From 49def6d809d5ea0a707ea4bbbffdc071138b7665 Mon Sep 17 00:00:00 2001 From: Avi Dessauer Date: Tue, 20 Jul 2021 17:08:56 -0400 Subject: [PATCH 1/2] Fix nix flake --- flake.lock | 6 +++--- flake.nix | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 1a268107dc..5361790461 100644 --- a/flake.lock +++ b/flake.lock @@ -49,11 +49,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1624977608, - "narHash": "sha256-i/QZI5qM4eYw2wWGd/OjruBx53FqUPq+sdAWmyIQ0ws=", + "lastModified": 1626764163, + "narHash": "sha256-TB+mtRpwn6pnoUXjBvJPIgHKkwLtjzFji4tkANlZWJQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "db6e089456cdddcd7e2c1d8dac37a505c797e8fa", + "rev": "1441fa74d213d7cc120d9d7d49e540c1fc59bc58", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ea8cdc3c65..fb34cbe495 100644 --- a/flake.nix +++ b/flake.nix @@ -72,7 +72,7 @@ with haskell.lib; { hls-tactics-plugin = hsuper.hls-tactics-plugin.override { - refinery = hself.refinery_0_3_0_0; + refinery = hself.refinery; }; hiedb = hself.callCabal2nix "hiedb" @@ -83,6 +83,37 @@ "13jz8c46zfpf54ya2wsv4akhn0wcfc6qjazqsjfir5gpvsi7v8xr"; }) { }; + implicit-hie = hself.callCabal2nix "implicit-hie" + (builtins.fetchTarball { + url = + "https://hackage.haskell.org/package/implicit-hie-0.1.2.6/implicit-hie-0.1.2.6.tar.gz"; + sha256 = + "067bmw5b9qg55ggklbfyf93jgpkbzmprmgv906jscfzvv1h8266c"; + }) { }; + + implicit-hie-cradle = hself.callCabal2nix "implicit-hie-cradle" + (builtins.fetchTarball { + url = + "https://hackage.haskell.org/package/implicit-hie-cradle-0.3.0.5/implicit-hie-cradle-0.3.0.5.tar.gz"; + sha256 = + "15a7g9x6cjk2b92hb2wilxx4550msxp1pmk5a2shiva821qaxnfq"; + }) { }; + + ghc-source-gen = hself.callCabal2nix "ghc-source-gen" + (builtins.fetchTarball { + url = + "https://hackage.haskell.org/package/ghc-source-gen-0.4.1.0/ghc-source-gen-0.4.1.0.tar.gz"; + sha256 = + "0kk599vk54ckikpxkzwrbx7z5x0xr20hr179rldmnlb34bf9mpnk"; + }) { }; + + refinery = hself.callCabal2nix "refinery" + (builtins.fetchTarball { + url = + "https://hackage.haskell.org/package/refinery-0.4.0.0/refinery-0.4.0.0.tar.gz"; + sha256 = + "1ic7qvfizh5av3b3hp8db08v6b0hmac20smyhbaqzwvfpdgnjq71"; + }) { }; }; hlsSources = From 49841c7078ecb466dee424d9cd4e39f580b2699c Mon Sep 17 00:00:00 2001 From: Avi Dessauer Date: Tue, 20 Jul 2021 20:22:32 -0400 Subject: [PATCH 2/2] Address review --- flake.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/flake.nix b/flake.nix index fb34cbe495..eca9dd5c5e 100644 --- a/flake.nix +++ b/flake.nix @@ -71,10 +71,6 @@ tweaks = hself: hsuper: with haskell.lib; { - hls-tactics-plugin = hsuper.hls-tactics-plugin.override { - refinery = hself.refinery; - }; - hiedb = hself.callCabal2nix "hiedb" (builtins.fetchTarball { url = @@ -106,14 +102,6 @@ sha256 = "0kk599vk54ckikpxkzwrbx7z5x0xr20hr179rldmnlb34bf9mpnk"; }) { }; - - refinery = hself.callCabal2nix "refinery" - (builtins.fetchTarball { - url = - "https://hackage.haskell.org/package/refinery-0.4.0.0/refinery-0.4.0.0.tar.gz"; - sha256 = - "1ic7qvfizh5av3b3hp8db08v6b0hmac20smyhbaqzwvfpdgnjq71"; - }) { }; }; hlsSources =