Merge remote-tracking branch 'origin/master' into hkm/combined-derivations

# Conflicts:
#	release.nix

Author: hamishmack

.buildkite/pipeline.yml

@@ -74,13 +74,39 @@ steps:
     agents:
       system: x86_64-linux
 
-  - label: 'Check that jobset will evaluate in Hydra'
+  - label: 'Check that jobset will evaluate in Hydra at ifdLevel 0 and 1'
     command:
       - nix-build build.nix -A maintainer-scripts.check-hydra -o check-hydra.sh
-      - ./check-hydra.sh 0
-      - ./check-hydra.sh 1
-      - ./check-hydra.sh 2
-      - ./check-hydra.sh 3
+      - ./check-hydra.sh --arg ifdLevel 0
+      - ./check-hydra.sh --arg ifdLevel 1
+    agents:
+      system: x86_64-linux
+
+  - label: 'Check that jobset will evaluate in Hydra at ifdLevel 2'
+    command:
+      - nix-build build.nix -A maintainer-scripts.check-hydra -o check-hydra.sh
+      - ./check-hydra.sh --arg ifdLevel 2
+    agents:
+      system: x86_64-linux
+
+  - label: 'Check that jobset will evaluate in Hydra at ifdLevel 3 and ghc 8.10'
+    command:
+      - nix-build build.nix -A maintainer-scripts.check-hydra -o check-hydra.sh
+      - "./check-hydra.sh --arg ifdLevel 3 --arg include 'x: __substring 0 6 x == \"ghc810\"'"
+    agents:
+      system: x86_64-linux
+
+  - label: 'Check that jobset will evaluate in Hydra at ifdLevel 3 and ghc 9.2'
+    command:
+      - nix-build build.nix -A maintainer-scripts.check-hydra -o check-hydra.sh
+      - "./check-hydra.sh --arg ifdLevel 3 --arg include 'x: __substring 0 5 x == \"ghc92\"'"
+    agents:
+      system: x86_64-linux
+
+  - label: 'Check that jobset will evaluate in Hydra at ifdLevel 3 and not (ghc 8.10 or ghc 9.2)'
+    command:
+      - nix-build build.nix -A maintainer-scripts.check-hydra -o check-hydra.sh
+      - "./check-hydra.sh --arg ifdLevel 3 --arg include 'x: !(__substring 0 6 x == \"ghc810\" || __substring 0 5 x == \"ghc92\")'"
     agents:
       system: x86_64-linux
 

build.nix

@@ -5,7 +5,7 @@
 let
   haskellNix = (import ./default.nix {});
 in
-{ nixpkgs ? haskellNix.sources.nixpkgs-2111
+{ nixpkgs ? haskellNix.sources.nixpkgs-2205
 , nixpkgsArgs ? haskellNix.nixpkgsArgs
 , pkgs ? import nixpkgs nixpkgsArgs
 , evalPackages ? import nixpkgs nixpkgsArgs
@@ -76,10 +76,14 @@ in rec {
       ];
     };
     check-materialization-concurrency = pkgs.buildPackages.callPackage ./scripts/check-materialization-concurrency/check.nix {};
-    check-path-support = pkgs.buildPackages.callPackage ./scripts/check-path-support.nix {
-      # TODO remove this when nixpkgs-2205 is released and used for `pkgs`
-      # check-path-support fails unless we have nix 2.4 or newer.
-      inherit (import haskellNix.sources.nixpkgs-unstable {}) nix;
+    # Forcing nixpkgs-unstable here because this test makes a script
+    # that when run will build `aeson` (used by `tests/cabal-simple`)
+    # and we currently do not build that on hydra for nixpkgs-2205 (used by `pkgs`).
+    # Using nixpkgs-unstable should allow buildkite to find what it needs
+    # in the hydra cache when it runs the script.
+    check-path-support = (import haskellNix.sources.nixpkgs-unstable nixpkgsArgs)
+        .buildPackages.callPackage ./scripts/check-path-support.nix {
+      inherit compiler-nix-name;
     };
   };
 

flake.lock

@@ -13,17 +13,14 @@ site_name: Alternative Haskell Infrastructure for Nixpkgs
 theme: readthedocs
 site_url: null
 repo_url: https://github.com/input-output-hk/haskell.nix
-permalink: true
 markdown_extensions:
   - admonition
   - footnotes
   - tables
   - toc:
       permalink: true
 
-# this is called `nav` in more recent mkdocs versions. Mine
-# right now is 0.17.5
-pages:
+nav:
   - 'Introduction': index.md
   - 'Motivation': motivation.md
   - 'Architecture': architecture.md

mkdocs.yml

@@ -2,6 +2,7 @@
 # on a machine with e.g. no way to build the Darwin IFDs you need!
 { supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ]
 , ifdLevel ? 0
+, include ? (compiler-nix-name: true)
 , checkMaterialization ? false }:
 
 let
