Author: viric
Date: Sun Dec 19 20:12:10 2010
New Revision: 25202
URL: https://svn.nixos.org/websvn/nix/?rev=25202&sc=1
Log:
Merging from trunk. The previous merge took the firefox 3.6 in a bad state.
Modified:
nixpkgs/branches/stdenv-updates/ (props changed)
nixpkgs/branches/stdenv-updates/pkgs/applications/graphics/xscreensaver/default.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/applications/misc/xneur/0.8.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/firefox/3.6.nix
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/applications/video/kmplayer/default.nix
nixpkgs/branches/stdenv-updates/pkgs/build-support/gcc-wrapper/ (props
changed)
nixpkgs/branches/stdenv-updates/pkgs/build-support/release/debian-build.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/build-support/release/nix-build.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/build-support/release/rpm-build.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/build-support/release/source-tarball.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.10.1.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.10.2.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.8.2.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.8.3.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/aterm/2.8.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/fltk/fltk11.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.9/
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/goocanvas/
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/pcre/default.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/readline/readline6.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/tools/documentation/haddock/haddock-2.1.0.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/autoconf/2.13.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/gnum4/default.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/misc/tex/pgf/1.x.nix (props changed)
nixpkgs/branches/stdenv-updates/pkgs/misc/tex/pgf/2.x.nix (props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/atheros/r3867.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.25.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.27.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.28.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.29.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.33.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/qemu-kvm/default.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/util-linux-ng/
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/servers/mail/dovecot/1.1.1.nix (props
changed)
nixpkgs/branches/stdenv-updates/pkgs/shells/bash/default.nix (props
changed)
nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh (props
changed)
nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/make-bootstrap-tools.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/tools/misc/memtest86/default.nix
nixpkgs/branches/stdenv-updates/pkgs/tools/networking/wget/default.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/disnix/disnixos/default.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/firefox/3.6.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/firefox/3.6.nix
Sun Dec 19 15:28:11 2010 (r25201)
+++
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/firefox/3.6.nix
Sun Dec 19 20:12:10 2010 (r25202)
@@ -111,10 +111,6 @@
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
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/video/kmplayer/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/applications/video/kmplayer/default.nix
Sun Dec 19 15:28:11 2010 (r25201)
+++
nixpkgs/branches/stdenv-updates/pkgs/applications/video/kmplayer/default.nix
Sun Dec 19 20:12:10 2010 (r25202)
@@ -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 ];
Modified: nixpkgs/branches/stdenv-updates/pkgs/tools/misc/memtest86/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/tools/misc/memtest86/default.nix
Sun Dec 19 15:28:11 2010 (r25201)
+++ nixpkgs/branches/stdenv-updates/pkgs/tools/misc/memtest86/default.nix
Sun Dec 19 20:12:10 2010 (r25202)
@@ -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 @@
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
Modified:
nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/disnix/disnixos/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/disnix/disnixos/default.nix
Sun Dec 19 15:28:11 2010 (r25201)
+++
nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/disnix/disnixos/default.nix
Sun Dec 19 20:12:10 2010 (r25202)
@@ -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;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
