treewide: with stdenv.lib; in meta -> with lib;

Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
This commit is contained in:
Profpatsch
2021-01-11 10:38:22 +01:00
parent e87aef06e0
commit 4a7f99d55d
6869 changed files with 13585 additions and 13580 deletions
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub
{ lib, stdenv, fetchFromGitHub
, localBios ? true, nasm ? null
, sdlSupport ? true, SDL ? null }:
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
builder = ./builder.sh;
meta = with stdenv.lib; {
meta = with lib; {
description = "An open-source small 8086 emulator";
longDescription = ''
8086tiny is a tiny, open-source (MIT), portable (little-endian hosts)
@@ -1,4 +1,4 @@
{ mkDerivation, cmake, fetchFromGitHub, libvncserver, qemu, qtbase, stdenv
{ mkDerivation, cmake, fetchFromGitHub, libvncserver, qemu, qtbase, lib, stdenv
}:
mkDerivation rec {
@@ -16,7 +16,7 @@ mkDerivation rec {
buildInputs = [ libvncserver qtbase qemu ];
meta = with stdenv.lib; {
meta = with lib; {
description = "A virtual machine manager GUI for qemu";
homepage = "https://github.com/tobimensch/aqemu";
license = licenses.gpl2;
@@ -1,4 +1,4 @@
{ stdenv, rustPlatform, fetchFromGitHub }:
{ lib, stdenv, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "cntr";
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-lblvun2T1qpFiowld77Ti2MFPzhs5pOWWRbErORXYCM=";
meta = with stdenv.lib; {
meta = with lib; {
description = "A container debugging tool based on FUSE";
homepage = "https://github.com/Mic92/cntr";
license = licenses.mit;
@@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, fetchFromGitHub
, pkg-config
, glib
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
passthru.tests = { inherit (nixosTests) cri-o podman; };
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://github.com/containers/conmon";
description = "An OCI container runtime monitor";
license = licenses.asl20;
@@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, btrfs-progs
, buildGoModule
, fetchFromGitHub
@@ -56,7 +56,7 @@ buildGoModule rec {
passthru.tests = { inherit (nixosTests) cri-o; };
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://cri-o.io";
description = ''
Open Container Initiative-based implementation of the
@@ -1,4 +1,4 @@
{ stdenv, buildPythonApplication, fetchPypi, pythonOlder
{ lib, stdenv, buildPythonApplication, fetchPypi, pythonOlder
, installShellFiles
, mock, pytest, nose
, pyyaml, backports_ssl_match_hostname, colorama, docopt
@@ -39,7 +39,7 @@ buildPythonApplication rec {
installShellCompletion --zsh contrib/completion/zsh/_docker-compose
'';
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://docs.docker.com/compose/";
description = "Multi-container orchestration for Docker";
license = licenses.asl20;
@@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, buildGoPackage
, fetchFromGitHub
, makeWrapper
@@ -36,7 +36,7 @@ buildGoPackage rec {
wrapProgram "$out/bin/docker-slim" --add-flags '--state-path "$(pwd)"'
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Minify and secure Docker containers";
homepage = "https://dockersl.im/";
changelog = "https://github.com/docker-slim/docker-slim/blob/${version}/CHANGELOG.md";
@@ -1,4 +1,4 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "distribution";
@@ -14,7 +14,7 @@ buildGoPackage rec {
sha256 = "1nx8b5a68rn81alp8wkkw6qd5v32mgf0fk23mxm60zdf63qk1nzw";
};
meta = with stdenv.lib; {
meta = with lib; {
description = "The Docker toolset to pack, ship, store, and deliver content";
license = licenses.asl20;
maintainers = [ maintainers.globin ];
@@ -1,4 +1,4 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "docker-proxy-${rev}";
@@ -19,7 +19,7 @@ buildGoPackage rec {
install -m755 -D ./go/bin/proxy $out/bin/docker-proxy
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Docker proxy binary to forward traffic between host and containers";
license = licenses.asl20;
homepage = "https://github.com/docker/libnetwork";
@@ -1,4 +1,4 @@
{ stdenv, fetchgit }:
{ lib, stdenv, fetchgit }:
stdenv.mkDerivation {
name = "win-pvdrivers-git-20150701";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
cp -r amd64 $out/.
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Xen Subproject: Windows PV Driver";
homepage = "http://xenproject.org/downloads/windows-pv-drivers.html";
maintainers = [ maintainers.tstrobel ];
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, p7zip }:
{ lib, stdenv, fetchurl, p7zip }:
stdenv.mkDerivation {
name = "win-qemu-0.1.105-1";
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
in
(copy "amd64" "w8.1") + (copy "x86" "w8.1");
meta = with stdenv.lib; {
meta = with lib; {
description = "Windows QEMU Drivers";
homepage = "https://fedoraproject.org/wiki/Windows_Virtio_Drivers";
maintainers = [ maintainers.tstrobel ];
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, p7zip }:
{ lib, stdenv, fetchurl, p7zip }:
let
src_x86 = fetchurl {
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
cp amd64/* $out/amd64/.
'';
meta = with stdenv.lib; {
meta = with lib; {
description = ''
A collection of open source Window PV drivers that allow
Windows to be para-virtualized.
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, p7zip, win-virtio }:
{ lib, stdenv, fetchurl, p7zip, win-virtio }:
let
src_usbdk_x86 = fetchurl {
@@ -60,7 +60,7 @@ stdenv.mkDerivation {
in
(copy "amd64" "w8.1") + (copy "x86" "w8.1");
meta = with stdenv.lib; {
meta = with lib; {
description = "Windows SPICE Drivers";
homepage = "https://www.spice-space.org/";
license = [ licenses.asl20 ]; # See https://github.com/vrozenfe/qxl-dod
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, p7zip }:
{ lib, stdenv, fetchurl, p7zip }:
stdenv.mkDerivation rec {
pname = "win-virtio";
version = "0.1.141-1";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
in
stdenv.lib.concatStringsSep "\n" ((map (copy "amd64" "w8.1") virtio) ++ (map (copy "x86" "w8.1") virtio));
meta = with stdenv.lib; {
meta = with lib; {
description = "Windows VirtIO Drivers";
homepage = "https://fedoraproject.org/wiki/Windows_Virtio_Drivers";
maintainers = [ maintainers.tstrobel ];
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, glibc }:
{ lib, stdenv, fetchFromGitHub, glibc }:
stdenv.mkDerivation rec {
pname = "dumb-init";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "A minimal init system for Linux containers";
homepage = "https://github.com/Yelp/dumb-init";
license = licenses.mit;
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, libelf, libpcap }:
{ lib, stdenv, fetchFromGitHub, cmake, libelf, libpcap }:
stdenv.mkDerivation rec {
pname = "dynamips";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DDYNAMIPS_CODE=stable" ];
meta = with stdenv.lib; {
meta = with lib; {
description = "A Cisco router emulator";
longDescription = ''
Dynamips is an emulator computer program that was written to emulate Cisco
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildGoPackage }:
{ lib, stdenv, fetchFromGitHub, buildGoPackage }:
buildGoPackage rec {
pname = "amazon-ecs-agent";
@@ -14,7 +14,7 @@ buildGoPackage rec {
sha256 = "1l6c2if6wpjmq2hh6k818w38s1rsbwgd6igqy948dwcrb1g1mixr";
};
meta = with stdenv.lib; {
meta = with lib; {
description = "The agent that runs on AWS EC2 container instances and starts containers on behalf of Amazon ECS";
homepage = "https://github.com/aws/amazon-ecs-agent";
license = licenses.asl20;
@@ -1,4 +1,4 @@
{ fetchurl, stdenv }:
{ fetchurl, lib, stdenv }:
let
version = "0.23.0";
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
install -D jailer $out/bin/jailer
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Secure, fast, minimal micro-container virtualization";
homepage = "http://firecracker-microvm.io";
license = licenses.asl20;
@@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
{ lib, stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "firectl";
@@ -17,7 +17,7 @@ buildGoModule rec {
doCheck = false;
meta = with stdenv.lib; {
meta = with lib; {
description = "A command-line tool to run Firecracker microVMs";
homepage = "https://github.com/firecracker-microvm/firectl";
license = licenses.asl20;
@@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, buildBazelPackage
, fetchFromGitHub
, cacert
@@ -91,7 +91,7 @@ in buildBazelPackage rec {
'';
};
meta = with stdenv.lib; {
meta = with lib; {
description = "Container Runtime Sandbox";
homepage = "https://github.com/google/gvisor";
license = licenses.asl20;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "hercules";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0zg6rwz8ib4alibf8lygi8qn69xx8n92kbi8b3jhi1ymb32mf349";
};
meta = with stdenv.lib; {
meta = with lib; {
description = "IBM mainframe emulator";
homepage = "http://www.hercules-390.eu";
license = licenses.qpl;
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, bc, python, bison, flex, fuse, libarchive
{ lib, stdenv, fetchFromGitHub, bc, python, bison, flex, fuse, libarchive
, buildPackages }:
stdenv.mkDerivation rec {
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib; {
meta = with lib; {
description = "The Linux kernel as a library";
longDescription = ''
LKL (Linux Kernel Library) aims to allow reusing the Linux kernel code as
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_ttf, spice-protocol
{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_ttf, spice-protocol
, fontconfig, libX11, freefont_ttf, nettle, libpthreadstubs, libXau, libXdmcp
, libXi, libXext, wayland, libffi, libGLU, expat, libbfd
}:
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
sourceRoot = "source/client";
NIX_CFLAGS_COMPILE = "-mavx"; # Fix some sort of AVX compiler problem.
meta = with stdenv.lib; {
meta = with lib; {
description = "A KVM Frame Relay (KVMFR) implementation";
longDescription = ''
Looking Glass is an open source application that allows the use of a KVM
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
--prefix PATH ':' "${lib.makeBinPath [ iproute dbus systemd which ]}"
'';
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://github.com/vmware/open-vm-tools";
description = "Set of tools for VMWare guests to improve host-guest interaction";
longDescription = ''
@@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, fetchFromGitHub
, pkg-config
, installShellFiles
@@ -62,7 +62,7 @@ buildGoModule rec {
passthru.tests = { inherit (nixosTests) podman; };
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://podman.io/";
description = "A program for managing pods, containers and container images";
license = licenses.asl20;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, python, zlib, pkgconfig, glib
{ lib, stdenv, fetchurl, fetchpatch, python, zlib, pkgconfig, glib
, perl, pixman, vde2, alsaLib, texinfo, flex
, bison, lzo, snappy, libaio, gnutls, nettle, curl
, makeWrapper
@@ -6,7 +6,7 @@
, CoreServices, Cocoa, Hypervisor, rez, setfile
, numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl
, seccompSupport ? stdenv.isLinux, libseccomp
, alsaSupport ? stdenv.lib.hasSuffix "linux" stdenv.hostPlatform.system && !nixosTestRunner
, alsaSupport ? lib.hasSuffix "linux" stdenv.hostPlatform.system && !nixosTestRunner
, pulseSupport ? !stdenv.isDarwin && !nixosTestRunner, libpulseaudio
, sdlSupport ? !stdenv.isDarwin && !nixosTestRunner, SDL2
, gtkSupport ? !stdenv.isDarwin && !xenSupport && !nixosTestRunner, gtk3, gettext, vte, wrapGAppsHook
@@ -23,7 +23,7 @@
, tpmSupport ? true
, hostCpuOnly ? false
, hostCpuTargets ? (if hostCpuOnly
then (stdenv.lib.optional stdenv.isx86_64 "i386-softmmu"
then (lib.optional stdenv.isx86_64 "i386-softmmu"
++ ["${stdenv.hostPlatform.qemuArch}-softmmu"])
else null)
, nixosTestRunner ? false
@@ -180,7 +180,7 @@ stdenv.mkDerivation rec {
qemu-system-i386 = "bin/qemu-system-i386";
};
meta = with stdenv.lib; {
meta = with lib; {
homepage = "http://www.qemu.org/";
description = "A generic and open source machine emulator and virtualizer";
license = licenses.gpl2Plus;
@@ -1,4 +1,4 @@
{ stdenv, mkDerivation, fetchFromGitLab, pkgconfig, qmake, qtbase, qemu, makeWrapper }:
{ lib, stdenv, mkDerivation, fetchFromGitLab, pkgconfig, qmake, qtbase, qemu, makeWrapper }:
mkDerivation rec {
pname = "qtemu";
@@ -35,7 +35,7 @@ mkDerivation rec {
runHook postInstall
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Qt-based front-end for QEMU emulator";
homepage = "https://qtemu.org";
license = licenses.gpl2;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, perl, perlPackages }:
{ lib, stdenv, fetchurl, makeWrapper, perl, perlPackages }:
stdenv.mkDerivation rec {
pname = "remotebox";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
cp -pv packagers-readme/*.desktop $out/share/applications
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "VirtualBox client with remote management";
homepage = "http://remotebox.knobgoblin.org.uk/";
license = licenses.gpl2Plus;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, iasl, python }:
{ lib, stdenv, fetchurl, iasl, python }:
stdenv.mkDerivation rec {
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
cp out/Csm16.bin $out/Csm16.bin
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Open source implementation of a 16bit X86 BIOS";
longDescription = ''
SeaBIOS is an open source implementation of a 16bit X86 BIOS.
@@ -65,7 +65,7 @@ buildGoPackage rec {
runHook postInstall
'';
meta = with stdenv.lib; {
meta = with lib; {
homepage = "http://www.sylabs.io/";
description = "Application containers for linux";
license = licenses.bsd3;
@@ -1,4 +1,4 @@
{ stdenv, fetchgit, dtc, nixosTests }:
{ lib, stdenv, fetchgit, dtc, nixosTests }:
stdenv.mkDerivation rec {
pname = "spike";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
can-run-hello-world = nixosTests.spike;
};
meta = with stdenv.lib; {
meta = with lib; {
description = "A RISC-V ISA Simulator";
homepage = "https://github.com/riscv/riscv-isa-sim";
license = licenses.bsd3;
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, glibc }:
{ lib, stdenv, fetchFromGitHub, cmake, glibc }:
stdenv.mkDerivation rec {
version = "0.19.0";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ glibc glibc.static ];
meta = with stdenv.lib; {
meta = with lib; {
description = "A tiny but valid init for containers";
homepage = "https://github.com/krallin/tini";
license = licenses.mit;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, python3Packages, intltool, file
{ lib, stdenv, fetchurl, python3Packages, intltool, file
, wrapGAppsHook, gtk-vnc, vte, avahi, dconf
, gobject-introspection, libvirt-glib, system-libvirt
, gsettings-desktop-schemas, glib, libosinfo, gnome3
@@ -56,7 +56,7 @@ python3Packages.buildPythonApplication rec {
# Failed tests
doCheck = false;
meta = with stdenv.lib; {
meta = with lib; {
homepage = "http://virt-manager.org";
description = "Desktop user interface for managing virtual machines";
longDescription = ''
@@ -1,4 +1,4 @@
{ stdenv, fetchgit, fetchpatch, ocamlPackages, autoreconfHook }:
{ lib, stdenv, fetchgit, fetchpatch, ocamlPackages, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "virt-top";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
buildPhase = "make opt";
meta = with stdenv.lib; {
meta = with lib; {
description = "A top-like utility for showing stats of virtualized domains";
homepage = "https://people.redhat.com/~rjones/virt-top/";
license = licenses.gpl2;
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub }:
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "vpcs";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib; {
meta = with lib; {
description = "A simple virtual PC simulator";
longDescription = ''
The VPCS (Virtual PC Simulator) can simulate up to 9 PCs. You can