From 9ee2168932db3836794f5a881229a8bf18c0787d Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sun, 5 Dec 2021 14:35:25 +0800 Subject: [PATCH] Revert "flake: fix hydraJobs" This reverts commit e8e14994789db51dfaa71e4a4b524eabba5f05b4. --- flake.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 8157f217..62d4d11b 100644 --- a/flake.nix +++ b/flake.nix @@ -110,7 +110,7 @@ devShell.x86_64-linux = packages.x86_64-linux.nac3artiq; # Use "nix shell" to enter a development environment. - defaultPackage.x86_64-linux = pkgs.buildEnv rec { + defaultPackage.x86_64-linux = pkgs.buildEnv { name = "nac3-dev-shell"; paths = with pkgs; [ llvm_12 @@ -124,13 +124,12 @@ clippy (python3.withPackages(ps: [ ps.numpy ])) ]; - passthru.hydrapkgs = paths; }; hydraJobs = { inherit (packages.x86_64-linux) nac3artiq; nac3artiq-mingw = packages.x86_64-w64-mingw32.nac3artiq; - } // (pkgs.lib.foldr (a: b: {"${pkgs.lib.strings.getName a}" = a;} // b) {} defaultPackage.x86_64-linux.hydrapkgs); + } // (pkgs.lib.foldr (a: b: {"${pkgs.lib.strings.getName a}" = a;} // b) {} defaultPackage.x86_64-linux.paths); }; nixConfig = {