From 50aa0d05ceb4ab72a4dca41179406ffa4b857157 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 16 Aug 2023 17:18:36 +0000 Subject: [PATCH] chore(nix): Update dependencies. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- docs/developing.md | 2 +- flake.lock | 90 +++++++++---------- flake.nix | 21 +++-- nix/pkgs/scripts/default.nix | 2 +- ...oint.sh => primer-service-entrypoint.bash} | 0 5 files changed, 60 insertions(+), 55 deletions(-) rename nix/pkgs/scripts/{primer-service-entrypoint.sh => primer-service-entrypoint.bash} (100%) diff --git a/docs/developing.md b/docs/developing.md index 521076d1a..271eb144b 100644 --- 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 index c95a9d3a4..faf7674d9 100644 --- a/flake.lock +++ b/flake.lock @@ -169,11 +169,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1688466019, - "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", + "lastModified": 1690933134, + "narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", + "rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb", "type": "github" }, "original": { @@ -187,11 +187,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1688466019, - "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", + "lastModified": 1690933134, + "narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", + "rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb", "type": "github" }, "original": { @@ -331,11 +331,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1690676776, - "narHash": "sha256-6z8zYs1b4ZZWSM58H41TtfM7bKEqjFW2xaCSCJUbBHk=", + "lastModified": 1692145451, + "narHash": "sha256-kqfyD3Mu5kgiH5W2ZshUhzO46H0zYDpwD1SWz+POMrk=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "a21057809f37315eaba0188d8a737ababcaba7f5", + "rev": "9d2daeca0e09002bc6fb552a097a1802a2f3a4e3", "type": "github" }, "original": { @@ -357,11 +357,11 @@ "pre-commit-hooks-nix": "pre-commit-hooks-nix" }, "locked": { - "lastModified": 1690739279, - "narHash": "sha256-BOA2TEpUHXzdUwa077CgZ7e8hlKuGaN1QjNMG/RwjKw=", + "lastModified": 1691800354, + "narHash": "sha256-Pid5Lykvx7fK0JTECzEo+mXROb7CW+Oe2+ADHdgTbAw=", "owner": "hackworthltd", "repo": "hacknix", - "rev": "7d0d518171938c2b95f7cb8da58f291f5ed22f30", + "rev": "060e151c8e2ff7b52e4ce13579f39976ccf7baaf", "type": "github" }, "original": { @@ -401,11 +401,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1690678257, - "narHash": "sha256-AwGJH6Nje2g/XzdcPEkbGB8NvxyLbW2X9EQKB7ZsIhw=", + "lastModified": 1692147008, + "narHash": "sha256-ZiRaryaboJbNZ7y7XKZs2xuSfydZyGeupJNOfYpgQSw=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "66861ed35e43f4c1c8e4be2f11110eba3b13de48", + "rev": "1970bb2d5b0eb8152f89b305f32d055dbd6857d9", "type": "github" }, "original": { @@ -546,11 +546,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1690431538, - "narHash": "sha256-Uml8ivMMOFPB9fNSDcw72imGHRdJpaK12sRm2DTLLe8=", + "lastModified": 1691640097, + "narHash": "sha256-6vPsJYjtt2hs4mkiR46yt8c/Spdm/UiUKoSCIlc7iJw=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "16c07487ac9bc59f58b121d13160c67befa3342e", + "rev": "426d38710b656b0a31f8eaae6e0002206a3b96d7", "type": "github" }, "original": { @@ -659,11 +659,11 @@ }, "nixpkgs-2205": { "locked": { - "lastModified": 1682600000, - "narHash": "sha256-ha4BehR1dh8EnXSoE1m/wyyYVvHI9txjW4w5/oxsW5Y=", + "lastModified": 1685573264, + "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "50fc86b75d2744e1ab3837ef74b53f103a9b55a0", + "rev": "380be19fbd2d9079f677978361792cb25e8a3635", "type": "github" }, "original": { @@ -675,11 +675,11 @@ }, "nixpkgs-2211": { "locked": { - "lastModified": 1685314633, - "narHash": "sha256-8LXBPqTQXl5ofkjpJ18JcbmLJ/lWDoMxtUwiDYv0wro=", + "lastModified": 1688392541, + "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8a17ce7abc03c50cd072e9e6c9b389c5f61836b", + "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", "type": "github" }, "original": { @@ -691,11 +691,11 @@ }, "nixpkgs-2305": { "locked": { - "lastModified": 1685338297, - "narHash": "sha256-+Aq4O0Jn1W1q927ZHc3Zn6RO7bwQGmb6O8xYoGy0KrM=", + "lastModified": 1690680713, + "narHash": "sha256-NXCWA8N+GfSQyoN7ZNiOgq/nDJKOp5/BHEpiZP8sUZw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6287b47dbfabbb8bfbb9b1b53d198ad58a774de4", + "rev": "b81af66deb21f73a70c67e5ea189568af53b1e8c", "type": "github" }, "original": { @@ -708,11 +708,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1688049487, - "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=", + "lastModified": 1690881714, + "narHash": "sha256-h/nXluEqdiQHs1oSgkOOWF+j8gcJMWhwnZ9PFabN6q0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9", + "rev": "9e1960bc196baf6881340d53dccb203a951745a2", "type": "github" }, "original": { @@ -726,11 +726,11 @@ "nixpkgs-lib_2": { "locked": { "dir": "lib", - "lastModified": 1688049487, - "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=", + "lastModified": 1690881714, + "narHash": "sha256-h/nXluEqdiQHs1oSgkOOWF+j8gcJMWhwnZ9PFabN6q0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9", + "rev": "9e1960bc196baf6881340d53dccb203a951745a2", "type": "github" }, "original": { @@ -791,11 +791,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1685347552, - "narHash": "sha256-9woSppRyUFo26yUffORTzttJ+apOt8MmCv6RxpPNTU4=", + "lastModified": 1690720142, + "narHash": "sha256-GywuiZjBKfFkntQwpNQfL+Ksa2iGjPprBGL0/psgRZM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f2f1ec390714d303cf84ba086e34e45b450dd8c4", + "rev": "3acb5c4264c490e7714d503c7166a3fde0c51324", "type": "github" }, "original": { @@ -850,11 +850,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1690464206, - "narHash": "sha256-38V4kmOh6ikpfGiAS+Kt2H/TA2DubSqE66veP/jmB4Q=", + "lastModified": 1691747570, + "narHash": "sha256-J3fnIwJtHVQ0tK2JMBv4oAmII+1mCdXdpeCxtIsrL2A=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "9289996dcac62fd45836db7c07b87d2521eb526d", + "rev": "c5ac3aa3324bd8aebe8622a3fc92eeb3975d317a", "type": "github" }, "original": { @@ -874,11 +874,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1690743255, - "narHash": "sha256-dsJzQsyJGWCym1+LMyj2rbYmvjYmzeOrk7ypPrSFOPo=", + "lastModified": 1692203373, + "narHash": "sha256-St6Ie93YMi8ugwnbIFLuse7KE9f7nwmwT+fo86Mk/8Y=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "fcbf4705d98398d084e6cb1c826a0b90a91d22d7", + "rev": "3e3d45c1f26e212abe24188ece996871d94618d8", "type": "github" }, "original": { @@ -903,11 +903,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1690675816, - "narHash": "sha256-2zEY60hpK8NleQgCtlTpP/bmIOE6o7ziTrcOu2Y+TMU=", + "lastModified": 1692144531, + "narHash": "sha256-biHJYZkcjkJIBguSKib6neGFLJs/OM5VYKzQHhkDNN0=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "dc76687c7909334431bf6c0e7a6ad408d4fea1de", + "rev": "4e73b40d8946263c535dd56261311647afdfc560", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f09bf19c3..2c58e5f4b 100644 --- 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 index bc606e35e..9473b7b85 100644 --- 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/nix/pkgs/scripts/primer-service-entrypoint.sh b/nix/pkgs/scripts/primer-service-entrypoint.bash similarity index 100% rename from nix/pkgs/scripts/primer-service-entrypoint.sh rename to nix/pkgs/scripts/primer-service-entrypoint.bash