dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into x86info.130109

Browse Source
This commit is contained in:
Jack Cummings 2013-01-10 21:35:13 -08:00
commit 42859e49ed
16 changed files with 119 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -79,10 +79,8 @@ let
post23 = !versionOlder sourceInfo.version "24.0.0.0";
post24 = !versionOlder sourceInfo.version "25.0.0.0";
maybeFixPulseAudioBuild = optional (post23 && pulseSupport) (fetchurl {
url = http://archrepo.jeago.com/sources/chromium-dev/pulse_audio_fix.patch;
sha256 = "1w91mirrkqigdhsj892mqxlc0nlv1dsp5shc46w9xf8nl96jxgfb";
});
maybeFixPulseAudioBuild = optional (post23 && pulseSupport)
./pulse_audio_fix.patch;
in stdenv.mkDerivation rec {
name = "${packageName}-${version}";
@ -197,7 +195,7 @@ in stdenv.mkDerivation rec {
meta = {
description = "Chromium, an open source web browser";
homepage = http://www.chromium.org/;
maintainers = with maintainers; [ goibhniu chaoflow ];
maintainers = with maintainers; [ goibhniu chaoflow aszlig ];
license = licenses.bsd3;
platforms = platforms.linux;
};

11
pkgs/applications/networking/browsers/chromium/pulse_audio_fix.patch Normal file
View File

@ -0,0 +1,11 @@
--- chromium-build/media/audio/pulse/pulse_output.cc.orig 2012-10-26 09:44:38.509209905 -0700
+++ chromium-build/media/audio/pulse/pulse_output.cc 2012-10-26 09:45:32.178819603 -0700
@@ -86,7 +86,7 @@
// All channel maps have the same size array of channel positions.
for (unsigned int channel = 0; channel != CHANNELS_MAX; ++channel) {
- int channel_position = kChannelOrderings[channel_layout][channel];
+ int channel_position = ChannelOrder(channel_layout, static_cast<Channels>(channel));
if (channel_position > -1) {
channel_map.map[channel_position] = ChromiumToPAChannelPosition(
static_cast<Channels>(channel));

16
pkgs/applications/virtualization/virtualbox/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel
, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel, lvm2
, which, alsaLib, curl, gawk
, xorriso, makeself, perl, pkgconfig
, javaBindings ? false, jdk ? null
@ -11,8 +11,8 @@ with stdenv.lib;
let
version = "4.2.4";
extpackRevision = "81684";
version = "4.2.6";
extpackRevision = "82870";
forEachModule = action: ''
for mod in \
@ -35,7 +35,7 @@ let
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}"
+ ".vbox-extpack";
# Has to be base16 because it's used as an input to VBoxExtPackHelperApp!
sha256 = "62078e057a4ab56aec5ac086746522b3d94787333d0444169471fa5152c609ed";
sha256 = "f0113688a76efa0426c27c5541c78506b18637025c35aa682ecc6eeed5d56582";
url = "https://www.virtualbox.org/wiki/Downloads";
};
@ -44,19 +44,17 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
sha256 = "a7c607523c1c10b7b978ab39a92bb646517316548aa4a1a74b6e434ac2bf0adc";
sha256 = "54526091bc2aa66b88ca878dd9ecc4466f96d607db2f6678a9d673ecf6646ae3";
};
buildInputs =
[ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL
libcap glib kernel python alsaLib curl pam xorriso makeself perl
libcap glib kernel lvm2 python alsaLib curl pam xorriso makeself perl
pkgconfig which libXmu ]
++ optional javaBindings jdk
++ optional pythonBindings python;
patches = [ ./remove_fa_ir.patch ];
postPatch = ''
prePatch = ''
set -x
MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build`
sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \

4
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
View File

@ -2,14 +2,14 @@
, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor
, dbus }:
let version = "4.2.4"; in
let version = "4.2.6"; in
stdenv.mkDerivation {
name = "VirtualBox-GuestAdditions-${version}-${kernel.version}";
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
sha256 = "3d7d909a0fe9ac5ffcca6afdd4142b88bad116d2ffed6e95588dbfbcf00ca5e9";
sha256 = "1lry4hjjk8p69km1bi3mpmyarlnxz9izs2c0s8pq5rjzv1bd7bxr";
};
KERN_DIR = "${kernel}/lib/modules/*/build";

30
pkgs/applications/virtualization/virtualbox/remove_fa_ir.patch
View File

@ -1,30 +0,0 @@
This patch is for VirtualBox-4.2.2, to temporarily remove references to the
fa_IR language file from the source tree, as it somehow got lost during tarball
creation. For more information on this subject please have a look at:
https://www.virtualbox.org/pipermail/vbox-dev/2012-October/005408.html
diff --git a/src/VBox/Frontends/VirtualBox/VBoxUI.pro b/src/VBox/Frontends/VirtualBox/VBoxUI.pro
index ffeb410..37ac56a 100644
--- a/src/VBox/Frontends/VirtualBox/VBoxUI.pro
+++ b/src/VBox/Frontends/VirtualBox/VBoxUI.pro
@@ -63,7 +63,6 @@ TRANSLATIONS = \
nls/VirtualBox_es.ts \
nls/VirtualBox_eu.ts \
nls/VirtualBox_fi.ts \
- nls/VirtualBox_fa_IR.ts \
nls/VirtualBox_fr.ts \
nls/VirtualBox_gl_ES.ts \
nls/VirtualBox_hu.ts \
diff --git a/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk b/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
index 66f0ec3..2fc19b9 100644
--- a/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
+++ b/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
@@ -23,7 +23,6 @@ VBOX_APPROVED_GUI_LANGUAGES := \
de \
en \
es \
- fa_IR \
hu \
it \
ja \

21
pkgs/data/fonts/libertine/default.nix
View File

@ -1,25 +1,24 @@
args : with args;
rec {
args: with args; rec {
name = "linux-libertine-5.3.0";
src = fetchurl {
url = http://downloads.sourceforge.net/linuxlibertine/5.0.0/LinLibertineSRC_2011_05_22.tgz;
sha256 = "1cr0kvvlqrcmaxfl6szfp3m93mcnhmypx33dxmdm3xdxxkab74vg";
url = mirror://sf/linuxlibertine/5.3.0/LinLibertineSRC_5.3.0_2012_07_02.tgz;
sha256 = "0x7cz6hvhpil1rh03rax9zsfzm54bh7r4bbrq8rz673gl9h47v0v";
};
buildInputs = [fontforge];
configureFlags = [];
buildInputs = [ fontforge ];
/* doConfigure should be specified separately */
phaseNames = ["doUnpack" "generateFontsFromSFD" "installFonts"];
extraFontForgeCommands = ''
ScaleToEm(1000);
'';
doUnpack = fullDepEntry ''
tar xf ${src}
'' ["minInit"];
doUnpack = lib.fullDepEntry ''
tar xf ${src}
'' ["minInit"];
name = "linux-libertine-5.0.0";
meta = {
description = "Linux Libertine Fonts";
homepage = http://linuxlibertine.sf.net;

18
pkgs/desktops/xfce-4.8/applications/xfce4-notifyd.nix Normal file
View File

@ -0,0 +1,18 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk, xfce }:
stdenv.mkDerivation rec {
name = "xfce4-notifyd-0.2.2";
src = fetchurl {
url = "http://archive.xfce.org/src/apps/xfce4-notifyd/0.2/${name}.tar.bz2";
sha256 = "0s4ilc36sl5k5mg5727rmqims1l3dy5pwg6dk93wyjqnqbgnhvmn";
};
buildInputs = [ intltool pkgconfig gtk xfce.libxfce4util xfce.libxfce4ui xfce.xfconf ];
meta = {
homepage = http://goodies.xfce.org/projects/applications/xfce4-notifyd;
description = "The Xfce Notify Daemon";
platforms = stdenv.lib.platforms.linux;
};
}

2
pkgs/desktops/xfce-4.8/default.nix
View File

@ -73,6 +73,8 @@ rec {
ristretto = callPackage ./applications/ristretto.nix { };
xfce4_notifyd = callPackage ./applications/xfce4-notifyd.nix { };
xfce4_power_manager = callPackage ./applications/xfce4-power-manager.nix { };
xfce4mixer = callPackage ./applications/xfce4-mixer.nix { };

10
pkgs/development/libraries/mygui/default.nix
View File

@ -1,16 +1,16 @@
{stdenv, fetchurl, unzip, ogre, cmake, ois, freetype, libuuid, boost}:
{stdenv, fetchurl, unzip, ogre, cmake, ois, freetype, libuuid, boost, pkgconfig}:
stdenv.mkDerivation rec {
name = "mygui-3.0.1";
name = "mygui-3.2.0";
src = fetchurl {
url = mirror://sourceforge/my-gui/MyGUI_3.0.1_source.zip;
sha256 = "1n56kl8ykzgv4k2nm9317jg9b9x2qa3l9hamz11hzn1qqjn2z4ig";
url = mirror://sourceforge/my-gui/MyGUI_3.2.0.zip;
sha256 = "16m1xrhx13qbwnp9gds2amlwycq8q5npr0665hnknwsb6rph010p";
};
enableParallelBuilding = true;
buildInputs = [ unzip ogre cmake ois freetype libuuid boost ];
buildInputs = [ unzip ogre cmake ois freetype libuuid boost pkgconfig ];
meta = {
homepage = http://mygui.info/;

6
pkgs/development/libraries/ogre/default.nix
View File

@ -8,11 +8,11 @@
, nvidia_cg_toolkit }:
stdenv.mkDerivation {
name = "ogre-1.7.2";
name = "ogre-1.8.1";
src = fetchurl {
url = "mirror://sourceforge/ogre/1.7/ogre_src_v1-7-2.tar.bz2";
sha256 = "10q8jx842s4aws9py6q67rb4dh5vli5vvg54jl8manjb4f388jh5";
url = "mirror://sourceforge/ogre/1.8.1/ogre_src_v1-8-1.tar.bz2";
sha256 = "1avadx87sdfdk8165wlffnd5dzks694dcdnkg3ijap966k4qm46s";
};
cmakeFlags = [ "-DOGRE_INSTALL_SAMPLES=yes" ]

32
pkgs/games/stuntrally/default.nix
View File

@ -1,15 +1,33 @@
{ fetchurl, stdenv, cmake, boost, ogre, myguiSvn, ois, SDL, libvorbis, pkgconfig
, makeWrapper }:
{ fetchgit, stdenv, cmake, boost, ogre, mygui, ois, SDL, libvorbis, pkgconfig
, makeWrapper, enet, libXcursor }:
stdenv.mkDerivation rec {
name = "stunt-rally-1.4";
name = "stunt-rally-1.8";
src = fetchurl {
url = mirror://sourceforge/stuntrally/StuntRally-1.4-sources.tar.bz2;
sha256 = "1am5af4l1qliyrq1183sqvwzqwcjx0v6gkzsxhfmk6ygp7yhw7kq";
src = fetchgit {
url = git://github.com/stuntrally/stuntrally.git;
rev = "refs/tags/1.8";
sha256 = "0p8p83xx8q33kymsqnmxqca4jdfyg9rwrsac790z56gdbc7gnahm";
};
buildInputs = [ cmake boost ogre myguiSvn ois SDL libvorbis pkgconfig makeWrapper ];
tracks = fetchgit {
url = git://github.com/stuntrally/tracks.git;
rev = "refs/tags/1.8";
sha256 = "1gcrs21nn0v3hvhrw8dc0wh1knn5qh66cjx7a1igiciiadmi2s3l";
};
patchPhase = ''
sed -i 's/materials/materials material_templates/' data/CMakeLists.txt
'';
preConfigure = ''
mkdir data/tracks
cp -R $tracks/* data/tracks
'';
buildInputs = [ cmake boost ogre mygui ois SDL libvorbis pkgconfig makeWrapper enet
libXcursor
];
# I think they suppose cmake should give them OGRE_PLUGIN_DIR defined, but
# the cmake code I saw is not ready for that. Therefore, we use the env var.

23
pkgs/games/super-tux-kart/default.nix
View File

@ -1,24 +1,27 @@
{ fetchurl, stdenv, plib, SDL, openal, freealut, mesa
, libvorbis, libogg, gettext, irrlicht3843, libXxf86vm, curl, pkgconfig
, fribidi }:
{ fetchurl, cmake, stdenv, plib, SDL, openal, freealut, mesa
, libvorbis, libogg, gettext, libXxf86vm, curl, pkgconfig
, fribidi, autoconf, automake, libtool }:
stdenv.mkDerivation rec {
name = "supertuxkart-0.7.3";
name = "supertuxkart-0.8";
src = fetchurl {
url = "mirror://sourceforge/supertuxkart/${name}-src.tar.bz2";
sha256 = "0njrs2qyhbiqdbsqk9jx0sl8nhdwmipf1i91k23rv1biwrim9yq7";
sha256 = "12sbml4wxg2x2wgnnkxfisj96a9gcsaj3fj27kdk8yj524ikv7xr";
};
buildInputs = [
plib SDL openal freealut mesa libvorbis libogg gettext irrlicht3843
libXxf86vm curl pkgconfig fribidi
plib SDL openal freealut mesa libvorbis libogg gettext
libXxf86vm curl pkgconfig fribidi autoconf automake libtool cmake
];
configureFlags = [ "--with-irrlicht=${irrlicht3843}" ];
enableParallelBuilding = true;
postInstall = ''
mv $out/games $out/bin
preConfigure = ''
echo Building internal Irrlicht
cd lib/irrlicht/source/Irrlicht/
NDEBUG=1 make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
cd -
'';
meta = {

1
pkgs/lib/maintainers.nix
View File

@ -10,6 +10,7 @@
andres = "Andres Loeh <ksnixos@andres-loeh.de>";
antono = "Antono Vasiljev <self@antono.info>";
astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
aszlig = "aszlig <aszlig@redmoonstudios.org>";
bbenoist = "Baptist BENOIST <return_0@live.com>";
bjg = "Brian Gough <bjg@gnu.org>";
bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>";

6
pkgs/os-specific/linux/xf86-video-nouveau/default.nix
View File

@ -3,7 +3,7 @@
, autoconf
, automake
, libtool
, xorgserver, xproto, fontsproto, xf86driproto, renderproto, videoproto
, xorgserver, xproto, fontsproto, xf86driproto, renderproto, videoproto, pixman
, utilmacros
, libdrm
, pkgconfig }:
@ -21,12 +21,14 @@ stdenv.mkDerivation {
autoconf
automake
libtool
xorgserver xproto fontsproto xf86driproto renderproto videoproto
xorgserver xproto fontsproto xf86driproto renderproto videoproto pixman
utilmacros
libdrm
pkgconfig
];
NIX_CFLAGS_COMPILE = "-I${pixman}/include/pixman-1";
preConfigure = "autoreconf -vfi";
meta = {

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

@ -6521,7 +6521,7 @@ let
liberation_ttf = callPackage ../data/fonts/redhat-liberation-fonts { };
libertine = builderDefsPackage (import ../data/fonts/libertine) {
inherit fontforge;
inherit fetchurl fontforge lib;
};
lmmath = callPackage ../data/fonts/lmodern/lmmath.nix {};
@ -8376,12 +8376,7 @@ let
superTux = callPackage ../games/super-tux { };
superTuxKart = callPackage ../games/super-tux-kart {
/* With GNU Make 3.82, the build process is stuck in the `data'
directory, after displaying "Making all in tracks", and `pstree'
indicates that `make' doesn't launch any new process. */
stdenv = overrideInStdenv stdenv [ gnumake381 ];
};
superTuxKart = callPackage ../games/super-tux-kart { };
tbe = callPackage ../games/the-butterfly-effect {};

13
pkgs/top-level/node-packages.nix
View File

@ -742,6 +742,19 @@ let self = {
];
};
"optparse" = self."optparse-1.0.3";
"optparse-1.0.3" = self.buildNodePackage rec {
name = "optparse-1.0.3";
src = fetchurl {
url = "http://registry.npmjs.org/optparse/-/${name}.tgz";
sha256 = "1cg99i4rq8azxikzqz0ykw4q971azbj49d3m7slj041yscb6m883";
};
deps = [
];
};
"osenv" = self."osenv-0";
"osenv-0" = self.buildNodePackage rec {