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

Merge branch 'master' into staging

Browse Source 
Conflicts:
	pkgs/games/scummvm/default.nix
This commit is contained in:
obadz
2016-08-28 12:20:59 +01:00
parent ed01e0ca4f f0da094b2e
commit 57ddc155fc
19 changed files with 150 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/haskell-modules/hackage-packages.nix
View File

@@ -171679,12 +171679,12 @@ self: {
"unbound" = callPackage
({ mkDerivation, base, binary, containers, mtl, parsec, pretty
, QuickCheck, RepLib, template-haskell, transformers
, QuickCheck, RepLib, stdenv, template-haskell, transformers
}:
mkDerivation {
pname = "unbound";
version = "0.5.0";
sha256 = "1290827b7a67d87eaa4dfa8d753e01d98ef0d501ee42da0f9635fdd73b64220e";
version = "0.5.1";
sha256 = "0cjfd6fdxpi94dac5aslgfggm81fdspbywfyl5m20ah5drgpsr12";
libraryHaskellDepends = [
base binary containers mtl RepLib transformers
];
@@ -171695,7 +171695,6 @@ self: {
homepage = "https://github.com/sweirich/replib";
description = "Generic support for programming with names and binders";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = [ "x86_64-darwin" ];
}) {};
"unbound-generics" = callPackage