Merge remote-tracking branch 'upstream/master' into master_clean
This commit is contained in:
Jack Cummings
commit
5988ad1c8a
@ -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";
|
||||
};
|
||||
|
||||
|
||||
19
pkgs/applications/graphics/qiv/default.nix
Normal file
19
pkgs/applications/graphics/qiv/default.nix
Normal 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/;
|
||||
};
|
||||
})
|
||||
@ -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.36";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.36.tar.bz2";
|
||||
sha256 = "1pn7qv1s6lcx8k26h89x9zdy43rzdq12f92s2l6cfdhr9ls9wv0s";
|
||||
};
|
||||
beta = {
|
||||
version = "24.0.1312.35";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.35.tar.bz2";
|
||||
sha256 = "0mb6xz5lrnzjk1zqr83jyprsxv20svy3a7lyxv9iwdb2bh1i13ci";
|
||||
version = "25.0.1364.36";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.36.tar.bz2";
|
||||
sha256 = "1pn7qv1s6lcx8k26h89x9zdy43rzdq12f92s2l6cfdhr9ls9wv0s";
|
||||
};
|
||||
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";
|
||||
|
||||
@ -21,8 +21,8 @@ assert stdenv.system == "x86_64-linux";
|
||||
|
||||
let
|
||||
|
||||
version = "1.4.0";
|
||||
sha256 = "93933d95cce5956ed99342fa342d01ce2bde8d2e4339afb97f23e0c0ec98875e";
|
||||
version = "1.4.21";
|
||||
sha256 = "94073842f4a81feee80bca590e1df73fc3cab47ba879407ceba2de48f30d84e2";
|
||||
|
||||
# relative location where the dropbox libraries are stored
|
||||
appdir = "opt/dropbox";
|
||||
|
||||
@ -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 ]
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv}:
|
||||
|
||||
let
|
||||
name = "stellarium-0.11.4";
|
||||
name = "stellarium-0.11.4a";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit name;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/stellarium/${name}.tar.gz";
|
||||
sha256 = "8ad5e9878eb36c2c27f4754dcfc69279123e0eae02cc388074e3cf9b23746535";
|
||||
sha256 = "0gs3lf2061chgcyx22xbnn6b284nsnj8xal7jyjzj57s8yk4n619";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl libiconv ];
|
||||
|
||||
@ -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
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
name = "maxima";
|
||||
version = "5.28.0";
|
||||
version = "5.29.1";
|
||||
|
||||
searchPath =
|
||||
stdenv.lib.makeSearchPath "bin"
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
|
||||
sha256 = "d73e925f0116ba361bf4390c80e24d4fa763f647cc1fc4cc06bbf40ceb3facda";
|
||||
sha256 = "1p94l28adcn0826nah460r9pz71h7wd5klsg885sl2gzds75bn74";
|
||||
};
|
||||
|
||||
buildInputs = [sbcl texinfo perl makeWrapper];
|
||||
|
||||
@ -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:
|
||||
|
||||
|
||||
79
pkgs/build-support/replace-dependency.nix
Normal file
79
pkgs/build-support/replace-dependency.nix
Normal 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,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";
|
||||
};
|
||||
|
||||
|
||||
@ -38,8 +38,8 @@ rec {
|
||||
name = "lazarus-${version}";
|
||||
meta = {
|
||||
description = "Lazarus graphical IDE for FreePascal language";
|
||||
homepage = http://www.lazarus.freepascal.org ;
|
||||
homepage = http://www.lazarus.freepascal.org;
|
||||
maintainers = [args.lib.maintainers.raskin];
|
||||
platforms = args.lib.platforms.linux;
|
||||
#platforms = args.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -48,13 +48,12 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Opa is a concise and elegant language for writing distributed web applications. Both client and server sides.";
|
||||
description = "A concise and elegant language for writing distributed web applications";
|
||||
longDescription = ''
|
||||
Opa is a new generation of web development platform that lets you write distributed
|
||||
web applications using a single technology. Among the the many features of Opa are these:
|
||||
Opa is concise, simple, concurrent, dynamically distributed, and secure.
|
||||
Opa is a new generation of web development platform that lets you write distributed
|
||||
web applications using a single technology. Among the the many features of Opa are these:
|
||||
Opa is concise, simple, concurrent, dynamically distributed, and secure.
|
||||
'';
|
||||
|
||||
homepage = http://opalang.org/;
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
maintainers = [ stdenv.lib.maintainers.kkallio ];
|
||||
|
||||
@ -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";
|
||||
};
|
||||
|
||||
|
||||
85
pkgs/development/libraries/ffmpeg/1.1.nix
Normal file
85
pkgs/development/libraries/ffmpeg/1.1.nix
Normal 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,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "certificate";
|
||||
version = "1.3.3";
|
||||
sha256 = "043xj3xd6cfnbg9hw2f8agckww3fasvraa72jw84zqc7l2gq0rq2";
|
||||
version = "1.3.5";
|
||||
sha256 = "17g2alyib89y2k8jjg4b6jskz0ndpr92yi8hzra7vw7ygfi5mi4j";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
||||
@ -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";
|
||||
|
||||
13
pkgs/development/libraries/haskell/cipher-rc4/default.nix
Normal file
13
pkgs/development/libraries/haskell/cipher-rc4/default.nix
Normal file
@ -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;
|
||||
};
|
||||
})
|
||||
18
pkgs/development/libraries/haskell/crypto-pubkey/default.nix
Normal file
18
pkgs/development/libraries/haskell/crypto-pubkey/default.nix
Normal file
@ -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.1.1.0";
|
||||
sha256 = "0v0c2hbwnd56q3vwrf9515v85yn2k850z9jd8y8kj2i79wh7l3dz";
|
||||
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";
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "highlighting-kate";
|
||||
version = "0.5.3.4";
|
||||
sha256 = "1xm9dr71qna1w65vzaf63hbchpvshfjvvs5038sy04x2ddwdix77";
|
||||
version = "0.5.3.5";
|
||||
sha256 = "0m76h33igw77ndllgzkqgmygi7krc5vfjvizidsgris0zd1g2yv3";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ blazeHtml filepath mtl parsec regexPcre ];
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hs-bibutils";
|
||||
version = "4.15";
|
||||
sha256 = "1h2vqi6ymhx9wpfv5qzvq4fhc4iand93shsncp8nszk64acmz9z9";
|
||||
version = "4.16";
|
||||
sha256 = "0501fqv0xlwdmpg65s3rr0fns6gqq15x2zq2a8915n3dvipfkixb";
|
||||
buildDepends = [ syb ];
|
||||
meta = {
|
||||
homepage = "http://gorgias.mine.nu/repos/hs-bibutils/";
|
||||
|
||||
@ -1,21 +1,23 @@
|
||||
{ cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring
|
||||
, blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate
|
||||
, conduit, cookie, cprngAes, dataDefault, deepseq, failure
|
||||
, httpTypes, liftedBase, monadControl, mtl, network, regexCompat
|
||||
, resourcet, socks, text, time, tls, tlsExtra, transformers
|
||||
, transformersBase, utf8String, void, zlibConduit
|
||||
, filepath, httpTypes, liftedBase, mimeTypes, monadControl, mtl
|
||||
, network, random, regexCompat, resourcet, socks, text, time, tls
|
||||
, tlsExtra, transformers, transformersBase, utf8String, void
|
||||
, zlibConduit
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "http-conduit";
|
||||
version = "1.8.6.2";
|
||||
sha256 = "0b9iw8gq0kyfmnpv1jba2dx8rik9136zx5q9xdyvy0lczdgb8i09";
|
||||
version = "1.8.7";
|
||||
sha256 = "12v5rxp4dx6glyijygpp7r7b5b6mscclgfp2cbii78m3hgld097i";
|
||||
buildDepends = [
|
||||
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
|
||||
blazeBuilderConduit caseInsensitive certificate conduit cookie
|
||||
cprngAes dataDefault deepseq failure httpTypes liftedBase
|
||||
monadControl mtl network regexCompat resourcet socks text time tls
|
||||
tlsExtra transformers transformersBase utf8String void zlibConduit
|
||||
cprngAes dataDefault deepseq failure filepath httpTypes liftedBase
|
||||
mimeTypes monadControl mtl network random regexCompat resourcet
|
||||
socks text time tls tlsExtra transformers transformersBase
|
||||
utf8String void zlibConduit
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/book/http-conduit";
|
||||
|
||||
@ -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";
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "pandoc-types";
|
||||
version = "1.9.1";
|
||||
sha256 = "1174nkaig0g71n3kqrhgqn7xmr9rni3l3dh1xpypc0ksjm0ym21i";
|
||||
version = "1.10";
|
||||
sha256 = "1xbqvgb95h0jhqx2y0jzds3xvycx5gwi3xn6agdmfkg7xhx9hnz6";
|
||||
buildDepends = [ syb ];
|
||||
meta = {
|
||||
homepage = "http://johnmacfarlane.net/pandoc";
|
||||
|
||||
@ -1,20 +1,20 @@
|
||||
{ cabal, base64Bytestring, blazeHtml, blazeMarkup, citeprocHs
|
||||
, extensibleExceptions, filepath, highlightingKate, HTTP, json, mtl
|
||||
, network, pandocTypes, parsec, random, syb, tagsoup, temporary
|
||||
, texmath, time, utf8String, xml, zipArchive, zlib
|
||||
, dataDefault, extensibleExceptions, filepath, highlightingKate
|
||||
, HTTP, json, mtl, network, pandocTypes, parsec, random, syb
|
||||
, tagsoup, temporary, texmath, text, time, xml, zipArchive, zlib
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "pandoc";
|
||||
version = "1.9.4.5";
|
||||
sha256 = "05k8i537756m07xlb6kgshpfxa4sp2jxidb1c8m72ilpai13r6fb";
|
||||
version = "1.10";
|
||||
sha256 = "11zvyzn16zckgs1zzhl415y14nziw16zhgghg31a459d1ww7c3dg";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
base64Bytestring blazeHtml blazeMarkup citeprocHs
|
||||
base64Bytestring blazeHtml blazeMarkup citeprocHs dataDefault
|
||||
extensibleExceptions filepath highlightingKate HTTP json mtl
|
||||
network pandocTypes parsec random syb tagsoup temporary texmath
|
||||
time utf8String xml zipArchive zlib
|
||||
text time xml zipArchive zlib
|
||||
];
|
||||
configureFlags = "-fblaze_html_0_5";
|
||||
meta = {
|
||||
|
||||
@ -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 = "smallcheck";
|
||||
version = "0.6.1";
|
||||
sha256 = "1p2bsc08lcyzmqdjc5qsr60dr03kvc8xw7kk4lbi9cnn9s9w90vb";
|
||||
version = "0.6.2";
|
||||
sha256 = "0yz7an3k71ia7sgs8xpkh37xz9ipsnbf13680185cij8llq8zbyr";
|
||||
buildDepends = [ dlist ];
|
||||
meta = {
|
||||
homepage = "https://github.com/feuerbach/smallcheck";
|
||||
|
||||
@ -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.1";
|
||||
sha256 = "0gc3dz3s188jk6q2lai56y4ckxh62s9gm04d7jznr6jzpx2i4fan";
|
||||
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,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yst";
|
||||
version = "0.3.0.1";
|
||||
sha256 = "17jp9vdbpp82wzsj8rhp5nh6fbmgm2xrclfnb7jl4gjwls7xggrv";
|
||||
version = "0.3.1";
|
||||
sha256 = "1ax3j21b4ac9x4vvvfgnhz0sczd7l7ia6mcxnqhbc3166sn91vig";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
||||
@ -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/;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, popt }:
|
||||
{ stdenv, fetchurl, popt, libiconv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (rec {
|
||||
name = "libnatspec-0.2.6";
|
||||
|
||||
src = fetchurl {
|
||||
@ -16,4 +16,8 @@ stdenv.mkDerivation rec {
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = [ stdenv.lib.maintainers.urkud ];
|
||||
};
|
||||
}
|
||||
} // stdenv.lib.optionalAttrs (!stdenv.isLinux) {
|
||||
NIX_CFLAGS_COMPILE = "-I${libiconv}/include";
|
||||
|
||||
NIX_CFLAGS_LINK = "-L${libiconv}/lib -liconv";
|
||||
})
|
||||
|
||||
@ -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";
|
||||
};
|
||||
|
||||
|
||||
@ -49,6 +49,6 @@ rec {
|
||||
maintainers = [
|
||||
a.lib.maintainers.raskin
|
||||
];
|
||||
platforms = a.lib.platforms.linux ;
|
||||
#platforms = a.lib.platforms.linux ;
|
||||
};
|
||||
}
|
||||
|
||||
@ -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";
|
||||
};
|
||||
|
||||
|
||||
22
pkgs/development/libraries/tsocks/default.nix
Normal file
22
pkgs/development/libraries/tsocks/default.nix
Normal 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;
|
||||
};
|
||||
}
|
||||
@ -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,9 +12,12 @@ let
|
||||
platformVersions = androidPlatformVersions;
|
||||
useGoogleAPIs = true;
|
||||
};
|
||||
|
||||
deleteKeychain = "security delete-keychain $keychainName";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit name src;
|
||||
name = stdenv.lib.replaceChars [" "] [""] name;
|
||||
inherit src;
|
||||
|
||||
buildInputs = [] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper;
|
||||
|
||||
@ -25,13 +28,12 @@ stdenv.mkDerivation {
|
||||
|
||||
${if target == "android" then
|
||||
if release then
|
||||
"${titaniumsdk}/mobilesdk/*/*/android/builder.py distribute ${name} ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId} ${androidKeyStore} ${androidKeyStorePassword} ${androidKeyAlias} $out"
|
||||
''${titaniumsdk}/mobilesdk/*/*/android/builder.py distribute "${name}" ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId} ${androidKeyStore} ${androidKeyStorePassword} ${androidKeyAlias} $out''
|
||||
else
|
||||
"${titaniumsdk}/mobilesdk/*/*/android/builder.py build ${name} ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId}"
|
||||
''${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 +53,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
|
||||
''
|
||||
@ -66,7 +96,7 @@ stdenv.mkDerivation {
|
||||
|
||||
cp -av * $out
|
||||
cd $out
|
||||
${titaniumsdk}/mobilesdk/*/*/iphone/builder.py build 6.0 $(pwd) ${appId} ${name}
|
||||
${titaniumsdk}/mobilesdk/*/*/iphone/builder.py build 6.0 $(pwd) ${appId} "${name}"
|
||||
''
|
||||
|
||||
else throw "Target: ${target} is not supported!"}
|
||||
@ -84,4 +114,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-"
|
||||
|
||||
@ -40,6 +40,8 @@
|
||||
, preInstall ? ""
|
||||
, postInstall ? ""
|
||||
|
||||
, meta ? {}
|
||||
|
||||
, ... } @ attrs:
|
||||
|
||||
# Keep extra attributes from ATTR, e.g., `patchPhase', etc.
|
||||
@ -48,16 +50,22 @@ python.stdenv.mkDerivation (attrs // {
|
||||
|
||||
name = namePrefix + name;
|
||||
|
||||
# default to python's platforms and add maintainer(s) to every
|
||||
# package
|
||||
meta = {
|
||||
platforms = python.meta.platforms;
|
||||
} // meta // {
|
||||
maintainers = (meta.maintainers or []) ++ [ lib.maintainers.chaoflow ];
|
||||
};
|
||||
|
||||
# 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 +91,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}
|
||||
'';
|
||||
@ -94,15 +100,6 @@ python.stdenv.mkDerivation (attrs // {
|
||||
''
|
||||
wrapPythonPrograms
|
||||
|
||||
# If a user installs a Python package, she probably also wants its
|
||||
# dependencies in the user environment (since Python modules don't
|
||||
# have something like an RPATH, so the only way to find the
|
||||
# dependencies is to have them in the PYTHONPATH variable).
|
||||
if test -e $out/nix-support/propagated-build-inputs; then
|
||||
ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
|
||||
fi
|
||||
|
||||
createBuildInputsPth build-inputs "$buildInputStrings"
|
||||
for inputsfile in propagated-build-inputs propagated-build-native-inputs; do
|
||||
if test -e $out/nix-support/$inputsfile; then
|
||||
createBuildInputsPth $inputsfile "$(cat $out/nix-support/$inputsfile)"
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hlint";
|
||||
version = "1.8.40";
|
||||
sha256 = "18w4dhxv7c1y4x1agdjq99ss5i77jnm8p9vg3jp9gvhk2arhcl0x";
|
||||
version = "1.8.41";
|
||||
sha256 = "0b585i5v81jh1j2r70x74ykabc5hcd5sbww4kspl3s5i3jwkp16q";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
, mesa, openal}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "minecraft-1.3.1";
|
||||
name = "minecraft-1.4.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://s3.amazonaws.com/MinecraftDownload/launcher/minecraft.jar";
|
||||
sha256 = "0j8a889w174vwgcxl4yqgp2kbqqha3x505fn7izz38srlx59gnwj";
|
||||
sha256 = "92db974aa759a3f17f3cd61550fa5010e335c57dd813dad9e39b9cc013420a49";
|
||||
};
|
||||
|
||||
phases = "installPhase";
|
||||
|
||||
@ -36,6 +36,6 @@ stdenv.mkDerivation {
|
||||
homepage = http://www.naev.org;
|
||||
license = "GPLv3+";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
#platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://torcs.sourceforge.net/;
|
||||
license = "GPLv2+";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
#platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Squad-based tactical strategy game in the tradition of X-Com";
|
||||
license = "GPLv2+";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
#platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -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";
|
||||
};
|
||||
|
||||
|
||||
@ -82,6 +82,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://www.urbanterror.net;
|
||||
license = [ "unfree-redistributable" ];
|
||||
maintainers = with stdenv.lib.maintainers; [ astsmtl ];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
#platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -64,8 +64,7 @@ rec {
|
||||
raskin
|
||||
jcumming
|
||||
];
|
||||
platforms = with a.lib.platforms;
|
||||
linux;
|
||||
#platforms = a.lib.platforms.linux;
|
||||
license = a.lib.licenses.gpl2Plus;
|
||||
};
|
||||
passthru = {
|
||||
|
||||
@ -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+";
|
||||
};
|
||||
}
|
||||
|
||||
@ -45,9 +45,9 @@ stdenv.mkDerivation rec {
|
||||
patchelf
|
||||
unzip
|
||||
];
|
||||
|
||||
|
||||
inherit kernel glibc /* glibc only used for setting interpreter */;
|
||||
|
||||
|
||||
LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":"
|
||||
[ "${xorg.libXrandr}/lib"
|
||||
"${xorg.libXrender}/lib"
|
||||
@ -58,11 +58,11 @@ stdenv.mkDerivation rec {
|
||||
inherit mesa; # only required to build examples
|
||||
|
||||
meta = {
|
||||
description = "ati drivers";
|
||||
description = "ATI drivers";
|
||||
homepage = http://support.amd.com/us/gpudownload/Pages/index.aspx;
|
||||
license = "unfree";
|
||||
maintainers = [stdenv.lib.maintainers.marcweber];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
#platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
|
||||
# moved assertions here because the name is evaluated when the NixOS manual is generated
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user