public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

synchronize with trunk 

svn path=/nixpkgs/branches/stdenv-updates/; revision=29696
This commit is contained in:
Peter Simons 2011-10-06 13:16:47 +00:00
parent d5d5ff5a78
commit 1add4b2e6d
7 changed files with 51 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/browsers/firefox/7.0.nix
View File

@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec { 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 { src = fetchurl {
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
sha256 = "1fpadlsdc8d739cz52dicn68v2ilv044hxivilgy9jnrazznrm42"; sha1 = "94bbc7152832371dc0be82f411730df043c5c6ac";
}; };
commonConfigureFlags = commonConfigureFlags =

2
pkgs/desktops/gnome-2.28/default.nix
View File

@ -182,7 +182,7 @@ pkgs.makeOverridable
#### DESKTOP #### DESKTOP
gnome_keyring = import ./desktop/gnome-keyring { 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 (pkgs.gtkLibs) glib gtk;
inherit intltool GConf; inherit intltool GConf;
}; };

4
pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix
View File

@ -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 { stdenv.mkDerivation {
name = "gnome-keyring-2.28.0"; name = "gnome-keyring-2.28.0";
@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1d6av3cq32ypq9f9mv7f9bcqkkdqgbvbb831kad62smczvqk8chv"; 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 ]; propagatedBuildInputs = [ glib libtasn1 ];
} }

2
pkgs/os-specific/linux/mdadm/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildNativeInputs = [ groff ]; 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 # Force mdadm to use /var/run/mdadm.map for its map file (or
# /dev/.mdadm/map as a fallback). # /dev/.mdadm/map as a fallback).

