From f5c886ef20f0ec99cdb02dd901e27cad08e3364d Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 12 Jul 2017 16:32:11 +0000 Subject: [PATCH 1/4] lib: generalize callPackageWith and callPackagesWith, add makeOverridableWithUseFlags --- lib/customisation.nix | 25 +++++++++++++++++++++---- lib/default.nix | 7 +++++-- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index 1f5eb0d11e8bf..e7455f8c2ca3d 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -83,6 +83,21 @@ rec { } else ff; + /* This function applies use-flags to packages of the following form + + { stdenv, ... }: + { useFlag ? true, ... }: + stdenv.mkDerivation { }; + + while keeping the rest of makeOverridable mechanics intact. + */ + makeOverridableWithUseFlags = useFlags: f: origArgs: + let + ff = f origArgs; + use = builtins.intersectAttrs (lib.functionArgs ff) useFlags; + in if lib.isFunction ff + then makeOverridable (origArgs: f origArgs use) origArgs + else makeOverridable f origArgs; /* Call the package function in the file `fn' with the required arguments automatically. The function is called with the @@ -105,25 +120,27 @@ rec { enableX11 = true; }; */ - callPackageWith = autoArgs: fn: args: + callPackageWith' = makeOverridableFun: autoArgs: fn: args: let f = if lib.isFunction fn then fn else import fn; auto = builtins.intersectAttrs (lib.functionArgs f) autoArgs; - in makeOverridable f (auto // args); + in makeOverridableFun f (auto // args); + callPackageWith = callPackageWith' makeOverridable; /* Like callPackage, but for a function that returns an attribute set of derivations. The override function is added to the individual attributes. */ - callPackagesWith = autoArgs: fn: args: + callPackagesWith' = makeOverridableFun: autoArgs: fn: args: let f = if lib.isFunction fn then fn else import fn; auto = builtins.intersectAttrs (lib.functionArgs f) autoArgs; origArgs = auto // args; pkgs = f origArgs; - mkAttrOverridable = name: _: makeOverridable (newArgs: (f newArgs).${name}) origArgs; + mkAttrOverridable = name: _: makeOverridableFun (newArgs: (f newArgs).${name}) origArgs; in lib.mapAttrs mkAttrOverridable pkgs; + callPackagesWith = callPackagesWith' makeOverridable; /* Add attributes to each output of a derivation without changing the derivation itself and check a given condition when evaluating. */ diff --git a/lib/default.nix b/lib/default.nix index d400907ebb0cb..8c1d7284dda4e 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -90,8 +90,11 @@ let toInt readPathsFromFile fileContents; inherit (stringsWithDeps) textClosureList textClosureMap noDepEntry fullDepEntry packEntry stringAfter; - inherit (customisation) overrideDerivation makeOverridable - callPackageWith callPackagesWith extendDerivation hydraJob + inherit (customisation) overrideDerivation + makeOverridable makeOverridableWithUseFlags + callPackageWith' callPackageWith + callPackagesWith' callPackagesWith + extendDerivation hydraJob makeScope; inherit (meta) addMetaAttrs dontDistribute setName updateName appendToName mapDerivationAttrset setPrio lowPrio lowPrioSet hiPrio From deede67b1bb035eff3f48b188fc65350ecf67f09 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 20 Feb 2019 20:42:06 +0000 Subject: [PATCH 2/4] splice.nix: demo working man's use flags --- pkgs/top-level/splice.nix | 6 +++--- pkgs/top-level/stage.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index ec6ed357c688b..f6345a15408ab 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -21,7 +21,7 @@ # For performance reasons, rather than uniformally splice in all cases, we only # do so when `pkgs` and `buildPackages` are distinct. The `actuallySplice` # parameter there the boolean value of that equality check. -lib: pkgs: actuallySplice: +lib: config: pkgs: actuallySplice: let @@ -126,9 +126,9 @@ in # `newScope' for sets of packages in `pkgs' (see e.g. `gnome' below). callPackage = pkgs.newScope {}; - callPackages = lib.callPackagesWith splicedPackagesWithXorg; + callPackages = lib.callPackagesWith' (lib.makeOverridableWithUseFlags (config.use or {})) splicedPackagesWithXorg; - newScope = extra: lib.callPackageWith (splicedPackagesWithXorg // extra); + newScope = extra: lib.callPackageWith' (lib.makeOverridableWithUseFlags (config.use or {})) (splicedPackagesWithXorg // extra); # Haskell package sets need this because they reimplement their own # `newScope`. diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 6ca370e0b9b77..b94aa57664c01 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -86,7 +86,7 @@ let inherit (hostPlatform) system; }; - splice = self: super: import ./splice.nix lib self (buildPackages != null); + splice = self: super: import ./splice.nix lib config self (buildPackages != null); allPackages = self: super: let res = import ./all-packages.nix From e4ecbef48cbcb4f775d3a4846f7e5f8e1a30a047 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 21 Feb 2019 05:30:33 +0000 Subject: [PATCH 3/4] treewide: change what needs to be changed to make this work In short, `callPackage` now can not be replaced with an `import` with some `inherit`s, it's a bit weird w.r.t. functions. --- .../applications/editors/jetbrains/common.nix | 2 +- pkgs/applications/editors/neovim/wrapper.nix | 2 +- pkgs/applications/graphics/sane/config.nix | 2 +- pkgs/applications/kde/default.nix | 2 +- .../networking/browsers/chromium/common.nix | 2 +- .../networking/browsers/firefox/wrapper.nix | 2 +- .../instant-messengers/bitlbee/plugins.nix | 2 +- .../rambox/fetchNodeModules.nix | 4 ++- .../networking/irc/weechat/wrapper.nix | 2 +- .../science/electronics/bitscope/common.nix | 2 +- .../build-bazel-package/default.nix | 2 +- .../build-dotnet-package/default.nix | 2 +- .../build-fhs-userenv/default.nix | 2 +- pkgs/build-support/build-fhs-userenv/env.nix | 2 +- pkgs/build-support/build-maven.nix | 2 +- pkgs/build-support/buildenv/default.nix | 2 +- pkgs/build-support/closure-info.nix | 2 +- pkgs/build-support/dhall-to-nix.nix | 2 +- pkgs/build-support/emacs/melpa.nix | 2 +- pkgs/build-support/fetchbitbucket/default.nix | 2 +- pkgs/build-support/fetchbower/default.nix | 2 +- pkgs/build-support/fetchbzr/default.nix | 2 +- pkgs/build-support/fetchcvs/default.nix | 2 +- pkgs/build-support/fetchdarcs/default.nix | 2 +- pkgs/build-support/fetchdocker/default.nix | 2 +- .../fetchdocker/fetchDockerConfig.nix | 2 +- .../fetchdocker/fetchDockerLayer.nix | 2 +- pkgs/build-support/fetchfossil/default.nix | 2 +- pkgs/build-support/fetchgit/default.nix | 2 +- pkgs/build-support/fetchgit/private.nix | 2 +- pkgs/build-support/fetchgithub/default.nix | 2 +- pkgs/build-support/fetchgitlab/default.nix | 2 +- pkgs/build-support/fetchgitlocal/default.nix | 2 +- pkgs/build-support/fetchgx/default.nix | 2 +- pkgs/build-support/fetchhg/default.nix | 2 +- pkgs/build-support/fetchipfs/default.nix | 2 +- .../fetchmavenartifact/default.nix | 2 +- pkgs/build-support/fetchmtn/default.nix | 2 +- pkgs/build-support/fetchnuget/default.nix | 2 +- pkgs/build-support/fetchpatch/default.nix | 2 +- pkgs/build-support/fetchrepoorcz/default.nix | 2 +- .../fetchrepoproject/default.nix | 2 +- pkgs/build-support/fetchs3/default.nix | 2 +- pkgs/build-support/fetchsavannah/default.nix | 2 +- pkgs/build-support/fetchsvn/default.nix | 2 +- pkgs/build-support/fetchsvnssh/default.nix | 2 +- pkgs/build-support/fetchzip/default.nix | 2 +- .../make-desktopitem/default.nix | 2 +- .../make-startupitem/default.nix | 2 +- pkgs/build-support/mkshell/default.nix | 2 +- pkgs/build-support/ocaml/default.nix | 2 +- pkgs/build-support/ocaml/dune.nix | 2 +- .../references-by-popularity/default.nix | 2 +- pkgs/build-support/replace-dependency.nix | 2 +- .../rust/build-rust-crate/default.nix | 2 +- pkgs/build-support/rust/default.nix | 2 +- pkgs/build-support/rust/fetchcargo.nix | 2 +- pkgs/build-support/rust/fetchcrate.nix | 2 +- .../build-support/rust/make-rust-platform.nix | 2 +- pkgs/build-support/setup-systemd-units.nix | 2 +- .../skaware/build-skaware-package.nix | 2 +- pkgs/build-support/source-from-head-fun.nix | 2 +- .../substitute-files/substitute-all-files.nix | 2 +- .../substitute/substitute-all.nix | 2 +- pkgs/desktops/deepin/update.nix | 2 +- pkgs/desktops/gnome-3/update.nix | 2 +- .../gnustep/make/gsmakeDerivation.nix | 2 +- pkgs/desktops/pantheon/update.nix | 2 +- pkgs/desktops/plasma-5/default.nix | 2 +- pkgs/desktops/xfce4-13/mkXfceDerivation.nix | 2 +- .../bower-modules/generic/default.nix | 2 +- .../compilers/chicken/5/eggDerivation.nix | 2 +- .../compilers/chicken/5/fetchegg/default.nix | 2 +- .../compilers/ghcjs-ng/default.nix | 2 +- .../em-modules/generic/default.nix | 2 +- .../go-modules/generic/default.nix | 2 +- pkgs/development/haskell-modules/default.nix | 2 +- .../haskell-modules/generic-builder.nix | 2 +- .../haskell-modules/make-package-set.nix | 2 +- .../interpreters/jruby/default.nix | 4 +-- .../interpreters/lua-5/build-lua-package.nix | 2 +- .../interpreters/lua-5/setup-hook.nix | 2 +- .../python/build-python-package.nix | 2 +- .../interpreters/python/setup-hook.nix | 2 +- .../java-modules/build-maven-package.nix | 2 +- pkgs/development/java-modules/m2install.nix | 2 +- .../libraries/aspell/aspell-with-dicts.nix | 2 +- pkgs/development/libraries/glibc/common.nix | 2 +- .../libraries/kde-frameworks/default.nix | 2 +- pkgs/development/libraries/psol/generic.nix | 2 +- pkgs/development/libraries/qt-5/qt-env.nix | 2 +- .../lua-modules/generated-packages.nix | 2 +- .../lua-modules/generic/default.nix | 2 +- .../janestreet/buildOcamlJane.nix | 2 +- .../ocaml-modules/janestreet/janePackage.nix | 2 +- .../perl-modules/generic/default.nix | 2 +- .../development/r-modules/generic-builder.nix | 2 +- .../ruby-modules/bundled-common/default.nix | 2 +- .../ruby-modules/bundler-app/default.nix | 2 +- .../ruby-modules/bundler-env/default.nix | 2 +- pkgs/development/ruby-modules/gem/default.nix | 2 +- pkgs/development/web/nodejs/nodejs.nix | 2 +- pkgs/games/quake3/wrapper/default.nix | 2 +- pkgs/misc/my-env/default.nix | 2 +- pkgs/misc/vim-plugins/overrides.nix | 2 +- .../libsecurity_generic/default.nix | 2 +- .../darwin/ghc-standalone-archive/default.nix | 2 +- .../linux/kernel/manual-config.nix | 2 +- pkgs/servers/dict/dictd-db-collector.nix | 2 +- pkgs/top-level/haskell-packages.nix | 28 +++++++++---------- pkgs/top-level/lua-packages.nix | 2 +- 111 files changed, 127 insertions(+), 125 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index be20800cde295..ca4293ee09800 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -1,6 +1,6 @@ { stdenv, makeDesktopItem, makeWrapper, patchelf, p7zip , coreutils, gnugrep, which, git, unzip, libsecret, libnotify -}: +}: {}: { name, product, version, src, wmClass, jdk, meta }: diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 7d76bc1fd1a0c..fa653c07ebc54 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -5,7 +5,7 @@ , nodePackages , pythonPackages , python3Packages -}: +}: {}: with stdenv.lib; neovim: diff --git a/pkgs/applications/graphics/sane/config.nix b/pkgs/applications/graphics/sane/config.nix index c0a0206ddd1f1..42e3c4fc24b09 100644 --- a/pkgs/applications/graphics/sane/config.nix +++ b/pkgs/applications/graphics/sane/config.nix @@ -1,4 +1,4 @@ -{ stdenv }: +{ stdenv }: {}: { paths }: diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 0822e65c7c0c4..e420609b2d51e 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -40,7 +40,7 @@ let sname = args.sname or name; inherit (srcs."${sname}") src version; mkDerivation = - libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; + libsForQt5.callPackage ({ mkDerivation }: {}: mkDerivation) {}; in mkDerivation (args // { name = "${name}-${version}"; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 5d59f7514c60c..6d80496e778fc 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -31,7 +31,7 @@ , pulseSupport ? false, libpulseaudio ? null , upstream-info -}: +}: {}: buildFun: diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index bc3a1ed844a46..f9cf77a2c0718 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -10,7 +10,7 @@ , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow , udev , kerberos -}: +}: {}: ## configurability of the wrapper itself diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix b/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix index 4e05e7cae9705..8b90008bc78f1 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix @@ -1,4 +1,4 @@ -{ stdenv, bitlbee }: +{ stdenv, bitlbee }: {}: with stdenv.lib; diff --git a/pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix b/pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix index 047890a932ca0..2a42ab431c867 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix @@ -1,4 +1,6 @@ -{ stdenv, jq }: { src, nodejs, sha256 }: +{ stdenv, jq }: {}: + +{ src, nodejs, sha256 }: # Only npm >= 5.4.2 is deterministic, see: # https://github.com/npm/npm/issues/17979#issuecomment-332701215 diff --git a/pkgs/applications/networking/irc/weechat/wrapper.nix b/pkgs/applications/networking/irc/weechat/wrapper.nix index faf069cebf140..78a43526ce9c1 100644 --- a/pkgs/applications/networking/irc/weechat/wrapper.nix +++ b/pkgs/applications/networking/irc/weechat/wrapper.nix @@ -1,6 +1,6 @@ { stdenv, lib, runCommand, writeScriptBin, buildEnv , pythonPackages, perlPackages -}: +}: {}: weechat: diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix index 64777b5a0ac8e..184d8b179fe62 100644 --- a/pkgs/applications/science/electronics/bitscope/common.nix +++ b/pkgs/applications/science/electronics/bitscope/common.nix @@ -9,7 +9,7 @@ , pango , stdenv , xorg -}: +}: {}: { src, toolName, version, ... } @ attrs: let diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index f39f4e65e454c..26ae0b96b9e6f 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bazel, cacert, enableNixHacks ? true }: +{ stdenv, bazel, cacert, enableNixHacks ? true }: {}: args@{ name, bazelFlags ? [], bazelTarget, buildAttrs, fetchAttrs, ... }: diff --git a/pkgs/build-support/build-dotnet-package/default.nix b/pkgs/build-support/build-dotnet-package/default.nix index f36c69e43392b..69ea530d4d25d 100644 --- a/pkgs/build-support/build-dotnet-package/default.nix +++ b/pkgs/build-support/build-dotnet-package/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeWrapper, pkgconfig, mono, dotnetbuildhelpers }: +{ stdenv, lib, makeWrapper, pkgconfig, mono, dotnetbuildhelpers }: {}: attrsOrig @ { baseName diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix index 707b256cd4b4a..70873159dcf51 100644 --- a/pkgs/build-support/build-fhs-userenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/default.nix @@ -1,4 +1,4 @@ -{ callPackage, runCommand, writeScript, stdenv, coreutils }: +{ callPackage, runCommand, writeScript, stdenv, coreutils }: {}: let buildFHSEnv = callPackage ./env.nix { }; in diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index 23568f51b23e1..8510fe5d0cb19 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, writeText, pkgs, pkgsi686Linux }: +{ stdenv, buildEnv, writeText, pkgs, pkgsi686Linux }: {}: { name, profile ? "" , targetPkgs ? pkgs: [], multiPkgs ? pkgs: [] diff --git a/pkgs/build-support/build-maven.nix b/pkgs/build-support/build-maven.nix index f47e3ebc61c20..673a4d1cfd4d4 100644 --- a/pkgs/build-support/build-maven.nix +++ b/pkgs/build-support/build-maven.nix @@ -1,4 +1,4 @@ -{ stdenv, maven, runCommand, writeText, fetchurl, lib, requireFile }: +{ stdenv, maven, runCommand, writeText, fetchurl, lib, requireFile }: {}: /* Takes an info file generated by mvn2nix * (https://github.com/NixOS/mvn2nix-maven-plugin) and builds the maven * project with it. diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index 41a1e67ef428b..edfeda8c0b8cf 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -2,7 +2,7 @@ # a fork of the buildEnv in the Nix distribution. Most changes should # eventually be merged back into the Nix distribution. -{ buildPackages, runCommand, lib }: +{ buildPackages, runCommand, lib }: {}: lib.makeOverridable ({ name diff --git a/pkgs/build-support/closure-info.nix b/pkgs/build-support/closure-info.nix index 28f2802a5bce6..742058c15171d 100644 --- a/pkgs/build-support/closure-info.nix +++ b/pkgs/build-support/closure-info.nix @@ -4,7 +4,7 @@ # "nix-store --load-db" and "nix-store --register-validity # --hash-given". -{ stdenv, coreutils, jq, buildPackages }: +{ stdenv, coreutils, jq, buildPackages }: {}: { rootPaths }: diff --git a/pkgs/build-support/dhall-to-nix.nix b/pkgs/build-support/dhall-to-nix.nix index c563b34ff3bc2..377a4f463af1e 100644 --- a/pkgs/build-support/dhall-to-nix.nix +++ b/pkgs/build-support/dhall-to-nix.nix @@ -15,7 +15,7 @@ Note that this uses "import from derivation", meaning that Nix will perform a build during the evaluation phase if you use this `dhallToNix` utility */ -{ stdenv, dhall-nix }: +{ stdenv, dhall-nix }: {}: let dhallToNix = code : diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index 96e61bbf90e5c..e8f6fa5c462d7 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -1,7 +1,7 @@ # builder for Emacs packages built for packages.el # using MELPA package-build.el -{ lib, stdenv, fetchFromGitHub, emacs, texinfo }: +{ lib, stdenv, fetchFromGitHub, emacs, texinfo }: {}: with lib; diff --git a/pkgs/build-support/fetchbitbucket/default.nix b/pkgs/build-support/fetchbitbucket/default.nix index a99f72e9eaa75..80792920dd895 100644 --- a/pkgs/build-support/fetchbitbucket/default.nix +++ b/pkgs/build-support/fetchbitbucket/default.nix @@ -1,4 +1,4 @@ -{ fetchzip }: +{ fetchzip }: {}: { owner, repo, rev, name ? "source" , ... # For hash agility diff --git a/pkgs/build-support/fetchbower/default.nix b/pkgs/build-support/fetchbower/default.nix index fd971d431df88..9df6e1534c737 100644 --- a/pkgs/build-support/fetchbower/default.nix +++ b/pkgs/build-support/fetchbower/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, lib, bower2nix, cacert }: +{ stdenvNoCC, lib, bower2nix, cacert }: {}: let bowerVersion = version: let diff --git a/pkgs/build-support/fetchbzr/default.nix b/pkgs/build-support/fetchbzr/default.nix index f9250de4ee07e..ff67ad497d785 100644 --- a/pkgs/build-support/fetchbzr/default.nix +++ b/pkgs/build-support/fetchbzr/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, bazaar }: +{ stdenvNoCC, bazaar }: {}: { url, rev, sha256 }: stdenvNoCC.mkDerivation { diff --git a/pkgs/build-support/fetchcvs/default.nix b/pkgs/build-support/fetchcvs/default.nix index 1f7947d4d4529..55cfc6e58c563 100644 --- a/pkgs/build-support/fetchcvs/default.nix +++ b/pkgs/build-support/fetchcvs/default.nix @@ -3,7 +3,7 @@ # tag="" (get version by tag name) # If you don't specify neither one date="NOW" will be used (get latest) -{stdenvNoCC, cvs, openssh}: +{stdenvNoCC, cvs, openssh}: {}: {cvsRoot, module, tag ? null, date ? null, sha256}: diff --git a/pkgs/build-support/fetchdarcs/default.nix b/pkgs/build-support/fetchdarcs/default.nix index 02777c9900dcc..83f526abf3efc 100644 --- a/pkgs/build-support/fetchdarcs/default.nix +++ b/pkgs/build-support/fetchdarcs/default.nix @@ -1,4 +1,4 @@ -{stdenvNoCC, darcs, cacert}: +{stdenvNoCC, darcs, cacert}: {}: {url, rev ? null, context ? null, md5 ? "", sha256 ? ""}: diff --git a/pkgs/build-support/fetchdocker/default.nix b/pkgs/build-support/fetchdocker/default.nix index bbd2bae46df55..3175fec91e2b4 100644 --- a/pkgs/build-support/fetchdocker/default.nix +++ b/pkgs/build-support/fetchdocker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, coreutils, bash, gnutar, writeText }: +{ stdenv, lib, coreutils, bash, gnutar, writeText }: {}: let stripScheme = builtins.replaceStrings [ "https://" "http://" ] [ "" "" ]; diff --git a/pkgs/build-support/fetchdocker/fetchDockerConfig.nix b/pkgs/build-support/fetchdocker/fetchDockerConfig.nix index 9fd813bfa575a..5f2f8e63afb50 100644 --- a/pkgs/build-support/fetchdocker/fetchDockerConfig.nix +++ b/pkgs/build-support/fetchdocker/fetchDockerConfig.nix @@ -1,4 +1,4 @@ -pkgargs@{ stdenv, lib, haskellPackages, writeText, gawk }: +pkgargs@{ stdenv, lib, haskellPackages, writeText, gawk }: {}: let generic-fetcher = import ./generic-fetcher.nix pkgargs; diff --git a/pkgs/build-support/fetchdocker/fetchDockerLayer.nix b/pkgs/build-support/fetchdocker/fetchDockerLayer.nix index 869ba637429cd..68134fb39f980 100644 --- a/pkgs/build-support/fetchdocker/fetchDockerLayer.nix +++ b/pkgs/build-support/fetchdocker/fetchDockerLayer.nix @@ -1,4 +1,4 @@ -pkgargs@{ stdenv, lib, haskellPackages, writeText, gawk }: +pkgargs@{ stdenv, lib, haskellPackages, writeText, gawk }: {}: let generic-fetcher = import ./generic-fetcher.nix pkgargs; diff --git a/pkgs/build-support/fetchfossil/default.nix b/pkgs/build-support/fetchfossil/default.nix index 27933b47178a6..e737ccdd86f53 100644 --- a/pkgs/build-support/fetchfossil/default.nix +++ b/pkgs/build-support/fetchfossil/default.nix @@ -1,4 +1,4 @@ -{stdenv, fossil}: +{stdenv, fossil}: {}: {name ? null, url, rev, sha256}: diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 256c86748d287..122e7f65fb55b 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -1,4 +1,4 @@ -{stdenvNoCC, git, cacert}: let +{stdenvNoCC, git, cacert}: {}: let urlToName = url: rev: let inherit (stdenvNoCC.lib) removeSuffix splitString last; base = last (splitString ":" (baseNameOf (removeSuffix "/" url))); diff --git a/pkgs/build-support/fetchgit/private.nix b/pkgs/build-support/fetchgit/private.nix index 59376f3b0424f..1158e555c7fc3 100644 --- a/pkgs/build-support/fetchgit/private.nix +++ b/pkgs/build-support/fetchgit/private.nix @@ -1,4 +1,4 @@ -{ fetchgit, runCommand, makeWrapper, openssh }: args: derivation ((fetchgit args).drvAttrs // { +{ fetchgit, runCommand, makeWrapper, openssh }: {}: args: derivation ((fetchgit args).drvAttrs // { SSH_AUTH_SOCK = if (builtins.tryEval ).success then builtins.toString else null; diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix index 66671dd0a6ae2..0862c0eb59336 100644 --- a/pkgs/build-support/fetchgithub/default.nix +++ b/pkgs/build-support/fetchgithub/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchgit, fetchzip }: +{ lib, fetchgit, fetchzip }: {}: { owner, repo, rev, name ? "source" , fetchSubmodules ? false, private ? false diff --git a/pkgs/build-support/fetchgitlab/default.nix b/pkgs/build-support/fetchgitlab/default.nix index be110cf8393ec..90fa3c11b6c08 100644 --- a/pkgs/build-support/fetchgitlab/default.nix +++ b/pkgs/build-support/fetchgitlab/default.nix @@ -1,4 +1,4 @@ -{ fetchzip, lib }: +{ fetchzip, lib }: {}: # gitlab example { owner, repo, rev, domain ? "gitlab.com", name ? "source", group ? null diff --git a/pkgs/build-support/fetchgitlocal/default.nix b/pkgs/build-support/fetchgitlocal/default.nix index fa19457755374..b208febd7ab77 100644 --- a/pkgs/build-support/fetchgitlocal/default.nix +++ b/pkgs/build-support/fetchgitlocal/default.nix @@ -1,4 +1,4 @@ -{ runCommand, git }: src: +{ runCommand, git }: {}: src: let srcStr = toString src; diff --git a/pkgs/build-support/fetchgx/default.nix b/pkgs/build-support/fetchgx/default.nix index 3ccf5d273fc5a..029439ae60b92 100644 --- a/pkgs/build-support/fetchgx/default.nix +++ b/pkgs/build-support/fetchgx/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, gx, gx-go, go, cacert }: +{ stdenvNoCC, gx, gx-go, go, cacert }: {}: { name, src, sha256 }: diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix index 41eff1f9c0c57..8fc6a20e39d85 100644 --- a/pkgs/build-support/fetchhg/default.nix +++ b/pkgs/build-support/fetchhg/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, mercurial }: +{ stdenvNoCC, mercurial }: {}: { name ? null , url , rev ? null diff --git a/pkgs/build-support/fetchipfs/default.nix b/pkgs/build-support/fetchipfs/default.nix index 7a66999ec5698..43362c7dce0be 100644 --- a/pkgs/build-support/fetchipfs/default.nix +++ b/pkgs/build-support/fetchipfs/default.nix @@ -1,6 +1,6 @@ { stdenv , curl -}: +}: {}: { ipfs , url ? "" diff --git a/pkgs/build-support/fetchmavenartifact/default.nix b/pkgs/build-support/fetchmavenartifact/default.nix index dc48a312fb379..787107ab869c2 100644 --- a/pkgs/build-support/fetchmavenartifact/default.nix +++ b/pkgs/build-support/fetchmavenartifact/default.nix @@ -1,6 +1,6 @@ # Adaptation of the MIT-licensed work on `sbt2nix` done by Charles O'Farrell -{ fetchurl, stdenv }: +{ fetchurl, stdenv }: {}: let defaultRepos = [ http://central.maven.org/maven2 diff --git a/pkgs/build-support/fetchmtn/default.nix b/pkgs/build-support/fetchmtn/default.nix index 7ce67453d698b..c3240aee1b801 100644 --- a/pkgs/build-support/fetchmtn/default.nix +++ b/pkgs/build-support/fetchmtn/default.nix @@ -1,5 +1,5 @@ # You can specify some extra mirrors and a cache DB via options -{stdenvNoCC, monotone, defaultDBMirrors ? [], cacheDB ? "./mtn-checkout.db"}: +{stdenvNoCC, monotone, defaultDBMirrors ? [], cacheDB ? "./mtn-checkout.db"}: {}: # dbs is a list of strings # each is an url for sync diff --git a/pkgs/build-support/fetchnuget/default.nix b/pkgs/build-support/fetchnuget/default.nix index 960bc3c1ffb2e..8d88f5cbb02bf 100644 --- a/pkgs/build-support/fetchnuget/default.nix +++ b/pkgs/build-support/fetchnuget/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, buildDotnetPackage, unzip }: +{ fetchurl, buildDotnetPackage, unzip }: {}: attrs @ { baseName diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix index 89d72f512f7f9..500a64c6e5cf8 100644 --- a/pkgs/build-support/fetchpatch/default.nix +++ b/pkgs/build-support/fetchpatch/default.nix @@ -4,7 +4,7 @@ # often change with updating of git or cgit. # stripLen acts as the -p parameter when applying a patch. -{ lib, fetchurl, buildPackages }: +{ lib, fetchurl, buildPackages }: {}: { stripLen ? 0, extraPrefix ? null, excludes ? [], includes ? [], revert ? false, ... }@args: fetchurl ({ diff --git a/pkgs/build-support/fetchrepoorcz/default.nix b/pkgs/build-support/fetchrepoorcz/default.nix index 3ac7cace0dcf7..2677d3a9b8f2f 100644 --- a/pkgs/build-support/fetchrepoorcz/default.nix +++ b/pkgs/build-support/fetchrepoorcz/default.nix @@ -1,4 +1,4 @@ -{ fetchzip }: +{ fetchzip }: {}: # gitweb example, snapshot support is optional in gitweb { repo, rev, name ? "source" diff --git a/pkgs/build-support/fetchrepoproject/default.nix b/pkgs/build-support/fetchrepoproject/default.nix index f8793dbac9502..497af7b76ec2a 100644 --- a/pkgs/build-support/fetchrepoproject/default.nix +++ b/pkgs/build-support/fetchrepoproject/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, gitRepo, cacert, copyPathsToStore }: +{ stdenvNoCC, gitRepo, cacert, copyPathsToStore }: {}: { name, manifest, rev ? "HEAD", sha256 # Optional parameters: diff --git a/pkgs/build-support/fetchs3/default.nix b/pkgs/build-support/fetchs3/default.nix index 3dbde203374d8..25e8fbea852f8 100644 --- a/pkgs/build-support/fetchs3/default.nix +++ b/pkgs/build-support/fetchs3/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, runCommand, awscli }: +{ stdenvNoCC, runCommand, awscli }: {}: { s3url , name ? builtins.baseNameOf s3url diff --git a/pkgs/build-support/fetchsavannah/default.nix b/pkgs/build-support/fetchsavannah/default.nix index 994922a58679d..ea50014065efe 100644 --- a/pkgs/build-support/fetchsavannah/default.nix +++ b/pkgs/build-support/fetchsavannah/default.nix @@ -1,4 +1,4 @@ -{ fetchzip }: +{ fetchzip }: {}: # cgit example, snapshot support is optional in cgit { repo, rev, name ? "source" diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix index 68433d1471d66..aa097f192680d 100644 --- a/pkgs/build-support/fetchsvn/default.nix +++ b/pkgs/build-support/fetchsvn/default.nix @@ -1,4 +1,4 @@ -{stdenvNoCC, subversion, glibcLocales, sshSupport ? true, openssh ? null}: +{stdenvNoCC, subversion, glibcLocales, sshSupport ? true, openssh ? null}: {}: {url, rev ? "HEAD", md5 ? "", sha256 ? "" , ignoreExternals ? false, ignoreKeywords ? false, name ? null , preferLocalBuild ? true }: diff --git a/pkgs/build-support/fetchsvnssh/default.nix b/pkgs/build-support/fetchsvnssh/default.nix index fbd74efd750ad..00f1e2bc86b48 100644 --- a/pkgs/build-support/fetchsvnssh/default.nix +++ b/pkgs/build-support/fetchsvnssh/default.nix @@ -1,4 +1,4 @@ -{stdenvNoCC, subversion, sshSupport ? true, openssh ? null, expect}: +{stdenvNoCC, subversion, sshSupport ? true, openssh ? null, expect}: {}: {username, password, url, rev ? "HEAD", md5 ? "", sha256 ? ""}: diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix index f1b9b9290d4c3..53d6b720ca0ce 100644 --- a/pkgs/build-support/fetchzip/default.nix +++ b/pkgs/build-support/fetchzip/default.nix @@ -5,7 +5,7 @@ # (e.g. due to minor changes in the compression algorithm, or changes # in timestamps). -{ lib, fetchurl, unzip }: +{ lib, fetchurl, unzip }: {}: { # Optionally move the contents of the unpacked tree up one level. stripRoot ? true diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix index f8c31ed5c1d42..cc1acf7ecc1dd 100644 --- a/pkgs/build-support/make-desktopitem/default.nix +++ b/pkgs/build-support/make-desktopitem/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib}: +{stdenv, lib}: {}: { name , type ? "Application" , exec diff --git a/pkgs/build-support/make-startupitem/default.nix b/pkgs/build-support/make-startupitem/default.nix index da1d4105c89fb..694e8bba5ce14 100644 --- a/pkgs/build-support/make-startupitem/default.nix +++ b/pkgs/build-support/make-startupitem/default.nix @@ -1,7 +1,7 @@ # given a pakcage with a $name.desktop file, makes a copy # as autostart item. -{stdenv, lib}: +{stdenv, lib}: {}: { name # name of the desktop file (without .desktop) , package # package where the desktop file resides in , srcPrefix ? "" # additional prefix that the desktop file may have in the 'package' diff --git a/pkgs/build-support/mkshell/default.nix b/pkgs/build-support/mkshell/default.nix index a98b4affacba2..23d712ba7f560 100644 --- a/pkgs/build-support/mkshell/default.nix +++ b/pkgs/build-support/mkshell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv }: +{ lib, stdenv }: {}: # A special kind of derivation that is only meant to be consumed by the # nix-shell. diff --git a/pkgs/build-support/ocaml/default.nix b/pkgs/build-support/ocaml/default.nix index cc2001c66e2e5..35f0e172b3f1d 100644 --- a/pkgs/build-support/ocaml/default.nix +++ b/pkgs/build-support/ocaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, ocaml, findlib, ocamlbuild, camlp4 }: +{ stdenv, writeText, ocaml, findlib, ocamlbuild, camlp4 }: {}: { name, version, buildInputs ? [], createFindlibDestdir ? true, diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix index 4d6ed76aca019..1b6236718c9cc 100644 --- a/pkgs/build-support/ocaml/dune.nix +++ b/pkgs/build-support/ocaml/dune.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, dune, opaline }: +{ stdenv, fetchurl, ocaml, findlib, dune, opaline }: {}: { pname, version, buildInputs ? [], ... }@args: diff --git a/pkgs/build-support/references-by-popularity/default.nix b/pkgs/build-support/references-by-popularity/default.nix index 4cae2dcf3ca96..252e87ea5e99d 100644 --- a/pkgs/build-support/references-by-popularity/default.nix +++ b/pkgs/build-support/references-by-popularity/default.nix @@ -1,4 +1,4 @@ -{ runCommand, python3, coreutils }: +{ runCommand, python3, coreutils }: {}: # Write the references of `path' to a file, in order of how "popular" each # reference is. Nix 2 only. path: runCommand "closure-paths" diff --git a/pkgs/build-support/replace-dependency.nix b/pkgs/build-support/replace-dependency.nix index 15ab50bf3974c..e4585bc701695 100644 --- a/pkgs/build-support/replace-dependency.nix +++ b/pkgs/build-support/replace-dependency.nix @@ -1,4 +1,4 @@ -{ runCommand, nix, lib }: +{ runCommand, nix, lib }: {}: # Replace a single dependency in the requisites tree of drv, propagating # the change all the way up the tree, without a full rebuild. This can be diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index dbb2f1b80cc94..a892fe95df23b 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -4,7 +4,7 @@ # This can be useful for deploying packages with NixOps, and to share # binary dependencies between projects. -{ lib, stdenv, defaultCrateOverrides, fetchCrate, rustc }: +{ lib, stdenv, defaultCrateOverrides, fetchCrate, rustc }: {}: let # This doesn't appear to be officially documented anywhere yet. diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 43aecdef5f2ee..97290d3fda6d0 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cacert, git, cargo, rustc, cargo-vendor, fetchcargo, python3 }: +{ stdenv, cacert, git, cargo, rustc, cargo-vendor, fetchcargo, python3 }: {}: { name, cargoSha256 ? "unset" , src ? null diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix index e8465ba61624a..1c30752459eef 100644 --- a/pkgs/build-support/rust/fetchcargo.nix +++ b/pkgs/build-support/rust/fetchcargo.nix @@ -1,4 +1,4 @@ -{ stdenv, cacert, git, cargo, cargo-vendor, python3 }: +{ stdenv, cacert, git, cargo, cargo-vendor, python3 }: {}: let cargo-vendor-normalise = stdenv.mkDerivation { name = "cargo-vendor-normalise"; src = ./cargo-vendor-normalise.py; diff --git a/pkgs/build-support/rust/fetchcrate.nix b/pkgs/build-support/rust/fetchcrate.nix index 95dfd38b12ae9..63580450a6ab3 100644 --- a/pkgs/build-support/rust/fetchcrate.nix +++ b/pkgs/build-support/rust/fetchcrate.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, unzip }: +{ lib, fetchurl, unzip }: {}: { crateName , version diff --git a/pkgs/build-support/rust/make-rust-platform.nix b/pkgs/build-support/rust/make-rust-platform.nix index afbc56865ff72..cbb0fe9d2219c 100644 --- a/pkgs/build-support/rust/make-rust-platform.nix +++ b/pkgs/build-support/rust/make-rust-platform.nix @@ -1,4 +1,4 @@ -{ callPackage }: +{ callPackage }: {}: { rustc, cargo, ... }: { rust = { inherit rustc cargo; diff --git a/pkgs/build-support/setup-systemd-units.nix b/pkgs/build-support/setup-systemd-units.nix index 4fa2f42c39dc8..36d34920e2840 100644 --- a/pkgs/build-support/setup-systemd-units.nix +++ b/pkgs/build-support/setup-systemd-units.nix @@ -9,7 +9,7 @@ , systemd , runCommand , lib -}: +}: {}: { units # : AttrSet String (Either Path { path : Path, wanted-by : [ String ] }) # ^ A set whose names are unit names and values are # either paths to the corresponding unit files or a set diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix index 51921fdfbdc74..dc86f58b05d6c 100644 --- a/pkgs/build-support/skaware/build-skaware-package.nix +++ b/pkgs/build-support/skaware/build-skaware-package.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeScript, file }: +{ stdenv, fetchurl, writeScript, file }: {}: let lib = stdenv.lib; in { # : string diff --git a/pkgs/build-support/source-from-head-fun.nix b/pkgs/build-support/source-from-head-fun.nix index c6d6cfcc95b6d..4adb6f9b9e9c1 100644 --- a/pkgs/build-support/source-from-head-fun.nix +++ b/pkgs/build-support/source-from-head-fun.nix @@ -9,7 +9,7 @@ The documentation is availible at http://github.com/MarcWeber/nix-repository-manager/raw/master/README */ -{ config }: +{ config }: {}: localTarName: publishedSrcSnapshot: if config.sourceFromHead.useLocalRepos or false then "${config.sourceFromHead.managedRepoDir or "/set/sourceFromHead.managedRepoDir/please"}/dist/${localTarName}" diff --git a/pkgs/build-support/substitute-files/substitute-all-files.nix b/pkgs/build-support/substitute-files/substitute-all-files.nix index aa600a76650c2..861c62788800f 100644 --- a/pkgs/build-support/substitute-files/substitute-all-files.nix +++ b/pkgs/build-support/substitute-files/substitute-all-files.nix @@ -1,4 +1,4 @@ -{ stdenv }: +{ stdenv }: {}: args: diff --git a/pkgs/build-support/substitute/substitute-all.nix b/pkgs/build-support/substitute/substitute-all.nix index 7fd46f95f998f..6a6dde2b673f0 100644 --- a/pkgs/build-support/substitute/substitute-all.nix +++ b/pkgs/build-support/substitute/substitute-all.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC }: +{ stdenvNoCC }: {}: args: diff --git a/pkgs/desktops/deepin/update.nix b/pkgs/desktops/deepin/update.nix index 22a6acb8ce31b..c188e7ef7bd07 100644 --- a/pkgs/desktops/deepin/update.nix +++ b/pkgs/desktops/deepin/update.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, writeScript, coreutils, curl, gnugrep, gnused, jq, common-updater-scripts, nix }: +{ stdenv, lib, writeScript, coreutils, curl, gnugrep, gnused, jq, common-updater-scripts, nix }: {}: { name, ignored-versions ? "^2014\\.|^v[0-9]+" }: let diff --git a/pkgs/desktops/gnome-3/update.nix b/pkgs/desktops/gnome-3/update.nix index 2ee72d46993de..75c32f6d48a30 100644 --- a/pkgs/desktops/gnome-3/update.nix +++ b/pkgs/desktops/gnome-3/update.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, writeScript, python3, common-updater-scripts, coreutils, gnugrep, gnused }: +{ stdenv, lib, writeScript, python3, common-updater-scripts, coreutils, gnugrep, gnused }: {}: { packageName, attrPath ? packageName, versionPolicy ? "odd-unstable" }: let diff --git a/pkgs/desktops/gnustep/make/gsmakeDerivation.nix b/pkgs/desktops/gnustep/make/gsmakeDerivation.nix index 7bb287c3fa598..67337cda3db4d 100644 --- a/pkgs/desktops/gnustep/make/gsmakeDerivation.nix +++ b/pkgs/desktops/gnustep/make/gsmakeDerivation.nix @@ -1,4 +1,4 @@ -{ stdenv, make, makeWrapper, which }: +{ stdenv, make, makeWrapper, which }: {}: { buildInputs ? [], ...} @ args: stdenv.mkDerivation (args // { buildInputs = [ makeWrapper make which ] ++ buildInputs; diff --git a/pkgs/desktops/pantheon/update.nix b/pkgs/desktops/pantheon/update.nix index 48fd2f2bf858f..42508ef6d47b8 100644 --- a/pkgs/desktops/pantheon/update.nix +++ b/pkgs/desktops/pantheon/update.nix @@ -1,4 +1,4 @@ -{ stdenv, writeScript, runCommand, nix, bash, git, jq, nix-prefetch-scripts, coreutils, common-updater-scripts, gnugrep, gnused, curl }: +{ stdenv, writeScript, runCommand, nix, bash, git, jq, nix-prefetch-scripts, coreutils, common-updater-scripts, gnugrep, gnused, curl }: {}: { repoName, attrPath ? repoName, versionPolicy ? "release" }: let script = ./update.sh; diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 2c99713bcd4a3..75bb1ba9977f5 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -35,7 +35,7 @@ let mirror = "mirror://kde"; }; - mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; + mkDerivation = libsForQt5.callPackage ({ mkDerivation }: {}: mkDerivation) {}; packages = self: with self; let diff --git a/pkgs/desktops/xfce4-13/mkXfceDerivation.nix b/pkgs/desktops/xfce4-13/mkXfceDerivation.nix index da7179c464625..d44f3ef15139d 100644 --- a/pkgs/desktops/xfce4-13/mkXfceDerivation.nix +++ b/pkgs/desktops/xfce4-13/mkXfceDerivation.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools, hicolor-icon-theme }: +{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools, hicolor-icon-theme }: {}: { category, pname, version, rev ? "${pname}-${version}", sha256, ... } @ args: diff --git a/pkgs/development/bower-modules/generic/default.nix b/pkgs/development/bower-modules/generic/default.nix index ba15b58816020..c3ec9bc9869b6 100644 --- a/pkgs/development/bower-modules/generic/default.nix +++ b/pkgs/development/bower-modules/generic/default.nix @@ -1,4 +1,4 @@ -{ pkgs }: +{ pkgs }: {}: { buildInputs ? [], generated, ... } @ attrs: diff --git a/pkgs/development/compilers/chicken/5/eggDerivation.nix b/pkgs/development/compilers/chicken/5/eggDerivation.nix index 3dc1c4afce989..e2c2eea859540 100644 --- a/pkgs/development/compilers/chicken/5/eggDerivation.nix +++ b/pkgs/development/compilers/chicken/5/eggDerivation.nix @@ -1,4 +1,4 @@ -{ stdenv, chicken, makeWrapper }: +{ stdenv, chicken, makeWrapper }: {}: { name, src , buildInputs ? [] , chickenInstallFlags ? [] diff --git a/pkgs/development/compilers/chicken/5/fetchegg/default.nix b/pkgs/development/compilers/chicken/5/fetchegg/default.nix index 24bfbd7a30f46..e83dedceb4245 100644 --- a/pkgs/development/compilers/chicken/5/fetchegg/default.nix +++ b/pkgs/development/compilers/chicken/5/fetchegg/default.nix @@ -1,7 +1,7 @@ # Fetches a chicken egg from henrietta using `chicken-install -r' # See: http://wiki.call-cc.org/chicken-projects/egg-index-5.html -{ stdenvNoCC, chicken }: +{ stdenvNoCC, chicken }: {}: { name, version, md5 ? "", sha256 ? "" }: if md5 != "" then diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 14a210783896f..dbdc420e5e06c 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -32,7 +32,7 @@ let inherit (self) callPackage; }) - (callPackage ./common-overrides.nix { + (import ./common-overrides.nix { inherit haskellLib; inherit (bootPkgs) alex happy; }) diff --git a/pkgs/development/em-modules/generic/default.nix b/pkgs/development/em-modules/generic/default.nix index f03e6e42739ad..9d4cf622cd692 100644 --- a/pkgs/development/em-modules/generic/default.nix +++ b/pkgs/development/em-modules/generic/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, emscripten, python }: +{ pkgs, lib, emscripten, python }: {}: { buildInputs ? [], nativeBuildInputs ? [] diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index eb45f446dc9d6..d30946aff9f7c 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -1,5 +1,5 @@ { go, govers, lib, fetchgit, fetchhg, fetchbzr, rsync -, removeReferencesTo, fetchFromGitHub, stdenv }: +, removeReferencesTo, fetchFromGitHub, stdenv }: {}: { buildInputs ? [] , nativeBuildInputs ? [] diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index a4f0399cf3c62..8580be35db7c8 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -7,7 +7,7 @@ , nonHackagePackages ? import ./non-hackage-packages.nix , configurationCommon ? import ./configuration-common.nix , configurationNix ? import ./configuration-nix.nix -}: +}: {}: let diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 2724ff5d62201..c80218df902c5 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -1,6 +1,6 @@ { stdenv, buildPackages, buildHaskellPackages, ghc , jailbreak-cabal, hscolour, cpphs, nodejs, shellFor -}: +}: {}: let isCross = stdenv.buildPlatform != stdenv.hostPlatform; diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index b4cd7fee311b2..a3ab728d36ebc 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -29,7 +29,7 @@ , # The final, fully overriden package set usable with the nixpkgs fixpoint # overriding functionality extensible-self -}: +}: {}: # return value: a function from self to the package set self: diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index cfefa8c95dc52..a0a681f186493 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -1,8 +1,8 @@ -{ stdenv, callPackage, fetchurl, makeWrapper, jre }: +{ lib, stdenv, callPackage, fetchurl, makeWrapper, jre }: let # The version number here is whatever is reported by the RUBY_VERSION string -rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" ""; +rubyVersion = import ../ruby/ruby-version.nix { inherit lib; } "2" "3" "3" ""; jruby = stdenv.mkDerivation rec { name = "jruby-${version}"; diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix index 0bed5efe4f793..be2b2260cc8f2 100644 --- a/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -7,7 +7,7 @@ , writeText # Whether the derivation provides a lua module or not. , toLuaModule -}: +}: {}: { name ? "${attrs.pname}-${attrs.version}" diff --git a/pkgs/development/interpreters/lua-5/setup-hook.nix b/pkgs/development/interpreters/lua-5/setup-hook.nix index 62caffd8d8a0f..25fd687533e01 100644 --- a/pkgs/development/interpreters/lua-5/setup-hook.nix +++ b/pkgs/development/interpreters/lua-5/setup-hook.nix @@ -1,4 +1,4 @@ -{ runCommand, lib, }: +{ runCommand, lib, }: {}: LuaPathSearchPaths: LuaCPathSearchPaths: diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix index b664cf0b14f46..c3ce213e751d0 100644 --- a/pkgs/development/interpreters/python/build-python-package.nix +++ b/pkgs/development/interpreters/python/build-python-package.nix @@ -13,7 +13,7 @@ , flit , writeScript , update-python-libraries -}: +}: {}: let setuptools-specific = import ./build-python-package-setuptools.nix { inherit lib python; }; diff --git a/pkgs/development/interpreters/python/setup-hook.nix b/pkgs/development/interpreters/python/setup-hook.nix index b66bd1cc5f69b..611dcbfde4d0b 100644 --- a/pkgs/development/interpreters/python/setup-hook.nix +++ b/pkgs/development/interpreters/python/setup-hook.nix @@ -1,4 +1,4 @@ -{ runCommand }: +{ runCommand }: {}: sitePackages: diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix index 499b2c65b7700..8e42acc6e138a 100644 --- a/pkgs/development/java-modules/build-maven-package.nix +++ b/pkgs/development/java-modules/build-maven-package.nix @@ -1,4 +1,4 @@ -{ stdenv, maven, pkgs }: +{ stdenv, maven, pkgs }: {}: { mavenDeps, src, name, meta, m2Path, skipTests ? true, quiet ? true, ... }: with builtins; diff --git a/pkgs/development/java-modules/m2install.nix b/pkgs/development/java-modules/m2install.nix index 7ebe655580e50..ca8ad4a12a6e3 100644 --- a/pkgs/development/java-modules/m2install.nix +++ b/pkgs/development/java-modules/m2install.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl }: {}: { version, artifactId, groupId, sha512, type ? "jar", suffix ? "" }: let diff --git a/pkgs/development/libraries/aspell/aspell-with-dicts.nix b/pkgs/development/libraries/aspell/aspell-with-dicts.nix index fd5ccf9696cc2..a8f3bf5c644bb 100644 --- a/pkgs/development/libraries/aspell/aspell-with-dicts.nix +++ b/pkgs/development/libraries/aspell/aspell-with-dicts.nix @@ -9,7 +9,7 @@ , aspellDicts , makeWrapper , buildEnv -}: +}: {}: f: diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index cb4571265af74..f5c35347665df 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -23,7 +23,7 @@ , linuxHeaders ? null , gd ? null, libpng ? null , bison -}: +}: {}: { name , withLinuxHeaders ? false diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 62ae433ff710e..ba84992f03493 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -33,7 +33,7 @@ let mirror = "mirror://kde"; }; - mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; + mkDerivation = libsForQt5.callPackage ({ mkDerivation }: {}: mkDerivation) {}; packages = self: with self; # SUPPORT diff --git a/pkgs/development/libraries/psol/generic.nix b/pkgs/development/libraries/psol/generic.nix index c61926fe13faa..ade20fba91f4a 100644 --- a/pkgs/development/libraries/psol/generic.nix +++ b/pkgs/development/libraries/psol/generic.nix @@ -1,4 +1,4 @@ -{ fetchzip, stdenv }: +{ fetchzip, stdenv }: {}: { version, sha256 }: { inherit version; } // fetchzip { inherit sha256; diff --git a/pkgs/development/libraries/qt-5/qt-env.nix b/pkgs/development/libraries/qt-5/qt-env.nix index da56c07779b9c..82aed425a784e 100644 --- a/pkgs/development/libraries/qt-5/qt-env.nix +++ b/pkgs/development/libraries/qt-5/qt-env.nix @@ -1,4 +1,4 @@ -{ buildEnv, qtbase }: name: paths: +{ buildEnv, qtbase }: {}: name: paths: buildEnv { inherit name; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 7da4a9eeddf34..6575535d8f11b 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -5,7 +5,7 @@ nixpkgs$ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modul These packages are manually refined in lua-overrides.nix */ -{ self, lua, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: +{ self, lua, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: {}: self: super: with self; { diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix index 3dae32b5e15d7..879320a91f099 100644 --- a/pkgs/development/lua-modules/generic/default.nix +++ b/pkgs/development/lua-modules/generic/default.nix @@ -1,4 +1,4 @@ -{ lua, writeText, toLuaModule }: +{ lua, writeText, toLuaModule }: {}: { buildInputs ? [], disabled ? false, ... } @ attrs: diff --git a/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix b/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix index fdb0d8034e690..48291c32dff49 100644 --- a/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix +++ b/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix @@ -1,4 +1,4 @@ -{ buildOcaml, opaline, js_build_tools, ocaml_oasis, fetchurl } : +{ buildOcaml, opaline, js_build_tools, ocaml_oasis, fetchurl }: {}: { name, version ? "113.33.03", buildInputs ? [], hash ? "", diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/pkgs/development/ocaml-modules/janestreet/janePackage.nix index b3ffecb38ce9f..a374520e1959d 100644 --- a/pkgs/development/ocaml-modules/janestreet/janePackage.nix +++ b/pkgs/development/ocaml-modules/janestreet/janePackage.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.11.0" }: +{ stdenv, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.11.0" }: {}: { pname, version ? defaultVersion, hash, ...}@args: diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix index a87e0c616fd8d..0b2ad55d5c744 100644 --- a/pkgs/development/perl-modules/generic/default.nix +++ b/pkgs/development/perl-modules/generic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, perl }: +{ lib, stdenv, perl }: {}: { nativeBuildInputs ? [], name, ... } @ attrs: diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix index 76bf29abc17c6..2ce45a1db3707 100644 --- a/pkgs/development/r-modules/generic-builder.nix +++ b/pkgs/development/r-modules/generic-builder.nix @@ -1,4 +1,4 @@ -{ stdenv, R, libcxx, xvfb_run, utillinux, Cocoa, Foundation, gettext, gfortran }: +{ stdenv, R, libcxx, xvfb_run, utillinux, Cocoa, Foundation, gettext, gfortran }: {}: { name, buildInputs ? [], requireX ? false, ... } @ attrs: diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index c31dfb63b3cd4..c5d4cbd9af85d 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -2,7 +2,7 @@ , defaultGemConfig, buildRubyGem, buildEnv , makeWrapper , bundler -}@defs: +}@defs: {}: { name ? null diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix index d0ad56538b94c..97d037beed62b 100644 --- a/pkgs/development/ruby-modules/bundler-app/default.nix +++ b/pkgs/development/ruby-modules/bundler-app/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, runCommand, makeWrapper, ruby }@defs: +{ lib, stdenv, callPackage, runCommand, makeWrapper, ruby }@defs: {}: # Use for simple installation of Ruby tools shipped in a Gem. # Start with a Gemfile that includes `gem ` diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix index 5d1489ba20054..fd3ec3d0fe724 100644 --- a/pkgs/development/ruby-modules/bundler-env/default.nix +++ b/pkgs/development/ruby-modules/bundler-env/default.nix @@ -1,4 +1,4 @@ -{ ruby, lib, callPackage, defaultGemConfig, buildEnv, bundler }@defs: +{ ruby, lib, callPackage, defaultGemConfig, buildEnv, bundler }@defs: {}: { name ? null , pname ? null diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index b0abb2c54fc5c..8a8e78eac95e8 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -20,7 +20,7 @@ { lib, fetchurl, fetchgit, makeWrapper, git, darwin , ruby, bundler -} @ defs: +} @ defs: {}: lib.makeOverridable ( diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 8ff02dfe71806..ac1701cd881bc 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -5,7 +5,7 @@ , gnupg , darwin, xcbuild , procps -}: +}: {}: with stdenv.lib; diff --git a/pkgs/games/quake3/wrapper/default.nix b/pkgs/games/quake3/wrapper/default.nix index 4ab53d677324f..afadcde4d6433 100644 --- a/pkgs/games/quake3/wrapper/default.nix +++ b/pkgs/games/quake3/wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, lib, libGL, ioquake3, makeWrapper }: +{ stdenv, buildEnv, lib, libGL, ioquake3, makeWrapper }: {}: { paks, name ? (stdenv.lib.head paks).name, description ? "" }: diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index fb8de9b6a71f8..b94d57286ef72 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -57,7 +57,7 @@ and show you a shell with a prefixed prompt. */ -{ mkDerivation, substituteAll, pkgs }: +{ mkDerivation, substituteAll, pkgs }: {}: { stdenv ? pkgs.stdenv, name, buildInputs ? [] , propagatedBuildInputs ? [], gcc ? stdenv.cc, extraCmds ? "" , cleanupCmds ? "", shell ? "${pkgs.bashInteractive}/bin/bash --norc"}: diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 8b7789cf62262..10e23a64240fa 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -16,7 +16,7 @@ , gomodifytags, gotags, gotools, go-motion , gnused, reftools, gogetdoc, gometalinter , impl, iferr, gocode, gocode-gomod, go-tools -}: +}: {}: self: super: { diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix index 714524e8da586..85abf75c82e18 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix @@ -1,4 +1,4 @@ -{ appleDerivation_, applePackage, pkgs, stdenv }: +{ appleDerivation_, applePackage, pkgs, stdenv }: {}: name: version: sha256: args: let n = stdenv.lib.removePrefix "lib" name; makeFile = ../. + "/${name}/GNUmakefile"; diff --git a/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix b/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix index 46ba682818688..db7e9b9cdd895 100644 --- a/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix +++ b/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix @@ -1,4 +1,4 @@ -{ runCommand, cctools }: +{ runCommand, cctools }: {}: { haskellPackages, src, deps ? p : [], name }: let inherit (haskellPackages) ghc ghcWithPackages; with-env = ghcWithPackages deps; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 4b570c1fe9404..8bfcecc964b29 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -2,7 +2,7 @@ , libelf , utillinux , writeTextFile -}: +}: {}: let readConfig = configfile: import (runCommand "config.nix" {} '' diff --git a/pkgs/servers/dict/dictd-db-collector.nix b/pkgs/servers/dict/dictd-db-collector.nix index f635c98602d96..95307a10656b2 100644 --- a/pkgs/servers/dict/dictd-db-collector.nix +++ b/pkgs/servers/dict/dictd-db-collector.nix @@ -1,4 +1,4 @@ -{stdenv, lib, dict}: +{stdenv, lib, dict}: {}: ({dictlist, allowList ? ["127.0.0.1"], denyList ? []}: /* dictlist is a list of form diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 15d4cf3f213af..9aff062b86507 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -88,13 +88,13 @@ in { bootPkgs = packages.ghc844; ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.4/git.json; stage0 = ../development/compilers/ghcjs-ng/8.4/stage0.nix; - ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix {}; + ghcjsDepOverrides = import ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix { inherit haskellLib; }; }; ghcjs86 = callPackage ../development/compilers/ghcjs-ng { bootPkgs = packages.ghc863; ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.6/git.json; stage0 = ../development/compilers/ghcjs-ng/8.6/stage0.nix; - ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.6/dep-overrides.nix {}; + ghcjsDepOverrides = import ../development/compilers/ghcjs-ng/8.6/dep-overrides.nix { inherit haskellLib; }; }; # The integer-simple attribute set contains all the GHC compilers @@ -117,57 +117,57 @@ in { ghc822Binary = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc822Binary; ghc = bh.compiler.ghc822Binary; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; + compilerConfig = import ../development/haskell-modules/configuration-ghc-8.2.x.nix { inherit pkgs haskellLib; }; packageSetConfig = bootstrapPackageSet; }; ghc863Binary = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc863Binary; ghc = bh.compiler.ghc863Binary; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; + compilerConfig = import ../development/haskell-modules/configuration-ghc-8.6.x.nix { inherit pkgs haskellLib; }; packageSetConfig = bootstrapPackageSet; }; ghc822 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc822; ghc = bh.compiler.ghc822; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; + compilerConfig = import ../development/haskell-modules/configuration-ghc-8.2.x.nix { inherit pkgs haskellLib; }; }; ghc844 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc844; ghc = bh.compiler.ghc844; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; + compilerConfig = import ../development/haskell-modules/configuration-ghc-8.4.x.nix { inherit pkgs haskellLib; }; }; ghc861 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc861; ghc = bh.compiler.ghc861; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; + compilerConfig = import ../development/haskell-modules/configuration-ghc-8.6.x.nix { inherit pkgs haskellLib; }; }; ghc862 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc862; ghc = bh.compiler.ghc862; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; + compilerConfig = import ../development/haskell-modules/configuration-ghc-8.6.x.nix { inherit pkgs haskellLib; }; }; ghc863 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc863; ghc = bh.compiler.ghc863; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; + compilerConfig = import ../development/haskell-modules/configuration-ghc-8.6.x.nix { inherit pkgs haskellLib; }; }; ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; + compilerConfig = import ../development/haskell-modules/configuration-ghc-head.nix { inherit pkgs haskellLib; }; }; ghcjs = packages.ghcjs86; ghcjs84 = callPackage ../development/haskell-modules rec { buildHaskellPackages = ghc.bootPkgs; ghc = bh.compiler.ghcjs84; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; + compilerConfig = import ../development/haskell-modules/configuration-ghc-8.4.x.nix { inherit pkgs haskellLib; }; + packageSetConfig = import ../development/haskell-modules/configuration-ghcjs.nix { inherit pkgs haskellLib; }; }; ghcjs86 = callPackage ../development/haskell-modules rec { buildHaskellPackages = ghc.bootPkgs; ghc = bh.compiler.ghcjs86; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; + compilerConfig = import ../development/haskell-modules/configuration-ghc-8.6.x.nix { inherit pkgs haskellLib; }; + packageSetConfig = import ../development/haskell-modules/configuration-ghcjs.nix { inherit pkgs haskellLib; }; }; # The integer-simple attribute set contains package sets for all the GHC compilers diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index ed0b919fd6908..6288c637c420f 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -14,7 +14,7 @@ , fetchgit , overrides ? (self: super: {}) , lib -}: +}: {}: let packages = ( self: From 4a93fb7d91a99be5b5b2af9fd883b783e8220cea Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 21 Feb 2019 05:30:38 +0000 Subject: [PATCH 4/4] mpv: make an example use-flag --- pkgs/applications/video/mpv/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 66fc1645e9a17..2917e8261f0c8 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -33,7 +33,7 @@ , dvdnavSupport ? stdenv.isLinux, libdvdnav ? null , dvdreadSupport ? stdenv.isLinux, libdvdread ? null , libpngSupport ? true, libpng ? null -, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null +, libpulseaudio ? null , rubberbandSupport ? stdenv.isLinux, rubberband ? null , screenSaverSupport ? true, libXScrnSaver ? null , sdl2Support ? true, SDL2 ? null @@ -48,6 +48,8 @@ , jackaudioSupport ? false, libjack2 ? null , openalSupport ? false, openalSoft ? null , vapoursynthSupport ? false, vapoursynth ? null +}: { + pulseaudio ? stdenv.isLinux }: with stdenv.lib; @@ -68,7 +70,7 @@ assert dvdreadSupport -> available libdvdread; assert jackaudioSupport -> available libjack2; assert libpngSupport -> available libpng; assert openalSupport -> available openalSoft; -assert pulseSupport -> available libpulseaudio; +assert pulseaudio -> available libpulseaudio; assert rubberbandSupport -> available rubberband; assert screenSaverSupport -> available libXScrnSaver; assert sdl2Support -> available SDL2; @@ -153,7 +155,7 @@ in stdenv.mkDerivation rec { ++ optional jackaudioSupport libjack2 ++ optional libpngSupport libpng ++ optional openalSupport openalSoft - ++ optional pulseSupport libpulseaudio + ++ optional pulseaudio libpulseaudio ++ optional rubberbandSupport rubberband ++ optional screenSaverSupport libXScrnSaver ++ optional sdl2Support SDL2