ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-08 14:40:07 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'channel-nixos' into python

Browse Source
This commit is contained in:
Florian Friesdorf 2013-01-15 17:42:48 +01:00
commit ed4f0b2657
79 changed files with 503 additions and 320 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/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";
};

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

@ -78,8 +78,9 @@ let
post23 = !versionOlder sourceInfo.version "24.0.0.0";
post24 = !versionOlder sourceInfo.version "25.0.0.0";
only24 = post23 && !post24;
maybeFixPulseAudioBuild = optional (post23 && pulseSupport)
maybeFixPulseAudioBuild = optional (only24 && pulseSupport)
./pulse_audio_fix.patch;
in stdenv.mkDerivation rec {
@ -120,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 // {

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

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

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 =

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

2
pkgs/build-support/release/source-tarball.nix
View File

@ -9,7 +9,7 @@
, versionSuffix ?
if officialRelease
then ""
else if src ? rev then "pre${toString src.rev}" else ""
else "pre${toString (src.rev or src.revCount or "")}"
, src, stdenv, autoconf, automake, libtool
, ... } @ args:

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)

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

@ -2,7 +2,7 @@ args: with args; rec {
name = "linux-libertine-5.3.0";
src = fetchurl {
url = mirror://sf/linuxlibertine/5.3.0/LinLibertineSRC_5.3.0_2012_07_02.tgz;
url = mirror://sourceforge/linuxlibertine/5.3.0/LinLibertineSRC_5.3.0_2012_07_02.tgz;
sha256 = "0x7cz6hvhpil1rh03rax9zsfzm54bh7r4bbrq8rz673gl9h47v0v";
};

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

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

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

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

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

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

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

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

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

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

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

33
pkgs/os-specific/linux/x86info/default.nix Normal file
View File

@ -0,0 +1,33 @@
{stdenv, fetchurl, pciutils, python}:
stdenv.mkDerivation rec {
version = "1.30";
name = "x86info-${version}";
src = fetchurl {
url = "http://codemonkey.org.uk/projects/x86info/${name}.tgz";
sha256 = "0a4lzka46nabpsrg3n7akwr46q38f96zfszd73xcback1s2hjc7y";
};
buildInputs = [ pciutils python ];
installPhase = ''
ensureDir $out/bin
cp x86info lsmsr $out/bin
'';
meta = {
description = "An identification utility for the x86 series of processors.";
longDescription =
''
x86info will identify all Intel/AMD/Centaur/Cyrix/VIA CPUs. It leverages
the cpuid kernel module where possible. it supports parsing model specific
registers (MSRs) via the msr kernel module. it will approximate processor
frequency, and identify the cache sizes and layout.
'';
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl2;
homepage = http://codemonkey.org.uk/projects/x86info/;
maintainers = with stdenv.lib.maintainers; [jcumming];
};
}

2
pkgs/servers/mail/freepops/default.nix
View File

@ -3,7 +3,7 @@
stdenv.mkDerivation {
name = "freepops-0.2.9";
src = fetchurl {
url = mirror://sf/freepops/0.2.9/freepops-0.2.9.tar.gz;
url = mirror://sourceforge/freepops/0.2.9/freepops-0.2.9.tar.gz;
sha256 = "3a065e30cafed03d9b6fdb28251ae5bf0d8aeb62181746154beecd25dc0c9cae";
};
buildInputs = [pkgconfig openssl lua5 curl readline bison expat];

4
pkgs/tools/filesystems/jfsutils/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, libuuid }:
stdenv.mkDerivation rec {
name = "jfsutils-1.1.12";
name = "jfsutils-1.1.15";
src = fetchurl {
url = "http://jfs.sourceforge.net/project/pub/${name}.tar.gz";
sha256 = "04vqdlg90j0mk5jkxpfg9fp6ss4gs1g5pappgns6183q3i6j02hd";
sha1 = "291e8bd9d615cf3d27e4000117c81a3602484a50";
};
buildInputs = [ libuuid ];

5
pkgs/tools/graphics/graphviz/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw
, yacc, libtool, fontconfig, pango, gd, xlibs, gts
, yacc, libtool, fontconfig, pango, gd, xlibs, gts, gettext
}:
stdenv.mkDerivation rec {
@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig
pango gd gts
] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ];
] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ]
++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext;
patches = [ ./fix-broken-memcp-signature.patch ];

6
pkgs/tools/graphics/mscgen/default.nix
View File

