From 0f888c712101596ce618a60f3a4d7d35076bf8f1 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Thu, 31 Dec 2020 02:28:32 +0200 Subject: haskellPackages.cryptohash-sha512: dontCheck base16-bytestring had new epoch (1.0) 3 month ago: https://hackage.haskell.org/package/base16-bytestring-1.0.1.0/changelog Which fixed the old return type to normal `Either String ByteString`. `cryptohash-sha512` is stale for ~10-11 months and testsuite does not suport the new `base16-bytesting` releases. --- .../haskell-modules/configuration-common.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 05740979b8a..6d2b3264b6f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -805,11 +805,20 @@ self: super: { # Needs QuickCheck <2.10, HUnit <1.6 and base <4.10 pointfree = doJailbreak super.pointfree; - # Depends on base <4.12 - # See https://github.com/haskell-hvr/cryptohash-sha512/pull/3 - # , https://github.com/haskell-hvr/cryptohash-sha512/issues/4 - # and https://github.com/haskell-hvr/cryptohash-sha512/pull/5 - cryptohash-sha512 = doJailbreak super.cryptohash-sha512; + # The project is stale + # + # Archiving request: https://github.com/haskell-hvr/cryptohash-sha512/issues/6 + # + # doJailbreak since base <4.12 && bytestring <0.11 + # Request to support: + # https://github.com/haskell-hvr/cryptohash-sha512/issues/4 + # PRs to support base <4.12: + # https://github.com/haskell-hvr/cryptohash-sha512/pull/3 + # https://github.com/haskell-hvr/cryptohash-sha512/pull/5 + # + # dontCheck since test suite does not support new `base16-bytestring` >= 1 format + # https://github.com/haskell-hvr/cryptohash-sha512/pull/5#issuecomment-752796913 + cryptohash-sha512 = dontCheck (doJailbreak super.cryptohash-sha512); # Depends on tasty < 1.x, which we don't have. cryptohash-sha256 = doJailbreak super.cryptohash-sha256; -- cgit 1.4.1 From 9f4b9b3b50d6ca9a6f209866eaa966b72ec4ef6d Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Thu, 31 Dec 2020 02:44:28 +0200 Subject: haskellPackages.hnix-store-remote: unbreak, fix deps --- pkgs/development/haskell-modules/configuration-common.nix | 9 +++++++++ pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6d2b3264b6f..ac220fe986c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -219,6 +219,15 @@ self: super: { # ghc 8.10. hnix = dontCheck super.hnix; + # 2021-01-07: NOTE: hnix-store-core pinned at ==0.2 in Stackage Nightly. + # https://github.com/haskell-nix/hnix-store/issues/104 + # Until unpin, which may hold off in time due to Stackage maintenence bottleneck + # the 0_4_0_0 is used + hnix-store-remote = (super.hnix-store-remote.override { + hnix-store-core = self.hnix-store-core_0_4_0_0; # at least 1.7 + }); + + # Fails for non-obvious reasons while attempting to use doctest. search = dontCheck super.search; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 90a374363e6..96918a15c57 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -6445,7 +6445,6 @@ broken-packages: - hmt-diagrams - hmumps - hnetcdf - - hnix-store-remote - HNM - hnormalise - ho-rewriting -- cgit 1.4.1 From cfce2908bcf3a23dd13b3f71ce6b4e3aa29ea0bd Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Thu, 7 Jan 2021 22:42:41 +0200 Subject: haskellPackages.hnix: fix deps --- pkgs/development/haskell-modules/configuration-common.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ac220fe986c..56f1078297e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -217,7 +217,15 @@ self: super: { # building of the executable has been disabled for ghc < 8.10 in hnix. # Generating the completions should be activated again, once we default to # ghc 8.10. - hnix = dontCheck super.hnix; + hnix = dontCheck (super.hnix.override { + + # 2021-01-07: NOTE: hnix-store-core pinned at ==0.2 in Stackage Nightly. + # https://github.com/haskell-nix/hnix-store/issues/104 + # Until unpin, which may hold off in time due to Stackage maintenence bottleneck + # the 0_4_0_0 is used + hnix-store-core = self.hnix-store-core_0_4_0_0; # at least 1.7 + + }); # 2021-01-07: NOTE: hnix-store-core pinned at ==0.2 in Stackage Nightly. # https://github.com/haskell-nix/hnix-store/issues/104 -- cgit 1.4.1