diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-12-19 20:12:10 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-12-19 20:12:10 +0000 |
commit | 22253677b33c5e6afeb22975562bcf6269d742b6 (patch) | |
tree | 68b94ea944a9074a490fe9e95c760ff558f62630 | |
parent | cd6de2880faab0475af10898772d92dd79c89cf0 (diff) | |
download | nixlib-22253677b33c5e6afeb22975562bcf6269d742b6.tar nixlib-22253677b33c5e6afeb22975562bcf6269d742b6.tar.gz nixlib-22253677b33c5e6afeb22975562bcf6269d742b6.tar.bz2 nixlib-22253677b33c5e6afeb22975562bcf6269d742b6.tar.lz nixlib-22253677b33c5e6afeb22975562bcf6269d742b6.tar.xz nixlib-22253677b33c5e6afeb22975562bcf6269d742b6.tar.zst nixlib-22253677b33c5e6afeb22975562bcf6269d742b6.zip |
Merging from trunk. The previous merge took the firefox 3.6 in a bad state.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25202
-rw-r--r-- | pkgs/applications/networking/browsers/firefox/3.6.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/kmplayer/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/memtest86/default.nix | 13 | ||||
-rw-r--r-- | pkgs/tools/package-management/disnix/disnixos/default.nix | 4 |
4 files changed, 10 insertions, 17 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/3.6.nix b/pkgs/applications/networking/browsers/firefox/3.6.nix index 1aa9ba437d76..f119f301dbb7 100644 --- a/pkgs/applications/networking/browsers/firefox/3.6.nix +++ b/pkgs/applications/networking/browsers/firefox/3.6.nix @@ -111,10 +111,6 @@ rec { inherit src; - # To be removed when the change gets upstream. I don't know if the patch - # affects xulrunner or firefox. - patches = [ ./symlinks-bug551152.patch ]; - buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix index a665670d9c98..a762bed0e28c 100644 --- a/pkgs/applications/video/kmplayer/default.nix +++ b/pkgs/applications/video/kmplayer/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, lib, cmake, qt4, perl, gettext, pango, gtk, dbus_glib, kdelibs, automoc4, phonon}: stdenv.mkDerivation { - name = "kmplayer-0.11.2b"; + name = "kmplayer-0.11.2c"; src = fetchurl { - url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.2b.tar.bz2; - sha256 = "00a1pw31p849cbgskyfi8jni9ar6yi2ivr625vza2za6apdxvkr7"; + url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.2c.tar.bz2; + sha256 = "1qhafq865bzpz6m9k7cjdv4884qfpn481ak77ly0nidpq2ab0l9m"; }; builder = ./builder.sh; buildInputs = [ cmake qt4 perl gettext stdenv.gcc.libc pango gtk dbus_glib kdelibs automoc4 phonon ]; diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix index 5df5fd31382b..480a29c63c95 100644 --- a/pkgs/tools/misc/memtest86/default.nix +++ b/pkgs/tools/misc/memtest86/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation { - name = "memtest86+-4.00"; + name = "memtest86+-4.10"; src = fetchurl { - url = http://www.memtest.org/download/4.00/memtest86+-4.00.tar.gz; - sha256 = "193chqvwmcxsrvpcfy3mbz1vakvpfhxvjmawzidp26x8kma2zi3f"; + url = http://www.memtest.org/download/4.10/memtest86+-4.10.tar.gz; + sha256 = "0kxa2m7vfcm543wp53fv16sjjf5p12mzdz5rm87mrrr6hw43a6gq"; }; preBuild = '' @@ -17,10 +17,7 @@ stdenv.mkDerivation { fi ''; - # Override the default optimisation setting (`-Os') to prevent lots - # of spurious errors. See - # https://bugs.launchpad.net/fedora/+source/memtest86+/+bug/246412. - NIX_CFLAGS_COMPILE = "-O1 -I."; + NIX_CFLAGS_COMPILE = "-I."; installPhase = '' ensureDir $out diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 5572ffe67975..317a47e0783e 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -3,8 +3,8 @@ stdenv.mkDerivation { name = "disnixos"; src = fetchurl { - url = http://hydra.nixos.org/build/811135/download/1/disnixos-0.1pre25150.tar.gz; - sha256 = "004i4k0c9lfvfmmv5iqwnqk3h2lip166dp8vpn3k3mvmpl17cn3j"; + url = http://hydra.nixos.org/build/812999/download/1/disnixos-0.1pre25200.tar.gz; + sha256 = "1cw0wg5x65nanrjfj67nk1jxngaqh2l7msx03s536hssm9g2mv7r"; }; buildInputs = [ socat pkgconfig disnix ]; dontStrip = true; |