Factor out --override-input in one place

Author: srid

example/test.sh

@@ -3,13 +3,10 @@ set -euo pipefail
 
 function templateTest () {
     # Build haskell executable
-    nix build \
-        ${OVERRIDE_HASKELL_FLAKE} \
-        ${OVERRIDE_NIXPKGS}
+    nix build ${OVERRIDE_ALL}
     # Test haskell devshell (via HLS check)
     nix develop \
-        ${OVERRIDE_HASKELL_FLAKE} \
-        ${OVERRIDE_NIXPKGS} \
+        ${OVERRIDE_ALL} \
         -c haskell-language-server
 }
 

nix/find-haskell-paths/test.sh

@@ -1,4 +1,4 @@
 source ../../test/common.sh
 
-nix eval -I nixpkgs=flake:github:nixos/nixpkgs/bb31220cca6d044baa6dc2715b07497a2a7c4bc7 \
+nix eval -I nixpkgs=flake:${NIXPKGS_URL} \
     --impure --expr 'import ./parser_tests.nix {}'

test/common.sh

@@ -14,7 +14,13 @@ fi
 DIR_OF_COMMON_SH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 HASKELL_FLAKE=${DIR_OF_COMMON_SH}/..
 OVERRIDE_HASKELL_FLAKE="--override-input haskell-flake path:${HASKELL_FLAKE}"
-OVERRIDE_NIXPKGS="--override-input nixpkgs github:nixos/nixpkgs/bb31220cca6d044baa6dc2715b07497a2a7c4bc7"
+
+# Let's pin both nixpkgs and flake-parts across all tests, to save up on CI time.
+NIXPKGS_URL="github:nixos/nixpkgs/bb31220cca6d044baa6dc2715b07497a2a7c4bc7"
+OVERRIDE_NIXPKGS="--override-input nixpkgs ${NIXPKGS_URL}"
+OVERRIDE_FLAKE_PARTS="--override-input flake-parts github:hercules-ci/flake-parts/7c7a8bce3dffe71203dcd4276504d1cb49dfe05f"
+
+OVERRIDE_ALL="${OVERRIDE_HASKELL_FLAKE} ${OVERRIDE_FLAKE_PARTS} ${OVERRIDE_NIXPKGS}"
 
 currentver="$(nix eval --raw --expr builtins.nixVersion)"
 requiredver="2.14.1"

test/hpack/flake.nix

@@ -3,12 +3,8 @@
   # pinning), we must specify revisions for *all* inputs to ensure
   # reproducibility.
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/bb31220cca6d044baa6dc2715b07497a2a7c4bc7";
-    flake-parts.url = "github:hercules-ci/flake-parts/7c7a8bce3dffe71203dcd4276504d1cb49dfe05f";
-
-    # We do not specify a value for this input, because it is explicitly
-    # specified using --override-input to point to ../. For example, 
-    #   `nix build --override-input haskell-flake ..`
+    nixpkgs = { };
+    flake-parts = { };
     haskell-flake = { };
   };
   outputs = inputs@{ self, nixpkgs, flake-parts, ... }:

test/hpack/test.sh

@@ -3,7 +3,7 @@ set -euxo pipefail
 
 # First, build the flake
 logHeader "Testing nix build"
-nix build ${OVERRIDE_HASKELL_FLAKE}
+nix build ${OVERRIDE_ALL}
 # Run the devshell test script in a nix develop shell.
 logHeader "Testing nix devshell"
-nix develop ${OVERRIDE_HASKELL_FLAKE} -c echo
+nix develop ${OVERRIDE_ALL} -c echo

test/simple/flake.nix

@@ -3,17 +3,14 @@
   # pinning), we must specify revisions for *all* inputs to ensure
   # reproducibility.
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/bb31220cca6d044baa6dc2715b07497a2a7c4bc7";
-    flake-parts.url = "github:hercules-ci/flake-parts/7c7a8bce3dffe71203dcd4276504d1cb49dfe05f";
+    nixpkgs = { };
+    flake-parts = { };
+    haskell-flake = { };
+
     check-flake.url = "github:srid/check-flake/48a17393ed4fcd523399d6602c283775b5127295";
 
     haskell-multi-nix.url = "github:srid/haskell-multi-nix/7aed736571714ec12105ec110358998d70d59e34";
     haskell-multi-nix.flake = false;
-
-    # We do not specify a value for this input, because it is explicitly
-    # specified using --override-input to point to ../. For example, 
-    #   `nix build --override-input haskell-flake ..`
-    haskell-flake = { };
   };
   outputs = inputs@{ self, nixpkgs, flake-parts, ... }:
     flake-parts.lib.mkFlake { inherit inputs; } {

test/simple/test.sh

@@ -3,12 +3,12 @@ set -euxo pipefail
 
 # First, build the flake
 logHeader "Testing nix build"
-nix build ${OVERRIDE_HASKELL_FLAKE}
+nix build ${OVERRIDE_ALL}
 # Run the devshell test script in a nix develop shell.
 logHeader "Testing nix devshell"
-nix develop ${OVERRIDE_HASKELL_FLAKE} -c ./test-in-devshell.sh
+nix develop ${OVERRIDE_ALL} -c ./test-in-devshell.sh
 # Test non-devshell features:
 # Checks
 logHeader "Testing nix flake checks"
 nix --option sandbox false \
-    build ${OVERRIDE_HASKELL_FLAKE} -L .#check
+    build ${OVERRIDE_ALL} -L .#check

test/with-subdir/flake.nix

@@ -3,12 +3,8 @@
   # pinning), we must specify revisions for *all* inputs to ensure
   # reproducibility.
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/bb31220cca6d044baa6dc2715b07497a2a7c4bc7";
-    flake-parts.url = "github:hercules-ci/flake-parts/7c7a8bce3dffe71203dcd4276504d1cb49dfe05f";
-
-    # We do not specify a value for this input, because it is explicitly
-    # specified using --override-input to point to ../. For example, 
-    #   `nix build --override-input haskell-flake ..`
+    nixpkgs = { };
+    flake-parts = { };
     haskell-flake = { };
   };
   outputs = inputs@{ self, nixpkgs, flake-parts, ... }:
@@ -18,7 +14,7 @@
         inputs.haskell-flake.flakeModule
       ];
       perSystem = { self', pkgs, ... }: {
-        haskellProjects.default = {};
+        haskellProjects.default = { };
         packages.default = self'.packages.haskell-flake-test;
       };
     };

test/with-subdir/test.sh

@@ -20,7 +20,7 @@ trap cleanup EXIT
 logHeader "Testing source filtering"
 
 function get_drv_path() {
-  nix eval ${OVERRIDE_HASKELL_FLAKE} .#packages.$SYSTEM.default.drvPath
+  nix eval ${OVERRIDE_ALL} .#packages.$SYSTEM.default.drvPath
 }
 baseline=$(get_drv_path)