From 880974a84d4e3150b2f45de3a084d686e39b0b61 Mon Sep 17 00:00:00 2001 From: Mazurel Date: Sat, 14 Nov 2020 16:10:22 +0100 Subject: [PATCH 01/52] qucs-s: init at 0.0.22 --- .../science/electronics/qucs-s/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/science/electronics/qucs-s/default.nix diff --git a/pkgs/applications/science/electronics/qucs-s/default.nix b/pkgs/applications/science/electronics/qucs-s/default.nix new file mode 100644 index 00000000000..6507198a790 --- /dev/null +++ b/pkgs/applications/science/electronics/qucs-s/default.nix @@ -0,0 +1,42 @@ +{ stdenv, lib, fetchFromGitHub, flex, bison, qt4, libX11, cmake, gperf, adms, +ngspice, wrapGAppsHook, +kernels ? [ ngspice ] }: + +stdenv.mkDerivation rec { + pname = "qucs-s"; + version = "0.0.22"; + + src = fetchFromGitHub { + owner = "ra3xdh"; + repo = "qucs_s"; + rev = version; + sha256 = "0rrq2ddridc09m6fixdmbngn42xmv8cmdf6r8zzn2s98fqib5qd6"; + }; + + nativeBuildInputs = [ wrapGAppsHook cmake ]; + buildInputs = [ flex bison qt4 libX11 gperf adms ] ++ kernels; + + preConfigure = '' + # Make custom kernels avaible from qucs-s + gappsWrapperArgs+=(--prefix PATH ":" ${lib.makeBinPath kernels}) + ''; + + QTDIR=qt4; + + doInstallCheck = true; + installCheck = '' + $out/bin/qucs-s --version + ''; + + meta = with lib; { + description = "Spin-off of Qucs that allows custom simulation kernels"; + longDescription = '' + Spin-off of Qucs that allows custom simulation kernels. + Default version is installed with ngspice. + ''; + homepage = "https://ra3xdh.github.io/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ mazurel ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8cb08bce062..7e45ced832b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26784,6 +26784,8 @@ in qucs = callPackage ../applications/science/electronics/qucs { }; + qucs-s = callPackage ../applications/science/electronics/qucs-s { }; + xcircuit = callPackage ../applications/science/electronics/xcircuit { }; xoscope = callPackage ../applications/science/electronics/xoscope { }; From 40eaff5836b52574a210270ed574a5898e4b6a82 Mon Sep 17 00:00:00 2001 From: peelz Date: Mon, 14 Dec 2020 18:35:56 -0500 Subject: [PATCH 02/52] r8125: 9.003.05 -> 9.004.01 --- pkgs/os-specific/linux/r8125/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/r8125/default.nix b/pkgs/os-specific/linux/r8125/default.nix index 8cdf11f80ad..80c00905876 100644 --- a/pkgs/os-specific/linux/r8125/default.nix +++ b/pkgs/os-specific/linux/r8125/default.nix @@ -4,16 +4,16 @@ stdenv.mkDerivation rec { pname = "r8125"; # On update please verify (using `diff -r`) that the source matches the # realtek version. - version = "9.003.05"; + version = "9.004.01"; # This is a mirror. The original website[1] doesn't allow non-interactive # downloads, instead emailing you a download link. # [1] https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software src = fetchFromGitHub { - owner = "ibmibmibm"; + owner = "louistakepillz"; repo = "r8125"; rev = version; - sha256 = "016vh997xjs01si0zzs572vgflq3czxd0v4m7h1m3qxcv2cvq7i0"; + sha256 = "0h2y4mzydhc7var5281bk2jj1knig6i64k11ii4b94az3g9dbq24"; }; hardeningDisable = [ "pic" ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildFlags = [ "modules" ]; meta = with lib; { - homepage = "https://github.com/ibmibmibm/r8125"; + homepage = "https://github.com/louistakepillz/r8125"; downloadPage = "https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"; description = "Realtek r8125 driver"; longDescription = '' From c2058833d76a848aed8b34dc34f5f2aaab7fd8c5 Mon Sep 17 00:00:00 2001 From: misuzu Date: Wed, 12 Aug 2020 14:44:28 +0300 Subject: [PATCH 03/52] libiscsi: init at 1.19.0 --- .../libraries/libiscsi/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/libiscsi/default.nix diff --git a/pkgs/development/libraries/libiscsi/default.nix b/pkgs/development/libraries/libiscsi/default.nix new file mode 100644 index 00000000000..2f7e3c410dd --- /dev/null +++ b/pkgs/development/libraries/libiscsi/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "libiscsi"; + version = "1.19.0"; + + src = fetchFromGitHub { + owner = "sahlberg"; + repo = "libiscsi"; + rev = version; + sha256 = "0ajrkkg5awmi8m4b3mha7h07ylg18k252qprvk1sgq0qbyd66zy7"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { + description = "iscsi client library and utilities"; + homepage = "https://github.com/sahlberg/libiscsi"; + license = licenses.lgpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ misuzu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33d8bd029bc..acceecf965f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5478,6 +5478,8 @@ in libircclient = callPackage ../development/libraries/libircclient { }; + libiscsi = callPackage ../development/libraries/libiscsi { }; + libisds = callPackage ../development/libraries/libisds { }; libite = callPackage ../development/libraries/libite { }; From c5dd597870e90f2bf9a03c5a61517eab5c145740 Mon Sep 17 00:00:00 2001 From: misuzu Date: Wed, 12 Aug 2020 14:47:41 +0300 Subject: [PATCH 04/52] qemu: libiscsi support --- pkgs/applications/virtualization/qemu/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 5d4b891ad5d..259b3282118 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -19,6 +19,7 @@ , cephSupport ? false, ceph , openGLSupport ? sdlSupport, mesa, epoxy, libdrm , virglSupport ? openGLSupport, virglrenderer +, libiscsiSupport ? true, libiscsi , smbdSupport ? false, samba , tpmSupport ? true , hostCpuOnly ? false @@ -72,6 +73,7 @@ stdenv.mkDerivation rec { ++ optionals cephSupport [ ceph ] ++ optionals openGLSupport [ mesa epoxy libdrm ] ++ optionals virglSupport [ virglrenderer ] + ++ optionals libiscsiSupport [ libiscsi ] ++ optionals smbdSupport [ samba ]; enableParallelBuilding = true; @@ -148,6 +150,7 @@ stdenv.mkDerivation rec { ++ optional openGLSupport "--enable-opengl" ++ optional virglSupport "--enable-virglrenderer" ++ optional tpmSupport "--enable-tpm" + ++ optional libiscsiSupport "--enable-libiscsi" ++ optional smbdSupport "--smbd=${samba}/bin/smbd"; doCheck = false; # tries to access /dev From 0dfad7d5dffe371aeb5e339e5e6011aaffbf3b27 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Tue, 29 Dec 2020 19:35:15 +0100 Subject: [PATCH 05/52] pythonPackages.agent-py: init at 0.0.23 --- .../python-modules/agent-py/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/agent-py/default.nix diff --git a/pkgs/development/python-modules/agent-py/default.nix b/pkgs/development/python-modules/agent-py/default.nix new file mode 100644 index 00000000000..2a9e358cf04 --- /dev/null +++ b/pkgs/development/python-modules/agent-py/default.nix @@ -0,0 +1,26 @@ +{ aiohttp, buildPythonPackage, fetchPypi, isPy3k, lib, python, requests }: + +buildPythonPackage rec { + pname = "agent-py"; + version = "0.0.23"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1hx88m8b8kfb2gm6hii5ldjv7hlvqf99cz0w2vj0d0grrxcbn5cz"; + }; + + propagatedBuildInputs = [ requests aiohttp ]; + + checkPhase = '' + ${python.interpreter} tests/test_agent.py + ''; + + meta = with lib; { + description = "A python wrapper around the Agent REST API."; + homepage = "https://github.com/ispysoftware/agent-py"; + license = licenses.asl20; + maintainers = with maintainers; [ jamiemagee ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80f5f6cab1c..81d8ed0b96e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -187,6 +187,8 @@ in { agate-sql = callPackage ../development/python-modules/agate-sql { }; + agent-py = callPackage ../development/python-modules/agent-py { }; + aioamqp = callPackage ../development/python-modules/aioamqp { }; aioconsole = callPackage ../development/python-modules/aioconsole { }; From c493ab12c0fe63dc0e530d524df8445dccc34a77 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Tue, 29 Dec 2020 19:47:06 +0100 Subject: [PATCH 06/52] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 9135ea549f3..22712cd7f83 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -13,7 +13,7 @@ "ads" = ps: with ps; [ pyads ]; "advantage_air" = ps: with ps; [ ]; # missing inputs: advantage_air "aftership" = ps: with ps; [ pyaftership ]; - "agent_dvr" = ps: with ps; [ ]; # missing inputs: agent-py + "agent_dvr" = ps: with ps; [ agent-py ]; "air_quality" = ps: with ps; [ ]; "airly" = ps: with ps; [ ]; # missing inputs: airly "airvisual" = ps: with ps; [ pyairvisual ]; From e0eca243bd32e24ee566d82c35e199cd4c8a4bcb Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 31 Jul 2020 20:48:41 +0200 Subject: [PATCH 07/52] cargo-deny: 0.7.0 -> 0.7.2 --- pkgs/development/tools/rust/cargo-deny/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 34126a7713f..c79ed842e4a 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.7.0"; + version = "0.7.2"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "0mfccjcll7dxrhdi2bhfbggmkqdp8cmq5vf8vbb05qzpvlswvkf7"; + sha256 = "01z3v1p8wv3h5x8mvwmfxwqii0kal9wsl0z8zkl5p803ffvv2r7c"; }; - cargoSha256 = "1gp5m432273mr0zwq1kdswdjgp0kajr0imymqyc4yj9i931by1xv"; + cargoSha256 = "10q3w3pn7qmq7xk4mx1b9f9y7485icpz7m6gg5rplzpdjg38ill5"; nativeBuildInputs = [ perl pkgconfig ]; From 9cd2b88942cbde148814144722cabb22b76398c2 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 19 Aug 2020 10:01:11 +0200 Subject: [PATCH 08/52] cargo-deny: 0.7.2 -> 0.7.3 Signed-off-by: Matthias Beyer --- pkgs/development/tools/rust/cargo-deny/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index c79ed842e4a..9e6d3f09b9c 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "01z3v1p8wv3h5x8mvwmfxwqii0kal9wsl0z8zkl5p803ffvv2r7c"; + sha256 = "1bvn75rg6b8f6k9379sj4vjz7z6b33zblnx290qsjgw7fhhmx3gz"; }; - cargoSha256 = "10q3w3pn7qmq7xk4mx1b9f9y7485icpz7m6gg5rplzpdjg38ill5"; + cargoSha256 = "1b1pnk0s99wcpqna2f4vp889crhf3lhmhia85kc25g6g03f86y2x"; nativeBuildInputs = [ perl pkgconfig ]; From 4689c606e798b19c6230a59f5b0a0a9a2bf10fbe Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 2 Nov 2020 16:59:05 +0100 Subject: [PATCH 09/52] cargo-deny: 0.7.3 -> 0.8.2 Signed-off-by: Matthias Beyer --- pkgs/development/tools/rust/cargo-deny/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 9e6d3f09b9c..97395a5dde1 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.7.3"; + version = "0.8.2"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "1bvn75rg6b8f6k9379sj4vjz7z6b33zblnx290qsjgw7fhhmx3gz"; + sha256 = "1qkg689ks4i665vk3qzyab1y955z5fshp2c6f0zjp618g84sd4ki"; }; - cargoSha256 = "1b1pnk0s99wcpqna2f4vp889crhf3lhmhia85kc25g6g03f86y2x"; + cargoSha256 = "0nm6xy0nvv2nw6kkdbqq07ix48yd1vvkd06zmffh7gavw40lha9n"; nativeBuildInputs = [ perl pkgconfig ]; From 5f9b236728b38058b55bad3746478aee80e9b348 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 25 Nov 2020 09:56:31 +0100 Subject: [PATCH 10/52] Cargo-deny: 0.8.2 -> 0.8.4 Signed-off-by: Matthias Beyer --- pkgs/development/tools/rust/cargo-deny/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 97395a5dde1..2084f9c9fd3 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.8.2"; + version = "0.8.4"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "1qkg689ks4i665vk3qzyab1y955z5fshp2c6f0zjp618g84sd4ki"; + sha256 = "18l3nl7db8s8c5yjr5n63qw49bl4qvbzcx1y3vdawfr5fvxj3535"; }; - cargoSha256 = "0nm6xy0nvv2nw6kkdbqq07ix48yd1vvkd06zmffh7gavw40lha9n"; + cargoSha256 = "00hqxr97lpz1999dkhain0np5yn42mqfrp84nasp4vxyvnmqngmx"; nativeBuildInputs = [ perl pkgconfig ]; From 9a550661a75df7118d85de5cbbf73735db2dac29 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 17 Dec 2020 18:41:51 +0100 Subject: [PATCH 11/52] cargo-deny: 0.8.4 -> 0.8.5 Signed-off-by: Matthias Beyer --- pkgs/development/tools/rust/cargo-deny/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 2084f9c9fd3..c27805418d5 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "18l3nl7db8s8c5yjr5n63qw49bl4qvbzcx1y3vdawfr5fvxj3535"; + sha256 = "01czsnhlvs78fpx1kpi75386657jmlrqpsj4474nxmgcs75igncx"; }; - cargoSha256 = "00hqxr97lpz1999dkhain0np5yn42mqfrp84nasp4vxyvnmqngmx"; + cargoSha256 = "1d5vh6cifkvqxmbgc2z9259q8879fjw016z959hfivv38rragqbr"; nativeBuildInputs = [ perl pkgconfig ]; From 4b987925cfa14a8230104bd42c68bc845dd62211 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 17 Dec 2020 18:43:05 +0100 Subject: [PATCH 12/52] cargo-deny: Disable tests Because nobody told me how to add the missing cargo-metadata command to the test environment and the PR for updating this package is almost half a year old, disable tests now. Hopefully someone will step up and fix this, but I doubt it. Signed-off-by: Matthias Beyer --- pkgs/development/tools/rust/cargo-deny/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index c27805418d5..63aadf4f1fc 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -18,6 +18,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1d5vh6cifkvqxmbgc2z9259q8879fjw016z959hfivv38rragqbr"; + doCheck = false; + nativeBuildInputs = [ perl pkgconfig ]; buildInputs = [ openssl ] From 166bd46415323633271ea12c7a1823ce8951d21b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Dec 2020 22:43:01 +0100 Subject: [PATCH 13/52] aiodnsbrute: init at 0.3.2 --- pkgs/tools/security/aiodnsbrute/default.nix | 45 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/tools/security/aiodnsbrute/default.nix diff --git a/pkgs/tools/security/aiodnsbrute/default.nix b/pkgs/tools/security/aiodnsbrute/default.nix new file mode 100644 index 00000000000..77f03e4174f --- /dev/null +++ b/pkgs/tools/security/aiodnsbrute/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, aiodns +, click +, tqdm +, uvloop +}: + +buildPythonApplication rec { + pname = "aiodnsbrute"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "blark"; + repo = pname; + rev = "v${version}"; + sha256 = "0fs8544kx7vwvc97zpg4rs3lmvnb4vwika5g952rv3bfx4rv3bpg"; + }; + + # https://github.com/blark/aiodnsbrute/pull/8 + prePatch = '' + substituteInPlace setup.py --replace " 'asyncio', " "" + ''; + + propagatedBuildInputs = [ + aiodns + click + tqdm + uvloop + ]; + + # no tests present + doCheck = false; + + pythonImportsCheck = [ "aiodnsbrute.cli" ]; + + meta = with lib; { + description = "DNS brute force utility"; + homepage = "https://github.com/blark/aiodnsbrute"; + # https://github.com/blark/aiodnsbrute/issues/5 + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b183ed808f0..a681638c747 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -685,6 +685,8 @@ in aide = callPackage ../tools/security/aide { }; + aiodnsbrute = python3Packages.callPackage ../tools/security/aiodnsbrute { }; + aircrack-ng = callPackage ../tools/networking/aircrack-ng { }; airfield = callPackage ../tools/networking/airfield { }; From 930637646406046d02231e03429bf49d2bf1ab92 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Dec 2020 23:43:57 +0100 Subject: [PATCH 14/52] evillimiter: init at 1.5.0 --- pkgs/tools/networking/evillimiter/default.nix | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/tools/networking/evillimiter/default.nix diff --git a/pkgs/tools/networking/evillimiter/default.nix b/pkgs/tools/networking/evillimiter/default.nix new file mode 100644 index 00000000000..20cc10728d6 --- /dev/null +++ b/pkgs/tools/networking/evillimiter/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, colorama +, iproute2 +, iptables +, netaddr +, netifaces +, scapy +, terminaltables +, tqdm +}: + +buildPythonApplication rec { + pname = "evillimiter"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "bitbrute"; + repo = pname; + rev = "v${version}"; + sha256 = "1l0acd4a36wzz1gyc6mcw3zpagyi2mc425c6d4c6anq3jxwm3847"; + }; + + propagatedBuildInputs = [ + colorama + iproute2 + iptables + netaddr + netifaces + scapy + terminaltables + tqdm + ]; + + # no tests present + doCheck = false; + + pythonImportsCheck = [ "evillimiter.evillimiter" ]; + + meta = with lib; { + description = "Tool that monitors, analyzes and limits the bandwidth"; + longDescription = '' + A tool to monitor, analyze and limit the bandwidth (upload/download) of + devices on your local network without physical or administrative access. + evillimiter employs ARP spoofing and traffic shaping to throttle the + bandwidth of hosts on the network. + ''; + homepage = "https://github.com/bitbrute/evillimiter"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b183ed808f0..01170c84f4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3796,6 +3796,8 @@ in eventstat = callPackage ../os-specific/linux/eventstat { }; + evillimiter = python3Packages.callPackage ../tools/networking/evillimiter { }; + evtest = callPackage ../applications/misc/evtest { }; evtest-qt = libsForQt5.callPackage ../applications/misc/evtest-qt { }; From 03471b0e1c714e88f1041e73da2142f36e7adeb0 Mon Sep 17 00:00:00 2001 From: peelz Date: Thu, 31 Dec 2020 15:05:57 -0500 Subject: [PATCH 15/52] r8125: add broken check for kernel >=5.9.1 --- pkgs/os-specific/linux/r8125/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/r8125/default.nix b/pkgs/os-specific/linux/r8125/default.nix index 80c00905876..30f8da7d5f4 100644 --- a/pkgs/os-specific/linux/r8125/default.nix +++ b/pkgs/os-specific/linux/r8125/default.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { longDescription = '' A kernel module for Realtek 8125 2.5G network cards. ''; + # r8125 has been integrated into the kernel as of v5.9.1 + broken = lib.versionAtLeast kernel.version "5.9.1"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ peelz ]; From 672607c41f28570ea435989ac9f470e528a062ff Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 13 Dec 2020 16:53:02 +0100 Subject: [PATCH 16/52] bitcoin: introduce withWallet flag, allow building without wallet --- pkgs/applications/blockchains/bitcoin.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix index 80e935f2b1a..3bda048a0cf 100644 --- a/pkgs/applications/blockchains/bitcoin.nix +++ b/pkgs/applications/blockchains/bitcoin.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, pkgconfig +, pkg-config , autoreconfHook , db48 , boost @@ -16,6 +16,7 @@ , qrencode , libevent , withGui +, withWallet ? true }: with stdenv.lib; @@ -40,11 +41,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = - [ pkgconfig autoreconfHook ] + [ pkg-config autoreconfHook ] ++ optional stdenv.isDarwin hexdump ++ optional withGui wrapQtAppsHook; - buildInputs = [ db48 boost zlib zeromq miniupnpc libevent ] + buildInputs = [ boost zlib zeromq miniupnpc libevent ] ++ optionals stdenv.isLinux [ util-linux ] + ++ optionals withWallet [ db48 ] ++ optionals withGui [ qtbase qttools qrencode ]; postInstall = optional withGui '' @@ -58,8 +60,9 @@ stdenv.mkDerivation rec { ] ++ optionals (!doCheck) [ "--disable-tests" "--disable-gui-tests" - ] - ++ optionals withGui [ + ] ++ optionals (!withWallet) [ + "--disable-wallet" + ] ++ optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; @@ -87,7 +90,7 @@ stdenv.mkDerivation rec { homepage = "https://bitcoin.org/"; downloadPage = "https://bitcoincore.org/bin/bitcoin-core-${version}/"; changelog = "https://bitcoincore.org/en/releases/${version}/"; - maintainers = with maintainers; [ roconnor ]; + maintainers = with maintainers; [ prusnak roconnor ]; license = licenses.mit; platforms = platforms.unix; }; From 30b46643934471cbe0ebf47e430193eba95cf4bb Mon Sep 17 00:00:00 2001 From: Daniel Barter Date: Fri, 15 Jan 2021 15:21:48 -0800 Subject: [PATCH 17/52] maintainers: add danielbarter --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 50efa11c97c..e0a14ab0fe1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2031,6 +2031,12 @@ githubId = 23366017; name = "Dan Haraj"; }; + danielbarter = { + email = "danielbarter@gmail.com"; + github = "danielbarter"; + githubId = 8081722; + name = "Daniel Barter"; + }; danieldk = { email = "me@danieldk.eu"; github = "danieldk"; From f324c9a0b616bc0cb48ddded1744bfc66129346f Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 16 Jan 2021 13:44:40 +0100 Subject: [PATCH 18/52] bitcoin: 0.20.1 -> 0.21.0 + add sqlite to buildInputs (if wallet is enabled) --- pkgs/applications/blockchains/bitcoin.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix index 3bda048a0cf..3d4e9c038be 100644 --- a/pkgs/applications/blockchains/bitcoin.nix +++ b/pkgs/applications/blockchains/bitcoin.nix @@ -3,6 +3,7 @@ , pkg-config , autoreconfHook , db48 +, sqlite , boost , zeromq , hexdump @@ -21,7 +22,7 @@ with stdenv.lib; let - version = "0.20.1"; + version = "0.21.0"; majorMinorVersion = versions.majorMinor version; desktop = fetchurl { url = "https://raw.githubusercontent.com/bitcoin-core/packaging/${majorMinorVersion}/debian/bitcoin-qt.desktop"; @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; - sha256 = "4bbd62fd6acfa5e9864ebf37a24a04bc2dcfe3e3222f056056288d854c53b978"; + sha256 = "1a91202c62ee49fb64d57a52b8d6d01cd392fffcbef257b573800f9289655f37"; }; nativeBuildInputs = @@ -46,7 +47,7 @@ stdenv.mkDerivation rec { ++ optional withGui wrapQtAppsHook; buildInputs = [ boost zlib zeromq miniupnpc libevent ] ++ optionals stdenv.isLinux [ util-linux ] - ++ optionals withWallet [ db48 ] + ++ optionals withWallet [ db48 sqlite ] ++ optionals withGui [ qtbase qttools qrencode ]; postInstall = optional withGui '' From 70b54ac1cdde89eea086682979227fdd9f826645 Mon Sep 17 00:00:00 2001 From: Matej Urbas Date: Sun, 17 Jan 2021 11:08:56 +0000 Subject: [PATCH 19/52] python3Packages.hug: disable broken marshmallow tests --- .../python-modules/hug/default.nix | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/hug/default.nix b/pkgs/development/python-modules/hug/default.nix index 6769b5371b8..839c0ce387c 100644 --- a/pkgs/development/python-modules/hug/default.nix +++ b/pkgs/development/python-modules/hug/default.nix @@ -2,7 +2,7 @@ , falcon , pytestrunner , requests -, pytest +, pytestCheckHook , marshmallow , mock , numpy @@ -20,19 +20,29 @@ buildPythonPackage rec { sha256 = "05rsv16g7ph100p8kl4l2jba0y4wcpp3xblc02mfp67zp1279vaq"; }; - nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ falcon requests ]; - checkInputs = [ mock marshmallow pytest numpy ]; - checkPhase = '' - mv hug hug.hidden - # some tests attempt network access - PATH=$out/bin:$PATH pytest -k "not (test_request or test_datagram_request)" + checkInputs = [ mock marshmallow pytestCheckHook pytestrunner numpy ]; + + preCheck = '' + # some tests need the `hug` CLI on the PATH + export PATH=$out/bin:$PATH ''; + disabledTests = [ + # some tests attempt network access + "test_datagram_request" + "test_request" + # these tests use an unstable test dependency (https://github.com/hugapi/hug/issues/859) + "test_marshmallow_custom_context" + "test_marshmallow_schema" + "test_transform" + "test_validate_route_args_negative_case" + ]; + meta = with lib; { description = "A Python framework that makes developing APIs as simple as possible, but no simpler"; - homepage = "https://github.com/timothycrosley/hug"; + homepage = "https://github.com/hugapi/hug"; license = licenses.mit; }; From 1e3b34fb5f01d0dc763636c562b28374220e39c0 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 6 Sep 2020 15:02:21 +0100 Subject: [PATCH 20/52] elasticmq: remove in favour of elasticmq-server the elasticmq package is very old and hasn't seen any non-automatic updates since its introduction. newer releases are packaged as elasticmq-server --- pkgs/servers/elasticmq/default.nix | 40 ------------------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 --- 3 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 pkgs/servers/elasticmq/default.nix diff --git a/pkgs/servers/elasticmq/default.nix b/pkgs/servers/elasticmq/default.nix deleted file mode 100644 index b27a8decb5e..00000000000 --- a/pkgs/servers/elasticmq/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchurl, jre, makeWrapper, which }: - -stdenv.mkDerivation rec { - name = "elasticmq-0.5"; - - src = fetchurl { - url = "https://github.com/downloads/adamw/elasticmq/${name}.tar.gz"; - sha256 = "1zpv3vzairprh4x9fia82qqr14kf5hpxq1r90mn4ww7ighbv9pf1"; - }; - - buildInputs = [ makeWrapper ]; - - installPhase = - '' - mkdir -p $out/bin - cp -prd lib conf $out/ - - cp bin/run.sh $out/bin/elasticmq - substituteInPlace $out/bin/elasticmq --replace '-DBASEDIR=$BASEDIR' '-DBASEDIR=''${ELASTICMQ_DATA_PREFIX:-.}' - - wrapProgram $out/bin/elasticmq --prefix PATH : "${lib.makeBinPath [ which jre ]}" - ''; - - meta = { - homepage = "https://github.com/adamw/elasticmq"; - description = "Message queueing system with Java, Scala and Amazon SQS-compatible interfaces"; - longDescription = - '' - ElasticMQ is a message queueing system with Java, Scala and - Amazon SQS-compatible interfaces. You should set the - environment ELASTICMQ_DATA_PREFIX to a writable directory - where ElasticMQ will store its data and log files. It also - looks for its configuration file in - $ELASTICMQ_DATA_PREFIX/conf/Default.scala. You can use the - Default.scala included in the distribution as a template. - ''; - license = lib.licenses.asl20; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d5374158a10..189992db802 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -139,6 +139,7 @@ mapAliases ({ draftsight = throw "draftsight has been removed, no longer available as freeware"; # added 2020-08-14 dvb_apps = throw "dvb_apps has been removed."; # added 2020-11-03 dwarf_fortress = dwarf-fortress; # added 2016-01-23 + elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # added 2021-01-17 emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5396d4d32b..8219a60f320 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17668,10 +17668,6 @@ in biboumi = callPackage ../servers/xmpp/biboumi { }; - elasticmq = callPackage ../servers/elasticmq { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; - elasticmq-server-bin = callPackage ../servers/elasticmq-server-bin { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 From 5da03fc60d934a14574335a569bbd3b69325bade Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 16 Jan 2021 20:57:40 +0100 Subject: [PATCH 21/52] grafana-agent: init at 0.10.0 --- .../monitoring/grafana-agent/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/servers/monitoring/grafana-agent/default.nix diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix new file mode 100644 index 00000000000..71973333063 --- /dev/null +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -0,0 +1,41 @@ +{ lib, buildGoModule, fetchFromGitHub, systemd }: + +buildGoModule rec { + pname = "grafana-agent"; + version = "0.10.0"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "grafana"; + repo = "agent"; + sha256 = "1kliq6d3hg4bx9s5crdagirf2h3ljl0ikcyz0x0wb2ack6cgjsvm"; + }; + + vendorSha256 = null; + + # uses go-systemd, which uses libsystemd headers + # https://github.com/coreos/go-systemd/issues/351 + NIX_CFLAGS_COMPILE = [ "-I${lib.getDev systemd}/include" ]; + + # tries to access /sys: https://github.com/grafana/agent/issues/333 + preBuild = '' + rm pkg/integrations/node_exporter/node_exporter_test.go + ''; + + # go-systemd uses libsystemd under the hood, which does dlopen(libsystemd) at + # runtime. + # Add to RUNPATH so it can be found. + postFixup = '' + patchelf \ + --set-rpath "${lib.makeLibraryPath [ (lib.getDev systemd) ]}:$(patchelf --print-rpath $out/bin/agent)" \ + $out/bin/agent + ''; + + meta = with lib; { + description = "A lightweight subset of Prometheus and more, optimized for Grafana Cloud"; + license = licenses.asl20; + homepage = "https://grafana.com/products/cloud"; + maintainers = with maintainers; [ flokli ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 355df6b465f..40586feb5f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17708,6 +17708,8 @@ in grafana = callPackage ../servers/monitoring/grafana { }; grafanaPlugins = dontRecurseIntoAttrs (callPackage ../servers/monitoring/grafana/plugins { }); + grafana-agent = callPackage ../servers/monitoring/grafana-agent { }; + grafana-loki = callPackage ../servers/monitoring/loki { }; grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; From 8efbb2791d0d453a2145d421a42c97f835c2044d Mon Sep 17 00:00:00 2001 From: Matej Urbas Date: Sun, 17 Jan 2021 15:26:33 +0000 Subject: [PATCH 22/52] fixup! removes pytest-runner dependency from setup.py --- pkgs/development/python-modules/hug/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hug/default.nix b/pkgs/development/python-modules/hug/default.nix index 839c0ce387c..872798c6ced 100644 --- a/pkgs/development/python-modules/hug/default.nix +++ b/pkgs/development/python-modules/hug/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage, fetchFromGitHub, isPy27 , falcon -, pytestrunner , requests , pytestCheckHook , marshmallow @@ -22,7 +21,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ falcon requests ]; - checkInputs = [ mock marshmallow pytestCheckHook pytestrunner numpy ]; + checkInputs = [ mock marshmallow pytestCheckHook numpy ]; + + postPatch = '' + substituteInPlace setup.py --replace '"pytest-runner"' "" + ''; preCheck = '' # some tests need the `hug` CLI on the PATH From 22746e627858999e8786c1ab18acd4428086b49b Mon Sep 17 00:00:00 2001 From: "\"Andrey Kuznetsov\"" <"fear@loathing.in"> Date: Sun, 17 Jan 2021 15:45:32 +0000 Subject: [PATCH 23/52] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 304 ++++++++++++++-------------- 1 file changed, 152 insertions(+), 152 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 35abdcf5421..92ae1fa6205 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-01-13"; + version = "2021-01-16"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "97ce2423b04745d5c7588385ddbd75be9ef846d4"; - sha256 = "1q55kd8xqxl43rvj08awyq32a0mrv4svm2932s6q73zb8022db4a"; + rev = "9387ccfbc57f34f9fdc6af85cd0dbddf5ee8c5ae"; + sha256 = "1p8fxlnwfiaigfrcw8sk832p4msqcl4n45k5qshy625cz9jkysn0"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -89,12 +89,12 @@ let aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2020-12-21"; + version = "2021-01-16"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "50adbc5ed5bb97b73b0b0c3241d9e62621ca59f9"; - sha256 = "1wy5jd86273q7sxa50kv88flqdgmg9z2m4b6phpw3xnl5d1sj9f7"; + rev = "9d3a5e926a5708039abcaf552c8ab3d133c37f80"; + sha256 = "0waa122pk1mcbbhj7zrsb9ch0xmg0x3mpm627k7knpi4q8krgrzy"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -245,12 +245,12 @@ let barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2021-01-05"; + version = "2021-01-16"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "e0b4935d5956025ab595195d935a5bac00f1a973"; - sha256 = "0h723j5zhj8mzwghykd84rxdr0l4ngvyy692d6sl2zz940mvwlkw"; + rev = "80860e972cdf78e0e0b8dc7f16e07142966f73cf"; + sha256 = "009gnamainla5z2q98p6mi4gifmlbx5im7d2gx2d0da62cbdrcsl"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -449,24 +449,24 @@ let coc-denite = buildVimPluginFrom2Nix { pname = "coc-denite"; - version = "2020-11-26"; + version = "2021-01-14"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-denite"; - rev = "ea22e4462f9ac77f9c0cf3b1413bcd4d3b86a135"; - sha256 = "15rx4ws7hvssi7z1fkh7mzadc9xifi4hzb9g91lbinds12v19gg9"; + rev = "819b0e334431a9e914d69f3fedf68122799fcab9"; + sha256 = "02zy4ip7m1jivqzs67c8bzc8lis8wxkm38nvk6nngz2790xpfywc"; }; meta.homepage = "https://github.com/neoclide/coc-denite/"; }; coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2021-01-13"; + version = "2021-01-16"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "e0a4cfa0fb856b31a6d16828ce3629b2901496f0"; - sha256 = "0vadrkk92vrw48h7clbasqacyfcjn63ziq33740mciwa7a3h5bfg"; + rev = "2dc88ca328de4e00b37586aaf532b2cd90b5c3a0"; + sha256 = "0zjryprw2qdshshw7f8dkk7jf515sq11gc1w0lvssimkqdi47zaj"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; @@ -485,12 +485,12 @@ let coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-01-08"; + version = "2021-01-16"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "ad83de5ef16299e026b7fce6a024c82b2b7110f5"; - sha256 = "0b56af3z04vvlkr67yg3bfj71qycyhrv895p1sbfamj483hs7ds6"; + rev = "07a533b2b1202beda8e07e4d605584a8b7525e3d"; + sha256 = "1r8yijfm9m0g4r2d1q3ja05vjy7li578ix2c2wbq8iy3i10g8lkl"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -521,12 +521,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-01-12"; + version = "2021-01-15"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "891c73f0deb3777870aed67c6ea6e5e184bafe27"; - sha256 = "11wlsicv74vsxyr5l7q8r02h1wmf6zq3igxrp1anndv3j8mjbi09"; + rev = "a150d49a46ea85b4c78813e6ba0fcf9a2b0d86ea"; + sha256 = "067fhgvfnrvzw67hyag0fxv61m1fbl8160klgy5l0kjy7nx6hwiw"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -606,12 +606,12 @@ let completion-nvim = buildVimPluginFrom2Nix { pname = "completion-nvim"; - version = "2021-01-13"; + version = "2021-01-15"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "completion-nvim"; - rev = "d8eb3ba816d6bae9b741c23dee4d496e545a4ef8"; - sha256 = "1nndg6lbsgfp65vpqw5bpjj2qa944c2x5s38jfrf2lp68hk39z23"; + rev = "fc9b2fd2d47bea6a8954de1b1b19f2330545b354"; + sha256 = "0dip8z6cfhjbz5lvf6f75382lg7d819djrpygbc12lf1s4i66i3z"; }; meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; @@ -654,12 +654,12 @@ let conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2021-01-03"; + version = "2021-01-16"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "e966ef58720fa0a2739aa33e9307809925b36597"; - sha256 = "1baf3r6fmdwn1pbn5sfrrmzi4dxp9a298bajr4sqds05avk4z2dc"; + rev = "94a55a46ecbbd169436f4f937060c8d449a74c51"; + sha256 = "074ksnsisv1yvf3fcvgz9bl8s15q5z8h2hvfmymhf53rxbfh7dfk"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -690,12 +690,12 @@ let Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-01-03"; + version = "2021-01-15"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "8c3cced82a5ea8051fbbe2ade25fac557ca976f0"; - sha256 = "1ayzpwc9bi6x5l5yhmhlfqifizpya9z57f0qdm64diwqvr8lvyb2"; + rev = "50c34a24bb6638fdf8f604f75cd036ec5252864d"; + sha256 = "1b5cs4yznz8vcmba6vk67kpd6071cz1m5jbfjpvyinvld5ipnapn"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -882,24 +882,24 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-01-13"; + version = "2021-01-16"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "d01c56ff3eab215c1485bd04d132b709f922de3e"; - sha256 = "0b2hmdkbi9d1273f8pylb87hxq2mws4s8g06rmy61ycbq60ldg4k"; + rev = "b7c43e846b404d6068e4905cc1fc22c73e6d333a"; + sha256 = "00nyw1fnjjkr7zqns05sp00qvbsyyc8a6avr9s0j76hhamrfwkhg"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2021-01-13"; + version = "2021-01-14"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "e470e3df3e94181c6e8a20e62df564beb8d7df36"; - sha256 = "17l0ykpib84lgq30dkfdk7s6gxb2dc20wg22z0pvf3slnyfdf8ra"; + rev = "f1bf4b1dc68d441936019f97a2f306327c52f5c4"; + sha256 = "0gd23blp723gybzp0g466kkf3rf9d0bd2zs76hadmw7w7992im2z"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1076,12 +1076,12 @@ let deoplete-tabnine = buildVimPluginFrom2Nix { pname = "deoplete-tabnine"; - version = "2020-11-30"; + version = "2021-01-15"; src = fetchFromGitHub { owner = "tbodt"; repo = "deoplete-tabnine"; - rev = "a9bc7ffddbcae9c90be2c56f06842890e07126ce"; - sha256 = "1ar0ccr09m76arjcz4n5q7l9k8l1klc4sdxl5g0v87jjmiiazzvg"; + rev = "80a329eca215f48de8a4e575af55607700ddc93e"; + sha256 = "1i23ajbkx3yrll4mnqzf17g66c9x5g6ih3hk3acjq7h3m6ifgfyi"; }; meta.homepage = "https://github.com/tbodt/deoplete-tabnine/"; }; @@ -1124,12 +1124,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2021-01-12"; + version = "2021-01-15"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "4c5acd271591c4b5e5420ce05c2b20eb7beb08e3"; - sha256 = "1vy3n81y7f535adyplmy3pvvsgjdzrxcfqlzrwz62r4bspqqf42r"; + rev = "5fb8291d5f5238bdd52025e02470c7602d66f7c4"; + sha256 = "08fidhbqxhzxabww0zb5lxfignl3qmjn8ffl1g81acl2v62bz3hn"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1328,21 +1328,9 @@ let meta.homepage = "https://github.com/konfekt/fastfold/"; }; - fern-vim = buildVimPluginFrom2Nix { - pname = "fern-vim"; - version = "2021-01-13"; - src = fetchFromGitHub { - owner = "lambdalisue"; - repo = "fern.vim"; - rev = "316c8ad965f7d23093bd36a792730f701b80fb2a"; - sha256 = "1l04kjrnafj8509nmz349ki6xm5vzry9dqikgw5gsykrwgf8cp3a"; - }; - meta.homepage = "https://github.com/lambdalisue/fern.vim/"; - }; - fennel-vim = buildVimPluginFrom2Nix { - pname = "fennel.vim"; - version = "2021-01-08"; + pname = "fennel-vim"; + version = "2020-11-15"; src = fetchFromGitHub { owner = "bakpakin"; repo = "fennel.vim"; @@ -1352,6 +1340,18 @@ let meta.homepage = "https://github.com/bakpakin/fennel.vim/"; }; + fern-vim = buildVimPluginFrom2Nix { + pname = "fern-vim"; + version = "2021-01-17"; + src = fetchFromGitHub { + owner = "lambdalisue"; + repo = "fern.vim"; + rev = "f057425350c3a01372f071de0b6f1ac597b962d6"; + sha256 = "10wrk0a9ich10bgky912i22ix3xanxk81clda63fg4nw7c4sqqfs"; + }; + meta.homepage = "https://github.com/lambdalisue/fern.vim/"; + }; + ferret = buildVimPluginFrom2Nix { pname = "ferret"; version = "2020-12-08"; @@ -1463,12 +1463,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2021-01-07"; + version = "2021-01-17"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "d43df0ea2f099836c2e3499756101e87bcbd3e25"; - sha256 = "1hclx6c476i523qa5r27r2jbdfdrlbgan1j7aczzwgj3lahbdlvx"; + rev = "1fcdee55cc5975d67248b2f8ea5fbac9aa628b7c"; + sha256 = "0pnpjm17dn28gidjc43dkh5rn5s5rni5l8zjhy72hnix8ws3m1k0"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -2076,12 +2076,12 @@ let lh-brackets = buildVimPluginFrom2Nix { pname = "lh-brackets"; - version = "2021-01-06"; + version = "2021-01-15"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-brackets"; - rev = "547fc9ab14ecf6ecc0d81e8bbb1cc1fec314b6aa"; - sha256 = "0344ap5fkp1d0g91rv9pn0p28xqz8as48d3m6kxc99w229sj6p2q"; + rev = "7e0e38857de5558de04c251cf6ddc350724562d9"; + sha256 = "105dgm80946jvx9qxs10vscgrplwpg89nwd6cmpm47wzj8999r8b"; }; meta.homepage = "https://github.com/LucHermitte/lh-brackets/"; }; @@ -2100,12 +2100,12 @@ let lightline-ale = buildVimPluginFrom2Nix { pname = "lightline-ale"; - version = "2020-04-30"; + version = "2021-01-16"; src = fetchFromGitHub { owner = "maximbaz"; repo = "lightline-ale"; - rev = "23352556fdaa067209fa22df424f1b88ab370f6a"; - sha256 = "1cz1pcz6qxddpalymj2p19clnwsj568zlvbyg7mai0vxx6cv7a9w"; + rev = "fa5e6bf8bca114c508b1247a94ef95c89c390a57"; + sha256 = "00a8lpj57mbjqky4anjk5jjm2kz9y2iim2dvv1slvm6wyvd4hkwq"; }; meta.homepage = "https://github.com/maximbaz/lightline-ale/"; }; @@ -2172,12 +2172,12 @@ let lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; - version = "2021-01-11"; + version = "2021-01-15"; src = fetchFromGitHub { owner = "hoob3rt"; repo = "lualine.nvim"; - rev = "823665c511d5727107a57e4f31205f92bb2c573e"; - sha256 = "1krfj35zmbf9gznsh4npwhjmy132svbrivsy007vpz798lir7i06"; + rev = "10a6087a74b235a7e3a77310a21a563afad3a148"; + sha256 = "06p776nkm2r1i6hslbcaqqg4adqlmv3car6gi8yd4yv8vwlffraw"; }; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; }; @@ -2532,12 +2532,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2021-01-13"; + version = "2021-01-16"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "18aee89508fb7eea2bbff824dd1c33bdf7158d75"; - sha256 = "1bq2m85kdlgak1df5gpslylq0x7fxf694gb2y18s33jxmpvnahxz"; + rev = "306b74eab85bc84bb790118bfb6a4b01e352f4f0"; + sha256 = "0nkhj5yamws84w0gwnydgysqbscigfm2yjb9p8yvbfx23y6idijk"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -2580,12 +2580,12 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2020-12-23"; + version = "2021-01-15"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "901b9ba8f2eea6222649282a58d7b86b8719334f"; - sha256 = "0k08057fbs4pmx9w6mwnjvms6sn694h6n255ff6n40sf4yy8w4mh"; + rev = "ba35daa1d248b47b3a5202e5d32e3af5affdcd4b"; + sha256 = "14aq1m9qbmkyzp36qlpgqm8rdpc0338z68hxshwk55i01wdysqfd"; }; meta.homepage = "https://github.com/Shougo/neosnippet-snippets/"; }; @@ -2796,12 +2796,12 @@ let nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-01-10"; + version = "2021-01-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "e971d2af33189bff941c9632aca51211dfca0869"; - sha256 = "09h2kacqbqazllajacpfnlysvwb1ikg5gmymci3hp39g488i3kx6"; + rev = "570b84cdd58ff8ae00974d827ab259b226809ab2"; + sha256 = "040y3a1bzpf69ra6a9f0jzdfw9yf694x9zxmby8ba7xil3q69pzr"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -2856,12 +2856,12 @@ let nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-01-12"; + version = "2021-01-15"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "844d6f9d7af961eb27f876dc0cae9fe0fab5a769"; - sha256 = "151s2n50zmvfgbb30h63cgzbbxi8vb5fagiyl4gr6vpfn6p64s4g"; + rev = "87900ffcccd47bb6a09483ccf0d6840dc1d0d0d6"; + sha256 = "18qj8ql48fnncghm0p6wnbjggmkvs9gdf6lgffhdqinlrnrja9ry"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -2904,24 +2904,24 @@ let nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-01-10"; + version = "2021-01-15"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "361e20ecfa21c6bbc31436cf701ceb87e8e7bde7"; - sha256 = "01yd5i56k8c7kii3gnxh3654d5a8kdmad974yicxj0jzgvawncn4"; + rev = "787cef2a1d4ccdd1058cd1486dfea509fab1d291"; + sha256 = "1n1cvrfz2vfx5rjslx4brv3rfqjmxymy9yxyvzhi5p3vwn0phr6f"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-01-12"; + version = "2021-01-15"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "39968ca258c89b796fc9ce5f3643ca8781150dd8"; - sha256 = "0lcm37xrysypflyrblmbgn6sv8106mrjv9qg1rf4mn1sbdc7z4bp"; + rev = "1c3fb201c65b42a3752b299d31b1fcf40e3c38e4"; + sha256 = "1q3i1jfmrc7spayyhz85w9gfv69shlz59cbf9zrp1fvnlhys4ds9"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -2964,12 +2964,12 @@ let nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-01-05"; + version = "2021-01-16"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "68eee9b031432de6a1964315235d3cf265243a77"; - sha256 = "0zjhyd02sj17i0yrmffzzja2s0y9fa37v1nvqa17kap9vmcgyh7h"; + rev = "6fc6c5691bfc5f1d742c3674400ff7074bf4d6f4"; + sha256 = "02g977djjmpjag72h38i98kiwqw5qbcqa1kp8g0iayyy8agvkr81"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -3036,12 +3036,12 @@ let onehalf = buildVimPluginFrom2Nix { pname = "onehalf"; - version = "2020-10-14"; + version = "2021-01-15"; src = fetchFromGitHub { owner = "sonph"; repo = "onehalf"; - rev = "89923117bc49dd1e0c6b7fdd34bc6dc4d425fe1f"; - sha256 = "0d3d9sp88b41j8yhkn99b0g1y3jbcm3hhf8dw6kq50scrb84g5y3"; + rev = "ba6c71ee99dce0b505c430f2c2706dc5f97ad3a0"; + sha256 = "10pbhaim4rcg0ljprfvqfw6k73jpp46yzhs8i9yn00bpi70frr89"; }; meta.homepage = "https://github.com/sonph/onehalf/"; }; @@ -3806,12 +3806,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2021-01-12"; + version = "2021-01-15"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "c7e7d5e565eca1c8a39a567a7a26cdc2512c1c7e"; - sha256 = "0sqsh8vca1yvj253as4ky0l925czf8584k7zcbcimkjb35cp4d64"; + rev = "59eef1364d8ebb16ceb8dba4274f3926f3c3b7f0"; + sha256 = "004ss6v677qlizmav2cbmcswc39880c0hazcdrkrzxfdfzrb8byp"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -3854,12 +3854,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-01-12"; + version = "2021-01-17"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "57012550977679925176819345adc4d0dce85a00"; - sha256 = "002c120ppz8g6xiqckq61nbr7zcfdh5n75hhzbcn0xqlagmi9p6y"; + rev = "c2039ca78d261392b0ab7bef85b3c5f1c8f507b9"; + sha256 = "0ca93m1nl14js4wgbqhgc786mr9is0zkiwkzp4fv5ny03nhd025w"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -3951,12 +3951,12 @@ let traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2020-10-13"; + version = "2021-01-14"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "1fb8738cf1e4db06423396dd3576592a94255935"; - sha256 = "0jl7m04rly8y1kslmcmi9f83a87qb3fbk6isqqqd5xgrxxmcj753"; + rev = "2b54b52badf9e052cbb78f5c21d9dc994110ff52"; + sha256 = "0p5xkyyrdr3gph4q4p0n517g6rv1vzqfjqzzmrjclf4zpqqiarc5"; }; meta.homepage = "https://github.com/markonm/traces.vim/"; }; @@ -4083,12 +4083,12 @@ let verilog_systemverilog-vim = buildVimPluginFrom2Nix { pname = "verilog_systemverilog-vim"; - version = "2020-06-12"; + version = "2021-01-16"; src = fetchFromGitHub { owner = "vhda"; repo = "verilog_systemverilog.vim"; - rev = "c37bcf010fcb73599d690d8da6ac966dac02a07e"; - sha256 = "1f4kicgr7wv0dprvr91wi4lmk0d9bb9f4wcng4rfkq1cdwfkqdw4"; + rev = "0b88f2ccf81983944bf00d15ec810dd807053d19"; + sha256 = "0zaxz1j2v8nvhd9x6bx3sj95i7h7c7029hmccls777ikyp6ynf0r"; }; meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/"; }; @@ -4347,12 +4347,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2021-01-10"; + version = "2021-01-14"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "0ca9576331ba845e7bf29f5e092f5da04f4f3580"; - sha256 = "11ai8j7l1v6pviijvrayaw4wcs5720a0qpk35x99ir3dq7pflm54"; + rev = "c7a633ce8f4547e680377efe8ea70493fcce1349"; + sha256 = "10n70bk6nsc5sgd95d80jna4v77dlla6x0886kb5lwzmiflfq31x"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -4587,12 +4587,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-01-12"; + version = "2021-01-17"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "07cac9de58ad1f1ce287e47ac41e7eb7bb4db6a3"; - sha256 = "186d3mncgw6g4hrl6qv6wxnpy5mk5xkjpr0b03ql6z52iybcmxff"; + rev = "a9d1ccd9a3e9807d600abccab706634594ed0d2e"; + sha256 = "0smmgbsrqm757hgijq76y4yra0b68qhnxnyswfs37vrarcrqkfq3"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -5175,12 +5175,12 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2021-01-12"; + version = "2021-01-15"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "37c999def265ebf5463a925decc6604481f3c598"; - sha256 = "1ix3q36hhb5k7y1c4r5qzmr8gyxk6amb3zk88bs85j36kn56mz4j"; + rev = "355f1788b4a0878be6f99f4d41bf09d79fa4e80a"; + sha256 = "0j89h2vyggpgx2vhfd0a3x6nk5yaf898g9ipw5ags66sp13c4fqc"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -5596,12 +5596,12 @@ let vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2021-01-11"; + version = "2021-01-17"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "19bfdcaafcc15b2d891c6c523c4ce80dfbba965a"; - sha256 = "0c586j1icllyl0y54dayn4204w0rvfvv9srz51rk6k1n7rghr72n"; + rev = "85103ff4ab0c5c8017af106ba1af9949aa28793e"; + sha256 = "1aixb0rbjdmask0miry1b9xi0f8bcg8z6w58bphxa7f9ndfgbppw"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -5969,24 +5969,24 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2021-01-05"; + version = "2021-01-16"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "9f914a4859d911d8a152ff828ad093198fee8763"; - sha256 = "0xvzwnfmgix6cz3xzzl9v9aslassnp6jkjpv5q2qngfrf33z8j9j"; + rev = "104813da45c5bb620b9c6ce48cb918872f968dab"; + sha256 = "1x06zb9xa9v9ycg3vq1il45ylm7p2d3vflv347hpssmwcjzd6xyv"; }; meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-01-13"; + version = "2021-01-16"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "3bca7e8c8a794fde38075e7df9d14c286d055a84"; - sha256 = "1x9rb34a9542rn2dx2kaz4iq83swpq56144h81pr8l080r6vi2l6"; + rev = "90d61f11149ffb380eabcb66f66a160f4fc31a5d"; + sha256 = "1gr9y12fjw89ym6kdzjki12j21bhwy4ch4gpsy4gzb04xhjqllgf"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -6390,12 +6390,12 @@ let vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2021-01-11"; + version = "2021-01-17"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "ffac2ecab211469a1f9a4d17d42bc543214112f5"; - sha256 = "08vkalypqcrj4p2znx2gih7b1i87pk2ygybvl8a7hby13gwrm8v1"; + rev = "a70de0f7830ff7238d122908583faf50d73a9f26"; + sha256 = "0q00wqv4kbnwmnkawp4hm7mvk8p82mr4v5kf0m791gm7yy8gvb7x"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -6582,12 +6582,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2021-01-03"; + version = "2021-01-14"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "7bde552a463999897320a1899a6ca4f8806041ea"; - sha256 = "1rc9dfpl7x2fmqcm954x1syfcl392vsrcgid2pm6p91j3drm78nq"; + rev = "4c10562d2cc9b084518284c49a158558da5180a7"; + sha256 = "0avrjy1mxzkpsrbblzqx81ml08gm7n4bd4ihxm4qbvcdbg8n5chx"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -6690,12 +6690,12 @@ let vim-puppet = buildVimPluginFrom2Nix { pname = "vim-puppet"; - version = "2021-01-13"; + version = "2021-01-15"; src = fetchFromGitHub { owner = "rodjek"; repo = "vim-puppet"; - rev = "cee73ec40ee21083c3fc1e1fede2c288fa46c2c3"; - sha256 = "0mbsslhwjnjg8l39pbqj4zlirqvysj21xq01fb6dnld7rl7qrxyg"; + rev = "a3af44488b00481f2a79dc7e4bb49e2767a4e6a4"; + sha256 = "07bspasgd38kj91x3c6nf7wwhbg1sqw8kwvn7c4z11q32ry4hmgk"; }; meta.homepage = "https://github.com/rodjek/vim-puppet/"; }; @@ -6834,12 +6834,12 @@ let vim-rsi = buildVimPluginFrom2Nix { pname = "vim-rsi"; - version = "2019-11-15"; + version = "2021-01-16"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rsi"; - rev = "ad8ba6beae8e82339479104b914214a868c9f1fe"; - sha256 = "1ycjwnbs6rks78yxh0k0ywpvic0663mv7kydy3kjpa4f5bnkgbvc"; + rev = "e181883a0932d9315cceb96b5fffb5e2ec67068e"; + sha256 = "1pfg3y1hf840pr7f6vcwldbraj2w4c2pnf7ampbgyric0q3f4708"; }; meta.homepage = "https://github.com/tpope/vim-rsi/"; }; @@ -7086,12 +7086,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2021-01-11"; + version = "2021-01-17"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "29d37483c4a8dad8baf0684f73541f6364dd3734"; - sha256 = "0dav4125sjrbj5mg0d76ivsadz9mh8skzaixzifxs2cq2zl3n0s1"; + rev = "673390c68328d8d067439127f15923a8ebc9efd8"; + sha256 = "1mvsm0q6nzsp31ndh5yrr3bbgysn4fmcfzlg0rjbh18y159fcfqv"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -7230,12 +7230,12 @@ let vim-SyntaxRange = buildVimPluginFrom2Nix { pname = "vim-SyntaxRange"; - version = "2020-08-18"; + version = "2021-01-16"; src = fetchFromGitHub { owner = "inkarkat"; repo = "vim-SyntaxRange"; - rev = "602316468bc044e047db88f50157b61fa00b65cb"; - sha256 = "0zrrvd9xrivx61fiz799mdbwdzl7damdgm6i9h0sl1v95hclhi3i"; + rev = "3a7fd9ff50fabafe61df12522ed2f275c8e2f45e"; + sha256 = "1b5xyacbn87z8wkacjpnjk82xmxzivlb111427kwb5kxxdh4w7gq"; }; meta.homepage = "https://github.com/inkarkat/vim-SyntaxRange/"; }; @@ -7591,12 +7591,12 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2021-01-07"; + version = "2021-01-15"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "5917d944b259baab85c9c249a8be33a82cd033d3"; - sha256 = "0gj5qjrb31j93vv8wpqlhdpsgrnkwaxvhvslkjj9m3fnx34gqvdv"; + rev = "7d96014c899e92476a4d74dca010713d17507a2d"; + sha256 = "1fb7xcpjysix846vrz02mcx8bm2swzckxa54i0sf462ynckcvg4f"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -7699,12 +7699,12 @@ let vim-yaml = buildVimPluginFrom2Nix { pname = "vim-yaml"; - version = "2020-01-30"; + version = "2021-01-14"; src = fetchFromGitHub { owner = "stephpy"; repo = "vim-yaml"; - rev = "8fc9136a9c3f64b3e65bb6170391f9daf2c23056"; - sha256 = "08bg7mxvgrl070m0kk4rmain7h3rv712jj6lk9l808cfjzaw9343"; + rev = "dce19542d5ec1663183b0f6844ec663b5d1f3d24"; + sha256 = "18xpdl86zsnmrc1w8wccx9acwjvgij2wpsg7f6dpnxx70c07g3ig"; }; meta.homepage = "https://github.com/stephpy/vim-yaml/"; }; @@ -7868,12 +7868,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-01-13"; + version = "2021-01-16"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "aebcaddf2ede37e04812a2804b0d951dacdfa150"; - sha256 = "0cf94yv9zmksnvsv4d8xyqk48d4v3k7zs1cb01g7l4m34cx0gv99"; + rev = "7c7d6020f848864e091ac437e55f72139f9a59b4"; + sha256 = "10fl44xpjfsrfqr3sz2mbxhigmkz5ivky96smxp4yp9av0zvvcm4"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -7916,12 +7916,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2021-01-01"; + version = "2021-01-17"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "691fbce5fa1473c64035fba6e3c7b3876a99cb58"; - sha256 = "0xx06s8syqs3a5b5711zgbjbzqz17pk66vzcazhq08bqgys21alr"; + rev = "a648aab8b35401bea2b9192efe171b3787264abd"; + sha256 = "15ib66lsx2wpbykv5pmr4ly2gkksml2dp6nmb2iv7zy70655whsf"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; From 82069d18ad333803c8d4fbbab88b838ae55c964b Mon Sep 17 00:00:00 2001 From: "\"Andrey Kuznetsov\"" <"fear@loathing.in"> Date: Sun, 17 Jan 2021 15:45:56 +0000 Subject: [PATCH 24/52] vimPlugins.indent-blankline-nvim: init at 2020-12-18 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 92ae1fa6205..bcc2afd49f1 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1797,6 +1797,18 @@ let meta.homepage = "https://github.com/haya14busa/incsearch.vim/"; }; + indent-blankline-nvim = buildVimPluginFrom2Nix { + pname = "indent-blankline-nvim"; + version = "2020-12-18"; + src = fetchFromGitHub { + owner = "lukas-reineke"; + repo = "indent-blankline.nvim"; + rev = "3e4eb10fd57dec3ca11ecb4afa6b3a76558c4182"; + sha256 = "1qgnrdflw8c7afh060xk5fl5yw7jbap5fp8a4mbhdhgrfr7gv6ll"; + }; + meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; + }; + indentLine = buildVimPluginFrom2Nix { pname = "indentLine"; version = "2020-11-27"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index c61fd8ef3a1..c9393ca2984 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -286,6 +286,7 @@ LucHermitte/lh-brackets LucHermitte/lh-vim-lib ludovicchabant/vim-gutentags ludovicchabant/vim-lawrencium +lukas-reineke/indent-blankline.nvim lukaszkorecki/workflowish lumiliet/vim-twig luochen1990/rainbow From 07ffb7b90231774482c91f24c0032b5a2bebafd6 Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Sun, 17 Jan 2021 16:12:36 +0000 Subject: [PATCH 25/52] vimPlugins.vim-clap: updated cargoSha256 --- pkgs/misc/vim-plugins/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index c47ae5aa658..9640869ad1d 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -654,7 +654,7 @@ self: super: { libiconv ]; - cargoSha256 = "1738hvqzwr4h1bigsqffc6alkzvir8s6f7mr0xyp21qbf5qkxmq2"; + cargoSha256 = "6tgSdIC9ThKvyiX1Unihwozhez6+HsQiqebugzNrKVc="; }; in '' ln -s ${maple-bin}/bin/maple $target/bin/maple From 16d91ee628d781c721506b19e3e03bed810327e8 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 15 Jan 2021 21:45:37 +0700 Subject: [PATCH 26/52] pkgs/os-specific: stdenv.lib -> lib --- .../darwin/DarwinTools/default.nix | 6 +-- pkgs/os-specific/darwin/apple-sdk/default.nix | 24 ++++++------ .../apple-sdk/print-reexports/default.nix | 4 +- .../apple-source-releases/IOKit/default.nix | 2 +- .../apple-source-releases/adv_cmds/boot.nix | 6 +-- .../adv_cmds/default.nix | 6 +-- .../basic_cmds/default.nix | 6 +-- .../bootstrap_cmds/default.nix | 4 +- .../apple-source-releases/bsdmake/default.nix | 4 +- .../darwin/apple-source-releases/default.nix | 8 ++-- .../developer_cmds/default.nix | 6 +-- .../diskdev_cmds/default.nix | 6 +-- .../file_cmds/default.nix | 6 +-- .../libpthread/default.nix | 4 +- .../network_cmds/default.nix | 6 +-- .../shell_cmds/default.nix | 6 +-- .../system_cmds/default.nix | 4 +- .../text_cmds/default.nix | 6 +-- pkgs/os-specific/darwin/binutils/default.nix | 6 +-- pkgs/os-specific/darwin/cctools/port.nix | 18 ++++----- .../darwin/insert_dylib/default.nix | 4 +- pkgs/os-specific/darwin/lsusb/default.nix | 8 ++-- pkgs/os-specific/darwin/maloader/default.nix | 6 +-- .../os-specific/darwin/opencflite/default.nix | 4 +- pkgs/os-specific/darwin/stubs/default.nix | 4 +- .../darwin/swift-corelibs/corefoundation.nix | 4 +- pkgs/os-specific/darwin/trash/default.nix | 6 +-- .../darwin/usr-include/default.nix | 4 +- .../darwin/wifi-password/default.nix | 8 ++-- pkgs/os-specific/darwin/xcode/sdk-pkgs.nix | 8 ++-- pkgs/os-specific/linux/acpi/default.nix | 2 +- pkgs/os-specific/linux/acpitool/default.nix | 8 ++-- pkgs/os-specific/linux/afuse/default.nix | 8 ++-- .../linux/alsa-firmware/default.nix | 6 +-- pkgs/os-specific/linux/alsa-utils/default.nix | 2 +- pkgs/os-specific/linux/amdgpu-pro/default.nix | 2 +- pkgs/os-specific/linux/anbox/default.nix | 2 +- pkgs/os-specific/linux/apparmor/default.nix | 20 +++++----- .../os-specific/linux/ati-drivers/default.nix | 2 +- pkgs/os-specific/linux/audit/default.nix | 14 +++---- pkgs/os-specific/linux/autofs/default.nix | 6 +-- pkgs/os-specific/linux/batman-adv/alfred.nix | 8 ++-- pkgs/os-specific/linux/batman-adv/batctl.nix | 8 ++-- pkgs/os-specific/linux/batman-adv/default.nix | 8 ++-- pkgs/os-specific/linux/bcc/default.nix | 2 +- pkgs/os-specific/linux/blktrace/default.nix | 6 +-- pkgs/os-specific/linux/bolt/default.nix | 2 +- pkgs/os-specific/linux/bpftrace/default.nix | 2 +- .../linux/bridge-utils/default.nix | 6 +-- .../linux/broadcom-sta/default.nix | 12 +++--- pkgs/os-specific/linux/busybox/default.nix | 2 +- .../os-specific/linux/checkpolicy/default.nix | 4 +- pkgs/os-specific/linux/checksec/default.nix | 2 +- pkgs/os-specific/linux/cifs-utils/default.nix | 2 +- pkgs/os-specific/linux/conky/default.nix | 2 +- pkgs/os-specific/linux/conspy/default.nix | 8 ++-- pkgs/os-specific/linux/cpuid/default.nix | 6 +-- pkgs/os-specific/linux/cpupower/default.nix | 2 +- pkgs/os-specific/linux/cryptodev/default.nix | 6 +-- pkgs/os-specific/linux/cryptsetup/default.nix | 8 ++-- .../os-specific/linux/device-tree/default.nix | 4 +- .../linux/device-tree/raspberrypi.nix | 4 +- pkgs/os-specific/linux/digimend/default.nix | 2 +- .../linux/disk-indicator/default.nix | 6 +-- pkgs/os-specific/linux/dmraid/default.nix | 12 +++--- pkgs/os-specific/linux/e1000e/default.nix | 6 +-- pkgs/os-specific/linux/earlyoom/default.nix | 4 +- pkgs/os-specific/linux/edac-utils/default.nix | 2 +- pkgs/os-specific/linux/eudev/default.nix | 8 ++-- pkgs/os-specific/linux/exfat/default.nix | 2 +- pkgs/os-specific/linux/facetimehd/default.nix | 4 +- pkgs/os-specific/linux/firejail/default.nix | 8 ++-- .../firmware/b43-firmware-cutter/default.nix | 6 +-- .../linux/firmware/b43-firmware/5.1.138.nix | 4 +- .../firmware-linux-nonfree/default.nix | 2 +- .../linux/firmware/fwupd/default.nix | 16 ++++---- .../linux/firmware/raspberrypi/armstubs.nix | 2 +- .../linux/firmware/raspberrypi/default.nix | 4 +- .../firmware/rtl8192su-firmware/default.nix | 2 +- .../firmware/rtl8723bs-firmware/default.nix | 2 +- .../linux/firmware/sof-firmware/default.nix | 2 +- .../linux/firmware/zd1211/default.nix | 4 +- pkgs/os-specific/linux/forktty/default.nix | 8 ++-- pkgs/os-specific/linux/fswebcam/default.nix | 6 +-- pkgs/os-specific/linux/fuse/common.nix | 8 ++-- pkgs/os-specific/linux/gfxtablet/default.nix | 8 ++-- pkgs/os-specific/linux/guvcview/default.nix | 14 +++---- pkgs/os-specific/linux/hdapsd/default.nix | 4 +- pkgs/os-specific/linux/hibernate/default.nix | 10 ++--- pkgs/os-specific/linux/hostapd/default.nix | 2 +- pkgs/os-specific/linux/hwdata/default.nix | 6 +-- pkgs/os-specific/linux/i810switch/default.nix | 6 +-- pkgs/os-specific/linux/ifenslave/default.nix | 6 +-- .../linux/ima-evm-utils/default.nix | 8 ++-- .../linux/intel-compute-runtime/default.nix | 2 +- pkgs/os-specific/linux/intel-ocl/default.nix | 8 ++-- pkgs/os-specific/linux/iptables/default.nix | 4 +- pkgs/os-specific/linux/iputils/default.nix | 4 +- pkgs/os-specific/linux/irqbalance/default.nix | 6 +-- pkgs/os-specific/linux/iw/default.nix | 8 ++-- pkgs/os-specific/linux/iwd/default.nix | 6 +-- pkgs/os-specific/linux/jfbview/default.nix | 2 +- pkgs/os-specific/linux/jujuutils/default.nix | 6 +-- pkgs/os-specific/linux/kbd/default.nix | 2 +- .../linux/kernel/common-config.nix | 8 ++-- pkgs/os-specific/linux/kernel/generic.nix | 10 ++--- .../linux/kernel/hardened/config.nix | 8 ++-- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 +- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 +- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 +- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 +- pkgs/os-specific/linux/kernel/linux-5.9.nix | 4 +- pkgs/os-specific/linux/kernel/linux-lqx.nix | 4 +- .../linux/kernel/linux-mptcp-95.nix | 8 ++-- .../linux/kernel/linux-testing-bcachefs.nix | 4 +- .../linux/kernel/linux-testing.nix | 4 +- pkgs/os-specific/linux/kernel/linux-zen.nix | 4 +- .../linux/kernel/manual-config.nix | 39 ++++++++++--------- .../os-specific/linux/kernel/mptcp-config.nix | 4 +- pkgs/os-specific/linux/kernel/perf.nix | 6 +-- pkgs/os-specific/linux/keyutils/default.nix | 2 +- pkgs/os-specific/linux/klibc/default.nix | 4 +- pkgs/os-specific/linux/latencytop/default.nix | 8 ++-- pkgs/os-specific/linux/ldm/default.nix | 6 +-- pkgs/os-specific/linux/libaio/default.nix | 10 ++--- pkgs/os-specific/linux/libcap-ng/default.nix | 4 +- pkgs/os-specific/linux/libcap/default.nix | 6 +-- pkgs/os-specific/linux/libcgroup/default.nix | 8 ++-- pkgs/os-specific/linux/libselinux/default.nix | 6 +-- .../os-specific/linux/libsemanage/default.nix | 6 +-- pkgs/os-specific/linux/libsepol/default.nix | 2 +- pkgs/os-specific/linux/light/default.nix | 8 ++-- pkgs/os-specific/linux/lightum/default.nix | 8 ++-- pkgs/os-specific/linux/lm-sensors/default.nix | 6 +-- pkgs/os-specific/linux/lockdep/default.nix | 8 ++-- pkgs/os-specific/linux/lsiutil/default.nix | 10 ++--- pkgs/os-specific/linux/lvm2/default.nix | 22 +++++------ pkgs/os-specific/linux/lxc/default.nix | 4 +- pkgs/os-specific/linux/lxcfs/default.nix | 6 +-- pkgs/os-specific/linux/mdadm/default.nix | 2 +- .../linux/multipath-tools/default.nix | 2 +- .../linux/mwprocapture/default.nix | 4 +- .../os-specific/linux/ndiswrapper/default.nix | 4 +- pkgs/os-specific/linux/net-tools/default.nix | 6 +-- pkgs/os-specific/linux/netatop/default.nix | 8 ++-- pkgs/os-specific/linux/nftables/default.nix | 4 +- pkgs/os-specific/linux/nvidia-x11/default.nix | 2 +- pkgs/os-specific/linux/nvidia-x11/generic.nix | 2 +- pkgs/os-specific/linux/open-isns/default.nix | 6 +-- .../linux/opengl/xorg-sys/default.nix | 4 +- .../os-specific/linux/openvswitch/default.nix | 2 +- pkgs/os-specific/linux/openvswitch/lts.nix | 2 +- pkgs/os-specific/linux/otpw/default.nix | 6 +-- pkgs/os-specific/linux/pam/default.nix | 4 +- .../linux/pam_ssh_agent_auth/default.nix | 6 +-- pkgs/os-specific/linux/pam_usb/default.nix | 6 +-- .../os-specific/linux/pcmciautils/default.nix | 4 +- pkgs/os-specific/linux/phc-intel/default.nix | 4 +- pkgs/os-specific/linux/pktgen/default.nix | 4 +- pkgs/os-specific/linux/ply/default.nix | 2 +- pkgs/os-specific/linux/pm-utils/default.nix | 10 ++--- pkgs/os-specific/linux/pmount/default.nix | 8 ++-- .../linux/pommed-light/default.nix | 4 +- pkgs/os-specific/linux/powertop/default.nix | 2 +- pkgs/os-specific/linux/pps-tools/default.nix | 4 +- pkgs/os-specific/linux/prl-tools/default.nix | 2 +- pkgs/os-specific/linux/psmisc/default.nix | 2 +- .../linux/roccat-tools/default.nix | 6 +-- pkgs/os-specific/linux/rtl8192eu/default.nix | 4 +- pkgs/os-specific/linux/rtl8723bs/default.nix | 8 ++-- pkgs/os-specific/linux/rtl8812au/default.nix | 2 +- .../os-specific/linux/rtlwifi_new/default.nix | 2 +- .../linux/s6-linux-utils/default.nix | 4 +- pkgs/os-specific/linux/sch_cake/default.nix | 4 +- .../linux/selinux-python/default.nix | 6 +-- .../linux/selinux-sandbox/default.nix | 5 +-- .../linux/semodule-utils/default.nix | 2 +- pkgs/os-specific/linux/setools/default.nix | 6 +-- pkgs/os-specific/linux/seturgent/default.nix | 8 ++-- pkgs/os-specific/linux/shadow/default.nix | 6 +-- pkgs/os-specific/linux/sinit/default.nix | 16 ++++---- pkgs/os-specific/linux/sssd/default.nix | 2 +- pkgs/os-specific/linux/sysdig/default.nix | 4 +- pkgs/os-specific/linux/sysfsutils/default.nix | 6 +-- pkgs/os-specific/linux/syslinux/default.nix | 2 +- pkgs/os-specific/linux/sysstat/default.nix | 8 ++-- pkgs/os-specific/linux/systemd/default.nix | 2 +- pkgs/os-specific/linux/sysvinit/default.nix | 8 ++-- .../os-specific/linux/target-isns/default.nix | 4 +- pkgs/os-specific/linux/tbs/default.nix | 2 +- .../linux/tcp-wrappers/default.nix | 6 +-- .../os-specific/linux/thunderbolt/default.nix | 8 ++-- pkgs/os-specific/linux/tp_smapi/default.nix | 2 +- pkgs/os-specific/linux/tpacpi-bat/default.nix | 8 ++-- pkgs/os-specific/linux/tunctl/default.nix | 6 +-- pkgs/os-specific/linux/uclibc/default.nix | 4 +- .../os-specific/linux/udisks-glue/default.nix | 8 ++-- pkgs/os-specific/linux/udisks/2-default.nix | 8 ++-- pkgs/os-specific/linux/upower/default.nix | 2 +- pkgs/os-specific/linux/usermount/default.nix | 6 +-- pkgs/os-specific/linux/wireguard/default.nix | 4 +- .../linux/wireless-tools/default.nix | 6 +-- .../linux/wpa_supplicant/default.nix | 6 +-- pkgs/os-specific/linux/x86info/default.nix | 8 ++-- pkgs/os-specific/linux/zfs/default.nix | 6 +-- .../windows/cygwin-setup/default.nix | 2 +- pkgs/os-specific/windows/default.nix | 4 +- pkgs/os-specific/windows/jom/default.nix | 4 +- pkgs/os-specific/windows/libgnurx/default.nix | 2 +- .../os-specific/windows/mingw-w64/default.nix | 2 +- .../os-specific/windows/wxMSW-2.8/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +- 212 files changed, 597 insertions(+), 599 deletions(-) diff --git a/pkgs/os-specific/darwin/DarwinTools/default.nix b/pkgs/os-specific/darwin/DarwinTools/default.nix index 174f9478633..5badf2434d6 100644 --- a/pkgs/os-specific/darwin/DarwinTools/default.nix +++ b/pkgs/os-specific/darwin/DarwinTools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "DarwinTools-1"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = { - maintainers = [ stdenv.lib.maintainers.matthewbauer ]; - platforms = stdenv.lib.platforms.darwin; + maintainers = [ lib.maintainers.matthewbauer ]; + platforms = lib.platforms.darwin; }; } diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index a768accdbcb..0ba7a1d209e 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -176,7 +176,7 @@ let setupHook = ./framework-setup-hook.sh; # Not going to be more specific than this for now - __propagatedImpureHostDeps = stdenv.lib.optionals (name != "Kernel") [ + __propagatedImpureHostDeps = lib.optionals (name != "Kernel") [ # The setup-hook ensures that everyone uses the impure CoreFoundation who uses these SDK frameworks, so let's expose it "/System/Library/Frameworks/CoreFoundation.framework" "/System/Library/Frameworks/${name}.framework" @@ -249,42 +249,42 @@ in rec { }; overrides = super: { - AppKit = stdenv.lib.overrideDerivation super.AppKit (drv: { + AppKit = lib.overrideDerivation super.AppKit (drv: { __propagatedImpureHostDeps = drv.__propagatedImpureHostDeps ++ [ "/System/Library/PrivateFrameworks/" ]; }); - Carbon = stdenv.lib.overrideDerivation super.Carbon (drv: { + Carbon = lib.overrideDerivation super.Carbon (drv: { extraTBDFiles = [ "Versions/A/Frameworks/HTMLRendering.framework/Versions/A/HTMLRendering.tbd" ]; }); - CoreFoundation = stdenv.lib.overrideDerivation super.CoreFoundation (drv: { + CoreFoundation = lib.overrideDerivation super.CoreFoundation (drv: { setupHook = ./cf-setup-hook.sh; }); - CoreMedia = stdenv.lib.overrideDerivation super.CoreMedia (drv: { + CoreMedia = lib.overrideDerivation super.CoreMedia (drv: { __propagatedImpureHostDeps = drv.__propagatedImpureHostDeps ++ [ "/System/Library/Frameworks/CoreImage.framework" ]; }); - CoreMIDI = stdenv.lib.overrideDerivation super.CoreMIDI (drv: { + CoreMIDI = lib.overrideDerivation super.CoreMIDI (drv: { __propagatedImpureHostDeps = drv.__propagatedImpureHostDeps ++ [ "/System/Library/PrivateFrameworks/" ]; setupHook = ./private-frameworks-setup-hook.sh; }); - IMServicePlugIn = stdenv.lib.overrideDerivation super.IMServicePlugIn (drv: { + IMServicePlugIn = lib.overrideDerivation super.IMServicePlugIn (drv: { extraTBDFiles = [ "Versions/A/Frameworks/IMServicePlugInSupport.framework/Versions/A/IMServicePlugInSupport.tbd" ]; }); - Security = stdenv.lib.overrideDerivation super.Security (drv: { + Security = lib.overrideDerivation super.Security (drv: { setupHook = ./security-setup-hook.sh; }); - QuartzCore = stdenv.lib.overrideDerivation super.QuartzCore (drv: { + QuartzCore = lib.overrideDerivation super.QuartzCore (drv: { installPhase = drv.installPhase + '' f="$out/Library/Frameworks/QuartzCore.framework/Headers/CoreImage.h" substituteInPlace "$f" \ @@ -292,14 +292,14 @@ in rec { ''; }); - MetalKit = stdenv.lib.overrideDerivation super.MetalKit (drv: { + MetalKit = lib.overrideDerivation super.MetalKit (drv: { installPhase = drv.installPhase + '' mkdir -p $out/include/simd cp ${lib.getDev sdk}/include/simd/*.h $out/include/simd/ ''; }); - WebKit = stdenv.lib.overrideDerivation super.WebKit (drv: { + WebKit = lib.overrideDerivation super.WebKit (drv: { extraTBDFiles = [ "Versions/A/Frameworks/WebCore.framework/Versions/A/WebCore.tbd" "Versions/A/Frameworks/WebKitLegacy.framework/Versions/A/WebKitLegacy.tbd" @@ -307,7 +307,7 @@ in rec { }); } // lib.genAttrs [ "ContactsPersistence" "UIFoundation" "GameCenter" ] (x: tbdOnlyFramework x {}); - bareFrameworks = stdenv.lib.mapAttrs framework (import ./frameworks.nix { + bareFrameworks = lib.mapAttrs framework (import ./frameworks.nix { inherit frameworks libs; inherit (pkgs.darwin) libobjc; }); diff --git a/pkgs/os-specific/darwin/apple-sdk/print-reexports/default.nix b/pkgs/os-specific/darwin/apple-sdk/print-reexports/default.nix index 85e11096f06..a548d8da753 100644 --- a/pkgs/os-specific/darwin/apple-sdk/print-reexports/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/print-reexports/default.nix @@ -1,8 +1,8 @@ -{ stdenv, libyaml }: +{ lib, stdenv, libyaml }: stdenv.mkDerivation { name = "print-reexports"; - src = stdenv.lib.sourceFilesBySuffices ./. [".c"]; + src = lib.sourceFilesBySuffices ./. [".c"]; buildInputs = [ libyaml ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix b/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix index 976b977e602..cb54212f217 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix @@ -2,7 +2,7 @@ # Someday it'll make sense to split these out into their own packages, but today is not that day. appleDerivation { - srcs = stdenv.lib.attrValues IOKitSrcs; + srcs = lib.attrValues IOKitSrcs; sourceRoot = "."; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix index 2a2d4cbe493..4f719ef8463 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, fetchzip, bsdmake, perl, flex, yacc +{ lib, stdenv, appleDerivation, fetchzip, bsdmake, perl, flex, yacc }: # this derivation sucks @@ -85,7 +85,7 @@ in appleDerivation { setOutputFlags = false; meta = { - platforms = stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ gridaphobe ]; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ gridaphobe ]; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix index 6113eed007e..614bdf570f3 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, xcbuild, ncurses, libutil }: +{ lib, stdenv, appleDerivation, xcbuild, ncurses, libutil }: appleDerivation { # We can't just run the root build, because https://github.com/facebook/xcbuild/issues/264 @@ -45,7 +45,7 @@ appleDerivation { buildInputs = [ ncurses libutil ]; meta = { - platforms = stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix index eadf18e028e..8cff145661f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, xcbuildHook }: +{ lib, stdenv, appleDerivation, xcbuildHook }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; @@ -26,7 +26,7 @@ appleDerivation { ''; meta = { - platforms = stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix index 256781f61b1..5819101e10a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, yacc, flex }: +{ lib, stdenv, appleDerivation, yacc, flex }: appleDerivation { nativeBuildInputs = [ yacc flex ]; @@ -44,6 +44,6 @@ appleDerivation { ''; meta = { - platforms = stdenv.lib.platforms.darwin; + platforms = lib.platforms.darwin; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix b/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix index 043c7b0bc70..5a5a603eae8 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, makeWrapper }: +{ lib, stdenv, appleDerivation, makeWrapper }: appleDerivation { nativeBuildInputs = [ makeWrapper ]; @@ -44,6 +44,6 @@ appleDerivation { ''; meta = { - platforms = stdenv.lib.platforms.darwin; + platforms = lib.platforms.darwin; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 14c69b84eb4..12176fd526c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchzip, pkgs }: +{ lib, stdenv, fetchurl, fetchzip, pkgs }: let # This attrset can in theory be computed automatically, but for that to work nicely we need @@ -152,7 +152,7 @@ let name = "${name}-${version}"; enableParallelBuilding = true; meta = { - platforms = stdenv.lib.platforms.darwin; + platforms = lib.platforms.darwin; }; } // (if attrs ? srcs then {} else { src = fetchApple version sha256 name; @@ -160,7 +160,7 @@ let applePackage = namePath: version: sha256: let - name = builtins.elemAt (stdenv.lib.splitString "/" namePath) 0; + name = builtins.elemAt (lib.splitString "/" namePath) 0; appleDerivation = appleDerivation_ name version sha256; callPackage = pkgs.newScope (packages // pkgs.darwin // { inherit appleDerivation name version; }); in callPackage (./. + "/${namePath}"); @@ -187,7 +187,7 @@ let # There should be an IOVideo here, but they haven't released it :( }; - IOKitSrcs = stdenv.lib.mapAttrs (name: value: if stdenv.lib.isFunction value then value name else value) IOKitSpecs; + IOKitSrcs = lib.mapAttrs (name: value: if lib.isFunction value then value name else value) IOKitSpecs; # Only used for bootstrapping. It’s convenient because it was the last version to come with a real makefile. adv_cmds-boot = applePackage "adv_cmds/boot.nix" "osx-10.5.8" "102ssayxbg9wb35mdmhswbnw0bg7js3pfd8fcbic83c5q3bqa6c6" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix index cfd13b1b049..db57537bacb 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, xcbuildHook, llvmPackages }: +{ lib, stdenv, appleDerivation, xcbuildHook, llvmPackages }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; @@ -30,7 +30,7 @@ appleDerivation { ''; meta = { - platforms = stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix index 6d3bd103811..e46e826053f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, xcbuildHook +{ lib, stdenv, appleDerivation, xcbuildHook , Libc, xnu, libutil }: appleDerivation { @@ -32,7 +32,7 @@ appleDerivation { ''; meta = { - platforms = stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix index 5de84d2a6e5..407117f1dbd 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, xcbuildHook, zlib, bzip2, lzma, ncurses, libutil }: +{ lib, stdenv, appleDerivation, xcbuildHook, zlib, bzip2, lzma, ncurses, libutil }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; @@ -32,7 +32,7 @@ appleDerivation { ''; meta = { - platforms = stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix index 650c6415def..ceb4b18df17 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, libdispatch, xnu }: +{ lib, stdenv, appleDerivation, libdispatch, xnu }: appleDerivation { propagatedBuildInputs = [ libdispatch xnu ]; @@ -16,6 +16,6 @@ appleDerivation { ''; meta = { - platforms = stdenv.lib.platforms.darwin; + platforms = lib.platforms.darwin; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix index 82be7dc860e..f216a820dd4 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, xcbuildHook +{ lib, stdenv, appleDerivation, xcbuildHook , openssl_1_0_2, Librpcsvc, xnu, libpcap, developer_cmds }: appleDerivation { @@ -44,7 +44,7 @@ appleDerivation { ''; meta = { - platforms = stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix index b87dadd391d..771dd41b575 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, xcbuildHook }: +{ lib, stdenv, appleDerivation, xcbuildHook }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; @@ -44,7 +44,7 @@ appleDerivation { ''; meta = { - platforms = stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix index 16454cbc1a5..34d093b7cc0 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix @@ -98,7 +98,7 @@ appleDerivation { ''; meta = { - platforms = stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ shlevy matthewbauer ]; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ shlevy matthewbauer ]; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix index 14d7a5e3b32..d5dca4a3035 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, xcbuildHook, ncurses, bzip2, zlib, lzma }: +{ lib, stdenv, appleDerivation, xcbuildHook, ncurses, bzip2, zlib, lzma }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; @@ -21,7 +21,7 @@ appleDerivation { ''; meta = { - platforms = stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index fad33b21d04..e9aa706da2d 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, binutils-unwrapped, cctools, llvm }: +{ lib, stdenv, binutils-unwrapped, cctools, llvm }: # Make sure both underlying packages claim to have prepended their binaries # with the same targetPrefix. @@ -32,7 +32,7 @@ stdenv.mkDerivation { # - strip: the binutils one seems to break mach-o files # - lipo: gcc build assumes it exists # - nm: the gnu one doesn't understand many new load commands - for i in ${stdenv.lib.concatStringsSep " " (builtins.map (e: targetPrefix + e) cmds)}; do + for i in ${lib.concatStringsSep " " (builtins.map (e: targetPrefix + e) cmds)}; do ln -sf "${cctools}/bin/$i" "$out/bin/$i" done @@ -56,7 +56,7 @@ stdenv.mkDerivation { }; meta = { - maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + maintainers = with lib.maintainers; [ matthewbauer ]; priority = 10; }; } diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 64f1490a7a7..50e0a2eb3fb 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, autoreconfHook +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, autoreconfHook , installShellFiles , libcxxabi, libuuid , libobjc ? null, maloader ? null @@ -9,7 +9,7 @@ let # The targetPrefix prepended to binary names to allow multiple binuntils on the # PATH to both be usable. - targetPrefix = stdenv.lib.optionalString + targetPrefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "${stdenv.targetPlatform.config}-"; in @@ -32,8 +32,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoconf automake libtool autoreconfHook installShellFiles ]; buildInputs = [ libuuid ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ] - ++ stdenv.lib.optional enableTapiSupport libtapi; + ++ lib.optionals stdenv.isDarwin [ libcxxabi libobjc ] + ++ lib.optional enableTapiSupport libtapi; patches = [ ./ld-ignore-rpath-link.patch ./ld-rpath-nonfinal.patch ]; @@ -47,14 +47,14 @@ stdenv.mkDerivation { # TODO(@Ericson2314): Always pass "--target" and always targetPrefix. configurePlatforms = [ "build" "host" ] - ++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target"; + ++ lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target"; configureFlags = [ "--disable-clang-as" ] - ++ stdenv.lib.optionals enableTapiSupport [ + ++ lib.optionals enableTapiSupport [ "--enable-tapi-support" "--with-libtapi=${libtapi}" ]; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace cctools/Makefile.am --replace libobjc2 "" '' + '' sed -i -e 's/addStandardLibraryDirectories = true/addStandardLibraryDirectories = false/' cctools/ld64/src/ld/Options.cpp @@ -100,7 +100,7 @@ stdenv.mkDerivation { broken = !stdenv.targetPlatform.isDarwin; # Only supports darwin targets homepage = "http://www.opensource.apple.com/source/cctools/"; description = "MacOS Compiler Tools (cross-platform port)"; - license = stdenv.lib.licenses.apsl20; - maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + license = lib.licenses.apsl20; + maintainers = with lib.maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/os-specific/darwin/insert_dylib/default.nix b/pkgs/os-specific/darwin/insert_dylib/default.nix index 0ab6a415707..07e8886e3e6 100644 --- a/pkgs/os-specific/darwin/insert_dylib/default.nix +++ b/pkgs/os-specific/darwin/insert_dylib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xcbuildHook }: +{ lib, stdenv, fetchFromGitHub, xcbuildHook }: stdenv.mkDerivation { name = "insert_dylib-2016.08.28"; @@ -14,5 +14,5 @@ stdenv.mkDerivation mkdir -p $out/bin install -m755 Products/Release/insert_dylib $out/bin ''; - meta.platforms = stdenv.lib.platforms.darwin; + meta.platforms = lib.platforms.darwin; } diff --git a/pkgs/os-specific/darwin/lsusb/default.nix b/pkgs/os-specific/darwin/lsusb/default.nix index 799a4761fbd..712e32f16fe 100644 --- a/pkgs/os-specific/darwin/lsusb/default.nix +++ b/pkgs/os-specific/darwin/lsusb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { version = "1.0"; @@ -21,8 +21,8 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/jlhonora/lsusb"; description = "lsusb command for Mac OS X"; - platforms = stdenv.lib.platforms.darwin; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.varunpatro ]; + platforms = lib.platforms.darwin; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.varunpatro ]; }; } diff --git a/pkgs/os-specific/darwin/maloader/default.nix b/pkgs/os-specific/darwin/maloader/default.nix index 0de94c92388..3943092bcf0 100644 --- a/pkgs/os-specific/darwin/maloader/default.nix +++ b/pkgs/os-specific/darwin/maloader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, opencflite, clang, libcxx }: +{ lib, stdenv, fetchgit, opencflite, clang, libcxx }: stdenv.mkDerivation { name = "maloader-0git"; @@ -31,8 +31,8 @@ stdenv.mkDerivation { meta = { description = "Mach-O loader for Linux"; homepage = "https://github.com/shinh/maloader"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd2; + platforms = lib.platforms.linux; broken = true; # 2018-09-08, no succesful build since 2017-08-21 }; } diff --git a/pkgs/os-specific/darwin/opencflite/default.nix b/pkgs/os-specific/darwin/opencflite/default.nix index 26af46a171f..937d0763fef 100644 --- a/pkgs/os-specific/darwin/opencflite/default.nix +++ b/pkgs/os-specific/darwin/opencflite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, icu, libuuid, tzdata }: +{ lib, stdenv, fetchurl, icu, libuuid, tzdata }: stdenv.mkDerivation rec { pname = "opencflite"; @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { description = "Cross platform port of the macOS CoreFoundation"; homepage = "https://sourceforge.net/projects/opencflite/"; - license = stdenv.lib.licenses.apsl20; + license = lib.licenses.apsl20; }; } diff --git a/pkgs/os-specific/darwin/stubs/default.nix b/pkgs/os-specific/darwin/stubs/default.nix index 6fedf0a451e..e21f00beb5a 100644 --- a/pkgs/os-specific/darwin/stubs/default.nix +++ b/pkgs/os-specific/darwin/stubs/default.nix @@ -1,6 +1,6 @@ -{ stdenv, writeScriptBin, runtimeShell }: +{ lib, stdenv, writeScriptBin, runtimeShell }: -let fake = name: stdenv.lib.overrideDerivation (writeScriptBin name '' +let fake = name: lib.overrideDerivation (writeScriptBin name '' #!${runtimeShell} echo >&2 "Faking call to ${name} with arguments:" echo >&2 "$@" diff --git a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix index 059cb70bfbd..9f0ee4db118 100644 --- a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix +++ b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, ninja, python3, curl, libxml2, objc4, ICU }: +{ lib, stdenv, fetchFromGitHub, fetchurl, ninja, python3, curl, libxml2, objc4, ICU }: let # 10.12 adds a new sysdir.h that our version of CF in the main derivation depends on, but @@ -74,7 +74,7 @@ stdenv.mkDerivation { # Based on testing this issue seems to only occur with clang_7, so # please remove this when updating the default llvm versions to 8 or # later. - buildPhase = stdenv.lib.optionalString true '' + buildPhase = lib.optionalString true '' for i in {1..512}; do if ninja -j $NIX_BUILD_CORES; then break diff --git a/pkgs/os-specific/darwin/trash/default.nix b/pkgs/os-specific/darwin/trash/default.nix index 205391a52da..ea5786f6a56 100644 --- a/pkgs/os-specific/darwin/trash/default.nix +++ b/pkgs/os-specific/darwin/trash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, AppKit, Cocoa, ScriptingBridge }: +{ lib, stdenv, fetchFromGitHub, perl, AppKit, Cocoa, ScriptingBridge }: stdenv.mkDerivation rec { version = "0.9.2"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ali-rantakari/trash"; description = "Small command-line program for OS X that moves files or folders to the trash."; - platforms = stdenv.lib.platforms.darwin; - license = stdenv.lib.licenses.mit; + platforms = lib.platforms.darwin; + license = lib.licenses.mit; }; } diff --git a/pkgs/os-specific/darwin/usr-include/default.nix b/pkgs/os-specific/darwin/usr-include/default.nix index 4fef1388764..26b60ea44f5 100644 --- a/pkgs/os-specific/darwin/usr-include/default.nix +++ b/pkgs/os-specific/darwin/usr-include/default.nix @@ -1,4 +1,4 @@ -{stdenv, darwin}: +{lib, stdenv, darwin}: /* * This is needed to build GCC on Darwin. @@ -19,5 +19,5 @@ stdenv.mkDerivation { ln -sf ${darwin.CF}/Library/Frameworks/CoreFoundation.framework/Headers/* CoreFoundation ''; - meta.platforms = stdenv.lib.platforms.darwin; + meta.platforms = lib.platforms.darwin; } diff --git a/pkgs/os-specific/darwin/wifi-password/default.nix b/pkgs/os-specific/darwin/wifi-password/default.nix index 2dfc97dec1b..f66af1ddfb5 100644 --- a/pkgs/os-specific/darwin/wifi-password/default.nix +++ b/pkgs/os-specific/darwin/wifi-password/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { version = "0.1.0"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/rauchg/wifi-password"; description = "Get the password of the wifi you're on"; - platforms = stdenv.lib.platforms.darwin; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.nikitavoloboev ]; + platforms = lib.platforms.darwin; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.nikitavoloboev ]; }; } diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix index 45e1f1eab4f..cc485bb62c6 100644 --- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix +++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix @@ -37,9 +37,9 @@ rec { bintools = binutils-unwrapped; extraBuildCommands = '' echo "-arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/libc-ldflags - '' + stdenv.lib.optionalString (sdk.platform == "iPhoneSimulator") '' + '' + lib.optionalString (sdk.platform == "iPhoneSimulator") '' echo "-platform_version ios-sim ${minSdkVersion} ${sdk.version}" >> $out/nix-support/libc-ldflags - '' + stdenv.lib.optionalString (sdk.platform == "iPhoneOS") '' + '' + lib.optionalString (sdk.platform == "iPhoneOS") '' echo "-platform_version ios ${minSdkVersion} ${sdk.version}" >> $out/nix-support/libc-ldflags ''; }; @@ -54,9 +54,9 @@ rec { mv cc-cflags.tmp $out/nix-support/cc-cflags echo "-target ${targetPlatform.config} -arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/cc-cflags echo "-isystem ${sdk}/usr/include${lib.optionalString (lib.versionAtLeast "10" sdk.version) " -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++"}" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString (sdk.platform == "iPhoneSimulator") '' + '' + lib.optionalString (sdk.platform == "iPhoneSimulator") '' echo "-mios-simulator-version-min=${minSdkVersion}" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString (sdk.platform == "iPhoneOS") '' + '' + lib.optionalString (sdk.platform == "iPhoneOS") '' echo "-miphoneos-version-min=${minSdkVersion}" >> $out/nix-support/cc-cflags ''; }) // { diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix index 127d0c4b022..d257553299c 100644 --- a/pkgs/os-specific/linux/acpi/default.nix +++ b/pkgs/os-specific/linux/acpi/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { battery and thermal information. ''; homepage = "https://sourceforge.net/projects/acpiclient/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ ]; }; diff --git a/pkgs/os-specific/linux/acpitool/default.nix b/pkgs/os-specific/linux/acpitool/default.nix index 9f2ad5b5c03..4a3d1a36bd7 100644 --- a/pkgs/os-specific/linux/acpitool/default.nix +++ b/pkgs/os-specific/linux/acpitool/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchpatch}: +{lib, stdenv, fetchurl, fetchpatch}: let acpitool-patch-051-4 = params: fetchpatch rec { @@ -44,8 +44,8 @@ in stdenv.mkDerivation rec { meta = { description = "A small, convenient command-line ACPI client with a lot of features"; homepage = "https://sourceforge.net/projects/acpitool/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.guibert ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.guibert ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/os-specific/linux/afuse/default.nix b/pkgs/os-specific/linux/afuse/default.nix index 758c57bb9e1..5f5948ed0bf 100644 --- a/pkgs/os-specific/linux/afuse/default.nix +++ b/pkgs/os-specific/linux/afuse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, fuse }: +{ lib, stdenv, fetchurl, pkgconfig, autoreconfHook, fuse }: stdenv.mkDerivation { name = "afuse-0.4.1"; @@ -14,8 +14,8 @@ stdenv.mkDerivation { meta = { description = "Automounter in userspace"; homepage = "https://github.com/pcarrier/afuse"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.marcweber ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-firmware/default.nix index 01955534bfc..a627a7762a8 100644 --- a/pkgs/os-specific/linux/alsa-firmware/default.nix +++ b/pkgs/os-specific/linux/alsa-firmware/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, autoreconfHook, fetchurl, fetchpatch }: +{ lib, stdenv, buildPackages, autoreconfHook, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "alsa-firmware-1.2.1"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.alsa-project.org/"; description = "Soundcard firmwares from the alsa project"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 40db2261007..da365fb7d99 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installFlags = [ "ASOUND_STATE_DIR=$(TMPDIR)/dummy" ]; postFixup = '' - wrapProgram $out/bin/alsa-info.sh --prefix PATH : "${stdenv.lib.makeBinPath [ which pciutils ]}" + wrapProgram $out/bin/alsa-info.sh --prefix PATH : "${lib.makeBinPath [ which pciutils ]}" ''; meta = with lib; { diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix index 78d0748ed3b..13dd8302b18 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -7,7 +7,7 @@ assert (!libsOnly) -> kernel != null; -with stdenv.lib; +with lib; let diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix index cfbdb376977..d684e24db91 100644 --- a/pkgs/os-specific/linux/anbox/default.nix +++ b/pkgs/os-specific/linux/anbox/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/anbox \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [libGL libglvnd]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [libGL libglvnd]} \ --prefix PATH : ${git}/bin mkdir -p $out/share/dbus-1/services diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 3ce310acf23..8455374fc68 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -17,7 +17,7 @@ let apparmor-patchver = "6"; apparmor-version = apparmor-series + "." + apparmor-patchver; - apparmor-meta = component: with stdenv.lib; { + apparmor-meta = component: with lib; { homepage = "https://apparmor.net/"; description = "A mandatory access control system - ${component}"; license = licenses.gpl2; @@ -39,7 +39,7 @@ let substituteInPlace ./common/Make.rules --replace "/usr/share/man" "share/man" ''; - patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + patches = lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { url = "https://git.alpinelinux.org/aports/plain/testing/apparmor/0003-Added-missing-typedef-definitions-on-parser.patch?id=74b8427cc21f04e32030d047ae92caa618105b53"; name = "0003-Added-missing-typedef-definitions-on-parser.patch"; @@ -75,8 +75,8 @@ let ]; buildInputs = [] - ++ stdenv.lib.optional withPerl perl - ++ stdenv.lib.optional withPython python; + ++ lib.optional withPerl perl + ++ lib.optional withPython python; # required to build apparmor-parser dontDisableStatic = true; @@ -84,21 +84,21 @@ let prePatch = prePatchCommon + '' substituteInPlace ./libraries/libapparmor/swig/perl/Makefile.am --replace install_vendor install_site substituteInPlace ./libraries/libapparmor/swig/perl/Makefile.in --replace install_vendor install_site - substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${stdenv.lib.getDev stdenv.cc.libc}/include/netinet/in.h" - substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${stdenv.lib.getDev stdenv.cc.libc}/include/netinet/in.h" + substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${lib.getDev stdenv.cc.libc}/include/netinet/in.h" + substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${lib.getDev stdenv.cc.libc}/include/netinet/in.h" ''; inherit patches; postPatch = "cd ./libraries/libapparmor"; # https://gitlab.com/apparmor/apparmor/issues/1 configureFlags = [ - (stdenv.lib.withFeature withPerl "perl") - (stdenv.lib.withFeature withPython "python") + (lib.withFeature withPerl "perl") + (lib.withFeature withPython "python") ]; - outputs = [ "out" ] ++ stdenv.lib.optional withPython "python"; + outputs = [ "out" ] ++ lib.optional withPython "python"; - postInstall = stdenv.lib.optionalString withPython '' + postInstall = lib.optionalString withPython '' mkdir -p $python/lib mv $out/lib/python* $python/lib/ ''; diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index f4378cad816..b7301837026 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -9,7 +9,7 @@ assert (!libsOnly) -> kernel != null; -with stdenv.lib; +with lib; # This derivation requires a maximum of gcc49, Linux kernel 4.1 and xorg.xserver 1.17 # and will not build or run using versions newer diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index f77d71c823b..7d72b0eec56 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -1,5 +1,5 @@ { - stdenv, buildPackages, fetchurl, fetchpatch, + lib, stdenv, buildPackages, fetchurl, fetchpatch, runCommand, autoconf, automake, libtool, enablePython ? false, python ? null, @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = stdenv.lib.optionals stdenv.hostPlatform.isMusl + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isMusl [ autoconf automake libtool ]; - buildInputs = stdenv.lib.optional enablePython python; + buildInputs = lib.optional enablePython python; configureFlags = [ # z/OS plugin is not useful on Linux, @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # TODO: Remove the musl patches when # https://github.com/linux-audit/audit-userspace/pull/25 # is available with the next release. - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl [ + patches = lib.optional stdenv.hostPlatform.isMusl [ ( let patch = fetchpatch { url = "https://github.com/linux-audit/audit-userspace/commit/d579a08bb1cde71f939c13ac6b2261052ae9f77e.patch"; @@ -59,8 +59,8 @@ stdenv.mkDerivation rec { meta = { description = "Audit Library"; homepage = "https://people.redhat.com/sgrubb/audit/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix index ab78c590017..f7ca3f71d43 100644 --- a/pkgs/os-specific/linux/autofs/default.nix +++ b/pkgs/os-specific/linux/autofs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs +{ lib, stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs , libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto }: let @@ -44,8 +44,8 @@ in stdenv.mkDerivation { meta = { description = "Kernel-based automounter"; homepage = "https://www.kernel.org/pub/linux/daemons/autofs/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; executables = [ "automount" ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 04217b8989b..7af451c1545 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: +{ lib, stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: let cfg = import ./version.nix; in @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.open-mesh.org/projects/batman-adv/wiki/Wiki"; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, information distribution tool"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ fpletz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ fpletz ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 3b1cf183e08..ba9b5d09d8d 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libnl }: +{ lib, stdenv, fetchurl, pkgconfig, libnl }: let cfg = import ./version.nix; in @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.open-mesh.org/projects/batman-adv/wiki/Wiki"; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, control tool"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ fpletz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ fpletz ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 8985949a012..b2b3dab76a8 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel }: +{ lib, stdenv, fetchurl, kernel }: let cfg = import ./version.nix; in @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.open-mesh.org/projects/batman-adv/wiki/Wiki"; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ fpletz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ fpletz ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 43725b60735..d994aed6d0f 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -31,7 +31,7 @@ python.pkgs.buildPythonApplication rec { propagatedBuildInputs = [ python.pkgs.netaddr ]; nativeBuildInputs = [ makeWrapper cmake flex bison ] # libelf is incompatible with elfutils-libelf - ++ stdenv.lib.filter (x: x != libelf) kernel.moduleBuildDependencies; + ++ lib.filter (x: x != libelf) kernel.moduleBuildDependencies; cmakeFlags = [ "-DBCC_KERNEL_MODULES_DIR=${kernel.dev}/lib/modules" diff --git a/pkgs/os-specific/linux/blktrace/default.nix b/pkgs/os-specific/linux/blktrace/default.nix index 4ae449c19aa..fb5a5d06212 100644 --- a/pkgs/os-specific/linux/blktrace/default.nix +++ b/pkgs/os-specific/linux/blktrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libaio }: +{ lib, stdenv, fetchurl, libaio }: stdenv.mkDerivation { name = "blktrace-1.2.0"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "Block layer IO tracing mechanism"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix index d857fa1463a..a79926c0158 100644 --- a/pkgs/os-specific/linux/bolt/default.nix +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meson ninja pkgconfig - ] ++ stdenv.lib.optional (!doCheck) python3; + ] ++ lib.optional (!doCheck) python3; buildInputs = [ glib diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index ce890ec578b..afddb963cef 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig flex bison ] # libelf is incompatible with elfutils-libelf - ++ stdenv.lib.filter (x: x != libelf) kernel.moduleBuildDependencies; + ++ lib.filter (x: x != libelf) kernel.moduleBuildDependencies; # patch the source, *then* substitute on @NIX_KERNEL_SRC@ in the result. we could # also in theory make this an environment variable around bpftrace, but this works diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix index 1aeb4a907fb..12655c3bed6 100644 --- a/pkgs/os-specific/linux/bridge-utils/default.nix +++ b/pkgs/os-specific/linux/bridge-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { name = "bridge-utils-1.5"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "https://sourceforge.net/projects/bridge/"; homepage = "https://wiki.linuxfoundation.org/networking/bridge"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 8e2271b9f7f..527d2253e5b 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel }: +{ lib, stdenv, fetchurl, kernel }: let version = "6.30.223.271"; @@ -7,8 +7,8 @@ let x86_64-linux = "1gj485qqr190idilacpxwgqyw21il03zph2rddizgj7fbd6pfyaz"; }; - arch = stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "_64"; - tarballVersion = stdenv.lib.replaceStrings ["."] ["_"] version; + arch = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "_64"; + tarballVersion = lib.replaceStrings ["."] ["_"] version; tarball = "hybrid-v35${arch}-nodebug-pcoem-${tarballVersion}.tar.gz"; in stdenv.mkDerivation { @@ -62,8 +62,8 @@ stdenv.mkDerivation { meta = { description = "Kernel module driver for some Broadcom's wireless cards"; homepage = "http://www.broadcom.com/support/802.11/linux_sta.php"; - license = stdenv.lib.licenses.unfreeRedistributable; - maintainers = with stdenv.lib.maintainers; [ phreedom ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.unfreeRedistributable; + maintainers = with lib.maintainers; [ phreedom ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 49b07bd18e7..a4a7adeb8b7 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { patches = [ ./busybox-in-store.patch - ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch; + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch; postPatch = "patchShebangs ."; diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix index fc2faa5b8f5..c3d8928c7ba 100644 --- a/pkgs/os-specific/linux/checkpolicy/default.nix +++ b/pkgs/os-specific/linux/checkpolicy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, flex, libsepol }: +{ lib, stdenv, fetchurl, bison, flex, libsepol }: stdenv.mkDerivation rec { pname = "checkpolicy"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" - "LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a" + "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a" ]; meta = removeAttrs libsepol.meta ["outputsToInstall"] // { diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index 64edd59d3c9..e0a65589571 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; installPhase = let - path = stdenv.lib.makeBinPath [ + path = lib.makeBinPath [ findutils file binutils-unwrapped sysctl openssl ]; in '' diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index 3171c30987e..fa9cd34c1b3 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ kerberos keyutils pam talloc ]; - configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # AC_FUNC_MALLOC is broken on cross builds. "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index fa3aa563fb1..2df08dbb2b5 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -64,7 +64,7 @@ assert weatherMetarSupport -> curlSupport; assert weatherXoapSupport -> curlSupport && libxml2 != null; assert journalSupport -> systemd != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "conky"; diff --git a/pkgs/os-specific/linux/conspy/default.nix b/pkgs/os-specific/linux/conspy/default.nix index a52b8738570..480962024f7 100644 --- a/pkgs/os-specific/linux/conspy/default.nix +++ b/pkgs/os-specific/linux/conspy/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, autoconf, automake, ncurses}: +{lib, stdenv, fetchurl, autoconf, automake, ncurses}: let s = # Generated upstream information rec { @@ -30,8 +30,8 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = "Linux text console viewer"; - license = stdenv.lib.licenses.epl10 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.epl10 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/cpuid/default.nix b/pkgs/os-specific/linux/cpuid/default.nix index 3f57d0c7038..ea9ae06130e 100644 --- a/pkgs/os-specific/linux/cpuid/default.nix +++ b/pkgs/os-specific/linux/cpuid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { pname = "cpuid"; @@ -42,9 +42,9 @@ stdenv.mkDerivation rec { ''; platforms = [ "i686-linux" "x86_64-linux" ]; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "http://etallen.com/cpuid.html"; - maintainers = with stdenv.lib.maintainers; [ blitz ]; + maintainers = with lib.maintainers; [ blitz ]; }; } diff --git a/pkgs/os-specific/linux/cpupower/default.nix b/pkgs/os-specific/linux/cpupower/default.nix index cdc76b6772e..cfc0ace8e0a 100644 --- a/pkgs/os-specific/linux/cpupower/default.nix +++ b/pkgs/os-specific/linux/cpupower/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { "LD=${stdenv.cc.targetPrefix}cc" ]; - installFlags = stdenv.lib.mapAttrsToList + installFlags = lib.mapAttrsToList (n: v: "${n}dir=${placeholder "out"}/${v}") { bin = "bin"; sbin = "sbin"; diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index 79132852d23..bbd8d35403b 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, kernel ? false }: +{ fetchFromGitHub, lib, stdenv, kernel ? false }: stdenv.mkDerivation rec { pname = "cryptodev-linux-1.11"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Device that allows access to Linux kernel cryptographic drivers"; homepage = "http://cryptodev-linux.org/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index aa5c124ea60..e678996a852 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lvm2, json_c +{ lib, stdenv, fetchurl, lvm2, json_c , openssl, libuuid, pkgconfig, popt }: stdenv.mkDerivation rec { @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://gitlab.com/cryptsetup/cryptsetup/"; description = "LUKS for dm-crypt"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/device-tree/default.nix b/pkgs/os-specific/linux/device-tree/default.nix index 0599289ab72..13c609cdf7d 100644 --- a/pkgs/os-specific/linux/device-tree/default.nix +++ b/pkgs/os-specific/linux/device-tree/default.nix @@ -1,6 +1,6 @@ -{ stdenvNoCC, dtc, findutils }: +{ lib, stdenvNoCC, dtc, findutils }: -with stdenvNoCC.lib; { +with lib; { applyOverlays = (base: overlays': stdenvNoCC.mkDerivation { name = "device-tree-overlays"; nativeBuildInputs = [ dtc findutils ]; diff --git a/pkgs/os-specific/linux/device-tree/raspberrypi.nix b/pkgs/os-specific/linux/device-tree/raspberrypi.nix index 93dad5ef327..b4b40f8331f 100644 --- a/pkgs/os-specific/linux/device-tree/raspberrypi.nix +++ b/pkgs/os-specific/linux/device-tree/raspberrypi.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, raspberrypifw }: +{ lib, stdenvNoCC, raspberrypifw }: stdenvNoCC.mkDerivation { name = "raspberrypi-dtbs-${raspberrypifw.version}"; @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation { # Compatible overlays that may be used overlays = "${raspberrypifw}/share/raspberrypi/boot/overlays"; }; - meta = with stdenvNoCC.lib; { + meta = with lib; { inherit (raspberrypifw.meta) homepage license; description = "DTBs for the Raspberry Pi"; }; diff --git a/pkgs/os-specific/linux/digimend/default.nix b/pkgs/os-specific/linux/digimend/default.nix index d0f02097587..6b5f66f825b 100644 --- a/pkgs/os-specific/linux/digimend/default.nix +++ b/pkgs/os-specific/linux/digimend/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, kernel }: -assert stdenv.lib.versionAtLeast kernel.version "3.5"; +assert lib.versionAtLeast kernel.version "3.5"; stdenv.mkDerivation rec { pname = "digimend"; diff --git a/pkgs/os-specific/linux/disk-indicator/default.nix b/pkgs/os-specific/linux/disk-indicator/default.nix index b2ae930f193..f754882ccd0 100644 --- a/pkgs/os-specific/linux/disk-indicator/default.nix +++ b/pkgs/os-specific/linux/disk-indicator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libX11 }: +{ lib, stdenv, fetchgit, libX11 }: stdenv.mkDerivation { name = "disk-indicator-2014-05-19"; @@ -34,7 +34,7 @@ stdenv.mkDerivation { Small program for Linux that will turn your Scroll, Caps or Num Lock LED or LED on your ThinkPad laptop into a hard disk activity indicator. ''; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix index 129ccb30456..c1e0dfc5ae4 100644 --- a/pkgs/os-specific/linux/dmraid/default.nix +++ b/pkgs/os-specific/linux/dmraid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, lvm2 }: +{ lib, stdenv, fetchurl, fetchpatch, lvm2 }: stdenv.mkDerivation rec { name = "dmraid-1.0.0.rc16"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; patches = [ ./hardening-format.patch ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + ++ lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { url = "https://raw.githubusercontent.com/void-linux/void-packages/fceed4b8e96b3c1da07babf6f67b6ed1588a28b2/srcpkgs/dmraid/patches/006-musl-libc.patch"; sha256 = "1j8xda0fpz8lxjxnqdidy7qb866qrzwpbca56yjdg6vf4x21hx6w"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -i 's/\[\[[^]]*\]\]/[ "''$''${n##*.}" = "so" ]/' */lib/Makefile.in - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + '' + lib.optionalString stdenv.hostPlatform.isMusl '' NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE" ''; @@ -42,8 +42,8 @@ stdenv.mkDerivation rec { its volumes. May be needed for rescuing an older system or nuking the metadata when reformatting. ''; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/e1000e/default.nix b/pkgs/os-specific/linux/e1000e/default.nix index d5d6697a01e..51bc6ada07d 100644 --- a/pkgs/os-specific/linux/e1000e/default.nix +++ b/pkgs/os-specific/linux/e1000e/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, kernel }: +{ lib, stdenv, fetchurl, kernel }: -assert stdenv.lib.versionOlder kernel.version "4.10"; +assert lib.versionOlder kernel.version "4.10"; stdenv.mkDerivation rec { name = "e1000e-${version}-${kernel.version}"; @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { meta = { description = "Linux kernel drivers for Intel Ethernet adapters and LOMs (LAN On Motherboard)"; homepage = "http://e1000.sf.net/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/earlyoom/default.nix b/pkgs/os-specific/linux/earlyoom/default.nix index 668a3795b99..930e9381bb7 100644 --- a/pkgs/os-specific/linux/earlyoom/default.nix +++ b/pkgs/os-specific/linux/earlyoom/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "16iyn51xlrsbshc7p5xl2338yyfzknaqc538sa7mamgccqwgyvvq"; }; - nativeBuildInputs = stdenv.lib.optionals withManpage [ pandoc installShellFiles ]; + nativeBuildInputs = lib.optionals withManpage [ pandoc installShellFiles ]; patches = [ ./fix-dbus-path.patch ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installPhase = '' install -D earlyoom $out/bin/earlyoom - '' + stdenv.lib.optionalString withManpage '' + '' + lib.optionalString withManpage '' installManPage earlyoom.1 ''; diff --git a/pkgs/os-specific/linux/edac-utils/default.nix b/pkgs/os-specific/linux/edac-utils/default.nix index 9b8b9981274..63c539602f1 100644 --- a/pkgs/os-specific/linux/edac-utils/default.nix +++ b/pkgs/os-specific/linux/edac-utils/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { postInstall = '' wrapProgram "$out/sbin/edac-ctl" \ - --set PATH ${stdenv.lib.makeBinPath [ dmidecode kmod ]} + --set PATH ${lib.makeBinPath [ dmidecode kmod ]} ''; meta = with lib; { diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index 696dfd275c7..862deef5582 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, gperf, util-linux, kmod}: +{lib, stdenv, fetchurl, pkgconfig, glib, gperf, util-linux, kmod}: let s = # Generated upstream information rec { @@ -50,9 +50,9 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = ''An udev fork by Gentoo''; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = ''https://www.gentoo.org/proj/en/eudev/''; downloadPage = ''http://dev.gentoo.org/~blueness/eudev/''; updateWalker = true; diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix index 5e212825bab..88792346d70 100644 --- a/pkgs/os-specific/linux/exfat/default.nix +++ b/pkgs/os-specific/linux/exfat/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "ARCH=${stdenv.hostPlatform.platform.kernelArch}" - ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix index 80c823b31d7..163001638cd 100644 --- a/pkgs/os-specific/linux/facetimehd/default.nix +++ b/pkgs/os-specific/linux/facetimehd/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, kernel }: # facetimehd is not supported for kernels older than 3.19"; -assert stdenv.lib.versionAtLeast kernel.version "3.19"; +assert lib.versionAtLeast kernel.version "3.19"; let # Note: When updating this revision: @@ -14,7 +14,7 @@ let # e. see if the module loads back (apps using the camera won't # recover and will have to be restarted) and the camera # still works. - srcParams = if (stdenv.lib.versionAtLeast kernel.version "4.8") then + srcParams = if (lib.versionAtLeast kernel.version "4.8") then { # Use mainline branch version = "unstable-2020-04-16"; rev = "82626d4892eeb9eb704538bf0dc49a00725ff451"; diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index a3be5484a04..ce3d99b0409 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchpatch, which, xdg-dbus-proxy, nixosTests}: +{lib, stdenv, fetchurl, fetchpatch, which, xdg-dbus-proxy, nixosTests}: let s = # Generated upstream information rec { @@ -81,9 +81,9 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = ''Namespace-based sandboxing tool for Linux''; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://firejail.wordpress.com/"; downloadPage = "https://sourceforge.net/projects/firejail/files/firejail/"; }; diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix index 7cb5d2a9a40..79de65fcb98 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "b43-fwcutter-019"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Firmware extractor for cards supported by the b43 kernel module"; homepage = "http://wireless.kernel.org/en/users/Drivers/b43"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.free; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix index 4f03f58b11f..42444d784d5 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, b43FirmwareCutter }: +{ lib, stdenv, fetchurl, b43FirmwareCutter }: let version = "5.100.138"; in @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Firmware for cards supported by the b43 kernel module"; homepage = "http://wireless.kernel.org/en/users/Drivers/b43"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; }; } diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index caa675951e1..4fd1cf7ef1a 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec { outputHashAlgo = "sha256"; outputHash = "1p7vn2hfwca6w69jhw5zq70w44ji8mdnibm1z959aalax6ndy146"; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "Binary firmware collection packaged by kernel.org"; homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; license = licenses.unfreeRedistributableFirmware; diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 25e0e6b0d88..5c40a5540dc 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -160,7 +160,7 @@ let pango tpm2-tss efivar - ] ++ stdenv.lib.optionals haveDell [ + ] ++ lib.optionals haveDell [ libsmbios ]; @@ -187,12 +187,12 @@ let # Our builder only adds $lib/lib to rpath but some things link # against libfwupdplugin which is in $out/lib. "-Dc_link_args=-Wl,-rpath,${placeholder "out"}/lib" - ] ++ stdenv.lib.optionals (!haveDell) [ + ] ++ lib.optionals (!haveDell) [ "-Dplugin_dell=false" "-Dplugin_synaptics=false" - ] ++ stdenv.lib.optionals (!haveRedfish) [ + ] ++ lib.optionals (!haveRedfish) [ "-Dplugin_redfish=false" - ] ++ stdenv.lib.optionals haveFlashrom [ + ] ++ lib.optionals haveFlashrom [ "-Dplugin_flashrom=true" ]; @@ -250,12 +250,12 @@ let efibootmgr bubblewrap tpm2-tools - ] ++ stdenv.lib.optional haveFlashrom flashrom; + ] ++ lib.optional haveFlashrom flashrom; in '' gappsWrapperArgs+=( --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" # See programs reached with fu_common_find_program_in_path in source - --prefix PATH : "${stdenv.lib.makeBinPath binPath}" + --prefix PATH : "${lib.makeBinPath binPath}" ) ''; @@ -291,7 +291,7 @@ let "pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata" "pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service" "pki/fwupd-metadata/LVFS-CA.pem" - ] ++ stdenv.lib.optionals haveDell [ + ] ++ lib.optionals haveDell [ "fwupd/remotes.d/dell-esrt.conf" ]; @@ -302,7 +302,7 @@ let ]; tests = let - listToPy = list: "[${stdenv.lib.concatMapStringsSep ", " (f: "'${f}'") list}]"; + listToPy = list: "[${lib.concatMapStringsSep ", " (f: "'${f}'") list}]"; in { installedTests = nixosTests.installed-tests.fwupd; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix index 00ae9868673..9d6d3dc7a80 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, pkgconfig }: let - inherit (stdenv.lib) optionals; + inherit (lib) optionals; in stdenv.mkDerivation { pname = "raspberrypi-armstubs"; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index b5fa3909c3b..3561916fd6f 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: stdenvNoCC.mkDerivation rec { # NOTE: this should be updated with linux_rpi @@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec { dontBuild = true; dontFixup = true; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "Firmware for the Raspberry Pi board"; homepage = "https://github.com/raspberrypi/firmware"; license = licenses.unfreeRedistributableFirmware; # See https://github.com/raspberrypi/firmware/blob/master/boot/LICENCE.broadcom diff --git a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix index 84a753ca8ea..34c2b683ea4 100644 --- a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub }: -with stdenv.lib; +with lib; stdenv.mkDerivation { name = "rtl8192su-unstable-2016-10-05"; diff --git a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix index 4f33f09cc78..36580d4b1b9 100644 --- a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, linuxPackages }: -with stdenv.lib; +with lib; stdenv.mkDerivation { name = "rtl8723bs-firmware-${linuxPackages.rtl8723bs.version}"; inherit (linuxPackages.rtl8723bs) src; diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix index c1f99bdad68..b474c48e341 100644 --- a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "sof-firmware"; version = "1.6"; diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/os-specific/linux/firmware/zd1211/default.nix index d6963c8eb78..9baa4eee621 100644 --- a/pkgs/os-specific/linux/firmware/zd1211/default.nix +++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: let pname = "zd1211-firmware"; @@ -19,6 +19,6 @@ in fetchzip rec { description = "Firmware for the ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip"; homepage = "https://sourceforge.net/projects/zd1211/"; license = "GPL"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/forktty/default.nix b/pkgs/os-specific/linux/forktty/default.nix index 66570bac942..88b5a308ee7 100644 --- a/pkgs/os-specific/linux/forktty/default.nix +++ b/pkgs/os-specific/linux/forktty/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: let s = # Generated upstream information rec { @@ -29,8 +29,8 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = ''Tool to detach from controlling TTY and attach to another''; - license = stdenv.lib.licenses.gpl2 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/fswebcam/default.nix b/pkgs/os-specific/linux/fswebcam/default.nix index fc1a2563382..18cdc21f0b6 100644 --- a/pkgs/os-specific/linux/fswebcam/default.nix +++ b/pkgs/os-specific/linux/fswebcam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libv4l, gd }: +{ lib, stdenv, fetchurl, libv4l, gd }: stdenv.mkDerivation rec { name = "fswebcam-20200725"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Neat and simple webcam app"; homepage = "http://www.sanslogic.co.uk/fswebcam"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index faef3673bb9..053ea34c82e 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -8,7 +8,7 @@ }: let - isFuse3 = stdenv.lib.hasPrefix "3" version; + isFuse3 = lib.hasPrefix "3" version; in stdenv.mkDerivation rec { pname = "fuse"; inherit version; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { preAutoreconf = "touch config.rpath"; patches = - stdenv.lib.optional + lib.optional (!isFuse3 && stdenv.isAarch64) (fetchpatch { url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch"; @@ -37,9 +37,9 @@ in stdenv.mkDerivation rec { then [ meson ninja pkg-config ] else [ autoreconfHook gettext ]; - outputs = [ "out" ] ++ stdenv.lib.optional isFuse3 "common"; + outputs = [ "out" ] ++ lib.optional isFuse3 "common"; - mesonFlags = stdenv.lib.optionals isFuse3 [ + mesonFlags = lib.optionals isFuse3 [ "-Dudevrulesdir=/udev/rules.d" "-Duseroot=false" ]; diff --git a/pkgs/os-specific/linux/gfxtablet/default.nix b/pkgs/os-specific/linux/gfxtablet/default.nix index 56fa4f1d7d6..5bb6a85438d 100644 --- a/pkgs/os-specific/linux/gfxtablet/default.nix +++ b/pkgs/os-specific/linux/gfxtablet/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, linuxHeaders}: +{lib, stdenv, fetchFromGitHub, linuxHeaders}: stdenv.mkDerivation rec { version = "1.4"; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { description = ''Uinput driver for Android GfxTablet tablet-as-input-device app''; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index 00e726d7222..a4dfc7cad5f 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { intltool pkgconfig ] - ++ stdenv.lib.optionals (useGtk) [ wrapGAppsHook ] - ++ stdenv.lib.optionals (useQt) [ wrapQtAppsHook ] + ++ lib.optionals (useGtk) [ wrapGAppsHook ] + ++ lib.optionals (useQt) [ wrapQtAppsHook ] ; buildInputs = [ @@ -55,17 +55,17 @@ stdenv.mkDerivation rec { libpng sfml ] - ++ stdenv.lib.optionals (pulseaudioSupport) [ libpulseaudio ] - ++ stdenv.lib.optionals (useGtk) [ gtk3 ] - ++ stdenv.lib.optionals (useQt) [ + ++ lib.optionals (pulseaudioSupport) [ libpulseaudio ] + ++ lib.optionals (useGtk) [ gtk3 ] + ++ lib.optionals (useQt) [ qtbase ] ; configureFlags = [ "--enable-sfml" ] - ++ stdenv.lib.optionals (useGtk) [ "--enable-gtk3" ] - ++ stdenv.lib.optionals (useQt) [ "--enable-qt5" ] + ++ lib.optionals (useGtk) [ "--enable-gtk3" ] + ++ lib.optionals (useQt) [ "--enable-qt5" ] ; meta = with lib; { diff --git a/pkgs/os-specific/linux/hdapsd/default.nix b/pkgs/os-specific/linux/hdapsd/default.nix index 893eb4fdd99..39f69ef0144 100644 --- a/pkgs/os-specific/linux/hdapsd/default.nix +++ b/pkgs/os-specific/linux/hdapsd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let version = "20141203"; in stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { postInstall = builtins.readFile ./postInstall.sh; - meta = with stdenv.lib; + meta = with lib; { description = "Hard Drive Active Protection System Daemon"; homepage = "http://hdaps.sf.net/"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/hibernate/default.nix b/pkgs/os-specific/linux/hibernate/default.nix index 8fc6bfdbdcf..1a7dd01e977 100644 --- a/pkgs/os-specific/linux/hibernate/default.nix +++ b/pkgs/os-specific/linux/hibernate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gawk }: +{ lib, stdenv, fetchurl, gawk }: let version = "2.0"; in @@ -35,12 +35,12 @@ in description = "The `hibernate' script for swsusp and Tux-on-Ice"; longDescription = '' This package provides the `hibernate' script, a command-line utility - that saves the computer's state to disk and switches it off, turning - it into "hibernation". It works both with Linux swsusp and Tux-on-Ice. + that saves the computer's state to disk and switches it off, turning + it into "hibernation". It works both with Linux swsusp and Tux-on-Ice. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "http://www.tuxonice.net/"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index f004a27fca1..3364f013504 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { CONFIG_HS20=y CONFIG_ACS=y CONFIG_GETRANDOM=y - '' + stdenv.lib.optionalString (sqlite != null) '' + '' + lib.optionalString (sqlite != null) '' CONFIG_SQLITE=y ''; diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 9b54f404f72..6cee603664d 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "hwdata"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/vcrhonek/hwdata"; description = "Hardware Database, including Monitors, pci.ids, usb.ids, and video cards"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/i810switch/default.nix b/pkgs/os-specific/linux/i810switch/default.nix index 5b65f2a16fd..ffca983a35e 100644 --- a/pkgs/os-specific/linux/i810switch/default.nix +++ b/pkgs/os-specific/linux/i810switch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pciutils }: +{ lib, stdenv, fetchurl, pciutils }: stdenv.mkDerivation { name = "i810switch-0.6.5"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "A utility for switching between the LCD and external VGA display on Intel graphics cards"; homepage = "http://www16.plala.or.jp/mano-a-mano/i810switch.html"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/ifenslave/default.nix b/pkgs/os-specific/linux/ifenslave/default.nix index 1b22c1eafd3..d23fc101bcc 100644 --- a/pkgs/os-specific/linux/ifenslave/default.nix +++ b/pkgs/os-specific/linux/ifenslave/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "ifenslave"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Utility for enslaving networking interfaces under a bond"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/os-specific/linux/ima-evm-utils/default.nix index 246c109faf3..e40a8d9b406 100644 --- a/pkgs/os-specific/linux/ima-evm-utils/default.nix +++ b/pkgs/os-specific/linux/ima-evm-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig, openssl, attr, keyutils, asciidoc, libxslt, docbook_xsl }: +{ lib, stdenv, fetchgit, autoreconfHook, pkgconfig, openssl, attr, keyutils, asciidoc, libxslt, docbook_xsl }: stdenv.mkDerivation rec { pname = "ima-evm-utils"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "evmctl utility to manage digital signatures of the Linux kernel integrity subsystem (IMA/EVM)"; homepage = "https://sourceforge.net/projects/linux-ima/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ tstrobel ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ tstrobel ]; }; } diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 9d69eca57f4..9d7c2baf1a6 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ intel-gmmlib intel-graphics-compiler libva stdenv.cc.cc.lib ]} \ + patchelf --set-rpath ${lib.makeLibraryPath [ intel-gmmlib intel-graphics-compiler libva stdenv.cc.cc.lib ]} \ $out/lib/intel-opencl/libigdrcl.so ''; diff --git a/pkgs/os-specific/linux/intel-ocl/default.nix b/pkgs/os-specific/linux/intel-ocl/default.nix index 95a2cfbd846..06cb18b2377 100644 --- a/pkgs/os-specific/linux/intel-ocl/default.nix +++ b/pkgs/os-specific/linux/intel-ocl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, rpmextract, ncurses5, numactl, zlib }: +{ lib, stdenv, fetchzip, rpmextract, ncurses5, numactl, zlib }: stdenv.mkDerivation rec { pname = "intel-ocl"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sourceRoot = "."; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib ncurses5 numactl @@ -66,8 +66,8 @@ stdenv.mkDerivation rec { meta = { description = "Official OpenCL runtime for Intel CPUs"; homepage = "https://software.intel.com/en-us/articles/opencl-drivers"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = [ stdenv.lib.maintainers.kierdavis ]; + maintainers = [ lib.maintainers.kierdavis ]; }; } diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index 97c93db50b8..33a956d2aa8 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, pruneLibtoolFiles, flex, bison +{ lib, stdenv, fetchurl, pkgconfig, pruneLibtoolFiles, flex, bison , libmnl, libnetfilter_conntrack, libnfnetlink, libnftnl, libpcap , nftablesCompat ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "1.8.6"; diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 3bb653ebcf7..46146e90c7c 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchpatch , meson, ninja, pkgconfig, gettext, libxslt, docbook_xsl_ns , libcap, libidn2 }: -with stdenv.lib; +with lib; let version = "20200821"; diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix index d61d02b5598..8fff7a27429 100644 --- a/pkgs/os-specific/linux/irqbalance/default.nix +++ b/pkgs/os-specific/linux/irqbalance/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, ncurses, libcap_ng }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, ncurses, libcap_ng }: stdenv.mkDerivation rec { pname = "irqbalance"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/Irqbalance/irqbalance"; description = "A daemon to help balance the cpu load generated by interrupts across all of a systems cpus"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index f0097e37a99..7d526db53e9 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libnl }: +{ lib, stdenv, fetchurl, pkg-config, libnl }: stdenv.mkDerivation rec { pname = "iw"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { deprecated and it's strongly recommended to switch to iw and nl80211. ''; homepage = "https://wireless.wiki.kernel.org/en/users/Documentation/iw"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ viric primeos ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ viric primeos ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 0e73dc94e5a..6a33790eead 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; outputs = [ "out" "man" ] - ++ stdenv.lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "test"; + ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "test"; nativeBuildInputs = [ autoreconfHook @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # wrapPython wraps the scripts in $test. They pull in gobject-introspection, # which doesn't cross-compile. - pythonPath = stdenv.lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ + pythonPath = lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ python3Packages.dbus-python python3Packages.pygobject3 ]; @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share cp -a doc $out/share/ cp -a README AUTHORS TODO $out/share/doc/ - '' + stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' mkdir -p $test/bin cp -a test/* $test/bin/ ''; diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix index 8ed1d87c195..da4135d8a80 100644 --- a/pkgs/os-specific/linux/jfbview/default.nix +++ b/pkgs/os-specific/linux/jfbview/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ freetype harfbuzz jbig2dec libjpeg libX11 mupdf_1_17 ncurses openjpeg openssl - ] ++ stdenv.lib.optionals imageSupport [ + ] ++ lib.optionals imageSupport [ imlib2 ]; diff --git a/pkgs/os-specific/linux/jujuutils/default.nix b/pkgs/os-specific/linux/jujuutils/default.nix index 86b24fe6a5b..554898cedeb 100644 --- a/pkgs/os-specific/linux/jujuutils/default.nix +++ b/pkgs/os-specific/linux/jujuutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, linuxHeaders }: +{ lib, stdenv, fetchurl, linuxHeaders }: stdenv.mkDerivation { name = "jujuutils-0.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/cladisch/linux-firewire-utils"; description = "Utilities around FireWire devices connected to a Linux computer"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index 80cb98feffe..68aff5c9d8a 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { # We get a warning in armv5tel-linux and the fuloong2f, so we # disable -Werror in it. - ${stdenv.lib.optionalString (stdenv.isAarch32 || stdenv.hostPlatform.isMips) '' + ${lib.optionalString (stdenv.isAarch32 || stdenv.hostPlatform.isMips) '' sed -i s/-Werror// src/Makefile.am ''} ''; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index c86ec88ec69..14f2246d05b 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -10,14 +10,14 @@ # hardware problems with a new one. # Configuration -{ stdenv, version +{ lib, stdenv, version , features ? { grsecurity = false; xen_dom0 = false; } }: -with stdenv.lib; -with stdenv.lib.kernel; -with (stdenv.lib.kernel.whenHelpers version); +with lib; +with lib.kernel; +with (lib.kernel.whenHelpers version); let diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index dd3050a93ee..31a90dc740f 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -6,6 +6,7 @@ , gmp ? null , libmpc ? null , mpfr ? null +, lib , stdenv , # The kernel source tarball. @@ -66,9 +67,6 @@ assert stdenv.isLinux; let - - lib = stdenv.lib; - # Combine the `features' attribute sets of all the kernel patches. kernelFeatures = lib.fold (x: y: (x.features or {}) // y) ({ iwlwifi = true; @@ -81,7 +79,7 @@ let } // features) kernelPatches; commonStructuredConfig = import ./common-config.nix { - inherit stdenv version ; + inherit lib stdenv version; features = kernelFeatures; # Ensure we know of all extra patches, etc. }; @@ -113,7 +111,7 @@ let depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl gmp libmpc mpfr ] - ++ lib.optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ]; + ++ lib.optionals (lib.versionAtLeast version "4.16") [ bison flex ]; platformName = stdenv.hostPlatform.platform.name; # e.g. "defconfig" @@ -173,7 +171,7 @@ let }; # end of configfile derivation kernel = (callPackage ./manual-config.nix {}) { - inherit version modDirVersion src kernelPatches randstructSeed stdenv extraMeta configfile; + inherit version modDirVersion src kernelPatches randstructSeed lib stdenv extraMeta configfile; config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; }; }; diff --git a/pkgs/os-specific/linux/kernel/hardened/config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix index c817f104427..ffd710e632e 100644 --- a/pkgs/os-specific/linux/kernel/hardened/config.nix +++ b/pkgs/os-specific/linux/kernel/hardened/config.nix @@ -8,11 +8,11 @@ # # See also -{ stdenv, version }: +{ lib, stdenv, version }: -with stdenv.lib; -with stdenv.lib.kernel; -with (stdenv.lib.kernel.whenHelpers version); +with lib; +with lib.kernel; +with (lib.kernel.whenHelpers version); assert (versionAtLeast version "4.9"); diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 0f1b26eb889..d914ef63ead 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: +{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: -with stdenv.lib; +with lib; buildLinux (args // rec { version = "4.14.215"; diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 3012eca87a5..f432b38f9c8 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: +{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: -with stdenv.lib; +with lib; buildLinux (args // rec { version = "4.19.167"; diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index f9a74dec425..a9519bedecc 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: +{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: -with stdenv.lib; +with lib; buildLinux (args // rec { version = "5.10.7"; diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index f30abeb6b90..fec3e314b82 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: +{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: -with stdenv.lib; +with lib; buildLinux (args // rec { version = "5.4.89"; diff --git a/pkgs/os-specific/linux/kernel/linux-5.9.nix b/pkgs/os-specific/linux/kernel/linux-5.9.nix index 39cc9c56c5f..5f7db41c9a9 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.9.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: +{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: -with stdenv.lib; +with lib; buildLinux (args // rec { version = "5.9.16"; diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index c8f5df788b7..4926288f926 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: +{ lib, stdenv, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let version = "5.10.6"; @@ -18,7 +18,7 @@ buildLinux (args // { extraMeta = { branch = "5.10/master"; - maintainers = with stdenv.lib.maintainers; [ atemu ]; + maintainers = with lib.maintainers; [ atemu ]; description = linux_zen.meta.description + " (Same as linux_zen but less aggressive release schedule)"; }; diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp-95.nix b/pkgs/os-specific/linux/kernel/linux-mptcp-95.nix index ad933ff63a7..f7bca36481b 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp-95.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp-95.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, structuredExtraConfig ? {}, ... } @ args: +{ lib, stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, structuredExtraConfig ? {}, ... } @ args: let mptcpVersion = "0.95"; modDirVersion = "4.19.55"; @@ -9,7 +9,7 @@ buildLinux ({ extraMeta = { branch = "4.19"; - maintainers = with stdenv.lib.maintainers; [ teto layus ]; + maintainers = with lib.maintainers; [ teto layus ]; }; src = fetchFromGitHub { @@ -19,8 +19,8 @@ buildLinux ({ sha256 = "04a66iq5vsiz8mkpszfxmqknz7y4w3lsckrcz6q1syjpk0pdyiyw"; }; - structuredExtraConfig = stdenv.lib.mkMerge [ - (import ./mptcp-config.nix { inherit stdenv; }) + structuredExtraConfig = lib.mkMerge [ + (import ./mptcp-config.nix { inherit lib; }) structuredExtraConfig ]; diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index dd9ce3e080a..5f0f513ff45 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args: +{ lib, stdenv, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args: buildLinux (args // { version = "5.9.0-2020.11.20"; @@ -16,7 +16,7 @@ buildLinux (args // { extraMeta = { branch = "master"; hydraPlatforms = []; # Should the testing kernels ever be built on Hydra? - maintainers = with stdenv.lib.maintainers; [ davidak chiiruno ]; + maintainers = with lib.maintainers; [ davidak chiiruno ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index c18d75b93f2..98fafaadece 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: +{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: -with stdenv.lib; +with lib; buildLinux (args // rec { version = "5.11-rc3"; diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 118272d2876..63d2204ee36 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildLinux, ... } @ args: +{ lib, stdenv, fetchFromGitHub, buildLinux, ... } @ args: let version = "5.10.6"; @@ -18,7 +18,7 @@ buildLinux (args // { extraMeta = { branch = "5.10/master"; - maintainers = with stdenv.lib.maintainers; [ atemu andresilva ]; + maintainers = with lib.maintainers; [ atemu andresilva ]; description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads."; }; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index c2f13718308..67016b71918 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,4 +1,4 @@ -{ buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl +{ lib, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl , libelf, cpio, elfutils, zstd, gawk , writeTextFile }: @@ -14,6 +14,7 @@ let echo "}" >> $out '').outPath; in { + lib, # Allow overriding stdenv on each buildLinux call stdenv, # The kernel version @@ -28,7 +29,7 @@ in { configfile, # Manually specified nixexpr representing the config # If unspecified, this will be autodetected from the .config - config ? stdenv.lib.optionalAttrs allowImportFromDerivation (readConfig configfile), + config ? lib.optionalAttrs allowImportFromDerivation (readConfig configfile), # Custom seed used for CONFIG_GCC_PLUGIN_RANDSTRUCT if enabled. This is # automatically extended with extra per-version and per-config values. randstructSeed ? "", @@ -48,11 +49,11 @@ in { }: let - inherit (stdenv.lib) + inherit (lib) hasAttr getAttr optional optionals optionalString optionalAttrs maintainers platforms; # Dependencies that are required to build kernel modules - moduleBuildDependencies = optional (stdenv.lib.versionAtLeast version "4.14") libelf; + moduleBuildDependencies = optional (lib.versionAtLeast version "4.14") libelf; installkernel = writeTextFile { name = "installkernel"; executable=true; text = '' #!${stdenv.shell} -e @@ -63,7 +64,7 @@ let commonMakeFlags = [ "O=$(buildRoot)" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform.platform ? kernelMakeFlags) + ] ++ lib.optionals (stdenv.hostPlatform.platform ? kernelMakeFlags) stdenv.hostPlatform.platform.kernelMakeFlags; drvAttrs = config_: platform: kernelPatches: configfile: @@ -88,14 +89,14 @@ let installsFirmware = (config.isEnabled "FW_LOADER") && (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL")) && - (stdenv.lib.versionOlder version "4.14"); + (lib.versionOlder version "4.14"); in (optionalAttrs isModular { outputs = [ "out" "dev" ]; }) // { passthru = { inherit version modDirVersion config kernelPatches configfile moduleBuildDependencies stdenv; inherit isXen isZen isHardened isLibre; - kernelOlder = stdenv.lib.versionOlder version; - kernelAtLeast = stdenv.lib.versionAtLeast version; + kernelOlder = lib.versionOlder version; + kernelAtLeast = lib.versionAtLeast version; }; inherit src; @@ -103,9 +104,9 @@ let patches = map (p: p.patch) kernelPatches # Required for deterministic builds along with some postPatch magic. - ++ optional (stdenv.lib.versionAtLeast version "4.13") ./randstruct-provide-seed.patch + ++ optional (lib.versionAtLeast version "4.13") ./randstruct-provide-seed.patch # Fixes determinism by normalizing metadata for the archive of kheaders - ++ optional (stdenv.lib.versionAtLeast version "5.2" && stdenv.lib.versionOlder version "5.4") ./gen-kheaders-metadata.patch; + ++ optional (lib.versionAtLeast version "5.2" && lib.versionOlder version "5.4") ./gen-kheaders-metadata.patch; prePatch = '' for mf in $(find -name Makefile -o -name Makefile.include -o -name install.sh); do @@ -282,9 +283,9 @@ let "The Linux kernel" + (if kernelPatches == [] then "" else " (with patches: " - + stdenv.lib.concatStringsSep ", " (map (x: x.name) kernelPatches) + + lib.concatStringsSep ", " (map (x: x.name) kernelPatches) + ")"); - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "https://www.kernel.org/"; repositories.git = "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"; maintainers = [ @@ -296,8 +297,8 @@ let }; in -assert (stdenv.lib.versionAtLeast version "4.14" && stdenv.lib.versionOlder version "5.8") -> libelf != null; -assert stdenv.lib.versionAtLeast version "5.8" -> elfutils != null; +assert (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") -> libelf != null; +assert lib.versionAtLeast version "5.8" -> elfutils != null; stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches configfile) // { pname = "linux"; @@ -308,11 +309,11 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr gawk zstd ] ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools - ++ optional (stdenv.lib.versionAtLeast version "4.14" && stdenv.lib.versionOlder version "5.8") libelf + ++ optional (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") libelf # Removed util-linuxMinimal since it should not be a dependency. - ++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ] - ++ optional (stdenv.lib.versionAtLeast version "5.2") cpio - ++ optional (stdenv.lib.versionAtLeast version "5.8") elfutils + ++ optionals (lib.versionAtLeast version "4.16") [ bison flex ] + ++ optional (lib.versionAtLeast version "5.2") cpio + ++ optional (lib.versionAtLeast version "5.8") elfutils ; hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ]; @@ -322,7 +323,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" "ARCH=${stdenv.hostPlatform.platform.kernelArch}" - ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; diff --git a/pkgs/os-specific/linux/kernel/mptcp-config.nix b/pkgs/os-specific/linux/kernel/mptcp-config.nix index 9752e63d9f9..59b11167ac2 100644 --- a/pkgs/os-specific/linux/kernel/mptcp-config.nix +++ b/pkgs/os-specific/linux/kernel/mptcp-config.nix @@ -1,5 +1,5 @@ -{ stdenv }: -with stdenv.lib.kernel; +{ lib }: +with lib.kernel; { # DRM_AMDGPU = yes; diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index a3558244297..de7d508c10e 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { buildInputs = [ elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl libopcodes python3 perl - ] ++ stdenv.lib.optional withGtk gtk2 + ] ++ lib.optional withGtk gtk2 ++ (if (versionAtLeast kernel.version "4.19") then [ python3 ] else [ python2 ]); # Note: we don't add elfutils to buildInputs, since it provides a @@ -72,7 +72,7 @@ stdenv.mkDerivation { meta = { homepage = "https://perf.wiki.kernel.org/"; description = "Linux tools to profile with performance counters"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index 81d37d14d9d..71f708e210d 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ./conf-symlink.patch ]; - makeFlags = stdenv.lib.optionals stdenv.hostPlatform.isStatic "NO_SOLIB=1"; + makeFlags = lib.optionals stdenv.hostPlatform.isStatic "NO_SOLIB=1"; BUILDDATE = "1970-01-01"; outputs = [ "out" "lib" "dev" ]; diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index 02abda7b138..65ab71bd562 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { "KLIBCKERNELSRC=${linuxHeaders}" ] # TODO(@Ericson2314): We now can get the ABI from # `stdenv.hostPlatform.parsed.abi`, is this still a good idea? - ++ stdenv.lib.optional (stdenv.hostPlatform.platform.kernelArch == "arm") "CONFIG_AEABI=y" - ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "CROSS_COMPILE=${stdenv.cc.targetPrefix}"; + ++ lib.optional (stdenv.hostPlatform.platform.kernelArch == "arm") "CONFIG_AEABI=y" + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "CROSS_COMPILE=${stdenv.cc.targetPrefix}"; # Install static binaries as well. postInstall = '' diff --git a/pkgs/os-specific/linux/latencytop/default.nix b/pkgs/os-specific/linux/latencytop/default.nix index 40095e543b4..c7586a7d871 100644 --- a/pkgs/os-specific/linux/latencytop/default.nix +++ b/pkgs/os-specific/linux/latencytop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, glib, pkgconfig, gtk2 }: +{ lib, stdenv, fetchurl, ncurses, glib, pkgconfig, gtk2 }: stdenv.mkDerivation rec { name = "latencytop-0.5"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://latencytop.org"; description = "Tool to show kernel reports on latencies (LATENCYTOP option)"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.viric ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/os-specific/linux/ldm/default.nix index 352ce535337..072b53b02ec 100644 --- a/pkgs/os-specific/linux/ldm/default.nix +++ b/pkgs/os-specific/linux/ldm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, udev, util-linux, mountPath ? "/media/" }: +{ lib, stdenv, fetchgit, udev, util-linux, mountPath ? "/media/" }: assert mountPath != ""; @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { meta = { description = "A lightweight device mounter, with libudev as only dependency"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; repositories.git = git; }; } diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix index b9aa6b5de56..83e06bbe6f3 100644 --- a/pkgs/os-specific/linux/libaio/default.nix +++ b/pkgs/os-specific/linux/libaio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { version = "0.3.112"; @@ -21,15 +21,15 @@ stdenv.mkDerivation rec { "prefix=${placeholder ''out''}" ]; - hardeningDisable = stdenv.lib.optional (stdenv.isi686) "stackprotector"; + hardeningDisable = lib.optional (stdenv.isi686) "stackprotector"; checkTarget = "partcheck"; # "check" needs root meta = { description = "Library for asynchronous I/O in Linux"; homepage = "http://lse.sourceforge.net/io/aio.html"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl21; - maintainers = with stdenv.lib.maintainers; [ ]; + platforms = lib.platforms.linux; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/os-specific/linux/libcap-ng/default.nix index 27f4ddcce18..f8f9b5b80ba 100644 --- a/pkgs/os-specific/linux/libcap-ng/default.nix +++ b/pkgs/os-specific/linux/libcap-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, swig ? null, python2 ? null, python3 ? null }: +{ lib, stdenv, fetchurl, swig ? null, python2 ? null, python3 ? null }: assert python2 != null || python3 != null -> swig != null; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { (if python3 != null then "--with-python3" else "--without-python3") ]; - meta = let inherit (stdenv.lib) platforms licenses; in { + meta = let inherit (lib) platforms licenses; in { description = "Library for working with POSIX capabilities"; homepage = "https://people.redhat.com/sgrubb/libcap-ng/"; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index ab78a3a33d8..4c4238a7e0e 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ${lib.optionalString (!isStatic) ''rm "$lib"/lib/*.a''} mkdir -p "$doc/share/doc/${pname}-${version}" cp License "$doc/share/doc/${pname}-${version}/" - '' + stdenv.lib.optionalString usePam '' + '' + lib.optionalString usePam '' mkdir -p "$pam/lib/security" mv "$lib"/lib/security "$pam/lib" ''; @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for working with POSIX capabilities"; homepage = "https://sites.google.com/site/fullycapable"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.bsd3; + platforms = lib.platforms.linux; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix index 4d93c3bb4fe..b43d70f21bb 100644 --- a/pkgs/os-specific/linux/libcgroup/default.nix +++ b/pkgs/os-specific/linux/libcgroup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pam, yacc, flex }: +{ lib, stdenv, fetchurl, fetchpatch, pam, yacc, flex }: stdenv.mkDerivation rec { pname = "libcgroup"; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { meta = { description = "Library and tools to manage Linux cgroups"; homepage = "http://libcg.sourceforge.net/"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.lgpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 4dfd6a3f2cd..7a1b6539e5e 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pcre, pkgconfig, libsepol +{ lib, stdenv, fetchurl, pcre, pkgconfig, libsepol , enablePython ? true, swig ? null, python3 ? null , fts }: assert enablePython -> swig != null && python3 != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libselinux"; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { "SBINDIR=$(bin)/sbin" "SHLIBDIR=$(out)/lib" - "LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a" + "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a" ]; preInstall = '' diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix index 70b2508451b..f995ea5e45c 100644 --- a/pkgs/os-specific/linux/libsemanage/default.nix +++ b/pkgs/os-specific/linux/libsemanage/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, bison, flex, libsepol, libselinux, bzip2, audit +{ lib, stdenv, fetchurl, pkgconfig, bison, flex, libsepol, libselinux, bzip2, audit , enablePython ? true, swig ? null, python ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libsemanage"; @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { meta = removeAttrs libsepol.meta ["outputsToInstall"] // { description = "Policy management tools for SELinux"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }; } diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index f5a190718bf..12a94d6fc42 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "http://userspace.selinuxproject.org"; platforms = platforms.linux; maintainers = [ maintainers.phreedom ]; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/light/default.nix b/pkgs/os-specific/linux/light/default.nix index b465b2243e1..995381c5340 100644 --- a/pkgs/os-specific/linux/light/default.nix +++ b/pkgs/os-specific/linux/light/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, coreutils }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, coreutils }: stdenv.mkDerivation rec { version = "1.2.2"; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { description = "GNU/Linux application to control backlights"; homepage = "https://haikarainen.github.io/light/"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ puffnfresh dtzWill ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ puffnfresh dtzWill ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/lightum/default.nix b/pkgs/os-specific/linux/lightum/default.nix index 3c37b66d231..2168d482442 100644 --- a/pkgs/os-specific/linux/lightum/default.nix +++ b/pkgs/os-specific/linux/lightum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libX11, libXScrnSaver, libXext, glib, dbus, pkgconfig, systemd }: +{ lib, stdenv, fetchgit, libX11, libXScrnSaver, libXext, glib, dbus, pkgconfig, systemd }: stdenv.mkDerivation { name = "lightum-2014-06-07"; @@ -31,8 +31,8 @@ stdenv.mkDerivation { meta = { description = "MacBook automatic light sensor daemon"; homepage = "https://github.com/poliva/lightum"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ puffnfresh ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix index 7bde5bd84a7..915609e8868 100644 --- a/pkgs/os-specific/linux/lm-sensors/default.nix +++ b/pkgs/os-specific/linux/lm-sensors/default.nix @@ -7,7 +7,7 @@ assert sensord -> rrdtool != null; stdenv.mkDerivation rec { pname = "lm-sensors"; version = "3.6.0"; - dashedVersion = stdenv.lib.replaceStrings ["."] ["-"] version; + dashedVersion = lib.replaceStrings ["."] ["-"] version; src = fetchzip { url = "https://github.com/lm-sensors/lm-sensors/archive/V${dashedVersion}.tar.gz"; @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bison flex which ]; buildInputs = [ perl ] - ++ stdenv.lib.optional sensord rrdtool; + ++ lib.optional sensord rrdtool; makeFlags = [ "PREFIX=${placeholder "out"}" "ETCDIR=${placeholder "out"}/etc" "CC=${stdenv.cc.targetPrefix}cc" "AR=${stdenv.cc.targetPrefix}ar" - ] ++ stdenv.lib.optional sensord "PROG_EXTRA=sensord"; + ] ++ lib.optional sensord "PROG_EXTRA=sensord"; meta = with lib; { homepage = "https://hwmon.wiki.kernel.org/lm_sensors"; diff --git a/pkgs/os-specific/linux/lockdep/default.nix b/pkgs/os-specific/linux/lockdep/default.nix index 2e9003c3f92..190941b1633 100644 --- a/pkgs/os-specific/linux/lockdep/default.nix +++ b/pkgs/os-specific/linux/lockdep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, flex, bison, valgrind }: +{ lib, stdenv, fetchurl, bash, flex, bison, valgrind }: stdenv.mkDerivation rec { pname = "lockdep"; @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { meta = { description = "Userspace locking validation tool built on the Linux kernel"; homepage = "https://kernel.org/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/os-specific/linux/lsiutil/default.nix index da45e202c02..4cb70faee96 100644 --- a/pkgs/os-specific/linux/lsiutil/default.nix +++ b/pkgs/os-specific/linux/lsiutil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: let @@ -8,14 +8,14 @@ let name = "lsiutil-${version}.zip"; url = "http://www.lsi.com/DistributionSystem/AssetDocument/support/downloads/hbas/fibre_channel/hardware_drivers/LSIUtil%20Kit_${version}.zip"; sha256 = "1d4337faa56e24f7d98db87b9de94d6e2c17ab671f4e301b93833eea08b9e426"; - }; + }; in stdenv.mkDerivation { pname = "lsiutils"; inherit version; - + srcs = [ src "Source/lsiutil.tar.gz" ]; buildInputs = [ unzip ]; @@ -32,10 +32,10 @@ stdenv.mkDerivation { ''; installPhase = "true"; - + meta = { homepage = "http://www.lsi.com/"; description = "LSI Logic Fusion MPT command line management tool"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; }; } diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index a7666cc6a7f..65048ab4bd5 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -15,7 +15,7 @@ assert enableDmeventd -> enableCmdlib; stdenv.mkDerivation rec { - pname = "lvm2" + stdenv.lib.optionalString enableDmeventd "with-dmeventd"; + pname = "lvm2" + lib.optionalString enableDmeventd "with-dmeventd"; version = "2.03.10"; src = fetchurl { @@ -32,20 +32,20 @@ stdenv.mkDerivation rec { "--with-default-locking-dir=/run/lock/lvm" "--with-default-run-dir=/run/lvm" "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" - ] ++ stdenv.lib.optionals (!enableCmdlib) [ + ] ++ lib.optionals (!enableCmdlib) [ "--bindir=${placeholder "bin"}/bin" "--sbindir=${placeholder "bin"}/bin" "--libdir=${placeholder "lib"}/lib" - ] ++ stdenv.lib.optional enableCmdlib "--enable-cmdlib" - ++ stdenv.lib.optionals enableDmeventd [ + ] ++ lib.optional enableCmdlib "--enable-cmdlib" + ++ lib.optionals enableDmeventd [ "--enable-dmeventd" "--with-dmeventd-pidfile=/run/dmeventd/pid" "--with-default-dm-run-dir=/run/dmeventd" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ] ++ - stdenv.lib.optionals (udev != null) [ + lib.optionals (udev != null) [ "--enable-udev_rules" "--enable-udev_sync" ]; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; - patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + patches = lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { name = "fix-stdio-usage.patch"; url = "https://git.alpinelinux.org/aports/plain/main/lvm2/fix-stdio-usage.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { doCheck = false; # requires root - makeFlags = stdenv.lib.optionals (udev != null) [ + makeFlags = lib.optionals (udev != null) [ "SYSTEMD_GENERATOR_DIR=$(out)/lib/systemd/system-generators" ]; @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { installFlags = [ "OWNER=" "GROUP=" "confdir=$(out)/etc" ]; # Install systemd stuff. - installTargets = [ "install" ] ++ stdenv.lib.optionals (udev != null) [ + installTargets = [ "install" ] ++ lib.optionals (udev != null) [ "install_systemd_generators" "install_systemd_units" "install_tmpfiles_configuration" @@ -107,12 +107,12 @@ stdenv.mkDerivation rec { "out" "dev" "man" - ] ++ stdenv.lib.optionals (enableCmdlib != true) [ + ] ++ lib.optionals (enableCmdlib != true) [ "bin" "lib" ]; - postInstall = stdenv.lib.optionalString (enableCmdlib != true) '' + postInstall = lib.optionalString (enableCmdlib != true) '' moveToOutput lib/libdevmapper.so $lib ''; diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index ade4299eaa7..16e7ef0a804 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, docbook2x +{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, perl, docbook2x , docbook_xml_dtd_45, python3Packages, pam # Optional Dependencies @@ -6,7 +6,7 @@ , libcap ? null, systemd ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "lxc"; version = "4.0.5"; diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 8fdb72e060f..1f8b7f0143c 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -1,8 +1,8 @@ -{ config, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse +{ config, lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse , util-linux, makeWrapper , enableDebugBuild ? config.lxcfs.enableDebugBuild or false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "lxcfs"; version = "4.0.6"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; buildInputs = [ fuse makeWrapper ]; - preConfigure = stdenv.lib.optionalString enableDebugBuild '' + preConfigure = lib.optionalString enableDebugBuild '' sed -i 's,#AM_CFLAGS += -DDEBUG,AM_CFLAGS += -DDEBUG,' Makefile.am ''; diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 6a319572cbe..935ded63709 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { "SYSTEMD_DIR=$(out)/lib/systemd/system" "MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm" "STRIP=" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index 57c75210568..adeb71befe4 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace libmultipath/Makefile --replace /usr/include/libdevmapper.h ${stdenv.lib.getDev lvm2}/include/libdevmapper.h + substituteInPlace libmultipath/Makefile --replace /usr/include/libdevmapper.h ${lib.getDev lvm2}/include/libdevmapper.h sed -i -re ' s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'", ' libmultipath/defaults.h diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index c5f293011db..c21cf2bb648 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, kernel, alsaLib }: +{ lib, stdenv, fetchurl, kernel, alsaLib }: -with stdenv.lib; +with lib; # The Magewell Pro Capture drivers are not supported for kernels older than 3.2 assert versionAtLeast kernel.version "3.2.0"; diff --git a/pkgs/os-specific/linux/ndiswrapper/default.nix b/pkgs/os-specific/linux/ndiswrapper/default.nix index 92da7f6fb82..2db046e6392 100644 --- a/pkgs/os-specific/linux/ndiswrapper/default.nix +++ b/pkgs/os-specific/linux/ndiswrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel, perl, kmod, libelf }: +{ lib, stdenv, fetchurl, kernel, perl, kmod, libelf }: let version = "1.63"; in @@ -41,6 +41,6 @@ stdenv.mkDerivation { homepage = "https://sourceforge.net/projects/ndiswrapper"; license = "GPL"; platforms = [ "i686-linux" "x86_64-linux" ]; - broken = stdenv.lib.versionAtLeast kernel.version "5.8"; + broken = lib.versionAtLeast kernel.version "5.8"; }; } diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix index 9095b652b42..461a65c007b 100644 --- a/pkgs/os-specific/linux/net-tools/default.nix +++ b/pkgs/os-specific/linux/net-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "net-tools"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://net-tools.sourceforge.net/"; description = "A set of tools for controlling the network subsystem in Linux"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index e433fd1e9f3..fb0a4eb7188 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel, zlib }: +{ lib, stdenv, fetchurl, kernel, zlib }: let version = "3.1"; @@ -36,8 +36,8 @@ stdenv.mkDerivation { meta = { description = "Network monitoring module for atop"; homepage = "https://www.atoptool.nl/downloadnetatop.php"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [viric]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [viric]; }; } diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index c5879fcc021..49b4da5c671 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, bison, file, flex +{ lib, stdenv, fetchurl, pkgconfig, bison, file, flex , asciidoc, libxslt, findXMLCatalogs, docbook_xml_dtd_45, docbook_xsl , libmnl, libnftnl, libpcap , gmp, jansson, readline @@ -7,7 +7,7 @@ , withXtables ? false , iptables }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "0.9.7"; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 4b0c060f9ce..f15ba884d3f 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -94,6 +94,6 @@ rec { ''; in applyPatches [ "fix-typos" ]; patches = maybePatch_drm_legacy; - broken = stdenv.lib.versionAtLeast kernel.version "4.18"; + broken = lib.versionAtLeast kernel.version "4.18"; }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 1587ad06bc3..2543da74ca6 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -27,7 +27,7 @@ disable32Bit ? false }: -with stdenv.lib; +with lib; assert !libsOnly -> kernel != null; assert versionOlder version "391" -> sha256_32bit != null; diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix index 1617696e00e..71cee65602c 100644 --- a/pkgs/os-specific/linux/open-isns/default.nix +++ b/pkgs/os-specific/linux/open-isns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, openssl, fetchFromGitHub }: +{ lib, stdenv, openssl, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "open-isns"; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { description = "iSNS server and client for Linux"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; homepage = "https://github.com/gonzoleeman/open-isns"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix b/pkgs/os-specific/linux/opengl/xorg-sys/default.nix index f4043f70030..33df8c0cc34 100644 --- a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix +++ b/pkgs/os-specific/linux/opengl/xorg-sys/default.nix @@ -6,7 +6,7 @@ # Of course, use of the driver in /usr/lib is highly impure. But it # might actually work ;-) -{stdenv, xorg, expat, libdrm}: +{lib, stdenv, xorg, expat, libdrm}: stdenv.mkDerivation { name = "xorg-sys-opengl-3"; @@ -15,6 +15,6 @@ stdenv.mkDerivation { [xorg.libXxf86vm xorg.libXext expat libdrm stdenv.cc.cc]; meta = { - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index ab7e7cf62e2..0adc6dbc3c2 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -2,7 +2,7 @@ , procps, libcap_ng, openssl, python3 , perl , kernel ? null }: -with stdenv.lib; +with lib; let _kernel = kernel; diff --git a/pkgs/os-specific/linux/openvswitch/lts.nix b/pkgs/os-specific/linux/openvswitch/lts.nix index d0588d4b441..59031d8a706 100644 --- a/pkgs/os-specific/linux/openvswitch/lts.nix +++ b/pkgs/os-specific/linux/openvswitch/lts.nix @@ -2,7 +2,7 @@ , procps, libcap_ng, openssl, python2, iproute , perl , automake, autoconf, libtool, kernel ? null }: -with stdenv.lib; +with lib; let _kernel = kernel; diff --git a/pkgs/os-specific/linux/otpw/default.nix b/pkgs/os-specific/linux/otpw/default.nix index c9597ab0fe4..fed7930bf14 100644 --- a/pkgs/os-specific/linux/otpw/default.nix +++ b/pkgs/os-specific/linux/otpw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pam }: +{ lib, stdenv, fetchurl, pam }: stdenv.mkDerivation rec { name = "otpw-1.3"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.cl.cam.ac.uk/~mgk25/otpw.html"; description = "A one-time password login package"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index d42ced5ad55..45f901b42f0 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-IB1AcwsRNbGzzeoJ8sKKxjTXMYHM0Bcs7d7jZJxXkvw="; }; - patches = stdenv.lib.optionals (stdenv.hostPlatform.libc == "musl") [ + patches = lib.optionals (stdenv.hostPlatform.libc == "musl") [ (fetchpatch { url = "https://git.alpinelinux.org/aports/plain/main/linux-pam/fix-compat.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; sha256 = "1h5yp5h2mqp1fcwiwwklyfpa69a3i03ya32pivs60fd7g5bqa7sf"; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { # which is done by dlopening $out/lib/security/pam_foo.so # $out/etc was also missed: pam_env(login:session): Unable to open config file - preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") '' + preConfigure = lib.optionalString (stdenv.hostPlatform.libc == "musl") '' # export ac_cv_search_crypt=no # (taken from Alpine linux, apparently insecure but also doesn't build O:)) # disable insecure modules diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix index 167363e60a8..f28cb28ef37 100644 --- a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix +++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchFromGitHub, pam, openssl, perl }: +{ lib, stdenv, fetchpatch, fetchFromGitHub, pam, openssl, perl }: stdenv.mkDerivation rec { pname = "pam_ssh_agent_auth"; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/jbeverly/pam_ssh_agent_auth"; description = "PAM module for authentication through the SSH agent"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix index 3e01b1bd455..57f0d97ae81 100644 --- a/pkgs/os-specific/linux/pam_usb/default.nix +++ b/pkgs/os-specific/linux/pam_usb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkgconfig, pmount, pythonPackages, writeScript, runtimeShell }: +{ lib, stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkgconfig, pmount, pythonPackages, writeScript, runtimeShell }: let @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://pamusb.org/"; description = "Authentication using USB Flash Drives"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index 820ef7f9612..15bd499650c 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { the PCMCIA subsystem to behave (almost) as every other hotpluggable bus system. "; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix index 4b4c86aa916..34693564e0a 100644 --- a/pkgs/os-specific/linux/phc-intel/default.nix +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, kernel, which }: # Don't bother with older versions, though some might even work: -assert stdenv.lib.versionAtLeast kernel.version "4.10"; +assert lib.versionAtLeast kernel.version "4.10"; let release = "0.4.0"; @@ -48,6 +48,6 @@ in stdenv.mkDerivation rec { downloadPage = "http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267"; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; - broken = stdenv.lib.versionAtLeast kernel.version "4.18"; + broken = lib.versionAtLeast kernel.version "4.18"; }; } diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index 23b9b9426df..1e8bd3407d5 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -16,10 +16,10 @@ stdenv.mkDerivation rec { buildInputs = [ dpdk libbsd libpcap lua5_3 numactl which ] - ++ stdenv.lib.optionals withGtk [gtk2]; + ++ lib.optionals withGtk [gtk2]; RTE_SDK = dpdk; - GUI = stdenv.lib.optionalString withGtk "true"; + GUI = lib.optionalString withGtk "true"; NIX_CFLAGS_COMPILE = "-msse3"; diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix index 0433a7a0718..2844badc730 100644 --- a/pkgs/os-specific/linux/ply/default.nix +++ b/pkgs/os-specific/linux/ply/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, p7zip, rsync }: -assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.0"; +assert kernel != null -> lib.versionAtLeast kernel.version "4.0"; let version = "1.0.beta1-9e810b1"; diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index e685402d473..17723983c69 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, coreutils, gnugrep, util-linux, kmod +{ lib, stdenv, fetchurl, coreutils, gnugrep, util-linux, kmod , procps, kbd, dbus }: let - binPath = stdenv.lib.makeBinPath + binPath = lib.makeBinPath [ coreutils gnugrep util-linux kmod procps kbd dbus ]; - sbinPath = stdenv.lib.makeSearchPathOutput "bin" "sbin" + sbinPath = lib.makeSearchPathOutput "bin" "sbin" [ procps ]; in @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://pm-utils.freedesktop.org/wiki/"; description = "A small collection of scripts that handle suspend and resume on behalf of HAL"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix index 01624bff535..0f65e0278ca 100644 --- a/pkgs/os-specific/linux/pmount/default.nix +++ b/pkgs/os-specific/linux/pmount/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, intltool, ntfs3g, util-linux +{ lib, stdenv, fetchurl, intltool, ntfs3g, util-linux , mediaDir ? "/media/" , lockDir ? "/var/lock/pmount" , whiteList ? "/etc/pmount.allow" }: # constraint mention in the configure.ac -assert stdenv.lib.hasSuffix "/" mediaDir; +assert lib.hasSuffix "/" mediaDir; stdenv.mkDerivation rec { pname = "pmount"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://bazaar.launchpad.net/~fourmond/pmount/main/files"; description = "Mount removable devices as normal user"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/pommed-light/default.nix b/pkgs/os-specific/linux/pommed-light/default.nix index 31697823e52..e5e8ea2feea 100644 --- a/pkgs/os-specific/linux/pommed-light/default.nix +++ b/pkgs/os-specific/linux/pommed-light/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pciutils , libconfuse @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/bytbox/pommed-light"; platforms = [ "x86_64-linux" ]; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index a8733ac1f8a..ad5b664b09a 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gettext libnl ncurses pciutils zlib ]; - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ( + patches = lib.optional stdenv.hostPlatform.isMusl ( fetchpatch { name = "strerror_r.patch"; url = "https://git.alpinelinux.org/aports/plain/main/powertop/strerror_r.patch?id=3b9214d436f1611f297b01f72469d66bfe729d6e"; diff --git a/pkgs/os-specific/linux/pps-tools/default.nix b/pkgs/os-specific/linux/pps-tools/default.nix index fd5225c5cfe..146c9457ed3 100644 --- a/pkgs/os-specific/linux/pps-tools/default.nix +++ b/pkgs/os-specific/linux/pps-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { baseName = "pps-tools"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { rm -rf $out/usr/ ''; - meta = with stdenv.lib;{ + meta = with lib;{ description = "User-space tools for LinuxPPS"; homepage = "http://linuxpps.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 14e43b09e30..431e0ed58b1 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ''; libPath = with xorg; - stdenv.lib.makeLibraryPath ([ stdenv.cc.cc libXrandr libXext libX11 libXcomposite libXinerama ] + lib.makeLibraryPath ([ stdenv.cc.cc libXrandr libXext libX11 libXcomposite libXinerama ] ++ lib.optionals (!libsOnly) [ libXi glib dbus-glib zlib ]); diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index 3e03ec4ea67..0902ce3d612 100644 --- a/pkgs/os-specific/linux/psmisc/default.nix +++ b/pkgs/os-specific/linux/psmisc/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake gettext ]; buildInputs = [ ncurses ]; - preConfigure = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + preConfigure = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' # Goes past the rpl_malloc linking failure export ac_cv_func_malloc_0_nonnull=yes export ac_cv_func_realloc_0_nonnull=yes diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/os-specific/linux/roccat-tools/default.nix index 766216f07d9..d30c1bdf19b 100644 --- a/pkgs/os-specific/linux/roccat-tools/default.nix +++ b/pkgs/os-specific/linux/roccat-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gettext +{ lib, stdenv, fetchurl, cmake, pkgconfig, gettext , dbus, dbus-glib, libgaminggear, libgudev, lua , harfbuzz }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "Tools to configure ROCCAT devices"; homepage = "http://roccat.sourceforge.net/"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/rtl8192eu/default.nix b/pkgs/os-specific/linux/rtl8192eu/default.nix index c6527ac285d..d921eb71b0e 100644 --- a/pkgs/os-specific/linux/rtl8192eu/default.nix +++ b/pkgs/os-specific/linux/rtl8192eu/default.nix @@ -34,8 +34,8 @@ in stdenv.mkDerivation rec { meta = { description = "Realtek rtl8192eu driver"; homepage = "https://github.com/Mange/rtl8192eu-linux-driver"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; maintainers = with maintainers; [ troydm ]; }; } diff --git a/pkgs/os-specific/linux/rtl8723bs/default.nix b/pkgs/os-specific/linux/rtl8723bs/default.nix index 323d6a82073..056fd40d252 100644 --- a/pkgs/os-specific/linux/rtl8723bs/default.nix +++ b/pkgs/os-specific/linux/rtl8723bs/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, nukeReferences, kernel }: -with stdenv.lib; +{ lib, stdenv, fetchFromGitHub, nukeReferences, kernel }: +with lib; stdenv.mkDerivation rec { name = "rtl8723bs-${kernel.version}-${version}"; version = "2017-04-06"; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { meta = { description = "Realtek SDIO Wi-Fi driver"; homepage = "https://github.com/hadess/rtl8723bs"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; broken = (! versionOlder kernel.version "4.12"); # Now in kernel staging drivers maintainers = with maintainers; [ elitak ]; }; diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 0051e689794..aeed87d3c19 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ("CONFIG_PLATFORM_I386_PC=" + (if (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) then "y" else "n")) ("CONFIG_PLATFORM_ARM_RPI=" + (if (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) then "y" else "n")) - ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; diff --git a/pkgs/os-specific/linux/rtlwifi_new/default.nix b/pkgs/os-specific/linux/rtlwifi_new/default.nix index 78e5510ad17..ef71cd82541 100644 --- a/pkgs/os-specific/linux/rtlwifi_new/default.nix +++ b/pkgs/os-specific/linux/rtlwifi_new/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { meta = { description = "The newest Realtek rtlwifi codes"; inherit (src.meta) homepage; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ tvorog ]; priority = -1; diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix index 5c4fc762245..42ffea0029a 100644 --- a/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, skawarePackages }: +{ lib, stdenv, skawarePackages }: with skawarePackages; @@ -8,7 +8,7 @@ buildPackage { sha256 = "0wbv02zxaami88xbj2zg63kspz05bbplswg0c6ncb5g9khf52wa4"; description = "A set of minimalistic Linux-specific system utilities"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; outputs = [ "bin" "dev" "doc" "out" ]; diff --git a/pkgs/os-specific/linux/sch_cake/default.nix b/pkgs/os-specific/linux/sch_cake/default.nix index ef2ebaa0362..851a903cf07 100644 --- a/pkgs/os-specific/linux/sch_cake/default.nix +++ b/pkgs/os-specific/linux/sch_cake/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, kernel }: -assert stdenv.lib.versionAtLeast kernel.version "4.4"; +assert lib.versionAtLeast kernel.version "4.4"; stdenv.mkDerivation { name = "sch_cake-2017-07-16"; @@ -30,6 +30,6 @@ stdenv.mkDerivation { license = with licenses; [ bsd3 gpl2 ]; maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; - broken = !stdenv.lib.versionOlder kernel.version "4.13"; + broken = !lib.versionOlder kernel.version "4.13"; }; } diff --git a/pkgs/os-specific/linux/selinux-python/default.nix b/pkgs/os-specific/linux/selinux-python/default.nix index 57aa5d49fac..32ed5bc2e7d 100644 --- a/pkgs/os-specific/linux/selinux-python/default.nix +++ b/pkgs/os-specific/linux/selinux-python/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, python3 +{ lib, stdenv, fetchurl, python3 , libselinux, libsemanage, libsepol, setools }: # this is python3 only because setools only supports python3 -with stdenv.lib; +with lib; with python3.pkgs; stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { "BASHCOMPLETIONDIR=$(out)/share/bash-completion/completions" "PYTHON=python" "PYTHONLIBDIR=$(out)/${python.sitePackages}" - "LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a" + "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a" ]; diff --git a/pkgs/os-specific/linux/selinux-sandbox/default.nix b/pkgs/os-specific/linux/selinux-sandbox/default.nix index 387db08e1d6..a10588bacf1 100644 --- a/pkgs/os-specific/linux/selinux-sandbox/default.nix +++ b/pkgs/os-specific/linux/selinux-sandbox/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, bash, coreutils, python3 +{ lib, stdenv, fetchurl, bash, coreutils, python3 , libcap_ng, policycoreutils, selinux-python, dbus , xorgserver, openbox, xmodmap }: # this is python3 only as it depends on selinux-python -with stdenv.lib; +with lib; with python3.pkgs; stdenv.mkDerivation rec { @@ -58,4 +58,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } - diff --git a/pkgs/os-specific/linux/semodule-utils/default.nix b/pkgs/os-specific/linux/semodule-utils/default.nix index c1243582a51..b76e715dbc2 100644 --- a/pkgs/os-specific/linux/semodule-utils/default.nix +++ b/pkgs/os-specific/linux/semodule-utils/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" - "LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a" + "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a" ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index c0ed4102aaf..bcdb622866b 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, python3 +{ lib, stdenv, fetchFromGitHub, python3 , libsepol, libselinux, checkpolicy , withGraphics ? false }: -with stdenv.lib; +with lib; with python3.pkgs; buildPythonApplication rec { @@ -30,7 +30,7 @@ buildPythonApplication rec { setupPyBuildFlags = [ "-i" ]; preBuild = '' - export SEPOL="${stdenv.lib.getLib libsepol}/lib/libsepol.a" + export SEPOL="${lib.getLib libsepol}/lib/libsepol.a" ''; meta = { diff --git a/pkgs/os-specific/linux/seturgent/default.nix b/pkgs/os-specific/linux/seturgent/default.nix index 8cfc9d35940..a2ffcae3d6b 100644 --- a/pkgs/os-specific/linux/seturgent/default.nix +++ b/pkgs/os-specific/linux/seturgent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, xorgproto, unzip }: +{ lib, stdenv, fetchurl, libX11, xorgproto, unzip }: stdenv.mkDerivation { name = "seturgent-2012-08-17"; @@ -18,10 +18,10 @@ stdenv.mkDerivation { ''; meta = { - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; description = "Set an application's urgency hint (or not)"; - maintainers = [ stdenv.lib.maintainers.yarr ]; + maintainers = [ lib.maintainers.yarr ]; homepage = "https://github.com/hiltjo/seturgent"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index a6d288e0e72..0ff6fa1f341 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { sha256 = "13407r6qwss00504qy740jghb2dzd561la7dhp47rg8w3g8jarpn"; }; - buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam; + buildInputs = lib.optional (pam != null && stdenv.isLinux) pam; nativeBuildInputs = [autoreconfHook libxslt libxml2 docbook_xml_dtd_45 docbook_xsl flex bison itstool ]; @@ -59,9 +59,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-man" "--with-group-name-max-length=32" - ] ++ stdenv.lib.optional (stdenv.hostPlatform.libc != "glibc") "--disable-nscd"; + ] ++ lib.optional (stdenv.hostPlatform.libc != "glibc") "--disable-nscd"; - preBuild = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "glibc") + preBuild = lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc.bin}/bin/nscd ''; diff --git a/pkgs/os-specific/linux/sinit/default.nix b/pkgs/os-specific/linux/sinit/default.nix index 6a479453489..830087013fe 100644 --- a/pkgs/os-specific/linux/sinit/default.nix +++ b/pkgs/os-specific/linux/sinit/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, rcinit ? null, rcshutdown ? null, rcreboot ? null}: +{lib, stdenv, fetchgit, rcinit ? null, rcshutdown ? null, rcreboot ? null}: let s = # Generated upstream information rec { @@ -10,7 +10,7 @@ let rev = "refs/tags/v${version}"; }; buildInputs = [ - (stdenv.lib.getOutput "static" stdenv.cc.libc) + (lib.getOutput "static" stdenv.cc.libc) ]; in stdenv.mkDerivation { @@ -21,16 +21,16 @@ stdenv.mkDerivation { }; makeFlags = ["PREFIX=$(out)"]; preConfigure = "" - + (stdenv.lib.optionalString (rcinit != null) ''sed -re 's@(rcinitcmd[^"]*")[^"]*"@\1${rcinit}"@' -i config.def.h; '') - + (stdenv.lib.optionalString (rcshutdown != null) ''sed -re 's@(rc(reboot|poweroff)cmd[^"]*")[^"]*"@\1${rcshutdown}"@' -i config.def.h; '') - + (stdenv.lib.optionalString (rcreboot != null) ''sed -re 's@(rc(reboot)cmd[^"]*")[^"]*"@\1${rcreboot}"@' -i config.def.h; '') + + (lib.optionalString (rcinit != null) ''sed -re 's@(rcinitcmd[^"]*")[^"]*"@\1${rcinit}"@' -i config.def.h; '') + + (lib.optionalString (rcshutdown != null) ''sed -re 's@(rc(reboot|poweroff)cmd[^"]*")[^"]*"@\1${rcshutdown}"@' -i config.def.h; '') + + (lib.optionalString (rcreboot != null) ''sed -re 's@(rc(reboot)cmd[^"]*")[^"]*"@\1${rcreboot}"@' -i config.def.h; '') ; meta = { inherit (s) version; description = "A very minimal Linux init implementation from suckless.org"; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://tools.suckless.org/sinit"; downloadPage = "https://git.suckless.org/sinit"; }; diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 0398757c57e..4649ff8af56 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { --with-ldb-lib-dir=$out/modules/ldb --with-nscd=${glibc.bin}/sbin/nscd ) - '' + stdenv.lib.optionalString withSudo '' + '' + lib.optionalString withSudo '' configureFlagsArray+=("--with-sudo") ''; diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 0f8702eb6e0..ecbd23e117f 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, cmake, kernel, installShellFiles +{ lib, stdenv, fetchFromGitHub, cmake, kernel, installShellFiles , luajit, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, c-ares, protobuf, grpc }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "sysdig"; version = "0.27.1"; diff --git a/pkgs/os-specific/linux/sysfsutils/default.nix b/pkgs/os-specific/linux/sysfsutils/default.nix index 3b2d54bc83a..4daac076e58 100644 --- a/pkgs/os-specific/linux/sysfsutils/default.nix +++ b/pkgs/os-specific/linux/sysfsutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "sysfsutils-2.1.0"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { filesystem in Linux kernel versions 2.5+ that exposes a system's device tree. ''; - license = with stdenv.lib.licenses; [ gpl2 lgpl21 ]; - platforms = stdenv.lib.platforms.linux; + license = with lib.licenses; [ gpl2 lgpl21 ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index cf263281da2..1b2415dd805 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation { "PERL=perl" "HEXDATE=0x00000000" ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isi686 [ "bios" "efi32" ]; + ++ lib.optionals stdenv.hostPlatform.isi686 [ "bios" "efi32" ]; doCheck = false; # fails. some fail in a sandbox, others require qemu diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 258da07c40b..2d54223edb5 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, bzip2 }: +{ lib, stdenv, fetchurl, gettext, bzip2 }: stdenv.mkDerivation rec { name = "sysstat-12.3.2"; @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://sebastien.godard.pagesperso-orange.fr/"; description = "A collection of performance monitoring tools for Linux (such as sar, iostat and pidstat)"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.eelco ]; }; } diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 2822bffdb51..51ccdd22b11 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -320,7 +320,7 @@ stdenv.mkDerivation { "-Dgcrypt=${lib.boolToString (libgcrypt != null)}" "-Dimportd=${lib.boolToString withImportd}" "-Dlz4=${lib.boolToString withCompression}" - "-Dhomed=${stdenv.lib.boolToString withHomed}" + "-Dhomed=${lib.boolToString withHomed}" "-Dlogind=${lib.boolToString withLogind}" "-Dlocaled=${lib.boolToString withLocaled}" "-Dhostnamed=${lib.boolToString withHostnamed}" diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix index 5d081f2db82..8f9acdf0662 100644 --- a/pkgs/os-specific/linux/sysvinit/default.nix +++ b/pkgs/os-specific/linux/sysvinit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, withoutInitTools ? false }: +{ lib, stdenv, fetchurl, withoutInitTools ? false }: let version = "2.97"; in @@ -26,7 +26,7 @@ stdenv.mkDerivation { mv $out/sbin/killall5 $out/bin ln -sf killall5 $out/bin/pidof '' - + stdenv.lib.optionalString withoutInitTools + + lib.optionalString withoutInitTools '' shopt -s extglob rm -rf $out/sbin/!(sulogin) @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = { homepage = "https://www.nongnu.org/sysvinit/"; description = "Utilities related to booting and shutdown"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/target-isns/default.nix b/pkgs/os-specific/linux/target-isns/default.nix index 32e0669ed54..fdc0c52a0bf 100644 --- a/pkgs/os-specific/linux/target-isns/default.nix +++ b/pkgs/os-specific/linux/target-isns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchFromGitHub, fetchpatch } : +{ lib, stdenv, cmake, fetchFromGitHub, fetchpatch } : stdenv.mkDerivation rec { pname = "target-isns"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "iSNS client for the Linux LIO iSCSI target"; homepage = "https://github.com/open-iscsi/target-isns"; maintainers = [ maintainers.markuskowa ]; diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix index 6502cc9c38e..d2b0bc08071 100644 --- a/pkgs/os-specific/linux/tbs/default.nix +++ b/pkgs/os-specific/linux/tbs/default.nix @@ -58,6 +58,6 @@ in stdenv.mkDerivation { license = licenses.gpl2; maintainers = with maintainers; [ ck3d ]; priority = -1; - broken = stdenv.lib.versionAtLeast kernel.version "4.18"; + broken = lib.versionAtLeast kernel.version "4.18"; }; } diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix index b3d59cf5a6a..92a6b328b2c 100644 --- a/pkgs/os-specific/linux/tcp-wrappers/default.nix +++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libnsl }: +{ fetchurl, lib, stdenv, libnsl }: let vanillaVersion = "7.6.q"; @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { # Fix __BEGIN_DECLS usage (even if it wasn't non-standard, this doesn't include sys/cdefs.h) patches = [ ./cdecls.patch ]; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace Makefile \ --replace '-DNETGROUP' '-DUSE_GETDOMAIN' ''; @@ -70,6 +70,6 @@ in stdenv.mkDerivation rec { homepage = "ftp://ftp.porcupine.org/pub/security/index.html"; license = "BSD-style"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/thunderbolt/default.nix b/pkgs/os-specific/linux/thunderbolt/default.nix index d9817a6c04b..e6cdf69d6d1 100644 --- a/pkgs/os-specific/linux/thunderbolt/default.nix +++ b/pkgs/os-specific/linux/thunderbolt/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , boost , cmake , fetchFromGitHub @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { meta = { description = "Thunderbolt(TM) user-space components"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.ryantrinkle ]; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.ryantrinkle ]; homepage = "https://01.org/thunderbolt-sw"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix index 5e0e9c539ea..d9b4333d249 100644 --- a/pkgs/os-specific/linux/tp_smapi/default.nix +++ b/pkgs/os-specific/linux/tp_smapi/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "IBM ThinkPad hardware functions driver"; homepage = "https://github.com/evgeni/tp_smapi"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = [ ]; # driver is only ment for linux thinkpads i think bellow platforms should cover it. platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/os-specific/linux/tpacpi-bat/default.nix b/pkgs/os-specific/linux/tpacpi-bat/default.nix index bb6d51669e6..5512eed63ab 100644 --- a/pkgs/os-specific/linux/tpacpi-bat/default.nix +++ b/pkgs/os-specific/linux/tpacpi-bat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, kmod, coreutils }: +{ lib, stdenv, fetchFromGitHub, perl, kmod, coreutils }: # Requires the acpi_call kernel module in order to run. stdenv.mkDerivation rec { @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { ''; meta = { - maintainers = [stdenv.lib.maintainers.orbekk]; - platforms = stdenv.lib.platforms.linux; + maintainers = [lib.maintainers.orbekk]; + platforms = lib.platforms.linux; description = "Tool to set battery charging thesholds on Lenovo Thinkpad"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; }; } diff --git a/pkgs/os-specific/linux/tunctl/default.nix b/pkgs/os-specific/linux/tunctl/default.nix index c20c3e98f55..549a607b152 100644 --- a/pkgs/os-specific/linux/tunctl/default.nix +++ b/pkgs/os-specific/linux/tunctl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "tunctl-1.5"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { homepage = "http://tunctl.sourceforge.net/"; description = "Utility to set up and maintain TUN/TAP network interfaces"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index 03798b9fe5c..7c95a98372d 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -39,7 +39,7 @@ let UCLIBC_SUSV4_LEGACY y UCLIBC_HAS_THREADS_NATIVE y KERNEL_HEADERS "${linuxHeaders}/include" - '' + stdenv.lib.optionalString (stdenv.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) '' + '' + lib.optionalString (stdenv.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) '' CONFIG_ARM_EABI y ARCH_WANTS_BIG_ENDIAN n ARCH_BIG_ENDIAN n @@ -83,7 +83,7 @@ stdenv.mkDerivation { makeFlags = [ "ARCH=${stdenv.hostPlatform.parsed.cpu.name}" "VERBOSE=1" - ] ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "CROSS=${stdenv.cc.targetPrefix}" ]; diff --git a/pkgs/os-specific/linux/udisks-glue/default.nix b/pkgs/os-specific/linux/udisks-glue/default.nix index 60a1f8a619d..d304bd2533f 100644 --- a/pkgs/os-specific/linux/udisks-glue/default.nix +++ b/pkgs/os-specific/linux/udisks-glue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, automake, autoconf, udisks1, dbus-glib, glib, libconfuse }: +{ lib, stdenv, fetchurl, pkgconfig, automake, autoconf, udisks1, dbus-glib, glib, libconfuse }: stdenv.mkDerivation { name = "udisks-glue-1.3.5"; @@ -16,9 +16,9 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/fernandotcl/udisks-glue"; description = "A tool to associate udisks events to user-defined actions"; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [pSub]; - license = stdenv.lib.licenses.bsd2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [pSub]; + license = lib.licenses.bsd2; broken = true; hydraPlatforms = []; }; diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 1152ab7ca1e..b2b65de1078 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "01wx2x8xyal595dhdih7rva2bz7gqzgwdp56gi0ikjdzayx17wcf"; }; - outputs = [ "out" "man" "dev" ] ++ stdenv.lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "devdoc"; + outputs = [ "out" "man" "dev" ] ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "devdoc"; patches = [ (substituteAll { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { }) (substituteAll { src = ./force-path.patch; - path = stdenv.lib.makeBinPath [ + path = lib.makeBinPath [ btrfs-progs coreutils dosfstools e2fsprogs exfat f2fs-tools nilfs-utils xfsprogs ntfs3g parted util-linux ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { gtk-doc libxslt docbook_xml_dtd_412 docbook_xml_dtd_43 docbook_xsl ]; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace udisks/udisksclient.c \ --replace 'defined( __GNUC_PREREQ)' 1 \ --replace '__GNUC_PREREQ(4,6)' 1 @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { preConfigure = "NOCONFIGURE=1 ./autogen.sh"; configureFlags = [ - (stdenv.lib.enableFeature (stdenv.buildPlatform == stdenv.hostPlatform) "gtk-doc") + (lib.enableFeature (stdenv.buildPlatform == stdenv.hostPlatform) "gtk-doc") "--localstatedir=/var" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-udevdir=$(out)/lib/udev" diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 3a5fb4fa261..9a01d3980e8 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { udev systemd ] - ++ stdenv.lib.optional useIMobileDevice libimobiledevice + ++ lib.optional useIMobileDevice libimobiledevice ; propagatedBuildInputs = [ diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/os-specific/linux/usermount/default.nix index 85f769d9dba..c3c3c87dafc 100644 --- a/pkgs/os-specific/linux/usermount/default.nix +++ b/pkgs/os-specific/linux/usermount/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, dbus, libnotify, udisks2, gdk-pixbuf }: +{ lib, stdenv, fetchgit, pkgconfig, dbus, libnotify, udisks2, gdk-pixbuf }: stdenv.mkDerivation { name = "usermount-0.1"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/tom5760/usermount"; description = "A simple tool to automatically mount removable drives using UDisks2 and D-Bus"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 590e16f7993..41ab1a0f539 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchzip, kernel, perl, wireguard-tools, bc }: # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements -assert stdenv.lib.versionAtLeast kernel.version "3.10"; +assert lib.versionAtLeast kernel.version "3.10"; # wireguard upstreamed since 5.6 https://lists.zx2c4.com/pipermail/wireguard/2019-December/004704.html -assert stdenv.lib.versionOlder kernel.version "5.6"; +assert lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; diff --git a/pkgs/os-specific/linux/wireless-tools/default.nix b/pkgs/os-specific/linux/wireless-tools/default.nix index 687bb7647cf..fbe5d95e2a6 100644 --- a/pkgs/os-specific/linux/wireless-tools/default.nix +++ b/pkgs/os-specific/linux/wireless-tools/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "wireless-tools"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; meta = { - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 7703ffc0e4f..49fd957de1a 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -2,7 +2,7 @@ , dbus, readline ? null, pcsclite ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "2.9"; @@ -81,8 +81,8 @@ stdenv.mkDerivation rec { cat -n .config substituteInPlace Makefile --replace /usr/local $out export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE \ - -I$(echo "${stdenv.lib.getDev libnl}"/include/libnl*/) \ - -I${stdenv.lib.getDev pcsclite}/include/PCSC/" + -I$(echo "${lib.getDev libnl}"/include/libnl*/) \ + -I${lib.getDev pcsclite}/include/PCSC/" ''; buildInputs = [ openssl libnl dbus readline pcsclite ]; diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/os-specific/linux/x86info/default.nix index 9b745315b1c..dbda35670f6 100644 --- a/pkgs/os-specific/linux/x86info/default.nix +++ b/pkgs/os-specific/linux/x86info/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pciutils, python}: +{lib, stdenv, fetchurl, pciutils, python}: stdenv.mkDerivation rec { version = "1.30"; @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { x86info will identify all Intel/AMD/Centaur/Cyrix/VIA CPUs. It leverages the cpuid kernel module where possible. it supports parsing model specific registers (MSRs) via the msr kernel module. it will approximate processor - frequency, and identify the cache sizes and layout. + frequency, and identify the cache sizes and layout. ''; platforms = [ "i686-linux" "x86_64-linux" ]; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "http://codemonkey.org.uk/projects/x86info/"; - maintainers = with stdenv.lib.maintainers; [jcumming]; + maintainers = with lib.maintainers; [jcumming]; }; } diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 59719922987..85990a6989d 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchpatch , autoreconfHook269, util-linux, nukeReferences, coreutils , perl, buildPackages , configFile ? "all" @@ -16,7 +16,7 @@ , enablePython ? true }: -with stdenv.lib; +with lib; let buildKernel = any (n: n == configFile) [ "kernel" "all" ]; buildUser = any (n: n == configFile) [ "user" "all" ]; @@ -32,7 +32,7 @@ let versionAtLeast kernel.version incompatibleKernelVersion then throw '' Linux v${kernel.version} is not yet supported by zfsonlinux v${version}. - ${stdenv.lib.optionalString (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."} + ${lib.optionalString (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."} '' else stdenv.mkDerivation { name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/pkgs/os-specific/windows/cygwin-setup/default.nix index 16b07507695..aec605111b5 100644 --- a/pkgs/os-specific/windows/cygwin-setup/default.nix +++ b/pkgs/os-specific/windows/cygwin-setup/default.nix @@ -2,7 +2,7 @@ , zlib, bzip2, lzma, libgcrypt }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "cygwin-setup"; diff --git a/pkgs/os-specific/windows/default.nix b/pkgs/os-specific/windows/default.nix index 7f1634d5c0b..7c8041206ca 100644 --- a/pkgs/os-specific/windows/default.nix +++ b/pkgs/os-specific/windows/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildPackages +{ lib, stdenv, buildPackages , newScope, overrideCC, crossLibcStdenv, libcCross }: -stdenv.lib.makeScope newScope (self: with self; { +lib.makeScope newScope (self: with self; { cygwinSetup = callPackage ./cygwin-setup { }; diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index 1f42330be35..0d3ab81135c 100644 --- a/pkgs/os-specific/windows/jom/default.nix +++ b/pkgs/os-specific/windows/jom/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation { # cmakeFlags = [ "-DWIN32=1" "-DCMAKE_SYSTEM_NAME=Windows" "-DCMAKE_RC_COMPILER=${stdenv.cc.targetPrefix}windres" ]; - preBuild = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + preBuild = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' export NIX_CROSS_CFLAGS_COMPILE=-fpermissive ''; meta = { homepage = "http://qt-project.org/wiki/jom"; description = "Clone of nmake supporting multiple independent commands in parallel"; - license = stdenv.lib.licenses.gpl2Plus; # Explicitly, GPLv2 or GPLv3, but not later. + license = lib.licenses.gpl2Plus; # Explicitly, GPLv2 or GPLv3, but not later. }; } diff --git a/pkgs/os-specific/windows/libgnurx/default.nix b/pkgs/os-specific/windows/libgnurx/default.nix index fedfea15ccb..eb4ae8dad00 100644 --- a/pkgs/os-specific/windows/libgnurx/default.nix +++ b/pkgs/os-specific/windows/libgnurx/default.nix @@ -11,6 +11,6 @@ in stdenv.mkDerivation rec { }; meta = { - platforms = stdenv.lib.platforms.windows; + platforms = lib.platforms.windows; }; } diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 6c17e0718bb..838c39fc3c1 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -25,6 +25,6 @@ in stdenv.mkDerivation { hardeningDisable = [ "stackprotector" "fortify" ]; meta = { - platforms = stdenv.lib.platforms.windows; + platforms = lib.platforms.windows; }; } diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix index 4dc886915b7..f57df3192cc 100644 --- a/pkgs/os-specific/windows/wxMSW-2.8/default.nix +++ b/pkgs/os-specific/windows/wxMSW-2.8/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { passthru = {inherit compat24 compat26 unicode;}; meta = { - platforms = stdenv.lib.platforms.windows; + platforms = lib.platforms.windows; broken = true; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 182c6f90454..f1e98773022 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19343,7 +19343,7 @@ in linuxPackages_custom = { version, src, configfile, allowImportFromDerivation ? true }: recurseIntoAttrs (linuxPackagesFor (pkgs.linuxManualConfig { - inherit version src configfile stdenv allowImportFromDerivation; + inherit version src configfile lib stdenv allowImportFromDerivation; })); # This serves as a test for linuxPackages_custom @@ -19374,7 +19374,7 @@ in kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides; in linuxPackagesFor (kernel.override { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { - inherit stdenv; + inherit lib stdenv; inherit (kernel) version; }; kernelPatches = kernel.kernelPatches ++ [ From 4b385fc9b3fbcb207faaa252cfbe9e0e1f7c8d64 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Sun, 17 Jan 2021 16:39:35 +0000 Subject: [PATCH 27/52] maintainers: add baloo Signed-off-by: Arthur Gautier --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 50efa11c97c..438c5de5403 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -970,6 +970,12 @@ email = "sivaraman.balaji@gmail.com"; name = "Balaji Sivaraman"; }; + baloo = { + email = "nixpkgs@superbaloo.net"; + github = "baloo"; + githubId = 59060; + name = "Arthur Gautier"; + }; balsoft = { email = "balsoft75@gmail.com"; github = "balsoft"; From 8af74b34860c156167edff8330147cfb59cb15da Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Jan 2021 17:50:44 +0100 Subject: [PATCH 28/52] python3Packages.pypck: 0.7.8 -> 0.7.9 --- pkgs/development/python-modules/pypck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index f8e6cc96aff..3d39b3516b6 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pypck"; - version = "0.7.8"; + version = "0.7.9"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "alengwenus"; repo = pname; rev = version; - sha256 = "06yqyqpzpypid27z31prvsp7nzpjqzn7gjlfqwjhhxl8fdgh8hkr"; + sha256 = "0clpi6bplzw7qg2m0hgwqr71zwxrh901gwprhd1yjykn30njp5bw"; }; checkInputs = [ From 3d24a90c3a0f4f2a01413e26b282114c594a3475 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Jan 2021 17:57:59 +0100 Subject: [PATCH 29/52] python3Packages.digital-ocean: 1.15.0 -> 1.16.0 --- pkgs/development/python-modules/digitalocean/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/digitalocean/default.nix b/pkgs/development/python-modules/digitalocean/default.nix index f052d8f978e..ad8a3f7e146 100644 --- a/pkgs/development/python-modules/digitalocean/default.nix +++ b/pkgs/development/python-modules/digitalocean/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "python-digitalocean"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "koalalorenzo"; repo = "python-digitalocean"; rev = "v${version}"; - sha256 = "1pz15mh72i992p63grwzqn2bbp6sm37zcp4f0fy1z7rsargwsbcz"; + sha256 = "16fxlfpisj4rcj9dvlifs6bpx42a0sn9b07bnyzwrbhi6nfvkd2g"; }; propagatedBuildInputs = [ From 533baea7ab84001c4b153a6a68d764907282909e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Jan 2021 18:08:35 +0100 Subject: [PATCH 30/52] python3Packages.digital-ocean: update meta and add pythonImportsCheck --- .../python-modules/digitalocean/default.nix | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/digitalocean/default.nix b/pkgs/development/python-modules/digitalocean/default.nix index ad8a3f7e146..7ba0d106e25 100644 --- a/pkgs/development/python-modules/digitalocean/default.nix +++ b/pkgs/development/python-modules/digitalocean/default.nix @@ -1,4 +1,5 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub , fetchPypi , isPy3k @@ -8,7 +9,6 @@ , pytestCheckHook , requests , responses -, lib, stdenv }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "koalalorenzo"; - repo = "python-digitalocean"; + repo = pname; rev = "v${version}"; sha256 = "16fxlfpisj4rcj9dvlifs6bpx42a0sn9b07bnyzwrbhi6nfvkd2g"; }; @@ -33,7 +33,7 @@ buildPythonPackage rec { pytest pytestCheckHook responses - ] ++ stdenv.lib.optionals (!isPy3k) [ + ] ++ lib.optionals (!isPy3k) [ mock ]; @@ -41,13 +41,12 @@ buildPythonPackage rec { cd digitalocean ''; + pythonImportsCheck = [ "digitalocean" ]; + meta = with lib; { - description = "digitalocean.com API to manage Droplets and Images"; - homepage = "https://pypi.python.org/pypi/python-digitalocean"; - license = licenses.lgpl3; - maintainers = with maintainers; [ - kiwi - teh - ]; + description = "Python API to manage Digital Ocean Droplets and Images"; + homepage = "https://github.com/koalalorenzo/python-digitalocean"; + license = with licenses; [ lgpl3Only ]; + maintainers = with maintainers; [ kiwi teh ]; }; } From ece85b6976d0c8924e31f37f81cd91bdf2f3322d Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Sun, 17 Jan 2021 18:52:04 +0100 Subject: [PATCH 31/52] albert: 0.16.1 -> 0.17.2 --- pkgs/applications/misc/albert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 9f4fc95df77..c862872a793 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "albert"; - version = "0.16.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${version}"; - sha256 = "04sr35fqz66i24lv7r2p9qfqxs55i8xpj7aam0v9yakcr33lf55a"; + sha256 = "0lpp8rqx5b6rwdpcdldfdlw5327harr378wnfbc6rp3ajmlb4p7w"; fetchSubmodules = true; }; From cf2a67fef385d021ced8a63048c0cf88f2d8dbc5 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 17 Jan 2021 19:11:59 +0100 Subject: [PATCH 32/52] pkgs/development: stdenv.lib -> lib this takes care of the following folders in pkgs/development: * arduino * chez-modules * go-packages * guile-modules * idris-modules * perl-modules * r-modules * ruby-modules --- pkgs/development/arduino/arduino-ci/default.nix | 2 +- pkgs/development/arduino/arduino-cli/default.nix | 2 +- pkgs/development/arduino/arduino-core/default.nix | 12 ++++++------ pkgs/development/arduino/arduino-mk/default.nix | 11 +++++------ pkgs/development/arduino/ino/default.nix | 10 +++++----- .../chez-modules/chez-matchable/default.nix | 8 ++++---- pkgs/development/chez-modules/chez-mit/default.nix | 8 ++++---- .../chez-modules/chez-scmutils/default.nix | 8 ++++---- pkgs/development/chez-modules/chez-srfi/default.nix | 8 ++++---- pkgs/development/go-packages/generic/default.nix | 2 +- .../guile-modules/guile-gnome/default.nix | 2 +- .../guile-modules/guile-reader/default.nix | 1 - pkgs/development/idris-modules/with-packages.nix | 6 +++--- .../perl-modules/WWW-YoutubeViewer/default.nix | 12 ++++++------ pkgs/development/perl-modules/maatkit/default.nix | 6 +++--- .../perl-modules/strip-nondeterminism/default.nix | 4 ++-- pkgs/development/r-modules/generic-builder.nix | 8 ++++---- pkgs/development/ruby-modules/gem-config/default.nix | 6 +++--- 18 files changed, 57 insertions(+), 59 deletions(-) diff --git a/pkgs/development/arduino/arduino-ci/default.nix b/pkgs/development/arduino/arduino-ci/default.nix index 2f5d4bedc7f..fe28a962e10 100644 --- a/pkgs/development/arduino/arduino-ci/default.nix +++ b/pkgs/development/arduino/arduino-ci/default.nix @@ -2,7 +2,7 @@ let - runtimePath = stdenv.lib.makeBinPath [ + runtimePath = lib.makeBinPath [ arduino-cli python3 # required by the esp8266 core ]; diff --git a/pkgs/development/arduino/arduino-cli/default.nix b/pkgs/development/arduino/arduino-cli/default.nix index f3cc8341777..95586d064d9 100644 --- a/pkgs/development/arduino/arduino-cli/default.nix +++ b/pkgs/development/arduino/arduino-cli/default.nix @@ -21,7 +21,7 @@ let buildFlagsArray = [ "-ldflags=-s -w -X github.com/arduino/arduino-cli/version.versionString=${version} -X github.com/arduino/arduino-cli/version.commit=unknown" - ] ++ stdenv.lib.optionals stdenv.isLinux [ "-extldflags '-static'" ]; + ] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ]; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index 081c7c7c638..4c440ab97db 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -47,7 +47,7 @@ let ; # abiVersion 6 is default, but we need 5 for `avrdude_bin` executable ncurses5 = ncurses.override { abiVersion = "5"; }; - teensy_libpath = stdenv.lib.makeLibraryPath [ + teensy_libpath = lib.makeLibraryPath [ atk cairo expat @@ -76,7 +76,7 @@ let else throw "${stdenv.hostPlatform.system} is not supported in teensy"; flavor = (if withTeensyduino then "teensyduino" else "arduino") - + stdenv.lib.optionalString (!withGui) "-core"; + + lib.optionalString (!withGui) "-core"; in stdenv.mkDerivation rec { version = "1.8.13"; @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { zlib ncurses5 readline - ] ++ stdenv.lib.optionals withTeensyduino [ upx ]; + ] ++ lib.optionals withTeensyduino [ upx ]; downloadSrcList = builtins.attrValues externalDownloads; downloadDstList = builtins.attrNames externalDownloads; @@ -165,7 +165,7 @@ stdenv.mkDerivation rec { cp -r ./build/linux/work/* "$out/share/arduino/" echo -n ${version} > $out/share/arduino/lib/version.txt - ${stdenv.lib.optionalString withGui '' + ${lib.optionalString withGui '' mkdir -p $out/bin substituteInPlace $out/share/arduino/arduino \ --replace "JAVA=java" "JAVA=$javaPath/java" \ @@ -180,7 +180,7 @@ stdenv.mkDerivation rec { --replace '' "$out/share/arduino/icons/128x128/apps/arduino.png" ''} - ${stdenv.lib.optionalString withTeensyduino '' + ${lib.optionalString withTeensyduino '' # Back up the original jars mv $out/share/arduino/lib/arduino-core.jar $out/share/arduino/lib/arduino-core.jar.bak mv $out/share/arduino/lib/pde.jar $out/share/arduino/lib/pde.jar.bak @@ -235,7 +235,7 @@ stdenv.mkDerivation rec { mkdir $out/lib/ ln -s ${lib.makeLibraryPath [ ncurses5 ]}/libtinfo.so.5 $out/lib/libtinfo.so.5 - ${stdenv.lib.optionalString withTeensyduino '' + ${lib.optionalString withTeensyduino '' # Patch the Teensy loader binary patchelf --debug \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ diff --git a/pkgs/development/arduino/arduino-mk/default.nix b/pkgs/development/arduino/arduino-mk/default.nix index cd3dd32f380..d5f506038ca 100644 --- a/pkgs/development/arduino/arduino-mk/default.nix +++ b/pkgs/development/arduino/arduino-mk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, installShellFiles }: +{ stdenv, lib, fetchFromGitHub, python3Packages, installShellFiles }: stdenv.mkDerivation rec { version = "1.6.0"; @@ -22,12 +22,11 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; - meta = { + meta = with lib; { description = "Makefile for Arduino sketches"; homepage = "https://github.com/sudar/Arduino-Makefile"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.eyjhb ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.lgpl21; + maintainers = [ maintainers.eyjhb ]; + platforms = platforms.unix; }; } - diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix index c51d3f89d07..c536ed8c2c0 100644 --- a/pkgs/development/arduino/ino/default.nix +++ b/pkgs/development/arduino/ino/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages, picocom +{ stdenv, lib, fetchurl, python2Packages, picocom , avrdude, arduino-core }: python2Packages.buildPythonApplication rec { @@ -36,11 +36,11 @@ python2Packages.buildPythonApplication rec { --replace "'-C', self.e['avrdude.conf']," "" ''; - meta = { + meta = with lib; { description = "Command line toolkit for working with Arduino hardware"; homepage = "http://inotool.org/"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ antono ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ antono ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/chez-modules/chez-matchable/default.nix b/pkgs/development/chez-modules/chez-matchable/default.nix index d3f4e3fbe63..d66f6133fb7 100644 --- a/pkgs/development/chez-modules/chez-matchable/default.nix +++ b/pkgs/development/chez-modules/chez-matchable/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, chez }: +{ stdenv, lib, fetchFromGitHub, chez }: stdenv.mkDerivation rec { pname = "chez-matchable"; @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { doCheck = false; - meta = { + meta = with lib; { description = "This is a Library for ChezScheme providing the protable hygenic pattern matcher by Alex Shinn"; homepage = "https://github.com/fedeinthemix/chez-matchable/"; - maintainers = [ stdenv.lib.maintainers.jitwit ]; - license = stdenv.lib.licenses.publicDomain; + maintainers = [ maintainers.jitwit ]; + license = licenses.publicDomain; }; } diff --git a/pkgs/development/chez-modules/chez-mit/default.nix b/pkgs/development/chez-modules/chez-mit/default.nix index 63d6ef2c676..b3a2a44d278 100644 --- a/pkgs/development/chez-modules/chez-mit/default.nix +++ b/pkgs/development/chez-modules/chez-mit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, chez, chez-srfi }: +{ stdenv, lib, fetchgit, chez, chez-srfi }: stdenv.mkDerivation { pname = "chez-mit"; @@ -22,11 +22,11 @@ stdenv.mkDerivation { doCheck = false; - meta = { + meta = with lib; { description = "This is a MIT/GNU Scheme compatibility library for Chez Scheme"; homepage = "https://github.com/fedeinthemix/chez-mit/"; - maintainers = [ stdenv.lib.maintainers.jitwit ]; - license = stdenv.lib.licenses.free; + maintainers = [ maintainers.jitwit ]; + license = licenses.free; }; } diff --git a/pkgs/development/chez-modules/chez-scmutils/default.nix b/pkgs/development/chez-modules/chez-scmutils/default.nix index 19fe43da49e..39c1f73003e 100644 --- a/pkgs/development/chez-modules/chez-scmutils/default.nix +++ b/pkgs/development/chez-modules/chez-scmutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, chez, chez-srfi, chez-mit }: +{ stdenv, lib, fetchgit, chez, chez-srfi, chez-mit }: stdenv.mkDerivation { pname = "chez-scmutils"; @@ -22,11 +22,11 @@ stdenv.mkDerivation { doCheck = false; - meta = { + meta = with lib; { description = "This is a port of the ‘MIT Scmutils’ library to Chez Scheme"; homepage = "https://github.com/fedeinthemix/chez-scmutils/"; - maintainers = [ stdenv.lib.maintainers.jitwit ]; - license = stdenv.lib.licenses.gpl3; + maintainers = [ maintainers.jitwit ]; + license = licenses.gpl3; }; } diff --git a/pkgs/development/chez-modules/chez-srfi/default.nix b/pkgs/development/chez-modules/chez-srfi/default.nix index f055a14884a..1d8579ae106 100644 --- a/pkgs/development/chez-modules/chez-srfi/default.nix +++ b/pkgs/development/chez-modules/chez-srfi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, chez }: +{ stdenv, lib, fetchgit, chez }: stdenv.mkDerivation { pname = "chez-srfi"; @@ -22,11 +22,11 @@ stdenv.mkDerivation { doCheck = false; - meta = { + meta = with lib; { description = "This package provides a collection of SRFI libraries for Chez Scheme"; homepage = "https://github.com/fedeinthemix/chez-srfi/"; - maintainers = [ stdenv.lib.maintainers.jitwit ]; - license = stdenv.lib.licenses.free; + maintainers = [ maintainers.jitwit ]; + license = licenses.free; }; } diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix index 3f85b6e0268..0a1b3a9a294 100644 --- a/pkgs/development/go-packages/generic/default.nix +++ b/pkgs/development/go-packages/generic/default.nix @@ -83,7 +83,7 @@ let GO111MODULE = "off"; GOFLAGS = lib.optionals (!allowGoReference) [ "-trimpath" ]; - GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); + GOARM = toString (lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); configurePhase = args.configurePhase or '' runHook preConfigure diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix index a02da829c7f..e1ae323707e 100644 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/pkgs/development/guile-modules/guile-gnome/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ texinfo guile gwrap pkgconfig gconf glib gnome_vfs gtk2 libglade libgnome libgnomecanvas libgnomeui pango guile-cairo - ] ++ stdenv.lib.optional doCheck guile-lib; + ] ++ lib.optional doCheck guile-lib; # The test suite tries to open an X display, which fails. doCheck = false; diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix index 47ef15ef4e2..ac5358bade9 100644 --- a/pkgs/development/guile-modules/guile-reader/default.nix +++ b/pkgs/development/guile-modules/guile-reader/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch, pkgconfig , gperf, guile, guile-lib, libffi }: -with stdenv.lib; stdenv.mkDerivation rec { pname = "guile-reader"; diff --git a/pkgs/development/idris-modules/with-packages.nix b/pkgs/development/idris-modules/with-packages.nix index 47136839d01..72b9067b691 100644 --- a/pkgs/development/idris-modules/with-packages.nix +++ b/pkgs/development/idris-modules/with-packages.nix @@ -1,10 +1,10 @@ # Build a version of idris with a set of packages visible # packages: The packages visible to idris -{ stdenv, idris, symlinkJoin, makeWrapper }: packages: +{ stdenv, lib, idris, symlinkJoin, makeWrapper }: packages: -let paths = stdenv.lib.closePropagation packages; +let paths = lib.closePropagation packages; in -stdenv.lib.appendToName "with-packages" (symlinkJoin { +lib.appendToName "with-packages" (symlinkJoin { inherit (idris) name; diff --git a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix index ccc59980dd1..17ec8ab48b5 100644 --- a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix +++ b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPerlPackage, shortenPerlShebang, LWP, LWPProtocolHttps, DataDump, JSON }: +{ stdenv, lib, fetchFromGitHub, buildPerlPackage, shortenPerlShebang, LWP, LWPProtocolHttps, DataDump, JSON }: buildPerlPackage rec { pname = "WWW-YoutubeViewer"; @@ -11,21 +11,21 @@ buildPerlPackage rec { sha256 = "16p0sa91h0zpqdpqmy348g6b9qj5f6qrbzrljn157vk00cg6mx18"; }; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; propagatedBuildInputs = [ LWP LWPProtocolHttps DataDump JSON ]; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/youtube-viewer ''; - meta = { + meta = with lib; { description = "A lightweight application for searching and streaming videos from YouTube"; homepage = "https://github.com/trizen/youtube-viewer"; - maintainers = with stdenv.lib.maintainers; [ woffs ]; - license = with stdenv.lib.licenses; [ artistic2 ]; + maintainers = with maintainers; [ woffs ]; + license = with licenses; [ artistic2 ]; }; } diff --git a/pkgs/development/perl-modules/maatkit/default.nix b/pkgs/development/perl-modules/maatkit/default.nix index e0a1a45cd44..29bcc9bab25 100644 --- a/pkgs/development/perl-modules/maatkit/default.nix +++ b/pkgs/development/perl-modules/maatkit/default.nix @@ -1,4 +1,4 @@ -{buildPerlPackage, stdenv, fetchurl, DBDmysql}: +{buildPerlPackage, lib, stdenv, fetchurl, DBDmysql}: buildPerlPackage { pname = "maatkit"; @@ -27,7 +27,7 @@ buildPerlPackage { done '' ; - meta = { + meta = with lib; { description = "Database toolkit"; longDescription = '' You can use Maatkit to prove replication is working correctly, fix @@ -37,7 +37,7 @@ buildPerlPackage { In addition to MySQL, there is support for PostgreSQL, Memcached, and a growing variety of other databases and technologies. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; homepage = "http://www.maatkit.org/"; }; } diff --git a/pkgs/development/perl-modules/strip-nondeterminism/default.nix b/pkgs/development/perl-modules/strip-nondeterminism/default.nix index 80e81cad74d..20463ed2425 100644 --- a/pkgs/development/perl-modules/strip-nondeterminism/default.nix +++ b/pkgs/development/perl-modules/strip-nondeterminism/default.nix @@ -17,7 +17,7 @@ buildPerlPackage rec { # stray test failure doCheck = false; - nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ shortenPerlShebang ]; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ shortenPerlShebang ]; buildInputs = [ ArchiveZip ArchiveCpio file ]; perlPostHook = '' @@ -26,7 +26,7 @@ buildPerlPackage rec { rm $out/share/man/man1/dh_strip_nondeterminism.1.gz ''; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/strip-nondeterminism ''; diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix index 3adb84a0ba5..1e96a64a5e2 100644 --- a/pkgs/development/r-modules/generic-builder.nix +++ b/pkgs/development/r-modules/generic-builder.nix @@ -1,14 +1,14 @@ -{ stdenv, R, libcxx, xvfb_run, util-linux, Cocoa, Foundation, gettext, gfortran }: +{ stdenv, lib, R, libcxx, xvfb_run, util-linux, Cocoa, Foundation, gettext, gfortran }: { name, buildInputs ? [], requireX ? false, ... } @ attrs: stdenv.mkDerivation ({ buildInputs = buildInputs ++ [R gettext] ++ - stdenv.lib.optionals requireX [util-linux xvfb_run] ++ - stdenv.lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran]; + lib.optionals requireX [util-linux xvfb_run] ++ + lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran]; NIX_CFLAGS_COMPILE = - stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; configurePhase = '' runHook preConfigure diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index ba2bb33b5a6..c7d2f4198a0 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -265,7 +265,7 @@ in hitimes = attrs: { buildInputs = - stdenv.lib.optionals stdenv.isDarwin + lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; }; @@ -514,7 +514,7 @@ in --replace "gobject-2.0" "${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}" substituteInPlace lib/vips.rb \ - --replace "vips_libname = 'vips'" "vips_libname = '${stdenv.lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}'" + --replace "vips_libname = 'vips'" "vips_libname = '${lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; }; @@ -631,7 +631,7 @@ in }; zookeeper = attrs: { - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ]; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.cctools ]; dontBuild = false; postPatch = '' sed -i ext/extconf.rb -e "4a \ From 58899f1454bf9d43a647373e5a2b82eb186621d0 Mon Sep 17 00:00:00 2001 From: devhell Date: Sat, 26 Dec 2020 16:24:39 +0000 Subject: [PATCH 33/52] libstrophe: 0.10.0 -> 0.10.1 --- .../libraries/libstrophe/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libstrophe/default.nix b/pkgs/development/libraries/libstrophe/default.nix index 0c7828c954f..72cc24fcfdb 100644 --- a/pkgs/development/libraries/libstrophe/default.nix +++ b/pkgs/development/libraries/libstrophe/default.nix @@ -1,11 +1,10 @@ { stdenv , fetchFromGitHub -, pkg-config -, automake -, autoconf +, autoreconfHook , libtool , openssl , expat +, pkg-config , check }: @@ -17,16 +16,14 @@ stdenv.mkDerivation rec { owner = "strophe"; repo = pname; rev = version; - sha256 = "sha256-6byg7hE0DN/cbf9NHpK/2DhXZyuelYAp+SA7vVUgo4U="; + sha256 = "11d341avsfr0z4lq15cy5dkmff6qpy91wkgzdpfdy31l27pa1g79"; }; - nativeBuildInputs = [ automake autoconf pkg-config libtool check ]; - buildInputs = [ openssl expat ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ openssl expat libtool check ]; dontDisableStatic = true; - preConfigure = "mkdir m4 && sh bootstrap.sh"; - doCheck = true; meta = with stdenv.lib; { @@ -37,8 +34,10 @@ stdenv.mkDerivation rec { runs well on both Linux, Unix, and Windows based platforms. ''; homepage = "https://strophe.im/libstrophe/"; - license = with licenses; [ gpl3 mit ]; + license = with licenses; [ gpl3Only mit ]; platforms = platforms.unix; + broken = stdenv.isDarwin; maintainers = with maintainers; [ devhell flosse ]; }; } + From 3c4aebd618d9e76e156e22aec48098d6eb701305 Mon Sep 17 00:00:00 2001 From: tu-maurice Date: Sun, 17 Jan 2021 18:40:52 +0100 Subject: [PATCH 34/52] gnomeExtensions.noannoyance: init at unstable --- .../extensions/noannoyance/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 32 insertions(+) create mode 100644 pkgs/desktops/gnome-3/extensions/noannoyance/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/noannoyance/default.nix b/pkgs/desktops/gnome-3/extensions/noannoyance/default.nix new file mode 100644 index 00000000000..4763d905755 --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/noannoyance/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, lib +, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "noannoyance"; + version = "unstable-2021-01-17"; + + src = fetchFromGitHub { + owner = "BjoernDaase"; + repo = "noannoyance"; + rev = "f6e76916336aee2f7c4141796f3c40c870d2b347"; + sha256 = "1iy3nif8rjjcwf83fg9ds93fi7vmhliynmlwqnx036s3msmxvgs3"; + }; + + uuid = "noannoyance@daase.net"; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp metadata.json extension.js $out/share/gnome-shell/extensions/${uuid} + ''; + + meta = with lib; { + description = "Removes the 'Window is ready' notification and puts the window into focus"; + homepage = "https://github.com/BjoernDaase/noannoyance"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ tu-maurice ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 355df6b465f..dea2b79d122 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27263,6 +27263,7 @@ in mpris-indicator-button = callPackage ../desktops/gnome-3/extensions/mpris-indicator-button { }; night-theme-switcher = callPackage ../desktops/gnome-3/extensions/night-theme-switcher { }; no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { }; + noannoyance = callPackage ../desktops/gnome-3/extensions/noannoyance { }; paperwm = callPackage ../desktops/gnome-3/extensions/paperwm { }; pidgin-im-integration = callPackage ../desktops/gnome-3/extensions/pidgin-im-integration { }; remove-dropdown-arrows = callPackage ../desktops/gnome-3/extensions/remove-dropdown-arrows { }; From 870303d6ff60dba7c6c9aa9e0c8e1e3ab8d69ef1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 17 Jan 2021 19:00:30 +0000 Subject: [PATCH 35/52] obsidian: 0.10.6 -> 0.10.7 --- pkgs/applications/misc/obsidian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index bfe215487af..d2f0c42d7dc 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.10.6"; + version = "0.10.7"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz"; - sha256 = "KfGVc3nXu5ilYKQPLc5qaksTwsdhSVtty9CfjSoiCU8="; + sha256 = "clRasHVk9tZYJd0wP0q5TKnjhJwlx5g62XbkjBmCTJI="; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; From 607505005e6d6116c1b4064b5249c85128610409 Mon Sep 17 00:00:00 2001 From: Justinas Stankevicius Date: Sun, 17 Jan 2021 17:15:23 +0200 Subject: [PATCH 36/52] python3Packages.roombapy: init at 1.6.2.post1 --- .../python-modules/roombapy/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/roombapy/default.nix diff --git a/pkgs/development/python-modules/roombapy/default.nix b/pkgs/development/python-modules/roombapy/default.nix new file mode 100644 index 00000000000..9c438bde756 --- /dev/null +++ b/pkgs/development/python-modules/roombapy/default.nix @@ -0,0 +1,37 @@ +{ buildPythonPackage +, fetchFromGitHub +, hbmqtt +, lib +, paho-mqtt +, poetry +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "roombapy"; + version = "1.6.2-1"; + + src = fetchFromGitHub { + owner = "pschmitt"; + repo = "roombapy"; + rev = version; + sha256 = "14k7bys479xwpa4alpdwphzmxm3x8kc48nfqnshn1wj94vyxc425"; + }; + + format = "pyproject"; + + nativeBuildInputs = [ poetry ]; + propagatedBuildInputs = [ paho-mqtt ]; + + checkInputs = [ hbmqtt pytest-asyncio pytestCheckHook ]; + pytestFlagsArray = [ "tests/" "--ignore=tests/test_discovery.py" ]; + pythonImportsCheck = [ "roombapy" ]; + + meta = with lib; { + homepage = "https://github.com/pschmitt/roombapy"; + description = "Python program and library to control Wi-Fi enabled iRobot Roombas"; + maintainers = with maintainers; [ justinas ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 195fee99a90..9352f2b9bfd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6726,6 +6726,8 @@ in { roman = callPackage ../development/python-modules/roman { }; + roombapy = callPackage ../development/python-modules/roombapy { }; + rope = callPackage ../development/python-modules/rope { }; ROPGadget = callPackage ../development/python-modules/ROPGadget { }; From 6bc75a7ba6dc46559abc6c40bfade392c5f86d16 Mon Sep 17 00:00:00 2001 From: Justinas Stankevicius Date: Sun, 17 Jan 2021 17:20:32 +0200 Subject: [PATCH 37/52] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 2e9c5f99da5..f72d036cf9e 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -682,7 +682,7 @@ "rmvtransport" = ps: with ps; [ PyRMVtransport ]; "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API "roku" = ps: with ps; [ ]; # missing inputs: rokuecp - "roomba" = ps: with ps; [ ]; # missing inputs: roombapy + "roomba" = ps: with ps; [ roombapy ]; "roon" = ps: with ps; [ ]; # missing inputs: roonapi "route53" = ps: with ps; [ boto3 ]; "rova" = ps: with ps; [ ]; # missing inputs: rova From c361307da34b0c282a4d9cb316e9126d92e00240 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Jan 2021 21:06:30 +0100 Subject: [PATCH 38/52] python3Packages.adext: init at 0.3 --- .../python-modules/adext/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/adext/default.nix diff --git a/pkgs/development/python-modules/adext/default.nix b/pkgs/development/python-modules/adext/default.nix new file mode 100644 index 00000000000..f3818c93188 --- /dev/null +++ b/pkgs/development/python-modules/adext/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, alarmdecoder +}: + +buildPythonPackage rec { + pname = "adext"; + version = "0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "184qxw6i5ixnhgkjnby4zwn4jg90mxb8xy9vbg80x5w331p4z50f"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "alarmdecoder==1.13.2" "alarmdecoder>=1.13.2" + ''; + + propagatedBuildInputs = [ alarmdecoder ]; + + # Tests are not published yet + doCheck = false; + pythonImportsCheck = [ "adext" ]; + + meta = with lib; { + description = "Python extension for AlarmDecoder"; + homepage = "https://github.com/ajschmidt8/adext"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 195fee99a90..53a0834b8c3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -174,6 +174,8 @@ in { addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { }; + adext = callPackage ../development/python-modules/adext { }; + adguardhome = callPackage ../development/python-modules/adguardhome { }; advantage-air = callPackage ../development/python-modules/advantage-air { }; From f939ff61d98f2b277b464205d52c4e3063a1c8af Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Jan 2021 21:06:45 +0100 Subject: [PATCH 39/52] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 2e9c5f99da5..8defbafd48b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -19,7 +19,7 @@ "airvisual" = ps: with ps; [ pyairvisual ]; "aladdin_connect" = ps: with ps; [ ]; # missing inputs: aladdin_connect "alarm_control_panel" = ps: with ps; [ ]; - "alarmdecoder" = ps: with ps; [ ]; # missing inputs: adext + "alarmdecoder" = ps: with ps; [ adext ]; "alert" = ps: with ps; [ ]; "alexa" = ps: with ps; [ aiohttp-cors ]; "almond" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pyalmond From 069c45c2afbac2be2d37a4f086d4155764324188 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Jan 2021 21:50:46 +0100 Subject: [PATCH 40/52] python3Packages.pyblackbird: init at 0.5 --- .../python-modules/pyblackbird/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/pyblackbird/default.nix diff --git a/pkgs/development/python-modules/pyblackbird/default.nix b/pkgs/development/python-modules/pyblackbird/default.nix new file mode 100644 index 00000000000..fd8f46a968f --- /dev/null +++ b/pkgs/development/python-modules/pyblackbird/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyserial +, pyserial-asyncio +}: + +buildPythonPackage rec { + pname = "pyblackbird"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "koolsb"; + repo = pname; + rev = version; + sha256 = "0m1yd1cb3z8011x7nicxpf091bdcwghcphn0l21c65f71rabzg6s"; + }; + + propagatedBuildInputs = [ + pyserial + pyserial-asyncio + ]; + + # Test setup try to create a serial port + doCheck = false; + pythonImportsCheck = [ "pyblackbird" ]; + + meta = with lib; { + description = "Python implementation for Monoprice Blackbird units"; + homepage = "https://github.com/koolsb/pyblackbird"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 195fee99a90..912045fa3b9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5139,6 +5139,8 @@ in { pybindgen = callPackage ../development/python-modules/pybindgen { }; + pyblackbird = callPackage ../development/python-modules/pyblackbird { }; + pyblake2 = callPackage ../development/python-modules/pyblake2 { }; pyblock = callPackage ../development/python-modules/pyblock { }; From c55c02baffc30a7f2230db733d7f4f912ded25bb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Jan 2021 21:51:17 +0100 Subject: [PATCH 41/52] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 2e9c5f99da5..558fcf7ab4d 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -77,7 +77,7 @@ "binary_sensor" = ps: with ps; [ ]; "bitcoin" = ps: with ps; [ blockchain ]; "bizkaibus" = ps: with ps; [ ]; # missing inputs: bizkaibus - "blackbird" = ps: with ps; [ ]; # missing inputs: pyblackbird + "blackbird" = ps: with ps; [ pyblackbird ]; "blebox" = ps: with ps; [ ]; # missing inputs: blebox_uniapi "blink" = ps: with ps; [ ]; # missing inputs: blinkpy "blinksticklight" = ps: with ps; [ BlinkStick ]; From f8b69fa6d2fcf54548795e3e04845f304efb3a30 Mon Sep 17 00:00:00 2001 From: Mauricio Scheffer Date: Sun, 17 Jan 2021 17:06:24 +0000 Subject: [PATCH 42/52] starspace: init at unstable-2021-01-17 --- maintainers/maintainer-list.nix | 6 ++++ .../machine-learning/starspace/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 36 insertions(+) create mode 100644 pkgs/applications/science/machine-learning/starspace/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d376cbecf57..a042ae9bd59 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5604,6 +5604,12 @@ fingerprint = "B573 5118 0375 A872 FBBF 7770 B629 036B E399 EEE9"; }]; }; + mausch = { + email = "mauricioscheffer@gmail.com"; + github = "mausch"; + githubId = 95194; + name = "Mauricio Scheffer"; + }; matejc = { email = "cotman.matej@gmail.com"; github = "matejc"; diff --git a/pkgs/applications/science/machine-learning/starspace/default.nix b/pkgs/applications/science/machine-learning/starspace/default.nix new file mode 100644 index 00000000000..b511b4ea42e --- /dev/null +++ b/pkgs/applications/science/machine-learning/starspace/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, boost165 }: + +stdenv.mkDerivation rec { + pname = "starspace"; + version = "unstable-2021-01-17"; + + src = fetchFromGitHub { + owner = "facebookresearch"; + repo = pname; + rev = "8aee0a950aa607c023e5c91cff518bec335b5df5"; + sha256 = "0sc7a37z1skb9377a1qs8ggwrkz0nmpybx7sms38xj05b702kbvj"; + }; + + buildInputs = [ boost165 ]; + + installPhase = '' + mkdir -p $out/bin + mv starspace $out/bin + ''; + + meta = with lib; { + description = "General-purpose neural model for efficient learning of entity embeddings"; + homepage = https://ai.facebook.com/tools/starspace/; + license = licenses.mit; + platforms = platforms.unix; + maintainers = [ maintainers.mausch ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 182c6f90454..1ee6deeb47a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26974,6 +26974,8 @@ in stardust = callPackage ../games/stardust {}; + starspace = callPackage ../applications/science/machine-learning/starspace { }; + stockfish = callPackage ../games/stockfish { }; steamPackages = dontRecurseIntoAttrs (callPackage ../games/steam { From 75658b374b815cd716dfba2752add61c501a23bd Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Sun, 17 Jan 2021 16:40:05 +0000 Subject: [PATCH 43/52] cargo-readme: init at 3.2.0 Signed-off-by: Arthur Gautier --- .../tools/rust/cargo-readme/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/tools/rust/cargo-readme/default.nix diff --git a/pkgs/development/tools/rust/cargo-readme/default.nix b/pkgs/development/tools/rust/cargo-readme/default.nix new file mode 100644 index 00000000000..ae638cac8a9 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-readme/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, rustPlatform, fetchFromGitHub, fetchpatch }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-readme"; + version = "3.2.0"; + + src = fetchFromGitHub { + owner = "livioribeiro"; + repo = pname; + # Git tag is missing, see upstream issue: + # https://github.com/livioribeiro/cargo-readme/issues/61 + rev = "cf66017c0120ae198210ebaf58a0be6a78372974"; + sha256 = "sha256-/ufHHM13L83M3UYi6mjdhIjgXx7bZgzvR/X02Zsx7Fw="; + }; + + cargoSha256 = "sha256-QVRl6xCvztWi5zAs3PXYR4saTqO5nTBPIjdlMiMXFTM="; + + patches = [ + (fetchpatch { + # Fixup warning thrown at build when running test-suite + # unused return, see upstream PR: + # https://github.com/livioribeiro/cargo-readme/pull/62 + url = "https://github.com/livioribeiro/cargo-readme/commit/060f2daaa2b2cf981bf490dc36bcc6527545ea03.patch"; + sha256 = "sha256-wlAIgTI9OqtA/Jnswoqp7iOj+1zjrUZA7JpHUiF/n+s="; + }) + ]; + + meta = with lib; { + description = "Generate README.md from docstrings"; + homepage = "https://github.com/livioribeiro/cargo-readme"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ baloo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 692fdbf96cb..51e2013c8ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10627,6 +10627,7 @@ in cargo-raze = callPackage ../development/tools/rust/cargo-raze { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-readme = callPackage ../development/tools/rust/cargo-readme {}; cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { }; cargo-sync-readme = callPackage ../development/tools/rust/cargo-sync-readme {}; cargo-udeps = callPackage ../development/tools/rust/cargo-udeps { From b706315dfc326382dbd414e1e34df0fcbd22fd6a Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sat, 16 Jan 2021 22:35:51 +0100 Subject: [PATCH 44/52] git-big-picture: 0.10.1 -> 1.0.0 (fixes CVE-2021-3028) Also propagates move of repository from https://github.com/esc/git-big-picture to https://github.com/git-big-picture/git-big-picture . Upstream change log at https://github.com/git-big-picture/git-big-picture#changelog --- .../git-and-tools/git-big-picture/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix index 6cadd92eb3d..ec832866c71 100644 --- a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix @@ -1,19 +1,23 @@ -{ fetchFromGitHub, python2Packages, lib, stdenv, git, graphviz }: +{ fetchFromGitHub, python3Packages, lib, stdenv, git, graphviz }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "git-big-picture"; - version = "0.10.1"; + version = "1.0.0"; src = fetchFromGitHub { - owner = "esc"; + owner = "git-big-picture"; repo = pname; rev = "v${version}"; - sha256 = "0b0zdq7d7k7f6p3wwc799347fraphbr20rxd1ysnc4xi1cj4wpmi"; + sha256 = "14yf71iwgk78nw8w0bpijsnnl4vg3bvxsw3vvypxmbrc1nh0bdha"; }; buildInputs = [ git graphviz ]; - checkInputs = [ git ]; + # NOTE: Tests are disabled due to unpackaged test dependency "Scruf". + # When bumping to 1.1.0, please re-enable and use: + #checkInputs = [ cram git pytest ]; + #checkPhase = "pytest test.py"; + doCheck = false; postFixup = '' wrapProgram $out/bin/git-big-picture \ @@ -22,8 +26,8 @@ python2Packages.buildPythonApplication rec { meta = { description = "Tool for visualization of Git repositories"; - homepage = "https://github.com/esc/git-big-picture"; - license = lib.licenses.gpl3; + homepage = "https://github.com/git-big-picture/git-big-picture"; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.nthorne ]; }; From 822e677f0a0b05b1cc6c349e14a57fcbb86afbfa Mon Sep 17 00:00:00 2001 From: eropleco <73182853+eropleco@users.noreply.github.com> Date: Mon, 18 Jan 2021 07:09:10 +0800 Subject: [PATCH 45/52] smartmontools: 7.1 -> 7.2 and devicedb updated to latest (#109566) Co-authored-by: Sandro --- pkgs/tools/system/smartmontools/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index e21fbcfd700..9eaf00b537a 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchurl, autoreconfHook , mailutils, inetutils -, IOKit ? null , ApplicationServices ? null }: +, IOKit, ApplicationServices }: let - version = "7.1"; + version = "7.2"; - dbrev = "5062"; - drivedbBranch = "RELEASE_7_0_DRIVEDB"; + dbrev = "5164"; + drivedbBranch = "RELEASE_7_2_DRIVEDB"; driverdb = fetchurl { url = "https://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw"; - sha256 = "0gggl55h9gq0z846ndhyd7xrpxh8lqfbidblx0598q2wlh9rvlww"; + sha256 = "1vj0sv3bgcd0lwk5x450brfyxksa5fn1mjgvmj994ab8spmicc43"; name = "smartmontools-drivedb.h"; }; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/smartmontools/${pname}-${version}.tar.gz"; - sha256 = "0imqb7ka4ia5573w8rnpck571pjjc9698pdjcapy9cfyk4n4swrz"; + sha256 = "1mlc25sd5rgj5xmzcllci47inmfdw7cp185fday6hc9rwqkqmnaw"; }; patches = [ ./smartmontools.patch ]; From 6ec4a219ce75db09cec14247e29dddf1b055bf0d Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 17 Jan 2021 17:14:43 -0600 Subject: [PATCH 46/52] yosys-bluespec: 2021.01.14 -> 2021.01.17 Signed-off-by: Austin Seipp --- pkgs/development/compilers/yosys/plugins/bluespec.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/yosys/plugins/bluespec.nix b/pkgs/development/compilers/yosys/plugins/bluespec.nix index ea67ffc661c..58fef968e46 100644 --- a/pkgs/development/compilers/yosys/plugins/bluespec.nix +++ b/pkgs/development/compilers/yosys/plugins/bluespec.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation { pname = "yosys-bluespec"; - version = "2021.01.14"; + version = "2021.01.17"; src = fetchFromGitHub { owner = "thoughtpolice"; repo = "yosys-bluespec"; - rev = "7a0c609e9b601560067c34b8ce41e89ea4a397d4"; - sha256 = "0xj9j5dwvq0dwqzfjd4ikmxkd28amj6d9m6ava7pwcrpjhyjnd0c"; + rev = "3cfa22c2810b840f406610efe3d7657477c1b0ed"; + sha256 = "1r48128yisw5lpziaj3hq88acghwi94pvm4735xajx8dl79jkcng"; }; buildInputs = [ yosys readline zlib bluespec ]; From a8bb8fcab27461ca6d388caaf389fbca8a609390 Mon Sep 17 00:00:00 2001 From: Daniel Barter Date: Mon, 28 Dec 2020 12:01:20 -0800 Subject: [PATCH 47/52] openbabel: 2.4 -> 3.1.1 --- .../libraries/openbabel/default.nix | 47 ++++++++++++------- .../openbabel-bindings/default.nix | 27 +++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 3 files changed, 60 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/openbabel-bindings/default.nix diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix index d074db7d165..301025dfd20 100644 --- a/pkgs/development/libraries/openbabel/default.nix +++ b/pkgs/development/libraries/openbabel/default.nix @@ -1,34 +1,45 @@ -{stdenv, fetchurl, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkgconfig }: +{stdenv, lib, fetchurl, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config, swig, rapidjson }: stdenv.mkDerivation rec { pname = "openbabel"; - version = "2.4.1"; + version = "3.1.1"; src = fetchurl { url = "https://github.com/openbabel/openbabel/archive/openbabel-${stdenv.lib.replaceStrings ["."] ["-"] version}.tar.gz"; - sha256 = "0xm7y859ivq2cp0q08mwshfxm0jq31xkyr4x8s0j6l7khf57yk2r"; + sha256 = "c97023ac6300d26176c97d4ef39957f06e68848d64f1a04b0b284ccff2744f02"; }; - patches = [ - # ARM / AArch64 fixes. - (fetchpatch { - url = "https://github.com/openbabel/openbabel/commit/ee11c98a655296550710db1207b294f00e168216.patch"; - sha256 = "0wjqjrkr4pfirzzicdvlyr591vppydk572ix28jd2sagnfnf566g"; - }) + + buildInputs = [ zlib libxml2 eigen python cairo pcre swig rapidjson ]; + + nativeBuildInputs = [ cmake pkg-config ]; + + pythonMajorMinor = "${python.sourceVersion.major}.${python.sourceVersion.minor}"; + + cmakeFlags = [ + "-DRUN_SWIG=ON" + "-DPYTHON_BINDINGS=ON" ]; - # TODO : perl & python bindings; - # TODO : wxGTK: I have no time to compile - # TODO : separate lib and apps - buildInputs = [ zlib libxml2 eigen python cairo pcre ]; - nativeBuildInputs = [ cmake pkgconfig ]; + postFixup = '' + cat < $out/lib/python$pythonMajorMinor/site-packages/setup.py + from distutils.core import setup - meta = { + setup( + name = 'pyopenbabel', + version = '${version}', + packages = ['openbabel'], + package_data = {'openbabel' : ['_openbabel.so']} + ) + EOF + ''; + + meta = with lib; { description = "A toolbox designed to speak the many languages of chemical data"; homepage = "http://openbabel.org"; - platforms = stdenv.lib.platforms.all; - maintainers = [ ]; - license = stdenv.lib.licenses.gpl2Plus; + platforms = platforms.all; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ danielbarter ]; }; } diff --git a/pkgs/development/python-modules/openbabel-bindings/default.nix b/pkgs/development/python-modules/openbabel-bindings/default.nix new file mode 100644 index 00000000000..18a6a8dd032 --- /dev/null +++ b/pkgs/development/python-modules/openbabel-bindings/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, openbabel, python, buildPythonPackage }: + +buildPythonPackage rec { + pname = "openbabel"; + version = "3.1.1"; + + src = "${openbabel}/lib/python${python.sourceVersion.major}.${python.sourceVersion.minor}/site-packages"; + + nativeBuildInputs = [ openbabel ]; + + # these env variables are used by the bindings to find libraries + # they need to be included explicitly in your nix-shell for + # some functionality to work (inparticular, pybel). + # see https://openbabel.org/docs/dev/Installation/install.html + BABEL_LIBDIR = "${openbabel}/lib/openbabel/3.1.0"; + LD_LIBRARY_PATH = "$LD_LIBRARY_PATH:${openbabel}/lib"; + + doCheck = false; + pythonImportsCheck = [ "openbabel" ]; + + meta = with lib; { + homepage = "http://openbabel.org/wiki/Main_Page"; + description = "Python bindings for openbabel"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ danielbarter ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 754e0d75310..ef69757042e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4458,6 +4458,10 @@ in { openapi-spec-validator = callPackage ../development/python-modules/openapi-spec-validator { }; + openbabel-bindings = callPackage ../development/python-modules/openbabel-bindings { + openbabel = (callPackage ../development/libraries/openbabel { python = self.python; }); + }; + opencv3 = toPythonModule (pkgs.opencv3.override { enablePython = true; pythonPackages = self; From aadf7a50d777726e9facd509e518d6d3e848fc93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 18 Jan 2021 00:21:05 +0100 Subject: [PATCH 48/52] openbabel2: init at 2.4.1 --- pkgs/development/libraries/openbabel/2.nix | 31 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 ++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/openbabel/2.nix diff --git a/pkgs/development/libraries/openbabel/2.nix b/pkgs/development/libraries/openbabel/2.nix new file mode 100644 index 00000000000..41631da1241 --- /dev/null +++ b/pkgs/development/libraries/openbabel/2.nix @@ -0,0 +1,31 @@ +{stdenv, lib, fetchurl, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config }: + +stdenv.mkDerivation rec { + pname = "openbabel"; + version = "2.4.1"; + + src = fetchurl { + url = "https://github.com/openbabel/openbabel/archive/openbabel-${stdenv.lib.replaceStrings ["."] ["-"] version}.tar.gz"; + sha256 = "0xm7y859ivq2cp0q08mwshfxm0jq31xkyr4x8s0j6l7khf57yk2r"; + }; + + patches = [ + # ARM / AArch64 fixes. + (fetchpatch { + url = "https://github.com/openbabel/openbabel/commit/ee11c98a655296550710db1207b294f00e168216.patch"; + sha256 = "0wjqjrkr4pfirzzicdvlyr591vppydk572ix28jd2sagnfnf566g"; + }) + ]; + + buildInputs = [ zlib libxml2 eigen python cairo pcre ]; + + nativeBuildInputs = [ cmake pkg-config ]; + + meta = with lib; { + description = "A toolbox designed to speak the many languages of chemical data"; + homepage = "http://openbabel.org"; + platforms = platforms.all; + maintainers = with maintainers; [ danielbarter ]; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 355df6b465f..7a0cce2f68f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15779,7 +15779,11 @@ in }; openal = openalSoft; - openbabel = callPackage ../development/libraries/openbabel { }; + openbabel = openbabel3; + + openbabel2 = callPackage ../development/libraries/openbabel/2.nix { }; + + openbabel3 = callPackages ../development/libraries/openbabel { }; opencascade = callPackage ../development/libraries/opencascade { inherit (darwin.apple_sdk.frameworks) OpenCL Cocoa; @@ -27344,6 +27348,7 @@ in ### SCIENCE/CHEMISTY avogadro = callPackage ../applications/science/chemistry/avogadro { + openbabel = openbabel2; eigen = eigen2; }; From 197eace0818140013f4e5cd12d6ecc40e153852c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 18 Jan 2021 00:21:19 +0100 Subject: [PATCH 49/52] avogadro: update maintainers --- pkgs/applications/science/chemistry/avogadro/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index 14ceb91b06c..a1e775135e0 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { }) ]; - meta = { + meta = with lib; { description = "Molecule editor and visualizer"; - maintainers = [ ]; - platforms = lib.platforms.mesaPlatforms; + maintainers = with maintainers; [ danielbarter ]; + platforms = platforms.mesaPlatforms; }; } From 40952628a9f20728c3ec52e1f1503615bab93b52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Mon, 18 Jan 2021 00:29:28 +0100 Subject: [PATCH 50/52] matrix-corporal: init at 2.0.1 (#99074) * matrix-corporal: init at 2.0.1 * Update pkgs/servers/matrix-corporal/default.nix Co-authored-by: Sandro --- pkgs/servers/matrix-corporal/default.nix | 26 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/servers/matrix-corporal/default.nix diff --git a/pkgs/servers/matrix-corporal/default.nix b/pkgs/servers/matrix-corporal/default.nix new file mode 100644 index 00000000000..d7822afffa5 --- /dev/null +++ b/pkgs/servers/matrix-corporal/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "matrix-corporal"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "devture"; + repo = pname; + rev = version; + sha256 = "1n8yjmy3j0spgwpxgc26adhpl52fm3d2xbmkf5n9dwzw29grv68r"; + }; + + buildFlagsArray = [ + "-ldflags=-s -w -X main.GitCommit=${version} -X main.GitBranch=${version} -X main.GitState=nixpkgs -X main.GitSummary=${version} -X main.Version=${version}" + ]; + + vendorSha256 = "1gi6mff6h0fkgfq5yybd1qcy2qwrvc4kzi11x7arfl9nr0d24rb2"; + + meta = with lib; { + homepage = "https://github.com/devture/matrix-corporal"; + description = "Reconciliator and gateway for a managed Matrix server"; + maintainers = with maintainers; [ dandellion ]; + license = licenses.agpl3Only; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42d74dd44cf..570b8dadf4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5590,6 +5590,8 @@ in matrix-appservice-discord = callPackage ../servers/matrix-appservice-discord { }; + matrix-corporal = callPackage ../servers/matrix-corporal { }; + mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { }); mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { }; From f7481bcb3e5f3308089363734b75f5d84fe40d4d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 17 Jan 2021 20:03:17 -0300 Subject: [PATCH 51/52] pythonPackages.dotty-dict: init at 1.3.0 --- .../python-modules/dotty-dict/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/dotty-dict/default.nix diff --git a/pkgs/development/python-modules/dotty-dict/default.nix b/pkgs/development/python-modules/dotty-dict/default.nix new file mode 100644 index 00000000000..22d469b9669 --- /dev/null +++ b/pkgs/development/python-modules/dotty-dict/default.nix @@ -0,0 +1,26 @@ +{ lib +, fetchPypi +, buildPythonPackage +, setuptools_scm +}: + +buildPythonPackage rec { + pname = "dotty_dict"; + version = "1.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-6wA1o2KezYQ5emjx9C8elKvRw0V3oZzT6srTMe58uvA="; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + doCheck = false; + + meta = with lib; { + description = "Dictionary wrapper for quick access to deeply nested keys"; + homepage = "https://dotty-dict.readthedocs.io"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 073e92cc884..3e944ea20ae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1917,6 +1917,8 @@ in { dopy = callPackage ../development/python-modules/dopy { }; + dotty-dict = callPackage ../development/python-modules/dotty-dict { }; + dot2tex = callPackage ../development/python-modules/dot2tex { inherit (pkgs) graphviz; }; dparse = callPackage ../development/python-modules/dparse { }; From f33006be7f7e71409ad22d921c8ef0ea4fbd9b71 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jan 2021 00:20:00 +0000 Subject: [PATCH 52/52] fava: 1.17 -> 1.18 --- pkgs/applications/office/fava/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 5c5d21860cd..fd5f3b8d7c5 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -5,11 +5,11 @@ let in buildPythonApplication rec { pname = "fava"; - version = "1.17"; + version = "1.18"; src = fetchPypi { inherit pname version; - sha256 = "efad3a4b5697b9d7ee29eff5dc0c8367fc1df37b1abacc8d0b2071602e94a6cd"; + sha256 = "21336b695708497e6f00cab77135b174c51feb2713b657e0e208282960885bf5"; }; checkInputs = [ python3.pkgs.pytest ];