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

Merge branch 'master' into staging

Browse Source 
Conflicts:
	nixos/doc/manual/release-notes/rl-unstable.xml
	nixos/modules/services/printing/cupsd.nix
	pkgs/applications/misc/calibre/default.nix
	pkgs/development/haskell-modules/hackage-packages.nix
	pkgs/development/libraries/libsodium/default.nix
	pkgs/misc/emulators/wine/unstable.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Domen Kožar
2015-05-11 10:05:23 +02:00
parent b7f15c43da c3bdabca73
commit bb4d658f64
31 changed files with 683 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/haskell-modules/configuration-common.nix
+2 -12
View File
@@ -517,10 +517,6 @@ self: super: {
# https://github.com/cgaebel/stm-conduit/issues/33
stm-conduit = dontCheck super.stm-conduit;
# https://github.com/fumieval/call/issues/3
call = markBrokenVersion "0.1.2" super.call;
rhythm-game-tutorial = dontDistribute super.rhythm-game-tutorial; # depends on call
# The install target tries to run lots of commands as "root". WTF???
hannahci = markBroken super.hannahci;
@@ -724,14 +720,8 @@ self: super: {
# https://github.com/fumieval/audiovisual/issues/1
audiovisual = markBroken super.audiovisual;
# https://github.com/alephcloud/hs-stm-queue-extras/issues/2
stm-queue-extras = overrideCabal super.stm-queue-extras (drv: { editedCabalFile = null; });
# https://github.com/GaloisInc/cryptol/issues/197
cryptol = overrideCabal super.cryptol (drv: {
postUnpack = "rm -v ${drv.pname}-${drv.version}/Setup.hs";
});
call = dontDistribute super.call;
rhythm-game-tutorial = dontDistribute super.rhythm-game-tutorial;
# https://github.com/haskell/haddock/issues/378
haddock-library = dontCheck super.haddock-library;