NexVeridian/docker-nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

nix-unstable: transform into package

Browse source 
move the logic into the package
This commit is contained in:
zimbatm 2019-03-16 14:46:37 +01:00
parent f9c33c375e
commit 9c5e06ad07
No known key found for this signature in database
GPG key ID: 71BAF6D40C1D63D7
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nix-unstable/default.nix Normal file
View file

@ -0,0 +1,6 @@
{ docker-nixpkgs
, nixUnstable
}:
docker-nixpkgs.nix.override {
nix = nixUnstable;
}

6
overlay.nix
View file

@ -3,7 +3,7 @@ _: pkgs: {
buildCLIImage = pkgs.callPackage ./lib/buildCLIImage.nix {}; buildCLIImage = pkgs.callPackage ./lib/buildCLIImage.nix {};
# docker images must be lower-cased # docker images must be lower-cased
docker-nixpkgs = rec { docker-nixpkgs = {
bash = pkgs.callPackage ./bash {}; bash = pkgs.callPackage ./bash {};
busybox = pkgs.callPackage ./busybox {}; busybox = pkgs.callPackage ./busybox {};
@ -12,9 +12,7 @@ _: pkgs: {
kubectl = pkgs.callPackage ./kubectl {}; kubectl = pkgs.callPackage ./kubectl {};
kubernetes-helm = pkgs.callPackage ./kubernetes-helm {}; kubernetes-helm = pkgs.callPackage ./kubernetes-helm {};
nix = pkgs.callPackage ./nix {}; nix = pkgs.callPackage ./nix {};
nix-unstable = nix.override { nix-unstable = pkgs.callPackage ./nix-unstable {};
nix = pkgs.nixUnstable;
};
}; };
} }