From f8e51f0db226bb7ecdce3c96da69f8419661a6be Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Sat, 23 May 2020 21:00:45 +0300 Subject: [PATCH 1/5] default.nix: m clean-up M default.nix --- default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/default.nix b/default.nix index 82efaf474..79c38d5bf 100644 --- a/default.nix +++ b/default.nix @@ -97,7 +97,6 @@ in haskellPackages.developPackage { modifier = drv: pkgs.haskell.lib.overrideCabal drv (attrs: { buildTools = (attrs.buildTools or []) ++ [ haskellPackages.cabal-install - # haskellPackages.brittany ]; enableLibraryProfiling = doProfiling; From 3fe7de78ffbf621c3c0924f71ce59dd19d29117c Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Sat, 23 May 2020 21:01:26 +0300 Subject: [PATCH 2/5] default.nix: override: free semialign It no longer needed, and 1.1 now does not exist in Nixpkgs - and this override prevents building HNix with HNix-store 0.2 M default.nix --- default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/default.nix b/default.nix index 79c38d5bf..1997c179f 100644 --- a/default.nix +++ b/default.nix @@ -69,11 +69,8 @@ let overlay = pkgs.lib.foldr pkgs.lib.composeExtensions (_: _: {}) [ (import "${hnix-store-src}/overlay.nix") - (self: super: with pkgs.haskell.lib; { - - semialign = super.semialign_1_1; - - } // pkgs.lib.optionalAttrs withHoogle { + (self: super: with pkgs.haskell.lib; + pkgs.lib.optionalAttrs withHoogle { ghc = super.ghc // { withPackages = super.ghc.withHoogle; }; ghcWithPackages = self.ghc.withPackages; }) From 591336dbb0ea648ae4c110fc9a43a0f7d30d7fb3 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Sat, 23 May 2020 21:03:32 +0300 Subject: [PATCH 3/5] default.nix: upd Nixpkgs revision M default.nix --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.nix b/default.nix index 1997c179f..f10db8663 100644 --- a/default.nix +++ b/default.nix @@ -8,7 +8,7 @@ , withHoogle ? true -, rev ? "8da81465c19fca393a3b17004c743e4d82a98e4f" +, rev ? "29d57de30101b51b016310ee51c2c4ec762f88db" # 2020-05-23: NOTE: UTC 17:00 , pkgs ? if builtins.compareVersions builtins.nixVersion "2.0" < 0 From 1c8f5822fd36eedcf75db7ab1152f82dc5131522 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Sat, 23 May 2020 21:04:48 +0300 Subject: [PATCH 4/5] default.nix: dep: upd hnix-store to 0.2 M default.nix --- default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/default.nix b/default.nix index f10db8663..96b1733c4 100644 --- a/default.nix +++ b/default.nix @@ -63,8 +63,8 @@ let hnix-store-src = pkgs.fetchFromGitHub { owner = "haskell-nix"; repo = "hnix-store"; - rev = "0.1.0.0"; - sha256 = "1z48msfkiys432rkd00fgimjgspp98dci11kgg3v8ddf4mk1s8g0"; + rev = "0.2.0.0"; + sha256 = "1qf5rn43d46vgqqgmwqdkjh78rfg6bcp4kypq3z7mx46sdpzvb78"; }; overlay = pkgs.lib.foldr pkgs.lib.composeExtensions (_: _: {}) [ From c5d05d3003120afbf5f00842bfeee3a02e933f18 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Sat, 23 May 2020 21:11:23 +0300 Subject: [PATCH 5/5] default.nix: dep: upd hnix-store: use it from the repository M default.nix --- default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/default.nix b/default.nix index 96b1733c4..036b14615 100644 --- a/default.nix +++ b/default.nix @@ -60,15 +60,17 @@ }: let - hnix-store-src = pkgs.fetchFromGitHub { - owner = "haskell-nix"; - repo = "hnix-store"; - rev = "0.2.0.0"; - sha256 = "1qf5rn43d46vgqqgmwqdkjh78rfg6bcp4kypq3z7mx46sdpzvb78"; - }; + + # 2020-05-23: NOTE: Currently HNix-store needs no overlay + # hnix-store-src = pkgs.fetchFromGitHub { + # owner = "haskell-nix"; + # repo = "hnix-store"; + # rev = "0.2.0.0"; + # sha256 = "1qf5rn43d46vgqqgmwqdkjh78rfg6bcp4kypq3z7mx46sdpzvb78"; + # }; overlay = pkgs.lib.foldr pkgs.lib.composeExtensions (_: _: {}) [ - (import "${hnix-store-src}/overlay.nix") + # (import "${hnix-store-src}/overlay.nix") (self: super: with pkgs.haskell.lib; pkgs.lib.optionalAttrs withHoogle { ghc = super.ghc // { withPackages = super.ghc.withHoogle; };