From 7f871719d57fbb7460b658c1732a810b50238a0d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 1 Oct 2012 11:48:41 -0400 Subject: [PATCH 01/23] Add template-haskell haskellPackage --- .../libraries/haskell/template-haskell/default.nix | 11 +++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/development/libraries/haskell/template-haskell/default.nix diff --git a/pkgs/development/libraries/haskell/template-haskell/default.nix b/pkgs/development/libraries/haskell/template-haskell/default.nix new file mode 100644 index 000000000000..93d9d2e53e1e --- /dev/null +++ b/pkgs/development/libraries/haskell/template-haskell/default.nix @@ -0,0 +1,11 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "template-haskell"; + version = "2.8.0.0"; + sha256 = "1c75f7d0zhdh84za42dk0qkh9s9v29s4zzfy7aincq4dwjaa3rpc"; + meta = { + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7be018fbeb8f..6fb0271a6aea 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1492,6 +1492,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); tagstreamConduit = callPackage ../development/libraries/haskell/tagstream-conduit {}; + templateHaskell = callPackage ../development/libraries/haskell/template-haskell {}; + temporary = callPackage ../development/libraries/haskell/temporary {}; Tensor = callPackage ../development/libraries/haskell/Tensor {}; From c073071e13d7fa1f6931c20a5668d6e9ff161eed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Mon, 1 Oct 2012 22:26:51 +0200 Subject: [PATCH 02/23] Patch JACK to be compatible with the 2.1.0 release of ffado --- pkgs/misc/jackaudio/default.nix | 2 + .../jackaudio/ffado_setbuffsize-jack2.patch | 140 ++++++++++++++++++ 2 files changed, 142 insertions(+) create mode 100644 pkgs/misc/jackaudio/ffado_setbuffsize-jack2.patch diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 7447421fc949..363d2308d0b3 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { pkgconfig python pythonDBus ] ++ (stdenv.lib.optional firewireSupport ffado); + patches = ./ffado_setbuffsize-jack2.patch; + configurePhase = '' cd jack-1.9.8 python waf configure --prefix=$out --dbus --alsa ${if firewireSupport then "--firewire" else ""} diff --git a/pkgs/misc/jackaudio/ffado_setbuffsize-jack2.patch b/pkgs/misc/jackaudio/ffado_setbuffsize-jack2.patch new file mode 100644 index 000000000000..7771639280d8 --- /dev/null +++ b/pkgs/misc/jackaudio/ffado_setbuffsize-jack2.patch @@ -0,0 +1,140 @@ +https://projects.archlinux.org/svntogit/community.git/tree/trunk?h=packages/jack2 + +From 96e0251234a29a1360c05d5d7dc98b83436b8183 Mon Sep 17 00:00:00 2001 +From: Adrian Knoth +Date: Sat, 17 Mar 2012 22:36:30 +0100 +Subject: [PATCH] [firewire] Allow FFADO backend to change the buffer size + +This is a port of Jonathan Woithe's patch from jackd1. +With sufficiently recent versions of FFADO, it allows to change +the buffersize at runtime. +--- + linux/firewire/JackFFADODriver.cpp | 65 ++++++++++++++++++++++++++++++++---- + linux/firewire/JackFFADODriver.h | 6 ++++ + 2 files changed, 65 insertions(+), 6 deletions(-) + +diff --git a/jack-1.9.8/linux/firewire/JackFFADODriver.cpp b/jack-1.9.8/linux/firewire/JackFFADODriver.cpp +index b33e1cd..085b78a 100644 +--- a/jack-1.9.8/linux/firewire/JackFFADODriver.cpp ++++ b/jack-1.9.8/linux/firewire/JackFFADODriver.cpp +@@ -3,6 +3,7 @@ + Copyright (C) 2004 Grame + Copyright (C) 2007 Pieter Palmers + Copyright (C) 2009 Devin Anderson ++Copyright (C) 2012 Jonathan Woithe, Adrian Knoth + + 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 +@@ -48,7 +49,10 @@ + namespace Jack + { + ++// Basic functionality requires API version 8. If version 9 or later ++// is present the buffers can be resized at runtime. + #define FIREWIRE_REQUIRED_FFADO_API_VERSION 8 ++#define FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE 9 + + #define jack_get_microseconds GetMicroSeconds + +@@ -281,19 +285,68 @@ + int + JackFFADODriver::SetBufferSize (jack_nframes_t nframes) + { +- printError("Buffer size change requested but not supported!!!"); ++ ffado_driver_t* driver = (ffado_driver_t*)fDriver; ++ signed int chn; ++ ++ // The speed of this function isn't critical; we can afford the ++ // time to check the FFADO API version. ++ if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE || ++ ffado_streaming_set_period_size == NULL) { ++ printError("unsupported on current version of FFADO; please upgrade FFADO"); ++ return -1; ++ } + +- /* + driver->period_size = nframes; + driver->period_usecs = + (jack_time_t) floor ((((float) nframes) / driver->sample_rate) + * 1000000.0f); +- */ ++ ++ ++ // Reallocate the null and scratch buffers. ++ driver->nullbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t)); ++ if(driver->nullbuffer == NULL) { ++ printError("could not allocate memory for null buffer"); ++ return -1; ++ } ++ driver->scratchbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t)); ++ if(driver->scratchbuffer == NULL) { ++ printError("could not allocate memory for scratch buffer"); ++ return -1; ++ } ++ ++ // MIDI buffers need reallocating ++ for (chn = 0; chn < driver->capture_nchannels; chn++) { ++ if(driver->capture_channels[chn].stream_type == ffado_stream_type_midi) { ++ // setup the midi buffer ++ if (driver->capture_channels[chn].midi_buffer != NULL) ++ free(driver->capture_channels[chn].midi_buffer); ++ driver->capture_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t)); ++ } ++ } ++ for (chn = 0; chn < driver->playback_nchannels; chn++) { ++ if(driver->playback_channels[chn].stream_type == ffado_stream_type_midi) { ++ if (driver->playback_channels[chn].midi_buffer != NULL) ++ free(driver->playback_channels[chn].midi_buffer); ++ driver->playback_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t)); ++ } ++ } ++ ++ // Notify FFADO of the period size change ++ if (ffado_streaming_set_period_size(driver->dev, nframes) != 0) { ++ printError("could not alter FFADO device period size"); ++ return -1; ++ } ++ ++ // This is needed to give the shadow variables a chance to ++ // properly update to the changes. ++ sleep(1); + + /* tell the engine to change its buffer size */ +- //driver->engine->set_buffer_size (driver->engine, nframes); ++ JackAudioDriver::SetBufferSize(nframes); // Generic change, never fails + +- return -1; // unsupported ++ UpdateLatencies(); ++ ++ return 0; + } + + typedef void (*JackDriverFinishFunction) (jack_driver_t *); +@@ -306,7 +359,7 @@ + + assert(params); + +- if (ffado_get_api_version() != FIREWIRE_REQUIRED_FFADO_API_VERSION) { ++ if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION) { + printError("Incompatible libffado version! (%s)", ffado_get_version()); + return NULL; + } +diff --git a/jack-1.9.8/linux/firewire/JackFFADODriver.h b/jack-1.9.8/linux/firewire/JackFFADODriver.h +index cb2a45d..790f4dd 100644 +--- a/jack-1.9.8/linux/firewire/JackFFADODriver.h ++++ b/jack-1.9.8/linux/firewire/JackFFADODriver.h +@@ -82,6 +82,12 @@ class JackFFADODriver : public JackAudioDriver + int Read(); + int Write(); + ++ // BufferSize can be changed ++ bool IsFixedBufferSize() ++ { ++ return false; ++ } ++ + int SetBufferSize(jack_nframes_t nframes); + }; + +-- +1.7.10 From 21271fee8d46b9ea926fab659e7a323568ed68ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Tue, 2 Oct 2012 01:00:13 +0200 Subject: [PATCH 03/23] Add the LV2 version of the SWH audio plugins (used for audio production) --- pkgs/applications/audio/swh-lv2/default.nix | 39 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/audio/swh-lv2/default.nix diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/applications/audio/swh-lv2/default.nix new file mode 100644 index 000000000000..9b18ab31abf4 --- /dev/null +++ b/pkgs/applications/audio/swh-lv2/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchgit, fftwSinglePrec, libxslt, lv2, pkgconfig }: + +let + rev = "ec6b85e19e24ed"; +in +stdenv.mkDerivation rec { + name = "swh-lv2-${rev}"; + + src = fetchgit { + url = "git://github.com/swh/lv2.git"; + inherit rev; + sha256 = "d0d918ee642cd9649215737fcc008ce2bf55f4ea893a1897138b33775ea60d17"; + }; + + patchPhase = '' + sed -e "s#xsltproc#${libxslt}/bin/xsltproc#" -i Makefile + sed -e "s#PREFIX = /usr/local#PREFIX = $out#" -i Makefile + ''; + + buildInputs = [ fftwSinglePrec lv2 pkgconfig ]; + + installPhase = "make install-system"; + + meta = with stdenv.lib; { + homepage = http://plugin.org.uk; + description = "LV2 version of Steve Harris' SWH plugins"; + longDescription = '' + SWH plugins include: + amp, fast overdrive, overdrive (with colourisation), comb + filter, waveshaper, ringmod, divider, diode, decliper, pitch + scaler, 16 band equaliser, sinus wavewrapper, hermes filter, + chorus, flanger, decimater, oscillator, gverb, phasers, harmonic + generators, surround encoders and more. + ''; + license = licenses.gpl3; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0a0ae0cd26d..a00f8db14583 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7702,6 +7702,8 @@ let svk = perlPackages.SVK; + swh_lv2 = callPackage ../applications/audio/swh-lv2 { }; + sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { sslSupport = true; gpgSupport = true; From 91b26c0e42f035724335be5a1bad21124a21671d Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 1 Oct 2012 09:36:09 +0200 Subject: [PATCH 04/23] virtualbox: Update to 4.2.0. New major upstream version, changes can be found here: https://www.virtualbox.org/wiki/Changelog Signed-off-by: aszlig --- pkgs/applications/virtualization/virtualbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 56387f9e5c40..3af9796136fb 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -10,7 +10,7 @@ with stdenv.lib; let - version = "4.1.22"; + version = "4.2.0"; forEachModule = action: '' for mod in \ @@ -34,7 +34,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "7abb506203dd0d69b4b408fd999b5b9a479a9adce5f80e9b5569641c053dd153"; + sha256 = "895426ecac371bef4c070e8bcc9306f0c57dcbd6be25188d915b63ddde6f49e6"; }; buildInputs = From 240cd87eda3ff1f77a71eb4b56d304ff83f1da4d Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 1 Oct 2012 09:45:07 +0200 Subject: [PATCH 05/23] virtualbox-guest-additions: Update to 4.2.0. Tested with a bunch of charon VirtualBox machines. Signed-off-by: aszlig --- .../virtualization/virtualbox/guest-additions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index d903c44866c0..63939cc5e659 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper , libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}: -let version = "4.1.22"; in +let version = "4.2.0"; in stdenv.mkDerivation { name = "VirtualBox-GuestAdditions-${version}"; src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "5c7d9a4a31c8a926ba6dbae2b9704a561638e94ea0fc4f805a9231dd4f932d46"; + sha256 = "ef274ecdcb48adec469656959e51c8468b6d3a7733ddf93f9a3713f77f1604f3"; }; KERN_DIR = "${kernel}/lib/modules/*/build"; buildInputs = [ patchelf cdrkit makeWrapper ]; From 5908f6c28f3aa2a00fd559aa1911b0970cece402 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 1 Oct 2012 10:24:37 +0200 Subject: [PATCH 06/23] linuxconsoletools: New package, version 1.4.3. This is a small set of tools useful for testing and calibrating joysticks, gamepads and various other input devices. Signed-off-by: aszlig --- .../linux/consoletools/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/os-specific/linux/consoletools/default.nix diff --git a/pkgs/os-specific/linux/consoletools/default.nix b/pkgs/os-specific/linux/consoletools/default.nix new file mode 100644 index 000000000000..537cc386402b --- /dev/null +++ b/pkgs/os-specific/linux/consoletools/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchgit, SDL }: + +stdenv.mkDerivation rec { + name = "linuxconsoletools-${version}"; + version = "1.4.3"; + + src = fetchgit { + url = "git://linuxconsole.git.sourceforge.net/gitroot/linuxconsole/linuxconsole"; + rev = "dac2cae0e5795ddc27b76a92767dd9e07a10621e"; + sha256 = "350b008e614923dbd548fcaaf2842b39433acdcf595e2ce8aaf1599f076d331d"; + }; + + buildInputs = [ SDL ]; + makeFlags = [ "PREFIX=$(out)" ]; + + meta = { + homepage = "https://sourceforge.net/projects/linuxconsole/"; + description = "A set of tools for joysticks and serial peripherals"; + license = stdenv.lib.licenses.gpl2Plus; + + longDescription = '' + The included tools are: + + ffcfstress(1) - force-feedback stress test + ffmvforce(1) - force-feedback orientation test + ffset(1) - force-feedback configuration tool + fftest(1) - general force-feedback test + jstest(1) - joystick test + jscal(1) - joystick calibration tool + inputattach(1) - connects legacy serial devices to the input layer + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a00f8db14583..4f2bed5c4152 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5699,6 +5699,8 @@ let libnl = callPackage ../os-specific/linux/libnl { }; + linuxConsoleTools = callPackage ../os-specific/linux/consoletools { }; + linuxHeaders = callPackage ../os-specific/linux/kernel-headers { }; linuxHeaders33 = callPackage ../os-specific/linux/kernel-headers/3.3.5.nix { }; From cbaf071944c60135c883838b3657b3f597d7e6b5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 1 Oct 2012 20:41:08 +0200 Subject: [PATCH 07/23] youtube-dl: Update to version 2012.09.27. As the current version doesn't work anymore and there has been a lot of progress since February, I think it's time to switch over to the new versen. Signed-off-by: aszlig --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index a810001d0ccf..1fc5c08042cb 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchgit, python}: let pkgname = "youtube-dl"; - pkgver = "2012.02.27"; + pkgver = "2012.09.27"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchgit { url = "git://github.com/rg3/${pkgname}"; rev = "refs/tags/${pkgver}"; - sha256 = "17270ba14f42e8f2813bc6a0eb3674e51592eede69612e156e7d99a96fd147ce"; + sha256 = "a98f3339301324ddd6620f7b1353abed807cd8dea5586d6901d7fe69bc6a397c"; }; buildInputs = [python]; From 7e439ea13c91b9a5b156215f1bcce9c6798c8054 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 1 Oct 2012 21:16:02 +0200 Subject: [PATCH 08/23] i3: Update to version 4.3. Though upstream clearly recommends to not deactivate Pango, we currently can't use Pango right now, as we are stuck at cairo-1.10.2. This version only has experimental support for XCB which became stable in 1.12.x. So we need to wait for 21bf5ef509dcadebab10de0ba142d55776a961f1 to be merged into master before we can enable Pango. Signed-off-by: aszlig --- pkgs/applications/window-managers/i3/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 14fd6ce41931..042e1a323a6d 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -3,17 +3,21 @@ libXcursor, coreutils, perl }: stdenv.mkDerivation rec { - name = "i3-4.2"; + name = "i3-${version}"; + version = "4.3"; src = fetchurl { url = "http://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "e02c832820e8922a44e744e555294f8580c2f8e218c5c1029e52f1bde048732b"; + sha256 = "895bf586092535efb2bc723ba599c71a027768115e56052f111fc8bb148db925"; }; buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil bison xcbutilwm libstartup_notification libX11 pcre libev yajl flex libXcursor perl ]; - patchPhase = "patchShebangs ."; + patchPhase = '' + sed -i -e '/^# Pango/,/^$/d' common.mk + patchShebangs . + ''; configurePhase = "makeFlags=PREFIX=$out"; From 59a75fc985b25108ace27e644a0ae0d8bfcc9369 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 2 Oct 2012 03:38:45 +0200 Subject: [PATCH 09/23] Fix typo introduced by e6077fbc46. Already created a line note about that in the commit, but somehow it went unnoticed and most other typos introduced by that commit are already fixed by now. Signed-off-by: aszlig --- 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 4f2bed5c4152..90a6d8688114 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7909,7 +7909,7 @@ let ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin ); libs = - if config.browserNameenableQuakeLive or false + if config.browserName.enableQuakeLive or false then with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ] else [ ]; }; From d2df1ada2745d8a71044b468aed5b9932e5708f9 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 2 Oct 2012 03:42:39 +0200 Subject: [PATCH 10/23] chromium: Update channels to stable v22.0.1229.79. dev: 23.0.1271.10 beta: 22.0.1229.91 stable: 22.0.1229.79 The revert for SVN revision 151720 is now obsolete in the current beta release and is only needed for the stable version. So let's hope that >= 22.0.1229.91 will get stable soon. Signed-off-by: aszlig --- .../networking/browsers/chromium/default.nix | 4 ++-- .../networking/browsers/chromium/sources.nix | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 33f9283b47ad..59b05e94911f 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -86,7 +86,7 @@ let # XXX: this reverts r151720 to prevent http://crbug.com/143623 maybeRevertZlibChanges = let - below22 = versionOlder sourceInfo.version "22.0.0.0"; + below22_91 = versionOlder sourceInfo.version "22.0.1229.91"; patch = fetchurl { name = "revert-r151720"; url = "http://git.chromium.org/gitweb/?p=chromium.git;a=commitdiff_plain;" @@ -94,7 +94,7 @@ let + "h=0fabb4fda7059a8757422e8a44e70deeab28e698"; sha256 = "0n0d6mkg89g8q63cifapzpg9dxfs2n6xvk4k13szhymvf67b77pf"; }; - in optional (!below22) patch; + in optional (below22_91) patch; in stdenv.mkDerivation rec { name = "${packageName}-${version}"; diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index e4e72617bc42..9d2a78931027 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "23.0.1262.0"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1262.0.tar.bz2"; - sha256 = "19sqiv2vg9qy1kj6s12sq5aknvp3969yw26szwp54ipfv7lxqjh6"; + version = "23.0.1271.10"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.10.tar.bz2"; + sha256 = "1jm9fhnq978lfn21xripf7l2n362axinggnxlz7rcc9as1y086y3"; }; beta = { - version = "22.0.1229.56"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.56.tar.bz2"; - sha256 = "0wynq27yz1aslsnrjmf47dwbglblpfida2kmgv23l804mgdj19gv"; + version = "22.0.1229.91"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.91.tar.bz2"; + sha256 = "1b47rb5hw0k2fwc4jvmjpmxbhmqxgkz66j3mrjy4f8im41hmndyw"; }; stable = { - version = "21.0.1180.89"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.89.tar.bz2"; - sha256 = "1i9mjbjj3aywg03hd59m9j5gq5b5fl8nvw56g47q8s9k1bcsik0n"; + version = "22.0.1229.79"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.79.tar.bz2"; + sha256 = "0f7py2hd7fnx5z0xrg2vwf675xbg9xvamx79jjyzbpljh32b3jh6"; }; } From b63305721d39107c04ef9fa1e74f3eb8f32beb79 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 2 Oct 2012 08:49:33 +0200 Subject: [PATCH 11/23] gnum4: Disable tests for ARM. I can't get the `diversions' to pass on SheevaPlug. It builds fine otherwise. --- pkgs/development/tools/misc/gnum4/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 1f026f12f523..e603c398b026 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { doCheck = !stdenv.isDarwin && !stdenv.isCygwin # XXX: `test-dup2' fails on Cygwin - && !stdenv.isSunOS; # XXX: `test-setlocale2.sh' fails + && !stdenv.isSunOS # XXX: `test-setlocale2.sh' fails + && !stdenv.isArm; # XXX: `diversions' fails on SheevaPlug # Upstream is aware of it; it may be in the next release. patches = [ ./s_isdir.patch ./readlink-EINVAL.patch ]; From cf230cdddae861cac4197d8a655c1fc8112f6792 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 2 Oct 2012 08:50:42 +0200 Subject: [PATCH 12/23] sysfsutils: Use SourceForge mirror instead of static URL. --- pkgs/os-specific/linux/sysfsutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/sysfsutils/default.nix b/pkgs/os-specific/linux/sysfsutils/default.nix index cecb65f50a2f..bf6dafae10ac 100644 --- a/pkgs/os-specific/linux/sysfsutils/default.nix +++ b/pkgs/os-specific/linux/sysfsutils/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "sysfsutils-2.1.0"; src = fetchurl { - url = "http://kent.dl.sourceforge.net/sourceforge/linux-diag/${name}.tar.gz"; + url = "mirror://sourceforge/linux-diag/${name}.tar.gz"; sha256 = "e865de2c1f559fff0d3fc936e660c0efaf7afe662064f2fb97ccad1ec28d208a"; }; From 38161b6c64045b961e93ec8730e707c2ea2e7ca2 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 2 Oct 2012 08:51:51 +0200 Subject: [PATCH 13/23] dosfstools: Add alternative URL, since main site seems to be down. --- pkgs/tools/filesystems/dosfstools/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index 21e2ceea9dd8..b0ee47e23b56 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation rec { name = "dosfstools-3.0.11"; src = fetchurl { - url = "http://www.daniel-baumann.ch/software/dosfstools/${name}.tar.bz2"; + urls = [ + "http://www.daniel-baumann.ch/software/dosfstools/${name}.tar.bz2" + "http://pkgs.fedoraproject.org/repo/pkgs/dosfstools/${name}.tar.bz2/8d2211d5bd813164e20740e7c852aa06/${name}.tar.bz2" + ]; sha256 = "1a6rzjy82f6579ywaln33g1wc7k8gbgjdss9q2q8daplac7pmcll"; }; From dad7ea5a7e57666dfe5716317860a85877e31250 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Oct 2012 11:18:59 +0400 Subject: [PATCH 14/23] Fix timidity source url --- pkgs/tools/misc/timidity/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index 4fae21250cac..89ff6f4677fc 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -7,7 +7,7 @@ composableDerivation.composableDerivation {} { name = "timidity-2.13.0"; src = fetchurl { - url = http://ovh.dl.sourceforge.net/sourceforge/timidity/TiMidity++-2.13.0.tar.bz2; + url = mirror://sourceforge/timidity/TiMidity++-2.13.0.tar.bz2; sha256 = "1jbmk0m375fh5nj2awqzns7pdjbi7dxpjdwcix04zipfcilppbmf"; }; From 3c572df9001e5697ddf4b0da400d6ffe974b1508 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Oct 2012 11:09:28 -0400 Subject: [PATCH 15/23] alsa-utils: Fix the path to alsactl in the udev rule --- pkgs/os-specific/linux/alsa-utils/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 7e4a97a1ab1a..ebaef323491e 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -16,6 +16,12 @@ stdenv.mkDerivation rec { installFlags = "ASOUND_STATE_DIR=$(TMPDIR)/dummy"; + preConfigure = + '' + # Ensure that ‘90-alsa-restore.rules.in’ gets rebuilt. + rm alsactl/90-alsa-restore.rules + ''; + meta = { description = "ALSA, the Advanced Linux Sound Architecture utils"; From f75dddde80a410fbe8f56d85bfe87c86bf9654a0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Oct 2012 11:45:54 -0400 Subject: [PATCH 16/23] apache-httpd: Update to 2.2.23 Fixes CVE-2012-0883, CVE-2012-2687. --- pkgs/servers/http/apache-httpd/2.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix index f2a21ee28be2..d4def35c09f1 100644 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ b/pkgs/servers/http/apache-httpd/2.2.nix @@ -12,12 +12,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert mpm == "prefork" || mpm == "worker" || mpm == "event"; stdenv.mkDerivation rec { - version = "2.2.22"; + version = "2.2.23"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha1 = "766cd0843050a8dfb781e48b976f3ba6ebcf8696"; + sha1 = "2776145201068045d4ed83157a0e2e1c28c4c453"; }; buildInputs = [perl apr aprutil pcre] ++ From 3cf0b00b5a9d409a622ee5b9b04ed065910c043a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Oct 2012 11:48:54 -0400 Subject: [PATCH 17/23] bind: Update to 9.7.6-P3 Fixes CVE-2012-4244. --- pkgs/servers/dns/bind/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index cdd8704739b6..2e1af8a2cbc3 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchurl, openssl, libtool, perl, libxml2 }: -let - version = "9.7.6-P1"; -in +let version = "9.7.6-P3"; in + stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "1xp7c3fpi3b6y1bz77mf7c98ic7rxp5lpwlmzqwsdrllip33qw1k"; + sha256 = "0xx23dcy9rbky8ar89pg3s07njqy7667sfrnbqc334pvd2qxanjx"; }; patchPhase = '' @@ -21,7 +20,7 @@ stdenv.mkDerivation rec { /* Why --with-libtool? */ configureFlags = [ "--with-libtool" "--with-openssl=${openssl}" "--localstatedir=/var" ]; - + meta = { homepage = http://www.isc.org/software/bind; description = "ISC BIND: a domain name server"; From 9bc8e1250bc1b6f74962e1ea0e43cb0b439ec63d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Oct 2012 11:52:37 -0400 Subject: [PATCH 18/23] xinetd: Update to 2.3.15 Fixes CVE-2012-0862. --- pkgs/servers/xinetd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/servers/xinetd/default.nix index 6f752a7194fe..c841f8431deb 100644 --- a/pkgs/servers/xinetd/default.nix +++ b/pkgs/servers/xinetd/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "xinetd-2.3.14"; - + name = "xinetd-2.3.15"; + src = fetchurl { url = "http://www.xinetd.org/${name}.tar.gz"; - sha256 = "07xws1ydxrrx4xinvfqkc66diwfjh2apxz33xw4hb6k0gihhw3kn"; + sha256 = "1qsv1al506x33gh92bqa8w21k7mxqrbsrwmxvkj0amn72420ckmz"; }; meta = { From 7dd3236c81b08ae01e9aec65038292f18460bf65 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Oct 2012 12:34:38 -0400 Subject: [PATCH 19/23] git: Update to 1.7.12.2 --- .../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 916aa69b05fd..4481a1f83219 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -9,7 +9,7 @@ let - version = "1.7.12.1"; + version = "1.7.12.2"; svn = subversionClient.override { perlBindings = true; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; - sha256 = "a0c2b7e122ac2e40fe5b69baeeaac24b237a1341f08ba848cadaa835a0dbcfcd"; + sha1 = "277b759139ddb62c6935da37de8a483e2c234a97"; }; patches = [ ./docbook2texi.patch ]; From 63a72d462583df76377e85666bddb31d3fb6b0c2 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Wed, 3 Oct 2012 11:19:27 +0200 Subject: [PATCH 20/23] Update flashplayer to 11.2.202.238 since 11.1.102.55 is no longer available. --- .../mozilla-plugins/flashplayer-11/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 260edd360c65..5feb1747e827 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -40,11 +40,11 @@ let # no plans to provide a x86_64 version: # http://labs.adobe.com/technologies/flashplayer10/faq.html throw "no x86_64 debugging version available" - else { + else rec { # -> http://labs.adobe.com/downloads/flashplayer10.html - version = "11.1.102.55"; - url = http://fpdownload.macromedia.com/get/flashplayer/pdc/11.1.102.55/install_flash_player_11_linux.x86_64.tar.gz; - sha256 = "09swldv174z23pnixy9fxkw084qkl3bbrxfpf159fbjdgvwihn1l"; + version = "11.2.202.238"; + url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; + sha256 = "07d09xjnn2hm877psmv9a6c4cfighxw24p0apq2ykawnrjpjc6zn"; } else if stdenv.system == "i686-linux" then if debug then { @@ -52,10 +52,10 @@ let version = "11.1"; url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz; sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk"; - } else { - version = "11.1.102.55"; - url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/11.1.102.55/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "08zdnl06lqyk2k3yq4lgphqd3ci2267448mghlv1p0hjrdq253k7"; + } else rec { + version = "11.2.202.238"; + url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; + sha256 = "0p05pr4vmc4536axjyljhxhqizq4ihslar8g638dj24251byp7ca"; } else throw "Flash Player is not supported on this platform"; From bc829a1050e13c6df2cde3988bb847773bb4577e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 3 Oct 2012 07:46:58 -0400 Subject: [PATCH 21/23] Revert "Add template-haskell haskellPackage" This reverts commit 7f871719d57fbb7460b658c1732a810b50238a0d. Apparently, GHC comes with template-haskell, so there's no point in installing it separately. --- .../libraries/haskell/template-haskell/default.nix | 11 ----------- pkgs/top-level/haskell-packages.nix | 2 -- 2 files changed, 13 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/template-haskell/default.nix diff --git a/pkgs/development/libraries/haskell/template-haskell/default.nix b/pkgs/development/libraries/haskell/template-haskell/default.nix deleted file mode 100644 index 93d9d2e53e1e..000000000000 --- a/pkgs/development/libraries/haskell/template-haskell/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "template-haskell"; - version = "2.8.0.0"; - sha256 = "1c75f7d0zhdh84za42dk0qkh9s9v29s4zzfy7aincq4dwjaa3rpc"; - meta = { - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6fb0271a6aea..7be018fbeb8f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1492,8 +1492,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); tagstreamConduit = callPackage ../development/libraries/haskell/tagstream-conduit {}; - templateHaskell = callPackage ../development/libraries/haskell/template-haskell {}; - temporary = callPackage ../development/libraries/haskell/temporary {}; Tensor = callPackage ../development/libraries/haskell/Tensor {}; From 114dc080266584f07c3e7ee21191002b0b555bd6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 3 Oct 2012 11:35:30 -0400 Subject: [PATCH 22/23] openjpeg: Update to 1.5.1 Fixes CVE-2012-3535, CVE-2012-3358. --- pkgs/development/libraries/openjpeg/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index 575d580faf65..6024456652c6 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "openjpeg-1.5.1"; -stdenv.mkDerivation { - name = "openjpeg-1.5.0"; - src = fetchurl { - url = http://openjpeg.googlecode.com/files/openjpeg-1.5.0.tar.gz; - sha256 = "1kja6s9dk0hh7p9064kg69y6vninwyvpqi8cap92waj38jmqz469"; + url = "http://openjpeg.googlecode.com/files/${name}.tar.gz"; + sha256 = "13dbyf3jwr4h2dn1k11zph3jgx17z7d66xmi640mbsf8l6bk1yvc"; }; meta = { From f9714ace11b2417d61ce068c3fb1a69c3725ab8c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 3 Oct 2012 14:06:53 -0400 Subject: [PATCH 23/23] boehm-gc: Update to 7.2d --- .../libraries/boehm-gc/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 0ad643d9ac41..3b2670d988ae 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -1,15 +1,20 @@ { stdenv, fetchurl }: -stdenv.mkDerivation (rec { - name = "boehm-gc-7.2alpha6"; +stdenv.mkDerivation rec { + name = "boehm-gc-7.2d"; src = fetchurl { - url = "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.2alpha6.tar.gz"; - sha256 = "05jwadjbrv8pr7z9cb4miskicxqpxm0pca4h2rg5cgbpajr2bx7b"; + url = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.2d.tar.gz; + sha256 = "0phwa5driahnpn79zqff14w9yc8sn3599cxz91m78hqdcpl0mznr"; }; + configureFlags = "--enable-cplusplus"; + doCheck = true; + # Don't run the native `strip' when cross-compiling. + dontStrip = stdenv ? cross; + meta = { description = "The Boehm-Demers-Weiser conservative garbage collector for C and C++"; @@ -39,10 +44,3 @@ stdenv.mkDerivation (rec { platforms = stdenv.lib.platforms.all; }; } - -// - -# Don't run the native `strip' when cross-compiling. -(if (stdenv ? cross) - then { dontStrip = true; } - else { }))