From 092902ebc908734cb17b831d72dd5ad93abf14ef Mon Sep 17 00:00:00 2001 From: Ben Price Date: Tue, 12 Sep 2023 12:44:16 +0100 Subject: [PATCH] (to reword) bump primer to pin including editable kinds on foralls Signed-off-by: Ben Price --- argocd/base/statefulset.yaml | 2 +- flake.lock | 147 ++++++++++++++++++++++------------- flake.nix | 2 +- 3 files changed, 93 insertions(+), 58 deletions(-) diff --git a/argocd/base/statefulset.yaml b/argocd/base/statefulset.yaml index fc02b333..e6431e19 100644 --- a/argocd/base/statefulset.yaml +++ b/argocd/base/statefulset.yaml @@ -26,7 +26,7 @@ spec: # Note: use the *dev* version of the package here, so that # PRs can deploy `primer-service` container images that have # not yet been merged to `primer` `main`. - image: ghcr.io/hackworthltd/primer-service-dev:git-e603e61697d00a76c52252d154a5179fc9779417 + image: ghcr.io/hackworthltd/primer-service-dev:git-ebeb1827cfb7b9040d418e673b5455634ce27858 ports: - containerPort: 8081 env: diff --git a/flake.lock b/flake.lock index f3cf7b6f..2fa34cdb 100644 --- a/flake.lock +++ b/flake.lock @@ -269,11 +269,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1688466019, - "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", + "lastModified": 1693611461, + "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", + "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", "type": "github" }, "original": { @@ -287,11 +287,11 @@ "nixpkgs-lib": "nixpkgs-lib_4" }, "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": { @@ -355,24 +355,26 @@ } }, "flake-utils_4": { + "inputs": { + "systems": "systems_4" + }, "locked": { - "lastModified": 1679360468, - "narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=", - "owner": "hamishmack", + "lastModified": 1692799911, + "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", + "owner": "numtide", "repo": "flake-utils", - "rev": "e1ea268ff47ad475443dbabcd54744b4e5b9d4f5", + "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", "type": "github" }, "original": { - "owner": "hamishmack", - "ref": "hkm/nested-hydraJobs", + "owner": "numtide", "repo": "flake-utils", "type": "github" } }, "flake-utils_5": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1685518550, @@ -548,11 +550,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1690676776, - "narHash": "sha256-6z8zYs1b4ZZWSM58H41TtfM7bKEqjFW2xaCSCJUbBHk=", + "lastModified": 1693614242, + "narHash": "sha256-D7wbGA9ra631wOqnd6F5jNpiXUN5pZUxPusY6M4iJPk=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "a21057809f37315eaba0188d8a737ababcaba7f5", + "rev": "5a4a63a5e9167e26815ebb0a06a1f7542ec995be", "type": "github" }, "original": { @@ -599,11 +601,11 @@ "pre-commit-hooks-nix": "pre-commit-hooks-nix_3" }, "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": { @@ -625,6 +627,7 @@ "hackage": "hackage", "hls-1.10": "hls-1.10", "hls-2.0": "hls-2.0", + "hls-2.2": "hls-2.2", "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", @@ -644,11 +647,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1690678257, - "narHash": "sha256-AwGJH6Nje2g/XzdcPEkbGB8NvxyLbW2X9EQKB7ZsIhw=", + "lastModified": 1693615819, + "narHash": "sha256-Cf0qbdTqx37vXSdXToZDlfd+raFCAPn404U9F/0z1lg=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "66861ed35e43f4c1c8e4be2f11110eba3b13de48", + "rev": "00639427ecea4887e28f21bc8da27d29a54cb242", "type": "github" }, "original": { @@ -691,6 +694,23 @@ "type": "github" } }, + "hls-2.2": { + "flake": false, + "locked": { + "lastModified": 1693064058, + "narHash": "sha256-8DGIyz5GjuCFmohY6Fa79hHA/p1iIqubfJUTGQElbNk=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "b30f4b6cf5822f3112c35d14a0cba51f3fe23b85", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.2.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, "hpc-coveralls": { "flake": false, "locked": { @@ -808,11 +828,11 @@ "nixpkgs": "nixpkgs_3" }, "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": { @@ -959,11 +979,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": { @@ -975,11 +995,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": { @@ -991,11 +1011,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": { @@ -1044,11 +1064,11 @@ "nixpkgs-lib_3": { "locked": { "dir": "lib", - "lastModified": 1688049487, - "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=", + "lastModified": 1693471703, + "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9", + "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85", "type": "github" }, "original": { @@ -1062,11 +1082,11 @@ "nixpkgs-lib_4": { "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": { @@ -1159,11 +1179,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": { @@ -1297,11 +1317,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "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": { @@ -1322,11 +1342,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1690743255, - "narHash": "sha256-dsJzQsyJGWCym1+LMyj2rbYmvjYmzeOrk7ypPrSFOPo=", + "lastModified": 1692274144, + "narHash": "sha256-BxTQuRUANQ81u8DJznQyPmRsg63t4Yc+0kcyq6OLz8s=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "fcbf4705d98398d084e6cb1c826a0b90a91d22d7", + "rev": "7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa", "type": "github" }, "original": { @@ -1349,17 +1369,17 @@ "pre-commit-hooks-nix": "pre-commit-hooks-nix_4" }, "locked": { - "lastModified": 1691486196, - "narHash": "sha256-J3cSvDSLsGD8sFBghvsUCcRSV5Crii8I9DR1IlB1q1A=", + "lastModified": 1694095483, + "narHash": "sha256-JluY7o+b9EXObuqp1r4CweaId2CrCQY54/wP5CJadzk=", "owner": "hackworthltd", "repo": "primer", - "rev": "e603e61697d00a76c52252d154a5179fc9779417", + "rev": "ebeb1827cfb7b9040d418e673b5455634ce27858", "type": "github" }, "original": { "owner": "hackworthltd", "repo": "primer", - "rev": "e603e61697d00a76c52252d154a5179fc9779417", + "rev": "ebeb1827cfb7b9040d418e673b5455634ce27858", "type": "github" } }, @@ -1381,11 +1401,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1690675816, - "narHash": "sha256-2zEY60hpK8NleQgCtlTpP/bmIOE6o7ziTrcOu2Y+TMU=", + "lastModified": 1693355012, + "narHash": "sha256-ybo240tZ9LKPKRRzKYUTxlFMP4KlrokgFMFjpVa/X98=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "dc76687c7909334431bf6c0e7a6ad408d4fea1de", + "rev": "05b018ca16fa6616c2c988a7a0f2b8aad0b293b3", "type": "github" }, "original": { @@ -1454,6 +1474,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 804bb375..1f8b56d0 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ # Note: don't override any of primer's Nix flake inputs, or else # we won't hit its binary cache. - primer.url = github:hackworthltd/primer/e603e61697d00a76c52252d154a5179fc9779417; + primer.url = github:hackworthltd/primer/ebeb1827cfb7b9040d418e673b5455634ce27858; flake-parts.url = "github:hercules-ci/flake-parts"; };