From bb7a5a1a9e5355028efa4ed80204d028be6281ff Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jan 2013 18:00:11 +0100 Subject: [PATCH 001/107] ledger-2.6.3: update location of the source code tarball The source code tarball we used to rely on has disappeared. --- pkgs/applications/office/ledger/2.6.3.nix | 40 ++++++++--------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/office/ledger/2.6.3.nix b/pkgs/applications/office/ledger/2.6.3.nix index c1cd4b42a02a..603c9ea473e8 100644 --- a/pkgs/applications/office/ledger/2.6.3.nix +++ b/pkgs/applications/office/ledger/2.6.3.nix @@ -1,40 +1,26 @@ -# Patchelf fails to hard-code the library paths to ledger's -# libamounts.so and libledger-2.6.3 shared objects: -# -# $ ldd ~/.nix-profile/bin/ledger -# linux-vdso.so.1 => (0x00007fff513ff000) -# libamounts.so.0 => not found -# libledger-2.6.3.so => not found -# libstdc++.so.6 => /nix/store/3r8kfi33y3lbrsvlx8vzwm74h8178y35-gcc-4.5.1/lib/../lib64/libstdc++.so.6 (0x00007f1f0feee000) -# libpcre.so.0 => /nix/store/kfhy189arpj3wrfzpgw8p9ac4g4hfgca-pcre-8.10/lib/libpcre.so.0 (0x00007f1f0fcd3000) -# libgmp.so.3 => /nix/store/ji6py9m9w2ray1bmpkmgig9llj1i2ggf-gmp-4.3.2/lib/libgmp.so.3 (0x00007f1f0fa7f000) -# libm.so.6 => /nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/libm.so.6 (0x00007f1f0f7fd000) -# libgcc_s.so.1 => /nix/store/3r8kfi33y3lbrsvlx8vzwm74h8178y35-gcc-4.5.1/lib/../lib64/libgcc_s.so.1 (0x00007f1f0f5e8000) -# libc.so.6 => /nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/libc.so.6 (0x00007f1f0f27d000) -# /nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/ld-linux-x86-64.so.2 (0x00007f1f101ef000) -# -# Fortunately, libtools builds the program with proper paths hard-coded -# alread, so we don't need patchelf. Phew! +{ stdenv, fetchurl, emacs, gmp, pcre, expat, autoconf, automake, libtool, texinfo }: -{stdenv, fetchurl, emacs, gmp, pcre, expat}: - -let - name = "ledger-2.6.3"; -in stdenv.mkDerivation { - inherit name; + name = "ledger-2.6.3"; src = fetchurl { - url = "https://github.com/downloads/jwiegley/ledger/${name}.tar.gz"; - sha256 = "05zpnypcwgck7lwk00pbdlcwa347xsqifxh4zsbbn01m98bx1v5k"; + url = "https://github.com/jwiegley/ledger/archive/v2.6.3.tar.gz"; + sha256 = "0fmawai1fakhvdmjrydxp2pl67vk1c1ff54z28xl2k057ws49hnm"; }; - buildInputs = [ emacs gmp pcre expat ]; + buildInputs = [ emacs gmp pcre expat autoconf automake libtool texinfo ]; + + preConfigure = "autoreconf -vi"; configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3"; - dontPatchELF = true; + doCheck = true; + # Patchelf breaks the hard-coded rpath to ledger's libamounts.so and + # libledger-2.6.3. Fortunately, libtool chooses proper rpaths to begin + # with, so we can just disable patchelf to avoid the issue. + dontPatchELF = true; + meta = { homepage = "http://ledger-cli.org/"; description = "A double-entry accounting system with a command-line reporting interface"; From b5ce83d38d3641058ba147c7067839134da60a3b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jan 2013 18:05:54 +0100 Subject: [PATCH 002/107] ledger-2.6.3: update the location of the source code tarball some more I found the original tarball at a different URL. This one doesn't require Autoconf et al to compile. --- pkgs/applications/office/ledger/2.6.3.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/office/ledger/2.6.3.nix b/pkgs/applications/office/ledger/2.6.3.nix index 603c9ea473e8..ca71ceeca66c 100644 --- a/pkgs/applications/office/ledger/2.6.3.nix +++ b/pkgs/applications/office/ledger/2.6.3.nix @@ -1,24 +1,22 @@ -{ stdenv, fetchurl, emacs, gmp, pcre, expat, autoconf, automake, libtool, texinfo }: +{ stdenv, fetchurl, emacs, gmp, pcre, expat }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ledger-2.6.3"; src = fetchurl { - url = "https://github.com/jwiegley/ledger/archive/v2.6.3.tar.gz"; - sha256 = "0fmawai1fakhvdmjrydxp2pl67vk1c1ff54z28xl2k057ws49hnm"; + url = "https://github.com/downloads/ledger/ledger/${name}.tar.gz"; + sha256 = "05zpnypcwgck7lwk00pbdlcwa347xsqifxh4zsbbn01m98bx1v5k"; }; - buildInputs = [ emacs gmp pcre expat autoconf automake libtool texinfo ]; - - preConfigure = "autoreconf -vi"; + buildInputs = [ emacs gmp pcre expat ]; configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3"; doCheck = true; - # Patchelf breaks the hard-coded rpath to ledger's libamounts.so and - # libledger-2.6.3. Fortunately, libtool chooses proper rpaths to begin - # with, so we can just disable patchelf to avoid the issue. + # Patchelf breaks the hard-coded rpath to ledger's libamounts.0.so and + # libledger-2.6.3.so. Fortunately, libtool chooses proper rpaths to + # begin with, so we can just disable patchelf to avoid the issue. dontPatchELF = true; meta = { From 6930efd1e592c9cc2915863f0a7122da8362f083 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jan 2013 18:04:52 +0100 Subject: [PATCH 003/107] openjade: Use default gcc --- pkgs/tools/text/sgml/openjade/default.nix | 15 ++++++--------- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/text/sgml/openjade/default.nix b/pkgs/tools/text/sgml/openjade/default.nix index 77532fd216c9..fc7ee9f6f066 100644 --- a/pkgs/tools/text/sgml/openjade/default.nix +++ b/pkgs/tools/text/sgml/openjade/default.nix @@ -1,22 +1,19 @@ -{stdenv, fetchurl, opensp, perl}: +{ stdenv, fetchurl, opensp, perl }: -stdenv.mkDerivation { - # OpenJade-1.3.2 requires gcc 3.3 to build. - # The next release is likely to be compatible with newer gccs. - # If so the overrideGCC in top-level/all-packages should be removed. - name = "OpenJade-1.3.2"; +stdenv.mkDerivation rec { + name = "openjade-1.3.2"; src = fetchurl { - url = "mirror://sourceforge/openjade/openjade-1.3.2.tar.gz"; + url = "mirror://sourceforge/openjade/${name}.tar.gz"; sha256 = "1l92sfvx1f0wmkbvzv1385y1gb3hh010xksi1iyviyclrjb7jb8x"; }; - buildInputs = [opensp perl]; + buildInputs = [ opensp perl ]; configureFlags = [ "--enable-spincludedir=${opensp}/include/OpenSP" "--enable-splibdir=${opensp}/lib" - ]; + ]; meta = { description = "An implementation of DSSSL, an ISO standard for formatting SGML (and XML) documents"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f78b3d8669ee..38df8c28fbc1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1242,10 +1242,7 @@ let opendkim = callPackage ../development/libraries/opendkim { }; - openjade = callPackage ../tools/text/sgml/openjade { - stdenv = overrideGCC stdenv gcc33; - opensp = opensp.override { stdenv = overrideGCC stdenv gcc33; }; - }; + openjade = callPackage ../tools/text/sgml/openjade { }; openobex = callPackage ../tools/bluetooth/openobex { }; From f7cc884de4437612e1658aaabd3de2cb4a00ca54 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jan 2013 18:19:42 +0100 Subject: [PATCH 004/107] gwt: Remove obsolete version --- pkgs/development/compilers/gwt/2.4.0.nix | 14 +++++---- pkgs/development/compilers/gwt/builder.sh | 31 ------------------- pkgs/development/compilers/gwt/default.nix | 14 --------- .../development/compilers/opencxx/default.nix | 2 +- pkgs/top-level/all-packages.nix | 3 -- pkgs/top-level/release-python.nix | 1 - 6 files changed, 9 insertions(+), 56 deletions(-) delete mode 100644 pkgs/development/compilers/gwt/builder.sh delete mode 100644 pkgs/development/compilers/gwt/default.nix diff --git a/pkgs/development/compilers/gwt/2.4.0.nix b/pkgs/development/compilers/gwt/2.4.0.nix index 000b57946f69..c5c7841d72a0 100644 --- a/pkgs/development/compilers/gwt/2.4.0.nix +++ b/pkgs/development/compilers/gwt/2.4.0.nix @@ -1,12 +1,14 @@ -{stdenv, fetchurl, unzip}: +{ stdenv, fetchurl, unzip }: stdenv.mkDerivation { name = "gwt-java-2.4.0"; - src = fetchurl { - url=http://google-web-toolkit.googlecode.com/files/gwt-2.4.0.zip; - sha1 = "a91ac20db0ddd5994ac3cbfb0e8061d5bbf66f88"; + + src = fetchurl { + url=http://google-web-toolkit.googlecode.com/files/gwt-2.4.0.zip; + sha1 = "a91ac20db0ddd5994ac3cbfb0e8061d5bbf66f88"; }; - buildInputs = [unzip]; + + buildInputs = [ unzip ]; installPhase = '' ensureDir $out @@ -18,4 +20,4 @@ stdenv.mkDerivation { homepage = http://code.google.com/webtoolkit/; description = "Google Web Toolkit (GWT) is a development toolkit for building and optimizing complex browser-based applications."; }; - } +} diff --git a/pkgs/development/compilers/gwt/builder.sh b/pkgs/development/compilers/gwt/builder.sh deleted file mode 100644 index b14a0432ea58..000000000000 --- a/pkgs/development/compilers/gwt/builder.sh +++ /dev/null @@ -1,31 +0,0 @@ -source $stdenv/setup - -tar xfvj $src -mkdir -p $out -cp -av $name $out - -# Create wrapper scripts so that the GWT compiler/host work - -libPath="$libstdcpp5/lib:$glib/lib:$gtk/lib:$atk/lib:$pango/lib:$libX11/lib:$libXt/lib:$out/$name/mozilla-1.7.12" - -mkdir -p $out/bin - -cat > $out/bin/gwt-compile < $out/bin/gwt-shell < Date: Mon, 28 Jan 2013 18:21:16 +0100 Subject: [PATCH 005/107] modutils: Remove This package is long obsolete. --- pkgs/os-specific/linux/modutils/default.nix | 10 ---------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 14 deletions(-) delete mode 100644 pkgs/os-specific/linux/modutils/default.nix diff --git a/pkgs/os-specific/linux/modutils/default.nix b/pkgs/os-specific/linux/modutils/default.nix deleted file mode 100644 index 3a063408a2fe..000000000000 --- a/pkgs/os-specific/linux/modutils/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl, bison, flex}: - -stdenv.mkDerivation { - name = "modutils-2.4.27"; - src = fetchurl { - url = mirror://kernel/linux/utils/kernel/modutils/v2.4/modutils-2.4.27.tar.bz2; - md5 = "bac989c74ed10f3bf86177fc5b4b89b6"; - }; - buildInputs = [bison flex]; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f617914c404c..ea7173d692ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6200,10 +6200,6 @@ let inherit stdenv module_init_tools modules buildEnv; }; - modutils = callPackage ../os-specific/linux/modutils { - stdenv = overrideGCC stdenv gcc34; - }; - multipath_tools = callPackage ../os-specific/linux/multipath-tools { }; nettools = callPackage ../os-specific/linux/net-tools { }; From 424d695cd8755fe358cb2029f51c57109a3dacc6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jan 2013 18:25:10 +0100 Subject: [PATCH 006/107] xfig: Use the default gcc --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea7173d692ad..fec9eab34a0d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8114,9 +8114,7 @@ let xfe = callPackage ../applications/misc/xfe { }; - xfig = callPackage ../applications/graphics/xfig { - stdenv = overrideGCC stdenv gcc34; - }; + xfig = callPackage ../applications/graphics/xfig { }; xineUI = callPackage ../applications/video/xine-ui { }; From 8cc94dc6525983a0f670417e93425066c2123c5c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jan 2013 18:27:49 +0100 Subject: [PATCH 007/107] ov511: Remove This is very obsolete (last updated for Linux 2.6.0-test4). --- pkgs/os-specific/linux/ov511/default.nix | 1 - .../linux/ov511/ov511-2.30-builder.sh | 18 --------- .../linux/ov511/ov511-2.30-default.nix | 13 ------- .../linux/ov511/ov511-2.32-kdir.patch | 20 ---------- .../linux/ov511/ov511-kernel.patch | 39 ------------------- pkgs/top-level/all-packages.nix | 4 -- pkgs/top-level/release-python.nix | 1 - 7 files changed, 96 deletions(-) delete mode 100644 pkgs/os-specific/linux/ov511/default.nix delete mode 100644 pkgs/os-specific/linux/ov511/ov511-2.30-builder.sh delete mode 100644 pkgs/os-specific/linux/ov511/ov511-2.30-default.nix delete mode 100644 pkgs/os-specific/linux/ov511/ov511-2.32-kdir.patch delete mode 100644 pkgs/os-specific/linux/ov511/ov511-kernel.patch diff --git a/pkgs/os-specific/linux/ov511/default.nix b/pkgs/os-specific/linux/ov511/default.nix deleted file mode 100644 index 628261e6c5f0..000000000000 --- a/pkgs/os-specific/linux/ov511/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ./ov511-2.30-default.nix diff --git a/pkgs/os-specific/linux/ov511/ov511-2.30-builder.sh b/pkgs/os-specific/linux/ov511/ov511-2.30-builder.sh deleted file mode 100644 index 21a2ac725ca7..000000000000 --- a/pkgs/os-specific/linux/ov511/ov511-2.30-builder.sh +++ /dev/null @@ -1,18 +0,0 @@ -source $stdenv/setup - -hashname=$(basename $kernel) -echo $hashname -if echo "$hashname" | grep -q '^[a-z0-9]\{32\}-'; then - hashname=$(echo "$hashname" | cut -c -32) -fi - -stripHash $kernel -version=$(echo $strippedName | cut -c 7-)-$hashname - -echo "version $version" - -export version - -mkdir -p $out/lib/modules/$version/kernel/drivers/usb/media/ - -genericBuild diff --git a/pkgs/os-specific/linux/ov511/ov511-2.30-default.nix b/pkgs/os-specific/linux/ov511/ov511-2.30-default.nix deleted file mode 100644 index ec9cda0e4d1e..000000000000 --- a/pkgs/os-specific/linux/ov511/ov511-2.30-default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, kernel}: - -stdenv.mkDerivation { - name = "ov511-2.30-${kernel.version}"; - builder = ./ov511-2.30-builder.sh; - src = fetchurl { - url = http://nixos.org/tarballs/ov511-2.30.tar.bz2; - md5 = "9eacf9e54f2f54a59ddbf14221a53f2a"; - }; - patches = [./ov511-kernel.patch ./ov511-2.32-kdir.patch]; - inherit kernel; - NIX_GLIBC_FLAGS_SET=1; -} diff --git a/pkgs/os-specific/linux/ov511/ov511-2.32-kdir.patch b/pkgs/os-specific/linux/ov511/ov511-2.32-kdir.patch deleted file mode 100644 index e0a1175a7ff4..000000000000 --- a/pkgs/os-specific/linux/ov511/ov511-2.32-kdir.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -rc ov511-2.32/Makefile ov511-2.32.new/Makefile -*** ov511-2.32/Makefile 2006-03-28 17:47:31.000000000 +0200 ---- ov511-2.32.new/Makefile 2006-07-17 09:46:17.000000000 +0200 -*************** -*** 114,120 **** - - else # We were called from command line - -! KDIR := /lib/modules/$(shell uname -r)/build - PWD := $(shell pwd) - - default: ---- 114,120 ---- - - else # We were called from command line - -! KDIR := $(kernel)/lib/modules/$(version)/build - PWD := $(shell pwd) - - default: diff --git a/pkgs/os-specific/linux/ov511/ov511-kernel.patch b/pkgs/os-specific/linux/ov511/ov511-kernel.patch deleted file mode 100644 index eca39e90fced..000000000000 --- a/pkgs/os-specific/linux/ov511/ov511-kernel.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -rc ov511-2.32/do_install.sh ov511-2.32.new/do_install.sh -*** ov511-2.32/do_install.sh 2003-11-12 09:24:29.000000000 +0100 ---- ov511-2.32.new/do_install.sh 2006-07-16 19:44:56.000000000 +0200 -*************** -*** 8,15 **** - - UNAME=`uname -r` - -! INSTALL_PATH_2_4=/lib/modules/$UNAME/kernel/drivers/usb/ -! INSTALL_PATH_2_6=/lib/modules/$UNAME/kernel/drivers/usb/media/ - - MAJMIN=`echo $UNAME | cut -d . -f 1-2` - ---- 8,15 ---- - - UNAME=`uname -r` - -! INSTALL_PATH_2_4=$out/lib/modules/$version/kernel/drivers/usb/ -! INSTALL_PATH_2_6=$out/lib/modules/$version/kernel/drivers/usb/media/ - - MAJMIN=`echo $UNAME | cut -d . -f 1-2` - -*************** -*** 35,41 **** - install $MODULE $INSTALL_PATH - done - -! echo Finding module dependencies -! /sbin/depmod -ae - - echo All done! ---- 35,41 ---- - install $MODULE $INSTALL_PATH - done - -! #echo Finding module dependencies -! #/sbin/depmod -ae - - echo All done! diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fec9eab34a0d..8b676f499090 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6087,10 +6087,6 @@ let */ ndiswrapper = callPackage ../os-specific/linux/ndiswrapper { }; - ov511 = callPackage ../os-specific/linux/ov511 { - stdenv = overrideGCC stdenv gcc34; - }; - perf = callPackage ../os-specific/linux/kernel/perf.nix { }; spl = callPackage ../os-specific/linux/spl/default.nix { }; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index d4cc54d367c9..ce7b70e3c94e 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -1106,7 +1106,6 @@ in nvidia_x11_legacy96 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; openafsClient = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; openiscsi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ov511 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; perf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; spl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; sysprof = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; From e460a3f37c6720e608fabb96357ae48d91f247ae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jan 2013 19:30:32 +0100 Subject: [PATCH 008/107] pkgs/build-support/native-darwin-x11-and-opengl: lift native X11 and OpenGL implementation from Darwin into the Nix store --- .../native-darwin-x11-and-opengl/default.nix | 12 ++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/build-support/native-darwin-x11-and-opengl/default.nix diff --git a/pkgs/build-support/native-darwin-x11-and-opengl/default.nix b/pkgs/build-support/native-darwin-x11-and-opengl/default.nix new file mode 100644 index 000000000000..cee03741dce6 --- /dev/null +++ b/pkgs/build-support/native-darwin-x11-and-opengl/default.nix @@ -0,0 +1,12 @@ +{ stdenv, writeScript }: + +assert stdenv.isDarwin; + +stdenv.mkDerivation rec { + name = "darwin-native-x11-and-opengl"; + + builder = writeScript "${name}-builder.sh" '' + /bin/mkdir -p $out + /bin/ln -sv /usr/X11/{bin,lib,include,share} $out/ + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b676f499090..199bb58371e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4587,6 +4587,8 @@ let mesaSupported = lib.elem system lib.platforms.mesaPlatforms; + darwinX11AndOpenGL = callPackage ../build-support/native-darwin-x11-and-opengl { }; + mesa = callPackage ../development/libraries/mesa { }; metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec { From 4a3904f82cb2b5cbd815755576cb66c4ba962ce2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jan 2013 19:31:50 +0100 Subject: [PATCH 009/107] all-packages: redirect 'x11' attribute on Darwin to the native implementation --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 199bb58371e5..41e1e1d262b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -161,8 +161,7 @@ let ### Symbolic names. - - x11 = xlibsWrapper; + x11 = if stdenv.isDarwin then darwinX11AndOpenGL else xlibsWrapper; # `xlibs' is the set of X library components. This used to be the # old modular X llibraries project (called `xlibs') but now it's just From 07cdc02266e3854d914c966d0746fb29dcae8ba7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jan 2013 19:32:29 +0100 Subject: [PATCH 010/107] all-packages: redirect 'mesa' attribute on Darwin to the native implementation --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41e1e1d262b3..5b1a81a3b943 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4588,7 +4588,8 @@ let darwinX11AndOpenGL = callPackage ../build-support/native-darwin-x11-and-opengl { }; - mesa = callPackage ../development/libraries/mesa { }; + mesa = if stdenv.isDarwin then darwinX11AndOpenGL else + callPackage ../development/libraries/mesa { }; metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec { sdfLibrary = callPackage ../development/libraries/sdf-library { aterm = aterm28; }; From c924e051b69778d4f94c44195cec0fec5c9bf62c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jan 2013 19:32:47 +0100 Subject: [PATCH 011/107] all-packages: redirect 'freeglut' attribute on Darwin to the native implementation --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b1a81a3b943..f9cf2896dfdd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3654,7 +3654,8 @@ let freealut = callPackage ../development/libraries/freealut { }; - freeglut = callPackage ../development/libraries/freeglut { }; + freeglut = if stdenv.isDarwin then darwinX11AndOpenGL else + callPackage ../development/libraries/freeglut { }; freetype = callPackage ../development/libraries/freetype { }; From 6950cf3bc4c9868dc92d6aeda226860256d38c01 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jan 2013 19:40:02 +0100 Subject: [PATCH 012/107] xfig: update download location of the Debian patch files --- pkgs/applications/graphics/xfig/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix index e4ab57989184..c5f147ed032f 100644 --- a/pkgs/applications/graphics/xfig/default.nix +++ b/pkgs/applications/graphics/xfig/default.nix @@ -20,20 +20,20 @@ stdenv.mkDerivation { patches = let - debPrefix = "http://patch-tracker.debian.org/patch/series/dl/xfig/1:3.2.5.b-2"; + debPrefix = "http://patch-tracker.debian.org/patch/series/dl/xfig/1:3.2.5.b-3"; in [ (fetchurl { - url = "${debPrefix}/35_CVE-2010-4262.dpatch"; - sha256 = "18741b3dbipgr55fyp5x0296za3336ylln639jw8yjcyd1call22"; + url = "${debPrefix}/35_CVE-2010-4262.patch"; + sha256 = "1pj669sz49wzjvvm96gwbnani7wqi0ijh21imqdzqw47qxdv7zp5"; }) (fetchurl { - url = "${debPrefix}/13_remove_extra_libs.dpatch"; - sha256 = "0v3k30ib7xq5wfhd3yacnal4gbih7nqw0z0aycvc0hafffl97i46"; + url = "${debPrefix}/13_remove_extra_libs.patch"; + sha256 = "1qb14ay0c8xrjzhi21jl7sl8mdzxardldzpnflkzml774bbpn8av"; }) (fetchurl { - url = "${debPrefix}/36_libpng15.dpatch"; - sha256 = "0ssmvlcpjn3iqj3l38db8j8qpqbzixlwpczq01m49r5w9l3viy8k"; + url = "${debPrefix}/36_libpng15.patch"; + sha256 = "0jd5bqj7sj9bbnxg2d0y6zmv4ka4qif2x4zc84ngdqga5433anvn"; }) ]; From 8a9ba8c382339ef8db5b6267375009323000454b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 28 Jan 2013 21:24:04 +0100 Subject: [PATCH 013/107] git: adding an option not to build the manual asciidoc+xsltproc take hours to run --- .../version-management/git-and-tools/git/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index db3833f1855b..87fa119252c1 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -3,6 +3,7 @@ , libxslt, tcl, tk, makeWrapper , svnSupport, subversionClient, perlLibs, smtpPerlLibs , guiSupport +, withManual ? true , pythonSupport ? true , sendEmailSupport }: @@ -26,8 +27,7 @@ stdenv.mkDerivation { patches = [ ./docbook2texi.patch ]; buildInputs = [curl openssl zlib expat gettext cpio makeWrapper] - ++ # documentation tools - [ asciidoc texinfo xmlto docbook2x + ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt ] ++ stdenv.lib.optionals guiSupport [tcl tk]; @@ -91,7 +91,7 @@ stdenv.mkDerivation { notSupported $out/libexec/git-core/git-send-email "reinstall with config git = { sendEmailSupport = true } set" '') - + ''# Install man pages and Info manual + + stdenv.lib.optionalString withManual ''# Install man pages and Info manual make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${perl}/bin/perl" cmd-list.made install install-info \ -C Documentation '' From 615b1d42a782b32895a7d535d3ef6cf5ebf1e6da Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jan 2013 23:13:03 +0100 Subject: [PATCH 014/107] JSON::Any: Pull in JSON --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7e80f23a19ff..a51abf44ff24 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2641,7 +2641,7 @@ rec { url = mirror://cpan/authors/id/P/PE/PERIGRIN/JSON-Any-1.29.tar.gz; sha256 = "15v2j9dh58r7r4s7rnnmgnzzbyz61bhyxwpx1z7r811ixs9bkks2"; }; - buildInputs = [ JSON ]; + propagatedBuildInputs = [ JSON ]; meta = { description = "Wrapper Class for the various JSON classes"; license = "perl"; From 111b2034671b091ba324deb4aa246672e3c52dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 29 Jan 2013 00:26:20 +0100 Subject: [PATCH 015/107] Updates related to VAAPI/VDPAU Making ffmpeg link to libva. Add the vdpau driver for vaapi. --- pkgs/development/libraries/ffmpeg/1.1.nix | 3 +++ pkgs/development/libraries/libva/default.nix | 11 +++++---- .../libraries/vaapi-vdpau/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/vaapi-vdpau/default.nix diff --git a/pkgs/development/libraries/ffmpeg/1.1.nix b/pkgs/development/libraries/ffmpeg/1.1.nix index 6651f1783f80..a40b40d68be9 100644 --- a/pkgs/development/libraries/ffmpeg/1.1.nix +++ b/pkgs/development/libraries/ffmpeg/1.1.nix @@ -7,6 +7,7 @@ , x264Support ? true, x264 ? null , xvidSupport ? true, xvidcore ? null , vdpauSupport ? true, libvdpau ? null +, vaapiSupport ? true, libva ? null , faacSupport ? false, faac ? null , dc1394Support ? false, libdc1394 ? null , x11grabSupport ? false, libXext ? null, libXfixes ? null @@ -19,6 +20,7 @@ assert vpxSupport -> libvpx != null; assert x264Support -> x264 != null; assert xvidSupport -> xvidcore != null; assert vdpauSupport -> libvdpau != null; +assert vaapiSupport -> libva != null; assert faacSupport -> faac != null; assert x11grabSupport -> libXext != null && libXfixes != null; @@ -62,6 +64,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional x264Support x264 ++ stdenv.lib.optional xvidSupport xvidcore ++ stdenv.lib.optional vdpauSupport libvdpau + ++ stdenv.lib.optional vaapiSupport libva ++ stdenv.lib.optional faacSupport faac ++ stdenv.lib.optional dc1394Support libdc1394 ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 9b2eb19bab4d..cf030eda777d 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes, intelgen4asm }: +{ stdenv, fetchurl, autoconf, automake, libtool, libX11, pkgconfig, libXext, mesa +, libdrm, libXfixes, intelgen4asm, which }: stdenv.mkDerivation rec { - name = "libva-1.0.12"; + name = "libva-1.1.0"; src = fetchurl { url = "http://cgit.freedesktop.org/libva/snapshot/${name}.tar.bz2"; - sha256 = "1xg8zvmh75w63sc8ykagzrbzswph6g9jardy8v83glkqzilaw2p8"; + sha256 = "0lqkharln67p60jlyz9y662gjgqk2iy2nrj84j1jr1nzgw7j01a5"; }; buildInputs = [ autoconf automake libtool libX11 libXext pkgconfig mesa libdrm - libXfixes intelgen4asm ]; + libXfixes intelgen4asm which ]; - configureFlags = [ "--enable-i965-driver" "--enable-glx" ]; + configureFlags = [ "--enable-glx" ]; preConfigure = "sh autogen.sh"; diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix new file mode 100644 index 000000000000..58ebc1032755 --- /dev/null +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, autoconf, automake, libtool, libvdpau, mesa, libva, pkgconfig }: + +stdenv.mkDerivation rec { + name = "vdpau-driver-0.7.4"; + + src = fetchurl { + url = "http://cgit.freedesktop.org/vdpau-driver/snapshot/${name}.tar.bz2"; + sha256 = "1kvhpqwzw01bfamvxhnl4yhmb7pwkkfaii3w7bidd4vj1gsrx5l4"; + }; + + buildInputs = [ autoconf automake libtool libvdpau mesa libva pkgconfig ]; + + preConfigure = '' + sh autogen.sh + sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure + ''; + + meta = { + homepage = http://cgit.freedesktop.org/vaapi/vdpau-driver/; + license = "GPLv2+"; + description = "VDPAU driver for the VAAPI library"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9cf2896dfdd..9cd5943b9371 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5057,6 +5057,8 @@ let ucommon = callPackage ../development/libraries/ucommon { }; + vdpauDriver = callPackage ../development/libraries/vaapi-vdpau { }; + vamp = callPackage ../development/libraries/audio/vamp { }; vcdimager = callPackage ../development/libraries/vcdimager { }; From c73655fa9251bae3b9316d3ee9c7d55838f1f59b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 29 Jan 2013 00:31:35 +0100 Subject: [PATCH 016/107] Adding the vaapi Intel driver. I also renamed the vdpau driver to 'vaapiDriver' in all-packages. I think it's a better name. --- .../libraries/vaapi-intel/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/vaapi-intel/default.nix diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix new file mode 100644 index 000000000000..432daa88a332 --- /dev/null +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, autoconf, automake, libtool, mesa, libva, libdrm, libX11, pkgconfig }: + +stdenv.mkDerivation rec { + name = "intel-driver-1.0.19"; + + src = fetchurl { + url = "http://cgit.freedesktop.org/intel-driver/snapshot/${name}.tar.bz2"; + sha256 = "1ns6y1hdqvqd92mc0d6axyh17rgyzp73xnbf97mnnzi9fc47x6p1"; + }; + + buildInputs = [ autoconf automake libtool mesa libva pkgconfig libdrm libX11 ]; + + preConfigure = '' + sh autogen.sh + sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure + ''; + + meta = { + homepage = http://cgit.freedesktop.org/vaapi/intel-driver/; + license = "MIT"; + description = "Intel driver for the VAAPI library"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cd5943b9371..7b17379aedcb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5057,7 +5057,9 @@ let ucommon = callPackage ../development/libraries/ucommon { }; - vdpauDriver = callPackage ../development/libraries/vaapi-vdpau { }; + vaapiIntel = callPackage ../development/libraries/vaapi-intel { }; + + vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { }; vamp = callPackage ../development/libraries/audio/vamp { }; From 5d6da38d33ca927af337d91d6bd436aa6095b3e9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 29 Jan 2013 12:16:40 +0100 Subject: [PATCH 017/107] cups: Don't build on Darwin --- pkgs/misc/cups/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index f19298e7ccdd..6cc13aa3013a 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation { description = "A standards-based printing system for UNIX"; license = stdenv.lib.licenses.gpl2; # actually LGPL for the library and GPL for the rest maintainers = [ stdenv.lib.maintainers.urkud stdenv.lib.maintainers.simons ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = stdenv.lib.platforms.linux; }; } From 8317cd1f1481092103d2d9b18dae24fa6ed8d677 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 29 Jan 2013 12:23:34 +0100 Subject: [PATCH 018/107] kde-3: Remove KDE 3 hasn't built in a long time. Also remove six, the only package with a dependency on KDE 3. --- .../applications/misc/taskjuggler/default.nix | 5 +- pkgs/desktops/kde-3/kdelibs/default.nix | 51 ----- pkgs/desktops/kde-3/kdelibs/inotify.patch | 30 --- .../kdelibs-3.5.10-openssl_1.0.0.patch | 180 ------------------ pkgs/development/libraries/arts/default.nix | 31 --- pkgs/games/six/default.nix | 35 ---- pkgs/games/six/gcc43-includes.patch | 38 ---- pkgs/top-level/all-packages.nix | 22 +-- 8 files changed, 2 insertions(+), 390 deletions(-) delete mode 100644 pkgs/desktops/kde-3/kdelibs/default.nix delete mode 100644 pkgs/desktops/kde-3/kdelibs/inotify.patch delete mode 100644 pkgs/desktops/kde-3/kdelibs/kdelibs-3.5.10-openssl_1.0.0.patch delete mode 100644 pkgs/development/libraries/arts/default.nix delete mode 100644 pkgs/games/six/default.nix delete mode 100644 pkgs/games/six/gcc43-includes.patch diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/default.nix index 652450e510b4..b8edd93455dd 100644 --- a/pkgs/applications/misc/taskjuggler/default.nix +++ b/pkgs/applications/misc/taskjuggler/default.nix @@ -1,7 +1,6 @@ {stdenv, fetchurl, zlib, libpng, libjpeg, perl, expat, qt3, libX11, libXext, libSM, libICE, -withKde, kdelibs, kdebase }: stdenv.mkDerivation rec { @@ -13,7 +12,6 @@ stdenv.mkDerivation rec { buildInputs = [zlib libpng libX11 libXext libSM libICE perl expat libjpeg] - ++ (if withKde then [kdelibs] else []) ; patches = [ ./timezone-glibc.patch ]; @@ -51,7 +49,6 @@ stdenv.mkDerivation rec { --x-includes=${libX11}/include --x-libraries=${libX11}/lib --with-qt-dir=${qt3} - --with-kde-support=${if withKde then "yes" else "no"} --with-ical-support=${if withKde then "yes" else "no"} "; preInstall = '' @@ -61,7 +58,7 @@ stdenv.mkDerivation rec { installFlags = # kde_locale is not defined when installing without kde. - if withKde then "" else "kde_locale=\${out}/share/locale"; + "kde_locale=\${out}/share/locale"; meta = { homepage = "http://www.taskjuggler.org"; diff --git a/pkgs/desktops/kde-3/kdelibs/default.nix b/pkgs/desktops/kde-3/kdelibs/default.nix deleted file mode 100644 index 2c9e8e3563a8..000000000000 --- a/pkgs/desktops/kde-3/kdelibs/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, fetchurl, xlibs, zlib, perl, qt3, openssl, pcre -, pkgconfig, libtiff, libxml2, libxslt, libtool, expat -, freetype, bzip2, cups, attr, acl -}: - -let version = "3.5.10"; in - -stdenv.mkDerivation { - name = "kdelibs-${version}"; - - src = fetchurl { - url = "mirror://kde/stable/${version}/src/kdelibs-${version}.tar.bz2"; - sha256 = "0wjw51r96h6rngbsrzndw890xggzvrakydsbaldlrvbh3jq9qzk1"; - }; - - patches = [ - # We're not supposed to use linux/inotify.h, use sys/inotify.h instead. - # Adapted from Gentoo. - ./inotify.patch - - # Fixes compilation issues with openssl-1.0.0 - ./kdelibs-3.5.10-openssl_1.0.0.patch - ]; - - buildInputs = [ - zlib perl qt3 openssl pcre pkgconfig libtiff libxml2 - libxslt expat libtool freetype bzip2 cups - xlibs.libX11 xlibs.libXt xlibs.libXext xlibs.libXrender xlibs.libXft - ]; - - propagatedBuildInputs = [attr acl]; - - # Prevent configure from looking for pkg-config and freetype-config - # in the wrong location (it looks in /usr/bin etc. *before* looking - # in $PATH). - preConfigure = '' - substituteInPlace configure \ - --replace /usr/bin /no-such-path \ - --replace /usr/local/bin /no-such-path \ - --replace /opt/local/bin /no-such-path - ''; - - configureFlags = '' - --without-arts - --with-ssl-dir=${openssl} - --x-includes=${xlibs.libX11}/include - --x-libraries=${xlibs.libX11}/lib - ''; - - meta.platforms = stdenv.lib.platforms.linux; -} diff --git a/pkgs/desktops/kde-3/kdelibs/inotify.patch b/pkgs/desktops/kde-3/kdelibs/inotify.patch deleted file mode 100644 index 3d0b470811af..000000000000 --- a/pkgs/desktops/kde-3/kdelibs/inotify.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -rc kdelibs-3.5.10-orig/kio/kio/kdirwatch.cpp kdelibs-3.5.10/kio/kio/kdirwatch.cpp -*** kdelibs-3.5.10-orig/kio/kio/kdirwatch.cpp 2006-07-22 10:16:37.000000000 +0200 ---- kdelibs-3.5.10/kio/kio/kdirwatch.cpp 2009-04-01 13:26:48.000000000 +0200 -*************** -*** 64,74 **** - // debug - #include - -! #ifdef HAVE_INOTIFY - #include - #include - #include -- #include - // Linux kernel headers are documented to not compile - #define _S390_BITOPS_H - #include ---- 64,76 ---- - // debug - #include - -! #if 1 -! #include -! #include -! #elif HAVE_INOTIFY - #include - #include - #include - // Linux kernel headers are documented to not compile - #define _S390_BITOPS_H - #include diff --git a/pkgs/desktops/kde-3/kdelibs/kdelibs-3.5.10-openssl_1.0.0.patch b/pkgs/desktops/kde-3/kdelibs/kdelibs-3.5.10-openssl_1.0.0.patch deleted file mode 100644 index 7a3a96e972f8..000000000000 --- a/pkgs/desktops/kde-3/kdelibs/kdelibs-3.5.10-openssl_1.0.0.patch +++ /dev/null @@ -1,180 +0,0 @@ -diff -Naur kdelibs-3.5.10-old/kio/kssl/kopenssl.cc kdelibs-3.5.10-new/kio/kssl/kopenssl.cc ---- kdelibs-3.5.10-old/kio/kssl/kopenssl.cc 2006-07-22 01:16:39.000000000 -0700 -+++ kdelibs-3.5.10-new/kio/kssl/kopenssl.cc 2010-03-31 09:34:38.000000000 -0700 -@@ -96,9 +96,14 @@ - static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *, - const EVP_CIPHER *,unsigned char *,int , - pem_password_cb *, void *) = 0L; -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L; -+static ASN1_ITEM *K_NETSCAPE_X509_it = 0L; -+#else - static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L; - static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L; - static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L; -+#endif - static int (*K_X509_print_fp) (FILE *, X509*) = 0L; - static int (*K_i2d_PKCS12) (PKCS12*, unsigned char**) = 0L; - static int (*K_i2d_PKCS12_fp) (FILE *, PKCS12*) = 0L; -@@ -404,9 +409,14 @@ - K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) _cryptoLib->symbol("BIO_ctrl"); - K_BIO_write = (int (*) (BIO *b, const void *data, int len)) _cryptoLib->symbol("BIO_write"); - K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) _cryptoLib->symbol("PEM_ASN1_write_bio"); -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_item_i2d_fp"); -+ K_NETSCAPE_X509_it = (ASN1_ITEM *) _cryptoLib->symbol("NETSCAPE_X509_it"); -+#else - K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) _cryptoLib->symbol("X509_asn1_meth"); - K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_i2d_fp"); - K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) _cryptoLib->symbol("i2d_ASN1_HEADER"); -+#endif - K_X509_print_fp = (int (*)(FILE*, X509*)) _cryptoLib->symbol("X509_print_fp"); - K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) _cryptoLib->symbol("i2d_PKCS12"); - K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) _cryptoLib->symbol("i2d_PKCS12_fp"); -@@ -568,7 +578,7 @@ - K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session"); - K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION"); - K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION"); -- K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers"); -+ K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers"); - #endif - - -@@ -956,7 +966,13 @@ - else return -1; - } - -- -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) { -+ if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it) -+ return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x); -+ else return -1; -+} -+#else - ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) { - if (K_X509_asn1_meth) return (K_X509_asn1_meth)(); - else return 0L; -@@ -968,7 +984,7 @@ - return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x); - else return -1; - } -- -+#endif - - int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) { - if (K_X509_print_fp) return (K_X509_print_fp)(fp, x); -diff -Naur kdelibs-3.5.10-old/kio/kssl/kopenssl.h kdelibs-3.5.10-new/kio/kssl/kopenssl.h ---- kdelibs-3.5.10-old/kio/kssl/kopenssl.h 2006-07-22 01:16:39.000000000 -0700 -+++ kdelibs-3.5.10-new/kio/kssl/kopenssl.h 2010-03-31 09:35:20.000000000 -0700 -@@ -48,6 +48,9 @@ - #include - #include - #undef crypt -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+#define STACK _STACK -+#endif - #endif - - #include -@@ -446,12 +449,12 @@ - */ - int PEM_write_bio_X509(BIO *bp, X509 *x); - -- -+#if OPENSSL_VERSION_NUMBER < 0x10000000L - /* - * X509_asn1_meth - used for netscape output - */ - ASN1_METHOD *X509_asn1_meth(); -- -+#endif - - /* - * ASN1_i2d_fp - used for netscape output -@@ -531,6 +534,9 @@ - */ - void sk_free(STACK *s); - -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ void sk_free(void *s) { return sk_free(reinterpret_cast(s)); } -+#endif - - /* - * Number of elements in the stack -@@ -543,6 +549,9 @@ - */ - char *sk_value(STACK *s, int n); - -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ char *sk_value(void *s, int n) { return sk_value(reinterpret_cast(s), n); } -+#endif - - /* - * Create a new stack -@@ -555,6 +564,9 @@ - */ - int sk_push(STACK *s, char *d); - -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ int sk_push(void *s, void *d) { return sk_push(reinterpret_cast(s), reinterpret_cast(d)); } -+#endif - - /* - * Duplicate the stack -diff -Naur kdelibs-3.5.10-old/kio/kssl/ksmimecrypto.cc kdelibs-3.5.10-new/kio/kssl/ksmimecrypto.cc ---- kdelibs-3.5.10-old/kio/kssl/ksmimecrypto.cc 2005-10-10 08:05:44.000000000 -0700 -+++ kdelibs-3.5.10-new/kio/kssl/ksmimecrypto.cc 2010-03-31 09:34:38.000000000 -0700 -@@ -87,7 +87,7 @@ - - - STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(QPtrList &certs) { -- STACK_OF(X509) *x509 = sk_new(NULL); -+ STACK_OF(X509) *x509 = reinterpret_cast(sk_new(NULL)); - KSSLCertificate *cert = certs.first(); - while(cert) { - sk_X509_push(x509, cert->getCert()); -diff -Naur kdelibs-3.5.10-old/kio/kssl/ksslcertificate.cc kdelibs-3.5.10-new/kio/kssl/ksslcertificate.cc ---- kdelibs-3.5.10-old/kio/kssl/ksslcertificate.cc 2006-01-19 09:06:12.000000000 -0800 -+++ kdelibs-3.5.10-new/kio/kssl/ksslcertificate.cc 2010-03-31 09:34:38.000000000 -0700 -@@ -1003,17 +1003,31 @@ - QByteArray KSSLCertificate::toNetscape() { - QByteArray qba; - #ifdef KSSL_HAVE_SSL --ASN1_HEADER ah; --ASN1_OCTET_STRING os; --KTempFile ktf; -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ NETSCAPE_X509 nx; -+ ASN1_OCTET_STRING hdr; -+#else -+ ASN1_HEADER ah; -+ ASN1_OCTET_STRING os; -+#endif -+ KTempFile ktf; - -- os.data = (unsigned char *)NETSCAPE_CERT_HDR; -- os.length = strlen(NETSCAPE_CERT_HDR); -- ah.header = &os; -- ah.data = (char *)getCert(); -- ah.meth = d->kossl->X509_asn1_meth(); -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ hdr.data = (unsigned char *)NETSCAPE_CERT_HDR; -+ hdr.length = strlen(NETSCAPE_CERT_HDR); -+ nx.header = &hdr; -+ nx.cert = getCert(); -+ -+ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx); -+#else -+ os.data = (unsigned char *)NETSCAPE_CERT_HDR; -+ os.length = strlen(NETSCAPE_CERT_HDR); -+ ah.header = &os; -+ ah.data = (char *)getCert(); -+ ah.meth = d->kossl->X509_asn1_meth(); - -- d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah); -+ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah); -+#endif - - ktf.close(); - diff --git a/pkgs/development/libraries/arts/default.nix b/pkgs/development/libraries/arts/default.nix deleted file mode 100644 index 50c270f534e7..000000000000 --- a/pkgs/development/libraries/arts/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{stdenv, fetchurl, pkgconfig, glib, kdelibs, libX11, libXext, zlib, libjpeg -, libpng, perl, qt3}: - -stdenv.mkDerivation { - name = "arts-1.5.10"; - - src = fetchurl { - url = mirror://kde/stable/3.5.10/src/arts-1.5.10.tar.bz2; - sha256 = "0ffcm24lkgg3sm89q4zsj8za5h5d9j1195pmbjhx4hj0xcwkiqlj"; - }; - - KDEDIR = kdelibs; - - configureFlags = '' - --with-extra-includes=${libjpeg}/include - --with-extra-libs=${libjpeg}/lib - --x-includes=${libX11}/include - --x-libraries=${libX11}/lib - --disable-dependency-tracking - --enable-final - ''; - - buildNativeInputs = [ pkgconfig perl ]; - - buildInputs = - [glib kdelibs libX11 libXext zlib libjpeg libpng qt3]; - - meta = { - homepage = http://www.arts-project.org/; - }; -} diff --git a/pkgs/games/six/default.nix b/pkgs/games/six/default.nix deleted file mode 100644 index a95ed6c50c65..000000000000 --- a/pkgs/games/six/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, arts, kdelibs, libX11, libXext, libXt, perl, qt3, zlib }: - -let - - versionNumber = "0.5.3"; - -in - -stdenv.mkDerivation { - - name = "six-${versionNumber}"; - - src = fetchurl { - url = "http://six.retes.hu/download/six-${versionNumber}.tar.gz"; - sha256 = "0hialm0kxr11rp5z452whjmxp2vaqqj668d0dfs32fd10ggi8wj4"; - }; - - meta = { - description = "Six - A Hex playing program for KDE"; - homepage = http://six.retes.hu/; - license = "GPLv2"; - platforms = stdenv.lib.platforms.linux; - }; - - buildInputs = [ arts kdelibs libX11 libXext libXt perl qt3 zlib ]; - - # Supress some warnings which are less useful to us when making packages. - NIX_CFLAGS_COMPILE = "-Wno-conversion -Wno-parentheses"; - - # Without "--x-libraries=", we get the error - # "impure path `/usr/lib' used in link". - configureFlags = "--x-libraries="; - - patches = [ ./gcc43-includes.patch ]; -} diff --git a/pkgs/games/six/gcc43-includes.patch b/pkgs/games/six/gcc43-includes.patch deleted file mode 100644 index 83096bb0da2b..000000000000 --- a/pkgs/games/six/gcc43-includes.patch +++ /dev/null @@ -1,38 +0,0 @@ -This patch makes six compile with gcc 4.3 by including more header files. It -is based on the advice at . - ---- a/six/carrier.h -+++ b/six/carrier.h -@@ -2,6 +2,7 @@ - #ifndef CARRIER_H - #define CARRIER_H - -+#include - #include - #include - -diff --git a/six/hexgame.cpp b/six/hexgame.cpp -index 720e977..5d0dafe 100644 ---- a/six/hexgame.cpp -+++ b/six/hexgame.cpp -@@ -3,6 +3,7 @@ - #include - #include - #include -+#include - - #include - -diff --git a/six/main.cpp b/six/main.cpp -index 7fb5c21..b925a0c 100644 ---- a/six/main.cpp -+++ b/six/main.cpp -@@ -4,6 +4,8 @@ - #include "carrier.h" - #include "misc.h" - -+#include -+ - #include - #include - #include diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b17379aedcb..7391ca21d104 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7887,11 +7887,7 @@ let teamspeak_client = callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; - taskjuggler = callPackage ../applications/misc/taskjuggler { - # KDE support is not working yet. - inherit (kde3) kdelibs kdebase; - withKde = config.taskJuggler.kde or false; - }; + taskjuggler = callPackage ../applications/misc/taskjuggler { }; taskwarrior = callPackage ../applications/misc/taskwarrior { }; @@ -8367,10 +8363,6 @@ let simutrans = callPackage ../games/simutrans { }; - six = callPackage ../games/six { - inherit (kde3) arts kdelibs; - }; - soi = callPackage ../games/soi {}; # You still can override by passing more arguments. @@ -8495,18 +8487,6 @@ let gnome = recurseIntoAttrs gnome2; - kde3 = recurseIntoAttrs { - - kdelibs = callPackage ../desktops/kde-3/kdelibs { - stdenv = overrideGCC stdenv gcc43; - }; - - arts = callPackage ../development/libraries/arts { - inherit (pkgs.kde3) kdelibs; - }; - - }; - kde4 = recurseIntoAttrs pkgs.kde47; kde47 = kdePackagesFor (pkgs.kde47 // { From 97c5ab3a6d474a36b5ffb309857cd230d55d344e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 29 Jan 2013 12:29:51 +0100 Subject: [PATCH 019/107] linux-2.6.32-xen: Remove Hasn't built in a long time and is obsolete anyway. --- .../linux/kernel/linux-2.6.32-xen.nix | 222 ------------------ pkgs/top-level/all-packages.nix | 13 - 2 files changed, 235 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix deleted file mode 100644 index 20e14ccf5e27..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix +++ /dev/null @@ -1,222 +0,0 @@ -{ stdenv, fetchurl, extraConfig ? "", ... } @ args: - -let - configWithPlatform = kernelPlatform: - '' - # Don't include any debug features. - DEBUG_KERNEL n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - NUMA? n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI y - MTD_COMPLEX_MAPPINGS y # needed for many devices - NET_POCKET y # enable pocket and portable adapters - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - IWLWIFI_LEDS? y - IWLWIFI_SPECTRUM_MEASUREMENT y - IWL3945_SPECTRUM_MEASUREMENT y - IWL4965 y # Intel Wireless WiFi 4965AGN - IWL5000 y # Intel Wireless WiFi 5000AGN - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # The intel drivers already require KMS - DRM_I915_KMS y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - OCFS2_FS_POSIX_ACL y - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - CIFS_XATTR y - CIFS_POSIX y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_BSG n - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM_TTY y # RFCOMM TTY support - CPU_FREQ_DEBUG n - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - KALLSYMS_EXTRA_PASS n - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PCI_LEGACY y - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - # Enable Xen Dom0 support. - XEN_DOM0 y - XEN_PCI_PASSTHROUGH y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "2.6.32.24-xen-179eca5"; - localVersion = "-xen-179eca5"; - - src = fetchurl { - url = "http://nixos.org/tarballs/linux-${version}.tar.bz2"; - sha256 = "09a7xh4hvw0hzq67dqdxn8p4rkd907937xvshx30rg4ab6717scf"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - - meta.description = "Linux kernel suitable for Xen Domain 0"; - } - - // removeAttrs args ["extraConfig"] -) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7391ca21d104..5af580757b1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5880,18 +5880,6 @@ let ]; }; - linux_2_6_32_xen = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.32-xen.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ kernelPatches.fbcondecor_2_6_31 - kernelPatches.sec_perm_2_6_24 - # kernelPatches.aufs2_2_6_32 - kernelPatches.cifs_timeout_2_6_29 - kernelPatches.no_xsave - kernelPatches.dell_rfkill - ]; - }; - linux_2_6_35 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.35.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -6123,7 +6111,6 @@ let # Build the kernel modules for the some of the kernels. linuxPackages_2_6_32 = recurseIntoAttrs (linuxPackagesFor linux_2_6_32 pkgs.linuxPackages_2_6_32); - linuxPackages_2_6_32_xen = linuxPackagesFor linux_2_6_32_xen pkgs.linuxPackages_2_6_32_xen; linuxPackages_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_2_6_35 pkgs.linuxPackages_2_6_35); linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 pkgs.linuxPackages_3_0); linuxPackages_3_1 = recurseIntoAttrs (linuxPackagesFor linux_3_1 pkgs.linuxPackages_3_1); From 6dba65b51fd27c722012d1b12fcfca1ccbb031a6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 29 Jan 2013 12:34:58 +0100 Subject: [PATCH 020/107] openoffice: Remove It's superseded by LibreOffice and doesn't build anymore. --- .../applications/office/openoffice/builder.sh | 105 ------------------ .../office/openoffice/default.nix | 105 ------------------ pkgs/applications/office/openoffice/oo.patch | 72 ------------ .../office/openoffice/root-required.patch | 25 ----- .../applications/office/openoffice/xlib.patch | 22 ---- pkgs/top-level/all-packages.nix | 8 -- pkgs/top-level/release-cross.nix | 1 - pkgs/top-level/release-python.nix | 1 - pkgs/top-level/release.nix | 1 - 9 files changed, 340 deletions(-) delete mode 100644 pkgs/applications/office/openoffice/builder.sh delete mode 100644 pkgs/applications/office/openoffice/default.nix delete mode 100644 pkgs/applications/office/openoffice/oo.patch delete mode 100644 pkgs/applications/office/openoffice/root-required.patch delete mode 100644 pkgs/applications/office/openoffice/xlib.patch diff --git a/pkgs/applications/office/openoffice/builder.sh b/pkgs/applications/office/openoffice/builder.sh deleted file mode 100644 index 2c6e04e049be..000000000000 --- a/pkgs/applications/office/openoffice/builder.sh +++ /dev/null @@ -1,105 +0,0 @@ -source $stdenv/setup - -export nodep=TRUE -export NO_HIDS=TRUE - -export PATH=$icu/sbin:$PATH - -postUnpack() { - tar xvjf $src_system -} - -preConfigure() { - ./configure --help - - for i in sysui/desktop/share/makefile.mk; do - substituteInPlace $i --replace /bin/bash $shell - done - - SRCDIR= - - sed -e '/CURL_NO_OLDIES/d' -i ucb/source/ucp/ftp/makefile.mk -} - -postConfigure() { - for i in LinuxX86*Env.Set; do - substituteInPlace $i --replace /usr /no-such-path - done - substituteInPlace solenv/inc/libs.mk \ - --replace /usr/lib/libjpeg.so $libjpeg/lib/libjpeg.so \ - --replace /usr/lib64/libjpeg.so $libjpeg/lib/libjpeg.so -} - -buildPhase() { - source LinuxX86*Env.Set.sh - ./bootstrap - # bootstrap defines the alias 'build', that mostly runs this perl script: - (cd instsetoo_native; perl ../solenv/bin/build.pl --all) # wait a few hours... add -P4 for quadcores -} - -wrapSOffice() { - local fn=$1 - local arg=$2 - - # !!! should use makeWrapper for this. - - cat > $out/bin/$fn <> $appl - done - - # Copy icons so that the menu items in KDE and GNOME will look much nicer - (cd $SRC_ROOT/sysui/desktop/icons - install -v -d $out/share/icons/{hicolor,locolor} -m 755 - cp -rv hicolor/*x* $out/share/icons/hicolor - cp -rv locolor/*x* $out/share/icons/locolor - ) - - # The desktop files expect a openoffice.org3 executable in the PATH, which is a symlink to soffice - ln -s $out/bin/soffice $out/bin/openoffice.org3 -} - -genericBuild - diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix deleted file mode 100644 index 5bc5cbf8c9b3..000000000000 --- a/pkgs/applications/office/openoffice/default.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ stdenv, fetchurl, pam, python, tcsh, libxslt, perl, ArchiveZip -, CompressZlib, zlib, libjpeg, expat, pkgconfig, freetype, libwpd -, libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon -, bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which -, icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups -, libXinerama, openssl, gperf, cppunit, GConf, ORBit2 -}: - -let version = "3.2.1"; in - -stdenv.mkDerivation rec { - name = "openoffice.org-${version}"; - builder = ./builder.sh; - - downloadRoot = "http://openoffice.mirrorbrain.org/files/stable"; - versionDirs = true; - - src = fetchurl { - url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_core.tar.bz2"; - sha256 = "0gj2hinhnzkazh44k1an05x5cj7n6721f2grqrkjh31cm38r9p6i"; - }; - - patches = [ ./oo.patch ./root-required.patch ./xlib.patch ]; - - postPatch = - /* Compiling with GCC 4.5 fails: - - Compiling: cppu/source/AffineBridge/AffineBridge.cxx - [...] - ../../inc/uno/lbnames.h:67:2: error: #error "Supported gcc majors are 2 , 3 and 4 <= 4.4. Unsupported gcc major version." - - However, we can't compile with GCC 4.4 because then we'd end up with - two different versions of libstdc++ (because the deps are compiled - with 4.5), which isn't supported (link time error.) - - Thus, force compilation with 4.5 and hope for the best. */ - '' sed -i "cppu/inc/uno/lbnames.h" \ - -e 's/#[[:blank:]]*error "Supported.*$//g' - ''; - - src_system = fetchurl { - url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_system.tar.bz2"; - sha256 = "0giy3sza64ij19w7b06rxcrkrb5kq2fvkz486vh3mv08s8xa8zfc"; - }; - - preConfigure = '' - PATH=$PATH:${icu}/sbin - ''; - - configureFlags = " - --with-package-format=native - --disable-epm - --disable-fontooo - --disable-gnome-vfs - --disable-gnome-vfs - --disable-mathmldtd - --disable-mozilla - --disable-odk - --disable-pasf - --with-cairo - --with-system-libs - --with-system-python - --with-system-boost - --with-system-db - --with-jdk-home=${jdk} - --with-ant-home=${ant} - --without-afms - --without-dict - --without-fonts - --without-myspell-dicts - --without-nas - --without-ppds - --without-system-agg - --without-system-beanshell - --without-system-hsqldb - --without-system-xalan - --without-system-xerces - --without-system-xml-apis - --without-system-xt - --without-system-jars - --without-system-hunspell - --without-system-altlinuxhyph - --without-system-lpsolve - --without-system-graphite - "; - - LD_LIBRARY_PATH = "${libXext}/lib:${libX11}/lib:${libXtst}/lib:${libXi}/lib:${libjpeg}/lib"; - - buildInputs = [ - pam python tcsh libxslt perl ArchiveZip CompressZlib zlib - libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl - libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack - getopt file jdk cairo which icu boost libXext libX11 libXtst libXi - cups libXinerama openssl gperf GConf ORBit2 - ]; - - inherit icu fontconfig libjpeg jdk cups; - - meta = { - description = "OpenOffice.org is a multiplatform and multilingual office suite"; - homepage = http://www.openoffice.org/; - license = "LGPL"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - }; -} diff --git a/pkgs/applications/office/openoffice/oo.patch b/pkgs/applications/office/openoffice/oo.patch deleted file mode 100644 index e759fcdc2d4f..000000000000 --- a/pkgs/applications/office/openoffice/oo.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk -index 74c64bf..fbf8d21 100644 ---- a/libtextcat/makefile.mk -+++ b/libtextcat/makefile.mk -@@ -57,7 +57,7 @@ ADDITIONAL_FILES= \ - #CONFIGURE_DIR=$(BUILD_DIR) - - #relative to CONFIGURE_DIR --CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" -+CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" --prefix=$(TMPDIR) - CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL)) - - BUILD_ACTION=make -diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk -index 0d92de9..aae3b4f 100644 ---- a/redland/raptor/makefile.mk -+++ b/redland/raptor/makefile.mk -@@ -130,7 +130,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config - CONFIGURE_DIR= - CONFIGURE_ACTION=.$/configure - # do not enable grddl parser (#i93768#) --CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml -+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR) - BUILD_ACTION=$(GNUMAKE) - BUILD_FLAGS+= -j$(EXTMAXPROCESS) - BUILD_DIR=$(CONFIGURE_DIR) -diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk -index fba6460..fc70419 100644 ---- a/redland/rasqal/makefile.mk -+++ b/redland/rasqal/makefile.mk -@@ -126,7 +126,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config - - CONFIGURE_DIR= - CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" --CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml -+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR) - BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) - BUILD_FLAGS+= -j$(EXTMAXPROCESS) - BUILD_DIR=$(CONFIGURE_DIR) -diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk -index 710d7d6..dd60f0d 100644 ---- a/redland/redland/makefile.mk -+++ b/redland/redland/makefile.mk -@@ -132,7 +132,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config - - CONFIGURE_DIR= - CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" --CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml -+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR) - BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) - BUILD_FLAGS+= -j$(EXTMAXPROCESS) - BUILD_DIR=$(CONFIGURE_DIR) -diff --git a/hunspell/hunspell-1.2.8.patch b/hunspell/hunspell-1.2.8.patch -index 37b7964..e6fd962 100644 ---- a/hunspell/hunspell-1.2.8.patch -+++ b/hunspell/hunspell-1.2.8.patch -@@ -619,3 +619,15 @@ - p++; - } - if (i > 0 && buf[i - 1] == '\n') { -+diff --git a/hunspell/unxlngi6.pro/misc/build/hunspell-1.2.8/tests/test.sh b/hunspell/unxlngi6.pro/misc/build/hunspell-1.1.12/tests/test.sh -+index 90080f6..f069517 100755 -+--- a/hunspell/unxlngi6.pro/misc/build/hunspell-1.2.8/tests/test.sh -++++ b/hunspell/unxlngi6.pro/misc/build/hunspell-1.2.8/tests/test.sh -+--- misc/hunspell-1.2.8/tests/test.sh Sep 4 01:25:35 2007 -++++ misc/build/hunspell-1.2.8/tests/test.sh Jun 18 11:53:11 2008 -+@@ -1,4 +1,4 @@ -+-#!/bin/bash -++#!/bin/sh -+ export LC_ALL="C" -+ -+ function check_valgrind_log () { diff --git a/pkgs/applications/office/openoffice/root-required.patch b/pkgs/applications/office/openoffice/root-required.patch deleted file mode 100644 index b93fd22b4ab8..000000000000 --- a/pkgs/applications/office/openoffice/root-required.patch +++ /dev/null @@ -1,25 +0,0 @@ -As nix chroot environment does not have the 'root' as owner, we have to disable -the "owner=root" tar parameters when doing these tar files. -They are built at openoffice build time. -diff --git a/sysui/desktop/slackware/makefile.mk b/sysui/desktop/slackware/makefile.mk -index 3342aca..49679b1 100644 ---- a/sysui/desktop/slackware/makefile.mk -+++ b/sysui/desktop/slackware/makefile.mk -@@ -100,7 +100,7 @@ $(MISC)/$(TARGET)/usr/share/applications/ : - - $(MISC)/$(TARGET)/empty.tar : - @$(MKDIRHIER) $(@:d)/empty -- @tar -C $(MISC)/$(TARGET)/empty --owner=root --group=root --same-owner -cf $@ . -+ @tar -C $(MISC)/$(TARGET)/empty -cf $@ . - - - # --- packaging --------------------------------------------------- -@@ -112,7 +112,7 @@ $(MENUFILES) : $(MISC)/$(TARGET)/empty.tar - -$(RM) -r $(MISC)$/$(@:b) - dmake $(MISC)$/$(@:b)$/usr/share/applications $(MISC)$/$(@:b)$/install$/slack-desc $(MISC)$/$(@:b)$/install$/doinst.sh - @$(COPY) $(MISC)/$(TARGET)$/empty.tar $@.tmp -- @tar -C $(MISC)/$(@:b) --owner=root --group=root --same-owner --exclude application.flag -rf $@.tmp install usr opt -+ @tar -C $(MISC)/$(@:b) --exclude application.flag -rf $@.tmp install usr opt - @gzip < $@.tmp > $@ - @$(RM) $@.tmp - $(RM) -r $(MISC)$/$(@:b) diff --git a/pkgs/applications/office/openoffice/xlib.patch b/pkgs/applications/office/openoffice/xlib.patch deleted file mode 100644 index d5f0ff9aa209..000000000000 --- a/pkgs/applications/office/openoffice/xlib.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://bugs.freedesktop.org/show_bug.cgi?id=31322 - -diff -rc OOO320_m19-orig//vcl/unx/inc/dtint.hxx OOO320_m19//vcl/unx/inc/dtint.hxx -*** OOO320_m19-orig//vcl/unx/inc/dtint.hxx 2010-05-26 20:34:28.000000000 +0200 ---- OOO320_m19//vcl/unx/inc/dtint.hxx 2011-02-15 17:04:32.134813676 +0100 -*************** -*** 36,42 **** - class SalDisplay; - class AllSettings; - -! #ifndef _XLIB_H_ - // forwards from X - struct Display; - struct XEvent; ---- 36,42 ---- - class SalDisplay; - class AllSettings; - -! #if !defined(_XLIB_H_) && !defined(_X11_XLIB_H_) - // forwards from X - struct Display; - struct XEvent; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5af580757b1e..b35d0e8b3b40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7613,14 +7613,6 @@ let openjump = callPackage ../applications/misc/openjump { }; - openoffice = callPackage ../applications/office/openoffice { - inherit (perlPackages) ArchiveZip CompressZlib; - inherit (gnome) GConf ORBit2; - neon = neon029; - libwpd = libwpd_08; - zip = zip.override { enableNLS = false; }; - }; - openscad = callPackage ../applications/graphics/openscad {}; opera = callPackage ../applications/networking/browsers/opera { diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 63fffd7d3161..d5a57337f4f2 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -10,7 +10,6 @@ let coreutils.hostDrv = nativePlatforms; dropbear.hostDrv = nativePlatforms; tigervnc.hostDrv = nativePlatforms; - #openoffice.hostDrv = nativePlatforms; wxGTK.hostDrv = nativePlatforms; #firefox = nativePlatforms; xorg = { diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index ce7b70e3c94e..f5fc2f3a7f66 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -1362,7 +1362,6 @@ in openfire = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; openlierox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; openobex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - openoffice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; opensc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; openscad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; opensc_dnie_wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 833210e8de9b..b3b58f43e1b9 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -210,7 +210,6 @@ with (import ./release-lib.nix); ntp = linux; ocaml = linux; octave = linux; - openoffice = linux; openssh = linux; openssl = all; pam_console = linux; From be412fc7890cec480161c9d6d3ecbf844a09688d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 29 Jan 2013 12:36:01 +0100 Subject: [PATCH 021/107] Rename openoffice directory to libreoffice --- .../{openoffice/libreoffice.nix => libreoffice/default.nix} | 0 .../{openoffice => libreoffice}/generate-libreoffice-srcs.sh | 0 .../office/{openoffice => libreoffice}/libreoffice-srcs.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/office/{openoffice/libreoffice.nix => libreoffice/default.nix} (100%) rename pkgs/applications/office/{openoffice => libreoffice}/generate-libreoffice-srcs.sh (100%) rename pkgs/applications/office/{openoffice => libreoffice}/libreoffice-srcs.nix (100%) diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/libreoffice/default.nix similarity index 100% rename from pkgs/applications/office/openoffice/libreoffice.nix rename to pkgs/applications/office/libreoffice/default.nix diff --git a/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh similarity index 100% rename from pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh rename to pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh diff --git a/pkgs/applications/office/openoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix similarity index 100% rename from pkgs/applications/office/openoffice/libreoffice-srcs.nix rename to pkgs/applications/office/libreoffice/libreoffice-srcs.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b35d0e8b3b40..18f106e5a262 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7402,7 +7402,7 @@ let librecad2 = callPackage ../applications/misc/librecad/2.0.nix { }; - libreoffice = callPackage ../applications/office/openoffice/libreoffice.nix { + libreoffice = callPackage ../applications/office/libreoffice { inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome) GConf ORBit2 gnome_vfs; zip = zip.override { enableNLS = false; }; From 3f49d8dd5070776317e759d5f7a7497bf72533d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 29 Jan 2013 13:23:42 +0100 Subject: [PATCH 022/107] libspectre: minor update, patches no longer needed --- ...-documents-containing-an-invalid-Pag.patch | 29 -------------- ...llocate-at-least-1-page-in-doc-pages.patch | 38 ------------------- .../libraries/libspectre/default.nix | 10 ++--- 3 files changed, 4 insertions(+), 73 deletions(-) delete mode 100644 pkgs/development/libraries/libspectre/0001-Fix-a-crash-with-documents-containing-an-invalid-Pag.patch delete mode 100644 pkgs/development/libraries/libspectre/0002-Allocate-at-least-1-page-in-doc-pages.patch diff --git a/pkgs/development/libraries/libspectre/0001-Fix-a-crash-with-documents-containing-an-invalid-Pag.patch b/pkgs/development/libraries/libspectre/0001-Fix-a-crash-with-documents-containing-an-invalid-Pag.patch deleted file mode 100644 index 3e232ee5ac50..000000000000 --- a/pkgs/development/libraries/libspectre/0001-Fix-a-crash-with-documents-containing-an-invalid-Pag.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7500e4d1ae85ecf9f61b1446e07ebb887118757c Mon Sep 17 00:00:00 2001 -From: Carlos Garcia Campos -Date: Sat, 30 Oct 2010 15:55:18 +0200 -Subject: [PATCH 1/2] Fix a crash with documents containing an invalid - %%Pages: comment - -When failed to allocate memory for pages because of invalid %%Pages: -comment, set maxpages to 0 to ignore the comment. Problem spotted -by Marek Kasik. Fixes bug #30867. ---- - libspectre/ps.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libspectre/ps.c b/libspectre/ps.c -index 6c7cfce..4578cec 100644 ---- a/libspectre/ps.c -+++ b/libspectre/ps.c -@@ -597,6 +597,8 @@ psscan(const char *filename, int scanstyle) - if (maxpages > 0) { - doc->pages = (struct page *) PS_calloc(maxpages, - sizeof(struct page)); -+ if (!doc->pages) -+ maxpages = 0; - CHECK_MALLOCED(doc->pages); - } - } --- -1.7.11 - diff --git a/pkgs/development/libraries/libspectre/0002-Allocate-at-least-1-page-in-doc-pages.patch b/pkgs/development/libraries/libspectre/0002-Allocate-at-least-1-page-in-doc-pages.patch deleted file mode 100644 index 09ab9e11c16f..000000000000 --- a/pkgs/development/libraries/libspectre/0002-Allocate-at-least-1-page-in-doc-pages.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8ffd9185f81cb8337cece4c8e3672d0e6a97e935 Mon Sep 17 00:00:00 2001 -From: Marek Kasik -Date: Wed, 24 Nov 2010 15:54:14 +0100 -Subject: [PATCH 2/2] Allocate at least 1 page in doc->pages - -Allocate at least 1 page if there are no %%Pages: or %%Page: comments -in the PS file (#31512). ---- - libspectre/ps.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/libspectre/ps.c b/libspectre/ps.c -index 4578cec..0130fb4 100644 ---- a/libspectre/ps.c -+++ b/libspectre/ps.c -@@ -1004,14 +1004,14 @@ psscan(const char *filename, int scanstyle) - section_len += line_len; - } - -+ if (maxpages == 0) { -+ maxpages = 1; -+ doc->pages = (struct page *) PS_calloc(maxpages, sizeof(struct page)); -+ CHECK_MALLOCED(doc->pages); -+ } - - newpage: - while (DSCcomment(line) && iscomment(line+2, "Page:")) { -- if (maxpages == 0) { -- maxpages = 1; -- doc->pages = (struct page *) PS_calloc(maxpages, sizeof(struct page)); -- CHECK_MALLOCED(doc->pages); -- } - label = ps_gettext(line+length("%%Page:"), &next_char); - if (sscanf(next_char, "%u", &thispage) != 1) thispage = 0; - if (nextpage == 1) { --- -1.7.11 - diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index 379727aec5c9..a819e0cef6f3 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -1,20 +1,18 @@ -{ fetchurl, stdenv, ghostscript }: +{ fetchurl, stdenv, pkgconfig, ghostscript, cairo }: stdenv.mkDerivation rec { - name = "libspectre-0.2.6"; + name = "libspectre-0.2.7"; src = fetchurl { url = "http://libspectre.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "1lqdmi7vx497pbigpp77064a4463lmihzh44898l101c69i7qqrg"; + sha256 = "1v63lqc6bhhxwkpa43qmz8phqs8ci4dhzizyy16d3vkb20m846z8"; }; buildInputs = [ # Need `libgs.so'. - ghostscript + pkgconfig ghostscript cairo /*for tests*/ ]; - patches = [ ./0001-Fix-a-crash-with-documents-containing-an-invalid-Pag.patch ./0002-Allocate-at-least-1-page-in-doc-pages.patch ]; - doCheck = true; meta = { From 0072c442557b4d57fe128bf75775b2912f94b313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 29 Jan 2013 17:37:06 +0100 Subject: [PATCH 023/107] wpa_supplicant: refactor settings, readline support (on by default) --- .../linux/wpa_supplicant/default.nix | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index b1bc15ff0836..c74fc8d634fe 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, openssl, dbus_libs, pkgconfig, libnl }: +{ stdenv, fetchurl, lib, openssl, dbus_libs, pkgconfig, libnl +, readlineSupport ? true, readline +}: +assert readlineSupport -> readline!=null; stdenv.mkDerivation rec { version = "1.1"; @@ -9,20 +12,26 @@ stdenv.mkDerivation rec { url = "http://hostap.epitest.fi/releases/${name}.tar.gz"; sha256 = "00lyifj8cz7qyal6dy1dxbpk3g3bywvdarik8gbj9ds7zmfbwkd5"; }; + extraConfig = lib.concatStringsSep "\n" ( + [ "CONFIG_DEBUG_SYSLOG=y" + "CONFIG_CTRL_IFACE_DBUS=y" + "CONFIG_CTRL_IFACE_DBUS_NEW=y" + "CONFIG_CTRL_IFACE_DBUS_INTRO=y" + "CONFIG_DRIVER_NL80211=y" + "CONFIG_LIBNL32=y" + ] ++ lib.optional readlineSupport "CONFIG_READLINE=y" + ); preBuild = '' cd wpa_supplicant cp -v defconfig .config - echo CONFIG_DEBUG_SYSLOG=y | tee -a .config - echo CONFIG_CTRL_IFACE_DBUS=y | tee -a .config - echo CONFIG_CTRL_IFACE_DBUS_NEW=y | tee -a .config - echo CONFIG_CTRL_IFACE_DBUS_INTRO=y | tee -a .config - echo CONFIG_DRIVER_NL80211=y | tee -a .config + echo ${extraConfig} | tee -a .config echo CONFIG_LIBNL32=y | tee -a .config substituteInPlace Makefile --replace /usr/local $out ''; - buildInputs = [ openssl dbus_libs libnl ]; + buildInputs = [ openssl dbus_libs libnl ] + ++ lib.optional readlineSupport readline; buildNativeInputs = [ pkgconfig ]; From 675679f450ff1f1e6b11a011ac59e5ac6d50730d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 29 Jan 2013 11:56:12 +0100 Subject: [PATCH 024/107] Fixes on VAAPI src packages. The github 'snapshots' weren't stable on hashes, I think (at least as I saw today trying to build vaapiVdpau in another computer). Using released tarballs, pointer by vcunat. --- pkgs/development/libraries/libva/default.nix | 12 ++++-------- pkgs/development/libraries/vaapi-intel/default.nix | 11 ++++++----- pkgs/development/libraries/vaapi-vdpau/default.nix | 11 +++++------ 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index cf030eda777d..5caea5ba6109 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,21 +1,17 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, libX11, pkgconfig, libXext, mesa -, libdrm, libXfixes, intelgen4asm, which }: +{ stdenv, fetchurl, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes }: stdenv.mkDerivation rec { name = "libva-1.1.0"; src = fetchurl { - url = "http://cgit.freedesktop.org/libva/snapshot/${name}.tar.bz2"; - sha256 = "0lqkharln67p60jlyz9y662gjgqk2iy2nrj84j1jr1nzgw7j01a5"; + url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; + sha256 = "1a7g7i96ww8hmim2pq2a3xc89073lzacxn1xh9526bzhlqjdqsnv"; }; - buildInputs = [ autoconf automake libtool libX11 libXext pkgconfig mesa libdrm - libXfixes intelgen4asm which ]; + buildInputs = [ libX11 libXext pkgconfig mesa libdrm libXfixes ]; configureFlags = [ "--enable-glx" ]; - preConfigure = "sh autogen.sh"; - meta = { homepage = http://www.freedesktop.org/wiki/Software/vaapi; license = "MIT"; diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index 432daa88a332..548aeb8a2de6 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, mesa, libva, libdrm, libX11, pkgconfig }: +{ stdenv, fetchurl, autoconf, automake, libtool, mesa, libva, libdrm, libX11, pkgconfig +, intelgen4asm }: stdenv.mkDerivation rec { - name = "intel-driver-1.0.19"; + name = "libva-intel-driver-1.0.19"; src = fetchurl { - url = "http://cgit.freedesktop.org/intel-driver/snapshot/${name}.tar.bz2"; - sha256 = "1ns6y1hdqvqd92mc0d6axyh17rgyzp73xnbf97mnnzi9fc47x6p1"; + url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2"; + sha256 = "14m7krah3ajkwj190q431lqqa84hdljcdmrcrqkbgaffyjlqvdid"; }; - buildInputs = [ autoconf automake libtool mesa libva pkgconfig libdrm libX11 ]; + buildInputs = [ autoconf automake libtool mesa libva pkgconfig libdrm libX11 intelgen4asm ]; preConfigure = '' sh autogen.sh diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix index 58ebc1032755..a3d51217ead8 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -1,17 +1,16 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, libvdpau, mesa, libva, pkgconfig }: +{ stdenv, fetchurl, libvdpau, mesa, libva, pkgconfig }: stdenv.mkDerivation rec { - name = "vdpau-driver-0.7.4"; + name = "libva-vdpau-driver-0.7.4"; src = fetchurl { - url = "http://cgit.freedesktop.org/vdpau-driver/snapshot/${name}.tar.bz2"; - sha256 = "1kvhpqwzw01bfamvxhnl4yhmb7pwkkfaii3w7bidd4vj1gsrx5l4"; + url = "http://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/${name}.tar.bz2"; + sha256 = "1fcvgshzyc50yb8qqm6v6wn23ghimay23ci0p8sm8gxcy211jp0m"; }; - buildInputs = [ autoconf automake libtool libvdpau mesa libva pkgconfig ]; + buildInputs = [ libvdpau mesa libva pkgconfig ]; preConfigure = '' - sh autogen.sh sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure ''; From 3a68505c6e03a526d4ee020c2608c18d6f7438f3 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Tue, 29 Jan 2013 20:40:53 +0100 Subject: [PATCH 025/107] GHC 7.6.2 --- pkgs/development/compilers/ghc/7.6.2.nix | 59 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/haskell-defaults.nix | 6 +++ 3 files changed, 66 insertions(+) create mode 100644 pkgs/development/compilers/ghc/7.6.2.nix diff --git a/pkgs/development/compilers/ghc/7.6.2.nix b/pkgs/development/compilers/ghc/7.6.2.nix new file mode 100644 index 000000000000..a62f2468a61d --- /dev/null +++ b/pkgs/development/compilers/ghc/7.6.2.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchurl, ghc, perl, gmp, ncurses }: + +stdenv.mkDerivation rec { + version = "7.6.2"; + + name = "ghc-${version}"; + + src = fetchurl { + url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2"; + sha256 = "d5f45184abeacf7e9c6b4f63c7101a5c1d7b4fe9007901159e2287ecf38de533"; + }; + + buildInputs = [ ghc perl gmp ncurses ]; + + # The comments below applied to GHC 7.6.1, left for if somebody experiences + # similar problems. If so, I argue we should selectively disable parallel + # building JUST for that platform. ~aristidb + # + ## My attempts to compile GHC with parallel build support enabled, failed + ## 4 consecutive times with the following error: + ## + ## building rts/dist/build/AutoApply.debug_o + ## building rts/dist/build/AutoApply.thr_o + ## rts_dist_HC rts/dist/build/AutoApply.debug_o + ## /nix/store/1iigiim5855m8j7pmwf5xrnpf705s4dh-binutils-2.21.1a/bin/ld: cannot find libraries/integer-gmp/dist-install/build/cbits/gmp-wrappers_o_split/gmp-wrappers__1.o + ## collect2: ld returned 1 exit status + ## make[1]: *** [libraries/integer-gmp/dist-install/build/cbits/gmp-wrappers.p_o] Error 1 + enableParallelBuilding = true; + + buildMK = '' + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" + ''; + + preConfigure = '' + echo "${buildMK}" > mk/build.mk + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + ''; + + configureFlags=[ + "--with-gcc=${stdenv.gcc}/bin/gcc" + ]; + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags=["-S" "--keep-file-symbols"]; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = [ + stdenv.lib.maintainers.marcweber + stdenv.lib.maintainers.andres + stdenv.lib.maintainers.simons + ]; + platforms = ghc.meta.platforms; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18f106e5a262..b732c6716893 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2404,6 +2404,7 @@ let haskellPackages_ghc742_profiling = recurseIntoAttrs (haskell.packages_ghc741.profiling); haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742.highPrio); haskellPackages_ghc761 = recurseIntoAttrs (haskell.packages_ghc761); + haskellPackages_ghc762 = recurseIntoAttrs (haskell.packages_ghc762); # Reasonably current HEAD snapshot. haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 69c99db89a2f..a03f0a6fe466 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -277,6 +277,12 @@ prefFun = ghcHEADPrefs; }; + packages_ghc762 = + packages { ghcPath = ../development/compilers/ghc/7.6.2.nix; + ghcBinary = ghc704Binary; + prefFun = ghcHEADPrefs; + }; + # Reasonably current HEAD snapshot. Should *always* be lowPrio. packages_ghcHEAD = packages { ghcPath = ../development/compilers/ghc/head.nix; From 792f47020b62870666bc8ecc3e6d77813cff1402 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 10:58:23 +0100 Subject: [PATCH 026/107] haskell-string-qq: add version 0.0.2 --- .../libraries/haskell/string-qq/default.nix | 12 ++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/haskell/string-qq/default.nix diff --git a/pkgs/development/libraries/haskell/string-qq/default.nix b/pkgs/development/libraries/haskell/string-qq/default.nix new file mode 100644 index 000000000000..78fe1c3930f7 --- /dev/null +++ b/pkgs/development/libraries/haskell/string-qq/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "string-qq"; + version = "0.0.2"; + sha256 = "0662m3i5xrdrr95w829bszkhp88mj9iy1zya54vk2sl5hz9wlmwp"; + meta = { + description = "QuasiQuoter for non-interpolated strings, texts and bytestrings"; + license = self.stdenv.lib.licenses.publicDomain; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 64b172c0c21e..c45f949342c8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1558,6 +1558,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); stringCombinators = callPackage ../development/libraries/haskell/string-combinators {}; + stringQq = callPackage ../development/libraries/haskell/string-qq {}; + stringsearch = callPackage ../development/libraries/haskell/stringsearch {}; strptime = callPackage ../development/libraries/haskell/strptime {}; From 89ee4bd883d0cbdbded7f5697137a8fa90ecad62 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:12:10 +0100 Subject: [PATCH 027/107] haskell-split: update to 0.2.1.2 --- .../development/libraries/haskell/split/0.2.1.2.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/split/0.2.1.2.nix diff --git a/pkgs/development/libraries/haskell/split/0.2.1.2.nix b/pkgs/development/libraries/haskell/split/0.2.1.2.nix new file mode 100644 index 000000000000..e88f478f9762 --- /dev/null +++ b/pkgs/development/libraries/haskell/split/0.2.1.2.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "split"; + version = "0.2.1.2"; + sha256 = "0wjw4j9wgk66h7filzfh0py9b0wwmaynvwqvd6kinxgms86fpvyi"; + meta = { + description = "Combinator library for splitting lists"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c45f949342c8..70a0f0acb3a3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -138,7 +138,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regexBase = self.regexBase_0_93_2; # 7.6 ok regexCompat = self.regexCompat_0_95_1; # 7.6 ok regexPosix = self.regexPosix_0_95_2; # 7.6 ok - split = self.split_0_2_1_1; # 7.6 ok + split = self.split_0_2_1_2; # 7.6 ok stm = self.stm_2_4_2; # 7.6 ok syb = self.syb_0_3_7; # 7.6 ok text = self.text_0_11_2_3; # 7.6 ok @@ -1608,7 +1608,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {}; split_0_2_1_1 = callPackage ../development/libraries/haskell/split/0.2.1.1.nix {}; - split = self.split_0_2_1_1; + split_0_2_1_2 = callPackage ../development/libraries/haskell/split/0.2.1.2.nix {}; + split = self.split_0_2_1_2; stbImage = callPackage ../development/libraries/haskell/stb-image {}; From 1e0055679518c9f771e818c7efda1b1366547567 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:14:16 +0100 Subject: [PATCH 028/107] haskell-HTTP: update to 4000.2.7 --- .../libraries/haskell/HTTP/{4000.2.6.nix => 4000.2.7.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/libraries/haskell/HTTP/{4000.2.6.nix => 4000.2.7.nix} (81%) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.6.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.7.nix similarity index 81% rename from pkgs/development/libraries/haskell/HTTP/4000.2.6.nix rename to pkgs/development/libraries/haskell/HTTP/4000.2.7.nix index 2c85ec7cd9e6..0711e47b005d 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.6.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.7.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HTTP"; - version = "4000.2.6"; - sha256 = "0rycwrn9cq9mrsgxkbx373zjvmzg4hd8hzclya6ipd3jda1w5r92"; + version = "4000.2.7"; + sha256 = "0a5zjhrbdp8hwmkc709i2qwnxx4lafrp6wssdms6g5l97a52bdc2"; buildDepends = [ mtl network parsec ]; meta = { homepage = "https://github.com/haskell/HTTP"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 70a0f0acb3a3..290124dee1aa 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -126,7 +126,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GLUT = self.GLUT_2_3_1_0; # 7.6 ok haskellSrc = self.haskellSrc_1_0_1_5; # 7.6 ok html = self.html_1_0_1_2; # 7.6 ok - HTTP = self.HTTP_4000_2_6; # 7.6 ok + HTTP = self.HTTP_4000_2_7; # 7.6 ok HUnit = self.HUnit_1_2_5_1; # 7.6 ok mtl = self.mtl_2_1_2; # 7.6 ok network = self.network_2_4_1_0; # 7.6 ok @@ -967,8 +967,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HTTP_4000_2_2 = callPackage ../development/libraries/haskell/HTTP/4000.2.2.nix {}; HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {}; HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {}; - HTTP_4000_2_6 = callPackage ../development/libraries/haskell/HTTP/4000.2.6.nix {}; - HTTP = self.HTTP_4000_2_6; + HTTP_4000_2_7 = callPackage ../development/libraries/haskell/HTTP/4000.2.7.nix {}; + HTTP = self.HTTP_4000_2_7; httpReverseProxy = callPackage ../development/libraries/haskell/http-reverse-proxy {}; From b569cf34291f2ba582ae903dbda8796a8fc9b3ba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:39 +0100 Subject: [PATCH 029/107] haskell-authenticate: update to version 1.3.2.1 --- pkgs/development/libraries/haskell/authenticate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index b336a632b9dd..835cdce2e914 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "authenticate"; - version = "1.3.2"; - sha256 = "1bvgfri0c2nyz06r59rm3slpvm1b0s242s4mznmndpdclgg33d9m"; + version = "1.3.2.1"; + sha256 = "1r53mnj4b4x0prcqqf6y3gdia2j1l3155iw79jzlx0cnxbdsfnc7"; buildDepends = [ aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive conduit httpConduit httpTypes monadControl network resourcet From 38ab8fda135adc5a32832dcf4a3418b77bf257b7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:39 +0100 Subject: [PATCH 030/107] haskell-bifunctors: update to version 3.2 --- pkgs/development/libraries/haskell/bifunctors/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/bifunctors/default.nix b/pkgs/development/libraries/haskell/bifunctors/default.nix index b4de19104659..09287600323d 100644 --- a/pkgs/development/libraries/haskell/bifunctors/default.nix +++ b/pkgs/development/libraries/haskell/bifunctors/default.nix @@ -1,10 +1,10 @@ -{ cabal, semigroupoids, semigroups }: +{ cabal, semigroupoids, semigroups, tagged }: cabal.mkDerivation (self: { pname = "bifunctors"; - version = "3.0.3"; - sha256 = "1nmrwc9n9qkj9w9c38ja0had32isr6v35j1v19fhqdwk5ddbpxp4"; - buildDepends = [ semigroupoids semigroups ]; + version = "3.2"; + sha256 = "03bszf1127iw5kimjbag5gmgzz7h2qzcd9f7jb53jpiadfhjfx0a"; + buildDepends = [ semigroupoids semigroups tagged ]; meta = { homepage = "http://github.com/ekmett/bifunctors/"; description = "Haskell 98 bifunctors"; From 3fd2c151449592d3ae0fc7f32df7a9ae8ce090dd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:39 +0100 Subject: [PATCH 031/107] haskell-case-insensitive: update to version 1.0 --- .../libraries/haskell/case-insensitive/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/case-insensitive/default.nix b/pkgs/development/libraries/haskell/case-insensitive/default.nix index 7f972dfd6551..58e0ebbbe000 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/default.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/default.nix @@ -1,10 +1,10 @@ -{ cabal, hashable, text }: +{ cabal, deepseq, hashable, text }: cabal.mkDerivation (self: { pname = "case-insensitive"; - version = "0.4.0.4"; - sha256 = "1xzpri688vbd6fvvxczqx8bv53009ygzws7vbjmj2q97wcm8nmwd"; - buildDepends = [ hashable text ]; + version = "1.0"; + sha256 = "1x437b5yyh930a5dr642lvfdgpx12w4ms70whiw1ffjjhssb88zk"; + buildDepends = [ deepseq hashable text ]; meta = { homepage = "https://github.com/basvandijk/case-insensitive"; description = "Case insensitive string comparison"; From a7d99b7d4d9931c05fa81112141f936c60841cd6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:39 +0100 Subject: [PATCH 032/107] haskell-classy-prelude-conduit: update to version 0.4.4 --- .../libraries/haskell/classy-prelude-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix index c167f191d4d3..66a5b51b1896 100644 --- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude-conduit"; - version = "0.4.3"; - sha256 = "0ny4si6z6i6g6khcg9d3m9wks42sqh8i8kpgghhdwd37v32l3f34"; + version = "0.4.4"; + sha256 = "1xsqdifqm68mlrmpmj04nqd5r83psq5ffis2pm8k8vwl1n1jv8kn"; buildDepends = [ classyPrelude conduit monadControl resourcet transformers void xmlConduit From 17842f4e8fa80cb79e68b3c2ab6660624555d085 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:39 +0100 Subject: [PATCH 033/107] haskell-classy-prelude: update to version 0.4.4 --- .../libraries/haskell/classy-prelude/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index 9f8893bf72fa..4514e587051e 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -1,13 +1,13 @@ -{ cabal, basicPrelude, hashable, systemFilepath, text, transformers -, unorderedContainers, vector +{ cabal, basicPrelude, hashable, liftedBase, systemFilepath, text +, transformers, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.4.3"; - sha256 = "1k2iszja03s8azypl8lpkdjvvqsgzg73cl1wp4jl2fqp1psqv36q"; + version = "0.4.4"; + sha256 = "0f49b07r5isz57wjmgpfvq4hg9m5q59ad918rk1v24xdvn4y3all"; buildDepends = [ - basicPrelude hashable systemFilepath text transformers + basicPrelude hashable liftedBase systemFilepath text transformers unorderedContainers vector ]; meta = { From fe5b58759ef0ae773e879fbeaca8922866ef7eb8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:39 +0100 Subject: [PATCH 034/107] haskell-diagrams-contrib: update to version 0.6.0.3 --- pkgs/development/libraries/haskell/diagrams/contrib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix index 85b1360c3662..a25603453a75 100644 --- a/pkgs/development/libraries/haskell/diagrams/contrib.nix +++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "diagrams-contrib"; - version = "0.6.0.2"; - sha256 = "1lj99a46r12zjwmpkn7vj04wapfgdlmw05jwb5lnhy9hxqgcsgng"; + version = "0.6.0.3"; + sha256 = "0j0wmf2nksqh3rqmzyw468bp25zikc5icif5f3rfi1v06ghsk0i5"; buildDepends = [ colour dataDefault diagramsLib forceLayout lens mtl vectorSpace ]; From 6cee3f32f1c6eebb74404aaaf47f659b6dabdc46 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:39 +0100 Subject: [PATCH 035/107] haskell-digestive-functors-heist: update to version 0.6.0.0 --- .../libraries/haskell/digestive-functors-heist/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix index 08a9f09be3ad..0b7eb1e88de3 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.6.0.0"; sha256 = "17qndqsk09fvnvyhhw3xbbjjhfyyp4sivc898vqllyyky0wqmrdk"; buildDepends = [ digestiveFunctors heist mtl text xmlhtml ]; + jailbreak = true; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Heist frontend for the digestive-functors library"; From 1401f654cb3b419d04a3e611a1b99e989b449d8c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:39 +0100 Subject: [PATCH 036/107] haskell-distributed-process-simplelocalnet: update to version 0.2.0.9 --- .../haskell/distributed-process-simplelocalnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix b/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix index 86fa71221954..aaca850c0d7a 100644 --- a/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "distributed-process-simplelocalnet"; - version = "0.2.0.8"; - sha256 = "01kzqfbrkl9zzknw0gbdh1c1lss911lphagn2sw6nzl9xpnhjqk0"; + version = "0.2.0.9"; + sha256 = "0bkb26bfpmyhh26hgznnw073kvk78ws6lqi86pxrgnnm9sx5mi21"; isLibrary = true; isExecutable = true; buildDepends = [ From cf71ba454df96382daafe3d215c40a4c361fb9bb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:39 +0100 Subject: [PATCH 037/107] haskell-distributed-process: update to version 0.4.2 --- .../libraries/haskell/distributed-process/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix index 6ecd5d578838..1e83cbaa8d95 100644 --- a/pkgs/development/libraries/haskell/distributed-process/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "distributed-process"; - version = "0.4.1"; - sha256 = "1ysm2rq7ldxb5w6m04vf5q3zrgvg99z7kszjqj17r17ps61v898f"; + version = "0.4.2"; + sha256 = "16w8jp66903vn089ysqdn534v0744cr2m6wkqd77zri6a0caaa6c"; isLibrary = true; isExecutable = true; buildDepends = [ From cb7607499ba00dcec8f3bb4eba974fe9cd046d70 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:40 +0100 Subject: [PATCH 038/107] haskell-edit-distance: update to version 0.2.1.2 --- pkgs/development/libraries/haskell/edit-distance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/edit-distance/default.nix b/pkgs/development/libraries/haskell/edit-distance/default.nix index b6d0b4668f8e..22f5953b7e04 100644 --- a/pkgs/development/libraries/haskell/edit-distance/default.nix +++ b/pkgs/development/libraries/haskell/edit-distance/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "edit-distance"; - version = "0.2.1.1"; - sha256 = "1d8h38cn3azvsp2dp5gycglm5bwwd8plbag8ypi38yj6c35a82yn"; + version = "0.2.1.2"; + sha256 = "08dxsp1ar8mr4xrjy37lzl0s1rjnqsdq30p09nclip5pyhcw7g44"; isLibrary = true; isExecutable = true; buildDepends = [ random ]; From eb2adf9acd2c7e2b5178156e4756d527b0a81451 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:40 +0100 Subject: [PATCH 039/107] haskell-either: update to version 3.1 --- .../libraries/haskell/either/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix index cbfa53b6d001..91b24e56378d 100644 --- a/pkgs/development/libraries/haskell/either/default.nix +++ b/pkgs/development/libraries/haskell/either/default.nix @@ -1,13 +1,16 @@ -{ cabal, semigroupoids, semigroups, transformers }: +{ cabal, MonadRandom, mtl, semigroupoids, semigroups, transformers +}: cabal.mkDerivation (self: { pname = "either"; - version = "3.0.3"; - sha256 = "02kpb8xd19n00ll61haqr6k3hy8qmbdf73gr4zs59q9xh0739qxc"; - buildDepends = [ semigroupoids semigroups transformers ]; + version = "3.1"; + sha256 = "1paglfhd2xjr32sh5npl3kvamv4nps9fpy0wk9ya0l26w4c3bdsm"; + buildDepends = [ + MonadRandom mtl semigroupoids semigroups transformers + ]; meta = { homepage = "http://github.com/ekmett/either/"; - description = "Haskell 98 either monad transformer"; + description = "An either monad transformer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; From 35295065efbd10caddca36200f4303a12a5928c9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:40 +0100 Subject: [PATCH 040/107] haskell-hakyll: update to version 4.1.4.0 --- pkgs/development/libraries/haskell/hakyll/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index c8b2117c1286..68b79bdcc3b5 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.1.2.1"; - sha256 = "1d9bbqy1dix60w72zc3g4y7454avngfyl2i8gj99bdqin2wwcgp8"; + version = "4.1.4.0"; + sha256 = "0nhr7ai03hx2qjxlqml0js43iwxhcbpdqkwdvw8pqs396yrjwxdj"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -15,6 +15,7 @@ cabal.mkDerivation (self: { filepath httpConduit httpTypes lrucache mtl pandoc parsec random regexBase regexTdfa snapCore snapServer tagsoup text time ]; + jailbreak = true; meta = { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; From 2ae771ab7b04faefaa2484cb202dc2997be42816 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:40 +0100 Subject: [PATCH 041/107] haskell-hamlet: update to version 1.1.4 --- pkgs/development/libraries/haskell/hamlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index 906a8e2759aa..0250e6c6bcd1 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "1.1.3.1"; - sha256 = "04qqsjrn0fh9y4z7gjf3g60w69gqxhzq7dqkraq97p3w45fijm1i"; + version = "1.1.4"; + sha256 = "10hb3a6c56bmwbbrbnczvlangzz24ghl4vm8nq4z0plj1nglnlqx"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; From a1c17bf9242f3c29fefc07b9a8b94a2f1bd5cab5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:40 +0100 Subject: [PATCH 042/107] haskell-heist: update to version 0.11.0 --- pkgs/development/libraries/haskell/heist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index a2251f696731..7547fcff4101 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "heist"; - version = "0.10.2.1"; - sha256 = "14lp27vlzv6qqv325x2vqqvphw5ads5ywjqpjramv3hhd275fn3d"; + version = "0.11.0"; + sha256 = "1zbwbgabdj6x0vi7l8wfq7rx77p8b4zxz5wv43nr67irszyz1k7w"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors filepath hashable MonadCatchIOTransformers mtl random text time From 3af9c0d6eb4db84e57318df8283e2fbe2e99a843 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:40 +0100 Subject: [PATCH 043/107] haskell-hoogle: update to version 4.2.15 --- pkgs/development/libraries/haskell/hoogle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index 8ebc698892ff..153cee7db75a 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hoogle"; - version = "4.2.14"; - sha256 = "1ymmf8zxp2nbygnavhr3ay0fidhd3vhrdqb7mg0qgk8y9kx25brj"; + version = "4.2.15"; + sha256 = "0mhxdbbzq7hl5zxz3dhxyrs5q08y8hxwsm19ba0gx47qvg3znzki"; isLibrary = true; isExecutable = true; buildDepends = [ From 79553f7ea8dee493ae0836d8cad1f830dba39b18 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:40 +0100 Subject: [PATCH 044/107] haskell-hspec: update to version 1.4.4 --- pkgs/development/libraries/haskell/hspec/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index bc194108d337..4c897f20ef7e 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -4,15 +4,14 @@ cabal.mkDerivation (self: { pname = "hspec"; - version = "1.4.3"; - sha256 = "0i963fxamyyi3afac67rkw4340i3xqs1q3lvcy69mq0czbdvgjmc"; + version = "1.4.4"; + sha256 = "09wrvdlqzpa3vjcnirnzpj8nsvqnn5xbilnxaqmjm2agbl8xfj5r"; isLibrary = true; isExecutable = true; buildDepends = [ ansiTerminal filepath hspecExpectations HUnit QuickCheck setenv silently time transformers ]; - jailbreak = true; meta = { homepage = "http://hspec.github.com/"; description = "Behavior-Driven Development for Haskell"; From 6384ff2e1fa12a82ac51ee66a7c7becab7d6f2e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:40 +0100 Subject: [PATCH 045/107] haskell-http-conduit: update to version 1.8.7.1 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index b9f47b440068..544f6c0d6747 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.8.7"; - sha256 = "12v5rxp4dx6glyijygpp7r7b5b6mscclgfp2cbii78m3hgld097i"; + version = "1.8.7.1"; + sha256 = "1m0f9snc2zxj8hvxw3ngw0h78ckvdlxxfjvrryk93blfwbamssi5"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie From b2277d0afd846aca4e894a141aa1ed210cdf3890 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:40 +0100 Subject: [PATCH 046/107] haskell-http-types: update to version 0.8.0 --- pkgs/development/libraries/haskell/http-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix index 242f73e9b21a..d0837d21bff4 100644 --- a/pkgs/development/libraries/haskell/http-types/default.nix +++ b/pkgs/development/libraries/haskell/http-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "http-types"; - version = "0.7.3.0.1"; - sha256 = "1s2dh75jpf2yllw503hjw0x2anhc4c71vz5yylri8nxzx1zs18rq"; + version = "0.8.0"; + sha256 = "14d1gzgwhinkwx3lmc6hvqj6ivjrvy4m6fm2walnyk1zv24zli75"; buildDepends = [ blazeBuilder caseInsensitive text ]; meta = { homepage = "https://github.com/aristidb/http-types"; From ce9c8a235d91526041345f95cafabb6387f2d2d9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:41 +0100 Subject: [PATCH 047/107] haskell-language-haskell-extract: update to version 0.2.4 --- .../haskell/language-haskell-extract/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix index 461c790c88b3..a77040a5578c 100644 --- a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix +++ b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix @@ -1,10 +1,10 @@ -{ cabal, haskellSrcExts, regexPosix }: +{ cabal, regexPosix }: cabal.mkDerivation (self: { pname = "language-haskell-extract"; - version = "0.2.3"; - sha256 = "0fz1nin596ihlh77pafzpdf46br1k3pxcxyml2rvly6g0h3yjgpr"; - buildDepends = [ haskellSrcExts regexPosix ]; + version = "0.2.4"; + sha256 = "1nxcs7g8a1sp91bzpy4cj6s31k5pvc3gvig04cbrggv5cvjidnhl"; + buildDepends = [ regexPosix ]; meta = { homepage = "http://github.com/finnsson/template-helper"; description = "Module to automatically extract functions from the local code"; From ba9c06dedb36eb8620f4bd3cca406cf28b50d860 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:41 +0100 Subject: [PATCH 048/107] haskell-lens: update to version 3.8.5 --- pkgs/development/libraries/haskell/lens/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index e815d654b612..e7e40312af3e 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "lens"; - version = "3.8.2"; - sha256 = "1spz4nyv1f7kf4bnw8qgqaks5kc4m0slzw0czj1wh1232w2sz15m"; + version = "3.8.5"; + sha256 = "09z2izh7mqj75yh9f0pb8ky9vnzs9zx2z2mz1ik7l8wid43gm6vn"; buildDepends = [ bifunctors comonad comonadsFd comonadTransformers contravariant distributive filepath genericDeriving hashable From c59690d29a8b280d859be05c2bbb963bba1c61a1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:41 +0100 Subject: [PATCH 049/107] haskell-mime-types: update to version 0.1.0.3 --- pkgs/development/libraries/haskell/mime-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mime-types/default.nix b/pkgs/development/libraries/haskell/mime-types/default.nix index 1bde4861b3ac..5dd5f65c9e74 100644 --- a/pkgs/development/libraries/haskell/mime-types/default.nix +++ b/pkgs/development/libraries/haskell/mime-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "mime-types"; - version = "0.1.0.2"; - sha256 = "1pkhr8k23386qwa1wmlrcilz75di2l8n5kc4n8pnia05p49akfcs"; + version = "0.1.0.3"; + sha256 = "0mzhkqcjlnrs9mwn2crsr1m2mf6pgygs1s3ks8akz1618v6jm6y1"; buildDepends = [ text ]; meta = { homepage = "https://github.com/yesodweb/wai"; From d9bb07210a80d7733e9f4d7b0d8420b90e7a08ab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:41 +0100 Subject: [PATCH 050/107] haskell-pandoc: update to version 1.10.1 --- pkgs/development/libraries/haskell/pandoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index ed6600626734..d53ddf7ad308 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pandoc"; - version = "1.10.0.5"; - sha256 = "05mjgvxk3wxfssf4aviigdm6jb73a6bp8lwz86aabdgkgh2i6n54"; + version = "1.10.1"; + sha256 = "127pxs1w99nr6hdancaajm20w3vgmch4xlj0v7221y7i9qcr1y1y"; isLibrary = true; isExecutable = true; buildDepends = [ From 870bfea44069f2be3076550776191e9878350935 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:41 +0100 Subject: [PATCH 051/107] haskell-postgresql-libpq: update to version 0.8.2.2 --- .../libraries/haskell/postgresql-libpq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix index 040c931d1f61..90a92019f0e1 100644 --- a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "postgresql-libpq"; - version = "0.8.2.1"; - sha256 = "0fjy451gc9lg3kcglq4s5s3hja8ni3adh4jmxd01kfyvyhwggv4d"; + version = "0.8.2.2"; + sha256 = "1mmsfgia318p34l8jx8hihb160sx2wpg2h5r741akcs50v6p5878"; extraLibraries = [ postgresql ]; meta = { homepage = "http://github.com/lpsmith/postgresql-libpq"; From 55343d26c36374ad822b0469090eb354adfcd67b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:41 +0100 Subject: [PATCH 052/107] haskell-shakespeare-js: update to version 1.1.2 --- pkgs/development/libraries/haskell/shakespeare-js/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index a7238ba52eb3..01bf73fd5013 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-js"; - version = "1.1.1"; - sha256 = "1xzhb3ipax2489311hmiaxp9i44099bsbclcj3ds0rhdfa62xarg"; + version = "1.1.2"; + sha256 = "0iwajn0d0yngzp10j9qbb2gpq1g7r390yqd7pj5dri35rjc6mr8n"; buildDepends = [ aeson shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; From 67a128958f27ae130c61238dba3600f397fe2773 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:41 +0100 Subject: [PATCH 053/107] haskell-shakespeare: update to version 1.0.3 --- pkgs/development/libraries/haskell/shakespeare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 11a03eaa9b28..14a70b44c4f8 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare"; - version = "1.0.2"; - sha256 = "1n7qymrn2f83a11zdh2950pf8rsqnc52blwi02amjxsvy2piidzm"; + version = "1.0.3"; + sha256 = "0js56njy5rbviavga5qlp8d989wdpqf7lcyhwrjf1clf3k4f8anl"; buildDepends = [ parsec text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; From 736e9958b43530aee24c8780c86a7959f503f759 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:41 +0100 Subject: [PATCH 054/107] haskell-snap-core: update to version 0.9.2.2 --- pkgs/development/libraries/haskell/snap/core.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index 16df3f347563..8174c897a8c5 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -15,6 +15,7 @@ cabal.mkDerivation (self: { MonadCatchIOTransformers mtl random regexPosix text time unixCompat unorderedContainers vector zlibEnum ]; + jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "Snap: A Haskell Web Framework (core interfaces and types)"; From 7d41cdf238086d5cfb82b5828cf3e733932f36d6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:42 +0100 Subject: [PATCH 055/107] haskell-snap-server: update to version 0.9.2.4 --- pkgs/development/libraries/haskell/snap/server.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index 7f8dc8780243..9250666430cb 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -13,6 +13,7 @@ cabal.mkDerivation (self: { caseInsensitive enumerator MonadCatchIOTransformers mtl network snapCore text time unixCompat ]; + jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework"; From 53e0d41689a7b73c0c92a3080be3a89c4581eb4c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:42 +0100 Subject: [PATCH 056/107] haskell-snap: update to version 0.11.0 --- .../libraries/haskell/snap/snap.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 30a2d34a99ef..34ee639564da 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -1,22 +1,22 @@ { cabal, aeson, attoparsec, cereal, clientsession, comonad -, configurator, directoryTree, dlist, errors, filepath, hashable -, heist, lens, logict, MonadCatchIOTransformers, mtl, mwcRandom -, pwstoreFast, regexPosix, snapCore, snapServer, stm, syb, text -, time, transformers, unorderedContainers, vector, vectorAlgorithms -, xmlhtml +, configurator, directoryTree, dlist, either, errors, filepath +, hashable, heist, lens, logict, MonadCatchIOTransformers, mtl +, mwcRandom, pwstoreFast, regexPosix, snapCore, snapServer, stm +, syb, text, time, transformers, unorderedContainers, vector +, vectorAlgorithms, xmlhtml }: cabal.mkDerivation (self: { pname = "snap"; - version = "0.10.0.1"; - sha256 = "14j9lgcdyxh7n4yidfvn1r94nziljiqz6nsqgq114v34bnn6l2yn"; + version = "0.11.0"; + sha256 = "0mw1fxjijd3z9bz1znrc5vfxa4mc1by481gxfmk2hdlcsib9sp7n"; isLibrary = true; isExecutable = true; buildDepends = [ aeson attoparsec cereal clientsession comonad configurator - directoryTree dlist errors filepath hashable heist lens logict - MonadCatchIOTransformers mtl mwcRandom pwstoreFast regexPosix - snapCore snapServer stm syb text time transformers + directoryTree dlist either errors filepath hashable heist lens + logict MonadCatchIOTransformers mtl mwcRandom pwstoreFast + regexPosix snapCore snapServer stm syb text time transformers unorderedContainers vector vectorAlgorithms xmlhtml ]; jailbreak = true; From a9660e65da5f7967420801923144258974eb3eba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:42 +0100 Subject: [PATCH 057/107] haskell-texmath: update to version 0.6.1.3 --- pkgs/development/libraries/haskell/texmath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index 78ec99da8db5..581cede2e879 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "texmath"; - version = "0.6.1.2"; - sha256 = "1izsjy30saz2il16dwx8sh2s30b1pfgcpq6023v135w1bdrzrnmq"; + version = "0.6.1.3"; + sha256 = "1f2hka9jwlrm9dvw7z3896yfpdzxs2vaw0vbcmj5p401mvzc8w05"; isLibrary = true; isExecutable = true; buildDepends = [ parsec syb xml ]; From a46a0ee8ef535fd31c8db9ae73263ed49bac50ab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:42 +0100 Subject: [PATCH 058/107] haskell-tls: update to version 1.1.2 --- pkgs/development/libraries/haskell/tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index 29b6b11d7913..af7b4c57bb76 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls"; - version = "1.1.1"; - sha256 = "0ji83b5z3v6f6a6rgyj5xkjh9vvsqckr7ymzjnhb4zqf0mgymypq"; + version = "1.1.2"; + sha256 = "1vg1mnz6cxxgs48pbpjp4hwyvsysxyzvjfy4p1vd23lwc32cdjqg"; buildDepends = [ cereal certificate cryptohash cryptoPubkey cryptoRandomApi mtl network From 8a50c3d9ff3f7d3ef55c5b5a1c42518a44f89ebe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:42 +0100 Subject: [PATCH 059/107] haskell-wai-extra: update to version 1.3.2.1 --- pkgs/development/libraries/haskell/wai-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 1f08f3f1fd4f..9cebbde00090 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.3.2"; - sha256 = "1089sfb4jyi17rw6nivpy96gbc90nyawr35jzwlzl41gzxxmv503"; + version = "1.3.2.1"; + sha256 = "13w3nhz59h4j25fsy95221y71k300plhs4vjqz2wxaigpv9sc2y7"; buildDepends = [ ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault dateCache fastLogger httpTypes network From c2e68b4019c352bacf205be3b2809e780c041088 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:42 +0100 Subject: [PATCH 060/107] haskell-wai-test: update to version 1.3.0.1 --- pkgs/development/libraries/haskell/wai-test/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index 0c9b8eb2eb81..cff2cb318502 100644 --- a/pkgs/development/libraries/haskell/wai-test/default.nix +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai-test"; - version = "1.3.0"; - sha256 = "15y0aw5c4sh1mns4ss39l0wsxrd1b6yq6m5r638x23zl6y7d9j40"; + version = "1.3.0.1"; + sha256 = "0yy0bvkrny4kj77wvn0cflwha6yijfxvnj530ps7xnzv1qm8qn1l"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie httpTypes HUnit text transformers wai From 23140d9411ad33902ec37e66a541c3e2ada7c3bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:42 +0100 Subject: [PATCH 061/107] haskell-wai: update to version 1.3.0.2 --- pkgs/development/libraries/haskell/wai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index 56421b213d5b..ee6eb2885654 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai"; - version = "1.3.0.1"; - sha256 = "0z6byx71awhjb7fycz1ixsyzzlsrv1i69qwjrfzh9y5wnbchj9yl"; + version = "1.3.0.2"; + sha256 = "1ijxdnl76kkm2qck5qiwdwqvwkbpw8zbilfaz67sfbz3ccwls2fc"; buildDepends = [ blazeBuilder conduit httpTypes network text transformers vault ]; From 2603bc59b1b1b29e315f687a24ec475a8e03de81 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:43 +0100 Subject: [PATCH 062/107] haskell-warp: update to version 1.3.7.2 --- pkgs/development/libraries/haskell/warp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 6a36e873ca69..dd6bf66b676b 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "1.3.7.1"; - sha256 = "0kabcxzjc686iayhxln2cmnxm3vk3h0685n4d4ybprv5h1nc6ghl"; + version = "1.3.7.2"; + sha256 = "06cwc0lmzgna939svdw7v5s822safkfy3wd4n21f9ml20iskzqm6"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpTypes liftedBase network networkConduit simpleSendfile From ec34d4c497c1488e911c895cc28898a401a99a57 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:43 +0100 Subject: [PATCH 063/107] haskell-yesod-auth: update to version 1.1.4 --- .../libraries/haskell/yesod-auth/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index dfa96bf2b13e..67a436870924 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -1,5 +1,5 @@ { cabal, aeson, authenticate, blazeHtml, blazeMarkup, hamlet -, httpConduit, liftedBase, mimeMail, network, persistent +, httpConduit, httpTypes, liftedBase, mimeMail, network, persistent , persistentTemplate, pureMD5, pwstoreFast, random, SHA , shakespeareCss, shakespeareJs, text, transformers , unorderedContainers, wai, yesodCore, yesodForm, yesodJson @@ -8,12 +8,12 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.1.3"; - sha256 = "0rlp56jsb0cwm1z303b7l9iy5hbip18vlm7fisna4agbf4rj2k0z"; + version = "1.1.4"; + sha256 = "060548zbjsvf6zvixiyic729fd9862z3qwz349ric60jfa20cdpx"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup hamlet httpConduit - liftedBase mimeMail network persistent persistentTemplate pureMD5 - pwstoreFast random SHA shakespeareCss shakespeareJs text + httpTypes liftedBase mimeMail network persistent persistentTemplate + pureMD5 pwstoreFast random SHA shakespeareCss shakespeareJs text transformers unorderedContainers wai yesodCore yesodForm yesodJson yesodPersistent ]; From dfd6a80c772f4889217adce5c858f2c5ab9d624a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:43 +0100 Subject: [PATCH 064/107] haskell-yesod-core: update to version 1.1.8 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 65b24a4534ca..bf13f7da1741 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.1.7.1"; - sha256 = "07rh6yy8hz660hxz60gvminm166cb5was8qb1l24lrmzchigbf3r"; + version = "1.1.8"; + sha256 = "03yk9ypd314830bk3jjwkzi87bn04lqkh6hq91izn1prvijjiqjm"; buildDepends = [ aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie failure fastLogger hamlet httpTypes From f20eff4609eeca9358267746b8caaee32684b75e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:43 +0100 Subject: [PATCH 065/107] haskell-yesod-form: update to version 1.2.1 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 2d0a099002cb..ae36c5180c3f 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.2.0.2"; - sha256 = "0a3172rgvma420l98hkgvl17ks2a2jkys3rh4qd2bbm9p7qknv3y"; + version = "1.2.1"; + sha256 = "10xjpky7dglqbhc6i49q9ckkhq23wyyqd7karlp0byhprmspnifq"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent shakespeareCss From 3c7b8578a7c6b422da177a9b15484b7eec11266b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:44 +0100 Subject: [PATCH 066/107] haskell-yesod-routes: update to version 1.1.2 --- pkgs/development/libraries/haskell/yesod-routes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index ec09a68e32c7..c1dd27e377d7 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "yesod-routes"; - version = "1.1.1.1"; - sha256 = "10cy50dnhbhwi0yspq0x06gzqpmhkalqq1sww2wjpv13hp53pq3m"; + version = "1.1.2"; + sha256 = "17yv2z7k1s958xyn552wpk0cwpivsnkvia8477yhgbp4n2d1i5jv"; buildDepends = [ pathPieces text vector ]; meta = { homepage = "http://www.yesodweb.com/"; From eb6c71ad5511acd529876d0dc1143a7178477af6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:44 +0100 Subject: [PATCH 067/107] haskell-yesod-static: update to version 1.1.2 --- pkgs/development/libraries/haskell/yesod-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index 7923b6e9e8e3..a47cc59ecc5b 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.1.1.2"; - sha256 = "0x3vrzqqddi4fmbivmy5pi66jmnc5fh68j5fjfxn5nyhp4n6z0sw"; + version = "1.1.2"; + sha256 = "0rh5vdpiq1ryw7isyaqqw3sif833k8j32m47lvr0dj46lj2jz0a0"; buildDepends = [ base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed httpTypes systemFilepath text transformers unixCompat wai From bd8ae3c5234d1dd1b10d0d3fe6514e108448640b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:44 +0100 Subject: [PATCH 068/107] haskell-yesod-test: update to version 0.3.3.1 --- pkgs/development/libraries/haskell/yesod-test/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index b03274902e67..2d7496b3c1c5 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-test"; - version = "0.3.3"; - sha256 = "1jb410r905wd26swh2rk59nbyy389gcfz261adhb69awmsyql5x3"; + version = "0.3.3.1"; + sha256 = "052dc68r2k56jzl9yh72kwcgdp35rm9w9vyj6xprqk506i43x7m1"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive cookie hspec htmlConduit httpTypes HUnit monadControl network From 4d11098bddace11d630e9bd17c9ff8d7c3663019 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:44 +0100 Subject: [PATCH 069/107] haskell-yesod: update to version 1.1.8 --- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 50365296270d..c4f865d3e85f 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.1.7.2"; - sha256 = "0mxxzcmp63sdn7g30ilp40dsj2iccajc9gpxycnqxqabdzhqkbm0"; + version = "1.1.8"; + sha256 = "0ygcsrq8nf1jvksig72r3i13qz1d3hgh5476fy6l4wl33idk6jb1"; isLibrary = true; isExecutable = true; buildDepends = [ From e816889ccccfcac0a23693377bfda6224cd41066 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:44 +0100 Subject: [PATCH 070/107] haskell-hlint: update to version 1.8.43 --- pkgs/development/tools/haskell/hlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 8f8e16dd2609..c914e9c82253 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hlint"; - version = "1.8.42"; - sha256 = "03myq4wagx5d9g6v8znw4l67f1irami0fnlw48rxlqhfn33y5mgc"; + version = "1.8.43"; + sha256 = "0wffswyx60qig1is3ki5asp8i4wvd3gqg2r811rw0zxwi3nrjiv6"; isLibrary = true; isExecutable = true; buildDepends = [ From 07fb82aef3f0514d3d6ceead42061777f8aa60fe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 12:25:11 +0100 Subject: [PATCH 071/107] bash-completion: update to current git HEAD at 2.0-95-gd08b9f2 The 2.0 release is 7+ months old, and there has been lots of activity since. --- pkgs/shells/bash-completion/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix index 7e4c0f230155..217489f4dc01 100644 --- a/pkgs/shells/bash-completion/default.nix +++ b/pkgs/shells/bash-completion/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchgit, autoconf, automake }: -let - version = "2.0"; -in stdenv.mkDerivation { - name = "bash-completion-${version}"; + name = "bash-completion-2.0-95-gd08b9f2"; - src = fetchurl { - url = "http://bash-completion.alioth.debian.org/files/bash-completion-${version}.tar.bz2"; - sha256 = "e5a490a4301dfb228361bdca2ffca597958e47dd6056005ef9393a5852af5804"; + src = fetchgit { + url = "http://anonscm.debian.org/git/bash-completion/bash-completion.git"; + rev = "d08b9f233559b3dced20050ba312b08fe0de53b4"; + sha256 = "0jybaib2bmpk5qd80y1l6wmfcd0b95cmf1l3hcb0ckpj0pjff0bn"; }; + buildInputs = [ autoconf automake ]; + + preConfigure = "autoreconf -i"; + doCheck = true; meta = { @@ -18,6 +20,7 @@ stdenv.mkDerivation { description = "Programmable completion for the bash shell"; license = "GPL"; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.simons ]; }; } From 75fcdfbb9e3eb1a179833be886348157c1e17f50 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 12:25:38 +0100 Subject: [PATCH 072/107] ghc-head: update to snapshot version 7.7.20121213 --- pkgs/development/compilers/ghc/head.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 67f2b4f5c7e2..376033fe2394 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses }: stdenv.mkDerivation rec { - version = "7.7.20121106"; + version = "7.7.20121213"; name = "ghc-${version}"; src = fetchurl { url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2"; - sha256 = "1n3xj8arkzfvs3q1ymxsnbzs23ndsp8pl67sqirl837pkgcmq263"; + sha256 = "0z9ld6271jzv3mx02vqaakirj79pm2vzxnv5a178r6v874qbzx3p"; }; buildInputs = [ ghc perl gmp ncurses ]; From 80056ddc012dc545969515e97ddd88653c6fcbf0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 29 Jan 2013 19:07:09 +0100 Subject: [PATCH 073/107] Add cowsay to the channel --- pkgs/tools/misc/cowsay/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix index 59978e2865cb..a9bdf1b2b92f 100644 --- a/pkgs/tools/misc/cowsay/default.nix +++ b/pkgs/tools/misc/cowsay/default.nix @@ -2,17 +2,22 @@ stdenv.mkDerivation { name = "cowsay-3.03"; + src = fetchurl { url = http://www.nog.net/~tony/warez/cowsay-3.03.tar.gz; - sha256 = "1bxj802na2si2bk5zh7n0b7c33mg8a5n2wnvh0vihl9bmjkp51hb"; + sha256 = "1s3c0g5vmsadicc4lrlkmkm8znm4y6wnxd8kyv9xgm676hban1il"; }; - buildInputs = [perl]; + + buildInputs = [ perl ]; + installPhase = '' bash ./install.sh $out ''; meta = { - description = "cowsay is a program which generates ASCII pictures of a cow with a message."; + description = "A program which generates ASCII pictures of a cow with a message"; homepage = http://www.nog.net/~tony/warez/cowsay.shtml; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.rob ]; }; } From d330f6ff85194735d1f1710af547d4607bd7326d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Jan 2013 12:51:29 +0100 Subject: [PATCH 074/107] Nixpkgs channel: Use XZ compression for nixexprs.tar --- pkgs/top-level/make-tarball.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index e8d775a9a30c..cd70773869de 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -77,8 +77,7 @@ releaseTools.sourceTarball { mkdir ../$releaseName cp -prd . ../$releaseName echo nixpkgs > ../$releaseName/channel-name - (cd .. && tar cfa $out/tarballs/$releaseName.tar.bz2 $releaseName) || false - (cd .. && tar cfa $out/tarballs/$releaseName.tar.lzma $releaseName) || false + (cd .. && tar cfa $out/tarballs/$releaseName.tar.xz $releaseName) || false mkdir -p $out/release-notes cp doc/NEWS.html $out/release-notes/index.html From 8c0179bdde74422a4e2edcd930d7f7b558dc025f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Jan 2013 13:48:45 +0100 Subject: [PATCH 075/107] Make Stratego packages visible to nix-env --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b732c6716893..60252da54738 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2650,7 +2650,7 @@ let stalin = callPackage ../development/compilers/stalin { }; - strategoPackages = strategoPackages018; + strategoPackages = recurseIntoAttrs strategoPackages018; strategoPackages016 = callPackage ../development/compilers/strategoxt/0.16.nix { stdenv = overrideInStdenv stdenv [gnumake380]; From 72cc82d49a2fe5cfba75f3ebed6772008889a115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 30 Jan 2013 14:36:50 +0100 Subject: [PATCH 076/107] Add PODIFF, a tool to diff PO files --- pkgs/tools/text/podiff/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/text/podiff/default.nix diff --git a/pkgs/tools/text/podiff/default.nix b/pkgs/tools/text/podiff/default.nix new file mode 100644 index 000000000000..fc9e3785cf3e --- /dev/null +++ b/pkgs/tools/text/podiff/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "podiff-${version}"; + version = "1.1"; + + src = fetchurl { + url = "ftp://download.gnu.org.ua/pub/release/podiff/podiff-1.1.tar.gz"; + sha256 = "1zz6bcmka5zvk2rq775qv122lqh54aijkxlghvx7z0r6kh880x59"; + }; + + patchPhase = '' + sed "s#PREFIX=/usr#PREFIX=$out#g" -i Makefile + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + ''; + + meta = with stdenv.lib; { + description = "Finds differences in translations between two PO files, or revisions"; + homepage = http://puszcza.gnu.org.ua/software/podiff; + license = licenses.gpl3Plus; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60252da54738..84b4bc485870 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1359,6 +1359,8 @@ let libpng = libpng12; }; + podiff = callPackage ../tools/text/podiff { }; + polipo = callPackage ../servers/polipo { }; polkit_gnome = callPackage ../tools/security/polkit-gnome { }; From e5b51648b1ccb218f83c5310a3b6b00ed3bdc581 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 14:52:53 +0100 Subject: [PATCH 077/107] Move "darwin-native-x11-and-opengl" package into the "os-specific" hierarchy. --- .../darwin/native-x11-and-opengl}/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{build-support/native-darwin-x11-and-opengl => os-specific/darwin/native-x11-and-opengl}/default.nix (100%) diff --git a/pkgs/build-support/native-darwin-x11-and-opengl/default.nix b/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix similarity index 100% rename from pkgs/build-support/native-darwin-x11-and-opengl/default.nix rename to pkgs/os-specific/darwin/native-x11-and-opengl/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84b4bc485870..2b6866e553b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4590,7 +4590,7 @@ let mesaSupported = lib.elem system lib.platforms.mesaPlatforms; - darwinX11AndOpenGL = callPackage ../build-support/native-darwin-x11-and-opengl { }; + darwinX11AndOpenGL = callPackage ../os-specific/darwin/native-x11-and-opengl { }; mesa = if stdenv.isDarwin then darwinX11AndOpenGL else callPackage ../development/libraries/mesa { }; From bc4064af73bde28487c634c99ce44a9b5a23ef0d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Jan 2013 15:16:08 +0100 Subject: [PATCH 078/107] wpa_supplicant: Fix config generation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ‘echo ${extraConfig}’ doesn't do the right thing if extraConfig contains newlines. This broke NixOS because CONFIG_DEBUG_SYSLOG=y wasn't processed. --- .../linux/wpa_supplicant/default.nix | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index c74fc8d634fe..3b77c7104ff9 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, lib, openssl, dbus_libs, pkgconfig, libnl , readlineSupport ? true, readline }: -assert readlineSupport -> readline!=null; + +assert readlineSupport -> readline != null; stdenv.mkDerivation rec { version = "1.1"; @@ -12,21 +13,23 @@ stdenv.mkDerivation rec { url = "http://hostap.epitest.fi/releases/${name}.tar.gz"; sha256 = "00lyifj8cz7qyal6dy1dxbpk3g3bywvdarik8gbj9ds7zmfbwkd5"; }; - extraConfig = lib.concatStringsSep "\n" ( - [ "CONFIG_DEBUG_SYSLOG=y" - "CONFIG_CTRL_IFACE_DBUS=y" - "CONFIG_CTRL_IFACE_DBUS_NEW=y" - "CONFIG_CTRL_IFACE_DBUS_INTRO=y" - "CONFIG_DRIVER_NL80211=y" - "CONFIG_LIBNL32=y" - ] ++ lib.optional readlineSupport "CONFIG_READLINE=y" - ); + + extraConfig = + '' + CONFIG_DEBUG_SYSLOG=y + CONFIG_CTRL_IFACE_DBUS=y + CONFIG_CTRL_IFACE_DBUS_NEW=y + CONFIG_CTRL_IFACE_DBUS_INTRO=y + CONFIG_DRIVER_NL80211=y + CONFIG_LIBNL32=y + ${stdenv.lib.optionalString readlineSupport "CONFIG_READLINE=y"} + ''; preBuild = '' cd wpa_supplicant cp -v defconfig .config - echo ${extraConfig} | tee -a .config - echo CONFIG_LIBNL32=y | tee -a .config + echo "$extraConfig" >> .config + cat .config substituteInPlace Makefile --replace /usr/local $out ''; From 06c9353270039c5edc2f6fc0c6c81d05204ce3cf Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 30 Jan 2013 15:42:40 +0100 Subject: [PATCH 079/107] Add awscli 0.5.0, updated some of its dependencies. --- pkgs/top-level/python-packages.nix | 67 +++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 64fa96af7ce0..4b878b9272c4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -251,6 +251,17 @@ pythonPackages = python.modules // rec { }; }); + awscli = buildPythonPackage rec { + name = "awscli-0.5.0"; + + src = fetchurl { + url = https://github.com/aws/aws-cli/archive/0.5.0.tar.gz; + sha256 = "0smgcisl2p7p2y2i299x7g271kdmgs0hnzngw5030phvh0lq202i"; + }; + + propagatedBuildInputs = [ argparse botocore ]; + + }; logilab_astng = buildPythonPackage rec { name = "logilab-astng-0.24.1"; @@ -337,6 +348,27 @@ pythonPackages = python.modules // rec { }; + botocore = buildPythonPackage rec { + name = "botocore-0.5.2"; + + src = fetchurl { + url = https://github.com/boto/botocore/archive/0.5.2.tar.gz; + sha256 = "18073mydin0mwk1d7vdlmsiz3rvhjzxkaaqrmxw440acbipnngq2"; + }; + + propagatedBuildInputs = [ dateutil requests014 ]; + + meta = { + homepage = https://github.com/boto/botocore; + + license = "bsd"; + + description = "A low-level interface to a growing number of Amazon Web Services"; + + }; + }; + + # bugz = buildPythonPackage (rec { # name = "bugz-0.9.3"; # @@ -576,13 +608,15 @@ pythonPackages = python.modules // rec { dateutil = buildPythonPackage (rec { - name = "dateutil-1.5"; + name = "dateutil-2.1"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/python-dateutil/python-${name}.tar.gz"; - sha256 = "02dhw57jf5kjcp7ng1if7vdrbnlpb9yjmz7wygwwvf3gni4766bg"; + sha256 = "1vlx0lpsxjxz64pz87csx800cwfqznjyr2y7nk3vhmzhkwzyqi2c"; }; + propagatedBuildInputs = [ six ]; + meta = { description = "Powerful extensions to the standard datetime module"; homepage = http://pypi.python.org/pypi/python-dateutil; @@ -2639,6 +2673,35 @@ pythonPackages = python.modules // rec { }; + requests = buildPythonPackage rec { + name = "requests-1.1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz"; + md5 = "a0158815af244c32041a3147ee09abf3"; + }; + + meta = { + description = "Requests is an Apache2 Licensed HTTP library, written in Python, for human beings.."; + homepage = http://docs.python-requests.org/en/latest/; + }; + }; + + requests014 = buildPythonPackage rec { + name = "requests-0.14.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz"; + md5 = "3de30600072cbc7214ae342d1d08aa46"; + }; + + meta = { + description = "Requests is an Apache2 Licensed HTTP library, written in Python, for human beings.."; + homepage = http://docs.python-requests.org/en/latest/; + }; + }; + + reviewboard = buildPythonPackage rec { name = "ReviewBoard-1.6.13"; From c343e1db77970bd7dfa98cdac644743b62c242c7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Jan 2013 15:55:39 +0100 Subject: [PATCH 080/107] awscli: Remove Python prefix --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4b878b9272c4..154feb5c9c85 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -253,6 +253,7 @@ pythonPackages = python.modules // rec { awscli = buildPythonPackage rec { name = "awscli-0.5.0"; + namePrefix = ""; src = fetchurl { url = https://github.com/aws/aws-cli/archive/0.5.0.tar.gz; From 78487562836179a0d61eee26d44a921f0792c61b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 17:30:25 +0100 Subject: [PATCH 081/107] Parallel building is enabled again in GHC 7.6.2, because we hope the issues we've had with earlier versions have been remedied. If anyone experiences build errors with this package, please file issue at Github! --- pkgs/development/compilers/ghc/7.6.2.nix | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.6.2.nix b/pkgs/development/compilers/ghc/7.6.2.nix index a62f2468a61d..e10dcf08b77c 100644 --- a/pkgs/development/compilers/ghc/7.6.2.nix +++ b/pkgs/development/compilers/ghc/7.6.2.nix @@ -12,19 +12,6 @@ stdenv.mkDerivation rec { buildInputs = [ ghc perl gmp ncurses ]; - # The comments below applied to GHC 7.6.1, left for if somebody experiences - # similar problems. If so, I argue we should selectively disable parallel - # building JUST for that platform. ~aristidb - # - ## My attempts to compile GHC with parallel build support enabled, failed - ## 4 consecutive times with the following error: - ## - ## building rts/dist/build/AutoApply.debug_o - ## building rts/dist/build/AutoApply.thr_o - ## rts_dist_HC rts/dist/build/AutoApply.debug_o - ## /nix/store/1iigiim5855m8j7pmwf5xrnpf705s4dh-binutils-2.21.1a/bin/ld: cannot find libraries/integer-gmp/dist-install/build/cbits/gmp-wrappers_o_split/gmp-wrappers__1.o - ## collect2: ld returned 1 exit status - ## make[1]: *** [libraries/integer-gmp/dist-install/build/cbits/gmp-wrappers.p_o] Error 1 enableParallelBuilding = true; buildMK = '' From f929eecfa7209638ef1d9d86cb26db188be069ca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 17:30:51 +0100 Subject: [PATCH 082/107] ghc-7.6.2: cosmetic, no functional change --- pkgs/development/compilers/ghc/7.6.2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/7.6.2.nix b/pkgs/development/compilers/ghc/7.6.2.nix index e10dcf08b77c..fd678d090a27 100644 --- a/pkgs/development/compilers/ghc/7.6.2.nix +++ b/pkgs/development/compilers/ghc/7.6.2.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure ''; - configureFlags=[ + configureFlags = [ "--with-gcc=${stdenv.gcc}/bin/gcc" ]; From abdd5bc538a7972ac393e422ea6029926ef54e04 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 17:47:45 +0100 Subject: [PATCH 083/107] Hide package sets for GHC 6.10.4, 6.12.3, 7.0.4, 7.4.1, and 7.6.1 from nix-env (and from Hydra). It is still possible to install any of those packages by referring to them by attribute: | $ nix-env -iA haskellPackages_ghc6104.hopenssl --dry-run | (dry run; not doing anything) | installing `haskell-hopenssl-ghc6.10.4-1.6.1' | these paths will be fetched (50.61 MiB download, 450.34 MiB unpacked): | /nix/store/rjsgga1fdqin47n2rkfn9l7v9ncsfh9l-haskell-hopenssl-ghc6.10.4-1.6.1 | /nix/store/y567qhqbjxbkldg3kq2clzn52a56cmdn-haskell-mtl-ghc6.10.4-1.1.0.2 | /nix/store/zbn24z1443fbrx6ch1nn2vnss9bdw1g0-ghc-6.10.4 It's no longer possible to install those by name anymore, though: | $ nix-env -i haskell-hopenssl-ghc6.10.4 | error: selector `haskell-hopenssl-ghc6.10.4' matches no derivations That style works only for active GHC versions 7.4.2 and 7.6.2: | $ nix-env -qaP \* | grep haskell-hopenssl | haskellPackages.hopenssl haskell-hopenssl-ghc7.4.2-1.6.1 | haskellPackages_ghc742_no_profiling.hopenssl haskell-hopenssl-ghc7.4.2-1.6.1 | haskellPackages_ghc742_profiling.hopenssl haskell-hopenssl-ghc7.4.2-1.6.1-profiling | haskellPackages_ghc762.hopenssl haskell-hopenssl-ghc7.6.2-1.6.1 These changes intend to ease the load on Hydra. If you desperately need pre-build binaries of any of those old versions, please post a short note on the nix-dev mailing list. --- pkgs/top-level/all-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b6866e553b4..2fbe33cf1452 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2387,25 +2387,25 @@ let # Current Haskell Platform: 2012.4.0.0 haskellPlatform = haskellPackages.haskellPlatform; - haskellPackages_ghc6104 = recurseIntoAttrs (haskell.packages_ghc6104); + haskellPackages_ghc6104 = haskell.packages_ghc6104; haskellPackages_ghc6121 = haskell.packages_ghc6121; haskellPackages_ghc6122 = haskell.packages_ghc6122; - haskellPackages_ghc6123 = recurseIntoAttrs (haskell.packages_ghc6123); + haskellPackages_ghc6123 = haskell.packages_ghc6123; haskellPackages_ghc701 = haskell.packages_ghc701; haskellPackages_ghc702 = haskell.packages_ghc702; haskellPackages_ghc703 = haskell.packages_ghc703; - haskellPackages_ghc704 = recurseIntoAttrs (haskell.packages_ghc704); + haskellPackages_ghc704 = haskell.packages_ghc704; haskellPackages_ghc721 = haskell.packages_ghc721; haskellPackages_ghc722 = haskell.packages_ghc722; # For the default version, we build profiling versions of the libraries, too. # The following three lines achieve that: the first two make Hydra build explicit # profiling and non-profiling versions; the final respects the user-configured # default setting. - haskellPackages_ghc741 = recurseIntoAttrs (haskell.packages_ghc741); + haskellPackages_ghc741 = haskell.packages_ghc741; haskellPackages_ghc742_no_profiling = recurseIntoAttrs (haskell.packages_ghc741.noProfiling); haskellPackages_ghc742_profiling = recurseIntoAttrs (haskell.packages_ghc741.profiling); haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742.highPrio); - haskellPackages_ghc761 = recurseIntoAttrs (haskell.packages_ghc761); + haskellPackages_ghc761 = haskell.packages_ghc761; haskellPackages_ghc762 = recurseIntoAttrs (haskell.packages_ghc762); # Reasonably current HEAD snapshot. haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; From 23e7008a71bf606af38c480567866831d2b6251a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 17:50:07 +0100 Subject: [PATCH 084/107] all-packages.nix: fix typos in the haskellPackages attribute sets for GHC 7.4.2 The haskellPackages_ghc742_{no_,}profiling set accidentally referred to the GHC 7.4.1 versions. --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2fbe33cf1452..be32e6e59465 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2402,8 +2402,8 @@ let # profiling and non-profiling versions; the final respects the user-configured # default setting. haskellPackages_ghc741 = haskell.packages_ghc741; - haskellPackages_ghc742_no_profiling = recurseIntoAttrs (haskell.packages_ghc741.noProfiling); - haskellPackages_ghc742_profiling = recurseIntoAttrs (haskell.packages_ghc741.profiling); + haskellPackages_ghc742_no_profiling = recurseIntoAttrs (haskell.packages_ghc742.noProfiling); + haskellPackages_ghc742_profiling = recurseIntoAttrs (haskell.packages_ghc742.profiling); haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742.highPrio); haskellPackages_ghc761 = haskell.packages_ghc761; haskellPackages_ghc762 = recurseIntoAttrs (haskell.packages_ghc762); From 36f6f003feba394621a7dfdbb9de23fe0468944f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 31 Jan 2013 00:23:55 +0100 Subject: [PATCH 085/107] docutils: updating to 0.10 mplayer2 required "rst2man.py", not available in 0.5. --- pkgs/development/tools/documentation/docutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/documentation/docutils/default.nix b/pkgs/development/tools/documentation/docutils/default.nix index 1630b0f4072f..f6edcf54463a 100644 --- a/pkgs/development/tools/documentation/docutils/default.nix +++ b/pkgs/development/tools/documentation/docutils/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "0.5" a; + version = a.lib.attrByPath ["version"] "0.10" a; buildInputs = with a; [ python pil makeWrapper ]; @@ -10,7 +10,7 @@ in rec { src = fetchurl { url = "http://prdownloads.sourceforge.net/docutils/docutils-${version}.tar.gz"; - sha256 = "03k1dakb5j1xi1xd62vqqy7dkgd1fhr4ahmvvmd5g87wxn2gjz3l"; + sha256 = "0gk0733w34zibzvi6paqqfbbajzaxajc4z5i5wpxlwv73gk281ip"; }; inherit buildInputs; From 10e12b76a5484a2168a2038bdc38a0b710e3d5fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 31 Jan 2013 00:24:24 +0100 Subject: [PATCH 086/107] ffmpeg 1.1: building libavresample It's disabled by default, but mplayer2 requires it (still). --- pkgs/development/libraries/ffmpeg/1.1.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/ffmpeg/1.1.nix b/pkgs/development/libraries/ffmpeg/1.1.nix index a40b40d68be9..7cb83db5e8d3 100644 --- a/pkgs/development/libraries/ffmpeg/1.1.nix +++ b/pkgs/development/libraries/ffmpeg/1.1.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { "--enable-swscale" "--disable-ffplay" "--enable-shared" + "--enable-avresample" "--enable-runtime-cpudetect" ] ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" From 511f3b7a613c51192996a9d191ddaf17338a1f14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 31 Jan 2013 00:26:30 +0100 Subject: [PATCH 087/107] Adding mplayer2, a mplayer fork. It can play files very well with "vdpau". It has a reworked vdpau pipeline compared to mplayer1. Mplayer1 fails to play well in my computer. --- pkgs/applications/video/mplayer2/default.nix | 132 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 2 files changed, 136 insertions(+) create mode 100644 pkgs/applications/video/mplayer2/default.nix diff --git a/pkgs/applications/video/mplayer2/default.nix b/pkgs/applications/video/mplayer2/default.nix new file mode 100644 index 000000000000..52b5b9f7bd44 --- /dev/null +++ b/pkgs/applications/video/mplayer2/default.nix @@ -0,0 +1,132 @@ +{ stdenv, fetchurl, fetchgit, freetype, pkgconfig, yasm, freefont_ttf, ffmpeg, libass +, python3, docutils, which +, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null +, xineramaSupport ? true, libXinerama ? null +, xvSupport ? true, libXv ? null +, alsaSupport ? true, alsaLib ? null +, screenSaverSupport ? true, libXScrnSaver ? null +, vdpauSupport ? true, libvdpau ? null +, dvdnavSupport ? true, libdvdnav ? null +, bluraySupport ? true, libbluray ? null +, speexSupport ? true, speex ? null +, theoraSupport ? true, libtheora ? null +, jackaudioSupport ? false, jackaudio ? null +, pulseSupport ? true, pulseaudio ? null +# For screenshots +, libpngSupport ? true, libpng ? null +, useUnfreeCodecs ? false +}: + +assert x11Support -> (libX11 != null && libXext != null && mesa != null); +assert xineramaSupport -> (libXinerama != null && x11Support); +assert xvSupport -> (libXv != null && x11Support); +assert alsaSupport -> alsaLib != null; +assert screenSaverSupport -> libXScrnSaver != null; +assert vdpauSupport -> libvdpau != null; +assert dvdnavSupport -> libdvdnav != null; +assert bluraySupport -> libbluray != null; +assert speexSupport -> speex != null; +assert theoraSupport -> libtheora != null; +assert jackaudioSupport -> jackaudio != null; +assert pulseSupport -> pulseaudio != null; +assert libpngSupport -> libpng != null; + +let + + codecs_src = + let + dir = http://www.mplayerhq.hu/MPlayer/releases/codecs/; + in + if stdenv.system == "i686-linux" then fetchurl { + url = "${dir}/essential-20071007.tar.bz2"; + sha256 = "18vls12n12rjw0mzw4pkp9vpcfmd1c21rzha19d7zil4hn7fs2ic"; + } else if stdenv.system == "x86_64-linux" then fetchurl { + url = "${dir}/essential-amd64-20071007.tar.bz2"; + sha256 = "13xf5b92w1ra5hw00ck151lypbmnylrnznq9hhb0sj36z5wz290x"; + } else if stdenv.system == "powerpc-linux" then fetchurl { + url = "${dir}/essential-ppc-20071007.tar.bz2"; + sha256 = "18mlj8dp4wnz42xbhdk1jlz2ygra6fbln9wyrcyvynxh96g1871z"; + } else null; + + codecs = if codecs_src != null then stdenv.mkDerivation { + name = "MPlayer-codecs-essential-20071007"; + + src = codecs_src; + + installPhase = '' + mkdir $out + cp -prv * $out + ''; + + meta.license = "unfree"; + } else null; + +in + +stdenv.mkDerivation rec { + name = "mplayer2-20130130"; + + src = fetchgit { + url = "git://git.mplayer2.org/mplayer2.git"; + rev = "d3c580156c0b8777ff082426ebd61bb7ffe0c225"; + sha256 = "1akf2mb2zklz609ks555vjvcs1gw8nwg5kbb9jwra8c4v1dfyhys"; + }; + + prePatch = '' + sed -i /^_install_strip/d configure + ''; + + buildInputs = with stdenv.lib; + [ freetype pkgconfig ffmpeg libass docutils which ] + ++ optionals x11Support [ libX11 libXext mesa ] + ++ optional alsaSupport alsaLib + ++ optional xvSupport libXv + ++ optional theoraSupport libtheora + ++ optional xineramaSupport libXinerama + ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] + ++ optional bluraySupport libbluray + ++ optional jackaudioSupport jackaudio + ++ optional pulseSupport pulseaudio + ++ optional screenSaverSupport libXScrnSaver + ++ optional vdpauSupport libvdpau + ++ optional speexSupport speex + ++ optional libpngSupport libpng + ; + + buildNativeInputs = [ yasm python3 ]; + + postConfigure = '' + patchShebangs TOOLS + ''; + + configureFlags = with stdenv.lib; + '' + ${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"} + ${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"} + ${optionalString dvdnavSupport "--extra-ldflags=-ldvdread"} + ${if xvSupport then "--enable-xv" else "--disable-xv"} + ${if x11Support then "--enable-x11 --enable-gl --extra-cflags=-I{libx11}/include" + else "--disable-x11 --disable-gl"} + --disable-xvid + --disable-ossaudio + ''; + + NIX_LDFLAGS = stdenv.lib.optionalString x11Support "-lX11 -lXext"; + + enableParallelBuilding = true; + + # Provide a reasonable standard font. Maybe we should symlink here. + postInstall = + '' + mkdir -p $out/share/mplayer + cp ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mplayer/subfont.ttf + ''; + + meta = { + description = "A movie player that supports many video formats (MPlayer fork)"; + homepage = "http://mplayer2.org"; + license = "GPLv3+"; + maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be32e6e59465..fd01a7172819 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7541,6 +7541,10 @@ let pulseSupport = config.pulseaudio or false; }; + mplayer2 = callPackage ../applications/video/mplayer2 { + ffmpeg = ffmpeg_1_1; + }; + MPlayerPlugin = browser: import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in { inherit browser; From 86839c4a6da61acbe742b134d97b10155eb50561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 31 Jan 2013 17:01:13 +0100 Subject: [PATCH 088/107] iwlwifi-2030-ucode: url change --- pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix index 162423dbc05e..bc9c8efe063a 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "iwlwifi-2030-ucode-18.168.6.1"; src = fetchurl { - url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz"; + url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz"; + name = "${name}.tgz"; sha256 = "0b69jpb46fk63ybyyb8lbh99j1d29ayp8fl98l18iqy3q7mx4ry8"; }; From ebfc26b43df80f27b3f055c4a66ad3cc59eae687 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 31 Jan 2013 14:33:02 -0500 Subject: [PATCH 089/107] Update rubygems --- .../interpreters/ruby/generated.nix | 601 +++++++++--------- 1 file changed, 309 insertions(+), 292 deletions(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index bc50a08f29a8..7c0afdffda43 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -3,69 +3,69 @@ g: # Get dependencies from patched gems { aliases = { - ZenTest = g.ZenTest_4_8_1; - actionmailer = g.actionmailer_3_2_6; - actionpack = g.actionpack_3_2_6; - activemodel = g.activemodel_3_2_6; - activerecord = g.activerecord_3_2_6; - activeresource = g.activeresource_3_2_6; - activesupport = g.activesupport_3_2_6; - addressable = g.addressable_2_2_8; + ZenTest = g.ZenTest_4_8_4; + actionmailer = g.actionmailer_3_2_11; + actionpack = g.actionpack_3_2_11; + activemodel = g.activemodel_3_2_11; + activerecord = g.activerecord_3_2_11; + activeresource = g.activeresource_3_2_11; + activesupport = g.activesupport_3_2_11; arel = g.arel_3_0_2; - atoulme_Antwrap = g.atoulme_Antwrap_0_7_2; + atoulme_Antwrap = g.atoulme_Antwrap_0_7_4; autotest_rails = g.autotest_rails_4_1_2; - builder = g.builder_3_0_0; - buildr = g.buildr_1_4_7; - bundler = g.bundler_1_1_4; - childprocess = g.childprocess_0_3_3; + builder = g.builder_3_1_4; + buildr = g.buildr_1_4_9; + bundler = g.bundler_1_2_3; + childprocess = g.childprocess_0_3_7; diff_lcs = g.diff_lcs_1_1_3; erubis = g.erubis_2_7_0; fakes3 = g.fakes3_0_1_5; - ffi = g.ffi_1_0_11; + ffi = g.ffi_1_3_1; highline = g.highline_1_6_2; hike = g.hike_1_2_1; - hoe = g.hoe_2_3_3; - i18n = g.i18n_0_6_0; + hoe = g.hoe_3_1_0; + i18n = g.i18n_0_6_1; journey = g.journey_1_0_4; - json = g.json_1_7_3; - json_pure = g.json_pure_1_7_3; - libwebsocket = g.libwebsocket_0_1_3; + jruby_pageant = g.jruby_pageant_1_1_1; + json = g.json_1_7_6; + json_pure = g.json_pure_1_7_6; mail = g.mail_2_4_4; mime_types = g.mime_types_1_19; minitar = g.minitar_0_5_3; - multi_json = g.multi_json_1_3_6; + multi_json = g.multi_json_1_5_0; net_sftp = g.net_sftp_2_0_5; - net_ssh = g.net_ssh_2_5_2; + net_ssh = g.net_ssh_2_6_3; nix = g.nix_0_1_1; polyglot = g.polyglot_0_3_3; - rack = g.rack_1_4_1; + rack = g.rack_1_5_1; rack_cache = g.rack_cache_1_2; - rack_ssl = g.rack_ssl_1_3_2; - rack_test = g.rack_test_0_6_1; - rails = g.rails_3_2_6; - railties = g.railties_3_2_6; - rake = g.rake_0_9_2_2; - rb_fsevent = g.rb_fsevent_0_9_1; + rack_ssl = g.rack_ssl_1_3_3; + rack_test = g.rack_test_0_6_2; + rails = g.rails_3_2_11; + railties = g.railties_3_2_11; + rake = g.rake_10_0_3; + rb_fsevent = g.rb_fsevent_0_9_3; rdoc = g.rdoc_3_12; - rjb = g.rjb_1_4_0; - rspec = g.rspec_2_9_0; - rspec_core = g.rspec_core_2_9_0; - rspec_expectations = g.rspec_expectations_2_9_1; - rspec_mocks = g.rspec_mocks_2_9_0; + rjb = g.rjb_1_4_6; + rspec = g.rspec_2_11_0; + rspec_core = g.rspec_core_2_11_1; + rspec_expectations = g.rspec_expectations_2_11_3; + rspec_mocks = g.rspec_mocks_2_11_3; rubyforge = g.rubyforge_2_0_4; rubyzip = g.rubyzip_0_9_9; - sass = g.sass_3_1_20; - selenium_webdriver = g.selenium_webdriver_2_24_0; - sprockets = g.sprockets_2_1_3; - thor = g.thor_0_15_4; + sass = g.sass_3_2_5; + selenium_webdriver = g.selenium_webdriver_2_29_0; + sprockets = g.sprockets_2_2_2; + thor = g.thor_0_17_0; tilt = g.tilt_1_3_3; - treetop = g.treetop_1_4_10; - tzinfo = g.tzinfo_0_3_33; - xml_simple = g.xml_simple_1_0_12; + treetop = g.treetop_1_4_12; + tzinfo = g.tzinfo_0_3_35; + websocket = g.websocket_1_0_7; + xml_simple = g.xml_simple_1_1_1; }; gem_nix_args = [ ''autotest-rails'' ''buildr'' ''fakes3'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ]; gems = { - ZenTest_4_8_1 = { + ZenTest_4_8_4 = { basename = ''ZenTest''; meta = { description = ''ZenTest provides 4 different tools: zentest, unit_diff, autotest, and multiruby''; @@ -92,89 +92,75 @@ multiruby runs anything you want on multiple versions of ruby. Great for compatibility checking! Use multiruby_setup to manage your installed versions.''; }; - name = ''ZenTest-4.8.1''; + name = ''ZenTest-4.8.4''; requiredGems = [ ]; - sha256 = ''0jp86czz16b0wamxvzs8p7pxwagj68h2zch9yjmjk7b069xrsg3v''; + sha256 = ''074k8smn2qfyyh32r0pja0wpcxbvlb6bhsc7rqrcjrisdjkngkrr''; }; - actionmailer_3_2_6 = { + actionmailer_3_2_11 = { basename = ''actionmailer''; meta = { description = ''Email composition, delivery, and receiving framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.''; }; - name = ''actionmailer-3.2.6''; + name = ''actionmailer-3.2.11''; requiredGems = [ g.mail_2_4_4 ]; - sha256 = ''1h9035i9rnh98pc4z073cpcjjkwcswjigg1a3a6ll0s9lb6dnk54''; + sha256 = ''12j8k1kfz5lqqlrxna88455hx62mbs638414dhnwsw358yf52qnn''; }; - actionpack_3_2_6 = { + actionpack_3_2_11 = { basename = ''actionpack''; meta = { description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.''; }; - name = ''actionpack-3.2.6''; - requiredGems = [ g.activemodel_3_2_6 g.rack_cache_1_2 g.rack_test_0_6_1 g.journey_1_0_4 g.sprockets_2_1_3 g.erubis_2_7_0 ]; - sha256 = ''1qwy7p353sp3x3crinfsx873vfrc84bfy61hz95qhy8anq03ay34''; + name = ''actionpack-3.2.11''; + requiredGems = [ g.activemodel_3_2_11 g.rack_cache_1_2 g.rack_1_4_4 g.rack_test_0_6_2 g.journey_1_0_4 g.sprockets_2_2_2 g.erubis_2_7_0 ]; + sha256 = ''0ins0by3il1fkg5aslr7rb97ykkrrns7dsp6qr8wwvr1dvrzrnbq''; }; - activemodel_3_2_6 = { + activemodel_3_2_11 = { basename = ''activemodel''; meta = { description = ''A toolkit for building modeling frameworks (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.''; }; - name = ''activemodel-3.2.6''; - requiredGems = [ ]; - sha256 = ''18bvwpfxr6kp66b62n17qgn7bb02va6bvckips36cxrkznafsk6j''; + name = ''activemodel-3.2.11''; + requiredGems = [ g.builder_3_0_4 ]; + sha256 = ''0q5f70wv76aprdawqgwa0ldsg3v45mqi36yicir336941lcs28nf''; }; - activerecord_3_2_6 = { + activerecord_3_2_11 = { basename = ''activerecord''; meta = { description = ''Object-relational mapper framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.''; }; - name = ''activerecord-3.2.6''; - requiredGems = [ g.arel_3_0_2 g.tzinfo_0_3_33 ]; - sha256 = ''1xc901m3a85j28bn2f96fh9c5y4wq4xivympm32xj4zr2ib20c2m''; + name = ''activerecord-3.2.11''; + requiredGems = [ g.arel_3_0_2 g.tzinfo_0_3_35 ]; + sha256 = ''049h164hwd6j7p8rvb46h776rshmkk4dpvh9cynihaajvzmcj3lw''; }; - activeresource_3_2_6 = { + activeresource_3_2_11 = { basename = ''activeresource''; meta = { description = ''REST modeling framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.''; }; - name = ''activeresource-3.2.6''; + name = ''activeresource-3.2.11''; requiredGems = [ ]; - sha256 = ''1lyv64rccgrdfhzccxj9qm5dnjy212x4q1nc21mf2xf2nc4zi33a''; + sha256 = ''0pjxfl589an08pm29cqid8dsbn3f7dlr56kpr6bs3gbzg9k3b44h''; }; - activesupport_3_2_6 = { + activesupport_3_2_11 = { basename = ''activesupport''; meta = { description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.''; }; - name = ''activesupport-3.2.6''; - requiredGems = [ g.i18n_0_6_0 g.multi_json_1_3_6 ]; - sha256 = ''00jlixc7pkifikdgkjmgxypx8rizj3jizhjcpi4v9hd72yw8m7j2''; - }; - addressable_2_2_8 = { - basename = ''addressable''; - meta = { - description = ''URI Implementation''; - homepage = ''http://addressable.rubyforge.org/''; - longDescription = ''Addressable is a replacement for the URI implementation that is part of -Ruby's standard library. It more closely conforms to the relevant RFCs and -adds support for IRIs and URI templates. -''; - }; - name = ''addressable-2.2.8''; - requiredGems = [ ]; - sha256 = ''1zrwrs5aji7ah2qh4x47f4j85s3sdsrrx4xayyhnrcykcg7s4n49''; + name = ''activesupport-3.2.11''; + requiredGems = [ g.i18n_0_6_1 g.multi_json_1_5_0 ]; + sha256 = ''1dyi5vw118hfm88fxgrlfy3w5s6ka8505asw0nrrfma04jvpbq9s''; }; arel_3_0_2 = { basename = ''arel''; @@ -194,7 +180,7 @@ database compatibility and query generation.''; requiredGems = [ ]; sha256 = ''158bvrhammpblky9z9dgimjr55bdypfx6w5s1dm4vyj42h49qpkx''; }; - atoulme_Antwrap_0_7_2 = { + atoulme_Antwrap_0_7_4 = { basename = ''atoulme_Antwrap''; meta = { description = ''A Ruby module that wraps the Apache Ant build tool. Antwrap can be used to invoke Ant Tasks from a Ruby or a JRuby script.''; @@ -212,9 +198,9 @@ database compatibility and query generation.''; Ant (http://ant.apache.org/) tasks in a Java project. If you are tired of fighting with Ant or Maven XML files in your Java project, take some time to check out Buildr!''; }; - name = ''atoulme-Antwrap-0.7.2''; - requiredGems = [ ]; - sha256 = ''0r9l3cn0gjck5q00djas5h43pr64pjvafhz6f7zhki4qqkwbb6j3''; + name = ''atoulme-Antwrap-0.7.4''; + requiredGems = [ g.rjb_1_4_6 ]; + sha256 = ''0sh9capkya88qm9mvixwly32fwb2c4nzif9j9vv0f73rqw8kz4j4''; }; autotest_rails_4_1_2 = { basename = ''autotest_rails''; @@ -225,21 +211,10 @@ database compatibility and query generation.''; rails support and extra plugins for migrations and fixtures.''; }; name = ''autotest-rails-4.1.2''; - requiredGems = [ g.ZenTest_4_8_1 ]; + requiredGems = [ g.ZenTest_4_8_4 ]; sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4''; }; - builder_2_1_2 = { - basename = ''builder''; - meta = { - description = ''Builders for MarkUp.''; - homepage = ''http://onestepback.org''; - longDescription = ''Builder provides a number of builder objects that make creating structured data simple to do. Currently the following builder objects are supported: * XML Markup * XML Events''; - }; - name = ''builder-2.1.2''; - requiredGems = [ ]; - sha256 = ''0hp5gsvp63mqqvi7dl95zwci916vj6l1slgz4crip1rijk3v2806''; - }; - builder_3_0_0 = { + builder_3_0_4 = { basename = ''builder''; meta = { description = ''Builders for MarkUp.''; @@ -251,11 +226,43 @@ simple to do. Currently the following builder objects are supported: * XML Events ''; }; - name = ''builder-3.0.0''; + name = ''builder-3.0.4''; requiredGems = [ ]; - sha256 = ''13k12jii9z1hma4xxk2dl74wsx985idl3cs9svvla8p0bmgf3lzv''; + sha256 = ''0hn41h249v82wj7d9vji2lm568jxv8pzq2czh2v0603hjv21r8x1''; }; - buildr_1_4_7 = { + builder_3_1_3 = { + basename = ''builder''; + meta = { + description = ''Builders for MarkUp.''; + homepage = ''http://onestepback.org''; + longDescription = ''Builder provides a number of builder objects that make creating structured data +simple to do. Currently the following builder objects are supported: + +* XML Markup +* XML Events +''; + }; + name = ''builder-3.1.3''; + requiredGems = [ ]; + sha256 = ''0w6xsq9vyvzdy0xb52sajgipr9ml2bbpivk6dxm69c6987dk7him''; + }; + builder_3_1_4 = { + basename = ''builder''; + meta = { + description = ''Builders for MarkUp.''; + homepage = ''http://onestepback.org''; + longDescription = ''Builder provides a number of builder objects that make creating structured data +simple to do. Currently the following builder objects are supported: + +* XML Markup +* XML Events +''; + }; + name = ''builder-3.1.4''; + requiredGems = [ ]; + sha256 = ''1p0bjy1vb0zbswd6bsh5qda0f0br53p8vak8cm7hls62094r405p''; + }; + buildr_1_4_9 = { basename = ''buildr''; meta = { description = ''Build like you code''; @@ -267,31 +274,31 @@ to do, and it takes care of the rest. But also something we can easily extend for those one-off tasks, with a language that's a joy to use. ''; }; - name = ''buildr-1.4.7''; - requiredGems = [ g.rake_0_9_2_2 g.builder_2_1_2 g.net_ssh_2_3_0 g.net_sftp_2_0_5 g.rubyzip_0_9_4 g.highline_1_6_2 g.json_pure_1_4_3 g.rubyforge_2_0_3 g.hoe_2_3_3 g.rjb_1_4_0 g.atoulme_Antwrap_0_7_2 g.diff_lcs_1_1_3 g.rspec_expectations_2_9_0 g.rspec_mocks_2_9_0 g.rspec_core_2_9_0 g.rspec_2_9_0 g.xml_simple_1_0_12 g.minitar_0_5_3 ]; - sha256 = ''0ddb71xgdjxvkf485c16kvip8i26wy4l171pjbw04qmy3cank42h''; + name = ''buildr-1.4.9''; + requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 ]; + sha256 = ''1ws8cdc7ylfq0aqbcmgwj3d8jxh8lp8zgxx0w0a7ippvvjjxb7az''; }; - bundler_1_1_4 = { + bundler_1_2_3 = { basename = ''bundler''; meta = { description = ''The best way to manage your application's dependencies''; homepage = ''http://gembundler.com''; longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably''; }; - name = ''bundler-1.1.4''; + name = ''bundler-1.2.3''; requiredGems = [ ]; - sha256 = ''13pj4kk01xrdmdvgz1mvvhnbp1vi40gq50n8wdk3lpqp5za26gr0''; + sha256 = ''0bf6ync0901d9q4cg5ws4ra0qh9ssw2xgsip8dka34sbm59kav4w''; }; - childprocess_0_3_3 = { + childprocess_0_3_7 = { basename = ''childprocess''; meta = { description = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.''; homepage = ''http://github.com/jarib/childprocess''; longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.''; }; - name = ''childprocess-0.3.3''; - requiredGems = [ g.ffi_1_0_11 ]; - sha256 = ''0yqlbxnc427lnh1xw71qyzkic1pdpmacqxp8zw0gvx7yzkw3fjr0''; + name = ''childprocess-0.3.7''; + requiredGems = [ g.ffi_1_3_1 ]; + sha256 = ''1dq7zyjm9fdivxm83nbhn8y5w9cc5wa458qlmkkcy52yvv0vsc84''; }; diff_lcs_1_1_3 = { basename = ''diff_lcs''; @@ -348,23 +355,19 @@ is the MIT license.''; longDescription = ''Use FakeS3 to test basic S3 functionality without actually connecting to S3''; }; name = ''fakes3-0.1.5''; - requiredGems = [ g.thor_0_15_4 g.builder_3_0_0 ]; + requiredGems = [ g.thor_0_17_0 g.builder_3_1_4 ]; sha256 = ''1na5wrbarla6s414svqmr5spbpv6vmcgpswal444x4clcpmadhib''; }; - ffi_1_0_11 = { + ffi_1_3_1 = { basename = ''ffi''; meta = { - description = ''Ruby-FFI is a ruby extension for programmatically loading dynamic libraries, binding functions within them, and calling those functions from Ruby code''; + description = ''Ruby FFI''; homepage = ''http://wiki.github.com/ffi/ffi''; - longDescription = ''Ruby-FFI is a ruby extension for programmatically loading dynamic -libraries, binding functions within them, and calling those functions -from Ruby code. Moreover, a Ruby-FFI extension works without changes -on Ruby and JRuby. Discover why should you write your next extension -using Ruby-FFI here[http://wiki.github.com/ffi/ffi/why-use-ffi].''; + longDescription = ''Ruby FFI library''; }; - name = ''ffi-1.0.11''; + name = ''ffi-1.3.1''; requiredGems = [ ]; - sha256 = ''177v6bwslyb7n961nw11i8x9j43k796s11bs98kynl58n0a3n99b''; + sha256 = ''0hbrfwgaw3ilmb47lvg9gzdnnfs0q0dzp6dki7rphcvsgirhp0sb''; }; highline_1_6_2 = { basename = ''highline''; @@ -392,46 +395,36 @@ minutes of work. requiredGems = [ ]; sha256 = ''1c78gja9i9nj76gdj65czhvwam6550l0w9ilnn8vysj9cwv0rg7b''; }; - hoe_2_3_3 = { + hoe_3_1_0 = { basename = ''hoe''; meta = { description = ''Hoe is a rake/rubygems helper for project Rakefiles''; - homepage = ''http://rubyforge.org/projects/seattlerb/''; - longDescription = ''Hoe is a rake/rubygems helper for project Rakefiles. It helps generate -rubygems and includes a dynamic plug-in system allowing for easy -extensibility. Hoe ships with plug-ins for all your usual project -tasks including rdoc generation, testing, packaging, and deployment. + homepage = ''http://www.zenspider.com/projects/hoe.html''; + longDescription = ''Hoe is a rake/rubygems helper for project Rakefiles. It helps you +manage, maintain, and release your project and includes a dynamic +plug-in system allowing for easy extensibility. Hoe ships with +plug-ins for all your usual project tasks including rdoc generation, +testing, packaging, deployment, and announcement.. -Plug-ins Provided: +See class rdoc for help. Hint: `ri Hoe` or any of the plugins listed +below. -* Hoe::Clean -* Hoe::Debug -* Hoe::Deps -* Hoe::Flay -* Hoe::Flog -* Hoe::Inline -* Hoe::Package -* Hoe::Publish -* Hoe::RCov -* Hoe::Signing -* Hoe::Test - -See class rdoc for help. Hint: ri Hoe''; +For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; }; - name = ''hoe-2.3.3''; - requiredGems = [ g.rubyforge_2_0_4 ]; - sha256 = ''06jlnbhimrn6znimaaxm7kh2269lapkbmnp3wssrjmw06ms7lq9m''; + name = ''hoe-3.1.0''; + requiredGems = [ g.rake_0_9_6 ]; + sha256 = ''0i961x0hrd6fs1nsfham87dhn64gqpnai27l14jag7qbnp3a79yp''; }; - i18n_0_6_0 = { + i18n_0_6_1 = { basename = ''i18n''; meta = { description = ''New wave Internationalization support for Ruby''; homepage = ''http://github.com/svenfuchs/i18n''; longDescription = ''New wave Internationalization support for Ruby.''; }; - name = ''i18n-0.6.0''; + name = ''i18n-0.6.1''; requiredGems = [ ]; - sha256 = ''1pgmfhmh2wv409g7kla30mkp8jpslvp25vcmmim1figl87wpn3j0''; + sha256 = ''0x3lhp1vl1k4dfqx6k93hhxcpjkz57y8cf007ws7p845ywk6ibfl''; }; journey_1_0_4 = { basename = ''journey''; @@ -444,49 +437,49 @@ See class rdoc for help. Hint: ri Hoe''; requiredGems = [ ]; sha256 = ''03y1xidg1rx1yjz8xb50083vfwcsfkgs4zmizc040y1h4mhvhm3l''; }; - json_1_7_3 = { + jruby_pageant_1_1_1 = { + basename = ''jruby_pageant''; + meta = { + description = ''jruby-pageant allows Pageant access on JRuby + Windows''; + homepage = ''http://github.com/arturaz/jruby-pageant''; + longDescription = ''This is a convenience gem packaging required JNA/JSCH jars.''; + }; + name = ''jruby-pageant-1.1.1''; + requiredGems = [ ]; + sha256 = ''1kgqsn0bagr41gf5kbqaxbs38a7s5bm85m0pdx4qz7d70v9nc9cl''; + }; + json_1_7_6 = { basename = ''json''; meta = { description = ''JSON Implementation for Ruby''; homepage = ''http://flori.github.com/json''; longDescription = ''This is a JSON implementation as a Ruby extension in C.''; }; - name = ''json-1.7.3''; + name = ''json-1.7.6''; requiredGems = [ ]; - sha256 = ''1n969j5k0zb7dqfbnjhqm5hnxpsbi05rhsp5ww3cph7d5z6ycw0h''; + sha256 = ''025hdczzmj7zbwcdr53d8qc0bg8i7j5wpp1ps4cqkllz89snb82a''; }; - json_pure_1_4_3 = { + json_pure_1_7_5 = { basename = ''json_pure''; meta = { description = ''JSON Implementation for Ruby''; homepage = ''http://flori.github.com/json''; longDescription = ''This is a JSON implementation in pure Ruby.''; }; - name = ''json_pure-1.4.3''; + name = ''json_pure-1.7.5''; requiredGems = [ ]; - sha256 = ''1xw357gkmk6712c94lhpsrq8j9v91mgc2nxlr1m6n20yl6sz2g9r''; + sha256 = ''14nwwf001mh70qnynpb3h8c0kgcfi666yrg2frib4p6lr57jx8ap''; }; - json_pure_1_7_3 = { + json_pure_1_7_6 = { basename = ''json_pure''; meta = { description = ''JSON Implementation for Ruby''; homepage = ''http://flori.github.com/json''; longDescription = ''This is a JSON implementation in pure Ruby.''; }; - name = ''json_pure-1.7.3''; + name = ''json_pure-1.7.6''; requiredGems = [ ]; - sha256 = ''0m316halw0l1gd2lx811qhyfs9a98dfgxign8zij0a1wn9wsh2ci''; - }; - libwebsocket_0_1_3 = { - basename = ''libwebsocket''; - meta = { - description = ''Universal Ruby library to handle WebSocket protocol''; - homepage = ''http://github.com/imanel/libwebsocket''; - longDescription = ''Universal Ruby library to handle WebSocket protocol''; - }; - name = ''libwebsocket-0.1.3''; - requiredGems = [ g.addressable_2_2_8 ]; - sha256 = ''12i3lyjd9dqvk9wpnrz9zzj7dgb6660dz8xlc7h1nixhsny1y83n''; + sha256 = ''1cjwg6f9gj7w2n9916w12i1g97ngqqar44sc2r1x9ib5jicspb00''; }; mail_2_4_4 = { basename = ''mail''; @@ -496,7 +489,7 @@ See class rdoc for help. Hint: ri Hoe''; longDescription = ''A really Ruby Mail handler.''; }; name = ''mail-2.4.4''; - requiredGems = [ g.mime_types_1_19 g.treetop_1_4_10 ]; + requiredGems = [ g.mime_types_1_19 g.treetop_1_4_12 ]; sha256 = ''0idylz5pnlz34mrxm7gs9jbll2c0k0y9dq2qarhxk30gwyvjaxi3''; }; mime_types_1_19 = { @@ -530,16 +523,16 @@ longer happen. requiredGems = [ ]; sha256 = ''035vs1knnnjsb8arfp8vx75warvwcdpiljjwv38lqljai9v8fq53''; }; - multi_json_1_3_6 = { + multi_json_1_5_0 = { basename = ''multi_json''; meta = { description = ''A gem to provide swappable JSON backends.''; homepage = ''http://github.com/intridea/multi_json''; longDescription = ''A gem to provide easy switching between different JSON backends, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, and OkJson.''; }; - name = ''multi_json-1.3.6''; + name = ''multi_json-1.5.0''; requiredGems = [ ]; - sha256 = ''0q2zjfvd2ibds9g9nzf2p1b47fc1wqliwfywv5pw85w15lmy91yr''; + sha256 = ''0fk75m2496ghgv78yybzhrmf9izw65va3x90gdjkbsw8vfkghk79''; }; net_sftp_2_0_5 = { basename = ''net_sftp''; @@ -549,30 +542,30 @@ longer happen. longDescription = ''A pure Ruby implementation of the SFTP client protocol''; }; name = ''net-sftp-2.0.5''; - requiredGems = [ g.net_ssh_2_5_2 ]; + requiredGems = [ g.net_ssh_2_6_3 ]; sha256 = ''0lqk735wspm8rbiyxpbil8ikrqcyg00ss1df7fny0761c3as6m0v''; }; - net_ssh_2_3_0 = { - basename = ''net_ssh''; - meta = { - description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.''; - homepage = ''http://github.com/net-ssh/net-ssh''; - longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.''; - }; - name = ''net-ssh-2.3.0''; - requiredGems = [ ]; - sha256 = ''1q1fznl4nk2963czpzfby4m9jw9rs37k1rzgbjad5r1n7r6dv0sv''; - }; - net_ssh_2_5_2 = { + net_ssh_2_6_0 = { basename = ''net_ssh''; meta = { description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.''; homepage = ''http://github.com/net-ssh/net-ssh''; longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2.''; }; - name = ''net-ssh-2.5.2''; + name = ''net-ssh-2.6.0''; + requiredGems = [ g.jruby_pageant_1_1_1 ]; + sha256 = ''18fsgps4a9dfrjszkl3py8j7vw0xwi70bcp59ccj2rlr6i1jv5gw''; + }; + net_ssh_2_6_3 = { + basename = ''net_ssh''; + meta = { + description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.''; + homepage = ''http://github.com/net-ssh/net-ssh''; + longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2.''; + }; + name = ''net-ssh-2.6.3''; requiredGems = [ ]; - sha256 = ''0kalahmwz9ypglrgg29wlvr4wx381pqwmx9fq3pk600v3j7j018l''; + sha256 = ''1gmrchx9cn7s7ca97kwhrdxvlw5vs3cxpprrvqmhmi3knmnqcp9m''; }; nix_0_1_1 = { basename = ''nix''; @@ -599,23 +592,41 @@ augments 'require' to find and load matching files.''; requiredGems = [ ]; sha256 = ''082zmail2h3cxd9z1wnibhk6aj4sb1f3zzwra6kg9bp51kx2c00v''; }; - rack_1_4_1 = { + rack_1_4_4 = { basename = ''rack''; meta = { description = ''a modular Ruby webserver interface''; - homepage = ''http://rack.rubyforge.org''; + homepage = ''http://rack.github.com/''; longDescription = ''Rack provides a minimal, modular and adaptable interface for developing web applications in Ruby. By wrapping HTTP requests and responses in the simplest way possible, it unifies and distills the API for web servers, web frameworks, and software in between (the so-called middleware) into a single method call. -Also see http://rack.rubyforge.org. +Also see http://rack.github.com/. ''; }; - name = ''rack-1.4.1''; + name = ''rack-1.4.4''; requiredGems = [ ]; - sha256 = ''1cx3wzg48pn4sbb6a0iq726fjh3q7y77fly81mfnprrnwp7d0190''; + sha256 = ''1h0x50ng1s2jy6h5adw4a430vz8x28nskq099x3pjlpns6q632vz''; + }; + rack_1_5_1 = { + basename = ''rack''; + meta = { + description = ''a modular Ruby webserver interface''; + homepage = ''http://rack.github.com/''; + longDescription = ''Rack provides a minimal, modular and adaptable interface for developing +web applications in Ruby. By wrapping HTTP requests and responses in +the simplest way possible, it unifies and distills the API for web +servers, web frameworks, and software in between (the so-called +middleware) into a single method call. + +Also see http://rack.github.com/. +''; + }; + name = ''rack-1.5.1''; + requiredGems = [ ]; + sha256 = ''113gzaha2qx74y0wl940zlzrn9357yww6zrbyva05d09l749d21r''; }; rack_cache_1_2 = { basename = ''rack_cache''; @@ -625,10 +636,10 @@ Also see http://rack.rubyforge.org. longDescription = ''Rack::Cache is suitable as a quick drop-in component to enable HTTP caching for Rack-based applications that produce freshness (Expires, Cache-Control) and/or validation (Last-Modified, ETag) information.''; }; name = ''rack-cache-1.2''; - requiredGems = [ g.rack_1_4_1 ]; + requiredGems = [ g.rack_1_5_1 ]; sha256 = ''073ffpsqmy4nqxz178qisb3a4v3305c49ypj0jw6s9mkz02yvgq2''; }; - rack_ssl_1_3_2 = { + rack_ssl_1_3_3 = { basename = ''rack_ssl''; meta = { description = ''Force SSL/TLS in your app.''; @@ -636,11 +647,11 @@ Also see http://rack.rubyforge.org. longDescription = '' Rack middleware to force SSL/TLS. ''; }; - name = ''rack-ssl-1.3.2''; + name = ''rack-ssl-1.3.3''; requiredGems = [ ]; - sha256 = ''1h9pfn5c95qigkm1vb5nbla7fwjl86q887w57iiqp4kdvrjh9wrn''; + sha256 = ''0rkmj71s87prswa8sqal42kdllgpfd35ir5m9ahhnlmrrpqd0hr5''; }; - rack_test_0_6_1 = { + rack_test_0_6_2 = { basename = ''rack_test''; meta = { description = ''Simple testing API built on Rack''; @@ -650,31 +661,31 @@ own or as a reusable starting point for Web frameworks and testing libraries to build on. Most of its initial functionality is an extraction of Merb 1.0's request helpers feature.''; }; - name = ''rack-test-0.6.1''; + name = ''rack-test-0.6.2''; requiredGems = [ ]; - sha256 = ''0hq5q8fjhbb7szzrj7k0l21z025c4qsxqzd5qmgivikhymw10ws0''; + sha256 = ''01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky''; }; - rails_3_2_6 = { + rails_3_2_11 = { basename = ''rails''; meta = { description = ''Full-stack web application framework.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.''; }; - name = ''rails-3.2.6''; - requiredGems = [ g.activesupport_3_2_6 g.actionpack_3_2_6 g.activerecord_3_2_6 g.activeresource_3_2_6 g.actionmailer_3_2_6 g.railties_3_2_6 g.bundler_1_1_4 ]; - sha256 = ''184ys6yfdclv59x0wk7dxx6ss60bv5vsi89nf8n85sh4mn19sf2m''; + name = ''rails-3.2.11''; + requiredGems = [ g.activesupport_3_2_11 g.actionpack_3_2_11 g.activerecord_3_2_11 g.activeresource_3_2_11 g.actionmailer_3_2_11 g.railties_3_2_11 g.bundler_1_2_3 ]; + sha256 = ''0gk0wnydzb5dknk3d0n9vy51xixmwgcq5j6jqzr9m8wsi2cjkq7m''; }; - railties_3_2_6 = { + railties_3_2_11 = { basename = ''railties''; meta = { description = ''Tools for creating, working with, and running Rails applications.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.''; }; - name = ''railties-3.2.6''; - requiredGems = [ g.rack_ssl_1_3_2 g.rdoc_3_12 ]; - sha256 = ''1qyb4kcg2ld86qp411njr6cxfhv2ddw3jghk2rbr8d5f1ci7gfdh''; + name = ''railties-3.2.11''; + requiredGems = [ g.rake_10_0_3 g.rack_ssl_1_3_3 g.rdoc_3_12 ]; + sha256 = ''0gjna6jskckh35xp03sjlb7xq2cgabmjl7nvczh6kq8xb1vh09dw''; }; rake_0_9_2_2 = { basename = ''rake''; @@ -687,16 +698,38 @@ request helpers feature.''; requiredGems = [ ]; sha256 = ''19n4qp5gzbcqy9ajh56kgwqv9p9w2hnczhyvaqz0nlvk9diyng6q''; }; - rb_fsevent_0_9_1 = { + rake_0_9_6 = { + basename = ''rake''; + meta = { + description = ''Ruby based make-like utility.''; + homepage = ''http://rake.rubyforge.org''; + longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies arespecified in standard Ruby syntax.''; + }; + name = ''rake-0.9.6''; + requiredGems = [ ]; + sha256 = ''09kyh351gddn6gjz255hbaza1cw235xvfz9dc15rhyq9phvqdphc''; + }; + rake_10_0_3 = { + basename = ''rake''; + meta = { + description = ''Ruby based make-like utility.''; + homepage = ''http://rake.rubyforge.org''; + longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies arespecified in standard Ruby syntax.''; + }; + name = ''rake-10.0.3''; + requiredGems = [ ]; + sha256 = ''09vvf3ylhdkr10vz7ajl3c7ql6dsnzkh3qclpafar433bzadfbpf''; + }; + rb_fsevent_0_9_3 = { basename = ''rb_fsevent''; meta = { description = ''Very simple & usable FSEvents API''; homepage = ''http://rubygems.org/gems/rb-fsevent''; longDescription = ''FSEvents API with Signals catching (without RubyCocoa)''; }; - name = ''rb-fsevent-0.9.1''; + name = ''rb-fsevent-0.9.3''; requiredGems = [ ]; - sha256 = ''02vgavzfsvzm0p9xvy314nnjixym82f2s58pw2i6d7p81yhvhsyh''; + sha256 = ''0bdnxwdxj4r1kdxfi5nszbsb126njrr81p912g64xxs2bgxd1bp1''; }; rdoc_3_12 = { basename = ''rdoc''; @@ -710,10 +743,10 @@ documentation. See RDoc for a description of RDoc's markup and basic use.''; }; name = ''rdoc-3.12''; - requiredGems = [ g.json_1_7_3 ]; + requiredGems = [ g.json_1_7_6 ]; sha256 = ''0cd4hrkba7zr675m62yb87l7hpf0sp2qw8ccc2s0y2fa2fxdxdkp''; }; - rjb_1_4_0 = { + rjb_1_4_2 = { basename = ''rjb''; meta = { description = ''Ruby Java bridge''; @@ -721,82 +754,65 @@ See RDoc for a description of RDoc's markup and basic use.''; longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface. ''; }; - name = ''rjb-1.4.0''; + name = ''rjb-1.4.2''; requiredGems = [ ]; - sha256 = ''03ildf1k04a430mqdfggld4wjvca3xd0d4qn0dwcfa2zxs3vnbz3''; + sha256 = ''1cgbwpc45djs0mw05ydxf5apmb9ibj61n240ylqwzrajf13banzh''; }; - rspec_2_9_0 = { + rjb_1_4_6 = { + basename = ''rjb''; + meta = { + description = ''Ruby Java bridge''; + homepage = ''http://rjb.rubyforge.org/''; + longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface. +''; + }; + name = ''rjb-1.4.6''; + requiredGems = [ ]; + sha256 = ''0q2czc3ghk32hnxf76xsf0jqcfrnx60aqarvdjhgsfdc9a5pmk20''; + }; + rspec_2_11_0 = { basename = ''rspec''; meta = { - description = ''rspec-2.9.0''; + description = ''rspec-2.11.0''; homepage = ''http://github.com/rspec''; longDescription = ''BDD for Ruby''; }; - name = ''rspec-2.9.0''; - requiredGems = [ g.rspec_expectations_2_9_1 ]; - sha256 = ''02r1cg82xia5vls4zq2dchmgdig8rpky8rivsqbckczr5k9w0hwv''; + name = ''rspec-2.11.0''; + requiredGems = [ ]; + sha256 = ''0k55akvs2xhs57kz81g37s4v56vybq46sjs7f8wpybrwxryg1vxs''; }; - rspec_core_2_9_0 = { + rspec_core_2_11_1 = { basename = ''rspec_core''; meta = { - description = ''rspec-core-2.9.0''; + description = ''rspec-core-2.11.1''; homepage = ''http://github.com/rspec/rspec-core''; longDescription = ''BDD for Ruby. RSpec runner and example groups.''; }; - name = ''rspec-core-2.9.0''; + name = ''rspec-core-2.11.1''; requiredGems = [ ]; - sha256 = ''17wc7mqrwl0zzrx3gywf4w931vfdig1spyvl46fyqakf36shyknd''; + sha256 = ''035ki561pryy05y8cvv3mkihjwp9r2ychnazb7s33gl7q0l0jni4''; }; - rspec_expectations_2_9_0 = { + rspec_expectations_2_11_3 = { basename = ''rspec_expectations''; meta = { - description = ''rspec-expectations-2.9.0''; + description = ''rspec-expectations-2.11.3''; homepage = ''http://github.com/rspec/rspec-expectations''; longDescription = ''rspec expectations (should[_not] and matchers)''; }; - name = ''rspec-expectations-2.9.0''; + name = ''rspec-expectations-2.11.3''; requiredGems = [ ]; - sha256 = ''0pdws2zdi1h7mx0dqhkx6l5sqvrnpkrvqsnxvpmxk413db7li34x''; + sha256 = ''0vqqw4hkaff6v6i6kinki4jxp9xv8b2nbmz91qa1yhjd3wr14ai5''; }; - rspec_expectations_2_9_1 = { - basename = ''rspec_expectations''; - meta = { - description = ''rspec-expectations-2.9.1''; - homepage = ''http://github.com/rspec/rspec-expectations''; - longDescription = ''rspec expectations (should[_not] and matchers)''; - }; - name = ''rspec-expectations-2.9.1''; - requiredGems = [ ]; - sha256 = ''1vb7axdg76naml7i6zd45ry4gszs274xfqk1w617z0719mc557gc''; - }; - rspec_mocks_2_9_0 = { + rspec_mocks_2_11_3 = { basename = ''rspec_mocks''; meta = { - description = ''rspec-mocks-2.9.0''; + description = ''rspec-mocks-2.11.3''; homepage = ''http://github.com/rspec/rspec-mocks''; longDescription = ''RSpec's 'test double' framework, with support for stubbing and mocking''; }; - name = ''rspec-mocks-2.9.0''; + name = ''rspec-mocks-2.11.3''; requiredGems = [ ]; - sha256 = ''10mp152j5l0r3mqqhxq35m3slamzdzwsm9qnf6chh0l3zx5dwifg''; - }; - rubyforge_2_0_3 = { - basename = ''rubyforge''; - meta = { - description = ''A script which automates a limited set of rubyforge operations''; - homepage = ''http://codeforpeople.rubyforge.org/rubyforge/''; - longDescription = ''A script which automates a limited set of rubyforge operations. - -* Run 'rubyforge help' for complete usage. -* Setup: For first time users AND upgrades to 0.4.0: - * rubyforge setup (deletes your username and password, so run sparingly!) - * edit ~/.rubyforge/user-config.yml - * rubyforge config -* For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest.''; - }; - name = ''rubyforge-2.0.3''; - requiredGems = [ g.json_pure_1_7_3 ]; - sha256 = ''1ck9hkad55dy25819v4gd1nmnpvcrb3i4np3hc03h1j6q8qpxg5p''; + sha256 = ''1rna3ii52rlhhca49zigk692hdcmz7qib42i4hhny478k04wx0qg''; }; rubyforge_2_0_4 = { basename = ''rubyforge''; @@ -813,19 +829,9 @@ See RDoc for a description of RDoc's markup and basic use.''; * For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest.''; }; name = ''rubyforge-2.0.4''; - requiredGems = [ ]; + requiredGems = [ g.json_pure_1_7_6 ]; sha256 = ''1wdaa4nzy39yzy848fa1rybi72qlyf9vhi1ra9wpx9rpi810fwh1''; }; - rubyzip_0_9_4 = { - basename = ''rubyzip''; - meta = { - description = ''rubyzip is a ruby module for reading and writing zip files''; - homepage = ''http://rubyzip.sourceforge.net/''; - }; - name = ''rubyzip-0.9.4''; - requiredGems = [ ]; - sha256 = ''1lc67ssqyz49rm1jms5sdvy6x41h070razxlmvj4j5q6w3qixx41''; - }; rubyzip_0_9_9 = { basename = ''rubyzip''; meta = { @@ -836,7 +842,7 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ ]; sha256 = ''1khf6d903agnwd8965f5f8b353rzmfvygxp53z1199rqzw8h46q2''; }; - sass_3_1_20 = { + sass_3_2_5 = { basename = ''sass''; meta = { description = ''A powerful but elegant CSS compiler that makes CSS fun again.''; @@ -847,42 +853,42 @@ See RDoc for a description of RDoc's markup and basic use.''; command line tool or a web-framework plugin. ''; }; - name = ''sass-3.1.20''; + name = ''sass-3.2.5''; requiredGems = [ ]; - sha256 = ''1aw2n5vg82d7ajx9wpyfrx6v1ddxhk73j77dkwjgsmlgci5lab8a''; + sha256 = ''1ys7pfadw61dm09yyk28zrssi8zsyj99fyq6bdf2xmi8yp1avs6k''; }; - selenium_webdriver_2_24_0 = { + selenium_webdriver_2_29_0 = { basename = ''selenium_webdriver''; meta = { description = ''The next generation developer focused tool for automated testing of webapps''; homepage = ''http://selenium.googlecode.com''; longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.''; }; - name = ''selenium-webdriver-2.24.0''; - requiredGems = [ g.rubyzip_0_9_9 g.childprocess_0_3_3 g.libwebsocket_0_1_3 ]; - sha256 = ''0iricx2gglza44s92jhk7w44g2pbvg23jr5s0g3nggq7dc5mh48f''; + name = ''selenium-webdriver-2.29.0''; + requiredGems = [ g.childprocess_0_3_7 g.websocket_1_0_7 ]; + sha256 = ''0c5fybp19mawq07h59b16h736pz8sz017m1pwalb6mcyliqmlwcj''; }; - sprockets_2_1_3 = { + sprockets_2_2_2 = { basename = ''sprockets''; meta = { description = ''Rack-based asset packaging system''; homepage = ''http://getsprockets.org/''; longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.''; }; - name = ''sprockets-2.1.3''; + name = ''sprockets-2.2.2''; requiredGems = [ g.hike_1_2_1 g.tilt_1_3_3 ]; - sha256 = ''05q6qpskabl8v0vx1mwlzv5fhf48r9f4zvc7v3xdsygm2hbs3vzh''; + sha256 = ''15ngw3bjbyr31ygzmmdxxa30ylah6pdn8akgdy9w30vfx2vr7s7s''; }; - thor_0_15_4 = { + thor_0_17_0 = { basename = ''thor''; meta = { description = ''A scripting framework that replaces rake, sake and rubigen''; - homepage = ''http://github.com/wycats/thor''; + homepage = ''http://whatisthor.com/''; longDescription = ''A scripting framework that replaces rake, sake and rubigen''; }; - name = ''thor-0.15.4''; + name = ''thor-0.17.0''; requiredGems = [ ]; - sha256 = ''1q4y34p4v0ipr6z5wcnc6n1mwfysrgjcibc1ls7rbdfzx4sdcic8''; + sha256 = ''0gf46qafcfgmi20a2mnb3wkd9y6spgy2hq22h70377daj4zjxla2''; }; tilt_1_3_3 = { basename = ''tilt''; @@ -895,36 +901,47 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ ]; sha256 = ''18qdl8nllbgwipa2ab9df3wlfgvsc8ml78hbypwc17b9qwv9bbs8''; }; - treetop_1_4_10 = { + treetop_1_4_12 = { basename = ''treetop''; meta = { description = ''A Ruby-based text parsing and interpretation DSL''; - homepage = ''http://functionalform.blogspot.com''; + homepage = ''https://github.com/cjheath/treetop''; }; - name = ''treetop-1.4.10''; + name = ''treetop-1.4.12''; requiredGems = [ g.polyglot_0_3_3 ]; - sha256 = ''01f4w7fm6phhdbkx7bp0b58hrk3x4b0a63p2vvjbxm5gi2gv9ap2''; + sha256 = ''1jlfjq67n933sm0px0s2j965v1kl1rj8fbx6xk8y4yppkv6ygxc8''; }; - tzinfo_0_3_33 = { + tzinfo_0_3_35 = { basename = ''tzinfo''; meta = { description = ''Daylight-savings aware timezone library''; homepage = ''http://tzinfo.rubyforge.org/''; longDescription = ''TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations between times in different time zones.''; }; - name = ''tzinfo-0.3.33''; + name = ''tzinfo-0.3.35''; requiredGems = [ ]; - sha256 = ''0bgfbm2amclg6amf1g1pyw4bkpmavqzf2hq7w9466xz08z1zsv1p''; + sha256 = ''1c52ndjqcxpgxhlclbxf98clcpni216xk5zgrkcd4px84riyjbmp''; }; - xml_simple_1_0_12 = { + websocket_1_0_7 = { + basename = ''websocket''; + meta = { + description = ''Universal Ruby library to handle WebSocket protocol''; + homepage = ''http://github.com/imanel/websocket-ruby''; + longDescription = ''Universal Ruby library to handle WebSocket protocol''; + }; + name = ''websocket-1.0.7''; + requiredGems = [ ]; + sha256 = ''1jrfz4295qbnjaxv37fw9jzxyxz61izp7c0683mnscacpx262zw0''; + }; + xml_simple_1_1_1 = { basename = ''xml_simple''; meta = { description = ''A simple API for XML processing.''; homepage = ''http://xml-simple.rubyforge.org''; }; - name = ''xml-simple-1.0.12''; + name = ''xml-simple-1.1.1''; requiredGems = [ ]; - sha256 = ''0m7z3l8ccm3zd22gyx40fnfl0nah61jaigb4bkmplq0hdazyj60y''; + sha256 = ''0zlwz8kvpm45m227aazg369fapbqyhvd5v9aga8cvxyhqnq0b87i''; }; }; } From 5bd9baa141d246de8967e10d45b12015cce4ebd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 31 Jan 2013 21:10:37 +0100 Subject: [PATCH 090/107] gnufdisk: update the alpha-version, no hydra now It builds now. --- pkgs/tools/system/fdisk/default.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 6 ++++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/system/fdisk/default.nix b/pkgs/tools/system/fdisk/default.nix index 5a34813d8d99..988989b82f75 100644 --- a/pkgs/tools/system/fdisk/default.nix +++ b/pkgs/tools/system/fdisk/default.nix @@ -1,19 +1,19 @@ -{ fetchurl, stdenv, parted, libuuid, gettext }: +{ fetchurl, stdenv, parted, libuuid, gettext, guile }: stdenv.mkDerivation rec { - name = "fdisk-1.3.0a"; + name = "gnufdisk-2.0.0a"; # .0a1 seems broken, see http://lists.gnu.org/archive/html/bug-fdisk/2012-09/msg00000.html src = fetchurl { - url = "mirror://gnu/fdisk/${name}.tar.bz2"; - sha256 = "1g2zvl560f7p1hd4q50d1msy6qp7949mdkagfy8ki8cayp8fp267"; + url = "mirror://gnu/fdisk/${name}.tar.gz"; + sha256 = "04nd7civ561x2lwcmxhsqbprml3178jfc58fy1v7hzqg5k4nbhy3"; }; - buildInputs = [ parted libuuid gettext ]; + buildInputs = [ parted libuuid gettext guile ]; doCheck = true; meta = { - description = "GNU fdisk, a command-line disk partitioning tool"; + description = "A command-line disk partitioning tool"; longDescription = '' GNU fdisk provides alternatives to util-linux fdisk and util-linux @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/fdisk/; maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.linux; + #platforms = stdenv.lib.platforms.linux; # was failing for long without anyone complaining }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd01a7172819..07ab2f1a7b60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -727,8 +727,6 @@ let fcron = callPackage ../tools/system/fcron { }; - fdisk = callPackage ../tools/system/fdisk { }; - fdm = callPackage ../tools/networking/fdm {}; figlet = callPackage ../tools/misc/figlet { }; @@ -813,6 +811,10 @@ let inherit (xorg) libXpm; }; + gnufdisk = callPackage ../tools/system/fdisk { + guile = guile_1_8; + }; + gnugrep = # Use libiconv only on non-GNU platforms (we can't test with # `stdenv ? glibc' at this point.) From 00258a362d6d9571d1e16524c5ee17fe0ef824a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 31 Jan 2013 22:16:31 +0100 Subject: [PATCH 091/107] liboil: update, incl. a patch from Gentoo --- pkgs/development/libraries/liboil/default.nix | 11 ++++-- .../libraries/liboil/x86_64-cpuid.patch | 38 +++++++++++++++++++ 2 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/liboil/x86_64-cpuid.patch diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix index 05cafecff279..45f75b4f8052 100644 --- a/pkgs/development/libraries/liboil/default.nix +++ b/pkgs/development/libraries/liboil/default.nix @@ -1,17 +1,20 @@ -{stdenv, fetchurl, pkgconfig, glib }: +{stdenv, fetchurl, pkgconfig }: stdenv.mkDerivation rec { - name = "liboil-0.3.15"; + name = "liboil-0.3.17"; src = fetchurl { url = "${meta.homepage}/download/${name}.tar.gz"; - sha256 = "1m3zcl54sf21cf2ckzny16ihymz8whi60ymyrhmd3m1dlw1knpmf"; + sha256 = "0sgwic99hxlb1av8cm0albzh8myb7r3lpcwxfm606l0bkc3h4pqh"; }; - buildInputs = [pkgconfig glib]; + buildInputs = [ pkgconfig ]; + + patches = [ ./x86_64-cpuid.patch ]; meta = { homepage = http://liboil.freedesktop.org; description = "A library of simple functions that are optimized for various CPUs"; + license = "BSD-2"; }; } diff --git a/pkgs/development/libraries/liboil/x86_64-cpuid.patch b/pkgs/development/libraries/liboil/x86_64-cpuid.patch new file mode 100644 index 000000000000..d86dd79c3bcb --- /dev/null +++ b/pkgs/development/libraries/liboil/x86_64-cpuid.patch @@ -0,0 +1,38 @@ +From 705916007fba0a845229a02dc6474cb523eff150 Mon Sep 17 00:00:00 2001 +From: David Schleef +Date: Tue, 20 Jul 2010 21:05:26 +0000 +Subject: x86: Fix cpuid function on x86-64 + +Fixes: #28956. +--- +diff --git a/liboil/liboilcpu-x86.c b/liboil/liboilcpu-x86.c +index e7a1978..ef4d3f2 100644 +--- a/liboil/liboilcpu-x86.c ++++ b/liboil/liboilcpu-x86.c +@@ -162,13 +162,10 @@ get_cpuid (uint32_t op, uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d) + static void + get_cpuid (uint32_t op, uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d) + { ++ *a = op; + __asm__ ( +- " pushq %%rbx\n" + " cpuid\n" +- " mov %%ebx, %%esi\n" +- " popq %%rbx\n" +- : "=a" (*a), "=S" (*b), "=c" (*c), "=d" (*d) +- : "0" (op)); ++ : "+a" (*a), "=b" (*b), "=c" (*c), "=d" (*d)); + } + #endif + +@@ -185,7 +182,7 @@ oil_cpu_detect_cpuid (void) + { + uint32_t eax, ebx, ecx, edx; + uint32_t level; +- char vendor[13] = { 0 }; ++ char vendor[13+4] = { 0 }; + int ret; + + oil_fault_check_enable (); +-- +cgit v0.9.0.2-2-gbebe From da3be9c6b23ac6677821597223c142034b2b7c91 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 1 Feb 2013 00:39:26 -0500 Subject: [PATCH 092/107] Add deepSeq lib function --- pkgs/lib/attrsets.nix | 3 ++- pkgs/lib/lists.nix | 4 ++++ pkgs/lib/trivial.nix | 11 +++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/lib/attrsets.nix b/pkgs/lib/attrsets.nix index 5e0ab6208651..fcdc3c31f290 100644 --- a/pkgs/lib/attrsets.nix +++ b/pkgs/lib/attrsets.nix @@ -5,7 +5,7 @@ with { inherit (import ./trivial.nix) or; inherit (import ./default.nix) fold; inherit (import ./strings.nix) concatStringsSep; - inherit (import ./lists.nix) concatMap concatLists all; + inherit (import ./lists.nix) concatMap concatLists all deepSeqList; inherit (import ./misc.nix) maybeAttr; }; @@ -314,4 +314,5 @@ rec { overrideExisting = old: new: old // listToAttrs (map (attr: nameValuePair attr (attrByPath [attr] (getAttr attr old) new)) (attrNames old)); + deepSeqAttrs = x: y: deepSeqList (attrValues x) y; } diff --git a/pkgs/lib/lists.nix b/pkgs/lib/lists.nix index ede7018fb236..0916355568c3 100644 --- a/pkgs/lib/lists.nix +++ b/pkgs/lib/lists.nix @@ -1,4 +1,7 @@ # General list operations. +with { + inherit (import ./trivial.nix) deepSeq; +}; rec { inherit (builtins) head tail length isList add sub lessThan; @@ -220,4 +223,5 @@ rec { ++ zipTwoLists (tail xs) (tail ys) else []; + deepSeqList = xs: y: if any (x: deepSeq x false) xs then y else y; } diff --git a/pkgs/lib/trivial.nix b/pkgs/lib/trivial.nix index af47a8c88415..e971dd6d80e7 100644 --- a/pkgs/lib/trivial.nix +++ b/pkgs/lib/trivial.nix @@ -1,3 +1,8 @@ +with { + inherit (import ./lists.nix) deepSeqList; + inherit (import ./attrsets.nix) deepSeqAttrs; +}; + rec { # Identity function. @@ -22,4 +27,10 @@ rec { # evaluation of its first argument. seq = x: y: if x == null then y else y; + deepSeq = x: y: + if builtins.isList x + then deepSeqList x y + else if builtins.isAttrs x + then deepSeqAttrs x y + else seq x y; } From 959dd6399c64fed1e3a26c8ec35ce2f5b31e8973 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 1 Feb 2013 22:16:56 +0100 Subject: [PATCH 093/107] wget: update to 1.14 The 1.13.4 took for me 2G of RAM while doing: wget -r -l 1 -k https://fosdem.org/2013/schedule/events/ --- pkgs/tools/networking/wget/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 799c5e9dd85d..3199c1cadb84 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext, perl, LWP, gnutls ? null }: stdenv.mkDerivation rec { - name = "wget-1.13.4"; + name = "wget-1.14"; src = fetchurl { - url = "mirror://gnu/wget/${name}.tar.gz"; - sha256 = "1kadjg63x1mm741dxdidwsn1rz0f7dkzbq59v0iww87jr45p3ir4"; + url = "mirror://gnu/wget/${name}.tar.xz"; + sha256 = "0yqllj3nv9p3vqbdm6j4nvpjcwf1y19rq8sd966nrbd2qvvxfq8p"; }; preConfigure = stdenv.lib.optionalString doCheck From aa703a2b44c5be8a98efd538b6bd6c7314645113 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 1 Feb 2013 16:50:11 -0500 Subject: [PATCH 094/107] gnu-efi: bump to version 3.0s --- pkgs/development/libraries/gnu-efi/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index 731b44aa0ecd..ca24db94cd05 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -2,12 +2,13 @@ , fetchurl }: -stdenv.mkDerivation { - name = "gnu-efi-3.0r"; +let version = "3.0s"; in stdenv.mkDerivation { + + name = "gnu-efi-${version}"; src = fetchurl { - url = "mirror://sourceforge/gnu-efi/gnu-efi_3.0r.orig.tar.gz"; - sha256 = "1zi298wsg8v29xj4azcawqfjbxqi2w7l60agf7x2ph2lnqlga2v5"; + url = "mirror://sourceforge/gnu-efi/gnu-efi_${version}.orig.tar.gz"; + sha256 = "18bpswzkj81dadq1b7n2s9g0cz60l34ggzxlq21mb8va10j9zmhh"; }; meta = { From f5f5eff924a4bfbc0a67a4f5ac328d60605669d0 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 1 Feb 2013 17:42:19 -0500 Subject: [PATCH 095/107] Add gummiboot UEFI boot manager --- pkgs/tools/misc/gummiboot/default.nix | 28 ++++++++++++++++++++++++++ pkgs/tools/misc/gummiboot/no-usr.patch | 20 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 50 insertions(+) create mode 100644 pkgs/tools/misc/gummiboot/default.nix create mode 100644 pkgs/tools/misc/gummiboot/no-usr.patch diff --git a/pkgs/tools/misc/gummiboot/default.nix b/pkgs/tools/misc/gummiboot/default.nix new file mode 100644 index 000000000000..d52ac309f4ef --- /dev/null +++ b/pkgs/tools/misc/gummiboot/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, gnu_efi }: + +stdenv.mkDerivation rec { + name = "gummiboot-16"; + + patches = [ ./no-usr.patch ]; + + buildFlags = [ + "GNU_EFI=${gnu_efi}" + ]; + + installPhase = "mkdir -p $out/bin; mv gummiboot.efi $out/bin"; + + src = fetchurl { + url = "http://cgit.freedesktop.org/gummiboot/snapshot/${name}.tar.gz"; + sha256 = "1znvbxrhc7pkbhbw9bvg4zhfkp81q7fy4mq2jsw6vimccr7h29a0"; + }; + + meta = { + description = "A simple UEFI boot manager which executes configured EFI images"; + + homepage = http://freedesktop.org/wiki/Software/gummiboot; + + license = stdenv.lib.licenses.lgpl21Plus; + + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/tools/misc/gummiboot/no-usr.patch b/pkgs/tools/misc/gummiboot/no-usr.patch new file mode 100644 index 000000000000..7f63e20d3e9a --- /dev/null +++ b/pkgs/tools/misc/gummiboot/no-usr.patch @@ -0,0 +1,20 @@ +diff -Naur gummiboot-16-orig/Makefile gummiboot-16/Makefile +--- gummiboot-16-orig/Makefile 2013-01-24 04:20:58.000000000 -0500 ++++ gummiboot-16/Makefile 2013-02-01 17:27:42.922371399 -0500 +@@ -1,13 +1,13 @@ + VERSION=16 + + ARCH=$(shell $(CC) -dumpmachine | sed "s/\(-\).*$$//") +-LIBDIR=$(shell echo $$(cd /usr/lib/$$(gcc -print-multi-os-directory); pwd)) ++LIBDIR=$(GNU_EFI)/lib + LIBEFIDIR=$(or $(wildcard $(LIBDIR)/gnuefi), $(LIBDIR)) + + CPPFLAGS = \ + -I. \ +- -I/usr/include/efi \ +- -I/usr/include/efi/$(ARCH) ++ -I$(GNU_EFI)/include/efi \ ++ -I$(GNU_EFI)/include/efi/$(ARCH) + + CFLAGS = \ + -DVERSION=$(VERSION) \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07ab2f1a7b60..8860d409c367 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -891,6 +891,8 @@ let gtmess = callPackage ../applications/networking/instant-messengers/gtmess { }; + gummiboot = callPackage ../tools/misc/gummiboot { }; + gupnp = callPackage ../development/libraries/gupnp { inherit (gnome) libsoup; }; From 3f3ac212fb017b20ee2246639c95886f154b4816 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 1 Feb 2013 17:50:41 -0500 Subject: [PATCH 096/107] Forgot maintainers --- pkgs/tools/misc/gummiboot/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/gummiboot/default.nix b/pkgs/tools/misc/gummiboot/default.nix index d52ac309f4ef..e087a0a50024 100644 --- a/pkgs/tools/misc/gummiboot/default.nix +++ b/pkgs/tools/misc/gummiboot/default.nix @@ -24,5 +24,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl21Plus; platforms = [ "x86_64-linux" ]; + + maintainers = [ stdenv.lib.maintainers.shlevy ]; }; } From 9463175461199c9972dabbefed7637f94cc617d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 2 Feb 2013 10:47:21 +0100 Subject: [PATCH 097/107] directfb: fix after update (of someone else) (semi-)automatic updates are nice, but it needs at least to check that the package still compiles --- .../libraries/directfb/default.nix | 18 ++++++------- .../libraries/directfb/ftbfs.patch | 25 ------------------- 2 files changed, 8 insertions(+), 35 deletions(-) delete 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 9b4241aa3be5..5c6c080a9251 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -1,5 +1,5 @@ -{stdenv, fetchurl, perl, zlib, libjpeg, freetype, libpng, giflib -, enableX11 ? true, libX11, xproto, xextproto, libXext, renderproto, libXrender +{ stdenv, fetchurl, pkgconfig, perl, zlib, libjpeg, freetype, libpng, giflib +, enableX11 ? true, xlibs , enableSDL ? true, SDL }: let s = import ./src-for-default.nix; in @@ -10,16 +10,14 @@ stdenv.mkDerivation { sha256 = s.hash; }; - patches = [ ./ftbfs.patch ]; - buildNativeInputs = [ perl ]; - buildInputs = [ zlib libjpeg freetype giflib libpng ] + buildInputs = [ pkgconfig zlib libjpeg freetype giflib libpng ] ++ stdenv.lib.optional enableSDL SDL - ++ stdenv.lib.optionals enableX11 [ - xproto libX11 libXext xextproto - renderproto libXrender - ]; + ++ stdenv.lib.optionals enableX11 (with xlibs; [ + xproto libX11 libXext #xextproto + #renderproto libXrender + ]); NIX_LDFLAGS="-lgcc_s"; @@ -31,7 +29,7 @@ stdenv.mkDerivation { "--enable-fbdev" "--enable-mmx" "--enable-sse" - "--enable-sysfs" + #"--enable-sysfs" # not recognized "--with-software" "--with-smooth-scaling" ] ++ stdenv.lib.optionals enableX11 [ diff --git a/pkgs/development/libraries/directfb/ftbfs.patch b/pkgs/development/libraries/directfb/ftbfs.patch deleted file mode 100644 index b6907e70be77..000000000000 --- a/pkgs/development/libraries/directfb/ftbfs.patch +++ /dev/null @@ -1,25 +0,0 @@ -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; From db63a24ac06086fe5948b58eb9364d07030eb731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 2 Feb 2013 11:07:14 +0100 Subject: [PATCH 098/107] powertop: fix and update --- pkgs/os-specific/linux/powertop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 2fb852acc31a..4de8ad6db0f4 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }: stdenv.mkDerivation rec { - name = "powertop-2.1"; + name = "powertop-2.2"; src = fetchurl { url = "https://01.org/powertop/sites/default/files/downloads/${name}.tar.gz"; - sha256 = "16161nlah4i4hq8vyx7ds1vq7icdzwm7gmyjg0xhcrs1r9n83m1x"; + sha256 = "0a5haxawcjrlwwxx4j5kd4ad05gjmcr13v8gswfwfxcn7fyf2f8k"; }; buildInputs = [ gettext libnl ncurses pciutils pkgconfig zlib ]; From 1469a0862f97e717e827553282217e97e3b73f21 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 2 Feb 2013 12:23:13 +0100 Subject: [PATCH 099/107] haskell-attoparsec: update to version 0.10.4.0 --- pkgs/development/libraries/haskell/attoparsec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/attoparsec/default.nix b/pkgs/development/libraries/haskell/attoparsec/default.nix index e7bb666e677e..fda3ae1474b2 100644 --- a/pkgs/development/libraries/haskell/attoparsec/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "attoparsec"; - version = "0.10.3.0"; - sha256 = "1l4cnfgnynrprfvx0p3n6kca8arsmvb1yxb9ir782rrk537jci50"; + version = "0.10.4.0"; + sha256 = "0inkcrl40j9kgcmmi0xkcszayqjd5yn7i9fyvv0ywfqwpl6lxf5n"; buildDepends = [ deepseq text ]; meta = { homepage = "https://github.com/bos/attoparsec"; - description = "Fast combinator parsing for bytestrings"; + description = "Fast combinator parsing for bytestrings and text"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; From 864c2ed99c5bf1ac91574296e59d3023b3f5aab3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 2 Feb 2013 12:23:13 +0100 Subject: [PATCH 100/107] haskell-hamlet: update to version 1.1.5 --- pkgs/development/libraries/haskell/hamlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index 0250e6c6bcd1..06c415ea978f 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "1.1.4"; - sha256 = "10hb3a6c56bmwbbrbnczvlangzz24ghl4vm8nq4z0plj1nglnlqx"; + version = "1.1.5"; + sha256 = "18rv53bqf07w0y1qs96v3krimvjx5salq9mn168l01vl98blwhvv"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; From 602e6a94eea1e942deb24a9a943c780115bacd48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 2 Feb 2013 12:36:38 +0100 Subject: [PATCH 101/107] simutrans: fix, update, split data, make pak128 the default Today the monitor resolutions are quite high, so I set pak128 as the default. It's easy to change. --- pkgs/games/simutrans/default.nix | 141 +++++++++++++++++-------------- 1 file changed, 79 insertions(+), 62 deletions(-) diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index c0f9d213762b..3682f9e4f4f8 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -1,78 +1,95 @@ -{ stdenv, fetchurl, unzip, zlib, libpng, bzip2, SDL, SDL_mixer } : +{ stdenv, fetchurl, unzip, zlib, libpng, bzip2, SDL, SDL_mixer, makeWrapper } : let - # This is the default "pakset" of objects, images, text, music, etc. + result = withPak (mkPak pak128); + + ver_1 = "112"; + ver_2 = "1"; + ver_h2 = "${ver_1}-${ver_2}"; + + # "pakset" of objects, images, text, music, etc. + mkPak = src: stdenv.mkDerivation { + name = "simutrans-pakset"; + inherit src; + unpackPhase = "true"; + buildInputs = [ unzip ]; + installPhase = '' + mkdir -p $out + cd $out + unzip ${src} + mv simutrans/*/* . + rm -rf simutrans + ''; + }; pak64 = fetchurl { - url = http://sourceforge.net/projects/simutrans/files/pak64/110-0-1/simupak64-110-0-1.zip/download; - name = "pak64.zip"; - sha256 = "0gs6k9dbbhh60g2smsx2jza65vyss616bpngwpvilrvb5rzzrxcq"; + url = "mirror://sourceforge/simutrans/pak64/${ver_h2}/simupak64-${ver_h2}.zip"; + sha256 = "1197rl2534wx9wdafarlr42qjw6pyghz4bynq2g68pi10h8csypw"; + }; + pak128 = fetchurl { + url = "mirror://sourceforge/simutrans/pak128/pak128%20for%20${ver_1}/pak128-2.2.0--${ver_1}.0.zip"; + sha256 = "13rwv9q3fa3ac0k11ds7zkpd00k4mn14rb0cknknvyz46icb9n80"; }; - # The source distribution seems to be missing some text files. - # So we will get them from the binary Linux release (which apparently has them). - langtab = fetchurl { - url = http://sourceforge.net/projects/simutrans/files/simutrans/110-0-1/simulinux-110-0-1.zip/download; - name = "simulinux-110-0-1.zip"; - sha256 = "15z13kazdzhfzwxry7a766xkkdzaidvscylzrjkx3nnbcq6461s4"; - }; -in -stdenv.mkDerivation rec { - pname = "simutrans"; - version = "110.0.1"; - name = "${pname}-${version}"; - - src = fetchurl { - url = "http://github.com/aburch/simutrans/tarball/v110.0.1"; - name = "${name}.tar.gz"; - sha256 = "ab0e42e5013d6d2fd5d3176b39dc45e482583b3bad178aac1188bf2ec88feb51"; + withPak = pak: stdenv.mkDerivation { + inherit (binaries) name; + unpackPhase = "true"; + buildInputs = [ makeWrapper ]; + installPhase = ''makeWrapper "${binaries}/bin/simutrans" "$out/bin/simutrans" --add-flags -objects --add-flags "${pak}"''; }; - buildInputs = [ zlib libpng bzip2 SDL SDL_mixer unzip ]; + binaries = stdenv.mkDerivation rec { + pname = "simutrans"; + name = "${pname}-${ver_1}.${ver_2}"; - prePatch = '' - # Use ~/.simutrans instead of ~/simutrans - sed -i 's@%s/simutrans@%s/.simutrans@' simsys_s.cc - ''; + src = fetchurl { + url = "mirror://sourceforge/simutrans/simutrans/${ver_h2}/simutrans-src-${ver_h2}.zip"; + sha256 = "1xrxpd5m2dc9bk8w21smfj28r41ji1qaihjwkwrifgz6rhg19l5c"; + }; + sourceRoot = "."; - preConfigure = '' - # Configuration as per the readme.txt - sed -i 's@#BACKEND = sdl@BACKEND = sdl@' config.template - sed -i 's@#COLOUR_DEPTH = 16@COLOUR_DEPTH = 16@' config.template - sed -i 's@#OSTYPE = linux@OSTYPE = linux@' config.template - sed -i 's@#OPTIMISE = 1@OPTIMISE = 1@' config.template + buildInputs = [ zlib libpng bzip2 SDL SDL_mixer unzip ]; - cp config.template config.default - ''; + preConfigure = '' + # Configuration as per the readme.txt + sed \ + -e 's@#BACKEND = sdl@BACKEND = sdl@' \ + -e 's@#COLOUR_DEPTH = 16@COLOUR_DEPTH = 16@' \ + -e 's@#OSTYPE = linux@OSTYPE = linux@' \ + < config.template > config.default - installPhase = '' - # Erase the source distribution object definitions, will be replaced with langtab. - rm -r simutrans + # Different default data dir + sed -i -e 's:argv\[0\]:"'$out'/share/simutrans/":' \ + simmain.cc - # Default pakset and binary release core objects. - unzip ${pak64} - unzip ${langtab} + # Use ~/.simutrans instead of ~/simutrans ##not working + #sed -i -e 's@%s/simutrans@%s/.simutrans@' simsys_s.cc - mv sim simutrans/ - - mkdir -p $out/simutrans - cp -r simutrans $out - - mkdir -p $out/bin - ln -s $out/simutrans/sim $out/bin/simutrans - ''; - - meta = { - description = "Simutrans is a simulation game in which the player strives to run a successful transport system."; - longDescription = '' - Simutrans is a cross-platform simulation game in which the - player strives to run a successful transport system by - transporting goods, passengers, and mail between - places. Simutrans is an open source remake of Transport Tycoon. + # No optimization overriding + sed -i -e '/-O$/d' Makefile ''; - homepage = http://www.simutrans.com/; - license = "Artistic"; - maintainers = [ stdenv.lib.maintainers.kkallio ]; - platforms = stdenv.lib.platforms.linux; + installPhase = '' + mkdir -p $out/share/ + mv simutrans $out/share/ + + mkdir -p $out/bin/ + mv build/default/sim $out/bin/simutrans + ''; + + meta = { + description = "A simulation game in which the player strives to run a successful transport system"; + longDescription = '' + Simutrans is a cross-platform simulation game in which the + player strives to run a successful transport system by + transporting goods, passengers, and mail between + places. Simutrans is an open source remake of Transport Tycoon. + ''; + + homepage = http://www.simutrans.com/; + license = "Artistic"; + maintainers = [ stdenv.lib.maintainers.kkallio ]; + platforms = stdenv.lib.platforms.linux; + }; }; -} + +in result From 06007460b4c7874b5e6e0b1effe7251430b0b100 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 2 Feb 2013 13:45:01 +0100 Subject: [PATCH 102/107] stlport: fix and update --- .../development/libraries/stlport/default.nix | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/stlport/default.nix b/pkgs/development/libraries/stlport/default.nix index 040395ecf8a1..f1c8a84fee26 100644 --- a/pkgs/development/libraries/stlport/default.nix +++ b/pkgs/development/libraries/stlport/default.nix @@ -1,10 +1,25 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "STLport-5.2.0"; +stdenv.mkDerivation rec { + name = "STLport-5.2.1"; src = fetchurl { - url = mirror://sourceforge/stlport/STLport-5.2.0.tar.bz2; - md5 = "448d74859407912c0087adcf51bf109a"; + url = "mirror://sourceforge/stlport/${name}.tar.bz2"; + sha256 = "1jbgak1m1qk7d4gyn1p2grbws2icsf7grbs3dh44ai9ck1xh0nvm"; + }; + + # fix hardcoded /usr/bin; not recognizing the standard --disable-static flag + configurePhase = '' + echo Preconf: build/Makefiles/gmake/*/sys.mak + for f in build/Makefiles/gmake/*/sys.mak; do + substituteInPlace "$f" --replace /usr/bin/ "" + done + ./configure --prefix=$out + ''; + + meta = { + description = "An implementation of the C++ Standard Library"; + homepage = http://sourceforge.net/projects/stlport/; + license = "free"; # seems BSD-like }; } From 0bbb1813bcf3bd2107c3770d3a3e4775e68d7df0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 2 Feb 2013 14:57:39 +0100 Subject: [PATCH 103/107] haskell-hsemail: update to version 1.7.5 --- pkgs/development/libraries/haskell/hsemail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hsemail/default.nix b/pkgs/development/libraries/haskell/hsemail/default.nix index e8c0c9e4da86..bffe1ad58096 100644 --- a/pkgs/development/libraries/haskell/hsemail/default.nix +++ b/pkgs/development/libraries/haskell/hsemail/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hsemail"; - version = "1.7.4"; - sha256 = "0nigv0zbkm90m5jskfc5a4zx2d3gyqj1y472jplrgd76s15alsmw"; + version = "1.7.5"; + sha256 = "0ls6y48bndwgb7ng29wxim4h36rs6b07dqi6ic4hqgbb7lg6fma4"; buildDepends = [ mtl parsec ]; meta = { homepage = "http://gitorious.org/hsemail"; From 0fa7bc7379c11bb4be773eee6060c1c3d8463d6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 2 Feb 2013 15:01:43 +0100 Subject: [PATCH 104/107] wine: update to 1.5.23, update gecko --- pkgs/misc/emulators/wine/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index f4968158dd28..010e65f62eb4 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -7,16 +7,17 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; stdenv.mkDerivation rec { - name = "wine-${meta.version}"; + version = "1.5.23"; + name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "0l5kr3iq1lkv3gcw8ljzfjcfnsh9b5crdd4i0dzwdk1i3bfw2xxc"; + sha256 = "1wgs2bdl3sn3j0za7fk9zfjlii1x6qkvmyw4jxzz1mfw6nizswzr"; }; gecko = fetchurl { - url = "mirror://sourceforge/wine/wine_gecko-1.5-x86.msi"; - sha256 = "2e372a1b87ff2a22ad5127400ece4b09e55591d9f84e00bb562d294898a49b5c"; + url = "mirror://sourceforge/wine/wine_gecko-1.9-x86.msi"; + sha256 = "10p7djsf85xjk8rzg3hgw5fskrn8402y2aijy701xwm4hy9ga79g"; }; buildInputs = [ @@ -46,7 +47,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - version = "1.5.21"; homepage = "http://www.winehq.org/"; license = "LGPL"; description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; From ed699d1c17eb10307e4b804ad854a512d5d4a20c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 2 Feb 2013 16:44:42 +0100 Subject: [PATCH 105/107] simutrans: pass meta into the final package so it's built by hydra --- pkgs/games/simutrans/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 3682f9e4f4f8..65a61cb6cabc 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -35,6 +35,7 @@ let unpackPhase = "true"; buildInputs = [ makeWrapper ]; installPhase = ''makeWrapper "${binaries}/bin/simutrans" "$out/bin/simutrans" --add-flags -objects --add-flags "${pak}"''; + inherit (binaries) meta; }; binaries = stdenv.mkDerivation rec { From b73b7e29bd9c5c50f555537dede6f568e6f2fc0a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 2 Feb 2013 11:02:44 -0500 Subject: [PATCH 106/107] Gummiboot: Fix build on 32-bit Linux --- pkgs/tools/misc/gummiboot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/gummiboot/default.nix b/pkgs/tools/misc/gummiboot/default.nix index e087a0a50024..a59854c82d2c 100644 --- a/pkgs/tools/misc/gummiboot/default.nix +++ b/pkgs/tools/misc/gummiboot/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { buildFlags = [ "GNU_EFI=${gnu_efi}" - ]; + ] ++ stdenv.lib.optional (stdenv.system == "i686-linux") "ARCH=ia32"; installPhase = "mkdir -p $out/bin; mv gummiboot.efi $out/bin"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl21Plus; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ stdenv.lib.maintainers.shlevy ]; }; From ac1d2a1221a873dfa105c178225e8a7643ecc794 Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Sat, 2 Feb 2013 20:26:09 +0100 Subject: [PATCH 107/107] Add haskell-ghc-vis, haskell-heap-view and deps. --- .../haskell/ghc-heap-view/default.nix | 14 +++++++++++++ .../libraries/haskell/ghc-vis/default.nix | 20 +++++++++++++++++++ .../libraries/haskell/xdot/default.nix | 14 +++++++++++++ pkgs/top-level/haskell-packages.nix | 12 +++++++++++ 4 files changed, 60 insertions(+) create mode 100644 pkgs/development/libraries/haskell/ghc-heap-view/default.nix create mode 100644 pkgs/development/libraries/haskell/ghc-vis/default.nix create mode 100644 pkgs/development/libraries/haskell/xdot/default.nix diff --git a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix new file mode 100644 index 000000000000..99aa99fc9d31 --- /dev/null +++ b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix @@ -0,0 +1,14 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "ghc-heap-view"; + version = "0.4.1.0"; + sha256 = "1icq5620j37n85d08yfpln75f9944flbqyqhjqsf0qr72zsm3w11"; + buildDepends = [ transformers ]; + meta = { + description = "Extract the heap representation of Haskell values and thunks"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix new file mode 100644 index 000000000000..4b606e8b73b9 --- /dev/null +++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix @@ -0,0 +1,20 @@ +{ cabal, cairo, deepseq, fgl, ghcHeapView, graphviz, gtk, mtl +, svgcairo, text, transformers, xdot +}: + +cabal.mkDerivation (self: { + pname = "ghc-vis"; + version = "0.6"; + sha256 = "0gvfs0f6fjg4bzq9q6rrhin6gk1pbyw9qbigi90cz1fg10nq7nzi"; + buildDepends = [ + cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text + transformers xdot + ]; + meta = { + homepage = "http://felsin9.de/nnis/ghc-vis"; + description = "Live visualization of data structures in GHCi"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix new file mode 100644 index 000000000000..73cc5c6e7640 --- /dev/null +++ b/pkgs/development/libraries/haskell/xdot/default.nix @@ -0,0 +1,14 @@ +{ cabal, cairo, graphviz, gtk, mtl, polyparse, text }: + +cabal.mkDerivation (self: { + pname = "xdot"; + version = "0.2.2"; + sha256 = "1n7lwshfn5rzbk4fxlkn02fxki2xh5m0304hnb1d5mchxyzhfdan"; + buildDepends = [ cairo graphviz gtk mtl polyparse text ]; + meta = { + description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 290124dee1aa..be8744c44939 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -835,6 +835,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ghcEvents = callPackage ../development/libraries/haskell/ghc-events {}; + ghcHeapView = callPackage ../development/libraries/haskell/ghc-heap-view { + cabal = self.cabal.override { enableLibraryProfiling = false; }; # pkg cannot be built with profiling enabled + }; + ghcMod = callPackage ../development/libraries/haskell/ghc-mod { inherit (pkgs) emacs; }; @@ -847,6 +851,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ghcSybUtils = callPackage ../development/libraries/haskell/ghc-syb-utils {}; + ghcVis = callPackage ../development/libraries/haskell/ghc-vis { + cabal = self.cabal.override { enableLibraryProfiling = false; }; # pkg cannot be built with profiling enabled + }; + gio = callPackage ../development/libraries/haskell/gio {}; gitit = callPackage ../development/libraries/haskell/gitit {}; @@ -1825,6 +1833,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); X11Xft = callPackage ../development/libraries/haskell/X11-xft {}; + xdot = callPackage ../development/libraries/haskell/xdot { + polyparse = self.polyparse_1_7; + }; + xhtml_3000_2_0_1 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.1.nix {}; xhtml_3000_2_0_4 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.4.nix {}; xhtml_3000_2_0_5 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.5.nix {};