From 7d0e26647c7219408fdf13bb5fc59faa8a956c5d Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Sat, 3 Aug 2024 18:31:46 +0000 Subject: [PATCH] add docker executable, needed for swarm --- flake.nix | 1 + nix/upstreamable/default.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 14a35db..5a2c86c 100644 --- a/flake.nix +++ b/flake.nix @@ -61,6 +61,7 @@ devShells.default = config.devShells.haskell-package.overrideAttrs (o: { nativeBuildInputs = o.nativeBuildInputs or [ ] ++ [ pkgs.docker-compose + pkgs.docker pkgs.nixpkgs-fmt config.haskellProjects.haskell-package.haskellPackages.releaser ]; diff --git a/nix/upstreamable/default.nix b/nix/upstreamable/default.nix index b82bc82..97e0205 100644 --- a/nix/upstreamable/default.nix +++ b/nix/upstreamable/default.nix @@ -57,7 +57,7 @@ let mv $out/bin/arion $out/libexec makeWrapper $out/libexec/arion $out/bin/arion \ --unset PYTHONPATH \ - --prefix PATH : ${lib.makeBinPath [ pkgs.docker-compose ]} \ + --prefix PATH : ${lib.makeBinPath [ pkgs.docker-compose pkgs.docker ]} \ ; ''; };