diff options
author | Will Fancher <elvishjerricco@gmail.com> | 2017-07-13 18:54:04 -0400 |
---|---|---|
committer | Will Fancher <elvishjerricco@gmail.com> | 2017-07-14 06:43:33 -0400 |
commit | 05f9db601abd582be51f096affbb97eff49f2ccb (patch) | |
tree | 579844c1a85d948cc45b9f1c3061ea0b89cf4557 /pkgs/top-level/splice.nix | |
parent | 8b764960e93f60cb0896a8866f8e53e331726985 (diff) | |
download | nixpkgs-05f9db601abd582be51f096affbb97eff49f2ccb.tar nixpkgs-05f9db601abd582be51f096affbb97eff49f2ccb.tar.gz nixpkgs-05f9db601abd582be51f096affbb97eff49f2ccb.tar.bz2 nixpkgs-05f9db601abd582be51f096affbb97eff49f2ccb.tar.lz nixpkgs-05f9db601abd582be51f096affbb97eff49f2ccb.tar.xz nixpkgs-05f9db601abd582be51f096affbb97eff49f2ccb.tar.zst nixpkgs-05f9db601abd582be51f096affbb97eff49f2ccb.zip |
Added `self` views of the interface in `makeExtensibleWithInterface`
Fixing the `overrideScope` in `haskellpackages`.
Diffstat (limited to 'pkgs/top-level/splice.nix')
-rw-r--r-- | pkgs/top-level/splice.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index 329a83e5a31..36596ec5961 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -79,11 +79,11 @@ in # `newScope' for sets of packages in `pkgs' (see e.g. `gnome' below). callPackage = pkgs.newScope {}; - callPackageWithSelf = pkgs.newScopeWithSelf {}; + callPackageWithOutput = pkgs.newScopeWithOutput {}; callPackages = lib.callPackagesWith splicedPackages; newScope = extra: lib.callPackageWith (splicedPackages // extra); - newScopeWithSelf = extra: lib.callPackageWithSelfWith (splicedPackages // extra); + newScopeWithOutput = extra: lib.callPackageWithOutputWith (splicedPackages // extra); } |