Commit 6b79f7d6ea0a

@@ -0,0 +1,26 @@
+image: nixos/20.03
+secrets:
+  - 67527e1f-d69c-4f8e-a26d-21685f4ed380
+  - 0818d60d-b587-4d4e-81d8-dc15072ccb97
+sources:
+  - git@git.sr.ht:~vdemeester/secrets
+tasks:
+- setup: |
+    set -euo pipefail
+    set +x
+    export CACHIX_SIGNING_KEY=$(cat ~/.cachix.key)
+    set -x
+    nix-env -iA cachix -f https://cachix.org/api/v1/install
+    cachix use shortbrain
+- nixos: |
+    nix-build home/ci.nix -A nixosCacheOutputs | cachix push shortbrain
+- nixos-unstable: |
+    nix-build home/ci.nix -A nixosUnstableCacheOutputs | cachix push shortbrain
+- nixpkgs: |
+    nix-build home/ci.nix -A nixkgsCacheOutputs | cachix push shortbrain
+- nur-update: |
+    curl -XPOST "https://nur-update.herokuapp.com/update?repo=vdemeester"
+triggers:
+- action: email
+  condition: failure
+  to: vincent@sbr.pm

@@ -12,9 +12,8 @@ tasks:
     set -x
     nix-env -iA cachix -f https://cachix.org/api/v1/install
     cachix use shortbrain
-- pkgs: |
-    nix-build home/ci.nix -A cacheOutputs | cachix push shortbrain
-    curl -XPOST "https://nur-update.herokuapp.com/update?repo=vdemeester"
+- systems: |
+    nix-build -A x86_64-linux
 triggers:
 - action: email
   condition: failure

@@ -9,7 +9,11 @@
 # then your CI will be able to build and cache only those packages for
 # which this is possible.
 
-{ pkgs ? import <nixpkgs> { } }:
+{ sources ? import ./nix
+, pkgs ? sources.pkgs { }
+, pkgs-unstable ? sources.pkgs-unstable { }
+, nixpkgs ? sources.nixpkgs { }
+}:
 
 with builtins;
 let
@@ -29,24 +33,35 @@ let
     in
     concatMap f (attrValues s);
   outputsOf = p: map (o: p.${o}) p.outputs;
-  nurAttrs = import ./pkgs/default.nix { inherit pkgs; };
-  nurPkgs =
+  nurAttrs = p: import ./pkgs/default.nix { pkgs = p; };
+  nurPkgs = p:
     flattenPkgs (
       listToAttrs (
         map
-          (n: nameValuePair n nurAttrs.${n})
+          (n: nameValuePair n (nurAttrs p).${n})
           (
             filter
               (n: !isReserved n)
-              (attrNames nurAttrs)
+              (attrNames (nurAttrs p))
           )
       )
     );
+  nixosNurPkgs = nurPkgs pkgs;
+  nixosUnstableNurPkgs = nurPkgs pkgs-unstable;
+  nixpkgsNurPkgs = nurPkgs nixpkgs;
 in
 rec {
-  buildPkgs = filter isBuildable nurPkgs;
-  cachePkgs = filter isCacheable buildPkgs;
+  nixosBuildPkgs = filter isBuildable nixosNurPkgs;
+  nixosCachePkgs = filter isCacheable nixosBuildPkgs;
+  nixosUnstableBuildPkgs = filter isBuildable nixosUnstableNurPkgs;
+  nixosUnstableCachePkgs = filter isCacheable nixosUnstableBuildPkgs;
+  nixpkgsBuildPkgs = filter isBuildable nixpkgsNurPkgs;
+  nixpkgsCachePkgs = filter isCacheable nixpkgsBuildPkgs;
 
-  buildOutputs = concatMap outputsOf buildPkgs;
-  cacheOutputs = concatMap outputsOf cachePkgs;
+  nixosBuildOutputs = concatMap outputsOf nixosBuildPkgs;
+  nixosCacheOutputs = concatMap outputsOf nixosCachePkgs;
+  nixosUnstableBuildOutputs = concatMap outputsOf nixosUnstableBuildPkgs;
+  nixosUnstableCacheOutputs = concatMap outputsOf nixosUnstableCachePkgs;
+  nixpkgsBuildOutputs = concatMap outputsOf nixpkgsBuildPkgs;
+  nixpkgsCacheOutputs = concatMap outputsOf nixpkgsCachePkgs;
 }