From 25a1978dc4baaacda82edb5b2310d8df16085c55 Mon Sep 17 00:00:00 2001 From: Victor Nawothnig Date: Tue, 25 Aug 2020 12:30:50 +0200 Subject: [PATCH 1/3] libsodium: feed c2hs dependency --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ .../haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 54c4e7c5465..1970efca80c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1330,6 +1330,10 @@ self: super: { # https://github.com/ennocramer/monad-dijkstra/issues/4 monad-dijkstra = dontCheck (doJailbreak super.monad-dijkstra); + libsodium = overrideCabal super.libsodium (drv: { + libraryToolDepends = drv.libraryToolDepends or [self.c2hs]; + }); + # https://github.com/kowainik/policeman/issues/57 policeman = doJailbreak super.policeman; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index a9b0b88eaef..2e70d99257c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -7265,7 +7265,6 @@ broken-packages: - libraft - librandomorg - librato - - libsodium - libssh2 - libssh2-conduit - libsystemd-daemon From 381f4d1aab048162d2becdd1ecced1ac0829402a Mon Sep 17 00:00:00 2001 From: Victor Nawothnig Date: Tue, 25 Aug 2020 13:34:20 +0200 Subject: [PATCH 2/3] Update pkgs/development/haskell-modules/configuration-common.nix Co-authored-by: Dennis Gosnell --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1970efca80c..66340a8b2c1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1331,7 +1331,7 @@ self: super: { monad-dijkstra = dontCheck (doJailbreak super.monad-dijkstra); libsodium = overrideCabal super.libsodium (drv: { - libraryToolDepends = drv.libraryToolDepends or [self.c2hs]; + libraryToolDepends = (drv.libraryToolDepends or []) ++ [self.c2hs]; }); # https://github.com/kowainik/policeman/issues/57 From 68a6c74c3b2c7a44fb0623f7c3ca0c2352dd9e00 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Aug 2020 20:27:35 +0200 Subject: [PATCH 3/3] document motivation for the changes in the previous commit Co-authored-by: Dennis Gosnell --- pkgs/development/haskell-modules/configuration-common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 66340a8b2c1..f98d358f3a7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1330,6 +1330,8 @@ self: super: { # https://github.com/ennocramer/monad-dijkstra/issues/4 monad-dijkstra = dontCheck (doJailbreak super.monad-dijkstra); + # Fixed upstream but not released to Hackage yet: + # https://github.com/k0001/hs-libsodium/issues/2 libsodium = overrideCabal super.libsodium (drv: { libraryToolDepends = (drv.libraryToolDepends or []) ++ [self.c2hs]; });