From 0504a5f2951cdd10f154872a4ebb3b3ba4589cb8 Mon Sep 17 00:00:00 2001 From: Matthew Russell Date: Thu, 15 Sep 2022 13:54:09 -0700 Subject: [PATCH 1/4] Pin base-compat in flake inputs and update lock --- flake.lock | 31 ++++++++++++++++++++++--------- flake.nix | 5 +++++ 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index e01237f392..2e66b23645 100644 --- a/flake.lock +++ b/flake.lock @@ -12,6 +12,18 @@ "url": "https://hackage.haskell.org/package/aeson-1.5.2.0/aeson-1.5.2.0.tar.gz" } }, + "base-compat": { + "flake": false, + "locked": { + "narHash": "sha256-Km8tvqCkMgYh38fm/uitS49+//vRBxzSZzFzhqUY8Ak=", + "type": "tarball", + "url": "https://hackage.haskell.org/package/base-compat-0.12.2/base-compat-0.12.2.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://hackage.haskell.org/package/base-compat-0.12.2/base-compat-0.12.2.tar.gz" + } + }, "brittany-01312": { "flake": false, "locked": { @@ -149,13 +161,13 @@ "hie-bios": { "flake": false, "locked": { - "narHash": "sha256-5RqspT27rb/tMBwrKr4VfSSbq0+c0LMNuaKlTun0Kkk=", + "narHash": "sha256-KLAg++tO9lCOn7R/cSN2wLbrhpeBOOmeTEh7auIbUNk=", "type": "tarball", - "url": "https://hackage.haskell.org/package/hie-bios-0.9.1/hie-bios-0.9.1.tar.gz" + "url": "https://hackage.haskell.org/package/hie-bios-0.11.0/hie-bios-0.11.0.tar.gz" }, "original": { "type": "tarball", - "url": "https://hackage.haskell.org/package/hie-bios-0.9.1/hie-bios-0.9.1.tar.gz" + "url": "https://hackage.haskell.org/package/hie-bios-0.11.0/hie-bios-0.11.0.tar.gz" } }, "hlint": { @@ -197,13 +209,13 @@ "lsp": { "flake": false, "locked": { - "narHash": "sha256-+rkFYvSAI1hyFxPkgWZReyM2P6irVDpGVUGK8mcfEJE=", + "narHash": "sha256-g5R34SVz0kRD5zpODNsaaaIJOHty10cTS6ZDPi4s8pc=", "type": "tarball", - "url": "https://hackage.haskell.org/package/lsp-1.5.0.0/lsp-1.5.0.0.tar.gz" + "url": "https://hackage.haskell.org/package/lsp-1.6.0.0/lsp-1.6.0.0.tar.gz" }, "original": { "type": "tarball", - "url": "https://hackage.haskell.org/package/lsp-1.5.0.0/lsp-1.5.0.0.tar.gz" + "url": "https://hackage.haskell.org/package/lsp-1.6.0.0/lsp-1.6.0.0.tar.gz" } }, "lsp-test": { @@ -221,13 +233,13 @@ "lsp-types": { "flake": false, "locked": { - "narHash": "sha256-q4XTvIvsLvISjgedpRktJbWsWHSRIQbOx2Z/2u+3s50=", + "narHash": "sha256-QSixsrCvsWlckG/LLF1z8LsHhqaXxVAxOPIA1NxjVT4=", "type": "tarball", - "url": "https://hackage.haskell.org/package/lsp-types-1.5.0.0/lsp-types-1.5.0.0.tar.gz" + "url": "https://hackage.haskell.org/package/lsp-types-1.6.0.0/lsp-types-1.6.0.0.tar.gz" }, "original": { "type": "tarball", - "url": "https://hackage.haskell.org/package/lsp-types-1.5.0.0/lsp-types-1.5.0.0.tar.gz" + "url": "https://hackage.haskell.org/package/lsp-types-1.6.0.0/lsp-types-1.6.0.0.tar.gz" } }, "myst-parser": { @@ -325,6 +337,7 @@ "root": { "inputs": { "aeson-1520": "aeson-1520", + "base-compat": "base-compat", "brittany-01312": "brittany-01312", "constraints-extras": "constraints-extras", "flake-compat": "flake-compat", diff --git a/flake.nix b/flake.nix index 5d0ec5955d..8c5f9e5609 100644 --- a/flake.nix +++ b/flake.nix @@ -20,6 +20,10 @@ }; # List of hackage dependencies + base-compat = { + url = "https://hackage.haskell.org/package/base-compat-0.12.2/base-compat-0.12.2.tar.gz"; + flake = false; + }; lsp = { url = "https://hackage.haskell.org/package/lsp-1.6.0.0/lsp-1.6.0.0.tar.gz"; flake = false; @@ -153,6 +157,7 @@ with haskell.lib; { # Patches don't apply github = overrideCabal hsuper.github (drv: { patches = []; }); + base-compat = hself.callCabal2nix "base-compat" inputs.base-compat {}; # GHCIDE requires hie-bios ^>=0.9.1 hie-bios = hself.callCabal2nix "hie-bios" inputs.hie-bios {}; From 0a5023bf0d54b1f53752a349a209e3ef2cf7b292 Mon Sep 17 00:00:00 2001 From: Matthew Russell Date: Thu, 15 Sep 2022 14:01:47 -0700 Subject: [PATCH 2/4] Pin base-compat-batteries as well --- flake.lock | 13 +++++++++++++ flake.nix | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/flake.lock b/flake.lock index 2e66b23645..e0344fadf3 100644 --- a/flake.lock +++ b/flake.lock @@ -24,6 +24,18 @@ "url": "https://hackage.haskell.org/package/base-compat-0.12.2/base-compat-0.12.2.tar.gz" } }, + "base-compat-batteries": { + "flake": false, + "locked": { + "narHash": "sha256-6sCgAD6EJvE4xBpu02F5thHvKqGuSK3QUQWJcNaSKK0=", + "type": "tarball", + "url": "https://hackage.haskell.org/package/base-compat-batteries-0.12.2/base-compat-batteries-0.12.2.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://hackage.haskell.org/package/base-compat-batteries-0.12.2/base-compat-batteries-0.12.2.tar.gz" + } + }, "brittany-01312": { "flake": false, "locked": { @@ -338,6 +350,7 @@ "inputs": { "aeson-1520": "aeson-1520", "base-compat": "base-compat", + "base-compat-batteries": "base-compat-batteries", "brittany-01312": "brittany-01312", "constraints-extras": "constraints-extras", "flake-compat": "flake-compat", diff --git a/flake.nix b/flake.nix index 8c5f9e5609..47bf0ec9e2 100644 --- a/flake.nix +++ b/flake.nix @@ -24,6 +24,10 @@ url = "https://hackage.haskell.org/package/base-compat-0.12.2/base-compat-0.12.2.tar.gz"; flake = false; }; + base-compat-batteries = { + url = "https://hackage.haskell.org/package/base-compat-batteries-0.12.2/base-compat-batteries-0.12.2.tar.gz"; + flake = false; + }; lsp = { url = "https://hackage.haskell.org/package/lsp-1.6.0.0/lsp-1.6.0.0.tar.gz"; flake = false; @@ -158,6 +162,7 @@ # Patches don't apply github = overrideCabal hsuper.github (drv: { patches = []; }); base-compat = hself.callCabal2nix "base-compat" inputs.base-compat {}; + base-compat-batteries = hself.callCabal2nix "base-compat-batteries" inputs.base-compat-batteries {}; # GHCIDE requires hie-bios ^>=0.9.1 hie-bios = hself.callCabal2nix "hie-bios" inputs.hie-bios {}; From eed7a4625462f9ed4509333c983faeb1cc834fe0 Mon Sep 17 00:00:00 2001 From: Matthew Russell Date: Thu, 15 Sep 2022 14:46:59 -0700 Subject: [PATCH 3/4] Cereal also --- flake.lock | 13 +++++++++++++ flake.nix | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/flake.lock b/flake.lock index e0344fadf3..2bc30b7a72 100644 --- a/flake.lock +++ b/flake.lock @@ -48,6 +48,18 @@ "url": "https://hackage.haskell.org/package/brittany-0.13.1.2/brittany-0.13.1.2.tar.gz" } }, + "cereal": { + "flake": false, + "locked": { + "narHash": "sha256-UII2NFJdfJU7YzrU8jUJjZJ+2H/0RUJopxGVJQeadyk=", + "type": "tarball", + "url": "https://hackage.haskell.org/package/cereal-0.5.8.3/cereal-0.5.8.3.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://hackage.haskell.org/package/cereal-0.5.8.3/cereal-0.5.8.3.tar.gz" + } + }, "constraints-extras": { "flake": false, "locked": { @@ -352,6 +364,7 @@ "base-compat": "base-compat", "base-compat-batteries": "base-compat-batteries", "brittany-01312": "brittany-01312", + "cereal": "cereal", "constraints-extras": "constraints-extras", "flake-compat": "flake-compat", "flake-utils": "flake-utils", diff --git a/flake.nix b/flake.nix index 47bf0ec9e2..b2707e87ad 100644 --- a/flake.nix +++ b/flake.nix @@ -28,6 +28,10 @@ url = "https://hackage.haskell.org/package/base-compat-batteries-0.12.2/base-compat-batteries-0.12.2.tar.gz"; flake = false; }; + cereal = { + url = "https://hackage.haskell.org/package/cereal-0.5.8.3/cereal-0.5.8.3.tar.gz"; + flake = false; + }; lsp = { url = "https://hackage.haskell.org/package/lsp-1.6.0.0/lsp-1.6.0.0.tar.gz"; flake = false; @@ -163,6 +167,7 @@ github = overrideCabal hsuper.github (drv: { patches = []; }); base-compat = hself.callCabal2nix "base-compat" inputs.base-compat {}; base-compat-batteries = hself.callCabal2nix "base-compat-batteries" inputs.base-compat-batteries {}; + cereal = hself.callCabal2nix "cereal" inputs.cereal {}; # GHCIDE requires hie-bios ^>=0.9.1 hie-bios = hself.callCabal2nix "hie-bios" inputs.hie-bios {}; From 677980ffd0695f44c088205c20d85a4f5339d531 Mon Sep 17 00:00:00 2001 From: Matthew Russell Date: Thu, 15 Sep 2022 15:31:14 -0700 Subject: [PATCH 4/4] Hashable --- flake.lock | 13 +++++++++++++ flake.nix | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/flake.lock b/flake.lock index 2bc30b7a72..4f3ce231c8 100644 --- a/flake.lock +++ b/flake.lock @@ -182,6 +182,18 @@ "type": "github" } }, + "hashable": { + "flake": false, + "locked": { + "narHash": "sha256-1o7UxdUV75QAdvSjZIx+zzoyY/pK6veIIJ5lspNrSFc=", + "type": "tarball", + "url": "https://hackage.haskell.org/package/hashable-1.4.1.0/hashable-1.4.1.0.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://hackage.haskell.org/package/hashable-1.4.1.0/hashable-1.4.1.0.tar.gz" + } + }, "hie-bios": { "flake": false, "locked": { @@ -373,6 +385,7 @@ "ghc-exactprint": "ghc-exactprint", "ghc-exactprint-150": "ghc-exactprint-150", "gitignore": "gitignore", + "hashable": "hashable", "hie-bios": "hie-bios", "hlint": "hlint", "hlint-34": "hlint-34", diff --git a/flake.nix b/flake.nix index b2707e87ad..bb2325a233 100644 --- a/flake.nix +++ b/flake.nix @@ -32,6 +32,10 @@ url = "https://hackage.haskell.org/package/cereal-0.5.8.3/cereal-0.5.8.3.tar.gz"; flake = false; }; + hashable = { + url = "https://hackage.haskell.org/package/hashable-1.4.1.0/hashable-1.4.1.0.tar.gz"; + flake = false; + }; lsp = { url = "https://hackage.haskell.org/package/lsp-1.6.0.0/lsp-1.6.0.0.tar.gz"; flake = false; @@ -168,6 +172,7 @@ base-compat = hself.callCabal2nix "base-compat" inputs.base-compat {}; base-compat-batteries = hself.callCabal2nix "base-compat-batteries" inputs.base-compat-batteries {}; cereal = hself.callCabal2nix "cereal" inputs.cereal {}; + hashable = hself.callCabal2nix "hashable" inputs.hashable {}; # GHCIDE requires hie-bios ^>=0.9.1 hie-bios = hself.callCabal2nix "hie-bios" inputs.hie-bios {};