From 295714e31ec204352e65ea622baaa54e9f9e8ed3 Mon Sep 17 00:00:00 2001 From: Sandy Maguire Date: Thu, 22 Dec 2022 09:47:24 -0800 Subject: [PATCH 1/4] chore: update hackage pins to use new polysemy --- nix/haskell-pins.nix | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/nix/haskell-pins.nix b/nix/haskell-pins.nix index 0082da92620..1bc6431b615 100644 --- a/nix/haskell-pins.nix +++ b/nix/haskell-pins.nix @@ -203,30 +203,6 @@ let tasty-hunit = "hunit"; }; }; - polysemy = { - src = fetchgit { - url = "https://github.com/polysemy-research/polysemy.git"; - rev = "3855786e58bf397ca8204f3a79d19c24485dabd4"; - sha256 = "sha256-4ans30VWuSMC9HNFb6FWQyc30oxJd2dmFrMGu5/dLg0="; - }; - }; - polysemy-plugin = { - src = fetchgit { - url = "https://github.com/polysemy-research/polysemy.git"; - rev = "3855786e58bf397ca8204f3a79d19c24485dabd4"; - sha256 = "sha256-4ans30VWuSMC9HNFb6FWQyc30oxJd2dmFrMGu5/dLg0="; - }; - packages = { - polysemy-plugin = "polysemy-plugin"; - }; - }; - polysemy-check = { - src = fetchgit { - url = "https://github.com/polysemy-research/polysemy-check.git"; - rev = "4c0d3ff929ae22ae68d962f7f3f7056f357bf7ac"; - sha256 = "sha256-8XeCeJWbkdqrUf6tERFMoGM8xRI5l/nKNqI810kzMs0="; - }; - }; kind-generics = { src = fetchgit { url = "https://gitlab.com/trupill/kind-generics.git"; @@ -256,6 +232,18 @@ let version = "0.2.2.1"; sha256 = "sha256-TdsLB0ueaUUllLdvcGu3YNQXCfGRRk5WxP3deHEbHGI="; }; + polysemy = { + version = "1.8.0.0"; + sha256 = "sha256-AdxxKWXdUjZiHLDj6iswMWpycs7mFB8eKhBR4ljF6kk="; + }; + polysemy-check = { + version = "0.9.0.1"; + sha256 = "sha256-CsL2vMxAmpvVVR/iUnZAkbcRLiy/a8ulJQ6QwtCYmRM="; + }; + polysemy-plugin = { + version = "0.4.3.1"; + sha256 = "sha256-0vkLYNZISr3fmmQvD8qdLkn2GHc80l1GzJuOmqjqXE4="; + }; singletons = { version = "2.7"; sha256 = "sha256-q7yc/wyGSyYI0KdgHgRi0WISv9WEibxQ5yM7cSjXS2s="; From 6568a51d610f4a5103cc1ae4bfc254c2c93b692f Mon Sep 17 00:00:00 2001 From: Sandy Maguire Date: Thu, 22 Dec 2022 09:50:51 -0800 Subject: [PATCH 2/4] chore: also pin kind-generics --- nix/haskell-pins.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/nix/haskell-pins.nix b/nix/haskell-pins.nix index 1bc6431b615..b228bb16882 100644 --- a/nix/haskell-pins.nix +++ b/nix/haskell-pins.nix @@ -203,17 +203,6 @@ let tasty-hunit = "hunit"; }; }; - kind-generics = { - src = fetchgit { - url = "https://gitlab.com/trupill/kind-generics.git"; - rev = "f4ad2bcfacc9c3dcecf64c069d086926465cab2c"; - sha256 = "sha256-uvQMV8aTNyTN+ozrseohexbCneVPMO35Jf1eEhLPk78="; - }; - packages = { - kind-generics = "kind-generics"; - kind-generics-th = "kind-generics-th"; - }; - }; # This can be removed once postie 0.6.0.3 (or later) is in nixpkgs postie = { src = fetchgit { @@ -232,6 +221,14 @@ let version = "0.2.2.1"; sha256 = "sha256-TdsLB0ueaUUllLdvcGu3YNQXCfGRRk5WxP3deHEbHGI="; }; + kind-generics = { + version = "0.4.1.2"; + sha256 = "sha256-orDfC5+QXRlAMVaqAhT1Fo7Eh/AnobROWeliZqEAXZU="; + }; + kind-generics-th = { + version = "0.2.2.2"; + sha256 = "sha256-nPuRq19UGVXe4YrITAZcF+U4TUBo5APMT2Nh9NqIkxQ="; + }; polysemy = { version = "1.8.0.0"; sha256 = "sha256-AdxxKWXdUjZiHLDj6iswMWpycs7mFB8eKhBR4ljF6kk="; From e0d6f4247cdd24ea52ba3ef3c2407489a9d28455 Mon Sep 17 00:00:00 2001 From: Sandy Maguire Date: Thu, 22 Dec 2022 09:53:17 -0800 Subject: [PATCH 3/4] chore: changelog --- changelog.d/5-internal/pr-2949 | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/5-internal/pr-2949 diff --git a/changelog.d/5-internal/pr-2949 b/changelog.d/5-internal/pr-2949 new file mode 100644 index 00000000000..96f68ed1839 --- /dev/null +++ b/changelog.d/5-internal/pr-2949 @@ -0,0 +1 @@ +Update nix pins to point at polysemy-1.8.0.0 From 2f338a9ac158a588a39c3e5c5947118bdda1be40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Dimja=C5=A1evi=C4=87?= Date: Tue, 27 Dec 2022 09:52:23 +0100 Subject: [PATCH 4/4] Hi CI