Flake toolchain and check improvements

flake.nix

@@ -27,7 +27,7 @@
           overlays = [ rust-overlay.overlays.default ];
         };
 
-        msrv = "1.85.0";
+        msrv-version = "1.85.0";
 
         nginxWithStream = pkgs.nginxMainline.overrideAttrs (oldAttrs: {
           configureFlags = oldAttrs.configureFlags ++ [
@@ -50,9 +50,9 @@
               }
             )
             {
-              msrv = stable.${msrv}.default;
+              msrv = stable.${msrv-version}.default;
               stable = stable.latest.default;
-              nightly = nightly.latest.default;
+              nightly = fromRustupToolchainFile ./rust-toolchain.toml;
             };
 
         # Use crane to define nix packages for the workspace crate
@@ -61,14 +61,23 @@
         craneLibVersions = builtins.mapAttrs (
           name: rust-bin: (crane.mkLib pkgs).overrideToolchain (_: rust-bin)
         ) rustVersions;
-        craneLib = craneLibVersions.nightly;
+
         src = nixpkgs.lib.cleanSourceWith {
           src = ./.;
           filter =
             path: type:
-            (builtins.match ".*nginx.conf.template$" path != null) || (craneLib.filterCargoSources path type);
+            (builtins.match ".*nginx.conf.template$" path != null)
+            || (craneLibVersions.msrv.filterCargoSources path type);
           name = "source";
         };
+        cargoLock = rec {
+          default = recent; # see also #454
+          recent = ./Cargo-recent.lock;
+          minimal = ./Cargo-minimal.lock;
+          msrv = minimal;
+          stable = default;
+          nightly = recent;
+        };
         commonArgs = {
           inherit src;
           strictDeps = true;
@@ -79,38 +88,46 @@
           pname = "workspace";
           version = "no-version";
 
-          # default to recent dependency versions
-          # TODO add overrides for minimal lockfile, once #454 is resolved
-          cargoLock = ./Cargo-recent.lock;
-
           # tell bitcoind crate not to try to download during build
           BITCOIND_SKIP_DOWNLOAD = 1;
         };
 
-        cargoArtifacts = craneLib.buildDepsOnly commonArgs;
-        individualCrateArgs = commonArgs // {
-          inherit cargoArtifacts;
-          doCheck = false; # skip testing, since that's done in flake check
-        };
+        cargoArtifacts = builtins.mapAttrs (
+          name: craneLib:
+          craneLib.buildDepsOnly (
+            commonArgs
+            // {
+              name = "workspace-deps-${name}";
+              cargoLock = cargoLock.${name};
+            }
+          )
+        ) craneLibVersions;
 
         fileSetForCrate =
           subdir:
           pkgs.lib.fileset.toSource {
             root = ./.;
             fileset = pkgs.lib.fileset.unions [
               ./Cargo.toml
-              (craneLib.fileset.commonCargoSources subdir)
+              (craneLibVersions.msrv.fileset.commonCargoSources subdir)
             ];
           };
 
         packages =
           builtins.mapAttrs
             (
               name: extraArgs:
-              craneLib.buildPackage (
-                individualCrateArgs
-                // craneLib.crateNameFromCargoToml { cargoToml = builtins.toPath "${./.}/${name}/Cargo.toml"; }
+              # build packages with MSRV toolchain by default, since the builds are
+              # mostly for testing purposes
+              craneLibVersions.msrv.buildPackage (
+                commonArgs
+                // craneLibVersions.msrv.crateNameFromCargoToml {
+                  cargoToml = builtins.toPath "${./.}/${name}/Cargo.toml";
+                }
                 // {
+                  cargoLock = cargoLock.msrv;
+                  cargoArtifacts = cargoArtifacts.msrv;
+                  doCheck = false; # skip testing, since that's done in a separate flake check
                   cargoExtraArgs = "--locked -p ${name} ${extraArgs}";
                   inherit src;
                 }
@@ -152,6 +169,15 @@
             }
             // args
           );
