From bf2579b4a3b4e7b8aaa5437f72b607019978f22e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 23 Feb 2012 20:24:00 +0000 Subject: [PATCH 01/38] Latest netpbm (builds with libpng-1.5) svn path=/nixpkgs/trunk/; revision=32521 --- pkgs/tools/graphics/netpbm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index a9d3b5c394c..06a89a1e2da 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation { src = fetchsvn { url = https://netpbm.svn.sourceforge.net/svnroot/netpbm/advanced; - rev = 1177; - sha256 = "d8893599fcb7839025e7fbe24120928b4bbcd70f0e1034a21d91885c40a5c39f"; + rev = 1656; + sha256 = "0mbrvd8nc52yrg8wgxcvxsajxc9qrnjqhlcks6dpdzq7qmwjy6g9"; }; NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; From 04d2aa443e1a7dc29820bdba19f9ea26da8c4f1a Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 23 Feb 2012 21:14:19 +0000 Subject: [PATCH 02/38] graphicsmagick-1.3.13 builds with libpng-1.5 svn path=/nixpkgs/trunk/; revision=32523 --- pkgs/applications/graphics/graphicsmagick/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 0636903d329..6caf0f05c51 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -1,15 +1,15 @@ {stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript -, libjpeg, libpng, libtiff, libxml2, zlib, libtool +, libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz , libX11}: -let version = "1.3.11"; in +let version = "1.3.13"; in stdenv.mkDerivation { name = "graphicsmagick-${version}"; src = fetchurl { - url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.bz2"; - sha256 = "184grcvxa5w0ghiv8zf2vdva0kgp3njf20k3h6lbylspjgd3zhxg"; + url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; + sha256 = "08lgjvhvhw3by5h4kfpl7072dbvkcpsajy5f6izq69cv61vadqs5"; }; configureFlags = "--enable-shared"; @@ -19,6 +19,8 @@ stdenv.mkDerivation { zlib libtool ]; + buildNativeInputs = [ xz ]; + postInstall = '' sed -i 's/-ltiff.*'\'/\'/ $out/bin/* ''; From 722db331a374ac658d377dc41d0585d919e66af9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 23 Feb 2012 21:25:59 +0000 Subject: [PATCH 03/38] * Updated novaclient. svn path=/nixpkgs/trunk/; revision=32526 --- pkgs/applications/virtualization/nova/client.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/nova/client.nix b/pkgs/applications/virtualization/nova/client.nix index 84858c416c8..4a3c730c3cc 100644 --- a/pkgs/applications/virtualization/nova/client.nix +++ b/pkgs/applications/virtualization/nova/client.nix @@ -1,12 +1,12 @@ { fetchurl, pythonPackages }: pythonPackages.buildPythonPackage rec { - name = "novaclient-2.4.3"; + name = "novaclient-2012.1"; namePrefix = ""; src = fetchurl { url = "http://pypi.python.org/packages/source/p/python-novaclient/python-${name}.tar.gz"; - md5 = "c4be4adf371d1a84ce1581af365a53d0"; + md5 = "8f53a308e08b2af4645281917be77ffc"; }; pythonPath = [ pythonPackages.prettytable pythonPackages.argparse pythonPackages.httplib2 pythonPackages.ssl ]; From 5f204239480b257270436b09506beb22a6cda639 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 23 Feb 2012 22:04:54 +0000 Subject: [PATCH 04/38] * Fix the VirtualBox build. It was broken since the Qt 4.8 update because Qt 4.8 doesn't propagate dependencies such as "which" and "pkgconfig". Thanks to Yury for pointing this out. * Also updated VirtualBox to 4.1.8. svn path=/nixpkgs/trunk/; revision=32527 --- .../virtualization/virtualbox/default.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index d435f53e109..e8f5f637cc3 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,33 +1,37 @@ { stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext -, libXcursor, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel +, libXcursor, libXmu, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel , python, which, alsaLib, curl, gawk -, xorriso, makeself, perl, jdk +, xorriso, makeself, perl, jdk, pkgconfig }: -let version = "4.1.6"; in +let version = "4.1.8"; in stdenv.mkDerivation { name = "virtualbox-${version}-${kernel.version}"; src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "0zmbq0h9g4lamzmxqg281nr9pp88606dxh2dsw6vy1m86g5kfham"; + sha256 = "1q04825ayynzgh8zl6y038lzxp3jk1a3dxpg6f52kk4vkirdc5pg"; }; - buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL hal libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk ]; + buildInputs = + [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL + hal libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk + pkgconfig which libXmu + ]; - patchPhase = " + patchPhase = '' set -x MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build` - sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \\ - -e 's@MKISOFS --version@MKISOFS -version@' \\ + sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \ + -e 's@MKISOFS --version@MKISOFS -version@' \ -i configure ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 find . -type f | xargs sed 's/depmod -a/true/' -i export USER=nix set +x - "; + ''; configurePhase = '' ./configure --with-qt4-dir=${qt4} --disable-python --disable-pulse --disable-hardening --with-mkisofs=${xorriso}/bin/xorrisofs From 0660134750fead0f4a6ac8d9d7bf95821f066b9b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Feb 2012 22:31:09 +0000 Subject: [PATCH 05/38] git: updated to version 1.7.9.2 svn path=/nixpkgs/trunk/; revision=32528 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 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 795d43da6da..24390bc3908 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -8,7 +8,7 @@ }: let - version = "1.7.8"; + version = "1.7.9.2"; svn = subversionClient.override { perlBindings = true; }; in stdenv.mkDerivation { @@ -16,7 +16,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; - sha256 = "ede41a79c83e0d8673ed16c64d5c105e404d953591f9611e44c3964130da0713"; + sha256 = "bd7725fb80f305bf27666e3d26a9b7b79596e2248f2ae2d27e06bc15a501ac75"; }; patches = [ ./docbook2texi.patch ]; From 2c7845859fdcc8db6e44244cf1e049f96c26955a Mon Sep 17 00:00:00 2001 From: Arie Middelkoop Date: Thu, 23 Feb 2012 23:47:26 +0000 Subject: [PATCH 06/38] Added the irc proxy "bip". svn path=/nixpkgs/trunk/; revision=32529 --- .../networking/irc/bip/default.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/applications/networking/irc/bip/default.nix diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix new file mode 100644 index 00000000000..eaee36b9711 --- /dev/null +++ b/pkgs/applications/networking/irc/bip/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, bison, flex, autoconf, automake, openssl }: + +let + + version = "0.8.8"; + sha256 = "7ca3fb96f5ee6b76eb398d7ea45344ea24855344ced11632241a33353bba05d7"; + + # fetches patches from a gentoo mirror + fetchPatch = + { file, sha256 }: + fetchurl { + url = "mirror://gentoo/../gentoo-portage/net-irc/bip/files/${file}"; + inherit sha256; + }; + +in stdenv.mkDerivation { + name = "bip-${version}"; + + # fetch sources from debian, because the creator's website provides + # the files only via https but with an untrusted certificate. + src = fetchurl { + url = "mirror://debian/pool/main/b/bip/bip_${version}.orig.tar.gz"; + inherit sha256; + }; + + # includes an important security patch + patches = map fetchPatch [ + { file = "bip-0.8.8-configure.patch"; + sha256 = "286e169745e6cd768f0cb95bbc9589ca2bda497eb06461174549b80a459d901c"; + } + { file = "bip-CVE-2012-0806.patch"; + sha256 = "e47523095ee1d717c762ca0195520026c6ea2c30d8adcf434d276d42f052d506"; + } + { file = "bip-freenode.patch"; + sha256 = "a67e582f89cc6a32d5bb48c7e8ceb647b889808c2c8798ae3eb27d88869b892f"; + } + ]; + + configureFlags = [ "--disable-pie" ]; + + buildInputs = [ bison flex autoconf automake openssl ]; + + meta = { + description = "An IRC proxy (bouncer)"; + homepage = http://bip.milkypond.org/; + license = stdenv.lib.licenses.gpl2; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4af3ac9797c..9c3449a0f32 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7034,6 +7034,8 @@ let irssi = callPackage ../applications/networking/irc/irssi { }; + bip = callPackage ../applications/networking/irc/bip { }; + jackmeter = callPackage ../applications/audio/jackmeter { }; jedit = callPackage ../applications/editors/jedit { }; From 70d56e06383cfa6eb547ce7f1882bfcd95b1e813 Mon Sep 17 00:00:00 2001 From: Arie Middelkoop Date: Thu, 23 Feb 2012 23:50:56 +0000 Subject: [PATCH 07/38] Fixed autoconfPhase so that it additionally tests if ./bootstrap is a file (and not a directory with executable permission) before executing it. svn path=/nixpkgs/trunk/; revision=32530 --- pkgs/build-support/release/source-tarball.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/build-support/release/source-tarball.nix index 16ac0033d93..0475cdf76b7 100644 --- a/pkgs/build-support/release/source-tarball.nix +++ b/pkgs/build-support/release/source-tarball.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation ( eval "$preAutoconf" - if test -x ./bootstrap; then ./bootstrap + if test -x ./bootstrap && test -f ./bootstrap; then ./bootstrap elif test -x ./bootstrap.sh; then ./bootstrap.sh elif test -x ./autogen.sh; then ./autogen.sh elif test -x ./autogen ; then ./autogen From ed813f3955595ffd594570f74f406f3b6319610a Mon Sep 17 00:00:00 2001 From: Arie Middelkoop Date: Fri, 24 Feb 2012 00:17:09 +0000 Subject: [PATCH 08/38] Let 'bbswitch' and 'acpi-call' use the attribute kernel.version instead of a nasty 'ls' to determine the kernel version. svn path=/nixpkgs/trunk/; revision=32531 --- pkgs/os-specific/linux/acpi-call/default.nix | 8 +++----- pkgs/os-specific/linux/bbswitch/default.nix | 7 +++---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix index d7c9e2c3695..f9615da0c2f 100644 --- a/pkgs/os-specific/linux/acpi-call/default.nix +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -10,16 +10,14 @@ stdenv.mkDerivation { }; preBuild = '' - kernelVersion=$(cd ${kernel}/lib/modules && ls) sed -e 's/break/true/' -i test_off.sh sed -e 's@/bin/bash@.bin/sh@' -i test_off.sh - sed -e "s@/lib/modules/\$(.*)@${kernel}/lib/modules/$kernelVersion@" -i Makefile + sed -e "s@/lib/modules/\$(.*)@${kernel}/lib/modules/${kernel.version}@" -i Makefile ''; installPhase = '' - kernelVersion=$(cd ${kernel}/lib/modules && ls) - ensureDir $out/lib/modules/$kernelVersion/misc - cp acpi_call.ko $out/lib/modules/$kernelVersion/misc + ensureDir $out/lib/modules/${kernel.version}/misc + cp acpi_call.ko $out/lib/modules/${kernel.version}/misc ensureDir $out/bin cp test_off.sh $out/bin/test_discrete_video_off.sh ''; diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index a8f8a9d33ef..7c5752b4e34 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -17,14 +17,13 @@ stdenv.mkDerivation { preBuild = '' kernelVersion=$(cd ${kernel}/lib/modules && ls) substituteInPlace Makefile \ - --replace "\$(shell uname -r)" "$kernelVersion" \ + --replace "\$(shell uname -r)" "${kernel.version}" \ --replace "/lib/modules" "${kernel}/lib/modules" ''; installPhase = '' - kernelVersion=$(cd ${kernel}/lib/modules && ls) - ensureDir $out/lib/modules/$kernelVersion/misc - cp bbswitch.ko $out/lib/modules/$kernelVersion/misc + ensureDir $out/lib/modules/${kernel.version}/misc + cp bbswitch.ko $out/lib/modules/${kernel.version}/misc ensureDir $out/bin tee $out/bin/discrete_vga_poweroff << EOF From 1b2d50c14f7e1a319e5c167810179a3e0e6397e3 Mon Sep 17 00:00:00 2001 From: Arie Middelkoop Date: Fri, 24 Feb 2012 01:35:59 +0000 Subject: [PATCH 09/38] rfkill udev package. svn path=/nixpkgs/trunk/; revision=32532 --- pkgs/os-specific/linux/rfkill/rfkill-hook.sh | 19 ++++++++ pkgs/os-specific/linux/rfkill/udev.nix | 49 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 70 insertions(+) create mode 100755 pkgs/os-specific/linux/rfkill/rfkill-hook.sh create mode 100644 pkgs/os-specific/linux/rfkill/udev.nix diff --git a/pkgs/os-specific/linux/rfkill/rfkill-hook.sh b/pkgs/os-specific/linux/rfkill/rfkill-hook.sh new file mode 100755 index 00000000000..d07c7298183 --- /dev/null +++ b/pkgs/os-specific/linux/rfkill/rfkill-hook.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +# Executes a hook in case of a change to the +# rfkill state. The hook can be passed as +# environment variable, or present as executable +# file. + +if [ -z "$RFKILL_STATE" ]; then + echo "rfkill-hook: error: RFKILL_STATE variable not set" + exit 1 +fi + +if [ -x /var/run/current-system/etc/rfkill.hook ]; then + exec /var/run/current-system/etc/rfkill.hook +elif [ ! -z "$RFKILL_HOOK" ]; then + exec $RFKILL_HOOK +else + echo "rfkill-hook: $RFKILL_STATE" +fi \ No newline at end of file diff --git a/pkgs/os-specific/linux/rfkill/udev.nix b/pkgs/os-specific/linux/rfkill/udev.nix new file mode 100644 index 00000000000..6cf6e4adfa0 --- /dev/null +++ b/pkgs/os-specific/linux/rfkill/udev.nix @@ -0,0 +1,49 @@ +{ stdenv }: + +# Provides a facility to hook into rfkill changes. +# +# Exemplary usage: +# +# Add this package to udev.packages, e.g.: +# udev.packages = [ pkgs.rfkill_udev ]; +# +# Add a hook script in the managed etc directory, e.g.: +# etc = [ +# { source = pkgs.writeScript "rtfkill.hook" '' +# #!/bin/sh +# +# if [ "$RFKILL_STATE" -eq "1" ]; then +# exec ${config.system.build.upstart}/sbin/initctl emit -n antenna-on +# else +# exec ${config.system.build.upstart}/sbin/initctl emit -n antenna-off +# fi +# ''; +# target = "rfkill.hook"; +# } + +# Note: this package does not need the binaries +# in the rfkill package. + +stdenv.mkDerivation { + name = "rfkill-udev"; + + unpackPhase = "true"; + dontBuild = true; + + installPhase = '' + ensureDir "$out/etc/udev/rules.d/"; + cat > "$out/etc/udev/rules.d/90-rfkill.rules" << EOF + SUBSYSTEM=="rfkill", ATTR{type}=="wlan", RUN+="$out/bin/rfkill-hook.sh" + EOF + + ensureDir "$out/bin/"; + cp ${./rfkill-hook.sh} "$out/bin/rfkill-hook.sh" + chmod +x "$out/bin/rfkill-hook.sh"; + ''; + + meta = { + homepage = http://wireless.kernel.org/en/users/Documentation/rfkill; + description = "Rules+hook for udev to catch rfkill state changes"; + platforms = stdenv.lib.platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c3449a0f32..b033176ef61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6032,6 +6032,8 @@ let rfkill = callPackage ../os-specific/linux/rfkill { }; + rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { }; + ralink_fw = callPackage ../os-specific/linux/firmware/ralink { }; rt2860fw = callPackage ../os-specific/linux/firmware/rt2860 { }; From 9c06f2b68a7747d0ef05f883bcc08eb70bdea21b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 24 Feb 2012 08:24:12 +0000 Subject: [PATCH 10/38] haskell-monads-tf: added version 0.1.0.0 svn path=/nixpkgs/trunk/; revision=32533 --- .../libraries/haskell/monads-tf/default.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/haskell/monads-tf/default.nix diff --git a/pkgs/development/libraries/haskell/monads-tf/default.nix b/pkgs/development/libraries/haskell/monads-tf/default.nix new file mode 100644 index 00000000000..d61922dc508 --- /dev/null +++ b/pkgs/development/libraries/haskell/monads-tf/default.nix @@ -0,0 +1,17 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "monads-tf"; + version = "0.1.0.0"; + sha256 = "1d38rddm9h8crs96zhzj87a3ygix0ipyxy0qcyas88k60fgavg5i"; + buildDepends = [ transformers ]; + meta = { + description = "Monad classes, using type families"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index fa4c6ac4d9b..be48385e5d5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1000,6 +1000,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); MonadRandom = callPackage ../development/libraries/haskell/MonadRandom {}; + monadsTf = callPackage ../development/libraries/haskell/monads-tf {}; + mongoDB = callPackage ../development/libraries/haskell/mongoDB { monadControl = self.monadControl_0_2_0_3; }; From 7c0fd3beccc2325008e9e6f9c6efae4d037a2f7d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 24 Feb 2012 11:31:08 +0000 Subject: [PATCH 11/38] haskell-attoparsec-conduit: updated to version 0.2.0.1 svn path=/nixpkgs/trunk/; revision=32534 --- .../libraries/haskell/attoparsec-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix index 9a17ef13563..9f58a5af748 100644 --- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "attoparsec-conduit"; - version = "0.2.0"; - sha256 = "11jcsqyqc33xn980rac7fmdgj99dg4bp75b5whqzpnr67ginjjv9"; + version = "0.2.0.1"; + sha256 = "1jxb2zanfmfqdmd5q770r4yz2s0giky9ify6fcsjwc8wiah4aji1"; buildDepends = [ attoparsec conduit text transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; From 01efc845249e31e1adf48f73fbb3078a392885da Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 24 Feb 2012 11:31:11 +0000 Subject: [PATCH 12/38] haskell-blaze-builder-conduit: updated to version 0.2.0.1 svn path=/nixpkgs/trunk/; revision=32535 --- .../libraries/haskell/blaze-builder-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix index da3bd570e05..ff6f7429c79 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-builder-conduit"; - version = "0.2.0"; - sha256 = "13fcxmzw4xz7y271vdf6w6fj6isninjcxnm7h7gbk4yf31wx831r"; + version = "0.2.0.1"; + sha256 = "0p6kq43avsf21biskjardv7k47bag16ki2gmwjpk8ram9mwlz0zg"; buildDepends = [ blazeBuilder conduit text transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; From e8ee9fa720fd2de710825bccac4aecae4f645aad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 24 Feb 2012 11:31:14 +0000 Subject: [PATCH 13/38] haskell-pandoc-types: updated to version 1.9.1 svn path=/nixpkgs/trunk/; revision=32536 --- pkgs/development/libraries/haskell/pandoc-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix index 063fe6f45c5..b55c214bb75 100644 --- a/pkgs/development/libraries/haskell/pandoc-types/default.nix +++ b/pkgs/development/libraries/haskell/pandoc-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pandoc-types"; - version = "1.9.0.2"; - sha256 = "1rqqchxinjk3njgkp73i92q4iz1cl84p56i2fmgj2zn221r0zhyl"; + version = "1.9.1"; + sha256 = "1174nkaig0g71n3kqrhgqn7xmr9rni3l3dh1xpypc0ksjm0ym21i"; buildDepends = [ syb ]; meta = { homepage = "http://johnmacfarlane.net/pandoc"; From 1df1758ca279d67b00fb17913222973974b8e772 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 24 Feb 2012 11:31:16 +0000 Subject: [PATCH 14/38] haskell-zlib-conduit: updated to version 0.2.0.1 svn path=/nixpkgs/trunk/; revision=32537 --- pkgs/development/libraries/haskell/zlib-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix index decdd32676a..1b8d40efe28 100644 --- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix +++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zlib-conduit"; - version = "0.2.0"; - sha256 = "1vwan9vglj7xdna3pfw71bcfcp10s4vn6fd6wwdz7wvxrbn52gsk"; + version = "0.2.0.1"; + sha256 = "0css7cr9jj6rn829bw8mlbdl0d6iz9ckhsbrlrdcppx8k4gzb4rg"; buildDepends = [ conduit transformers zlibBindings ]; meta = { homepage = "http://github.com/snoyberg/conduit"; From 4b3e14f5d0ea4dc0182a1fd4b7cd6fa73481de01 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 24 Feb 2012 11:31:19 +0000 Subject: [PATCH 15/38] Deleted deprecated packages: haskell-containers-deepseq haskell-control-monad-attempt haskell-data-object haskell-data-object-yaml haskell-frown haskell-jsonEnumerator haskell-neither haskell-pool haskell-web-routes haskell-web-routes-quasi haskell-xml-enumerator svn path=/nixpkgs/trunk/; revision=32538 --- .../haskell/containers-deepseq/default.nix | 17 ----------- .../haskell/control-monad-attempt/default.nix | 18 ----------- .../haskell/data-object-yaml/default.nix | 24 --------------- .../libraries/haskell/data-object/default.nix | 18 ----------- .../haskell/jsonEnumerator/default.nix | 23 -------------- .../libraries/haskell/neither/default.nix | 18 ----------- .../libraries/haskell/pool/default.nix | 18 ----------- .../haskell/web-routes-quasi/default.nix | 20 ------------- .../libraries/haskell/web-routes/default.nix | 21 ------------- .../haskell/xml-enumerator/default.nix | 24 --------------- .../tools/parsing/frown/builder.sh | 7 ----- .../tools/parsing/frown/default.nix | 11 ------- pkgs/top-level/haskell-packages.nix | 30 ------------------- 13 files changed, 249 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/containers-deepseq/default.nix delete mode 100644 pkgs/development/libraries/haskell/control-monad-attempt/default.nix delete mode 100644 pkgs/development/libraries/haskell/data-object-yaml/default.nix delete mode 100644 pkgs/development/libraries/haskell/data-object/default.nix delete mode 100644 pkgs/development/libraries/haskell/jsonEnumerator/default.nix delete mode 100644 pkgs/development/libraries/haskell/neither/default.nix delete mode 100644 pkgs/development/libraries/haskell/pool/default.nix delete mode 100644 pkgs/development/libraries/haskell/web-routes-quasi/default.nix delete mode 100644 pkgs/development/libraries/haskell/web-routes/default.nix delete mode 100644 pkgs/development/libraries/haskell/xml-enumerator/default.nix delete mode 100644 pkgs/development/tools/parsing/frown/builder.sh delete mode 100644 pkgs/development/tools/parsing/frown/default.nix diff --git a/pkgs/development/libraries/haskell/containers-deepseq/default.nix b/pkgs/development/libraries/haskell/containers-deepseq/default.nix deleted file mode 100644 index 1e7630a93e8..00000000000 --- a/pkgs/development/libraries/haskell/containers-deepseq/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, deepseq }: - -cabal.mkDerivation (self: { - pname = "containers-deepseq"; - version = "0.1.0.1"; - sha256 = "0l9d7hj66fygpsbjw6wy4l11c9cw739lvkrypapwihav7jzva541"; - buildDepends = [ deepseq ]; - meta = { - description = "Provide orphan NFData instances for containers as needed. (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/control-monad-attempt/default.nix b/pkgs/development/libraries/haskell/control-monad-attempt/default.nix deleted file mode 100644 index 0450373e8c6..00000000000 --- a/pkgs/development/libraries/haskell/control-monad-attempt/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, attempt, transformers }: - -cabal.mkDerivation (self: { - pname = "control-monad-attempt"; - version = "0.3.0.1"; - sha256 = "140n27vdbyjz5qycrwlrmyd7s48fxcl6msl16g7czg40k5y23j5s"; - buildDepends = [ attempt transformers ]; - meta = { - homepage = "http://github.com/snoyberg/control-monad-attempt"; - description = "Monad transformer for attempt. (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/data-object-yaml/default.nix b/pkgs/development/libraries/haskell/data-object-yaml/default.nix deleted file mode 100644 index 54c2a05f8f1..00000000000 --- a/pkgs/development/libraries/haskell/data-object-yaml/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ cabal, conduit, convertibleText, dataObject, failure, text -, transformers, yaml -}: - -cabal.mkDerivation (self: { - pname = "data-object-yaml"; - version = "0.3.4.2"; - sha256 = "18a9r4wfpb7icjb6nji9iy3abq6sxafmsnfwqpnm1nn2nn3fm1ap"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - conduit convertibleText dataObject failure text transformers yaml - ]; - meta = { - homepage = "http://github.com/snoyberg/data-object-yaml"; - description = "Serialize data to and from Yaml files (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/data-object/default.nix b/pkgs/development/libraries/haskell/data-object/default.nix deleted file mode 100644 index c1b12ab038f..00000000000 --- a/pkgs/development/libraries/haskell/data-object/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, failure, text, time }: - -cabal.mkDerivation (self: { - pname = "data-object"; - version = "0.3.1.9"; - sha256 = "0z8m23kw8mj6hhy1r8y1vvlxxpwl273dhanszig2673a1sw0l98l"; - buildDepends = [ failure text time ]; - meta = { - homepage = "http://github.com/snoyberg/data-object/tree/master"; - description = "Represent hierachichal structures, called objects in JSON. (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/jsonEnumerator/default.nix b/pkgs/development/libraries/haskell/jsonEnumerator/default.nix deleted file mode 100644 index 1e4629166fa..00000000000 --- a/pkgs/development/libraries/haskell/jsonEnumerator/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ cabal, blazeBuilder, blazeBuilderEnumerator, enumerator -, jsonTypes, text, transformers -}: - -cabal.mkDerivation (self: { - pname = "json-enumerator"; - version = "0.0.1.2"; - sha256 = "08gwrm15pvvhhrkrncy6wr4fi5v55fdhc8byfrw5zd62hmx8xm9d"; - buildDepends = [ - blazeBuilder blazeBuilderEnumerator enumerator jsonTypes text - transformers - ]; - meta = { - homepage = "http://github.com/snoyberg/json-enumerator"; - description = "Pure-Haskell utilities for dealing with JSON with the enumerator package. (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/neither/default.nix b/pkgs/development/libraries/haskell/neither/default.nix deleted file mode 100644 index e5b3e6a8c48..00000000000 --- a/pkgs/development/libraries/haskell/neither/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, failure, transformers }: - -cabal.mkDerivation (self: { - pname = "neither"; - version = "0.3.1"; - sha256 = "1n00v2xs2ghm273barc3bbi67wgpvyihhgl1ij7qczyp9fhqlyfk"; - buildDepends = [ failure transformers ]; - meta = { - homepage = "http://github.com/snoyberg/neither"; - description = "Provide versions of Either with good monad and applicative instances. (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/pool/default.nix b/pkgs/development/libraries/haskell/pool/default.nix deleted file mode 100644 index fb417a3faf2..00000000000 --- a/pkgs/development/libraries/haskell/pool/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, monadControl, transformers }: - -cabal.mkDerivation (self: { - pname = "pool"; - version = "0.1.2.1"; - sha256 = "1fwwnwxk3kprr2z9y7bwa1qwxfkzwcb2n5l6vkq1c5s8gjls581c"; - buildDepends = [ monadControl transformers ]; - meta = { - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Thread-safe resource pools. (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/web-routes-quasi/default.nix b/pkgs/development/libraries/haskell/web-routes-quasi/default.nix deleted file mode 100644 index 7ecc85742e1..00000000000 --- a/pkgs/development/libraries/haskell/web-routes-quasi/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ cabal, pathPieces, text }: - -cabal.mkDerivation (self: { - pname = "web-routes-quasi"; - version = "0.7.1.1"; - sha256 = "1rqbymi0n7kdhl272qfjhx9s3gspd5k0bjrhclj9l8mjf033vdmf"; - isLibrary = true; - isExecutable = true; - buildDepends = [ pathPieces text ]; - meta = { - homepage = "http://docs.yesodweb.com/web-routes-quasi/"; - description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix deleted file mode 100644 index 270328441e1..00000000000 --- a/pkgs/development/libraries/haskell/web-routes/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ cabal, blazeBuilder, httpTypes, mtl, network, parsec, text -, utf8String -}: - -cabal.mkDerivation (self: { - pname = "web-routes"; - version = "0.27.1"; - sha256 = "0rbl57qnn908hwfhj14m8z11pscrv44rlg7c9y9rm6jvwy4v58qz"; - buildDepends = [ - blazeBuilder httpTypes mtl network parsec text utf8String - ]; - meta = { - description = "Library for maintaining correctness and composability of URLs within an application"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/xml-enumerator/default.nix b/pkgs/development/libraries/haskell/xml-enumerator/default.nix deleted file mode 100644 index c891096c205..00000000000 --- a/pkgs/development/libraries/haskell/xml-enumerator/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder -, blazeBuilderEnumerator, dataDefault, enumerator, failure, text -, transformers, xmlTypes -}: - -cabal.mkDerivation (self: { - pname = "xml-enumerator"; - version = "0.4.4.1"; - sha256 = "0vwn6s7x626970b8lgyhmngkqv5n5kvv0qikrvi9sjzq5rjyx1zj"; - buildDepends = [ - attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator - dataDefault enumerator failure text transformers xmlTypes - ]; - meta = { - homepage = "http://github.com/snoyberg/xml"; - description = "Pure-Haskell utilities for dealing with XML with the enumerator package. (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/tools/parsing/frown/builder.sh b/pkgs/development/tools/parsing/frown/builder.sh deleted file mode 100644 index 82689b42d72..00000000000 --- a/pkgs/development/tools/parsing/frown/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -source $stdenv/setup - -makeFlags="-e PREFIX=\"$out\"" - -ensureDir $out/bin - -genericBuild diff --git a/pkgs/development/tools/parsing/frown/default.nix b/pkgs/development/tools/parsing/frown/default.nix deleted file mode 100644 index f94a12e11d1..00000000000 --- a/pkgs/development/tools/parsing/frown/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv, fetchurl, ghc}: - -stdenv.mkDerivation { - name = "frown-0.6.1"; - src = fetchurl { - url = http://www.informatik.uni-bonn.de/~ralf/frown/frown-0.6.1.tar.gz; - md5 = "b6fe9a8bf029c2a7c31b574be05816cf"; - }; - builder = ./builder.sh; - buildInputs = [ghc]; -} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index be48385e5d5..5fcc1ca607e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -547,10 +547,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {}; - containersDeepseq = callPackage ../development/libraries/haskell/containers-deepseq {}; - - controlMonadAttempt = callPackage ../development/libraries/haskell/control-monad-attempt {}; - convertible = callPackage ../development/libraries/haskell/convertible { time = self.time_1_1_3; }; @@ -600,12 +596,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); dataenc = callPackage ../development/libraries/haskell/dataenc {}; - dataObject = callPackage ../development/libraries/haskell/data-object { - failure = self.failure_0_1_2; - }; - - dataObjectYaml = callPackage ../development/libraries/haskell/data-object-yaml {}; - dataReify = callPackage ../development/libraries/haskell/data-reify {}; datetime = callPackage ../development/libraries/haskell/datetime {}; @@ -940,8 +930,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); json = callPackage ../development/libraries/haskell/json {}; - jsonEnumerator = callPackage ../development/libraries/haskell/jsonEnumerator {}; - jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {}; languageJavascript = callPackage ../development/libraries/haskell/language-javascript { @@ -1033,8 +1021,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {}; - neither = callPackage ../development/libraries/haskell/neither {}; - network_2_2_1_4 = callPackage ../development/libraries/haskell/network/2.2.1.4.nix {}; network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {}; network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {}; @@ -1109,8 +1095,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); polyparse = callPackage ../development/libraries/haskell/polyparse/default.nix {}; - pool = callPackage ../development/libraries/haskell/pool {}; - poolConduit = callPackage ../development/libraries/haskell/pool-conduit {}; ppm = callPackage ../development/libraries/haskell/ppm {}; @@ -1450,12 +1434,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); }; WebBitsHtml = self.WebBitsHtml_1_0_2; - webRoutes = callPackage ../development/libraries/haskell/web-routes {}; - - webRoutesQuasi = callPackage ../development/libraries/haskell/web-routes-quasi { - pathPieces = self.pathPieces_0_0_0; - }; - CouchDB = callPackage ../development/libraries/haskell/CouchDB {}; wlPprintText = callPackage ../development/libraries/haskell/wl-pprint-text {}; @@ -1481,10 +1459,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); xmlConduit = callPackage ../development/libraries/haskell/xml-conduit {}; - xmlEnumerator = callPackage ../development/libraries/haskell/xml-enumerator { - failure = self.failure_0_1_2; - }; - xmlTypes = callPackage ../development/libraries/haskell/xml-types {}; xssSanitize = callPackage ../development/libraries/haskell/xss-sanitize {}; @@ -1578,10 +1552,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Ebnf2ps = callPackage ../development/tools/parsing/Ebnf2ps {}; - # 2012-02-09: Disabled because upstream site has disappeared. This tool is clearly - # unmaintained, and we should delete it unless anyone complains. - # frown = callPackage ../development/tools/parsing/frown {}; - haddock_2_4_2 = callPackage ../development/tools/documentation/haddock/2.4.2.nix {}; haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix {}; haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix {}; From 846da9fb0a019bccee804f80929c2e4df98ce175 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 24 Feb 2012 11:31:21 +0000 Subject: [PATCH 16/38] haskell-hledger-web: disable this package temporarily until it has been upgraded to support recent versions of Yesod svn path=/nixpkgs/trunk/; revision=32539 --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5fcc1ca607e..90fd84573b1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -844,7 +844,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); #hledgerVty = callPackage ../development/libraries/haskell/hledger-vty {}; #hledgerChart = callPackage ../development/libraries/haskell/hledger-chart {}; hledgerInterest = callPackage ../applications/office/hledger-interest {}; - hledgerWeb = callPackage ../development/libraries/haskell/hledger-web {}; + #hledgerWeb = callPackage ../development/libraries/haskell/hledger-web {}; HList = callPackage ../development/libraries/haskell/HList {}; From 3eca3a2f179faf715fd3ceaa184234751760d70e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 24 Feb 2012 11:38:52 +0000 Subject: [PATCH 17/38] haskell-wai-app-static: updated to version 1.1.2 svn path=/nixpkgs/trunk/; revision=32540 --- pkgs/development/libraries/haskell/wai-app-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index e7197e293f2..79baedeb239 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "1.1.1"; - sha256 = "0i73rxgmng7grs8cgxw8769jg0cvpsb5gi4s0iwrdyh3xd1vj7iy"; + version = "1.1.2"; + sha256 = "1nvzqg3wk7i2p1kcpb9f9wdzbrfl6gxid44l94mmvc7xjcmdl6qw"; buildDepends = [ base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed httpDate httpTypes text time transformers unixCompat wai From 557c02f29cf62e9920899b4f27ee3ca3dff36320 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 24 Feb 2012 11:38:55 +0000 Subject: [PATCH 18/38] haskell-wai-extra: updated to version 1.1.0.1 svn path=/nixpkgs/trunk/; revision=32541 --- .../libraries/haskell/wai-extra/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index e0a36878582..734e8a6fe1c 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -1,16 +1,16 @@ -{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive -, conduit, dataDefault, fastLogger, httpTypes, network, text, time -, transformers, wai, zlibConduit +{ cabal, ansiTerminal, blazeBuilder, blazeBuilderConduit +, caseInsensitive, conduit, dataDefault, fastLogger, httpTypes +, network, text, time, transformers, wai, zlibConduit }: cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.1.0"; - sha256 = "1mj2swb2bgsay9prpw6h0wmwsqyan53ndyczmhppdax4y5088f55"; + version = "1.1.0.1"; + sha256 = "0kavvbywkkwj9914y622wsziwfca9qjaqz798mjhl1ip5bfy73b0"; buildDepends = [ - blazeBuilder blazeBuilderConduit caseInsensitive conduit - dataDefault fastLogger httpTypes network text time transformers wai - zlibConduit + ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive + conduit dataDefault fastLogger httpTypes network text time + transformers wai zlibConduit ]; meta = { homepage = "http://github.com/yesodweb/wai"; From c24800a05b5e862167954e8a4f953b28fe0b5c52 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 24 Feb 2012 11:38:57 +0000 Subject: [PATCH 19/38] haskell-wai: updated to version 1.1.0.1 svn path=/nixpkgs/trunk/; revision=32542 --- 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 f1d4210b667..4fb6227d2e8 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.1.0"; - sha256 = "1kmmivcak9v13rgivs2vhr543dfdx19wncwlpda453570ywam7vh"; + version = "1.1.0.1"; + sha256 = "0klyi3d4rivgvbasamxccvkz1w44ak0rcbx840ypdcjq8mbcb85f"; buildDepends = [ blazeBuilder conduit httpTypes network text transformers vault ]; From 7002f5975160388ace66bfb3a9192c5f0ecec646 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 24 Feb 2012 11:38:59 +0000 Subject: [PATCH 20/38] haskell-warp: updated to version 1.1.0.1 svn path=/nixpkgs/trunk/; revision=32543 --- .../libraries/haskell/warp/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index b6380981d00..03dee23b78b 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -1,15 +1,16 @@ -{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive -, conduit, httpTypes, liftedBase, network, simpleSendfile -, transformers, unixCompat, wai +{ cabal, blazeBuilder, blazeBuilderConduit, bytestringLexing +, caseInsensitive, conduit, httpTypes, liftedBase, network +, simpleSendfile, transformers, unixCompat, wai }: cabal.mkDerivation (self: { pname = "warp"; - version = "1.1.0"; - sha256 = "1an2j89422rcvrvrmhg1hwj8vpikjj5xdzb3h37rjsfj6qlqy5cf"; + version = "1.1.0.1"; + sha256 = "1bgjnnkqgcyj00jd4rgsnpmac0yfd1ydd6i61b252gyrr9dd0wm9"; buildDepends = [ - blazeBuilder blazeBuilderConduit caseInsensitive conduit httpTypes - liftedBase network simpleSendfile transformers unixCompat wai + blazeBuilder blazeBuilderConduit bytestringLexing caseInsensitive + conduit httpTypes liftedBase network simpleSendfile transformers + unixCompat wai ]; meta = { homepage = "http://github.com/yesodweb/wai"; From 4716f6735d57ea2b6cd126f7351dca2759258401 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 24 Feb 2012 17:32:11 +0000 Subject: [PATCH 21/38] vpnc: install the README file into $out/share/doc svn path=/nixpkgs/trunk/; revision=32544 --- pkgs/tools/networking/vpnc/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index 34f41272da8..88ef6bd8e59 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -28,17 +28,22 @@ stdenv.mkDerivation rec { ''; postInstall = '' - for i in $out/{bin,sbin}/* + for i in "$out/{bin,sbin}/"* do wrapProgram $i --prefix PATH : \ "${nettools}/bin:${nettools}/sbin" done + + mkdir -p $out/share/doc/vpnc + cp README nortel.txt ChangeLog $out/share/doc/vpnc/ ''; meta = { - description = ''VPNC, a virtual private network (VPN) client - for Cisco's VPN concentrators''; - homepage = http://www.unix-ag.uni-kl.de/~massar/vpnc/; + homepage = "http://www.unix-ag.uni-kl.de/~massar/vpnc/"; + description = "virtual private network (VPN) client for Cisco's VPN concentrators"; license = "GPLv2+"; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } From 72450d9b735e7f0d012e21424b4211ecc0f0f098 Mon Sep 17 00:00:00 2001 From: Arie Middelkoop Date: Fri, 24 Feb 2012 17:53:19 +0000 Subject: [PATCH 22/38] Added dropbox (binary). svn path=/nixpkgs/trunk/; revision=32545 --- .../networking/dropbox/default.nix | 86 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 88 insertions(+) create mode 100644 pkgs/applications/networking/dropbox/default.nix diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix new file mode 100644 index 00000000000..5e7e921710f --- /dev/null +++ b/pkgs/applications/networking/dropbox/default.nix @@ -0,0 +1,86 @@ +{ stdenv, fetchurl, makeDesktopItem +, xlibs, gtkLibs, gnome +, dbus, dbus_glib, fontconfig, gcc, patchelf +}: + +# this package contains the daemon version of dropbox +# it's unfortunately closed source +# +# note: the resulting program has to be invoced as +# 'dropbox' because the internal python engine takes +# uses the name of the program as starting point. +# +# todo: dropbox is shipped with some copies of libraries. +# replace these libraries with the appropriate ones in +# nixpkgs. + +# note: there is a i686 version available as well +assert stdenv.system == "x86_64-linux"; + +let + + version = "1.2.52"; + sha256 = "72aeaf00727da9f3fe39386dcf883bb303de928ba43c738fcc5bb62b93eca252"; + + # relative location where the dropbox libraries are stored + sharedir = "share/dropbox"; + + # Libraries referenced by dropbox binary. + # Be aware that future versions of the dropbox binary may refer + # to different versions than are currently in these packages. + ldpath = with xlibs; with gtkLibs; with gnome; + stdenv.lib.makeSearchPath "lib" [ + libSM libX11 libXext libXcomposite libXcursor libXdamage + libXfixes libXi libXinerama libXrandr libXrender + atk dbus dbus_glib glib fontconfig gcc gdk_pixbuf + gtk pango + ]; + + desktopItem = makeDesktopItem { + name = "dropbox"; + exec = "dropbox"; + comment = "Online directories"; + desktopName = "Dropbox"; + genericName = "Online storage"; + categories = "Application;Internet;"; + }; + +in stdenv.mkDerivation { + name = "dropbox-${version}-bin"; + src = fetchurl { + name = "dropbox-${version}.tar.gz"; + url = "http://www.dropbox.com/download?plat=lnx.x86_64"; + inherit sha256; + }; + + sourceRoot = "."; + + patchPhase = '' + rm -f .dropbox-dist/dropboxd + ''; + + installPhase = '' + ensureDir "$out/${sharedir}" + cp -r .dropbox-dist/* "$out/${sharedir}/" + ensureDir "$out/bin" + ln -s "$out/${sharedir}/dropbox" "$out/bin/dropbox" + + patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \ + "$out/${sharedir}/dropbox" + + RPATH=${ldpath}:${gcc.gcc}/lib64:$out/${sharedir} + echo "updating rpaths to: $RPATH" + find "$out/${sharedir}" -type f -a -perm +0100 \ + -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \; + + ensureDir "$out/share/applications" + cp ${desktopItem}/share/applications/* $out/share/applications + ''; + + buildInputs = [ patchelf ]; + + meta = { + description = "Online stored folders (daemon version)"; + homepage = http://www.dropbox.com; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b033176ef61..063e20d175a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7426,6 +7426,8 @@ let usePulseAudio = getConfig [ "pulseaudio" ] false; # disabled by default (the 100% cpu bug) }; + dropbox = callPackage ../applications/networking/dropbox { }; + slim = callPackage ../applications/display-managers/slim { }; sndBase = builderDefsPackage (import ../applications/audio/snd) { From d1e84a7498eb73c2f4a48953db5227dfa3e0afd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 24 Feb 2012 20:18:32 +0000 Subject: [PATCH 23/38] Blind commit trying to fix nvidia cg toolkit on i686-linux svn path=/nixpkgs/trunk/; revision=32546 --- pkgs/development/compilers/nvidia-cg-toolkit/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix index 06f1d74382e..083b420318c 100644 --- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix +++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix @@ -33,10 +33,9 @@ stdenv.mkDerivation rec { ensureDir "$out/include/" cp -v -r include/Cg/ "$out/include/" ensureDir "$out/lib/" - [ "$system" = "x86_64-linux" ] && cp -v lib64/* "$out/lib/" - [ "$system" = "i686-linux" ] && cp -v lib/* "$out/lib/" - for mandir in man1 man3 \ - ${if stdenv.system == "x86_64-linux" then "manCg" else ""} manCgFX + [ "$system" == "x86_64-linux" ] && cp -v lib64/* "$out/lib/" + [ "$system" == "i686-linux" ] && cp -v lib/* "$out/lib/" + for mandir in man1 man3 manCg manCgFX do ensureDir "$out/share/man/$mandir/" cp -v share/man/$mandir/* "$out/share/man/$mandir/" From 6b10ace1ca7a0eef39c7ff65469057f6a8d41339 Mon Sep 17 00:00:00 2001 From: Arie Middelkoop Date: Fri, 24 Feb 2012 20:20:59 +0000 Subject: [PATCH 24/38] mcelog: a tool to access the machine check exceptions logged by the kernel. The kernel indicated that machine check exceptions were logged, but did not tell what kind of exceptions. In my case, this is usually the processor being throttled because it gets too hot (laptop...), but it may also be more severe problems. Anyway, with this tool you can access these logs. svn path=/nixpkgs/trunk/; revision=32547 --- pkgs/os-specific/linux/mcelog/default.nix | 33 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/os-specific/linux/mcelog/default.nix diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix new file mode 100644 index 00000000000..82c502ede72 --- /dev/null +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchgit }: + +# Shows the machine check exceptions logged by the kernel. +# E.g. a log is generated when intel processors cpu-throttle. + +# The releases of this package are no longer on kernel.org +# hence we fetch them from github. Apparently, these +# are also more recent. + +let + + rev = "7fa99818367a6d17014b36d6f918ad848cbe7ce2"; + version = "1.0pre-${rev}"; + sha256 = "15eea3acd76190c7922c71028b31963221a2eefd8afa713879e191a26bc22ae7"; + +in stdenv.mkDerivation { + + name = "mcelog-${version}"; + + src = fetchgit { + url = "https://github.com/andikleen/mcelog"; + inherit sha256; + inherit rev; + }; + + makeFlags = "prefix=$(out) etcprefix=$(out) DOCDIR=$(out)/share/doc"; + + meta = { + description = "Tool to display logged machine check exceptions"; + homepage = http://mcelog.org/; + license = stdenv.lib.licenses.gpl2; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 063e20d175a..81f42cc55c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -444,6 +444,8 @@ let syslogng = callPackage ../tools/system/syslog-ng { }; + mcelog = callPackage ../os-specific/linux/mcelog { }; + asciidoc = callPackage ../tools/typesetting/asciidoc { }; autossh = callPackage ../tools/networking/autossh { }; From 0812ff0e57c00fd757d29d2290834cb733fc23e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 24 Feb 2012 20:34:35 +0000 Subject: [PATCH 25/38] Adding caelum (I want RoR) svn path=/nixpkgs/trunk/; revision=32548 --- pkgs/development/libraries/caelum/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/caelum/default.nix diff --git a/pkgs/development/libraries/caelum/default.nix b/pkgs/development/libraries/caelum/default.nix new file mode 100644 index 00000000000..68d96f4f373 --- /dev/null +++ b/pkgs/development/libraries/caelum/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, cmake, pkgconfig, ois, ogre, boost }: + +stdenv.mkDerivation rec { + name = "caelum-0.6.1"; + + src = fetchurl { + url = "http://caelum.googlecode.com/files/${name}.tar.gz"; + sha256 = "1j995q1a88cikqrxdqsrwzm2asid51xbmkl7vn1grfrdadb15303"; + }; + + buildInputs = [ ois ogre boost ]; + buildNativeInputs = [ cmake pkgconfig ]; + + enableParallelBuilding = true; + + meta = { + description = "Add-on for the OGRE, aimed to render atmospheric effects"; + homepage = http://code.google.com/p/caelum/; + license = "LGPLv2+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81f42cc55c8..c2c10d56be1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3276,6 +3276,8 @@ let buddy = callPackage ../development/libraries/buddy { }; + caelum = callPackage ../development/libraries/caelum { }; + cairomm = callPackage ../development/libraries/cairomm { }; scmccid = callPackage ../development/libraries/scmccid { }; From d6f6caea6be6526a8cef8e3c738b8504efb98bb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 24 Feb 2012 21:13:14 +0000 Subject: [PATCH 26/38] Updating angelscript to 2.22.1. Adding mysocketw. Adding ogre-paged. Fixing the caelum licence. svn path=/nixpkgs/trunk/; revision=32549 --- .../interpreters/angelscript/default.nix | 4 ++-- pkgs/development/libraries/caelum/default.nix | 2 +- .../libraries/mysocketw/default.nix | 23 +++++++++++++++++++ .../development/libraries/mysocketw/gcc.patch | 13 +++++++++++ .../libraries/ogrepaged/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 6 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/mysocketw/default.nix create mode 100644 pkgs/development/libraries/mysocketw/gcc.patch create mode 100644 pkgs/development/libraries/ogrepaged/default.nix diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix index 65ff72bae56..fa53071d306 100644 --- a/pkgs/development/interpreters/angelscript/default.nix +++ b/pkgs/development/interpreters/angelscript/default.nix @@ -11,10 +11,10 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="angelscript"; - version="2.20.2"; + version="2.22.1"; name="${baseName}-${version}"; url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; - hash="0s5d6av27dl6kxkzns011zwznj7r8zy5ypfhl6x9r1kzaqdkqz2a"; + hash="0fmw0cb7ymgyq31r4cfvsn4k86r20hj650fbzs9i7zl0p3lb6hpm"; }; in rec { diff --git a/pkgs/development/libraries/caelum/default.nix b/pkgs/development/libraries/caelum/default.nix index 68d96f4f373..75eb5109b45 100644 --- a/pkgs/development/libraries/caelum/default.nix +++ b/pkgs/development/libraries/caelum/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { description = "Add-on for the OGRE, aimed to render atmospheric effects"; homepage = http://code.google.com/p/caelum/; - license = "LGPLv2+"; + license = "LGPLv2.1+"; }; } diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix new file mode 100644 index 00000000000..c1cada63abe --- /dev/null +++ b/pkgs/development/libraries/mysocketw/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, openssl}: + +stdenv.mkDerivation rec { + name = "mysocketw-031026"; + src = fetchurl { + url = http://www.digitalfanatics.org/cal/socketw/files/SocketW031026.tar.gz; + sha256 = "0crinikhdl7xihzmc3k3k41pgxy16d5ci8m9sza1lbibns7pdwj4"; + }; + + patches = [ ./gcc.patch ]; + + configurePhase = '' + sed -i s,/usr/local,$out, Makefile.conf + ''; + + buildInputs = [ openssl ]; + + meta = { + description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++"; + license = "LGPLv2.1+"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/mysocketw/gcc.patch b/pkgs/development/libraries/mysocketw/gcc.patch new file mode 100644 index 00000000000..7779a18fa52 --- /dev/null +++ b/pkgs/development/libraries/mysocketw/gcc.patch @@ -0,0 +1,13 @@ +I picked it up from: +http://www.rigsofrods.com/wiki/images/c/c0/Socketw.patch + +--- a/src/sw_base.cxx.old 2009-12-19 21:19:31.057051328 -0800 ++++ b/src/sw_base.cxx 2009-12-19 21:19:44.939551918 -0800 +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + + #ifndef __WIN32__ + #include diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix new file mode 100644 index 00000000000..6b2b9c9e4a6 --- /dev/null +++ b/pkgs/development/libraries/ogrepaged/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, cmake, pkgconfig, ois, ogre, libX11, boost }: + +stdenv.mkDerivation rec { + name = "ogre-paged-1.1.3"; + + src = fetchurl { + url = "http://ogre-paged.googlecode.com/files/${name}.tar.gz"; + sha256 = "1qqlkg17plk87dm3fsm34x8lkd5rxkhiz77ppcgc71a7z050vhjq"; + }; + + buildInputs = [ ois ogre libX11 boost ]; + buildNativeInputs = [ cmake pkgconfig ]; + + cmakeFlags = "-DPAGEDGEOMETRY_BUILD_SAMPLES=OFF"; + + enableParallelBuilding = true; + + meta = { + description = "Paged Geometry for Ogre3D"; + homepage = http://code.google.com/p/ogre-paged/; + license = "MIT"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2c10d56be1..6792996dbf4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4371,6 +4371,8 @@ let myguiSvn = callPackage ../development/libraries/mygui/svn.nix {}; + mysocketw = callPackage ../development/libraries/mysocketw { }; + ncurses = makeOverridable (import ../development/libraries/ncurses) { inherit fetchurl stdenv; unicode = system != "i686-cygwin"; @@ -4416,6 +4418,8 @@ let ogre = callPackage ../development/libraries/ogre {}; + ogrepaged = callPackage ../development/libraries/ogrepaged { }; + openal = callPackage ../development/libraries/openal { }; # added because I hope that it has been easier to compile on x86 (for blender) From d3d5783466abc8a9868039cb52457ceb8275499a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 24 Feb 2012 22:05:47 +0000 Subject: [PATCH 27/38] Updating and fixing rigsofrods, to 0.39.4. Pay attention to the last 'echo' of installPhase. svn path=/nixpkgs/trunk/; revision=32550 --- pkgs/games/rigsofrods/default.nix | 55 ++++++++++++++----------------- pkgs/games/rigsofrods/wx.patch | 13 -------- 2 files changed, 24 insertions(+), 44 deletions(-) delete mode 100644 pkgs/games/rigsofrods/wx.patch diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index 8fc623184ed..13d6159528a 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -1,21 +1,15 @@ { fetchsvn, fetchurl, stdenv, wxGTK290, freeimage, cmake, zziplib, mesa, boost, pkgconfig, libuuid, lua5, openal, ogre, ois, curl, gtk, pixman, mygui, unzip, - angelscript + angelscript, caelum, ogrepaged, mysocketw, libxcb }: stdenv.mkDerivation rec { - /* version = "1780"; */ - version = "0.37"; + version = "0.39.4"; name = "rigsofrods-${version}"; - /* src = fetchsvn { - url = https://rigsofrods.svn.sourceforge.net/svnroot/rigsofrods/trunk; - rev = version; - }; */ - src = fetchurl { - url = mirror://sourceforge/rigsofrods/rigsofrods/0.37-dev/RoR-0.37.126-Sources.zip; - sha256 = "03mxmxpfdlsri0j3nqgyj2pc4gpzs8zq8qgg6qhnyazi7j95j4mk"; + url = mirror://sourceforge/rigsofrods/rigsofrods-source-0.39.4.tar.bz2; + sha256 = "1kpjkski0yllwzdki0rjpqvifjs0fwpgs513y4dv4s9wfwan1qcx"; }; contentPackSrc = fetchurl { @@ -26,45 +20,44 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; cmakeFlags = [ - "-DROR_USE_LUA=TRUE" "-DLUA_LIBRARIES=${lua5}/lib/liblua.a" + # "-DROR_USE_LUA=TRUE" "-DLUA_LIBRARIES=${lua5}/lib/liblua.a" "-DROR_USE_CURL=TRUE" "-DROR_USE_MYGUI=TRUE" - # "-DROR_USE_OPNEAL=TRUE" - # "-DROR_USE_MOFILEREADER=TRUE" - # "-DROR_USE_CAELUM=TRUE" - # "-DROR_USE_PAGED=TRUE" + "-DROR_USE_OPNEAL=TRUE" + "-DROR_USE_CAELUM=TRUE" + "-DROR_USE_PAGED=TRUE" "-DROR_USE_ANGELSCRIPT=TRUE" - # "-DROR_USE_SOCKETW=TRUE" + "-DROR_USE_SOCKETW=TRUE" ]; + makeFlags = "VERBOSE=1"; installPhase = '' - sed -e "s@/usr/local/lib/OGRE@${ogre}/lib/OGRE@" -i ../bin/plugins.cfg - sed -e "/CgProgramManager/d" -i ../bin/plugins.cfg + sed -e "s@/usr/local/lib/OGRE@${ogre}/lib/OGRE@" -i ../tools/linux/binaries/plugins.cfg ensureDir $out/share/rigsofrods cp -r .. $out/share/rigsofrods/build-dir + cp ../tools/linux/binaries/plugins.cfg $out/share/rigsofrods/build-dir/bin ensureDir $out/bin - for i in RoR rorconfig RoRViewer; do - echo '#! ${stdenv.shell}' >> "$out/bin/$i" - if [ "$i" = "rorconfig" ]; then - echo "[ -d \"\$HOME/.rigsofrods\" ] && cp -r '$out/share/rigsofrods/build-dirs/bin/skeleton' \"\$HOME/.rigsofrods\"" >> "$out/bin/$i" - echo "chmod u+w -R \"\$HOME/.rigsofrods\"" >> "$out/bin/$i" - fi - echo "\"$out/share/rigsofrods/build-dir/bin/$i\"" >> "$out/bin/$i" - chmod a+x "$out/bin/$i" - done - cd $out/share/rigsofrods/build-dir/bin/ + ln -s $out/share/rigsofrods/build-dir/bin/{RoR,rorconfig} $out/bin + cd $out/share/rigsofrods + mkdir contentpack + cd contentpack unzip "${contentPackSrc}" + + echo First run rorconfig once to create ~/.rigsofrods + echo Then copy $out/share/rigsofrods/build-dir/bin/plugins.cfg to ~/.rigsofrods + echo Then ln $out/share/rigsofrods/contentpack/* to ~/.rigsofrods/packs ''; + patches = [ ./doubleslash.patch ]; + preConfigure = '' export NIX_LDFLAGS="$NIX_LDFLAGS -langelscript -lgtk-x11-2.0" sed -e 's@wxLOCALE_CONV_ENCODING@0@g' -i source/configurator/configurator.cpp ''; - # patches = [ ./wx.patch ]; - buildInputs = [ wxGTK290 freeimage cmake zziplib mesa boost pkgconfig - libuuid lua5 openal ogre ois curl gtk mygui unzip angelscript ]; + libuuid lua5 openal ogre ois curl gtk mygui unzip angelscript + caelum ogrepaged mysocketw libxcb ]; meta = { description = "3D simulator game where you can drive, fly and sail various vehicles"; diff --git a/pkgs/games/rigsofrods/wx.patch b/pkgs/games/rigsofrods/wx.patch deleted file mode 100644 index d5b8e27de7b..00000000000 --- a/pkgs/games/rigsofrods/wx.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/source/configurator/configurator.cpp b/source/configurator/configurator.cpp -index c058820..5a4b316 100644 ---- a/source/configurator/configurator.cpp -+++ b/source/configurator/configurator.cpp -@@ -2155,7 +2155,7 @@ void MyDialog::OnsightrangesliderScroll(wxScrollEvent &e) - int v = sightRange->GetValue(); - if(v == sightRange->GetMax()) - { -- s = "Unlimited"; -+ s = _("Unlimited"); - } else - { - s.Printf(wxT("%i m"), v); From ded053529f36639580dc53e8bc3c240b7e110a1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 24 Feb 2012 22:09:07 +0000 Subject: [PATCH 28/38] A patch required for RoR I just forgot. svn path=/nixpkgs/trunk/; revision=32551 --- pkgs/games/rigsofrods/doubleslash.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 pkgs/games/rigsofrods/doubleslash.patch diff --git a/pkgs/games/rigsofrods/doubleslash.patch b/pkgs/games/rigsofrods/doubleslash.patch new file mode 100644 index 00000000000..c62c5470dfc --- /dev/null +++ b/pkgs/games/rigsofrods/doubleslash.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeDependenciesConfig.txt b/CMakeDependenciesConfig.txt +index 447a440..e2562de 100644 +--- a/CMakeDependenciesConfig.txt ++++ b/CMakeDependenciesConfig.txt +@@ -228,7 +228,7 @@ ELSEIF(UNIX) + # Paged Geometry + find_path(PAGED_INCLUDE_DIRS "PagedGeometry/PagedGeometry.h") + if(PAGED_INCLUDE_DIRS) +- set(PAGED_INCLUDE_DIRS "${PAGED_INCLUDE_DIRS};/${PAGED_INCLUDE_DIRS}/PagedGeometry") ++ set(PAGED_INCLUDE_DIRS "${PAGED_INCLUDE_DIRS};${PAGED_INCLUDE_DIRS}/PagedGeometry") + find_library(PAGED_LIBRARIES "PagedGeometry") + set(ROR_USE_PAGED ON) + else() From 60bd341efdefc9e6db6fa7c169eaf54efb19b314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 24 Feb 2012 22:49:41 +0000 Subject: [PATCH 29/38] Trying to fix go-oo svn path=/nixpkgs/trunk/; revision=32552 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6792996dbf4..7b4cf34d948 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7278,6 +7278,7 @@ let inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome) GConf ORBit2; neon = neon029; + libwpd = libwpd_08; }; openscad = callPackage ../applications/graphics/openscad {}; From 6f7cb59e04d4b75a6799d8c82bc4ad8ef7331a9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 24 Feb 2012 22:56:53 +0000 Subject: [PATCH 30/38] Making rigs of rods build and run right away. Simpyl run 'rorconfig' first, and 'RoR' then. On linux, disable Caleum rendering. It does not work. Known bug upstream. svn path=/nixpkgs/trunk/; revision=32553 --- pkgs/games/rigsofrods/default.nix | 27 ++++++++------------------- pkgs/games/rigsofrods/paths.patch | 12 ++++++++++++ 2 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 pkgs/games/rigsofrods/paths.patch diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index 13d6159528a..480481afe9a 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -1,5 +1,5 @@ { fetchsvn, fetchurl, stdenv, wxGTK290, freeimage, cmake, zziplib, mesa, boost, - pkgconfig, libuuid, lua5, openal, ogre, ois, curl, gtk, pixman, mygui, unzip, + pkgconfig, libuuid, openal, ogre, ois, curl, gtk, pixman, mygui, unzip, angelscript, caelum, ogrepaged, mysocketw, libxcb }: @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; cmakeFlags = [ - # "-DROR_USE_LUA=TRUE" "-DLUA_LIBRARIES=${lua5}/lib/liblua.a" "-DROR_USE_CURL=TRUE" "-DROR_USE_MYGUI=TRUE" "-DROR_USE_OPNEAL=TRUE" @@ -29,34 +28,24 @@ stdenv.mkDerivation rec { "-DROR_USE_ANGELSCRIPT=TRUE" "-DROR_USE_SOCKETW=TRUE" ]; - makeFlags = "VERBOSE=1"; installPhase = '' sed -e "s@/usr/local/lib/OGRE@${ogre}/lib/OGRE@" -i ../tools/linux/binaries/plugins.cfg ensureDir $out/share/rigsofrods - cp -r .. $out/share/rigsofrods/build-dir - cp ../tools/linux/binaries/plugins.cfg $out/share/rigsofrods/build-dir/bin + cp -r ../bin/* $out/share/rigsofrods + cp ../tools/linux/binaries/plugins.cfg $out/share/rigsofrods ensureDir $out/bin - ln -s $out/share/rigsofrods/build-dir/bin/{RoR,rorconfig} $out/bin + ln -s $out/share/rigsofrods/{RoR,rorconfig} $out/bin cd $out/share/rigsofrods - mkdir contentpack - cd contentpack + mkdir packs + cd packs unzip "${contentPackSrc}" - - echo First run rorconfig once to create ~/.rigsofrods - echo Then copy $out/share/rigsofrods/build-dir/bin/plugins.cfg to ~/.rigsofrods - echo Then ln $out/share/rigsofrods/contentpack/* to ~/.rigsofrods/packs ''; - patches = [ ./doubleslash.patch ]; - - preConfigure = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -langelscript -lgtk-x11-2.0" - sed -e 's@wxLOCALE_CONV_ENCODING@0@g' -i source/configurator/configurator.cpp - ''; + patches = [ ./doubleslash.patch ./paths.patch ]; buildInputs = [ wxGTK290 freeimage cmake zziplib mesa boost pkgconfig - libuuid lua5 openal ogre ois curl gtk mygui unzip angelscript + libuuid openal ogre ois curl gtk mygui unzip angelscript caelum ogrepaged mysocketw libxcb ]; meta = { diff --git a/pkgs/games/rigsofrods/paths.patch b/pkgs/games/rigsofrods/paths.patch new file mode 100644 index 00000000000..e20b00a7693 --- /dev/null +++ b/pkgs/games/rigsofrods/paths.patch @@ -0,0 +1,12 @@ +diff --git a/source/main/framework/ContentManager.cpp b/source/main/framework/ContentManager.cpp +index 0bfea8c..82cdab9 100644 +--- a/source/main/framework/ContentManager.cpp ++++ b/source/main/framework/ContentManager.cpp +@@ -238,6 +238,7 @@ bool ContentManager::init(void) + #endif // USE_OPENAL + + // and the content ++ ResourceGroupManager::getSingleton().addResourceLocation(SSETTING("Program Path")+"packs", "FileSystem", "Packs", true); + ResourceGroupManager::getSingleton().addResourceLocation(SSETTING("User Path")+"packs", "FileSystem", "Packs", true); + ResourceGroupManager::getSingleton().addResourceLocation(SSETTING("User Path")+"mods", "FileSystem", "Packs", true); + From bfd787a69a4bf8c2b170063f3b9416f0df24ddf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 24 Feb 2012 23:40:58 +0000 Subject: [PATCH 31/38] Finally I fix, not blindly, the nvidia-cg-toolkit expression for i686-linux svn path=/nixpkgs/trunk/; revision=32554 --- pkgs/development/compilers/nvidia-cg-toolkit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix index 083b420318c..d6b7d70100b 100644 --- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix +++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { installPhase = '' for b in cgc cgfxcat cginfo do - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-*.so.? "bin/$b" + patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux*.so.? "bin/$b" done # FIXME: cgfxcat and cginfo need more patchelf ensureDir "$out/bin/" From bfb0389d6cf2caa6f017f11f9fd9a488713b89f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 25 Feb 2012 15:54:57 +0000 Subject: [PATCH 32/38] Disabling NLS for the zip at openoffice builders. I think it breaks the builds, based on the nixpkgs diff for the breakage at http://hydra.nixos.org/build/1964660 . svn path=/nixpkgs/trunk/; revision=32556 --- pkgs/tools/archivers/zip/default.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index e3b48f48325..c7bddfd6de2 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, libnatspec }: +{ stdenv, fetchurl, enableNLS ? true, libnatspec ? null }: + +assert enableNLS -> libnatspec != null; stdenv.mkDerivation { name = "zip-3.0"; @@ -12,9 +14,9 @@ stdenv.mkDerivation { installFlags="-f unix/Makefile prefix=$(out) INSTALL=cp"; - patches = [ ./natspec-gentoo.patch.bz2 ]; + patches = if enableNLS then [ ./natspec-gentoo.patch.bz2 ] else []; - buildInputs = [ libnatspec ]; + buildInputs = if enableNLS then [ libnatspec ] else []; meta = { homepage = http://www.info-zip.org; @@ -22,4 +24,3 @@ stdenv.mkDerivation { maintainer = [ stdenv.lib.maintainers.urkud ]; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b4cf34d948..99fb330bec3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7272,6 +7272,7 @@ let inherit (gnome) GConf ORBit2; neon = neon029; libwpd = libwpd_08; + zip = zip.override { enableNLS = false; }; }; go_oo = callPackage ../applications/office/openoffice/go-oo.nix { @@ -7279,6 +7280,7 @@ let inherit (gnome) GConf ORBit2; neon = neon029; libwpd = libwpd_08; + zip = zip.override { enableNLS = false; }; }; openscad = callPackage ../applications/graphics/openscad {}; From 675e16f8054ce0e6e9d69dfb8eba61c1f4a6141a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 25 Feb 2012 16:47:21 +0000 Subject: [PATCH 33/38] Fixing jam for i686-linux. That should allow building trigger rally. svn path=/nixpkgs/trunk/; revision=32557 --- pkgs/development/tools/build-managers/jam/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix index d2a002a70cf..6e2d79c6400 100644 --- a/pkgs/development/tools/build-managers/jam/default.nix +++ b/pkgs/development/tools/build-managers/jam/default.nix @@ -1,5 +1,11 @@ {stdenv, fetchurl}: +let + bindir = if stdenv.system == "i686-linux" then "bin.linuxx86" + else if stdenv.system == "x86_64-linux" then "bin.linux" + else throw "Unsupported platform by now"; +in + stdenv.mkDerivation { name = "jam-2.5"; src = fetchurl { @@ -9,7 +15,7 @@ stdenv.mkDerivation { installPhase = '' ensureDir $out/bin - cp bin.linux/jam $out/bin + cp ${bindir}/jam $out/bin ''; meta = { From 5f78cfa108a856b35136ada20be2a8cac26280cb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 25 Feb 2012 17:33:14 +0000 Subject: [PATCH 34/38] * Add "..." to the trace message. svn path=/nixpkgs/trunk/; revision=32559 --- pkgs/lib/debug.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/lib/debug.nix b/pkgs/lib/debug.nix index d4d2702a284..e452151add6 100644 --- a/pkgs/lib/debug.nix +++ b/pkgs/lib/debug.nix @@ -42,7 +42,7 @@ rec { else if x == null then "x is null" else if isInt x then "x is an integer `${toString x}'" else if isString x then "x is a string `${substring 0 50 x}...'" - else "x is probably a path `${substring 0 50 (toString x)}'"; + else "x is probably a path `${substring 0 50 (toString x)}...'"; # trace the arguments passed to function and its result # maybe rewrite these functions in a traceCallXml like style. Then one function is enough From f0197c653e4601776128061d7624ded313c059fd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 25 Feb 2012 17:34:21 +0000 Subject: [PATCH 35/38] * Backport a fix to qemu-kvm to prevent "qemu-img convert" from creating corrupt VirtualBox images. (https://bugs.launchpad.net/qemu/+bug/919242) svn path=/nixpkgs/trunk/; revision=32560 --- pkgs/os-specific/linux/qemu-kvm/default.nix | 2 +- .../qemu-kvm/qemu-img-fix-corrupt-vdi.patch | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix index 821084c1b33..aa92b2f2d0d 100644 --- a/pkgs/os-specific/linux/qemu-kvm/default.nix +++ b/pkgs/os-specific/linux/qemu-kvm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0gkk96yid3nq8i4z8xbiarj0r9v7b2zavf5mnh0rc7kclzxa7mmf"; }; - patches = [ ./smb-tmpdir.patch ]; + patches = [ ./smb-tmpdir.patch ./qemu-img-fix-corrupt-vdi.patch ]; configureFlags = "--audio-drv-list=alsa"; diff --git a/pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch b/pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch new file mode 100644 index 00000000000..446a69a146b --- /dev/null +++ b/pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch @@ -0,0 +1,27 @@ +From http://patchwork.ozlabs.org/patch/137186/ + +diff -ru qemu-kvm-0.15.1-orig/block/vdi.c qemu-kvm-0.15.1/block/vdi.c +--- qemu-kvm-0.15.1-orig/block/vdi.c 2011-10-19 15:54:48.000000000 +0200 ++++ qemu-kvm-0.15.1/block/vdi.c 2012-02-25 18:15:36.114574574 +0100 +@@ -1,7 +1,7 @@ + /* + * Block driver for the Virtual Disk Image (VDI) format + * +- * Copyright (c) 2009 Stefan Weil ++ * Copyright (c) 2009, 2012 Stefan Weil + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +@@ -767,8 +767,12 @@ + acb->header_modified = 1; + } + acb->bmap_last = block_index; ++ /* Copy data to be written to new block and zero unused parts. */ ++ memset(block, 0, sector_in_block * SECTOR_SIZE); + memcpy(block + sector_in_block * SECTOR_SIZE, + acb->buf, n_sectors * SECTOR_SIZE); ++ memset(block + (sector_in_block + n_sectors) * SECTOR_SIZE, 0, ++ (s->block_sectors - n_sectors - sector_in_block) * SECTOR_SIZE); + acb->hd_iov.iov_base = (void *)block; + acb->hd_iov.iov_len = s->block_size; + qemu_iovec_init_external(&acb->hd_qiov, &acb->hd_iov, 1); From f25daaaf3d069bfce0716c599d6acf197eae2952 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 25 Feb 2012 18:29:30 +0000 Subject: [PATCH 36/38] Rigs of rods was built without optimisations. Setting the cmake build type to release. I think that should be done at the cmake setup hook, and win that for all possible cmake packages that are built by default without optimisation flags. Which is the cmake default behaviour if not overriden. svn path=/nixpkgs/trunk/; revision=32561 --- pkgs/games/rigsofrods/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index 480481afe9a..4fa89798306 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { "-DROR_USE_PAGED=TRUE" "-DROR_USE_ANGELSCRIPT=TRUE" "-DROR_USE_SOCKETW=TRUE" + "-DCMAKE_BUILD_TYPE=Release" ]; installPhase = '' From 9e7a5c5157859edc49bfb6eee0bb249889010d9f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Feb 2012 19:22:06 +0000 Subject: [PATCH 37/38] boost: updated to version 1.49 svn path=/nixpkgs/trunk/; revision=32562 --- pkgs/development/libraries/boost/1.49.nix | 91 +++++++++++++++++++ .../boost/boost_filesystem_post_1_49_0.patch | 12 +++ pkgs/top-level/all-packages.nix | 3 +- 3 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/boost/1.49.nix create mode 100644 pkgs/development/libraries/boost/boost_filesystem_post_1_49_0.patch diff --git a/pkgs/development/libraries/boost/1.49.nix b/pkgs/development/libraries/boost/1.49.nix new file mode 100644 index 00000000000..a86670927aa --- /dev/null +++ b/pkgs/development/libraries/boost/1.49.nix @@ -0,0 +1,91 @@ +{ stdenv, fetchurl, icu, expat, zlib, bzip2, python +, enableRelease ? true +, enableDebug ? false +, enableSingleThreaded ? false +, enableMultiThreaded ? true +, enableShared ? true +, enableStatic ? false +, enablePIC ? false +, enableExceptions ? false +}: + +let + + variant = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableRelease "release" ++ + stdenv.lib.optional enableDebug "debug"); + + threading = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableSingleThreaded "single" ++ + stdenv.lib.optional enableMultiThreaded "multi"); + + link = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableShared "shared" ++ + stdenv.lib.optional enableStatic "static"); + + # To avoid library name collisions + finalLayout = if ((enableRelease && enableDebug) || + (enableSingleThreaded && enableMultiThreaded) || + (enableShared && enableStatic)) then + "tagged" else "system"; + + cflags = if (enablePIC && enableExceptions) then + "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC" + else if (enablePIC) then + "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" + else if (enableExceptions) then + "cflags=-fexceptions" + else + ""; +in + +stdenv.mkDerivation { + name = "boost-1.49.0"; + + meta = { + homepage = "http://boost.org/"; + description = "Boost C++ Library Collection"; + license = "boost-license"; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_49_0.tar.bz2"; + sha256 = "0g0d33942rm073jgqqvj3znm3rk45b2y2lplfjpyg9q7amzqlx6x"; + }; + + # See . + patches = [ ./boost_filesystem_post_1_49_0.patch ]; + + enableParallelBuilding = true; + + buildInputs = [icu expat zlib bzip2 python]; + + configureScript = "./bootstrap.sh"; + configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; + + buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; + + installPhase = ":"; + + crossAttrs = rec { + buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ]; + # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to + # override them. + propagatedBuildInputs = buildInputs; + # We want to substitute the contents of configureFlags, removing thus the + # usual --build and --host added on cross building. + preConfigure = '' + export configureFlags="--prefix=$out --without-icu" + ''; + buildPhase = '' + set -x + cat << EOF > user-config.jam + using gcc : cross : $crossConfig-g++ ; + EOF + ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install + ''; + }; +} diff --git a/pkgs/development/libraries/boost/boost_filesystem_post_1_49_0.patch b/pkgs/development/libraries/boost/boost_filesystem_post_1_49_0.patch new file mode 100644 index 00000000000..334533d98a6 --- /dev/null +++ b/pkgs/development/libraries/boost/boost_filesystem_post_1_49_0.patch @@ -0,0 +1,12 @@ +diff -ubr boost_1_49_0/libs/filesystem/v2/src/v2_path.cpp boost_1_49_0-patched/libs/filesystem/v2/src/v2_path.cpp +--- boost_1_49_0/libs/filesystem/v2/src/v2_path.cpp 2011-01-11 22:39:33.000000000 +0100 ++++ boost_1_49_0-patched/libs/filesystem/v2/src/v2_path.cpp 2012-02-25 20:00:33.628767485 +0100 +@@ -45,7 +45,7 @@ + { + #if !defined(macintosh) && !defined(__APPLE__) && !defined(__APPLE_CC__) + // ISO C calls this "the locale-specific native environment": +- static std::locale lc(""); ++ static std::locale lc; + #else // Mac OS + // "All BSD system functions expect their string parameters to be in UTF-8 encoding + // and nothing else." diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99fb330bec3..bf6af1326a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3260,7 +3260,8 @@ let boost146 = callPackage ../development/libraries/boost/1.46.nix { }; boost147 = callPackage ../development/libraries/boost/1.47.nix { }; boost148 = callPackage ../development/libraries/boost/1.48.nix { }; - boost = boost148; + boost149 = callPackage ../development/libraries/boost/1.49.nix { }; + boost = boost149; # A Boost build with all library variants enabled. Very large (about 250 MB). boostFull = appendToName "full" (boost.override { From 385f242a400749b3923d51fff5a86403e6dab0dc Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 25 Feb 2012 19:36:24 +0000 Subject: [PATCH 38/38] node.js: Get building on darwin svn path=/nixpkgs/trunk/; revision=32563 --- pkgs/development/web/nodejs/default.nix | 12 ++++++++--- .../development/web/nodejs/no-arch-flag.patch | 21 +++++++++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/web/nodejs/no-arch-flag.patch diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 9f48627e392..19785753b2d 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, python, zlib, v8 }: +{ stdenv, fetchurl, openssl, python, zlib, v8, darwinInstallNameToolUtility }: stdenv.mkDerivation rec { version = "0.6.10"; @@ -17,11 +17,17 @@ stdenv.mkDerivation rec { "--shared-v8-libpath=${v8}/lib" ]; - patchPhase = '' + patches = stdenv.lib.optional stdenv.isDarwin ./no-arch-flag.patch; + + prePatch = '' sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf} ''; - buildInputs = [ python openssl v8 zlib]; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -change libv8.dylib ${v8}/lib/libv8.dylib $out/bin/node + ''; + + buildInputs = [ python openssl v8 zlib ] ++ stdenv.lib.optional stdenv.isDarwin darwinInstallNameToolUtility; meta = with stdenv.lib; { description = "Event-driven I/O framework for the V8 JavaScript engine"; diff --git a/pkgs/development/web/nodejs/no-arch-flag.patch b/pkgs/development/web/nodejs/no-arch-flag.patch new file mode 100644 index 00000000000..bbe96c0c552 --- /dev/null +++ b/pkgs/development/web/nodejs/no-arch-flag.patch @@ -0,0 +1,21 @@ +diff -Naur node-v0.6.10-orig/wscript node-v0.6.10/wscript +--- node-v0.6.10-orig/wscript 2012-02-02 19:56:42.000000000 -0500 ++++ node-v0.6.10/wscript 2012-02-25 14:18:50.000000000 -0500 +@@ -443,17 +443,6 @@ + if sys.platform.startswith("darwin"): + # used by platform_darwin_*.cc + conf.env.append_value('LINKFLAGS', ['-framework','Carbon']) +- # cross compile for architecture specified by DEST_CPU +- if 'DEST_CPU' in conf.env: +- arch = conf.env['DEST_CPU'] +- # map supported_archs to GCC names: +- arch_mappings = {'ia32': 'i386', 'x64': 'x86_64'} +- if arch in arch_mappings: +- arch = arch_mappings[arch] +- flags = ['-arch', arch] +- conf.env.append_value('CCFLAGS', flags) +- conf.env.append_value('CXXFLAGS', flags) +- conf.env.append_value('LINKFLAGS', flags) + if 'DEST_CPU' in conf.env: + arch = conf.env['DEST_CPU'] + # TODO: -m32 is only available on 64 bit machines, so check host type