diff options
| author | John Ericson <jericson@galois.com> | 2016-11-02 17:08:39 -0400 |
|---|---|---|
| committer | John Ericson <jericson@galois.com> | 2016-11-02 18:36:02 -0400 |
| commit | eed34bd214d6f513a859f3cfc52b266a9d19898b (patch) | |
| tree | 3f399b7422a4b670d7a0a5fc4d761def2d681579 /pkgs | |
| parent | 68a04c1195ba8087f0f57c5b9017b38a02a8c6c1 (diff) | |
| download | nixpkgs-eed34bd214d6f513a859f3cfc52b266a9d19898b.tar nixpkgs-eed34bd214d6f513a859f3cfc52b266a9d19898b.tar.gz nixpkgs-eed34bd214d6f513a859f3cfc52b266a9d19898b.tar.bz2 nixpkgs-eed34bd214d6f513a859f3cfc52b266a9d19898b.tar.lz nixpkgs-eed34bd214d6f513a859f3cfc52b266a9d19898b.tar.xz nixpkgs-eed34bd214d6f513a859f3cfc52b266a9d19898b.tar.zst nixpkgs-eed34bd214d6f513a859f3cfc52b266a9d19898b.zip | |
top-level: Remove redundant arguments from top-level/{all-package,stdenv}.nix
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/stdenv.nix | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc4660108d0..8d7a5d204ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5,9 +5,9 @@ * to merges. Please use the full-text search of your editor. ;) * Hint: ### starts category names. */ -{ system, bootStdenv, noSysDirs, config, crossSystem, platform, lib +{ system, noSysDirs, config, crossSystem, platform, lib , nixpkgsFun -, ... }: +}: self: pkgs: with pkgs; diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 67577aabaa4..baf314edece 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -79,12 +79,12 @@ let stdenvDefault = self: super: import ./stdenv.nix { - inherit system bootStdenv noSysDirs config crossSystem platform lib nixpkgsFun pkgs; + inherit system bootStdenv crossSystem config platform lib nixpkgsFun pkgs; }; allPackages = self: super: let res = import ./all-packages.nix - { inherit system bootStdenv noSysDirs config crossSystem platform lib nixpkgsFun; } + { inherit system noSysDirs config crossSystem platform lib nixpkgsFun; } res self; in res; diff --git a/pkgs/top-level/stdenv.nix b/pkgs/top-level/stdenv.nix index 7efbfc36b1f..f9ba5e7516e 100644 --- a/pkgs/top-level/stdenv.nix +++ b/pkgs/top-level/stdenv.nix @@ -1,4 +1,4 @@ -{ system, bootStdenv, crossSystem, config, platform, lib, nixpkgsFun, pkgs, ... }: +{ system, bootStdenv, crossSystem, config, platform, lib, nixpkgsFun, pkgs }: rec { allStdenvs = import ../stdenv { |