Author: urkud
Date: Sat Jan 28 12:29:35 2012
New Revision: 31905
URL: https://nixos.org/websvn/nix/?rev=31905&sc=1
Log:
svn merge ^/nixpkgs/trunk
Added:
nixpkgs/branches/libpng15/pkgs/development/libraries/cppnetlib/
- copied from r31902, nixpkgs/trunk/pkgs/development/libraries/cppnetlib/
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/GLFW/
- copied from r31902,
nixpkgs/trunk/pkgs/development/libraries/haskell/GLFW/
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/zlib/0.5.3.2.nix
- copied unchanged from r31902,
nixpkgs/trunk/pkgs/development/libraries/haskell/zlib/0.5.3.2.nix
Modified:
nixpkgs/branches/libpng15/ (props changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/test-framework-hunit/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/test-framework/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/zlib-bindings/default.nix
nixpkgs/branches/libpng15/pkgs/tools/misc/fontforge/default.nix
nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix
nixpkgs/branches/libpng15/pkgs/top-level/haskell-packages.nix
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
Sat Jan 28 10:20:57 2012 (r31904)
+++
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
Sat Jan 28 12:29:35 2012 (r31905)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "ansi-wl-pprint";
- version = "0.6.3";
- sha256 = "1cpkfn1ld0sjysksdsxxwwy1b17s4smmzk8y88y9mb81vgwlalkl";
+ version = "0.6.4";
+ sha256 = "0zrhzkmc5ki6q9ac5l16lhnyf9z2raj78gj9n0a7530rcv4ak3k0";
isLibrary = true;
isExecutable = true;
buildDepends = [ ansiTerminal ];
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/test-framework-hunit/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/test-framework-hunit/default.nix
Sat Jan 28 10:20:57 2012 (r31904)
+++
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/test-framework-hunit/default.nix
Sat Jan 28 12:29:35 2012 (r31905)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "test-framework-hunit";
- version = "0.2.6";
- sha256 = "1ivgyh71wwvrrgnk3fp6hsfssvy39jikhjdzr7x68pv1ca7f247r";
+ version = "0.2.7";
+ sha256 = "1c7424i5vnggzncwiwqqwq7ir7kaijif2waqmss5pn6db3gj33fc";
buildDepends = [ extensibleExceptions HUnit testFramework ];
meta = {
homepage = "http://batterseapower.github.com/test-framework/";;
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix
Sat Jan 28 10:20:57 2012 (r31904)
+++
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix
Sat Jan 28 12:29:35 2012 (r31905)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "test-framework-quickcheck";
- version = "0.2.7";
- sha256 = "065nazli8vh9dz8xi71gwzlwy81anfd471jhz6hv3m893cc9vvx8";
+ version = "0.2.8";
+ sha256 = "0ca6s7dnrdr9s2gdpfb74lswlj2lj091crk89m3yqjcadchkh3vl";
buildDepends = [
deepseq extensibleExceptions QuickCheck random testFramework
];
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
Sat Jan 28 10:20:57 2012 (r31904)
+++
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
Sat Jan 28 12:29:35 2012 (r31905)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "test-framework-quickcheck2";
- version = "0.2.10";
- sha256 = "12c37m74idjydxshgms9ib9ii2rpvy4647kra2ards1w2jmnr6w3";
+ version = "0.2.12";
+ sha256 = "08qr2lh1akjy5daxxk1sy59sg94hvv5s5njs9x6lrx648hy7y8iy";
buildDepends = [
extensibleExceptions QuickCheck random testFramework
];
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/test-framework/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/test-framework/default.nix
Sat Jan 28 10:20:57 2012 (r31904)
+++
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/test-framework/default.nix
Sat Jan 28 12:29:35 2012 (r31905)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "test-framework";
- version = "0.4.2.0";
- sha256 = "0a74ajlmwsajrj06k22zqwnyxqfrpbd9xplf4b1swafp7y952ind";
+ version = "0.4.2.1";
+ sha256 = "1021drmg1k4b844rwsjfbvajai4irrxc9aa7g6rk5n246a2nh9if";
isLibrary = true;
isExecutable = true;
buildDepends = [
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/zlib-bindings/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/zlib-bindings/default.nix
Sat Jan 28 10:20:57 2012 (r31904)
+++
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/zlib-bindings/default.nix
Sat Jan 28 12:29:35 2012 (r31905)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "zlib-bindings";
- version = "0.0.2";
- sha256 = "01ksbrlcn9g74ql0388zfa02abmrpkw654y2ayybzgygzdb51mnk";
+ version = "0.0.3";
+ sha256 = "0hi74pc9lc11j7bvaka2fpy3cdql2z7232nxpjffjk7prqrc0q8d";
buildDepends = [ zlib ];
meta = {
homepage = "http://github.com/snoyberg/zlib-bindings";;
Copied:
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/zlib/0.5.3.2.nix
(from r31902, nixpkgs/trunk/pkgs/development/libraries/haskell/zlib/0.5.3.2.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/zlib/0.5.3.2.nix
Sat Jan 28 12:29:35 2012 (r31905, copy of r31902,
nixpkgs/trunk/pkgs/development/libraries/haskell/zlib/0.5.3.2.nix)
@@ -0,0 +1,17 @@
+{ cabal, zlib }:
+
+cabal.mkDerivation (self: {
+ pname = "zlib";
+ version = "0.5.3.2";
+ sha256 = "1a5xr59bw7hpgd7fwkpgkrpib7i46dsip7285pccvi2934k0628q";
+ extraLibraries = [ zlib ];
+ meta = {
+ description = "Compression and decompression in the gzip and zlib formats";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
Modified: nixpkgs/branches/libpng15/pkgs/tools/misc/fontforge/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/tools/misc/fontforge/default.nix Sat Jan
28 10:20:57 2012 (r31904)
+++ nixpkgs/branches/libpng15/pkgs/tools/misc/fontforge/default.nix Sat Jan
28 12:29:35 2012 (r31905)
@@ -5,7 +5,7 @@
}:
let
- version = "20090408";
+ version = "20110222";
name = "fontforge-${version}";
in
@@ -14,7 +14,7 @@
src = fetchurl {
url = "mirror://sourceforge/fontforge/fontforge_full-${version}.tar.bz2";
- sha256 = "1s9a1mgbr5sv5jx6rdj2v3p6s52hgjr9wqd1aq57kn9whc8ny8y4";
+ sha256 = "0gj342iyd2qmza523r84m65fm7bymcfd4lbllywbfjzq4s0838lg";
};
configureFlags = lib.optionalString withX11 "--with-gui=gdraw";
Modified: nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Sat Jan 28
10:20:57 2012 (r31904)
+++ nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Sat Jan 28
12:29:35 2012 (r31905)
@@ -3333,6 +3333,10 @@
cppunit = callPackage ../development/libraries/cppunit { };
+ cppnetlib = callPackage ../development/libraries/cppnetlib {
+ boost = boostFull;
+ };
+
cracklib = callPackage ../development/libraries/cracklib { };
cryptopp = callPackage ../development/libraries/crypto++ { };
Modified: nixpkgs/branches/libpng15/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/top-level/haskell-packages.nix Sat Jan
28 10:20:57 2012 (r31904)
+++ nixpkgs/branches/libpng15/pkgs/top-level/haskell-packages.nix Sat Jan
28 12:29:35 2012 (r31905)
@@ -151,7 +151,7 @@
stm = self.stm_2_2_0_1; # 7.2 ok, 7.3 ok
syb = self.syb_0_3_6; # 7.2 ok, 7.3 ok
xhtml = self.xhtml_3000_2_0_1; # 7.2 ok, 7.3 ok
- zlib = self.zlib_0_5_3_1; # 7.2 ok, 7.3 ok
+ zlib = self.zlib_0_5_3_2; # 7.2 ok, 7.3 ok
HTTP = self.HTTP_4000_2_2; # 7.2 ok, 7.3 ok
deepseq = self.deepseq_1_1_0_2; # 7.2 ok, 7.3 ok
text = self.text_0_11_1_13; # 7.2 ok, 7.3 ok
@@ -210,6 +210,7 @@
haskellPlatform = self.haskellPlatform_2011_4_0_0;
mtl1 = self.mtl_1_1_1_1;
repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
+ zlib_0_5_3_2 = null; # don't pick this version of 'zlib' during
nix-env -u
};
haskellPlatform_2011_4_0_0 =
@@ -252,6 +253,7 @@
haskellPlatform = self.haskellPlatform_2011_2_0_1;
mtl1 = self.mtl_1_1_1_1;
repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
+ zlib_0_5_3_2 = null; # don't pick this version of 'zlib' during
nix-env -u
};
haskellPlatform_2011_2_0_1 =
@@ -294,6 +296,7 @@
haskellPlatform = self.haskellPlatform_2011_2_0_0;
mtl1 = self.mtl_1_1_1_1;
repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
+ zlib_0_5_3_2 = null; # don't pick this version of 'zlib' during
nix-env -u
};
haskellPlatform_2011_2_0_0 =
@@ -332,6 +335,7 @@
self : self.haskellPlatformArgs_2010_2_0_0 self // {
haskellPlatform = self.haskellPlatform_2010_2_0_0;
repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
+ zlib_0_5_3_2 = null; # don't pick this version of 'zlib' during
nix-env -u
deepseq = self.deepseq_1_1_0_2;
# deviating from Haskell platform here, to make some packages (notably
statistics) compile
};
@@ -371,6 +375,7 @@
haskellPlatform = self.haskellPlatform_2010_1_0_0;
extensibleExceptions = self.extensibleExceptions_0_1_1_0;
repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
+ zlib_0_5_3_2 = null; # don't pick this version of 'zlib' during
nix-env -u
};
haskellPlatform_2010_1_0_0 =
@@ -410,6 +415,7 @@
extensibleExceptions = self.extensibleExceptions_0_1_1_0;
text = self.text_0_11_0_6;
repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
+ zlib_0_5_3_2 = null; # don't pick this version of 'zlib' during
nix-env -u
};
haskellPlatform_2009_2_0_2 =
@@ -703,6 +709,8 @@
libc = pkgs.stdenv.gcc.libc;
};
+ GLFW = callPackage ../development/libraries/haskell/GLFW {};
+
glib = callPackage ../development/libraries/haskell/glib {
glib = pkgs.glib;
libc = pkgs.stdenv.gcc.libc;
@@ -1484,7 +1492,10 @@
zlib_0_5_3_1 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix
{
inherit (pkgs) zlib;
};
- zlib = self.zlib_0_5_0_0;
+ zlib_0_5_3_2 = callPackage ../development/libraries/haskell/zlib/0.5.3.2.nix
{
+ inherit (pkgs) zlib;
+ };
+ zlib = self.zlib_0_5_3_2;
zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