@@ -16,7 +17,7 @@ let
   lib = genericPkgs.lib;
   ci = import ./ci.nix { inherit supportedSystems ifdLevel checkMaterialization; restrictEval = true; };
   allJobs = stripAttrsForHydra (filterDerivations ci);
-  latestJobs = {
+  latestJobs = lib.optionalAttrs (include "ghc8107") {
     # All the jobs are included in the `requiredJobs`, but the ones
     # added here will also included without aggregation, making it easier
     # to find a failing test.  Keep in mind though that adding too many
@@ -32,7 +33,7 @@ let
         let nixpkgsJobs = allJobs.${nixpkgsVer};
         in lib.concatMap (compiler-nix-name:
           let ghcJobs = nixpkgsJobs.${compiler-nix-name};
-          in builtins.concatMap (platform:
+          in lib.optionals (include compiler-nix-name) (builtins.concatMap (platform:
             let platformJobs = ghcJobs.${platform};
             in builtins.map (crossPlatform: {
               name = "required-${nixpkgsVer}-${compiler-nix-name}-${platform}-${crossPlatform}";
@@ -42,7 +43,7 @@ let
                 constituents = lib.collect (d: lib.isDerivation d) platformJobs.${crossPlatform};
               };
            }) (names platformJobs)
-         ) (names ghcJobs)
+         ) (names ghcJobs))
         ) (names nixpkgsJobs)
       ) (names allJobs));
 in traceNames "job " (latestJobs // requiredJobs // {

release.nix

@@ -10,12 +10,12 @@ writeScript "check-hydra.sh" ''
   export PATH="${makeBinPath [ coreutils time gnutar gzip hydra-unstable jq gitMinimal ]}"
   export NIX_PATH=
 
-  echo '~~~ Evaluating release.nix with --arg ifdLevel '$1
+  echo '~~~ Evaluating release.nix with' "$@"
   command time --format '%e' -o eval-time.txt \
       hydra-eval-jobs \
       --option allowed-uris "https://github.com/NixOS https://github.com/input-output-hk" \
       --arg supportedSystems '[ builtins.currentSystem ]' \
-      --arg ifdLevel $1 \
+      "$@" \
       -I $(realpath .) release.nix > eval.json
   EVAL_EXIT_CODE="$?"
   if [ "$EVAL_EXIT_CODE" != 0 ]

scripts/check-hydra.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, writeScript, coreutils, gnutar, gzip, nix, gitMinimal }:
+{ stdenv, lib, writeScript, coreutils, gnutar, gzip, nix, gitMinimal, compiler-nix-name }:
 
 with lib;
 
@@ -9,5 +9,5 @@ writeScript "check-path-supprot.sh" ''
 
   export PATH="${makeBinPath [ coreutils gnutar gzip nix gitMinimal ]}"
 
-  nix-build -E '((import ./. {}).pkgs.haskell-nix.cabalProject { compiler-nix-name = "ghc865"; src = ./test/cabal-simple; }).cabal-simple.components.library'
+  nix-build -E '((import ./. {}).pkgs.haskell-nix.cabalProject { compiler-nix-name = "${compiler-nix-name}"; src = ./test/cabal-simple; }).cabal-simple.components.library'
 ''

scripts/check-path-support.nix

@@ -35,7 +35,7 @@ in
 
     cd ..
 
-    nix flack lock --accept-flake-config \
+    nix flake lock --accept-flake-config \
                    --experimental-features 'nix-command flakes' \
                    --update-input ${name}
   ''