cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

svn merge ^/nixpkgs/trunk

Browse source 
svn path=/nixpkgs/branches/libpng15/; revision=31905
This commit is contained in:
Yury G. Kudryashov 2012-01-28 12:29:35 +00:00
commit 491316794c
12 changed files with 107 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
pkgs/development/libraries/cppnetlib/default.nix Normal file
View file

@ -0,0 +1,40 @@
{stdenv, fetchurl, cmake, openssl, boost}:
stdenv.mkDerivation rec {
name = "cpp-netlib-0.9.2";
src = fetchurl {
url = "https://github.com/downloads/cpp-netlib/cpp-netlib/${name}.tar.bz2";
sha256 = "0llmiyp9l7byavwdyb7vpks27yfv3g85170bm81paps748bcyb1p";
};
buildInputs = [ cmake boost openssl ];
/* Tests fail to build ...
https://github.com/cpp-netlib/cpp-netlib/issues/85
Once working, we could do:
checkTarget = "test";
doCheck = true;
*/
preConfigure = ''
sed -i /test/d CMakeLists.txt
'';
/* The build phase just builds examples. That's at least some testing.
That's how to install the lib - copy the headers. */
installPhase = ''
# We are at sourcepath/build
mkdir -p $out/include
cp -R ../boost $out/include/
mkdir -p $out/lib
cp -R libs/network/src/*.a $out/lib/
'';
meta = {
homepage = http://cpp-netlib.github.com/;
description = "Provides application layer network support at boost style";
license = "boost";
};
}

19
pkgs/development/libraries/haskell/GLFW/default.nix Normal file
View file

@ -0,0 +1,19 @@
{ cabal, libX11, mesa, OpenGL }:
cabal.mkDerivation (self: {
pname = "GLFW";
version = "0.5.0.1";
sha256 = "1zjxw0fn1am9n4bwqn8jwp14cdgyg1cv5v8rrg2bisggw7wdc4c6";
buildDepends = [ OpenGL ];
extraLibraries = [ libX11 mesa ];
meta = {
homepage = "http://haskell.org/haskellwiki/GLFW";
description = "A Haskell binding for GLFW";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

4
pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
View file

@ -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 ];

4
pkgs/development/libraries/haskell/test-framework-hunit/default.nix
View file

@ -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/";

4
pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix
View file

@ -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
];

4
pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
View file

@ -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
];

4
pkgs/development/libraries/haskell/test-framework/default.nix
View file

@ -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 = [

4
pkgs/development/libraries/haskell/zlib-bindings/default.nix
View file

@ -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";

17
pkgs/development/libraries/haskell/zlib/0.5.3.2.nix Normal file
View file

@ -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
];
};
})

4
pkgs/tools/misc/fontforge/default.nix
View file

@ -5,7 +5,7 @@
}:
let
version = "20090408";
version = "20110222";
name = "fontforge-${version}";
in
@ -14,7 +14,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/fontforge/fontforge_full-${version}.tar.bz2";
sha256 = "1s9a1mgbr5sv5jx6rdj2v3p6s52hgjr9wqd1aq57kn9whc8ny8y4";
sha256 = "0gj342iyd2qmza523r84m65fm7bymcfd4lbllywbfjzq4s0838lg";
};
configureFlags = lib.optionalString withX11 "--with-gui=gdraw";

4
pkgs/top-level/all-packages.nix
View file

@ -3333,6 +3333,10 @@ let
cppunit = callPackage ../development/libraries/cppunit { };
cppnetlib = callPackage ../development/libraries/cppnetlib {
boost = boostFull;
};
cracklib = callPackage ../development/libraries/cracklib { };
cryptopp = callPackage ../development/libraries/crypto++ { };

15
pkgs/top-level/haskell-packages.nix
View file

@ -151,7 +151,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
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 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
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 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
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 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
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 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
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 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
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 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
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 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
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 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
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 {};