github-mirror/docker-nixpkgs
1
0
Fork 1
mirror of https://github.com/nix-community/docker-nixpkgs.git synced 2026-01-11 20:30:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

docker-compose: move condition to package

Browse Source 
make the default.nix self-sufficient
This commit is contained in:
zimbatm
2019-03-16 14:43:16 +01:00
parent f31c910416
commit f9c33c375e
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
docker-compose/default.nix
View File

@@ -1,6 +1,11 @@
{ buildCLIImage { buildCLIImage
, docker-compose , docker-compose ? null
, python3Packages
}: }:
buildCLIImage { buildCLIImage {
drv = docker-compose; drv =
if docker-compose == null
then python3Packages.docker_compose
else docker-compose # nixos 19.03+
;
} }

8
overlay.nix
View File

@@ -8,13 +8,7 @@ _: pkgs: {
bash = pkgs.callPackage ./bash {}; bash = pkgs.callPackage ./bash {};
busybox = pkgs.callPackage ./busybox {}; busybox = pkgs.callPackage ./busybox {};
curl = pkgs.callPackage ./curl {}; curl = pkgs.callPackage ./curl {};
docker-compose = pkgs.callPackage ./docker-compose { docker-compose = pkgs.callPackage ./docker-compose {};
docker-compose =
# master
pkgs.docker-compose or
# 18.09 or later
pkgs.python3Packages.docker_compose;
};
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 {};