From ed92080b8de117bdd151dffb9eced708bea63459 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 27 Jan 2012 18:56:31 +0000 Subject: [PATCH 01/11] icewm-1.3.7 svn path=/nixpkgs/trunk/; revision=31890 --- .../window-managers/icewm/default.nix | 22 +++++++++++-------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 632bc50c869..000f0e55bb4 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -1,29 +1,33 @@ -{ stdenv, fetchurl, gettext, libjpeg, libtiff, libungif, libpng, imlib -, xlibs, automake, pkgconfig, gtk }: +{ stdenv, fetchurl, gettext, libjpeg, libtiff, libungif, libpng, freetype +, fontconfig, xlibs, automake, pkgconfig, gdk_pixbuf }: stdenv.mkDerivation rec { - name = "icewm-1.3.6"; + name = "icewm-1.3.7"; buildInputs = - [ gettext libjpeg libtiff libungif libpng imlib + [ gettext libjpeg libtiff libungif libpng xlibs.libX11 xlibs.libXft xlibs.libXext xlibs.libXinerama xlibs.libXrandr - pkgconfig gtk + xlibs.libICE xlibs.libSM freetype fontconfig + pkgconfig gdk_pixbuf ]; src = fetchurl { url = "mirror://sourceforge/icewm/${name}.tar.gz"; - sha256 = "1pr7rc10rddwvy4ncng4mf5fpxd1nqjsw34xba9ngsg32rg57b91"; + sha256 = "0yw813d8amrl0n1fvdiyznxah92wcylj9kj1qhjc6h73d827h6na"; }; - NIX_LDFLAGS = "-lfontconfig"; - # The fuloong2f is not supported by 1.3.6 still + # + # Don't know whether 1.3.7 supports fuloong2f and don't know how to test it + # on x86_64 hardware. So I left this 'cp' -- urkud + preConfigure = '' - cp ${automake}/share/automake*/config.{sub,guess} . + cp -v ${automake}/share/automake*/config.{sub,guess} . ''; meta = { description = "A window manager for the X Window System"; homepage = http://www.icewm.org/; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41325666554..e5842d618bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7041,9 +7041,7 @@ let icecat3Wrapper = wrapFirefox { browser = icecat3Xul; browserName = "icecat"; desktopName = "IceCat"; }; - icewm = callPackage ../applications/window-managers/icewm { - inherit (gtkLibs) gtk; - }; + icewm = callPackage ../applications/window-managers/icewm { }; id3v2 = callPackage ../applications/audio/id3v2 { }; From bbe935774d3521f65b5e8fc21d51ef1827ce8007 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Jan 2012 20:31:00 +0000 Subject: [PATCH 02/11] haskell-GLFW: added version 0.5.0.1 svn path=/nixpkgs/trunk/; revision=31893 --- .../libraries/haskell/GLFW/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/GLFW/default.nix diff --git a/pkgs/development/libraries/haskell/GLFW/default.nix b/pkgs/development/libraries/haskell/GLFW/default.nix new file mode 100644 index 00000000000..1a9179b9877 --- /dev/null +++ b/pkgs/development/libraries/haskell/GLFW/default.nix @@ -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 + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 15cb3336262..c9e8796668c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -703,6 +703,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; From 47c3e4b2a3dbd9761ea24237a17e9b5f336bcd9c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Jan 2012 20:31:03 +0000 Subject: [PATCH 03/11] haskell-zlib: added version 0.5.3.2 This version is disabled for all versions of GHC older than 7.2, because it won't build. Upstream has been notified. svn path=/nixpkgs/trunk/; revision=31894 --- .../libraries/haskell/zlib/0.5.3.2.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 13 +++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/zlib/0.5.3.2.nix diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.2.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.2.nix new file mode 100644 index 00000000000..6370c5560b8 --- /dev/null +++ b/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 + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c9e8796668c..9a7c7cab1f7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -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 = @@ -1486,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 {}; From c3883364c648580abe28be752d6f226922ea1613 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Jan 2012 20:31:06 +0000 Subject: [PATCH 04/11] haskell-ansi-wl-pprint: updated to version 0.6.4 svn path=/nixpkgs/trunk/; revision=31895 --- pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix index 468b35136a3..5730588ab9e 100755 --- a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix +++ b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix @@ -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 ]; From 45312449cc04770ba08455a78e9d8ca3c9492405 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Jan 2012 20:31:09 +0000 Subject: [PATCH 05/11] haskell-test-framework-hunit: updated to version 0.2.7 svn path=/nixpkgs/trunk/; revision=31896 --- .../libraries/haskell/test-framework-hunit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix index e196322190d..e280d497bee 100644 --- a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix @@ -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/"; From 2be13ee0042a8be466147d6f484ab2fb40043023 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Jan 2012 20:31:12 +0000 Subject: [PATCH 06/11] haskell-test-framework-quickcheck: updated to version 0.2.8 svn path=/nixpkgs/trunk/; revision=31897 --- .../libraries/haskell/test-framework-quickcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix index 20d86feaa1b..db70ec18a98 100644 --- a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix @@ -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 ]; From 8cc520bd88db4d8426e9f3f051cd2996bee297f5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Jan 2012 20:31:15 +0000 Subject: [PATCH 07/11] haskell-test-framework-quickcheck2: updated to version 0.2.12 svn path=/nixpkgs/trunk/; revision=31898 --- .../libraries/haskell/test-framework-quickcheck2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix index e3787bbd057..8e3698ab000 100644 --- a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix @@ -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 ]; From fb5c1e068739c05daaf52bf8057e419dd4b178ca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Jan 2012 20:31:17 +0000 Subject: [PATCH 08/11] haskell-test-framework: updated to version 0.4.2.1 svn path=/nixpkgs/trunk/; revision=31899 --- pkgs/development/libraries/haskell/test-framework/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/test-framework/default.nix b/pkgs/development/libraries/haskell/test-framework/default.nix index 64a45206b6e..7fa6dcae0ce 100644 --- a/pkgs/development/libraries/haskell/test-framework/default.nix +++ b/pkgs/development/libraries/haskell/test-framework/default.nix @@ -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 = [ From 999502f95c07761a6288f792b9e65b9c3ded2116 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Jan 2012 20:31:20 +0000 Subject: [PATCH 09/11] haskell-zlib-bindings: updated to version 0.0.3 svn path=/nixpkgs/trunk/; revision=31900 --- pkgs/development/libraries/haskell/zlib-bindings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix index 66068cb5d0f..86ab3ad1aab 100644 --- a/pkgs/development/libraries/haskell/zlib-bindings/default.nix +++ b/pkgs/development/libraries/haskell/zlib-bindings/default.nix @@ -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"; From 415b2bb145c45a567eebb49bd526a071e38ee620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 27 Jan 2012 20:40:44 +0000 Subject: [PATCH 10/11] Adding cppnetlib 0.9.2. The last I found in their github. svn path=/nixpkgs/trunk/; revision=31901 --- .../libraries/cppnetlib/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/libraries/cppnetlib/default.nix diff --git a/pkgs/development/libraries/cppnetlib/default.nix b/pkgs/development/libraries/cppnetlib/default.nix new file mode 100644 index 00000000000..3eab580c6a8 --- /dev/null +++ b/pkgs/development/libraries/cppnetlib/default.nix @@ -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"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5842d618bd..6bd8f938244 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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++ { }; From 8c1f88549d55a3b02b6fa7174ce55956f7645367 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 28 Jan 2012 09:04:48 +0000 Subject: [PATCH 11/11] fontforge-20100222 svn path=/nixpkgs/trunk/; revision=31902 --- pkgs/tools/misc/fontforge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 9402fad2287..d5a1bf42a12 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -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";