haskellPackages.hnix: 0.14.0.8 -> 0.16

0.14 doesn't seem to be buildable with LTS 20 / GHC 9.2, so we'll have to
try and upgrade. I've also downgraded hnix-store* globally mostly because
it was kind of silly to have them on latest before – those packages are
not really used independently of hnix.
This commit is contained in:
sternenseemann 2022-11-24 16:06:53 +01:00
parent 747179fd72
commit 21c4d08cd6
3 changed files with 13 additions and 78 deletions

View file

@ -249,16 +249,11 @@ self: super: {
}));
# 2020-06-05: HACK: does not pass own build suite - `dontCheck`
# 2022-06-17: Use hnix-store 0.5 until hnix 0.17
hnix = self.generateOptparseApplicativeCompletions [ "hnix" ] (dontCheck (
super.hnix.overrideScope (hself: hsuper: {
hnix-store-core = hself.hnix-store-core_0_5_0_0;
hnix-store-remote = hself.hnix-store-remote_0_5_0_0;
})
));
# Too strict bounds on algebraic-graphs
# 2022-11-24: jailbreak as it has too strict bounds on a bunch of things
hnix = self.generateOptparseApplicativeCompletions [ "hnix" ] (dontCheck (doJailbreak super.hnix));
# Too strict bounds on algebraic-graphs and bytestring
# https://github.com/haskell-nix/hnix-store/issues/180
hnix-store-core_0_5_0_0 = doJailbreak super.hnix-store-core_0_5_0_0;
hnix-store-core = doJailbreak super.hnix-store-core;
# Too strict upper bound on bytestring
# https://github.com/wangbj/hashing/issues/3

View file

@ -78,9 +78,6 @@ default-package-overrides:
- ghc-bignum == 1.0
# 1.2.0.0: “Dropped support for GHC <9.2 (might readd it later)”
- retrie < 1.2.0.0
# On the recommendation of hnix author:
# https://github.com/NixOS/nixpkgs/pull/154461#issuecomment-1015511883
- hnix < 0.15
# needs http-client >= 0.7.11 which isn't part of Stackage LTS 18
- http-client-restricted < 0.0.5
# patch is primarily used by reflex packages not all of which are patch 0.0.7 compatible yet
@ -92,6 +89,9 @@ default-package-overrides:
# Its dependency brick >= 1.0 is not yet in stackage
- brick-skylighting < 1.0
- 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
extra-packages:
- Cabal == 2.2.* # required for jailbreak-cabal etc.
@ -134,8 +134,6 @@ extra-packages:
- hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29
- hlint == 3.2.8 # 2022-09-21: needed for hls on ghc 8.8
- hlint == 3.4.1 # 2022-09-21: needed for hls with ghc-lib-parser 9.2
- 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
- hpack == 0.35.0 # 2022-09-29: Needed for stack-2.9.1
- hspec < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
- hspec-core < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6

View file