@ -7,7 +7,7 @@ stdenv.mkDerivation {
name = "mscgen-${version}";
src = fetchurl {
url = "www.mcternan.me.uk/mscgen/software/mscgen-src-${version}.tar.gz";
url = "http://www.mcternan.me.uk/mscgen/software/mscgen-src-${version}.tar.gz";
sha256 = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23";
};
@ -19,8 +19,8 @@ stdenv.mkDerivation {
'';
meta = {
homepage = "http://www.mcternan.me.uk/mscgen/";
description = "convert Message Sequence Chart descriptions into PNG, SVG, or EPS images";
homepage = http://www.mcternan.me.uk/mscgen/;
description = "Convert Message Sequence Chart descriptions into PNG, SVG, or EPS images";
license = "GPLv2";
longDescription = ''

2
pkgs/tools/misc/ised/default.nix
View File

@ -12,7 +12,7 @@ let
baseName="ised";
version="2.2.2";
name="${baseName}-${version}";
url="mirror://sf/project/ised/${name}.tar.bz2";
url="mirror://sourceforge/project/ised/${name}.tar.bz2";
hash="1nb1cnsbs2k3j9cy2kc2kg01rd7wf3jwxm62rwn1rjlc46nwdlmn";
};
in

4
pkgs/tools/security/tor/torsocks.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "torsocks";
name = "${pname}-${version}";
version = "1.0-epsilon";
version = "1.2";
src = fetchurl {
url = "http://${pname}.googlecode.com/files/${name}.tar.gz";
sha256 = "0508i4q9gm0rrav018z1jn4as5if3qrfdng6dmmzgs324hvdgap5";
sha256 = "1m0is5q24sf7jjlkl0icfkdc0m53nbkg0q72s57p48yp4hv7v9dy";
};
preConfigure = ''

6
pkgs/tools/security/vidalia/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "vidalia-${version}";
version = "0.2.17";
version = "0.2.21";
src = fetchurl {
url = "https://www.torproject.org/dist/vidalia/${name}.tar.gz";
sha256 = "0x0vb37h2d5njxmqkss03ybv7b7jw25682xb793mix1m8l0hs44r";
sha256 = "1rqvvhdqgk6jqrd15invvc4r7p4nckd3b93hhr5dzpc1fxz8w064";
};
buildInputs = [ cmake qt4 ];
@ -18,4 +18,4 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.phreedom ];
platforms = platforms.all;
};
}
}

2
pkgs/tools/system/hardlink/default.nix
View File

@ -7,7 +7,7 @@ stdenv.mkDerivation {
name = "hardlink-2012.9.${rev}";
src = fetchurl {
url = "pkgs.fedoraproject.org/cgit/hardlink.git/snapshot/hardlink-${rev}.zip";
url = "http://pkgs.fedoraproject.org/cgit/hardlink.git/snapshot/hardlink-${rev}.zip";
sha256 = "fea1803170b538d5fecf6a8d312ded1d25d516e9386a3797441a247487551647";
name = "hardlink-${rev}.zip";
};

4
pkgs/tools/system/smartmontools/default.nix
View File

@ -2,8 +2,8 @@
let
driverdb = fetchurl {
url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/drivedb.h?revision=3685";
sha256 = "11zczy03asfpj4wwip5bf3fpingdc7biz1cs3cykg4vnlxiwjxkx";
url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/drivedb.h?revision=3742";
sha256 = "04xsgxzc1mqn9szazyr6v3xcpw0pszi8vz7xcsb661rww5482rw0";
name = "smartmontools-drivedb.h";
};
in

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

@ -344,6 +344,10 @@ let
inherit stdenv;
};
replaceDependency = import ../build-support/replace-dependency.nix {
inherit runCommand nix lib;
};
nukeReferences = callPackage ../build-support/nuke-references/default.nix { };
vmTools = import ../build-support/vm/default.nix {
@ -541,7 +545,7 @@ let
cfdg = builderDefsPackage ../tools/graphics/cfdg {
inherit libpng bison flex;
ffmpeg = ffmpeg_1_0;
ffmpeg = ffmpeg_1_1;
};
checkinstall = callPackage ../tools/package-management/checkinstall { };
@ -1749,6 +1753,8 @@ let
wv2 = callPackage ../tools/misc/wv2 { };
x86info = callPackage ../os-specific/linux/x86info { };
x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { };
xbursttools = assert stdenv ? glibc; import ../tools/misc/xburst-tools {
@ -3604,6 +3610,10 @@ let
vpxSupport = !stdenv.isMips;
};
ffmpeg_1_1 = callPackage ../development/libraries/ffmpeg/1.1.nix {
vpxSupport = !stdenv.isMips;
};
fftw = callPackage ../development/libraries/fftw {
singlePrecision = false;
};
@ -5021,6 +5031,8 @@ let
unicap = callPackage ../development/libraries/unicap {};
tsocks = callPackage ../development/libraries/tsocks { };
unixODBC = callPackage ../development/libraries/unixODBC { };
unixODBCDrivers = recurseIntoAttrs (import ../development/libraries/unixODBCDrivers {
@ -7529,7 +7541,7 @@ let
ncmpcpp = callPackage ../applications/audio/ncmpcpp { };
MPlayer = callPackage ../applications/video/MPlayer {
mplayer = callPackage ../applications/video/mplayer {
pulseSupport = config.pulseaudio or false;
};
@ -7683,6 +7695,8 @@ let
pqiv = callPackage ../applications/graphics/pqiv { };
qiv = callPackage ../applications/graphics/qiv { };
# perhaps there are better apps for this task? It's how I had configured my preivous system.
# And I don't want to rewrite all rules
procmail = callPackage ../applications/misc/procmail { };
@ -7990,7 +8004,7 @@ let
};
vlc = callPackage ../applications/video/vlc {
ffmpeg = ffmpeg_1_0;
ffmpeg = ffmpeg_1_1;
};
vnstat = callPackage ../applications/networking/vnstat { };
@ -9139,8 +9153,6 @@ let
# Wine cannot be built in 64-bit; use a 32-bit build instead.
wine = callPackage_i686 ../misc/emulators/wine { };
wineWarcraft = callPackage_i686 ../misc/emulators/wine/wine-warcraft.nix { };
x2x = callPackage ../tools/X11/x2x { };
xosd = callPackage ../misc/xosd { };

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

@ -128,7 +128,7 @@ let self = {
name = "bson-0.1.5";
src = fetchurl {
url = "http://registry.npmjs.org/bson/-/${name}.tgz";
sha256 = "3fad2209466740ea81d0bc285b92d940efe5104a6314946ea40180c431a19692";
sha256 = "58af4a1697b015190b40c2a7e5743f9d4494887ef98dfe2f58f24c70f2d31150";
};
deps = [