Commit 447e590de97a

Vincent Demeester <vincent@sbr.pm>
2020-05-25 15:27:05
builds: un-split nix-pkgs ๐Ÿ˜œ
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
1 parent 1e4363f
Changed files (2)
.builds/nix-pkgs.yml
@@ -12,17 +12,7 @@ tasks:
     set +x
     export CACHIX_SIGNING_KEY=$(cat ~/.cachix.key)
     set -x
-    nix-build home/ci.nix -A nixosCacheOutputs | cachix push shortbrain
-- nixos-unstable: |
-    set +x
-    export CACHIX_SIGNING_KEY=$(cat ~/.cachix.key)
-    set -x
-    nix-build home/ci.nix -A nixosUnstableCacheOutputs | cachix push shortbrain
-- nixpkgs: |
-    set +x
-    export CACHIX_SIGNING_KEY=$(cat ~/.cachix.key)
-    set -x
-    nix-build home/ci.nix -A nixkgsCacheOutputs | cachix push shortbrain
+    nix-build home/ci.nix -A cacheOutputs | cachix push shortbrain
 - nur-update: |
     curl -XPOST "https://nur-update.herokuapp.com/update?repo=vdemeester"
 triggers:
ci.nix
@@ -64,4 +64,7 @@ rec {
   nixosUnstableCacheOutputs = concatMap outputsOf nixosUnstableCachePkgs;
   nixpkgsBuildOutputs = concatMap outputsOf nixpkgsBuildPkgs;
   nixpkgsCacheOutputs = concatMap outputsOf nixpkgsCachePkgs;
+
+  buildOuputs = nixosBuildOutputs ++ nixosUnstableBuildOutputs ++ nixpkgsBuildOutputs;
+  cacheOutputs = nixosCacheOutputs ++ nixosUnstableCacheOutputs ++ nixpkgsCacheOutputs;
 }