diff options
| author | Shea Levy <shea@shealevy.com> | 2017-09-29 09:11:26 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2017-09-29 09:11:26 -0400 |
| commit | 1a1ad1a17dfbe1b4da3a0bb174c6830ac318a3a7 (patch) | |
| tree | 32f1f408d7008e64e7a936f0c80859f0daa15dcd /pkgs/top-level/splice.nix | |
| parent | 8f33315f8f50fa5a01d082fb1cce57f1ac2c20d1 (diff) | |
| download | nixpkgs-1a1ad1a17dfbe1b4da3a0bb174c6830ac318a3a7.tar nixpkgs-1a1ad1a17dfbe1b4da3a0bb174c6830ac318a3a7.tar.gz nixpkgs-1a1ad1a17dfbe1b4da3a0bb174c6830ac318a3a7.tar.bz2 nixpkgs-1a1ad1a17dfbe1b4da3a0bb174c6830ac318a3a7.tar.lz nixpkgs-1a1ad1a17dfbe1b4da3a0bb174c6830ac318a3a7.tar.xz nixpkgs-1a1ad1a17dfbe1b4da3a0bb174c6830ac318a3a7.tar.zst nixpkgs-1a1ad1a17dfbe1b4da3a0bb174c6830ac318a3a7.zip | |
Revert "Merge branch 'improved-make-overridable' of git://github.com/ElvishJerricco/nixpkgs"
This reverts commit c3af1210b4c5d7ef380e75add463b37574fdcc8b, reversing changes made to 49f175cd0c80a39e1d05fc687c4a2a40e0aba58c.
Diffstat (limited to 'pkgs/top-level/splice.nix')
| -rw-r--r-- | pkgs/top-level/splice.nix | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index d6498be949b..44a46b7b692 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -80,11 +80,7 @@ in # `newScope' for sets of packages in `pkgs' (see e.g. `gnome' below). callPackage = pkgs.newScope {}; - callPackageWithOutput = pkgs.newScopeWithOutput {}; - callPackages = lib.callPackagesWith splicedPackages; newScope = extra: lib.callPackageWith (splicedPackages // extra); - - newScopeWithOutput = extra: lib.callPackageWithOutputWith (splicedPackages // extra); } |