+
+        dummySrc = pkgs.runCommand "dummy src" { } "mkdir $out";
+        checkSuite =
+          name: buildInputs:
+          simpleCheck {
+            inherit name;
+            inherit buildInputs;
+            src = dummySrc;
+          };
       in
       {
         packages = packages // {
@@ -161,95 +187,138 @@
           default = devShells.nightly;
         };
         formatter = pkgs.nixfmt-tree;
-        checks = packages // {
-          payjoin-workspace-nextest = craneLib.cargoNextest (
-            commonArgs
-            // {
-              inherit cargoArtifacts;
-              partitions = 1;
-              partitionType = "count";
-              cargoExtraArgs = "--locked --all-features";
-              BITCOIND_EXE = nixpkgs.lib.getExe' pkgs.bitcoind "bitcoind";
-              nativeBuildInputs = [ nginxWithStream ];
-            }
-          );
+        checks =
+          packages
+          // (pkgs.lib.mapAttrs' (
+            name: craneLib:
+            (pkgs.lib.nameValuePair "payjoin-workspace-nextest-${name}" (
+              craneLib.cargoNextest (
+                commonArgs
+                // {
+                  name = "payjoin-workspace-nextest-${name}";
+                  cargoLock = cargoLock.${name};
+                  cargoArtifacts = cargoArtifacts.${name};
+                  partitions = 1;
+                  partitionType = "count";
+                  cargoExtraArgs = "--locked --all-features";
+                  BITCOIND_EXE = nixpkgs.lib.getExe' pkgs.bitcoind "bitcoind";
+                  nativeBuildInputs = [ nginxWithStream ];
+                }
 
-          payjoin-workspace-nextest-msrv = craneLibVersions.msrv.cargoNextest (
-            commonArgs
-            // {
-              cargoArtifacts = craneLibVersions.msrv.buildDepsOnly commonArgs;
-              partitions = 1;
-              partitionType = "count";
-              cargoExtraArgs = "--locked --all-features";
-              BITCOIND_EXE = nixpkgs.lib.getExe' pkgs.bitcoind "bitcoind";
-              nativeBuildInputs = [ nginxWithStream ];
-            }
-          );
+              )
+            ))
+          ) craneLibVersions
 
-          payjoin-workspace-machete = craneLib.mkCargoDerivation (
-            commonArgs
-            // {
-              pname = "payjoin-workspace-machete";
-              inherit cargoArtifacts;
-              nativeBuildInputs = [ pkgs.cargo-machete ];
-              buildPhaseCargoCommand = "";
-              checkPhaseCargoCommand = "cargo machete";
-              doCheck = true;
-            }
-          );
+          )
+          // {
+            payjoin-workspace-machete = craneLibVersions.nightly.mkCargoDerivation (
+              commonArgs
+              // {
+                pname = "payjoin-workspace-machete";
+                cargoLock = cargoLock.nightly;
+                cargoArtifacts = cargoArtifacts.nightly;
+                nativeBuildInputs = [ pkgs.cargo-machete ];
+                buildPhaseCargoCommand = "";
+                checkPhaseCargoCommand = "cargo machete";
+                doCheck = true;
+              }
+            );
 
-          payjoin-workspace-clippy = craneLib.cargoClippy (
-            commonArgs
-            // {
-              inherit cargoArtifacts;
-              cargoClippyExtraArgs = "--all-targets --all-features --keep-going -- --deny warnings";
-            }
-          );
+            payjoin-workspace-clippy = craneLibVersions.nightly.cargoClippy (
+              commonArgs
+              // {
+                cargoLock = cargoLock.nightly;
+                cargoArtifacts = cargoArtifacts.nightly;
+                cargoClippyExtraArgs = "--all-targets --all-features --keep-going -- --deny warnings";
+              }
+            );
 
