haskellPackages.hnix: remove obsolete patch and overrides
This commit is contained in:
Naïm Favier
parent
0ae13741a8
commit
0a686c36f1
@ -477,13 +477,9 @@ self: super: {
|
||||
matterhorn = doJailbreak super.matterhorn;
|
||||
|
||||
# 2020-06-05: HACK: does not pass own build suite - `dontCheck`
|
||||
# 2022-11-24: jailbreak as it has too strict bounds on a bunch of things
|
||||
# 2023-07-26: Cherry-pick GHC 9.4 changes from hnix master branch
|
||||
hnix = appendPatches [
|
||||
./patches/hnix-compat-for-ghc-9.4.patch
|
||||
] (dontCheck (doJailbreak super.hnix));
|
||||
hnix = dontCheck super.hnix;
|
||||
|
||||
# Too strict bounds on algebraic-graphs and bytestring
|
||||
# Too strict bounds on algebraic-graphs
|
||||
# https://github.com/haskell-nix/hnix-store/issues/180
|
||||
hnix-store-core = doJailbreak super.hnix-store-core;
|
||||
|
||||
|
||||
@ -33,9 +33,7 @@ default-package-overrides:
|
||||
# Downgrade hasql-dynamic-statements until hasql 1.6 is in Stackage
|
||||
- hasql-dynamic-statements < 0.3.1.2
|
||||
- rope-utf16-splay < 0.4.0.0
|
||||
# hnix < 0.17 (unreleased) needs hnix-store-* 0.5.*
|
||||
- hnix-store-core == 0.5.0.0 # 2022-06-17: Until hnix 0.17
|
||||
- hnix-store-remote == 0.5.0.0 # 2022-06-17: Until hnix 0.17
|
||||
- hnix-store-core < 0.7 # 2023-12-07: required by hnix-store-remote 0.6
|
||||
|
||||
# 2023-04-22: For dhall < 1.42 compatibility
|
||||
- dhall-nixpkgs == 1.0.9
|
||||
|
||||
@ -1095,7 +1095,6 @@ self: super: builtins.intersectAttrs super {
|
||||
'';
|
||||
}) (lib.pipe
|
||||
(super.cachix.override {
|
||||
hnix-store-core = self.hnix-store-core_0_7_0_0;
|
||||
nix = self.hercules-ci-cnix-store.nixPackage;
|
||||
})
|
||||
[
|
||||
|
||||
@ -151102,26 +151102,25 @@ self: {
|
||||
, base16-bytestring, base64-bytestring, binary, bytestring, cereal
|
||||
, containers, cryptonite, directory, filepath, hashable, hspec
|
||||
, lifted-base, memory, monad-control, mtl, nix-derivation, process
|
||||
, saltine, tasty, tasty-discover, tasty-golden, tasty-hspec
|
||||
, relude, saltine, tasty, tasty-discover, tasty-golden, tasty-hspec
|
||||
, tasty-hunit, tasty-quickcheck, temporary, text, time, unix
|
||||
, unordered-containers, vector
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "hnix-store-core";
|
||||
version = "0.5.0.0";
|
||||
sha256 = "1w5qmk7qhasv2qydrhg3g5x9s2pjf5602w084lj1zbman44phzv5";
|
||||
revision = "2";
|
||||
editedCabalFile = "0iy7h66fqpg3glssywn1ag7a4mcmgnqn9xfhid1jyxnzqhllf20n";
|
||||
version = "0.6.1.0";
|
||||
sha256 = "1bziw2avcahqn2fpzw40s74kdw9wjvcplp6r2zrg83rbh2k1x73p";
|
||||
libraryHaskellDepends = [
|
||||
algebraic-graphs attoparsec base base16-bytestring
|
||||
base64-bytestring bytestring cereal containers cryptonite directory
|
||||
filepath hashable lifted-base memory monad-control mtl
|
||||
nix-derivation saltine text time unix unordered-containers vector
|
||||
nix-derivation relude saltine text time unix unordered-containers
|
||||
vector
|
||||
];
|
||||
testHaskellDepends = [
|
||||
attoparsec base base16-bytestring base64-bytestring binary
|
||||
bytestring containers cryptonite directory filepath hspec process
|
||||
tasty tasty-golden tasty-hspec tasty-hunit tasty-quickcheck
|
||||
relude tasty tasty-golden tasty-hspec tasty-hunit tasty-quickcheck
|
||||
temporary text unix
|
||||
];
|
||||
testToolDepends = [ tasty-discover ];
|
||||
@ -151169,27 +151168,6 @@ self: {
|
||||
}) {};
|
||||
|
||||
"hnix-store-remote" = callPackage
|
||||
({ mkDerivation, attoparsec, base, binary, bytestring, containers
|
||||
, cryptonite, hnix-store-core, mtl, network, nix-derivation, text
|
||||
, time, unordered-containers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "hnix-store-remote";
|
||||
version = "0.5.0.0";
|
||||
sha256 = "0xvqi1l84ic249qf566vz3pxv75qwgc5d2cf3grh3rcxchp12kf9";
|
||||
libraryHaskellDepends = [
|
||||
attoparsec base binary bytestring containers cryptonite
|
||||
hnix-store-core mtl network nix-derivation text time
|
||||
unordered-containers
|
||||
];
|
||||
description = "Remote hnix store";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [
|
||||
lib.maintainers.Anton-Latukha lib.maintainers.sorki
|
||||
];
|
||||
}) {};
|
||||
|
||||
"hnix-store-remote_0_6_0_0" = callPackage
|
||||
({ mkDerivation, attoparsec, base, binary, bytestring, containers
|
||||
, cryptonite, hnix-store-core, mtl, network, nix-derivation, relude
|
||||
, text, time, unordered-containers
|
||||
@ -151205,7 +151183,6 @@ self: {
|
||||
];
|
||||
description = "Remote hnix store";
|
||||
license = lib.licenses.asl20;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
maintainers = [
|
||||
lib.maintainers.Anton-Latukha lib.maintainers.sorki
|
||||
];
|
||||
|
||||
@ -1,79 +0,0 @@
|
||||
From daae423d339e820e3fe8c720bd568cc49eae3fde Mon Sep 17 00:00:00 2001
|
||||
From: Rodney Lorrimar <dev@rodney.id.au>
|
||||
Date: Tue, 25 Jul 2023 16:46:36 +0800
|
||||
Subject: [PATCH] GHC 9.4 compatibility
|
||||
|
||||
This is commit b89eed9 from haskell-nix/hnix master branch,
|
||||
backported to 0.16.
|
||||
|
||||
The patch should be removed once hnix-0.17 is released.
|
||||
|
||||
---
|
||||
src/Nix/Fresh.hs | 2 +-
|
||||
src/Nix/Lint.hs | 2 +-
|
||||
src/Nix/Utils.hs | 2 +-
|
||||
src/Nix/Value.hs | 2 +-
|
||||
4 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/Nix/Fresh.hs b/src/Nix/Fresh.hs
|
||||
index fdd20c4a..4b55de4e 100644
|
||||
--- a/src/Nix/Fresh.hs
|
||||
+++ b/src/Nix/Fresh.hs
|
||||
@@ -14,7 +14,7 @@ import Control.Monad.Catch ( MonadCatch
|
||||
, MonadMask
|
||||
, MonadThrow
|
||||
)
|
||||
-import Control.Monad.Except ( MonadFix )
|
||||
+import Control.Monad.Fix ( MonadFix )
|
||||
import Control.Monad.Ref ( MonadAtomicRef(..)
|
||||
, MonadRef(Ref)
|
||||
)
|
||||
diff --git a/src/Nix/Lint.hs b/src/Nix/Lint.hs
|
||||
index 2c207c91..3da8c298 100644
|
||||
--- a/src/Nix/Lint.hs
|
||||
+++ b/src/Nix/Lint.hs
|
||||
@@ -498,7 +498,7 @@ instance MonadThrow (Lint s) where
|
||||
throwM e = Lint $ ReaderT $ const (throw e)
|
||||
|
||||
instance MonadCatch (Lint s) where
|
||||
- catch _m _h = Lint $ ReaderT $ const (fail "Cannot catch in 'Lint s'")
|
||||
+ catch _m _h = Lint $ ReaderT $ const (error "Cannot catch in 'Lint s'")
|
||||
|
||||
runLintM :: Options -> Lint s a -> ST s a
|
||||
runLintM opts action =
|
||||
diff --git a/src/Nix/Utils.hs b/src/Nix/Utils.hs
|
||||
index 8f53b3a7..af370c21 100644
|
||||
--- a/src/Nix/Utils.hs
|
||||
+++ b/src/Nix/Utils.hs
|
||||
@@ -67,6 +67,7 @@ import Relude hiding ( pass
|
||||
import Data.Binary ( Binary )
|
||||
import Data.Data ( Data )
|
||||
import Codec.Serialise ( Serialise )
|
||||
+import Control.Monad ( foldM )
|
||||
import Control.Monad.Fix ( MonadFix(..) )
|
||||
import Control.Monad.Free ( Free(..) )
|
||||
import Control.Monad.Trans.Control ( MonadTransControl(..) )
|
||||
@@ -84,7 +85,6 @@ import Lens.Family2.Stock ( _1
|
||||
, _2
|
||||
)
|
||||
import qualified System.FilePath as FilePath
|
||||
-import Control.Monad.List (foldM)
|
||||
|
||||
#if ENABLE_TRACING
|
||||
import qualified Relude.Debug as X
|
||||
diff --git a/src/Nix/Value.hs b/src/Nix/Value.hs
|
||||
index aafdc25a..28b9508c 100644
|
||||
--- a/src/Nix/Value.hs
|
||||
+++ b/src/Nix/Value.hs
|
||||
@@ -554,7 +554,7 @@ liftNValue
|
||||
=> (forall x . u m x -> m x)
|
||||
-> NValue t f m
|
||||
-> NValue t f (u m)
|
||||
-liftNValue = (`hoistNValue` lift)
|
||||
+liftNValue f = hoistNValue f lift
|
||||
|
||||
|
||||
-- *** MonadTransUnlift
|
||||
--
|
||||
2.40.1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user