From af6543f9ce4886c55c358d9d7a18031ffc63aadb Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Sun, 2 Jun 2024 00:41:41 +0100 Subject: [PATCH] chore: bump Primer pin to latest `main` Signed-off-by: Drew Hess --- argocd/base/statefulset.yaml | 2 +- flake.lock | 78 +++++++++++++++++++++++------------- flake.nix | 2 +- 3 files changed, 52 insertions(+), 30 deletions(-) diff --git a/argocd/base/statefulset.yaml b/argocd/base/statefulset.yaml index 918ea46c..604ff171 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-e692f818faee0e4005c24ea1f87c1464000a91ca + image: ghcr.io/hackworthltd/primer-service-dev:git-fe24bec4fa279a7973d39813c0f5275fe0078d96 ports: - containerPort: 8081 env: diff --git a/flake.lock b/flake.lock index cca86b17..cc7d11f0 100644 --- a/flake.lock +++ b/flake.lock @@ -413,11 +413,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1713474460, - "narHash": "sha256-L3k9NUR9imLfm9EKytXJ9Lsx1AIjjAUgvdYCM0VX/4o=", + "lastModified": 1713766300, + "narHash": "sha256-gNodIIx7UIua3l2WwUrDCQDsbkIPSiQydr+i83CFh8E=", "ref": "refs/heads/master", - "rev": "fe968d0d39f49cae165da757e48d1365c607a38b", - "revCount": 167, + "rev": "f9b95689c5bd1c565e270879734d1663ff7ed8b4", + "revCount": 171, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc-wasm-meta" }, @@ -606,11 +606,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1713572844, - "narHash": "sha256-/XWI1qyfIaR2+Zfp9sFSkCS0tSLQ2kT8rZ8YO6TEC+w=", + "lastModified": 1714177528, + "narHash": "sha256-ZsydC/V2tf0f4xMfr2ZItEoLYMio034D6JQCJE05wRA=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "5fbda11a1e6c32f1deee000160bb67dfa9e06855", + "rev": "6760c08210ad696450e8d7c81e580d9fed42a702", "type": "github" }, "original": { @@ -659,11 +659,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1713006438, - "narHash": "sha256-VLSOFnOXptUh2jAFQ4ZpHzfwiXGDbS/wZKrpikEXrfE=", + "lastModified": 1713603272, + "narHash": "sha256-NCTz1OJ8InBRioz8iEappcOc1Pz9AjhEP0MVEiGK+lc=", "owner": "hackworthltd", "repo": "hacknix", - "rev": "37ac3cb477dc52f906313b838c7c84d60af6b42e", + "rev": "fab8e0bca9ff001dcf38efcaa9d6b34a3808df5d", "type": "github" }, "original": { @@ -712,11 +712,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1713574219, - "narHash": "sha256-QLCxxfmht4POO73ld1EH0w/GTb3XLgKLXcCitkMkLrs=", + "lastModified": 1714178996, + "narHash": "sha256-l/gnjCfdsPfrnOjekeKcfT40FHRmT0wHHTI5LW0VPOE=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "e43654102de69c2a4ddfdcb067d42f203f0ecf51", + "rev": "2aac981b37f89b276ddab4016806a8fdce624fff", "type": "github" }, "original": { @@ -978,11 +978,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1711763326, - "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=", + "lastModified": 1713543876, + "narHash": "sha256-olEWxacm1xZhAtpq+ZkEyQgR4zgfE7ddpNtZNvubi3g=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083", + "rev": "9e7c20ffd056e406ddd0276ee9d89f09c5e5f4ed", "type": "github" }, "original": { @@ -1377,11 +1377,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1713248628, - "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=", + "lastModified": 1713537308, + "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8", + "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", "type": "github" }, "original": { @@ -1550,20 +1550,21 @@ "haskell-nix", "nixpkgs-unstable" ], - "pre-commit-hooks-nix": "pre-commit-hooks-nix_4" + "pre-commit-hooks-nix": "pre-commit-hooks-nix_4", + "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1713886253, - "narHash": "sha256-xQM8h+9IKVpBvuAcPfVIA7a9sN3udDcdIAspKg5EP7A=", + "lastModified": 1714916623, + "narHash": "sha256-Z8JxQ7hE4Jq8r6jXI7GjzHQmEYgdLsXpUg4ibSu7b9w=", "owner": "hackworthltd", "repo": "primer", - "rev": "e692f818faee0e4005c24ea1f87c1464000a91ca", + "rev": "fe24bec4fa279a7973d39813c0f5275fe0078d96", "type": "github" }, "original": { "owner": "hackworthltd", "repo": "primer", - "rev": "e692f818faee0e4005c24ea1f87c1464000a91ca", + "rev": "fe24bec4fa279a7973d39813c0f5275fe0078d96", "type": "github" } }, @@ -1579,17 +1580,17 @@ ], "pre-commit-hooks-nix": "pre-commit-hooks-nix_2", "primer": "primer", - "treefmt-nix": "treefmt-nix_3" + "treefmt-nix": "treefmt-nix_4" } }, "stackage": { "flake": false, "locked": { - "lastModified": 1713572055, - "narHash": "sha256-gyxWqQhTvI7MvSWj9tNBWvUIUw9I1RkoCkKYmT6nMQ8=", + "lastModified": 1714176719, + "narHash": "sha256-VNTkI4n9ngsxA2BP+EzH6QtK2wwwdKDhSehHAecmvm0=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "0b92a647a8e834c8c13c346149501d50e85d7380", + "rev": "43ea9f3ad080d6d5cc251bbc2f7fff828eab02b2", "type": "github" }, "original": { @@ -1717,6 +1718,27 @@ } }, "treefmt-nix_3": { + "inputs": { + "nixpkgs": [ + "primer", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1714058656, + "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_4": { "inputs": { "nixpkgs": [ "nixpkgs" diff --git a/flake.nix b/flake.nix index 473adab8..1650ba5d 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/e692f818faee0e4005c24ea1f87c1464000a91ca; + primer.url = github:hackworthltd/primer/fe24bec4fa279a7973d39813c0f5275fe0078d96; flake-parts.url = "github:hercules-ci/flake-parts"; };