diff options
Diffstat (limited to 'pkgs')
145 files changed, 1599 insertions, 560 deletions
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 4315a5a7547e..88bc7399c65e 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -6,7 +6,7 @@ , perl, pkgconfig, python, serd, sord, sratom, suil }: let - tag = "3.5.357"; + tag = "3.5.380"; in stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = git://git.ardour.org/ardour/ardour.git; rev = "refs/tags/${tag}"; - sha256 = "1e026fb9a6ad4179d52c4b578cc3861bdfd3629b9e7b7a7341d431c7d3692c42"; + sha256 = "dbcbb2d9143e196d079c27b15266e47d24b81cb7591fe64b717f3485965ded7b"; }; buildInputs = @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { patchPhase = '' # The funny revision number is from `git describe rev` - printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-gce4d125\"; }\n' > libs/ardour/revision.cc + printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-g2f6065b\"; }\n' > libs/ardour/revision.cc # Note the different version number - sed -i '33i rev = \"3.5-357-gce4d125\"' wscript + sed -i '33i rev = \"3.5-380-g2f6065b\"' wscript sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index f3cba4ca8198..31d5240529f7 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -69,6 +69,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (withTaglib && !withKDE4 && withDevices) udisks2; unpackPhase = "tar -xvf $src"; + sourceRoot = "cantata-1.3.4"; # Qt4 is implicit when KDE is switched off. cmakeFlags = stdenv.lib.flatten [ diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 5d4a3614e408..82f24b05f729 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -1,8 +1,10 @@ { stdenv, fetchurl, boost, cmake, gettext, gstreamer, gst_plugins_base , liblastfm, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist , usbmuxd, libmtp, gvfs, libcdio, protobuf, libspotify, qca2, pkgconfig -, sparsehash }: +, sparsehash, config }: +let withSpotify = config.clementine.spotify or false; +in stdenv.mkDerivation { name = "clementine-1.2.1"; @@ -27,7 +29,6 @@ stdenv.mkDerivation { liblastfm libmtp libplist - libspotify pkgconfig protobuf qca2 @@ -37,7 +38,7 @@ stdenv.mkDerivation { sqlite taglib usbmuxd - ]; + ] ++ stdenv.lib.optional withSpotify libspotify; meta = with stdenv.lib; { homepage = "http://www.clementine-player.org"; @@ -45,6 +46,7 @@ stdenv.mkDerivation { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.ttuegel ]; - hydraPlatforms = []; # libspotify is unfree + # libspotify is unfree + hydraPlatforms = optional (!withSpotify) platforms.linux; }; } diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 39f6ae0ded4e..ab8027e23711 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "0wxbn5qm3dn9spwbm618flgrwvls7bipg0nhgn0lv4za2g823g56"; + sha256 = "18rvfgblynlmklk25azmppibn1bdjid97hipa323gnzmxgq0rfjq"; }; buildInputs = [ jackaudio libsndfile lv2 qt4 ]; diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index 5356d4ce298a..c5a33796ca52 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg_0_10, libvorbis, mpc, libsndfile, jackaudio, db, libmodplug, timidity, libid3tag, libtool }: +{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg, libvorbis, mpc, libsndfile, jackaudio, db, libmodplug, timidity, libid3tag, libtool }: stdenv.mkDerivation rec { name = "moc-${version}"; - version = "2.5.0-beta1"; + version = "2.5.0-beta2"; src = fetchurl { url = "http://ftp.daper.net/pub/soft/moc/unstable/moc-${version}.tar.bz2"; - sha256 = "076816da9c6d1e61a386a1dda5f63ee2fc84bc31e9011ef70acc1d391d4c46a6"; + sha256 = "486d50584c3fb0067b8c03af54e44351633a7740b18dc3b7358322051467034c"; }; configurePhase = "./configure prefix=$out"; - buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg_0_10 libvorbis mpc libsndfile jackaudio db libmodplug timidity libid3tag libtool ]; + buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis mpc libsndfile jackaudio db libmodplug timidity libid3tag libtool ]; meta = { description = "MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use."; diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 6db80f39e2cf..f690b914abe0 100755 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, ncurses, mpd_clientlib }: +{ stdenv, fetchurl, pkgconfig, glib, ncurses, mpd_clientlib, libintlOrEmpty }: stdenv.mkDerivation rec { version = "0.21"; @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "648e846e305c867cb937dcb467393c2f5a30bf460bdf77b63de7af69fba1fd07"; }; - buildInputs = [ pkgconfig glib ncurses mpd_clientlib ]; + buildInputs = [ pkgconfig glib ncurses mpd_clientlib ] + ++ libintlOrEmpty; meta = with stdenv.lib; { description = "Curses-based interface for MPD (music player daemon)"; diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index c70842c399ad..a15cf2550407 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -3,12 +3,12 @@ , libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }: stdenv.mkDerivation rec { - version = "0.6.0"; + version = "0.6.1"; name = "qtractor-${version}"; src = fetchurl { url = "mirror://sourceforge/qtractor/${name}.tar.gz"; - sha256 = "0aw6g0biqzysnsk5vd6wx3q1khyav6krhjz7bzk0v7d2160bn40r"; + sha256 = "09lyz1pn2dadr1ii2msyv3n13kq3mbgpcwcyfm0brm01c2fnh6wc"; }; buildInputs = diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index f1d3be317d17..c201536ed347 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "1cx3qs9vrdwmym2qsghqq53bshnjqgpqypsilr1m2i1cpfnfrr6x"; + sha256 = "1vr6jbqnsgdq3v2h1ndp4pirnil3119dqwlq0k0kdscmcskvb9j4"; }; buildInputs = [ jackaudio libsndfile lv2 qt4 ]; diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 4037b88ecb7e..d1c2230cf16d 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "synthv1-${version}"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { url = "mirror://sourceforge/synthv1/${name}.tar.gz"; - sha256 = "1j1x8n3rlwrh373wqmm6mj3cgyk3apvnpqygx1700fl4cf249agl"; + sha256 = "1r4fszbzwd0yfcch0mcsmh7781zw1317hiljn85w79721fs2m8hc"; }; buildInputs = [ qt4 jackaudio lv2 ]; diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix index ad2bd2f0ba6a..9af7c24e8008 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, emacs, texinfo, which, texLive }: stdenv.mkDerivation rec { - name = "org-8.2.1"; + name = "org-8.2.6"; src = fetchurl { url = "http://orgmode.org/${name}.tar.gz"; - sha256 = "625e2b6786158bcf6c43194075f7638ab8048c68a60025289a051c407e467823"; + sha256 = "0f196r0n9m2np123sjabsqdw68h9qp6qr7l5v257am8qs7rj0jm1"; }; buildInputs = [ emacs ]; diff --git a/pkgs/applications/misc/arbtt/default.nix b/pkgs/applications/misc/arbtt/default.nix index b8c56baf9560..b5ecf8fa1d11 100644 --- a/pkgs/applications/misc/arbtt/default.nix +++ b/pkgs/applications/misc/arbtt/default.nix @@ -19,6 +19,7 @@ cabal.mkDerivation (self: { tastyGolden tastyHunit time transformers utf8String ]; extraLibraries = [ libXScrnSaver ]; + jailbreak = true; meta = { homepage = "http://arbtt.nomeata.de/"; description = "Automatic Rule-Based Time Tracker"; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 81bd9e1e97e9..a89735c093f3 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -19,12 +19,42 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + my_soname = "libmupdf.so.1.3"; + my_soname_js_none = "libmupdf-js-none.so.1.3"; preBuild = '' - export makeFlags="prefix=$out build=release" + export makeFlags="prefix=$out build=release XCFLAGS=-fpic" export NIX_CFLAGS_COMPILE=" $NIX_CFLAGS_COMPILE -I$(echo ${openjpeg}/include/openjpeg-*) " + + # Copied from Gentoo ebuild + rm -rf thirdparty + sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \ + -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \ + -e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \ + -e "\$a\$(MUPDF_JS_NONE_LIB):" \ + -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \ + -e "/^MUPDF_JS_NONE_LIB :=/s:=.*:= \$(OUT)/${my_soname_js_none}:" \ + -i Makefile + + sed -e "s/libopenjpeg1/libopenjp2/" -i Makerules ''; postInstall = '' + ln -s ${my_soname} $out/lib/libmupdf.so + + mkdir -p "$out/lib/pkgconfig" + cat >"$out/lib/pkgconfig/mupdf.pc" <<EOF + prefix=$out + libdir=$out/lib + includedir=$out/include + + Name: mupdf + Description: Library for rendering PDF documents + Requires: freetype2 libopenjp2 libcrypto + Version: 1.3 + Libs: -L$out/lib -lmupdf + Cflags: -I$out/include + EOF + mkdir -p $out/share/applications cat > $out/share/applications/mupdf.desktop <<EOF [Desktop Entry] diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 52f0ef9cde39..7392123673ad 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -25,7 +25,10 @@ stdenv.mkDerivation (rec { outputs = [ "out" "terminfo" ]; - patches = [ ./rxvt-unicode-9.06-font-width.patch ]; + patches = [ + ./rxvt-unicode-9.06-font-width.patch + ./rxvt-unicode-256-color-resources.patch + ]; preConfigure = '' diff --git a/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-256-color-resources.patch b/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-256-color-resources.patch new file mode 100644 index 000000000000..c8d2acfbdc51 --- /dev/null +++ b/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-256-color-resources.patch @@ -0,0 +1,255 @@ +diff --git a/src/xdefaults.C b/src/xdefaults.C +index 23b6822..382f3b1 100644 +--- a/src/xdefaults.C ++++ b/src/xdefaults.C +@@ -155,6 +155,250 @@ optList[] = { + RSTRG (Rs_color + minCOLOR + 5, "color5", "color"), + RSTRG (Rs_color + minCOLOR + 6, "color6", "color"), + RSTRG (Rs_color + minCOLOR + 7, "color7", "color"), ++ // 88 xterm colors ++ RSTRG (Rs_color + minCOLOR + 16, "color16", "color"), ++ RSTRG (Rs_color + minCOLOR + 17, "color17", "color"), ++ RSTRG (Rs_color + minCOLOR + 18, "color18", "color"), ++ RSTRG (Rs_color + minCOLOR + 19, "color19", "color"), ++ RSTRG (Rs_color + minCOLOR + 20, "color20", "color"), ++ RSTRG (Rs_color + minCOLOR + 21, "color21", "color"), ++ RSTRG (Rs_color + minCOLOR + 22, "color22", "color"), ++ RSTRG (Rs_color + minCOLOR + 23, "color23", "color"), ++ RSTRG (Rs_color + minCOLOR + 24, "color24", "color"), ++ RSTRG (Rs_color + minCOLOR + 25, "color25", "color"), ++ RSTRG (Rs_color + minCOLOR + 26, "color26", "color"), ++ RSTRG (Rs_color + minCOLOR + 27, "color27", "color"), ++ RSTRG (Rs_color + minCOLOR + 28, "color28", "color"), ++ RSTRG (Rs_color + minCOLOR + 29, "color29", "color"), ++ RSTRG (Rs_color + minCOLOR + 30, "color30", "color"), ++ RSTRG (Rs_color + minCOLOR + 31, "color31", "color"), ++ RSTRG (Rs_color + minCOLOR + 32, "color32", "color"), ++ RSTRG (Rs_color + minCOLOR + 33, "color33", "color"), ++ RSTRG (Rs_color + minCOLOR + 34, "color34", "color"), ++ RSTRG (Rs_color + minCOLOR + 35, "color35", "color"), ++ RSTRG (Rs_color + minCOLOR + 36, "color36", "color"), ++ RSTRG (Rs_color + minCOLOR + 37, "color37", "color"), ++ RSTRG (Rs_color + minCOLOR + 38, "color38", "color"), ++ RSTRG (Rs_color + minCOLOR + 39, "color39", "color"), ++ RSTRG (Rs_color + minCOLOR + 40, "color40", "color"), ++ RSTRG (Rs_color + minCOLOR + 41, "color41", "color"), ++ RSTRG (Rs_color + minCOLOR + 42, "color42", "color"), ++ RSTRG (Rs_color + minCOLOR + 43, "color43", "color"), ++ RSTRG (Rs_color + minCOLOR + 44, "color44", "color"), ++ RSTRG (Rs_color + minCOLOR + 45, "color45", "color"), ++ RSTRG (Rs_color + minCOLOR + 46, "color46", "color"), ++ RSTRG (Rs_color + minCOLOR + 47, "color47", "color"), ++ RSTRG (Rs_color + minCOLOR + 48, "color48", "color"), ++ RSTRG (Rs_color + minCOLOR + 49, "color49", "color"), ++ RSTRG (Rs_color + minCOLOR + 50, "color50", "color"), ++ RSTRG (Rs_color + minCOLOR + 51, "color51", "color"), ++ RSTRG (Rs_color + minCOLOR + 52, "color52", "color"), ++ RSTRG (Rs_color + minCOLOR + 53, "color53", "color"), ++ RSTRG (Rs_color + minCOLOR + 54, "color54", "color"), ++ RSTRG (Rs_color + minCOLOR + 55, "color55", "color"), ++ RSTRG (Rs_color + minCOLOR + 56, "color56", "color"), ++ RSTRG (Rs_color + minCOLOR + 57, "color57", "color"), ++ RSTRG (Rs_color + minCOLOR + 58, "color58", "color"), ++ RSTRG (Rs_color + minCOLOR + 59, "color59", "color"), ++ RSTRG (Rs_color + minCOLOR + 60, "color60", "color"), ++ RSTRG (Rs_color + minCOLOR + 61, "color61", "color"), ++ RSTRG (Rs_color + minCOLOR + 62, "color62", "color"), ++ RSTRG (Rs_color + minCOLOR + 63, "color63", "color"), ++ RSTRG (Rs_color + minCOLOR + 64, "color64", "color"), ++ RSTRG (Rs_color + minCOLOR + 65, "color65", "color"), ++ RSTRG (Rs_color + minCOLOR + 66, "color66", "color"), ++ RSTRG (Rs_color + minCOLOR + 67, "color67", "color"), ++ RSTRG (Rs_color + minCOLOR + 68, "color68", "color"), ++ RSTRG (Rs_color + minCOLOR + 69, "color69", "color"), ++ RSTRG (Rs_color + minCOLOR + 70, "color70", "color"), ++ RSTRG (Rs_color + minCOLOR + 71, "color71", "color"), ++ RSTRG (Rs_color + minCOLOR + 72, "color72", "color"), ++ RSTRG (Rs_color + minCOLOR + 73, "color73", "color"), ++ RSTRG (Rs_color + minCOLOR + 74, "color74", "color"), ++ RSTRG (Rs_color + minCOLOR + 75, "color75", "color"), ++ RSTRG (Rs_color + minCOLOR + 76, "color76", "color"), ++ RSTRG (Rs_color + minCOLOR + 77, "color77", "color"), ++ RSTRG (Rs_color + minCOLOR + 78, "color78", "color"), ++ RSTRG (Rs_color + minCOLOR + 79, "color79", "color"), ++ RSTRG (Rs_color + minCOLOR + 80, "color80", "color"), ++ RSTRG (Rs_color + minCOLOR + 81, "color81", "color"), ++ RSTRG (Rs_color + minCOLOR + 82, "color82", "color"), ++ RSTRG (Rs_color + minCOLOR + 83, "color83", "color"), ++ RSTRG (Rs_color + minCOLOR + 84, "color84", "color"), ++ RSTRG (Rs_color + minCOLOR + 85, "color85", "color"), ++ RSTRG (Rs_color + minCOLOR + 86, "color86", "color"), ++ RSTRG (Rs_color + minCOLOR + 87, "color87", "color"), ++#if USE_256_COLORS ++ // 256 xterm colors ++ RSTRG (Rs_color + minCOLOR + 88, "color88", "color"), ++ RSTRG (Rs_color + minCOLOR + 89, "color89", "color"), ++ RSTRG (Rs_color + minCOLOR + 90, "color90", "color"), ++ RSTRG (Rs_color + minCOLOR + 91, "color91", "color"), ++ RSTRG (Rs_color + minCOLOR + 92, "color92", "color"), ++ RSTRG (Rs_color + minCOLOR + 93, "color93", "color"), ++ RSTRG (Rs_color + minCOLOR + 94, "color94", "color"), ++ RSTRG (Rs_color + minCOLOR + 95, "color95", "color"), ++ RSTRG (Rs_color + minCOLOR + 96, "color96", "color"), ++ RSTRG (Rs_color + minCOLOR + 97, "color97", "color"), ++ RSTRG (Rs_color + minCOLOR + 98, "color98", "color"), ++ RSTRG (Rs_color + minCOLOR + 99, "color99", "color"), ++ RSTRG (Rs_color + minCOLOR + 100, "color100", "color"), ++ RSTRG (Rs_color + minCOLOR + 101, "color101", "color"), ++ RSTRG (Rs_color + minCOLOR + 102, "color102", "color"), ++ RSTRG (Rs_color + minCOLOR + 103, "color103", "color"), ++ RSTRG (Rs_color + minCOLOR + 104, "color104", "color"), ++ RSTRG (Rs_color + minCOLOR + 105, "color105", "color"), ++ RSTRG (Rs_color + minCOLOR + 106, "color106", "color"), ++ RSTRG (Rs_color + minCOLOR + 107, "color107", "color"), ++ RSTRG (Rs_color + minCOLOR + 108, "color108", "color"), ++ RSTRG (Rs_color + minCOLOR + 109, "color109", "color"), ++ RSTRG (Rs_color + minCOLOR + 110, "color110", "color"), ++ RSTRG (Rs_color + minCOLOR + 111, "color111", "color"), ++ RSTRG (Rs_color + minCOLOR + 112, "color112", "color"), ++ RSTRG (Rs_color + minCOLOR + 113, "color113", "color"), ++ RSTRG (Rs_color + minCOLOR + 114, "color114", "color"), ++ RSTRG (Rs_color + minCOLOR + 115, "color115", "color"), ++ RSTRG (Rs_color + minCOLOR + 116, "color116", "color"), ++ RSTRG (Rs_color + minCOLOR + 117, "color117", "color"), ++ RSTRG (Rs_color + minCOLOR + 118, "color118", "color"), ++ RSTRG (Rs_color + minCOLOR + 119, "color119", "color"), ++ RSTRG (Rs_color + minCOLOR + 120, "color120", "color"), ++ RSTRG (Rs_color + minCOLOR + 121, "color121", "color"), ++ RSTRG (Rs_color + minCOLOR + 122, "color122", "color"), ++ RSTRG (Rs_color + minCOLOR + 123, "color123", "color"), ++ RSTRG (Rs_color + minCOLOR + 124, "color124", "color"), ++ RSTRG (Rs_color + minCOLOR + 125, "color125", "color"), ++ RSTRG (Rs_color + minCOLOR + 126, "color126", "color"), ++ RSTRG (Rs_color + minCOLOR + 127, "color127", "color"), ++ RSTRG (Rs_color + minCOLOR + 128, "color128", "color"), ++ RSTRG (Rs_color + minCOLOR + 129, "color129", "color"), ++ RSTRG (Rs_color + minCOLOR + 130, "color130", "color"), ++ RSTRG (Rs_color + minCOLOR + 131, "color131", "color"), ++ RSTRG (Rs_color + minCOLOR + 132, "color132", "color"), ++ RSTRG (Rs_color + minCOLOR + 133, "color133", "color"), ++ RSTRG (Rs_color + minCOLOR + 134, "color134", "color"), ++ RSTRG (Rs_color + minCOLOR + 135, "color135", "color"), ++ RSTRG (Rs_color + minCOLOR + 136, "color136", "color"), ++ RSTRG (Rs_color + minCOLOR + 137, "color137", "color"), ++ RSTRG (Rs_color + minCOLOR + 138, "color138", "color"), ++ RSTRG (Rs_color + minCOLOR + 139, "color139", "color"), ++ RSTRG (Rs_color + minCOLOR + 140, "color140", "color"), ++ RSTRG (Rs_color + minCOLOR + 141, "color141", "color"), ++ RSTRG (Rs_color + minCOLOR + 142, "color142", "color"), ++ RSTRG (Rs_color + minCOLOR + 143, "color143", "color"), ++ RSTRG (Rs_color + minCOLOR + 144, "color144", "color"), ++ RSTRG (Rs_color + minCOLOR + 145, "color145", "color"), ++ RSTRG (Rs_color + minCOLOR + 146, "color146", "color"), ++ RSTRG (Rs_color + minCOLOR + 147, "color147", "color"), ++ RSTRG (Rs_color + minCOLOR + 148, "color148", "color"), ++ RSTRG (Rs_color + minCOLOR + 149, "color149", "color"), ++ RSTRG (Rs_color + minCOLOR + 150, "color150", "color"), ++ RSTRG (Rs_color + minCOLOR + 151, "color151", "color"), ++ RSTRG (Rs_color + minCOLOR + 152, "color152", "color"), ++ RSTRG (Rs_color + minCOLOR + 153, "color153", "color"), ++ RSTRG (Rs_color + minCOLOR + 154, "color154", "color"), ++ RSTRG (Rs_color + minCOLOR + 155, "color155", "color"), ++ RSTRG (Rs_color + minCOLOR + 156, "color156", "color"), ++ RSTRG (Rs_color + minCOLOR + 157, "color157", "color"), ++ RSTRG (Rs_color + minCOLOR + 158, "color158", "color"), ++ RSTRG (Rs_color + minCOLOR + 159, "color159", "color"), ++ RSTRG (Rs_color + minCOLOR + 160, "color160", "color"), ++ RSTRG (Rs_color + minCOLOR + 161, "color161", "color"), ++ RSTRG (Rs_color + minCOLOR + 162, "color162", "color"), ++ RSTRG (Rs_color + minCOLOR + 163, "color163", "color"), ++ RSTRG (Rs_color + minCOLOR + 164, "color164", "color"), ++ RSTRG (Rs_color + minCOLOR + 165, "color165", "color"), ++ RSTRG (Rs_color + minCOLOR + 166, "color166", "color"), ++ RSTRG (Rs_color + minCOLOR + 167, "color167", "color"), ++ RSTRG (Rs_color + minCOLOR + 168, "color168", "color"), ++ RSTRG (Rs_color + minCOLOR + 169, "color169", "color"), ++ RSTRG (Rs_color + minCOLOR + 170, "color170", "color"), ++ RSTRG (Rs_color + minCOLOR + 171, "color171", "color"), ++ RSTRG (Rs_color + minCOLOR + 172, "color172", "color"), ++ RSTRG (Rs_color + minCOLOR + 173, "color173", "color"), ++ RSTRG (Rs_color + minCOLOR + 174, "color174", "color"), ++ RSTRG (Rs_color + minCOLOR + 175, "color175", "color"), ++ RSTRG (Rs_color + minCOLOR + 176, "color176", "color"), ++ RSTRG (Rs_color + minCOLOR + 177, "color177", "color"), ++ RSTRG (Rs_color + minCOLOR + 178, "color178", "color"), ++ RSTRG (Rs_color + minCOLOR + 179, "color179", "color"), ++ RSTRG (Rs_color + minCOLOR + 180, "color180", "color"), ++ RSTRG (Rs_color + minCOLOR + 181, "color181", "color"), ++ RSTRG (Rs_color + minCOLOR + 182, "color182", "color"), ++ RSTRG (Rs_color + minCOLOR + 183, "color183", "color"), ++ RSTRG (Rs_color + minCOLOR + 184, "color184", "color"), ++ RSTRG (Rs_color + minCOLOR + 185, "color185", "color"), ++ RSTRG (Rs_color + minCOLOR + 186, "color186", "color"), ++ RSTRG (Rs_color + minCOLOR + 187, "color187", "color"), ++ RSTRG (Rs_color + minCOLOR + 188, "color188", "color"), ++ RSTRG (Rs_color + minCOLOR + 189, "color189", "color"), ++ RSTRG (Rs_color + minCOLOR + 190, "color190", "color"), ++ RSTRG (Rs_color + minCOLOR + 191, "color191", "color"), ++ RSTRG (Rs_color + minCOLOR + 192, "color192", "color"), ++ RSTRG (Rs_color + minCOLOR + 193, "color193", "color"), ++ RSTRG (Rs_color + minCOLOR + 194, "color194", "color"), ++ RSTRG (Rs_color + minCOLOR + 195, "color195", "color"), ++ RSTRG (Rs_color + minCOLOR + 196, "color196", "color"), ++ RSTRG (Rs_color + minCOLOR + 197, "color197", "color"), ++ RSTRG (Rs_color + minCOLOR + 198, "color198", "color"), ++ RSTRG (Rs_color + minCOLOR + 199, "color199", "color"), ++ RSTRG (Rs_color + minCOLOR + 200, "color200", "color"), ++ RSTRG (Rs_color + minCOLOR + 201, "color201", "color"), ++ RSTRG (Rs_color + minCOLOR + 202, "color202", "color"), ++ RSTRG (Rs_color + minCOLOR + 203, "color203", "color"), ++ RSTRG (Rs_color + minCOLOR + 204, "color204", "color"), ++ RSTRG (Rs_color + minCOLOR + 205, "color205", "color"), ++ RSTRG (Rs_color + minCOLOR + 206, "color206", "color"), ++ RSTRG (Rs_color + minCOLOR + 207, "color207", "color"), ++ RSTRG (Rs_color + minCOLOR + 208, "color208", "color"), ++ RSTRG (Rs_color + minCOLOR + 209, "color209", "color"), ++ RSTRG (Rs_color + minCOLOR + 210, "color210", "color"), ++ RSTRG (Rs_color + minCOLOR + 211, "color211", "color"), ++ RSTRG (Rs_color + minCOLOR + 212, "color212", "color"), ++ RSTRG (Rs_color + minCOLOR + 213, "color213", "color"), ++ RSTRG (Rs_color + minCOLOR + 214, "color214", "color"), ++ RSTRG (Rs_color + minCOLOR + 215, "color215", "color"), ++ RSTRG (Rs_color + minCOLOR + 216, "color216", "color"), ++ RSTRG (Rs_color + minCOLOR + 217, "color217", "color"), ++ RSTRG (Rs_color + minCOLOR + 218, "color218", "color"), ++ RSTRG (Rs_color + minCOLOR + 219, "color219", "color"), ++ RSTRG (Rs_color + minCOLOR + 220, "color220", "color"), ++ RSTRG (Rs_color + minCOLOR + 221, "color221", "color"), ++ RSTRG (Rs_color + minCOLOR + 222, "color222", "color"), ++ RSTRG (Rs_color + minCOLOR + 223, "color223", "color"), ++ RSTRG (Rs_color + minCOLOR + 224, "color224", "color"), ++ RSTRG (Rs_color + minCOLOR + 225, "color225", "color"), ++ RSTRG (Rs_color + minCOLOR + 226, "color226", "color"), ++ RSTRG (Rs_color + minCOLOR + 227, "color227", "color"), ++ RSTRG (Rs_color + minCOLOR + 228, "color228", "color"), ++ RSTRG (Rs_color + minCOLOR + 229, "color229", "color"), ++ RSTRG (Rs_color + minCOLOR + 230, "color230", "color"), ++ RSTRG (Rs_color + minCOLOR + 231, "color231", "color"), ++ RSTRG (Rs_color + minCOLOR + 232, "color232", "color"), ++ RSTRG (Rs_color + minCOLOR + 233, "color233", "color"), ++ RSTRG (Rs_color + minCOLOR + 234, "color234", "color"), ++ RSTRG (Rs_color + minCOLOR + 235, "color235", "color"), ++ RSTRG (Rs_color + minCOLOR + 236, "color236", "color"), ++ RSTRG (Rs_color + minCOLOR + 237, "color237", "color"), ++ RSTRG (Rs_color + minCOLOR + 238, "color238", "color"), ++ RSTRG (Rs_color + minCOLOR + 239, "color239", "color"), ++ RSTRG (Rs_color + minCOLOR + 240, "color240", "color"), ++ RSTRG (Rs_color + minCOLOR + 241, "color241", "color"), ++ RSTRG (Rs_color + minCOLOR + 242, "color242", "color"), ++ RSTRG (Rs_color + minCOLOR + 243, "color243", "color"), ++ RSTRG (Rs_color + minCOLOR + 244, "color244", "color"), ++ RSTRG (Rs_color + minCOLOR + 245, "color245", "color"), ++ RSTRG (Rs_color + minCOLOR + 246, "color246", "color"), ++ RSTRG (Rs_color + minCOLOR + 247, "color247", "color"), ++ RSTRG (Rs_color + minCOLOR + 248, "color248", "color"), ++ RSTRG (Rs_color + minCOLOR + 249, "color249", "color"), ++ RSTRG (Rs_color + minCOLOR + 250, "color250", "color"), ++ RSTRG (Rs_color + minCOLOR + 251, "color251", "color"), ++ RSTRG (Rs_color + minCOLOR + 252, "color252", "color"), ++ RSTRG (Rs_color + minCOLOR + 253, "color253", "color"), ++ RSTRG (Rs_color + minCOLOR + 254, "color254", "color"), ++ RSTRG (Rs_color + minCOLOR + 255, "color255", "color"), ++#endif + RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"), + RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"), + RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"), diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index fb6b011f30a4..0bc2170340c8 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, which, openssl, qt4, libtool }: +{ stdenv, fetchurl, pkgconfig, which, openssl, qt4, libtool, gcc, makeWrapper }: stdenv.mkDerivation rec { name = "xca-${version}"; @@ -15,7 +15,12 @@ stdenv.mkDerivation rec { prefix=$out ./configure ${openssl} ${libtool} ''; - buildInputs = [ openssl qt4 libtool ]; + postInstall = '' + wrapProgram "$out/bin/xca" \ + --prefix LD_LIBRARY_PATH : "${qt4}/lib:${gcc.gcc}/lib:${gcc.gcc}/lib64:${openssl}/lib:${libtool}/lib" + ''; + + buildInputs = [ openssl qt4 libtool gcc makeWrapper ]; nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index 227fa438a14a..acd0568772aa 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -1,6 +1,7 @@ -{ cabal, alsaCore, alsaMixer, filepath, HTTP, libmpd, libXrandr -, mtl, parsec, regexCompat, stm, time, utf8String, wirelesstools -, X11, X11Xft +{ cabal, alsaCore, alsaMixer, dbus, filepath, hinotify, HTTP +, libmpd, libXrandr, mtl, parsec, regexCompat, stm, time +, timezoneOlson, timezoneSeries, utf8String, wirelesstools, X11 +, X11Xft }: cabal.mkDerivation (self: { @@ -10,11 +11,12 @@ cabal.mkDerivation (self: { isLibrary = false; isExecutable = true; buildDepends = [ - alsaCore alsaMixer filepath HTTP libmpd mtl parsec regexCompat stm - time utf8String X11 X11Xft + alsaCore alsaMixer dbus filepath hinotify HTTP libmpd mtl parsec + regexCompat stm time timezoneOlson timezoneSeries utf8String X11 + X11Xft ]; extraLibraries = [ libXrandr wirelesstools ]; - configureFlags = "-fwith_xft -fwith_iwlib -fwith_alsa -fwith_mpd"; + configureFlags = "-fall_extensions"; meta = { homepage = "http://projects.haskell.org/xmobar/"; description = "A Minimalistic Text Based Status Bar"; diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index f943bff7bf0c..1a4ab3d772c5 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/pkgs/applications/misc/zathura/default.nix @@ -1,4 +1,4 @@ -{ callPackage, pkgs, fetchurl }: +{ callPackage, pkgs, fetchurl, useMupdf }: rec { inherit (pkgs) stdenv; @@ -12,6 +12,10 @@ rec { zathura_pdf_poppler = callPackage ./pdf-poppler { }; + zathura_pdf_mupdf = callPackage ./pdf-mupdf { + gtk = pkgs.gtk3; + }; + zathura_djvu = callPackage ./djvu { gtk = pkgs.gtk3; }; @@ -27,9 +31,9 @@ rec { name = "zathura-${zathura_core.version}"; plugins_path = stdenv.lib.makeSearchPath "lib" [ - zathura_pdf_poppler zathura_djvu zathura_ps + (if useMupdf then zathura_pdf_mupdf else zathura_pdf_poppler) ]; builder = ./builder.sh; diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/config.patch b/pkgs/applications/misc/zathura/pdf-mupdf/config.patch new file mode 100644 index 000000000000..c7d172c92634 --- /dev/null +++ b/pkgs/applications/misc/zathura/pdf-mupdf/config.patch @@ -0,0 +1,17 @@ +--- zathura-pdf-mupdf-0.2.6/config.mk ++++ zathura-pdf-mupdf-0.2.6/config.mk +@@ -32,10 +32,11 @@ + OPENSSL_INC ?= $(shell pkg-config --cflags libcrypto) + OPENSSL_LIB ?= $(shell pkg-config --libs libcrypto) + +-MUPDF_LIB ?= -lmupdf -lmupdf-js-none ++MUPDF_INC ?= $(shell pkg-config --cflags mupdf) ++MUPDF_LIB ?= $(shell pkg-config --libs mupdf) + +-INCS = ${GTK_INC} ${GIRARA_INC} ${OPENSSL_INC} ${ZATHURA_INC} +-LIBS = ${GTK_LIB} ${GIRARA_LIB} ${MUPDF_LIB} ${OPENSSL_LIB} -ljbig2dec -lopenjp2 -ljpeg ++INCS = ${GTK_INC} ${GIRARA_INC} ${OPENSSL_INC} ${ZATHURA_INC} ${MUPDF_INC} ++LIBS = ${GTK_LIB} ${GIRARA_LIB} ${OPENSSL_LIB} ${MUPDF_LIB} -ljbig2dec -ljpeg + + # flags + CFLAGS += -std=c99 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS) diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix new file mode 100644 index 000000000000..4e585d852a2a --- /dev/null +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, zathura_core, gtk, girara, mupdf, openssl, openjpeg, libjpeg, jbig2dec }: + +stdenv.mkDerivation rec { + version = "0.2.6"; + name = "zathura-pdf-mupdf-${version}"; + + src = fetchurl { + url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; + sha256 = "5df94b6f906008b5f3bca770a552da6d2917d6b8d3e4b3049cb7001302041b20"; + }; + + buildInputs = [ pkgconfig zathura_core gtk girara openssl mupdf openjpeg libjpeg jbig2dec ]; + + makeFlags = "PREFIX=$(out) PLUGINDIR=$(out)/lib"; + + preConfigure = "patch -p1 < ${./config.patch}"; + + meta = { + homepage = http://pwmt.org/projects/zathura/; + description = "A zathura PDF plugin (mupdf)"; + longDescription = '' + The zathura-pdf-mupdf plugin adds PDF support to zathura by + using the mupdf rendering library. + ''; + license = stdenv.lib.licenses.zlib; + platforms = stdenv.lib.platforms.linux; +# maintainers = [ ]; + }; +} diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index ce4894e6c0f1..6625bf471942 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, zathura_core, girara, poppler, gettext }: +{ stdenv, fetchurl, pkgconfig, zathura_core, girara, poppler }: stdenv.mkDerivation rec { version = "0.2.5"; @@ -9,16 +9,16 @@ stdenv.mkDerivation rec { sha256 = "1b0chsds8iwjm4g629p6a67nb6wgra65pw2vvngd7g35dmcjgcv0"; }; - buildInputs = [ pkgconfig poppler gettext zathura_core girara ]; + buildInputs = [ pkgconfig poppler zathura_core girara ]; makeFlags = "PREFIX=$(out) PLUGINDIR=$(out)/lib"; meta = { homepage = http://pwmt.org/projects/zathura/; - description = "A zathura PDF plugin"; + description = "A zathura PDF plugin (poppler)"; longDescription = '' The zathura-pdf-poppler plugin adds PDF support to zathura by - using the poppler rendering engine. + using the poppler rendering library. ''; license = stdenv.lib.licenses.zlib; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix index 010dbd168a8d..b426019efca3 100644 --- a/pkgs/applications/networking/browsers/dwb/default.nix +++ b/pkgs/applications/networking/browsers/dwb/default.nix @@ -2,12 +2,12 @@ m4, glib_networking, gsettings_desktop_schemas }: stdenv.mkDerivation { - name = "dwb-2014-04-20"; + name = "dwb-2014-05-23"; src = fetchgit { url = "https://bitbucket.org/portix/dwb.git"; - rev = "117a6a8cdb84b30b0c084dee531b650664d09ba2"; - sha256 = "1k1nax3ij64b2hbn9paqj128yyzy41b61xd2m1ayq9y17k9als0b"; + rev = "813457c0cb6603d3b7a548fc97a8298a7fac34fa"; + sha256 = "1fywnf3yp6p84hap40nb9vrz1gswgnhppygmi1gzjzz3bphwf5pr"; }; buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup webkit gtk3 gnutls json_c m4 ]; diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index 0a9703d5e34a..766ec0c17fc0 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, curl, coreutils, gawk, bash, which }: stdenv.mkDerivation { - name = "esniper-2.29.0"; + name = "esniper-2.30.0"; src = fetchurl { - url = "mirror://sourceforge/esniper/esniper-2-29-0.tgz"; - sha256 = "052jfbzm0a88h3hss2vg1vfdrhibjwhbcdnwsbkk5i1z0jj16xxc"; + url = "mirror://sourceforge/esniper/esniper-2-30-0.tgz"; + sha256 = "1p85d5qfr3f35xfj5555ck4wwk5hqkh65ivam1527p8dwcz00wpl"; }; buildInputs = [ openssl curl ]; diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index c0f76602b2bb..6da12905f560 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -1,59 +1,96 @@ -{ stdenv -, fetchurl -, libtool -, libXext -, libSM -, libICE -, libX11 -, libXft -, libXau -, libXdmcp -, libXrender -, freetype -, fontconfig -, openssl -}: +{ stdenv, fetchurl, libtool, xlibs, freetype, fontconfig, openssl, glib +, mesa, gstreamer, gst_plugins_base, dbus, alsaLib, zlib, libuuid +, libxml2, libxslt, sqlite, libogg, libvorbis, xz, libcanberra +, makeWrapper, libredirect, xkeyboard_config }: let - version = "1.94.407"; + + version = "2.2.1107"; rpath = stdenv.lib.makeSearchPath "lib" [ stdenv.glibc - stdenv.gcc.gcc libtool - libXext - libSM - libICE - libX11 - libXft - libXau - libXdmcp - libXrender + xlibs.libXext + xlibs.libSM + xlibs.libICE + xlibs.libX11 + xlibs.libXft + xlibs.libXau + xlibs.libXdmcp + xlibs.libXrender + xlibs.libXfixes + xlibs.libXcomposite + xlibs.libxcb + xlibs.libXi freetype fontconfig openssl - ]; + glib + mesa + gstreamer + gst_plugins_base + dbus + alsaLib + zlib + libuuid + libxml2 + libxslt + sqlite + libogg + libvorbis + xz + libcanberra + ] + ":${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}"; - src = fetchurl { - url = "http://downloads.hipchat.com/linux/arch/hipchat-${version}-i686.pkg.tar.xz"; - sha256 = "0kyjpa2ir066zqkvs1zmnx6kvl8v4jfl8h7bw110cgigwmiplk7k"; - }; -in stdenv.mkDerivation { + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "http://downloads.hipchat.com/linux/arch/x86_64/hipchat-${version}-x86_64.pkg.tar.xz"; + sha256 = "0lf780pxbh40m2i48cki072lrm75924cz3zgkmaxddmar3y13bwa"; + } + else if stdenv.system == "i686-linux" then + fetchurl { + url = "http://downloads.hipchat.com/linux/arch/i686/hipchat-${version}-i686.pkg.tar.xz"; + sha256 = "1k33670rpigdpy9jcacryc1i05ykp5yffcplmbm5q29ng54cn0zv"; + } + else + throw "HipChat is not supported on ${stdenv.system}"; + +in + +stdenv.mkDerivation { name = "hipchat-${version}"; + inherit src; + + buildInputs = [ makeWrapper ]; + buildCommand = '' tar xf ${src} - mkdir -p $out - mv opt/HipChat/lib $out - mv opt/HipChat/bin $out + + mkdir -p $out/libexec/hipchat/bin + d=$out/libexec/hipchat/lib + rm -rfv opt/HipChat/lib/{libstdc++*,libz*,libuuid*,libxml2*,libxslt*,libsqlite*,libogg*,libvorbis*,liblzma*,libcanberra.*,libcanberra-*} + mv opt/HipChat/lib/ $d mv usr/share $out + patchShebangs $out/bin - for file in $(find $out/lib -type f); do - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $file || true - patchelf --set-rpath ${rpath}:$out/lib $file || true + + for file in $(find $d -type f); do + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $file || true + patchelf --set-rpath ${rpath}:\$ORIGIN $file || true done + substituteInPlace $out/share/applications/hipchat.desktop \ --replace /opt/HipChat/bin $out/bin + + makeWrapper $d/hipchat.bin $out/bin/hipchat \ + --set HIPCHAT_LD_LIBRARY_PATH '"$LD_LIBRARY_PATH"' \ + --set HIPCHAT_QT_PLUGIN_PATH '"$QT_PLUGIN_PATH"' \ + --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ + --set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb + + mv opt/HipChat/bin/linuxbrowserlaunch $out/libexec/hipchat/bin/ ''; meta = { diff --git a/pkgs/applications/networking/irc/weechat/devel.nix b/pkgs/applications/networking/irc/weechat/devel.nix index cf52838b78cc..f8558ef052e0 100644 --- a/pkgs/applications/networking/irc/weechat/devel.nix +++ b/pkgs/applications/networking/irc/weechat/devel.nix @@ -3,14 +3,14 @@ , pythonPackages, cacert, cmake, makeWrapper }: stdenv.mkDerivation rec { - rev = "6f64ee699ba46c90b55d3b99c60e4807819e2b7b"; - version = "0.4.4-rev${rev}"; + rev = "02eed97d977567b0fb16cfeeaeebb863eab1e509"; + version = "1.0-rev${rev}"; name = "weechat-${version}"; src = fetchgit { inherit rev; url = "git://github.com/weechat/weechat.git"; - sha256 = "1w58gir48kxvscf6njy3kmfxbjlnsf2byw3g3w6r47zjkgyxcf1z"; + sha256 = "0nk0p9chvn0h2pzq9793k2dz8h5iplz0zwqzyds55fbmsgzz51g2"; }; buildInputs = diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index d24437aabb6b..e9036ba92614 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { - version = "2.1.1"; + version = "3.0.4"; name = "seafile-client-${version}"; src = fetchurl { url = "https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz"; - sha256 = "d98515ea229df702cbe973d85ec0bd5cf3f5282ef1022ba0157d5301b521c8e0"; + sha256 = "10iz45y8j5f9smi0srxw62frb97vhr0w938v8w3rsjcw9qq366a2"; }; buildInputs = [ pkgconfig cmake qt4 seafile-shared makeWrapper ]; diff --git a/pkgs/build-support/build-fhs-chrootenv/default.nix b/pkgs/build-support/build-fhs-chrootenv/default.nix index 2f3aa14c6a0f..e807a04628a3 100644 --- a/pkgs/build-support/build-fhs-chrootenv/default.nix +++ b/pkgs/build-support/build-fhs-chrootenv/default.nix @@ -1,11 +1,11 @@ {stdenv, glibc, glibcLocales, gcc, coreutils, diffutils, findutils, gnused, gnugrep, gnutar, gzip, bzip2, -bashInteractive, xz, shadow, gawk, less, su, buildEnv}: +bashInteractive, xz, shadow, gawk, less, buildEnv}: {name, pkgs ? [], profile ? ""}: let basePkgs = [ glibc glibcLocales gcc coreutils diffutils findutils gnused gnugrep gnutar - gzip bzip2 bashInteractive xz shadow gawk less su + gzip bzip2 bashInteractive xz shadow gawk less ]; # Compose a global profile for the chroot environment diff --git a/pkgs/build-support/build-fhs-chrootenv/load.sh.in b/pkgs/build-support/build-fhs-chrootenv/load.sh.in index 8d3f464186b7..6089fa275855 100644 --- a/pkgs/build-support/build-fhs-chrootenv/load.sh.in +++ b/pkgs/build-support/build-fhs-chrootenv/load.sh.in @@ -3,4 +3,4 @@ chrootenvDest=/run/chrootenv/@name@ # Enter the LFS chroot environment -chroot $chrootenvDest /usr/bin/env -i PS1="$PS1" TERM="$TERM" DISPLAY="$DISPLAY" HOME="/root" PATH="/bin:/sbin" /bin/bash --login +sudo chroot --userspec "$USER:${GROUPS[0]}" --groups "${GROUPS[0]}" $chrootenvDest /usr/bin/env -i PS1="$PS1" TERM="$TERM" DISPLAY="$DISPLAY" HOME="$HOME" PATH="/bin:/sbin" XDG_RUNTIME_DIR="$XDG_RUNTIME_DIR" /bin/bash --login diff --git a/pkgs/build-support/build-fhs-chrootenv/mount.sh.in b/pkgs/build-support/build-fhs-chrootenv/mount.sh.in index 68459cca2560..225d9dbc4f72 100644 --- a/pkgs/build-support/build-fhs-chrootenv/mount.sh.in +++ b/pkgs/build-support/build-fhs-chrootenv/mount.sh.in @@ -17,7 +17,7 @@ mount --bind /home $chrootenvDest/home # Bind mount state directories mount --bind /var $chrootenvDest/var -mount --bind /run $chrootenvDest/run +mount --rbind /run $chrootenvDest/run # Bind mount the host system's /etc mount --bind /etc $chrootenvDest/host-etc diff --git a/pkgs/build-support/build-fhs-chrootenv/umount.sh.in b/pkgs/build-support/build-fhs-chrootenv/umount.sh.in index 29d631fbd90b..5089141c0aa4 100644 --- a/pkgs/build-support/build-fhs-chrootenv/umount.sh.in +++ b/pkgs/build-support/build-fhs-chrootenv/umount.sh.in @@ -2,5 +2,5 @@ chrootenvDest=/run/chrootenv/@name@ -# Unmount all bind mounts -umount $chrootenvDest/{dev/pts,dev/shm,dev,nix/store,proc,sys,host-etc,home,var,run} +# Unmount all (r)bind mounts +umount -l $chrootenvDest/{dev/pts,dev/shm,dev,nix/store,proc,sys,host-etc,home,var,run} diff --git a/pkgs/build-support/libredirect/default.nix b/pkgs/build-support/libredirect/default.nix new file mode 100644 index 000000000000..a8a497d46d73 --- /dev/null +++ b/pkgs/build-support/libredirect/default.nix @@ -0,0 +1,14 @@ +{ stdenv }: + +stdenv.mkDerivation { + name = "libredirect-0"; + + unpackPhase = "cp ${./libredirect.c} libredirect.c"; + + buildPhase = + '' + gcc -Wall -std=c99 -O3 -shared libredirect.c -o libredirect.so -fPIC -ldl + ''; + + installPhase = "mkdir -p $out/lib; cp libredirect.so $out/lib"; +} diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c new file mode 100644 index 000000000000..4afed3add75b --- /dev/null +++ b/pkgs/build-support/libredirect/libredirect.c @@ -0,0 +1,104 @@ +#define _GNU_SOURCE +#include <stdio.h> +#include <stdarg.h> +#include <stdlib.h> +#include <dlfcn.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <limits.h> +#include <string.h> + +#define MAX_REDIRECTS 128 + +static int nrRedirects = 0; +static char * from[MAX_REDIRECTS]; +static char * to[MAX_REDIRECTS]; + +// FIXME: might run too late. +static void init() __attribute__((constructor)); + +static void init() +{ + char * spec = getenv("NIX_REDIRECTS"); + if (!spec) return; + + unsetenv("NIX_REDIRECTS"); + + char * spec2 = malloc(strlen(spec) + 1); + strcpy(spec2, spec); + + char * pos = spec2, * eq; + while ((eq = strchr(pos, '='))) { + *eq = 0; + from[nrRedirects] = pos; + pos = eq + 1; + to[nrRedirects] = pos; + nrRedirects++; + if (nrRedirects == MAX_REDIRECTS) break; + char * end = strchr(pos, ':'); + if (!end) break; + *end = 0; + pos = end + 1; + } + +} + +static const char * rewrite(const char * path, char * buf) +{ + for (int n = 0; n < nrRedirects; ++n) { + int len = strlen(from[n]); + if (strncmp(path, from[n], len) != 0) continue; + if (snprintf(buf, PATH_MAX, "%s%s", to[n], path + len) >= PATH_MAX) + abort(); + return buf; + } + + return path; +} + +/* The following set of Glibc library functions is very incomplete - + it contains only what we needed for programs in Nixpkgs. Just add + more functions as needed. */ + +int open(const char * path, int flags, ...) +{ + int (*open_real) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open"); + mode_t mode = 0; + if (flags & O_CREAT) { + va_list ap; + va_start(ap, flags); + mode = va_arg(ap, mode_t); + va_end(ap); + } + char buf[PATH_MAX]; + return open_real(rewrite(path, buf), flags, mode); +} + +int open64(const char * path, int flags, ...) +{ + int (*open64_real) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open64"); + mode_t mode = 0; + if (flags & O_CREAT) { + va_list ap; + va_start(ap, flags); + mode = va_arg(ap, mode_t); + va_end(ap); + } + char buf[PATH_MAX]; + return open64_real(rewrite(path, buf), flags, mode); +} + +FILE * fopen(const char * path, const char * mode) +{ + FILE * (*fopen_real) (const char *, const char *) = dlsym(RTLD_NEXT, "fopen"); + char buf[PATH_MAX]; + return fopen_real(rewrite(path, buf), mode); +} + +int __xstat(int ver, const char * path, struct stat * st) +{ + int (*__xstat_real) (int ver, const char *, struct stat *) = dlsym(RTLD_NEXT, "__xstat"); + char buf[PATH_MAX]; + return __xstat_real(ver, rewrite(path, buf), st); +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix index 967c19af540a..eb2324c9c0f2 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { accountservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo gdk_pixbuf gnome3.gnome_icon_theme librsvg clutter clutter_gtk - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic gnome3.vino networkmanager modemmanager makeWrapper ]; preBuild = '' diff --git a/pkgs/desktops/gnome-3/3.12/core/vino/default.nix b/pkgs/desktops/gnome-3/3.12/core/vino/default.nix index 2318e68930e0..8580af9b8841 100644 --- a/pkgs/desktops/gnome-3/3.12/core/vino/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/vino/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper -, libnotify, file }: +, libnotify, file, telepathy_glib, dbus_glib }: stdenv.mkDerivation rec { name = "vino-${versionMajor}.${versionMinor}"; @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { doCheck = true; - buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify file makeWrapper ]; + buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify + dbus_glib telepathy_glib file makeWrapper ]; preFixup = '' wrapProgram "$out/libexec/vino-server" \ diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix index 0600b4ebbf91..baa7113ce90f 100644 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ b/pkgs/desktops/gnome-3/3.12/default.nix @@ -211,6 +211,8 @@ rec { #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ + geary = callPackage ./misc/geary { }; + gfbgraph = callPackage ./misc/gfbgraph { }; goffice = callPackage ./misc/goffice { }; diff --git a/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix new file mode 100644 index 000000000000..1eb6c0e3ed29 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala +, makeWrapper, gdk_pixbuf, cmake, desktop_file_utils +, libnotify, libcanberra, libsecret, gmime +, libpthreadstubs, hicolor_icon_theme +, gnome3, librsvg, gnome_doc_utils, webkitgtk }: + +stdenv.mkDerivation rec { + name = "geary-0.6.0"; + + src = fetchurl { + url = "mirror://gnome/sources/geary/0.6/${name}.tar.xz"; + sha256 = "44ad1dc2c81c50006c751f8e72aa817f07002188da4c29e158060524a1962715"; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils + vala webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime + libpthreadstubs gnome3.gsettings_desktop_schemas hicolor_icon_theme + gdk_pixbuf librsvg gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme ]; + + preConfigure = '' + substituteInPlace src/CMakeLists.txt --replace '`pkg-config --variable=girdir gobject-introspection-1.0`' '${webkitgtk}/share/gir-1.0' + ''; + + postInstall = '' + mkdir -p $out/share/gsettings-schemas/${name}/ + mv $out/share/glib-2.0 $out/share/gsettings-schemas/${name} + ''; + + preFixup = '' + wrapProgram "$out/bin/geary" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + ''; + + enableParallelBuilding = true; + + patches = [ ./disable_valadoc.patch ]; + patchFlags = "-p0"; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Geary; + description = "Mail client for GNOME 3"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch b/pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch new file mode 100644 index 000000000000..e65c0dea7472 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch @@ -0,0 +1,24 @@ +--- src/CMakeLists.txt.orig 2014-05-23 14:41:20.809160364 +0200 ++++ src/CMakeLists.txt 2014-05-23 14:41:29.240261581 +0200 +@@ -696,21 +696,6 @@ + ${CMAKE_COMMAND} -E copy geary-mailer ${CMAKE_BINARY_DIR}/ + ) + +-# Valadoc +-################################################# +-foreach(pkg ${ENGINE_PACKAGES}) +- list(APPEND valadoc_pkg_opts "--pkg=${pkg}") +-endforeach(pkg ${ENGINE_PACKAGES}) +- +-include(FindValadoc) +-add_custom_target( +- valadoc +- WORKING_DIRECTORY +- ${CMAKE_SOURCE_DIR}/src +- COMMAND +- ${VALADOC_EXECUTABLE} --force --no-protected -b ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_SOURCE_DIR}/valadoc --package-name=geary --package-version=${VERSION} ${ENGINE_SRC} ${valadoc_pkg_opts} --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi +-) +- + ## Make clean: remove copied files + ################################################## + set_property( diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index 76359de65753..8098b9d278f4 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.nasm.us/; description = "An 80x86 and x86-64 assembler designed for portability and modularity"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix new file mode 100644 index 000000000000..bab8e66799b7 --- /dev/null +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -0,0 +1,41 @@ +# Binaries provided by Open Dylan to be used to bootstrap from source. +# The binaries can also be used as is. +{stdenv, fetchurl, patchelf, boehmgc, gnused, gcc, makeWrapper}: + +stdenv.mkDerivation { + name = "opendylan-2013.2"; + + src = if stdenv.system == "x86_64-linux" then fetchurl { + url = http://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86_64-linux.tar.bz2; + sha256 = "035brbw3hm7zrs593q4zc42yglj1gmmkw3b1r7zzlw3ks4i2lg7h"; + } + else if stdenv.system == "i686-linux" then fetchurl { + url = http://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86-linux.tar.bz2; + sha256 = "0c61ihvblcsjrw6ncr8x8ylhskcrqs8pajs4mg5di36cvqw12nq5"; + } + else throw "platform ${stdenv.system} not supported."; + + buildInputs = [ patchelf boehmgc gnused makeWrapper ]; + + buildCommand = '' + mkdir -p "$out" + tar --strip-components=1 -xjf "$src" -C "$out" + + interpreter="$(cat "$NIX_GCC"/nix-support/dynamic-linker)" + for a in "$out"/bin/*; do + patchelf --set-interpreter "$interpreter" "$a" + patchelf --set-rpath "$out/lib:${boehmgc}/lib" "$a" + done + for a in "$out"/lib/*.so; do + patchelf --set-rpath "$out/lib:${boehmgc}/lib" "$a" + done + sed -i -e "s|\-lgc|\-L${boehmgc}\/lib -lgc|" $out/lib/config.jam + wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin + ''; + + meta = { + homepage = http://opendylan.org; + description = "Dylan is a multi-paradigm functional and object-oriented programming language."; + license = "MIT"; + }; +} diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix new file mode 100644 index 000000000000..b1ee1d000c4c --- /dev/null +++ b/pkgs/development/compilers/opendylan/default.nix @@ -0,0 +1,37 @@ +# Build Open Dylan from source using the binary builds to bootstrap. +{stdenv, fetchgit, patchelf, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }: + +stdenv.mkDerivation { + name = "opendylan-2013.2"; + + src = fetchgit { + url = https://github.com/dylan-lang/opendylan; + rev = "ce9b14dab6cb9ffedc69fae8c6df524c0c79abd3"; + sha256 = "cec80980b838ac2581dfb6282e25d208e720d475256b75e24b23dbd30b09d21f"; + fetchSubmodules = true; + }; + + buildInputs = (if stdenv.system == "i686-linux" then [ mps ] else [ boehmgc ]) ++ [ + opendylan-bootstrap boehmgc gnused autoconf automake perl makeWrapper + ] ; + + preConfigure = if stdenv.system == "i686-linux" then '' + mkdir -p $TMPDIR/mps + tar --strip-components=1 -xf ${mps.src} -C $TMPDIR/mps + ./autogen.sh + '' + else '' + ./autogen.sh + ''; + + configureFlags = if stdenv.system == "i686-linux" then "--with-mps=$(TMPDIR)/mps" else "--with-gc=${boehmgc}"; + buildPhase = "make 3-stage-bootstrap"; + + postInstall = "wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin"; + + meta = { + homepage = http://opendylan.org; + description = "Dylan is a multi-paradigm functional and object-oriented programming language."; + license = "MIT"; + }; +} diff --git a/pkgs/development/compilers/yasm/default.nix b/pkgs/development/compilers/yasm/default.nix index 9a803a6d5106..ec1fda10d8c3 100644 --- a/pkgs/development/compilers/yasm/default.nix +++ b/pkgs/development/compilers/yasm/default.nix @@ -12,6 +12,6 @@ stdenv.mkDerivation rec { homepage = http://www.tortall.net/projects/yasm/; description = "Complete rewrite of the NASM assembler"; license = "BSD"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index d3630888f64f..ccaa45c6c338 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation { - name = "renpy-6.17.4"; + name = "renpy-6.17.6"; meta = { description = "Ren'Py Visual Novel Engine"; @@ -14,8 +14,8 @@ stdenv.mkDerivation { }; src = fetchurl { - url = "http://www.renpy.org/dl/6.17.4/renpy-6.17.4-source.tar.bz2"; - sha256 = "1n0ki944vawl1i3z9g5h65spdjvb8p0gj6rckv36fb2yq2adxclp"; + url = "http://www.renpy.org/dl/6.17.6/renpy-6.17.6-source.tar.bz2"; + sha256 = "0rkynw9cnr1zqdinz037d9zig6grhp2ca2pyxk80vhdpjb0xrkic"; }; buildInputs = [ diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix index 0e94b78c0372..847d561fbe4b 100644 --- a/pkgs/development/libraries/ffmpeg/2.x.nix +++ b/pkgs/development/libraries/ffmpeg/2.x.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { "--enable-avresample" "--enable-runtime-cpudetect" ] - ++ stdenv.lib.optional subtitleSupport "--enable-libass" + ++ stdenv.lib.optional (!stdenv.isDarwin && subtitleSupport) "--enable-libass" ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" ++ stdenv.lib.optional speexSupport "--enable-libspeex" ++ stdenv.lib.optional theoraSupport "--enable-libtheora" @@ -55,13 +55,12 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree" ++ stdenv.lib.optional dc1394Support "--enable-libdc1394" ++ stdenv.lib.optional x11grabSupport "--enable-x11grab" - ++ stdenv.lib.optional playSupport "--enable-ffplay" + ++ stdenv.lib.optional (!stdenv.isDarwin && playSupport) "--enable-ffplay" ++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig" ++ stdenv.lib.optional fdkAACSupport "--enable-libfdk_aac --enable-nonfree" ++ stdenv.lib.optional gnutlsSupport "--enable-gnutls"; - buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib texinfo perl ] - ++ stdenv.lib.optional subtitleSupport libass + buildInputs = [ pkgconfig lame yasm zlib bzip2 texinfo perl ] ++ stdenv.lib.optional mp3Support lame ++ stdenv.lib.optional speexSupport speex ++ stdenv.lib.optional theoraSupport libtheora @@ -75,10 +74,12 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional faacSupport faac ++ stdenv.lib.optional dc1394Support libdc1394 ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ] - ++ stdenv.lib.optional playSupport SDL + ++ stdenv.lib.optional (!stdenv.isDarwin && playSupport) SDL ++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ] ++ stdenv.lib.optional fdkAACSupport fdk_aac - ++ stdenv.lib.optional gnutlsSupport gnutls; + ++ stdenv.lib.optional gnutlsSupport gnutls + ++ stdenv.lib.optional (!stdenv.isDarwin && subtitleSupport) libass + ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 033a1def3ce7..b1dd66584f4a 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -55,7 +55,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext perl python ]; - propagatedBuildInputs = [ pcre zlib libffi ] ++ libiconvOrEmpty ++ libintlOrEmpty; + propagatedBuildInputs = [ pcre zlib libffi ] + ++ optional (!stdenv.isDarwin) libiconvOrEmpty + ++ libintlOrEmpty; configureFlags = optional stdenv.isDarwin "--disable-compile-warnings" diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 92c6debaa661..c57179364a7c 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -23,14 +23,17 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with xlibs; with stdenv.lib; [ glib cairo pango gdk_pixbuf atk ] - ++ optionals stdenv.isLinux - [ libXrandr libXrender libXcomposite libXi libXcursor ] - ++ optional stdenv.isDarwin x11 + ++ optionals (stdenv.isLinux || stdenv.isDarwin) [ + libXrandr libXrender libXcomposite libXi libXcursor + ] + ++ optionals stdenv.isDarwin [ x11 libXdamage ] ++ libintlOrEmpty ++ optional xineramaSupport libXinerama ++ optionals cupsSupport [ cups ]; - configureFlags = "--with-xinput=yes"; + configureFlags = if stdenv.isDarwin + then "--disable-glibtest --disable-introspection --disable-visibility" + else "--with-xinput=yes"; postInstall = "rm -rf $out/share/gtk-doc"; diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 2e596b17af3d..9cdd2a275bff 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintlOrEmpty , icu, graphite2 , withIcu ? false # recommended by upstream as default, but most don't needed and it's big -, withGraphite2 ? true # it is small and major distros do include it +, withGraphite2 ? !stdenv.isDarwin # it is small and major distros do include it }: # TODO: split non-icu and icu lib into different outputs? diff --git a/pkgs/development/libraries/haskell/GLURaw/1.4.0.0.nix b/pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix index a6f0e61d2730..1da2b743687a 100644 --- a/pkgs/development/libraries/haskell/GLURaw/1.4.0.0.nix +++ b/pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "GLURaw"; - version = "1.4.0.0"; - sha256 = "0q86rpd5cx0vrb9d3y1fljc3mg0p8wy6xdn37ngv2s0f4kslq63g"; + version = "1.4.0.1"; + sha256 = "1k0f1vbbrsfc7jb4qbif4w4q87lsis5gvq7jd2n8zzslxd5n8mcn"; buildDepends = [ OpenGLRaw ]; extraLibraries = [ freeglut mesa ]; meta = { diff --git a/pkgs/development/libraries/haskell/GLUT/2.5.1.0.nix b/pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix index 1cfd9a37eb0d..79112138b4ac 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.5.1.0.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "GLUT"; - version = "2.5.1.0"; - sha256 = "0zxj5i8rw402gpns5ivb1g5fkk502jwzrkviqhwhrxn7yxrybi1s"; + version = "2.5.1.1"; + sha256 = "0n9dkdjmpnbcjg0ll0ny7mw21xwwix0gxy0hq6yagmgaakhpg0aa"; buildDepends = [ OpenGL OpenGLRaw ]; extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; meta = { diff --git a/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix b/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix new file mode 100644 index 000000000000..844d512c62f3 --- /dev/null +++ b/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix @@ -0,0 +1,14 @@ +{ cabal, JuicyPixels, vector }: + +cabal.mkDerivation (self: { + pname = "JuicyPixels-util"; + version = "0.1"; + sha256 = "181wryax2k43qlblink9vcg2hk8f2qxn02ifmgxa2fl95z5ar0dc"; + buildDepends = [ JuicyPixels vector ]; + meta = { + homepage = "https://github.com/fumieval/JuicyPixels-util"; + description = "Convert JuicyPixel images into RGBA format, flip, trim and so on"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.9.1.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix index 6f79b5c7a068..c012c65d5228 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.9.1.0.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "OpenGL"; - version = "2.9.1.0"; - sha256 = "09xzjaa9qyh7bfsnq226v9zi6lhnalhmlqlca3808hgax8ijwhp3"; + version = "2.9.2.0"; + sha256 = "1sa5jmhj0az6sik6swv2vgzhv9gj34dbq2px23ag1a4yrk5gcn0p"; buildDepends = [ GLURaw OpenGLRaw text ]; extraLibraries = [ libX11 mesa ]; meta = { diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix b/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix new file mode 100644 index 000000000000..f0e6c7ac7adb --- /dev/null +++ b/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix @@ -0,0 +1,15 @@ +{ cabal, mesa }: + +cabal.mkDerivation (self: { + pname = "OpenGLRaw"; + version = "1.5.0.0"; + sha256 = "04lsidv82fl7yb2fnqpx7q0vgiwxbswh8g7dv9q9s9i2jwiaaal5"; + extraLibraries = [ mesa ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/Opengl"; + description = "A raw binding for the OpenGL graphics system"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.4.nix index 7c8dd42c0052..b5c959bb6176 100644 --- a/pkgs/development/libraries/haskell/aeson/default.nix +++ b/pkgs/development/libraries/haskell/aeson/0.7.0.4.nix @@ -16,14 +16,10 @@ cabal.mkDerivation (self: { attoparsec HUnit QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 text time unorderedContainers vector ]; - patchPhase = '' - sed -i -e 's|scientific >=.*,|scientific,|' aeson.cabal - ''; meta = { homepage = "https://github.com/bos/aeson"; description = "Fast JSON parsing and encoding"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix new file mode 100644 index 000000000000..96a93b40195f --- /dev/null +++ b/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix @@ -0,0 +1,26 @@ +{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit +, mtl, QuickCheck, scientific, syb, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, text, time +, unorderedContainers, vector +}: + +cabal.mkDerivation (self: { + pname = "aeson"; + version = "0.7.0.6"; + sha256 = "0vsf9msz9iv7xvsnys5c0kbkldb0pvhiai02vz50b0d1kdsk2mb4"; + buildDepends = [ + attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb + text time unorderedContainers vector + ]; + testDepends = [ + attoparsec HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 text time unorderedContainers vector + ]; + meta = { + homepage = "https://github.com/bos/aeson"; + description = "Fast JSON parsing and encoding"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/amqp/default.nix b/pkgs/development/libraries/haskell/amqp/default.nix index 9d08994af4f2..8256ff54e191 100644 --- a/pkgs/development/libraries/haskell/amqp/default.nix +++ b/pkgs/development/libraries/haskell/amqp/default.nix @@ -1,20 +1,21 @@ { cabal, binary, clock, connection, dataBinaryIeee754, hspec -, hspecExpectations, monadControl, network, split, text, xml +, hspecExpectations, monadControl, network, split, text, vector +, xml }: cabal.mkDerivation (self: { pname = "amqp"; - version = "0.8.2"; - sha256 = "0hl9x6kbxdv32014k1w34d84wl4ivpiyg1ikpjr0nr9bsg3wr0gf"; + version = "0.8.3"; + sha256 = "0gl5vdhbic8llhbqmhnwj0wvykhbrci6zz53v5cayqfcwi1v1dw2"; isLibrary = true; isExecutable = true; buildDepends = [ binary clock connection dataBinaryIeee754 monadControl network - split text xml + split text vector xml ]; testDepends = [ binary clock connection dataBinaryIeee754 hspec hspecExpectations - network split text + network split text vector ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix b/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix new file mode 100644 index 000000000000..4af501e7dca6 --- /dev/null +++ b/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix @@ -0,0 +1,20 @@ +{ cabal, deepseq, QuickCheck, scientific, testFramework +, testFrameworkQuickcheck2, text +}: + +cabal.mkDerivation (self: { + pname = "attoparsec"; + version = "0.11.3.4"; + sha256 = "1zahmkb0n7jz0di35x3r8s0xnfg1awqybh2x2zicxbwazl4f53hi"; + buildDepends = [ deepseq scientific text ]; + testDepends = [ + QuickCheck testFramework testFrameworkQuickcheck2 text + ]; + meta = { + homepage = "https://github.com/bos/attoparsec"; + description = "Fast combinator parsing for bytestrings and text"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix b/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix new file mode 100644 index 000000000000..3dfd986ee62b --- /dev/null +++ b/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix @@ -0,0 +1,21 @@ +{ cabal, lens, linear, QuickCheck, random, testFramework +, testFrameworkQuickcheck2, testFrameworkTh +}: + +cabal.mkDerivation (self: { + pname = "boundingboxes"; + version = "0.1.1"; + sha256 = "1nl0lqgfwd98jzhhw7i4vvd88lpnn8770x2pcbyfzqcyr27079f0"; + buildDepends = [ lens linear ]; + testDepends = [ + lens linear QuickCheck random testFramework + testFrameworkQuickcheck2 testFrameworkTh + ]; + doCheck = false; + meta = { + homepage = "https://github.com/fumieval/boundingboxes"; + description = "The type for 2D bounding box"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/boundingboxes/0.2.nix b/pkgs/development/libraries/haskell/boundingboxes/0.2.nix new file mode 100644 index 000000000000..44c8b3fee6f4 --- /dev/null +++ b/pkgs/development/libraries/haskell/boundingboxes/0.2.nix @@ -0,0 +1,21 @@ +{ cabal, lens, linear, QuickCheck, random, testFramework +, testFrameworkQuickcheck2, testFrameworkTh +}: + +cabal.mkDerivation (self: { + pname = "boundingboxes"; + version = "0.2"; + sha256 = "0xvh1h4papfrf6dg553rx6q8fqi06ff1ivgn4rdx3haqg1zf40hp"; + buildDepends = [ lens ]; + testDepends = [ + lens linear QuickCheck random testFramework + testFrameworkQuickcheck2 testFrameworkTh + ]; + doCheck = false; + meta = { + homepage = "https://github.com/fumieval/boundingboxes"; + description = "The type for 2D bounding box"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/categories/default.nix b/pkgs/development/libraries/haskell/categories/default.nix new file mode 100644 index 000000000000..54483f177011 --- /dev/null +++ b/pkgs/development/libraries/haskell/categories/default.nix @@ -0,0 +1,14 @@ +{ cabal, void }: + +cabal.mkDerivation (self: { + pname = "categories"; + version = "1.0.6"; + sha256 = "0i5mrxbhqj5g46lvwbw2m07prjvfwja6q8648qm6bq54z6zrl5cy"; + buildDepends = [ void ]; + meta = { + homepage = "http://github.com/ekmett/categories"; + description = "Categories"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/colors/default.nix b/pkgs/development/libraries/haskell/colors/default.nix new file mode 100644 index 000000000000..245ea3ef30e0 --- /dev/null +++ b/pkgs/development/libraries/haskell/colors/default.nix @@ -0,0 +1,14 @@ +{ cabal, profunctors }: + +cabal.mkDerivation (self: { + pname = "colors"; + version = "0.1.1"; + sha256 = "1i1n05prbp0l3xgx0w2lxzc5r81pcmbzclsamdr7fmjvhvh8blqm"; + buildDepends = [ profunctors ]; + meta = { + homepage = "https://github.com/fumieval/colors"; + description = "A type for colors"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/compdata/default.nix b/pkgs/development/libraries/haskell/compdata/default.nix new file mode 100644 index 000000000000..13e6fd8a2b21 --- /dev/null +++ b/pkgs/development/libraries/haskell/compdata/default.nix @@ -0,0 +1,23 @@ +{ cabal, deepseq, derive, HUnit, mtl, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, thExpandSyns +, transformers, treeView +}: + +cabal.mkDerivation (self: { + pname = "compdata"; + version = "0.8.1.0"; + sha256 = "06bsdhf40b8111k0fmfc53i5kib9n431f07qyj83pq8isgkk33xc"; + buildDepends = [ + deepseq derive mtl QuickCheck thExpandSyns transformers treeView + ]; + testDepends = [ + deepseq derive HUnit mtl QuickCheck testFramework + testFrameworkHunit testFrameworkQuickcheck2 thExpandSyns + transformers + ]; + meta = { + description = "Compositional Data Types"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 99308d432724..94423cc41eff 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 = "1.1.2.1"; - sha256 = "1jzc3vnc0dr4nm79yx2kk5rsm06jfbf3h89y28bgv05r1pw6r7ai"; + version = "1.1.3"; + sha256 = "14fc7v00zmrcwba2rdnh7c6sx0rv5mmbwlgq5p8p7nlald1dcr6z"; buildDepends = [ exceptions liftedBase mmorph monadControl mtl resourcet transformers transformersBase void diff --git a/pkgs/development/libraries/haskell/control-bool/default.nix b/pkgs/development/libraries/haskell/control-bool/default.nix new file mode 100644 index 000000000000..4fe9a975f41d --- /dev/null +++ b/pkgs/development/libraries/haskell/control-bool/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "control-bool"; + version = "0.2.1"; + sha256 = "10amxm1ff7xhd8g66n65wkbb8d17n77v1nmwxkbzhrask398asp4"; + meta = { + homepage = "https://github.com/fumieval/control-bool"; + description = "Useful combinators for boolean expressions"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/directory-tree/default.nix b/pkgs/development/libraries/haskell/directory-tree/default.nix index 5c8b357593e4..343aeb014ad1 100644 --- a/pkgs/development/libraries/haskell/directory-tree/default.nix +++ b/pkgs/development/libraries/haskell/directory-tree/default.nix @@ -2,9 +2,10 @@ cabal.mkDerivation (self: { pname = "directory-tree"; - version = "0.11.0"; - sha256 = "07vqwnzbwfjvlwcl50x5jl9yzvqfln0m4k4lam9r5n49wv7p01c9"; + version = "0.12.0"; + sha256 = "1idknm7fwci91fkwvzl35g0qd0jk1vb00ds2x82zjf2hdbkcc2gz"; buildDepends = [ filepath ]; + testDepends = [ filepath ]; meta = { homepage = "http://brandon.si/code/directory-tree-module-released/"; description = "A simple directory-like tree datatype, with useful IO functions"; diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix index 0a92db399e50..0538e2f1899c 100644 --- a/pkgs/development/libraries/haskell/esqueleto/default.nix +++ b/pkgs/development/libraries/haskell/esqueleto/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "esqueleto"; - version = "1.4.1"; - sha256 = "0b2gwsd6014fhmq8lipc299n6ndak7fv6dmrvi9vgasw0a665ryj"; + version = "1.4.1.2"; + sha256 = "1qny5c0xy2vdsl4qmgqr83jxqw1r68r81xhmx236rhxcffs9yvw2"; buildDepends = [ conduit monadLogger persistent resourcet tagged text transformers unorderedContainers @@ -18,7 +18,7 @@ cabal.mkDerivation (self: { ]; meta = { homepage = "https://github.com/meteficha/esqueleto"; - description = "Bare bones, type-safe EDSL for SQL queries on persistent backends"; + description = "Type-safe EDSL for SQL queries on persistent backends"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.ocharles ]; diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix index d67cc988a2d7..d32a57597802 100644 --- a/pkgs/development/libraries/haskell/fay/default.nix +++ b/pkgs/development/libraries/haskell/fay/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "fay"; - version = "0.20.0.3"; - sha256 = "1vs4brndk091mp7lm057my4ghlpv3563qg5blrs5zqcmnwnm75x5"; + version = "0.20.0.4"; + sha256 = "0cxcd4nxnq8nl03xgxa1nb0932hq4dz1lxpp3gqqs5k5wvs62303"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix index 7aa1b78a03eb..a42e963d5582 100644 --- a/pkgs/development/libraries/haskell/file-embed/default.nix +++ b/pkgs/development/libraries/haskell/file-embed/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "file-embed"; - version = "0.0.6"; - sha256 = "0ag3g8mv8cw8km785kskz8kv38zs8gimrc3lr9dvkc1qnp2fdmgz"; + version = "0.0.7"; + sha256 = "0mj8f70f9k78wjzcx59w68szajafmm119rcrsspmxsygglh8ji2g"; buildDepends = [ filepath ]; testDepends = [ filepath HUnit ]; meta = { diff --git a/pkgs/development/libraries/haskell/free-game/1.0.5.nix b/pkgs/development/libraries/haskell/free-game/1.0.5.nix new file mode 100644 index 000000000000..efe269db26c5 --- /dev/null +++ b/pkgs/development/libraries/haskell/free-game/1.0.5.nix @@ -0,0 +1,23 @@ +{ cabal, boundingboxes, colors, controlBool, filepath, free +, freetype2, GLFWB, hashable, JuicyPixels, JuicyPixelsUtil, lens +, linear, mtl, OpenGL, OpenGLRaw, random, reflection, transformers +, vector, void +}: + +cabal.mkDerivation (self: { + pname = "free-game"; + version = "1.0.5"; + sha256 = "048hmb4zbn67ycdwy7alhfakdyv405ck79bzrxv2ra6w1v5b3yvf"; + buildDepends = [ + boundingboxes colors controlBool filepath free freetype2 GLFWB + hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL + OpenGLRaw random reflection transformers vector void + ]; + jailbreak = true; + meta = { + homepage = "https://github.com/fumieval/free-game"; + description = "Create games for free"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/free-game/1.1.nix b/pkgs/development/libraries/haskell/free-game/1.1.nix new file mode 100644 index 000000000000..b19e32027412 --- /dev/null +++ b/pkgs/development/libraries/haskell/free-game/1.1.nix @@ -0,0 +1,23 @@ +{ cabal, boundingboxes, colors, controlBool, filepath, free +, freetype2, GLFWB, hashable, JuicyPixels, JuicyPixelsUtil, lens +, linear, mtl, OpenGL, OpenGLRaw, random, reflection, transformers +, vector, void +}: + +cabal.mkDerivation (self: { + pname = "free-game"; + version = "1.1"; + sha256 = "0id3vn2j44gd8krl5icacwxgx00h6r89yncjg10nyyb90rymvxzz"; + buildDepends = [ + boundingboxes colors controlBool filepath free freetype2 GLFWB + hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL + OpenGLRaw random reflection transformers vector void + ]; + jailbreak = true; + meta = { + homepage = "https://github.com/fumieval/free-game"; + description = "Create games for free"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/freetype2/default.nix b/pkgs/development/libraries/haskell/freetype2/default.nix new file mode 100644 index 000000000000..145ae4a2d792 --- /dev/null +++ b/pkgs/development/libraries/haskell/freetype2/default.nix @@ -0,0 +1,14 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "freetype2"; + version = "0.1.1"; + sha256 = "16ayyqvbl278z68ssfbv2nvbyxs7585zmnk2w53vlxvj0k9zj66s"; + isLibrary = true; + isExecutable = true; + meta = { + description = "Haskell binding for FreeType 2 library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix index be0b72aa963e..40700b52f61d 100644 --- a/pkgs/development/libraries/haskell/ghc-vis/default.nix +++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix @@ -4,17 +4,17 @@ cabal.mkDerivation (self: { pname = "ghc-vis"; - version = "0.7.2.1"; - sha256 = "160b45bgiz2ckva70dnmkf6i9bvffaavm5wzia2lk8c65pnvc9ih"; + version = "0.7.2.2"; + sha256 = "0abk76cy9qiblyways1r7jfsj996sj4laawzaz1j9p546plfkbnj"; buildDepends = [ cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text transformers xdot ]; + jailbreak = true; postInstall = '' ensureDir "$out/share/ghci" ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname" ''; - jailbreak = true; meta = { homepage = "http://felsin9.de/nnis/ghc-vis"; description = "Live visualization of data structures in GHCi"; diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index 77ebf3fd9af1..faf5212a7942 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -13,6 +13,7 @@ cabal.mkDerivation (self: { filepath hashable MonadCatchIOTransformers mtl random text time transformers unorderedContainers vector xmlhtml ]; + jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "An Haskell template system supporting both HTML5 and XML"; diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix index cc8341e2ac4f..b447d9a1f11c 100644 --- a/pkgs/development/libraries/haskell/http-client/default.nix +++ b/pkgs/development/libraries/haskell/http-client/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "http-client"; - version = "0.3.2.2"; - sha256 = "1znfcn549zxz4wdlv9rvyqz0x52ygx9jba9r1fzxk08mbi8xz6ff"; + version = "0.3.3"; + sha256 = "001nmy6f57l2f7gc4mchz1gwam28qldkwmcxzs8jnqwczcirgk38"; buildDepends = [ base64Bytestring blazeBuilder caseInsensitive cookie dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix index a3fa1c8c9ee4..4b1a7b956f67 100644 --- a/pkgs/development/libraries/haskell/http-types/default.nix +++ b/pkgs/development/libraries/haskell/http-types/default.nix @@ -1,11 +1,15 @@ -{ cabal, blazeBuilder, caseInsensitive, hspec, QuickCheck, text }: +{ cabal, blazeBuilder, caseInsensitive, doctest, hspec, QuickCheck +, quickcheckInstances, text +}: cabal.mkDerivation (self: { pname = "http-types"; - version = "0.8.4"; - sha256 = "0bz7g537if863vk29z72hndf1x019dj7shj1aa77pssrxma3a685"; + version = "0.8.5"; + sha256 = "0d282sf3xyk5makhnwfm2k9mgw1fkh07kasmy85fiwjkc1447ciw"; buildDepends = [ blazeBuilder caseInsensitive text ]; - testDepends = [ blazeBuilder hspec QuickCheck text ]; + testDepends = [ + blazeBuilder doctest hspec QuickCheck quickcheckInstances text + ]; jailbreak = true; meta = { homepage = "https://github.com/aristidb/http-types"; diff --git a/pkgs/development/libraries/haskell/httpd-shed/default.nix b/pkgs/development/libraries/haskell/httpd-shed/default.nix index 90f11940a465..2ebb89026176 100644 --- a/pkgs/development/libraries/haskell/httpd-shed/default.nix +++ b/pkgs/development/libraries/haskell/httpd-shed/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "httpd-shed"; - version = "0.4.0.1"; - sha256 = "04m07wqhaggkgksha7x528y890j30ay5axipfy6b1ma9cf0a9jwq"; + version = "0.4.0.2"; + sha256 = "0w37ra59xhk6gqrxpk83m1wmm7mqygcg59y5nl00x279c77qzxj3"; isLibrary = true; isExecutable = true; buildDepends = [ network ]; diff --git a/pkgs/development/libraries/haskell/io-streams/default.nix b/pkgs/development/libraries/haskell/io-streams/default.nix index 4e3617246813..4813771cb53c 100644 --- a/pkgs/development/libraries/haskell/io-streams/default.nix +++ b/pkgs/development/libraries/haskell/io-streams/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "io-streams"; - version = "1.1.4.3"; - sha256 = "0qp63xfbfz5ymfn8l9fiy27z30fi4sq201zgsh9x2mkhp6z2yzld"; + version = "1.1.4.4"; + sha256 = "07kmmjn1bsjzfi27fk6fx56pchks866qwrxkyvwihfvd96wgqggd"; buildDepends = [ attoparsec blazeBuilder network primitive text time transformers vector zlibBindings diff --git a/pkgs/development/libraries/haskell/minioperational/default.nix b/pkgs/development/libraries/haskell/minioperational/default.nix new file mode 100644 index 000000000000..99cae442c3bb --- /dev/null +++ b/pkgs/development/libraries/haskell/minioperational/default.nix @@ -0,0 +1,14 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "minioperational"; + version = "0.4.3"; + sha256 = "09z8536q0cc09iack6s8fghgrc5f3syq3sxf2cnai3rcfaqix86p"; + buildDepends = [ transformers ]; + meta = { + homepage = "https://github.com/fumieval/minioperational"; + description = "fast and simple operational monad"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/openssl-streams/default.nix b/pkgs/development/libraries/haskell/openssl-streams/default.nix index 14d256a471e9..33b48d1f1216 100644 --- a/pkgs/development/libraries/haskell/openssl-streams/default.nix +++ b/pkgs/development/libraries/haskell/openssl-streams/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "openssl-streams"; - version = "1.1.0.0"; - sha256 = "0xww3n1mhw0sp9nkx4847gqbq4wnfcnc2m782kn5n8jxnjnm1fqn"; + version = "1.1.0.2"; + sha256 = "0h3jxxdls0p1xxr02rfag7j9y13ll3xgzx2ldv1nsfcv3rzw2pfy"; buildDepends = [ HsOpenSSL ioStreams network ]; testDepends = [ HsOpenSSL HUnit ioStreams network testFramework testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/default.nix index 94d4b5746e2c..bad23a102ee2 100644 --- a/pkgs/development/libraries/haskell/optparse-applicative/default.nix +++ b/pkgs/development/libraries/haskell/optparse-applicative/default.nix @@ -1,13 +1,13 @@ { cabal, ansiWlPprint, HUnit, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2 -, testFrameworkThPrime, transformers +, testFrameworkThPrime, transformers, transformersCompat }: cabal.mkDerivation (self: { pname = "optparse-applicative"; - version = "0.8.1"; - sha256 = "0zy295r2idrwz030i1slpgysyw08782cjc4vgpkxby8i6piixwlh"; - buildDepends = [ ansiWlPprint transformers ]; + version = "0.9.0"; + sha256 = "1nmwrg74wz8k3zwgw5aaf7padkawi0dlrclq6nsr17xz5yx524ay"; + buildDepends = [ ansiWlPprint transformers transformersCompat ]; testDepends = [ HUnit QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 testFrameworkThPrime diff --git a/pkgs/development/libraries/haskell/pipes-aeson/default.nix b/pkgs/development/libraries/haskell/pipes-aeson/default.nix index 899810c1539e..85fd3a0a548b 100644 --- a/pkgs/development/libraries/haskell/pipes-aeson/default.nix +++ b/pkgs/development/libraries/haskell/pipes-aeson/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "pipes-aeson"; - version = "0.3.0"; - sha256 = "1kckdllw5xnh8z92gjw5swyxp9km879wqfly7af3iirwhickk4vn"; + version = "0.4"; + sha256 = "0cz9av3w8h2gh3cz7gs3ikplf60a111wcsr3z6vi8gqlmmgmck07"; buildDepends = [ aeson attoparsec pipes pipesAttoparsec pipesBytestring pipesParse transformers diff --git a/pkgs/development/libraries/haskell/pipes-parse/default.nix b/pkgs/development/libraries/haskell/pipes-parse/default.nix index ef615ebb808b..5f5dec485b62 100644 --- a/pkgs/development/libraries/haskell/pipes-parse/default.nix +++ b/pkgs/development/libraries/haskell/pipes-parse/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pipes-parse"; - version = "3.0.1"; - sha256 = "0f262p8mfcpvs3f3myy6bll9v61rfgrfdy2scdzf7vvx0h0lrpj7"; + version = "3.0.2"; + sha256 = "1d5lhh8knk0hmvd9wv2ihs5z9ybyvhd1n7qaazqkazqkyl14pd08"; buildDepends = [ pipes transformers ]; meta = { description = "Parsing infrastructure for the pipes ecosystem"; diff --git a/pkgs/development/libraries/haskell/pretty-show/1.2.nix b/pkgs/development/libraries/haskell/pretty-show/1.2.nix deleted file mode 100644 index 545816a57a02..000000000000 --- a/pkgs/development/libraries/haskell/pretty-show/1.2.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ cabal, haskellLexer }: - -cabal.mkDerivation (self: { - pname = "pretty-show"; - version = "1.2"; - sha256 = "0lbalmyrqisgd2spbvzifsy25lr6cl9sgz78hav8q8r406k7nf2l"; - isLibrary = true; - isExecutable = true; - buildDepends = [ haskellLexer ]; - meta = { - homepage = "http://wiki.github.com/yav/pretty-show"; - description = "Tools for working with derived Show instances"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/pretty-show/1.6.7.nix b/pkgs/development/libraries/haskell/pretty-show/default.nix index 7e3e3e25e8a0..56126a42cb36 100644 --- a/pkgs/development/libraries/haskell/pretty-show/1.6.7.nix +++ b/pkgs/development/libraries/haskell/pretty-show/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pretty-show"; - version = "1.6.7"; - sha256 = "16qjp6cl3hyir5bchnncq95bp7nw5cpp5kd5mszkjjhzw1jj9srz"; + version = "1.6.8"; + sha256 = "0vfb712dvbb91659sch62d06vm0451b9l4l0hdwnlbhzjymmh2rs"; isLibrary = true; isExecutable = true; buildDepends = [ filepath haskellLexer ]; diff --git a/pkgs/development/libraries/haskell/recursion-schemes/default.nix b/pkgs/development/libraries/haskell/recursion-schemes/default.nix new file mode 100644 index 000000000000..78e7da44061a --- /dev/null +++ b/pkgs/development/libraries/haskell/recursion-schemes/default.nix @@ -0,0 +1,14 @@ +{ cabal, comonad, free, transformers }: + +cabal.mkDerivation (self: { + pname = "recursion-schemes"; + version = "4.0"; + sha256 = "1xc1k04p3birxgv5h3ypw85w0cgq4d5rsmadx4pc3j409y6i5p06"; + buildDepends = [ comonad free transformers ]; + meta = { + homepage = "http://github.com/ekmett/recursion-schemes/"; + description = "Generalized bananas, lenses and barbed wire"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/scientific/default.nix b/pkgs/development/libraries/haskell/scientific/0.2.0.2.nix index 523bfce62b5d..523bfce62b5d 100644 --- a/pkgs/development/libraries/haskell/scientific/default.nix +++ b/pkgs/development/libraries/haskell/scientific/0.2.0.2.nix diff --git a/pkgs/development/libraries/haskell/scientific/0.3.2.1.nix b/pkgs/development/libraries/haskell/scientific/0.3.2.1.nix new file mode 100644 index 000000000000..467f2f1d1608 --- /dev/null +++ b/pkgs/development/libraries/haskell/scientific/0.3.2.1.nix @@ -0,0 +1,22 @@ +{ cabal, deepseq, hashable, QuickCheck, smallcheck, tasty +, tastyAntXml, tastyQuickcheck, tastySmallcheck, text +}: + +cabal.mkDerivation (self: { + pname = "scientific"; + version = "0.3.2.1"; + sha256 = "0z0k0dqmv6a3spgl48yl00a55niv0gqjy906sh4r8xfpsabzl88s"; + buildDepends = [ deepseq hashable text ]; + testDepends = [ + QuickCheck smallcheck tasty tastyAntXml tastyQuickcheck + tastySmallcheck text + ]; + jailbreak = true; + meta = { + homepage = "https://github.com/basvandijk/scientific"; + description = "Numbers represented using scientific notation"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/setlocale/default.nix b/pkgs/development/libraries/haskell/setlocale/default.nix new file mode 100644 index 000000000000..09ffc7159a4a --- /dev/null +++ b/pkgs/development/libraries/haskell/setlocale/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "setlocale"; + version = "0.0.3"; + sha256 = "08pd20ibmslr94p52rn6x9w3swn9jy7vjlvxzw29h8dlqgmvcrjl"; + meta = { + description = "A Haskell interface to setlocale()"; + license = self.stdenv.lib.licenses.publicDomain; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 01f07ae6a089..4549adaf43e2 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "1.5.3.1"; - sha256 = "0lhan549nkxihd94byaknswczlr757smha2fwq7y82rr0k16im4y"; + version = "1.5.3.2"; + sha256 = "0ilqg7mffw8cnl3w175if74xwfij7460qqqsp6hzml7gzjdb0rky"; buildDepends = [ async enclosedExceptions exceptions liftedAsync liftedBase monadControl mtl systemFileio systemFilepath text time transformers diff --git a/pkgs/development/libraries/haskell/split/0.1.4.3.nix b/pkgs/development/libraries/haskell/split/0.1.4.3.nix new file mode 100644 index 000000000000..ad0df5c2cb02 --- /dev/null +++ b/pkgs/development/libraries/haskell/split/0.1.4.3.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "split"; + version = "0.1.4.3"; + sha256 = "1i9vmb0zvmhqj6qcbnsapsk9lhsyzznz336c8s7v4sz20s99hsby"; + meta = { + homepage = "http://code.haskell.org/~byorgey/code/split"; + description = "Combinator library for splitting lists"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/split/0.2.2.nix b/pkgs/development/libraries/haskell/split/0.2.2.nix index ab60774cca40..2d768e2e71d7 100644 --- a/pkgs/development/libraries/haskell/split/0.2.2.nix +++ b/pkgs/development/libraries/haskell/split/0.2.2.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.2.2"; sha256 = "0xa3j0gwr6k5vizxybnzk5fgb3pppgspi6mysnp2gwjp2dbrxkzr"; testDepends = [ QuickCheck ]; + doCheck = self.stdenv.lib.versionOlder self.ghc.version "7.9"; meta = { description = "Combinator library for splitting lists"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/streaming-commons/default.nix b/pkgs/development/libraries/haskell/streaming-commons/default.nix index f98e6a7b4a2c..1a17cd5f14f5 100644 --- a/pkgs/development/libraries/haskell/streaming-commons/default.nix +++ b/pkgs/development/libraries/haskell/streaming-commons/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "streaming-commons"; - version = "0.1.2.4"; - sha256 = "1wy1cdmx3fhxg9xb7v5r3nyyjhr7irvcwy3l4g6br671zh8j8kcg"; + version = "0.1.3"; + sha256 = "0zv309lqmv5bgbmxx5k0zk4iyxwj77lwqcaaycizi7559nzvsrh3"; buildDepends = [ blazeBuilder network random text transformers zlib ]; diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index 13e4e37e4b06..bb8e20e98e45 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty"; - version = "0.8.0.4"; - sha256 = "016niwympxbxpg3yq7samgh92l20wxm2h6cwhqal4zdj8n9262j0"; + version = "0.8.1.1"; + sha256 = "04vzq5gwyd5zb6lsf8nbr5dypgf07b4aq70i1jghkg12v8h529dr"; buildDepends = [ ansiTerminal async deepseq mtl optparseApplicative regexTdfa stm tagged unboundedDelays diff --git a/pkgs/development/libraries/haskell/tls/1.2.7.nix b/pkgs/development/libraries/haskell/tls/1.2.8.nix index fbd9b048f065..8bba66b6c92e 100644 --- a/pkgs/development/libraries/haskell/tls/1.2.7.nix +++ b/pkgs/development/libraries/haskell/tls/1.2.8.nix @@ -1,19 +1,19 @@ { cabal, asn1Encoding, asn1Types, byteable, cereal, cipherAes -, cipherRc4, cprngAes, cryptohash, cryptoNumbers, cryptoPubkey -, cryptoPubkeyTypes, cryptoRandom, dataDefaultClass, mtl, network -, QuickCheck, testFramework, testFrameworkQuickcheck2, time, x509 -, x509Store, x509Validation +, cipherDes, cipherRc4, cprngAes, cryptoCipherTypes, cryptohash +, cryptoNumbers, cryptoPubkey, cryptoPubkeyTypes, cryptoRandom +, dataDefaultClass, mtl, network, QuickCheck, testFramework +, testFrameworkQuickcheck2, time, x509, x509Store, x509Validation }: cabal.mkDerivation (self: { pname = "tls"; - version = "1.2.7"; - sha256 = "0f0zlyiw6bgqkhg0czlpqyz8jgb1zbgbpzpk73v5p7hsjffsblgs"; + version = "1.2.8"; + sha256 = "0fm36jn2yri3fn6wadl5v4k0cpnansqlid4fhavgnp6mazf0q5ha"; buildDepends = [ - asn1Encoding asn1Types byteable cereal cipherAes cipherRc4 - cryptohash cryptoNumbers cryptoPubkey cryptoPubkeyTypes - cryptoRandom dataDefaultClass mtl network x509 x509Store - x509Validation + asn1Encoding asn1Types byteable cereal cipherAes cipherDes + cipherRc4 cryptoCipherTypes cryptohash cryptoNumbers cryptoPubkey + cryptoPubkeyTypes cryptoRandom dataDefaultClass mtl network x509 + x509Store x509Validation ]; testDepends = [ cereal cprngAes cryptoPubkey cryptoRandom dataDefaultClass mtl diff --git a/pkgs/development/libraries/haskell/transformers-compat/default.nix b/pkgs/development/libraries/haskell/transformers-compat/default.nix index e160ed5226e7..dfe9e2ef0d65 100644 --- a/pkgs/development/libraries/haskell/transformers-compat/default.nix +++ b/pkgs/development/libraries/haskell/transformers-compat/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "transformers-compat"; - version = "0.3.2"; - sha256 = "1rbwmbb04f6lnag1d11skznmxxygf9x7jjnjfkvyza4mnaxnrbpy"; + version = "0.3.3"; + sha256 = "14lmwqr6q79k1f7byvb0jcm4r7lprhxkl85z72pr6ghn7bsvqwps"; buildDepends = [ transformers ]; meta = { homepage = "http://github.com/ekmett/transformers-compat/"; diff --git a/pkgs/development/libraries/haskell/usb/default.nix b/pkgs/development/libraries/haskell/usb/default.nix index 05f151bfd2cf..a023a682a921 100644 --- a/pkgs/development/libraries/haskell/usb/default.nix +++ b/pkgs/development/libraries/haskell/usb/default.nix @@ -1,10 +1,10 @@ -{ cabal, baseUnicodeSymbols, bindingsLibusb, text, vector }: +{ cabal, bindingsLibusb, text, vector }: cabal.mkDerivation (self: { pname = "usb"; - version = "1.2"; - sha256 = "1k73avkmpbmg6iq2kmwhg2ifibni5c1yp202afdb6v7w5akvmc0b"; - buildDepends = [ baseUnicodeSymbols bindingsLibusb text vector ]; + version = "1.2.0.1"; + sha256 = "10bpkrsnin9f3g1p5a84nhxx5xlfjdxisc0q60iain30rn99g2mk"; + buildDepends = [ bindingsLibusb text vector ]; jailbreak = true; meta = { homepage = "http://basvandijk.github.com/usb"; diff --git a/pkgs/development/libraries/haskell/vty-ui/default.nix b/pkgs/development/libraries/haskell/vty-ui/default.nix index ad3ab7823c0e..913451de213b 100644 --- a/pkgs/development/libraries/haskell/vty-ui/default.nix +++ b/pkgs/development/libraries/haskell/vty-ui/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "vty-ui"; - version = "1.6.1"; - sha256 = "013a4wlhrhsbkh9wd8dxppn9aa0l7cfrgn3na6cifry34d96ql9d"; + version = "1.7"; + sha256 = "1wd7ada3x7d5rhl4z3h29m9h42513vbz6dp49xhn4j806mi164nd"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index ef91a8726874..66d45f059129 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "2.1.1.1"; - sha256 = "1mqpy1klr4b5dvgk89hqyd8c2vg7rl0vypy3m9hxr2r4bzifkqc1"; + version = "2.1.1.2"; + sha256 = "000ksma1jmi7rfg2ib94baj31mcwqj2xfhkyv7lai89di0m0v6s4"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive conduit conduitExtra dataDefault fastLogger diff --git a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix index 9be534725825..9d59fd68ed61 100644 --- a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix +++ b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai-handler-launch"; - version = "2.0.1.2"; - sha256 = "1mcjxv4dkcc5rx1bj8zc5m2q2ifcdwhsl4x4fnrv1ir9kclzsm7q"; + version = "2.0.1.3"; + sha256 = "06im28x26jbzbdk9xz33kqvzblglk3b3b60qwal836hima69alsd"; buildDepends = [ blazeBuilder blazeBuilderConduit conduit conduitExtra httpTypes transformers wai warp zlibConduit diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index 6f9760054664..b15aa1070ba5 100644 --- a/pkgs/development/libraries/haskell/wai-test/default.nix +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "wai-test"; - version = "2.0.1.2"; - sha256 = "11mkzh5wlfhdrwzqhsbcl3qnbawmks4vxr1vv0s2ny50q5na41ln"; + version = "2.0.1.3"; + sha256 = "18j77l2n41941f95awj6fj0w712628v5lsc3bif00cqnaixjmz48"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit conduitExtra cookie deepseq httpTypes network text transformers wai diff --git a/pkgs/development/libraries/haskell/wai-websockets/default.nix b/pkgs/development/libraries/haskell/wai-websockets/default.nix index 5558f2e32ce1..5d909c7d773c 100644 --- a/pkgs/development/libraries/haskell/wai-websockets/default.nix +++ b/pkgs/development/libraries/haskell/wai-websockets/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "wai-websockets"; - version = "2.1.0.1"; - sha256 = "1ic1wgfp16j6lhypn1psmicafjavbhq5rvm32xqwkb65abhpg571"; + version = "2.1.0.2"; + sha256 = "16hff38x6fpmp4r1wkjd922s02v5na8zwy6mq5f5gsj7b70n2ww2"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index 18c6e08c0b36..540df207241d 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai"; - version = "2.1.0.2"; - sha256 = "02hj07s3vlhbd2hds5pyksghildadjqhr8mmiyabwb7ap8iybidg"; + version = "2.1.0.3"; + sha256 = "0qprvk63fvb4rddg9h385xbd5sr5bcgkpx6fqlw01pjzmmrig1m3"; buildDepends = [ blazeBuilder conduit conduitExtra httpTypes network text transformers vault diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 6a41f6e5bdf6..be5dd392d16f 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "2.1.5.1"; - sha256 = "1dx911y3nr2ixsn3zdp1rd97rydnvixr9chs3nmmkswzdg3qihvl"; + version = "2.1.5.2"; + sha256 = "0rv5fxw1d5dh6jzvs3bg2vjjr702xw59fx7mflygpqh8zivfh4ds"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit conduitExtra hashable httpDate httpTypes liftedBase network diff --git a/pkgs/development/libraries/haskell/wcwidth/default.nix b/pkgs/development/libraries/haskell/wcwidth/default.nix new file mode 100644 index 000000000000..0307642f62ba --- /dev/null +++ b/pkgs/development/libraries/haskell/wcwidth/default.nix @@ -0,0 +1,16 @@ +{ cabal, attoparsec, setlocale, utf8String }: + +cabal.mkDerivation (self: { + pname = "wcwidth"; + version = "0.0.2"; + sha256 = "1n1fq7v64b59ajf5g50iqj9sa34wm7s2j3viay0kxpmvlcv8gipz"; + isLibrary = true; + isExecutable = true; + buildDepends = [ attoparsec setlocale utf8String ]; + meta = { + homepage = "http://github.com/solidsnack/wcwidth/"; + description = "Native wcwidth"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix index 774b17140e19..9e22d0cab185 100644 --- a/pkgs/development/libraries/haskell/websockets/default.nix +++ b/pkgs/development/libraries/haskell/websockets/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "websockets"; - version = "0.8.2.2"; - sha256 = "16q4znki5f4133cgwcs8wqgx6ljl8x59khrsdsi646nclb3lyl0a"; + version = "0.8.2.3"; + sha256 = "0j4lm5hkipd4q6kizrjy1cjdw2b0588m4k6fh50ss5qnqw9rkjkd"; buildDepends = [ attoparsec base64Bytestring binary blazeBuilder caseInsensitive entropy ioStreams mtl network random SHA text diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix index 9c1a938234da..78a9d921ff6c 100644 --- a/pkgs/development/libraries/haskell/xdot/default.nix +++ b/pkgs/development/libraries/haskell/xdot/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "xdot"; - version = "0.2.4.2"; - sha256 = "0a5wmwcl3akw1n9xgdhvlrbvphvy9s528daax28137ixaphvrl0f"; + version = "0.2.4.3"; + sha256 = "0p6y3ng8nwi8sksy0881bs331asi73x816zd5v7qlg4v719s8jxg"; buildDepends = [ cairo graphviz gtk mtl polyparse text ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index d31f1d0e70d7..4f3e7fcebb7a 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "1.2.0.1"; - sha256 = "0ry3h1csblssv2x8b63hvl2gqc0wyzyqbvp6iyisrk77wkz72jw9"; + version = "1.2.0.2"; + sha256 = "1kcrhyri4knkp1x9zn99qklkj4nd47gwdfy6q0pwdz7cgjskps1z"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit blazeHtml blazeMarkup conduit conduitExtra dataDefault deepseq diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index edbd5afe20bf..502a11e81251 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.8.2"; - sha256 = "0dqn5pzk3bh9pprnlp9ggmjdwbb1j9yyd6ihq7vwky5g4yrqbl8m"; + version = "0.8.8.3"; + sha256 = "031d1wx31mw9lw0swlcf1xfzdixaq6wmglhzaj9sixhid0r2isvf"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/0.2.2.1.nix index 44a14259b40b..44a14259b40b 100644 --- a/pkgs/development/libraries/haskell/zip-archive/default.nix +++ b/pkgs/development/libraries/haskell/zip-archive/0.2.2.1.nix diff --git a/pkgs/development/libraries/haskell/zip-archive/0.2.3.2.nix b/pkgs/development/libraries/haskell/zip-archive/0.2.3.2.nix new file mode 100644 index 000000000000..f1a36feda904 --- /dev/null +++ b/pkgs/development/libraries/haskell/zip-archive/0.2.3.2.nix @@ -0,0 +1,19 @@ +{ cabal, binary, digest, filepath, HUnit, mtl, text, time, zlib }: + +cabal.mkDerivation (self: { + pname = "zip-archive"; + version = "0.2.3.2"; + sha256 = "1y69sk6jyw1klgpl6bcamq1i9wy1536hz9x4s9b8n375sbhj10f1"; + isLibrary = true; + isExecutable = true; + buildDepends = [ binary digest filepath mtl text time zlib ]; + testDepends = [ HUnit time ]; + doCheck = false; + meta = { + homepage = "http://github.com/jgm/zip-archive"; + description = "Library for creating and modifying zip archives"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index 863a42b741ba..32cb7b860c4e 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - version = "1.2.1"; - seafileVersion = "2.1.1"; + version = "1.2.2"; + seafileVersion = "3.0.4"; name = "libsearpc-${version}"; src = fetchurl { url = "https://github.com/haiwen/libsearpc/archive/v${seafileVersion}.tar.gz"; - sha256 = "c0e7cc812c642ebb1339c3701570e78ff5b8c8aa2a521e5a505e28d9666e89ec"; + sha256 = "0s5bqqajxfzyw4km6nhhx39nyq20gv0fxlf2v6ifipvnyk14850k"; }; patches = [ ./libsearpc.pc.patch ]; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.calrama ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index a25079c5617e..f77dc4a3711a 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -23,7 +23,7 @@ else */ let - version = "10.1.3"; + version = "10.1.4"; # this is the default search path for DRI drivers driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32"; in @@ -34,7 +34,7 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"; - sha256 = "1hzcmpa7ykqm0qrvkm52bkfvf855wb9bs8449fwhypgjdqimwqdj"; + sha256 = "0g2j2zz7yq3i8k8dkji8h7iqfbcm8afb5lrb4dxrcyjl1bh6gibg"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index 75999f18d62c..979812184781 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -15,7 +15,21 @@ stdenv.mkDerivation rec { nativebuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libpng libtiff lcms ]; # in closure anyway - postInstall = glib.flattenInclude; + postInstall = glib.flattenInclude + '' + mkdir -p "$out/lib/pkgconfig" + cat >"$out/lib/pkgconfig/libopenjp2.pc" <<EOF + prefix=$out + libdir=$out/lib + includedir=$out/include + + Name: openjp2 + Description: JPEG2000 library (Part 1 and 2) + URL: http://www.openjpeg.org/ + Version: @OPENJPEG_VERSION@ + Libs: -L$out/lib -lopenjp2 + Cflags: -I$out/include + EOF + ''; meta = { homepage = http://www.openjpeg.org/; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 2dc71bb2d11b..1c62a64d006d 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -19,7 +19,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + # jww (2014-05-05): The tests currently fail on Darwin: + # + # ERROR:testiter.c:139:iter_char_test: assertion failed: (extents.width == x1 - x0) + # .../bin/sh: line 5: 14823 Abort trap: 6 srcdir=. PANGO_RC_FILE=./pangorc ${dir}$tst + # FAIL: testiter + doCheck = !stdenv.isDarwin; postInstall = "rm -rf $out/share/gtk-doc"; meta = { diff --git a/pkgs/development/libraries/qt-5/default.nix b/pkgs/development/libraries/qt-5/default.nix index e94aecc41e43..be028e89ce84 100644 --- a/pkgs/development/libraries/qt-5/default.nix +++ b/pkgs/development/libraries/qt-5/default.nix @@ -10,7 +10,7 @@ , gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs , buildDocs ? false , buildExamples ? false -, buildTests ? true +, buildTests ? false , developerBuild ? false }: @@ -84,8 +84,6 @@ stdenv.mkDerivation rec { -optimized-qmake -strip -reduce-relocations - -force-debug-info - -no-separate-debug-info -system-proxies -gui @@ -143,7 +141,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python perl pkgconfig ]; - postInstall = if buildDocs then "make docs&&make install_docs" else ""; + postInstall = + '' + ${optionalString buildDocs '' + make docs && make install_docs + ''} + + # Don't retain build-time dependencies like gdb and ruby. + sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri + ''; #enableParallelBuilding = true; # often fails on Hydra, as well as qt4 diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 8497ea9ae942..3b6ef1acd983 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "webkitgtk-2.4.0"; + name = "webkitgtk-2.4.3"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "1fyz6ysw7npy5wa7m1zg05zrj0gi0wdlpjbqix03iq4ym36pflnw"; + sha256 = "1b6fm1c5kk6vl0llalsd605raqs152hn14635kjwcb6iq7mc6qlq"; }; patches = [ ./webcore-svg-libxml-cflags.patch ]; diff --git a/pkgs/development/tools/haskell/codex/default.nix b/pkgs/development/tools/haskell/codex/default.nix new file mode 100644 index 000000000000..eeba452f5c8a --- /dev/null +++ b/pkgs/development/tools/haskell/codex/default.nix @@ -0,0 +1,21 @@ +{ cabal, Cabal, downloadCurl, either, filepath, hackageDb, MissingH +, monadLoops, tar, text, transformers, yaml, zlib +}: + +cabal.mkDerivation (self: { + pname = "codex"; + version = "0.0.2"; + sha256 = "156830krsn1qczrx27bn3ihqlis698sjf563sa2njvc7v85plx55"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + Cabal downloadCurl either filepath hackageDb MissingH monadLoops + tar text transformers yaml zlib + ]; + meta = { + homepage = "http://github.com/aloiscochard/codex"; + description = "A ctags file generator for cabal project dependencies"; + license = self.stdenv.lib.licenses.asl20; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/tools/haskell/hobbes/default.nix b/pkgs/development/tools/haskell/hobbes/default.nix new file mode 100644 index 000000000000..0c9b2d45ae17 --- /dev/null +++ b/pkgs/development/tools/haskell/hobbes/default.nix @@ -0,0 +1,16 @@ +{ cabal, filemanip, filepath, fsnotify, systemFilepath, text }: + +cabal.mkDerivation (self: { + pname = "hobbes"; + version = "0.2.2"; + sha256 = "1pri63d59q918jv1hdp2ib06m6lzw9a2b6bjyn86b2qrrx2512xd"; + isLibrary = false; + isExecutable = true; + buildDepends = [ filemanip filepath fsnotify systemFilepath text ]; + meta = { + homepage = "http://github.com/jhickner/hobbes"; + description = "A small file watcher for OSX"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/development/tools/misc/srecord/default.nix index 25140093f516..e316b4a628e5 100644 --- a/pkgs/development/tools/misc/srecord/default.nix +++ b/pkgs/development/tools/misc/srecord/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, boost, libtool, groff, ghostscript }: stdenv.mkDerivation rec { - name = "srecord-1.62"; + name = "srecord-1.63"; src = fetchurl { url = "mirror://sourceforge/srecord/${name}.tar.gz"; - sha256 = "0bfbmhsm9mbwiik3yrhm95q8bgx1k4mh2ai412k8zjyi8f5f3904"; + sha256 = "06mzj9lrk8lzfzhnfyh8xm4p92j242jik6zm37ihcia20inwgzkq"; }; buildInputs = [ boost libtool groff ghostscript ]; diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index d489feba4dc5..80c6b20e69d0 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost }: +{ stdenv, fetchurl, boost, tcl }: stdenv.mkDerivation rec { name = "swig-1.3.40"; @@ -8,18 +8,9 @@ stdenv.mkDerivation rec { sha256 = "02dc8g8wy75nd2is1974rl24c6mdl0ai1vszs1xpg9nd7dlv6i8r"; }; - #buildInputs = [ boost ]; # needed for `make check' - - /* The test suite fails this way: - - building python_cpp - python: tpp.c:63: __pthread_tpp_change_priority: Assertion `new_prio == -1 || (new_prio >= __sched_fifo_min_prio && new_prio <= __sched_fifo_max_prio)' failed. - /bin/sh: line 1: 32101 Aborted env LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH PYTHONPATH=.:$PYTHONPATH python ./li_boost_shared_ptr_runme.py - make[1]: *** [li_boost_shared_ptr.cpptest] Error 134 - - This may be an uninitialized mutex or mutexattr or something. - */ - doCheck = false; + doCheck = true; + # 'make check' uses boost and tcl + buildInputs = stdenv.lib.optionals doCheck [ boost tcl ]; meta = { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; @@ -39,7 +30,7 @@ stdenv.mkDerivation rec { # Licensing is a mess: http://www.swig.org/Release/LICENSE . license = "BSD-style"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.all; maintainers = [ ]; }; diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/development/tools/yuicompressor/default.nix new file mode 100644 index 000000000000..5dcc30811e22 --- /dev/null +++ b/pkgs/development/tools/yuicompressor/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "yuicompressor"; + version = "2.4.8"; + src = fetchurl { + url = "http://github.com/yui/yuicompressor/releases/download/v${version}/${name}-${version}.jar"; + sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh"; + }; + + meta = { + description = "A JavaScript and CSS minifier"; + maintainers = [ stdenv.lib.maintainers.jwiegley ]; + platforms = stdenv.lib.platforms.all; + homepage = http://yui.github.io/yuicompressor/; + license = stdenv.lib.licenses.bsd3; + }; + + buildCommand = '' + ensureDir $out/lib + ln -s $src $out/lib/yuicompressor.jar + ''; +} diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index a7ded1095268..a980aa53f5f9 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; assert stdenv.isi686; stdenv.mkDerivation { - name = "tibia-10.39"; + name = "tibia-10.40"; src = fetchurl { - url = http://static.tibia.com/download/tibia1039.tgz; - sha256 = "0401sdg2b4jb6350z841f9xjipi37z4z82bc72rs0chgdp363n79"; + url = http://static.tibia.com/download/tibia1040.tgz; + sha256 = "1d6wibwr84cnglnc0c9d6m3nynbg2zwgnxpyy9ykqiiwsz8qgzyg"; }; shell = stdenv.shell; diff --git a/pkgs/misc/seafile-shared/0003-Add-autoconfiguration-for-libjansson.patch b/pkgs/misc/seafile-shared/0003-Add-autoconfiguration-for-libjansson.patch deleted file mode 100644 index 7966d1e683b9..000000000000 --- a/pkgs/misc/seafile-shared/0003-Add-autoconfiguration-for-libjansson.patch +++ /dev/null @@ -1,121 +0,0 @@ -diff -r -u a/app/Makefile.am b/app/Makefile.am ---- a/app/Makefile.am 2014-01-10 11:38:46.000000000 +0100 -+++ b/app/Makefile.am 2014-01-16 14:22:24.584094619 +0100 -@@ -21,7 +21,7 @@ - seafile_LDADD = @CCNET_LIBS@ \ - $(top_builddir)/lib/libseafile.la \ - $(top_builddir)/lib/libseafile_common.la \ -- @SEARPC_LIBS@ \ -+ @SEARPC_LIBS@ @JANSSON_LIBS@ \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 - - seafile_LDFALGS = @STATIC_COMPILE@ @CONSOLE@ -@@ -29,7 +29,7 @@ - if COMPILE_SERVER - seafserv_tool_SOURCES = seafserv-tool.c - seafserv_tool_LDADD = @CCNET_LIBS@ \ -- $(top_builddir)/lib/libseafile.la @SEARPC_LIBS@ \ -+ $(top_builddir)/lib/libseafile.la @SEARPC_LIBS@ @JANSSON_LIBS@ \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 - - seafserv_tool_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ @SERVER_PKG_RPATH@ -diff -r -u a/configure.ac b/configure.ac ---- a/configure.ac 2014-01-10 11:38:46.000000000 +0100 -+++ b/configure.ac 2014-01-16 14:22:24.584094619 +0100 -@@ -233,6 +233,7 @@ - GLIB_REQUIRED=2.16.0 - CCNET_REQUIRED=0.9.3 - SEARPC_REQUIRED=1.0 -+JANSSON_REQUIRED=2.2.1 - ZDB_REQUIRED=2.10 - #LIBNAUTILUS_EXTENSION_REQUIRED=2.30.1 - CURL_REQUIRED=7.17 -@@ -254,6 +255,11 @@ - AC_SUBST(SEARPC_CFLAGS) - AC_SUBST(SEARPC_LIBS) - -+PKG_CHECK_MODULES(JANSSON, [jansson >= $JANSSON_REQUIRED]) -+AC_SUBST(JANSSON_CFLAGS) -+AC_SUBST(JANSSON_LIBS) -+ -+ - PKG_CHECK_MODULES(LIBEVENT, [libevent >= $LIBEVENT_REQUIRED]) - AC_SUBST(LIBEVENT_CFLAGS) - AC_SUBST(LIBEVENT_LIBS) -diff -r -u a/daemon/Makefile.am b/daemon/Makefile.am ---- a/daemon/Makefile.am 2014-01-10 11:38:46.000000000 +0100 -+++ b/daemon/Makefile.am 2014-01-16 14:22:24.587427993 +0100 -@@ -139,7 +139,7 @@ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \ - $(top_builddir)/common/cdc/libcdc.la \ - $(top_builddir)/common/index/libindex.la ${LIB_WS32} \ -- @SEARPC_LIBS@ @CCNET_LIBS@ @GNOME_KEYRING_LIBS@ -+ @SEARPC_LIBS@ @CCNET_LIBS@ @GNOME_KEYRING_LIBS@ @JANSSON_LIBS@ - - seaf_daemon_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ - -diff -r -u a/server/gc/Makefile.am b/server/gc/Makefile.am ---- a/server/gc/Makefile.am 2014-01-10 11:38:46.000000000 +0100 -+++ b/server/gc/Makefile.am 2014-01-16 14:23:20.991449822 +0100 -@@ -50,7 +50,7 @@ - $(top_builddir)/common/cdc/libcdc.la \ - $(top_builddir)/lib/libseafile_common.la \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \ -- @SEARPC_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} -+ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} - - seafserv_gc_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ - -@@ -63,6 +63,6 @@ - $(top_builddir)/common/cdc/libcdc.la \ - $(top_builddir)/lib/libseafile_common.la \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \ -- @SEARPC_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} -+ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} - - seaf_fsck_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ -diff -r -u a/server/Makefile.am b/server/Makefile.am ---- a/server/Makefile.am 2014-01-10 11:38:46.000000000 +0100 -+++ b/server/Makefile.am 2014-01-16 14:23:40.498354610 +0100 -@@ -99,6 +99,6 @@ - $(top_builddir)/common/index/libindex.la \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \ - $(top_builddir)/common/cdc/libcdc.la \ -- @SEARPC_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} -+ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} - - seaf_server_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ -diff -r -u a/httpserver/Makefile.am b/httpserver/Makefile.am ---- a/httpserver/Makefile.am 2014-01-10 11:38:46.000000000 +0100 -+++ b/httpserver/Makefile.am 2014-01-16 14:26:48.673985279 +0100 -@@ -50,7 +50,7 @@ - @CCNET_LIBS@ \ - $(top_builddir)/lib/libseafile.la \ - $(top_builddir)/common/cdc/libcdc.la \ -- @SEARPC_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ \ -+ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ \ - @LIBARCHIVE_LIBS@ ${LIB_WS32} - - httpserver_LDFLAGS = @STATIC_COMPILE@ -diff -r -u a/controller/Makefile.am b/controller/Makefile.am ---- a/controller/Makefile.am 2014-01-10 11:38:46.000000000 +0100 -+++ b/controller/Makefile.am 2014-01-16 14:29:42.076102675 +0100 -@@ -18,6 +18,6 @@ - seafile_controller_LDADD = @CCNET_LIBS@ \ - $(top_builddir)/lib/libseafile_common.la \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -levent \ -- @SEARPC_LIBS@ -+ @SEARPC_LIBS@ @JANSSON_LIBS@ - - seafile_controller_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ -diff -r -u a/fuse/Makefile.am b/fuse/Makefile.am ---- a/fuse/Makefile.am 2014-01-10 11:38:46.000000000 +0100 -+++ b/fuse/Makefile.am 2014-01-16 14:31:44.764267711 +0100 -@@ -43,6 +43,6 @@ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ \ - -lsqlite3 -levent \ - $(top_builddir)/common/cdc/libcdc.la \ -- @SEARPC_LIBS@ @ZDB_LIBS@ @FUSE_LIBS@ -+ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @FUSE_LIBS@ - - seaf_fuse_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 53092e3a8b74..d6c08e99a51f 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -2,17 +2,15 @@ stdenv.mkDerivation rec { - version = "2.1.1"; + version = "3.0.4"; name = "seafile-shared-${version}"; src = fetchurl { url = "https://github.com/haiwen/seafile/archive/v${version}.tar.gz"; - sha256 = "f07b09ab1eb1cb33f92cee74e499d0350941624396910a4c1a7d79abb45acaa6"; + sha256 = "0a0yj9k2rr3q42swwzn1js3r8bld9wcysw6p9415rw5jabcm1af0"; }; - patches = [ ./0003-Add-autoconfiguration-for-libjansson.patch ]; - buildInputs = [ which automake autoconf pkgconfig libtool vala python intltool fuse ]; propagatedBuildInputs = [ ccnet ]; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 6f927be52598..0c498c5d8285 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -323,6 +323,12 @@ with stdenv.lib; TRANSPARENT_HUGEPAGE_ALWAYS? n TRANSPARENT_HUGEPAGE_MADVISE? y + # zram support (e.g for in-memory compressed swap) + ${optionalString (versionAtLeast version "3.4") '' + ZSMALLOC y + ''} + ZRAM m + ${kernelPlatform.kernelExtraConfig or ""} ${extraConfig} '' diff --git a/pkgs/servers/http/spawn-fcgi/default.nix b/pkgs/servers/http/spawn-fcgi/default.nix new file mode 100644 index 000000000000..7c11aa8e8378 --- /dev/null +++ b/pkgs/servers/http/spawn-fcgi/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchsvn, autoconf, automake }: + +stdenv.mkDerivation rec { + name = "spawn-fcgi-${version}"; + version = "1.6.3"; + + src = fetchsvn { + url = "svn://svn.lighttpd.net/spawn-fcgi/tags/spawn-fcgi-${version}"; + sha256 = "06f0zw3rja42d9vg8j68nqkm3mn5pfzzhwfadpvs4aidh6kz9p42"; + }; + + buildInputs = [ automake autoconf ]; + + patches = [ ./show_version.patch ]; + + preConfigure = '' + ./autogen.sh + ''; + + meta = with stdenv.lib; { + homepage = "http://redmine.lighttpd.net/projects/spawn-fcgi"; + description = "Provides an interface to external programs that support the FastCGI interface"; + license = licenses.bsd3; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/servers/http/spawn-fcgi/show_version.patch b/pkgs/servers/http/spawn-fcgi/show_version.patch new file mode 100644 index 000000000000..90c64ed66209 --- /dev/null +++ b/pkgs/servers/http/spawn-fcgi/show_version.patch @@ -0,0 +1,14 @@ +diff --git a/src/spawn-fcgi.c b/src/spawn-fcgi.c +index 7f3f594..2f1046f 100644 +--- a/src/spawn-fcgi.c ++++ b/src/spawn-fcgi.c +@@ -405,8 +405,7 @@ static int find_user_group(const char *user, const char *group, uid_t *uid, gid_ + + static void show_version () { + write(1, CONST_STR_LEN( +- PACKAGE_DESC \ +- "Build-Date: " __DATE__ " " __TIME__ "\n" ++ PACKAGE_DESC "\n" + )); + } + diff --git a/pkgs/servers/mail/dovecot-pigeonhole/default.nix b/pkgs/servers/mail/dovecot-pigeonhole/default.nix index 5c0f39ca135f..bf56d7b9bfd5 100644 --- a/pkgs/servers/mail/dovecot-pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot-pigeonhole/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dovecot-pigeonhole-${version}"; - version = "0.4.2"; + version = "0.4.3"; src = fetchurl { url = "http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-pigeonhole-${version}.tar.gz"; - sha256 = "04rybb7ipsrhqapcqfr787n60lwd56gb33ylq7yqjr5q6xqg1684"; + sha256 = "0mypnkc980s3kd1bmy4f93dliwg6n8jfsac8r51jrpvv0ymz94nn"; }; buildInputs = [ dovecot22 openssl ]; diff --git a/pkgs/servers/mail/dovecot/2.2.x.nix b/pkgs/servers/mail/dovecot/2.2.x.nix index 64ef3c44895d..0c12b6ba3dbd 100644 --- a/pkgs/servers/mail/dovecot/2.2.x.nix +++ b/pkgs/servers/mail/dovecot/2.2.x.nix @@ -2,14 +2,14 @@ , inotifyTools, clucene_core_2, sqlite }: stdenv.mkDerivation rec { - name = "dovecot-2.2.12"; + name = "dovecot-2.2.13"; buildInputs = [perl openssl bzip2 zlib openldap clucene_core_2 sqlite] ++ stdenv.lib.optionals (stdenv.isLinux) [ systemd pam inotifyTools ]; src = fetchurl { url = "http://dovecot.org/releases/2.2/${name}.tar.gz"; - sha256 = "0mlcwgrxfwy1fqfk3wwbh1h9f0jddg4rnj612ckj1zv5asp1rppk"; + sha256 = "1klxbnlgqvq4v2inp18yv3x04xp0vf8nr67ci1k3yww1mb9g6g0k"; }; preConfigure = '' diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 8d1b03ddf344..be890ff59005 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "2.0.20"; + version = "2.0.21"; name = "munin-${version}"; src = fetchurl { url = "https://github.com/munin-monitoring/munin/archive/${version}.tar.gz"; - sha256 = "17b24fsr8abipq09hipnh6cd4h2aiwyzyjhg0wpplngwals54qmc"; + sha256 = "18ipk8n78iik07190h9r8mj5209ha6yhbiw7da0l4khw0y00cvf8"; }; buildInputs = [ diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index cd65234855f3..40b4ff1f2d72 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "Client library for MPD (music player daemon)"; homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki; license = "GPLv2"; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; unix; maintainers = [ stdenv.lib.maintainers.mornfall ]; }; } diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 7a2f3538fb8c..792aa49f447f 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -80,6 +80,7 @@ in stdenv.mkDerivation rec { (mkFlag mmsSupport "mms") (mkFlag mpg123Support "mpg123") (mkFlag aacSupport "aac") + (mkFlag stdenv.isDarwin "osx") "--enable-debugging" ] ++ opt stdenv.isLinux "--with-systemdsystemunitdir=$(out)/etc/systemd/system"; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 795fa8a60af2..7fca58f54461 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -480,11 +480,11 @@ let })) // {inherit mkfontdir mkfontscale ;}; gccmakedep = (stdenv.mkDerivation ((if overrides ? gccmakedep then overrides.gccmakedep else x: x) { - name = "gccmakedep-1.0.2"; + name = "gccmakedep-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/gccmakedep-1.0.2.tar.bz2; - sha256 = "04dfamx3fvkvqfgs6xy2a6yqbxjrj4777ylxp38g60hhbdl4jg86"; + url = mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2; + sha256 = "1r1fpy5ni8chbgx7j5sz0008fpb6vbazpy1nifgdhgijyzqxqxdj"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -520,11 +520,11 @@ let })) // {inherit libICE xproto ;}; imake = (stdenv.mkDerivation ((if overrides ? imake then overrides.imake else x: x) { - name = "imake-1.0.6"; + name = "imake-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/imake-1.0.6.tar.bz2; - sha256 = "1786k6jsazpr37v2b6qlsznjjp5lgyb869hx5m4ahax7n3yq72gs"; + url = mirror://xorg/individual/util/imake-1.0.7.tar.bz2; + sha256 = "0zpk8p044jh14bis838shbf4100bjg7mccd7bq54glpsq552q339"; }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; @@ -1370,11 +1370,11 @@ let })) // {inherit ;}; xf86inputevdev = (stdenv.mkDerivation ((if overrides ? xf86inputevdev then overrides.xf86inputevdev else x: x) { - name = "xf86-input-evdev-2.8.3"; + name = "xf86-input-evdev-2.8.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-evdev-2.8.3.tar.bz2; - sha256 = "1c067h0452728s39rb1csw4r26ihdhzs4nr722z6gg9mhvb7zv02"; + url = mirror://xorg/individual/driver/xf86-input-evdev-2.8.4.tar.bz2; + sha256 = "030haki1h0m85h91c91812gdnk6znfamw5kpr010zxwwbsgxxyl5"; }; buildInputs = [pkgconfig inputproto udev xorgserver xproto ]; })) // {inherit inputproto udev xorgserver xproto ;}; @@ -1410,11 +1410,11 @@ let })) // {inherit inputproto xorgserver xproto ;}; xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) { - name = "xf86-input-synaptics-1.7.5"; + name = "xf86-input-synaptics-1.7.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-synaptics-1.7.5.tar.bz2; - sha256 = "1iwiihwbqiq2lxd12ca7j3ajggjbmlk33wsfv2lyyizp3x92710z"; + url = mirror://xorg/individual/driver/xf86-input-synaptics-1.7.6.tar.bz2; + sha256 = "0ls8f7gy92f54hdqsa19vypg0xm496jrgdhdn4qphycxwn3gwkbm"; }; buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;}; diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list index 7019273dd11a..19cf79ca796b 100644 --- a/pkgs/servers/x11/xorg/old.list +++ b/pkgs/servers/x11/xorg/old.list @@ -9,7 +9,7 @@ mirror://xorg/individual/lib/libXp-1.0.2.tar.bz2 mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2 mirror://xorg/individual/proto/printproto-1.0.5.tar.bz2 mirror://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2 -mirror://xorg/individual/util/gccmakedep-1.0.2.tar.bz2 -mirror://xorg/individual/util/imake-1.0.6.tar.bz2 +mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2 +mirror://xorg/individual/util/imake-1.0.7.tar.bz2 mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.5.tar.bz2 diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 5edff19c4315..512bbbb9eff1 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -115,11 +115,11 @@ mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-evdev-2.8.3.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.8.4.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-synaptics-1.7.5.tar.bz2 +mirror://xorg/individual/driver/xf86-input-synaptics-1.7.6.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix new file mode 100644 index 000000000000..61553566d6c9 --- /dev/null +++ b/pkgs/tools/audio/mpdcron/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, glib, libdaemon +, mpd_clientlib, curl, sqlite, ruby, rubyLibs, libnotify }: + +stdenv.mkDerivation rec { + version = "20130809"; + name = "mpdcron-${version}"; + + src = fetchgit { + url = https://github.com/alip/mpdcron.git; + rev = "1dd16181c32f33e7754bbe21841c8e70b28f8ecd"; + sha256 = "1h3n433jn9yg74i218pkxzrngsjpnf0z02lakfldl6j1s9di2pn3"; + }; + + meta = { + description = "A cron like daemon for mpd."; + homepage = http://alip.github.io/mpdcron/; + license = stdenv.lib.licenses.gpl2; + platforms = with stdenv.lib.platforms; unix; + maintainers = [ stdenv.lib.maintainers.lovek323 ]; + }; + + buildInputs = + [ autoconf automake libtool pkgconfig glib libdaemon + mpd_clientlib curl sqlite ruby rubyLibs.nokogiri libnotify ]; + + preConfigure = '' + ./autogen.sh + ''; + + configureFlags = [ "--enable-gmodule" "--with-standard-modules=all" ]; +} diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix index 183b889da9b3..161383cb9de5 100644 --- a/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/pkgs/tools/filesystems/bcache-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bcache-tools-${version}"; - version = "1.0.5"; + version = "1.0.7"; src = fetchurl { url = "https://github.com/g2p/bcache-tools/archive/v${version}.tar.gz"; - sha256 = "1abf86xcnj601lddig3kmn26jrf8q8xhcyszf5pxrcs5ym72jj8l"; + sha256 = "1gbsh2qw0a7kgck6w0apydiy37nnz5xvdgipa0yqrfmghl86vmv4"; }; buildInputs = [ pkgconfig utillinux ]; diff --git a/pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch b/pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch deleted file mode 100644 index 83cdbad7bbac..000000000000 --- a/pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch +++ /dev/null @@ -1,72 +0,0 @@ -From f730ba82d641029dd262d05e8533fc7643f4c4b9 Mon Sep 17 00:00:00 2001 -From: Aaron Lindsay <aaron@aclindsay.com> -Date: Wed, 15 Jan 2014 13:49:40 -0500 -Subject: [PATCH] Add autoconfiguration for libjansson - ---- - configure.ac | 5 +++++ - net/daemon/Makefile.am | 4 ++-- - net/server/Makefile.am | 2 +- - 3 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 64e74b5..0911671 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -248,6 +248,7 @@ SEARPC_REQUIRED=1.0 - ZDB_REQUIRED=2.10 - LIBNAUTILUS_EXTENSION_REQUIRED=2.30.1 - SEARPC_REQUIRED=1.0 -+JANSSON_REQUIRED=2.2.1 - CURL_REQUIRED=7.17 - - PKG_CHECK_MODULES(GLIB2, [glib-2.0 >= $GLIB_REQUIRED]) -@@ -262,6 +263,10 @@ PKG_CHECK_MODULES(SEARPC, [libsearpc >= $SEARPC_REQUIRED]) - AC_SUBST(SEARPC_CFLAGS) - AC_SUBST(SEARPC_LIBS) - -+PKG_CHECK_MODULES(JANSSON, [jansson >= $JANSSON_REQUIRED]) -+AC_SUBST(JANSSON_CFLAGS) -+AC_SUBST(JANSSON_LIBS) -+ - if test x${compile_python} = xyes; then - AM_PATH_PYTHON([2.6]) - -diff --git a/net/daemon/Makefile.am b/net/daemon/Makefile.am -index 35d1a3c..0e28c6a 100644 ---- a/net/daemon/Makefile.am -+++ b/net/daemon/Makefile.am -@@ -95,7 +95,7 @@ ccnet_SOURCES = ccnet-daemon.c \ - - ccnet_LDADD = -levent $(top_builddir)/lib/libccnetd.la \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 \ -- @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ -+ @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ @JANSSON_LIBS@ - - - ccnet_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ @SERVER_PKG_RPATH@ -no-undefined -@@ -106,7 +106,7 @@ ccnet_test_SOURCES = ccnet-test.c daemon-session.c $(common_srcs) - - ccnet_test_LDADD = -levent $(top_builddir)/lib/libccnetd.la \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 \ -- @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ -+ @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ @JANSSON_LIBS@ - - ccnet_test_LDFLAGS = @STATIC_COMPILE@ -no-undefined @CONSOLE@ - -diff --git a/net/server/Makefile.am b/net/server/Makefile.am -index d587f48..b048936 100644 ---- a/net/server/Makefile.am -+++ b/net/server/Makefile.am -@@ -103,7 +103,7 @@ ccnet_server_LDADD = -levent $(top_builddir)/lib/libccnetd.la \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 \ - -lpthread \ - @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ @ZDB_LIBS@ \ -- @LDAP_LIBS@ -+ @LDAP_LIBS@ @JANSSON_LIBS@ - - - ccnet_server_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ @SERVER_PKG_RPATH@ -no-undefined --- -1.8.5.2 - diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix index 14b88ddafe84..8896156bd1c5 100644 --- a/pkgs/tools/networking/ccnet/default.nix +++ b/pkgs/tools/networking/ccnet/default.nix @@ -2,18 +2,16 @@ stdenv.mkDerivation rec { - version = "1.4.0"; - seafileVersion = "2.1.1"; + version = "1.4.2"; + seafileVersion = "3.0.4"; name = "ccnet-${version}"; src = fetchurl { url = "https://github.com/haiwen/ccnet/archive/v${seafileVersion}.tar.gz"; - sha256 = "6882eb1a3066897e4f91fb60a3405b3f58b4b794334deaca73617003f77a7eb0"; + sha256 = "1y9x6k9ql8bj83016a1mi1m5ixxh8fm7p4qbd5mslnamvjln171q"; }; - patches = [ ./libccnet.pc.patch ./0001-Add-autoconfiguration-for-libjansson.patch ]; - buildInputs = [ which automake autoconf pkgconfig libtool vala python ]; propagatedBuildInputs = [ libsearpc libzdb libuuid libevent sqlite openssl ]; diff --git a/pkgs/tools/networking/ccnet/libccnet.pc.patch b/pkgs/tools/networking/ccnet/libccnet.pc.patch deleted file mode 100644 index 0d9fea552bcd..000000000000 --- a/pkgs/tools/networking/ccnet/libccnet.pc.patch +++ /dev/null @@ -1,10 +0,0 @@ -From: Aaron Lindsay <aaron@aclindsay.com> - ---- a/libccnet.pc.in 2013-01-10 01:35:24.000000000 -0500 -+++ b/libccnet.pc.in 2013-01-19 11:31:50.479301798 -0500 -@@ -1,4 +1,4 @@ --prefix=(DESTDIR)@prefix@ -+prefix=@prefix@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=@includedir@ diff --git a/pkgs/tools/package-management/cabal-install/1.20.0.1.nix b/pkgs/tools/package-management/cabal-install/1.20.0.2.nix index d0db9354ae05..dba92ab9321b 100644 --- a/pkgs/tools/package-management/cabal-install/1.20.0.1.nix +++ b/pkgs/tools/package-management/cabal-install/1.20.0.2.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "cabal-install"; - version = "1.20.0.1"; - sha256 = "14zrsbjr7kgrnjd5hxczll4j39vwj95drlw73gad2div2954dqxi"; + version = "1.20.0.2"; + sha256 = "1nsc8qklhlg2xpaj7k158gg45rlrp7mn15zyfsgjpaqf3rjm9dl4"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index 28d58abe5aac..8e4848f2db62 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, openssl, bison, flex, pam, usePAM ? stdenv.isLinux }: stdenv.mkDerivation rec { - name = "monit-5.8"; + name = "monit-5.8.1"; src = fetchurl { url = "${meta.homepage}dist/${name}.tar.gz"; - sha256 = "1xa7i29ma81jjxac0qc29wcxxvbv58n3jbwmllscamh1phz5f00c"; + sha256 = "1rbhr3aff8pbiz60r73607hci4yngv5xq1b6yjx9xhks4mwlnpm2"; }; nativeBuildInputs = [ bison flex ]; diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index 2484aac8b0d1..c67444838b24 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip, jre, coreutils, makeDesktopItem }: stdenv.mkDerivation rec { - name = "basex-7.7.2"; + name = "basex-7.8.2"; src = fetchurl { - url = "http://files.basex.org/releases/7.7.2/BaseX772.zip"; - sha256 = "1rh91rzgca1waq8jnd3ard1r04qlalc2qqrawmrahwxgf3f16f4a"; + url = "http://files.basex.org/releases/7.8.2/BaseX782.zip"; + sha256 = "0i9h7fsvn8cy1g44f23iyqndwamvx4kvyc4y3i00j15qm6qd2kbm"; }; buildInputs = [ unzip jre ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8be68fe36b02..91fefb51ba28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -270,7 +270,7 @@ let buildFHSChrootEnv = import ../build-support/build-fhs-chrootenv { inherit stdenv glibc glibcLocales gcc coreutils diffutils findutils; inherit gnused gnugrep gnutar gzip bzip2 bashInteractive xz shadow gawk; - inherit less su buildEnv; + inherit less buildEnv; }; dotnetenv = import ../build-support/dotnetenv { @@ -373,6 +373,8 @@ let inherit url; }; + libredirect = callPackage ../build-support/libredirect { }; + makeDesktopItem = import ../build-support/make-desktopitem { inherit stdenv; }; @@ -638,6 +640,8 @@ let mcrl2 = callPackage ../tools/misc/mcrl2 { }; + mpdcron = callPackage ../tools/audio/mpdcron { }; + syslogng = callPackage ../tools/system/syslog-ng { }; rsyslog = callPackage ../tools/system/rsyslog { }; @@ -1657,6 +1661,12 @@ let opendkim = callPackage ../development/libraries/opendkim { }; + opendylan = callPackage ../development/compilers/opendylan { + opendylan-bootstrap = opendylan_bin; + }; + + opendylan_bin = callPackage ../development/compilers/opendylan/bin.nix { }; + openjade = callPackage ../tools/text/sgml/openjade { perl = perl510; }; @@ -6305,6 +6315,7 @@ let jquery_ui = callPackage ../development/libraries/javascript/jquery-ui { }; + yuicompressor = callPackage ../development/tools/yuicompressor { }; ### DEVELOPMENT / LISP MODULES @@ -6613,10 +6624,8 @@ let mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { }; mpd = callPackage ../servers/mpd { - # resolve the "stray '@' in program" errors - stdenv = if stdenv.isDarwin - then overrideGCC stdenv gccApple - else stdenv; + aacSupport = config.mpd.aacSupport or true; + ffmpegSupport = config.mpd.ffmpegSupport or true; }; mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { }; @@ -6769,6 +6778,8 @@ let sipwitch = callPackage ../servers/sip/sipwitch { }; + spawn_fcgi = callPackage ../servers/http/spawn-fcgi { }; + squids = recurseIntoAttrs( import ../servers/squid/squids.nix { inherit fetchurl stdenv perl lib composableDerivation openldap pam db cyrus_sasl kerberos libcap expat libxml2 libtool @@ -8618,7 +8629,7 @@ let hexedit = callPackage ../applications/editors/hexedit { }; - hipchat = callPackage_i686 ../applications/networking/instant-messengers/hipchat { }; + hipchat = callPackage ../applications/networking/instant-messengers/hipchat { }; homebank = callPackage ../applications/office/homebank { }; @@ -9801,7 +9812,10 @@ let zathuraCollection = recurseIntoAttrs (let callPackage = newScope pkgs.zathuraCollection; in - import ../applications/misc/zathura { inherit callPackage pkgs fetchurl; }); + import ../applications/misc/zathura { + inherit callPackage pkgs fetchurl; + useMupdf = config.zathura.useMupdf or false; + }); zathura = zathuraCollection.zathuraWrapper; @@ -10883,7 +10897,7 @@ let libXmu libXext xextproto libSM libICE; ghostscript = ghostscriptX; harfbuzz = harfbuzz.override { - withIcu = true; withGraphite2 = true; + withIcu = true; withGraphite2 = !stdenv.isDarwin; }; }; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index a39bf2d4be52..3618c0f10ed9 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -16,11 +16,12 @@ ghcHEADPrefs = self : super : super // { mtl = self.mtl_2_1_3_1; - cabalInstall_1_20_0_1 = super.cabalInstall_1_20_0_1.override { Cabal = null; }; + cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = null; }; }; ghc782Prefs = self : super : ghcHEADPrefs self super // { - cabalInstall_1_20_0_1 = super.cabalInstall_1_20_0_1.override { Cabal = self.Cabal_1_20_0_0; }; + cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = self.Cabal_1_20_0_0; }; + codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_0; }; }; }; ghc763Prefs = self : super : ghc782Prefs self super // { @@ -41,25 +42,30 @@ modularArithmetic = null; # requires base >= 4.7 pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_1; }; transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x + zipArchive = super.zipArchive_0_2_2_1; # works without binary 0.7.x }; ghc742Prefs = self : super : ghc763Prefs self super // { - aeson = super.aeson.override { blazeBuilder = self.blazeBuilder; }; + aeson = self.aeson_0_7_0_4.override { blazeBuilder = self.blazeBuilder; }; + attoparsec = self.attoparsec_0_11_3_1; + extensibleExceptions = null; # core package in ghc <= 7.4.x hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; haddock = self.haddock_2_11_0; haskeline = super.haskeline.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + scientific = self.scientific_0_2_0_2; }; ghc722Prefs = self : super : ghc742Prefs self super // { + caseInsensitive = self.caseInsensitive_1_0_0_1; deepseq = self.deepseq_1_3_0_2; DrIFT = null; # doesn't compile with old GHC versions - extensibleExceptions = null; # core package in ghc <= 7.4.x haddock = self.haddock_2_9_4; syb = self.syb_0_4_0; }; ghc704Prefs = self : super : ghc722Prefs self super // { binary = self.binary_0_7_2_1; # core package in ghc >= 7.2.2 + caseInsensitive = super.caseInsensitive; # undo the override from ghc 7.2.2 haddock = self.haddock_2_9_2.override { alex = self.alex_2_3_5; }; HsSyck = self.HsSyck_0_51; jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_16_0_3; }; @@ -68,35 +74,51 @@ ghc6123Prefs = self : super : ghc704Prefs self super // { alex = self.alex_3_1_3; + async = self.async_2_0_1_4; + attoparsec = self.attoparsec_0_10_4_0; cabalInstall = self.cabalInstall_1_16_0_2; cgi = self.cgi_3001_1_7_5; deepseq = self.deepseq_1_2_0_1; + dlist = super.dlist.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + exceptions = null; # none of our versions compile haddock = self.haddock_2_7_2; + logict = super.logict.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + monadPar = self.monadPar_0_1_0_3; + nats = null; # none of our versions compile parallel = self.parallel_3_2_0_3; primitive = self.primitive_0_5_0_1; + reflection = super.reflection.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + scientific = null; # none of our versions compile + split = self.split_0_1_4_3; stm = self.stm_2_4_2; syb = null; # core package in ghc < 7 + tagged = super.tagged.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + temporary = null; # none of our versions compile + vectorAlgorithms = super.vectorAlgorithms.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; }; ghc6104Prefs = self : super : ghc6123Prefs self super // { - alex = self.alex_2_3_5.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - binary = super.binary_0_7_2_1.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - Cabal = self.Cabal_1_16_0_3; + alex = self.alex_2_3_5.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + async = null; # none of our versions compile + attoparsec = null; # none of our versions compile + binary = super.binary_0_7_2_1.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + caseInsensitive = super.caseInsensitive.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; GLUT = self.GLUT_2_2_2_1; haddock = self.haddock_2_4_2; - happy = super.happy.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - hashable = self.hashable_1_1_2_5; - HTTP = super.HTTP.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - HUnit = super.HUnit.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - network = super.network.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; + happy = super.happy.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + hashable = super.hashable.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + hashtables = super.hashtables.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + HTTP = super.HTTP.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + HUnit = super.HUnit.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + network = super.network.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; OpenGLRaw = self.OpenGLRaw_1_3_0_0; OpenGL = self.OpenGL_2_6_0_1; - QuickCheck = super.QuickCheck.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - stm = self.stm_2_4_2.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - tar = super.tar.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - text = self.text_0_11_2_3.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - time = self.time_1_1_2_4.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - zlib = super.zlib.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; + QuickCheck = super.QuickCheck.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + stm = self.stm_2_4_2.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + tar = super.tar.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + text = self.text_0_11_2_3.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + time = self.time_1_1_2_4.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + zlib = super.zlib.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; }; # Abstraction for Haskell packages collections diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9c33cb8ff479..216037e74cdf 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -138,9 +138,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in aes = callPackage ../development/libraries/haskell/aes {}; - aeson = callPackage ../development/libraries/haskell/aeson { - blazeBuilder = null; - }; + aeson_0_7_0_4 = callPackage ../development/libraries/haskell/aeson/0.7.0.4.nix { blazeBuilder = null; }; + aeson_0_7_0_6 = callPackage ../development/libraries/haskell/aeson/0.7.0.6.nix { blazeBuilder = null; }; + aeson = self.aeson_0_7_0_6; aesonPretty = callPackage ../development/libraries/haskell/aeson-pretty {}; @@ -191,7 +191,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in attoparsec_0_10_4_0 = callPackage ../development/libraries/haskell/attoparsec/0.10.4.0.nix {}; attoparsec_0_11_3_1 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.1.nix {}; - attoparsec = self.attoparsec_0_11_3_1; + attoparsec_0_11_3_4 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.4.nix {}; + attoparsec = self.attoparsec_0_11_3_4; attoparsecBinary = callPackage ../development/libraries/haskell/attoparsec-binary {}; @@ -275,6 +276,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in Boolean = callPackage ../development/libraries/haskell/Boolean {}; + boundingboxes_0_1_1 = callPackage ../development/libraries/haskell/boundingboxes/0.1.1.nix {}; + boundingboxes_0_2 = callPackage ../development/libraries/haskell/boundingboxes/0.2.nix {}; + boundingboxes = self.boundingboxes_0_2; + brainfuck = callPackage ../development/libraries/haskell/brainfuck {}; bson = callPackage ../development/libraries/haskell/bson {}; @@ -326,6 +331,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in carray = callPackage ../development/libraries/haskell/carray {}; + categories = callPackage ../development/libraries/haskell/categories {}; + cassava = callPackage ../development/libraries/haskell/cassava {}; caseInsensitive_1_0_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.0.0.1.nix {}; @@ -404,6 +411,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in colorizeHaskell = callPackage ../development/libraries/haskell/colorize-haskell {}; + colors = callPackage ../development/libraries/haskell/colors {}; + colour = callPackage ../development/libraries/haskell/colour {}; comonad = callPackage ../development/libraries/haskell/comonad {}; @@ -414,6 +423,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {}; + compdata = callPackage ../development/libraries/haskell/compdata {}; + composition = callPackage ../development/libraries/haskell/composition {}; concatenative = callPackage ../development/libraries/haskell/concatenative {}; @@ -436,6 +447,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in constraints = callPackage ../development/libraries/haskell/constraints {}; + controlBool = callPackage ../development/libraries/haskell/control-bool {}; + controlMonadFree = callPackage ../development/libraries/haskell/control-monad-free {}; controlMonadLoop = callPackage ../development/libraries/haskell/control-monad-loop {}; @@ -768,8 +781,16 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in free = callPackage ../development/libraries/haskell/free {}; + freeGame_1_0_5 = callPackage ../development/libraries/haskell/free-game/1.0.5.nix { + boundingboxes = self.boundingboxes_0_1_1; + }; + freeGame_1_1 = callPackage ../development/libraries/haskell/free-game/1.1.nix {}; + freeGame = self.freeGame_1_1; + fsnotify = callPackage ../development/libraries/haskell/fsnotify {}; + freetype2 = callPackage ../development/libraries/haskell/freetype2 {}; + gamma = callPackage ../development/libraries/haskell/gamma {}; geniplate = callPackage ../development/libraries/haskell/geniplate {}; @@ -830,7 +851,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in GLFW = callPackage ../development/libraries/haskell/GLFW {}; - GLFWb = callPackage ../development/libraries/haskell/GLFW-b {}; + GLFWB = callPackage ../development/libraries/haskell/GLFW-b {}; glib = callPackage ../development/libraries/haskell/glib { glib = pkgs.glib; @@ -852,8 +873,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in glpkHs = callPackage ../development/libraries/haskell/glpk-hs {}; GLURaw_1_3_0_0 = callPackage ../development/libraries/haskell/GLURaw/1.3.0.0.nix { OpenGLRaw = self.OpenGLRaw_1_3_0_0; }; - GLURaw_1_4_0_0 = callPackage ../development/libraries/haskell/GLURaw/1.4.0.0.nix { OpenGLRaw = self.OpenGLRaw_1_4_0_0; }; - GLURaw = self.GLURaw_1_4_0_0; + GLURaw_1_4_0_1 = callPackage ../development/libraries/haskell/GLURaw/1.4.0.1.nix {}; + GLURaw = self.GLURaw_1_4_0_1; GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix {}; GLUT_2_1_2_1 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix {}; @@ -869,10 +890,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in OpenGLRaw = self.OpenGLRaw_1_3_0_0; OpenGL = self.OpenGL_2_8_0_0.override { OpenGLRaw = self.OpenGLRaw_1_3_0_0; GLURaw = self.GLURaw_1_3_0_0; }; }; - GLUT_2_5_1_0 = callPackage ../development/libraries/haskell/GLUT/2.5.1.0.nix { - OpenGL = self.OpenGL_2_9_1_0; + GLUT_2_5_1_1 = callPackage ../development/libraries/haskell/GLUT/2.5.1.1.nix { + OpenGL = self.OpenGL_2_9_2_0; }; - GLUT = self.GLUT_2_5_1_0; + GLUT = self.GLUT_2_5_1_1; gnuidn = callPackage ../development/libraries/haskell/gnuidn {}; @@ -1231,6 +1252,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {}; + JuicyPixelsUtil = callPackage ../development/libraries/haskell/JuicyPixels-util {}; + kanExtensions = callPackage ../development/libraries/haskell/kan-extensions {}; kansasLava = callPackage ../development/libraries/haskell/kansas-lava {}; @@ -1361,6 +1384,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in minimorph = callPackage ../development/libraries/haskell/minimorph {}; + minioperational = callPackage ../development/libraries/haskell/minioperational {}; + miniutter = callPackage ../development/libraries/haskell/miniutter { binary = self.binary_0_7_2_1; }; @@ -1534,9 +1559,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in oeis = callPackage ../development/libraries/haskell/oeis {}; - OpenAL = callPackage ../development/libraries/haskell/OpenAL { - OpenGL = self.OpenGL_2_9_1_0; - }; + OpenAL = callPackage ../development/libraries/haskell/OpenAL {}; OpenGL_2_2_1_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.1.1.nix {}; OpenGL_2_2_3_0 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.0.nix {}; @@ -1544,12 +1567,13 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in OpenGL_2_4_0_2 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.2.nix {}; OpenGL_2_6_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.6.0.1.nix {}; OpenGL_2_8_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.8.0.0.nix {}; - OpenGL_2_9_1_0 = callPackage ../development/libraries/haskell/OpenGL/2.9.1.0.nix {}; - OpenGL = self.OpenGL_2_9_1_0; + OpenGL_2_9_2_0 = callPackage ../development/libraries/haskell/OpenGL/2.9.2.0.nix {}; + OpenGL = self.OpenGL_2_9_2_0; OpenGLRaw_1_3_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.3.0.0.nix {}; OpenGLRaw_1_4_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.4.0.0.nix {}; - OpenGLRaw = self.OpenGLRaw_1_4_0_0; + OpenGLRaw_1_5_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.5.0.0.nix {}; + OpenGLRaw = self.OpenGLRaw_1_5_0_0; opensslStreams = callPackage ../development/libraries/haskell/openssl-streams {}; @@ -1691,9 +1715,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in prettyclass = callPackage ../development/libraries/haskell/prettyclass {}; - prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {}; - prettyShow_1_6_7 = callPackage ../development/libraries/haskell/pretty-show/1.6.7.nix {}; - prettyShow = self.prettyShow_1_6_7; + prettyShow = callPackage ../development/libraries/haskell/pretty-show {}; punycode = callPackage ../development/libraries/haskell/punycode {}; @@ -1780,6 +1802,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in recaptcha = callPackage ../development/libraries/haskell/recaptcha {}; + recursionSchemes = callPackage ../development/libraries/haskell/recursion-schemes {}; + reducers = callPackage ../development/libraries/haskell/reducers {}; reflection = callPackage ../development/libraries/haskell/reflection {}; @@ -1856,7 +1880,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in sbv = callPackage ../development/libraries/haskell/sbv {}; - scientific = callPackage ../development/libraries/haskell/scientific {}; + scientific_0_2_0_2 = callPackage ../development/libraries/haskell/scientific/0.2.0.2.nix {}; + scientific_0_3_2_1 = callPackage ../development/libraries/haskell/scientific/0.3.2.1.nix {}; + scientific = self.scientific_0_3_2_1; scotty = callPackage ../development/libraries/haskell/scotty {}; @@ -1876,6 +1902,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in setenv = callPackage ../development/libraries/haskell/setenv {}; + setlocale = callPackage ../development/libraries/haskell/setlocale {}; + shelly = callPackage ../development/libraries/haskell/shelly {}; simpleReflect = callPackage ../development/libraries/haskell/simple-reflect {}; @@ -2014,6 +2042,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in sourcemap = callPackage ../development/libraries/haskell/sourcemap {}; + split_0_1_4_3 = callPackage ../development/libraries/haskell/split/0.1.4.3.nix {}; split_0_2_1_1 = callPackage ../development/libraries/haskell/split/0.2.1.1.nix {}; split_0_2_2 = callPackage ../development/libraries/haskell/split/0.2.2.nix {}; split = self.split_0_2_2; @@ -2189,8 +2218,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in timeCompat = callPackage ../development/libraries/haskell/time-compat {}; tls_1_1_5 = callPackage ../development/libraries/haskell/tls/1.1.5.nix {}; - tls_1_2_7 = callPackage ../development/libraries/haskell/tls/1.2.7.nix {}; - tls = self.tls_1_2_7; + tls_1_2_8 = callPackage ../development/libraries/haskell/tls/1.2.8.nix {}; + tls = self.tls_1_2_8; tlsExtra = callPackage ../development/libraries/haskell/tls-extra { tls = self.tls_1_1_5; @@ -2351,6 +2380,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in warpTls = callPackage ../development/libraries/haskell/warp-tls {}; + wcwidth = callPackage ../development/libraries/haskell/wcwidth {}; + webRoutes = callPackage ../development/libraries/haskell/web-routes {}; webRoutesBoomerang = callPackage ../development/libraries/haskell/web-routes-boomerang {}; @@ -2375,13 +2406,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in word8 = callPackage ../development/libraries/haskell/word8 {}; - wreq = callPackage ../development/libraries/haskell/wreq { - aeson = self.aeson.override { attoparsec = self.attoparsec_0_11_3_1; }; - attoparsec = self.attoparsec_0_11_3_1; - lens = self.lens.override { - aeson = self.aeson.override { attoparsec = self.attoparsec_0_11_3_1; }; - }; - }; + wreq = callPackage ../development/libraries/haskell/wreq {}; wx = callPackage ../development/libraries/haskell/wxHaskell/wx.nix {}; @@ -2477,7 +2502,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in zeromq4Haskell = callPackage ../development/libraries/haskell/zeromq4-haskell { zeromq = pkgs.zeromq4; }; - zipArchive = callPackage ../development/libraries/haskell/zip-archive {}; + zipArchive_0_2_2_1 = callPackage ../development/libraries/haskell/zip-archive/0.2.2.1.nix {}; + zipArchive_0_2_3_2 = callPackage ../development/libraries/haskell/zip-archive/0.2.3.2.nix {}; + zipArchive = self.zipArchive_0_2_3_2; zipper = callPackage ../development/libraries/haskell/zipper {}; @@ -2665,13 +2692,17 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {}; cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix { Cabal = self.Cabal_1_16_0_3; }; cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix { Cabal = self.Cabal_1_18_1_3; }; - cabalInstall_1_20_0_1 = callPackage ../tools/package-management/cabal-install/1.20.0.1.nix { Cabal = self.Cabal_1_20_0_0; }; - cabalInstall = self.cabalInstall_1_20_0_1; + cabalInstall_1_20_0_2 = callPackage ../tools/package-management/cabal-install/1.20.0.2.nix { Cabal = self.Cabal_1_20_0_0; }; + cabalInstall = self.cabalInstall_1_20_0_2; + + codex = callPackage ../development/tools/haskell/codex {}; gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {}; githubBackup = callPackage ../applications/version-management/git-and-tools/github-backup {}; + hobbes = callPackage ../development/tools/haskell/hobbes {}; + jailbreakCabal = callPackage ../development/tools/haskell/jailbreak-cabal {}; keter = callPackage ../development/tools/haskell/keter {}; diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 356b736506df..e250085f7307 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -18226,6 +18226,26 @@ ]; passthru.names = [ "typedarray" ]; }; + by-spec."typescript"."*" = + self.by-version."typescript"."1.0.1"; + by-version."typescript"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "typescript-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/typescript/-/typescript-1.0.1.tgz"; + name = "typescript-1.0.1.tgz"; + sha1 = "e8eacde3084a091d3fe29b60ac5862252662a25a"; + }) + ]; + buildInputs = + (self.nativeDeps."typescript" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "typescript" ]; + }; + "typescript" = self.by-version."typescript"."1.0.1"; by-spec."uglify-js"."*" = self.by-version."uglify-js"."2.4.13"; by-version."uglify-js"."2.4.13" = lib.makeOverridable self.buildNodePackage { diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 57eab330ce21..4d220a008290 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -130,4 +130,5 @@ , "phantomjs" , "sinon" , "shelljs" +, "typescript" ] |