From 1d156fc4703ad03dae370d63d3f5417d9f59340f Mon Sep 17 00:00:00 2001 From: Tyson Whitehead Date: Tue, 23 Jan 2018 23:37:03 -0500 Subject: [PATCH] Make super available in all-*.nix for override* use --- default.nix | 2 +- pkgs/all-packages.nix | 6 +++++- temporary/all-temporary.nix | 7 ++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/default.nix b/default.nix index bd1eeca..866d3f3 100644 --- a/default.nix +++ b/default.nix @@ -86,7 +86,7 @@ let # This matches what is done in nixpkgs (see pkgs/top-level/stage.nix). # knot = path: self: super: - let res = import path res self; in res; + let res = import path res super self; in res; in map knot [ ./temporary/all-temporary.nix diff --git a/pkgs/all-packages.nix b/pkgs/all-packages.nix index 3233be2..a94d98f 100644 --- a/pkgs/all-packages.nix +++ b/pkgs/all-packages.nix @@ -1,4 +1,8 @@ -self: pkgs: with pkgs; { +# self - next package set (after our additions) +# super - prior package set (before our additions) +# pkgs - final package set (after everyone's additions) +# +self: super: pkgs: with pkgs; { cryptominisat = callPackage ./cryptominisat.nix { }; diff --git a/temporary/all-temporary.nix b/temporary/all-temporary.nix index 212487b..76fc72b 100644 --- a/temporary/all-temporary.nix +++ b/temporary/all-temporary.nix @@ -1,5 +1,10 @@ # Temporary stuff (e.g., upstream bug fixes that haven't landed) +# +# self - next package set (after our additions) +# super - prior package set (before our additions) +# pkgs - final package set (after everyone's additions) +# -self: pkgs: with pkgs; { +self: super: pkgs: with pkgs; { }