Merge pull request #129634 from Anton-Latukha/haskellPackages.upd-hnix-0.14
haskellPackages: allow hnix-store-{core,remote} 0.5
This commit is contained in:
Gabriel Gonzalez
GitHub
commit
c2b276292a
4 changed files with 18 additions and 96 deletions
|
|
@ -178,48 +178,13 @@ self: super: {
|
|||
digit = doJailbreak super.digit;
|
||||
|
||||
hnix = generateOptparseApplicativeCompletion "hnix"
|
||||
(overrideCabal super.hnix (drv: {
|
||||
(overrideCabal (super.hnix.override {
|
||||
# needs newer version of relude and semialign than stackage has
|
||||
relude = self.relude_1_0_0_1;
|
||||
semialign = self.semialign_1_2;
|
||||
}) (drv: {
|
||||
# 2020-06-05: HACK: does not pass own build suite - `dontCheck`
|
||||
doCheck = false;
|
||||
# 2021-05-12: Revert a few dependency cleanups which depend on release
|
||||
# that are not in stackage yet:
|
||||
# * Depend on semialign-indexed for Data.Semialign.Indexed
|
||||
# (remove when semialign >= 1.2 in stackage)
|
||||
# * Readd dependencies to text and unordered-containers.
|
||||
# (remove when relude >= 1.0.0.0 is in stackage, see
|
||||
# https://github.com/haskell-nix/hnix/issues/933)
|
||||
libraryHaskellDepends = [
|
||||
self.semialign-indexed
|
||||
] ++ drv.libraryHaskellDepends;
|
||||
patches = [
|
||||
# depend on semialign-indexed again
|
||||
(pkgs.fetchpatch {
|
||||
url = "https://github.com/haskell-nix/hnix/commit/16fc342a4f2974f855968472252cd9274609f177.patch";
|
||||
sha256 = "0gm4gy3jpn4dqnrhnqlsavfpw9c1j1xa8002v54knnlw6vpk9niy";
|
||||
revert = true;
|
||||
})
|
||||
# depend on text again
|
||||
(pkgs.fetchpatch {
|
||||
url = "https://github.com/haskell-nix/hnix/commit/73057618576e86bb87dfd42f62b855d24bbdf469.patch";
|
||||
sha256 = "03cyk96d5ad362i1pnz9bs8ifr84kpv8phnr628gys4j6a0bqwzc";
|
||||
revert = true;
|
||||
})
|
||||
# depend on unordered-containers again
|
||||
(pkgs.fetchpatch {
|
||||
url = "https://github.com/haskell-nix/hnix/commit/70643481883ed448b51221a030a76026fb5eb731.patch";
|
||||
sha256 = "0pqmijfkysjixg3gb4kmrqdif7s2saz8qi6k337jf15i0npzln8d";
|
||||
revert = true;
|
||||
})
|
||||
# allow relude < 1.0 again
|
||||
(pkgs.fetchpatch {
|
||||
url = "https://github.com/haskell-nix/hnix/commit/f4ea5dcb344369916586498ba33c00d0fc605a79.patch";
|
||||
sha256 = "1ajl7d49d658xhalgf3pc5svmbq73dsysy6z434n75vb1357mx86";
|
||||
revert = true;
|
||||
})
|
||||
] ++ (drv.patches or []);
|
||||
# make sure patches are not broken by cabal file revisions
|
||||
revision = null;
|
||||
editedCabalFile = null;
|
||||
}));
|
||||
|
||||
# Fails for non-obvious reasons while attempting to use doctest.
|
||||
|
|
@ -1950,4 +1915,8 @@ EOT
|
|||
assert pkgs.lib.versionOlder self.hspec.version "2.8.2";
|
||||
doJailbreak super.graphql;
|
||||
|
||||
# Too strict bounds on hnix
|
||||
# https://github.com/Synthetica9/nix-linter/issues/56
|
||||
nix-linter = doJailbreak super.nix-linter;
|
||||
|
||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
||||
|
|
|
|||
|
|
@ -85,9 +85,6 @@ default-package-overrides:
|
|||
- dual-tree < 0.2.3.0
|
||||
- diagrams-core < 1.5.0
|
||||
- diagrams-lib < 1.4.4
|
||||
# 2021-06-14: hnix still needs old versions https://github.com/haskell-nix/hnix/issues/952
|
||||
- hnix-store-core < 0.5
|
||||
- hnix-store-remote < 0.5
|
||||
|
||||
extra-packages:
|
||||
- base16-bytestring < 1 # required for cabal-install etc.
|
||||
|
|
@ -119,6 +116,10 @@ extra-packages:
|
|||
package-maintainers:
|
||||
abbradar:
|
||||
- Agda
|
||||
Anton-Latukha:
|
||||
- hnix
|
||||
- hnix-store-core
|
||||
- hnix-store-remote
|
||||
berberman:
|
||||
- nvfetcher
|
||||
- arch-web
|
||||
|
|
|
|||
|
|
@ -131701,41 +131701,10 @@ self: {
|
|||
];
|
||||
description = "Haskell implementation of the Nix language";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ Anton-Latukha ];
|
||||
}) {};
|
||||
|
||||
"hnix-store-core" = callPackage
|
||||
({ mkDerivation, algebraic-graphs, attoparsec, base
|
||||
, base16-bytestring, base64-bytestring, binary, bytestring, cereal
|
||||
, containers, cryptohash-md5, cryptohash-sha1, cryptohash-sha256
|
||||
, cryptohash-sha512, directory, filepath, hashable, hspec
|
||||
, lifted-base, monad-control, mtl, nix-derivation, process, 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.4.3.0";
|
||||
sha256 = "17l7198s3dzjx416nplinyghbqgignvpvxkww241gjv4p23izf77";
|
||||
libraryHaskellDepends = [
|
||||
algebraic-graphs attoparsec base base16-bytestring
|
||||
base64-bytestring bytestring cereal containers cryptohash-md5
|
||||
cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 directory
|
||||
filepath hashable lifted-base monad-control mtl nix-derivation
|
||||
saltine text time unix unordered-containers vector
|
||||
];
|
||||
testHaskellDepends = [
|
||||
attoparsec base base16-bytestring base64-bytestring binary
|
||||
bytestring containers directory filepath hspec process tasty
|
||||
tasty-golden tasty-hspec tasty-hunit tasty-quickcheck temporary
|
||||
text unix
|
||||
];
|
||||
testToolDepends = [ tasty-discover ];
|
||||
description = "Core effects for interacting with the Nix store";
|
||||
license = lib.licenses.asl20;
|
||||
}) {};
|
||||
|
||||
"hnix-store-core_0_5_0_0" = callPackage
|
||||
({ mkDerivation, algebraic-graphs, attoparsec, base
|
||||
, base16-bytestring, base64-bytestring, binary, bytestring, cereal
|
||||
, containers, cryptonite, directory, filepath, hashable, hspec
|
||||
|
|
@ -131765,27 +131734,10 @@ self: {
|
|||
testToolDepends = [ tasty-discover ];
|
||||
description = "Core effects for interacting with the Nix store";
|
||||
license = lib.licenses.asl20;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
maintainers = with lib.maintainers; [ Anton-Latukha ];
|
||||
}) {};
|
||||
|
||||
"hnix-store-remote" = callPackage
|
||||
({ mkDerivation, attoparsec, base, binary, bytestring, containers
|
||||
, hnix-store-core, mtl, network, nix-derivation, text, time
|
||||
, unordered-containers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "hnix-store-remote";
|
||||
version = "0.4.3.1";
|
||||
sha256 = "1wp6z5f13fkgh3mdzr1zcqdvsx1j90l5isf671gsg43brsv4c2vl";
|
||||
libraryHaskellDepends = [
|
||||
attoparsec base binary bytestring containers hnix-store-core mtl
|
||||
network nix-derivation text time unordered-containers
|
||||
];
|
||||
description = "Remote hnix store";
|
||||
license = lib.licenses.asl20;
|
||||
}) {};
|
||||
|
||||
"hnix-store-remote_0_5_0_0" = callPackage
|
||||
({ mkDerivation, attoparsec, base, binary, bytestring, containers
|
||||
, cryptonite, hnix-store-core, mtl, network, nix-derivation, text
|
||||
, time, unordered-containers
|
||||
|
|
@ -131801,7 +131753,7 @@ self: {
|
|||
];
|
||||
description = "Remote hnix store";
|
||||
license = lib.licenses.asl20;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
maintainers = with lib.maintainers; [ Anton-Latukha ];
|
||||
}) {};
|
||||
|
||||
"hnn" = callPackage
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "nix-linter-unstable";
|
||||
version = "2021-06-16";
|
||||
pname = "nix-linter";
|
||||
version = "unstable-2021-06-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Synthetica9";
|
||||
|
|
|
|||
Loading…
Reference in a new issue