Merge remote-tracking branch 'origin/master' into stdenv-updates
This commit is contained in:
Eelco Dolstra
commit
5bb548d2e4
|
|
@ -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 (
|
||||
|
|
|
|||
|
|
@ -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"];
|
||||
|
|
|
|||
|
|
@ -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 = {
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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/;
|
||||
};
|
||||
})
|
||||
|
|
@ -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 =
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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 // {
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -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 ]
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ stdenv, fetchurl, pythonPackages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.3";
|
||||
version = "2.5";
|
||||
release = ".1";
|
||||
name = "bazaar-${version}${release}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://launchpad.net/bzr/${version}/${version}${release}/+download/bzr-${version}${release}.tar.gz";
|
||||
sha256 = "07kx41w4gqv68bcykdflsg68wvpmcyqknzyb4vr1zqlf27hahp53";
|
||||
sha256 = "10krjbzia2avn09p0cdlbx2wya0r5v11w5ymvyl72af5dkx4cwwn";
|
||||
};
|
||||
|
||||
buildInputs = [ pythonPackages.python pythonPackages.wrapPython ];
|
||||
|
|
|
|||
|
|
@ -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 ]
|
||||
|
|
|
|||
|
|
@ -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 =
|
||||
''
|
||||
|
|
@ -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 =
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
||||
|
|
|
|||
|
|
@ -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,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";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -68,6 +68,8 @@ let
|
|||
rm -rf "$out/lib/python${majorVersion}/test"
|
||||
ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb
|
||||
ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion}
|
||||
mv $out/share/man/man1/{python.1,python2.6.1}
|
||||
ln -s $out/share/man/man1/{python2.6.1,python.1}
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -76,6 +76,7 @@ let
|
|||
rm -rf "$out/lib/python${majorVersion}/test"
|
||||
ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb
|
||||
ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion}
|
||||
ln -s $out/share/man/man1/{python2.7.1.gz,python.1.gz}
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
# Create a python that knows about additional python packages via
|
||||
# PYTHONPATH
|
||||
|
||||
{stdenv, python, makeWrapper, extraLibs ? []}:
|
||||
{ stdenv, python, makeWrapper, recursivePthLoader, extraLibs ? [] }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "python-${python.version}-wrapper";
|
||||
|
||||
propagatedBuildInputs = [python makeWrapper] ++ extraLibs;
|
||||
propagatedBuildInputs = extraLibs ++ [ python makeWrapper recursivePthLoader ];
|
||||
|
||||
unpackPhase = "true";
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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/;
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "cipher-rc4";
|
||||
version = "0.1.2";
|
||||
sha256 = "0nyrqms7h3hq236h03sjjjqdcxn3iz3fg4ifqj43f4nb8gv0ifb1";
|
||||
meta = {
|
||||
homepage = "http://github.com/vincenthz/hs-cipher-rc4";
|
||||
description = "Fast RC4 cipher implementation";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
{ cabal, base64Bytestring, cereal, cprngAes, cryptoApi
|
||||
, cryptocipher, entropy, skein, tagged
|
||||
{ cabal, base64Bytestring, cereal, cipherAes, cprngAes, cryptoApi
|
||||
, entropy, skein, tagged
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "clientsession";
|
||||
version = "0.8.0.2";
|
||||
sha256 = "189v030g23lvky4vccdaw3p0p6drn26zly80a8n9bbn7b8kbfh4r";
|
||||
version = "0.8.1";
|
||||
sha256 = "1x4qfm4hkvm3xmn7hnvcx1j900g97qhks66xzik1wvsjy3piwpgd";
|
||||
buildDepends = [
|
||||
base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy
|
||||
skein tagged
|
||||
base64Bytestring cereal cipherAes cprngAes cryptoApi entropy skein
|
||||
tagged
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://github.com/yesodweb/clientsession/tree/master";
|
||||
|
|
|
|||
|
|
@ -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
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "crypto-conduit";
|
||||
version = "0.4.2";
|
||||
sha256 = "0kg99kvpm5h8v28sylrp9z868ksz5737377akqy09y90xzb8pak3";
|
||||
version = "0.4.3";
|
||||
sha256 = "0h9dmr88hqmz2876mlnzz8s5kmi368zs9pljvvmb9vn7m44gpyrk";
|
||||
buildDepends = [ cereal conduit cryptoApi transformers ];
|
||||
meta = {
|
||||
homepage = "https://github.com/meteficha/crypto-conduit";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
{ cabal, cryptoRandomApi, vector }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "crypto-numbers";
|
||||
version = "0.1.3";
|
||||
sha256 = "115lgnay3ly5r53flh3v5jygqks0rg1i8qmbvrqf9nkmnmw6a5x1";
|
||||
buildDepends = [ cryptoRandomApi vector ];
|
||||
meta = {
|
||||
homepage = "http://github.com/vincenthz/hs-crypto-numbers";
|
||||
description = "Cryptographic numbers: functions and algorithms";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
{ cabal, cryptohash, cryptoNumbers, cryptoPubkeyTypes
|
||||
, cryptoRandomApi
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "crypto-pubkey";
|
||||
version = "0.1.2";
|
||||
sha256 = "1law5l7j0r0v89dnibmaipjp0yshffq10xs4rvg2j247v29lhns5";
|
||||
buildDepends = [
|
||||
cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandomApi
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://github.com/vincenthz/hs-crypto-pubkey";
|
||||
description = "Public Key cryptography";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -1,19 +1,20 @@
|
|||
{ cabal, cereal, cpu, cryptoApi, cryptoPubkeyTypes, primitive
|
||||
, tagged, vector
|
||||
{ cabal, cereal, cipherAes, cipherRc4, cpu, cryptoApi
|
||||
, cryptoPubkeyTypes, primitive, tagged, vector
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "cryptocipher";
|
||||
version = "0.3.7";
|
||||
sha256 = "14qhi3969q1h9n85flb7wwsr50gdn63q7pmcpm2npy5vkp34lkp5";
|
||||
version = "0.4.0";
|
||||
sha256 = "1qbnhzbzypin7h62sn2sibij7clsgmaiq24q3xhgbjrirb6bhqf0";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
cereal cpu cryptoApi cryptoPubkeyTypes primitive tagged vector
|
||||
cereal cipherAes cipherRc4 cpu cryptoApi cryptoPubkeyTypes
|
||||
primitive tagged vector
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://github.com/vincenthz/hs-cryptocipher";
|
||||
description = "Symmetrical Block, Stream and PubKey Ciphers";
|
||||
description = "Symmetrical block and stream ciphers";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -1,16 +1,19 @@
|
|||
{ cabal, binary, blazeHtml, blazeMarkup, citeprocHs, cryptohash
|
||||
, filepath, hamlet, lrucache, mtl, pandoc, parsec, regexBase
|
||||
, regexTdfa, snapCore, snapServer, tagsoup, text, time
|
||||
{ cabal, binary, blazeHtml, blazeMarkup, citeprocHs, cmdargs
|
||||
, cryptohash, deepseq, filepath, httpConduit, httpTypes, lrucache
|
||||
, mtl, pandoc, parsec, random, regexBase, regexTdfa, snapCore
|
||||
, snapServer, tagsoup, text, time
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hakyll";
|
||||
version = "3.5.2.1";
|
||||
sha256 = "1fp7jak2sfznvg3lfyjqy13m1iq9821mdq6n5qmqz5dh5b960iv4";
|
||||
version = "4.0.0.0";
|
||||
sha256 = "165r9x158nnnwzd1cxymskkxvfhxsnpam8bi3gjy8bql8arsibzr";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
binary blazeHtml blazeMarkup citeprocHs cryptohash filepath hamlet
|
||||
lrucache mtl pandoc parsec regexBase regexTdfa snapCore snapServer
|
||||
tagsoup text time
|
||||
binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash deepseq
|
||||
filepath httpConduit httpTypes lrucache mtl pandoc parsec random
|
||||
regexBase regexTdfa snapCore snapServer tagsoup text time
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://jaspervdj.be/hakyll";
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hashable";
|
||||
version = "1.2.0.3";
|
||||
sha256 = "0q4zl2mry6qfp9vln6pxmgqik7szv1sh7if55gydnxln1ybvvgmp";
|
||||
version = "1.2.0.5";
|
||||
sha256 = "0frqr294bsx4i21xxd5pw59xpaf0nww0dh4bqn0ywblsm9c7nyqh";
|
||||
buildDepends = [ text ];
|
||||
meta = {
|
||||
homepage = "http://github.com/tibbe/hashable";
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "mime-types";
|
||||
version = "0.1.0.1";
|
||||
sha256 = "1a34ckmv8qcyk38jydxwph59zcrhnwaah1h6pzn112kysjqjgcsl";
|
||||
version = "0.1.0.2";
|
||||
sha256 = "1pkhr8k23386qwa1wmlrcilz75di2l8n5kc4n8pnia05p49akfcs";
|
||||
buildDepends = [ text ];
|
||||
meta = {
|
||||
homepage = "https://github.com/yesodweb/wai";
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "network";
|
||||
version = "2.4.0.1";
|
||||
sha256 = "00jj3pf2gchkx5wmipm2ijxcmhy37g86ggnp6pb92i5nmb93h1iw";
|
||||
version = "2.4.1.0";
|
||||
sha256 = "0m44iqlcnpsaa3iqxb4wbx2l1k2ycxzq8v07bwz7br7yyikv16y3";
|
||||
buildDepends = [ parsec ];
|
||||
meta = {
|
||||
homepage = "https://github.com/haskell/network";
|
||||
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "persistent";
|
||||
version = "1.1.3.2";
|
||||
sha256 = "1q8p5nxsf9fjhsyy1lha852f7vssp9mz6l24gg47mgv6y5mm9myv";
|
||||
version = "1.1.4";
|
||||
sha256 = "1frxhyyp8l5xvq5h9zf730c7kpnrryw2mw8mpnav2bs5g6rmmrgj";
|
||||
buildDepends = [
|
||||
aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
|
||||
liftedBase monadControl monadLogger pathPieces poolConduit
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "system-fileio";
|
||||
version = "0.3.10";
|
||||
sha256 = "1f8si6m62nxzj71jgyhxl38szmw8wr3frvgih596vfjxwdhqpkq4";
|
||||
version = "0.3.11";
|
||||
sha256 = "0hnjrzhzbqx9l93c8dnl5b54f72ki584cn3jh8m6z56x2lrs24zb";
|
||||
buildDepends = [ systemFilepath text time ];
|
||||
meta = {
|
||||
homepage = "https://john-millikin.com/software/haskell-filesystem/";
|
||||
|
|
|
|||
|
|
@ -1,16 +1,17 @@
|
|||
{ cabal, certificate, cipherAes, cryptoApi, cryptocipher
|
||||
, cryptohash, mtl, network, pem, text, time, tls, vector
|
||||
{ cabal, certificate, cipherAes, cipherRc4, cryptohash
|
||||
, cryptoPubkey, cryptoRandomApi, mtl, network, pem, text, time, tls
|
||||
, vector
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "tls-extra";
|
||||
version = "0.5.1";
|
||||
sha256 = "0a977qy6ig4bhgsl6y5iw0xv52yswmcc2x37ypm1601wikjv38x3";
|
||||
version = "0.6.0";
|
||||
sha256 = "11cf91cgbyp4xzbr3n9h20rvbb6756r9dk74r5w158f3xmlgk5nx";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
certificate cipherAes cryptoApi cryptocipher cryptohash mtl network
|
||||
pem text time tls vector
|
||||
certificate cipherAes cipherRc4 cryptohash cryptoPubkey
|
||||
cryptoRandomApi mtl network pem text time tls vector
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://github.com/vincenthz/hs-tls";
|
||||
|
|
|
|||
|
|
@ -1,17 +1,15 @@
|
|||
{ cabal, cereal, certificate, cryptoApi, cryptocipher, cryptohash
|
||||
, mtl, network
|
||||
{ cabal, cereal, certificate, cryptohash, cryptoPubkey
|
||||
, cryptoRandomApi, mtl, network
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "tls";
|
||||
version = "1.0.3";
|
||||
sha256 = "14wgwz032skkgkxg2lyh8kwg1fkapmlg2jh74czbacvnssc2iidb";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
version = "1.1.1";
|
||||
sha256 = "0ji83b5z3v6f6a6rgyj5xkjh9vvsqckr7ymzjnhb4zqf0mgymypq";
|
||||
buildDepends = [
|
||||
cereal certificate cryptoApi cryptocipher cryptohash mtl network
|
||||
cereal certificate cryptohash cryptoPubkey cryptoRandomApi mtl
|
||||
network
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://github.com/vincenthz/hs-tls";
|
||||
description = "TLS/SSL protocol native implementation (Server and Client)";
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "warp";
|
||||
version = "1.3.7";
|
||||
sha256 = "06648wqiwlcsvd41qdqdbgn1zcq890iq39zsxi24vf4s8q7jnzyf";
|
||||
version = "1.3.7.1";
|
||||
sha256 = "0kabcxzjc686iayhxln2cmnxm3vk3h0685n4d4ybprv5h1nc6ghl";
|
||||
buildDepends = [
|
||||
blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
|
||||
httpTypes liftedBase network networkConduit simpleSendfile
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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/;
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{stdenv, androidsdk, titaniumsdk, xcodewrapper}:
|
||||
{ appId, name, src, target, androidPlatformVersions ? [ "8" ]
|
||||
, release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
|
||||
, iosKeyFile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null
|
||||
, iosKeyFile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosDistribute ? false
|
||||
}:
|
||||
|
||||
assert (release && target == "android") -> androidKeyStore != null && androidKeyAlias != null && androidKeyStorePassword != null;
|
||||
|
|
@ -12,6 +12,8 @@ let
|
|||
platformVersions = androidPlatformVersions;
|
||||
useGoogleAPIs = true;
|
||||
};
|
||||
|
||||
deleteKeychain = "security delete-keychain $keychainName";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit name src;
|
||||
|
|
@ -30,8 +32,7 @@ stdenv.mkDerivation {
|
|||
"${titaniumsdk}/mobilesdk/*/*/android/builder.py build ${name} ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId}"
|
||||
|
||||
else if target == "iphone" then
|
||||
if release then
|
||||
''
|
||||
if iosDistribute then ''
|
||||
export HOME=/Users/$(whoami)
|
||||
export keychainName=$(basename $out)
|
||||
|
||||
|
|
@ -51,11 +52,39 @@ stdenv.mkDerivation {
|
|||
cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision"
|
||||
fi
|
||||
|
||||
${titaniumsdk}/mobilesdk/*/*/iphone/builder.py adhoc 6.0 $(pwd) ${appId} ${name} "$provisioningId" "${iosCertificateName}" universal "$HOME/Library/Keychains/$keychainName"
|
||||
${titaniumsdk}/mobilesdk/*/*/iphone/builder.py distribute 6.0 $(pwd) ${appId} ${name} "$provisioningId" "${iosCertificateName}" $out universal "$HOME/Library/Keychains/$keychainName"
|
||||
|
||||
# Remove our generated keychain
|
||||
|
||||
security delete-keychain $keychainName
|
||||
${deleteKeychain}
|
||||
''
|
||||
else
|
||||
if release then
|
||||
''
|
||||
export HOME=/Users/$(whoami)
|
||||
export keychainName=$(basename $out)
|
||||
|
||||
# Create a keychain with the component hash name (should always be unique)
|
||||
security create-keychain -p "" $keychainName
|
||||
security default-keychain -s $keychainName
|
||||
security unlock-keychain -p "" $keychainName
|
||||
security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A
|
||||
|
||||
provisioningId=$(grep UUID -A1 -a ${iosKeyFile} | grep -o "[-A-Z0-9]\{36\}")
|
||||
|
||||
# Ensure that the requested provisioning profile can be found
|
||||
|
||||
if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles" ]
|
||||
then
|
||||
mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
|
||||
cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision"
|
||||
fi
|
||||
|
||||
${titaniumsdk}/mobilesdk/*/*/iphone/builder.py adhoc 6.0 $(pwd) ${appId} ${name} "$provisioningId" "${iosCertificateName}" universal "$HOME/Library/Keychains/$keychainName"
|
||||
|
||||
# Remove our generated keychain
|
||||
|
||||
${deleteKeychain}
|
||||
''
|
||||
else
|
||||
''
|
||||
|
|
@ -84,4 +113,6 @@ stdenv.mkDerivation {
|
|||
else if target == "iphone" then ""
|
||||
else throw "Target: ${target} is not supported!"}
|
||||
'';
|
||||
|
||||
failureHook = stdenv.lib.optionalString (release && target == "iphone") deleteKeychain;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,5 +53,8 @@ stdenv.mkDerivation {
|
|||
--prefix PYTHONPATH : ${python.modules.sqlite3}/lib/python*/site-packages \
|
||||
--prefix PATH : ${jdk}/bin \
|
||||
--prefix JAVA_HOME : ${jdk}
|
||||
'' + stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
|
||||
# 'ditto' utility is needed to copy stuff to the Xcode organizer. Dirty, but this allows it to work.
|
||||
sed -i -e "s|ditto|/usr/bin/ditto|g" $out/mobilesdk/osx/*/iphone/builder.py
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
diff -Naur Google-ProtocolBuffers-0.08-orig/lib/Google/ProtocolBuffers/Compiler.pm Google-ProtocolBuffers-0.08/lib/Google/ProtocolBuffers/Compiler.pm
|
||||
--- Google-ProtocolBuffers-0.08-orig/lib/Google/ProtocolBuffers/Compiler.pm 2008-10-23 13:46:01.000000000 -0400
|
||||
+++ Google-ProtocolBuffers-0.08/lib/Google/ProtocolBuffers/Compiler.pm 2013-01-16 13:52:09.855063997 -0500
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
my $grammar = <<'END_OF_GRAMMAR';
|
||||
|
||||
-proto : <skip: qr! (?: //.*\n | \s+ )* !x>
|
||||
+proto : <skip: qr! (?: //.*?\n | \s+ | /\*.*?\*/\s* )* !xs>
|
||||
## list of top level declarations.
|
||||
## Skip empty declarations and ";".
|
||||
(message | extend | enum | import | package | option | service | syntax | ";")(s) /\Z/
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
(http://pypi.python.org/pypi/setuptools/), which represents a large
|
||||
number of Python packages nowadays. */
|
||||
|
||||
{ python, setuptools, wrapPython, lib, offlineDistutils, setuptoolsSite }:
|
||||
{ python, setuptools, wrapPython, lib, offlineDistutils, recursivePthLoader }:
|
||||
|
||||
{ name, namePrefix ? "python-"
|
||||
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
''
|
||||
easy_install --always-unzip --prefix="$out" .
|
||||
''
|
||||
|
||||
|
||||
, preConfigure ? "true"
|
||||
|
||||
, buildPhase ? "true"
|
||||
|
|
@ -48,16 +48,14 @@ python.stdenv.mkDerivation (attrs // {
|
|||
|
||||
name = namePrefix + name;
|
||||
|
||||
# checkPhase after installPhase to run tests on installed packages
|
||||
phases = "unpackPhase patchPhase configurePhase buildPhase installPhase checkPhase fixupPhase distPhase";
|
||||
|
||||
buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath;
|
||||
|
||||
# setuptoolsSite is responsible for loading pth files
|
||||
propagatedBuildInputs = propagatedBuildInputs ++ [ setuptoolsSite ];
|
||||
propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ];
|
||||
|
||||
buildInputStrings = map toString buildInputs;
|
||||
|
||||
pythonPath = [ setuptools] ++ pythonPath;
|
||||
pythonPath = [ setuptools ] ++ pythonPath;
|
||||
|
||||
preConfigure = ''
|
||||
PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
|
||||
|
|
@ -83,9 +81,7 @@ python.stdenv.mkDerivation (attrs // {
|
|||
# Remove any site.py files generated by easy_install as these
|
||||
# cause collisions. If pth files are to be processed a
|
||||
# corresponding site.py needs to be included in the PYTHONPATH.
|
||||
#
|
||||
# leave them until we have a better solution: see #209
|
||||
#rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py*
|
||||
rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py*
|
||||
|
||||
${postInstall}
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -51,6 +51,9 @@ createBuildInputsPth() {
|
|||
local inputs="$2"
|
||||
if [ foo"$inputs" != foo ]; then
|
||||
for x in $inputs; do
|
||||
if $(echo -n $x |grep -q python-recursive-pth-loader); then
|
||||
continue
|
||||
fi
|
||||
if test -d "$x"/lib/@libPrefix@/site-packages; then
|
||||
echo $x/lib/@libPrefix@/site-packages \
|
||||
>> "$out"/lib/@libPrefix@/site-packages/${name}-nix-python-$category.pth
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, fetchurl, python, pkgconfig, cairo, x11}:
|
||||
{ stdenv, fetchurl, python, pkgconfig, cairo, x11 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "pycairo-1.8.8";
|
||||
|
|
@ -7,5 +7,5 @@ stdenv.mkDerivation {
|
|||
sha256 = "0q18hd4ai4raljlvd76ylgi30kxpr2qq83ka6gzwh0ya8fcmjlig";
|
||||
};
|
||||
|
||||
buildInputs = [python pkgconfig cairo x11];
|
||||
buildInputs = [ python pkgconfig cairo x11 ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,16 +12,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ python pkgconfig glib ];
|
||||
|
||||
# in a "normal" setup, pygobject and pygtk are installed into the
|
||||
# same site-packages: we need a pth file for both. pygtk.py would be
|
||||
# used to select a specific version, in our setup it should have no
|
||||
# effect, but we leave it in case somebody expects and calls it.
|
||||
postInstall = ''
|
||||
# All python code is installed into a "gtk-2.0" sub-directory. That
|
||||
# sub-directory may be useful on systems which share several library
|
||||
# versions in the same prefix, i.e. /usr/local, but on Nix that directory
|
||||
# is useless. Furthermore, its existence makes it very hard to guess a
|
||||
# proper $PYTHONPATH that allows "import gtk" to succeed.
|
||||
cd $(toPythonPath $out)/gtk-2.0
|
||||
for n in *; do
|
||||
ln -s "gtk-2.0/$n" "../$n"
|
||||
done
|
||||
mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${name}.pth}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, fetchurl, makeWrapper, python, pkgconfig, glib, gtk, pygobject, pycairo
|
||||
, libglade ? null }:
|
||||
{ stdenv, fetchurl, python, pkgconfig, glib, gtk, pygobject, pycairo
|
||||
, buildPythonPackage, libglade ? null }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
buildPythonPackage rec {
|
||||
name = "pygtk-2.22.0";
|
||||
|
||||
src = fetchurl {
|
||||
|
|
@ -10,26 +10,35 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
buildInputs =
|
||||
[ makeWrapper python pkgconfig glib gtk ]
|
||||
[ pkgconfig glib gtk ]
|
||||
++ stdenv.lib.optional (libglade != null) libglade;
|
||||
|
||||
propagatedBuildInputs = [ pygobject pycairo ];
|
||||
|
||||
installCommand = "make install";
|
||||
checkPhase = stdenv.lib.optionalString (libglade == null)
|
||||
''
|
||||
sed -i -e "s/glade = importModule('gtk.glade', buildDir)//" \
|
||||
tests/common.py
|
||||
sed -i -e "s/, glade$//" \
|
||||
-e "s/.*testGlade.*//" \
|
||||
-e "s/.*(glade.*//" \
|
||||
tests/test_api.py
|
||||
'' + ''
|
||||
sed -i -e "s/sys.path.insert(0, os.path.join(buildDir, 'gtk'))//" \
|
||||
-e "s/sys.path.insert(0, buildDir)//" \
|
||||
tests/common.py
|
||||
make check
|
||||
'';
|
||||
# XXX: TypeError: Unsupported type: <class 'gtk._gtk.WindowType'>
|
||||
# The check phase was not executed in the previous
|
||||
# non-buildPythonPackage setup - not sure why not.
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
rm $out/bin/pygtk-codegen-2.0
|
||||
ln -s ${pygobject}/bin/pygobject-codegen-2.0 $out/bin/pygtk-codegen-2.0
|
||||
|
||||
# All python code is installed into a "gtk-2.0" sub-directory. That
|
||||
# sub-directory may be useful on systems which share several library
|
||||
# versions in the same prefix, i.e. /usr/local, but on Nix that directory
|
||||
# is useless. Furthermore, its existence makes it very hard to guess a
|
||||
# proper $PYTHONPATH that allows "import gtk" to succeed.
|
||||
cd $(toPythonPath $out)/gtk-2.0
|
||||
for n in *; do
|
||||
ln -s "gtk-2.0/$n" "../$n"
|
||||
done
|
||||
|
||||
wrapProgram $out/bin/pygtk-demo --prefix PYTHONPATH ":" \
|
||||
$(toPythonPath "${pygobject} ${pycairo} $out")
|
||||
ln -s ${pygobject}/lib/${python.libPrefix}/site-packages/${pygobject.name}.pth \
|
||||
$out/lib/${python.libPrefix}/site-packages/${name}.pth
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, fetchurl, python, wrapPython }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "setuptools-" + version;
|
||||
name = "python-setuptools-" + version;
|
||||
|
||||
version = "0.6c11";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,29 +1,32 @@
|
|||
Without this patch `virtualenv --python=python2.7 .` fails with an error because it notices that the python readline.so is not in the same path as python2.7. I assume this is to avoid copying the wrong file on systems where it is possible to find incompatible libraries by accident. Adding "/nix/store" to the prefix fixes this problem. Unfortunately readline is still not available if you just run `virtualenv .`.
|
||||
|
||||
|
||||
--- virtualenv-1.6.4/virtualenv.py 2012-05-20 00:40:38.070649647 +0200
|
||||
+++ virtualenv-1.6.4/virtualenv.py 2012-05-20 00:45:10.596242604 +0200
|
||||
@@ -951,13 +951,7 @@
|
||||
--- virtualenv-1.8.4/virtualenv.py 2013-01-16 23:43:37.583615220 +0100
|
||||
+++ virtualenv-1.8.4/virtualenv.py 2013-01-16 23:44:47.885973431 +0100
|
||||
@@ -1135,17 +1135,7 @@
|
||||
|
||||
|
||||
def change_prefix(filename, dst_prefix):
|
||||
- prefixes = [sys.prefix]
|
||||
-
|
||||
- if sys.platform == "darwin":
|
||||
- if is_darwin:
|
||||
- prefixes.extend((
|
||||
- os.path.join("/Library/Python", sys.version[:3], "site-packages"),
|
||||
- os.path.join(sys.prefix, "Extras", "lib", "python"),
|
||||
- os.path.join("~", "Library", "Python", sys.version[:3], "site-packages")))
|
||||
- os.path.join("~", "Library", "Python", sys.version[:3], "site-packages"),
|
||||
- # Python 2.6 no-frameworks
|
||||
- os.path.join("~", ".local", "lib","python", sys.version[:3], "site-packages"),
|
||||
- # System Python 2.7 on OSX Mountain Lion
|
||||
- os.path.join("~", "Library", "Python", sys.version[:3], "lib", "python", "site-packages")))
|
||||
+ prefixes = ["/nix/store", sys.prefix]
|
||||
|
||||
if hasattr(sys, 'real_prefix'):
|
||||
prefixes.append(sys.real_prefix)
|
||||
@@ -968,6 +962,8 @@
|
||||
_, relpath = filename.split(src_prefix, 1)
|
||||
assert relpath[0] == os.sep
|
||||
relpath = relpath[1:]
|
||||
+ if src_prefix == "/nix/store":
|
||||
+ relpath = "/".join(relpath.split("/")[1:])
|
||||
@@ -1162,6 +1152,8 @@
|
||||
if src_prefix != os.sep: # sys.prefix == "/"
|
||||
assert relpath[0] == os.sep
|
||||
relpath = relpath[1:]
|
||||
+ if src_prefix == "/nix/store":
|
||||
+ relpath = "/".join(relpath.split("/")[1:])
|
||||
return join(dst_prefix, relpath)
|
||||
assert False, "Filename %s does not start with any of these prefixes: %s" % \
|
||||
(filename, prefixes)
|
||||
|
|
|
|||
|
|
@ -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,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" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -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+";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ stdenv.mkDerivation {
|
|||
name = "cpufrequtils-008";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/utils/kernel/cpufreq/cpufrequtils-008.tar.gz";
|
||||
url = http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-008.tar.gz;
|
||||
md5 = "52d3e09e47ffef634833f7fab168eccf";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ stdenv.mkDerivation {
|
|||
|
||||
src = [
|
||||
(fetchurl {
|
||||
url = mirror://kernel/linux/utils/kernel/module-init-tools/module-init-tools-3.16.tar.bz2;
|
||||
url = http://ftp.be.debian.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-3.16.tar.bz2;
|
||||
sha256 = "0jxnz9ahfic79rp93l5wxcbgh4pkv85mwnjlbv1gz3jawv5cvwp1";
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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"
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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];
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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,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";
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "powertop-2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://01.org/powertop/sites/default/files/downloads/${name}.tar.gz";
|
||||
sha256 = "16161nlah4i4hq8vyx7ds1vq7icdzwm7gmyjg0xhcrs1r9n83m1x";
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{stdenv, fetchurl, klibc, kernel, withKlibc ? true}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "v86d-0.1.10-${kernel.version}";
|
||||
name = "v86d-${version}-${kernel.version}";
|
||||
version = "0.1.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dev.gentoo.org/~spock/projects/uvesafb/archive/${name}.tar.bz2";
|
||||
url = "mirror://gentoo/distfiles//v86d-${version}.tar.bz2";
|
||||
sha256 = "0p3kwqjis941pns9948dxfnjnl5lwd8f2b6x794whs7g32p68jb3";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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];
|
||||
};
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue