Author: simons
Date: Thu Oct 6 13:16:47 2011
New Revision: 29696
URL: https://nixos.org/websvn/nix/?rev=29696&sc=1
Log:
synchronize with trunk
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/7.0.nix
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/icecat-4/
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/
(props changed)
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/desktops/gnome-2.28/default.nix
nixpkgs/branches/stdenv-updates/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix
nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.5/support/shared-desktop-ontologies/
(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/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-headers/default.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/mdadm/default.nix
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/nvidia-x11/default.nix
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/filesystems/btrfsprogs/default.nix
nixpkgs/branches/stdenv-updates/pkgs/tools/networking/wget/default.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/firefox/7.0.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/firefox/7.0.nix
Thu Oct 6 13:15:09 2011 (r29695)
+++
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/firefox/7.0.nix
Thu Oct 6 13:16:47 2011 (r29696)
@@ -15,14 +15,14 @@
rec {
- firefoxVersion = "7.0";
+ firefoxVersion = "7.0.1";
- xulVersion = "7.0"; # this attribute is used by other packages
+ xulVersion = "7.0.1"; # this attribute is used by other packages
src = fetchurl {
url =
"http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";;
- sha256 = "1fpadlsdc8d739cz52dicn68v2ilv044hxivilgy9jnrazznrm42";
+ sha1 = "94bbc7152832371dc0be82f411730df043c5c6ac";
};
commonConfigureFlags =
Modified: nixpkgs/branches/stdenv-updates/pkgs/desktops/gnome-2.28/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/desktops/gnome-2.28/default.nix
Thu Oct 6 13:15:09 2011 (r29695)
+++ nixpkgs/branches/stdenv-updates/pkgs/desktops/gnome-2.28/default.nix
Thu Oct 6 13:16:47 2011 (r29696)
@@ -182,7 +182,7 @@
#### DESKTOP
gnome_keyring = import ./desktop/gnome-keyring {
- inherit (pkgs) stdenv fetchurl pkgconfig dbus libgcrypt libtasn1 pam hal
python;
+ inherit (pkgs) stdenv fetchurl pkgconfig dbus libgcrypt libtasn1 pam
python;
inherit (pkgs.gtkLibs) glib gtk;
inherit intltool GConf;
};
Modified:
nixpkgs/branches/stdenv-updates/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix
Thu Oct 6 13:15:09 2011 (r29695)
+++
nixpkgs/branches/stdenv-updates/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix
Thu Oct 6 13:16:47 2011 (r29696)
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, hal, python,
glib, gtk, intltool, GConf}:
+{stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib,
gtk, intltool, GConf}:
stdenv.mkDerivation {
name = "gnome-keyring-2.28.0";
@@ -8,7 +8,7 @@
sha256 = "1d6av3cq32ypq9f9mv7f9bcqkkdqgbvbb831kad62smczvqk8chv";
};
- buildInputs = [ pkgconfig dbus.libs libgcrypt pam hal python gtk intltool
GConf ];
+ buildInputs = [ pkgconfig dbus.libs libgcrypt pam python gtk intltool GConf
];
propagatedBuildInputs = [ glib libtasn1 ];
}
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/mdadm/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/mdadm/default.nix
Thu Oct 6 13:15:09 2011 (r29695)
+++ nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/mdadm/default.nix
Thu Oct 6 13:16:47 2011 (r29696)
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
name = "mdadm-3.1.2";
-
+
src = fetchurl {
url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.bz2";
sha256 = "0s2d2a01j8cizxqvbgd0sn5bpa1j46q8976078b3jq1q7i1ir0zz";
@@ -13,7 +13,7 @@
buildNativeInputs = [ groff ];
- preConfigure = "sed -e 's@/lib/udev@\${out}/lib/udev@' -i Makefile";
+ preConfigure = "sed -e 's@/lib/udev@\${out}/lib/udev@' -e 's@ -Werror @ @'
-i Makefile";
# Force mdadm to use /var/run/mdadm.map for its map file (or
# /dev/.mdadm/map as a fallback).
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/nvidia-x11/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/nvidia-x11/default.nix
Thu Oct 6 13:15:09 2011 (r29695)
+++
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/nvidia-x11/default.nix
Thu Oct 6 13:16:47 2011 (r29696)
@@ -7,7 +7,7 @@
with stdenv.lib;
-let versionNumber = "280.13"; in
+let versionNumber = "285.05.09"; in
stdenv.mkDerivation {
name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly)
"-${kernel.version}"}";
@@ -18,12 +18,12 @@
if stdenv.system == "i686-linux" then
fetchurl {
url =
"http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";;
- sha256 = "16xcidshamxvc80sdnkph5rpgf72m5zz4x155amg2433kkhsy8mj";
+ sha256 = "15kgsfpv0jigm1v3vnhcagni694lqm55kqysslmvb090nsczl0yf";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
url =
"http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";;
- sha256 = "14x80qirwlfxhphzqvi92lpgs82qnzb7hq0vd02rkbwvvnkhgdxd";
+ sha256 = "1zkgsjkhbx6dfmhhbflghbysr3icwfb5p6210xnhfss5dp2cvbwl";
}
else throw "nvidia-x11 does not support platform ${stdenv.system}";
Modified:
nixpkgs/branches/stdenv-updates/pkgs/tools/filesystems/btrfsprogs/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/tools/filesystems/btrfsprogs/default.nix
Thu Oct 6 13:15:09 2011 (r29695)
+++
nixpkgs/branches/stdenv-updates/pkgs/tools/filesystems/btrfsprogs/default.nix
Thu Oct 6 13:16:47 2011 (r29696)
@@ -1,10 +1,10 @@
-a :
-let
+a :
+let
fetchurl = a.fetchurl;
- version = a.lib.attrByPath ["version"] "0.19" a;
+ version = a.lib.attrByPath ["version"] "0.19" a;
buildInputs = with a; [
- zlib libuuid acl
+ zlib libuuid acl
];
in
@@ -18,13 +18,13 @@
inherit buildInputs;
configureFlags = [];
- makeFlags = ["prefix=$out"];
+ makeFlags = ["prefix=$out CFLAGS=-Os"];
patches = [ ./glibc212.patch ];
phaseNames = ["doPatch" "doEnsureBtrfsImage" "doMakeInstall"];
-
+
doEnsureBtrfsImage = a.fullDepEntry (''
- if ! grep 'progs = ' Makefile | grep btrfs-image; then
+ if ! grep 'progs = ' Makefile | grep btrfs-image; then
sed -e 's/progs = .*/& btrfs-image/' -i Makefile
fi
'') ["minInit" "doUnpack"];
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Thu Oct
6 13:15:09 2011 (r29695)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Thu Oct
6 13:16:47 2011 (r29696)
@@ -4213,6 +4213,7 @@
neon029 = callPackage ../development/libraries/neon/0.29.nix {
compressionSupport = true;
sslSupport = true;
+ openssl = opensslNew;
};
nethack = builderDefsPackage (import ../games/nethack) {
@@ -5980,7 +5981,7 @@
tunctl = true; mconsole = true;
};
- untie = callPackage ../os-specific/linux/untie {};
+ untie = callPackage ../os-specific/linux/untie { };
upower = callPackage ../os-specific/linux/upower {
dbus_glib = pkgs.dbus_glib_0_94;
@@ -6324,7 +6325,7 @@
patchelf = patchelf06;
};
- chromeWrapper = wrapFirefox chrome "chrome" "";
+ chromeWrapper = wrapFirefox { browser = chrome; browserName = "chrome";
desktopName = "Chrome"; };
cinelerra = callPackage ../applications/video/cinelerra {
inherit (gnome) esound;
@@ -6576,37 +6577,37 @@
firefox = pkgs.firefoxPkgs.firefox;
- firefoxWrapper = wrapFirefox pkgs.firefox "firefox" "";
+ firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };
- firefoxPkgs = pkgs.firefox60Pkgs;
+ firefoxPkgs = pkgs.firefox70Pkgs;
firefox36Pkgs = callPackage
../applications/networking/browsers/firefox/3.6.nix {
inherit (gtkLibs) gtk pango;
inherit (gnome) libIDL;
};
- firefox36Wrapper = wrapFirefox firefox36Pkgs.firefox "firefox" "";
+ firefox36Wrapper = wrapFirefox { browser = firefox36Pkgs.firefox; };
firefox50Pkgs = callPackage
../applications/networking/browsers/firefox/5.0.nix {
inherit (gtkLibs) gtk pango;
inherit (gnome) libIDL;
};
- firefox50Wrapper = wrapFirefox firefox50Pkgs.firefox "firefox" "";
+ firefox50Wrapper = wrapFirefox { browser = firefox50Pkgs.firefox; };
firefox60Pkgs = callPackage
../applications/networking/browsers/firefox/6.0.nix {
inherit (gtkLibs) gtk pango;
inherit (gnome) libIDL;
};
- firefox60Wrapper = wrapFirefox firefox60Pkgs.firefox "firefox" "";
+ firefox60Wrapper = wrapFirefox { browser = firefox60Pkgs.firefox; };
firefox70Pkgs = callPackage
../applications/networking/browsers/firefox/7.0.nix {
inherit (gtkLibs) gtk pango;
inherit (gnome) libIDL;
};
- firefox70Wrapper = lowPrio (wrapFirefox firefox70Pkgs.firefox "firefox" "");
+ firefox70Wrapper = wrapFirefox { browser = firefox70Pkgs.firefox; };
firefox80bPkgs = callPackage
../applications/networking/browsers/firefox/8.0.nix {
inherit (gtkLibs) gtk pango;
@@ -6808,7 +6809,7 @@
[ icecat3 icecatXulrunner3 ])
// { inherit (icecat3) gtk isFirefox3Like meta; };
- icecat3Wrapper = wrapFirefox icecat3Xul "icecat" "";
+ icecat3Wrapper = wrapFirefox { browser = icecat3Xul; browserName = "icecat";
desktopName = "IceCat"; };
icecat4 = lowPrio (import ../applications/networking/browsers/icecat-4 {
inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo
@@ -6834,7 +6835,7 @@
[ icecat4 icecatXulrunner4 ])
// { inherit (icecat4) gtk meta; };
- icecat4Wrapper = wrapFirefox icecat4Xul "icecat" "";
+ icecat4Wrapper = wrapFirefox { browser = icecat4Xul; browserName = "icecat";
desktopName = "IceCat"; };
icewm = callPackage ../applications/window-managers/icewm {
inherit (gtkLibs) gtk;
@@ -7476,26 +7477,28 @@
wordnet = callPackage ../applications/misc/wordnet { };
- wrapFirefox = browser: browserName: nameSuffix: import
../applications/networking/browsers/firefox/wrapper.nix {
- inherit stdenv nameSuffix makeWrapper makeDesktopItem browser browserName;
- plugins =
- let
- enableAdobeFlash = getConfig [ browserName "enableAdobeFlash" ] true;
- enableGnash = getConfig [ browserName "enableGnash" ] false;
- in
- assert !(enableGnash && enableAdobeFlash);
- ([ ]
- ++ lib.optional enableGnash gnash
- ++ lib.optional enableAdobeFlash flashplayer
- # RealPlayer is disabled by default for legal reasons.
- ++ lib.optional (system != "i686-linux" && getConfig [browserName
"enableRealPlayer"] false) RealPlayer
- ++ lib.optional (getConfig [browserName "enableDjvu"] false) (djview4)
- ++ lib.optional (getConfig [browserName "enableMPlayer"] false)
(MPlayerPlugin browser)
- ++ lib.optional (getConfig [browserName "enableGeckoMediaPlayer"]
false) gecko_mediaplayer
- ++ lib.optional (supportsJDK && getConfig [browserName "jre"] false &&
jrePlugin ? mozillaPlugin) jrePlugin
- ++ lib.optional (getConfig [browserName "enableGoogleTalkPlugin"]
false) google_talk_plugin
- );
- };
+ wrapFirefox =
+ { browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ?
"" }:
+ import ../applications/networking/browsers/firefox/wrapper.nix {
+ inherit stdenv makeWrapper makeDesktopItem browser browserName
desktopName nameSuffix;
+ plugins =
+ let
+ enableAdobeFlash = getConfig [ browserName "enableAdobeFlash" ] true;
+ enableGnash = getConfig [ browserName "enableGnash" ] false;
+ in
+ assert !(enableGnash && enableAdobeFlash);
+ ([ ]
+ ++ lib.optional enableGnash gnash
+ ++ lib.optional enableAdobeFlash flashplayer
+ # RealPlayer is disabled by default for legal reasons.
+ ++ lib.optional (system != "i686-linux" && getConfig [browserName
"enableRealPlayer"] false) RealPlayer
+ ++ lib.optional (getConfig [browserName "enableDjvu"] false)
(djview4)
+ ++ lib.optional (getConfig [browserName "enableMPlayer"] false)
(MPlayerPlugin browser)
+ ++ lib.optional (getConfig [browserName "enableGeckoMediaPlayer"]
false) gecko_mediaplayer
+ ++ lib.optional (supportsJDK && getConfig [browserName "jre"] false
&& jrePlugin ? mozillaPlugin) jrePlugin
+ ++ lib.optional (getConfig [browserName "enableGoogleTalkPlugin"]
false) google_talk_plugin
+ );
+ };
x11vnc = callPackage ../tools/X11/x11vnc { };
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
