home

commit 447e590de97a76b1668b39b7ac40b3b5f5427ce0
parent 1e4363fdbaaa13f52eb63d38e13cf286c9cde702
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Mon, 25 May 2020 15:27:05 +0200

builds: un-split nix-pkgs 😜

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
.builds/nix-pkgs.yml
 | 
12
+-----------
M
ci.nix
 | 
3
+++

2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/.builds/nix-pkgs.yml b/.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:
diff --git a/ci.nix b/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;
 }