haskellPackages.cabal2nix-unstable: 2022-12-08 -> 2023-01-06

This is mostly to accomodate a possible merge of #209128.
This commit is contained in:
sternenseemann 2023-01-06 15:25:56 +01:00
parent 07123bb23b
commit aa0d300cfd
2 changed files with 8 additions and 8 deletions

View File

@ -8,10 +8,10 @@
}: }:
mkDerivation { mkDerivation {
pname = "cabal2nix"; pname = "cabal2nix";
version = "unstable-2022-12-08"; version = "unstable-2023-01-06";
src = fetchzip { src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/021a48f4b4942462154b06fd81429a248638f87f.tar.gz"; url = "https://github.com/NixOS/cabal2nix/archive/d24f4eab2352468510fb81e276aab9d62e94b561.tar.gz";
sha256 = "1is1q5mqi86vzy3ni2959hr95gs9hwd5wiz92hanfli3infg00xc"; sha256 = "16d3mf4d622gns1myx9mwx39sx0l9wndybxn5ik00x0pxnmh7f36";
}; };
postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
isLibrary = true; isLibrary = true;

View File

@ -8416,7 +8416,7 @@ self: {
libraryHaskellDepends = [ base bytestring unix ]; libraryHaskellDepends = [ base bytestring unix ];
librarySystemDepends = [ fuse ]; librarySystemDepends = [ fuse ];
preConfigure = '' preConfigure = ''
sed -i -e "s@ Extra-Lib-Dirs: /usr/local/lib@ Extra-Lib-Dirs: ${fuse}/lib@" HFuse.cabal sed -i -e "s@ Extra-Lib-Dirs: /usr/local/lib@ Extra-Lib-Dirs: ${lib.getLib fuse}/lib@" HFuse.cabal
''; '';
description = "HFuse is a binding for the Linux FUSE library"; description = "HFuse is a binding for the Linux FUSE library";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
@ -111733,7 +111733,7 @@ self: {
]; ];
libraryPkgconfigDepends = [ cairo ]; libraryPkgconfigDepends = [ cairo ];
preCompileBuildDriver = '' preCompileBuildDriver = ''
PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" PKG_CONFIG_PATH+=":${lib.getDev cairo}/lib/pkgconfig"
setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
''; '';
description = "Cairo bindings"; description = "Cairo bindings";
@ -112750,7 +112750,7 @@ self: {
]; ];
libraryPkgconfigDepends = [ cairo pango ]; libraryPkgconfigDepends = [ cairo pango ];
preCompileBuildDriver = '' preCompileBuildDriver = ''
PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" PKG_CONFIG_PATH+=":${lib.getDev cairo}/lib/pkgconfig"
setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
''; '';
description = "Pango bindings"; description = "Pango bindings";
@ -112777,7 +112777,7 @@ self: {
]; ];
libraryPkgconfigDepends = [ cairo pango ]; libraryPkgconfigDepends = [ cairo pango ];
preCompileBuildDriver = '' preCompileBuildDriver = ''
PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" PKG_CONFIG_PATH+=":${lib.getDev cairo}/lib/pkgconfig"
setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
''; '';
description = "PangoCairo bindings"; description = "PangoCairo bindings";
@ -177449,7 +177449,7 @@ self: {
version = "0.1.1"; version = "0.1.1";
sha256 = "01zvk86kg726lf2vnlr7dxiz7g3xwi5a4ak9gcfbwyhynkzjmsfi"; sha256 = "01zvk86kg726lf2vnlr7dxiz7g3xwi5a4ak9gcfbwyhynkzjmsfi";
configureFlags = [ configureFlags = [
"--extra-include-dir=${libxml2.dev}/include/libxml2" "--extra-include-dir=${lib.getDev libxml2}/include/libxml2"
]; ];
libraryHaskellDepends = [ base bytestring mtl ]; libraryHaskellDepends = [ base bytestring mtl ];
librarySystemDepends = [ libxml2 ]; librarySystemDepends = [ libxml2 ];