haskellPackages.cabal2nix-unstable: 2022-10-10 -> 2022-10-22
With this hackage2nix knows that libcrypt can no longer be found in glibc, but needs to be taken from libxcrypt. We can trim down the overrides accordingly, leaving only the test failure workaround for crypt-sha512.
This commit is contained in:
sternenseemann
parent
bc44680dee
commit
b167f1bb14
|
|
@ -8,10 +8,10 @@
|
|||
}:
|
||||
mkDerivation {
|
||||
pname = "cabal2nix";
|
||||
version = "unstable-2022-10-10";
|
||||
version = "unstable-2022-10-22";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/b3ae6f9240d07ba103f1eb7ab22f6055e9cdb7dc.tar.gz";
|
||||
sha256 = "0ym6lyp4br57442b6a9cg9bczbjqz8nz984rxwiacldqzndk8jbr";
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/bf7cc8f202e332953f7fbfc1d90490e4c197d287.tar.gz";
|
||||
sha256 = "0fmpfl2nl215aids9yxdmdik77w7cppk900rnx23m07rmwg4xa4f";
|
||||
};
|
||||
postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
|
||||
isLibrary = true;
|
||||
|
|
|
|||
|
|
@ -2544,32 +2544,9 @@ self: super: {
|
|||
# Remove once version 1.* is released
|
||||
monad-bayes = doJailbreak super.monad-bayes;
|
||||
|
||||
crypt-sha512 = overrideCabal (drv: {
|
||||
librarySystemDepends = [
|
||||
pkgs.libxcrypt
|
||||
];
|
||||
# Test failure after libxcrypt migration, reported upstrem at
|
||||
# https://github.com/phadej/crypt-sha512/issues/13
|
||||
doCheck = false;
|
||||
}) super.crypt-sha512;
|
||||
|
||||
nano-cryptr = overrideCabal (drv: {
|
||||
librarySystemDepends = [
|
||||
pkgs.libxcrypt
|
||||
];
|
||||
}) super.nano-cryptr;
|
||||
|
||||
Unixutils = overrideCabal (drv: {
|
||||
librarySystemDepends = [
|
||||
pkgs.libxcrypt
|
||||
];
|
||||
}) super.Unixutils;
|
||||
|
||||
xmonad-utils = overrideCabal (drv: {
|
||||
librarySystemDepends = [
|
||||
pkgs.libxcrypt
|
||||
];
|
||||
}) super.xmonad-utils;
|
||||
# Test failure after libxcrypt migration, reported upstrem at
|
||||
# https://github.com/phadej/crypt-sha512/issues/13
|
||||
crypt-sha512 = dontCheck super.crypt-sha512;
|
||||
|
||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super // (let
|
||||
# We need to build purescript with these dependencies and thus also its reverse
|
||||
|
|
|
|||
|
|
@ -5643,10 +5643,10 @@ self: {
|
|||
|
||||
"EtaMOO" = callPackage
|
||||
({ mkDerivation, array, async, base, bytestring, case-insensitive
|
||||
, containers, cryptonite, hashable, haskeline, memory, mtl, network
|
||||
, parsec, pcre, pipes, pipes-bytestring, pipes-concurrency
|
||||
, pipes-network, random, stm, stm-chans, text, time, transformers
|
||||
, unix, unordered-containers, vcache, vector
|
||||
, containers, cryptonite, hashable, haskeline, libxcrypt, memory
|
||||
, mtl, network, parsec, pcre, pipes, pipes-bytestring
|
||||
, pipes-concurrency, pipes-network, random, stm, stm-chans, text
|
||||
, time, transformers, unix, unordered-containers, vcache, vector
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "EtaMOO";
|
||||
|
|
@ -5660,12 +5660,13 @@ self: {
|
|||
pipes-concurrency pipes-network random stm stm-chans text time
|
||||
transformers unix unordered-containers vcache vector
|
||||
];
|
||||
executableSystemDepends = [ libxcrypt ];
|
||||
executablePkgconfigDepends = [ pcre ];
|
||||
description = "A new implementation of the LambdaMOO server";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
mainProgram = "etamoo";
|
||||
}) {inherit (pkgs) pcre;};
|
||||
}) {inherit (pkgs) libxcrypt; inherit (pkgs) pcre;};
|
||||
|
||||
"Etage" = callPackage
|
||||
({ mkDerivation, base, containers, ghc, mtl, operational, random
|
||||
|
|
@ -21230,7 +21231,8 @@ self: {
|
|||
|
||||
"Unixutils" = callPackage
|
||||
({ mkDerivation, base, bytestring, directory, exceptions, filepath
|
||||
, mtl, process, process-extras, pureMD5, regex-tdfa, unix, zlib
|
||||
, libxcrypt, mtl, process, process-extras, pureMD5, regex-tdfa
|
||||
, unix, zlib
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "Unixutils";
|
||||
|
|
@ -21242,9 +21244,10 @@ self: {
|
|||
base bytestring directory exceptions filepath mtl process
|
||||
process-extras pureMD5 regex-tdfa unix zlib
|
||||
];
|
||||
librarySystemDepends = [ libxcrypt ];
|
||||
description = "A crude interface between Haskell and Unix-like operating systems";
|
||||
license = lib.licenses.bsd3;
|
||||
}) {};
|
||||
}) {inherit (pkgs) libxcrypt;};
|
||||
|
||||
"Unixutils-shadow" = callPackage
|
||||
({ mkDerivation, base, unix }:
|
||||
|
|
@ -70511,7 +70514,8 @@ self: {
|
|||
|
||||
"crypt-sha512" = callPackage
|
||||
({ mkDerivation, attoparsec, base, bytestring, cryptohash-sha512
|
||||
, quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck
|
||||
, libxcrypt, quickcheck-instances, tasty, tasty-hunit
|
||||
, tasty-quickcheck
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "crypt-sha512";
|
||||
|
|
@ -70526,9 +70530,10 @@ self: {
|
|||
base bytestring quickcheck-instances tasty tasty-hunit
|
||||
tasty-quickcheck
|
||||
];
|
||||
testSystemDepends = [ libxcrypt ];
|
||||
description = "Pure Haskell implelementation for GNU SHA512 crypt algorithm";
|
||||
license = lib.licenses.bsd3;
|
||||
}) {};
|
||||
}) {inherit (pkgs) libxcrypt;};
|
||||
|
||||
"crypto-api" = callPackage
|
||||
({ mkDerivation, base, bytestring, cereal, entropy, tagged
|
||||
|
|
@ -123514,11 +123519,11 @@ self: {
|
|||
, base16-bytestring, base64-bytestring, binary, blaze-builder
|
||||
, bytestring, Cabal, cereal, containers, crypto-api, csv, deepseq
|
||||
, directory, filepath, happstack-server, happy, HaXml, hscolour
|
||||
, hslogger, HStringTemplate, HTTP, lifted-base, mime-mail, mtl
|
||||
, network, old-locale, parsec, pretty, process, pureMD5, QuickCheck
|
||||
, random, rss, safecopy, snowball, split, stm, tar, text, time
|
||||
, tokenize, transformers, unix, unordered-containers, vector, xhtml
|
||||
, xml, zlib
|
||||
, hslogger, HStringTemplate, HTTP, libxcrypt, lifted-base
|
||||
, mime-mail, mtl, network, old-locale, parsec, pretty, process
|
||||
, pureMD5, QuickCheck, random, rss, safecopy, snowball, split, stm
|
||||
, tar, text, time, tokenize, transformers, unix
|
||||
, unordered-containers, vector, xhtml, xml, zlib
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "hackage-server";
|
||||
|
|
@ -123537,6 +123542,7 @@ self: {
|
|||
time tokenize transformers unix unordered-containers vector xhtml
|
||||
zlib
|
||||
];
|
||||
executableSystemDepends = [ libxcrypt ];
|
||||
executableToolDepends = [ alex happy ];
|
||||
testHaskellDepends = [
|
||||
aeson base base64-bytestring bytestring Cabal directory filepath
|
||||
|
|
@ -123547,7 +123553,7 @@ self: {
|
|||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
broken = true;
|
||||
}) {};
|
||||
}) {inherit (pkgs) libxcrypt;};
|
||||
|
||||
"hackage-sparks" = callPackage
|
||||
({ mkDerivation, base, bytestring, directory, download, filepath
|
||||
|
|
@ -199708,7 +199714,7 @@ self: {
|
|||
}) {};
|
||||
|
||||
"nano-cryptr" = callPackage
|
||||
({ mkDerivation, base, bytestring, HUnit, test-framework
|
||||
({ mkDerivation, base, bytestring, HUnit, libxcrypt, test-framework
|
||||
, test-framework-hunit, test-framework-quickcheck2
|
||||
}:
|
||||
mkDerivation {
|
||||
|
|
@ -199716,13 +199722,14 @@ self: {
|
|||
version = "0.2.1";
|
||||
sha256 = "00c0niyjhkcv942vhm775jml3frhj0i3svgj9xxy0hnfb3nawvjb";
|
||||
libraryHaskellDepends = [ base bytestring ];
|
||||
librarySystemDepends = [ libxcrypt ];
|
||||
testHaskellDepends = [
|
||||
base bytestring HUnit test-framework test-framework-hunit
|
||||
test-framework-quickcheck2
|
||||
];
|
||||
description = "A threadsafe binding to glibc's crypt_r function";
|
||||
license = lib.licenses.bsd3;
|
||||
}) {};
|
||||
}) {inherit (pkgs) libxcrypt;};
|
||||
|
||||
"nano-erl" = callPackage
|
||||
({ mkDerivation, base, stm }:
|
||||
|
|
@ -311651,7 +311658,7 @@ self: {
|
|||
}) {};
|
||||
|
||||
"xmonad-utils" = callPackage
|
||||
({ mkDerivation, base, ghc, random, unix, X11 }:
|
||||
({ mkDerivation, base, ghc, libxcrypt, random, unix, X11 }:
|
||||
mkDerivation {
|
||||
pname = "xmonad-utils";
|
||||
version = "0.1.3.3";
|
||||
|
|
@ -311659,9 +311666,10 @@ self: {
|
|||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
executableHaskellDepends = [ base ghc random unix X11 ];
|
||||
executableSystemDepends = [ libxcrypt ];
|
||||
description = "A small collection of X utilities";
|
||||
license = lib.licenses.bsd3;
|
||||
}) {};
|
||||
}) {inherit (pkgs) libxcrypt;};
|
||||
|
||||
"xmonad-vanessa" = callPackage
|
||||
({ mkDerivation, alsa-mixer, base, composition-prelude, containers
|
||||
|
|
|
|||
Loading…
Reference in a new issue