6
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@ -7,7 +7,7 @@
with stdenv.lib; with stdenv.lib;
let versionNumber = "280.13"; in let versionNumber = "285.05.09"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
@ -18,12 +18,12 @@ stdenv.mkDerivation {
if stdenv.system == "i686-linux" then if stdenv.system == "i686-linux" then
fetchurl { fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; 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 else if stdenv.system == "x86_64-linux" then
fetchurl { fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; 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}"; else throw "nvidia-x11 does not support platform ${stdenv.system}";

2
pkgs/tools/filesystems/btrfsprogs/default.nix
View File

@ -18,7 +18,7 @@ rec {
inherit buildInputs; inherit buildInputs;
configureFlags = []; configureFlags = [];
makeFlags = ["prefix=$out"]; makeFlags = ["prefix=$out CFLAGS=-Os"];
patches = [ ./glibc212.patch ]; patches = [ ./glibc212.patch ];
phaseNames = ["doPatch" "doEnsureBtrfsImage" "doMakeInstall"]; phaseNames = ["doPatch" "doEnsureBtrfsImage" "doMakeInstall"];

63
pkgs/top-level/all-packages.nix
View File

@ -4213,6 +4213,7 @@ let
neon029 = callPackage ../development/libraries/neon/0.29.nix { neon029 = callPackage ../development/libraries/neon/0.29.nix {
compressionSupport = true; compressionSupport = true;
sslSupport = true; sslSupport = true;
openssl = opensslNew;
}; };
nethack = builderDefsPackage (import ../games/nethack) { nethack = builderDefsPackage (import ../games/nethack) {
@ -5980,7 +5981,7 @@ let
tunctl = true; mconsole = true; tunctl = true; mconsole = true;
}; };
untie = callPackage ../os-specific/linux/untie {}; untie = callPackage ../os-specific/linux/untie { };
upower = callPackage ../os-specific/linux/upower { upower = callPackage ../os-specific/linux/upower {
dbus_glib = pkgs.dbus_glib_0_94; dbus_glib = pkgs.dbus_glib_0_94;
@ -6324,7 +6325,7 @@ let
patchelf = patchelf06; patchelf = patchelf06;
}; };
chromeWrapper = wrapFirefox chrome "chrome" ""; chromeWrapper = wrapFirefox { browser = chrome; browserName = "chrome"; desktopName = "Chrome"; };
cinelerra = callPackage ../applications/video/cinelerra { cinelerra = callPackage ../applications/video/cinelerra {
inherit (gnome) esound; inherit (gnome) esound;
@ -6576,37 +6577,37 @@ let
firefox = pkgs.firefoxPkgs.firefox; 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 { firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix {
inherit (gtkLibs) gtk pango; inherit (gtkLibs) gtk pango;
inherit (gnome) libIDL; inherit (gnome) libIDL;
}; };
firefox36Wrapper = wrapFirefox firefox36Pkgs.firefox "firefox" ""; firefox36Wrapper = wrapFirefox { browser = firefox36Pkgs.firefox; };
firefox50Pkgs = callPackage ../applications/networking/browsers/firefox/5.0.nix { firefox50Pkgs = callPackage ../applications/networking/browsers/firefox/5.0.nix {
inherit (gtkLibs) gtk pango; inherit (gtkLibs) gtk pango;
inherit (gnome) libIDL; inherit (gnome) libIDL;
}; };
firefox50Wrapper = wrapFirefox firefox50Pkgs.firefox "firefox" ""; firefox50Wrapper = wrapFirefox { browser = firefox50Pkgs.firefox; };
firefox60Pkgs = callPackage ../applications/networking/browsers/firefox/6.0.nix { firefox60Pkgs = callPackage ../applications/networking/browsers/firefox/6.0.nix {
inherit (gtkLibs) gtk pango; inherit (gtkLibs) gtk pango;
inherit (gnome) libIDL; inherit (gnome) libIDL;
}; };
firefox60Wrapper = wrapFirefox firefox60Pkgs.firefox "firefox" ""; firefox60Wrapper = wrapFirefox { browser = firefox60Pkgs.firefox; };
firefox70Pkgs = callPackage ../applications/networking/browsers/firefox/7.0.nix { firefox70Pkgs = callPackage ../applications/networking/browsers/firefox/7.0.nix {
inherit (gtkLibs) gtk pango; inherit (gtkLibs) gtk pango;
inherit (gnome) libIDL; inherit (gnome) libIDL;
}; };
firefox70Wrapper = lowPrio (wrapFirefox firefox70Pkgs.firefox "firefox" ""); firefox70Wrapper = wrapFirefox { browser = firefox70Pkgs.firefox; };
firefox80bPkgs = callPackage ../applications/networking/browsers/firefox/8.0.nix { firefox80bPkgs = callPackage ../applications/networking/browsers/firefox/8.0.nix {
inherit (gtkLibs) gtk pango; inherit (gtkLibs) gtk pango;
@ -6808,7 +6809,7 @@ let
[ icecat3 icecatXulrunner3 ]) [ icecat3 icecatXulrunner3 ])
// { inherit (icecat3) gtk isFirefox3Like meta; }; // { 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 { icecat4 = lowPrio (import ../applications/networking/browsers/icecat-4 {
inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo
@ -6834,7 +6835,7 @@ let
[ icecat4 icecatXulrunner4 ]) [ icecat4 icecatXulrunner4 ])
// { inherit (icecat4) gtk meta; }; // { inherit (icecat4) gtk meta; };
icecat4Wrapper = wrapFirefox icecat4Xul "icecat" ""; icecat4Wrapper = wrapFirefox { browser = icecat4Xul; browserName = "icecat"; desktopName = "IceCat"; };
icewm = callPackage ../applications/window-managers/icewm { icewm = callPackage ../applications/window-managers/icewm {
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
@ -7476,26 +7477,28 @@ let
wordnet = callPackage ../applications/misc/wordnet { }; wordnet = callPackage ../applications/misc/wordnet { };
wrapFirefox = browser: browserName: nameSuffix: import ../applications/networking/browsers/firefox/wrapper.nix { wrapFirefox =
inherit stdenv nameSuffix makeWrapper makeDesktopItem browser browserName; { browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? "" }:
plugins = import ../applications/networking/browsers/firefox/wrapper.nix {
let inherit stdenv makeWrapper makeDesktopItem browser browserName desktopName nameSuffix;
enableAdobeFlash = getConfig [ browserName "enableAdobeFlash" ] true; plugins =
enableGnash = getConfig [ browserName "enableGnash" ] false; let
in enableAdobeFlash = getConfig [ browserName "enableAdobeFlash" ] true;
assert !(enableGnash && enableAdobeFlash); enableGnash = getConfig [ browserName "enableGnash" ] false;
([ ] in
++ lib.optional enableGnash gnash assert !(enableGnash && enableAdobeFlash);
++ lib.optional enableAdobeFlash flashplayer ([ ]
# RealPlayer is disabled by default for legal reasons. ++ lib.optional enableGnash gnash
++ lib.optional (system != "i686-linux" && getConfig [browserName "enableRealPlayer"] false) RealPlayer ++ lib.optional enableAdobeFlash flashplayer
++ lib.optional (getConfig [browserName "enableDjvu"] false) (djview4) # RealPlayer is disabled by default for legal reasons.
++ lib.optional (getConfig [browserName "enableMPlayer"] false) (MPlayerPlugin browser) ++ lib.optional (system != "i686-linux" && getConfig [browserName "enableRealPlayer"] false) RealPlayer
++ lib.optional (getConfig [browserName "enableGeckoMediaPlayer"] false) gecko_mediaplayer ++ lib.optional (getConfig [browserName "enableDjvu"] false) (djview4)
++ lib.optional (supportsJDK && getConfig [browserName "jre"] false && jrePlugin ? mozillaPlugin) jrePlugin ++ lib.optional (getConfig [browserName "enableMPlayer"] false) (MPlayerPlugin browser)
++ lib.optional (getConfig [browserName "enableGoogleTalkPlugin"] false) google_talk_plugin ++ 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 { }; x11vnc = callPackage ../tools/X11/x11vnc { };