diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix
index 81d44fdcb74a..0978b15bfaf0 100644
--- a/pkgs/applications/audio/bristol/default.nix
+++ b/pkgs/applications/audio/bristol/default.nix
@@ -14,6 +14,11 @@ stdenv.mkDerivation rec {
xlibs.xproto
];
+ preInstall = ''
+ sed -e "s@\`which bristol\`@$out/bin/bristol@g" -i bin/startBristol
+ sed -e "s@\`which brighton\`@$out/bin/brighton@g" -i bin/startBristol
+ '';
+
meta = with stdenv.lib; {
description = "A range of synthesiser, electric piano and organ emulations";
homepage = http://bristol.sourceforge.net;
diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix
index a64561b10996..13a36e258fde 100644
--- a/pkgs/applications/editors/zile/default.nix
+++ b/pkgs/applications/editors/zile/default.nix
@@ -11,6 +11,9 @@ stdenv.mkDerivation rec {
buildInputs = [ ncurses boehmgc ];
buildNativeInputs = [ help2man perl ];
+ # `help2man' wants to run Zile, which fails when cross-compiling.
+ crossAttrs.buildNativeInputs = [];
+
# Tests can't be run because most of them rely on the ability to
# fiddle with the terminal.
doCheck = false;
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index cbab2da551a9..d66db51a4de3 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -46,6 +46,8 @@ stdenv.mkDerivation rec {
'' else "";
meta = {
- homepage = http://www.imagemagick.org;
+ homepage = http://www.imagemagick.org/;
+ description = "A software suite to create, edit, compose, or convert bitmap images";
+ platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix
new file mode 100644
index 000000000000..df50dd5bd793
--- /dev/null
+++ b/pkgs/applications/graphics/ipe/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, pkgconfig, zlib, qt4, freetype, cairo, lua5, texLive, ghostscriptX
+, makeWrapper }:
+let ghostscript = ghostscriptX; in
+stdenv.mkDerivation rec {
+ name = "ipe-7.1.2";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/ipe7/ipe/7.1.0/${name}-src.tar.gz";
+ sha256 = "04fs5slci3bmpgz8d038h3hnzzdw57xykcpsmisdxci2xrkxx41k";
+ };
+
+ # changes taken from Gentoo portage
+ preConfigure = ''
+ cd src
+ sed -i \
+ -e 's/fpic/fPIC/' \
+ -e 's/moc-qt4/moc/' \
+ config.mak || die
+ sed -i -e 's/install -s/install/' common.mak || die
+ '';
+
+ IPEPREFIX="$$out";
+ URWFONTDIR="${texLive}/texmf-dist/fonts/type1/urw/";
+
+ buildInputs = [
+ pkgconfig zlib qt4 freetype cairo lua5 texLive ghostscript makeWrapper
+ ];
+
+ postInstall = ''
+ for prog in $out/bin/*; do
+ wrapProgram "$prog" --prefix PATH : "${texLive}/bin"
+ done
+ '';
+
+ #TODO: make .desktop entry
+
+ meta = {
+ description = "An editor for drawing figures";
+ homepage = http://ipe7.sourceforge.net;
+ license = "GPLv3+";
+ longDescription = ''
+ Ipe is an extensible drawing editor for creating figures in PDF and Postscript format.
+ It supports making small figures for inclusion into LaTeX-documents
+ as well as presentations in PDF.
+ '';
+ };
+}
diff --git a/pkgs/applications/misc/freicoin/default.nix b/pkgs/applications/misc/freicoin/default.nix
new file mode 100644
index 000000000000..163cb04c27eb
--- /dev/null
+++ b/pkgs/applications/misc/freicoin/default.nix
@@ -0,0 +1,30 @@
+{ fetchurl, stdenv, db4, boost, gmp, mpfr, miniupnpc, qt4, unzip }:
+
+stdenv.mkDerivation rec {
+ version = "0.0.1-3";
+ name = "freicoin-${version}";
+
+ src = fetchurl {
+ url = "https://github.com/freicoin/freicoin/archive/v${version}.zip";
+ sha256 = "19q4llv67kmvfr0x56rnqcf0d050dayv246q4i51mmkvjijc1qpf";
+ };
+
+ # I think that openssl and zlib are required, but come through other
+ # packages
+ buildInputs = [ db4 boost gmp mpfr miniupnpc qt4 unzip ];
+
+ configurePhase = "qmake";
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp freicoin-qt $out/bin
+ '';
+
+ meta = {
+ description = "Peer-to-peer currency with demurrage fee";
+ homepage = "http://freicoi.in/";
+ license = "MIT";
+ maintainers = with stdenv.lib.maintainers; [viric];
+ platforms = with stdenv.lib.platforms; linux;
+ };
+}
diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index df59145e51fd..bbc8aaac49bd 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null);
let
name = "ikiwiki";
- version = "3.20121017";
+ version = "3.20121212";
lib = stdenv.lib;
in
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
- sha256 = "c0bb6ef9340ebc7eec40812b091700b2bcfd61e7321a22f41026ce130e877028";
+ sha256 = "1frsr2sqzsnagbxvyjsgk4nrl1p1048vybsd1zw1ln1mqik31ydz";
};
buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix
index cb832ed99f5c..4c24f149f005 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@@ -3,19 +3,19 @@
}:
stdenv.mkDerivation rec {
- version = "2.0.4";
+ version = "2.0.5";
name = "lyx-${version}";
src = fetchurl {
url = "ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${name}.tar.xz";
- sha256 = "137dzmz1z6aqz9mdj8gmmi0k60s9sfn6gy916j175cwzq6hpncb8";
+ sha256 = "00pv2d9p8j1p6x87kalbn1bgxg9l4zqh65zcajrnh10a76isv6nk";
};
configureFlags = [
#"--without-included-boost"
/* Boost is a huge dependency from which 1.4 MB of libs would be used.
Using internal boost stuff only increases executable by around 0.2 MB. */
- #"--without-included-mythes" # such a small library isn't worth a split package
+ #"--without-included-mythes" # such a small library isn't worth a separate package
];
buildInputs = [
diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
new file mode 100644
index 000000000000..43ee98b55dcb
--- /dev/null
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, dbus, gnutls2, wxGTK28, libidn, tinyxml, gettext, pkgconfig, xdg_utils, gtk2, sqlite36 }:
+
+let version = "3.6.0.2"; in
+stdenv.mkDerivation {
+ name = "filezilla-${version}";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
+ sha256 = "01n6k1q21i21451rdx3rgc4hhxghdn5b0ldzpjsp44ipgww5wsjk";
+ };
+
+ configureFlags = [
+ "--disable-manualupdatecheck"
+ ];
+
+ buildInputs = [ dbus gnutls2 wxGTK28 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite36 ];
+
+ meta = {
+ homepage = "http://filezilla-project.org/";
+ description = "FileZilla is a cross-platform graphical FTP, FTPS and SFTP client a lot of features, supporting Windows, Linux, Mac OS X and more.";
+ license = "GPLv2";
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix
index 7dc66886af6e..03cbb1ce0737 100644
--- a/pkgs/applications/networking/instant-messengers/kadu/default.nix
+++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation {
- name = "kadu-0.10.1";
+ name = "kadu-0.12.2";
src = fetchurl {
- url = http://download.kadu.im/stable/kadu-0.10.1.tar.bz2;
- sha256 = "0j88pyp2nqpc57j38zr135ypfiv4v329gfgiz9rdbqi8j26cyp7g";
+ url = http://download.kadu.im/stable/kadu-0.12.2.tar.bz2;
+ sha256 = "0rqhkiyn8c7jigpxmvwh7daxsgjxlvd16zjdss1azdzd9x2dbym1";
};
buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon pkgconfig
@@ -21,8 +21,12 @@ stdenv.mkDerivation {
patchShebangs .
'';
- # because I was not able to get those working
- patches = [ ./disable_some_plugins.patch ];
+ # Disable the kadu plugins I wasn't able to get to work
+ patchPhase = ''
+ sed -i -e '/mpd_mediaplayer/d' \
+ -e '/encryption_ng/d' \
+ -e '/encryption_ng_simlite/d' Plugins.cmake
+ '';
NIX_LDFLAGS="-lX11";
diff --git a/pkgs/applications/networking/instant-messengers/kadu/disable_some_plugins.patch b/pkgs/applications/networking/instant-messengers/kadu/disable_some_plugins.patch
deleted file mode 100644
index 0ee06c21382a..000000000000
--- a/pkgs/applications/networking/instant-messengers/kadu/disable_some_plugins.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/Plugins.cmake b/Plugins.cmake
-index ad63f20..c14a781 100644
---- a/Plugins.cmake
-+++ b/Plugins.cmake
-@@ -30,9 +30,9 @@ set (COMPILE_PLUGINS
-
- # encryption
- # Encrypted chat support
-- encryption_ng
-+ # encryption_ng
- # OpenSSL encrypted chat support
-- encryption_ng_simlite
-+ # encryption_ng_simlite
-
- # docking
- # Tray icon support (common part of all docking modules)
-@@ -104,9 +104,9 @@ if (UNIX)
-
- # mediaplayer
- # MPD mediaplayer support
-- mpd_mediaplayer
-+ # mpd_mediaplayer
- # MPRIS Media Players support
-- mprisplayer_mediaplayer
-+ # mprisplayer_mediaplayer
- )
- endif (UNIX)
-
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index eb1a9c4474f4..ba7953d737cf 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -1,20 +1,27 @@
{ stdenv, fetchurl, ncurses, openssl, perl, python, aspell, gnutls
-, zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile }:
+, zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile
+, pythonPackages, makeWrapper }:
stdenv.mkDerivation rec {
- version = "0.3.9";
+ version = "0.3.9.2";
name = "weechat-${version}";
src = fetchurl {
url = "http://weechat.org/files/src/${name}.tar.gz";
- sha256 = "8666c788cbb212036197365df3ba3cf964a23e4f644d76ea51d66dbe3be593bb";
+ sha256 = "114cffqwnrqx8r4dslz7sc4i4ky4akzh863rnzaw3dnn9ky9r503";
};
buildInputs =
[ ncurses perl python openssl aspell gnutls zlib curl pkgconfig
- libgcrypt ruby lua5 tcl guile
+ libgcrypt ruby lua5 tcl guile pythonPackages.pycrypto makeWrapper
];
+ postInstall = ''
+ wrapProgram "$out/bin/weechat-curses" \
+ --prefix PYTHONPATH : "$PYTHONPATH" \
+ --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages"
+ '';
+
meta = {
homepage = http://http://www.weechat.org/;
description = "A fast, light and extensible chat client";
diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index f2fbf7046492..02f782c75a10 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -1,19 +1,19 @@
{ stdenv, fetchurl, libextractor, libmicrohttpd, libgcrypt
, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig
-, libxml2, ncurses, gettext, libunistring
+, libxml2, ncurses, gettext, libunistring, libidn
, makeWrapper }:
stdenv.mkDerivation rec {
- name = "gnunet-0.9.3";
+ name = "gnunet-0.9.5";
src = fetchurl {
url = "mirror://gnu/gnunet/${name}.tar.gz";
- sha256 = "0ppirvwjb7w7270g0w83z6wyk984cnxv2ydxj7qr0j1cz2j6nn2h";
+ sha256 = "162bahbskhzc0b2pda7v36dckm3p5p9rnbv2w0fbl0xl2gln63aa";
};
buildInputs = [
libextractor libmicrohttpd libgcrypt gmp curl libtool
- zlib adns sqlite libxml2 ncurses
+ zlib adns sqlite libxml2 ncurses libidn
pkgconfig gettext libunistring makeWrapper
];
@@ -36,6 +36,10 @@ stdenv.mkDerivation rec {
echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..."
substituteInPlace "$i" --replace "/tmp" "$TMPDIR"
done
+
+ # Ensure NSS installation works fine
+ configureFlags="$configureFlags --with-nssdir=$out/lib"
+ patchShebangs src/gns/nss/install-nss-plugin.sh
'';
doCheck = false;
@@ -72,7 +76,7 @@ stdenv.mkDerivation rec {
license = "GPLv2+";
- maintainers = [ stdenv.lib.maintainers.ludo ];
+ maintainers = with stdenv.lib.maintainers; [ ludo viric ];
platforms = stdenv.lib.platforms.gnu;
};
}
diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix
new file mode 100644
index 000000000000..22180e9a3f7d
--- /dev/null
+++ b/pkgs/applications/science/astronomy/celestia/default.nix
@@ -0,0 +1,62 @@
+{ stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu
+, lua, mesa, pkgconfig, perl, automake, autoconf, libtool, gettext
+}:
+
+let
+ name = "celestia-1.6.1";
+
+ gcc46Patch = fetchurl {
+ url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/celestia-1.6.1-gcc46.patch?h=packages/celestia";
+ sha256 = "1q840ip5h2q93r0d68jwrvf40ns5qzqss9vzd6xnwvs3wa77m5wp";
+ name = "celestia-1.6.1-gcc46.patch";
+ };
+
+ libpng15Patch = fetchurl {
+ url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/celestia-1.6.1-libpng15.patch?h=packages/celestia";
+ sha256 = "19yqbi5k944d3jm0q2mvcfg52kicy4j347gj62dyaijzj505x4pm";
+ name = "celestia-1.6.1-libpng15.patch";
+ };
+
+ linkingPatch = fetchurl {
+ url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/celestia-1.6.1-linking.patch?h=packages/celestia";
+ sha256 = "1qzv18b2prqbhy21js5bnf7vwkmrq1dmrq8r0wab7v10axjqdv35";
+ name = "celestia-1.6.1-linking.patch";
+ };
+
+ gcc47Patch = fetchurl {
+ url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/gcc-4.7-fixes.diff?h=packages/celestia";
+ sha256 = "1jqkafwrg1829cwqvlxxkqbf42zqfsgpqd8a5b2qlzma5napdmg5";
+ name = "gcc-4.7-fixes.diff";
+ };
+in
+stdenv.mkDerivation {
+ inherit name;
+
+ src = fetchurl {
+ url = "mirror://sourceforge/celestia/${name}.tar.gz";
+ sha256 = "1i1lvhbgllsh2z8i6jj4mvrjak4a7r69psvk7syw03s4p7670mfk";
+ };
+
+ buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu mesa pkgconfig lua
+ perl automake autoconf libtool gettext ];
+
+ patchPhase = ''
+ patch -Np0 -i "${gcc46Patch}"
+ patch -Np0 -i "${libpng15Patch}"
+ patch -Np1 -i "${linkingPatch}"
+ patch -Np1 -i "${gcc47Patch}"
+ autoreconf
+ configureFlagsArray=( --with-gtk --with-lua=${lua} CFLAGS="-O2 -fsigned-char" CXXFLAGS="-O2 -fsigned-char" )
+ '';
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "Free space simulation";
+ homepage = "http://www.shatters.net/celestia/";
+ license = stdenv.lib.licenses.gpl2;
+
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.simons ];
+ };
+}
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index 5d9866a650bc..e62751cde9d4 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -9,11 +9,11 @@ let
in
stdenv.mkDerivation {
- name = "hol_light-20120529";
+ name = "hol_light-20121213";
src = fetchsvn {
url = http://hol-light.googlecode.com/svn/trunk;
- rev = "141";
- sha256 = "a11d7e5db7c6035a2debcf9e73f43c6322389aeac5bc4d123ebf58918052a57f";
+ rev = "153";
+ sha256 = "1n4da5k3jya8mf7dgif8cl5sr2dqf6vl21fw1fcdna215v2x1rc0";
};
buildInputs = [ ocaml findlib camlp5 ];
diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix
new file mode 100644
index 000000000000..009bed3ffe2a
--- /dev/null
+++ b/pkgs/applications/science/logic/logisim/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, jre }:
+
+let version = "2.7.1"; in
+
+stdenv.mkDerivation {
+ name = "logisim-${version}";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/project/circuit/2.7.x/${version}/logisim-generic-${version}.jar";
+ sha256 = "1hkvc9zc7qmvjbl9579p84hw3n8wl3275246xlzj136i5b0phain";
+ };
+
+ phases = [ "installPhase" ];
+
+ installPhase = ''
+ mkdir -pv $out/bin
+ cp -v $src $out/logisim.jar
+
+ cat > $out/bin/logisim << EOF
+ #!${stdenv.shell}
+ ${jre}/bin/java -jar $out/logisim.jar
+ EOF
+
+ chmod +x $out/bin/logisim
+ '';
+
+ meta = {
+ homepage = "http://ozark.hendrix.edu/~burch/logisim";
+ description = "Logisim is an educational tool for designing and simulating digital logic circuits.";
+ license = "GPLv2+";
+ };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index 99e1f8390934..28a917d51e79 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -12,14 +12,14 @@
}:
let
- version = "3.20121211";
+ version = "3.20130102";
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 = "1l5sffcn6mcfk0s808z490s30dbq8m4wi8a11ard35hyf599zawq";
+ sha256 = "0aga3i7rzq21vyj2wq87n4yl5aljzxc69vbzw43nxx9sr2f3xyh5";
name = "git-annex-${version}.tar.gz";
};
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 857b7de34861..db3833f1855b 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -9,7 +9,7 @@
let
- version = "1.8.0.1";
+ version = "1.8.1";
svn = subversionClient.override { perlBindings = true; };
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
- sha1 = "4e7492f7558f3ba2a450c43efa7de3b0b1adc6c1";
+ sha1 = "wfj2pbqf9l56014dm330wb13qgcwx3dc";
};
patches = [ ./docbook2texi.patch ];
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 219f8531787d..9483868bc5e3 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
-, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}:
+, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor
+, dbus }:
let version = "4.2.4"; in
@@ -13,7 +14,7 @@ stdenv.mkDerivation {
KERN_DIR = "${kernel}/lib/modules/*/build";
- buildInputs = [ patchelf cdrkit makeWrapper ];
+ buildInputs = [ patchelf cdrkit makeWrapper dbus ];
installPhase = ''
mkdir -p $out
@@ -56,7 +57,7 @@ stdenv.mkDerivation {
cd ..
# Change the interpreter for various binaries
- for i in sbin/VBoxService bin/{VBoxClient,VBoxControl}
+ for i in sbin/VBoxService bin/{VBoxClient,VBoxControl} lib/VBoxGuestAdditions/mount.vboxsf
do
${if stdenv.system == "i686-linux" then ''
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $i
@@ -66,14 +67,12 @@ stdenv.mkDerivation {
''
else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions")
}
+ patchelf --set-rpath ${stdenv.gcc.gcc}/lib:${dbus}/lib:${libX11}/lib:${libXt}/lib:${libXext}/lib:${libXmu}/lib:${libXfixes}/lib:${libXrandr}/lib:${libXcursor}/lib $i
done
- # Change rpath for various binaries and libraries
- patchelf --set-rpath ${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXt}/lib:${libXext}/lib:${libXmu}/lib:${libXfixes}/lib:${libXrandr}/lib:${libXcursor}/lib bin/VBoxClient
-
for i in lib/VBoxOGL*.so
do
- patchelf --set-rpath $out/lib $i
+ patchelf --set-rpath $out/lib:${dbus}/lib $i
done
# Remove references to /usr from various scripts and files
@@ -82,6 +81,7 @@ stdenv.mkDerivation {
# Install binaries
mkdir -p $out/sbin
+ install -m 4755 lib/VBoxGuestAdditions/mount.vboxsf $out/sbin/mount.vboxsf
install -m 755 sbin/VBoxService $out/sbin
mkdir -p $out/bin
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 042e1a323a6d..94ac84f838c2 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "i3-${version}";
- version = "4.3";
+ version = "4.4";
src = fetchurl {
url = "http://i3wm.org/downloads/${name}.tar.bz2";
- sha256 = "895bf586092535efb2bc723ba599c71a027768115e56052f111fc8bb148db925";
+ sha256 = "06s8gzcxxh06zp1586kp4bxaj8yj5i9jacwg0nizbmmnx94mg1wr";
};
buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil bison xcbutilwm
diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix
index e6714536cadd..b4dabb300c19 100644
--- a/pkgs/applications/window-managers/ion-3/default.nix
+++ b/pkgs/applications/window-managers/ion-3/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, x11, lua, gettext, groff }:
stdenv.mkDerivation {
- name = "ion-3rc-20070902";
+ name = "ion-3-20090110";
meta = {
description = "Ion is a tiling tabbed window manager designed with keyboard users in mind.";
homepage = http://modeemi.fi/~tuomov/ion;
};
src = fetchurl {
- url = http://iki.fi/tuomov/dl/ion-3rc-20070902.tar.gz;
- sha256 = "062a0rgxzz4h1hih5lp7l2nfvhz095brag9fmnanzqc4dac228xl";
+ url = http://tuomov.iki.fi/software/dl/ion-3-20090110.tar.gz;
+ sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns";
};
buildInputs = [ x11 lua gettext groff ];
buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}";
diff --git a/pkgs/applications/window-managers/xmonad/default.nix b/pkgs/applications/window-managers/xmonad/default.nix
index fd215986fa30..a15755205ee6 100644
--- a/pkgs/applications/window-managers/xmonad/default.nix
+++ b/pkgs/applications/window-managers/xmonad/default.nix
@@ -1,24 +1,19 @@
-{ cabal, extensibleExceptions, mtl, utf8String, X11, xmessage }:
+{ cabal, extensibleExceptions, filepath, mtl, utf8String, X11 }:
cabal.mkDerivation (self: {
pname = "xmonad";
- version = "0.10";
- sha256 = "19z5y36pybsm93x6hlj5hzyys9r4ag7hkdib5spsnryk2mv72xj6";
+ version = "0.11";
+ sha256 = "1nsv88y2b206n3s5hrsp5ginvz1bj818ns7jmikavb2g33akdgg5";
isLibrary = true;
isExecutable = true;
- buildDepends = [ extensibleExceptions mtl utf8String X11 ];
+ buildDepends = [
+ extensibleExceptions filepath mtl utf8String X11
+ ];
meta = {
homepage = "http://xmonad.org";
description = "A tiling window manager";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
- maintainers = [
- self.stdenv.lib.maintainers.andres
- ];
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
};
-
- preConfigure = ''
- substituteInPlace XMonad/Core.hs --replace \
- '"xmessage"' '"${xmessage}/bin/xmessage"'
- '';
})
diff --git a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
index 11c8531ad174..6716591eabae 100644
--- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "xmonad-contrib";
- version = "0.10";
- sha256 = "0lp7qr69rpjy4s3knhdgh2bp6zs81xp0az1lisv4a2i7i1ys7hfq";
+ version = "0.11";
+ sha256 = "188brys16b3wmxd22j4284wnpasm8bixdjfxl1jr2q2xi45nzks0";
buildDepends = [
extensibleExceptions mtl random utf8String X11 X11Xft xmonad
];
diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
index 334c7f59d571..eebb07c0aa1c 100644
--- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
@@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
xmonadContrib
];
configureFlags = "-f-with_hlist -fwith_split -fwith_parsec";
+ jailbreak = true;
meta = {
homepage = "http://projects.haskell.org/xmonad-extras";
description = "Third party extensions for xmonad with wacky dependencies";
diff --git a/pkgs/build-support/upstream-updater/update-walker.sh b/pkgs/build-support/upstream-updater/update-walker.sh
index b86216161690..c4dc7713f504 100755
--- a/pkgs/build-support/upstream-updater/update-walker.sh
+++ b/pkgs/build-support/upstream-updater/update-walker.sh
@@ -88,7 +88,7 @@ ensure_version () {
ensure_target () {
echo "Ensuring target. CURRENT_TARGET: $CURRENT_TARGET" >&2
- [ -z "$CURRENT_TARGET" ] && target default.nix
+ [ -z "$CURRENT_TARGET" ] && target "$(basename "$CONFIG_NAME" .upstream).nix"
}
ensure_name () {
@@ -152,8 +152,7 @@ full_path () {
target () {
CURRENT_TARGET="$1"
- test -e "$CURRENT_TARGET" ||
- { [ "$CURRENT_TARGET" = "${CURRENT_TARGET#/}" ] && CURRENT_TARGET="$CONFIG_DIR/$CURRENT_TARGET"; }
+ { [ "$CURRENT_TARGET" = "${CURRENT_TARGET#/}" ] && CURRENT_TARGET="$CONFIG_DIR/$CURRENT_TARGET"; }
echo "Target set to: $CURRENT_TARGET"
}
@@ -190,6 +189,12 @@ replace_once () {
replacement="$3"
instance="${4:-1}"
+ echo "Replacing once:"
+ echo "file: [[$file]]"
+ echo "regexp: [[$regexp]]"
+ echo "replacement: [[$replacement]]"
+ echo "instance: [[$instance]]"
+
position="$(line_position "$file" "$regexp" "$instance")"
sed -re "${position}s $regexp $replacement " -i "$file"
}
@@ -204,7 +209,7 @@ set_var_value () {
quote='"'
let "$no_quotes" && quote=""
- replace_once "$file" "${var} *= *.*" "${var} = ${quote}${value}${quote};"
+ replace_once "$file" "${var} *= *.*" "${var} = ${quote}${value}${quote};" "$instance"
}
do_regenerate () {
@@ -227,8 +232,9 @@ do_overwrite () {
process_config () {
CONFIG_DIR="$(directory_of "$1")"
+ CONFIG_NAME="$(basename "$1")"
BEGIN_EXPRESSION='# Generated upstream information';
- source "$CONFIG_DIR/$(basename "$1")"
+ source "$CONFIG_DIR/$CONFIG_NAME"
ensure_name
ensure_attribute_name
retrieve_version
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index 465d83f8b4c6..d00ca6c869fb 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "man-pages-3.43";
+ name = "man-pages-3.45";
src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.xz";
- sha256 = "05fjq8llfxm77mnf2jhly98780xbkakim7b7hbx6kafvvs5zisrf";
+ sha256 = "1lwqrp79xcyhnjlyg1n0imz5wc88lpgv909xxz8bdgbk7c1mky0h";
};
preBuild =
diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix
new file mode 100644
index 000000000000..f1be290b190e
--- /dev/null
+++ b/pkgs/development/arduino/arduino-core/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, jdk, jre, ant, coreutils, gnugrep }:
+
+stdenv.mkDerivation rec {
+
+ version = "1.0.2";
+ name = "arduino-core";
+
+ src = fetchurl {
+ url = "http://arduino.googlecode.com/files/arduino-${version}-src.tar.gz";
+ sha256 = "0nszl2hdjjgxk87gyk0xi0ww9grbq83hch3iqmpaf9yp4y9bra0x";
+ };
+
+ buildInputs = [ jdk ant ];
+
+ phases = "unpackPhase patchPhase buildPhase installPhase";
+
+ patchPhase = ''
+ #
+ '';
+
+ buildPhase = ''
+ cd ./core && ant
+ cd ../build && ant
+ cd ..
+ '';
+
+ installPhase = ''
+ mkdir -p $out/share/arduino
+ cp -r ./build/linux/work/hardware/ $out/share/arduino
+ cp -r ./build/linux/work/libraries/ $out/share/arduino
+ cp -r ./build/linux/work/tools/ $out/share/arduino
+ cp -r ./build/linux/work/lib/ $out/share/arduino
+ echo ${version} > $out/share/arduino/lib/version.txt
+ '';
+
+ meta = {
+ description = "Arduino libraries";
+ homepage = http://arduino.cc/;
+ license = "GPL";
+ maintainers = [ stdenv.lib.maintainers.antono ];
+ };
+}
diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix
new file mode 100644
index 000000000000..6b88a8deaea7
--- /dev/null
+++ b/pkgs/development/arduino/ino/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, buildPythonPackage, minicom, avrdude, arduino_core, avrgcclibc }:
+
+buildPythonPackage {
+ name = "ino-0.3.4";
+ namePrefix = "";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/i/ino/ino-0.3.4.tar.gz";
+ sha256 = "1v7z3da31cv212k28aci269qkg92p377fm7i76rymjjpjra7payv";
+ };
+
+ # TODO: add avrgcclibc, it must be rebuild with C++ support
+ propagatedBuildInputs = [ minicom avrdude arduino_core ];
+
+ patchPhase = ''
+ echo "Patching Arduino distribution path"
+ sed -i 's@/usr/local/share/arduino@${arduino_core}/share/arduino@g' ino/environment.py
+ '';
+
+ doCheck = false;
+
+ meta = {
+ description = "Command line toolkit for working with Arduino hardware";
+ homepage = http://inotool.org/;
+ license = "MIT";
+ maintainers = [ stdenv.lib.maintainers.antono ];
+ };
+}
diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix
index 60ef44f2a901..5ab7166204e9 100644
--- a/pkgs/development/compilers/gcc/4.7/default.nix
+++ b/pkgs/development/compilers/gcc/4.7/default.nix
@@ -89,9 +89,11 @@ let version = "4.7.2";
gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null cross;
gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null cross;
gccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null cross;
+ gccMode = stdenv.lib.attrByPath [ "gcc" "mode" ] null cross;
withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
+ withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
crossMingw = (cross != null && cross.libc == "msvcrt");
crossConfigureFlags =
@@ -99,6 +101,7 @@ let version = "4.7.2";
withArch +
withCpu +
withAbi +
+ withMode +
(if (crossMingw && crossStageStatic) then
" --with-headers=${libcCross}/include" +
" --with-gcc" +
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 607e1da81178..794a97b205fa 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -4,11 +4,11 @@ let
s= # Generated upstream information
rec {
baseName="sbcl";
- version="1.1.2";
- name="sbcl-1.1.2";
- hash="04vp68cf0jfpjwx64iys7hi7qxbk2h7277wiym7k4jgirka08yhc";
- url="mirror://sourceforge/project/sbcl/sbcl/1.1.2/sbcl-1.1.2-source.tar.bz2";
- sha256="04vp68cf0jfpjwx64iys7hi7qxbk2h7277wiym7k4jgirka08yhc";
+ version="1.1.3";
+ name="${baseName}-${version}";
+ hash="1qy64fy0nvjdgzlmasswgvzg1b2h2rygnnjvlf9vj7wg16i5383i";
+ url="mirror://sourceforge/project/sbcl/sbcl/1.1.3/sbcl-1.1.3-source.tar.bz2";
+ sha256="1qy64fy0nvjdgzlmasswgvzg1b2h2rygnnjvlf9vj7wg16i5383i";
};
buildInputs = with a; [
clisp makeWrapper
diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix
index e3dfd4711a17..8b1e1529095e 100644
--- a/pkgs/development/interpreters/lua-5/5.1.nix
+++ b/pkgs/development/interpreters/lua-5/5.1.nix
@@ -1,5 +1,12 @@
{ stdenv, fetchurl, readline}:
+let
+ dsoPatch = fetchurl {
+ url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/lua-arch.patch?h=packages/lua51";
+ sha256 = "11fcyb4q55p4p7kdb8yp85xlw8imy14kzamp2khvcyxss4vw8ipw";
+ name = "lua-arch.patch";
+ };
+in
stdenv.mkDerivation rec {
name = "lua-5.1.5";
@@ -10,7 +17,19 @@ stdenv.mkDerivation rec {
buildInputs = [ readline ];
- configurePhase = "makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux )";
+ patches = [ dsoPatch ];
+
+ configurePhase = ''
+ makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-O2 -fPIC" LDLAGS="-fPIC" )
+ installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.5.1" INSTALL_DATA='cp -d' )
+ '';
+
+ postInstall = ''
+ mkdir -p "$out/share/doc/lua" "$out/lib/pkgconfig"
+ mv "etc/lua.pc" "$out/lib/pkgconfig/"
+ mv "doc/"*.{gif,png,css,html} "$out/share/doc/lua/"
+ rmdir $out/{share,lib}/lua/5.1 $out/{share,lib}/lua
+ '';
meta = {
homepage = "http://www.lua.org";
@@ -25,6 +44,6 @@ stdenv.mkDerivation rec {
'';
license = "MIT";
platforms = stdenv.lib.platforms.unix;
- maintainers = [ ];
+ maintainers = [ stdenv.lib.maintainers.simons ];
};
}
diff --git a/pkgs/development/libraries/ffmpeg/1.0.nix b/pkgs/development/libraries/ffmpeg/1.0.nix
index 7ac77ffdcb7a..d703fd8e3697 100644
--- a/pkgs/development/libraries/ffmpeg/1.0.nix
+++ b/pkgs/development/libraries/ffmpeg/1.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2
+{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib
, mp3Support ? true, lame ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional dc1394Support "--enable-libdc1394"
++ stdenv.lib.optional x11grabSupport "--enable-x11grab";
- buildInputs = [ pkgconfig lame yasm zlib bzip2 ]
+ buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib ]
++ stdenv.lib.optional mp3Support lame
++ stdenv.lib.optional speexSupport speex
++ stdenv.lib.optional theoraSupport libtheora
diff --git a/pkgs/development/libraries/haskell/Boolean/default.nix b/pkgs/development/libraries/haskell/Boolean/default.nix
index 45661b815b1e..4503c0fec548 100644
--- a/pkgs/development/libraries/haskell/Boolean/default.nix
+++ b/pkgs/development/libraries/haskell/Boolean/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "Boolean";
- version = "0.1.1";
- sha256 = "1id075slxgz67gv382vpr7cr19i59bjajvb60iv2xrhh73gp08yv";
+ version = "0.1.2";
+ sha256 = "07mhg9zf98hlm7qq9gdbrq68a8rpvdby1jwmgrvf3nv2k47dimx6";
meta = {
description = "Generalized booleans";
license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/Diff/default.nix b/pkgs/development/libraries/haskell/Diff/default.nix
index c28bef5cbd7e..86e219ac91d2 100644
--- a/pkgs/development/libraries/haskell/Diff/default.nix
+++ b/pkgs/development/libraries/haskell/Diff/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "Diff";
- version = "0.1.3";
- sha256 = "02dhy4rp3mkzm5x3h1rkdin2h8qcb7h7nhn14gl2gvl6wdykfh5w";
+ version = "0.2.0";
+ sha256 = "15hdkrzwajnfcx8bj4jdcy4jli115g9v20msw1xyc9wnwrmbz97k";
meta = {
description = "O(ND) diff algorithm in haskell";
license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/Graphalyze/default.nix b/pkgs/development/libraries/haskell/Graphalyze/default.nix
index 90bcb9f8605d..489e338cba54 100644
--- a/pkgs/development/libraries/haskell/Graphalyze/default.nix
+++ b/pkgs/development/libraries/haskell/Graphalyze/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "Graphalyze";
- version = "0.13.0.1";
- sha256 = "1yk7iglsspbj0kxh5rhjkc6q65vz07vpygiig07w86g2s6gad8am";
+ version = "0.14.0.0";
+ sha256 = "027nxvv38cza6y6rivmvc9wpglbazkjrkyriwv3mn03pp21y53fg";
buildDepends = [
bktrees fgl filepath graphviz pandoc random text time
];
diff --git a/pkgs/development/libraries/haskell/X11/1.5.0.1.nix b/pkgs/development/libraries/haskell/X11/1.5.0.1.nix
deleted file mode 100644
index e36b940e923c..000000000000
--- a/pkgs/development/libraries/haskell/X11/1.5.0.1.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ cabal, libX11, libXext, libXinerama, syb }:
-
-cabal.mkDerivation (self: {
- pname = "X11";
- version = "1.5.0.1";
- sha256 = "0s8k3lhvlks6i1mwfnm5fimfd2f0sjw9k2p67is3x564kih7mh19";
- buildDepends = [ syb ];
- extraLibraries = [ libX11 libXext libXinerama ];
- meta = {
- homepage = "https://github.com/haskell-pkg-janitors/X11";
- description = "A binding to the X11 graphics library";
- license = self.stdenv.lib.licenses.bsd3;
- platforms = self.ghc.meta.platforms;
- maintainers = [ self.stdenv.lib.maintainers.andres ];
- };
-})
diff --git a/pkgs/development/libraries/haskell/X11/1.6.0.2.nix b/pkgs/development/libraries/haskell/X11/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/X11/1.6.0.2.nix
rename to pkgs/development/libraries/haskell/X11/default.nix
diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix
index 5c563ad9cd73..732000e74824 100644
--- a/pkgs/development/libraries/haskell/active/default.nix
+++ b/pkgs/development/libraries/haskell/active/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
version = "0.1.0.2";
sha256 = "1iymh3sd21ba7ijwv5afphn5vhmwchk6725hbcsdwk2d2x2gd674";
buildDepends = [ newtype semigroupoids semigroups vectorSpace ];
+ jailbreak = true;
meta = {
description = "Abstractions for animation";
license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/basic-prelude/default.nix b/pkgs/development/libraries/haskell/basic-prelude/default.nix
index c30f3f5c7e04..df00aff549f9 100644
--- a/pkgs/development/libraries/haskell/basic-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/basic-prelude/default.nix
@@ -1,13 +1,13 @@
-{ cabal, hashable, ReadArgs, systemFilepath, text, transformers
-, unorderedContainers, vector
+{ cabal, hashable, liftedBase, ReadArgs, systemFilepath, text
+, transformers, unorderedContainers, vector
}:
cabal.mkDerivation (self: {
pname = "basic-prelude";
- version = "0.3.1.0";
- sha256 = "15k89z78zjhga36wrvfn8b17hsmlwr1na6xq0gmimivfrdlnz5j0";
+ version = "0.3.2.0";
+ sha256 = "1sdwkh9xrsx8v96d06jll7cqc0p6ykv2y9gnjzpbfx0k3ns69kcj";
buildDepends = [
- hashable ReadArgs systemFilepath text transformers
+ hashable liftedBase ReadArgs systemFilepath text transformers
unorderedContainers vector
];
meta = {
diff --git a/pkgs/development/libraries/haskell/bloomfilter/default.nix b/pkgs/development/libraries/haskell/bloomfilter/default.nix
index 2545c3f4f407..7c8c2d348498 100644
--- a/pkgs/development/libraries/haskell/bloomfilter/default.nix
+++ b/pkgs/development/libraries/haskell/bloomfilter/default.nix
@@ -3,7 +3,7 @@
cabal.mkDerivation (self: {
pname = "bloomfilter";
version = "1.2.6.10";
- sha256 = "1z2jc7588fkv42dxf0dxsrgk5pmj3xapshy1vyfwipp1q6y20x4j";
+ sha256 = "162vp9riwf5q2l1hnw3g157fpwnw185fk41hkgyf8qaavcrz6slv";
buildDepends = [ deepseq ];
meta = {
homepage = "https://github.com/bos/bloomfilter";
diff --git a/pkgs/development/libraries/haskell/bmp/1.2.3.2.nix b/pkgs/development/libraries/haskell/bmp/1.2.3.4.nix
similarity index 81%
rename from pkgs/development/libraries/haskell/bmp/1.2.3.2.nix
rename to pkgs/development/libraries/haskell/bmp/1.2.3.4.nix
index 64c13f15ee10..404229cf7636 100644
--- a/pkgs/development/libraries/haskell/bmp/1.2.3.2.nix
+++ b/pkgs/development/libraries/haskell/bmp/1.2.3.4.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "bmp";
- version = "1.2.3.2";
- sha256 = "0lr6ys15ap3myzv48xmcy0bv17s4x2drskqz3kmbp06knrx9y1bh";
+ version = "1.2.3.4";
+ sha256 = "134nfchsw4q1k3kr09i5w8jxbr659as4523gs5m2dch15wrmrhf6";
buildDepends = [ binary ];
meta = {
homepage = "http://code.ouroborus.net/bmp";
diff --git a/pkgs/development/libraries/haskell/cautious-file/default.nix b/pkgs/development/libraries/haskell/cautious-file/default.nix
index bbdb6d350c8b..aa6e87565aee 100644
--- a/pkgs/development/libraries/haskell/cautious-file/default.nix
+++ b/pkgs/development/libraries/haskell/cautious-file/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cautious-file";
- version = "1.0.1";
- sha256 = "0mlgchvdhw9lhml4pqmxxvx1zcqmkcyl3yx6w3zp0df200njzsws";
+ version = "1.0.2";
+ sha256 = "1sw5ngwrarq1lsd4c6v2wdmgbhkkq6kpybb62r8ccm11ddgn3yiq";
buildDepends = [ filepath ];
meta = {
description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures";
diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
index ee9c93fa7f99..c167f191d4d3 100644
--- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "classy-prelude-conduit";
- version = "0.4.2";
- sha256 = "1p5j519s95cgiy5ig0agbfs4vyay8srzwsimnblij68zz5jjfrzp";
+ version = "0.4.3";
+ sha256 = "0ny4si6z6i6g6khcg9d3m9wks42sqh8i8kpgghhdwd37v32l3f34";
buildDepends = [
classyPrelude conduit monadControl resourcet transformers void
xmlConduit
diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix
index dbc539878610..9f8893bf72fa 100644
--- a/pkgs/development/libraries/haskell/classy-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "classy-prelude";
- version = "0.4.2";
- sha256 = "082zqhyswzlnl250g8pf88nmh7pkwxwjwnkp0pm9960qsl6kbn7s";
+ version = "0.4.3";
+ sha256 = "1k2iszja03s8azypl8lpkdjvvqsgzg73cl1wp4jl2fqp1psqv36q";
buildDepends = [
basicPrelude hashable systemFilepath text transformers
unorderedContainers vector
diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix
index 03d3896e8531..82c735b731fc 100644
--- a/pkgs/development/libraries/haskell/clientsession/default.nix
+++ b/pkgs/development/libraries/haskell/clientsession/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "clientsession";
- version = "0.8.0.1";
- sha256 = "0r6j15wkyp4akhaxvimjxlwdka7cbm3c3nfk5bvkqan1nrip5rxv";
+ version = "0.8.0.2";
+ sha256 = "189v030g23lvky4vccdaw3p0p6drn26zly80a8n9bbn7b8kbfh4r";
buildDepends = [
base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy
skein tagged
diff --git a/pkgs/development/libraries/haskell/comonad-transformers/default.nix b/pkgs/development/libraries/haskell/comonad-transformers/default.nix
index bc378235b91a..3a56b37edf9b 100644
--- a/pkgs/development/libraries/haskell/comonad-transformers/default.nix
+++ b/pkgs/development/libraries/haskell/comonad-transformers/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "comonad-transformers";
- version = "3.0";
- sha256 = "1bjix61rdzmqcd1irh6p91jwy4sz1617sj4zic07p7ng9h7fsz24";
+ version = "3.0.1";
+ sha256 = "1lmcz01zsgy0lfzsznqbdq83vlk6h10zs7i41nav8qhzzhjn095j";
buildDepends = [
comonad contravariant distributive semigroupoids semigroups
transformers
diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix
index 3394de012060..b37ffdf596e1 100644
--- a/pkgs/development/libraries/haskell/comonad/default.nix
+++ b/pkgs/development/libraries/haskell/comonad/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "comonad";
- version = "3.0.0.2";
- sha256 = "01q71b446mdbdj81qjrxjl5bshbg4bjih5zpw9fd4y5431bclfhi";
+ version = "3.0.1.1";
+ sha256 = "01zqxrqxy6x6nf6rynzmncbhlgbbpshhw10pkimnw5isg3b8qhc2";
buildDepends = [ semigroups transformers ];
meta = {
homepage = "http://github.com/ekmett/comonad/";
diff --git a/pkgs/development/libraries/haskell/comonads-fd/default.nix b/pkgs/development/libraries/haskell/comonads-fd/default.nix
index 26a18c667a2b..5921d8b07d39 100644
--- a/pkgs/development/libraries/haskell/comonads-fd/default.nix
+++ b/pkgs/development/libraries/haskell/comonads-fd/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "comonads-fd";
- version = "3.0";
- sha256 = "1j5ymj711c49fsk2ilxfpzqr0jr117z8kb5ggyh5nlwjy16m32in";
+ version = "3.0.1";
+ sha256 = "0ap9sw7h130bza43091mbl9a5bsin6342zawgycdcsag49wm3dyy";
buildDepends = [
comonad comonadTransformers mtl semigroups transformers
];
diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index 07e24ab996ee..74827d407b74 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "conduit";
- version = "0.5.5";
- sha256 = "0av12gaxsrfmsbs70y532wfwnpz9v6ymn182dr8phpqn8d9lx2iq";
+ version = "0.5.6";
+ sha256 = "1a5apcds3jjksz7hzw4ag725796axqk9nm5fhn5i4l82zphq2cxs";
buildDepends = [
liftedBase monadControl resourcet text transformers
transformersBase void
diff --git a/pkgs/development/libraries/haskell/configurator/default.nix b/pkgs/development/libraries/haskell/configurator/default.nix
index 3618f5980554..775c2e5027f8 100644
--- a/pkgs/development/libraries/haskell/configurator/default.nix
+++ b/pkgs/development/libraries/haskell/configurator/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "configurator";
- version = "0.2.0.1";
- sha256 = "02w6f5q2xkpc3kgqz6a58g7yr0q4xd8ck1b6lr64ahvqwsjbxy6p";
+ version = "0.2.0.2";
+ sha256 = "011rgd48gv4idkh2dwg4mlyx3s6pgm1263xq5ixsa4sg3jqh9d8b";
buildDepends = [
attoparsec hashable text unixCompat unorderedContainers
];
diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix
index f2ad59dc88a3..de5f400615a1 100644
--- a/pkgs/development/libraries/haskell/cprng-aes/default.nix
+++ b/pkgs/development/libraries/haskell/cprng-aes/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cprng-aes";
- version = "0.3.1";
- sha256 = "0z1kpgy9d4yp1vmcparsv3r5g1khv2yqqkr99ac3mgvr6pyh24dk";
+ version = "0.3.2";
+ sha256 = "1xwwhg83llf9fzfafxsky65biwk0sla9273rp4gqr7vg9p02k221";
buildDepends = [
cipherAes cryptoApi cryptoRandomApi entropy random
];
diff --git a/pkgs/development/libraries/haskell/crypto-random-api/default.nix b/pkgs/development/libraries/haskell/crypto-random-api/default.nix
index 0530a4bb2458..7c3b10a38386 100644
--- a/pkgs/development/libraries/haskell/crypto-random-api/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-random-api/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "crypto-random-api";
- version = "0.1.0";
- sha256 = "1zx05hskzdxm0kfj6x9qsx8f659zv77pa189s3xg56i7h18d25md";
+ version = "0.2.0";
+ sha256 = "0z49kwgjj7rz235642q64hbkgp0zl6ipn29xd19yb75xc5q7gsan";
buildDepends = [ entropy ];
meta = {
homepage = "http://github.com/vincenthz/hs-crypto-random-api";
diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix
index e0724e49ccbf..2dc0cad97729 100644
--- a/pkgs/development/libraries/haskell/cryptohash/default.nix
+++ b/pkgs/development/libraries/haskell/cryptohash/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cryptohash";
- version = "0.8.1";
- sha256 = "1xxnmxfpd77ahyjhy2fq3fxhiivhj6k12v1z72ndyhrd3369zqky";
+ version = "0.8.3";
+ sha256 = "1fcqbbclii2hmbhi7h64v0nnbc34zzs107m3lqq38iiyy5fvqqv2";
buildDepends = [ cereal cryptoApi tagged ];
meta = {
homepage = "http://github.com/vincenthz/hs-cryptohash";
diff --git a/pkgs/development/libraries/haskell/dataenc/default.nix b/pkgs/development/libraries/haskell/dataenc/default.nix
index 2ece14dcfdc3..9c4de4a1b84d 100644
--- a/pkgs/development/libraries/haskell/dataenc/default.nix
+++ b/pkgs/development/libraries/haskell/dataenc/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "dataenc";
- version = "0.14.0.4";
- sha256 = "0xnn90nyz4m0rbzykkr5p9270s8dq2bfiz5j7qyzyy5m8vbl15bw";
+ version = "0.14.0.5";
+ sha256 = "13gajqbayar7x8sq3rw93i277gqd0bx1i34spshlj4b41fraxc8w";
isLibrary = true;
isExecutable = true;
meta = {
diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix
index b31af6bd3838..c646c5e3943d 100644
--- a/pkgs/development/libraries/haskell/diagrams/contrib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "diagrams-contrib";
- version = "0.6";
- sha256 = "059ljwsbrkzj2wvx9q4viinz46nw5lf4yjmx2c1dmwaqfz3i7j7i";
+ version = "0.6.0.1";
+ sha256 = "1wrfdsfb2yj93wq2ykxjyg6g0q56bmxd2rc6r3gd0zcs8kiimaar";
buildDepends = [
colour dataDefault diagramsLib forceLayout lens mtl vectorSpace
];
diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix
index 3f4942086627..2acf784e8812 100644
--- a/pkgs/development/libraries/haskell/diagrams/core.nix
+++ b/pkgs/development/libraries/haskell/diagrams/core.nix
@@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
dualTree MemoTrie monoidExtras newtype semigroups vectorSpace
vectorSpacePoints
];
+ jailbreak = true;
meta = {
homepage = "http://projects.haskell.org/diagrams";
description = "Core libraries for diagrams EDSL";
diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix
index 472657b2df71..727a7156a9b8 100644
--- a/pkgs/development/libraries/haskell/diagrams/lib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/lib.nix
@@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
active colour dataDefault diagramsCore monoidExtras newtype
NumInstances semigroups vectorSpace
];
+ jailbreak = true;
meta = {
homepage = "http://projects.haskell.org/diagrams";
description = "Embedded domain-specific language for declarative graphics";
diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
index 92eadc44fcfe..2c2e95913b8b 100644
--- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
@@ -1,10 +1,10 @@
-{ cabal, digestiveFunctors, heist, text, xmlhtml }:
+{ cabal, digestiveFunctors, heist, mtl, text, xmlhtml }:
cabal.mkDerivation (self: {
pname = "digestive-functors-heist";
- version = "0.5.1.0";
- sha256 = "1rycf6y1c0car2m71iia929si5iqpc2rdyyxzp326q0rgj94whpk";
- buildDepends = [ digestiveFunctors heist text xmlhtml ];
+ version = "0.5.1.1";
+ sha256 = "0jdg35xrikqg3r0rziv71g619vnmn8fzsv63b73m72fbj5xvy881";
+ buildDepends = [ digestiveFunctors heist mtl text xmlhtml ];
meta = {
homepage = "http://github.com/jaspervdj/digestive-functors";
description = "Heist frontend for the digestive-functors library";
diff --git a/pkgs/development/libraries/haskell/distributive/default.nix b/pkgs/development/libraries/haskell/distributive/default.nix
index a8b07c608d8a..6709569b0540 100644
--- a/pkgs/development/libraries/haskell/distributive/default.nix
+++ b/pkgs/development/libraries/haskell/distributive/default.nix
@@ -1,10 +1,10 @@
-{ cabal, transformers }:
+{ cabal, transformers, transformersCompat }:
cabal.mkDerivation (self: {
pname = "distributive";
- version = "0.2.2";
- sha256 = "13wvr2wb3h2nr1qd3dwjqx0b6g4igjqm3q2cyi4mc41gwihkbhr2";
- buildDepends = [ transformers ];
+ version = "0.3";
+ sha256 = "0z6vwak2n91vpx9ps9j1pbiw0zlh9jmds84yx1yqssbqx8npi32f";
+ buildDepends = [ transformers transformersCompat ];
meta = {
homepage = "http://github.com/ekmett/distributive/";
description = "Haskell 98 Distributive functors -- Dual to Traversable";
diff --git a/pkgs/development/libraries/haskell/double-conversion/default.nix b/pkgs/development/libraries/haskell/double-conversion/default.nix
index 5d92b8178c18..878eba660a06 100644
--- a/pkgs/development/libraries/haskell/double-conversion/default.nix
+++ b/pkgs/development/libraries/haskell/double-conversion/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "double-conversion";
- version = "0.2.0.5";
- sha256 = "1z23a8sfnq5lady8n2kcina9a7df8lmsliscf85x84dxkd3a1ahf";
+ version = "0.2.0.6";
+ sha256 = "1c6hy0ghdqf44fvhdpdxjbcr0ahimw283x5fnvjxja36i71qshjp";
buildDepends = [ text ];
meta = {
homepage = "https://github.com/bos/double-conversion";
diff --git a/pkgs/development/libraries/haskell/dual-tree/default.nix b/pkgs/development/libraries/haskell/dual-tree/default.nix
index f1206fd822ee..741fcbce1c9b 100644
--- a/pkgs/development/libraries/haskell/dual-tree/default.nix
+++ b/pkgs/development/libraries/haskell/dual-tree/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
version = "0.1.0.0";
sha256 = "0av525gjxzd2hhrg5da647chwbv4j30gccaff2b3n5qijzy8l167";
buildDepends = [ monoidExtras newtype semigroups ];
+ jailbreak = true;
meta = {
description = "Rose trees with cached and accumulating monoidal annotations";
license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix
index 3d293d3b86e6..cbfa53b6d001 100644
--- a/pkgs/development/libraries/haskell/either/default.nix
+++ b/pkgs/development/libraries/haskell/either/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "either";
- version = "3.0.2";
- sha256 = "1s3rpxxqc9052hrmiznwqwxhl4826qzbgpivpv5acxfhm0w06lhg";
+ version = "3.0.3";
+ sha256 = "02kpb8xd19n00ll61haqr6k3hy8qmbdf73gr4zs59q9xh0739qxc";
buildDepends = [ semigroupoids semigroups transformers ];
meta = {
homepage = "http://github.com/ekmett/either/";
diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix
index a36d333e9099..119d9d185e55 100644
--- a/pkgs/development/libraries/haskell/file-embed/default.nix
+++ b/pkgs/development/libraries/haskell/file-embed/default.nix
@@ -1,9 +1,10 @@
-{ cabal }:
+{ cabal, filepath }:
cabal.mkDerivation (self: {
pname = "file-embed";
- version = "0.0.4.6";
- sha256 = "0p2vs56s1jy5xaw3axzfsir925z2a46624n32x797lga9khm3qvp";
+ version = "0.0.4.7";
+ sha256 = "1hn08499kay0y6ik5z1s58s8r9h1nzf116avgi6ia4b565wpzkvi";
+ buildDepends = [ filepath ];
meta = {
homepage = "https://github.com/snoyberg/file-embed";
description = "Use Template Haskell to embed file contents directly";
diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix
index f56db649fc7a..43492d73fae5 100644
--- a/pkgs/development/libraries/haskell/filestore/default.nix
+++ b/pkgs/development/libraries/haskell/filestore/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "filestore";
- version = "0.5.0.1";
- sha256 = "1wbiw3skbbcqi9p97xnhg5lnakq3vyan9v4f68wd3g4swk09xp7l";
+ version = "0.6";
+ sha256 = "1bmsqxrkiqw791h0xwasry3jm56rjsyvl9l5r78209bhiv5v6xk0";
isLibrary = true;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/libraries/haskell/fsnotify/default.nix b/pkgs/development/libraries/haskell/fsnotify/default.nix
index 2b8378803b9f..80b6760a3b7b 100644
--- a/pkgs/development/libraries/haskell/fsnotify/default.nix
+++ b/pkgs/development/libraries/haskell/fsnotify/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "fsnotify";
- version = "0.0.4";
- sha256 = "0s71zxj48jimzhl7wz9j22g9c09z64g61nfmpy4mlrhpkzn1f8sz";
+ version = "0.0.6";
+ sha256 = "0ib6ansj3vaq9hxxbsq5jw14w2b61wp4jfahzb3c3x46mdb1bqw5";
buildDepends = [ hinotify systemFileio systemFilepath text time ];
meta = {
description = "Cross platform library for file creation, modification, and deletion notification";
diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix
index a77c122985ee..e518dd879a05 100644
--- a/pkgs/development/libraries/haskell/gitit/default.nix
+++ b/pkgs/development/libraries/haskell/gitit/default.nix
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "gitit";
- version = "0.10.0.2";
- sha256 = "0cnql35h4laqpaymg32dmszwzc74qmbmmjas44gcsd8v5n6f701i";
+ version = "0.10.1.1";
+ sha256 = "1akrc362cf3fzfjyyf1g8bzna093kwsiyxdfpz0d9wd3z6jyc8cg";
isLibrary = true;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix
index e48f92e5b818..637bb5ba45ac 100644
--- a/pkgs/development/libraries/haskell/graphviz/default.nix
+++ b/pkgs/development/libraries/haskell/graphviz/default.nix
@@ -4,12 +4,11 @@
cabal.mkDerivation (self: {
pname = "graphviz";
- version = "2999.14.1.0";
- sha256 = "13fni5sf6cdfvgyh7kqjjdhmjxkhbgl3gbi0cbq90n8blzg4q1ql";
+ version = "2999.15.0.1";
+ sha256 = "137d8n20fbpdz7az79gqharsfl293pl3xn444338i6blfi47ssdy";
buildDepends = [
colour dlist fgl filepath polyparse text transformers wlPprintText
];
- patchPhase = "sed -i -e 's|bytestring.*,|bytestring,|' graphviz.cabal";
meta = {
homepage = "http://projects.haskell.org/graphviz/";
description = "Bindings to Graphviz for graph visualisation";
diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index 093a92dd16ec..50ff535d874b 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -5,14 +5,13 @@
cabal.mkDerivation (self: {
pname = "hakyll";
- version = "3.5.2.0";
- sha256 = "088qhzycpz003qa4b7hnn6frgmidk6219icii04ap964fkw0mqn0";
+ version = "3.5.2.1";
+ sha256 = "1fp7jak2sfznvg3lfyjqy13m1iq9821mdq6n5qmqz5dh5b960iv4";
buildDepends = [
binary blazeHtml blazeMarkup citeprocHs cryptohash filepath hamlet
lrucache mtl pandoc parsec regexBase regexTdfa snapCore snapServer
tagsoup text time
];
- jailbreak = true;
meta = {
homepage = "http://jaspervdj.be/hakyll";
description = "A static website compiler library";
diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
index 609b1ad4fb8e..906a8e2759aa 100644
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hamlet";
- version = "1.1.2";
- sha256 = "0k6wnjqmap4wv0p1hvzpd8br4wr4vda9aw87agzf7pix6hwmiybq";
+ version = "1.1.3.1";
+ sha256 = "04qqsjrn0fh9y4z7gjf3g60w69gqxhzq7dqkraq97p3w45fijm1i";
buildDepends = [
blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text
];
diff --git a/pkgs/development/libraries/haskell/hashable/default.nix b/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/hashable/default.nix
rename to pkgs/development/libraries/haskell/hashable/1.1.2.5.nix
diff --git a/pkgs/development/libraries/haskell/hashable/1.2.0.3.nix b/pkgs/development/libraries/haskell/hashable/1.2.0.3.nix
new file mode 100644
index 000000000000..43d99b63d5a4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hashable/1.2.0.3.nix
@@ -0,0 +1,15 @@
+{ cabal, text }:
+
+cabal.mkDerivation (self: {
+ pname = "hashable";
+ version = "1.2.0.3";
+ sha256 = "0q4zl2mry6qfp9vln6pxmgqik7szv1sh7if55gydnxln1ybvvgmp";
+ buildDepends = [ text ];
+ meta = {
+ homepage = "http://github.com/tibbe/hashable";
+ description = "A class for types that can be converted to a hash value";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix
index 6a6d0d7ddf3b..a2251f696731 100644
--- a/pkgs/development/libraries/haskell/heist/default.nix
+++ b/pkgs/development/libraries/haskell/heist/default.nix
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "heist";
- version = "0.10.1";
- sha256 = "1rwik8x2bfb0474vc1wzbqlhjgas3089g1rvphs7irfbmyki1646";
+ version = "0.10.2.1";
+ sha256 = "14lp27vlzv6qqv325x2vqqvphw5ads5ywjqpjramv3hhd275fn3d";
buildDepends = [
aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors
filepath hashable MonadCatchIOTransformers mtl random text time
diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
index 4b2e32d23520..cc591acf2022 100644
--- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix
+++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "highlighting-kate";
- version = "0.5.3.3";
- sha256 = "08jxl2ba0kb4vj1qbdf4sas8bwbxzayzwsxnjvq358x57i5l302n";
+ version = "0.5.3.4";
+ sha256 = "1xm9dr71qna1w65vzaf63hbchpvshfjvvs5038sy04x2ddwdix77";
isLibrary = true;
isExecutable = true;
buildDepends = [ blazeHtml filepath mtl parsec regexPcre ];
diff --git a/pkgs/development/libraries/haskell/hsemail/default.nix b/pkgs/development/libraries/haskell/hsemail/default.nix
index f69789772ace..e8c0c9e4da86 100644
--- a/pkgs/development/libraries/haskell/hsemail/default.nix
+++ b/pkgs/development/libraries/haskell/hsemail/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hsemail";
- version = "1.7.2";
- sha256 = "1bl017gfyvjvxs9z1fns6sknk1l55905r82i31aqbz9qyaj70gzx";
+ version = "1.7.4";
+ sha256 = "0nigv0zbkm90m5jskfc5a4zx2d3gyqj1y472jplrgd76s15alsmw";
buildDepends = [ mtl parsec ];
meta = {
homepage = "http://gitorious.org/hsemail";
diff --git a/pkgs/development/libraries/haskell/hslogger-template/default.nix b/pkgs/development/libraries/haskell/hslogger-template/default.nix
index a7b1a51b7057..be78bea938cf 100644
--- a/pkgs/development/libraries/haskell/hslogger-template/default.nix
+++ b/pkgs/development/libraries/haskell/hslogger-template/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hslogger-template";
- version = "2.0.1";
- sha256 = "1m8h4i8cxxw83vhbw61njvv86qdcff6zi3bf0nyhc4cq7pfrzqvj";
+ version = "2.0.2";
+ sha256 = "0qkyclj9fajvzbfcs0ik8ncy66x916r40jd85r4wi5nh482i7sp3";
buildDepends = [ hslogger mtl ];
meta = {
description = "Automatic generation of hslogger functions";
diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index b0755946eef9..aada13af06ae 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "http-conduit";
- version = "1.8.5.1";
- sha256 = "1v70rslnga063mlpfs1w03y1s4x7kfisjqwbcbczynhz15s9hymx";
+ version = "1.8.6.2";
+ sha256 = "0b9iw8gq0kyfmnpv1jba2dx8rik9136zx5q9xdyvy0lczdgb8i09";
buildDepends = [
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
blazeBuilderConduit caseInsensitive certificate conduit cookie
diff --git a/pkgs/development/libraries/haskell/http-date/default.nix b/pkgs/development/libraries/haskell/http-date/default.nix
index a0168a519581..58d4dd7ecbfd 100644
--- a/pkgs/development/libraries/haskell/http-date/default.nix
+++ b/pkgs/development/libraries/haskell/http-date/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "http-date";
- version = "0.0.3";
- sha256 = "12iylfzz1d0v0gl4cf31dxcmlg0x7bq5f7acacy2pb0ilrxmzsnn";
+ version = "0.0.4";
+ sha256 = "1pbm066i1cpa3z2kfsqpva0qixnx87s76dpafz3wf6dkaqj8n8i5";
buildDepends = [ attoparsec ];
meta = {
description = "HTTP Date parser/formatter";
diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
index 7e50b68286ce..e30a30fc7aa3 100644
--- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
+++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
@@ -1,15 +1,15 @@
{ cabal, blazeBuilder, caseInsensitive, classyPreludeConduit
-, conduit, httpConduit, httpTypes, liftedBase, monadControl
-, network, networkConduit, text, wai, warp, word8
+, conduit, dataDefault, httpConduit, httpTypes, liftedBase
+, monadControl, network, networkConduit, text, wai, warp, word8
}:
cabal.mkDerivation (self: {
pname = "http-reverse-proxy";
- version = "0.1.0.7";
- sha256 = "1fshng7bcpzjq5iqnvl2qsyia9yi80b8sbif18a3w86gsw5xcakk";
+ version = "0.1.1.1";
+ sha256 = "0xg6xw0j61db75smys2fgjn0nzv2dy8c1ha4m828ssnxlic98lk2";
buildDepends = [
blazeBuilder caseInsensitive classyPreludeConduit conduit
- httpConduit httpTypes liftedBase monadControl network
+ dataDefault httpConduit httpTypes liftedBase monadControl network
networkConduit text wai warp word8
];
meta = {
diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix
index 136c2f30191b..fc569f996a89 100644
--- a/pkgs/development/libraries/haskell/language-c-quote/default.nix
+++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix
@@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
mainlandPretty mtl srcloc syb symbol
];
buildTools = [ alex happy ];
+ jailbreak = true;
meta = {
homepage = "http://www.eecs.harvard.edu/~mainland/";
description = "C/CUDA/OpenCL quasiquoting library";
diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix
index 6a2ca0866b7c..92375e9f14a9 100644
--- a/pkgs/development/libraries/haskell/lens/default.nix
+++ b/pkgs/development/libraries/haskell/lens/default.nix
@@ -5,13 +5,16 @@
cabal.mkDerivation (self: {
pname = "lens";
- version = "3.7.1";
- sha256 = "16rgfv21f7sl7n6gqn4750i3yv7w972ybn883yr474y4xwhhyh6w";
+ version = "3.7.2";
+ sha256 = "14kc9yhq7niv49gpdcl55priwnvisawa9jsp8hnplk48p11i2xs3";
buildDepends = [
comonad comonadsFd comonadTransformers filepath hashable mtl
parallel semigroups split text transformers unorderedContainers
vector
];
+ patchPhase = ''
+ sed -i -e 's|semigroups.*,|semigroups,|' lens.cabal
+ '';
meta = {
homepage = "http://github.com/ekmett/lens/";
description = "Lenses, Folds and Traversals";
diff --git a/pkgs/development/libraries/haskell/liblastfm/default.nix b/pkgs/development/libraries/haskell/liblastfm/default.nix
index ac38a6de716b..d9a04355e2e5 100644
--- a/pkgs/development/libraries/haskell/liblastfm/default.nix
+++ b/pkgs/development/libraries/haskell/liblastfm/default.nix
@@ -1,16 +1,16 @@
-{ cabal, aeson, attoparsec, curl, mtl, pureMD5, urlencoded
-, utf8String, xml
+{ cabal, aeson, cereal, cryptoApi, httpConduit, httpTypes, network
+, pureMD5, text
}:
cabal.mkDerivation (self: {
pname = "liblastfm";
- version = "0.0.3.8";
- sha256 = "0icx86x3w85z0pqdxcch583j6jk5id5aw9gf24266mgfg5k6iwdy";
+ version = "0.1.0.0";
+ sha256 = "1777p2zysha9z389dkzvc22wph5k2xa6f23xk1ckr8j1q5v9dg6x";
buildDepends = [
- aeson attoparsec curl mtl pureMD5 urlencoded utf8String xml
+ aeson cereal cryptoApi httpConduit httpTypes network pureMD5 text
];
meta = {
- description = "Wrapper to Lastfm API";
+ description = "Lastfm API interface";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
};
diff --git a/pkgs/development/libraries/haskell/mainland-pretty/default.nix b/pkgs/development/libraries/haskell/mainland-pretty/default.nix
index 5da3e47a333e..30681bd340bc 100644
--- a/pkgs/development/libraries/haskell/mainland-pretty/default.nix
+++ b/pkgs/development/libraries/haskell/mainland-pretty/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "mainland-pretty";
- version = "0.2.4";
- sha256 = "0x481k36rz4zvj1nwvrfw1d10vbmmx8gb5f2nc8alnxcbc2y7xwq";
+ version = "0.2.5";
+ sha256 = "0h3q7xw69dc0lcqwlacsnv36dlbj0sfgv5imjlqrixy6m5cniq9x";
buildDepends = [ srcloc text ];
meta = {
homepage = "http://www.eecs.harvard.edu/~mainland/";
diff --git a/pkgs/development/libraries/haskell/mime-types/default.nix b/pkgs/development/libraries/haskell/mime-types/default.nix
index 8359d6dc181d..75eb11e6a129 100644
--- a/pkgs/development/libraries/haskell/mime-types/default.nix
+++ b/pkgs/development/libraries/haskell/mime-types/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "mime-types";
- version = "0.1.0.0";
- sha256 = "0xc36pr84nszyych3jd8sl6kj1grsyv8ci8v7ilrbpnw7ngbkw1p";
+ version = "0.1.0.1";
+ sha256 = "1a34ckmv8qcyk38jydxwph59zcrhnwaah1h6pzn112kysjqjgcsl";
buildDepends = [ text ];
meta = {
homepage = "https://github.com/yesodweb/wai";
diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix
index 40f82c69a378..97078f2fb84f 100644
--- a/pkgs/development/libraries/haskell/monad-logger/default.nix
+++ b/pkgs/development/libraries/haskell/monad-logger/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "monad-logger";
- version = "0.2.3.1";
- sha256 = "15f85cf1nsy3xbjgikrn8cr09r70h8n2c67bpbxnfjna3ak94gkn";
+ version = "0.2.3.2";
+ sha256 = "0b5jfmzmsb7pdawcm5i74sy934q2d78pjs39invas502kx5bxzk5";
buildDepends = [
conduit fastLogger monadControl mtl resourcet text transformers
transformersBase
diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix
index a86bdce38397..4e8a4154ae1e 100644
--- a/pkgs/development/libraries/haskell/monoid-extras/default.nix
+++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
version = "0.2.2.1";
sha256 = "0n2zwkwwq8kg9m6qr79mrhlxsfsrjzbyg96gfhcgk21zgc09zary";
buildDepends = [ semigroups ];
+ jailbreak = true;
meta = {
description = "Various extra monoid-related definitions and utilities";
license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/nats/default.nix b/pkgs/development/libraries/haskell/nats/default.nix
new file mode 100644
index 000000000000..02f5c289836e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/nats/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+ pname = "nats";
+ version = "0.1";
+ sha256 = "08gh7jjmws70919hmqqmvnfqcpxr34f03jmg3lzmmhqvr15gm1vy";
+ meta = {
+ homepage = "http://github.com/ekmett/nats/";
+ description = "Haskell 98 natural numbers";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix
index 8eff213c463a..a56c35a214ba 100644
--- a/pkgs/development/libraries/haskell/network-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit/default.nix
@@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "network-conduit";
- version = "0.6.2";
- sha256 = "1v9f2x4ryqiwird60n4rkj0jlyn3lqkfs40956xi11r7p656l6q6";
+ version = "0.6.2.2";
+ sha256 = "1v8abhw977hr78hkshrbxy04abbbhafvvnhr4xxgqc0phwch02mc";
buildDepends = [
conduit liftedBase monadControl network transformers
];
diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/default.nix
index 3af9dd248cb9..3e04a33990e3 100644
--- a/pkgs/development/libraries/haskell/optparse-applicative/default.nix
+++ b/pkgs/development/libraries/haskell/optparse-applicative/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "optparse-applicative";
- version = "0.4.3";
- sha256 = "1zsydxgq3lcgzrf9iwas3gkjy0vxn4z2cj6h3m63h0qqa26sfcwz";
+ version = "0.5.2.1";
+ sha256 = "0w4mk851mx8dch8lnck0g82asmzrsc47xrf34jygh0f6v4kbj40i";
buildDepends = [ transformers ];
meta = {
homepage = "https://github.com/pcapriotti/optparse-applicative";
diff --git a/pkgs/development/libraries/haskell/parallel-io/default.nix b/pkgs/development/libraries/haskell/parallel-io/default.nix
index 0672a01f361c..56c1a1306964 100644
--- a/pkgs/development/libraries/haskell/parallel-io/default.nix
+++ b/pkgs/development/libraries/haskell/parallel-io/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "parallel-io";
- version = "0.3.2.2";
- sha256 = "04swl1mp704ijrpmvw800x0fpzmrbd382p45kvqzynmkgqzx33a3";
+ version = "0.3.3";
+ sha256 = "0i86x3bf8pjlg6mdg1zg5lcrjpg75pbqs2mrgrbp4z4bkcmw051s";
isLibrary = true;
isExecutable = true;
buildDepends = [ extensibleExceptions random ];
diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
index 8731a83ac896..8fdc9f641aac 100644
--- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "persistent-postgresql";
- version = "1.1.1";
- sha256 = "19ywyf0d7n6z8ws7s7jc958g30aiy6il43qwvqh92q1cz8bd1mj9";
+ version = "1.1.2.1";
+ sha256 = "1iz6w9isva1drbr37c8f42g3nnl78sp27ydaj0975yqyp7nh7and";
buildDepends = [
aeson conduit monadControl persistent postgresqlLibpq
postgresqlSimple text time transformers
diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
index 1e03cfdb0365..2da2c06a2439 100644
--- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "persistent-sqlite";
- version = "1.1.0";
- sha256 = "0ycs8qb8vksnypzpxi0ypxk7akl68hdwyxzkbchyy6zh3zv2pa4z";
+ version = "1.1.2";
+ sha256 = "0pb52k7a7js71s4d2mynd62i8gk99az7y72rycs0xg9r9cr081p3";
buildDepends = [
aeson conduit monadControl persistent text transformers
];
diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
index 8bdf010215bf..596b0789445f 100644
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "persistent-template";
- version = "1.1.1";
- sha256 = "18rxjqgmjzx0j0sbg9ms779pkq264vf8w0qz679xsyn98wc95i36";
+ version = "1.1.2.1";
+ sha256 = "02sqrq847cxywj9hwixvi0bqq09kxr9w6lhn6kqg4ww0mw2add6s";
buildDepends = [ aeson monadControl persistent text transformers ];
meta = {
homepage = "http://www.yesodweb.com/book/persistent";
diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index 45b1da1ca79b..a45dbea57ae0 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "persistent";
- version = "1.1.0.1";
- sha256 = "07b9d9fcah3k03r2pm6mfl3qsdp4s9gbb376by3122nvc26w6sjc";
+ version = "1.1.3.2";
+ sha256 = "1q8p5nxsf9fjhsyy1lha852f7vssp9mz6l24gg47mgv6y5mm9myv";
buildDepends = [
aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
liftedBase monadControl monadLogger pathPieces poolConduit
diff --git a/pkgs/development/libraries/haskell/pretty-show/default.nix b/pkgs/development/libraries/haskell/pretty-show/default.nix
index 577848ab459d..5fedd0aca292 100644
--- a/pkgs/development/libraries/haskell/pretty-show/default.nix
+++ b/pkgs/development/libraries/haskell/pretty-show/default.nix
@@ -1,15 +1,15 @@
-{ cabal, haskellLexer }:
+{ cabal, filepath, haskellLexer }:
cabal.mkDerivation (self: {
pname = "pretty-show";
- version = "1.2";
- sha256 = "0lbalmyrqisgd2spbvzifsy25lr6cl9sgz78hav8q8r406k7nf2l";
+ version = "1.5";
+ sha256 = "1n04f9aypgbhkq0lbji9czv1mjfwv4f80w1c6hqs55gmzwif63m4";
isLibrary = true;
isExecutable = true;
- buildDepends = [ haskellLexer ];
+ buildDepends = [ filepath haskellLexer ];
meta = {
homepage = "http://wiki.github.com/yav/pretty-show";
- description = "Tools for working with derived Show instances";
+ description = "Tools for working with derived `Show` instances and generic inspection of values";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
diff --git a/pkgs/development/libraries/haskell/random-fu/default.nix b/pkgs/development/libraries/haskell/random-fu/default.nix
index 520f232d81fe..8dd228ad3db3 100644
--- a/pkgs/development/libraries/haskell/random-fu/default.nix
+++ b/pkgs/development/libraries/haskell/random-fu/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "random-fu";
- version = "0.2.3.1";
- sha256 = "06b4v7012fj1kmnz6i63vbwl9gkhzgk556gmcc62k14299ks8pci";
+ version = "0.2.4.0";
+ sha256 = "1wiwh52qfs699mcj3ylwc97pyabczn6dr8j92qczs89g8vvi91wd";
buildDepends = [
erf gamma monadLoops mtl randomShuffle randomSource rvar syb
transformers vector
diff --git a/pkgs/development/libraries/haskell/random-source/default.nix b/pkgs/development/libraries/haskell/random-source/default.nix
index e4dab92dcb76..acc0285a59a4 100644
--- a/pkgs/development/libraries/haskell/random-source/default.nix
+++ b/pkgs/development/libraries/haskell/random-source/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "random-source";
- version = "0.3.0.2";
- sha256 = "0sp39bj7rqg4w4rc4d4zgj0f77c23z4xc47p55chy12znc4frlp2";
+ version = "0.3.0.4";
+ sha256 = "1gvx9r6vy36lx7fy537zdbnbhpmfxz88a7gh0aiyd2vi7bvnndxy";
buildDepends = [
flexibleDefaults mersenneRandomPure64 mtl mwcRandom random stateref
syb thExtras
diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix
index c2e8deefbad5..7e25fa5913e2 100644
--- a/pkgs/development/libraries/haskell/semigroupoids/default.nix
+++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "semigroupoids";
- version = "3.0.0.1";
- sha256 = "0ilqmpywiwp9m1k8lrw0mxb0pzc9l8bs2hgzrp8k5iln1yq1fh6i";
+ version = "3.0.1";
+ sha256 = "12k2yryr31lxhwq42cx05kswljmbli8p8c2wknigzkkam63d8k5h";
buildDepends = [ comonad contravariant semigroups transformers ];
meta = {
homepage = "http://github.com/ekmett/semigroupoids";
diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix
index 240062493e30..ea0f2813b55f 100644
--- a/pkgs/development/libraries/haskell/semigroups/default.nix
+++ b/pkgs/development/libraries/haskell/semigroups/default.nix
@@ -1,9 +1,10 @@
-{ cabal }:
+{ cabal, nats }:
cabal.mkDerivation (self: {
pname = "semigroups";
- version = "0.8.4.1";
- sha256 = "05wv5amgg3nqr1if936zl330sv1k4i9p8xzdmgxsmchp4lshyr6n";
+ version = "0.9";
+ sha256 = "0cwyjjlr9zgpxryzdf26pb58dmad0cp8d0493rarhh5zmgighh90";
+ buildDepends = [ nats ];
meta = {
homepage = "http://github.com/ekmett/semigroups/";
description = "Haskell 98 semigroups";
diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
index 228e35bab467..a7238ba52eb3 100644
--- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare-js";
- version = "1.1.0";
- sha256 = "0rb1fim6xvpgc2in71drxgimh1z75p72zj0k6hwh2hyfwkj2yh9p";
+ version = "1.1.1";
+ sha256 = "1xzhb3ipax2489311hmiaxp9i44099bsbclcj3ds0rhdfa62xarg";
buildDepends = [ aeson shakespeare text ];
meta = {
homepage = "http://www.yesodweb.com/book/shakespearean-templates";
diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix
index 41953629e0b4..15245bfe0bcd 100644
--- a/pkgs/development/libraries/haskell/shelly/default.nix
+++ b/pkgs/development/libraries/haskell/shelly/default.nix
@@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "shelly";
- version = "0.15.0";
- sha256 = "138x2c76ynv0kl0kg86pawnnlk6973dqkaapycb30rf44p1m53j2";
+ version = "0.15.4";
+ sha256 = "1b8fn5fa350hhlswn97g6zn9454nzn9sz60x55j959phwys0fcdk";
buildDepends = [
mtl systemFileio systemFilepath text time unixCompat
];
diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix
index f2a90a5802cd..30a2d34a99ef 100644
--- a/pkgs/development/libraries/haskell/snap/snap.nix
+++ b/pkgs/development/libraries/haskell/snap/snap.nix
@@ -19,6 +19,7 @@ cabal.mkDerivation (self: {
snapCore snapServer stm syb text time transformers
unorderedContainers vector vectorAlgorithms xmlhtml
];
+ jailbreak = true;
meta = {
homepage = "http://snapframework.com/";
description = "Top-level package for the Snap Web Framework";
diff --git a/pkgs/development/libraries/haskell/srcloc/default.nix b/pkgs/development/libraries/haskell/srcloc/default.nix
index c867a353cd6f..f652ed001e40 100644
--- a/pkgs/development/libraries/haskell/srcloc/default.nix
+++ b/pkgs/development/libraries/haskell/srcloc/default.nix
@@ -1,10 +1,9 @@
-{ cabal, syb }:
+{ cabal }:
cabal.mkDerivation (self: {
pname = "srcloc";
- version = "0.3.0";
- sha256 = "1ymk8k0r9ckk7dalz3virvvpyrf4nw8xvb23cs6ibdjjbzsphpiz";
- buildDepends = [ syb ];
+ version = "0.4.0";
+ sha256 = "00af562n4m3nwlhl86x8rx7hhpnhwaijin61wk574pp47bh2jg0k";
meta = {
homepage = "http://www.eecs.harvard.edu/~mainland/";
description = "Data types for managing source code locations";
diff --git a/pkgs/development/libraries/haskell/strptime/default.nix b/pkgs/development/libraries/haskell/strptime/default.nix
index bb30fe71cc37..c092f0c0d15b 100644
--- a/pkgs/development/libraries/haskell/strptime/default.nix
+++ b/pkgs/development/libraries/haskell/strptime/default.nix
@@ -1,10 +1,10 @@
-{ cabal, time }:
+{ cabal, text, time }:
cabal.mkDerivation (self: {
pname = "strptime";
- version = "1.0.8";
- sha256 = "0cd4wzrg9zpnwrfpp6lxs1ib06h0fcsdqd3idsw663wr5lllfgdq";
- buildDepends = [ time ];
+ version = "1.0.10";
+ sha256 = "1f42yf49fqr2fyjfakscmmlnmw3w5rg7wyy6gjyrf0gcgsh0h9fd";
+ buildDepends = [ text time ];
meta = {
description = "Efficient parsing of LocalTime using a binding to C's strptime, with some extra features (i.e. fractional seconds)";
license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/tabular/default.nix b/pkgs/development/libraries/haskell/tabular/default.nix
index 65e12aa92952..32ede2f660b3 100644
--- a/pkgs/development/libraries/haskell/tabular/default.nix
+++ b/pkgs/development/libraries/haskell/tabular/default.nix
@@ -2,12 +2,11 @@
cabal.mkDerivation (self: {
pname = "tabular";
- version = "0.2.2.3";
- sha256 = "cf6d9f1928ec6981edcbb06c4dcbaea7a96deef5272192ad4290caa18711ea76";
+ version = "0.2.2.4";
+ sha256 = "103fqbypsgykv6z29jp1s75pd99vra9sfa70krcnlhbk9kbvdyjk";
buildDepends = [ csv html mtl ];
- jailbreak = true;
meta = {
- homepage = "http://patch-tag.com/r/kowey/tabular";
+ homepage = "http://hub.darcs.net/kowey/tabular";
description = "Two-dimensional data tables with rendering functions";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix
index 65d9da1548fd..78ec99da8db5 100644
--- a/pkgs/development/libraries/haskell/texmath/default.nix
+++ b/pkgs/development/libraries/haskell/texmath/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "texmath";
- version = "0.6.1.1";
- sha256 = "06yk19jvpj7di1njybk1hdc7hp6c9h3yb4gvi7ljna6wqrh6zqaz";
+ version = "0.6.1.2";
+ sha256 = "1izsjy30saz2il16dwx8sh2s30b1pfgcpq6023v135w1bdrzrnmq";
isLibrary = true;
isExecutable = true;
buildDepends = [ parsec syb xml ];
diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix
index 72466f5d8e83..fbd20bebdf1e 100644
--- a/pkgs/development/libraries/haskell/tls/default.nix
+++ b/pkgs/development/libraries/haskell/tls/default.nix
@@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
buildDepends = [
cereal certificate cryptoApi cryptocipher cryptohash mtl network
];
+ jailbreak = true;
meta = {
homepage = "http://github.com/vincenthz/hs-tls";
description = "TLS/SSL protocol native implementation (Server and Client)";
diff --git a/pkgs/development/libraries/haskell/transformers-compat/default.nix b/pkgs/development/libraries/haskell/transformers-compat/default.nix
new file mode 100644
index 000000000000..d36ace0eb299
--- /dev/null
+++ b/pkgs/development/libraries/haskell/transformers-compat/default.nix
@@ -0,0 +1,15 @@
+{ cabal, transformers }:
+
+cabal.mkDerivation (self: {
+ pname = "transformers-compat";
+ version = "0.1";
+ sha256 = "100xw00h2l6iipg6lq5bbncpil3bl6w3frak99klpi8gn6ihd8ah";
+ buildDepends = [ transformers ];
+ noHaddock = true;
+ meta = {
+ homepage = "http://github.com/ekmett/transformers-compat/";
+ description = "Lenses, Folds and Traversals";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/unix-compat/default.nix b/pkgs/development/libraries/haskell/unix-compat/default.nix
index 7c5cb6c63c4f..582764204818 100644
--- a/pkgs/development/libraries/haskell/unix-compat/default.nix
+++ b/pkgs/development/libraries/haskell/unix-compat/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "unix-compat";
- version = "0.4.0.0";
- sha256 = "0xhhvqdjcmcyavf0g2q2sjghj2h4si1ijg4nc4s8kidbd957z9r8";
+ version = "0.4.1.0";
+ sha256 = "155m3zg692zbfyck4njx1vzvb5vgs0dkzyzlqf2x78ds6j9bzjzi";
meta = {
homepage = "http://github.com/jystic/unix-compat";
description = "Portable POSIX-compatibility layer";
diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
index 02356789bc30..d28eb827dabf 100644
--- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
+++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "uu-parsinglib";
- version = "2.7.4";
- sha256 = "1cznyn09a3glfkvvzqma3bhjinddkp6v2xwiy5x403v0wy8y565j";
+ version = "2.7.4.1";
+ sha256 = "1aya95j7dd0yal0ygy6d4w4wmlhgn5ddy3c5f6ncl4k3kg7hjxd1";
buildDepends = [ ListLike time ];
meta = {
homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";
diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix
index 398027931038..6039e7424772 100644
--- a/pkgs/development/libraries/haskell/vault/default.nix
+++ b/pkgs/development/libraries/haskell/vault/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "vault";
- version = "0.2.0.3";
- sha256 = "1ky7c5hg7spa545xhgs4ahf07w60k3x149087mla1dxl8lpcz70i";
+ version = "0.2.0.4";
+ sha256 = "1a63rarksp4waj64b9kv8q77wbhdnsnxahkixl1klp25hkp8aan3";
buildDepends = [ hashable unorderedContainers ];
meta = {
homepage = "https://github.com/HeinrichApfelmus/vault";
diff --git a/pkgs/development/libraries/haskell/void/default.nix b/pkgs/development/libraries/haskell/void/default.nix
index 5cd54a3e0e77..cdf21c782334 100644
--- a/pkgs/development/libraries/haskell/void/default.nix
+++ b/pkgs/development/libraries/haskell/void/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "void";
- version = "0.5.10";
- sha256 = "0adykqns7vvzgrjg7waaklfj3dl1h7vk5rwlfx0f18js6di9zrh4";
+ version = "0.5.11";
+ sha256 = "0fi8ccnhg0ckz5v3cgxhdd67p0v3g9yawin917ik4vxfbwz5j3v6";
buildDepends = [ semigroups ];
meta = {
homepage = "http://github.com/ekmett/void";
diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix
index 5ccf7531d4c3..2ff182470009 100644
--- a/pkgs/development/libraries/haskell/wai-app-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "wai-app-static";
- version = "1.3.0.5";
- sha256 = "1fz2a30f3imn0m5q6hjkm2xan0ddalhfbzx78pklz4g7k79s1ncn";
+ version = "1.3.1";
+ sha256 = "0r2ghx3nqh7nms8yxa874h5pyagj993r077f8riybjyjp078s2lk";
buildDepends = [
base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal
cryptoConduit cryptohash fileEmbed httpDate httpTypes mimeTypes
diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index b0837b0246c4..bc55da654692 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "wai-extra";
- version = "1.3.0.5";
- sha256 = "0xzsnsf4sdbzkw92xyzmyi6qp2qpbh5dj3579sppcihdq9djj8l8";
+ version = "1.3.1.1";
+ sha256 = "0590i9zs47fxqlz4l7zrk15x4s1rvzvp0fs1caygr5hw32v8h0by";
buildDepends = [
ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive
conduit dataDefault dateCache fastLogger httpTypes network
diff --git a/pkgs/development/libraries/haskell/wxHaskell/fix-bogus-pointer-assignment.patch b/pkgs/development/libraries/haskell/wxHaskell/fix-bogus-pointer-assignment.patch
new file mode 100644
index 000000000000..38551d24d43f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/wxHaskell/fix-bogus-pointer-assignment.patch
@@ -0,0 +1,13 @@
+diff -ubr wxc-0.90.0.4-orig/src/cpp/eljpen.cpp wxc-0.90.0.4/src/cpp/eljpen.cpp
+--- wxc-0.90.0.4-orig/src/cpp/eljpen.cpp 2012-07-03 12:12:17.000000000 +0200
++++ wxc-0.90.0.4/src/cpp/eljpen.cpp 2013-01-07 12:09:50.296417007 +0100
+@@ -156,7 +156,7 @@
+ EWXWEXPORT(void,wxPen_GetStipple)(void* self,wxBitmap* _ref)
+ {
+ #if defined(__WXGTK__)
+- *_ref = NULL;
++ _ref = NULL;
+ #else
+ *_ref = *(((wxPen*)self)->GetStipple());
+ #endif
+Only in wxc-0.90.0.4/src/cpp: eljpen.cpp.orig
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
index f439b9e1594a..74ca4f91d70f 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
@@ -10,7 +10,7 @@ cabal.mkDerivation (self: {
postInstall = ''
cp -v dist/build/libwxc.so.${self.version} $out/lib/libwxc.so
'';
-
+ patches = [ ./fix-bogus-pointer-assignment.patch ];
meta = {
homepage = "http://haskell.org/haskellwiki/WxHaskell";
description = "wxHaskell C++ wrapper";
diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
index 0fac2ad63727..f592568cb324 100644
--- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix
+++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "xss-sanitize";
- version = "0.3.2";
- sha256 = "0m7gl232i06i090kbrlz67cs4q3pqf8169m9kjdj41kj6jay1dcx";
+ version = "0.3.3";
+ sha256 = "0xnyp8nwglh4waawijk1q5z8higf8mggh6hp0pp6ys4bm7gsp74a";
buildDepends = [
attoparsec cssText network tagsoup text utf8String
];
diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
index 0271f6874f34..eb90b847fc8c 100644
--- a/pkgs/development/libraries/haskell/yaml/default.nix
+++ b/pkgs/development/libraries/haskell/yaml/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "yaml";
- version = "0.8.1.1";
- sha256 = "0n2m205f0jq8v4g84bw642vdqqr68m3jklv98rr21s8r2fyy7937";
+ version = "0.8.2";
+ sha256 = "1c83vxgry1425z4wk2mnijy183pnlhamcra7fvh55rvhq4bql1m8";
buildDepends = [
aeson attoparsec conduit resourcet text transformers
unorderedContainers vector
diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index 7d4d208a9f54..dfa96bf2b13e 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "yesod-auth";
- version = "1.1.2.2";
- sha256 = "16g2lnnwp5219i77fb4pv2y8ljz4msflj38mvh0zw3x93747baf7";
+ version = "1.1.3";
+ sha256 = "0rlp56jsb0cwm1z303b7l9iy5hbip18vlm7fisna4agbf4rj2k0z";
buildDepends = [
aeson authenticate blazeHtml blazeMarkup hamlet httpConduit
liftedBase mimeMail network persistent persistentTemplate pureMD5
diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index 75b36eb0aeba..65b24a4534ca 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "yesod-core";
- version = "1.1.6.1";
- sha256 = "0pk7pxqp9g5pkbba2na503az9pghgqvs538pcz2k3r3cpb6nhgpa";
+ version = "1.1.7.1";
+ sha256 = "07rh6yy8hz660hxz60gvminm166cb5was8qb1l24lrmzchigbf3r";
buildDepends = [
aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal
clientsession conduit cookie failure fastLogger hamlet httpTypes
diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index 69ef6b1f4923..2d0a099002cb 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -14,7 +14,6 @@ cabal.mkDerivation (self: {
shakespeareJs text time transformers wai xssSanitize yesodCore
yesodPersistent
];
- noHaddock = true;
meta = {
homepage = "http://www.yesodweb.com/";
description = "Form handling support for Yesod Web Framework";
diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix
index ada24ea3193e..7923b6e9e8e3 100644
--- a/pkgs/development/libraries/haskell/yesod-static/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-static/default.nix
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "yesod-static";
- version = "1.1.1.1";
- sha256 = "1wp3ijiwsai9npf6zl0bq3fi4rbh0qjy8bii3d178sariv7588js";
+ version = "1.1.1.2";
+ sha256 = "0x3vrzqqddi4fmbivmy5pi66jmnc5fh68j5fjfxn5nyhp4n6z0sw";
buildDepends = [
base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed
httpTypes systemFilepath text transformers unixCompat wai
diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix
index ebbbc3f939fc..b03274902e67 100644
--- a/pkgs/development/libraries/haskell/yesod-test/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-test/default.nix
@@ -1,17 +1,18 @@
-{ cabal, attoparsec, blazeHtml, blazeMarkup, caseInsensitive, hspec
-, htmlConduit, httpTypes, HUnit, monadControl, network, persistent
-, poolConduit, text, transformers, wai, waiTest, xmlConduit
-, xmlTypes
+{ cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup
+, caseInsensitive, cookie, hspec, htmlConduit, httpTypes, HUnit
+, monadControl, network, persistent, poolConduit, text, time
+, transformers, wai, waiTest, xmlConduit, xmlTypes
}:
cabal.mkDerivation (self: {
pname = "yesod-test";
- version = "0.3.2";
- sha256 = "1wd5iwar6jxbv0p7p47js4spivwhph98h403bnmf3dl7069nyjcs";
+ version = "0.3.3";
+ sha256 = "1jb410r905wd26swh2rk59nbyy389gcfz261adhb69awmsyql5x3";
buildDepends = [
- attoparsec blazeHtml blazeMarkup caseInsensitive hspec htmlConduit
- httpTypes HUnit monadControl network persistent poolConduit text
- transformers wai waiTest xmlConduit xmlTypes
+ attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive
+ cookie hspec htmlConduit httpTypes HUnit monadControl network
+ persistent poolConduit text time transformers wai waiTest
+ xmlConduit xmlTypes
];
meta = {
homepage = "http://www.yesodweb.com";
diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index 72f19e5a5c20..50365296270d 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -12,8 +12,8 @@
cabal.mkDerivation (self: {
pname = "yesod";
- version = "1.1.7";
- sha256 = "1qcvmy8ichri9ivfkanj4gp687lwymgi170sbdzwf5phy34bhkc5";
+ version = "1.1.7.2";
+ sha256 = "0mxxzcmp63sdn7g30ilp40dsj2iccajc9gpxycnqxqabdzhqkbm0";
isLibrary = true;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
index 44b04397c3f4..4db350f93b52 100644
--- a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "zeromq3-haskell";
- version = "0.1.4";
- sha256 = "026b18ligbrfbg4x7vivk6r2gj9rj3vy6pm3h0s81571h6lk3dhx";
+ version = "0.2";
+ sha256 = "12qljfkcd4l9h3l80jibxgw2an6v782w0sxwvzxqmma29jv6hvky";
extraLibraries = [ zeromq ];
meta = {
homepage = "http://github.com/twittner/zeromq-haskell/";
diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix
index 5ee2377147ed..300de9df4c96 100644
--- a/pkgs/development/libraries/haskell/zip-archive/default.nix
+++ b/pkgs/development/libraries/haskell/zip-archive/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "zip-archive";
- version = "0.1.2.1";
- sha256 = "1c0pjbrkfv44nbpz60b1c4xdbkdk8qaxlkfxl51rb2183gj1gkph";
+ version = "0.1.3.3";
+ sha256 = "0zzps6s6lsv35qv1xx1fwipk2nwv255wpa956mvzbwdr47pgqjwi";
isLibrary = true;
isExecutable = true;
buildDepends = [ binary digest filepath mtl time utf8String zlib ];
diff --git a/pkgs/development/libraries/libgadu/default.nix b/pkgs/development/libraries/libgadu/default.nix
index 98324c184c66..430560107702 100644
--- a/pkgs/development/libraries/libgadu/default.nix
+++ b/pkgs/development/libraries/libgadu/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation {
- name = "libgadu-1.11.0";
+ name = "libgadu-1.11.2";
src = fetchurl {
- url = http://toxygen.net/libgadu/files/libgadu-1.11.0.tar.gz;
- sha256 = "045a0bd395k3ramdvlzyfx3878p42fv4r04rgasmdsm2n33wgm38";
+ url = http://toxygen.net/libgadu/files/libgadu-1.11.2.tar.gz;
+ sha256 = "0kifi9blhbimihqw4kaf6wyqhlx8fpp8nq4s6y280ar9p0il2n3z";
};
propagatedBuildInputs = [ zlib ];
diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index 90888ce09616..42f7c60610ec 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, curl}:
stdenv.mkDerivation rec {
- name = "libmicrohttpd-0.9.9";
+ name = "libmicrohttpd-0.9.24";
src = fetchurl {
url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
- sha256 = "0059isy80cmxv44dhngnsc4g25kwxdcfis5yrva199r0vnb8ab6c";
+ sha256 = "0cp2ac6wbk493zslbvbmb5z96h18k496f9id8d2ji7hbdrwzfk6h";
};
buildInputs = [ curl ];
diff --git a/pkgs/development/libraries/libxtc_dxtn/default.nix b/pkgs/development/libraries/libxtc_dxtn/default.nix
new file mode 100644
index 000000000000..0e7442633d77
--- /dev/null
+++ b/pkgs/development/libraries/libxtc_dxtn/default.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchurl, mesa }:
+
+stdenv.mkDerivation rec {
+ name = "libtxc_dxtn-1.0.1";
+
+ src = fetchurl {
+ url = "people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2";
+ sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5";
+ };
+
+ postUnpack = ''
+ tar xf ${mesa.src} --wildcards '*/include/'
+ export NIX_CFLAGS_COMPILE="-I $NIX_BUILD_TOP/[mM]esa*/include"
+ '';
+}
diff --git a/pkgs/development/libraries/tinyxml/2.6.2-add-pkgconfig.patch b/pkgs/development/libraries/tinyxml/2.6.2-add-pkgconfig.patch
new file mode 100644
index 000000000000..ca89685a458f
--- /dev/null
+++ b/pkgs/development/libraries/tinyxml/2.6.2-add-pkgconfig.patch
@@ -0,0 +1,13 @@
+--- a/tinyxml.pc 1970-01-01 01:00:00.000000000 +0100
++++ b/tinyxml.pc 2012-12-29 08:52:07.512266072 +0100
+@@ -0,0 +1,10 @@
++prefix=@out@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
++
++Name: TinyXML
++Description: A simple, small, C++ XML parser
++Version: @version@
++Libs: -L${libdir} -ltinyxml
++Cflags: -I${includedir}
diff --git a/pkgs/development/libraries/tinyxml/2.6.2-entity.patch b/pkgs/development/libraries/tinyxml/2.6.2-entity.patch
new file mode 100755
index 000000000000..3164261291ba
--- /dev/null
+++ b/pkgs/development/libraries/tinyxml/2.6.2-entity.patch
@@ -0,0 +1,64 @@
+? entity.patch
+Index: a/tinyxml.cpp
+===================================================================
+RCS file: b/tinyxml.cpp,v
+retrieving revision 1.105
+diff -u -r1.105 a/tinyxml.cpp
+--- tinyxml.cpp 5 Jun 2010 19:06:57 -0000 1.105
++++ tinyxml.cpp 19 Jul 2010 21:24:16 -0000
+@@ -57,30 +57,7 @@
+ {
+ unsigned char c = (unsigned char) str[i];
+
+- if ( c == '&'
+- && i < ( (int)str.length() - 2 )
+- && str[i+1] == '#'
+- && str[i+2] == 'x' )
+- {
+- // Hexadecimal character reference.
+- // Pass through unchanged.
+- // © -- copyright symbol, for example.
+- //
+- // The -1 is a bug fix from Rob Laveaux. It keeps
+- // an overflow from happening if there is no ';'.
+- // There are actually 2 ways to exit this loop -
+- // while fails (error case) and break (semicolon found).
+- // However, there is no mechanism (currently) for
+- // this function to return an error.
+- while ( i<(int)str.length()-1 )
+- {
+- outString->append( str.c_str() + i, 1 );
+- ++i;
+- if ( str[i] == ';' )
+- break;
+- }
+- }
+- else if ( c == '&' )
++ if ( c == '&' )
+ {
+ outString->append( entity[0].str, entity[0].strLength );
+ ++i;
+Index: a/xmltest.cpp
+===================================================================
+RCS file: b/xmltest.cpp,v
+retrieving revision 1.89
+diff -u -r1.89 a/xmltest.cpp
+--- xmltest.cpp 5 Jun 2010 17:41:52 -0000 1.89
++++ xmltest.cpp 19 Jul 2010 21:24:16 -0000
+@@ -1340,6 +1340,16 @@
+ }*/
+ }
+
++ #ifdef TIXML_USE_STL
++ {
++ TiXmlDocument xml;
++ xml.Parse("foo
+bar");
++ std::string str;
++ str << xml;
++ XmlTest( "Entity escaping", "foo
+bar", str.c_str() );
++ }
++ #endif
++
+ /* 1417717 experiment
+ {
+ TiXmlDocument xml;
diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix
new file mode 100644
index 000000000000..8770859817ca
--- /dev/null
+++ b/pkgs/development/libraries/tinyxml/2.6.2.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchurl, unzip }:
+
+let
+ version = "2.6.2";
+in stdenv.mkDerivation {
+ name = "tinyxml-${version}";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/project/tinyxml/tinyxml/${version}/tinyxml_2_6_2.zip";
+ sha256 = "04nmw6im2d1xp12yir8va93xns5iz816pwi25n9cql3g3i8bjsxc";
+ };
+
+ patches = [
+ # add pkgconfig file
+ ./2.6.2-add-pkgconfig.patch
+
+ # http://sourceforge.net/tracker/index.php?func=detail&aid=3031828&group_id=13559&atid=313559
+ ./2.6.2-entity.patch
+ ];
+
+ buildInputs = [ unzip ];
+ buildPhase = ''
+ # build xmltest
+ make
+
+ # build the lib as a shared library
+ g++ -Wall -O2 -shared -fpic tinyxml.cpp \
+ tinyxmlerror.cpp tinyxmlparser.cpp \
+ tinystr.cpp -o libtinyxml.so
+ '';
+
+ doCheck = true;
+ checkPhase = ''
+ ./xmltest
+ result=$?
+ if [[ $result != 0 ]] ; then
+ exit $result
+ fi
+ '';
+
+ installPhase = ''
+ mkdir -pv $out/include/
+ mkdir -pv $out/lib/pkgconfig/
+ mkdir -pv $out/share/doc/tinyxml/
+
+ cp -v libtinyxml.so $out/lib/
+ cp -v *.h $out/include/
+
+ substituteInPlace tinyxml.pc --replace "@out@" "$out"
+ substituteInPlace tinyxml.pc --replace "@version@" "${version}"
+ cp -v tinyxml.pc $out/lib/pkgconfig/
+
+ cp -v docs/* $out/share/doc/tinyxml/
+ '';
+
+ meta = {
+ description = "TinyXML is a simple, small, C++ XML parser that can be easily integrating into other programs.";
+ homepage = "http://www.grinninglizard.com/tinyxml/index.html";
+ license = "free-non-copyleft";
+ };
+}
diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index 5cd083a7e330..1fd6179183fd 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -37,7 +37,11 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
mkdir -p $out/lib
mv -v out/${arch}.release/d8 $out/bin
- mv -v out/${arch}.release/lib.target/libv8.so $out/lib
+
+ ${if stdenv.system == "x86_64-darwin" then
+ "mv -v out/${arch}.release/libv8.dylib $out/lib"
+ else
+ "mv -v out/${arch}.release/lib.target/libv8.so $out/lib"}
mv -v include $out/
'';
}
diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix
index a0e69bff0fea..21a80d8951fb 100644
--- a/pkgs/development/libraries/wxGTK-2.9/default.nix
+++ b/pkgs/development/libraries/wxGTK-2.9/default.nix
@@ -7,12 +7,15 @@ assert withMesa -> mesa != null;
with stdenv.lib;
+let
+ version = "2.9.4";
+in
stdenv.mkDerivation {
- name = "wxwidgets-2.9.3";
+ name = "wxwidgets-${version}";
src = fetchurl {
- url = "mirror://sourceforge/wxwindows/wxWidgets-2.9.3.tar.bz2";
- sha256 = "739c31a360b5c46b55904a7fb086f5cdfff0816efbc491d8263349210bf323b2";
+ url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2";
+ sha256 = "04jda4bns7cmp7xy68qz112yg0lribpc6xs5k9gilfqcyhshqlvc";
};
buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ]
diff --git a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
index 83e800faa2c3..3c28ed04dba2 100644
--- a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
+++ b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
@@ -6,13 +6,18 @@ stdenv.mkDerivation {
name = "avr-gcc-libc";
srcBinutils = fetchurl {
- url = "mirror://gnu/binutils/binutils-2.21.tar.bz2";
- sha256 = "1iyhc42zfa0j2gaxy4zvpk47sdqj4rqvib0mb8597ss8yidyrav0";
+ url = "mirror://gnu/binutils/binutils-2.21.1.tar.bz2";
+ sha256 = "0m7nmd7gc9d9md43wbrv65hz6lbi2crqwryzpigv19ray1lzmv6d";
};
srcGCC = fetchurl {
- url = "mirror://gcc/releases/gcc-4.6.1/gcc-core-4.6.1.tar.bz2";
- sha256 = "0bbb8f754a31f29013f6e9ad4c755d92bb0f154a665c4b623e86ae7174d98e33";
+ url = "mirror://gcc/releases/gcc-4.6.3/gcc-core-4.6.3.tar.bz2";
+ sha256 = "1hai090f0svf886nyhn4glmfw54v9lz88w2izkx5iqhd3j400gi8";
+ };
+
+ srcGCCGPP = fetchurl {
+ url = "mirror://gcc/releases/gcc-4.6.3/gcc-g++-4.6.3.tar.bz2";
+ sha256 = "1s199gb6p65r5k69cdfqqcz5hgifw9bhyj65n2b91s80x4rwgq5k";
};
srcAVRLibc = fetchurl {
@@ -55,10 +60,11 @@ stdenv.mkDerivation {
cd $TMP
tar jxf $srcGCC
+ tar jxf $srcGCCGPP
cd gcc-*
mkdir obj-avr
cd obj-avr
- ../configure --target=avr --prefix="$prefix" --disable-nls --enable-languages=c --disable-libssp --with-dwarf2
+ ../configure --target=avr --prefix="$prefix" --disable-nls --enable-languages=c,c++ --disable-libssp --with-dwarf2
make $MAKE_FLAGS
make install
diff --git a/pkgs/development/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml
similarity index 100%
rename from pkgs/development/androidenv/addon.xml
rename to pkgs/development/mobile/androidenv/addon.xml
diff --git a/pkgs/development/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix
similarity index 100%
rename from pkgs/development/androidenv/addons.nix
rename to pkgs/development/mobile/androidenv/addons.nix
diff --git a/pkgs/development/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
similarity index 100%
rename from pkgs/development/androidenv/androidsdk.nix
rename to pkgs/development/mobile/androidenv/androidsdk.nix
diff --git a/pkgs/development/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix
similarity index 100%
rename from pkgs/development/androidenv/build-app.nix
rename to pkgs/development/mobile/androidenv/build-app.nix
diff --git a/pkgs/development/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
similarity index 100%
rename from pkgs/development/androidenv/default.nix
rename to pkgs/development/mobile/androidenv/default.nix
diff --git a/pkgs/development/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix
similarity index 100%
rename from pkgs/development/androidenv/emulate-app.nix
rename to pkgs/development/mobile/androidenv/emulate-app.nix
diff --git a/pkgs/development/androidenv/generate-addons.sh b/pkgs/development/mobile/androidenv/generate-addons.sh
similarity index 100%
rename from pkgs/development/androidenv/generate-addons.sh
rename to pkgs/development/mobile/androidenv/generate-addons.sh
diff --git a/pkgs/development/androidenv/generate-addons.xsl b/pkgs/development/mobile/androidenv/generate-addons.xsl
similarity index 100%
rename from pkgs/development/androidenv/generate-addons.xsl
rename to pkgs/development/mobile/androidenv/generate-addons.xsl
diff --git a/pkgs/development/androidenv/generate-platforms.sh b/pkgs/development/mobile/androidenv/generate-platforms.sh
similarity index 100%
rename from pkgs/development/androidenv/generate-platforms.sh
rename to pkgs/development/mobile/androidenv/generate-platforms.sh
diff --git a/pkgs/development/androidenv/generate-platforms.xsl b/pkgs/development/mobile/androidenv/generate-platforms.xsl
similarity index 100%
rename from pkgs/development/androidenv/generate-platforms.xsl
rename to pkgs/development/mobile/androidenv/generate-platforms.xsl
diff --git a/pkgs/development/androidenv/generate-sysimages.sh b/pkgs/development/mobile/androidenv/generate-sysimages.sh
similarity index 100%
rename from pkgs/development/androidenv/generate-sysimages.sh
rename to pkgs/development/mobile/androidenv/generate-sysimages.sh
diff --git a/pkgs/development/androidenv/generate-sysimages.xsl b/pkgs/development/mobile/androidenv/generate-sysimages.xsl
similarity index 100%
rename from pkgs/development/androidenv/generate-sysimages.xsl
rename to pkgs/development/mobile/androidenv/generate-sysimages.xsl
diff --git a/pkgs/development/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix
similarity index 100%
rename from pkgs/development/androidenv/platform-tools.nix
rename to pkgs/development/mobile/androidenv/platform-tools.nix
diff --git a/pkgs/development/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix
similarity index 100%
rename from pkgs/development/androidenv/platforms-linux.nix
rename to pkgs/development/mobile/androidenv/platforms-linux.nix
diff --git a/pkgs/development/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix
similarity index 100%
rename from pkgs/development/androidenv/platforms-macosx.nix
rename to pkgs/development/mobile/androidenv/platforms-macosx.nix
diff --git a/pkgs/development/androidenv/repository-7.xml b/pkgs/development/mobile/androidenv/repository-7.xml
similarity index 100%
rename from pkgs/development/androidenv/repository-7.xml
rename to pkgs/development/mobile/androidenv/repository-7.xml
diff --git a/pkgs/development/androidenv/support.nix b/pkgs/development/mobile/androidenv/support.nix
similarity index 100%
rename from pkgs/development/androidenv/support.nix
rename to pkgs/development/mobile/androidenv/support.nix
diff --git a/pkgs/development/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix
similarity index 100%
rename from pkgs/development/androidenv/sysimages.nix
rename to pkgs/development/mobile/androidenv/sysimages.nix
diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
new file mode 100644
index 000000000000..0fd4929bda76
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -0,0 +1,87 @@
+{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
+}:
+
+assert (release && target == "android") -> androidKeyStore != null && androidKeyAlias != null && androidKeyStorePassword != null;
+assert (release && target == "iphone") -> iosKeyFile != null && iosCertificateName != null && iosCertificate != null && iosCertificatePassword != null;
+
+let
+ androidsdkComposition = androidsdk {
+ platformVersions = androidPlatformVersions;
+ useGoogleAPIs = true;
+ };
+in
+stdenv.mkDerivation {
+ inherit name src;
+
+ buildInputs = [] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper;
+
+ buildPhase = ''
+ export HOME=$TMPDIR
+
+ mkdir -p $out
+
+ ${if target == "android" then
+ if release then
+ "${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}"
+
+ else if target == "iphone" then
+ 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
+
+ security delete-keychain $keychainName
+ ''
+ else
+ ''
+ # Copy all sources to the output store directory.
+ # Why? Debug application include *.js files, which are symlinked into their
+ # sources. If they are not copied, we have dangling references to the
+ # temp folder.
+
+ cp -av * $out
+ cd $out
+ ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py build 6.0 $(pwd) ${appId} ${name}
+ ''
+
+ else throw "Target: ${target} is not supported!"}
+ '';
+
+ installPhase = ''
+ mkdir -p $out
+
+ ${if target == "android" && release then ""
+ else
+ if target == "android" then
+ ''cp $(ls build/android/bin/*.apk | grep -v '\-unsigned.apk') $out''
+ else if target == "iphone" && release then
+ "cp -av build/iphone/build/* $out"
+ else if target == "iphone" then ""
+ else throw "Target: ${target} is not supported!"}
+ '';
+}
diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix
new file mode 100644
index 000000000000..8117b452d70b
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/default.nix
@@ -0,0 +1,18 @@
+{pkgs, pkgs_i686}:
+
+rec {
+ androidenv = pkgs.androidenv;
+
+ xcodeenv = if pkgs.stdenv.system == "x86_64-darwin" then pkgs.xcodeenv else null;
+
+ titaniumsdk = import ./titaniumsdk.nix {
+ inherit (pkgs) stdenv fetchurl unzip makeWrapper python jdk;
+ };
+
+ buildApp = import ./build-app.nix {
+ inherit (pkgs) stdenv;
+ inherit (androidenv) androidsdk;
+ inherit (xcodeenv) xcodewrapper;
+ inherit titaniumsdk;
+ };
+}
diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix
new file mode 100644
index 000000000000..1526d4c43590
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/examples/default.nix
@@ -0,0 +1,38 @@
+let
+ pkgs = import {};
+ pkgs_i686 = import { system = "i686-linux"; };
+in
+rec {
+ titaniumenv = import ./.. {
+ inherit pkgs pkgs_i686;
+ };
+
+ kitchensink_android = import ./kitchensink {
+ inherit titaniumenv;
+ inherit (pkgs) fetchgit;
+ target = "android";
+ };
+
+ kitchensink_iphone = import ./kitchensink {
+ inherit titaniumenv;
+ inherit (pkgs) fetchgit;
+ target = "iphone";
+ };
+
+ emulate_kitchensink = import ./emulate-kitchensink {
+ inherit (titaniumenv) androidenv;
+ kitchensink = kitchensink_android;
+ };
+
+ simulate_kitchensink_iphone = import ./simulate-kitchensink {
+ inherit (titaniumenv) xcodeenv;
+ kitchensink = kitchensink_iphone;
+ device = "iPhone";
+ };
+
+ simulate_kitchensink_ipad = import ./simulate-kitchensink {
+ inherit (titaniumenv) xcodeenv;
+ kitchensink = kitchensink_iphone;
+ device = "iPad";
+ };
+}
diff --git a/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix
new file mode 100644
index 000000000000..817aa5ab37f5
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix
@@ -0,0 +1,10 @@
+{androidenv, kitchensink}:
+
+androidenv.emulateApp {
+ name = "kitchensink";
+ app = kitchensink;
+ platformVersion = "8";
+ useGoogleAPIs = true;
+ package = "com.appcelerator.kitchensink";
+ activity = "KitchensinkActivity";
+}
diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
new file mode 100644
index 000000000000..8e2b1df264a6
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
@@ -0,0 +1,24 @@
+{titaniumenv, fetchgit, target, androidPlatformVersions ? [ "8" ]}:
+
+titaniumenv.buildApp {
+ name = "KitchenSink";
+ appId = "com.appcelerator.kitchensink";
+ src = fetchgit {
+ url = https://github.com/appcelerator/KitchenSink.git;
+ rev = "0f2c0b818034cc4e6867f0aa2afc98bf77dbff02";
+ sha256 = "de31496cfb5625d7a193bbbc32a8021e4094ffab20ae13ef2e1583b0394d7c60";
+ };
+
+ inherit target androidPlatformVersions;
+
+ /*release = true;
+ androidKeyStore = /home/sander/keystore;
+ androidKeyAlias = "sander";
+ androidKeyStorePassword = "foobar";*/
+
+ /*release = true;
+ iosKeyFile = /Users/sander/Downloads/profile.mobileprovision;
+ iosCertificateName = "My Company";
+ iosCertificate = /Users/sander/Downloads/c.p12;
+ iosCertificatePassword = "";*/
+}
diff --git a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix
new file mode 100644
index 000000000000..70ec534f6ae2
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix
@@ -0,0 +1,8 @@
+{xcodeenv, kitchensink, device}:
+
+xcodeenv.simulateApp {
+ name = "kitchensink";
+ app = kitchensink;
+ inherit device;
+ baseDir = "build/iphone/build/Debug-iphonesimulator";
+}
diff --git a/pkgs/development/mobile/titaniumenv/fixnativelibs.sed b/pkgs/development/mobile/titaniumenv/fixnativelibs.sed
new file mode 100644
index 000000000000..76b330136b66
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/fixnativelibs.sed
@@ -0,0 +1 @@
+s|\t\t\t\t\t\t\t\tapk_zip.write(native_lib, path_in_zip)|\t\t\t\t\t\t\t\tinfo = zipfile.ZipInfo(path_in_zip)\n\t\t\t\t\t\t\t\tinfo.compress_type = zipfile.ZIP_DEFLATED\n\t\t\t\t\t\t\t\tinfo.create_system = 3\n\t\t\t\t\t\t\t\tf = open(native_lib)\n\t\t\t\t\t\t\t\tapk_zip.writestr(info, f.read())\n\t\t\t\t\t\t\t\tf.close()|
diff --git a/pkgs/development/mobile/titaniumenv/fixselfruntimev8.sed b/pkgs/development/mobile/titaniumenv/fixselfruntimev8.sed
new file mode 100644
index 000000000000..c849aaa611c6
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/fixselfruntimev8.sed
@@ -0,0 +1 @@
+s|apk_zip.write(os.path.join(lib_source_dir, fname), lib_dest_dir + fname)|info = zipfile.ZipInfo(lib_dest_dir + fname)\n\t\t\t\t\tinfo.compress_type = zipfile.ZIP_DEFLATED\n\t\t\t\t\tinfo.create_system = 3\n\t\t\t\t\tf = open(os.path.join(lib_source_dir, fname))\n\t\t\t\t\tapk_zip.writestr(info, f.read())\n\t\t\t\t\tf.close()|
diff --git a/pkgs/development/mobile/titaniumenv/fixtiverify.sed b/pkgs/development/mobile/titaniumenv/fixtiverify.sed
new file mode 100644
index 000000000000..8e1114769c89
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/fixtiverify.sed
@@ -0,0 +1 @@
+s|apk_zip.write(os.path.join(lib_source_dir, 'libtiverify.so'), lib_dest_dir + 'libtiverify.so')|info = zipfile.ZipInfo(lib_dest_dir + 'libtiverify.so')\n\t\t\tinfo.compress_type = zipfile.ZIP_DEFLATED\n\t\t\tinfo.create_system = 3\n\t\t\tf = open(os.path.join(lib_source_dir, 'libtiverify.so'))\n\t\t\tapk_zip.writestr(info, f.read())\n\t\t\tf.close()|
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix
new file mode 100644
index 000000000000..5e1943b1bdc0
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix
@@ -0,0 +1,57 @@
+{stdenv, fetchurl, unzip, makeWrapper, python, jdk}:
+
+stdenv.mkDerivation {
+ name = "titanium-mobilesdk-2.1.5.v20121112144658";
+ src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
+ url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.5.v20121112144658-linux.zip;
+ sha1 = "79f073d11ee893c508c5aa675a3126501dd385fd";
+ }
+ else if stdenv.system == "x86_64-darwin" then fetchurl {
+ url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.5.v20121112144658-osx.zip;
+ sha1 = "6a9a726882222d1615de332aa1ca608c15564e1c";
+ }
+ else throw "Platform: ${stdenv.system} not supported!";
+
+ buildInputs = [ unzip makeWrapper ];
+
+ buildCommand = ''
+ mkdir -p $out
+ cd $out
+ yes y | unzip $src
+
+ # Fix shebang header for python scripts
+
+ find . -name \*.py | while read i
+ do
+ sed -i -e "s|#!/usr/bin/env python|#!${python}/bin/python|" $i
+ done
+
+ # Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that
+ # Yes, I know it's nasty :-)
+
+ cd mobilesdk/*/*/android
+
+ sed -i -f ${./fixtiverify.sed} builder.py
+ sed -i -f ${./fixselfruntimev8.sed} builder.py
+ sed -i -f ${./fixnativelibs.sed} builder.py
+
+ # Patch some executables
+
+ ${if stdenv.system == "i686-linux" then
+ ''
+ patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 titanium_prep.linux32
+ ''
+ else if stdenv.system == "x86_64-linux" then
+ ''
+ patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
+ ''
+ else ""}
+
+ # Wrap builder script
+
+ wrapProgram `pwd`/builder.py \
+ --prefix PYTHONPATH : ${python.modules.sqlite3}/lib/python*/site-packages \
+ --prefix PATH : ${jdk}/bin \
+ --prefix JAVA_HOME : ${jdk}
+ '';
+}
diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix
new file mode 100644
index 000000000000..3ac9e4bb9581
--- /dev/null
+++ b/pkgs/development/mobile/xcodeenv/build-app.nix
@@ -0,0 +1,92 @@
+{stdenv, xcodewrapper}:
+{ name
+, src
+, target ? null
+, configuration ? null
+, scheme ? null
+, sdk ? null
+, arch ? null
+, xcodeFlags ? ""
+, release ? false
+, codeSignIdentity ? null
+, certificateFile ? null
+, certificatePassword ? null
+, provisioningProfile ? null
+, generateIPA ? false
+, generateXCArchive ? false
+}:
+
+assert release -> codeSignIdentity != null && certificateFile != null && certificatePassword != null && provisioningProfile != null;
+
+let
+ # Set some default values here
+
+ _target = if target == null then name else target;
+ _scheme = if scheme == null then name else scheme;
+
+ _configuration = if configuration == null
+ then
+ if release then "Release" else "Debug"
+ else configuration;
+
+ _arch = if arch == null
+ then
+ if release then "armv7" else "i386"
+ else arch;
+
+ _sdk = if sdk == null
+ then
+ if release then "iphoneos6.0" else "iphonesimulator6.0"
+ else sdk;
+
+ # The following is to prevent repetition
+ deleteKeychain = "security delete-keychain $keychainName";
+in
+stdenv.mkDerivation {
+ inherit name src;
+ buildInputs = [ xcodewrapper ];
+ buildPhase = ''
+ ${stdenv.lib.optionalString release ''
+ export HOME=/Users/$(whoami)
+ keychainName="$(basename $out)"
+
+ # Create a keychain
+ security create-keychain -p "" $keychainName
+ security default-keychain -s $keychainName
+ security unlock-keychain -p "" $keychainName
+
+ # Import the certificate into the keychain
+ security import ${certificateFile} -k $keychainName -P "${certificatePassword}" -A
+
+ # Determine provisioning ID
+ PROVISIONING_PROFILE=$(grep UUID -A1 -a ${provisioningProfile} | grep -o "[-A-Z0-9]\{36\}")
+
+ if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$PROVISIONING_PROFILE.mobileprovision" ]
+ then
+ # Copy provisioning profile into the home directory
+ mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
+ cp ${provisioningProfile} "$HOME/Library/MobileDevice/Provisioning Profiles/$PROVISIONING_PROFILE.mobileprovision"
+ fi
+
+ # Check whether the identity can be found
+ security find-identity -p codesigning $keychainName
+ ''}
+
+ # Do the building
+ xcodebuild -target ${_target} -configuration ${_configuration} -scheme ${_scheme} -sdk ${_sdk} -arch ${_arch} ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateXCArchive then "archive" else ""} ${xcodeFlags} ${if release then ''"CODE_SIGN_IDENTITY=${codeSignIdentity}" PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName"'' else ""}
+
+ ${stdenv.lib.optionalString release ''
+ ${stdenv.lib.optionalString generateIPA ''
+ # Produce an IPA file
+ xcrun -sdk iphoneos PackageApplication -v $out/*.app -o $out/${name}.ipa
+ ''}
+
+ # Delete our temp keychain
+ ${deleteKeychain}
+ ''}
+ '';
+
+ failureHook = stdenv.lib.optionalString release deleteKeychain;
+
+ installPhase = "true";
+}
diff --git a/pkgs/development/mobile/xcodeenv/default.nix b/pkgs/development/mobile/xcodeenv/default.nix
new file mode 100644
index 000000000000..7f834688e636
--- /dev/null
+++ b/pkgs/development/mobile/xcodeenv/default.nix
@@ -0,0 +1,15 @@
+{stdenv}:
+
+rec {
+ xcodewrapper = import ./xcodewrapper.nix {
+ inherit stdenv;
+ };
+
+ buildApp = import ./build-app.nix {
+ inherit stdenv xcodewrapper;
+ };
+
+ simulateApp = import ./simulate-app.nix {
+ inherit stdenv xcodewrapper;
+ };
+}
diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix
new file mode 100644
index 000000000000..456732abe1f4
--- /dev/null
+++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix
@@ -0,0 +1,17 @@
+{stdenv, xcodewrapper}:
+{name, app, device ? "iPhone", baseDir ? ""}:
+
+stdenv.mkDerivation {
+ inherit name;
+ buildCommand = ''
+ ensureDir $out/bin
+ cat > $out/bin/run-test-simulator << "EOF"
+ #! ${stdenv.shell} -e
+
+ cd ${app}/${baseDir}/${name}.app
+ "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication ./${name} -SimulateDevice '${device}'
+ EOF
+ chmod +x $out/bin/run-test-simulator
+ '';
+}
+
diff --git a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix
new file mode 100644
index 000000000000..39804b1a248b
--- /dev/null
+++ b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix
@@ -0,0 +1,24 @@
+{stdenv}:
+
+let
+ version = "4.5.2";
+in
+stdenv.mkDerivation {
+ name = "xcode-wrapper-"+version;
+ buildCommand = ''
+ ensureDir $out/bin
+ cd $out/bin
+ ln -s /usr/bin/xcode-select
+ ln -s /usr/bin/xcodebuild
+ ln -s /usr/bin/xcrun
+ ln -s /usr/bin/security
+ ln -s "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone Simulator.app/Contents/MacOS/iPhone Simulator"
+
+ # Check if we have the xcodebuild version that we want
+ if [ -z "$($out/bin/xcodebuild -version | grep ${version})" ]
+ then
+ echo "We require xcodebuild version: ${version}"
+ exit 1
+ fi
+ '';
+}
diff --git a/pkgs/development/tools/haskell/SourceGraph/default.nix b/pkgs/development/tools/haskell/SourceGraph/default.nix
index 382a940408f4..f5d43a7ab50f 100644
--- a/pkgs/development/tools/haskell/SourceGraph/default.nix
+++ b/pkgs/development/tools/haskell/SourceGraph/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "SourceGraph";
- version = "0.7.0.3";
- sha256 = "04bx7przxha38n9vckcxz3mbcxcws5ifbc1xfm0rg6bn8rym78yb";
+ version = "0.7.0.4";
+ sha256 = "1rxbanvw1dpdnpmrf5gpl12gn9796yq89dnmdxy56mb9qzsm7nm6";
isLibrary = false;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix
index bb6d64e54f08..4cbd57a8c5f9 100644
--- a/pkgs/development/tools/haskell/hlint/default.nix
+++ b/pkgs/development/tools/haskell/hlint/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hlint";
- version = "1.8.39";
- sha256 = "009qf441nri8pxzz22xvpz44dhspr9bkh5diaz29abimj10fm375";
+ version = "1.8.40";
+ sha256 = "18w4dhxv7c1y4x1agdjq99ss5i77jnm8p9vg3jp9gvhk2arhcl0x";
isLibrary = true;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/tools/haskell/splot/default.nix b/pkgs/development/tools/haskell/splot/default.nix
index 9f35054b4c01..4bd47b8decd4 100644
--- a/pkgs/development/tools/haskell/splot/default.nix
+++ b/pkgs/development/tools/haskell/splot/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "splot";
- version = "0.3.6";
- sha256 = "0fxjji6b0v3hf4pn1cbh88nvp4n4bfgfkiga6l149flk5nmlapqx";
+ version = "0.3.8";
+ sha256 = "188v9c070wn6gr47k5q55gsiph0lj96d96bss76gz7znknfj9rm3";
isLibrary = false;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/tools/haskell/timeplot/default.nix b/pkgs/development/tools/haskell/timeplot/default.nix
index ffdfa7869e04..d95c8cea03f3 100644
--- a/pkgs/development/tools/haskell/timeplot/default.nix
+++ b/pkgs/development/tools/haskell/timeplot/default.nix
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "timeplot";
- version = "1.0.18";
- sha256 = "1q4kzzqmr7bx97wfaasrkzii6b9zpxcxggshpsjv02bwb1hazxmc";
+ version = "1.0.19";
+ sha256 = "1mwhrcjavx56z3msdf5zqvqlx5m3hbcw85f22h8p9wvfgn79aydx";
isLibrary = false;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/tools/misc/automake/automake-1.13.x.nix b/pkgs/development/tools/misc/automake/automake-1.13.x.nix
new file mode 100644
index 000000000000..3556b4f47aad
--- /dev/null
+++ b/pkgs/development/tools/misc/automake/automake-1.13.x.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }:
+
+stdenv.mkDerivation rec {
+ name = "automake-1.13.1";
+
+ src = fetchurl {
+ url = "mirror://gnu/automake/${name}.tar.xz";
+ sha256 = "12yi1bzkipi7qdmkdy77pazljsa9z7q66hi6c4rq73p7hbv6rkbf";
+ };
+
+ buildInputs = [ perl autoconf ];
+
+ setupHook = ./setup-hook.sh;
+
+ # Disable indented log output from Make, otherwise "make.test" will
+ # fail.
+ preCheck = "unset NIX_INDENT_MAKE";
+ inherit doCheck;
+
+ # The test suite can run in parallel.
+ enableParallelBuilding = true;
+
+ # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
+ # "fixed" path in generated files!
+ dontPatchShebangs = true;
+
+ meta = {
+ homepage = "http://www.gnu.org/software/automake/";
+ description = "GNU Automake, a GNU standard-compliant makefile generator";
+ license = "GPLv2+";
+
+ longDescription = ''
+ GNU Automake is a tool for automatically generating
+ `Makefile.in' files compliant with the GNU Coding
+ Standards. Automake requires the use of Autoconf.
+ '';
+
+ maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
+ };
+}
diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix
index a46c7a695f21..565d7835f05d 100644
--- a/pkgs/development/tools/misc/distcc/default.nix
+++ b/pkgs/development/tools/misc/distcc/default.nix
@@ -1,46 +1,77 @@
-{ stdenv, fetchurl, popt, avahi, pkgconfig, python, gtk
+{ stdenv, fetchurl, popt, avahi, pkgconfig, python, gtk, runCommand, gcc
, sysconfDir ? "" # set this parameter to override the default value $out/etc
, static ? false
}:
-let name = "distcc";
- version = "3.1";
+let
+ name = "distcc";
+ version = "3.1";
+ distcc = stdenv.mkDerivation {
+ name = "${name}-${version}";
+ src = fetchurl {
+ url = "http://distcc.googlecode.com/files/${name}-${version}.tar.bz2";
+ sha256 = "f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89";
+ };
+
+ buildInputs = [popt avahi pkgconfig python gtk];
+ preConfigure =
+ ''
+ configureFlagsArray=( CFLAGS="-O2 -fno-strict-aliasing"
+ CXXFLAGS="-O2 -fno-strict-aliasing"
+ --mandir=$out/share/man
+ ${if sysconfDir == "" then "" else "--sysconfdir=${sysconfDir}"}
+ ${if static then "LDFLAGS=-static" else ""}
+ --with${if static == true || popt == null then "" else "out"}-included-popt
+ --with${if avahi != null then "" else "out"}-avahi
+ --with${if gtk != null then "" else "out"}-gtk
+ --without-gnome
+ --enable-rfc2553
+ --disable-Werror # a must on gcc 4.6
+ )
+ installFlags="sysconfdir=$out/etc";
+ '';
+ patches = [ ./20-minute-io-timeout.patch ];
+
+ # The test suite fails because it uses hard-coded paths, i.e. /usr/bin/gcc.
+ doCheck = false;
+
+ passthru = {
+ # A derivation that provides gcc and g++ commands, but that
+ # will end up calling distcc for the given cacheDir
+ #
+ # extraConfig is meant to be sh lines exporting environment
+ # variables like DISTCC_HOSTS, DISTCC_DIR, ...
+ links = extraConfig : (runCommand "distcc-links"
+ { inherit (gcc) langC langCC; }
+ ''
+ mkdir -p $out/bin
+ if [ $langC -eq 1 ]; then
+ cat > $out/bin/gcc << EOF
+ #!/bin/sh
+ ${extraConfig}
+ exec ${distcc}/bin/distcc gcc "\$@"
+ EOF
+ chmod +x $out/bin/gcc
+ fi
+ if [ $langCC -eq 1 ]; then
+ cat > $out/bin/g++ << EOF
+ #!/bin/sh
+ ${extraConfig}
+ exec ${distcc}/bin/distcc g++ "\$@"
+ EOF
+ chmod +x $out/bin/g++
+ fi
+ '');
+ };
+
+ meta = {
+ description = "a fast, free distributed C/C++ compiler";
+ homepage = "http://distcc.org";
+ license = "GPL";
+
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.simons ];
+ };
+ };
in
-
-stdenv.mkDerivation {
- name = "${name}-${version}";
- src = fetchurl {
- url = "http://distcc.googlecode.com/files/${name}-${version}.tar.bz2";
- sha256 = "f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89";
- };
-
- buildInputs = [popt avahi pkgconfig python gtk];
- preConfigure =
- ''
- configureFlagsArray=( CFLAGS="-O2 -fno-strict-aliasing"
- CXXFLAGS="-O2 -fno-strict-aliasing"
- --mandir=$out/share/man
- ${if sysconfDir == "" then "" else "--sysconfdir=${sysconfDir}"}
- ${if static then "LDFLAGS=-static" else ""}
- --with${if static == true || popt == null then "" else "out"}-included-popt
- --with${if avahi != null then "" else "out"}-avahi
- --with${if gtk != null then "" else "out"}-gtk
- --without-gnome
- --enable-rfc2553
- )
- installFlags="sysconfdir=$out/etc";
- '';
- patches = [ ./20-minute-io-timeout.patch ];
-
- # The test suite fails because it uses hard-coded paths, i.e. /usr/bin/gcc.
- doCheck = false;
-
- meta = {
- description = "a fast, free distributed C/C++ compiler";
- homepage = "http://distcc.org";
- license = "GPL";
-
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.simons ];
- };
-}
+ distcc
diff --git a/pkgs/development/tools/misc/distcc/masq.nix b/pkgs/development/tools/misc/distcc/masq.nix
new file mode 100644
index 000000000000..117480670c39
--- /dev/null
+++ b/pkgs/development/tools/misc/distcc/masq.nix
@@ -0,0 +1,41 @@
+{ stdenv, gccRaw, binutils }:
+
+stdenv.mkDerivation {
+ name = "distcc-masq-${gccRaw.name}";
+
+ phases = [ "installPhase" ];
+ installPhase = ''
+ ensureDir $out/bin
+
+ bin=${gccRaw}/bin
+
+ shopt -s nullglob
+ if [ -f $bin/gcc ]; then
+ ln -s $bin/gcc $out/bin
+ else
+ for a in $bin/*-gcc; do
+ ln -s $bin/*-gcc $out/bin/gcc
+ ln -s $bin/*-gcc $out/bin/cc
+ done
+ fi
+
+ if [ -f $bin/g++ ]; then
+ ln -s $bin/g++ $out/bin
+ else
+ for a in $bin/*-g++; do
+ ln -sf $bin/*-g++ $out/bin/g++
+ ln -sf $bin/*-g++ $out/bin/c++
+ done
+ fi
+
+ bbin=${binutils}/bin
+ if [ -f $bbin/as ]; then
+ ln -s $bbin/as $out/bin
+ else
+ for a in $bbin/*-as; do
+ ln -sf $bbin/*-as $out/bin/as
+ done
+ fi
+
+ '';
+}
diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix
index 154561e27e1e..b6750f889373 100644
--- a/pkgs/development/tools/profiling/sysprof/default.nix
+++ b/pkgs/development/tools/profiling/sysprof/default.nix
@@ -1,44 +1,24 @@
-{ fetchurl, stdenv, kernel, binutils
+{ fetchurl, stdenv, binutils
, pkgconfig, gtk, glib, pango, libglade }:
stdenv.mkDerivation rec {
- name = "sysprof-1.0.12-${kernel.version}";
+ name = "sysprof-1.2.0";
src = fetchurl {
- url = "http://www.daimi.au.dk/~sandmann/sysprof/sysprof-1.0.12.tar.gz";
- sha256 = "0f0z1dh97swlrkw3cbv5k2jhy5rk7wxv55hp7yhysw3idgp8wbmz";
+ url = "http://www.sysprof.com/sysprof-1.2.0.tar.gz";
+ sha256 = "1wb4d844rsy8qjg3z5m6rnfm72da4xwzrrkkb1q5r10sq1pkrw5s";
};
buildInputs = [ binutils pkgconfig gtk glib pango libglade ];
- patches = [ ./configure.patch ];
-
- preConfigure = ''
- kernelVersion=$(cd "${kernel}/lib/modules" && echo *)
- echo "assuming Linux kernel version \`$kernelVersion'"
-
- sed -i "module/Makefile" \
- -e"s|^[[:blank:]]*KDIR[[:blank:]]*:=.*$|KDIR := ${kernel}/lib/modules/$kernelVersion/build|g ;
- s|\$(KMAKE) modules_install|install sysprof-module.ko $out/share/sysprof/module|g ;
- s|\\[ -e /sbin/depmod.*$|true|g"
-
- # XXX: We won't run `depmod' after installing the module.
- '';
-
- configureFlags = "--enable-kernel-module";
-
- preInstall = ''
- mkdir -p "$out/share/sysprof/module"
- '';
-
meta = {
- homepage = http://www.daimi.au.dk/~sandmann/sysprof/;
+ homepage = http://sysprof.com/;
description = "Sysprof, a system-wide profiler for Linux";
license = "GPLv2+";
longDescription = ''
- Sysprof is a sampling CPU profiler for Linux that uses a kernel
- module to profile the entire system, not just a single
+ Sysprof is a sampling CPU profiler for Linux that uses the perf_event_open
+ system call to profile the entire system, not just a single
application. Sysprof handles shared libraries and applications
do not need to be recompiled. In fact they don't even have to
be restarted.
diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 48d1c3069932..533411b92de3 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
"--shared-v8-libpath=${v8}/lib"
];
- patches = stdenv.lib.optional stdenv.isDarwin ./no-arch-flag.patch;
+ #patches = stdenv.lib.optional stdenv.isDarwin ./no-arch-flag.patch;
prePatch = ''
sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf} configure
diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
new file mode 100644
index 000000000000..d2e438dfa7b1
--- /dev/null
+++ b/pkgs/games/anki/default.nix
@@ -0,0 +1,67 @@
+{ stdenv, lib, fetchurl
+, python, pyqt4, pythonPackages
+# This little flag adds a huge number of dependencies, but we assume that
+# everyone wants Anki to draw plots with statistics by default.
+, plotsSupport ? true }:
+
+let
+ py = pythonPackages;
+in
+
+stdenv.mkDerivation rec {
+ name = "anki-2.0.3";
+ src = fetchurl {
+ url = "http://ankisrs.net/download/mirror/${name}.tgz";
+ sha256 = "f40ee4ef29c91101cf9978ce7bd4c513f13ca7c77497a3fb50b8128adf3a5178";
+ };
+
+ pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy ]
+ ++ lib.optional plotsSupport py.matplotlib;
+
+ buildInputs = [ python py.wrapPython ];
+
+ preConfigure = ''
+ substituteInPlace anki \
+ --replace /usr/share/ $out/share/
+
+ substituteInPlace Makefile \
+ --replace PREFIX=/usr PREFIX=$out \
+ --replace /local/bin/ /bin/
+
+ sed -i '/xdg-mime/ d' Makefile
+ '';
+
+ preInstall = ''
+ mkdir -p $out/bin
+ mkdir -p $out/share/pixmaps
+ mkdir -p $out/share/applications
+ mkdir -p $out/share/man/man1
+ '';
+
+ postInstall = ''
+ wrapPythonPrograms
+ '';
+
+ meta = {
+ homepage = http://ankisrs.net/;
+ description = "Spaced repetition flashcard program";
+ # Copy-pasted from the homepage
+ longDescription = ''
+ Anki is a program which makes remembering things easy. Because it is a lot
+ more efficient than traditional study methods, you can either greatly
+ decrease your time spent studying, or greatly increase the amount you learn.
+
+ Anyone who needs to remember things in their daily life can benefit from
+ Anki. Since it is content-agnostic and supports images, audio, videos and
+ scientific markup (via LaTeX), the possibilities are endless. For example:
+
+ * learning a language
+ * studying for medical and law exams
+ * memorizing people's names and faces
+ * brushing up on geography
+ * mastering long poems
+ * even practicing guitar chords!
+ '';
+ license = "GPLv3";
+ };
+}
diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index d0ba6b8b6a55..b065a50ce004 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -37,6 +37,7 @@
sander = "Sander van der Burg ";
shlevy = "Shea Levy ";
simons = "Peter Simons ";
+ smironov = "Sergey Mironov ";
thammers = "Tobias Hammerschmidt ";
urkud = "Yury G. Kudryashov ";
viric = "Lluís Batlle i Rossell ";
diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix
index 6bc2e0f1ecb3..1cb1185b8bb8 100644
--- a/pkgs/lib/types.nix
+++ b/pkgs/lib/types.nix
@@ -11,7 +11,7 @@ with import ./trivial.nix;
rec {
hasType = x: isAttrs x && x ? _type;
- typeOf = x: if hasType x then x._type else "";
+ typeOf = x: x._type or "";
setType = typeName: value: value // {
_type = typeName;
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index 8e6d22dd76ae..f4968158dd28 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/wine/${name}.tar.bz2";
- sha256 = "08qhjqia2g6pm5rnawcvfz64pm2pmjaxafmwdyn950rdwrd7kbai";
+ sha256 = "0l5kr3iq1lkv3gcw8ljzfjcfnsh9b5crdd4i0dzwdk1i3bfw2xxc";
};
gecko = fetchurl {
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = {
- version = "1.5.19";
+ version = "1.5.21";
homepage = "http://www.winehq.org/";
license = "LGPL";
description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix
index 0e2df1e25fb0..39ba5dc3973e 100644
--- a/pkgs/os-specific/linux/atop/default.nix
+++ b/pkgs/os-specific/linux/atop/default.nix
@@ -1,12 +1,12 @@
{stdenv, fetchurl, zlib, ncurses}:
stdenv.mkDerivation rec {
- version = "1.27-3";
+ version = "2.0.2";
name = "atop-${version}";
src = fetchurl {
url = "http://www.atoptool.nl/download/atop-${version}.tar.gz";
- sha256 = "bce36e0b50f0e03995d86d25dbc9ab4a289f6755ce3558844f96d41b0bba563f";
+ sha256 = "029lfa2capz1lg3m3rnyrgb8v6jm4znin84vjh2f0zkwvvhdn856";
};
buildInputs = [zlib ncurses];
diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix
index 9e762f649041..6d612f8cdbdc 100644
--- a/pkgs/os-specific/linux/cryptsetup/default.nix
+++ b/pkgs/os-specific/linux/cryptsetup/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, devicemapper, libgcrypt, libuuid, pkgconfig, popt }:
stdenv.mkDerivation rec {
- name = "cryptsetup-1.5.0";
+ name = "cryptsetup-1.5.1";
src = fetchurl {
url = "http://cryptsetup.googlecode.com/files/${name}.tar.bz2";
- sha256 = "1l7qcmaq092k28k8sbw845hs6jwn0f05h68rmb7iwh52232m8wa0";
+ sha256 = "0dib3nw6ifd7d7hr9k4iyaha3hz0pkzairqa38l3fndkr9w3zlhn";
};
configureFlags = "--enable-cryptsetup-reencrypt";
diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index 8a3a6ba47e33..212a86f36a3c 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -237,7 +237,7 @@ in
import ./generic.nix (
rec {
- version = "3.2.35";
+ version = "3.2.36";
testing = false;
modDirVersion = version;
@@ -248,7 +248,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz";
- sha256 = "0p665msvhmjmcvgravi10yyfbnvn6bm9xfhsflj61qj0frj0lzn9";
+ sha256 = "0jyla0mjh1jjk84jywyvd7n6ax27xarkllfjf991rqj32zinlnzn";
};
config = configWithPlatform stdenv.platform;
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 124c8955e26d..98a03002fc2a 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -27,19 +27,23 @@ buildPhase() {
installPhase() {
# Install libGL and friends.
- mkdir -p $out/lib
- cp -prd libcuda.* libGL.* libnvidia-cfg.* libnvidia-compiler.* libnvidia-tls.* libnvidia-glcore.* libOpenCL.* libvdpau_nvidia* tls $out/lib/
+ mkdir -p $out/lib/vendors
- ln -snf libnvidia-glcore.so.$versionNumber $out/lib/libnvidia-glcore.so
- ln -snf libnvidia-glcore.so.$versionNumber $out/lib/libnvidia-glcore.so.1
- ln -snf libGL.so.$versionNumber $out/lib/libGL.so
- ln -snf libGL.so.$versionNumber $out/lib/libGL.so.1
- ln -snf libnvidia-cfg.so.$versionNumber $out/lib/libnvidia-cfg.so.1
- ln -snf libnvidia-tls.so.$versionNumber $out/lib/libnvidia-tls.so.1
- ln -snf libnvidia-tls.so.$versionNumber $out/lib/tls/libnvidia-tls.so.1
- ln -snf libcuda.so.$versionNumber $out/lib/libcuda.so.1
- ln -snf libcuda.so.1 $out/lib/libcuda.so
- ln -snf libvdpau_nvidia.so.$versionNumber $out/lib/libvdpau_nvidia.so
+ for f in \
+ libcuda libGL libnvcuvid libnvidia-cfg libnvidia-compiler \
+ libnvidia-encode libnvidia-glcore libnvidia-ml libnvidia-opencl \
+ libnvidia-tls libOpenCL libnvidia-tls libvdpau_nvidia
+ do
+ cp -prd $f.* $out/lib/
+ ln -snf $f.so.$versionNumber $out/lib/$f.so
+ ln -snf $f.so.$versionNumber $out/lib/$f.so.1
+ done
+
+ cp -p nvidia.icd $out/lib/vendors/
+ cp -prd tls $out/lib/
+ cp -prd libOpenCL.so.1.0.0 $out/lib/
+ ln -snf libOpenCL.so.1.0.0 $out/lib/libOpenCL.so
+ ln -snf libOpenCL.so.1.0.0 $out/lib/libOpenCL.so.1
patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.*
patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.*
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index c31fc456d44f..5943a231a85d 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, kernel, perl, autoconf, automake, libtool, coreutils, gawk }:
stdenv.mkDerivation {
- name = "spl-0.6.0-rc12-${kernel.version}";
+ name = "spl-0.6.0-rc13-${kernel.version}";
src = fetchurl {
- url = http://github.com/downloads/zfsonlinux/spl/spl-0.6.0-rc12.tar.gz;
- sha256 = "166853pqa294f78mn4j4x9pri79lyv3j2h8m9fzhfy7d7gxfqljk";
+ url = http://zfsonlinux.org/downloads/0.6.0-rc13/spl-0.6.0-rc13.tar.gz;
+ sha256 = "1frbifj1yd7pznlhsqsiksip5amx4ljvasg8h80haaxk0yvvkr9b";
};
patches = [ ./install_prefix.patch ./install_prefix_2.patch ./module_prefix.patch ];
diff --git a/pkgs/os-specific/linux/systemd/reexec.patch b/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch
similarity index 57%
rename from pkgs/os-specific/linux/systemd/reexec.patch
rename to pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch
index ff13a44ca0b2..dda9bea7674c 100644
--- a/pkgs/os-specific/linux/systemd/reexec.patch
+++ b/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch
@@ -1,10 +1,18 @@
-Make "systemctl daemon-reexec" do the right thing on NixOS.
+From 0085f49cd0ba889e3db9102f328f6044ae3a2c18 Mon Sep 17 00:00:00 2001
+From: Eelco Dolstra
+Date: Tue, 8 Jan 2013 15:44:33 +0100
+Subject: [PATCH 1/5] Make "systemctl daemon-reexec" do the right thing on
+ NixOS
+
+---
+ src/core/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/main.c b/src/core/main.c
-index 04fc0b3..0f5b0e9 100644
+index 1ee3c9c..1686f60 100644
--- a/src/core/main.c
+++ b/src/core/main.c
-@@ -1819,7 +1819,7 @@ finish:
+@@ -1858,7 +1858,7 @@ finish:
char_array_0(sfd);
i = 0;
@@ -13,3 +21,6 @@ index 04fc0b3..0f5b0e9 100644
if (switch_root_dir)
args[i++] = "--switched-root";
args[i++] = arg_running_as == SYSTEMD_SYSTEM ? "--system" : "--user";
+--
+1.8.0.1
+
diff --git a/pkgs/os-specific/linux/systemd/ignore-duplicates.patch b/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch
similarity index 58%
rename from pkgs/os-specific/linux/systemd/ignore-duplicates.patch
rename to pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch
index 764eead54eac..14795e521112 100644
--- a/pkgs/os-specific/linux/systemd/ignore-duplicates.patch
+++ b/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch
@@ -1,10 +1,17 @@
-Ignore duplicate paths in "systemctl start".
+From 2b0a9106d3aabb365af0cc34b595a1e697120f37 Mon Sep 17 00:00:00 2001
+From: Eelco Dolstra
+Date: Tue, 8 Jan 2013 15:45:01 +0100
+Subject: [PATCH 2/5] Ignore duplicate paths in "systemctl start"
+
+---
+ src/systemctl/systemctl.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index a4290c4..d3ac3ad 100644
+index 2ebfff8..9f99df5 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
-@@ -1596,8 +1596,11 @@ static int start_unit_one(
+@@ -1591,8 +1591,11 @@ static int start_unit_one(
r = set_put(s, p);
if (r < 0) {
@@ -18,3 +25,6 @@ index a4290c4..d3ac3ad 100644
}
p = NULL;
+--
+1.8.0.1
+
diff --git a/pkgs/os-specific/linux/systemd/crypt-devices-are-ready.patch b/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch
similarity index 58%
rename from pkgs/os-specific/linux/systemd/crypt-devices-are-ready.patch
rename to pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch
index 4646ed0e44ca..63de58f97d5a 100644
--- a/pkgs/os-specific/linux/systemd/crypt-devices-are-ready.patch
+++ b/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch
@@ -1,9 +1,16 @@
-Do start device units for uninitialised encrypted devices, because the
-service that initialises the filesystem depends on the appearance of
-the device unit. Also, this makes more sense to me: the device is
-ready; it's the filesystem that's not, but taking care of that is the
-responsibility of the mount unit. (However, this ignores the fsck
-unit, so it's not perfect...)
+From a013beb84f135cebf1c8c9363d5676c1c0a6be7a Mon Sep 17 00:00:00 2001
+From: Eelco Dolstra
+Date: Tue, 8 Jan 2013 15:46:30 +0100
+Subject: [PATCH 3/5] Start device units for uninitialised encrypted devices
+
+This is necessary because the NixOS service that initialises the
+filesystem depends on the appearance of the device unit. Also, this
+makes more sense to me: the device is ready; it's the filesystem
+that's not, but taking care of that is the responsibility of the mount
+unit. (However, this ignores the fsck unit, so it's not perfect...)
+---
+ rules/99-systemd.rules.in | 4 ----
+ 1 file changed, 4 deletions(-)
diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
index d17bdd9..040b10e 100644
@@ -20,3 +27,6 @@ index d17bdd9..040b10e 100644
# Ignore raid devices that are not yet assembled and started
SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", TEST!="md/array_state", ENV{SYSTEMD_READY}="0"
SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0"
+--
+1.8.0.1
+
diff --git a/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch b/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch
new file mode 100644
index 000000000000..f819d1640e83
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch
@@ -0,0 +1,74 @@
+From b40d8783f94666035baae567882c0d4be82cda01 Mon Sep 17 00:00:00 2001
+From: Eelco Dolstra
+Date: Tue, 8 Jan 2013 15:48:19 +0100
+Subject: [PATCH 4/5] Set switch-to-configuration hints for some units
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Target units like local-fs.target need ‘X-StopOnReconfiguration=yes’
+to ensure dependencies *on* that target properly take into account the
+dependencies *of* the target.
+
+‘X-RestartIfChanged=no’ is necessary for systemd-journald.service
+because restarting it causes services connected to journald to stop
+logging.
+
+‘X-RestartIfChanged=no’ is necessary for systemd-user-sessions.service
+to prevent all user sessions from being killed when this unit changes.
+---
+ units/local-fs.target | 2 ++
+ units/remote-fs.target | 2 ++
+ units/systemd-journald.service.in | 5 +++++
+ units/systemd-user-sessions.service.in | 3 +++
+ 4 files changed, 12 insertions(+)
+
+diff --git a/units/local-fs.target b/units/local-fs.target
+index dd92b17..dfcbc7b 100644
+--- a/units/local-fs.target
++++ b/units/local-fs.target
+@@ -10,3 +10,5 @@ Description=Local File Systems
+ Documentation=man:systemd.special(7)
+ OnFailure=emergency.target
+ OnFailureIsolate=yes
++
++X-StopOnReconfiguration=yes
+diff --git a/units/remote-fs.target b/units/remote-fs.target
+index 9e68878..85a53d7 100644
+--- a/units/remote-fs.target
++++ b/units/remote-fs.target
+@@ -9,5 +9,7 @@
+ Description=Remote File Systems
+ Documentation=man:systemd.special(7)
+
++X-StopOnReconfiguration=yes
++
+ [Install]
+ WantedBy=multi-user.target
+diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
+index ab2e50c..9563a7d 100644
+--- a/units/systemd-journald.service.in
++++ b/units/systemd-journald.service.in
+@@ -24,3 +24,8 @@ CapabilityBoundingSet=CAP_SYS_ADMIN CAP_DAC_OVERRIDE CAP_SYS_PTRACE CAP_SYSLOG C
+ # Increase the default a bit in order to allow many simultaneous
+ # services being run since we keep one fd open per service.
+ LimitNOFILE=16384
++
++# Don't restart journald, since that causes services connected to
++# journald to stop logging (see
++# https://bugs.freedesktop.org/show_bug.cgi?id=56043).
++X-RestartIfChanged=no
+diff --git a/units/systemd-user-sessions.service.in b/units/systemd-user-sessions.service.in
+index 0869e73..b6ed958 100644
+--- a/units/systemd-user-sessions.service.in
++++ b/units/systemd-user-sessions.service.in
+@@ -15,3 +15,6 @@ Type=oneshot
+ RemainAfterExit=yes
+ ExecStart=@rootlibexecdir@/systemd-user-sessions start
+ ExecStop=@rootlibexecdir@/systemd-user-sessions stop
++
++# Restart kills all active sessions.
++X-RestartIfChanged=no
+--
+1.8.0.1
+
diff --git a/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch b/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch
new file mode 100644
index 000000000000..54009f2e7fc7
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch
@@ -0,0 +1,33 @@
+From c5c8ac3a0420fb42ba2f629368fd5bd6ea1e753b Mon Sep 17 00:00:00 2001
+From: Eelco Dolstra
+Date: Tue, 8 Jan 2013 15:56:03 +0100
+Subject: [PATCH 5/5] sysinit.target: Drop the dependency on local-fs.target
+ and swap.target
+
+Having all services with DefaultDependencies=yes depend on
+local-fs.target is annoying, because some of those services might be
+necessary to mount local filesystems. For instance, Charon's
+send-keys feature requires sshd to be running in order to receive LUKS
+encryption keys, which in turn requires dhcpcd, and so on. So we drop
+this dependency (and swap.target as well for consistency). If
+services require a specific mount, they should use RequiresMountsFor
+in any case.
+---
+ units/sysinit.target | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/units/sysinit.target b/units/sysinit.target
+index 8f4fb8f..e0f0147 100644
+--- a/units/sysinit.target
++++ b/units/sysinit.target
+@@ -9,6 +9,5 @@
+ Description=System Initialization
+ Documentation=man:systemd.special(7)
+ Conflicts=emergency.service emergency.target
+-Wants=local-fs.target swap.target
+-After=local-fs.target swap.target emergency.service emergency.target
++After=emergency.service emergency.target
+ RefuseManualStart=yes
+--
+1.8.0.1
+
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index a207213d12d5..975a37fffce0 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -6,17 +6,19 @@
assert stdenv.gcc.libc or null != null;
stdenv.mkDerivation rec {
- name = "systemd-196";
+ name = "systemd-197";
src = fetchurl {
url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz";
- sha256 = "1gz4an5havzwzp7xsinn01prwvf51hgipb8pbciri0fxlmcadm3b";
+ sha256 = "1dbljyyc3w4a1af99f15f3sqnfx7mfmc5x5hwxb70kg23ai7x1g6";
};
patches =
- [ ./reexec.patch
- ./ignore-duplicates.patch
- ./crypt-devices-are-ready.patch
+ [ ./0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch
+ ./0002-Ignore-duplicate-paths-in-systemctl-start.patch
+ ./0003-Start-device-units-for-uninitialised-encrypted-devic.patch
+ ./0004-Set-switch-to-configuration-hints-for-some-units.patch
+ ./0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch
];
buildInputs =
@@ -27,7 +29,6 @@ stdenv.mkDerivation rec {
configureFlags =
[ "--localstatedir=/var"
"--sysconfdir=/etc"
- "--with-distro=other"
"--with-rootprefix=$(out)"
"--with-rootprefix=$(out)"
"--with-dbusinterfacedir=$(out)/share/dbus-1/interfaces"
@@ -55,6 +56,8 @@ stdenv.mkDerivation rec {
--replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/
'';
+ PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python
+
NIX_CFLAGS_COMPILE =
[ "-DKBD_LOADKEYS=\"${kbd}/bin/loadkeys\""
"-DKBD_SETFONT=\"${kbd}/bin/setfont\""
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index f947bc9a1e73..b1bc15ff0836 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, openssl, dbus_libs, pkgconfig, libnl }:
stdenv.mkDerivation rec {
- version = "1.0";
+ version = "1.1";
name = "wpa_supplicant-${version}";
src = fetchurl {
url = "http://hostap.epitest.fi/releases/${name}.tar.gz";
- sha256 = "171b9027rbzy64zaal4832ix9i3mm6ypwmynbpia5bss793ivm4i";
+ sha256 = "00lyifj8cz7qyal6dy1dxbpk3g3bywvdarik8gbj9ds7zmfbwkd5";
};
preBuild = ''
@@ -38,10 +38,11 @@ stdenv.mkDerivation rec {
mkdir -p $out/share/man/man5 $out/share/man/man8
cp -v doc/docbook/*.5 $out/share/man/man5/
cp -v doc/docbook/*.8 $out/share/man/man8/
- mkdir -p $out/etc/dbus-1/system.d $out/share/dbus-1/system-services
+ mkdir -p $out/etc/dbus-1/system.d $out/share/dbus-1/system-services $out/etc/systemd/system
cp -v dbus/*service $out/share/dbus-1/system-services
sed -e "s@/sbin/wpa_supplicant@$out&@" -i $out/share/dbus-1/system-services/*
cp -v dbus/dbus-wpa_supplicant.conf $out/etc/dbus-1/system.d
+ cp -v systemd/*.service $out/etc/systemd/system
''; # */
meta = {
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index f2b701695ffe..b83019ea87a0 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, kernel, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }:
stdenv.mkDerivation {
- name = "zfs-0.6.0-rc12-${kernel.version}";
+ name = "zfs-0.6.0-rc13-${kernel.version}";
src = fetchurl {
- url = http://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc12.tar.gz;
- sha256 = "1mipy6v63y8z3c5chn813x8c2r8mwyja1v19dvars3j85105xf1y";
+ url = http://zfsonlinux.org/downloads/0.6.0-rc13/zfs-0.6.0-rc13.tar.gz;
+ sha256 = "1kpx7sa49ir93kmlrjwjzd6v4kzmda4j9cf6bv2p4s3yrmiz3cjv";
};
patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ./no_absolute_paths_to_coreutils.patch ];
diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix
index 0fc1531056bc..39b78958b031 100644
--- a/pkgs/servers/ftp/vsftpd/default.nix
+++ b/pkgs/servers/ftp/vsftpd/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, openssl, sslEnable ? false, libcap, pam }:
stdenv.mkDerivation (rec {
- name = "vsftpd-2.3.4";
+ name = "vsftpd-3.0.2";
src = fetchurl {
- url = "ftp://vsftpd.beasts.org/users/cevans/${name}.tar.gz";
- sha256 = "0nhsqwnb8qkbxx5wjahara1ln85hp151v656psra5brpckwysrml";
+ url = "https://security.appspot.com/downloads/${name}.tar.gz";
+ sha256 = "0mjy345wszskz1vnk83360c1y37arwgap3gwz8hy13sjqpig0imy";
};
# The gcc-wrappers use -idirafter for glibc, and vsftpd also, and
@@ -14,9 +14,13 @@ stdenv.mkDerivation (rec {
sed -i -e 's/-idirafter.*//' Makefile
'';
- preBuild =''
- makeFlagsArray=( "LIBS=${if sslEnable then "-lcrypt -lssl -lcrypto " else ""}-lpam -lcap" )
- '';
+ preBuild = let
+ sslLibs = if sslEnable then "-lcrypt -lssl -lcrypto " else "";
+ in ''
+ makeFlagsArray=( "LIBS=${sslLibs}-lpam -lcap -fstack-protector" )
+ '';
+
+ # It won't link without this flag, used in CFLAGS
buildInputs = [ openssl libcap pam ];
diff --git a/pkgs/servers/nosql/redis/darwin.patch b/pkgs/servers/nosql/redis/darwin.patch
new file mode 100644
index 000000000000..002f09b36f34
--- /dev/null
+++ b/pkgs/servers/nosql/redis/darwin.patch
@@ -0,0 +1,12 @@
+diff -ru redis-2.4.7/deps/hiredis/Makefile redis-2.4.7.patched/deps/hiredis/Makefile
+--- redis-2.4.7/deps/hiredis/Makefile 2012-02-02 14:29:24.000000000 +0000
++++ redis-2.4.7.patched/deps/hiredis/Makefile 2012-12-07 17:14:43.000000000 +0000
+@@ -20,7 +20,7 @@
+ CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF)
+ CCLINK?=-lm -pthread
+ LDFLAGS?=-L. -Wl,-rpath,.
+- OBJARCH?=-arch i386 -arch x86_64
++ #OBJARCH?=-arch i386 -arch x86_64
+ DYLIBNAME?=libhiredis.dylib
+ DYLIB_MAKE_CMD?=libtool -dynamic -o ${DYLIBNAME} -lm ${DEBUG} - ${OBJ}
+ STLIBNAME?=libhiredis.a
diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix
index 08c53182dd5d..059b1c1a217d 100644
--- a/pkgs/servers/samba/default.nix
+++ b/pkgs/servers/samba/default.nix
@@ -75,4 +75,10 @@ stdenv.mkDerivation rec {
cp ../examples/LDAP/samba.schema $out/etc/openldap/schema
'' # */
+ stdenv.lib.optionalString (configDir == "") "touch $out/lib/smb.conf";
+
+ meta = {
+ homepage = http://www.samba.org/;
+ description = "The standard Windows interoperability suite of programs for Linux and Unix";
+ platforms = stdenv.lib.platforms.linux;
+ };
}
diff --git a/pkgs/tools/X11/xkb-switch/default.nix b/pkgs/tools/X11/xkb-switch/default.nix
new file mode 100644
index 000000000000..0fc49038efee
--- /dev/null
+++ b/pkgs/tools/X11/xkb-switch/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchgit, cmake, libX11 }:
+
+stdenv.mkDerivation rec {
+ name = "xkb-switch-1.2";
+
+ src = fetchgit {
+ url = https://github.com/ierton/xkb-switch.git;
+ rev = "4c90511ecf2cacc040c97f034a13254c3fa9dfef";
+ sha256 = "1jxya67v1qnvbzd0cd5gj7xrwvxyfy1rpa70l8p30p9cmw3ahk41";
+ };
+
+ buildInputs = [ cmake libX11 ];
+
+ meta = {
+ description = "Switch X layouts from the command line";
+ homepage = https://github.com/ierton/xkb-switch.git;
+ maintainers = with stdenv.lib.maintainers; [smironov];
+ platforms = stdenv.lib.platforms.gnu;
+ license = "BSD";
+ };
+}
+
diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix
index 586fc514ba65..7ba5175d550b 100644
--- a/pkgs/tools/backup/bup/default.nix
+++ b/pkgs/tools/backup/bup/default.nix
@@ -1,14 +1,17 @@
-{ stdenv, fetchgit, python, pyxattr, pylibacl, setuptools, fuse, git, perl, pandoc, makeWrapper }:
+{ stdenv, fetchgit, python, pyxattr, pylibacl, setuptools, fuse, git, perl, pandoc, makeWrapper
+, par2cmdline, par2Support ? false }:
+
+assert par2Support -> par2cmdline != null;
with stdenv.lib;
stdenv.mkDerivation {
- name = "bup-0.25git20120722";
+ name = "bup-0.25git20121224";
src = fetchgit {
- url = "https://github.com/apenwarr/bup.git";
- sha256 = "3ad232d7f23071ed34f920bd4c3137583f1adffbe23c022896289bc0a03fe7aa";
- rev = "02bd2b566ea5eec2fd656e0ae572b4c7b6b9550a";
+ url = "https://github.com/bup/bup.git";
+ sha256 = "f0e0c835ab83f00b28920d493e4150d2247113aad3a74385865c2a8c6f1ba7b8";
+ rev = "458e92da32ddd3c18fc1c3e52a76e9f0b48b832f";
};
buildNativeInputs = [ pandoc perl makeWrapper ];
@@ -26,8 +29,8 @@ stdenv.mkDerivation {
substituteInPlace $f --replace "/usr/bin/env python" "${python}/bin/python"
done
substituteInPlace Makefile --replace "./format-subst.pl" "perl ./format-subst.pl"
- substituteInPlace lib/bup/csetup.py \
- --replace "'bupsplit.c'])" "'bupsplit.c'], library_dirs=['${python}/lib'])"
+ '' + optionalString par2Support ''
+ substituteInPlace cmd/fsck-cmd.py --replace "['par2'" "['${par2cmdline}/bin/par2'"
'';
makeFlags = [
@@ -42,6 +45,6 @@ stdenv.mkDerivation {
Highly efficient file backup system based on the git packfile format.
Capable of doing *fast* incremental backups of virtual machine images.
'';
- homepage = "https://github.com/apenwarr/bup";
+ homepage = "https://github.com/bup/bup";
};
}
diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix
index 07b86c2e41ed..dcac235c6703 100644
--- a/pkgs/tools/backup/obnam/default.nix
+++ b/pkgs/tools/backup/obnam/default.nix
@@ -1,12 +1,14 @@
{ stdenv, fetchurl, python, pythonPackages, pycrypto, attr }:
-pythonPackages.buildPythonPackage {
- name = "obnam-1.2";
+pythonPackages.buildPythonPackage rec {
+ name = "obnam-${version}";
+ version = "1.3";
+
namePrefix = "";
src = fetchurl rec {
- url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_1.2.orig.tar.gz";
- sha256 = "33457452726d5c393d98c565b8e1ab3ac11276cc42bf67c4eee6c4e4ac9976d6";
+ url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.gz";
+ sha256 = "1hmi58knv7qjw6jr5m28sip5gwzavk87i3s77xk72anaxhvf4g8w";
};
buildInputs = [ pythonPackages.sphinx attr ];
diff --git a/pkgs/tools/filesystems/btrfsprogs/btrfs-progs-Fix-the-receive-code-pathing.patch b/pkgs/tools/filesystems/btrfsprogs/btrfs-progs-Fix-the-receive-code-pathing.patch
new file mode 100644
index 000000000000..6dd0639c607e
--- /dev/null
+++ b/pkgs/tools/filesystems/btrfsprogs/btrfs-progs-Fix-the-receive-code-pathing.patch
@@ -0,0 +1,146 @@
+diff --git a/cmds-receive.c b/cmds-receive.c
+index a8be6fa..6b7cf12 100644
+--- a/cmds-receive.c
++++ b/cmds-receive.c
+@@ -52,11 +52,13 @@ static int g_verbose = 0;
+ struct btrfs_receive
+ {
+ int mnt_fd;
++ int dest_dir_fd;
+
+ int write_fd;
+ char *write_path;
+
+ char *root_path;
++ char *dest_dir_path; /* relative to root_path */
+ char *full_subvol_path;
+
+ struct subvol_info *cur_subvol;
+@@ -150,8 +152,11 @@ static int process_subvol(const char *path, const u8 *uuid, u64 ctransid,
+ r->cur_subvol = calloc(1, sizeof(*r->cur_subvol));
+ r->parent_subvol = NULL;
+
+- r->cur_subvol->path = strdup(path);
+- r->full_subvol_path = path_cat(r->root_path, path);
++ if (strlen(r->dest_dir_path) == 0)
++ r->cur_subvol->path = strdup(path);
++ else
++ r->cur_subvol->path = path_cat(r->dest_dir_path, path);
++ r->full_subvol_path = path_cat3(r->root_path, r->dest_dir_path, path);
+
+ fprintf(stderr, "At subvol %s\n", path);
+
+@@ -167,7 +172,7 @@ static int process_subvol(const char *path, const u8 *uuid, u64 ctransid,
+
+ memset(&args_v1, 0, sizeof(args_v1));
+ strcpy(args_v1.name, path);
+- ret = ioctl(r->mnt_fd, BTRFS_IOC_SUBVOL_CREATE, &args_v1);
++ ret = ioctl(r->dest_dir_fd, BTRFS_IOC_SUBVOL_CREATE, &args_v1);
+ if (ret < 0) {
+ ret = -errno;
+ fprintf(stderr, "ERROR: creating subvolume %s failed. "
+@@ -195,8 +200,11 @@ static int process_snapshot(const char *path, const u8 *uuid, u64 ctransid,
+ r->cur_subvol = calloc(1, sizeof(*r->cur_subvol));
+ r->parent_subvol = NULL;
+
+- r->cur_subvol->path = strdup(path);
+- r->full_subvol_path = path_cat(r->root_path, path);
++ if (strlen(r->dest_dir_path) == 0)
++ r->cur_subvol->path = strdup(path);
++ else
++ r->cur_subvol->path = path_cat(r->dest_dir_path, path);
++ r->full_subvol_path = path_cat3(r->root_path, r->dest_dir_path, path);
+
+ fprintf(stderr, "At snapshot %s\n", path);
+
+@@ -243,7 +251,7 @@ static int process_snapshot(const char *path, const u8 *uuid, u64 ctransid,
+ goto out;
+ }
+
+- ret = ioctl(r->mnt_fd, BTRFS_IOC_SNAP_CREATE_V2, &args_v2);
++ ret = ioctl(r->dest_dir_fd, BTRFS_IOC_SNAP_CREATE_V2, &args_v2);
+ close(args_v2.fd);
+ if (ret < 0) {
+ ret = -errno;
+@@ -790,17 +798,48 @@ struct btrfs_send_ops send_ops = {
+ int do_receive(struct btrfs_receive *r, const char *tomnt, int r_fd)
+ {
+ int ret;
++ char *dest_dir_full_path;
+ int end = 0;
+
+- r->root_path = strdup(tomnt);
+- r->mnt_fd = open(tomnt, O_RDONLY | O_NOATIME);
++ dest_dir_full_path = realpath(tomnt, NULL);
++ if (!dest_dir_full_path) {
++ ret = -errno;
++ fprintf(stderr, "ERROR: realpath(%s) failed. %s\n", tomnt,
++ strerror(-ret));
++ goto out;
++ }
++ r->dest_dir_fd = open(dest_dir_full_path, O_RDONLY | O_NOATIME);
++ if (r->dest_dir_fd < 0) {
++ ret = -errno;
++ fprintf(stderr, "ERROR: failed to open destination directory %s. %s\n",
++ dest_dir_full_path, strerror(-ret));
++ goto out;
++ }
++
++ ret = find_mount_root(dest_dir_full_path, &r->root_path);
++ if (ret < 0) {
++ ret = -EINVAL;
++ fprintf(stderr, "ERROR: failed to determine mount point "
++ "for %s\n", dest_dir_full_path);
++ goto out;
++ }
++ r->mnt_fd = open(r->root_path, O_RDONLY | O_NOATIME);
+ if (r->mnt_fd < 0) {
+ ret = -errno;
+- fprintf(stderr, "ERROR: failed to open %s. %s\n", tomnt,
++ fprintf(stderr, "ERROR: failed to open %s. %s\n", r->root_path,
+ strerror(-ret));
+ goto out;
+ }
+
++ /*
++ * find_mount_root returns a root_path that is a subpath of
++ * dest_dir_full_path. Now get the other part of root_path,
++ * which is the destination dir relative to root_path.
++ */
++ r->dest_dir_path = dest_dir_full_path + strlen(r->root_path);
++ if (r->dest_dir_path[0] == '/')
++ r->dest_dir_path++;
++
+ ret = subvol_uuid_search_init(r->mnt_fd, &r->sus);
+ if (ret < 0)
+ return ret;
+diff --git a/cmds-send.c b/cmds-send.c
+index 9b47e70..c408bc7 100644
+--- a/cmds-send.c
++++ b/cmds-send.c
+@@ -81,6 +81,14 @@ int find_mount_root(const char *path, char **mount_root)
+ }
+ }
+
++ if (!longest_match) {
++ fprintf(stderr, "ERROR: Failed to find mount root for path %s.\n",
++ path);
++ fprintf(stderr, "Please make sure that you have a valid \
++ /etc/mtab file.\n");
++ return -ENOENT;
++ }
++
+ *mount_root = realpath(longest_match, NULL);
+ free(longest_match);
+
+diff --git a/send-utils.h b/send-utils.h
+index da407eb..a3e038b 100644
+--- a/send-utils.h
++++ b/send-utils.h
+@@ -65,5 +65,6 @@ void subvol_uuid_search_add(struct subvol_uuid_search *s,
+ char *path_cat(const char *p1, const char *p2);
+ char *path_cat3(const char *p1, const char *p2, const char *p3);
+
++int find_mount_root(const char *path, char **mount_root);
+
+ #endif /* SEND_UTILS_H_ */
diff --git a/pkgs/tools/filesystems/btrfsprogs/btrfs-receive-help-text.patch b/pkgs/tools/filesystems/btrfsprogs/btrfs-receive-help-text.patch
new file mode 100644
index 000000000000..a9892cc780ed
--- /dev/null
+++ b/pkgs/tools/filesystems/btrfsprogs/btrfs-receive-help-text.patch
@@ -0,0 +1,13 @@
+diff --git a/cmds-receive.c b/cmds-receive.c
+index a8be6fa..c182175 100644
+--- a/cmds-receive.c
++++ b/cmds-receive.c
+@@ -880,7 +880,7 @@ static const char * const receive_cmd_group_usage[] = {
+ };
+
+ static const char * const cmd_receive_usage[] = {
+- "btrfs receive [-v] [-i ] ",
++ "btrfs receive [-v] [-f ] ",
+ "Receive subvolumes from stdin.",
+ "Receives one or more subvolumes that were previously ",
+ "sent with btrfs send. The received subvolumes are stored",
diff --git a/pkgs/tools/filesystems/btrfsprogs/btrfs-receive-lchown.patch b/pkgs/tools/filesystems/btrfsprogs/btrfs-receive-lchown.patch
new file mode 100644
index 000000000000..3abb1ba25d32
--- /dev/null
+++ b/pkgs/tools/filesystems/btrfsprogs/btrfs-receive-lchown.patch
@@ -0,0 +1,12 @@
+diff --git a/cmds-receive.c b/cmds-receive.c
+index 6b7cf12..a6a6a5b 100644
+--- a/cmds-receive.c
++++ b/cmds-receive.c
+@@ -731,7 +731,7 @@ static int process_chown(const char *path, u64 uid, u64 gid, void *user)
+ fprintf(stderr, "chown %s - uid=%llu, gid=%llu\n", path,
+ uid, gid);
+
+- ret = chown(full_path, uid, gid);
++ ret = lchown(full_path, uid, gid);
+ if (ret < 0) {
+ ret = -errno;
diff --git a/pkgs/tools/filesystems/btrfsprogs/btrfs-set-received-uuid.c b/pkgs/tools/filesystems/btrfsprogs/btrfs-set-received-uuid.c
new file mode 100644
index 000000000000..483ec5f84155
--- /dev/null
+++ b/pkgs/tools/filesystems/btrfsprogs/btrfs-set-received-uuid.c
@@ -0,0 +1,109 @@
+/*
+btrfs receive currently mandates that incremental receives can only be performed on a parent subvolume
+that was also received. This means you cannot apply it to (snapshotted) subvolumes you still have on disk,
+as they were not received themselves.
+
+This small utility allows you to set the received_uuid of a subvolume, tricking btrfs receive into using it.
+
+found on btrfs mailing list
+read the discussion here: http://comments.gmane.org/gmane.comp.file-systems.btrfs/21922
+*/
+
+#define _GNU_SOURCE
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "ctree.h"
+#include "ioctl.h"
+#include "send-utils.h"
+
+#define CLEAR(var) memset(&var, 0, sizeof(var))
+
+
+int main(int argc, char **argv) {
+ int ret, fd;
+ struct subvol_uuid_search sus;
+ struct btrfs_ioctl_received_subvol_args rs_args;
+ struct subvol_info *si;
+ char uuidbuf[37], parent_uuidbuf[37], received_uuidbuf[37];
+
+
+ if (argc != 3 && argc != 4) {
+ printf("usage: btrfs-set-received-uuid btrfs-mountpoint src-subvolume-path-relative-to-mountpoint [dest-absolute-subvolume-path]\n");
+ exit(1);
+ }
+
+ printf("opening srcmnt %s\n", argv[1]);
+ fd = open(argv[1], O_RDONLY | O_NOATIME);
+ if (fd < 0) {
+ printf("failed to open srcmnt %s! %s\n", argv[1], strerror(errno));
+ exit(2);
+ }
+
+ puts("initializing sub search");
+ CLEAR(sus);
+ ret = subvol_uuid_search_init(fd, &sus);
+ if (ret < 0) {
+ printf("failed to initialize sub search! %s\n", strerror(-ret));
+ exit(3);
+ }
+
+ printf("searching srcsub %s\n", argv[2]);
+ si = subvol_uuid_search(&sus, 0, NULL, 0, argv[2], subvol_search_by_path);
+ if (!si) {
+ puts("srcsub not found!");
+ exit(4);
+ }
+
+ uuid_unparse(si->uuid, uuidbuf);
+ uuid_unparse(si->parent_uuid, parent_uuidbuf);
+ uuid_unparse(si->received_uuid, received_uuidbuf);
+
+ printf("\nsrcsub found:\n"
+ " uuid=%s\n"
+ " parent_uuid=%s\n"
+ "received_uuid=%s\n"
+ "ctransid=%Lu otransid=%Lu stransid=%Lu rtransid=%Lu\n\n",
+ uuidbuf, parent_uuidbuf, received_uuidbuf,
+ (unsigned long long)(si->ctransid),
+ (unsigned long long)(si->otransid),
+ (unsigned long long)(si->stransid),
+ (unsigned long long)(si->rtransid));
+
+ if (argc == 3)
+ goto done;
+
+ printf("opening dst subvol %s\n", argv[3]);
+ fd = open(argv[3], O_RDONLY | O_NOATIME);
+ if (fd < 0) {
+ printf("failed to open dst subvol %s. %s\n", argv[3], strerror(errno));
+ exit(5);
+ }
+
+ printf("\nhere we go with BTRFS_IOC_SET_RECEIVED_SUBVOL:\n"
+ "dstsub.received_uuid = srcsub.uuid == %s\n"
+ "dstsub.stransid = srcsub.ctransid == %Lu\n\n",
+ uuidbuf, (unsigned long long)(si->ctransid));
+
+ CLEAR(rs_args);
+ memcpy(rs_args.uuid, si->uuid, BTRFS_UUID_SIZE);
+ rs_args.stransid = si->ctransid;
+
+ ret = ioctl(fd, BTRFS_IOC_SET_RECEIVED_SUBVOL, &rs_args);
+ if (ret < 0) {
+ printf("BTRFS_IOC_SET_RECEIVED_SUBVOL failed: %s", strerror(-ret));
+ exit(6);
+ }
+
+done:
+ printf("done.\n");
+ exit(0);
+}
diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix
index 4c1963f46332..a42c6aa7a7ec 100644
--- a/pkgs/tools/filesystems/btrfsprogs/default.nix
+++ b/pkgs/tools/filesystems/btrfsprogs/default.nix
@@ -11,8 +11,27 @@ stdenv.mkDerivation {
sha256 = "72d4cd4fb23d876a17146d6231ad40a2151fa47c648485c54cf7478239b43764";
};
+ patches = [
+ ./subvol-listing.patch
+ ./btrfs-receive-help-text.patch
+ ./btrfs-progs-Fix-the-receive-code-pathing.patch
+ ./btrfs-receive-lchown.patch
+ ];
+
buildInputs = [ zlib libuuid acl attr e2fsprogs ];
+ postPatch = ''
+ cp ${./btrfs-set-received-uuid.c} btrfs-set-received-uuid.c
+ '';
+
+ postBuild = ''
+ gcc -O2 -luuid -o btrfs-set-received-uuid send-utils.o rbtree.o btrfs-list.o btrfs-set-received-uuid.c
+ '';
+
+ postInstall = ''
+ cp btrfs-set-received-uuid $out/bin
+ '';
+
makeFlags = "prefix=$(out)";
meta = {
diff --git a/pkgs/tools/filesystems/btrfsprogs/subvol-listing.patch b/pkgs/tools/filesystems/btrfsprogs/subvol-listing.patch
new file mode 100644
index 000000000000..1c113ddefbe3
--- /dev/null
+++ b/pkgs/tools/filesystems/btrfsprogs/subvol-listing.patch
@@ -0,0 +1,34 @@
+--- a/btrfs-list.c 2012-12-30 12:20:01.394137593 +0100
++++ b/btrfs-list.c 2012-12-30 12:22:47.242452906 +0100
+@@ -1004,6 +1004,23 @@
+ return 0;
+ }
+
++static void __drop_deleting_roots(struct root_lookup *root_lookup)
++{
++ struct rb_node *n;
++
++again:
++ n = rb_first(&root_lookup->root);
++ while (n) {
++ struct root_info *entry = rb_entry(n, struct root_info, rb_node);
++ if (!entry->ref_tree) {
++ rb_erase(n, &root_lookup->root);
++ free(entry);
++ goto again;
++ }
++ n = rb_next(n);
++ }
++}
++
+ static int __list_subvol_search(int fd, struct root_lookup *root_lookup)
+ {
+ int ret;
+@@ -1123,6 +1140,8 @@
+ break;
+ }
+
++ __drop_deleting_roots(root_lookup);
++
+ return 0;
+ }
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 1fc5c08042cb..52c8e493fdcc 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,31 +1,31 @@
-{stdenv, fetchgit, python}:
+{ stdenv, fetchurl, python, pandoc, zip }:
-let pkgname = "youtube-dl";
- pkgver = "2012.09.27";
-
+let
+ version = "2012.12.11";
in
stdenv.mkDerivation {
- name = "${pkgname}-${pkgver}";
+ name = "youtube-dl-${version}";
- src = fetchgit {
- url = "git://github.com/rg3/${pkgname}";
- rev = "refs/tags/${pkgver}";
- sha256 = "a98f3339301324ddd6620f7b1353abed807cd8dea5586d6901d7fe69bc6a397c";
+ src = fetchurl {
+ url = "https://github.com/downloads/rg3/youtube-dl/youtube-dl.${version}.tar.gz";
+ sha256 = "03zv3z8p0fi122nqj7ff8hkgqscir4s7psm03rq7dfpg1z35klmn";
};
- buildInputs = [python];
- buildPhase = "sed -i 's|#!/usr/bin/env python|#!#{python}/bin/python|' youtube-dl";
+ buildInputs = [ python ];
+ buildNativeInputs = [ pandoc zip ];
- installPhase = ''
- ensureDir $out/bin
- cp youtube-dl $out/bin
+ patchPhase = ''
+ rm youtube-dl
+ substituteInPlace Makefile --replace "#!/usr/bin/env python" "#!${python}/bin/python"
+ '';
+
+ configurePhase = ''
+ makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc )
'';
meta = {
- description = "A small command-line program to download videos from YouTube.com and a few more sites";
- homepage = http://rg3.github.com/youtube-dl/;
- maintainers = [
- stdenv.lib.maintainers.bluescreen303
- ];
+ homepage = "http://rg3.github.com/youtube-dl/";
+ description = "Command-line tool to download videos from YouTube.com and other sites";
+ maintainers = with stdenv.lib.maintainers; [ bluescreen303 simons ];
};
}
diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix
index ea4f517000a2..c616ba9ee160 100644
--- a/pkgs/tools/networking/aircrack-ng/default.nix
+++ b/pkgs/tools/networking/aircrack-ng/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchsvn, libpcap, openssl, zlib, wirelesstools}:
let
- rev = "2178";
+ rev = "2212";
in
stdenv.mkDerivation rec {
name = "aircrack-ng-1.1-${rev}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchsvn {
url = "http://trac.aircrack-ng.org/svn/trunk";
inherit rev;
- sha256 = "d16fd3a4e918fd6a855c0d0ae0c863247a45189e6ec35c0c7082d3d07b6438db";
+ sha256 = "80e567b4e4bc501721cd58f7efadcd13fc3b235a41486174826694a6e701ce09";
};
buildInputs = [libpcap openssl zlib];
diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix
new file mode 100644
index 000000000000..200bac53086a
--- /dev/null
+++ b/pkgs/tools/networking/httpie/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, buildPythonPackage }:
+
+buildPythonPackage {
+ name = "httpie-0.3.1";
+ namePrefix = "";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/h/httpie/httpie-0.3.1.tar.gz";
+ sha256 = "0abjkwcirmp6qa190qgbgj5fmmkmk5aa3fdiyayl2indh6304x7a";
+ };
+
+ doCheck = false;
+
+ meta = {
+ description = "A command line HTTP client whose goal is to make CLI human-friendly";
+ homepage = http://httpie.org/;
+ license = "BSD";
+ maintainers = [ stdenv.lib.maintainers.antono ];
+ };
+}
diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix
new file mode 100644
index 000000000000..b91282c9a2b4
--- /dev/null
+++ b/pkgs/tools/networking/maildrop/default.nix
@@ -0,0 +1,20 @@
+{ fetchurl, stdenv, pkgconfig, pcre, perl }:
+
+stdenv.mkDerivation rec {
+ name = "maildrop-2.6.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/courier/maildrop/2.6.0/maildrop-2.6.0.tar.bz2";
+ sha256 = "1a94p2b41iy334cwfwmzi19557dn5j61abh0cp2rfc9dkc8ibhdg";
+ };
+
+ buildInputs = [ pkgconfig pcre perl ];
+
+ patches = [ ./maildrop.configure.hack.patch ]; # for building in chroot
+
+ meta = {
+ homepage = http://www.courier-mta.org/maildrop/;
+ description = "Mail filter/mail delivery agent that is used by the Courier Mail Server";
+ licenses = [ "GPLv3" ];
+ };
+}
diff --git a/pkgs/tools/networking/maildrop/maildrop.configure.hack.patch b/pkgs/tools/networking/maildrop/maildrop.configure.hack.patch
new file mode 100644
index 000000000000..08988f6cde50
--- /dev/null
+++ b/pkgs/tools/networking/maildrop/maildrop.configure.hack.patch
@@ -0,0 +1,13 @@
+--- a/maildrop/configure 2012-09-06 01:52:13.000000000 +0100
++++ b/maildrop/configure 2013-01-04 03:00:57.095628327 +0000
+@@ -17562,8 +17562,8 @@
+ check_spooldir() {
+ if test "$CHECKED_SPOOLDIR" != 1
+ then
+- get_spooldir
+- MBOX_DIR="$SPOOLDIR"
++ MBOX_DIR="/var/spool/mail"
++ MBOX_RESET_GID=0
+ CHECKED_SPOOLDIR=1
+ fi
+ }
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
new file mode 100644
index 000000000000..7495c3bcd7f0
--- /dev/null
+++ b/pkgs/tools/networking/mu/default.nix
@@ -0,0 +1,25 @@
+{ fetchurl, stdenv, sqlite, pkgconfig, xapian, glib, gmime, texinfo, emacs, guile }:
+
+stdenv.mkDerivation rec {
+ version = "0.9.9";
+ name = "mu-${version}";
+
+ src = fetchurl {
+ url = "https://mu0.googlecode.com/files/mu-${version}.tar.gz";
+ sha256 = "04r0y05awsyb5hqwaxn1hq9jxijw20hwsgdbacqrma519f0y5y43";
+ };
+
+ buildInputs = [ sqlite pkgconfig xapian glib gmime texinfo emacs guile ];
+
+ meta = {
+ description = "mu is a collection of utilties for indexing and searching Maildirs";
+
+ licenses = [ "GPLv3+" ];
+
+ homepage = "http://www.djcbsoftware.nl/code/mu/";
+
+ platforms = stdenv.lib.platforms.all;
+
+ maintainers = [ stdenv.lib.maintainers.antono ];
+ };
+}
diff --git a/pkgs/tools/networking/mu0/default.nix b/pkgs/tools/networking/mu0/default.nix
deleted file mode 100644
index a772f2375004..000000000000
--- a/pkgs/tools/networking/mu0/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ fetchurl, stdenv, sqlite, pkgconfig, xapian, glib, gmime }:
-
-stdenv.mkDerivation rec {
- name = "mu0-0.9.7";
-
- src = fetchurl {
- url = http://mu0.googlecode.com/files/mu-0.9.7.tar.gz;
- sha256 = "14nyn791ficyllj9idhiq3mncwnrg71lfxk126804dxba1l90r72";
- };
-
- buildInputs = [ sqlite pkgconfig xapian glib gmime ];
-
- /* The tests don't pass */
- doCheck = false;
-
- meta = {
- description = "mu is a collection of utilties for indexing and searching Maildirs";
-
- licenses = [ "GPLv3+" ];
-
- homepage = http://code.google.com/p/mu0/;
-
- platforms = stdenv.lib.platforms.all;
- };
-}
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index eec7361f6a29..0adb9b1e5797 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "network-manager-${version}";
- version = "0.9.4.0";
+ version = "0.9.6.4";
src = fetchurl {
url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.xz";
- sha256 = "eb4f124008b3d855a37205d03ef035b7218639cd7332bdae5567095977e93e0f";
+ sha256 = "1sx7h29j9h13qszcppja1p27zq2m7vdrylbcyb47n62x0lg426si";
};
preConfigure = ''
@@ -29,7 +29,9 @@ stdenv.mkDerivation rec {
"--without-resolvconf"
"--sysconfdir=/etc" "--localstatedir=/var"
"--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d"
- "--with-crypto=gnutls" "--disable-more-warnings" ];
+ "--with-crypto=gnutls" "--disable-more-warnings"
+ "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
+ "--with-kernel-firmware-dir=/run/current-system/firmware" ];
buildInputs = [ wirelesstools udev libnl libuuid polkit ppp xz ];
diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix
index 7ff1ab4a5d32..c5386553f4f1 100644
--- a/pkgs/tools/networking/nzbget/default.nix
+++ b/pkgs/tools/networking/nzbget/default.nix
@@ -2,20 +2,18 @@
, gnutls, libgcrypt }:
stdenv.mkDerivation rec {
- name = "nzbget-0.8.0";
+ name = "nzbget-9.0";
src = fetchurl {
url = "mirror://sourceforge/nzbget/${name}.tar.gz";
- sha256 = "15bxsxdbkml9cqpy6zxgv78ff69l8qrv8r201gmzvylpc1ckjsb4";
+ sha256 = "1r4ys5nmcz1ilkdjdh3r8lawaf96i8spk6hl02h823q9rppvmya0";
};
buildInputs = [ pkgconfig libxml2 ncurses libsigcxx libpar2 gnutls libgcrypt ];
- postInstall =
- ''
- mkdir -p $out/etc
- cp nzbget.conf.example $out/etc/
- '';
+ enableParallelBuilding = true;
+
+ NIX_LDFLAGS = "-lz";
meta = {
homepage = http://nzbget.sourceforge.net/;
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index e6f15b7a5e5d..5448c9f5ba38 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
- name = "nix-1.2";
+ name = "nix-1.3";
src = fetchurl {
url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
- sha256 = "2f7c2d27e240b6a43ebfba330127072e3fb1473c17dbfc5e9662ea589dfd16e5";
+ sha256 = "32cba96df0e02d6627f5625a441fdd4ea0db718dd5bfd50044cdfd3c606d4852";
};
buildNativeInputs = [ perl pkgconfig ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
configureFlags =
''
- --with-store-dir=${storeDir} --localstatedir=${stateDir}
+ --with-store-dir=${storeDir} --localstatedir=${stateDir} --sysconfdir=/etc
--with-dbi=${perlPackages.DBI}/${perl.libPrefix}
--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}
--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}
@@ -35,6 +35,10 @@ stdenv.mkDerivation rec {
CFLAGS=-O3 CXXFLAGS=-O3
'';
+ makeFlags = "profiledir=$(out)/etc/profile.d";
+
+ installFlags = "sysconfdir=$(out)/etc";
+
doInstallCheck = true;
crossAttrs = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f972f19c3b6..e674e081e487 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -373,6 +373,11 @@ let
archivemount = callPackage ../tools/filesystems/archivemount { };
+ arduino_core = callPackage ../development/arduino/arduino-core {
+ jdk = jdk;
+ jre = jdk;
+ };
+
argyllcms = callPackage ../tools/graphics/argyllcms {};
ascii = callPackage ../tools/text/ascii { };
@@ -406,7 +411,14 @@ let
client = true;
});
- androidenv = import ../development/androidenv {
+ androidenv = import ../development/mobile/androidenv {
+ inherit pkgs;
+ pkgs_i686 = pkgsi686Linux;
+ };
+
+ xcodeenv = callPackage ../development/mobile/xcodeenv { };
+
+ titaniumenv = import ../development/mobile/titaniumenv {
inherit pkgs;
pkgs_i686 = pkgsi686Linux;
};
@@ -508,6 +520,7 @@ let
bup = callPackage ../tools/backup/bup {
inherit (pythonPackages) pyxattr pylibacl setuptools fuse;
inherit (haskellPackages) pandoc;
+ par2Support = (config.bup.par2Support or false);
};
atool = callPackage ../tools/archivers/atool { };
@@ -911,6 +924,8 @@ let
hping = callPackage ../tools/networking/hping { };
+ httpie = callPackage ../tools/networking/httpie { };
+
httpfs2 = callPackage ../tools/filesystems/httpfs { };
# FIXME: This Hydra snapshot is outdated and depends on the `nixPerl',
@@ -1047,7 +1062,7 @@ let
lzop = callPackage ../tools/compression/lzop { };
- mu0 = callPackage ../tools/networking/mu0 { };
+ maildrop = callPackage ../tools/networking/maildrop { };
mailutils = callPackage ../tools/networking/mailutils {
guile = guile_1_8;
@@ -1801,7 +1816,7 @@ let
xvfb_run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; };
- youtubeDL = callPackage ../tools/misc/youtube-dl { };
+ youtubeDL = callPackage ../tools/misc/youtube-dl { inherit (haskellPackages) pandoc; };
zbar = callPackage ../tools/graphics/zbar {};
@@ -2967,6 +2982,8 @@ let
&& stdenv.system != "i686-solaris";
};
+ automake113x = callPackage ../development/tools/misc/automake/automake-1.13.x.nix { };
+
automoc4 = callPackage ../development/tools/misc/automoc4 { };
avrdude = callPackage ../development/tools/misc/avrdude { };
@@ -3072,6 +3089,28 @@ let
distcc = callPackage ../development/tools/misc/distcc { };
+ # distccWrapper: wrapper that works as gcc or g++
+ # It can be used by setting in nixpkgs config like this, for example:
+ # replaceStdenv = { pkgs }: pkgs.distccStdenv;
+ # But if you build in chroot, a default 'nix' will create
+ # a new net namespace, and won't have network access.
+ # You can use an override in packageOverrides to set extraConfig:
+ # packageOverrides = pkgs: {
+ # distccWrapper = pkgs.distccWrapper.override {
+ # extraConfig = ''
+ # DISTCC_HOSTS="myhost1 myhost2"
+ # '';
+ # };
+ #
+ distccWrapper = makeOverridable ({ extraConfig ? "" }:
+ wrapGCC (distcc.links extraConfig)) {};
+ distccStdenv = lowPrio (overrideGCC stdenv distccWrapper);
+
+ distccMasquerade = callPackage ../development/tools/misc/distcc/masq.nix {
+ gccRaw = gcc.gcc;
+ binutils = binutils;
+ };
+
docutils = builderDefsPackage (import ../development/tools/documentation/docutils) {
inherit python pil makeWrapper;
};
@@ -3155,6 +3194,8 @@ let
indent = callPackage ../development/tools/misc/indent { };
+ ino = callPackage ../development/arduino/ino { };
+
inotifyTools = callPackage ../development/tools/misc/inotify-tools { };
intelgen4asm = callPackage ../development/misc/intelgen4asm { };
@@ -4485,6 +4526,8 @@ let
libxslt = callPackage ../development/libraries/libxslt { };
+ libxtc_dxtn = callPackage ../development/libraries/libxtc_dxtn { };
+
libixp_for_wmii = lowPrio (import ../development/libraries/libixp_for_wmii {
inherit fetchurl stdenv;
});
@@ -4567,6 +4610,8 @@ let
mtdev = callPackage ../development/libraries/mtdev { };
+ mu = callPackage ../tools/networking/mu { };
+
muparser = callPackage ../development/libraries/muparser { };
mygui = callPackage ../development/libraries/mygui {};
@@ -4963,6 +5008,10 @@ let
telepathy_qt = callPackage ../development/libraries/telepathy/qt { };
+ tinyxml = tinyxml2;
+
+ tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { };
+
tk = callPackage ../development/libraries/tk { };
tnt = callPackage ../development/libraries/tnt { };
@@ -6716,7 +6765,7 @@ let
cuneiform = builderDefsPackage (import ../tools/graphics/cuneiform) {
inherit cmake patchelf;
- imagemagick=imagemagick;
+ imagemagick = imagemagick;
};
cvs = callPackage ../applications/version-management/cvs { };
@@ -7001,6 +7050,8 @@ let
feh = callPackage ../applications/graphics/feh { };
+ filezilla = callPackage ../applications/networking/ftp/filezilla { };
+
firefox = pkgs.firefoxPkgs.firefox;
firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };
@@ -7050,6 +7101,10 @@ let
freerdpUnstable = callPackage ../applications/networking/remote/freerdp/unstable.nix { };
+ freicoin = callPackage ../applications/misc/freicoin {
+ db4 = db48;
+ };
+
fspot = callPackage ../applications/graphics/f-spot {
inherit (gnome) libgnome libgnomeui;
gtksharp = gtksharp1;
@@ -7273,6 +7328,8 @@ let
lua = lua5;
};
+ ipe = callPackage ../applications/graphics/ipe { };
+
iptraf = callPackage ../applications/networking/iptraf { };
irssi = callPackage ../applications/networking/irc/irssi { };
@@ -7909,7 +7966,7 @@ let
inherit (pkgs) python perl tcl ruby /*x11*/;
lua = pkgs.lua5;
# optional features by flags
- flags = [ "X11" ]; # only flag "X11" by now
+ flags = [ "python" "X11" ]; # only flag "X11" by now
};
virtviewer = callPackage ../applications/virtualization/virt-viewer {};
@@ -8062,6 +8119,8 @@ let
base14Fonts = "${ghostscript}/share/ghostscript/fonts";
};
+ xkb_switch = callPackage ../tools/X11/xkb-switch { };
+
libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { };
xpra = callPackage ../tools/X11/xpra {
@@ -8119,6 +8178,8 @@ let
andyetitmoves = if stdenv.isLinux then callPackage ../games/andyetitmoves {} else null;
+ anki = callPackage ../games/anki { };
+
asc = callPackage ../games/asc {
lua = lua5;
libsigcxx = libsigcxx12;
@@ -8578,6 +8639,12 @@ let
### SCIENCE
+ celestia = callPackage ../applications/science/astronomy/celestia {
+ lua = lua5_1;
+ inherit (xlibs) libXmu;
+ inherit (pkgs.gnome) gtkglext;
+ };
+
xplanet = callPackage ../applications/science/astronomy/xplanet { };
gravit = callPackage ../applications/science/astronomy/gravit { };
@@ -8706,6 +8773,8 @@ let
leo2 = callPackage ../applications/science/logic/leo2 {};
+ logisim = callPackage ../applications/science/logic/logisim {};
+
matita = callPackage ../applications/science/logic/matita {
ocaml = ocaml_3_11_2;
inherit (ocamlPackages_3_11_2) findlib lablgtk ocaml_expat gmetadom ocaml_http
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 8cfd3f72d139..9713f8f94dc6 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -523,7 +523,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
bloomfilter = callPackage ../development/libraries/haskell/bloomfilter {};
bmp_1_2_2_1 = callPackage ../development/libraries/haskell/bmp/1.2.2.1.nix {};
- bmp_1_2_3_2 = callPackage ../development/libraries/haskell/bmp/1.2.3.2.nix {};
+ bmp_1_2_3_4 = callPackage ../development/libraries/haskell/bmp/1.2.3.4.nix {};
bmp = self.bmp_1_2_2_1; # later versions work only with ghc 7.6 and beyond
Boolean = callPackage ../development/libraries/haskell/Boolean {};
@@ -910,7 +910,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
happstackHamlet = callPackage ../development/libraries/haskell/happstack/happstack-hamlet.nix {};
- hashable = callPackage ../development/libraries/haskell/hashable {};
+ hashable_1_1_2_5 = callPackage ../development/libraries/haskell/hashable/1.1.2.5.nix {};
+ hashable_1_2_0_3 = callPackage ../development/libraries/haskell/hashable/1.2.0.3.nix {};
+ hashable = self.hashable_1_1_2_5;
hashedStorage = callPackage ../development/libraries/haskell/hashed-storage {};
@@ -1240,6 +1242,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {};
+ nats = callPackage ../development/libraries/haskell/nats {};
+
netlist = callPackage ../development/libraries/haskell/netlist {};
netlistToVhdl = callPackage ../development/libraries/haskell/netlist-to-vhdl {};
@@ -1676,6 +1680,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
transformersBase = callPackage ../development/libraries/haskell/transformers-base {};
+ transformersCompat = callPackage ../development/libraries/haskell/transformers-compat {};
+
tuple = callPackage ../development/libraries/haskell/tuple {};
typeEquality = callPackage ../development/libraries/haskell/type-equality {};
@@ -1782,9 +1788,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
wxdirect = callPackage ../development/libraries/haskell/wxHaskell/wxdirect.nix {};
- X11_1_5_0_1 = callPackage ../development/libraries/haskell/X11/1.5.0.1.nix {};
- X11_1_6_0_2 = callPackage ../development/libraries/haskell/X11/1.6.0.2.nix {};
- X11 = self.X11_1_6_0_2;
+ X11 = callPackage ../development/libraries/haskell/X11 {};
X11Xft = callPackage ../development/libraries/haskell/X11-xft {};
@@ -1958,18 +1962,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
stm = self.stm_2_3;
};
- xmonad = callPackage ../applications/window-managers/xmonad {
- X11 = self.X11_1_5_0_1;
- };
+ xmonad = callPackage ../applications/window-managers/xmonad {};
- xmonadContrib = callPackage ../applications/window-managers/xmonad/xmonad-contrib.nix {
- X11 = self.X11_1_5_0_1;
- X11Xft = self.X11Xft.override { X11 = self.X11_1_5_0_1; };
- };
+ xmonadContrib = callPackage ../applications/window-managers/xmonad/xmonad-contrib.nix {};
- xmonadExtras = callPackage ../applications/window-managers/xmonad/xmonad-extras.nix {
- X11 = self.X11_1_5_0_1;
- };
+ xmonadExtras = callPackage ../applications/window-managers/xmonad/xmonad-extras.nix {};
# Tools.
@@ -1981,7 +1978,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
tar = self.tar_0_3_2_0;
};
-
cabalGhci = callPackage ../development/tools/haskell/cabal-ghci {};
cabalInstall_0_6_2 = callPackage ../tools/package-management/cabal-install/0.6.2.nix {};
diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix
index f00ad36f2e47..4ff31414722b 100644
--- a/pkgs/top-level/platforms.nix
+++ b/pkgs/top-level/platforms.nix
@@ -119,6 +119,11 @@ rec {
UBIFS_FS_LZO y
UBIFS_FS_ZLIB y
UBIFS_FS_DEBUG n
+
+ # Kdb, for kernel troubles
+ KGDB y
+ KGDB_SERIAL_CONSOLE y
+ KGDB_KDB y
'';
kernelTarget = "uImage";
uboot = "sheevaplug";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ba1068a112e9..4ca4b4cb0fde 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -86,13 +86,13 @@ let pythonPackages = python.modules // rec {
alot = buildPythonPackage rec {
- rev = "09804636609b4245cde4faceddffdb5361f3d390";
+ rev = "5b5dbecb5a03840b751219db90bcf4dcffda315e";
name = "alot-0.3.3_${rev}";
src = fetchurl {
url = "https://github.com/pazz/alot/tarball/${rev}";
name = "${name}.tar.bz";
- sha256 = "b5239c4dfcd9882608fb48ef80fe9ba9223949ab7e6a2c1abe970ac307ebcd4a";
+ sha256 = "156q7x4wilhcgmaap7rjci3cgwm5ia85ddgx6xm6lfp5hkf5300v";
};
# error: invalid command 'test'
@@ -411,7 +411,7 @@ let pythonPackages = python.modules // rec {
# ValueError: Could not parse auth file:
# /tmp/nix-build-.../CoilMQ-0.6.1/coilmq/tests/resources/auth.ini
- #doCheck = false;
+ doCheck = false;
meta = {
description = "Simple, lightweight, and easily extensible STOMP message broker";
@@ -1047,6 +1047,22 @@ let pythonPackages = python.modules // rec {
};
};
+ jedi = buildPythonPackage (rec {
+ name = "jedi-0.5b5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/j/jedi/${name}.tar.gz";
+ sha256 = "10xqdhda9kdbc22h4dphxqjncpdb80s1crxsirr5h016rw9czsa4";
+ };
+
+ meta = {
+ homepage = "https://github.com/davidhalter/jedi";
+ description = "An autocompletion tool for Python that can be used for text editors.";
+ license = pkgs.lib.licenses.lgpl3Plus;
+ maintainers = [ stdenv.lib.maintainers.garbas ];
+ platforms = python.meta.platforms;
+ };
+ });
jinja2 = buildPythonPackage {
name = "jinja2-2.6";
@@ -2102,23 +2118,19 @@ let pythonPackages = python.modules // rec {
pymacs = pkgs.stdenv.mkDerivation rec {
- version = "v0.24-beta2";
+ version = "v0.25";
name = "Pymacs-${version}";
src = fetchurl {
url = "https://github.com/pinard/Pymacs/tarball/${version}";
name = "${name}.tar.gz";
- sha256 = "0nzb3wrxwy0cmmj087pszkwgj2v22x0y5m4vxb6axz94zfl02r8j";
+ sha256 = "1hmy76c5igm95rqbld7gvk0az24smvc8hplfwx2f5rhn6frj3p2i";
};
buildInputs = [ python ];
- configurePhase = ''
- python p4 -C p4config.py *.in Pymacs contrib tests
- '';
-
- installPhase = ''
- python setup.py install --prefix=$out
+ patchPhase = ''
+ sed -e "s@ install@ install --prefix=$out@g" -i Makefile
'';
meta = with stdenv.lib; {
@@ -2449,21 +2461,15 @@ let pythonPackages = python.modules // rec {
};
});
- rope = pkgs.stdenv.mkDerivation rec {
- version = "0.9.3";
+ rope = buildPythonPackage rec {
+ version = "0.9.4";
name = "rope-${version}";
src = fetchurl {
url = "http://pypi.python.org/packages/source/r/rope/${name}.tar.gz";
- sha256 = "1092rlsfna7rm1jkdanilsmw7rr3hlkgyji02xfd02wfcm8xa2i7";
+ sha256 = "1fm6ahff50b10mlnc0ar4x1fv9sxmcp1g651myyqy7c50hk39h1d";
};
- buildInputs = [ python ];
-
- installPhase = ''
- python setup.py install --prefix=$out
- '';
-
meta = with stdenv.lib; {
description = "python refactoring library";
homepage = http://rope.sf.net;
@@ -2472,20 +2478,16 @@ let pythonPackages = python.modules // rec {
};
};
- ropemacs = pkgs.stdenv.mkDerivation rec {
- version = "0.6";
+ ropemacs = buildPythonPackage rec {
+ version = "0.7";
name = "ropemacs-${version}";
src = fetchurl {
- url = "mirror://sourceforge/rope/${name}.tar.gz";
- sha256 = "1afqybmjn7fqkwx8y8kx1kfx181ix73cbq3a0d5n7ryjm7k1r0s4";
+ url = "http://pypi.python.org/packages/source/r/ropemacs/${name}.tar.gz";
+ sha256 = "1x5qf1drcdz9jfiiakc60kzqkb3ahsg9j902c5byf3gjfacdrmqj";
};
- buildInputs = [ python ];
-
- installPhase = ''
- python setup.py install --prefix=$out
- '';
+ propagatedBuildInputs = [ ropemode ];
meta = with stdenv.lib; {
description = "a plugin for performing python refactorings in emacs";
@@ -2495,6 +2497,26 @@ let pythonPackages = python.modules // rec {
};
};
+ ropemode = buildPythonPackage rec {
+ version = "0.2";
+ name = "ropemode-${version}";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/r/ropemode/${name}.tar.gz";
+ sha256 = "0jw6h1wvk6wk0wknqdf7s9pw76m8472jv546lqdd88jbl2scgcjl";
+ };
+
+ propagatedBuildInputs = [ rope ];
+
+ meta = with stdenv.lib; {
+ description = "a plugin for performing python refactorings in emacs";
+ homepage = http://rope.sf.net;
+ maintainers = [ maintainers.goibhniu ];
+ license = licenses.gpl2;
+ };
+ };
+
+
routes = buildPythonPackage rec {
name = "routes-1.12.3";
@@ -2916,7 +2938,7 @@ let pythonPackages = python.modules // rec {
});
twisted = buildPythonPackage rec {
- name = "twisted-10.2.0";
+ name = "twisted-12.3.0";
src = fetchurl {
url = http://tmrc.mit.edu/mirror/twisted/Twisted/10.2/Twisted-10.2.0.tar.bz2;
@@ -3253,11 +3275,12 @@ let pythonPackages = python.modules // rec {
# };
cliapp = buildPythonPackage rec {
- name = "cliapp-1.20120929";
+ name = "cliapp-${version}";
+ version = "1.20121216";
src = fetchurl rec {
- url = "http://code.liw.fi/debian/pool/main/p/python-cliapp/python-cliapp_1.20120929.orig.tar.gz";
- sha256 = "30d5077e53b3e45f892b1c49feaaf4f47e4664400ed71435e77a82a2b823a0f8";
+ url = "http://code.liw.fi/debian/pool/main/p/python-cliapp/python-cliapp_${version}.orig.tar.gz";
+ sha256 = "1bzvc4aj3w8g85qycwz1jxa73jj8rl6zrgd4hi78kr4dgslcfns5";
};
buildInputs = [ sphinx ];
@@ -3316,11 +3339,12 @@ let pythonPackages = python.modules // rec {
};
larch = buildPythonPackage rec {
- name = "larch-1.20121006";
+ name = "larch-${version}";
+ version = "1.20121216";
src = fetchurl rec {
- url = "http://code.liw.fi/debian/pool/main/p/python-larch/python-larch_1.20121006.orig.tar.gz";
- sha256 = "b4482981010e9c22ee3fce6fdc664b8fc0a1a3a18ed30b40f247f3b44437ccfa";
+ url = "http://code.liw.fi/debian/pool/main/p/python-larch/python-larch_${version}.orig.tar.gz";
+ sha256 = "0w4hirs8wkp1hji6nxfmq4rahkd5rgw4cavvdhpdfr4mddycbis3";
};
buildInputs = [ sphinx ];
@@ -3337,4 +3361,88 @@ let pythonPackages = python.modules // rec {
};
};
+ whisper = buildPythonPackage rec {
+ name = "whisper-${version}";
+ version = "0.9.10";
+
+ src = fetchurl rec {
+ url = "https://launchpad.net/graphite/0.9/${version}/+download/${name}.tar.gz";
+ sha256 = "1zy4z4hrbiqj4ipcv2m9197hf03d4xphllqav9w4c8i6fn8zmd9n";
+ };
+
+ # error: invalid command 'test'
+ doCheck = false;
+
+ meta = {
+ homepage = http://graphite.wikidot.com/;
+ description = "Fixed size round-robin style database";
+ maintainers = [ stdenv.lib.maintainers.rickynils ];
+ platforms = python.meta.platforms;
+ };
+ };
+
+ carbon = buildPythonPackage rec {
+ name = "carbon-${version}";
+ version = "0.9.10";
+
+ src = fetchurl rec {
+ url = "https://launchpad.net/graphite/0.9/${version}/+download/${name}.tar.gz";
+ sha256 = "0wjhd87pvpcpvaj3wql2d92g8lpp33iwmxdkp7npic5mjl2y0dsg";
+ };
+
+ buildInputs = [ txamqp zopeInterface twisted ];
+ propagatedBuildInputs = [ whisper ];
+
+ # error: invalid command 'test'
+ doCheck = false;
+
+ meta = {
+ homepage = http://graphite.wikidot.com/;
+ description = "Backend data caching and persistence daemon for Graphite";
+ maintainers = [ stdenv.lib.maintainers.rickynils ];
+ platforms = python.meta.platforms;
+ };
+ };
+
+ txamqp = buildPythonPackage rec {
+ name = "txamqp-${version}";
+ version = "0.3";
+
+ src = fetchurl rec {
+ url = "https://launchpad.net/txamqp/trunk/${version}/+download/python-txamqp_${version}.orig.tar.gz";
+ sha256 = "1r2ha0r7g14i4b5figv2spizjrmgfpspdbl1m031lw9px2hhm463";
+ };
+
+ buildInputs = [ twisted ];
+
+ meta = {
+ homepage = https://launchpad.net/txamqp;
+ description = "Library for communicating with AMQP peers and brokers using Twisted";
+ maintainers = [ stdenv.lib.maintainers.rickynils ];
+ platforms = python.meta.platforms;
+ };
+ };
+
+ graphite_web = buildPythonPackage rec {
+ name = "graphite-web-${version}";
+ version = "0.9.10";
+
+ src = fetchurl rec {
+ url = "https://launchpad.net/graphite/0.9/${version}/+download/${name}.tar.gz";
+ sha256 = "1gj8i6j2i172cldqw98395235bn78ciagw6v17fgv01rmind3lag";
+ };
+
+ buildInputs = [ django pkgs.pycairo ldap memcached python.modules.sqlite3 ];
+
+ # error: invalid command 'test'
+ doCheck = false;
+
+ meta = {
+ homepage = http://graphite.wikidot.com/;
+ description = "Enterprise scalable realtime graphing";
+ maintainers = [ stdenv.lib.maintainers.rickynils ];
+ platforms = python.meta.platforms;
+ };
+ };
+
}; in pythonPackages
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index e4efb2cbd9cc..75d5ab72d62b 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -146,7 +146,6 @@ with (import ./release-lib.nix);
icewm = linux;
idutils = all;
ifplugd = linux;
- imagemagick = allBut "i686-cygwin";
impressive = linux;
inetutils = linux;
inkscape = linux;
@@ -252,7 +251,6 @@ with (import ./release-lib.nix);
rubber = allBut "i686-cygwin";
ruby = all;
rxvt_unicode = linux;
- samba = linux;
screen = linux ++ darwin;
scrot = linux;
sdparm = linux;