From 723e46b6a7878fb8d440bb6f420218c6e17340e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 19 Jan 2012 21:07:02 +0000 Subject: [PATCH 01/10] GRUB 0.97: Use an old Automake. svn path=/nixpkgs/trunk/; revision=31719 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf504d9fbff..f051abdc871 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -787,6 +787,7 @@ let grub = callPackage_i686 ../tools/misc/grub { buggyBiosCDSupport = getConfig ["grub" "buggyBiosCDSupport"] true; + automake = automake110x; }; grub19x = callPackage ../tools/misc/grub/1.9x.nix { }; From 2ebf8df60150589676737aa8cab6c735dafdd073 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Jan 2012 21:08:33 +0000 Subject: [PATCH 02/10] * Apply the latest Gentoo patches to Grub 1. svn path=/nixpkgs/trunk/; revision=31720 --- pkgs/tools/misc/grub/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index cce2adf5ce5..a187dd9d6b2 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, autoconf, automake, buggyBiosCDSupport ? true}: stdenv.mkDerivation { - name = "grub-0.97-patch-1.10"; + name = "grub-0.97-patch-1.12"; src = fetchurl { url = ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz; @@ -13,8 +13,8 @@ stdenv.mkDerivation { # failures on systems with more than 2 GiB RAM, and for booting from # ext3 filesystems with 256-byte inodes as well as ext4 filesystems. gentooPatches = fetchurl { - url = mirror://gentoo/distfiles/grub-0.97-patches-1.10.tar.bz2; - sha256 = "015hkmb2jd6jfzkfr13cdh16frvva04rwr4yahzyw5xhl634d1h9"; + url = mirror://gentoo/distfiles/grub-0.97-patches-1.12.tar.bz2; + sha256 = "15xc5349hkzl03lbn2cadrmvjrf3s8sn147vv2142cwys9sdzkl0"; }; patches = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f051abdc871..bf504d9fbff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -787,7 +787,6 @@ let grub = callPackage_i686 ../tools/misc/grub { buggyBiosCDSupport = getConfig ["grub" "buggyBiosCDSupport"] true; - automake = automake110x; }; grub19x = callPackage ../tools/misc/grub/1.9x.nix { }; From e2633477c0d797aabaf96f2d393a6a6c6f7c2e90 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 19 Jan 2012 21:43:14 +0000 Subject: [PATCH 03/10] haskell-hakyll: updated to version 3.2.4.1 svn path=/nixpkgs/trunk/; revision=31722 --- pkgs/development/libraries/haskell/hakyll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 5f506021c14..d461f54e15a 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.2.4.0"; - sha256 = "1hyvvcq4hvbwz8zaswi8949sqzjkby6754b0y5zp2cpax2ykkbgx"; + version = "3.2.4.1"; + sha256 = "0ijym3k8f9za6cd1dnf8qx0jk85r5kz4f8gy7bn50jclcslnfl0n"; buildDepends = [ binary blazeHtml citeprocHs cryptohash hamlet mtl pandoc parsec regexBase regexPcre snapCore snapServer tagsoup time From 1bc803cb0954186f21bda845337ec6ed00ca1b9f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 19 Jan 2012 21:43:17 +0000 Subject: [PATCH 04/10] glib-2.28.x: blind commit that hopefully fixes a lot of build errors on Darwin It appears that users of glibc expect to be able to link libintl via pkgconfig. On Linux, this always works because that library comes with glibc, but on other platforms gettext is required to fulfill the dependency. I don't have access to Darwin, so I cannot actually test this change. If any runs into problems because of this modification, please feel free to revert it! svn path=/nixpkgs/trunk/; revision=31723 --- pkgs/development/libraries/glib/2.28.x.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glib/2.28.x.nix b/pkgs/development/libraries/glib/2.28.x.nix index 3b7f8b18495..31ebe207a39 100644 --- a/pkgs/development/libraries/glib/2.28.x.nix +++ b/pkgs/development/libraries/glib/2.28.x.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; buildNativeInputs = [ perl pkgconfig gettext xz ]; - propagatedBuildInputs = [ zlib ]; + propagatedBuildInputs = [ zlib ] + ++ stdenv.lib.optional (!stdenv.isLinux) gettext; # glib buildsystem fails to find python, thus hardcodes python2.4 in #! postInstall = '' From bf71d12fd42d7cbeca323576ac53bbc08eaf3fda Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 19 Jan 2012 22:10:41 +0000 Subject: [PATCH 05/10] texlive-moderncv: updated to version 2012.01.16 svn path=/nixpkgs/trunk/; revision=31725 --- pkgs/misc/tex/texlive/moderncv.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/tex/texlive/moderncv.nix b/pkgs/misc/tex/texlive/moderncv.nix index a19835eda4b..6d5de0764e3 100644 --- a/pkgs/misc/tex/texlive/moderncv.nix +++ b/pkgs/misc/tex/texlive/moderncv.nix @@ -1,9 +1,9 @@ args: with args; rec { - name = "moderncv-2007.05.28"; + name = "moderncv-2012.01.16"; src = fetchurl { url = "http://mirror.ctan.org/macros/latex/contrib/moderncv.zip"; - sha256 = "d479141e9ae6dad745b03af47541b1bf7d312613de42bb7984eb4b556854cb51"; + sha256 = "a9d2de7fc03c35c4084915b2788c8d7acfb695f9e27f6cd81427a7dd1a64cb54"; }; buildInputs = [texLive unzip]; From 5cd82587aa6708b076fedb44c333f27c78ce6aa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 19 Jan 2012 22:29:26 +0000 Subject: [PATCH 06/10] overrideDerivation: Check whether `hostDrv' and `buildDrv' are present. svn path=/nixpkgs/trunk/; revision=31727 --- pkgs/lib/customisation.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/lib/customisation.nix b/pkgs/lib/customisation.nix index 49ae440a729..54965ffb580 100644 --- a/pkgs/lib/customisation.nix +++ b/pkgs/lib/customisation.nix @@ -42,9 +42,14 @@ rec { in newDrv // { meta = if drv ? meta then drv.meta else {}; passthru = if drv ? passthru then drv.passthru else {}; - hostDrv = overrideDerivation drv.hostDrv f; - buildDrv = overrideDerivation drv.buildDrv f; - }; + } + // + (if (drv ? hostDrv && drv ? buildDrv) + then { + hostDrv = overrideDerivation drv.hostDrv f; + buildDrv = overrideDerivation drv.buildDrv f; + } + else { }); # usage: (you can use override multiple times) From c2b80e225c6a90eab260d2b984a963fa28310bf7 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 20 Jan 2012 00:45:22 +0000 Subject: [PATCH 07/10] directfb-1.5.3 svn path=/nixpkgs/trunk/; revision=31730 --- .../libraries/directfb/default.nix | 2 ++ .../libraries/directfb/ftbfs.patch | 25 +++++++++++++++++++ .../libraries/directfb/src-for-default.nix | 10 ++++---- 3 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/directfb/ftbfs.patch diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix index 55a8a823e1c..9b4241aa3be 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation { sha256 = s.hash; }; + patches = [ ./ftbfs.patch ]; + buildNativeInputs = [ perl ]; buildInputs = [ zlib libjpeg freetype giflib libpng ] diff --git a/pkgs/development/libraries/directfb/ftbfs.patch b/pkgs/development/libraries/directfb/ftbfs.patch new file mode 100644 index 00000000000..b6907e70be7 --- /dev/null +++ b/pkgs/development/libraries/directfb/ftbfs.patch @@ -0,0 +1,25 @@ +From: André Draszik +Date: Wed, 28 Sep 2011 17:36:00 +0000 (+0100) +Subject: generic_stretch_blit: fix compilation due to undefined reference to DSPF_ARGBF88871 +X-Git-Url: http://git.directfb.org/?p=core%2FDirectFB.git;a=commitdiff_plain;h=ef5e1398fe4037b63d6513e450f107fcfe91047f + +generic_stretch_blit: fix compilation due to undefined reference to DSPF_ARGBF88871 + +../../../../DirectFB/src/gfx/generic/generic_stretch_blit.c: In function 'stretch_hvx': +../../../../DirectFB/src/gfx/generic/generic_stretch_blit.c:444:21: error: 'DSPF_ARGBF88871' undeclared (first use in this function) +../../../../DirectFB/src/gfx/generic/generic_stretch_blit.c:444:21: note: each undeclared identifier is reported only once for each function it appears in +--- + +diff --git a/src/gfx/generic/generic_stretch_blit.c b/src/gfx/generic/generic_stretch_blit.c +index 65076f4..6dd987b 100644 +--- a/src/gfx/generic/generic_stretch_blit.c ++++ b/src/gfx/generic/generic_stretch_blit.c +@@ -441,7 +441,7 @@ stretch_hvx( CardState *state, DFBRectangle *srect, DFBRectangle *drect ) + } + break; + +- case DSPF_ARGBF88871: ++ case DSPF_RGBAF88871: + if (state->blittingflags & DSBLIT_SRC_PREMULTIPLY) { + for (i=0; iBlut->num_entries; i++) { + int alpha = entries[i].a + 1; diff --git a/pkgs/development/libraries/directfb/src-for-default.nix b/pkgs/development/libraries/directfb/src-for-default.nix index b181d2858f5..c154ac68e4a 100644 --- a/pkgs/development/libraries/directfb/src-for-default.nix +++ b/pkgs/development/libraries/directfb/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.4.3"; - name="directfb-1.4.3"; - hash="0y79lwzq7srlbgrva7b5y8klbp6gmr8hxrayq8njaw7by3jald8l"; - url="http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-${version}.tar.gz"; - advertisedUrl="http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-1.4.3.tar.gz"; + version="1.5.3"; + name="directfb-1.5.3"; + hash="1w2i4az6v4sh086s27qbyn5w02s67a7dfm2xdpdm4r2zpgl7axg5"; + url="http://directfb.org/downloads/Core/DirectFB-1.5/DirectFB-${version}.tar.gz"; + advertisedUrl="http://directfb.org/downloads/Core/DirectFB-1.5/DirectFB-1.5.3.tar.gz"; } From dd83243b8c8ae3333e4099c8d4df000a5f8a04f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Fri, 20 Jan 2012 10:54:09 +0000 Subject: [PATCH 08/10] Make statistics and criterion compile with ghc-6.12.3. svn path=/nixpkgs/trunk/; revision=31733 --- pkgs/top-level/haskell-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2aba0b4afd3..87448499a42 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -332,6 +332,8 @@ 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 + deepseq = self.deepseq_1_1_0_2; + # deviating from Haskell platform here, to make some packages (notably statistics) compile }; haskellPlatform_2010_2_0_0 = @@ -553,7 +555,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cprngAes = callPackage ../development/libraries/haskell/cprng-aes {}; - criterion = callPackage ../development/libraries/haskell/criterion {}; + criterion = callPackage ../development/libraries/haskell/criterion { + mtl = self.mtl2; + parsec = self.parsec3; + }; Crypto = callPackage ../development/libraries/haskell/Crypto {}; From 2c3e921a4c2c8e5baf46ec8481dcf0c573a19a55 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 20 Jan 2012 12:29:13 +0000 Subject: [PATCH 09/10] Bumped MySQL 5.5.15 to 5.5.20 svn path=/nixpkgs/trunk/; revision=31735 --- pkgs/servers/sql/mysql55/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/mysql55/default.nix b/pkgs/servers/sql/mysql55/default.nix index 6a824b4f51c..493f86f00f7 100644 --- a/pkgs/servers/sql/mysql55/default.nix +++ b/pkgs/servers/sql/mysql55/default.nix @@ -3,11 +3,11 @@ # Note: zlib is not required; MySQL can use an internal zlib. stdenv.mkDerivation { - name = "mysql-5.5.15"; + name = "mysql-5.5.20"; src = fetchurl { - url = ftp://mirror.leaseweb.com/mysql/Downloads/MySQL-5.5/mysql-5.5.15.tar.gz; - sha256 = "10jwkkmp231swc986z01nsp0q67kp0zdkfb4q4v9if2vn6a51ldy"; + url = ftp://mirror.leaseweb.com/mysql/Downloads/MySQL-5.5/mysql-5.5.20.tar.gz; + sha256 = "03jl60mzrsd1jb8fvkz6c8j2239b37k8n1i07jk1q4yk58aq8ynh"; }; buildInputs = [ cmake bison ncurses openssl readline zlib ]; From b786ce664df777fc5e061a2d670306ee54b25615 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 20 Jan 2012 15:26:47 +0000 Subject: [PATCH 10/10] * Bump nixUnstable. svn path=/nixpkgs/trunk/; revision=31738 --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index e5475e7fd06..de17381fec9 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.0pre31616"; + name = "nix-1.0pre31729"; src = fetchurl { - url = "http://hydra.nixos.org/build/1823251/download/4/${name}.tar.bz2"; - sha256 = "34d95cee3a931666f358f18557f884b6bc7fade83092eef021e52db7ba5e2af1"; + url = "http://hydra.nixos.org/build/1867511/download/4/${name}.tar.bz2"; + sha256 = "c2e33d5837a686c42deaab1cfcf8ec0e13b0c841d936086d773a2415e4141d2d"; }; buildNativeInputs = [ perl pkgconfig ];