-          payjoin-workspace-doc = craneLib.cargoDoc (
-            commonArgs
-            // {
-              inherit cargoArtifacts;
-            }
-          );
+            payjoin-workspace-doc = craneLibVersions.nightly.cargoDoc (
+              commonArgs
+              // {
+                cargoLock = cargoLock.nightly;
+                cargoArtifacts = cargoArtifacts.nightly;
+              }
+            );
 
-          payjoin-workspace-fmt = craneLib.cargoFmt (
-            commonArgs
-            // {
-              inherit src;
-            }
-          );
+            payjoin-workspace-fmt = craneLibVersions.nightly.cargoFmt (
+              commonArgs
+              // {
+                inherit src;
+                # cargoLock = cargoLock.nightly;
+              }
+            );
 
-          nix-fmt-check = simpleCheck {
-            name = "nix-fmt-check";
-            src = pkgs.lib.sources.sourceFilesBySuffices ./. [ ".nix" ];
-            nativeBuildInputs = [ pkgs.nixfmt-tree ];
-            checkPhase = ''
-              treefmt --ci --tree-root .
-            '';
-          };
+            nix-fmt-check = simpleCheck {
+              name = "nix-fmt-check";
+              src = pkgs.lib.sources.sourceFilesBySuffices ./. [ ".nix" ];
+              nativeBuildInputs = [ pkgs.nixfmt-tree ];
+              checkPhase = ''
+                treefmt --ci --tree-root .
+              '';
+            };
 
-          shfmt = simpleCheck rec {
-            name = "shfmt";
-            src = pkgs.lib.sources.sourceFilesBySuffices ./. [ ".sh" ];
-            nativeBuildInputs = [ pkgs.shfmt ];
-            checkPhase = ''
-              shfmt -d -s -i 4 -ci ${src}
-            '';
-          };
+            shfmt = simpleCheck rec {
+              name = "shfmt";
+              src = pkgs.lib.sources.sourceFilesBySuffices ./. [ ".sh" ];
+              nativeBuildInputs = [ pkgs.shfmt ];
+              checkPhase = ''
+                shfmt -d -s -i 4 -ci ${src}
+              '';
+            };
 
-          shellcheck = simpleCheck rec {
-            name = "shellcheck";
-            src = pkgs.lib.sources.sourceFilesBySuffices ./. [ ".sh" ];
-            nativeBuildInputs = [
-              pkgs.shellcheck
-              pkgs.findutils
-            ];
-            checkPhase = ''
-              find "${src}" -name '*.sh' -print0 | xargs -0 shellcheck -x
-            '';
+            shellcheck = simpleCheck rec {
+              name = "shellcheck";
+              src = pkgs.lib.sources.sourceFilesBySuffices ./. [ ".sh" ];
+              nativeBuildInputs = [
+                pkgs.shellcheck
+                pkgs.findutils
+              ];
+              checkPhase = ''
+                find "${src}" -name '*.sh' -print0 | xargs -0 shellcheck -x
+              '';
+            };
+
+            quick = checkSuite "quick" (
+              with self.outputs.checks.${system};
+              [
+                shfmt
+                shellcheck
+                nix-fmt-check
+              ]
+            );
+
+            slow = checkSuite "slow" (
+              with self.outputs.checks.${system};
+              [
+                nightly
+                stable
+                msrv
+              ]
+            );
+
+            nightly = checkSuite "nightly" (
+              with self.outputs.checks.${system};
+              [
+                payjoin-workspace-nextest-nightly
+              ]
+            );
+
+            stable = checkSuite "stable" (
+              with self.outputs.checks.${system};
+              [
+                payjoin-workspace-nextest-stable
+              ]
+            );
+
+            msrv = checkSuite "msrv" (
+              with self.outputs.checks.${system};
+              [
+                payjoin-workspace-nextest-msrv
+              ]
+              ++ pkgs.lib.attrValues packages
+            );
           };
-        };
       }
     );
 }