diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:19:25 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:19:25 +0000 |
| commit | 55abc327b49b4097e48c916e40803caa8cf46e8f (patch) | |
| tree | 1c0420ab3fb21d9485460b912f1c3eae18781871 /nixpkgs/lib | |
| parent | 7936cf821dccc1eaade44b852db09d03fae8e5f3 (diff) | |
| parent | 18324978d632ffc55ef1d928e81630c620f4f447 (diff) | |
| download | nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.gz nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.bz2 nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.lz nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.xz nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.zst nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/lib')
| -rw-r--r-- | nixpkgs/lib/customisation.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixpkgs/lib/customisation.nix b/nixpkgs/lib/customisation.nix index c74708fbe4e2..0d023aa361cf 100644 --- a/nixpkgs/lib/customisation.nix +++ b/nixpkgs/lib/customisation.nix @@ -281,11 +281,11 @@ rec { /* backward compatibility with old uncurried form; deprecated */ makeScopeWithSplicing = splicePackages: newScope: otherSplices: keep: extra: f: - makeScopeWithSplicing' { - inherit splicePackages newScope otherSplices keep extra f; - }; + makeScopeWithSplicing' + { inherit splicePackages newScope; } + { inherit otherSplices keep extra f; }; - /* Like the above, but aims to support cross compilation. It's still ugly, but + /* Like makeScope, but aims to support cross compilation. It's still ugly, but hopefully it helps a little bit. */ makeScopeWithSplicing' = { splicePackages |