cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

haskellPackages.cabal2nix-unstable: 2023-04-11 -> 2023-05-05

Browse source 
This reverts commit 3cb794b0f3 —
cabal2nix has gained knowledge about the `liblzma` pkg-config name.
This commit is contained in:
sternenseemann 2023-05-05 14:46:32 +02:00
parent c933506468
commit 608aa362a0
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/haskell-modules/cabal2nix-unstable.nix
View file

@ -8,10 +8,10 @@
}:
mkDerivation {
pname = "cabal2nix";
version = "unstable-2023-04-11";
version = "unstable-2023-05-05";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/010ff5c3b75d976d0f3a25b7caa0bc5bf2fdae9f.tar.gz";
sha256 = "1n38kmavdv6s1czqbiq6f6nagpv27s8xg0g0rvyh4l0x2my8wj4y";
url = "https://github.com/NixOS/cabal2nix/archive/078350047d358bb450d634d775493aba89b21212.tar.gz";
sha256 = "0rsdn2zyw0zr6pi3dg6cm3i310alppigdsv20iqpx0dzykkicywj";
};
postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
isLibrary = true;

2
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -997,8 +997,6 @@ self: super: builtins.intersectAttrs super {
(overrideCabal { doCheck = pkgs.postgresql.doCheck; })
];
lzma = super.lzma.override { liblzma = pkgs.xz; };
# Wants running postgresql database accessible over ip, so postgresqlTestHook
# won't work (or would need to patch test suite).
domaindriven-core = dontCheck super.domaindriven-core;

8
pkgs/development/haskell-modules/hackage-packages.nix generated
View file

@ -187854,21 +187854,21 @@ self: {
}) {};
"lzma" = callPackage
({ mkDerivation, base, bytestring, HUnit, liblzma, QuickCheck
, tasty, tasty-hunit, tasty-quickcheck
({ mkDerivation, base, bytestring, HUnit, QuickCheck, tasty
, tasty-hunit, tasty-quickcheck, xz
}:
mkDerivation {
pname = "lzma";
version = "0.0.1.0";
sha256 = "0knz0d6456zf6wbqifzcsw2xvdgaqnig2zn96kav7aqn5i4nfbvj";
libraryHaskellDepends = [ base bytestring ];
libraryPkgconfigDepends = [ liblzma ];
libraryPkgconfigDepends = [ xz ];
testHaskellDepends = [
base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
];
description = "LZMA/XZ compression and decompression";
license = lib.licenses.bsd3;
}) {liblzma = null;};
}) {inherit (pkgs) xz;};
"lzma-clib" = callPackage
({ mkDerivation }: