Merge branch 'master' into wayland

This commit is contained in:
Carles Pagès 2013-01-26 11:13:20 +01:00
commit 29150b43a3
273 changed files with 6576 additions and 2405 deletions

View file

@ -176,6 +176,12 @@ following:
(“MIT”) License</link>.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>perl5</varname></term>
<listitem><para>The Perl 5 license (Artistic License, version 1
and GPL, version 1 or later).</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>free</varname></term>
<listitem><para>Catch-all for free software licenses not listed

View file

@ -10,25 +10,25 @@ base="$(basename "$url")"
if [ -z "$base" ]; then echo "bad URL"; exit 1; fi
dstPath="$distDir/$base"
if [ -e "$dstPath" ]; then echo "$dstPath already exists"; exit 0; fi
if [ -e "$dstPath" ]; then if [ -n "$VERBOSE" ]; then echo "$dstPath already exists"; fi; exit 0; fi
if [ -z "$file" ]; then
echo "downloading $url to $dstPath"
if [ -n "$dryRun" ]; then exit 0; fi
if [ -n "$DRY_RUN" ]; then exit 0; fi
declare -a res
if ! res=($(PRINT_PATH=1 nix-prefetch-url "$url")); then
continue
exit
fi
storePath=${res[1]}
else
storePath="$file"
fi
cp $storePath "$dstPath.tmp.$$"
mv -f "$dstPath.tmp.$$" "$dstPath"

View file

@ -8,7 +8,19 @@ urls=$(nix-instantiate --eval-only --xml --strict '<nixpkgs/maintainers/scripts/
for url in $urls; do
if echo "$url" | grep -q -E "www.cs.uu.nl|nixos.org|.stratego-language.org|java.sun.com|ut2004|linuxq3a|RealPlayer|Adbe|belastingdienst|microsoft|armijn/.nix|sun.com|archive.eclipse.org"; then continue; fi
if ! echo "$url" | grep -q -E "\-.*[0-9].*"; then echo "skipping $url"; continue; fi
# Check the URL scheme.
if ! echo "$url" | grep -q -E "^[a-z]+://"; then echo "skipping $url (no URL scheme)"; continue; fi
# Check the basename. It should include something resembling a version.
base="$(basename "$url")"
#if ! echo "$base" | grep -q -E "[-_].*[0-9].*"; then echo "skipping $url (no version)"; continue; fi
if ! echo "$base" | grep -q -E "[a-zA-Z]"; then echo "skipping $url (no letter in name)"; continue; fi
if ! echo "$base" | grep -q -E "[0-9]"; then echo "skipping $url (no digit in name)"; continue; fi
if ! echo "$base" | grep -q -E "[-_\.]"; then echo "skipping $url (no dot/underscore in name)"; continue; fi
if echo "$base" | grep -q -E "[&?=%]"; then echo "skipping $url (bad character in name)"; continue; fi
if [ "${base:0:1}" = "." ]; then echo "skipping $url (starts with a dot)"; continue; fi
$(dirname $0)/copy-tarball.sh "$url"
done

View file

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

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, pkgconfig, x11, libjpeg, libpng12, libXmu
, fontconfig, freetype, pam, consolekit, dbus_libs }:
, fontconfig, freetype, pam, dbus_libs }:
stdenv.mkDerivation rec {
name = "slim-1.3.4";
@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
buildInputs =
[ cmake pkgconfig x11 libjpeg libpng12 libXmu fontconfig freetype
pam dbus_libs
] ++ stdenv.lib.optional (consolekit != null) consolekit;
];
preConfigure = "substituteInPlace CMakeLists.txt --replace /etc $out/etc";
cmakeFlags = [ "-DUSE_PAM=1" ] ++ stdenv.lib.optional (consolekit != null) "-DUSE_CONSOLEKIT=1";
cmakeFlags = [ "-DUSE_PAM=1" ];
NIX_CFLAGS_LINK = "-lXmu";

View file

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

View file

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

View file

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

View file

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

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, x11, imlib2, libjpeg, libpng, giblib
, libXinerama, curl }:
stdenv.mkDerivation {
name = "feh-2.4";
stdenv.mkDerivation rec {
name = "feh-2.8";
src = fetchurl {
url = http://feh.finalrewind.org/feh-2.4.tar.bz2;
sha256 = "00liykp0ipmmiggl26wk72iawcff6zpmbniifdr3f5yf0sfanz48";
url = "http://feh.finalrewind.org/${name}.tar.bz2";
sha256 = "0zmslchnzvi9ydxj2mgci4x8zpv5mdfkf7kyny3nibbpajibqmrx";
};
buildInputs = [x11 imlib2 giblib libjpeg libpng libXinerama curl ];

View file

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

View file

@ -0,0 +1,22 @@
{ 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"
substituteInPlace Makefile --replace /man/ /share/man/
'';
meta = {
description = "qiv (quick image viewer)";
homepage = http://spiegl.de/qiv/;
};
})

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, qt4, libXtst, libvorbis, phonon, hunspell }:
{ stdenv, fetchurl, pkgconfig, qt4, libXtst, libvorbis, phonon, hunspell }:
stdenv.mkDerivation rec {
name = "goldendict-1.0.1";
src = fetchurl {
url = "mirror://sourceforge/goldendict/${name}-src.tar.bz2";
sha256 = "19p99dd5jgs0k66sy30vck7ymqj6dv1lh6w8xw18zczdll2h9yxk";
};
buildInputs = [ qt4 libXtst libvorbis phonon hunspell ];
buildInputs = [ pkgconfig qt4 libXtst libvorbis phonon hunspell ];
unpackPhase = ''
mkdir ${name}-src
cd ${name}-src

View file

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

View file

@ -1,34 +0,0 @@
{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi }:
stdenv.mkDerivation {
name = "nut-2.6.3";
src = fetchurl {
url = http://www.networkupstools.org/source/2.6/nut-2.6.3.tar.gz;
sha256 = "0fk3bcivv26kw1psxb6sykqp9n5w02j01s1idypzlci0kmr3p49l";
};
buildInputs = [ neon libusb openssl udev avahi freeipmi ];
buildNativeInputs = [ pkgconfig ];
configureFlags = [
"--with-all"
"--with-ssl"
"--without-snmp" # Until we have it ...
"--without-powerman" # Until we have it ...
"--without-cgi"
"--without-hal"
];
meta = {
description = "Network UPS Tools";
longDescription = ''
Network UPS Tools is a collection of programs which provide a common
interface for monitoring and administering UPS, PDU and SCD hardware.
It uses a layered approach to connect all of the parts.
'';
homepage = http://www.networkupstools.org/;
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [ pierron ];
priority = 10;
};
}

View file

@ -1,21 +1,28 @@
{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev }:
{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi }:
stdenv.mkDerivation {
name = "nut-2.6.1";
stdenv.mkDerivation rec {
name = "nut-2.6.5";
src = fetchurl {
url = http://www.networkupstools.org/source/2.6/nut-2.6.1.tar.gz;
sha256 = "f5c46b856c0cf5b7f0e4b22d82b670af64cc98717a90eaac8723dd402a181c00";
url = "http://www.networkupstools.org/source/2.6/${name}.tar.gz";
sha256 = "0gxrzsblx0jc4g9w0903ybwqbv1d79vq5hnks403fvnay4fgg3b1";
};
buildInputs = [ pkgconfig neon libusb openssl udev ];
buildInputs = [ neon libusb openssl udev avahi freeipmi ];
configureFlags = [
"--with-all"
"--without-snmp" # Until we have it ...
"--without-powerman" # Until we have it ...
"--without-cgi"
];
buildNativeInputs = [ pkgconfig ];
configureFlags =
[ "--with-all"
"--with-ssl"
"--without-snmp" # Until we have it ...
"--without-powerman" # Until we have it ...
"--without-cgi"
"--without-hal"
"--with-systemdsystemunitdir=$(out)/etc/systemd/systemd"
];
enableParallelBuilding = true;
meta = {
description = "Network UPS Tools";
@ -27,5 +34,6 @@ stdenv.mkDerivation {
homepage = http://www.networkupstools.org/;
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [ pierron ];
priority = 10;
};
}

View file

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

View file

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

View file

@ -78,11 +78,10 @@ let
post23 = !versionOlder sourceInfo.version "24.0.0.0";
post24 = !versionOlder sourceInfo.version "25.0.0.0";
only24 = post23 && !post24;
maybeFixPulseAudioBuild = optional (post23 && pulseSupport) (fetchurl {
url = http://archrepo.jeago.com/sources/chromium-dev/pulse_audio_fix.patch;
sha256 = "1w91mirrkqigdhsj892mqxlc0nlv1dsp5shc46w9xf8nl96jxgfb";
});
maybeFixPulseAudioBuild = optional (only24 && pulseSupport)
./pulse_audio_fix.patch;
in stdenv.mkDerivation rec {
name = "${packageName}-${version}";
@ -122,6 +121,8 @@ in stdenv.mkDerivation rec {
postPatch = optionalString useOpenSSL ''
cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
'' + optionalString post24 ''
sed -i -r -e "s/-f(stack-protector)(-all)?/-fno-\1/" build/common.gypi
'';
gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {
@ -197,7 +198,7 @@ in stdenv.mkDerivation rec {
meta = {
description = "Chromium, an open source web browser";
homepage = http://www.chromium.org/;
maintainers = with maintainers; [ goibhniu chaoflow ];
maintainers = with maintainers; [ goibhniu chaoflow aszlig ];
license = licenses.bsd3;
platforms = platforms.linux;
};

View file

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

View file

@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
dev = {
version = "25.0.1323.1";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1323.1.tar.bz2";
sha256 = "1i7ga1qhnjvnw2gynmpmsvvl5pxcb5z9sgldp87d9yalim5sra6s";
version = "25.0.1364.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";
};
}

View file

@ -15,9 +15,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
firefoxVersion = "17.0.1";
firefoxVersion = "18.0.1";
xulVersion = "17.0.1"; # this attribute is used by other packages
xulVersion = "18.0.1"; # this attribute is used by other packages
src = fetchurl {
@ -27,7 +27,7 @@ rec {
# Fall back to this url for versions not available at releases.mozilla.org.
"ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
];
sha1 = "15c09796a388f0a78996427b7bc2c80f4e0496f3";
sha1 = "26415396233450a4e66bb0e0a73a258e1cb174ef";
};
commonConfigureFlags =
@ -35,11 +35,11 @@ rec {
#"--enable-profiling"
"--disable-debug"
"--enable-strip"
"--with-system-jpeg"
# "--with-system-jpeg" # Too old in nixpkgs
"--with-system-zlib"
"--with-system-bz2"
"--with-system-nspr"
"--with-system-nss"
# "--with-system-nss" # Too old in nixpkgs
# "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
# "--enable-system-cairo" # disabled for the moment because our Cairo is too old
"--enable-system-sqlite"
@ -70,7 +70,7 @@ rec {
"--disable-javaxpcom"
] ++ commonConfigureFlags;
enableParallelBuilding = false;
enableParallelBuilding = true;
preConfigure =
''

View file

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

View file

@ -2,10 +2,10 @@
pkgconfig, webkit }:
stdenv.mkDerivation {
name = "vimprobable2-1.0.2";
name = "vimprobable2-1.2.0";
src = fetchurl {
url = "mirror://sourceforge/vimprobable/vimprobable2_1.0.2.tar.bz2";
sha256 = "19gwlfv0lczbns73xg3637q7ixly62y3ijccnv0m1bqaqxjl4v8x";
url = "mirror://sourceforge/vimprobable/vimprobable2_1.2.0.tar.bz2";
sha256 = "0fjakrmz1syjwgx01j2icpdv69jgvfl2nlxbj8zxfr8mw0h2wg1f";
};
buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit ];
installPhase = ''

View file

@ -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";
@ -42,7 +42,7 @@ let
exec = "dropbox";
comment = "Online directories";
desktopName = "Dropbox";
genericName = "Online storage";
genericName = "Online storage";
categories = "Application;Internet;";
};
@ -65,7 +65,7 @@ in stdenv.mkDerivation {
installPhase = ''
ensureDir "$out/${appdir}"
cp -r .dropbox-dist/* "$out/${appdir}/"
cp -r ".dropbox-dist/"* "$out/${appdir}/"
ensureDir "$out/bin"
ln -s "$out/${appdir}/dropbox" "$out/bin/dropbox"
@ -78,13 +78,13 @@ in stdenv.mkDerivation {
-print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;
ensureDir "$out/share/applications"
cp ${desktopItem}/share/applications/* $out/share/applications
cp "${desktopItem}/share/applications/"* $out/share/applications
'';
buildInputs = [ patchelf ];
meta = {
homepage = "http://www.dropbox.com";
description = "Online stored folders (daemon version)";
homepage = http://www.dropbox.com;
};
}

View file

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

View file

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

View file

@ -1,19 +1,20 @@
{ stdenv, fetchurl, ncurses, openssl, perl, python, aspell, gnutls
, zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile
, pythonPackages, makeWrapper }:
, pythonPackages, cacert, cmake, makeWrapper }:
stdenv.mkDerivation rec {
version = "0.3.9.2";
version = "0.4.0";
name = "weechat-${version}";
src = fetchurl {
url = "http://weechat.org/files/src/${name}.tar.gz";
sha256 = "114cffqwnrqx8r4dslz7sc4i4ky4akzh863rnzaw3dnn9ky9r503";
sha256 = "17jxknam1bbakmdfqy1b2cfc8l9ag90l3z1gcxdvwg358wasv9dc";
};
buildInputs =
[ ncurses perl python openssl aspell gnutls zlib curl pkgconfig
libgcrypt ruby lua5 tcl guile pythonPackages.pycrypto makeWrapper
cacert cmake
];
postInstall = ''

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,6 +1,6 @@
{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies
, lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate
, consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi
, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi
, pykde4, libjpeg, pkgconfig, libXft, libXxf86misc
}:
@ -12,7 +12,7 @@ kde {
xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp
xorg.libpthreadstubs
boost gpsd shared_desktop_ontologies lm_sensors pciutils libraw1394
libusb python libqalculate consolekit kdepimlibs pam prison akonadi
libusb python libqalculate kdepimlibs pam prison akonadi
];
buildNativeInputs = [ pkgconfig ];

View file

@ -1,6 +1,6 @@
{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies,
lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate,
consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi,
xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi,
pykde4, libjpeg, pkgconfig, libXft, libXxf86misc, kactivities
}:
@ -12,7 +12,7 @@ kde {
xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp
xorg.libpthreadstubs
boost gpsd shared_desktop_ontologies lm_sensors pciutils libraw1394
libusb python libqalculate consolekit kdepimlibs pam prison akonadi
libusb python libqalculate kdepimlibs pam prison akonadi
kactivities
];

View file

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

View file

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

View file

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

View file

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

View file

@ -1,15 +1,15 @@
{ cabal, binary, Cabal, filepath, happy, haskeline, mtl, parsec
, transformers
, split, transformers
}:
cabal.mkDerivation (self: {
pname = "idris";
version = "0.9.5.1";
sha256 = "0cy27b2kq696lw354y55mpx1gv66jdax1xjph989kxp0rd1v1sw9";
version = "0.9.6";
sha256 = "1yml1k4bis210hgi898hgs4wj5p34ainlj7vwy5lh7bjkvrksgq1";
isLibrary = false;
isExecutable = true;
buildDepends = [
binary Cabal filepath haskeline mtl parsec transformers
binary Cabal filepath haskeline mtl parsec split transformers
];
buildTools = [ happy ];
meta = {

View file

@ -1,21 +0,0 @@
diff -Naur clang-3.1.src-orig/lib/Driver/ToolChains.cpp clang-3.1.src/lib/Driver/ToolChains.cpp
--- clang-3.1.src-orig/lib/Driver/ToolChains.cpp 2012-05-11 20:16:02.000000000 -0400
+++ clang-3.1.src/lib/Driver/ToolChains.cpp 2012-10-08 01:13:01.044083509 -0400
@@ -2146,9 +2146,6 @@
if (DriverArgs.hasArg(options::OPT_nostdinc))
return;
- if (!DriverArgs.hasArg(options::OPT_nostdlibinc))
- addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include");
-
if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
llvm::sys::Path P(D.ResourceDir);
P.appendComponent("include");
@@ -2264,6 +2261,7 @@
return;
// Check if libc++ has been enabled and provide its include paths if so.
+ // !!! Will need to modify this if/when nixpkgs uses libc++
if (GetCXXStdlibType(DriverArgs) == ToolChain::CST_Libcxx) {
// libc++ is always installed at a fixed path on Linux currently.
addSystemInclude(DriverArgs, CC1Args,

View file

@ -1,57 +0,0 @@
diff -Naur clang-3.1.src-orig/lib/Driver/ToolChains.cpp clang-3.1.src/lib/Driver/ToolChains.cpp
--- clang-3.1.src-orig/lib/Driver/ToolChains.cpp 2012-05-11 20:16:02.000000000 -0400
+++ clang-3.1.src/lib/Driver/ToolChains.cpp 2012-10-08 01:22:53.458850737 -0400
@@ -2077,16 +2077,6 @@
addPathIfExists(LibPath + "/../" + Multilib, Paths);
}
}
- addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths);
- addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths);
- addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths);
- addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths);
-
- // Try walking via the GCC triple path in case of multiarch GCC
- // installations with strange symlinks.
- if (GCCInstallation.isValid())
- addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() +
- "/../../" + Multilib, Paths);
// Add the non-multilib suffixed paths (if potentially different).
if (GCCInstallation.isValid()) {
@@ -2100,8 +2090,6 @@
addPathIfExists(LibPath, Paths);
}
}
- addPathIfExists(SysRoot + "/lib", Paths);
- addPathIfExists(SysRoot + "/usr/lib", Paths);
}
bool Linux::HasNativeLLVMSupport() const {
diff -Naur clang-3.1.src-orig/lib/Driver/Tools.cpp clang-3.1.src/lib/Driver/Tools.cpp
--- clang-3.1.src-orig/lib/Driver/Tools.cpp 2012-04-18 17:32:25.000000000 -0400
+++ clang-3.1.src/lib/Driver/Tools.cpp 2012-10-08 01:25:23.913501995 -0400
@@ -5210,24 +5210,6 @@
ToolChain.getArch() == llvm::Triple::thumb ||
(!Args.hasArg(options::OPT_static) &&
!Args.hasArg(options::OPT_shared))) {
- CmdArgs.push_back("-dynamic-linker");
- if (ToolChain.getArch() == llvm::Triple::x86)
- CmdArgs.push_back("/lib/ld-linux.so.2");
- else if (ToolChain.getArch() == llvm::Triple::arm ||
- ToolChain.getArch() == llvm::Triple::thumb)
- CmdArgs.push_back("/lib/ld-linux.so.3");
- else if (ToolChain.getArch() == llvm::Triple::mips ||
- ToolChain.getArch() == llvm::Triple::mipsel)
- CmdArgs.push_back("/lib/ld.so.1");
- else if (ToolChain.getArch() == llvm::Triple::mips64 ||
- ToolChain.getArch() == llvm::Triple::mips64el)
- CmdArgs.push_back("/lib64/ld.so.1");
- else if (ToolChain.getArch() == llvm::Triple::ppc)
- CmdArgs.push_back("/lib/ld.so.1");
- else if (ToolChain.getArch() == llvm::Triple::ppc64)
- CmdArgs.push_back("/lib64/ld64.so.1");
- else
- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
}
CmdArgs.push_back("-o");

View file

@ -0,0 +1,137 @@
diff -Naur clang-3.2.src-orig/lib/Driver/ToolChains.cpp clang-3.2.src/lib/Driver/ToolChains.cpp
--- clang-3.2.src-orig/lib/Driver/ToolChains.cpp 2012-12-16 10:59:27.000000000 -0500
+++ clang-3.2.src/lib/Driver/ToolChains.cpp 2013-01-22 14:16:55.787547681 -0500
@@ -2153,16 +2153,6 @@
addPathIfExists(LibPath + "/../" + GCCTriple.str() + "/lib", Paths);
}
}
- addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths);
- addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths);
- addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths);
- addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths);
-
- // Try walking via the GCC triple path in case of multiarch GCC
- // installations with strange symlinks.
- if (GCCInstallation.isValid())
- addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() +
- "/../../" + Multilib, Paths);
// Add the non-multilib suffixed paths (if potentially different).
if (GCCInstallation.isValid()) {
@@ -2176,8 +2166,6 @@
addPathIfExists(LibPath, Paths);
}
}
- addPathIfExists(SysRoot + "/lib", Paths);
- addPathIfExists(SysRoot + "/usr/lib", Paths);
}
bool Linux::HasNativeLLVMSupport() const {
@@ -2228,9 +2216,6 @@
if (DriverArgs.hasArg(options::OPT_nostdinc))
return;
- if (!DriverArgs.hasArg(options::OPT_nostdlibinc))
- addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include");
-
if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
llvm::sys::Path P(D.ResourceDir);
P.appendComponent("include");
@@ -2295,24 +2280,6 @@
"/usr/include/powerpc64-linux-gnu"
};
ArrayRef<StringRef> MultiarchIncludeDirs;
- if (getTriple().getArch() == llvm::Triple::x86_64) {
- MultiarchIncludeDirs = X86_64MultiarchIncludeDirs;
- } else if (getTriple().getArch() == llvm::Triple::x86) {
- MultiarchIncludeDirs = X86MultiarchIncludeDirs;
- } else if (getTriple().getArch() == llvm::Triple::arm) {
- if (getTriple().getEnvironment() == llvm::Triple::GNUEABIHF)
- MultiarchIncludeDirs = ARMHFMultiarchIncludeDirs;
- else
- MultiarchIncludeDirs = ARMMultiarchIncludeDirs;
- } else if (getTriple().getArch() == llvm::Triple::mips) {
- MultiarchIncludeDirs = MIPSMultiarchIncludeDirs;
- } else if (getTriple().getArch() == llvm::Triple::mipsel) {
- MultiarchIncludeDirs = MIPSELMultiarchIncludeDirs;
- } else if (getTriple().getArch() == llvm::Triple::ppc) {
- MultiarchIncludeDirs = PPCMultiarchIncludeDirs;
- } else if (getTriple().getArch() == llvm::Triple::ppc64) {
- MultiarchIncludeDirs = PPC64MultiarchIncludeDirs;
- }
for (ArrayRef<StringRef>::iterator I = MultiarchIncludeDirs.begin(),
E = MultiarchIncludeDirs.end();
I != E; ++I) {
@@ -2324,13 +2291,6 @@
if (getTriple().getOS() == llvm::Triple::RTEMS)
return;
-
- // Add an include of '/include' directly. This isn't provided by default by
- // system GCCs, but is often used with cross-compiling GCCs, and harmless to
- // add even when Clang is acting as-if it were a system compiler.
- addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/include");
-
- addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/include");
}
/// \brief Helper to add the thre variant paths for a libstdc++ installation.
diff -Naur clang-3.2.src-orig/lib/Driver/Tools.cpp clang-3.2.src/lib/Driver/Tools.cpp
--- clang-3.2.src-orig/lib/Driver/Tools.cpp 2012-11-21 02:56:23.000000000 -0500
+++ clang-3.2.src/lib/Driver/Tools.cpp 2013-01-22 14:24:37.167212186 -0500
@@ -5972,34 +5972,6 @@
ToolChain.getArch() == llvm::Triple::thumb ||
(!Args.hasArg(options::OPT_static) &&
!Args.hasArg(options::OPT_shared))) {
- CmdArgs.push_back("-dynamic-linker");
- if (isAndroid)
- CmdArgs.push_back("/system/bin/linker");
- else if (ToolChain.getArch() == llvm::Triple::x86)
- CmdArgs.push_back("/lib/ld-linux.so.2");
- else if (ToolChain.getArch() == llvm::Triple::arm ||
- ToolChain.getArch() == llvm::Triple::thumb) {
- if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF)
- CmdArgs.push_back("/lib/ld-linux-armhf.so.3");
- else
- CmdArgs.push_back("/lib/ld-linux.so.3");
- }
- else if (ToolChain.getArch() == llvm::Triple::mips ||
- ToolChain.getArch() == llvm::Triple::mipsel)
- CmdArgs.push_back("/lib/ld.so.1");
- else if (ToolChain.getArch() == llvm::Triple::mips64 ||
- ToolChain.getArch() == llvm::Triple::mips64el) {
- if (hasMipsN32ABIArg(Args))
- CmdArgs.push_back("/lib32/ld.so.1");
- else
- CmdArgs.push_back("/lib64/ld.so.1");
- }
- else if (ToolChain.getArch() == llvm::Triple::ppc)
- CmdArgs.push_back("/lib/ld.so.1");
- else if (ToolChain.getArch() == llvm::Triple::ppc64)
- CmdArgs.push_back("/lib64/ld64.so.1");
- else
- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
}
CmdArgs.push_back("-o");
diff -Naur clang-3.2.src-orig/lib/Frontend/InitHeaderSearch.cpp clang-3.2.src/lib/Frontend/InitHeaderSearch.cpp
--- clang-3.2.src-orig/lib/Frontend/InitHeaderSearch.cpp 2012-10-24 12:19:39.000000000 -0400
+++ clang-3.2.src/lib/Frontend/InitHeaderSearch.cpp 2013-01-22 14:20:32.803925775 -0500
@@ -221,8 +221,6 @@
case llvm::Triple::Bitrig:
break;
default:
- // FIXME: temporary hack: hard-coded paths.
- AddPath("/usr/local/include", System, true, false, false);
break;
}
}
@@ -330,8 +328,6 @@
break;
}
- if ( os != llvm::Triple::RTEMS )
- AddPath("/usr/include", System, false, false, false);
}
void InitHeaderSearch::

View file

@ -1,14 +1,13 @@
{ stdenv, fetchurl, perl, groff, llvm, cmake }:
{ stdenv, fetchurl, perl, groff, llvm, cmake, libxml2 }:
let version = "3.1"; in
let version = "3.2"; in
stdenv.mkDerivation {
name = "clang-${version}";
buildInputs = [ perl llvm groff cmake ];
buildInputs = [ perl llvm groff cmake libxml2 ];
patches = stdenv.lib.optionals (stdenv.gcc.libc != null)
[ ./clang-include-paths.patch ./clang-ld-flags.patch ];
patches = stdenv.lib.optional (stdenv.gcc.libc != null) ./clang-purity.patch;
cmakeFlags = [
"-DCLANG_PATH_TO_LLVM_BUILD=${llvm}"
@ -22,7 +21,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://llvm.org/releases/${version}/clang-${version}.src.tar.gz";
sha256 = "11m7sm9f8qcrayckfg3z91zb3fimilpm0f7azn7q7qnkvhay4qzz";
sha256 = "0n2nzw3pw2v7fk67f2k2qyzd9wibvi3i5j7cjzz1csqgghzz1aia";
};
passthru = { gcc = stdenv.gcc.gcc; };
@ -35,4 +34,3 @@ stdenv.mkDerivation {
platforms = with stdenv.lib.platforms; all;
};
}

View file

@ -1,13 +1,13 @@
{ stdenv, fetchurl, perl, groff, cmake, python }:
let version = "3.1"; in
let version = "3.2"; in
stdenv.mkDerivation {
name = "llvm-${version}";
src = fetchurl {
url = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz";
sha256 = "1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab";
sha256 = "0hv30v5l4fkgyijs56sr1pbrlzgd674pg143x7az2h37sb290l0j";
};
buildInputs = [ perl groff cmake python ];
@ -24,4 +24,3 @@ stdenv.mkDerivation {
platforms = with stdenv.lib.platforms; all;
};
}

View file

@ -1,8 +1,12 @@
{ fetchurl, stdenv, gnum4, texinfo, texLive, automake }:
{ fetchurl, stdenv, makeWrapper, gnum4, texinfo, texLive, automake }:
let
version = "9.1.1";
bootstrapFromC = ! (stdenv.isi686 || stdenv.isx86_64);
arch = if stdenv.isi686 then "-i386"
else if stdenv.isx86_64 then "-x86-64"
else "";
in
stdenv.mkDerivation {
name = "mit-scheme-${version}";
@ -25,6 +29,11 @@ stdenv.mkDerivation {
sha256 = "0pclakzwxbqgy6wqwvs6ml62wgby8ba8xzmwzdwhx1v8wv05yw1j";
};
configurePhase =
'' (cd src && ./configure)
(cd doc && ./configure)
'';
buildPhase =
'' cd src
${if bootstrapFromC
@ -42,11 +51,16 @@ stdenv.mkDerivation {
'';
installPhase =
'' make install -C src
make install -C doc
'' make prefix=$out install -C src
make prefix=$out install -C doc
'';
buildNativeInputs = [ gnum4 texinfo texLive automake ];
fixupPhase =
'' wrapProgram $out/bin/mit-scheme${arch} --set MITSCHEME_LIBRARY_PATH \
$out/lib/mit-scheme${arch}
'';
buildNativeInputs = [ makeWrapper gnum4 texinfo texLive automake ];
# XXX: The `check' target doesn't exist.
doCheck = false;

View file

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

View file

@ -1,9 +1,9 @@
diff -Naur openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
--- openjdk-orig/jdk/make/sun/awt/mawt.gmk 2011-06-27 13:19:26.000000000 -0400
+++ openjdk/jdk/make/sun/awt/mawt.gmk 2011-07-31 17:42:11.370026854 -0400
@@ -223,12 +223,6 @@
-I$(PLATFORM_SRC)/native/$(PKGDIR) \
$(EVENT_MODEL)
--- openjdk-orig/jdk/make/sun/awt/mawt.gmk 2012-08-28 19:13:16.000000000 -0400
+++ openjdk/jdk/make/sun/awt/mawt.gmk 2013-01-22 11:56:22.315418708 -0500
@@ -234,12 +234,6 @@
endif # !HEADLESS
endif # PLATFORM
-ifeq ($(PLATFORM), linux)
- # Checking for the X11/extensions headers at the additional location
@ -11,6 +11,6 @@ diff -Naur openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.
- $(wildcard /usr/include/X11/extensions))
-endif
-
ifeq ($(PLATFORM), solaris)
CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions
endif
ifeq ($(PLATFORM), macosx))
CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
-I$(OPENWIN_HOME)/include

View file

@ -39,37 +39,18 @@ let
else
throw "openjdk requires i686-linux or x86_64 linux";
build = "147";
update = "6";
build = "24";
in
stdenv.mkDerivation rec {
name = "openj${if jreOnly then "re" else "dk"}-7b${build}";
name = "openj${if jreOnly then "re" else "dk"}-7u${update}b${build}";
src = fetchurl {
url = "http://www.java.net/download/openjdk/jdk7/promoted/b${build}/openjdk-7-fcs-src-b${build}-27_jun_2011.zip";
sha256 = "1qhwlz9y5qmwmja4qnxg6sn3pgsg1i11fb9j41w8l26acyhk34rs";
};
jaxws_src_name = "jdk7-jaxws2_2_4-b03-2011_05_27.zip";
jaxws_src = fetchurl {
url = "http://download.java.net/glassfish/components/jax-ws/openjdk/jdk7/${jaxws_src_name}";
sha256 = "1mpzgr9lnbf2p3x45npcniy47kbzi3hyqqbd4w3j63sxnxcp5bh5";
};
jaxp_src_name = "jaxp145_01.zip";
jaxp_src = fetchurl {
url = "http://download.java.net/jaxp/1.4.5/${jaxp_src_name}";
sha256 = "1js8m1a6lcn95byplmjjs1lja1maisyl6lgfjy1jx3lqi1hlr4n5";
};
jaf_src_name = "jdk7-jaf-2010_08_19.zip";
jaf_src = fetchurl {
url = "http://java.net/downloads/jax-ws/JDK7/${jaf_src_name}";
sha256 = "17n0i5cgvfsd6ric70h3n7hr8aqnzd216gaq3603wrxlvggzxbp6";
url = "http://www.java.net/download/openjdk/jdk7u6/promoted/b24/openjdk-7u6-fcs-src-b24-28_aug_2012.zip";
sha256 = "1x1iq8ga0hqqh0bpcmydzzy19757hknn2yvgzib85p7b7dx0vfx9";
};
# outputs = [ "out" ] ++ stdenv.lib.optionals (! jreOnly) [ "jre" ];
@ -98,12 +79,6 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = "-lfontconfig -lXcursor -lXinerama";
postUnpack = ''
mkdir -p drops
cp ${jaxp_src} drops/${jaxp_src_name}
cp ${jaxws_src} drops/${jaxws_src_name}
cp ${jaf_src} drops/${jaf_src_name}
export DROPS_PATH=$(pwd)/drops
sed -i -e "s@/usr/bin/test@${coreutils}/bin/test@" \
-e "s@/bin/ls@${coreutils}/bin/ls@" \
openjdk/hotspot/make/linux/makefiles/sa.make
@ -117,8 +92,6 @@ stdenv.mkDerivation rec {
patches = [
./cppflags-include-fix.patch
./printf-fix.patch
./linux-version-check-fix.patch
./no-crypto-restrictions.patch
];
@ -135,7 +108,6 @@ stdenv.mkDerivation rec {
"DEVTOOLS_PATH="
"UNIXCOMMAND_PATH="
"BOOTDIR=${jdk}"
"DROPS_DIR=$(DROPS_PATH)"
];
configurePhase = ''
@ -172,4 +144,3 @@ stdenv.mkDerivation rec {
passthru = { inherit architecture; };
}

View file

@ -1,12 +0,0 @@
diff -Naur openjdk-orig/hotspot/make/linux/Makefile openjdk/hotspot/make/linux/Makefile
--- openjdk-orig/hotspot/make/linux/Makefile 2011-06-27 12:10:07.000000000 -0400
+++ openjdk/hotspot/make/linux/Makefile 2011-08-10 20:08:40.879752771 -0400
@@ -230,7 +230,7 @@
# Solaris 2.5.1, 2.6).
# Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
-SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7%
+SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7% 3%
OS_VERSION := $(shell uname -r)
EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))

View file

@ -1,12 +0,0 @@
diff -Naur openjdk-orig/make/Defs-internal.gmk openjdk/make/Defs-internal.gmk
--- openjdk-orig/make/Defs-internal.gmk 2011-06-27 11:44:06.000000000 -0400
+++ openjdk/make/Defs-internal.gmk 2011-07-31 18:30:15.784506762 -0400
@@ -79,7 +79,7 @@
# Find all build_time_* files and print their contents in a list sorted
# on the name of the sub repository.
define ReportBuildTimes
-$(PRINTF) "-- Build times ----------\nTarget %s\nStart %s\nEnd %s\n%s\n%s\n-------------------------\n" \
+$(PRINTF) -- "-- Build times ----------\nTarget %s\nStart %s\nEnd %s\n%s\n%s\n-------------------------\n" \
$1 \
"`$(CAT) $(BUILDTIMESDIR)/build_time_start_TOTAL_human_readable`" \
"`$(CAT) $(BUILDTIMESDIR)/build_time_end_TOTAL_human_readable`" \

View file

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

View file

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

View file

@ -0,0 +1,13 @@
{ stdenv }:
stdenv.mkDerivation {
name = "python-linkme-wrapper-1.0";
unpackPhase = "true";
installPhase = ''
mkdir -p $out/bin
cat ${./python-linkme-wrapper.sh} > $out/bin/.python-linkme-wrapper
chmod +x $out/bin/.python-linkme-wrapper
'';
}

View file

@ -0,0 +1,34 @@
#!/bin/sh
#
# Install it into a nix profile and from there build symlink chains.
# The chain will be followed to set the PYTHONPATH
# A/bin/foo -> B/bin/bar -> NIXENV/bin/.python-linkme-wrapper.sh
#
if test ! -L "$0"; then
echo "Link me!"
exit 1
fi
PROG=$(basename "$0")
SITES=
pypath() {
BIN=$(dirname "$1")
BIN=$(realpath -s "$BIN")
ENV=$(dirname "$BIN")
SITE="$ENV/lib/python2.7/site-packages"
SITES="$SITES${SITES:+:}$SITE"
PRG=$BIN/$(readlink "$1")
if test -L "$PRG"; then
pypath "$PRG"
fi
}
pypath $(realpath -s "$0")
export PYTHONPATH="$PYTHONPATH${PYTHONPATH:+:}$SITES"
exec $BIN/$PROG "$@"

View file

@ -1,21 +0,0 @@
{ stdenv }:
stdenv.mkDerivation {
name = "pythonhome-wrapper";
unpackPhase = "true";
installPhase = ''
mkdir -p $out/bin
echo '
#!/bin/sh
BINDIR=`dirname $0`
PYTHONHOME=`dirname $BINDIR`
PYTHONHOME=`(cd $PYTHONHOME && pwd)`
export PYTHONHOME
$BINDIR/python "$@"
' > $out/bin/py
chmod +x $out/bin/py
'';
}

View file

@ -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 = ''

View file

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

View file

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

View file

@ -1,28 +0,0 @@
Upstream patch
From fc2870a65f6b3ed3b71bcac69c5faf3a9c759c64 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 21 Dec 2009 11:13:23 -0500
Subject: [PATCH 1/2] Don't daemonize when activated
It confuses some versions of D-Bus and isn't needed
(or wanted it).
http://bugs.freedesktop.org/show_bug.cgi?id=25642
---
data/org.freedesktop.ConsoleKit.service.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/data/org.freedesktop.ConsoleKit.service.in b/data/org.freedesktop.ConsoleKit.service.in
index ec2128c..d716a36 100644
--- a/data/org.freedesktop.ConsoleKit.service.in
+++ b/data/org.freedesktop.ConsoleKit.service.in
@@ -1,4 +1,4 @@
[D-BUS Service]
Name=org.freedesktop.ConsoleKit
-Exec=@sbindir@/console-kit-daemon
+Exec=@sbindir@/console-kit-daemon --no-daemon
User=root
--
1.7.1

View file

@ -1,62 +0,0 @@
Upstream patch
From 2418840248f07025ad0edc96ed17e03ce5e47f3e Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Mon, 21 Dec 2009 11:14:54 -0500
Subject: [PATCH 2/2] Don't take bus name until ready
Previously, we would take a bus name right away, but
not register the manager object until later. This
causes a race when being activated by a method call
on the manager object, where ConsoleKit gets started
but the method call fails.
https://bugs.freedesktop.org/show_bug.cgi?id=25744
---
src/main.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main.c b/src/main.c
index 809c6d6..b8f698f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -294,11 +294,19 @@ main (int argc,
setup_debug_log (debug);
+ g_debug ("initializing console-kit-daemon %s", VERSION);
+
connection = get_system_bus ();
if (connection == NULL) {
goto out;
}
+ manager = ck_manager_new ();
+
+ if (manager == NULL) {
+ goto out;
+ }
+
bus_proxy = get_bus_proxy (connection);
if (bus_proxy == NULL) {
g_warning ("Could not construct bus_proxy object; bailing out");
@@ -310,16 +318,8 @@ main (int argc,
goto out;
}
- g_debug ("initializing console-kit-daemon %s", VERSION);
-
create_pid_file ();
- manager = ck_manager_new ();
-
- if (manager == NULL) {
- goto out;
- }
-
loop = g_main_loop_new (NULL, FALSE);
g_signal_connect (bus_proxy,
--
1.7.1

View file

@ -1,33 +0,0 @@
This patch adds shutdown commands specific to NixOS, as NixOS does not have
a /sbin or /usr/sbin directory. In order not to have a dependency on the
package that provides "shutdown" when in an environment other than NixOS,
we'll make it depend on /var/run/current-system.
Note: this patch does not compromise system security. Other systems than
NixOS should have already shutdown in the earlier directories being searched,
and otherwise /var/run is writable only be root.
--- ConsoleKit-0.4.1/tools/linux/ck-system-restart.org 2012-02-13 11:29:57.352902568 +0100
+++ ConsoleKit-0.4.1/tools/linux/ck-system-restart 2012-02-13 11:43:27.593317712 +0100
@@ -7,6 +7,9 @@
elif [ -x "/usr/sbin/shutdown" ] ; then
/usr/sbin/shutdown -r now
exit $?
+elif [ -x "/var/run/current-system/sw/sbin/shutdown" ] ; then
+ /var/run/current-system/sw/sbin/shutdown -r now
+ exit $?
else
exit 1
fi
--- ConsoleKit-0.4.1/tools/linux/ck-system-stop.org 2012-02-13 11:30:06.228950934 +0100
+++ ConsoleKit-0.4.1/tools/linux/ck-system-stop 2012-02-13 11:44:12.664563304 +0100
@@ -7,6 +7,9 @@
elif [ -x "/usr/sbin/shutdown" ] ; then
/usr/sbin/shutdown -h now
exit $?
+elif [ -x "/var/run/current-system/sw/sbin/shutdown" ] ; then
+ /var/run/current-system/sw/sbin/shutdown -h now
+ exit $?
else
exit 1
fi

View file

@ -1,29 +0,0 @@
{ stdenv, fetchurl, pkgconfig, dbus_glib, zlib, pam, glib,
libX11, polkit, expat }:
stdenv.mkDerivation rec {
name = "consolekit-0.4.1";
src = fetchurl {
url = http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-0.4.1.tar.bz2;
sha256 = "0gj0airrgyi14a06w3d4407g62bs5a1cam2h64s50x3d2k3ascph";
};
buildInputs = [ pkgconfig dbus_glib zlib pam glib libX11 polkit expat ];
patches = [ ./0001-Don-t-daemonize-when-activated.patch
./0002-Don-t-take-bus-name-until-ready.patch
./commands.patch # adds shutdown commands for NixOS to the list of shutdown commands
];
# For console-kit to get the rpath to libgcc_s, needed for pthread_cancel to work
NIX_LDFLAGS = "-lgcc_s";
configureFlags = "--enable-pam-module --with-pam-module-dir=$(out)/lib/security --localstatedir=/var --sysconfdir=/etc";
installFlags = "sysconfdir=$(out)/etc DBUS_SYS_DIR=$(out)/etc/dbus-1/system.d"; # keep `make install' happy
meta = {
homepage = http://www.freedesktop.org/wiki/Software/ConsoleKit;
description = "A framework for defining and tracking users, login sessions, and seats";
};
}

View file

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

View file

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

View file

@ -40,7 +40,7 @@ stdenv.mkDerivation (rec {
# XXX: Gnulib's `test-select' fails on FreeBSD:
# http://hydra.nixos.org/build/2962084/nixlog/1/raw .
doCheck = (!stdenv.isFreeBSD);
doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin);
meta = {
description = "The GNU Transport Layer Security Library";

View file

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

View file

@ -1,17 +1,17 @@
{ cabal, cereal, deepseq, mtl, primitive, transformers, vector
{ cabal, binary, deepseq, mtl, primitive, transformers, vector
, zlib
}:
cabal.mkDerivation (self: {
pname = "JuicyPixels";
version = "2.0.2";
sha256 = "14nqifdsdhzlfq29waqlwspyy37gp174vw368ph772zp9b0ngyff";
version = "3.0";
sha256 = "1qhhhnfs12r67nf07bx58n8a2v6wikan8cqs1wnjnaad8yk2spsg";
buildDepends = [
cereal deepseq mtl primitive transformers vector zlib
binary deepseq mtl primitive transformers vector zlib
];
meta = {
homepage = "https://github.com/Twinside/Juicy.Pixels";
description = "Picture loading/serialization (in png, jpeg, bitmap and gif)";
description = "Picture loading/serialization (in png, jpeg, bitmap, radiance and gif)";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];

View file

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

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "ansi-terminal";
version = "0.5.5.1";
sha256 = "146kqp49dvsskws7pn54yynpac1sb1s51pbm4nkqj86wwp04f0lc";
version = "0.6";
sha256 = "0a5zrq80yrj48s2cm8lns06p6wwnz72vs2wy0ryp0gw6rrg50fkg";
isLibrary = true;
isExecutable = true;
meta = {

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "ansi-wl-pprint";
version = "0.6.4";
sha256 = "0zrhzkmc5ki6q9ac5l16lhnyf9z2raj78gj9n0a7530rcv4ak3k0";
version = "0.6.6";
sha256 = "1zkbiv5cpdgjiyn2nrrha29r84al7jg6647flqmc8riz2nn91zqy";
isLibrary = true;
isExecutable = true;
buildDepends = [ ansiTerminal ];

View file

@ -0,0 +1,14 @@
{ cabal, semigroupoids, semigroups }:
cabal.mkDerivation (self: {
pname = "bifunctors";
version = "3.0.3";
sha256 = "1nmrwc9n9qkj9w9c38ja0had32isr6v35j1v19fhqdwk5ddbpxp4";
buildDepends = [ semigroupoids semigroups ];
meta = {
homepage = "http://github.com/ekmett/bifunctors/";
description = "Haskell 98 bifunctors";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -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 = [

View file

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

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

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "citeproc-hs";
version = "0.3.6";
sha256 = "0zxwca3i7gg1vhdvrxd15c8zgx1gy3y7zjj746bcvf8pwavkq5q2";
version = "0.3.7";
sha256 = "0ix9y7z8m8x4l10h96fgv820grywvwcp3019wxjja4y4w6irid3b";
buildDepends = [
filepath hexpat hsBibutils HTTP json mtl network pandocTypes parsec
syb time utf8String

View file

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

View file

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

View file

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

View file

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

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

View file

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

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "diagrams-contrib";
version = "0.6.0.1";
sha256 = "1wrfdsfb2yj93wq2ykxjyg6g0q56bmxd2rc6r3gd0zcs8kiimaar";
version = "0.6.0.2";
sha256 = "1lj99a46r12zjwmpkn7vj04wapfgdlmw05jwb5lnhy9hxqgcsgng";
buildDepends = [
colour dataDefault diagramsLib forceLayout lens mtl vectorSpace
];

View file

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

View file

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

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "digestive-functors-heist";
version = "0.5.1.1";
sha256 = "0jdg35xrikqg3r0rziv71g619vnmn8fzsv63b73m72fbj5xvy881";
version = "0.6.0.0";
sha256 = "17qndqsk09fvnvyhhw3xbbjjhfyyp4sivc898vqllyyky0wqmrdk";
buildDepends = [ digestiveFunctors heist mtl text xmlhtml ];
meta = {
homepage = "http://github.com/jaspervdj/digestive-functors";

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "digestive-functors-snap";
version = "0.5.0.2";
sha256 = "0xx5i09l8n1srdmslq0sq1h366cdq3xqxwjd3kp2ck9s6x65zyjz";
version = "0.6.0.0";
sha256 = "18hc0sx7in0df6kgkc8mrxag5h2rmdj2cca9zf9w1if6wimx3g88";
buildDepends = [ digestiveFunctors filepath mtl snapCore text ];
meta = {
homepage = "http://github.com/jaspervdj/digestive-functors";

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