From bc49a0815ae860010b4d593b02f00ab6f07d50ea Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 24 Nov 2020 10:29:28 -0500 Subject: utillinux: rename to util-linux --- pkgs/os-specific/linux/pm-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux/pm-utils') diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index 1d8314923d3..e685402d473 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, coreutils, gnugrep, utillinux, kmod +{ stdenv, fetchurl, coreutils, gnugrep, util-linux, kmod , procps, kbd, dbus }: let binPath = stdenv.lib.makeBinPath - [ coreutils gnugrep utillinux kmod procps kbd dbus ]; + [ coreutils gnugrep util-linux kmod procps kbd dbus ]; sbinPath = stdenv.lib.makeSearchPathOutput "bin" "sbin" [ procps ]; -- cgit 1.4.1 From 16d91ee628d781c721506b19e3e03bed810327e8 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 15 Jan 2021 21:45:37 +0700 Subject: pkgs/os-specific: stdenv.lib -> lib --- pkgs/os-specific/darwin/DarwinTools/default.nix | 6 ++-- pkgs/os-specific/darwin/apple-sdk/default.nix | 24 ++++++------- .../darwin/apple-sdk/print-reexports/default.nix | 4 +-- .../darwin/apple-source-releases/IOKit/default.nix | 2 +- .../darwin/apple-source-releases/adv_cmds/boot.nix | 6 ++-- .../apple-source-releases/adv_cmds/default.nix | 6 ++-- .../apple-source-releases/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 ++-- .../apple-source-releases/diskdev_cmds/default.nix | 6 ++-- .../apple-source-releases/file_cmds/default.nix | 6 ++-- .../apple-source-releases/libpthread/default.nix | 4 +-- .../apple-source-releases/network_cmds/default.nix | 6 ++-- .../apple-source-releases/shell_cmds/default.nix | 6 ++-- .../apple-source-releases/system_cmds/default.nix | 4 +-- .../apple-source-releases/text_cmds/default.nix | 6 ++-- pkgs/os-specific/darwin/binutils/default.nix | 6 ++-- pkgs/os-specific/darwin/cctools/port.nix | 18 +++++----- pkgs/os-specific/darwin/insert_dylib/default.nix | 4 +-- pkgs/os-specific/darwin/lsusb/default.nix | 8 ++--- pkgs/os-specific/darwin/maloader/default.nix | 6 ++-- pkgs/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 ++-- pkgs/os-specific/darwin/usr-include/default.nix | 4 +-- pkgs/os-specific/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 ++--- pkgs/os-specific/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 +++++------ pkgs/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 +- pkgs/os-specific/linux/bridge-utils/default.nix | 6 ++-- pkgs/os-specific/linux/broadcom-sta/default.nix | 12 +++---- pkgs/os-specific/linux/busybox/default.nix | 2 +- pkgs/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 ++--- pkgs/os-specific/linux/device-tree/default.nix | 4 +-- pkgs/os-specific/linux/device-tree/raspberrypi.nix | 4 +-- pkgs/os-specific/linux/digimend/default.nix | 2 +- pkgs/os-specific/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 ++--- .../linux/firmware/b43-firmware-cutter/default.nix | 6 ++-- .../linux/firmware/b43-firmware/5.1.138.nix | 4 +-- .../firmware/firmware-linux-nonfree/default.nix | 2 +- pkgs/os-specific/linux/firmware/fwupd/default.nix | 16 ++++----- .../linux/firmware/raspberrypi/armstubs.nix | 2 +- .../linux/firmware/raspberrypi/default.nix | 4 +-- .../linux/firmware/rtl8192su-firmware/default.nix | 2 +- .../linux/firmware/rtl8723bs-firmware/default.nix | 2 +- .../linux/firmware/sof-firmware/default.nix | 2 +- pkgs/os-specific/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 ++-- pkgs/os-specific/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 +- pkgs/os-specific/linux/kernel/common-config.nix | 8 ++--- pkgs/os-specific/linux/kernel/generic.nix | 10 +++--- pkgs/os-specific/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 +-- pkgs/os-specific/linux/kernel/linux-mptcp-95.nix | 8 ++--- .../linux/kernel/linux-testing-bcachefs.nix | 4 +-- pkgs/os-specific/linux/kernel/linux-testing.nix | 4 +-- pkgs/os-specific/linux/kernel/linux-zen.nix | 4 +-- pkgs/os-specific/linux/kernel/manual-config.nix | 39 +++++++++++----------- pkgs/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 ++-- pkgs/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 +- pkgs/os-specific/linux/multipath-tools/default.nix | 2 +- pkgs/os-specific/linux/mwprocapture/default.nix | 4 +-- pkgs/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 ++-- pkgs/os-specific/linux/opengl/xorg-sys/default.nix | 4 +-- pkgs/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 ++-- pkgs/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 ++--- pkgs/os-specific/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 +- pkgs/os-specific/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 +- pkgs/os-specific/linux/rtlwifi_new/default.nix | 2 +- pkgs/os-specific/linux/s6-linux-utils/default.nix | 4 +-- pkgs/os-specific/linux/sch_cake/default.nix | 4 +-- pkgs/os-specific/linux/selinux-python/default.nix | 6 ++-- pkgs/os-specific/linux/selinux-sandbox/default.nix | 5 ++- pkgs/os-specific/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 ++--- pkgs/os-specific/linux/target-isns/default.nix | 4 +-- pkgs/os-specific/linux/tbs/default.nix | 2 +- pkgs/os-specific/linux/tcp-wrappers/default.nix | 6 ++-- pkgs/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 +-- pkgs/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 +-- pkgs/os-specific/linux/wireless-tools/default.nix | 6 ++-- pkgs/os-specific/linux/wpa_supplicant/default.nix | 6 ++-- pkgs/os-specific/linux/x86info/default.nix | 8 ++--- pkgs/os-specific/linux/zfs/default.nix | 6 ++-- pkgs/os-specific/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 +- pkgs/os-specific/windows/mingw-w64/default.nix | 2 +- pkgs/os-specific/windows/wxMSW-2.8/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +-- 212 files changed, 597 insertions(+), 599 deletions(-) (limited to 'pkgs/os-specific/linux/pm-utils') 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 ++ [ -- cgit 1.4.1