Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge pull request #110912 from siraben/stdenv-lib-inherit

treewide: remove inherited stdenv.lib

authored by Sandro and committed by GitHub ad97ca4e 2ee93d61

+37 -52
+1 -2
pkgs/applications/editors/vim/macvim-configurable.nix
··· 1 - { stdenv, callPackage, vimUtils, buildEnv, makeWrapper }: 2 3 let 4 macvim = callPackage ./macvim.nix { inherit stdenv; }; ··· 12 # sourcing of the user's vimrc. Use `customRC = "source $HOME/.vim/vimrc"` 13 # if you want to preserve that behavior. 14 configure = let 15 - inherit (stdenv) lib; 16 doConfig = config: let 17 vimrcConfig = config // { 18 # always source the bundled system vimrc
··· 1 + { lib, stdenv, callPackage, vimUtils, buildEnv, makeWrapper }: 2 3 let 4 macvim = callPackage ./macvim.nix { inherit stdenv; }; ··· 12 # sourcing of the user's vimrc. Use `customRC = "source $HOME/.vim/vimrc"` 13 # if you want to preserve that behavior. 14 configure = let 15 doConfig = config: let 16 vimrcConfig = config // { 17 # always source the bundled system vimrc
+1 -3
pkgs/applications/gis/grass/default.nix
··· 1 - { stdenv, fetchFromGitHub, flex, bison, pkg-config, zlib, libtiff, libpng, fftw 2 , cairo, readline, ffmpeg_3, makeWrapper, wxGTK30, netcdf, blas 3 , proj, gdal, geos, sqlite, postgresql, libmysqlclient, python2Packages, libLAS, proj-datumgrid 4 }: 5 - 6 - let inherit (stdenv) lib; in 7 8 stdenv.mkDerivation rec { 9 name = "grass";
··· 1 + { lib, stdenv, fetchFromGitHub, flex, bison, pkg-config, zlib, libtiff, libpng, fftw 2 , cairo, readline, ffmpeg_3, makeWrapper, wxGTK30, netcdf, blas 3 , proj, gdal, geos, sqlite, postgresql, libmysqlclient, python2Packages, libLAS, proj-datumgrid 4 }: 5 6 stdenv.mkDerivation rec { 7 name = "grass";
+1 -1
pkgs/applications/misc/electrum/default.nix
··· 125 ''; 126 127 passthru.updateScript = import ./update.nix { 128 - inherit (stdenv) lib; 129 inherit 130 writeScript 131 common-updater-scripts
··· 125 ''; 126 127 passthru.updateScript = import ./update.nix { 128 + inherit lib; 129 inherit 130 writeScript 131 common-updater-scripts
-1
pkgs/applications/networking/irc/quassel/default.nix
··· 20 }: 21 22 let 23 - inherit (stdenv) lib; 24 buildClient = monolithic || client; 25 buildCore = monolithic || enableDaemon; 26 in
··· 20 }: 21 22 let 23 buildClient = monolithic || client; 24 buildCore = monolithic || enableDaemon; 25 in
+1 -3
pkgs/applications/networking/remote/citrix-workspace/generic.nix
··· 1 - { stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook, which, more 2 , file, atk, alsaLib, cairo, fontconfig, gdk-pixbuf, glib, gnome3, gtk2-x11, gtk3 3 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 4 , gnome2, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 ··· 11 }: 12 13 let 14 - inherit (stdenv) lib; 15 - 16 openssl' = symlinkJoin { 17 name = "openssl-backwards-compat"; 18 nativeBuildInputs = [ makeWrapper ];
··· 1 + { lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook, which, more 2 , file, atk, alsaLib, cairo, fontconfig, gdk-pixbuf, glib, gnome3, gtk2-x11, gtk3 3 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 4 , gnome2, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 ··· 11 }: 12 13 let 14 openssl' = symlinkJoin { 15 name = "openssl-backwards-compat"; 16 nativeBuildInputs = [ makeWrapper ];
+2 -1
pkgs/applications/science/logic/coq/default.nix
··· 13 , csdp ? null 14 , version, coq-version ? null, 15 }@args: 16 - let lib = import ../../../../build-support/coq/extra-lib.nix {inherit (stdenv) lib;}; in 17 with builtins; with lib; 18 let 19 release = {
··· 13 , csdp ? null 14 , version, coq-version ? null, 15 }@args: 16 + let lib' = lib; in 17 + let lib = import ../../../../build-support/coq/extra-lib.nix {lib = lib';}; in 18 with builtins; with lib; 19 let 20 release = {
+1 -1
pkgs/applications/video/epgstation/default.nix
··· 91 # NOTE: this may take a while since it has to update all packages in 92 # nixpkgs.nodePackages 93 passthru.updateScript = import ./update.nix { 94 - inherit (stdenv) lib; 95 inherit (src.meta) homepage; 96 inherit 97 pname
··· 91 # NOTE: this may take a while since it has to update all packages in 92 # nixpkgs.nodePackages 93 passthru.updateScript = import ./update.nix { 94 + inherit lib; 95 inherit (src.meta) homepage; 96 inherit 97 pname
+1 -1
pkgs/development/compilers/gcc/10/default.nix
··· 245 246 inherit 247 (import ../common/extra-target-flags.nix { 248 - inherit stdenv crossStageStatic libcCross threadsCross; 249 }) 250 EXTRA_FLAGS_FOR_TARGET 251 EXTRA_LDFLAGS_FOR_TARGET
··· 245 246 inherit 247 (import ../common/extra-target-flags.nix { 248 + inherit lib stdenv crossStageStatic libcCross threadsCross; 249 }) 250 EXTRA_FLAGS_FOR_TARGET 251 EXTRA_LDFLAGS_FOR_TARGET
+1 -1
pkgs/development/compilers/gcc/4.8/default.nix
··· 271 272 inherit 273 (import ../common/extra-target-flags.nix { 274 - inherit stdenv crossStageStatic libcCross threadsCross; 275 }) 276 EXTRA_FLAGS_FOR_TARGET 277 EXTRA_LDFLAGS_FOR_TARGET
··· 271 272 inherit 273 (import ../common/extra-target-flags.nix { 274 + inherit lib stdenv crossStageStatic libcCross threadsCross; 275 }) 276 EXTRA_FLAGS_FOR_TARGET 277 EXTRA_LDFLAGS_FOR_TARGET
+1 -1
pkgs/development/compilers/gcc/4.9/default.nix
··· 284 285 inherit 286 (import ../common/extra-target-flags.nix { 287 - inherit stdenv crossStageStatic libcCross threadsCross; 288 }) 289 EXTRA_FLAGS_FOR_TARGET 290 EXTRA_LDFLAGS_FOR_TARGET
··· 284 285 inherit 286 (import ../common/extra-target-flags.nix { 287 + inherit lib stdenv crossStageStatic libcCross threadsCross; 288 }) 289 EXTRA_FLAGS_FOR_TARGET 290 EXTRA_LDFLAGS_FOR_TARGET
+1 -1
pkgs/development/compilers/gcc/6/default.nix
··· 303 304 inherit 305 (import ../common/extra-target-flags.nix { 306 - inherit stdenv crossStageStatic libcCross threadsCross; 307 }) 308 EXTRA_FLAGS_FOR_TARGET 309 EXTRA_LDFLAGS_FOR_TARGET
··· 303 304 inherit 305 (import ../common/extra-target-flags.nix { 306 + inherit lib stdenv crossStageStatic libcCross threadsCross; 307 }) 308 EXTRA_FLAGS_FOR_TARGET 309 EXTRA_LDFLAGS_FOR_TARGET
+1 -1
pkgs/development/compilers/gcc/7/default.nix
··· 255 256 inherit 257 (import ../common/extra-target-flags.nix { 258 - inherit stdenv crossStageStatic libcCross threadsCross; 259 }) 260 EXTRA_FLAGS_FOR_TARGET 261 EXTRA_LDFLAGS_FOR_TARGET
··· 255 256 inherit 257 (import ../common/extra-target-flags.nix { 258 + inherit lib stdenv crossStageStatic libcCross threadsCross; 259 }) 260 EXTRA_FLAGS_FOR_TARGET 261 EXTRA_LDFLAGS_FOR_TARGET
+1 -1
pkgs/development/compilers/gcc/8/default.nix
··· 240 241 inherit 242 (import ../common/extra-target-flags.nix { 243 - inherit stdenv crossStageStatic libcCross threadsCross; 244 }) 245 EXTRA_FLAGS_FOR_TARGET 246 EXTRA_LDFLAGS_FOR_TARGET
··· 240 241 inherit 242 (import ../common/extra-target-flags.nix { 243 + inherit lib stdenv crossStageStatic libcCross threadsCross; 244 }) 245 EXTRA_FLAGS_FOR_TARGET 246 EXTRA_LDFLAGS_FOR_TARGET
+1 -1
pkgs/development/compilers/gcc/9/default.nix
··· 259 260 inherit 261 (import ../common/extra-target-flags.nix { 262 - inherit stdenv crossStageStatic langD libcCross threadsCross; 263 }) 264 EXTRA_FLAGS_FOR_TARGET 265 EXTRA_LDFLAGS_FOR_TARGET
··· 259 260 inherit 261 (import ../common/extra-target-flags.nix { 262 + inherit lib stdenv crossStageStatic langD libcCross threadsCross; 263 }) 264 EXTRA_FLAGS_FOR_TARGET 265 EXTRA_LDFLAGS_FOR_TARGET
+1 -2
pkgs/development/compilers/gcc/common/configure-flags.nix
··· 39 40 let 41 inherit (stdenv) 42 - buildPlatform hostPlatform targetPlatform 43 - lib; 44 45 crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; 46 crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
··· 39 40 let 41 inherit (stdenv) 42 + buildPlatform hostPlatform targetPlatform; 43 44 crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; 45 crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
+2 -2
pkgs/development/compilers/gcc/common/extra-target-flags.nix
··· 1 - { stdenv, crossStageStatic, langD ? false, libcCross, threadsCross }: 2 3 let 4 - inherit (stdenv) lib hostPlatform targetPlatform; 5 in 6 7 {
··· 1 + { lib, stdenv, crossStageStatic, langD ? false, libcCross, threadsCross }: 2 3 let 4 + inherit (stdenv) hostPlatform targetPlatform; 5 in 6 7 {
+1 -2
pkgs/development/libraries/gpgme/default.nix
··· 1 - { stdenv, fetchurl, fetchpatch 2 , autoreconfHook, libgpgerror, gnupg, pkg-config, glib, pth, libassuan 3 , file, which, ncurses 4 , texinfo ··· 8 }: 9 10 let 11 - inherit (stdenv) lib; 12 inherit (stdenv.hostPlatform) system; 13 in 14
··· 1 + { lib, stdenv, fetchurl, fetchpatch 2 , autoreconfHook, libgpgerror, gnupg, pkg-config, glib, pth, libassuan 3 , file, which, ncurses 4 , texinfo ··· 8 }: 9 10 let 11 inherit (stdenv.hostPlatform) system; 12 in 13
+1 -2
pkgs/development/libraries/libsnark/default.nix
··· 1 - { stdenv, fetchFromGitHub, cmake, pkg-config, openssl, boost, gmp, procps }: 2 3 let 4 rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07"; 5 - inherit (stdenv) lib; 6 in stdenv.mkDerivation rec { 7 name = "libsnark-pre${version}"; 8 version = lib.substring 0 8 rev;
··· 1 + { lib, stdenv, fetchFromGitHub, cmake, pkg-config, openssl, boost, gmp, procps }: 2 3 let 4 rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07"; 5 in stdenv.mkDerivation rec { 6 name = "libsnark-pre${version}"; 7 version = lib.substring 0 8 rev;
+1 -1
pkgs/development/libraries/qt-5/5.12/default.nix
··· 124 # to avoid cyclic dependencies between Qt modules. 125 mkDerivation = 126 import ../mkDerivation.nix 127 - { inherit (stdenv) lib; inherit debug; wrapQtAppsHook = null; } 128 stdenvActual.mkDerivation; 129 } 130 { inherit self srcs patches; };
··· 124 # to avoid cyclic dependencies between Qt modules. 125 mkDerivation = 126 import ../mkDerivation.nix 127 + { inherit lib; inherit debug; wrapQtAppsHook = null; } 128 stdenvActual.mkDerivation; 129 } 130 { inherit self srcs patches; };
+3 -3
pkgs/development/libraries/qt-5/5.14/default.nix
··· 123 import ../qtModule.nix 124 { 125 inherit perl; 126 - inherit (stdenv) lib; 127 # Use a variant of mkDerivation that does not include wrapQtApplications 128 # to avoid cyclic dependencies between Qt modules. 129 mkDerivation = 130 import ../mkDerivation.nix 131 - { inherit (stdenv) lib; inherit debug; wrapQtAppsHook = null; } 132 stdenvActual.mkDerivation; 133 } 134 { inherit self srcs patches; }; ··· 140 141 mkDerivationWith = 142 import ../mkDerivation.nix 143 - { inherit (stdenv) lib; inherit debug; inherit (self) wrapQtAppsHook; }; 144 145 mkDerivation = mkDerivationWith stdenvActual.mkDerivation; 146
··· 123 import ../qtModule.nix 124 { 125 inherit perl; 126 + inherit lib; 127 # Use a variant of mkDerivation that does not include wrapQtApplications 128 # to avoid cyclic dependencies between Qt modules. 129 mkDerivation = 130 import ../mkDerivation.nix 131 + { inherit lib; inherit debug; wrapQtAppsHook = null; } 132 stdenvActual.mkDerivation; 133 } 134 { inherit self srcs patches; }; ··· 140 141 mkDerivationWith = 142 import ../mkDerivation.nix 143 + { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; }; 144 145 mkDerivation = mkDerivationWith stdenvActual.mkDerivation; 146
+3 -3
pkgs/development/libraries/qt-5/5.15/default.nix
··· 103 import ../qtModule.nix 104 { 105 inherit perl; 106 - inherit (stdenv) lib; 107 # Use a variant of mkDerivation that does not include wrapQtApplications 108 # to avoid cyclic dependencies between Qt modules. 109 mkDerivation = 110 import ../mkDerivation.nix 111 - { inherit (stdenv) lib; inherit debug; wrapQtAppsHook = null; } 112 stdenvActual.mkDerivation; 113 } 114 { inherit self srcs patches; }; ··· 120 121 mkDerivationWith = 122 import ../mkDerivation.nix 123 - { inherit (stdenv) lib; inherit debug; inherit (self) wrapQtAppsHook; }; 124 125 mkDerivation = mkDerivationWith stdenvActual.mkDerivation; 126
··· 103 import ../qtModule.nix 104 { 105 inherit perl; 106 + inherit lib; 107 # Use a variant of mkDerivation that does not include wrapQtApplications 108 # to avoid cyclic dependencies between Qt modules. 109 mkDerivation = 110 import ../mkDerivation.nix 111 + { inherit lib; inherit debug; wrapQtAppsHook = null; } 112 stdenvActual.mkDerivation; 113 } 114 { inherit self srcs patches; }; ··· 120 121 mkDerivationWith = 122 import ../mkDerivation.nix 123 + { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; }; 124 125 mkDerivation = mkDerivationWith stdenvActual.mkDerivation; 126
+1 -2
pkgs/development/tools/profiling/systemtap/default.nix
··· 1 - { fetchgit, pkg-config, gettext, runCommand, makeWrapper 2 , elfutils, kernel, gnumake, python2, python2Packages 3 }: 4 ··· 10 version = "4.1"; 11 12 inherit (kernel) stdenv; 13 - inherit (stdenv) lib; 14 15 ## stap binaries 16 stapBuild = stdenv.mkDerivation {
··· 1 + { lib, fetchgit, pkg-config, gettext, runCommand, makeWrapper 2 , elfutils, kernel, gnumake, python2, python2Packages 3 }: 4 ··· 10 version = "4.1"; 11 12 inherit (kernel) stdenv; 13 14 ## stap binaries 15 stapBuild = stdenv.mkDerivation {
+1 -1
pkgs/development/web/nodejs/nodejs.nix
··· 132 133 passthru.updateScript = import ./update.nix { 134 inherit writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix runtimeShell; 135 - inherit (stdenv) lib; 136 inherit majorVersion; 137 }; 138
··· 132 133 passthru.updateScript = import ./update.nix { 134 inherit writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix runtimeShell; 135 + inherit lib; 136 inherit majorVersion; 137 }; 138
+1 -2
pkgs/games/ue4/default.nix
··· 1 - { stdenv, writeScript, fetchurl, requireFile, unzip, clang, mono, which, 2 xorg, xdg-user-dirs }: 3 4 let 5 - inherit (stdenv) lib; 6 deps = import ./cdn-deps.nix { inherit fetchurl; }; 7 linkDeps = writeScript "link-deps.sh" (lib.concatMapStringsSep "\n" (hash: 8 let prefix = lib.concatStrings (lib.take 2 (lib.stringToCharacters hash));
··· 1 + { lib, stdenv, writeScript, fetchurl, requireFile, unzip, clang, mono, which, 2 xorg, xdg-user-dirs }: 3 4 let 5 deps = import ./cdn-deps.nix { inherit fetchurl; }; 6 linkDeps = writeScript "link-deps.sh" (lib.concatMapStringsSep "\n" (hash: 7 let prefix = lib.concatStrings (lib.take 2 (lib.stringToCharacters hash));
-1
pkgs/servers/monitoring/prometheus/smokeping-prober.nix
··· 1 { lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: 2 3 let 4 - inherit (stdenv) lib; 5 baseVersion = "0.3.1"; 6 commit = "9ba85274dcc21bf8132cbe3b3dccfcb4aab57d9f"; 7 in
··· 1 { lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: 2 3 let 4 baseVersion = "0.3.1"; 5 commit = "9ba85274dcc21bf8132cbe3b3dccfcb4aab57d9f"; 6 in
+2 -2
pkgs/servers/x11/xorg/overrides.nix
··· 1 { abiCompat ? null, 2 - stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages, 3 automake, autoconf, gettext, libiconv, libtool, intltool, 4 freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, 5 libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, ··· 9 }: 10 11 let 12 - inherit (stdenv) lib isDarwin; 13 inherit (lib) overrideDerivation; 14 15 malloc0ReturnsNullCrossFlag = lib.optional
··· 1 { abiCompat ? null, 2 + lib, stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages, 3 automake, autoconf, gettext, libiconv, libtool, intltool, 4 freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, 5 libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, ··· 9 }: 10 11 let 12 + inherit (stdenv) isDarwin; 13 inherit (lib) overrideDerivation; 14 15 malloc0ReturnsNullCrossFlag = lib.optional
+2 -2
pkgs/tools/graphics/wdisplays/default.nix
··· 1 - { stdenv, fetchFromGitHub, meson, ninja, pkg-config, gtk3, epoxy, wayland, wrapGAppsHook 2 , fetchpatch 3 }: 4 ··· 26 }) 27 ]; 28 29 - meta = let inherit (stdenv) lib; in { 30 description = "A graphical application for configuring displays in Wayland compositors"; 31 homepage = "https://github.com/cyclopsian/wdisplays"; 32 maintainers = with lib.maintainers; [ lheckemann ma27 ];
··· 1 + { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, gtk3, epoxy, wayland, wrapGAppsHook 2 , fetchpatch 3 }: 4 ··· 26 }) 27 ]; 28 29 + meta = with lib; { 30 description = "A graphical application for configuring displays in Wayland compositors"; 31 homepage = "https://github.com/cyclopsian/wdisplays"; 32 maintainers = with lib.maintainers; [ lheckemann ma27 ];
-1
pkgs/tools/misc/byobu/default.nix
··· 3 , gettext, vim, bc, screen }: 4 5 let 6 - inherit (stdenv) lib; 7 pythonEnv = python3.withPackages (ps: with ps; [ snack ]); 8 in 9 stdenv.mkDerivation rec {
··· 3 , gettext, vim, bc, screen }: 4 5 let 6 pythonEnv = python3.withPackages (ps: with ps; [ snack ]); 7 in 8 stdenv.mkDerivation rec {
-1
pkgs/tools/misc/staruml/default.nix
··· 4 , libXdamage, expat }: 5 6 let 7 - inherit (stdenv) lib; 8 LD_LIBRARY_PATH = lib.makeLibraryPath 9 [ glib gtk2 gdk-pixbuf alsaLib nss nspr GConf cups libgcrypt dbus libXdamage expat ]; 10 in
··· 4 , libXdamage, expat }: 5 6 let 7 LD_LIBRARY_PATH = lib.makeLibraryPath 8 [ glib gtk2 gdk-pixbuf alsaLib nss nspr GConf cups libgcrypt dbus libXdamage expat ]; 9 in
+2 -3
pkgs/tools/misc/yubikey-manager-qt/default.nix
··· 1 - { stdenv 2 , fetchurl 3 , wrapQtAppsHook 4 , pcsclite ··· 15 , yubikey-manager 16 , yubikey-personalization 17 }: 18 - 19 - let inherit (stdenv) lib; in 20 21 stdenv.mkDerivation rec { 22 pname = "yubikey-manager-qt";
··· 1 + { lib 2 + , stdenv 3 , fetchurl 4 , wrapQtAppsHook 5 , pcsclite ··· 16 , yubikey-manager 17 , yubikey-personalization 18 }: 19 20 stdenv.mkDerivation rec { 21 pname = "yubikey-manager-qt";
+1 -2
pkgs/tools/networking/s6-networking/default.nix
··· 1 - { stdenv, skawarePackages 2 3 # Whether to build the TLS/SSL tools and what library to use 4 # acceptable values: "libressl", false ··· 8 9 with skawarePackages; 10 let 11 - inherit (stdenv) lib; 12 sslSupportEnabled = sslSupport != false; 13 sslLibs = { 14 libressl = libressl;
··· 1 + { lib, stdenv, skawarePackages 2 3 # Whether to build the TLS/SSL tools and what library to use 4 # acceptable values: "libressl", false ··· 8 9 with skawarePackages; 10 let 11 sslSupportEnabled = sslSupport != false; 12 sslLibs = { 13 libressl = libressl;
+1 -1
pkgs/tools/security/tor/default.nix
··· 73 passthru = { 74 tests.tor = nixosTests.tor; 75 updateScript = import ./update.nix { 76 - inherit (stdenv) lib; 77 inherit 78 writeScript 79 common-updater-scripts
··· 73 passthru = { 74 tests.tor = nixosTests.tor; 75 updateScript = import ./update.nix { 76 + inherit lib; 77 inherit 78 writeScript 79 common-updater-scripts