@ -141278,63 +141278,6 @@ self: {
}) {inherit (pkgs) netcdf;};
"hnix" = callPackage
({ mkDerivation, aeson, array, base, base16-bytestring, binary
, bytestring, comonad, containers, criterion, cryptonite, data-fix
, deepseq, deriving-compat, Diff, directory, exceptions, filepath
, free, gitrev, Glob, hashable, hashing, haskeline, hedgehog
, hnix-store-core, hnix-store-remote, http-client, http-client-tls
, http-types, lens-family, lens-family-core, lens-family-th, logict
, megaparsec, monad-control, monadlist, mtl, neat-interpolation
, optparse-applicative, parser-combinators, pretty-show
, prettyprinter, process, ref-tf, regex-tdfa, relude, repline
, scientific, semialign, serialise, some, split, syb, tasty
, tasty-hedgehog, tasty-hunit, tasty-th, template-haskell, text
, th-lift-instances, these, time, transformers, transformers-base
, unix, unordered-containers, vector, xml
}:
mkDerivation {
pname = "hnix";
version = "0.14.0.8";
sha256 = "101zbbrqs3fv1kxp428r97pq59fa6g0qkj1bqnsfchv4mxizg8jc";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson array base base16-bytestring binary bytestring comonad
containers cryptonite data-fix deepseq deriving-compat directory
exceptions filepath free gitrev hashable hashing hnix-store-core
hnix-store-remote http-client http-client-tls http-types
lens-family lens-family-core lens-family-th logict megaparsec
monad-control monadlist mtl neat-interpolation optparse-applicative
parser-combinators pretty-show prettyprinter process ref-tf
regex-tdfa relude scientific semialign serialise some split syb
template-haskell text th-lift-instances these time transformers
transformers-base unix unordered-containers vector xml
];
executableHaskellDepends = [
aeson base comonad containers data-fix deepseq exceptions filepath
free haskeline optparse-applicative pretty-show prettyprinter
ref-tf relude repline serialise template-haskell time
];
testHaskellDepends = [
base containers data-fix Diff directory exceptions filepath Glob
hedgehog megaparsec neat-interpolation optparse-applicative
pretty-show prettyprinter process relude serialise split tasty
tasty-hedgehog tasty-hunit tasty-th template-haskell time unix
];
benchmarkHaskellDepends = [
base criterion data-fix exceptions filepath optparse-applicative
relude serialise template-haskell time
];
description = "Haskell implementation of the Nix language";
license = lib.licenses.bsd3;
mainProgram = "hnix";
maintainers = [
lib.maintainers.Anton-Latukha lib.maintainers.sorki
];
}) {};
"hnix_0_16_0" = callPackage
({ mkDerivation, aeson, array, base, base16-bytestring, binary
, bytestring, comonad, containers, criterion, cryptonite, data-fix
, deepseq, deriving-compat, Diff, directory, exceptions, filepath
@ -141385,14 +141328,13 @@ self: {
];
description = "Haskell implementation of the Nix language";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
mainProgram = "hnix";
maintainers = [
lib.maintainers.Anton-Latukha lib.maintainers.sorki
];
}) {};
"hnix-store-core_0_5_0_0" = callPackage
"hnix-store-core" = callPackage
({ mkDerivation, algebraic-graphs, attoparsec, base
, base16-bytestring, base64-bytestring, binary, bytestring, cereal
, containers, cryptonite, directory, filepath, hashable, hspec
@ -141422,13 +141364,12 @@ self: {
testToolDepends = [ tasty-discover ];
description = "Core effects for interacting with the Nix store";
license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
maintainers = [
lib.maintainers.Anton-Latukha lib.maintainers.sorki
];
}) {};
"hnix-store-core" = callPackage
"hnix-store-core_0_6_0_0" = callPackage
({ mkDerivation, algebraic-graphs, attoparsec, base
, base16-bytestring, base64-bytestring, binary, bytestring, cereal
, containers, cryptonite, directory, filepath, hashable, hspec
@ -141457,12 +141398,13 @@ self: {
testToolDepends = [ tasty-discover ];
description = "Core effects for interacting with the Nix store";
license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
maintainers = [
lib.maintainers.Anton-Latukha lib.maintainers.sorki
];
}) {};
"hnix-store-remote_0_5_0_0" = callPackage
"hnix-store-remote" = callPackage
({ mkDerivation, attoparsec, base, binary, bytestring, containers
, cryptonite, hnix-store-core, mtl, network, nix-derivation, text
, time, unordered-containers
@ -141478,13 +141420,12 @@ self: {
];
description = "Remote hnix store";
license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
maintainers = [
lib.maintainers.Anton-Latukha lib.maintainers.sorki
];
}) {};
"hnix-store-remote" = callPackage
"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
@ -141500,6 +141441,7 @@ self: {
];
description = "Remote hnix store";
license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
maintainers = [
lib.maintainers.Anton-Latukha lib.maintainers.sorki
];