chore(nix): Update dependencies.

Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/8e8d955c22df93dbe24f19ea04f47a74adbdc5ec' (2023-07-04) → 'github:hercules-ci/flake-parts/59cf3f1447cfc75087e7273b04b31e689a8599fb' (2023-08-01) • Updated input 'flake-parts/nixpkgs-lib': 'github:NixOS/nixpkgs/4bc72cae107788bf3f24f30db2e2f685c9298dc9?dir=lib' (2023-06-29) → 'github:NixOS/nixpkgs/9e1960bc196baf6881340d53dccb203a951745a2?dir=lib' (2023-08-01) • Updated input 'hacknix': 'github:hackworthltd/hacknix/7d0d518171938c2b95f7cb8da58f291f5ed22f30' (2023-07-30) → 'github:hackworthltd/hacknix/060e151c8e2ff7b52e4ce13579f39976ccf7baaf' (2023-08-12) • Updated input 'hacknix/flake-parts': 'github:hercules-ci/flake-parts/8e8d955c22df93dbe24f19ea04f47a74adbdc5ec' (2023-07-04) → 'github:hercules-ci/flake-parts/59cf3f1447cfc75087e7273b04b31e689a8599fb' (2023-08-01) • Updated input 'hacknix/flake-parts/nixpkgs-lib': 'github:NixOS/nixpkgs/4bc72cae107788bf3f24f30db2e2f685c9298dc9?dir=lib' (2023-06-29) → 'github:NixOS/nixpkgs/9e1960bc196baf6881340d53dccb203a951745a2?dir=lib' (2023-08-01) • Updated input 'hacknix/nix-darwin': 'github:LnL7/nix-darwin/16c07487ac9bc59f58b121d13160c67befa3342e' (2023-07-27) → 'github:LnL7/nix-darwin/426d38710b656b0a31f8eaae6e0002206a3b96d7' (2023-08-10) • Updated input 'hacknix/pre-commit-hooks-nix': 'github:cachix/pre-commit-hooks.nix/9289996dcac62fd45836db7c07b87d2521eb526d' (2023-07-27) → 'github:cachix/pre-commit-hooks.nix/c5ac3aa3324bd8aebe8622a3fc92eeb3975d317a' (2023-08-11) • Updated input 'haskell-nix': 'github:input-output-hk/haskell.nix/66861ed35e43f4c1c8e4be2f11110eba3b13de48' (2023-07-30) → 'github:input-output-hk/haskell.nix/1970bb2d5b0eb8152f89b305f32d055dbd6857d9' (2023-08-16) • Updated input 'haskell-nix/hackage': 'github:input-output-hk/hackage.nix/a21057809f37315eaba0188d8a737ababcaba7f5' (2023-07-30) → 'github:input-output-hk/hackage.nix/9d2daeca0e09002bc6fb552a097a1802a2f3a4e3' (2023-08-16) • Updated input 'haskell-nix/nixpkgs-2205': 'github:NixOS/nixpkgs/50fc86b75d2744e1ab3837ef74b53f103a9b55a0' (2023-04-27) → 'github:NixOS/nixpkgs/380be19fbd2d9079f677978361792cb25e8a3635' (2023-05-31) • Updated input 'haskell-nix/nixpkgs-2211': 'github:NixOS/nixpkgs/c8a17ce7abc03c50cd072e9e6c9b389c5f61836b' (2023-05-28) → 'github:NixOS/nixpkgs/ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b' (2023-07-03) • Updated input 'haskell-nix/nixpkgs-2305': 'github:NixOS/nixpkgs/6287b47dbfabbb8bfbb9b1b53d198ad58a774de4' (2023-05-29) → 'github:NixOS/nixpkgs/b81af66deb21f73a70c67e5ea189568af53b1e8c' (2023-07-30) • Updated input 'haskell-nix/nixpkgs-unstable': 'github:NixOS/nixpkgs/f2f1ec390714d303cf84ba086e34e45b450dd8c4' (2023-05-29) → 'github:NixOS/nixpkgs/3acb5c4264c490e7714d503c7166a3fde0c51324' (2023-07-30) • Updated input 'haskell-nix/stackage': 'github:input-output-hk/stackage.nix/dc76687c7909334431bf6c0e7a6ad408d4fea1de' (2023-07-30) → 'github:input-output-hk/stackage.nix/4e73b40d8946263c535dd56261311647afdfc560' (2023-08-16) • Updated input 'pre-commit-hooks-nix': 'github:cachix/pre-commit-hooks.nix/fcbf4705d98398d084e6cb1c826a0b90a91d22d7' (2023-07-30) → 'github:cachix/pre-commit-hooks.nix/3e3d45c1f26e212abe24188ece996871d94618d8' (2023-08-16) Also, rename the `primer-service-entrypoint.sh` to `.bash` so that Shellcheck doesn't complain. This appears to be new behavior as of this Nix pin update. Signed-off-by: Drew Hess <[email protected]>
hackworthltd · Aug 16, 2023 · 50aa0d0 · 50aa0d0
1 parent 93ece25
commit 50aa0d0
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 55 deletions.
diff --git a/docs/developing.md b/docs/developing.md
@@ -136,5 +136,5 @@ However, in this scenario, you'll need to have first created and/or
 migrated the local SQLite database by running `primer-sqitch`
 yourself. `primer-service` doesn't know how to deploy or migrate the
 database on its own. See the
-[`primer-service-entrypoint.sh`](../nix/pkgs/scripts/primer-service-entrypoint.sh)
+[`primer-service-entrypoint.bash`](../nix/pkgs/scripts/primer-service-entrypoint.bash)
 shell script for the commands that the Docker entrypoint runs.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -246,14 +246,19 @@
             inherit weeder openapi-validate;
             inherit primer-sqitch-test-sqlite;
           }
-          // (pkgs.lib.optionalAttrs (system == "x86_64-linux")
-            (inputs.hacknix.lib.testing.nixos.importFromDirectory ./nixos-tests
-              {
-                hostPkgs = pkgs;
-                defaults.imports = [ inputs.self.nixosModules.default ];
-              }
-            )
-          )
+
+          # Temporarily disabled due to a failure in nixpkgs.
+          # See:
+          # https://github.com/hackworthltd/primer/issues/1114
+
+          # // (pkgs.lib.optionalAttrs (system == "x86_64-linux")
+          #   (inputs.hacknix.lib.testing.nixos.importFromDirectory ./nixos-tests
+          #     {
+          #       hostPkgs = pkgs;
+          #       defaults.imports = [ inputs.self.nixosModules.default ];
+          #     }
+          #   )
+          # )
 
           # Broken on NixOS. See:
           # https://github.com/hackworthltd/primer/issues/632

diff --git a/nix/pkgs/scripts/default.nix b/nix/pkgs/scripts/default.nix
@@ -50,7 +50,7 @@ let
       primer-sqitch
     ];
     # Use `builtins.readFile` here so that we get a shellcheck.
-    text = builtins.readFile ./primer-service-entrypoint.sh;
+    text = builtins.readFile ./primer-service-entrypoint.bash;
   };
 
   # Run `primer-service` locally against a SQLite database. This

diff --git a/...pkgs/scripts/primer-service-entrypoint.sh → ...gs/scripts/primer-service-entrypoint.bash b/...pkgs/scripts/primer-service-entrypoint.sh → ...gs/scripts/primer-service-entrypoint.bash