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

Merge branch 'master' into systemd

Browse Source
This commit is contained in:
Eelco Dolstra 2013-01-15 12:11:07 +01:00
commit eeda226b02
117 changed files with 978 additions and 464 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maintainers/scripts/eval-release.nix
View File

@ -5,7 +5,7 @@
with import ../../pkgs/lib;
let
trace = if (builtins.getEnv "VERBOSE") == "1" then builtins.trace else (x: y: y);
trace = if builtins.getEnv "VERBOSE" == "1" then builtins.trace else (x: y: y);
rel = removeAttrs (import ../../pkgs/top-level/release.nix) [ "tarball" "xbursttools" ];
@ -13,7 +13,7 @@ let
strictAttrs = as: seqList (attrValues as) as;
maybe = as: let y = builtins.tryEval (strictAttrs as); in if y.success then y.value else builtins.trace "FAIL" null;
maybe = as: let y = builtins.tryEval (strictAttrs as); in if y.success then y.value else builtins.trace "FAIL" {};
call = attrs: flip mapAttrs attrs
(n: v: trace n (

4
pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, emacs }:
stdenv.mkDerivation rec {
name = "flymake-cursor-0.1.4";
name = "flymake-cursor-0.1.5";
src = fetchurl {
url = "http://www.emacswiki.org/emacs/download/flymake-cursor.el";
sha256 = "1wxqqmn2fk2b778nksvgn1mi7ajarcpc5lla90xx9jwz47d9hx02";
sha256 = "1qqppd1786w8pl1avjb01n23lwihb7m0hr23abjklsxz03gmp4qz";
};
phases = [ "buildPhase" "installPhase"];

4
pkgs/applications/editors/emacs-modes/htmlize/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "htmlize-1.40";
name = "htmlize-1.43";
builder = ./builder.sh;
src = fetchurl {
url = http://fly.srk.fer.hr/~hniksic/emacs/htmlize.el.cgi;
sha256 = "1v7pzif5b7dr6iyllqvzka8i6s23rsjdnmilnma054gv8d4shw6a";
sha256 = "0bdaxh3pjf4z55i7vz4yz3yz45720h8aalhmx13bgkrpijzn93bi";
};
meta = {

2
pkgs/applications/editors/jedit/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "jedit-4.4.2";
src = fetchurl {
url = mirror://sf/jedit/jedit4.4.2source.tar.bz2;
url = mirror://sourceforge/jedit/jedit4.4.2source.tar.bz2;
sha256 = "5e9ad9c32871b77ef0b9fe46dcfcea57ec52558d36113b7280194a33430b8ceb";
};

9
pkgs/applications/graphics/ImageMagick/default.nix
View File

@ -3,7 +3,7 @@
, bzip2
, freetype
, graphviz
, ghostscript
, ghostscript ? null
, libjpeg
, libpng
, libtiff
@ -27,16 +27,17 @@ stdenv.mkDerivation rec {
sha256 = "0m0sa4jxsvm8pf9nfvkzlbzq13d1lj15lfz6jif12l6ywyh2c1cs";
};
configureFlags = ''
configureFlags = "" + stdenv.lib.optionalString (ghostscript != null && stdenv.system != "x86_64-darwin") ''
--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts
--with-gslib
'' + ''
--with-frozenpaths
${if librsvg != null then "--with-rsvg" else ""}
'';
propagatedBuildInputs =
[ bzip2 freetype ghostscript libjpeg libpng libtiff libxml2 zlib librsvg
libtool jasper libX11 ];
[ bzip2 freetype libjpeg libpng libtiff libxml2 zlib librsvg
libtool jasper libX11 ] ++ stdenv.lib.optional (ghostscript != null && stdenv.system != "x86_64-darwin") ghostscript;
buildInputs = [ tetex graphviz ];

2
pkgs/applications/graphics/gocr/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "gocr-0.49";
src = fetchurl {
url = "www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.49.tar.gz";
url = http://www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.49.tar.gz;
sha256 = "06hpzp7rkkwfr1fvmc8kcfz9v490i9yir7f7imh13gmka0fr6afc";
};

19
pkgs/applications/graphics/qiv/default.nix Normal file
View File

@ -0,0 +1,19 @@
{ stdenv, fetchurl, pkgconfig, gtk, imlib2, file } :
stdenv.mkDerivation (rec {
name = "qiv-2.2.4";
src = fetchurl {
url = "http://spiegl.de/qiv/download/${name}.tgz";
sha256 = "ed6078dc550c1dc2fe35c1e0f46463c13589a24b83d4f7101b71a7485e51abb7";
};
buildInputs = [ pkgconfig gtk imlib2 file ];
preBuild=''substituteInPlace Makefile --replace /usr/local "$out"'';
meta = {
description = "qiv (quick image viewer)";
homepage = http://spiegl.de/qiv/;
};
})

4
pkgs/applications/misc/lyx/default.nix
View File

@ -3,12 +3,12 @@
}:
stdenv.mkDerivation rec {
version = "2.0.5";
version = "2.0.5.1";
name = "lyx-${version}";
src = fetchurl {
url = "ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${name}.tar.xz";
sha256 = "00pv2d9p8j1p6x87kalbn1bgxg9l4zqh65zcajrnh10a76isv6nk";
sha256 = "18k9qbz40v6lqmkfcg98wvcv4wi4p36ach1jz3z2b15gbmv2gr9n";
};
configureFlags = [

4
pkgs/applications/misc/rxvt_unicode/default.nix
View File

@ -3,7 +3,7 @@
let
name = "rxvt-unicode";
version = "9.15";
version = "9.16";
n = "${name}-${version}";
in
@ -13,7 +13,7 @@ stdenv.mkDerivation (rec {
src = fetchurl {
url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2";
sha256 = "ec1aa2932da844979ed8140bd92223defb12042aa5e877e05ac31139ca81f2b1";
sha256 = "0x28wyslqnhn2q11y4hncqdl07wgh5ypywl92fq0jxycr36ibfvn";
};
buildInputs =

2
pkgs/applications/misc/semnotes/default.nix
View File

@ -3,7 +3,7 @@ stdenv.mkDerivation {
name = "semnotes-0.4.0-1";
src = fetchurl {
url = "mirror://sf/semn/0.4.0/semnotes-0.4.0-1-src.tar.bz2";
url = "mirror://sourceforge/semn/0.4.0/semnotes-0.4.0-1-src.tar.bz2";
sha256 = "1zh5jfh7pyhyz5fbzcgzyckdg0ny7sf8s16yy6rjw9n021zz5i7m";
};

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

@ -78,11 +78,10 @@ let
post23 = !versionOlder sourceInfo.version "24.0.0.0";
post24 = !versionOlder sourceInfo.version "25.0.0.0";
only24 = post23 && !post24;
maybeFixPulseAudioBuild = optional (post23 && pulseSupport) (fetchurl {
url = http://archrepo.jeago.com/sources/chromium-dev/pulse_audio_fix.patch;
sha256 = "1w91mirrkqigdhsj892mqxlc0nlv1dsp5shc46w9xf8nl96jxgfb";
});
maybeFixPulseAudioBuild = optional (only24 && pulseSupport)
./pulse_audio_fix.patch;
in stdenv.mkDerivation rec {
name = "${packageName}-${version}";
@ -122,6 +121,8 @@ in stdenv.mkDerivation rec {
postPatch = optionalString useOpenSSL ''
cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
'' + optionalString post24 ''
sed -i -r -e "s/-f(stack-protector)(-all)?/-fno-\1/" build/common.gypi
'';
gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {
@ -197,7 +198,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));

18
pkgs/applications/networking/browsers/chromium/sources.nix
View File

@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
dev = {
version = "25.0.1323.1";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1323.1.tar.bz2";
sha256 = "1i7ga1qhnjvnw2gynmpmsvvl5pxcb5z9sgldp87d9yalim5sra6s";
version = "25.0.1364.29";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.29.tar.bz2";
sha256 = "0da3in98b65rb9wkj9jxb3n07d5k7s1xpqwpvk1jz9jbp0hw7ijp";
};
beta = {
version = "24.0.1312.35";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.35.tar.bz2";
sha256 = "0mb6xz5lrnzjk1zqr83jyprsxv20svy3a7lyxv9iwdb2bh1i13ci";
version = "24.0.1312.52";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.52.tar.bz2";
sha256 = "04fp04591dszx07wwdsgxf0wb2sxm863z1qxn5dii6f9yjqgh3gk";
};
stable = {
version = "23.0.1271.97";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.97.tar.bz2";
sha256 = "1qf21n6msj1jmxhnlw8fapsz7q6dd851rxdqv4334v06ny4i5fip";
version = "24.0.1312.52";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.52.tar.bz2";
sha256 = "04fp04591dszx07wwdsgxf0wb2sxm863z1qxn5dii6f9yjqgh3gk";
};
}

176
pkgs/applications/networking/browsers/firefox/18.0.nix Normal file
View File

@ -0,0 +1,176 @@
{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
, # If you want the resulting program to call itself "Firefox" instead
# of "Shiretoko" or whatever, enable this option. However, those
# binaries may not be distributed without permission from the
# Mozilla Foundation, see
# http://www.mozilla.org/foundation/trademarks/.
enableOfficialBranding ? false
}:
assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
firefoxVersion = "18.0";
xulVersion = "18.0"; # this attribute is used by other packages
src = fetchurl {
urls = [
# It is better to use this url for official releases, to take load off Mozilla's ftp server.
"http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
# Fall back to this url for versions not available at releases.mozilla.org.
"ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
];
sha1 = "3356562e69d699e5901df5a4da4e2e59dd1e7f57";
};
commonConfigureFlags =
[ "--enable-optimize"
#"--enable-profiling"
"--disable-debug"
"--enable-strip"
# "--with-system-jpeg" # Too old in nixpkgs
"--with-system-zlib"
"--with-system-bz2"
"--with-system-nspr"
# "--with-system-nss" # Too old in nixpkgs
# "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
# "--enable-system-cairo" # disabled for the moment because our Cairo is too old
"--enable-system-sqlite"
"--disable-crashreporter"
"--disable-tests"
"--disable-necko-wifi" # maybe we want to enable this at some point
"--disable-installer"
"--disable-updater"
];
xulrunner = stdenv.mkDerivation rec {
name = "xulrunner-${xulVersion}";
inherit src;
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
alsaLib nspr nss libnotify xlibs.pixman yasm mesa
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
];
configureFlags =
[ "--enable-application=xulrunner"
"--disable-javaxpcom"
] ++ commonConfigureFlags;
enableParallelBuilding = true;
preConfigure =
''
export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
mkdir ../objdir
cd ../objdir
configureScript=../mozilla-release/configure
''; # */
#installFlags = "SKIP_GRE_REGISTRATION=1";
postInstall = ''
# Fix run-mozilla.sh search
libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
echo libDir: $libDir
test -n "$libDir"
cd $out/bin
rm xulrunner
for i in $out/lib/$libDir/*; do
file $i;
if file $i | grep executable &>/dev/null; then
echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
chmod a+x "$out/bin/$(basename "$i")";
fi;
done
for i in $out/lib/$libDir/*.so; do
patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
done
for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do
wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir"
done
rm -f $out/bin/run-mozilla.sh
''; # */
meta = {
description = "Mozilla Firefox XUL runner";
homepage = http://www.mozilla.com/en-US/firefox/;
};
passthru = { inherit gtk; version = xulVersion; };
};
firefox = stdenv.mkDerivation rec {
name = "firefox-${firefoxVersion}";
inherit src;
enableParallelBuilding = true;
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
xlibs.pixman yasm mesa sqlite file unzip pysqlite
];
propagatedBuildInputs = [xulrunner];
configureFlags =
[ "--enable-application=browser"
"--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
"--enable-chrome-format=jar"
"--disable-elf-hack"
]
++ commonConfigureFlags
++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
makeFlags = [
"SYSTEM_LIBXUL=1"
];
# Hack to work around make's idea of -lbz2 dependency
preConfigure =
''
find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
stdenv.lib.concatStringsSep ":"
(map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
}' ';'
'';
postInstall =
''
ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
cd "$out/lib/"firefox-*
rm firefox
echo -e '#!${stdenv.shell}\nexec ${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox
chmod a+x firefox
''; # */
meta = {
description = "Mozilla Firefox - the browser, reloaded";
homepage = http://www.mozilla.com/en-US/firefox/;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
passthru = {
inherit gtk xulrunner nspr;
isFirefox3Like = true;
};
};
}

2
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
View File

@ -13,6 +13,7 @@
, libXrender
, libXcursor
, libXt
, libvdpau
, gtk
, glib
, pango
@ -78,6 +79,7 @@ stdenv.mkDerivation {
rpath = stdenv.lib.makeLibraryPath
[ zlib alsaLib curl nss nspr fontconfig freetype expat libX11
libXext libXrender libXcursor libXt gtk glib pango atk cairo gdk_pixbuf
libvdpau
];
buildPhase = ":";

4
pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, browser, x11
, GConf, gnome_mplayer, MPlayer, gmtk
, GConf, gnome_mplayer, mplayer, gmtk
}:
stdenv.mkDerivation rec {
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
# browser's $PATH.
postInstall =
''
echo "${gnome_mplayer}/bin:${MPlayer}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path
echo "${gnome_mplayer}/bin:${mplayer}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path
'';
passthru.mozillaPlugin = "/lib/mozilla/plugins";

1
pkgs/applications/networking/instant-messengers/tkabber/default.nix
View File

@ -36,6 +36,7 @@ in stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/tkabber \
--prefix PATH : "${tk}/bin" \
--set TCLLIBPATH '"${tclLibPaths}"' \
--set TKABBER_SITE_PLUGINS '$HOME/.nix-profile/share/tkabber-plugins'
'';

4
pkgs/applications/networking/irc/quassel/default.nix
View File

@ -11,11 +11,11 @@ let
in with stdenv; mkDerivation rec {
name = "quassel-0.7.1";
name = "quassel-0.7.4";
src = fetchurl {
url = "http://quassel-irc.org/pub/${name}.tar.bz2";
sha256 = "1kby1yikiv5bpzkdri5dq39pxnsj9gjrcv1gigvy2jzy3g99qjli";
sha256 = "08f4m35bkmp9p1n560a3fg711s9izb25ddx2az03xzf1jl8qdrg7";
};
buildInputs = [ cmake qt4 ]

2
pkgs/applications/science/logic/iprover/default.nix
View File

@ -13,7 +13,7 @@ let
baseName="iprover";
version="0.8.1";
name="${baseName}_v${version}";
url="${baseName}.googlecode.com/files/${name}.tar.gz";
url="http://${baseName}.googlecode.com/files/${name}.tar.gz";
hash="15qn523w4l296np5rnkwi50a5x2xqz0kaza7bsh9bkazph7jma7w";
};
in

2
pkgs/applications/science/logic/opensmt/default.nix
View File

@ -15,7 +15,7 @@ let
version="20101017";
name="${baseName}-${version}";
filename="${baseName}_src_${version}";
url="${baseName}.googlecode.com/files/${filename}.tgz";
url="http://${baseName}.googlecode.com/files/${filename}.tgz";
hash="0xrky7ixjaby5x026v7hn72xh7d401w9jhccxjn0khhn1x87p2w1";
};
in

32
pkgs/applications/science/misc/boinc/default.nix
View File

@ -1,18 +1,20 @@
{ fetchsvn, stdenv, autoconf, automake, pkgconfig, m4, curl,
mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK,
sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11 }:
{ fetchgit, stdenv, autoconf, automake, pkgconfig, m4, curl,
mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil,
sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11, libxcb }:
stdenv.mkDerivation rec {
name = "boinc-6.12.39";
name = "boinc-7.0.44";
src = fetchsvn {
url = "http://boinc.berkeley.edu/svn/tags/boinc_core_release_6_12_39";
rev = 24341;
sha256 = "158fkm4mr7wljsy8gav20km8jamf00mxjk1wsiqw6kx62bih37yb";
src = fetchgit {
url = "git://boinc.berkeley.edu/boinc.git";
rev = "7c449b1fb8a681ceb27d6895751b62a2b3adf0f2";
sha256 = "0hdramyl9nip3gadp7xiaz8ngyld15i93d8ai1nsd04bmrvdfqia";
};
buildInputs = [ libtool automake autoconf m4 pkgconfig curl mesa libXmu libXi
freeglut libjpeg wxGTK sqlite gtk libXScrnSaver libnotify patchelf libX11 ];
freeglut libjpeg wxGTK sqlite gtk libXScrnSaver libnotify patchelf libX11
libxcb xcbutil
];
postConfigure = ''
sed -i -e s,/etc,$out/etc, client/scripts/Makefile
@ -27,17 +29,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
configureFlags = "--disable-server --disable-fast-install";
postInstall = "
# Remove a leading rpath to /tmp/... I don't know how it got there
# I could not manage to get rid of that through autotools.
for a in $out/bin/*; do
RPATH=$(patchelf --print-rpath $a)
NEWRPATH=$(echo $RPATH | sed 's/^[^:]*://')
patchelf --set-rpath $out/lib:$NEWRPATH $a
done
";
configureFlags = "--disable-server";
meta = {
description = "Free software for distributed and grid computing";

4
pkgs/applications/version-management/git-and-tools/git-annex/default.nix
View File

@ -12,14 +12,14 @@
}:
let
version = "3.20130102";
version = "3.20130107";
in
stdenv.mkDerivation {
name = "git-annex-${version}";
src = fetchurl {
url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=${version}";
sha256 = "0aga3i7rzq21vyj2wq87n4yl5aljzxc69vbzw43nxx9sr2f3xyh5";
sha256 = "15x4rmpxv3mgp8r4gb6jana5262nvyl6rm5p8slc5z5ijl0qwbzq";
name = "git-annex-${version}.tar.gz";
};

4
pkgs/applications/version-management/subversion/default.nix
View File

@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport;
stdenv.mkDerivation rec {
version = "1.7.7";
version = "1.7.8";
name = "subversion-${version}";
src = fetchurl {
url = "mirror://apache/subversion//${name}.tar.bz2";
sha1 = "c9fc0c5992eda36ba9affd93a15929e25958a951";
sha1 = "12c7d8d5414bba74c9777c4d1dae74f152df63c2";
};
buildInputs = [ zlib apr aprutil sqlite ]

10
pkgs/applications/video/MPlayer/default.nix → pkgs/applications/video/mplayer/default.nix
View File

@ -18,6 +18,7 @@
, pulseSupport ? false, pulseaudio ? null
# For screenshots
, libpngSupport ? true, libpng ? null
, useUnfreeCodecs ? false
}:
assert x11Support -> (libX11 != null && libXext != null && mesa != null);
@ -66,9 +67,7 @@ let
cp -prv * $out
'';
meta = {
license = "unfree";
};
meta.license = "unfree";
} else null;
in
@ -140,8 +139,7 @@ stdenv.mkDerivation rec {
${if x264Support then "--enable-x264 --disable-x264-lavc" else "--disable-x264 --enable-x264-lavc"}
${if jackaudioSupport then "--enable-jack" else "--disable-jack"}
${if pulseSupport then "--enable-pulse" else "--disable-pulse"}
${optionalString (codecs != null) "--codecsdir=${codecs}"}
${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"}
${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"}
--enable-freetype
--disable-xanim
@ -154,6 +152,8 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = stdenv.lib.optionalString x11Support "-lX11 -lXext";
enableParallelBuilding = true;
# Provide a reasonable standard font. Maybe we should symlink here.
postInstall =
''

4
pkgs/applications/video/vlc/default.nix
View File

@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
name = "vlc-${version}";
version = "2.0.4";
version = "2.0.5";
src = fetchurl {
url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz";
sha256 = "1dixankckfxf8xixfc32rc9mfsv6mx2lk5h13ym8bp4dsk86w1jf";
sha256 = "0vkbv477a7z0v55sigz6c3abxljz7jyysp7z8s29zk8vhq0fpyfz";
};
buildInputs =

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 \

4
pkgs/applications/window-managers/xmonad/xmonad-extras.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "xmonad-extras";
version = "0.10.1.2";
sha256 = "1v0yhi3sw7qks8d13amps0qs5p90j3prjh5abm02wblcd0bm1xay";
version = "0.11";
sha256 = "09r64z09mfdz86k7v5c6zds9ng0fjcp44kd8f5qg1sz40yblrny5";
buildDepends = [
hint libmpd mtl network parsec random regexPosix split X11 xmonad
xmonadContrib

2
pkgs/build-support/fetchurl/mirrors.nix
View File

@ -20,8 +20,6 @@ rec {
http://kent.dl.sourceforge.net/sourceforge/
];
sf = sourceforge;
# GNU (http://www.gnu.org/prep/ftp.html).
gnu = [
# This one redirects to a (supposedly) nearby and (supposedly) up-to-date

79
pkgs/build-support/replace-dependency.nix Normal file
View File

@ -0,0 +1,79 @@
{ runCommand, nix, lib }:
# Replace a single dependency in the requisites tree of drv, propagating
# the change all the way up the tree, without a full rebuild. This can be
# useful, for example, to patch a security hole in libc and still use your
# system safely without rebuilding the world. This should be a short term
# solution, as soon as a rebuild can be done the properly rebuild derivation
# should be used. The old dependency and new dependency MUST have the same-length
# name, and ideally should have close-to-identical directory layout.
#
# Example: safeFirefox = replaceDependency {
# drv = firefox;
# oldDependency = glibc;
# newDependency = overrideDerivation glibc (attrs: {
# patches = attrs.patches ++ [ ./fix-glibc-hole.patch ];
# });
# };
# This will rebuild glibc with your security patch, then copy over firefox
# (and all of its dependencies) without rebuilding further.
{ drv, oldDependency, newDependency }:
with lib;
let
references = import (runCommand "references.nix" { exportReferencesGraph = [ "graph" drv ]; } ''
(echo {
while read path
do
echo " \"$path\" = ["
read count
read count
while [ "0" != "$count" ]
do
read ref_path
if [ "$ref_path" != "$path" ]
then
echo " (builtins.storePath $ref_path)"
fi
count=$(($count - 1))
done
echo " ];"
done < graph
echo }) > $out
'').outPath;
discard = builtins.unsafeDiscardStringContext;
oldStorepath = builtins.storePath (discard (toString oldDependency));
referencesOf = drv: getAttr (discard (toString drv)) references;
dependsOnOld = drv: elem oldStorepath (referencesOf drv) ||
any dependsOnOld (referencesOf drv);
drvName = drv:
discard (substring 33 (stringLength (builtins.baseNameOf drv)) (builtins.baseNameOf drv));
rewriteHashes = drv: hashes: runCommand (drvName drv) { nixStore = "${nix}/bin/nix-store"; } ''
$nixStore --dump ${drv} | sed 's|${baseNameOf drv}|'$(basename $out)'|g' | sed -e ${
concatStringsSep " -e " (mapAttrsToList (name: value:
"'s|${baseNameOf name}|${baseNameOf value}|g'"
) hashes)
} | $nixStore --restore $out
'';
rewrittenDeps = listToAttrs [ {name = discard (toString oldDependency); value = newDependency;} ];
rewrittenDerivations = drv:
if dependsOnOld drv
then listToAttrs [ {
name = discard (toString drv);
value = rewriteHashes drv (rewrittenDeps // (fold (drv: acc:
(rewrittenDerivations drv) // acc
) {} (referencesOf drv)));
} ]
else {};
in assert (stringLength (drvName (toString oldDependency)) == stringLength (drvName (toString newDependency)));
getAttr (discard (toString drv)) (rewrittenDerivations drv)

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://sourceforge/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;

4
pkgs/desktops/xfce-4.8/applications/terminal.nix
View File

@ -7,9 +7,9 @@
stdenv.mkDerivation {
name = "xfce-terminal-0.4.8";
src = fetchurl {
url = http://archive.xfce.org/src/apps/terminal/0.4/Terminal-0.4.8.tar.bz2;
url = http://archive.xfce.org/src/apps/xfce4-terminal/0.4/Terminal-0.4.8.tar.bz2;
sha1 = "2f12c3a0fffad18976d47e531d404ee308cb2f05";
};

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/interpreters/python/2.6/default.nix
View File

@ -9,11 +9,13 @@ with stdenv.lib;
let
majorVersion = "2.6";
version = "${majorVersion}.7";
version = "${majorVersion}.8";
# http://www.python.org/download/releases/2.6.8/
# md5 taken from webpage, python 2.6 will receive security fixes until Oct 2013
src = fetchurl {
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
sha256 = "0p0fd8i533zsdm6gc0jmhmdifccx4v064mh0i1hl2s6fcjhc20j5";
md5 = "c6e0420a21d8b23dee8b0195c9b9a125";
};
patches =
@ -51,6 +53,10 @@ let
for i in /usr /sw /opt /pkg; do
substituteInPlace ./setup.py --replace $i /no-such-path
done
'' + optionalString (stdenv ? gcc && stdenv.gcc.libc != null) ''
for i in Lib/plat-*/regen; do
substituteInPlace $i --replace /usr/include/ ${stdenv.gcc.libc}/include/
done
'';
NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2";

6
pkgs/development/libraries/apr-util/default.nix
View File

@ -9,11 +9,11 @@ assert bdbSupport -> db4 != null;
assert ldapSupport -> openldap != null;
stdenv.mkDerivation rec {
name = "apr-util-1.4.1";
name = "apr-util-1.5.1";
src = fetchurl {
url = "mirror://apache/apr/${name}.tar.bz2";
md5 = "52b31b33fb1aa16e65ddaefc76e41151";
md5 = "9c1db8606e520f201c451ec9a0b095f6";
};
configureFlags = ''
@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = stdenv.lib.optional ldapSupport openldap;
enableParallelBuilding = true;
passthru = {
inherit sslSupport bdbSupport ldapSupport;
};

2
pkgs/development/libraries/clucene-core/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "clucene-core-0.9.21b";
src = fetchurl {
url = "mirror://sf/clucene/${name}.tar.bz2";
url = "mirror://sourceforge/clucene/${name}.tar.bz2";
sha256 = "202ee45af747f18642ae0a088d7c4553521714a511a1a9ec99b8144cf9928317";
};

2
pkgs/development/libraries/cppunit/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "cppunit-1.12.0";
src = fetchurl {
url = mirror://sf/cppunit/cppunit-1.12.0.tar.gz;
url = mirror://sourceforge/cppunit/cppunit-1.12.0.tar.gz;
sha256 = "07zyyx5dyai94y8r8va28971f5mw84mb93xx9pm6m4ddpj6c79cq";
};

85
pkgs/development/libraries/ffmpeg/1.1.nix Normal file
View File

@ -0,0 +1,85 @@
{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib
, mp3Support ? true, lame ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
, vorbisSupport ? true, libvorbis ? null
, vpxSupport ? false, libvpx ? null
, x264Support ? true, x264 ? null
, xvidSupport ? true, xvidcore ? null
, vdpauSupport ? true, libvdpau ? null
, faacSupport ? false, faac ? null
, dc1394Support ? false, libdc1394 ? null
, x11grabSupport ? false, libXext ? null, libXfixes ? null
}:
assert speexSupport -> speex != null;
assert theoraSupport -> libtheora != null;
assert vorbisSupport -> libvorbis != null;
assert vpxSupport -> libvpx != null;
assert x264Support -> x264 != null;
assert xvidSupport -> xvidcore != null;
assert vdpauSupport -> libvdpau != null;
assert faacSupport -> faac != null;
assert x11grabSupport -> libXext != null && libXfixes != null;
stdenv.mkDerivation rec {
name = "ffmpeg-1.1";
src = fetchurl {
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
sha256 = "03s1zsprz5p6gjgwwqcf7b6cvzwwid6l8k7bamx9i0f1iwkgdm0j";
};
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that
# the resulting library is GPL'ed, so it can only be used in GPL'ed
# applications.
configureFlags = [
"--enable-gpl"
"--enable-postproc"
"--enable-swscale"
"--disable-ffplay"
"--enable-shared"
"--enable-runtime-cpudetect"
]
++ stdenv.lib.optional mp3Support "--enable-libmp3lame"
++ stdenv.lib.optional speexSupport "--enable-libspeex"
++ stdenv.lib.optional theoraSupport "--enable-libtheora"
++ stdenv.lib.optional vorbisSupport "--enable-libvorbis"
++ stdenv.lib.optional vpxSupport "--enable-libvpx"
++ stdenv.lib.optional x264Support "--enable-libx264"
++ stdenv.lib.optional xvidSupport "--enable-libxvid"
++ stdenv.lib.optional vdpauSupport "--enable-vdpau"
++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"
++ stdenv.lib.optional dc1394Support "--enable-libdc1394"
++ stdenv.lib.optional x11grabSupport "--enable-x11grab";
buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib ]
++ stdenv.lib.optional mp3Support lame
++ stdenv.lib.optional speexSupport speex
++ stdenv.lib.optional theoraSupport libtheora
++ stdenv.lib.optional vorbisSupport libvorbis
++ stdenv.lib.optional vpxSupport libvpx
++ stdenv.lib.optional x264Support x264
++ stdenv.lib.optional xvidSupport xvidcore
++ stdenv.lib.optional vdpauSupport libvdpau
++ stdenv.lib.optional faacSupport faac
++ stdenv.lib.optional dc1394Support libdc1394
++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ];
enableParallelBuilding = true;
crossAttrs = {
dontSetConfigureCross = true;
configureFlags = configureFlags ++ [
"--cross-prefix=${stdenv.cross.config}-"
"--enable-cross-compile"
"--target_os=linux"
"--arch=${stdenv.cross.arch}"
];
};
meta = {
homepage = http://www.ffmpeg.org/;
description = "A complete, cross-platform solution to record, convert and stream audio and video";
};
}

4
pkgs/development/libraries/gts/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, glib, pkgconfig }:
{ fetchurl, stdenv, glib, pkgconfig, gettext }:
stdenv.mkDerivation rec {
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "07mqx09jxh8cv9753y2d2jsv7wp8vjmrd7zcfpbrddz3wc9kx705";
};
buildInputs = [ glib pkgconfig ];
buildInputs = [ glib pkgconfig ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext;
meta = {
homepage = http://gts.sourceforge.net/;

4
pkgs/development/libraries/haskell/active/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "active";
version = "0.1.0.2";
sha256 = "1iymh3sd21ba7ijwv5afphn5vhmwchk6725hbcsdwk2d2x2gd674";
version = "0.1.0.3";
sha256 = "0jarc270z6raak1vz30jy2gl0pkj9a2x3ib5hq7vsl2ljbvbgyqi";
buildDepends = [ newtype semigroupoids semigroups vectorSpace ];
jailbreak = true;
meta = {

4
pkgs/development/libraries/haskell/cipher-aes/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cipher-aes";
version = "0.1.5";
sha256 = "0n0qbq2hwyksdbr6fn7yj5vwicmdrn58mfz0dprl8fj456r4j3kn";
version = "0.1.7";
sha256 = "1iai9c4rvxframylvc0xwx2nk6s0rsj4dc42wi334xyinilvfyng";
meta = {
homepage = "http://github.com/vincenthz/hs-cipher-aes";
description = "Fast AES cipher implementation with advanced mode of operations";

4
pkgs/development/libraries/haskell/cprng-aes/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cprng-aes";
version = "0.3.2";
sha256 = "1xwwhg83llf9fzfafxsky65biwk0sla9273rp4gqr7vg9p02k221";
version = "0.3.4";
sha256 = "0k1zh4nw30qgdrkgn6x6zfbpp129f9cparzyqsdqfbf44j0mf2rw";
buildDepends = [
cipherAes cryptoApi cryptoRandomApi entropy random
];

4
pkgs/development/libraries/haskell/diagrams/core.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "diagrams-core";
version = "0.6";
sha256 = "15frd5jdzkgpdcvyyhd0mbi5d4a69ajcnxawa1gafl4c3byz1778";
version = "0.6.0.1";
sha256 = "0kw0rxk9a2zkpnbx4bfd0japm75y29ldvdn7i3c93kvz0p6jc2wa";
buildDepends = [
dualTree MemoTrie monoidExtras newtype semigroups vectorSpace
vectorSpacePoints

4
pkgs/development/libraries/haskell/diagrams/lib.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "diagrams-lib";
version = "0.6";
sha256 = "05nfp5ggjk4fviwvwiblmzzw5dbzbi1w8dx5dimvah7wxb0km3lf";
version = "0.6.0.1";
sha256 = "00ysdppl2jv0kspj0pjy8qj8shc9gg6g10lkq62vlvr39wnxx6yj";
buildDepends = [
active colour dataDefault diagramsCore monoidExtras newtype
NumInstances semigroups vectorSpace

14
pkgs/development/libraries/haskell/dimensional-tf/default.nix Normal file
View File

@ -0,0 +1,14 @@
{ cabal, numtypeTf, time }:
cabal.mkDerivation (self: {
pname = "dimensional-tf";
version = "0.1.1";
sha256 = "0hhp2nx8xyk5ms3mzg1d3jhzm1b0bxz7aijxqasrxjq9p04jr2ci";
buildDepends = [ numtypeTf time ];
meta = {
homepage = "http://dimensional.googlecode.com/";
description = "Statically checked physical dimensions, implemented using type families";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/dual-tree/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "dual-tree";
version = "0.1.0.0";
sha256 = "0av525gjxzd2hhrg5da647chwbv4j30gccaff2b3n5qijzy8l167";
version = "0.1.0.1";
sha256 = "09bdid65frccpbh1bs01f7vprq0vfgqsb5bfa4j8yi3q773mycb2";
buildDepends = [ monoidExtras newtype semigroups ];
jailbreak = true;
meta = {

5
pkgs/development/libraries/haskell/gitit/default.nix
View File

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "gitit";
version = "0.10.1.1";
sha256 = "1akrc362cf3fzfjyyf1g8bzna093kwsiyxdfpz0d9wd3z6jyc8cg";
version = "0.10.1.2";
sha256 = "1dy1wdnld6cxx5xqfszywi4f7xv143ar2dq4nb0dnd1dgd5hgmak";
isLibrary = true;
isExecutable = true;
buildDepends = [
@ -18,7 +18,6 @@ cabal.mkDerivation (self: {
safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize
zlib
];
jailbreak = true;
meta = {
homepage = "http://gitit.net";
description = "Wiki using happstack, git or darcs, and pandoc";

4
pkgs/development/libraries/haskell/http-conduit/default.nix
View File

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "http-conduit";
version = "1.8.6.2";
sha256 = "0b9iw8gq0kyfmnpv1jba2dx8rik9136zx5q9xdyvy0lczdgb8i09";
version = "1.8.6.3";
sha256 = "0ykwfii3qcj77ai0jafgbf5017mckz51gmbk3m8kwm1z6dalb27r";
buildDepends = [
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
blazeBuilderConduit caseInsensitive certificate conduit cookie

14
pkgs/development/libraries/haskell/lens/default.nix
View File

@ -1,16 +1,16 @@
{ cabal, comonad, comonadsFd, comonadTransformers, filepath
, hashable, mtl, parallel, semigroups, split, text, transformers
, unorderedContainers, vector
, hashable, mtl, nats, parallel, semigroups, split, text
, transformers, transformersCompat, unorderedContainers, vector
}:
cabal.mkDerivation (self: {
pname = "lens";
version = "3.7.2";
sha256 = "14kc9yhq7niv49gpdcl55priwnvisawa9jsp8hnplk48p11i2xs3";
version = "3.7.3";
sha256 = "0mvwczviszfv52ylymvrz3zk6s05ngmqc2g1k4r6pym8s9cmgmzz";
buildDepends = [
comonad comonadsFd comonadTransformers filepath hashable mtl
parallel semigroups split text transformers unorderedContainers
vector
comonad comonadsFd comonadTransformers filepath hashable mtl nats
parallel semigroups split text transformers transformersCompat
unorderedContainers vector
];
patchPhase = ''
sed -i -e 's|semigroups.*,|semigroups,|' lens.cabal

4
pkgs/development/libraries/haskell/libmpd/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "libmpd";
version = "0.8.0.1";
sha256 = "16j2c0dnwllsb979gqf1cl4ylvpldcj8k32ddpp4wf62lbb1mqxm";
version = "0.8.0.2";
sha256 = "1phlbb5lsapw2hb0db7906ddlmvnpyk1xbgxvl9zp9zfd0sn40aj";
buildDepends = [ filepath mtl network text time utf8String ];
meta = {
homepage = "http://github.com/joachifm/libmpd-haskell";

4
pkgs/development/libraries/haskell/monoid-extras/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "monoid-extras";
version = "0.2.2.1";
sha256 = "0n2zwkwwq8kg9m6qr79mrhlxsfsrjzbyg96gfhcgk21zgc09zary";
version = "0.2.2.2";
sha256 = "1fz93hm0sswisvwvbygxvbwmmnzqcxmz9h82i4361wzychf2si22";
buildDepends = [ semigroups ];
jailbreak = true;
meta = {

6
pkgs/development/libraries/haskell/multiarg/default.nix
View File

@ -2,13 +2,13 @@
cabal.mkDerivation (self: {
pname = "multiarg";
version = "0.6.0.0";
sha256 = "1qrw1rajdvrvd297a7lpfkxm5qqhwmnnl5jiagjwzb9lckgpy87y";
version = "0.8.0.0";
sha256 = "17zfrm9zjf7c8g7q9vqj1srk0g766ifhwqp7gm4ql890541q5lv5";
buildDepends = [ explicitException utf8String ];
meta = {
homepage = "https://github.com/massysett/multiarg";
description = "Combinators to build command line parsers";
license = self.stdenv.lib.licenses.mit;
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};

12
pkgs/development/libraries/haskell/nat/default.nix Normal file
View File

@ -0,0 +1,12 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "nat";
version = "0.3";
sha256 = "1v43c1dr72qn8mymnwcq6an8sqxjaxhac037k4gbv8z8bg18zmf5";
meta = {
description = "Lazy binary natural numbers";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

13
pkgs/development/libraries/haskell/naturals/default.nix Normal file
View File

@ -0,0 +1,13 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "naturals";
version = "0.2.0.2";
sha256 = "1ay291833dcah411zc3r4qjilaw8x13ljlnb5z40d1s7784djm16";
meta = {
homepage = "frigidcode.com";
description = "Constructors and related functions for natural numbers";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

13
pkgs/development/libraries/haskell/numtype-tf/default.nix Normal file
View File

@ -0,0 +1,13 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "numtype-tf";
version = "0.1";
sha256 = "1hvnqgjg7yifxdsji9v0wqwbp4syhdc97pa3nrn4p96g7kmvw25v";
meta = {
homepage = "http://dimensional.googlecode.com/";
description = "Type-level (low cardinality) integers, implemented using type families";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/reactive-banana/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "reactive-banana";
version = "0.7.1.0";
sha256 = "0diklfkc4fq05g5fhgcdkx8y0vmq26zfnmfkj95yvmwks8p9k22r";
version = "0.7.1.1";
sha256 = "0d4dqpzglzkygy2hhn1j1c7vk2782mk66f8aqaadkyhijn7kc6i5";
buildDepends = [ hashable transformers unorderedContainers vault ];
meta = {
homepage = "http://haskell.org/haskellwiki/Reactive-banana";

12
pkgs/development/libraries/haskell/type-level-natural-number/default.nix Normal file
View File

@ -0,0 +1,12 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "type-level-natural-number";
version = "1.1.1";
sha256 = "1zc26nckpcixxp1m818jhzi3dj1ysnjfc2xliq4rpmf5583k6mjw";
meta = {
description = "Simple, Haskell 2010-compatible type level natural numbers";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/wai-extra/default.nix
View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "wai-extra";
version = "1.3.1.1";
sha256 = "0590i9zs47fxqlz4l7zrk15x4s1rvzvp0fs1caygr5hw32v8h0by";
version = "1.3.2";
sha256 = "1089sfb4jyi17rw6nivpy96gbc90nyawr35jzwlzl41gzxxmv503";
buildDepends = [
ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive
conduit dataDefault dateCache fastLogger httpTypes network

4
pkgs/development/libraries/haskell/warp/default.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "warp";
version = "1.3.6";
sha256 = "0aw5m7apj7l6fjb0w59bmgiy4j0rmdwjil4ppgp5qz2q2njqbbnj";
version = "1.3.7";
sha256 = "06648wqiwlcsvd41qdqdbgn1zcq890iq39zsxi24vf4s8q7jnzyf";
buildDepends = [
blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
httpTypes liftedBase network networkConduit simpleSendfile

2
pkgs/development/libraries/hunspell/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "hunspell-1.3.2";
src = fetchurl {
url = "mirror://sf/hunspell/${name}.tar.gz";
url = "mirror://sourceforge/hunspell/${name}.tar.gz";
sha256 = "1gfxdajnqk2civkshkfjx5ldg7kjdgj76m5khpsbjk4lxsjd9vdl";
};

2
pkgs/development/libraries/indilib/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "indilib-0.8";
src = fetchurl {
url = mirror://sf/indi/libindi_0.8.tar.gz;
url = mirror://sourceforge/indi/libindi_0.8.tar.gz;
sha256 = "d5ed14a5de6fd6e5db15463ada96c2b15b53e84a1ffe199b76f70128493f2a65";
};

9
pkgs/development/libraries/iso-codes/default.nix
View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, gettext, python}:
{stdenv, fetchurl, gettext, python, xz}:
stdenv.mkDerivation rec {
name = "iso-codes-3.23";
name = "iso-codes-3.40";
src = fetchurl {
url = "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/${name}.tar.bz2";
sha256 = "0lf9phrdr10biihqswq1qmwk5cz954nwavgbnpm7a5r6vzfzkfbq";
url = "http://pkg-isocodes.alioth.debian.org/downloads/${name}.tar.xz";
sha256 = "0iph96n8vh4khidxg2zzhmcqnphfzg50agn0lv9cjhmnx0i712pr";
};
patchPhase = ''
for i in `find . -name \*.py`
@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
done
'';
buildInputs = [ gettext ];
nativeBuildInputs = [ xz ];
meta = {
homepage = http://pkg-isocodes.alioth.debian.org/;

2
pkgs/development/libraries/libnova/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "libnova-0.12.1";
src = fetchurl {
url = "mirror://sf/libnova/${name}.tar.gz";
url = "mirror://sourceforge/libnova/${name}.tar.gz";
sha256 = "0bs6c45q4qkrns36qndl8vns5gvhgpd90hi68bhah4r4hrg48lw0";
};

2
pkgs/development/libraries/libqalculate/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "libqalculate-0.9.7";
src = fetchurl {
url = "mirror://sf/qalculate/${name}.tar.gz";
url = "mirror://sourceforge/qalculate/${name}.tar.gz";
sha256 = "0mbrc021dk0ayyglk4qyf9328cayrlz2q94lh8sh9l9r6g79fvcs";
};

4
pkgs/development/libraries/libvdpau/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libX11 }:
stdenv.mkDerivation rec {
name = "libvdpau-0.4.1";
name = "libvdpau-0.5";
src = fetchurl {
url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz";
sha256 = "16zmmbawfnvrxjqvgfwxjfd1wh3vyz2cmvxza6cgf4j9qs36y6q6";
sha256 = "0k2ydz4yp7zynlkpd1llfwax30xndwbca36z83ah1i4ldjw2gfhx";
};
buildInputs = [ pkgconfig libX11 ];

2
pkgs/development/libraries/libxklavier/default.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
name = "libxklavier-5.0";
src = fetchurl {
url = "mirror://sf/gswitchit/${name}.tar.bz2";
url = "mirror://sourceforge/gswitchit/${name}.tar.bz2";
sha256 = "1c2dxinjfpq1lzxi0z46r0j80crbmwb0lkvnh6987cjjlwblpnfz";
};

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/;

5
pkgs/development/libraries/nss/default.nix
View File

@ -13,8 +13,9 @@ let
secLoadPatch = fetchurl {
name = "security_load.patch";
urls = [
"http://patch-tracker.debian.org/patch/series/dl/nss/2:3.13.6-1/85_security_load.patch"
"http://anonscm.debian.org/gitweb/?p=pkg-mozilla/nss.git;a=blob_plain;f=debian/patches/85_security_load.patch;hb=HEAD"
# "http://patch-tracker.debian.org/patch/series/dl/nss/2:3.13.6-1/85_security_load.patch"
# "http://anonscm.debian.org/gitweb/?p=pkg-mozilla/nss.git;a=blob_plain;f=debian/patches/85_security_load.patch;hb=HEAD"
"http://www.parsix.org/export/7797/pkg/security/raul/main/nss/trunk/debian/patches/85_security_load.patch"
];
sha256 = "8a8d0ae4ebbd7c389973fa5d26d8bc5f473046c6cb1d8283cb9a3c1f4c565c47";
};

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" ]

2
pkgs/development/libraries/qimageblitz/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation {
name = "${pn}-${v}";
src = fetchurl {
url = "mirror://sf/${pn}/${pn}-${v}.tar.bz2";
url = "mirror://sourceforge/${pn}/${pn}-${v}.tar.bz2";
sha256 = "0pnaf3qi7rgkxzs2mssmslb3f9ya4cyx09wzwlis3ppyvf72j0p9";
};

2
pkgs/development/libraries/qjson/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "qjson-0.7.1";
src = fetchurl {
url = "mirror://sf/qjson/${name}.tar.bz2";
url = "mirror://sourceforge/qjson/${name}.tar.bz2";
sha256 = "155r7nypgnsvjc6w3q51zmjchpqxi4c3azad9cf1fip8bws993iv";
};

2
pkgs/development/libraries/science/math/atlas/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation {
name = "atlas-3.9.67";
src = fetchurl {
url = mirror://sf/math-atlas/atlas3.9.67.tar.bz2;
url = mirror://sourceforge/math-atlas/atlas3.9.67.tar.bz2;
sha256 = "06xxlv440z8a3qmfrh17p28girv71c6awvpw5vhpspr0pcsgk1pa";
};

22
pkgs/development/libraries/tsocks/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "tsocks-${version}";
version = "1.8beta5";
src = fetchurl {
url = "mirror://sourceforge/tsocks/${name}.tar.gz";
sha256 = "0ixkymiph771dcdzvssi9dr2pk1bzaw9zv85riv3xl40mzspx7c4";
};
preConfigure = ''
export configureFlags="$configureFlags --libdir=$out/lib"
'';
meta = with stdenv.lib; {
description = "Transparent SOCKS v4 proxying library";
homepage = http://tsocks.sourceforge.net/;
license = "GPLv2";
maintainers = [ maintainers.phreedom ];
platforms = platforms.linux;
};
}

3
pkgs/development/python-modules/generic/default.nix
View File

@ -37,6 +37,7 @@
runHook postCheck
''
, preInstall ? ""
, postInstall ? ""
, ... } @ attrs:
@ -63,7 +64,7 @@ python.stdenv.mkDerivation (attrs // {
${preConfigure}
'';
installPhase = ''
installPhase = preInstall + ''
mkdir -p "$out/lib/${python.libPrefix}/site-packages"
echo "installing \`${name}' with \`easy_install'..."

11
pkgs/games/bsdgames/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, ncurses, openssl, flex, bison, miscfiles}:
{stdenv, fetchurl, ncurses, openssl, flex, bison, less, miscfiles}:
stdenv.mkDerivation {
name = "bsd-games-2.17";
@ -26,12 +26,19 @@ stdenv.mkDerivation {
bsd_games_cfg_fortune_dir=$out/share/games/fortune
bsd_games_cfg_quiz_dir=$out/share/games/quiz
bsd_games_cfg_gamesdir=$out/bin
bsd_games_cfg_sbindir=$out/bin
bsd_games_cfg_usrbindir=$out/bin
bsd_games_cfg_libexecdir=$out/lib/games/dm
bsd_games_cfg_docdir=$out/share/doc/bsd-games
bsd_games_cfg_sharedir=$out/share/games
bsd_games_cfg_varlibdir=.
bsd_games_cfg_non_interactive=y
bsd_games_cfg_no_build_dirs="dab hack phantasia sail"
bsd_games_cfg_dictionary_src=${miscfiles}/share/dict/words
bsd_games_cfg_pager=${less}
EOF
sed -e s/getline/sdgames_local_getline/g -i $(grep getline -rl .)
sed -e s/getline/bsdgames_local_getline/g -i $(grep getline -rl .)
'';
postConfigure = ''

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 = {

8
pkgs/games/uqm/default.nix
View File

@ -8,22 +8,22 @@ stdenv.mkDerivation rec {
version = "0.7.0";
src = fetchurl {
url = "mirror://sf/sc2/uqm-${version}-source.tgz";
url = "mirror://sourceforge/sc2/uqm-${version}-source.tgz";
sha256 = "a3695c5f7f0be7ec9c0f80ec569907b382023a1fee6e635532bd53b7b53bb221";
};
content = fetchurl {
url = "mirror://sf/sc2/uqm-${version}-content.uqm";
url = "mirror://sourceforge/sc2/uqm-${version}-content.uqm";
sha256 = "b8f6db8ba29f0628fb1d5c233830896b19f441aee3744bda671ea264b44da3bf";
};
voice = fetchurl {
url = "mirror://sf/sc2/uqm-${version}-voice.uqm";
url = "mirror://sourceforge/sc2/uqm-${version}-voice.uqm";
sha256 = "bcccf801b4ba37594ff6217b292744ea586ee2d447e927804842ccae8b73c979";
};
music = fetchurl {
url = "mirror://sf/sc2/uqm-${version}-3domusic.uqm";
url = "mirror://sourceforge/sc2/uqm-${version}-3domusic.uqm";
sha256 = "c57085e64dad4bddf8a679a9aa2adf63f2156d5f6cbabe63af80519033dbcb82";
};

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>";

49
pkgs/misc/emulators/wine/wine-warcraft.nix
View File

@ -1,49 +0,0 @@
{ stdenv, fetchgit, xlibs, flex, bison, mesa, alsaLib
, ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge
, libxml2, libxslt, openssl, gnutls
}:
assert stdenv.isLinux;
assert stdenv.gcc.gcc != null;
stdenv.mkDerivation rec {
name = "wine-warcraft-${version}";
version = "1.1.19";
src = fetchgit {
url = git://repo.or.cz/wine/warcraft3.git;
rev = "38faaffd99331b71284d8da5f76f38625107ed6d";
};
buildInputs = [
xlibs.xlibs flex bison xlibs.libXi mesa
xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr
xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite
xlibs.xf86vidmodeproto
alsaLib ncurses libpng libjpeg lcms fontforge
libxml2 libxslt openssl gnutls
];
# Wine locates a lot of libraries dynamically through dlopen(). Add
# them to the RPATH so that the user doesn't have to set them in
# LD_LIBRARY_PATH.
NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [
freetype fontconfig stdenv.gcc.gcc mesa mesa.libdrm
xlibs.libXinerama xlibs.libXrender xlibs.libXrandr
xlibs.libXcursor xlibs.libXcomposite xlibs.libXxf86vm
xlibs.xf86vidmodeproto
openssl gnutls
];
# Don't shrink the ELF RPATHs in order to keep the extra RPATH
# elements specified above.
dontPatchELF = true;
meta = with stdenv.lib; {
homepage = "http://www.winehq.org/";
license = "LGPL";
description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix with patches for Warcraft 3";
maintainers = [ maintainers.phreedom ];
platforms = [ "i686-linux" ];
};
}

11
pkgs/os-specific/linux/acpi/default.nix
View File

@ -1,11 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "acpi-1.5";
name = "acpi-${version}";
version = "1.6";
src = fetchurl {
url = "http://ftp.de.debian.org/debian/pool/main/a/acpi/acpi_1.5.orig.tar.gz";
sha256 = "1pb020j627ldjm1askqfzp6cjxrs79ail8svihanv7pgbg5r3zsp";
url = "mirror://sourceforge/acpiclient/${version}/${name}.tar.gz";
sha256 = "0cawznhkzb51yxa599d1xkw05nklmjrrmd79vmjkkzf4002d4qgd";
};
meta = {
@ -15,7 +16,7 @@ stdenv.mkDerivation rec {
the "old" `apm' command on ACPI systems. It includes
battery and thermal information.
'';
homepage = http://grahame.angrygoats.net/acpi.shtml;
homepage = http://sourceforge.net/projects/acpiclient/;
license = "GPLv2+";
};
}

5
pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix
View File

@ -4,7 +4,8 @@ stdenv.mkDerivation rec {
name = "iwlwifi-1000-ucode-128.50.3.1";
src = fetchurl {
url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz";
url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz";
name = "${name}.tgz";
sha256 = "7e81ddad18acec19364c9df22496e8afae99a2e1490b2b178e420b52d443728d";
};
@ -26,6 +27,6 @@ stdenv.mkDerivation rec {
driver found in recent kernels.
'';
homepage = http://intellinuxwireless.org/;
homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi;
};
}

5
pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix
View File

@ -4,7 +4,8 @@ stdenv.mkDerivation rec {
name = "iwlwifi-5150-ucode-8.24.2.2";
src = fetchurl {
url = "http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-5150-ucode-8.24.2.2.tgz";
url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz";
name = "${name}.tgz";
sha256 = "d253e6ff6624639aded67c82df98b2bc4a66eb66400848d5614921d513540cf9";
};
@ -24,6 +25,6 @@ stdenv.mkDerivation rec {
firmware. It contains the `iwlwifi-5150-2.ucode' file.
'';
homepage = http://intellinuxwireless.org/;
homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi;
};
}

5
pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix
View File

@ -4,7 +4,8 @@ stdenv.mkDerivation rec {
name = "iwlwifi-6000-ucode-9.221.4.1";
src = fetchurl {
url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz";
url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz";
name = "${name}.tgz";
sha256 = "7f04623231663dc4ee63df32fd890bfa9514dce1fab9dc7a25fda90350da836b";
};
@ -24,6 +25,6 @@ stdenv.mkDerivation rec {
firmware. It contains the `iwlwifi-6000-4.ucode' file.
'';
homepage = http://intellinuxwireless.org/;
homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi;
};
}

5
pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix
View File

@ -4,7 +4,8 @@ stdenv.mkDerivation rec {
name = "iwlwifi-6000g2a-ucode-18.168.6.1";
src = fetchurl {
url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz";
url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz";
name = "${name}.tgz";
sha256 = "a7f2615756addafbf3e6912cb0265f9650b2807d1ccdf54b620735772725bbe9";
};
@ -17,7 +18,7 @@ stdenv.mkDerivation rec {
'';
meta = {
homepage = "http://intellinuxwireless.org/";
homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi;
description = "Firmware for the Intel 6000 Series Gen2 wireless card";
longDescription = ''

5
pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix
View File

@ -4,7 +4,8 @@ stdenv.mkDerivation rec {
name = "iwlwifi-6000g2b-ucode-17.168.5.2";
src = fetchurl {
url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz";
url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz";
name = "${name}.tgz";
sha256 = "5e4afdf070bfef549e50e62187f22dc2e40f5d9fe8b9a77561f8f3efb0d1d052";
};
@ -24,6 +25,6 @@ stdenv.mkDerivation rec {
firmware. It contains the `iwlwifi-6000g2b-4.ucode' file.
'';
homepage = http://intellinuxwireless.org/;
homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi;
};
}

4
pkgs/os-specific/linux/kernel/linux-3.0.nix
View File

@ -230,7 +230,7 @@ in
import ./generic.nix (
rec {
version = "3.0.57";
version = "3.0.58";
preConfigure = ''
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
@ -238,7 +238,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "12rf48ymwsgr133d6cydsajjxb3zihrcrfhpdv185x07dbri9nbl";
sha256 = "10ahi60ass970vjlhnzcf0y5fk3g7ck1a1lnwzy0kkywp6nb2c10";
};
config = configWithPlatform stdenv.platform;

4
pkgs/os-specific/linux/kernel/linux-3.4.nix
View File

@ -239,7 +239,7 @@ in
import ./generic.nix (
rec {
version = "3.4.24";
version = "3.4.25";
testing = false;
preConfigure = ''
@ -248,7 +248,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "1vxyb68ckzgm88jj7xzmwr2hmj5vdry5irvfr89klgqr95mmhkd1";
sha256 = "0jlnrjxyyfw2f87mr9y8c4337yfbnrj5jp3vhm33dwy7i3vdpfs6";
};
config = configWithPlatform stdenv.platform;

4
pkgs/os-specific/linux/kernel/linux-3.7.nix
View File

@ -245,7 +245,7 @@ in
import ./generic.nix (
rec {
version = "3.7.1";
version = "3.7.2";
testing = false;
preConfigure = ''
@ -254,7 +254,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "0mbjvrr0658gg052hbf32vfcmlzfsr777wgmaxrpkpzbfs1qpjp1";
sha256 = "09s1z2z15xnnqm2syr76l7s3s14zzsalifnnfmry52ibizllzh04";
};
config = configWithPlatform stdenv.platform;

8
pkgs/os-specific/linux/lxc/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, libcap, perl, docbook2x, docbook_xml_dtd_45 }:
{ stdenv, fetchurl, libcap, apparmor, perl, docbook2x, docbook_xml_dtd_45 }:
stdenv.mkDerivation rec {
name = "lxc-0.8.0-rc2";
name = "lxc-0.8.0";
src = fetchurl {
url = "http://lxc.sf.net/download/lxc/${name}.tar.gz";
sha256 = "1f0ee0464507d26e494784e841b68c765ecd3abc5976012e226f69d1aa361bef";
sha256 = "0b3912mal1n56i1v5f3aplm7shqnlz24p0znpva27r4l1drk7j7a";
};
buildInputs = [ libcap perl docbook2x ];
buildInputs = [ libcap apparmor perl docbook2x ];
patches = [
./dont-run-ldconfig.patch

27
pkgs/os-specific/linux/nvidia-x11/acpixf.patch
View File

@ -1,27 +0,0 @@
diff -pur 96.43.20/conftest.sh 96.43.20-3.4/conftest.sh
--- 96.43.20/conftest.sh 2011-07-18 10:51:11.000000000 +0400
+++ 96.43.20-3.4/conftest.sh 2012-06-16 00:04:22.870746239 +0400
@@ -908,6 +908,7 @@ compile_test() {
#
echo "$CONFTEST_PREAMBLE
#include <acpi/acpi.h>
+ #include <acpi/acpixf.h>
void conftest_acpi_walk_namespace(void) {
acpi_walk_namespace();
}" > conftest$$.c
@@ -923,6 +924,7 @@ compile_test() {
echo "$CONFTEST_PREAMBLE
#include <acpi/acpi.h>
+ #include <acpi/acpixf.h>
void conftest_acpi_walk_namespace(void) {
acpi_walk_namespace(0, NULL, 0, NULL, NULL, NULL, NULL);
}" > conftest$$.c
@@ -939,6 +941,7 @@ compile_test() {
echo "$CONFTEST_PREAMBLE
#include <acpi/acpi.h>
+ #include <acpi/acpixf.h>
void conftest_acpi_walk_namespace(void) {
acpi_walk_namespace(0, NULL, 0, NULL, NULL, NULL);
}" > conftest$$.c

101
pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh Executable file
View File

@ -0,0 +1,101 @@
source $stdenv/setup
dontPatchELF=1 # must keep libXv, $out in RPATH
unpackFile() {
sh $src -x
}
buildPhase() {
if test -z "$libsOnly"; then
# Create the module.
echo "Building linux driver against kernel: $kernel";
cd kernel
kernelVersion=$(cd $kernel/lib/modules && ls)
sysSrc=$(echo $kernel/lib/modules/$kernelVersion/build/)
unset src # used by the nv makefile
# Hack necessary to compile on 2.6.28.
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$sysSrc/include/asm/mach-default -I$sysSrc/include/generated"
make SYSSRC=$sysSrc module
cd ..
fi
}
installPhase() {
# Install libGL and friends.
mkdir -p $out/lib/vendors
for f in \
libcuda libGL libnvcuvid libnvidia-cfg libnvidia-compiler \
libnvidia-glcore libnvidia-ml libnvidia-opencl \
libnvidia-tls libOpenCL libnvidia-tls libvdpau_nvidia
do
cp -prd $f.* $out/lib/
ln -snf $f.so.$versionNumber $out/lib/$f.so
ln -snf $f.so.$versionNumber $out/lib/$f.so.1
done
cp -p nvidia.icd $out/lib/vendors/
cp -prd tls $out/lib/
cp -prd libOpenCL.so.1.0.0 $out/lib/
ln -snf libOpenCL.so.1.0.0 $out/lib/libOpenCL.so
ln -snf libOpenCL.so.1.0.0 $out/lib/libOpenCL.so.1
patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.*
patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.*
patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.*
if test -z "$libsOnly"; then
# Install the kernel module.
mkdir -p $out/lib/modules/$kernelVersion/misc
cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc
# Install the X driver.
mkdir -p $out/lib/xorg/modules
cp -p libnvidia-wfb.* $out/lib/xorg/modules/
mkdir -p $out/lib/xorg/modules/drivers
cp -p nvidia_drv.so $out/lib/xorg/modules/drivers
mkdir -p $out/lib/xorg/modules/extensions
cp -p libglx.so.* $out/lib/xorg/modules/extensions
ln -snf libnvidia-wfb.so.$versionNumber $out/lib/xorg/modules/libnvidia-wfb.so.1
ln -snf libglx.so.$versionNumber $out/lib/xorg/modules/extensions/libglx.so
patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.*
# Install the programs.
mkdir -p $out/bin
for i in nvidia-settings nvidia-xconfig; do
cp $i $out/bin/$i
patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--set-rpath $out/lib:$programPath:$glPath $out/bin/$i
done
# Header files etc.
mkdir -p $out/include/nvidia
cp -p *.h $out/include/nvidia
mkdir -p $out/share/man/man1
cp -p *.1.gz $out/share/man/man1
mkdir -p $out/share/applications
cp -p *.desktop $out/share/applications
mkdir -p $out/share/pixmaps
cp -p nvidia-settings.png $out/share/pixmaps
# Patch the `nvidia-settings.desktop' file.
substituteInPlace $out/share/applications/nvidia-settings.desktop \
--replace '__UTILS_PATH__' $out/bin \
--replace '__PIXMAP_PATH__' $out/share/pixmaps
fi
}
genericBuild

12
pkgs/os-specific/linux/nvidia-x11/generated.patch
View File

@ -1,12 +0,0 @@
diff -pur 173.14.31/conftest.sh 173.14.31-3.3/conftest.sh
--- 173.14.31/conftest.sh 2011-07-18 09:49:58.000000000 +0400
+++ 173.14.31-3.3/conftest.sh 2012-04-09 19:33:34.407928432 +0400
@@ -123,7 +123,7 @@ build_cflags() {
CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/generated"
fi
if [ -n "$BUILD_PARAMS" ]; then
CFLAGS="$CFLAGS -D$BUILD_PARAMS"

2
pkgs/os-specific/linux/nvidia-x11/legacy304.nix
View File

@ -13,7 +13,7 @@ let versionNumber = "304.64"; in
stdenv.mkDerivation {
name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
builder = ./builder.sh;
builder = ./builder-legacy304.sh;
src =
if stdenv.system == "i686-linux" then

16
pkgs/os-specific/linux/nvidia-x11/legacy96.nix
View File

@ -2,7 +2,7 @@
let
versionNumber = "96.43.20";
versionNumber = "96.43.23";
in
@ -15,27 +15,17 @@ stdenv.mkDerivation {
if stdenv.system == "i686-linux" then
fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run";
sha256 = "05vm36jnydp4cfdkfvrvxczd64i3f0pp0yp7dn8y8pklrxi80xxw";
sha256 = "0hi10h26l51mknr57zsdg0zaxcqdz1lp3hsz0hi1c1vkpbsavrji";
}
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}-pkg0.run";
sha256 = "0a8ninp4wyql3xh6z93dzhbacvz7g0h8gs4pg5279a0i6h05wb1w";
sha256 = "09vynha40rsxpklj1m0qjfg853ckdpi9g87h06irikh405x57kzp";
}
else throw "nvidia-x11 does not support platform ${stdenv.system}";
inherit versionNumber kernel;
# Only for kernels 3.4 and over
# Patches taken from arch linux AUR
# https://aur.archlinux.org/packages.php?ID=57698
kpatches = stdenv.lib.optionals (stdenv.lib.strings.versionOlder "3.4" kernel.version)
[ ./acpixf.patch
./generated.patch
./patchlevel.patch
./switch_to.patch
];
dontStrip = true;
glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr];

59
pkgs/os-specific/linux/nvidia-x11/patchlevel.patch
View File

@ -1,59 +0,0 @@
diff -pur 96.43.20-t1/conftest.sh 96.43.20-t2/conftest.sh
--- 96.43.20-t1/conftest.sh 2012-06-16 17:14:47.206589267 +0400
+++ 96.43.20-t2/conftest.sh 2012-06-16 15:35:45.049203248 +0400
@@ -1303,10 +1303,14 @@ case "$5" in
MAKEFILE=$HEADERS/../Makefile
if [ -f $MAKEFILE ]; then
+ VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3)
PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3)
- if [ -z "$PATCHLEVEL" ]; then
+ if [ -z "$PATCHLEVEL" -o -z "$VERSION" ]; then
exit 1
+ elif [ "$VERSION" = '3' ]; then
+ echo 6
+ exit 0
else
echo $PATCHLEVEL
exit 0
@@ -1426,10 +1430,11 @@ case "$5" in
# kernel older than 2.6.6, that's all we require to
# build the module.
#
+ VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3)
PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3)
SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3)
- if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
+ if [ "$VERSION" = '2' -a -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
-a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then
SELECTED_MAKEFILE=Makefile.kbuild
RET=0
@@ -1525,11 +1530,12 @@ case "$5" in
# This source tree is not configured, but includes
# the top-level Makefile.
#
+ VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3)
PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3)
SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3)
- if [ -n "$PATCHLEVEL" -a -n "$SUBLEVEL" ]; then
- echo 2.$PATCHLEVEL.$SUBLEVEL
+ if [ -n "$VERSION" -a -n "$PATCHLEVEL" -a -n "$SUBLEVEL" ]; then
+ echo $VERSION.$PATCHLEVEL.$SUBLEVEL
RET=0
fi
fi
diff -pur 96.43.20-t1/Makefile.kbuild 96.43.20-t2/Makefile.kbuild
--- 96.43.20-t1/Makefile.kbuild 2011-07-18 10:51:11.000000000 +0400
+++ 96.43.20-t2/Makefile.kbuild 2012-06-16 17:08:11.694605133 +0400
@@ -132,7 +132,7 @@ MODULE_ROOT := /lib/modules/$(KERNEL_UNA
#
TOPDIR ?= $(KERNEL_SOURCES)
-PATCHLEVEL ?= $(shell $(CONFTEST) kernel_patch_level)
+PATCHLEVEL := $(shell $(CONFTEST) kernel_patch_level)
#
# Linux 2.4 uses the .o module extension. Linux 2.6, however, uses the .ko

24
pkgs/os-specific/linux/nvidia-x11/switch_to.patch
View File

@ -1,24 +0,0 @@
diff -pur 173.14.31-3.3/conftest.sh 173.14.31-3.4/conftest.sh
--- 173.14.31-3.3/conftest.sh 2012-04-09 19:33:34.407928432 +0400
+++ 173.14.31-3.4/conftest.sh 2012-04-10 19:50:36.052346728 +0400
@@ -465,7 +465,7 @@ compile_test() {
# and if it as an 'event' member.
#
echo "$CONFTEST_PREAMBLE
- #include <asm/system.h>
+ #include <asm/switch_to.h>
#include <linux/pm.h>
void conftest_pm_message_t(pm_message_t state) {
pm_message_t *p = &state;
diff -pur 173.14.31-3.3/nv-linux.h 173.14.31-3.4/nv-linux.h
--- 173.14.31-3.3/nv-linux.h 2011-07-18 09:49:58.000000000 +0400
+++ 173.14.31-3.4/nv-linux.h 2012-04-10 19:53:04.853776013 +0400
@@ -92,7 +92,7 @@
#include <linux/timer.h>
#include <asm/div64.h> /* do_div() */
-#include <asm/system.h> /* cli, sli, save_flags */
+#include <asm/switch_to.h> /* cli, sli, save_flags */
#include <asm/io.h> /* ioremap, virt_to_phys */
#include <asm/uaccess.h> /* access_ok */
#include <asm/page.h> /* PAGE_OFFSET */

4
pkgs/os-specific/linux/pmtools/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "pmtools-20071116";
src = fetchurl {
url = "www.lesswatts.org/patches/linux_acpi/${name}.tar.gz";
url = "http://www.lesswatts.org/patches/linux_acpi/${name}.tar.gz";
sha256 = "91751774976e39f6237efd0326eb35196a9346220b92ad35894a33283e872748";
};
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
'';
meta = {
homepage = "http://www.lesswatts.org/projects/acpi/utilities.php";
homepage = http://www.lesswatts.org/projects/acpi/utilities.php;
description = "Linux ACPI utilities";
license = "GPLv2";

Some files were not shown because too many files have changed in this diff Show More