From 1add4b2e6dd4c5ac452edfaffb5c166a4dfe590a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Oct 2011 13:16:47 +0000 Subject: [PATCH] synchronize with trunk svn path=/nixpkgs/branches/stdenv-updates/; revision=29696 --- .../networking/browsers/firefox/7.0.nix | 6 +- pkgs/desktops/gnome-2.28/default.nix | 2 +- .../desktop/gnome-keyring/default.nix | 4 +- pkgs/os-specific/linux/mdadm/default.nix | 4 +- pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +- pkgs/tools/filesystems/btrfsprogs/default.nix | 14 ++--- pkgs/top-level/all-packages.nix | 63 ++++++++++--------- 7 files changed, 51 insertions(+), 48 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/7.0.nix b/pkgs/applications/networking/browsers/firefox/7.0.nix index c14386e5f9e..c4fef3dfaf2 100644 --- a/pkgs/applications/networking/browsers/firefox/7.0.nix +++ b/pkgs/applications/networking/browsers/firefox/7.0.nix @@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; 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 = diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index 36eb7b70be2..e486cac465e 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -182,7 +182,7 @@ pkgs.makeOverridable #### 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; }; diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix b/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix index fdb885bf595..f49cb1c2d1c 100644 --- a/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix @@ -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 @@ stdenv.mkDerivation { 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 ]; } diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 0a80e7c8dd0..a88107ae73d 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -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 @@ stdenv.mkDerivation rec { 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). diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index f2065e1aa01..1fc65eb35ed 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -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 @@ stdenv.mkDerivation { 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}"; diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index 2a5574a829e..22d7a1164c8 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -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 @@ rec { 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"]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ecbe6fadc7..77aba9c8372 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4213,6 +4213,7 @@ let neon029 = callPackage ../development/libraries/neon/0.29.nix { compressionSupport = true; sslSupport = true; + openssl = opensslNew; }; nethack = builderDefsPackage (import ../games/nethack) { @@ -5980,7 +5981,7 @@ let 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 @@ let 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 @@ let 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 @@ let [ 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 @@ let [ 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 @@ let 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 { };