public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hackage-packages.nix: re-generate from Hackage 2015-01-22T21:38:10+0100

Browse Source 
This commit also implements the second part of the
https://github.com/NixOS/cabal2nix/commit/4f603d1ca0e0da77b72f4efb70f9658a434f84cb
hack to work around https://github.com/NixOS/cabal2nix/issues/136

Fixes https://github.com/NixOS/nixpkgs/issues/5902.
This commit is contained in:
Peter Simons
2015-01-22 22:40:21 +01:00
parent 01fc3e0525
commit 78f3bd565a
7 changed files with 294 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/haskell-modules/configuration-common.nix
+2 -4
View File
@@ -16,7 +16,6 @@ self: super: {
hasql-postgres = dontCheck super.hasql-postgres;
hspec-expectations = dontCheck super.hspec-expectations;
HTTP = dontCheck super.HTTP;
matlab = super.matlab.override { matlab = null; };
mwc-random = dontCheck super.mwc-random;
nanospec = dontCheck super.nanospec;
options = dontCheck super.options;
@@ -149,9 +148,8 @@ self: super: {
})];});
# https://github.com/NixOS/cabal2nix/issues/136
gio = overrideCabal (super.gio.override { glib = self.glib; }) (drv: { pkgconfigDepends = [pkgs.glib]; });
glade = overrideCabal super.gio (drv: { pkgconfigDepends = [pkgs.gtk2]; buildDepends = drv.buildDepends ++ [self.glib]; });
pango = super.pango.override { cairo = self.cairo; };
gtk = addBuildDepends super.gtk [pkgs.pkgconfig pkgs.gtk];
glib = addBuildDepends super.glib [pkgs.pkgconfig pkgs.glib];
# https://github.com/jgm/zip-archive/issues/21
zip-archive = addBuildTool super.zip-archive pkgs.zip;