From 9c5e06ad076d1ebe51dff59d2076997715ea930b Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sat, 16 Mar 2019 14:46:37 +0100 Subject: [PATCH] nix-unstable: transform into package move the logic into the package --- nix-unstable/default.nix | 6 ++++++ overlay.nix | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 nix-unstable/default.nix diff --git a/nix-unstable/default.nix b/nix-unstable/default.nix new file mode 100644 index 0000000..4d74e9d --- /dev/null +++ b/nix-unstable/default.nix @@ -0,0 +1,6 @@ +{ docker-nixpkgs +, nixUnstable +}: +docker-nixpkgs.nix.override { + nix = nixUnstable; +} diff --git a/overlay.nix b/overlay.nix index 6e61274..4b6d31d 100644 --- a/overlay.nix +++ b/overlay.nix @@ -3,7 +3,7 @@ _: pkgs: { buildCLIImage = pkgs.callPackage ./lib/buildCLIImage.nix {}; # docker images must be lower-cased - docker-nixpkgs = rec { + docker-nixpkgs = { bash = pkgs.callPackage ./bash {}; busybox = pkgs.callPackage ./busybox {}; @@ -12,9 +12,7 @@ _: pkgs: { kubectl = pkgs.callPackage ./kubectl {}; kubernetes-helm = pkgs.callPackage ./kubernetes-helm {}; nix = pkgs.callPackage ./nix {}; - nix-unstable = nix.override { - nix = pkgs.nixUnstable; - }; + nix-unstable = pkgs.callPackage ./nix-unstable {}; }; }