Test both nixpkgs release-19.03 and 19.03

input-output-hk · Nov 18, 2019 · 45849f1 · 45849f1
1 parent 118c66c
commit 45849f1
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 22 deletions.
diff --git a/nixpkgs/release-19.09.json b/nixpkgs/release-19.09.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/input-output-hk/nixpkgs",
-  "rev": "a8f81dc037a5977414a356dd068f2621b3c89b60",
-  "date": "2019-10-17T21:54:56+08:00",
-  "sha256": "01z13axll5g5yl00lz9adr2jw2bs12g9skhbb1vxy8p7fjjbhhhm",
+  "rev": "31aa5316ca232a53667790a99e8b1e76252e065c",
+  "date": "2019-11-16T23:51:02+13:00",
+  "sha256": "0g0r473rdrh5vsdvr45nmfs6ibp0pqyzbw9f0iv6r0jkg6jjiykr",
   "fetchSubmodules": false
 }
diff --git a/release.nix b/release.nix
@@ -6,11 +6,6 @@
 
 let fixedNixpkgs = import ./nixpkgs {}; in
 with fixedNixpkgs.lib;
-with (import (fixedNixpkgs.path + "/pkgs/top-level/release-lib.nix") {
-  inherit supportedSystems scrubJobs nixpkgsArgs;
-  packageSet = import (haskell-nix + /build.nix);
-});
-
 let
   # Remove tests which have meta.disabled = true
   filterTests = let
@@ -22,19 +17,38 @@ let
 
   inherit (systems.examples) musl64 mingwW64;
 
-  jobs = {
-    native = filterTests (mapTestOn (packagePlatforms pkgs));
-    "${mingwW64.config}" = filterTests (mapTestOnCross mingwW64 (packagePlatforms pkgs));
-    # Disabled for now. Something is wrong and this would require `allowBroken`
-    # "${musl64.config}" = filterTests (mapTestOnCross musl64 (packagePlatforms pkgs));
-  } // {
-    # On IOHK Hydra, "required" is a special job that updates the
-    # GitHub CI status.
-    required = fixedNixpkgs.releaseTools.aggregate {
-      name = "haskell.nix-required";
-      meta.description = "All jobs required to pass CI";
-      constituents = collect isDerivation jobs.native;
+  jobs = nixpkgs-pin:
+    with (import (fixedNixpkgs.path + "/pkgs/top-level/release-lib.nix") {
+      inherit supportedSystems scrubJobs nixpkgsArgs;
+      packageSet = {
+            system ? builtins.currentSystem
+          , crossSystem ? null
+          , nixpkgsArgs ? { inherit system crossSystem; }
+          , ...}@args:
+        import (haskell-nix + /build.nix) (args // {
+          nixpkgsArgs = nixpkgsArgs // { inherit nixpkgs-pin; };
+      });
+    });
+
+    {
+      native = filterTests (mapTestOn (packagePlatforms pkgs));
+      # Disabled for now. Something is wrong and this would require `allowBroken`
+      # "${musl64.config}" = filterTests (mapTestOnCross musl64 (packagePlatforms pkgs));
+    } // (optionalAttrs (nixpkgs-pin == "release-19.03") {
+      "${mingwW64.config}" = filterTests (mapTestOnCross mingwW64 (packagePlatforms pkgs));
+    }) // {
+      # On IOHK Hydra, "required" is a special job that updates the
+      # GitHub CI status.
+      required = fixedNixpkgs.releaseTools.aggregate {
+        name = "haskell.nix-required";
+        meta.description = "All jobs required to pass CI";
+        constituents = collect isDerivation jobs.native;
+      };
     };
-  };
 
-in jobs
+in builtins.mapAttrs (_: nixpkgs-pin: jobs nixpkgs-pin) {
+  "R1903" = "release-19.03";
+  "R1909" = "release-19.09";
+}
+
+