diff options
Diffstat (limited to 'pkgs')
262 files changed, 4963 insertions, 1633 deletions
diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix new file mode 100644 index 00000000000..dd23504d3fa --- /dev/null +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, cairo, gtk, gtkmm, lv2, lvtk, pkgconfig, python }: + +stdenv.mkDerivation rec { + name = "ams-lv2-${version}"; + version = "1.0.2"; + + src = fetchurl { + url = "https://github.com/blablack/ams-lv2/archive/v${version}.tar.gz"; + sha256 = "0fa1ghf6qahbhj9j1ciyw0hr6nngwksa37hbs651mlz0fn7lz4xm"; + }; + + buildInputs = [ cairo gtk gtkmm lv2 lvtk pkgconfig python ]; + + configurePhase = "python waf configure --prefix=$out"; + + buildPhase = "python waf"; + + installPhase = "python waf install"; + + meta = with stdenv.lib; { + description = "An LV2 port of the internal modules found in Alsa Modular Synth"; + homepage = http://objectivewave.wordpress.com/ams-lv2; + license = licenses.gpl3; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index cf554f83c8b..4352e2e133a 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation { description = "A multiplatform music player"; license = licenses.gpl3Plus; platforms = platforms.linux; + maintainers = [ maintainers.ttuegel ]; }; } diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index fc2453869e5..9a812fd261a 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.3.6"; + version = "0.4.0"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "13prman3jlh3xz56675vnnnghnmmbxpq8gqdhv5llgd8ggzhmyjn"; + sha256 = "0bhj4liv6c0rw0gsh1zygj4a9vmwl3jdz2j6zzdxbqdk21xq4zpz"; }; buildInputs = [ jackaudio libsndfile lv2 qt4 ]; diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix new file mode 100644 index 00000000000..73138cc269d --- /dev/null +++ b/pkgs/applications/audio/ingen/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, jackaudio, lilv +, lv2, pkgconfig, python, raul, serd, sord, sratom, suil +}: + +stdenv.mkDerivation rec { + name = "ingen-svn-${rev}"; + rev = "5317"; + + src = fetchsvn { + url = "http://svn.drobilla.net/lad/trunk/ingen"; + rev = rev; + sha256 = "0zm3wbv9qsingjyr95nwin3khmnf3wq3fz2xa6p420dpcy6qnl4x"; + }; + + buildInputs = [ + boost ganv glibmm gtk gtkmm jackaudio lilv lv2 pkgconfig python + raul serd sord sratom suil + ]; + + configurePhase = "python waf configure --prefix=$out"; + + buildPhase = "python waf"; + + installPhase = "python waf install"; + + meta = with stdenv.lib; { + description = "A modular audio processing system using JACK and LV2 or LADSPA plugins"; + homepage = http://drobilla.net/software/ingen; + license = licenses.gpl3; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index f2f196acdd8..b8a283125fc 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -1,14 +1,15 @@ -{stdenv, fetchurl, alsaLib, gtk, pkgconfig }: +{ stdenv, fetchurl, alsaLib, gtk, pkgconfig }: stdenv.mkDerivation { - name = "praat-5323"; + name = "praat-5365"; + src = fetchurl { - url = http://www.fon.hum.uva.nl/praat/praat5323_sources.tar.gz; - sha256 = "1m0m5165h74mw5xhmnnyzh5ans3cn78w5rs9572sa1512cams203"; + url = http://www.fon.hum.uva.nl/praat/praat5365_sources.tar.gz; + sha256 = "1w3mcq0mipx88i7ckhvzhmdj0p67nhppnn7kbkp21d01yyyz5rgq"; }; configurePhase = '' - cp makefiles/makefile.defs.linux makefile.defs + cp makefiles/makefile.defs.linux.alsa makefile.defs ''; installPhase = '' @@ -22,5 +23,6 @@ stdenv.mkDerivation { description = "Doing phonetics by computer"; homepage = http://www.fon.hum.uva.nl/praat/; license = "GPLv2+"; # Has some 3rd-party code in it though + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index de1aba2a7f6..ea8ae88f022 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -18,7 +18,7 @@ buildPythonPackage { # XXX, tests fail doCheck = false; - src = [ + srcs = [ (fetchurl { url = "https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/quodlibet-${version}.tar.gz"; sha256 = "0ilasi4b0ay8r6v6ba209wsm80fq2nmzigzc5kvphrk71jwypx6z"; @@ -27,7 +27,7 @@ buildPythonPackage { url = "https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/quodlibet-plugins-${version}.tar.gz"; sha256 = "1rv08rhdjad8sjhplqsspcf4vkazgkxyshsqmbfbrrk5kvv57ybc"; }) - ]; + ]; preConfigure = '' # TODO: for now don't a apply gdist overrides, will be needed for shipping icons, gtk, etc @@ -35,11 +35,13 @@ buildPythonPackage { ''; sourceRoot = "quodlibet-${version}"; + postUnpack = '' # the patch searches for plugins in directory ../plugins # so link the appropriate directory there ln -sf quodlibet-plugins-${version} plugins ''; + patches = [ ./quodlibet-package-plugins.patch ]; buildInputs = stdenv.lib.optionals withGstPlugins [ diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 8c73928c79a..2748dfd5db4 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.3.6"; + version = "0.4.0"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "1fgy9w3mp0p8i1v41a7gmpzzk268k7bp75d4sgzfprikjihc6ary"; + sha256 = "04vldwpm4059czwd4i5yv07daqjnzs2zsrld779likans9ib3ri8"; }; buildInputs = [ jackaudio libsndfile lv2 qt4 ]; diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index c93c4c85225..229d4fdac14 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.3.6"; + version = "0.4.0"; src = fetchurl { url = "mirror://sourceforge/synthv1/${name}.tar.gz"; - sha256 = "1xj4dk1g546f9fv2c4i7g3f1axrxfrxzk9w1nidhj3686j79nyry"; + sha256 = "0zyxja1s74fr95qbwsyykggs3af2ndm2hz1l0avb645xgm93vcfv"; }; buildInputs = [ qt4 jackaudio lv2 ]; diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 7dd4a0519ce..67317490412 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -1,8 +1,10 @@ { stdenv, fetchhg, ncurses, gettext, pkgconfig }: stdenv.mkDerivation rec { - name = "vim-7.4.131"; - + name = "vim-${version}"; + + version = "7.4.131"; + src = fetchhg { url = "https://vim.googlecode.com/hg/"; tag = "v7-4-131"; @@ -10,7 +12,7 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - + buildInputs = [ ncurses pkgconfig ]; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/applications/editors/vim/wrapper.nix b/pkgs/applications/editors/vim/wrapper.nix new file mode 100644 index 00000000000..709753ff8eb --- /dev/null +++ b/pkgs/applications/editors/vim/wrapper.nix @@ -0,0 +1,30 @@ +{ stdenv, makeWrapper, writeText, vim, vimrc }: + +let + + vimrcfile = writeText "vimrc" (if vimrc == null then "" else vimrc); + +in stdenv.mkDerivation rec { + name = "vimwrapper-${vim.version}"; + + buildInputs = [ makeWrapper vim vimrcfile ]; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out + cp -r ${vim}/* $out/ + + chmod u+w $out/bin + chmod u+w $out/share/vim + + ln -s ${vimrcfile} $out/share/vim/vimrc + wrapProgram $out/bin/vim --set VIM "$out/share/vim" + ''; + + meta = with stdenv.lib; { + description = "The most popular clone of the VI editor"; + homepage = http://www.vim.org; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 66a7f334dbd..35659cbfe6f 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -18,14 +18,14 @@ }: let - version = "6.8.7-6"; + version = "6.8.8-7"; in stdenv.mkDerivation rec { name = "ImageMagick-${version}"; src = fetchurl { url = "mirror://imagemagick/${name}.tar.xz"; - sha256 = "0cbfhk184kxdxz5czyyqxac29mbfiahygjji6k97z6hp8ngnqlvh"; + sha256 = "1x5jkbrlc10rx7vm344j7xrs74c80xk3n1akqx8w5c194fj56mza"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index c2672393bc5..f3d7c26fe5c 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-1.23.0"; + name = "calibre-1.25.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "1sm6v53c12nkqnpv7n4g1mzkwmzbn74a8v83bzvvjiz0i9c7cl59"; + sha256 = "1y221r5vgq426ldqjrx3qvgf3j3v2wncwzra747psvhwf95zd5fd"; }; inherit python; diff --git a/pkgs/applications/misc/gnuradio-osmosdr/default.nix b/pkgs/applications/misc/gnuradio-osmosdr/default.nix new file mode 100644 index 00000000000..2e9d74c2441 --- /dev/null +++ b/pkgs/applications/misc/gnuradio-osmosdr/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchgit, cmake, pkgconfig, boost, gnuradio, rtl-sdr, uhd +, makeWrapper +, pythonSupport ? true, python, swig +}: + +assert pythonSupport -> python != null && swig != null; + +stdenv.mkDerivation rec { + name = "gnuradio-osmosdr-${version}"; + version = "0.1.0"; + + src = fetchgit { + url = "git://git.osmocom.org/gr-osmosdr"; + rev = "refs/tags/v${version}"; + sha256 = "112zfvnr6fjvhdc06ihi2sb0dp441qy7jq8rvr81nbyv3r8jspj4"; + }; + + buildInputs = [ + cmake pkgconfig boost gnuradio rtl-sdr uhd makeWrapper + ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; + + postInstall = '' + for prog in "$out"/bin/*; do + wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") + done + ''; + + meta = with stdenv.lib; { + description = "Gnuradio block for OsmoSDR and rtl-sdr"; + homepage = http://sdr.osmocom.org/trac/wiki/GrOsmoSDR; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index 08d2b29a92a..7e67682f17f 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { name = "gnuradio-${version}"; - version = "3.7.1"; + version = "3.7.2.1"; src = fetchurl { url = "http://gnuradio.org/releases/gnuradio/${name}.tar.gz"; - sha256 = "1kfni8vpgr6v9rdiz3zsmwc07qj6zka9x22z2y0y4rak2xnzdxz9"; + sha256 = "101wr19nxfc5x7i4s10vgrypaa0vj2pkg8b2vn5j5s9iv8gpwswc"; }; buildInputs = [ @@ -51,9 +51,9 @@ stdenv.mkDerivation rec { postInstall = '' printf "backend : Qt4Agg\n" > "$out/share/gnuradio/matplotlibrc" - for file in "$out"/bin/*; do + for file in "$out"/bin/* "$out"/share/gnuradio/examples/*/*.py; do wrapProgram "$file" \ - --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") \ + --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \ --set MATPLOTLIBRC "$out/share/gnuradio" done ''; diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix new file mode 100644 index 00000000000..a5208107750 --- /dev/null +++ b/pkgs/applications/misc/gqrx/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, qt4, gnuradio, boost, gnuradio-osmosdr +# drivers (optional): +, rtl-sdr +, pulseaudioSupport ? true, pulseaudio +}: + +assert pulseaudioSupport -> pulseaudio != null; + +stdenv.mkDerivation rec { + name = "gqrx-${version}"; + version = "2.2.0"; + + src = fetchurl { + url = "mirror://sourceforge/project/gqrx/${version}/${name}-src.tar.gz"; + sha256 = "15ncx2shh43skph7sj3jvmkls9cbbbysld49c8xd23fhdsxanj9x"; + }; + + buildInputs = [ + qt4 gnuradio boost gnuradio-osmosdr rtl-sdr + ] ++ stdenv.lib.optionals pulseaudioSupport [ pulseaudio ]; + + configurePhase = ''qmake PREFIX="$out"''; + + meta = with stdenv.lib; { + description = "Software defined radio (SDR) receiver"; + longDescription = '' + Gqrx is a software defined radio receiver powered by GNU Radio and the Qt + GUI toolkit. It can process I/Q data from many types of input devices, + including Funcube Dongle Pro/Pro+, rtl-sdr, HackRF, and Universal + Software Radio Peripheral (USRP) devices. + ''; + homepage = http://gqrx.dk/; + # Some of the code comes from the Cutesdr project, with a BSD license, but + # it's currently unknown which version of the BSD license that is. + license = licenses.gpl3Plus; + platforms = platforms.linux; # should work on Darwin / OS X too + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 17b86910de0..57ac7da9b78 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -8,6 +8,13 @@ stdenv.mkDerivation rec { sha256 = "0y247nka5gkr1ajn47jrlp5rcnf6h4ff7dfsprma3h4wxqdv7a5b"; }; + patches = [(fetchurl { + name = "CVE-2014-2013.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;" + + "h=60dabde18d7fe12b19da8b509bdfee9cc886aafc"; + sha256 = "1walj3wir9x50i6lph33bx14c8593r9xrn08gkd3v7r6d15lmjps"; + })]; + buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix new file mode 100644 index 00000000000..f7180097961 --- /dev/null +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, glib, gtk, intltool, libfm, libX11, pango, pkgconfig }: + +stdenv.mkDerivation { + name = "pcmanfm-1.2.0"; + src = fetchurl { + url = "mirror://sourceforge/pcmanfm/pcmanfm-1.2.0.tar.xz"; + sha256 = "1cmskj7dpjgrrn89z7cc1h1nsmd6qq3bakf207ldrhrxxv3fxl2j"; + }; + + buildInputs = [ glib gtk intltool libfm libX11 pango pkgconfig ]; + + meta = with stdenv.lib; { + homepage = "http://blog.lxde.org/?cat=28/"; + license = licenses.gpl2Plus; + description = "File manager with GTK+ interface"; + maintainers = [ maintainers.ttuegel ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/rtl-sdr/default.nix b/pkgs/applications/misc/rtl-sdr/default.nix new file mode 100644 index 00000000000..e6e76249388 --- /dev/null +++ b/pkgs/applications/misc/rtl-sdr/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit, cmake, pkgconfig, libusb1 }: + +stdenv.mkDerivation rec { + name = "rtl-sdr-${version}"; + version = "0.5.3"; + + src = fetchgit { + url = "git://git.osmocom.org/rtl-sdr.git"; + rev = "refs/tags/v${version}"; + sha256 = "00r5d08r12zzkd0xggd7l7p4r2278rzdhqdaihwjlajmr9qd3hs1"; + }; + + buildInputs = [ cmake pkgconfig libusb1 ]; + + # Building with -DINSTALL_UDEV_RULES=ON tries to install udev rules to + # /etc/udev/rules.d/, and there is no option to install elsewhere. So install + # rules manually. + postInstall = '' + mkdir -p "$out/etc/udev/rules.d/" + cp ../rtl-sdr.rules "$out/etc/udev/rules.d/99-rtl-sdr.rules" + ''; + + meta = with stdenv.lib; { + description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"; + homepage = http://sdr.osmocom.org/trac/wiki/rtl-sdr; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index 7eacaf15b62..49c1a403814 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -1,15 +1,16 @@ -{ cabal, alsaCore, alsaMixer, filepath, libXrandr, mtl, parsec -, regexCompat, stm, time, utf8String, wirelesstools, X11, X11Xft +{ cabal, alsaCore, alsaMixer, filepath, HTTP, libXrandr, mtl +, parsec, regexCompat, stm, time, utf8String, wirelesstools, X11 +, X11Xft }: cabal.mkDerivation (self: { pname = "xmobar"; - version = "0.19"; - sha256 = "1lwbww9vpqscip16lqiax2qvfyksxms5xx4n0s61mzw7v61hyxq2"; + version = "0.20"; + sha256 = "06ra5nx53rlijkb3hhp5p5a0b3bx14921jgkkp1xqciscnspj2nv"; isLibrary = false; isExecutable = true; buildDepends = [ - alsaCore alsaMixer filepath mtl parsec regexCompat stm time + alsaCore alsaMixer filepath HTTP mtl parsec regexCompat stm time utf8String X11 X11Xft ]; extraLibraries = [ libXrandr wirelesstools ]; diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index a13dd76fd03..ac2f6dd7756 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig }: stdenv.mkDerivation rec { - name = "xterm-301"; + name = "xterm-303"; src = fetchurl { url = "ftp://invisible-island.net/xterm/${name}.tgz"; - sha256 = "040rarvv18zg0lk7qy0m3n7gv10mh40jic708wvng01z4rlbpfhz"; + sha256 = "0n7hay16aam9kfn642ri0wj5yzilbjm3l8znxc2p5dx9pn3rkwla"; }; buildInputs = diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix index 895ebd7911b..c6277da704e 100644 --- a/pkgs/applications/networking/bittorrentsync/default.nix +++ b/pkgs/applications/networking/bittorrentsync/default.nix @@ -14,9 +14,9 @@ let else if stdenv.system == "i686-linux" then "ld-linux.so.2" else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; - version = "1.2.82"; - sha256 = if stdenv.system == "x86_64-linux" then "0cqrscav57xwz7rag6wy06xw6z7ca97xailprgg6jdjv4pnc91ra" - else if stdenv.system == "i686-linux" then "1b9rnfk0wkhj1zybvfqwgd9dcqnxwdnp7m0vf6lhrgi75cydj7is" + version = "1.2.91"; + sha256 = if stdenv.system == "x86_64-linux" then "1rx5mmk3ffkh6dbm0m33nyx6spsxqjw9djclcf9x9bs3zfyzgmnd" + else if stdenv.system == "i686-linux" then "1566mp01149gsb57dv87420w1vq2f3adp6g1c90xdxjxzd67yqpw" else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; in stdenv.mkDerivation { diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 0a8adfee40a..63b4c9033a3 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "34.0.1847.3"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1847.3.tar.xz"; - sha256 = "1jm9cr1qqfqd82fy3f1q4d0qg94vsrzyq8dbn4hrxyzqbjc4sclg"; + version = "35.0.1862.2"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-35.0.1862.2.tar.xz"; + sha256 = "19426x4x3bnx21qjhqc4sk27k7dnhm1pw84079h6gk0hyjzcwn0f"; }; beta = { - version = "33.0.1750.117"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.117.tar.xz"; - sha256 = "0nyaqrxz8kcnppcya68qpr47fw4d959p4l63kqzvd9ifdqfgk18f"; + version = "34.0.1847.14"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1847.14.tar.xz"; + sha256 = "038bz2d40rgjppkalal9ycjhfvkhph926k35v8pc3618z2fy10cn"; }; stable = { - version = "33.0.1750.117"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.117.tar.xz"; - sha256 = "0nyaqrxz8kcnppcya68qpr47fw4d959p4l63kqzvd9ifdqfgk18f"; + version = "33.0.1750.146"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.146.tar.xz"; + sha256 = "0x2a5kyaj38661c5s33pywhrwkm8kj2fbr1z940c5al6y2hfgc6m"; }; } diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix index e10acf294bf..c638e2b1adb 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-01-29"; + name = "dwb-2014-03-01"; src = fetchgit { url = "https://bitbucket.org/portix/dwb.git"; - rev = "eaf090af9ad63341a846377cb9ce473feee8f032"; - sha256 = "1wqa5dry9p3x3y07zpq3km8ycr8wvz8c11754vf99pv1kzk8gq0n"; + rev = "e8d4b8d7937b70279d006da4938dfe52fb85f9e8"; + sha256 = "0m4730zqmnvb9k6xyydi221sh0wbanzbhg07xvwil3kn1d29340w"; }; buildInputs = [ pkgconfig makeWrapper libsoup webkit gtk3 gnutls json_c m4 ]; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 3a73afe48c5..6a00dfcd8c1 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,8 +2,10 @@ , browserName, desktopName, nameSuffix, icon }: +let p = builtins.parseDrvName browser.name; in + stdenv.mkDerivation { - name = browser.name + "-with-plugins"; + name = "${p.name}-with-plugins-${p.version}"; desktopItem = makeDesktopItem { name = browserName; diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index b7c9a76e151..a8b4cfaf926 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus, gnutls2, wxGTK28, libidn, tinyxml, gettext +{ stdenv, fetchurl, dbus, gnutls, wxGTK28, libidn, tinyxml, gettext , pkgconfig, xdg_utils, gtk2, sqlite }: let version = "3.7.3"; in @@ -15,7 +15,7 @@ stdenv.mkDerivation { ]; buildInputs = [ - dbus gnutls2 wxGTK28 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite + dbus gnutls wxGTK28 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix new file mode 100644 index 00000000000..e6dd6569a55 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, makeDesktopItem, unzip, ant, jdk }: + +stdenv.mkDerivation rec { + + name = "jitsi-${version}"; + version = "2.4.4997"; + + src = fetchurl { + url = "https://download.jitsi.org/jitsi/src/jitsi-src-${version}.zip"; + sha256 = "f1c2688d7d6bf1916fed3b8b105a785662980c5b297dcab3c9e7d272647ef825"; + }; + + patches = [ ./jitsi.patch ]; + + jitsiItem = makeDesktopItem { + name = "Jitsi"; + exec = "jitsi"; + comment = "VoIP and Instant Messaging client"; + desktopName = "Jitsi"; + genericName = "Instant Messaging"; + categories = "Application;Internet;"; + }; + + buildInputs = [unzip ant jdk]; + + buildPhase = ''ant make''; + + installPhase = '' + mkdir -p $out + cp -a lib $out/ + cp -a sc-bundles $out/ + mkdir $out/bin + cp resources/install/generic/run.sh $out/bin/jitsi + chmod +x $out/bin/jitsi + sed -i 's| java | ${jdk}/bin/java |' $out/bin/jitsi + patchShebangs $out + ''; + + meta = { + homepage = https://jitsi.org/; + description = "Open Source Video Calls and Chat"; + license = stdenv.lib.licenses.lgpl21Plus.shortName; + platforms = stdenv.lib.platforms.linux; + }; + +} diff --git a/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch b/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch new file mode 100644 index 00000000000..9163cecd175 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch @@ -0,0 +1,27 @@ +--- /home/dario/Downloads/jitsi/resources/install/generic/run.sh 2013-11-01 15:37:21.000000000 +0000 ++++ jitsi/resources/install/generic/run.sh 2014-03-04 11:52:30.796397567 +0000 +@@ -1,4 +1,9 @@ +-mkdir -p $HOME/.sip-communicator/log ++#! /bin/bash ++# A modified version of the generic run.sh ++ ++#mkdir -p $HOME/.sip-communicator/log ++ ++cd "$( dirname "$( dirname "${BASH_SOURCE[0]}" )" )" + + # Get architecture + ARCH=`uname -m | sed -e s/x86_64/64/ -e s/i.86/32/` +@@ -6,10 +11,12 @@ + # Additionnal JVM arguments + CLIENTARGS="" + ++NATIVELIBS="lib/native/linux-64" + if [ $ARCH -eq 32 ] + then + CLIENTARGS="-client -Xmx256m" ++ NATIVELIBS="lib/native/linux" + fi + + export PATH=$PATH:native +-java $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator ++exec java $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=$NATIVELIBS -Dfelix.config.properties=file:lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator diff --git a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix new file mode 100644 index 00000000000..51639f6050d --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchgit, libconfig, lua5_2, openssl, readline, zlib +}: + +stdenv.mkDerivation rec { + name = "telegram-cli"; + + src = fetchgit { + url = "https://github.com/vysheng/tg.git"; + rev = "ac6079a00ac66bb37a3179a82af130b41ec39bc9"; + sha256 = "1rpwnyzmqk7p97n5pd00m5c6rypc39mb3hs94qxxrdcpwpgcb73q"; + }; + + buildInputs = [ libconfig lua5_2 openssl readline zlib ]; + + installPhase = '' + mkdir -p $out/bin + cp ./telegram $out/bin/telegram-wo-key + cp ./tg.pub $out/ + cat > $out/bin/telegram <<EOF + #!/usr/bin/env bash + $out/bin/telegram-wo-key -k $out/tg.pub + EOF + chmod +x $out/bin/telegram + ''; + + meta = { + description = "Command-line interface for Telegram messenger"; + homepage = https://telegram.org/; + license = "GPLv2"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix new file mode 100644 index 00000000000..f1cc7df1904 --- /dev/null +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, pkgconfig, gtk, perl, python, gettext +, libtool, pciutils, dbus_glib, libcanberra, libproxy +, libsexy, enchant, libnotify, openssl +, desktop_file_utils, hicolor_icon_theme +}: + +stdenv.mkDerivation rec { + version = "2.9.6.1"; + name = "hexchat-${version}"; + + src = fetchurl { + url = "http://dl.hexchat.net/hexchat/${name}.tar.xz"; + sha256 = "0w34jr1pqril6r011fwxv40m17bnb88q9cv5hf08mv0a9lygyrv2"; + }; + + buildInputs = [ + pkgconfig gtk perl python gettext + libtool pciutils dbus_glib libcanberra libproxy + libsexy libnotify openssl + desktop_file_utils hicolor_icon_theme + ]; + + configureFlags = [ "--enable-shm" "--enable-textfe" ]; + + meta = { + description = "A popular and easy to use graphical IRC (chat) client"; + homepage = http://hexchat.github.io/; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 093b801401d..caf7da3cf3c 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -1,30 +1,58 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, gtk2, gnome2 /*just GConf*/ -, libsoup, libunique, libxslt, webkit_gtk2, json_glib -, libnotify /*optional*/ }: +{ stdenv, fetchurl, pkgconfig, intltool, python, pygobject3 +, glib, gnome3, pango, libxml2, libxslt, sqlite, libsoup, glib_networking +, webkitgtk, json_glib, gobjectIntrospection, gst_all_1 +, libnotify +, makeWrapper +}: -let version = "1.8.15"; +let pname = "liferea"; + version = "1.10.6"; in stdenv.mkDerivation rec { - name = "liferea-${version}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/liferea/Liferea%20Stable/${version}/${name}.tar.bz2"; - sha256 = "12hhdl5biwcvr9ds7pdhhvlp4vggjix6xm4z5pnfaz53ai2dnc99"; + url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.gz"; + sha256 = "0vp19z4p3cn3zbg1zjpg2iyzwq893dx5c1kh6aac06s3rf1124gm"; }; - buildInputs = [ - pkgconfig intltool gtk2 gnome2.GConf - libsoup libunique libxslt webkit_gtk2 json_glib + buildInputs = with gst_all_1; [ + pkgconfig intltool python + glib gnome3.gtk pango libxml2 libxslt sqlite libsoup + webkitgtk json_glib gobjectIntrospection gnome3.gsettings_desktop_schemas + gnome3.libpeas gnome3.dconf + gst-plugins-base gst-plugins-good gst-plugins-bad + gnome3.libgnome_keyring libnotify + makeWrapper ]; preFixup = '' rm $out/share/icons/hicolor/icon-theme.cache''; + postInstall = '' + for f in "$out"/bin/*; do + wrapProgram "$f" \ + --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \ + --prefix LD_LIBRARY_PATH : "${gnome3.libgnome_keyring}/lib" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules:${glib_networking}/lib/gio/modules" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share" + done + ''; + meta = { description = "A GTK-based news feed agregator"; homepage = http://lzone.de/liferea/; - maintainers = [ stdenv.lib.maintainers.vcunat ]; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [ vcunat romildo ]; platforms = stdenv.lib.platforms.linux; + + longDescription = '' + Liferea (Linux Feed Reader) is an RSS/RDF feed reader. + It's intended to be a clone of the Windows-only FeedReader. + It can be used to maintain a list of subscribed feeds, + browse through their items, and show their contents. + ''; }; } diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix new file mode 100644 index 00000000000..d24437aabb6 --- /dev/null +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -0,0 +1,39 @@ +{stdenv, fetchurl, writeScript, pkgconfig, cmake, qt4, seafile-shared, ccnet, makeWrapper}: + +stdenv.mkDerivation rec +{ + version = "2.1.1"; + name = "seafile-client-${version}"; + + src = fetchurl + { + url = "https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz"; + sha256 = "d98515ea229df702cbe973d85ec0bd5cf3f5282ef1022ba0157d5301b521c8e0"; + }; + + buildInputs = [ pkgconfig cmake qt4 seafile-shared makeWrapper ]; + + builder = writeScript "${name}-builder.sh" '' + source $stdenv/setup + + tar xvfz $src + cd seafile-client-* + + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_BUILD_RPATH=ON -DCMAKE_INSTALL_PREFIX="$out" . + make -j1 + + make install + + wrapProgram $out/bin/seafile-applet \ + --suffix PATH : ${ccnet}/bin:${seafile-shared}/bin + ''; + + meta = + { + homepage = "https://github.com/haiwen/seafile-clients"; + description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage"; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.calrama ]; + }; +} diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 58e657f8b2e..5918f0612ce 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -6,10 +6,10 @@ { stdenv, fetchurl, pam, python3, tcsh, libxslt, perl, ArchiveZip , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd -, libxml2, db, sablotron, curl, libXaw, fontconfig, libsndfile, neon +, libxml2, db, sablotron, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which -, icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups -, libXinerama, openssl, gperf, cppunit, GConf, ORBit2, poppler +, icu, boost, jdk, ant, cups, xorg +, openssl, gperf, cppunit, GConf, ORBit2, poppler , librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra @@ -246,13 +246,14 @@ stdenv.mkDerivation rec { make slowcheck ''; - buildInputs = + buildInputs = with xorg; [ ant ArchiveZip autoconf automake bison boost cairo clucene_core CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig freetype GConf getopt gnome_vfs gperf gst_plugins_base gstreamer gtk hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 - libXaw libXext libXi libXinerama libxml2 libxslt libXtst mdds mesa mythes + libXaw libXext libXi libXinerama libxml2 libxslt libXtst + libXdmcp libpthreadstubs mdds mesa mythes neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler python3 sablotron saneBackends tcsh unzip vigra which zip zlib mdds bluez5 glibc libmspub libixion liborcus liblangtag diff --git a/pkgs/applications/science/logic/ekrhyper/default.nix b/pkgs/applications/science/logic/ekrhyper/default.nix index 3a50d3e1ed0..e1eb9a2dcc3 100644 --- a/pkgs/applications/science/logic/ekrhyper/default.nix +++ b/pkgs/applications/science/logic/ekrhyper/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="ekrhyper"; - version="1_4_20112013"; + version="1_4_21022014"; name="${baseName}-${version}"; - hash="08qrsahlgqq29zyrcc8435bymj3jvxaailbgjy47jzj1ki2i0vgm"; - url="http://userpages.uni-koblenz.de/~bpelzer/ekrhyper/ekrh_1_4_20112013.tar.gz"; - sha256="08qrsahlgqq29zyrcc8435bymj3jvxaailbgjy47jzj1ki2i0vgm"; + hash="14xaaxyvfli1nd4vd9fp4j1s8k76z2bhazxzzc7br3q6hc6b8ivw"; + url="http://userpages.uni-koblenz.de/~bpelzer/ekrhyper/ekrh_1_4_21022014.tar.gz"; + sha256="14xaaxyvfli1nd4vd9fp4j1s8k76z2bhazxzzc7br3q6hc6b8ivw"; }; buildInputs = [ ocaml perl diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 6c8ec9e68c5..88f4653cf7b 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "R-3.0.2"; + name = "R-3.0.3"; src = fetchurl { url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "0jq2vk6bgksbvgmdjvv7vfj6llp091d0nhl5j825aya4c2nhavlm"; + sha256 = "1mp6zp25nycn8bxnnq97gq6n21c6vprm6qc4drwap57j82azsz5r"; }; buildInputs = [ blas bzip2 gfortran liblapack libX11 libXmu libXt diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index ce4d9f98596..8a1201815ae 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "cgit-0.10"; + name = "cgit-0.10.1"; src = fetchurl { url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz"; - sha256 = "0ynywva0lrsasdm3nlk3dmd8k5bnrd9qlvmk4n42dfw9g1xj5i4h"; + sha256 = "0bci1p9spf79wirc4lk36cndcx2b9wj0fq1l58rlp6r563is77l3"; }; # cgit is is tightly coupled with git and needs a git source tree to build. @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://git.zx2c4.com/cgit/about/; + repositories.git = git://git.zx2c4.com/cgit; description = "Web frontend for git repositories"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index ee1de54a4fb..96e4631889c 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -4,10 +4,8 @@ args: with args; with pkgs; let inherit (pkgs) stdenv fetchgit fetchurl subversion; -in -rec { - git = lib.makeOverridable (import ./git) { + gitBase = lib.makeOverridable (import ./git) { inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep asciidoc xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt cpio tcl tk makeWrapper subversionClient gzip; @@ -24,6 +22,9 @@ rec { ]; }; +in +rec { + # support for bugzilla gitBz = import ./git-bz { inherit fetchgit stdenv makeWrapper python asciidoc xmlto # docbook2x docbook_xsl docbook_xml_dtd_45 libxslt @@ -31,17 +32,19 @@ rec { inherit (pythonPackages) pysqlite; }; + git = appendToName "minimal" gitBase; + # Git with SVN support, but without GUI. - gitSVN = lowPrio (appendToName "with-svn" (git.override { + gitSVN = lowPrio (appendToName "with-svn" (gitBase.override { svnSupport = true; })); # The full-featured Git. - gitFull = appendToName "full" (git.override { + gitFull = gitBase.override { svnSupport = true; guiSupport = true; sendEmailSupport = !stdenv.isDarwin; - }); + }; gitAnnex = pkgs.haskellPackages.gitAnnex; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 8a6244525e6..49129e6b8ce 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -10,14 +10,14 @@ , QuickCheck, random, regexTdfa, rsync, SafeSemaphore, SHA, stm , tasty, tastyHunit, tastyQuickcheck, tastyRerun, text, time , transformers, unixCompat, utf8String, uuid, wai, waiLogger, warp -, which, xmlTypes, yesod, yesodCore, yesodDefault, yesodForm -, yesodStatic +, warpTls, which, xmlTypes, yesod, yesodCore, yesodDefault +, yesodForm, yesodStatic }: cabal.mkDerivation (self: { pname = "git-annex"; - version = "5.20140227"; - sha256 = "0zdaryvfpbmc454798z3z3sshf0br8v3sw0vnksqng3zm3w73dah"; + version = "5.20140306"; + sha256 = "1kjgqrz0wnccylrbdiwj1yndg7v2k09f5h2vkk06bnx02xmwvjl9"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -30,7 +30,8 @@ cabal.mkDerivation (self: { networkProtocolXmpp optparseApplicative QuickCheck random regexTdfa SafeSemaphore SHA stm tasty tastyHunit tastyQuickcheck tastyRerun text time transformers unixCompat utf8String uuid wai waiLogger - warp xmlTypes yesod yesodCore yesodDefault yesodForm yesodStatic + warp warpTls xmlTypes yesod yesodCore yesodDefault yesodForm + yesodStatic ]; buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ]; configureFlags = "-fS3 diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 10283c171db..609e2654d59 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -2,7 +2,7 @@ , guiSupport ? false, tk ? null, curses }: let - name = "mercurial-2.9"; + name = "mercurial-2.9.1"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://mercurial.selenic.com/release/${name}.tar.gz"; - sha256 = "08m6h2zxik4hcqb5qq3k2anwgjrf0p9kj77lvikcaw8rqmz06y3h"; + sha256 = "06n07di6cf57bglnbh8szimngclyvf9c5ismz470gnyb9r1v23x2"; }; inherit python; # pass it so that the same version can be used in hg2git diff --git a/pkgs/applications/virtualization/8086tiny/builder.sh b/pkgs/applications/virtualization/8086tiny/builder.sh new file mode 100644 index 00000000000..36c381becec --- /dev/null +++ b/pkgs/applications/virtualization/8086tiny/builder.sh @@ -0,0 +1,19 @@ + +source $stdenv/setup + +mkdir -p ./$name $out/bin $out/share/$name $out/share/doc/$name/images + +cd $name +tar xf $src +make 8086tiny + +install 8086tiny $out/bin +install bios $out/share/$name/8086tiny-bios +install fd.img $out/share/$name/8086tiny-floppy.img +install bios_source/bios.asm $out/share/$name/8086tiny-bios-src.asmn +install docs/8086tiny.css $out/share/doc/$name +install docs/doc.html $out/share/doc/$name +for i in docs/images/*.gif +do + install $i $out/share/doc/$name/images +done diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix new file mode 100644 index 00000000000..0b4ff90e409 --- /dev/null +++ b/pkgs/applications/virtualization/8086tiny/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl +, localBios ? false, nasm ? null +, sdlSupport ? true, SDL ? null +}: + + +assert sdlSupport -> (SDL != null); + + +stdenv.mkDerivation rec { + + name = "8086tiny-${version}"; + version = "1.20"; + + src = fetchurl { + url ="http://www.megalith.co.uk/8086tiny/downloads/8086tiny_120.tar.bz2"; + sha256 = "0yapnr8wvlx7h1q1w98yfy2vsbf0rlp4wd99r3xb0b7l70b36mpw"; + }; + + buildInputs = with stdenv.lib; + optionals localBios [ nasm ] + ++ optionals sdlSupport [ SDL ]; + + builder = ./builder.sh; + + meta = { + description = "An open-source 8086 emulator"; + longDescription = '' + 8086tiny is a tiny, open source (MIT), portable (little-endian hosts) Intel PC emulator, powerful enough to run DOS, Windows 3.0, Excel, MS Flight Simulator, AutoCAD, Lotus 1-2-3, and similar applications. 8086tiny emulates a "late 80's era" PC XT-type machine. + + 8086tiny is based on an IOCCC 2013 winning entry. In fact that is the "unobfuscated" version :) + ''; + homepage = http://www.megalith.co.uk/8086tiny/index.html; + license = "MIT"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index c6c294d5504..c4841c50d94 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -159,7 +159,7 @@ rec { # Debian. debian = [ - #ftp://ftp.au.debian.org/debian/ + ftp://ftp.au.debian.org/debian/ ftp://ftp.de.debian.org/debian/ ftp://ftp.es.debian.org/debian/ ftp://ftp.fr.debian.org/debian/ diff --git a/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh b/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh index a7be09283ee..497047a73b1 100644 --- a/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh +++ b/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh @@ -70,11 +70,16 @@ fi if test "$dontSetConfigureCross" != "1"; then configureFlags="$configureFlags --build=$system --host=$crossConfig" + # This is because -print-prog-name tries to search FHS paths. + configureFlags="$configureFlags LD=$crossConfig-ld" fi # Disabling the tests when cross compiling, as usually the tests are meant for # native compilations. doCheck="" +# Don't strip foreign binaries with native "strip" tool. +dontStrip=1 + # Add the output as an rpath. if test "$NIX_NO_SELF_RPATH" != "1"; then export NIX_CROSS_LDFLAGS="-rpath $out/lib -rpath-link $out/lib $NIX_CROSS_LDFLAGS" diff --git a/pkgs/data/fonts/symbola/default.nix b/pkgs/data/fonts/symbola/default.nix new file mode 100644 index 00000000000..993a4c4f46d --- /dev/null +++ b/pkgs/data/fonts/symbola/default.nix @@ -0,0 +1,40 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "symbola-7.12"; + + ttf = fetchurl { + url = "http://users.teilar.gr/~g1951d/Symbola.ttf"; + sha256 = "7acc058bd4e56cc986b2a46420520f59be402c3565c202b5dcebca7f3bfd8b5a"; + }; + docs_pdf = fetchurl { + url = "http://users.teilar.gr/~g1951d/Symbola.pdf"; + sha256 = "11bb082ba5c2780a6f94a9bcddf4f314a54e2650bb63ce3081d1dc867c5e6843"; + }; + docs_docx = fetchurl { + url = "http://users.teilar.gr/~g1951d/Symbola.docx"; + sha256 = "4f0ab494e1e5a7aac147aa7bb8b8bdba7278aee2da942a35f995feb9051515b9"; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp -v "$ttf" $out/share/fonts/truetype/"${ttf.name}" + + mkdir -p "$out/doc/${name}" + cp -v "$docs_pdf" "$out/doc/${name}/${docs_pdf.name}" + cp -v "$docs_docx" "$out/doc/${name}/${docs_docx.name}" + ''; + + meta = { + description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode..."; + + # In lieu of a licence: + # Fonts in this site are offered free for any use; + # they may be installed, embedded, opened, edited, modified, regenerated, posted, packaged and redistributed. + license = "Unicode Fonts for Ancient Scripts"; + + homepage = http://users.teilar.gr/~g1951d/; + }; +} diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix index a5d196ae1e3..ed37f013e16 100644 --- a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix @@ -1,17 +1,26 @@ -{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool }: +{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection }: stdenv.mkDerivation rec { - name = "libgnome-keyring-3.6.0"; + name = "libgnome-keyring-3.10.1"; src = fetchurl { - url = "mirror://gnome/sources/libgnome-keyring/3.6/${name}.tar.xz"; - sha256 = "0c4qrjpmv1hqga3xv6wsq2z10x2n78qgw7q3k3s01y1pggxkgjkd"; + url = "mirror://gnome/sources/libgnome-keyring/3.10/${name}.tar.xz"; + sha256 = "0wip88r91kwx4zp6sc9b38mnlv11grgl4k2kzsd3a8x83c9g2b05"; }; - propagatedBuildInputs = [ glib dbus_libs libgcrypt ]; + propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ]; nativeBuildInputs = [ pkgconfig intltool ]; meta = { + description = "Framework for managing passwords and other secrets"; + homepage = http://live.gnome.org/GnomeKeyring; + license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; inherit (glib.meta) platforms maintainers; + + longDescription = '' + gnome-keyring is a program that keeps password and other secrets for + users. The library libgnome-keyring is used by applications to integrate + with the gnome-keyring system. + ''; }; } diff --git a/pkgs/desktops/gnome-3/core/libpeas/default.nix b/pkgs/desktops/gnome-3/core/libpeas/default.nix index eeec43a1b65..9cf8426104b 100644 --- a/pkgs/desktops/gnome-3/core/libpeas/default.nix +++ b/pkgs/desktops/gnome-3/core/libpeas/default.nix @@ -1,10 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, intltool, gobjectIntrospection }: +{ stdenv, fetchurl, pkgconfig, intltool +, glib, gtk3, gobjectIntrospection, python, pygobject3 +}: stdenv.mkDerivation rec { name = "libpeas-${version}"; version = "1.9.0"; - buildInputs = with gnome3; [ intltool pkgconfig glib gobjectIntrospection gtk3 ]; + buildInputs = [ + intltool pkgconfig + glib gtk3 gobjectIntrospection python pygobject3 + ]; src = fetchurl { url = "mirror://gnome/sources/libpeas/1.9/${name}.tar.xz"; @@ -15,8 +20,10 @@ stdenv.mkDerivation rec { rm $out/share/icons/hicolor/icon-theme.cache ''; - meta = with stdenv.lib; { - platforms = platforms.linux; + meta = { + description = "A GObject-based plugins engine"; + homepage = "http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/"; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; - } diff --git a/pkgs/desktops/kde-4.11/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.11/kdewebdev/klinkstatus.nix index 33a4d8c6083..86a8b7c0a19 100644 --- a/pkgs/desktops/kde-4.11/kdewebdev/klinkstatus.nix +++ b/pkgs/desktops/kde-4.11/kdewebdev/klinkstatus.nix @@ -1,8 +1,8 @@ -{ kde, kdelibs, libxml2, libxslt, kdepimlibs, htmlTidy, boost, ruby18 }: +{ kde, kdelibs, libxml2, libxslt, kdepimlibs, htmlTidy, boost }: kde { - buildInputs = [ kdelibs kdepimlibs ruby18 htmlTidy boost ]; + buildInputs = [ kdelibs kdepimlibs htmlTidy boost ]; meta = { description = "A KDE link checker"; diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index 3ed0f7ad0e6..af111322698 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -159,10 +159,8 @@ let version = "4.6.3"; # In any case, mingw32 g++ linking is broken by default with shared libs, # unless adding "-lsupc++" to any linking command. I don't know why. " --disable-shared" + - (if cross.config == "x86_64-w64-mingw32" then - # To keep ABI compatibility with upstream mingw-w64 - " --enable-fully-dynamic-string" - else "") + # To keep ABI compatibility with upstream mingw-w64 + " --enable-fully-dynamic-string" else (if cross.libc == "uclibc" then # In uclibc cases, libgomp needs an additional '-ldl' # and as I don't know how to pass it, I disable libgomp. diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 92bfdb683bb..96207b6ca42 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -181,10 +181,8 @@ let version = "4.8.2"; # In any case, mingw32 g++ linking is broken by default with shared libs, # unless adding "-lsupc++" to any linking command. I don't know why. " --disable-shared" + - (if cross.config == "x86_64-w64-mingw32" then - # To keep ABI compatibility with upstream mingw-w64 - " --enable-fully-dynamic-string" - else "") + # To keep ABI compatibility with upstream mingw-w64 + " --enable-fully-dynamic-string" else (if cross.libc == "uclibc" then # In uclibc cases, libgomp needs an additional '-ldl' # and as I don't know how to pass it, I disable libgomp. diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 0c653064eac..36ea8981786 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -4,11 +4,11 @@ let s= # Generated upstream information rec { baseName="sbcl"; - version="1.1.14"; + version="1.1.16"; name="${baseName}-${version}"; - hash="0vqsq6q4xvz7vn1akvjwxp406mysak4h955pp8x32dfqc6ina7k7"; - url="mirror://sourceforge/project/sbcl/sbcl/1.1.14/sbcl-1.1.14-source.tar.bz2"; - sha256="0vqsq6q4xvz7vn1akvjwxp406mysak4h955pp8x32dfqc6ina7k7"; + hash="04631klj02crs82b1i21rpddcgh9x6nnarj5avavy9c7zgvr8cnw"; + url="mirror://sourceforge/project/sbcl/sbcl/1.1.16/sbcl-1.1.16-source.tar.bz2"; + sha256="04631klj02crs82b1i21rpddcgh9x6nnarj5avavy9c7zgvr8cnw"; }; buildInputs = with a; [ clisp makeWrapper diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index 61655e1bd1f..aa027401b4d 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -4,14 +4,14 @@ }: let - version = "6.6.1"; + version = "6.6.2"; in stdenv.mkDerivation { name = "swi-prolog-${version}"; src = fetchurl { url = "http://www.swi-prolog.org/download/stable/src/pl-${version}.tar.gz"; - sha256 = "033b7z60jd1907p9idaa3xzbid2aadhqcdwsa2g9c1c7q8fj1gy8"; + sha256 = "1kdnc1r5c4320v5s6axk6w0jnqbkza295hdi9s5kyd8r78v6x6g4"; }; buildInputs = [ gmp readline openssl libjpeg unixODBC libXinerama diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix new file mode 100644 index 00000000000..fc02ab305a3 --- /dev/null +++ b/pkgs/development/guile-modules/guile-xcb/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, guile, texinfo }: + +stdenv.mkDerivation { + name = "guile-xcb-1.3"; + + meta = with stdenv.lib; { + description = "XCB bindings for Guile"; + homepage = "http://www.markwitmer.com/guile-xcb/guile-xcb.html"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong ]; + }; + + src = fetchurl { + url = "http://www.markwitmer.com/dist/guile-xcb-1.3.tar.gz"; + sha256 = "04dvbqdrrs67490gn4gkq9zk8mqy3mkls2818ha4p0ckhh0pm149"; + }; + + buildInputs = [ pkgconfig guile texinfo ]; + + preConfigure = '' + configureFlags=" + --with-guile-site-dir=$out/share/guile/site + --with-guile-site-ccache-dir=$out/share/guile/site + "; + ''; +} diff --git a/pkgs/development/interpreters/erlang/default.nix b/pkgs/development/interpreters/erlang/default.nix index 9562a0dc452..077eaa9093b 100644 --- a/pkgs/development/interpreters/erlang/default.nix +++ b/pkgs/development/interpreters/erlang/default.nix @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { configureFlags = "--with-ssl=${openssl}"; + postInstall = '' + ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call + ''; + # Some erlang bin/ scripts run sed and awk postFixup = '' wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index c496d14083e..2c749bd51f1 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "004zyh9p3lpvbwhyhlmrw6wwcia5abx84q4h2brkn4zdypipvmiz"; }; - buildInputs = [ readline ]; + nativeBuildInputs = [ readline ]; patches = [ dsoPatch ]; @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { ''; crossAttrs = let + isMingw = stdenv.cross.libc == "msvcrt"; isDarwin = stdenv.cross.libc == "libSystem"; in { configurePhase = '' @@ -61,11 +62,17 @@ stdenv.mkDerivation rec { RANLIB=${stdenv.cross.config}-ranlib V=${majorVersion} R=${version} - ${stdenv.lib.optionalString isDarwin '' + ${if isMingw then "mingw" else stdenv.lib.optionalString isDarwin '' AR="${stdenv.cross.config}-ar rcu" macosx ''} ) + '' + stdenv.lib.optionalString isMingw '' + installFlagsArray=( + TO_BIN="lua.exe luac.exe" + TO_LIB="liblua.a lua52.dll" + INSTALL_DATA="cp -d" + ) ''; } // stdenv.lib.optionalAttrs isDarwin { postPatch = '' diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index bf60e90d634..cc6e34b76fe 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -167,6 +167,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) configureFlags = ["--enable-ftp"]; }; + fpm = { + configureFlags = ["--enable-fpm"]; + }; + /* php is build within this derivation in order to add the xdebug lines to the php.ini. So both Apache and command line php both use xdebug without having to configure anything. @@ -208,6 +212,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) bz2Support = config.php.bz2 or false; zipSupport = config.php.zip or true; ftpSupport = config.php.ftp or true; + fpmSupport = config.php.fpm or true; }; configurePhase = '' diff --git a/pkgs/development/interpreters/pypy/2.2/default.nix b/pkgs/development/interpreters/pypy/2.2/default.nix index 231a0a7dfaa..2fee7bc74df 100644 --- a/pkgs/development/interpreters/pypy/2.2/default.nix +++ b/pkgs/development/interpreters/pypy/2.2/default.nix @@ -5,8 +5,8 @@ assert zlibSupport -> zlib != null; let - majorVersion = "2.2.1"; - version = "${majorVersion}"; + majorVersion = "2.2"; + version = "${majorVersion}.1"; pythonVersion = "2.7"; libPrefix = "pypy${majorVersion}"; diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index af37b4372b7..33b67a10f19 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -17,7 +17,7 @@ with stdenv.lib; let majorVersion = "3.3"; - version = "${majorVersion}.4"; + version = "${majorVersion}.5"; buildInputs = filter (p: p != null) [ zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto @@ -29,7 +29,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; - sha256 = "12ank7in8xyncim3yyn3mi84wkc4g9nx7yrci1406kn0j5ni5k66"; + sha256 = "1rdncc7g8g6f3lfdg33rli1yffbiq8z283xy4f5ksl1l8i49psdb"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 60884fce69d..237e58b5f93 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, python, pkgconfig, wrapPython +{ stdenv, fetchurl, python, cython, pkgconfig, wrapPython , pygame, SDL, libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib }: stdenv.mkDerivation { - name = "renpy-6.16.3"; + name = "renpy-6.17.3"; meta = { description = "Ren'Py Visual Novel Engine"; @@ -14,12 +14,12 @@ stdenv.mkDerivation { }; src = fetchurl { - url = "http://www.renpy.org/dl/6.16.3/renpy-6.16.3-source.tar.bz2"; - sha256 = "0yd7wj85kp0hlaqlrhl40irhkmcng89vcxypyx40pqmk87gjagqn"; + url = "http://www.renpy.org/dl/6.17.3/renpy-6.17.3-source.tar.bz2"; + sha256 = "1707xrjmnr4a209jqm4zkda0jyjd76f679g7d51g7vd5cs46s6ph"; }; buildInputs = [ - python pkgconfig wrapPython + python cython pkgconfig wrapPython SDL libpng ffmpeg freetype glew mesa fribidi zlib pygame ]; diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 476ec73ba18..ee3640fe64b 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { }; # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. - propagatedBuildInputs = stdenv.lib.optionals x11Support [ x11 libXrandr ] ++ + propagatedNativeBuildInputs = + stdenv.lib.optionals x11Support [ x11 libXrandr ] ++ stdenv.lib.optional pulseaudioSupport pulseaudio; buildInputs = let diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix new file mode 100644 index 00000000000..0abe3f0376b --- /dev/null +++ b/pkgs/development/libraries/audio/lvtk/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, boost, gtkmm, lv2, pkgconfig, python }: + +stdenv.mkDerivation rec { + name = "lvtk-${version}"; + version = "1.1.1"; + + src = fetchurl { + url = "http://lvtoolkit.org/code/browse/lvtk/snapshot/${name}.tar.gz"; + sha256 = "161l4n3a2kar2r5mn3zz6dbj1p2s6361ainrka3s74518z7yf42w"; + }; + + buildInputs = [ boost gtkmm lv2 pkgconfig python ]; + + configurePhase = '' + python waf configure --prefix=$out --boost-includes=${boost}/include + ''; + + buildPhase = "python waf"; + + installPhase = "python waf install"; + + meta = with stdenv.lib; { + description = "A set C++ wrappers around the LV2 C API"; + homepage = http://lvtoolkit.org; + license = licenses.gpl3; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix new file mode 100644 index 00000000000..aad3656cde8 --- /dev/null +++ b/pkgs/development/libraries/audio/raul/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchsvn, boost, gtk, pkgconfig, python }: + +stdenv.mkDerivation rec { + name = "raul-svn-${rev}"; + rev = "5205"; + + src = fetchsvn { + url = "http://svn.drobilla.net/lad/trunk/raul"; + rev = rev; + sha256 = "1rkl7vxhwf6d0qfl2ymfd1qwmh9cl1xv6kkz893xg0blpvzcdmp3"; + }; + + buildInputs = [ boost gtk pkgconfig python ]; + + configurePhase = "python waf configure --prefix=$out"; + + buildPhase = "python waf"; + + installPhase = "python waf install"; + + meta = with stdenv.lib; { + description = "A C++ utility library primarily aimed at audio/musical applications"; + homepage = http://drobilla.net/software/raul; + license = licenses.gpl3; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/ffmpeg/0.10.nix b/pkgs/development/libraries/ffmpeg/0.10.nix index f51e3ccd3c0..f356bceaf40 100644 --- a/pkgs/development/libraries/ffmpeg/0.10.nix +++ b/pkgs/development/libraries/ffmpeg/0.10.nix @@ -21,11 +21,11 @@ assert vdpauSupport -> libvdpau != null; assert faacSupport -> faac != null; stdenv.mkDerivation rec { - name = "ffmpeg-0.10.10"; + name = "ffmpeg-0.10.11"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "14fbjhiwv5zg9yh0zk3k9h6id815xrikyz6l2cdl7z4vazbmhq4k"; + sha256 = "1l1nyvsfafl9w0falv1hcm65r2rlxyb59har0rkrrpi56fj1ma4r"; }; # `--enable-gpl' (as well as the `postproc' and `swscale') mean that diff --git a/pkgs/development/libraries/ffmpeg/1.x.nix b/pkgs/development/libraries/ffmpeg/1.x.nix index 34d0a4e49fe..c43cd329956 100644 --- a/pkgs/development/libraries/ffmpeg/1.x.nix +++ b/pkgs/development/libraries/ffmpeg/1.x.nix @@ -31,11 +31,11 @@ assert playSupport -> SDL != null; assert freetypeSupport -> freetype != null; stdenv.mkDerivation rec { - name = "ffmpeg-1.2.4"; + name = "ffmpeg-1.2.6"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "1pqd544jmbggwisbkm0pj0l585b8a9x5n3jl9zbmqmw63g7ci5iv"; + sha256 = "174rf3g2pqaxa8rzg03qmy4cn2gsy0p2mk26y9yk5ksq6kg59m19"; }; # `--enable-gpl' (as well as the `postproc' and `swscale') mean that diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix index dd29e1e9e6b..931881fd142 100644 --- a/pkgs/development/libraries/ffmpeg/2.x.nix +++ b/pkgs/development/libraries/ffmpeg/2.x.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "ffmpeg-2.1.1"; + name = "ffmpeg-2.1.4"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "1qnspbpwa6cflsb6mkm84ay4nfx60ism6d7lgvnasidck9dmxydy"; + sha256 = "00c1k84amgkc7vk5xkrg7z99q7jbfhbz3qk854cxnc38d2ynrd3z"; }; mp3Support = config.ffmpeg.mp3 or true; diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix new file mode 100644 index 00000000000..40e0388d749 --- /dev/null +++ b/pkgs/development/libraries/ganv/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchsvn, graphviz, gtk, gtkmm, pkgconfig, python }: + +stdenv.mkDerivation rec { + name = "ganv-svn-${rev}"; + rev = "5318"; + + src = fetchsvn { + url = "http://svn.drobilla.net/lad/trunk/ganv"; + rev = rev; + sha256 = "0wi87ks2xjma979d9hy82wmlm06g4sr0pm3b1n3zv27y52wrf7fl"; + }; + + buildInputs = [ graphviz gtk gtkmm pkgconfig python ]; + + configurePhase = "python waf configure --prefix=$out"; + + buildPhase = "python waf"; + + installPhase = "python waf install"; + + meta = with stdenv.lib; { + description = "An interactive Gtk canvas widget for graph-based interfaces"; + homepage = http://drobilla.net; + license = licenses.gpl3; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 1106a013949..9ec88799d0d 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -10,9 +10,8 @@ stdenv.mkDerivation rec { sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r"; }; - - buildInputs = [ x11 libXmu libXi ]; - propagatedBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h + nativeBuildInputs = [ x11 libXmu libXi ]; + propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h patchPhase = '' sed -i 's|lib64|lib|' config/Makefile.linux @@ -21,9 +20,14 @@ stdenv.mkDerivation rec { ''} ''; -buildPhase = "make all"; - installPhase = '' - GLEW_DEST=$out make install.all + buildFlags = [ "all" ]; + installFlags = [ "install.all" ]; + + preInstall = '' + export GLEW_DEST="$out" + ''; + + postInstall = '' mkdir -pv $out/share/doc/glew mkdir -p $out/lib/pkgconfig cp glew*.pc $out/lib/pkgconfig @@ -35,7 +39,8 @@ buildPhase = "make all"; "LD=${stdenv.cross.config}-gcc" "AR=${stdenv.cross.config}-ar" "STRIP=" - ] ++ optional (stdenv.cross.libc == "libSystem") "SYSTEM=darwin"; + ] ++ optional (stdenv.cross.libc == "msvcrt") "SYSTEM=mingw" + ++ optional (stdenv.cross.libc == "libSystem") "SYSTEM=darwin"; meta = { description = "An OpenGL extension loading library for C(++)"; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 1e9fdd4f0aa..618b37bae4c 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -1,21 +1,33 @@ -{stdenv, fetchurl, pkgconfig, glib, libtool, intltool, gnutls2, libproxy -, gsettings_desktop_schemas, libgcrypt, libtasn1 }: +{ stdenv, fetchurl, pkgconfig, glib, intltool, gnutls, libproxy +, gsettings_desktop_schemas }: -stdenv.mkDerivation { - name = "glib-networking-2.30.2"; +let + ver_maj = "2.38"; + ver_min = "2"; +in +stdenv.mkDerivation rec { + name = "glib-networking-${ver_maj}.${ver_min}"; src = fetchurl { - url = mirror://gnome/sources/glib-networking/2.30/glib-networking-2.30.2.tar.xz; - sha256 = "1g2ran0rn37009fs3xl38m95i5w8sdf9ax0ady4jbjir15844xcz"; + url = "mirror://gnome/sources/glib-networking/${ver_maj}/${name}.tar.xz"; + sha256 = "1iwzjkx6q9gqr7fipc98zi2bi0gccrwq1v7skff1cdijkn8zxqp8"; }; configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt"; - + preBuild = '' sed -e "s@${glib}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile) ''; nativeBuildInputs = [ pkgconfig intltool ]; - propagatedBuildInputs = - [ glib libtool gnutls2 libproxy libgcrypt libtasn1 gsettings_desktop_schemas ]; + propagatedBuildInputs = [ glib gnutls libproxy gsettings_desktop_schemas ]; + + doCheck = false; # tests need to access the certificates (among other things) + + meta = with stdenv.lib; { + description = "Network-related giomodules for glib"; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + }; } + diff --git a/pkgs/development/libraries/gnutls/2.12.nix b/pkgs/development/libraries/gnutls/2.12.nix deleted file mode 100644 index 59f0131b9d4..00000000000 --- a/pkgs/development/libraries/gnutls/2.12.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle -, guileBindings, guile, pkgconfig, perl }: - -assert guileBindings -> guile != null; - -stdenv.mkDerivation rec { - - name = "gnutls-2.12.23"; - - src = fetchurl { # missing on standard mirrors - url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v2.12/${name}.tar.bz2"; - sha256 = "1lkys703z4yxfgzarmgas5ccvn6m254w9wvm7s8v0zkj81z7m9nz"; - }; - - patches = [(fetchurl { - url = "http://anonscm.debian.org/viewvc/pkg-gnutls/packages/gnutls26/trunk/" - + "debian/patches/21_sanitycheck.diff?revision=1777&view=co"; - sha256 = "0k18a7q6irmgjzp647bd18zccjpsr82n2s9arpamnkakgnny4ks9"; - name = "CVE-2013-2116.patch"; - })]; - - configurePhase = '' - patchShebangs . - - ./configure --prefix="$out" \ - --disable-dependency-tracking --enable-fast-install \ - --with-lzo --with-libtasn1-prefix="${libtasn1}" \ - --without-p11-kit \ - ${if guileBindings - then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\"" - else ""} - ''; - - buildInputs = [ zlib lzo libtasn1 pkgconfig perl ] - ++ stdenv.lib.optional guileBindings guile; - - propagatedBuildInputs = [ nettle ]; - - doCheck = true; - - meta = { - description = "The GNU Transport Layer Security Library"; - - longDescription = '' - GnuTLS is a project that aims to develop a library which - provides a secure layer, over a reliable transport - layer. Currently the GnuTLS library implements the proposed - standards by the IETF's TLS working group. - - Quoting from the TLS protocol specification: - - "The TLS protocol provides communications privacy over the - Internet. The protocol allows client/server applications to - communicate in a way that is designed to prevent eavesdropping, - tampering, or message forgery." - ''; - - homepage = http://www.gnu.org/software/gnutls/; - license = "LGPLv2.1+"; - - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/3.1.nix index 8750dd568f7..1046310946a 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/3.1.nix @@ -3,15 +3,17 @@ assert guileBindings -> guile != null; -stdenv.mkDerivation (rec { - - name = "gnutls-3.1.20"; +stdenv.mkDerivation rec { + name = "gnutls-3.1.22"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${name}.tar.lz"; - sha256 = "1a8pzc29sn1kmbqvldljf4kmbz60pdk931dirk5jdd0qpf8fzd5x"; + sha256 = "177kmq4jn67s7mmb249722nwxmbjwjpphmib7bhzfk43z02j3pvh"; }; + # FreeBSD doesn't have <alloca.h>, and Gnulib's `alloca' module isn't used. + patches = stdenv.lib.optional stdenv.isFreeBSD ./guile-gnulib-includes.patch; + # Note: GMP is a dependency of Nettle, whose public headers include # GMP headers, hence the hack. configurePhase = '' @@ -21,15 +23,14 @@ stdenv.mkDerivation (rec { --with-lzo --with-libtasn1-prefix="${libtasn1}" \ --with-libnettle-prefix="${nettle}" \ CPPFLAGS="-I${gmp}/include" \ - ${if guileBindings - then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\"" - else ""} + ${stdenv.lib.optionalString guileBindings + "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\""} ''; # Build of the Guile bindings is not parallel-safe. See # <http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=330995a920037b6030ec0282b51dde3f8b493cad> # for the actual fix. - enableParallelBuilding = false; + enableParallelBuilding = !guileBindings; buildInputs = [ zlib lzo lzip ] ++ stdenv.lib.optional guileBindings guile; @@ -42,7 +43,7 @@ stdenv.mkDerivation (rec { # http://hydra.nixos.org/build/2962084/nixlog/1/raw . doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin); - meta = with stdenv.lib; { + meta = { description = "The GNU Transport Layer Security Library"; longDescription = '' @@ -61,13 +62,6 @@ stdenv.mkDerivation (rec { homepage = http://www.gnu.org/software/gnutls/; license = "LGPLv2.1+"; - maintainers = [ ]; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; -} - -// - -(stdenv.lib.optionalAttrs stdenv.isFreeBSD { - # FreeBSD doesn't have <alloca.h>, and Gnulib's `alloca' module isn't used. - patches = [ ./guile-gnulib-includes.patch ]; -})) +} \ No newline at end of file diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix index ad873b3eae8..fff05ed8727 100644 --- a/pkgs/development/libraries/gnutls/3.2.nix +++ b/pkgs/development/libraries/gnutls/3.2.nix @@ -3,15 +3,19 @@ assert guileBindings -> guile != null; -stdenv.mkDerivation (rec { - - name = "gnutls-3.2.10"; +stdenv.mkDerivation rec { + name = "gnutls-3.2.12"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${name}.tar.lz"; - sha256 = "1g1w93d66sz51977zbqd56641r501a1djcwhykbjm8alhyz1564h"; + sha256 = "1zwk9qkxn3190nssyamd7jsb3ag6mnnln3jwbgmjs1w306dzwafi"; }; + patches = + # FreeBSD doesn't have <alloca.h>, and Gnulib's `alloca' module isn't used. + stdenv.lib.optional stdenv.isFreeBSD ./guile-gnulib-includes.patch + ; + # Note: GMP is a dependency of Nettle, whose public headers include # GMP headers, hence the hack. configurePhase = '' @@ -21,15 +25,14 @@ stdenv.mkDerivation (rec { --with-lzo --with-libtasn1-prefix="${libtasn1}" \ --with-libnettle-prefix="${nettle}" \ CPPFLAGS="-I${gmp}/include" \ - ${if guileBindings - then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\"" - else ""} + ${stdenv.lib.optionalString guileBindings + "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\""} ''; # Build of the Guile bindings is not parallel-safe. See # <http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=330995a920037b6030ec0282b51dde3f8b493cad> # for the actual fix. - enableParallelBuilding = false; + enableParallelBuilding = !guileBindings; buildInputs = [ zlib lzo lzip ] ++ stdenv.lib.optional guileBindings guile; @@ -42,7 +45,7 @@ stdenv.mkDerivation (rec { # http://hydra.nixos.org/build/2962084/nixlog/1/raw . doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin); - meta = with stdenv.lib; { + meta = { description = "The GNU Transport Layer Security Library"; longDescription = '' @@ -61,25 +64,8 @@ stdenv.mkDerivation (rec { homepage = http://www.gnu.org/software/gnutls/; license = "LGPLv2.1+"; - maintainers = [ ]; - platforms = platforms.all; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.all; }; } -// - -(stdenv.lib.optionalAttrs stdenv.isFreeBSD { - # FreeBSD doesn't have <alloca.h>, and Gnulib's `alloca' module isn't used. - patches = [ ./guile-gnulib-includes.patch ]; -}) - -// - -(stdenv.lib.optionalAttrs stdenv.isDarwin { - # multiple definitions of '_gnutls_x86_cpuid_s' cause linker to fail. - # the patch is: https://www.gitorious.org/gnutls/gnutls/commit/54768ca1cd9049bbd1c695696ef3c8595c6052db - # discussion: http://osdir.com/ml/gnutls-devel-gnu/2014-02/msg00012.html - patches = [ ./fix_gnutls_x86_cpuid_s_multi_definitions.patch ]; -}) - -) diff --git a/pkgs/development/libraries/gnutls/fix_gnutls_x86_cpuid_s_multi_definitions.patch b/pkgs/development/libraries/gnutls/fix_gnutls_x86_cpuid_s_multi_definitions.patch deleted file mode 100644 index 1bc3086faeb..00000000000 --- a/pkgs/development/libraries/gnutls/fix_gnutls_x86_cpuid_s_multi_definitions.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 54768ca1cd9049bbd1c695696ef3c8595c6052db Mon Sep 17 00:00:00 2001 -From: Nikos Mavrogiannopoulos <nmav@redhat.com> -Date: Mon, 10 Feb 2014 10:43:52 +0100 -Subject: [PATCH] do not redefine the _gnutls_x86_cpuid_s symbol - ---- - lib/accelerated/x86/aes-cbc-x86-aesni.c | 2 -- - lib/accelerated/x86/aes-cbc-x86-ssse3.c | 2 -- - lib/accelerated/x86/x86.h | 3 ++- - 3 files changed, 2 insertions(+), 5 deletions(-) - -diff --git a/lib/accelerated/x86/aes-cbc-x86-aesni.c b/lib/accelerated/x86/aes-cbc-x86-aesni.c -index 6d4526f..1a2681f 100644 ---- a/lib/accelerated/x86/aes-cbc-x86-aesni.c -+++ b/lib/accelerated/x86/aes-cbc-x86-aesni.c -@@ -39,8 +39,6 @@ struct aes_ctx { - int enc; - }; - --unsigned int _gnutls_x86_cpuid_s[4]; -- - static int - aes_cipher_init(gnutls_cipher_algorithm_t algorithm, void **_ctx, int enc) - { -diff --git a/lib/accelerated/x86/aes-cbc-x86-ssse3.c b/lib/accelerated/x86/aes-cbc-x86-ssse3.c -index ff24578..2b2440a 100644 ---- a/lib/accelerated/x86/aes-cbc-x86-ssse3.c -+++ b/lib/accelerated/x86/aes-cbc-x86-ssse3.c -@@ -39,8 +39,6 @@ struct aes_ctx { - int enc; - }; - --unsigned int _gnutls_x86_cpuid_s[4]; -- - static int - aes_cipher_init(gnutls_cipher_algorithm_t algorithm, void **_ctx, int enc) - { -diff --git a/lib/accelerated/x86/x86.h b/lib/accelerated/x86/x86.h -index ae04d32..03fc8de 100644 ---- a/lib/accelerated/x86/x86.h -+++ b/lib/accelerated/x86/x86.h -@@ -22,6 +22,8 @@ - - #include <config.h> - -+extern unsigned int _gnutls_x86_cpuid_s[4]; -+ - #if defined(ASM_X86) - - void gnutls_cpuid(unsigned int func, unsigned int *ax, unsigned int *bx, -@@ -43,5 +45,4 @@ unsigned int gnutls_have_cpuid(void); - (nettle_hash_digest_func *) digest_func \ - } - -- - #endif --- -1.7.1 - diff --git a/pkgs/development/libraries/haskell/Boolean/default.nix b/pkgs/development/libraries/haskell/Boolean/default.nix index bc8e9dca159..bb226733f8a 100644 --- a/pkgs/development/libraries/haskell/Boolean/default.nix +++ b/pkgs/development/libraries/haskell/Boolean/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Boolean"; - version = "0.2"; - sha256 = "1r8qvsfbfjfp453pdy9ci9w584ad9bm4xv0ynx4b1yny34ag3zr3"; + version = "0.2.1"; + sha256 = "0vi09icwc254mbx85lf1n81mx4hr2sdf61a4njaqa91cf046sjlr"; meta = { description = "Generalized booleans and numbers"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/Cabal/1.18.1.2.nix b/pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix index 024a4d5c135..0ef09dc49b1 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.18.1.2.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "Cabal"; - version = "1.18.1.2"; - sha256 = "0pbg9d40lskcps248fdcnm4hnib3vl10mbcdf830zw45q29gfkjr"; + version = "1.18.1.3"; + sha256 = "1m1m6f00sc4w0s5hnqy2z05rnaihaw1jy03bidc5pl6r1llkdi15"; buildDepends = [ deepseq filepath time ]; testDepends = [ extensibleExceptions filepath HUnit QuickCheck regexPosix diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix index 59656d51978..303a4852649 100644 --- a/pkgs/development/libraries/haskell/MissingH/default.nix +++ b/pkgs/development/libraries/haskell/MissingH/default.nix @@ -1,17 +1,17 @@ -{ cabal, filepath, hslogger, HUnit, mtl, network, parsec -, QuickCheck, random, regexCompat, testpack, time +{ cabal, errorcallEqInstance, filepath, hslogger, HUnit, mtl +, network, parsec, QuickCheck, random, regexCompat, testpack, time }: cabal.mkDerivation (self: { pname = "MissingH"; - version = "1.2.0.2"; - sha256 = "1wrrfa8dy0h0c53f1zjzwdkj8wkwsbi6qhv35wwlaz39dk32c4nn"; + version = "1.2.1.0"; + sha256 = "08zpzfhl31w35x13vapimwd508j4nydi8v3vid668r4fkqnymbss"; buildDepends = [ filepath hslogger HUnit mtl network parsec random regexCompat time ]; testDepends = [ - filepath hslogger HUnit mtl network parsec QuickCheck random - regexCompat testpack time + errorcallEqInstance filepath hslogger HUnit mtl network parsec + QuickCheck random regexCompat testpack time ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/aeson/0.6.2.1.nix b/pkgs/development/libraries/haskell/aeson/0.6.2.1.nix deleted file mode 100644 index edd2a21040e..00000000000 --- a/pkgs/development/libraries/haskell/aeson/0.6.2.1.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, mtl -, QuickCheck, syb, testFramework, testFrameworkQuickcheck2, text -, time, unorderedContainers, vector -}: - -cabal.mkDerivation (self: { - pname = "aeson"; - version = "0.6.2.1"; - sha256 = "00fa13qr38s4c0fwfvpks3x3sb21kh71cv1v0x2zqg0adnaydknb"; - buildDepends = [ - attoparsec blazeBuilder deepseq dlist hashable mtl syb text time - unorderedContainers vector - ]; - testDepends = [ - attoparsec QuickCheck testFramework testFrameworkQuickcheck2 text - time unorderedContainers vector - ]; - doCheck = false; - 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.1.nix b/pkgs/development/libraries/haskell/aeson/default.nix index 4b5c137d89b..960314920a1 100644 --- a/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix +++ b/pkgs/development/libraries/haskell/aeson/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "aeson"; - version = "0.7.0.1"; - sha256 = "17cwclxh2f2m0mvs867lfzrv14gd9grw8a9f8l95j3nd76y58kb3"; + version = "0.7.0.2"; + sha256 = "0li89xs4dlwc3ijs6w5gabjibj09x12qgxhzp7mch6gxjxwd3ihj"; buildDepends = [ attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb text time unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/alsa-mixer/default.nix b/pkgs/development/libraries/haskell/alsa-mixer/default.nix index 67ab0275e78..35cc7aa0c93 100644 --- a/pkgs/development/libraries/haskell/alsa-mixer/default.nix +++ b/pkgs/development/libraries/haskell/alsa-mixer/default.nix @@ -2,12 +2,13 @@ cabal.mkDerivation (self: { pname = "alsa-mixer"; - version = "0.1.2"; - sha256 = "081f3a62f83a269d72e0b0fac8bae8c81e9ec342d592fa25abe57f7206cf4414"; + version = "0.2.0.1"; + sha256 = "1306kw4w85d3pkdqjw8cwx77a2mbhw2hlmxcjczym1nsyp4rhyhr"; buildDepends = [ alsaCore ]; buildTools = [ c2hs ]; extraLibraries = [ alsaLib ]; meta = { + homepage = "https://github.com/ttuegel/alsa-mixer"; description = "Bindings to the ALSA simple mixer API"; license = self.stdenv.lib.licenses.bsd3; platforms = self.stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/haskell/amqp/default.nix b/pkgs/development/libraries/haskell/amqp/default.nix index 200a736f331..15079a5ba39 100644 --- a/pkgs/development/libraries/haskell/amqp/default.nix +++ b/pkgs/development/libraries/haskell/amqp/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "amqp"; - version = "0.8.1"; - sha256 = "10infzs2siw9vv8jgsndv7c82bsh22cs2drrb73nxpwf73hy3rzm"; + version = "0.8.2"; + sha256 = "0hl9x6kbxdv32014k1w34d84wl4ivpiyg1ikpjr0nr9bsg3wr0gf"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/attoparsec/0.11.1.0.nix b/pkgs/development/libraries/haskell/attoparsec/0.11.2.1.nix index bd7bdc745b2..2a2117a1a05 100644 --- a/pkgs/development/libraries/haskell/attoparsec/0.11.1.0.nix +++ b/pkgs/development/libraries/haskell/attoparsec/0.11.2.1.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "attoparsec"; - version = "0.11.1.0"; - sha256 = "09mks6lbzmqmdz6s10lvdklmc0mydd1sk5hphhnybp3yr4pvh7jc"; + version = "0.11.2.1"; + sha256 = "1grvmhxiqn02wbng0wd9zqc4c51wrbxar1b26agc3p9i09ngbs1w"; buildDepends = [ deepseq scientific text ]; testDepends = [ QuickCheck testFramework testFrameworkQuickcheck2 text diff --git a/pkgs/development/libraries/haskell/base-compat/default.nix b/pkgs/development/libraries/haskell/base-compat/default.nix index 9e5375a24d8..5ee81698eb5 100644 --- a/pkgs/development/libraries/haskell/base-compat/default.nix +++ b/pkgs/development/libraries/haskell/base-compat/default.nix @@ -2,9 +2,9 @@ cabal.mkDerivation (self: { pname = "base-compat"; - version = "0.4.0"; - sha256 = "0ps26w4mjp465a3mh3hpzkdkc97yvfhzh86fcnlqszy9wgj13w65"; - buildDepends = [ errorcallEqInstance ]; + version = "0.4.2"; + sha256 = "0rcra6bgx955c2yd52y6v7lmlm5r86sdmii3qapx6yghqhdslzry"; + buildDepends = [ errorcallEqInstance setenv ]; testDepends = [ hspec setenv ]; meta = { description = "A compatibility layer for base"; diff --git a/pkgs/development/libraries/haskell/blaze-textual/default.nix b/pkgs/development/libraries/haskell/blaze-textual/default.nix index ede82e5c2ed..508e68fa045 100644 --- a/pkgs/development/libraries/haskell/blaze-textual/default.nix +++ b/pkgs/development/libraries/haskell/blaze-textual/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "blaze-textual"; - version = "0.2.0.8"; - sha256 = "0zzqh53ywzz8ss58glp3i8is8gry5yqzvdjw4xh95fbbzcz4cgc7"; + version = "0.2.0.9"; + sha256 = "1gwy1pjnc2ikxfxn9c751rnydry1hmlfk13k29xnns9vwglf81f0"; buildDepends = [ blazeBuilder text time vector ]; testDepends = [ blazeBuilder doubleConversion QuickCheck testFramework diff --git a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix index 93c8b2aa229..8c4f2af654e 100644 --- a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "bytestring-lexing"; - version = "0.4.3"; - sha256 = "0dynfrf8ym01v2dl57422h8r75kdlqh2qzqi9yc0f1bmbfqxap6r"; + version = "0.4.3.1"; + sha256 = "1n0sk1xqwkj4whp0gav7hwr33xqmwl3ylqfnqix8wbwz6xpg9ygn"; buildTools = [ alex ]; meta = { homepage = "http://code.haskell.org/~wren/"; diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix index 8425c465331..5d1fa791c69 100644 --- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix +++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "conduit-combinators"; - version = "0.1.0.0"; - sha256 = "0m4qfcm66likasvsvfriw8xiz5ibqhq5sk1wiwx0gk2d1qcnb3wx"; + version = "0.2.0.1"; + sha256 = "0hmy398kk37n5l4pacb2a0z9h9f1kl6vva9gsph1kiqnnz7sbr4r"; buildDepends = [ chunkedData conduit monoTraversable primitive systemFileio systemFilepath text transformers transformersBase vector diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix index 84eacff71a1..ba8f1b70c77 100644 --- a/pkgs/development/libraries/haskell/criterion/default.nix +++ b/pkgs/development/libraries/haskell/criterion/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "criterion"; - version = "0.8.0.0"; - sha256 = "05v4glwvidsd4gm2jcvmlcpfaxg2x0fb69w051rbwg9scanrm7bf"; + version = "0.8.0.1"; + sha256 = "1f4wsaiyq0zks71jgfx43774vxkf9l362a9kfd2jhsnxx7zkv5sq"; buildDepends = [ aeson binary deepseq filepath Glob hastache mtl mwcRandom parsec statistics time transformers vector vectorAlgorithms diff --git a/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix b/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix index e21e026080b..7041bcc5285 100644 --- a/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cryptohash-cryptoapi"; - version = "0.1.0"; - sha256 = "06b62ddwx2mp71dzaj8h88vw2c6nv3rj8n6d3d9vmqa7cws3mjkx"; + version = "0.1.2"; + sha256 = "1i2qxyq5qk4jzgkl7kndy10sbmzmagamfnqvl300qm3msi9k0kfy"; buildDepends = [ cereal cryptoApi cryptohash tagged ]; meta = { homepage = "http://github.com/vincenthz/hs-cryptohash-cryptoapi"; diff --git a/pkgs/development/libraries/haskell/dependent-map/default.nix b/pkgs/development/libraries/haskell/dependent-map/default.nix index 32a10efc785..f8af7c8e42e 100644 --- a/pkgs/development/libraries/haskell/dependent-map/default.nix +++ b/pkgs/development/libraries/haskell/dependent-map/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "dependent-map"; - version = "0.1.1.1"; - sha256 = "1p5a5qahw7i6cvb0g0g1bv9gzy6jlxr5vb3hp8gahm210zw8g990"; + version = "0.1.1.2"; + sha256 = "1g8mq8189c6wr1rik70019gqrnk84c613x9cn5383p7hhfyc0rnn"; buildDepends = [ dependentSum ]; meta = { homepage = "https://github.com/mokus0/dependent-map"; diff --git a/pkgs/development/libraries/haskell/dependent-sum/default.nix b/pkgs/development/libraries/haskell/dependent-sum/default.nix index 3d33956edcf..a92dd8064da 100644 --- a/pkgs/development/libraries/haskell/dependent-sum/default.nix +++ b/pkgs/development/libraries/haskell/dependent-sum/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "dependent-sum"; - version = "0.2.0.1"; - sha256 = "07zv8rj574vf7wl3pms4q8d9m7zsfppac5vla9d9b7q11s81lldf"; + version = "0.2.0.2"; + sha256 = "06amnc50j246f2za0ri49j6vyq6admx03w3xxjhhfnfx9lp6zmhm"; meta = { homepage = "https://github.com/mokus0/dependent-sum"; description = "Dependent sum type"; diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix index 186f60aecf5..c38346d189b 100644 --- a/pkgs/development/libraries/haskell/diagrams/cairo.nix +++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix @@ -1,14 +1,16 @@ { cabal, cairo, colour, dataDefaultClass, diagramsCore, diagramsLib -, filepath, hashable, lens, mtl, split, statestack, time +, filepath, hashable, JuicyPixels, lens, mtl, optparseApplicative +, split, statestack, time, vector }: cabal.mkDerivation (self: { pname = "diagrams-cairo"; - version = "1.0.1.2"; - sha256 = "040x3zdrr70kg10isby6xp8mswvjd84xiz2rf7w1y66g9izdgfmc"; + version = "1.1"; + sha256 = "0x66qdwni3pwc2lrqy5jnyz7nqbfpr1086g1ndy6cxx8hp632zaf"; buildDepends = [ cairo colour dataDefaultClass diagramsCore diagramsLib filepath - hashable lens mtl split statestack time + hashable JuicyPixels lens mtl optparseApplicative split statestack + time vector ]; meta = { homepage = "http://projects.haskell.org/diagrams"; diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix index c0ce17d63db..34dcb3745e3 100644 --- a/pkgs/development/libraries/haskell/diagrams/contrib.nix +++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "diagrams-contrib"; - version = "1.1.0.1"; - sha256 = "1vgfk3drs61am5z0146pq17i00ygsi2pyz8qipf6c30c9wri9hjp"; + version = "1.1.1.1"; + sha256 = "1b91scy96zf2njikfyr2ir2ckiib4dlvjazrlbri6f5ds40gnhna"; buildDepends = [ arithmoi circlePacking colour dataDefault dataDefaultClass diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix index c291ce9a48c..3a3f74d4c27 100644 --- a/pkgs/development/libraries/haskell/diagrams/core.nix +++ b/pkgs/development/libraries/haskell/diagrams/core.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "diagrams-core"; - version = "1.0.0.1"; - sha256 = "19jri4np14lgf4pxyyczqjwh30cdmcpnb8alj60b0z5fca7042xm"; + version = "1.1"; + sha256 = "0prklz6s5zcainpkawibdg3bidmvsd2xsc1xxrmfp7lscmim736v"; buildDepends = [ dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace vectorSpacePoints diff --git a/pkgs/development/libraries/haskell/diagrams/diagrams.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix index 7a0cd53218d..cddc5dbadcf 100644 --- a/pkgs/development/libraries/haskell/diagrams/diagrams.nix +++ b/pkgs/development/libraries/haskell/diagrams/diagrams.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "diagrams"; - version = "1.0.0.1"; - sha256 = "0nlh4n5ykymjkyi9n0r5l1caq1f26mijw7smnj78mv3d40qcrnv1"; + version = "1.1"; + sha256 = "1fdacsa57w64hkcsrriwdgdxddd7gps97fyaz2rl8wfxcl96vclr"; buildDepends = [ diagramsContrib diagramsCore diagramsLib diagramsSvg ]; diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index 6dbedd5ecda..32385655426 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -1,18 +1,17 @@ { cabal, active, colour, dataDefaultClass, diagramsCore, filepath , fingertree, hashable, intervals, lens, MemoTrie, monoidExtras -, NumInstances, optparseApplicative, safe, semigroups, tagged -, vectorSpace, vectorSpacePoints +, optparseApplicative, safe, semigroups, tagged, vectorSpace +, vectorSpacePoints }: cabal.mkDerivation (self: { pname = "diagrams-lib"; - version = "1.0.1"; - sha256 = "0cjhb6dm0n4a7s8z0lyihql7dz34pdbm3ahm2p0yya4xf9pf0fw4"; + version = "1.1.0.1"; + sha256 = "0zkxkncz8ayvahr57fgq44vgir3yghxs2y1rrp138951fcy2g3a7"; buildDepends = [ active colour dataDefaultClass diagramsCore filepath fingertree - hashable intervals lens MemoTrie monoidExtras NumInstances - optparseApplicative safe semigroups tagged vectorSpace - vectorSpacePoints + hashable intervals lens MemoTrie monoidExtras optparseApplicative + safe semigroups tagged vectorSpace vectorSpacePoints ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix index 2c827b5f3d1..a7f85f98b09 100644 --- a/pkgs/development/libraries/haskell/diagrams/postscript.nix +++ b/pkgs/development/libraries/haskell/diagrams/postscript.nix @@ -1,14 +1,15 @@ -{ cabal, diagramsCore, diagramsLib, dlist, filepath, hashable, lens -, monoidExtras, mtl, semigroups, split, vectorSpace +{ cabal, dataDefaultClass, diagramsCore, diagramsLib, dlist +, filepath, hashable, lens, monoidExtras, mtl, semigroups, split +, vectorSpace }: cabal.mkDerivation (self: { pname = "diagrams-postscript"; - version = "1.0.1.2"; - sha256 = "0im1w70qi8qs2z8x41v7pwvk1alfaw1h8k0683njzd5sfz2m1gny"; + version = "1.0.2"; + sha256 = "14y8wivgxs3qvybzqk1bfqsrs5457qd5br7nk1924si5gpsgp1xx"; buildDepends = [ - diagramsCore diagramsLib dlist filepath hashable lens monoidExtras - mtl semigroups split vectorSpace + dataDefaultClass diagramsCore diagramsLib dlist filepath hashable + lens monoidExtras mtl semigroups split vectorSpace ]; meta = { homepage = "http://projects.haskell.org/diagrams/"; diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix index 926249b853a..cc5795c80a1 100644 --- a/pkgs/development/libraries/haskell/diagrams/svg.nix +++ b/pkgs/development/libraries/haskell/diagrams/svg.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "diagrams-svg"; - version = "1.0.1.3"; - sha256 = "0brbvzwh7yi3400wrdpkmw6jfd2nhi238zddhid76lmx2q9zxvvx"; + version = "1.0.2"; + sha256 = "1pbkr5qg3cjk2c23aas5y9f0bk5nsding4r4c4fdkxj49ipi4ys1"; buildDepends = [ blazeMarkup blazeSvg colour diagramsCore diagramsLib filepath hashable lens monoidExtras mtl split time vectorSpace diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix index 418923c453b..86a6a8560fb 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors-heist"; - version = "0.8.4.1"; - sha256 = "03bbz5q3asn1iid13xjiv5hdpj5bgr0h9wwp29bnysiw4vrgjax0"; + version = "0.8.5.0"; + sha256 = "0pjjr3b1zm23wpqnmcbr8ly08bp63sz3c9vbxcani4mwgx05qp87"; buildDepends = [ blazeBuilder digestiveFunctors heist mtl text xmlhtml ]; diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix index 3bbd8681ddb..fd314d12d51 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.3.4.5"; - sha256 = "0fw57dn67gx5v7drd4g7xbj1z614sr3lxw7gcciypnjc7qkqjgv7"; + version = "1.3.5"; + sha256 = "0lz17fr4by31h1qdw0djbsb1zx9xgll5iphqq18gp587l799iy2p"; buildDepends = [ conduit monadLogger persistent resourcet tagged text transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix index 70488010072..b57abc40e20 100644 --- a/pkgs/development/libraries/haskell/force-layout/default.nix +++ b/pkgs/development/libraries/haskell/force-layout/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "force-layout"; - version = "0.3.0.1"; - sha256 = "0x9nfmvml9hszbm2izr4rfl9xphiyv0lj0hlixjbpxvm5nqk2w95"; + version = "0.3.0.2"; + sha256 = "0zrvsrqwl0wjv38l6zl1pa09572njdbcfbvimhpp930629zk4yb7"; buildDepends = [ dataDefaultClass lens vectorSpace vectorSpacePoints ]; diff --git a/pkgs/development/libraries/haskell/ghc-mtl/default.nix b/pkgs/development/libraries/haskell/ghc-mtl/default.nix index ea2495f6586..1379d4a8ee8 100644 --- a/pkgs/development/libraries/haskell/ghc-mtl/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mtl/default.nix @@ -1,12 +1,12 @@ -{ cabal, MonadCatchIOMtl, mtl }: +{ cabal, exceptions, extensibleExceptions, mtl }: cabal.mkDerivation (self: { pname = "ghc-mtl"; - version = "1.0.1.2"; - sha256 = "06m8ynqlbvvs37w211ikldwvlvg4ry27x9l7idnwa1m8w2jkbkva"; - buildDepends = [ MonadCatchIOMtl mtl ]; + version = "1.1.0.0"; + sha256 = "1vmiy00fsdp1jzmpjrz8wzxbv3185h27aspw412pmcr4v1n29kxc"; + buildDepends = [ exceptions extensibleExceptions mtl ]; meta = { - homepage = "http://darcsden.com/jcpetruzza/ghc-mtl"; + homepage = "http://hub.darcs.net/jcpetruzza/ghc-mtl"; description = "An mtl compatible version of the Ghc-Api monads and monad-transformers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/ghcjs-codemirror/default.nix b/pkgs/development/libraries/haskell/ghcjs-codemirror/default.nix new file mode 100644 index 00000000000..3f15f394c2c --- /dev/null +++ b/pkgs/development/libraries/haskell/ghcjs-codemirror/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "ghcjs-codemirror"; + version = "0.0.0.1"; + sha256 = "04x5h0i4fgyc2c5ihrnk0w3l1f3avvcl115zlnich93nillgbnfw"; + meta = { + homepage = "https://github.com/ghcjs/CodeMirror"; + description = "Installs CodeMirror JavaScript files"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix new file mode 100644 index 00000000000..58ad2765f6b --- /dev/null +++ b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix @@ -0,0 +1,13 @@ +{ cabal, glib, gtk3, mtl, transformers, webkitgtk3 }: + +cabal.mkDerivation (self: { + pname = "ghcjs-dom"; + version = "0.0.4"; + sha256 = "1a3dv2l3s3aifcpivmnv308k2a1kb7r4x0z9gi83wc4xr9a8f08w"; + buildDepends = [ glib gtk3 mtl transformers webkitgtk3 ]; + meta = { + description = "DOM library that supports both GHCJS and WebKitGTK"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix index 8198960854c..081573e7223 100644 --- a/pkgs/development/libraries/haskell/gtk/default.nix +++ b/pkgs/development/libraries/haskell/gtk/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "gtk"; - version = "0.12.5.4"; - sha256 = "0vs31lzrmd3546q8dqql8sf1vfagyr24p5i6ddi792vw14mj3why"; + version = "0.12.5.6"; + sha256 = "06i6y7psl8fd7cy7jn0aqp98k876spr5vjgjxs8730pw3x17z6ld"; buildDepends = [ cairo glib mtl pango ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 40da6037e7d..4b54a002ab0 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "happstack-server"; - version = "7.3.3"; - sha256 = "18z706n9idszmn5j2cm2aqhs8zavk2sas6fwwywh38j536qzz36l"; + version = "7.3.4"; + sha256 = "1k9614f0x5ravblb00xiy8z2nqi4k9jhp2vzm1vdpx9q8sg47h1p"; buildDepends = [ base64Bytestring blazeHtml extensibleExceptions filepath hslogger html monadControl mtl network parsec sendfile syb systemFilepath diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix index db9e92fc8ce..519b24668ae 100644 --- a/pkgs/development/libraries/haskell/haskell-names/default.nix +++ b/pkgs/development/libraries/haskell/haskell-names/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "haskell-names"; - version = "0.3.2.5"; - sha256 = "1jp3109b742gr6ii7syacl167i1i91xsyw0200ghaad3ymrqkcvq"; + version = "0.3.2.8"; + sha256 = "043anrsilhd6mgc7c5qb6b7rkdf60xfgzzjn38zk6v0f41lvff99"; buildDepends = [ aeson Cabal dataLens dataLensTemplate filepath haskellPackages haskellSrcExts hseCpp mtl tagged transformers traverseWithClass diff --git a/pkgs/development/libraries/haskell/hint/default.nix b/pkgs/development/libraries/haskell/hint/default.nix index 3512bce9611..5534c2fc9da 100644 --- a/pkgs/development/libraries/haskell/hint/default.nix +++ b/pkgs/development/libraries/haskell/hint/default.nix @@ -1,17 +1,20 @@ -{ cabal, extensibleExceptions, filepath, ghcMtl, ghcPaths -, haskellSrc, MonadCatchIOMtl, mtl, random, utf8String +{ cabal, exceptions, extensibleExceptions, filepath, ghcMtl +, ghcPaths, HUnit, mtl, random, utf8String }: cabal.mkDerivation (self: { pname = "hint"; - version = "0.3.3.7"; - sha256 = "1aba9dfkxlpmvbvllw4qnlrd300vnr0ismkn3kva1pv1cay5pifk"; + version = "0.4.0.0"; + sha256 = "0xs56ws7vwdjgvg7d31iqa111342an6rxvwhh7c3h4z1bq5l1l61"; buildDepends = [ - extensibleExceptions filepath ghcMtl ghcPaths haskellSrc - MonadCatchIOMtl mtl random utf8String + exceptions extensibleExceptions filepath ghcMtl ghcPaths mtl random + utf8String + ]; + testDepends = [ + exceptions extensibleExceptions filepath HUnit mtl ]; meta = { - homepage = "http://darcsden.com/jcpetruzza/hint"; + homepage = "http://hub.darcs.net/jcpetruzza/hint"; description = "Runtime Haskell interpreter (GHC API wrapper)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index 0875c09db86..eee84c338e6 100644 --- a/pkgs/development/libraries/haskell/hledger-web/default.nix +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -20,6 +20,7 @@ cabal.mkDerivation (self: { yesodCore yesodStatic ]; testDepends = [ hspec yesod yesodTest ]; + jailbreak = true; doCheck = false; meta = { homepage = "http://hledger.org"; diff --git a/pkgs/development/libraries/haskell/hsimport/default.nix b/pkgs/development/libraries/haskell/hsimport/default.nix index eea778ec08a..c114e5aae0f 100644 --- a/pkgs/development/libraries/haskell/hsimport/default.nix +++ b/pkgs/development/libraries/haskell/hsimport/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hsimport"; - version = "0.2.9"; - sha256 = "1xfz1as980jg3crlwlajaj8yfj4pl4phg9l6fjap037vr0107hav"; + version = "0.2.10"; + sha256 = "0xvsjgckh2jab9q7l8pvnnn5x977mb6hkhqb175m10brr13yzk4z"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hsini/default.nix b/pkgs/development/libraries/haskell/hsini/default.nix new file mode 100644 index 00000000000..45e03ad7144 --- /dev/null +++ b/pkgs/development/libraries/haskell/hsini/default.nix @@ -0,0 +1,20 @@ +{ cabal, HUnit, mtl, parsec, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, testFrameworkTh +}: + +cabal.mkDerivation (self: { + pname = "hsini"; + version = "0.2"; + sha256 = "0d9dhzaw2v9r0hb4lywzw4f0inijbcw5brc5dh45zfkalmn3aqam"; + buildDepends = [ mtl parsec ]; + testDepends = [ + HUnit mtl parsec QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 testFrameworkTh + ]; + doCheck = false; + meta = { + description = "Package for user configuration files (INI)"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 3f938332c02..398459f6076 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "2.0.0.7"; - sha256 = "0rizmshpypllfbmipbrad7hkrs2asx0ijfhr53w3pj58w6h80m0i"; + version = "2.0.0.8"; + sha256 = "1yralv1nalvdpgamnbjl8xm4lrx22m3v6jancrzisq38a680q96b"; buildDepends = [ conduit httpClient httpClientConduit httpClientTls httpTypes liftedBase resourcet transformers diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index f78205c49a0..3605425436e 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -1,17 +1,17 @@ -{ cabal, basicPrelude, blazeBuilder, caseInsensitive, conduit -, dataDefaultClass, hspec, httpClient, httpConduit, httpTypes -, liftedBase, monadControl, network, networkConduit, resourcet -, text, transformers, wai, waiLogger, warp, word8 +{ cabal, async, basicPrelude, blazeBuilder, caseInsensitive +, conduit, dataDefaultClass, hspec, httpClient, httpConduit +, httpTypes, liftedBase, monadControl, network, networkConduit +, resourcet, text, transformers, wai, waiLogger, warp, word8 }: cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.3.0.1"; - sha256 = "01rbczzf300ivb08wncm19wq64m7n6r5xfbgh82phjxjmmx9h6wj"; + version = "0.3.1"; + sha256 = "1xayhjrs6nm7gm5xc6z6vhzi9iq5czdvpywamkncivjsxjlc50b8"; buildDepends = [ - basicPrelude blazeBuilder caseInsensitive conduit dataDefaultClass - httpClient httpTypes liftedBase monadControl network networkConduit - resourcet text wai waiLogger word8 + async basicPrelude blazeBuilder caseInsensitive conduit + dataDefaultClass httpClient httpTypes liftedBase monadControl + network networkConduit resourcet text wai waiLogger word8 ]; testDepends = [ blazeBuilder conduit hspec httpConduit httpTypes liftedBase network diff --git a/pkgs/development/libraries/haskell/interpolate/default.nix b/pkgs/development/libraries/haskell/interpolate/default.nix new file mode 100644 index 00000000000..6b0ee4b6e36 --- /dev/null +++ b/pkgs/development/libraries/haskell/interpolate/default.nix @@ -0,0 +1,18 @@ +{ cabal, doctest, haskellSrcMeta, hspec, QuickCheck +, quickcheckInstances, text +}: + +cabal.mkDerivation (self: { + pname = "interpolate"; + version = "0.0.2"; + sha256 = "0l9hrgwmvp7h2mgw90gk45zgp0yy00201ki9hwg26sh2wd0sj6f8"; + buildDepends = [ haskellSrcMeta ]; + testDepends = [ + doctest haskellSrcMeta hspec QuickCheck quickcheckInstances text + ]; + meta = { + description = "String interpolation done right"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/lens-family-core/default.nix b/pkgs/development/libraries/haskell/lens-family-core/default.nix new file mode 100644 index 00000000000..7bfb401c756 --- /dev/null +++ b/pkgs/development/libraries/haskell/lens-family-core/default.nix @@ -0,0 +1,13 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "lens-family-core"; + version = "1.0.0"; + sha256 = "149wfxddw58h5q42r3nknmac8wsc9c8xzsw6vrlfb4yasg7bhw53"; + buildDepends = [ transformers ]; + meta = { + description = "Haskell 98 Lens Families"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/lens/3.10.2.nix b/pkgs/development/libraries/haskell/lens/3.10.2.nix deleted file mode 100644 index 819902d6139..00000000000 --- a/pkgs/development/libraries/haskell/lens/3.10.2.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ cabal, bifunctors, comonad, contravariant, deepseq, distributive -, doctest, filepath, genericDeriving, hashable, HUnit -, MonadCatchIOTransformers, mtl, nats, parallel, profunctors -, QuickCheck, reflection, semigroupoids, semigroups, simpleReflect -, split, tagged, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2, testFrameworkTh, text, transformers -, transformersCompat, unorderedContainers, vector, void -}: - -cabal.mkDerivation (self: { - pname = "lens"; - version = "3.10.2"; - sha256 = "0hdj75sg8r1m2jdpfh81zdcwbhp6mb7xipp6q57pv6n90xc6dnxw"; - buildDepends = [ - bifunctors comonad contravariant distributive filepath - genericDeriving hashable MonadCatchIOTransformers mtl parallel - profunctors reflection semigroupoids semigroups split tagged text - transformers transformersCompat unorderedContainers vector void - ]; - testDepends = [ - deepseq doctest filepath genericDeriving HUnit mtl nats parallel - QuickCheck semigroups simpleReflect split testFramework - testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text - transformers unorderedContainers vector - ]; - patchPhase = '' - sed -i lens.cabal -e 's|MonadCatchIO-transformers >=.*,|MonadCatchIO-transformers,|' - ''; - doCheck = false; - meta = { - homepage = "http://github.com/ekmett/lens/"; - description = "Lenses, Folds and Traversals"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/lens/4.0.4.nix b/pkgs/development/libraries/haskell/lens/default.nix index cd85c7a4e94..7c347f69ce4 100644 --- a/pkgs/development/libraries/haskell/lens/4.0.4.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "lens"; - version = "4.0.4"; - sha256 = "14xa500afjpdfx3qqxr9dg5x8mxrna7c3b5xchqsrwck9d00cphd"; + version = "4.0.5"; + sha256 = "1kjmi76zpkhkwn514inhpfhfh3pg5na1f2zw1faqnk3bylpp9h6g"; buildDepends = [ aeson bifunctors comonad constraints contravariant distributive exceptions filepath hashable mtl parallel primitive profunctors diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix index 7462b362c98..9dd46754164 100644 --- a/pkgs/development/libraries/haskell/lifted-base/default.nix +++ b/pkgs/development/libraries/haskell/lifted-base/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "lifted-base"; - version = "0.2.2.0"; - sha256 = "1m6mk24nxkp9a78nywdb844avbqwh931gv1bxsgcbhavavzs72jj"; + version = "0.2.2.1"; + sha256 = "13w1y67wng5rv90fsikkwpvx2ajmq5ybnxrx9b2x0y0zbcy7pzk8"; buildDepends = [ baseUnicodeSymbols monadControl transformersBase ]; diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix index 5b8f42d5420..ea7c86e3c99 100644 --- a/pkgs/development/libraries/haskell/linear/default.nix +++ b/pkgs/development/libraries/haskell/linear/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "linear"; - version = "1.6"; - sha256 = "1aka0da4mwv9cdj76armlava0d4c5f8s2pv10fk6b5glyb0c1a7x"; + version = "1.8.1"; + sha256 = "1hrvlavghwj8psi3qdmvnccrr2vk8rss8ggw87gn0jh771pv8zl2"; buildDepends = [ adjunctions binary distributive hashable lens reflection semigroupoids semigroups tagged transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/math-functions/default.nix b/pkgs/development/libraries/haskell/math-functions/default.nix index 8180c8bce75..7faca58fd85 100644 --- a/pkgs/development/libraries/haskell/math-functions/default.nix +++ b/pkgs/development/libraries/haskell/math-functions/default.nix @@ -1,12 +1,13 @@ -{ cabal, erf, HUnit, ieee754, QuickCheck, testFramework +{ cabal, deepseq, erf, HUnit, ieee754, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, vector +, vectorThUnbox }: cabal.mkDerivation (self: { pname = "math-functions"; - version = "0.1.4.0"; - sha256 = "1cijm224gfvd7rvrrndcks8d7aj89c9qv0m4wx2qqngr7rk78kav"; - buildDepends = [ erf vector ]; + version = "0.1.5.2"; + sha256 = "12cznf7gwia1ki7xhvlhk5p8d09zrdvfgn07pkp4sfrwsc4vijcy"; + buildDepends = [ deepseq erf vector vectorThUnbox ]; testDepends = [ HUnit ieee754 QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 vector diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix index e88dee9fa51..fe8a9a35176 100644 --- a/pkgs/development/libraries/haskell/mime-mail/default.nix +++ b/pkgs/development/libraries/haskell/mime-mail/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "mime-mail"; - version = "0.4.4"; - sha256 = "1y0fss53z1mvykpfkp28zwic2mb7zhf02lwxdr22n34hjzk34g9b"; + version = "0.4.4.1"; + sha256 = "0jzbkrd62alvgyx9bkrzicz88hjjnnavpv6hl22cxnirz41h8hw0"; buildDepends = [ base64Bytestring blazeBuilder filepath random text ]; diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix index f6c261145c1..5119863500d 100644 --- a/pkgs/development/libraries/haskell/mono-traversable/default.nix +++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix @@ -1,15 +1,15 @@ { cabal, comonad, foldl, hashable, hspec, QuickCheck, semigroupoids , semigroups, text, transformers, unorderedContainers, vector -, vectorInstances +, vectorAlgorithms, vectorInstances }: cabal.mkDerivation (self: { pname = "mono-traversable"; - version = "0.3.1"; - sha256 = "0a0vy0hp34sw1q7153jd614mqydzg79pw645kfxlihs3j7ac2b3j"; + version = "0.4.0.1"; + sha256 = "049skbjwz49c9qz2nys2hn6pc4gqn1a91b5kl9z6hjs9fnaic6ng"; buildDepends = [ comonad hashable semigroupoids semigroups text transformers - unorderedContainers vector vectorInstances + unorderedContainers vector vectorAlgorithms vectorInstances ]; testDepends = [ foldl hspec QuickCheck semigroups text transformers diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix index 73f720ba421..17df8cbeecc 100644 --- a/pkgs/development/libraries/haskell/monoid-extras/default.nix +++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix @@ -1,10 +1,10 @@ -{ cabal, groupoids, groups, semigroupoids, semigroups }: +{ cabal, groups, semigroupoids, semigroups }: cabal.mkDerivation (self: { pname = "monoid-extras"; - version = "0.3.2.4"; - sha256 = "1qrgwnczznjp1visspqf3dk224nvqf5icv3646j96acl5srn84qc"; - buildDepends = [ groupoids groups semigroupoids semigroups ]; + version = "0.3.3.1"; + sha256 = "1176sazk10vapia1qvcm2rxckn2vxfav21277rsgf11hvn3lzznc"; + buildDepends = [ groups semigroupoids semigroups ]; jailbreak = true; meta = { description = "Various extra monoid-related definitions and utilities"; diff --git a/pkgs/development/libraries/haskell/mysql-simple/default.nix b/pkgs/development/libraries/haskell/mysql-simple/default.nix new file mode 100644 index 00000000000..e61d493cdbe --- /dev/null +++ b/pkgs/development/libraries/haskell/mysql-simple/default.nix @@ -0,0 +1,19 @@ +{ cabal, attoparsec, base16Bytestring, blazeBuilder, blazeTextual +, mysql, pcreLight, text, time +}: + +cabal.mkDerivation (self: { + pname = "mysql-simple"; + version = "0.2.2.4"; + sha256 = "044grjly1gyrgba2bfrii2pa14ff7v14ncyk3kj01g1zdxnwqjh6"; + buildDepends = [ + attoparsec base16Bytestring blazeBuilder blazeTextual mysql + pcreLight text time + ]; + meta = { + homepage = "https://github.com/bos/mysql-simple"; + description = "A mid-level MySQL client library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/mysql/default.nix b/pkgs/development/libraries/haskell/mysql/default.nix new file mode 100644 index 00000000000..4deec5bb767 --- /dev/null +++ b/pkgs/development/libraries/haskell/mysql/default.nix @@ -0,0 +1,15 @@ +{ cabal, mysqlConfig, zlib }: + +cabal.mkDerivation (self: { + pname = "mysql"; + version = "0.1.1.6"; + sha256 = "1sxzx5f4ysxhq1nimkj4xwf87i7prwp5wg0kjbhv9pbn65zc9mmj"; + buildTools = [ mysqlConfig ]; + extraLibraries = [ zlib ]; + meta = { + homepage = "https://github.com/bos/mysql"; + description = "A low-level MySQL client library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix index b859858b8be..63dbaec80fd 100644 --- a/pkgs/development/libraries/haskell/network-conduit/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "network-conduit"; - version = "1.0.2.2"; - sha256 = "1l7r40raqbhfgwgp5knkqfg2b7pqm4h23c9slbx55r829if8c54h"; + version = "1.0.3"; + sha256 = "0l5r0iws4zbqvkb2nlzxq0zspaz9vhl2a5r43jrxh4cvqb6lbn3q"; buildDepends = [ conduit liftedBase monadControl network transformers ]; diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix index 9853969d9f1..14b2e08ccac 100644 --- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix @@ -4,12 +4,13 @@ cabal.mkDerivation (self: { pname = "persistent-postgresql"; - version = "1.3.0.1"; - sha256 = "00m78hdrnk367ymlgbi49p2zq2gkwskax1ng2h3ljskf3ic4jahf"; + version = "1.3.0.2"; + sha256 = "1d5g5zg3p0nhhkgnf9mr1wxmrpw5y1adv5lf21681an9frkisggy"; buildDepends = [ aeson blazeBuilder conduit monadControl persistent postgresqlLibpq postgresqlSimple text time transformers ]; + jailbreak = true; meta = { homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; diff --git a/pkgs/development/libraries/haskell/pipes-binary/default.nix b/pkgs/development/libraries/haskell/pipes-binary/default.nix new file mode 100644 index 00000000000..e48ad2a96a4 --- /dev/null +++ b/pkgs/development/libraries/haskell/pipes-binary/default.nix @@ -0,0 +1,23 @@ +{ cabal, binary, lensFamilyCore, pipes, pipesBytestring, pipesParse +, smallcheck, tasty, tastyHunit, tastySmallcheck, transformers +}: + +cabal.mkDerivation (self: { + pname = "pipes-binary"; + version = "0.4.0.1"; + sha256 = "1vwsr446b3ysjm86bmpmq8pg2badx9xn0iyr17r4mby0bxvvld33"; + buildDepends = [ + binary pipes pipesBytestring pipesParse transformers + ]; + testDepends = [ + binary lensFamilyCore pipes pipesParse smallcheck tasty tastyHunit + tastySmallcheck transformers + ]; + doCheck = false; + meta = { + homepage = "https://github.com/k0001/pipes-binary"; + description = "Encode and decode binary streams using the pipes and binary libraries"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix b/pkgs/development/libraries/haskell/pipes-bytestring/default.nix index 8847f5e93f0..2a2324027d4 100644 --- a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/pipes-bytestring/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "pipes-bytestring"; - version = "2.0.0"; - sha256 = "17l74g7xfl1i32jj9qa9ivbb3ndi68hkc1b6jchwnn19rmg51j9i"; + version = "2.0.1"; + sha256 = "1vsfqqkr5danb0n30av4vk8d4by9f50y5l8ywm1xjrmwrx999gvf"; buildDepends = [ pipes pipesGroup pipesParse profunctors transformers ]; diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix index 2208955a9d8..d630f063391 100644 --- a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "postgresql-libpq"; - version = "0.8.2.6"; - sha256 = "0n3lqffscwc6pq0rfy4yjild9hcgnkpq9a8icbvgxv4si13ipsgh"; + version = "0.9.0.0"; + sha256 = "09bi0npvly02zjhp463bmzm1n8w1cqsln676z82xi2in86317pv3"; extraLibraries = [ postgresql ]; meta = { homepage = "http://github.com/lpsmith/postgresql-libpq"; diff --git a/pkgs/development/libraries/haskell/scientific/default.nix b/pkgs/development/libraries/haskell/scientific/default.nix index aa57f9dc5df..523bfce62b5 100644 --- a/pkgs/development/libraries/haskell/scientific/default.nix +++ b/pkgs/development/libraries/haskell/scientific/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "scientific"; - version = "0.2.0.1"; - sha256 = "0xwxds884pqywjbc4j6qkx27nbi64sihig8ps9v884sk08021wrp"; + version = "0.2.0.2"; + sha256 = "13rrdaf5mrhpckq9vvrm4pnj63vahg7f0g75hk11nk7k1644l4f0"; buildDepends = [ deepseq hashable text ]; testDepends = [ smallcheck tasty tastySmallcheck text ]; jailbreak = true; diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix index b53b310dafe..412dfa1fcd2 100644 --- a/pkgs/development/libraries/haskell/stm-conduit/default.nix +++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "stm-conduit"; - version = "2.2.1.1"; - sha256 = "0rqn6xhqhaqiy0n2g46z58zzccq1i749p97aihrvjpikrz5kypka"; + version = "2.2.2"; + sha256 = "0a6yi35iw0p18asr6l8370kndmvim097vklayads6gbk74gg67cy"; buildDepends = [ async cereal cerealConduit conduit liftedAsync liftedBase monadControl monadLoops resourcet stm stmChans transformers diff --git a/pkgs/development/libraries/haskell/stripe/default.nix b/pkgs/development/libraries/haskell/stripe/default.nix index 1759143eb9b..304cc3df8f7 100644 --- a/pkgs/development/libraries/haskell/stripe/default.nix +++ b/pkgs/development/libraries/haskell/stripe/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "stripe"; - version = "0.7.0"; - sha256 = "02kyxipifdaf08bk85cbgksvm3jn7i648h9afb3jfxqam5j4a7a0"; + version = "0.8.0"; + sha256 = "0bz932v7kcz2xsnmpx34ifqnf6kbgy7a7qd0dqnjqypc8g6kfl37"; buildDepends = [ aeson httpConduit httpTypes mtl text time unorderedContainers utf8String diff --git a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix index c77ee5f3a3a..695d7edca62 100644 --- a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix +++ b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty-ant-xml"; - version = "1.0.0.5"; - sha256 = "00nlp627r5rgahs8zqjxjm68ijf4yvxd18fq67z2fr68alg4rl4j"; + version = "1.0.0.6"; + sha256 = "06ll7mj60iiskla2x53yncs0931b7dw4l0shxkhz88558gjzy7cj"; buildDepends = [ genericDeriving mtl reducers stm tagged tasty transformers xml ]; diff --git a/pkgs/development/libraries/haskell/tasty-golden/default.nix b/pkgs/development/libraries/haskell/tasty-golden/default.nix index 0b13bb0dcff..f2fe7cfb0ad 100644 --- a/pkgs/development/libraries/haskell/tasty-golden/default.nix +++ b/pkgs/development/libraries/haskell/tasty-golden/default.nix @@ -1,13 +1,13 @@ -{ cabal, filepath, mtl, optparseApplicative, tagged, tasty +{ cabal, deepseq, filepath, mtl, optparseApplicative, tagged, tasty , temporary }: cabal.mkDerivation (self: { pname = "tasty-golden"; - version = "2.2.0.2"; - sha256 = "0wy29ybb31g34gjyx95an3azh111crvrrdhbbihjj064xvf6ddmy"; + version = "2.2.1"; + sha256 = "1q3x3vmck1yq7bf96f3ah5nadahfxjd4wr3dfh3ls549yz40x668"; buildDepends = [ - filepath mtl optparseApplicative tagged tasty temporary + deepseq filepath mtl optparseApplicative tagged tasty temporary ]; meta = { homepage = "https://github.com/feuerbach/tasty-golden"; diff --git a/pkgs/development/libraries/haskell/tasty-hunit/default.nix b/pkgs/development/libraries/haskell/tasty-hunit/default.nix index dfcc5a4bdae..44efd608002 100644 --- a/pkgs/development/libraries/haskell/tasty-hunit/default.nix +++ b/pkgs/development/libraries/haskell/tasty-hunit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "tasty-hunit"; - version = "0.4.1"; - sha256 = "1ns4lbqjkgfgl00jg4sw2jz3r189z4k5fzwbii3g1bnskn28fapa"; + version = "0.8.0.1"; + sha256 = "0a84j8yjqp9x59dy5nbb50vnscb7iimgc60s8vz1p5721gqi62r5"; buildDepends = [ HUnit mtl tasty ]; meta = { description = "HUnit support for the Tasty test framework"; diff --git a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix index e18f3d7cd33..86ee3437cbb 100644 --- a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix +++ b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "tasty-quickcheck"; - version = "0.3.1"; - sha256 = "1rajvcq2a1yxdbb4kykvab1p9rnmsd2lgmlk61nd4fxvsvfj5gzn"; + version = "0.8"; + sha256 = "10d7chqrlp1fjphnkiykxd22g4mfp69kmihd705sxb0y0mrdfh8x"; buildDepends = [ QuickCheck random tagged tasty ]; meta = { description = "QuickCheck support for the Tasty test framework"; diff --git a/pkgs/development/libraries/haskell/tasty-rerun/default.nix b/pkgs/development/libraries/haskell/tasty-rerun/default.nix index 0b2623c5f67..b5f7351c594 100644 --- a/pkgs/development/libraries/haskell/tasty-rerun/default.nix +++ b/pkgs/development/libraries/haskell/tasty-rerun/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty-rerun"; - version = "1.1.0"; - sha256 = "0nizjmz9z41r1vzxzld760x6ga4lqycwfazhddk570w3x2dzm6p2"; + version = "1.1.1"; + sha256 = "1xgjf47bvahankyic18l5fcda4dlfbd4j2lxqv3v5hhwk7zgvcp8"; buildDepends = [ mtl optparseApplicative reducers split stm tagged tasty transformers diff --git a/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix b/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix index 36a9c4280af..40a30a6d24f 100644 --- a/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "tasty-smallcheck"; - version = "0.2"; - sha256 = "1xw0l1bikwavyq7s8q71a92x87mg7z65mk32nn5qx0zxwqsfb5l4"; + version = "0.8"; + sha256 = "0c4ccmhql118j4dlvy5cmrnma454b0rdv1wq2ds6xhpdhx20h1br"; buildDepends = [ async smallcheck tagged tasty ]; meta = { homepage = "https://github.com/feuerbach/tasty"; diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index 2cf62b7cefd..6fcdf9a4cb3 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -1,16 +1,17 @@ -{ cabal, ansiTerminal, deepseq, either, mtl, optparseApplicative -, regexTdfa, stm, tagged +{ cabal, ansiTerminal, async, deepseq, mtl, optparseApplicative +, regexTdfa, stm, tagged, unboundedDelays }: cabal.mkDerivation (self: { pname = "tasty"; - version = "0.7"; - sha256 = "0nwhbbm70v2drv6kzdz65wws7gn8ph6583xpb6dw8g4j9aa1shxd"; + version = "0.8"; + sha256 = "12r8ml45r1dq3vmjkibxkla5rmmyrm11js26kmkha110ji8hnflg"; buildDepends = [ - ansiTerminal deepseq either mtl optparseApplicative regexTdfa stm - tagged + ansiTerminal async deepseq mtl optparseApplicative regexTdfa stm + tagged unboundedDelays ]; meta = { + homepage = "http://documentup.com/feuerbach/tasty"; description = "Modern and extensible testing framework"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/text-format/default.nix b/pkgs/development/libraries/haskell/text-format/default.nix index b9507d7777a..b478fb7c515 100644 --- a/pkgs/development/libraries/haskell/text-format/default.nix +++ b/pkgs/development/libraries/haskell/text-format/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "text-format"; - version = "0.3.1.0"; - sha256 = "13k5a1kfmapd4yckm2vcrwz4vrrf32c2dpisdw0hyvzvmdib3n60"; + version = "0.3.1.1"; + sha256 = "02zfgzfjvkaxbma1h2gr95h10c8q9gyaadag41q579j68iv15qbd"; buildDepends = [ doubleConversion text time transformers ]; meta = { homepage = "https://github.com/bos/text-format"; diff --git a/pkgs/development/libraries/haskell/text/1.1.0.0.nix b/pkgs/development/libraries/haskell/text/1.1.0.1.nix index 87a89c43be4..eecb54f3c68 100644 --- a/pkgs/development/libraries/haskell/text/1.1.0.0.nix +++ b/pkgs/development/libraries/haskell/text/1.1.0.1.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "text"; - version = "1.1.0.0"; - sha256 = "14mssz27f5ivhwcl9gvbw0s1mjh7hw9gviwxnimqiqzh4jlavwc0"; + version = "1.1.0.1"; + sha256 = "1f0zicvflfd17mr2h9s9idhi0215m2y208jbnh4fx1yj6snnvalw"; buildDepends = [ deepseq ]; testDepends = [ deepseq HUnit QuickCheck random testFramework testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/time/1.4.1.nix b/pkgs/development/libraries/haskell/time/1.4.2.nix index 1e675110190..ff9818a387d 100644 --- a/pkgs/development/libraries/haskell/time/1.4.1.nix +++ b/pkgs/development/libraries/haskell/time/1.4.2.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "time"; - version = "1.4.1"; - sha256 = "04ndcp7m1a7mia4by15dqrwl5k0d2477x20s6xcrdb7in8w9ccvp"; + version = "1.4.2"; + sha256 = "1kpsak2wka23c8591ry6i1d7hmd54s7iw5n6hpx48jhcxf1w199h"; buildDepends = [ deepseq ]; testDepends = [ Cabal deepseq QuickCheck testFramework testFrameworkQuickcheck2 diff --git a/pkgs/development/libraries/haskell/trifecta/default.nix b/pkgs/development/libraries/haskell/trifecta/default.nix index 84759406d00..d9a9a2a01c5 100644 --- a/pkgs/development/libraries/haskell/trifecta/default.nix +++ b/pkgs/development/libraries/haskell/trifecta/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "trifecta"; - version = "1.4"; - sha256 = "1wz9rqd5nf1y4vpwn0vrbdlxdbrdp967p5ivpd0b2w5493m3mvax"; + version = "1.4.1"; + sha256 = "0w8x9n7n57y997iajm42z44nm846fj88shc04dffn1xif3jw5zfc"; buildDepends = [ ansiTerminal ansiWlPprint blazeBuilder blazeHtml blazeMarkup charset comonad deepseq fingertree hashable lens mtl parsers diff --git a/pkgs/development/libraries/haskell/type-eq/default.nix b/pkgs/development/libraries/haskell/type-eq/default.nix index ac97377c607..55bc6b03a95 100644 --- a/pkgs/development/libraries/haskell/type-eq/default.nix +++ b/pkgs/development/libraries/haskell/type-eq/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "type-eq"; - version = "0.4.1"; - sha256 = "0l8nkrdn1hs8ddhh85qm176f9v42fdck9iscn4swd92vj7bfci7k"; + version = "0.4.2"; + sha256 = "0nyx3lqgrnlz0l3p615ln2dglqd39jwlk91ybz7blzhq1gpgayar"; buildTools = [ cpphs ]; meta = { homepage = "http://github.com/glaebhoerl/type-eq"; diff --git a/pkgs/development/libraries/haskell/vado/default.nix b/pkgs/development/libraries/haskell/vado/default.nix new file mode 100644 index 00000000000..45e9524657a --- /dev/null +++ b/pkgs/development/libraries/haskell/vado/default.nix @@ -0,0 +1,17 @@ +{ cabal, attoparsec, filepath, QuickCheck, text }: + +cabal.mkDerivation (self: { + pname = "vado"; + version = "0.0.1"; + sha256 = "11b8glzzpzhm8cfw3vyvvvz3h0xid5r3prwhnvplajr7v3r562h2"; + isLibrary = true; + isExecutable = true; + buildDepends = [ attoparsec filepath text ]; + testDepends = [ attoparsec filepath QuickCheck text ]; + meta = { + homepage = "https://github.com/hamishmack/vado"; + description = "Runs commands on remote machines using ssh"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/vcsgui/default.nix b/pkgs/development/libraries/haskell/vcsgui/default.nix new file mode 100644 index 00000000000..b27f61323a2 --- /dev/null +++ b/pkgs/development/libraries/haskell/vcsgui/default.nix @@ -0,0 +1,16 @@ +{ cabal, filepath, gtk3, MissingH, mtl, vcswrapper }: + +cabal.mkDerivation (self: { + pname = "vcsgui"; + version = "0.0.2"; + sha256 = "0kj06l9s4l791ffwdnh7j0nvjvgili18g2jl2ik81n28bzfyq1dx"; + isLibrary = true; + isExecutable = true; + buildDepends = [ filepath gtk3 MissingH mtl vcswrapper ]; + meta = { + homepage = "https://github.com/forste/haskellVCSGUI"; + description = "GUI library for source code management systems"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/vcswrapper/default.nix b/pkgs/development/libraries/haskell/vcswrapper/default.nix new file mode 100644 index 00000000000..33462522c29 --- /dev/null +++ b/pkgs/development/libraries/haskell/vcswrapper/default.nix @@ -0,0 +1,16 @@ +{ cabal, filepath, hxt, MissingH, mtl, parsec }: + +cabal.mkDerivation (self: { + pname = "vcswrapper"; + version = "0.0.3"; + sha256 = "04gmiiv461qh8fypkkiynipn5jsjqvywkj17ldq5wag4qaspx97x"; + isLibrary = true; + isExecutable = true; + buildDepends = [ filepath hxt MissingH mtl parsec ]; + meta = { + homepage = "https://github.com/forste/haskellVCSWrapper"; + description = "Wrapper for source code management systems"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/vector-space-points/default.nix b/pkgs/development/libraries/haskell/vector-space-points/default.nix index 2edb15beeda..ca9218bf42c 100644 --- a/pkgs/development/libraries/haskell/vector-space-points/default.nix +++ b/pkgs/development/libraries/haskell/vector-space-points/default.nix @@ -1,10 +1,10 @@ -{ cabal, newtype, vectorSpace }: +{ cabal, vectorSpace }: cabal.mkDerivation (self: { pname = "vector-space-points"; - version = "0.1.3"; - sha256 = "0bk2zrccf5bxh14dzhhv89mr755j801ziqyxgv69ksdyxh8hx2qg"; - buildDepends = [ newtype vectorSpace ]; + version = "0.2"; + sha256 = "05wczgvcqwqhcr4v0md4x5vybq6ns8rk6459yqyrc96kaig0sf2i"; + buildDepends = [ vectorSpace ]; meta = { description = "A type for points, as distinct from vectors"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 8f2c6ebb342..412fd3f16e6 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "2.0.0.2"; - sha256 = "0d9afs50r08k9zgz7vvh7fvamcvhm8hf4qxca4w0xi7pcj1vql0r"; + version = "2.0.0.3"; + sha256 = "0anbmp6wjk1qba1skr08fkm5y9lm58kfghzcgzgx8hrid7w85fb7"; buildDepends = [ base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal cryptoApi cryptoConduit cryptohashCryptoapi fileEmbed filepath diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index f3d2dfbd0cd..50e4d983d75 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.0.3.3"; - sha256 = "11ma8pazvysvpiy8y7xfh7kpmsfiw94bd6vyyi3ji8q71rzjlf62"; + version = "2.1.0"; + sha256 = "14aj1c6i58jyg79y516sa2l39y4i7az3l5lp6fkxkgqgzl5dxs6c"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase diff --git a/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix b/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix index 6612003fa2e..9767f2d7750 100644 --- a/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix +++ b/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wai-handler-fastcgi"; - version = "2.0.0"; - sha256 = "1pqiqx1wq2iv705f8bd4sxmjmmkkxiw4g6a9dpwnawwb5n0d88nl"; + version = "2.0.0.1"; + sha256 = "14jsibsqfj6z5yqgdrh43aiqps1yldxkgn6fkj4i80zxk099nbxp"; buildDepends = [ wai waiExtra ]; extraLibraries = [ fcgi ]; meta = { diff --git a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix index 3ba78e16251..f25206e69ac 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.0"; - sha256 = "1z03c3hjkh4k6j5dsp4973f05rk2cgl7gazac4vdq4imwfzxj3lg"; + version = "2.0.1.1"; + sha256 = "10izbri1a8mjb2q4r1badw63qbp3vxnw5v2hzskq6911bckqkskc"; buildDepends = [ blazeBuilder blazeBuilderConduit conduit 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 9cae0a85d6c..1d7b184d6df 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.0.1"; - sha256 = "1lk7i9kiawsn56f8w2nidmas6g94yq7diaprvkd7c52hjki5mla7"; + version = "2.0.0.2"; + sha256 = "0085whb8jav2zasmgi8z62anm6i509lc2w0988vqlcrds7rrknc8"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie httpTypes HUnit network text transformers wai diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index 4273e408a7f..f17b999f149 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.0.0"; - sha256 = "11s60v9pw8jl9w950z81gkxci7djrdibi8hxrw6j1v8az40qqiwk"; + version = "2.1.0"; + sha256 = "0n3dgm1pwv9baxrx0qh0iq1mh9i7ihhki3h4ks5k74d37w7bwcjy"; buildDepends = [ blazeBuilder conduit httpTypes network text transformers vault ]; diff --git a/pkgs/development/libraries/haskell/warp-tls/default.nix b/pkgs/development/libraries/haskell/warp-tls/default.nix index c93352cf65c..c21e3b0d432 100644 --- a/pkgs/development/libraries/haskell/warp-tls/default.nix +++ b/pkgs/development/libraries/haskell/warp-tls/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "warp-tls"; - version = "2.0.2"; - sha256 = "02wj9hwxd0x49g7kl68h3r4b9hc29yqfjagyybnr42xzwl6bdpyg"; + version = "2.0.3.1"; + sha256 = "1cyf4syblisi5hana7h2g72yyrjln40v3b6jq2253nglqip79l5w"; buildDepends = [ conduit cprngAes dataDefaultClass network networkConduit tls transformers wai warp diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index d3c1bdbd4c7..fee847795dc 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "2.0.3.2"; - sha256 = "1aapwhgqn693cvdhj4zafyww2xrpjn8wzdgrwxz8k6mq0f2lh599"; + version = "2.1.0"; + sha256 = "19pwpcn0qp0c4gb2yp81i550zfxk67087yhhn2iqgnzzhljhk8yw"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpDate httpTypes liftedBase network networkConduit simpleSendfile diff --git a/pkgs/development/libraries/haskell/x509/default.nix b/pkgs/development/libraries/haskell/x509/default.nix index 24ebf746202..d8fd7030f14 100644 --- a/pkgs/development/libraries/haskell/x509/default.nix +++ b/pkgs/development/libraries/haskell/x509/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "x509"; - version = "1.4.10"; - sha256 = "1xsq0g7f5ki6l9yx604j6bsl1k7s3p1xr6hh2086hsgl9fp1f9ap"; + version = "1.4.11"; + sha256 = "1ax56jps640cj1swy08y4k75vx908ckwkg2hi7y2s3bhnvpz49ga"; buildDepends = [ asn1Encoding asn1Parse asn1Types cryptohash cryptoPubkeyTypes filepath mtl pem time diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix index fb0bd78917c..e92d761edcb 100644 --- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix +++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "xss-sanitize"; - version = "0.3.4.2"; - sha256 = "1sx44vkixxydv75cds5g9si7hzm2hdl395p3bdycq2zky0mnxwra"; + version = "0.3.5"; + sha256 = "13iggcivpvzlzlx0n1pb6lyw55lc7d7hzihf1llphq6lmdy6l49s"; buildDepends = [ attoparsec cssText network tagsoup text utf8String ]; diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 3831cac76e4..6857b6f02d7 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.2.6"; - sha256 = "1w7svh49zqdrw1qp8v7df6y6mvkf40cn27k5ckxjyfin00rz0x31"; + version = "1.2.7"; + sha256 = "0arszd7nk7rwm0xnjb2vqk2zf7lcwyw1ncxyxdmdxxvmh28lymwk"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index 59eeac6e3cf..9a96d2e574c 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -1,26 +1,26 @@ { cabal, attoparsec, base64Bytestring, blazeBuilder, Cabal, conduit -, dataDefaultClass, fileEmbed, filepath, fsnotify, ghcPaths -, httpConduit, httpReverseProxy, httpTypes, liftedBase, network -, networkConduit, optparseApplicative, parsec, projectTemplate -, resourcet, shakespeare, shakespeareCss, shakespeareJs -, shakespeareText, split, systemFileio, systemFilepath, tar, text -, time, transformers, unixCompat, unorderedContainers, wai, warp -, yaml, zlib +, dataDefaultClass, fileEmbed, filepath, filesystemConduit +, fsnotify, ghcPaths, httpConduit, httpReverseProxy, httpTypes +, liftedBase, network, networkConduit, optparseApplicative, parsec +, projectTemplate, resourcet, shakespeare, shakespeareCss +, shakespeareJs, shakespeareText, split, systemFileio +, systemFilepath, tar, text, time, transformers, unixCompat +, unorderedContainers, wai, warp, yaml, zlib }: cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.6.1"; - sha256 = "0w3qar315w96139j16fq4py4qs83bhm6pab9pzjbx8h451sqjarh"; + version = "1.2.7"; + sha256 = "1xy62r61fhswainws8q39dqkr1wfp1cls6sj2xvagf1yw5pw06wv"; isLibrary = false; isExecutable = true; buildDepends = [ attoparsec base64Bytestring blazeBuilder Cabal conduit - dataDefaultClass fileEmbed filepath fsnotify ghcPaths httpConduit - httpReverseProxy httpTypes liftedBase network networkConduit - optparseApplicative parsec projectTemplate resourcet shakespeare - shakespeareCss shakespeareJs shakespeareText split systemFileio - systemFilepath tar text time transformers unixCompat + dataDefaultClass fileEmbed filepath filesystemConduit fsnotify + ghcPaths httpConduit httpReverseProxy httpTypes liftedBase network + networkConduit optparseApplicative parsec projectTemplate resourcet + shakespeare shakespeareCss shakespeareJs shakespeareText split + systemFileio systemFilepath tar text time transformers unixCompat unorderedContainers wai warp yaml zlib ]; meta = { diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 5eaaa316ecf..bd1116267fa 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -1,17 +1,17 @@ -{ cabal, aeson, attoparsecConduit, blazeBuilder, blazeHtml +{ cabal, aeson, async, attoparsecConduit, blazeBuilder, blazeHtml , blazeMarkup, caseInsensitive, cereal, clientsession, conduit , cookie, dataDefault, failure, fastLogger, hamlet, hspec -, httpTypes, HUnit, liftedBase, monadControl, monadLogger, parsec -, pathPieces, QuickCheck, random, resourcet, safe, shakespeare -, shakespeareCss, shakespeareI18n, shakespeareJs, text, time -, transformers, transformersBase, unixCompat, vector, wai, waiExtra -, waiLogger, waiTest, warp, yesodRoutes +, httpTypes, HUnit, liftedBase, monadControl, monadLogger, network +, networkConduit, parsec, pathPieces, QuickCheck, random, resourcet +, safe, shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs +, text, time, transformers, transformersBase, unixCompat, vector +, wai, waiExtra, waiLogger, waiTest, warp, yesodRoutes }: cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.6.7"; - sha256 = "09vxi7fkiakr58ifa6ribsqq1p6fmqclznj38vhl5rdfalm7yivg"; + version = "1.2.7"; + sha256 = "1gkpx0d7hyvn45254aj40iy4k0bf3kkrvmxnw3q1mvqc3k1kdxqn"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie dataDefault @@ -22,9 +22,9 @@ cabal.mkDerivation (self: { yesodRoutes ]; testDepends = [ - blazeBuilder conduit hamlet hspec httpTypes HUnit liftedBase - QuickCheck random resourcet shakespeareCss shakespeareJs text - transformers wai waiTest + async blazeBuilder conduit hamlet hspec httpTypes HUnit liftedBase + network networkConduit QuickCheck random resourcet shakespeareCss + shakespeareJs text transformers wai waiTest ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 7a7d1f16e05..84534d845a3 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.5.2"; - sha256 = "0ppzj04c5y02k2daw52g2pkzf85mhsg7n4hbkm05xk1crzbrbcxj"; + version = "1.3.6"; + sha256 = "1gynm078i9iak0iirdrnp7pmz9rx4gq96cb2q5n617hww9m5p0j2"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent resourcet diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix index 2d18fcd1f83..d76de048bab 100644 --- a/pkgs/development/libraries/haskell/zip-archive/default.nix +++ b/pkgs/development/libraries/haskell/zip-archive/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zip-archive"; - version = "0.2.1"; - sha256 = "1w58fg3kzbsgscadwx3k34xbq7d7hzghlv4mxyglaxn3qdcd6w8b"; + version = "0.2.2"; + sha256 = "10br64sn7wmssimxssqmjd43br8y63l5szn2wg30d957a9zgdk60"; isLibrary = true; isExecutable = true; buildDepends = [ binary digest filepath mtl text time zlib ]; diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 2210976ff90..5b19323f943 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -12,6 +12,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; + preConfigure = '' + substituteInPlace imlib2-config.in \ + --replace "@my_libs@" "" + ''; + meta = { hydraPlatforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix index 21b4eac30af..8d01c2f2f43 100644 --- a/pkgs/development/libraries/lesstif/default.nix +++ b/pkgs/development/libraries/lesstif/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11, libXp, libXau}: +{stdenv, fetchurl, xlibsWrapper, libXp, libXau}: stdenv.mkDerivation { name = "lesstif-0.95.0-p2"; @@ -6,7 +6,7 @@ stdenv.mkDerivation { url = mirror://sourceforge/lesstif/lesstif-0.95.0.tar.bz2; md5 = "ab895165c149d7f95843c7584b1c7ad4"; }; - buildInputs = [x11]; + buildInputs = [xlibsWrapper]; propagatedBuildInputs = [libXp libXau]; # The last stable release of lesstif was in June 2006. These diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix new file mode 100644 index 00000000000..7a005c9fda2 --- /dev/null +++ b/pkgs/development/libraries/libfm/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, glib, gtk, intltool, menu-cache, pango, pkgconfig, vala }: + +stdenv.mkDerivation { + name = "libfm-1.2.0"; + src = fetchurl { + url = "mirror://sourceforge/pcmanfm/libfm-1.2.0.tar.xz"; + sha256 = "08pwdrmfm9rl41lj2niyjqq2bdvydxk7v2shjxh5gk1xwj238lgh"; + }; + + buildInputs = [ glib gtk intltool menu-cache pango pkgconfig vala ]; + + meta = with stdenv.lib; { + homepage = "http://blog.lxde.org/?cat=28/"; + license = licenses.gpl2Plus; + description = "A glib-based library for file management"; + maintainers = [ maintainers.ttuegel ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libgcrypt/1.6.nix b/pkgs/development/libraries/libgcrypt/1.6.nix index ea981f7ed12..9dc8b8a2317 100644 --- a/pkgs/development/libraries/libgcrypt/1.6.nix +++ b/pkgs/development/libraries/libgcrypt/1.6.nix @@ -24,6 +24,12 @@ stdenv.mkDerivation rec { make check ''; + crossAttrs = let + isCross64 = stdenv.cross.config == "x86_64-w64-mingw32"; + in stdenv.lib.optionalAttrs isCross64 { + configureFlags = [ "--disable-asm" "--disable-padlock-support" ]; + }; + meta = { description = "GNU Libgcrypt, a general-pupose cryptographic library"; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index da142a957ad..8ce9a10701e 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash }: +{ stdenv, fetchurl, bash, gettext }: stdenv.mkDerivation (rec { name = "libgpg-error-1.12"; @@ -8,6 +8,10 @@ stdenv.mkDerivation (rec { sha256 = "0pz58vr12qihq2f0bypjxsb6cf6ajq5258fmfm8s6lvwm3b9xz6a"; }; + # If architecture-dependant MO files aren't available, they're generated + # during build, so we need gettext for cross-builds. + crossAttrs.buildInputs = [ gettext ]; + doCheck = true; meta = { diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index af985ac91fc..afab21bc4f0 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "0f1818l1vs5fbmrihzyv3qasddbqi3r01jik5crrxddwalsi2bd3"; + sha256 = "18nd2zkgazphgkfdhf8ps7knda8vdnhrq9c02989279x2qxjsci9"; }; nativeBuildInputs = [ pkgconfig gettext ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { MTP, and other vendor specific protocols for controlling and transferring data from digital cameras. ''; - version = "2.5.2"; + version = "2.5.3.1"; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus license = stdenv.lib.licenses.lgpl21Plus; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix new file mode 100644 index 00000000000..863a42b741b --- /dev/null +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl, automake, autoconf, pkgconfig, libtool, python, pythonPackages, glib, jansson}: + +stdenv.mkDerivation rec +{ + version = "1.2.1"; + seafileVersion = "2.1.1"; + name = "libsearpc-${version}"; + + src = fetchurl + { + url = "https://github.com/haiwen/libsearpc/archive/v${seafileVersion}.tar.gz"; + sha256 = "c0e7cc812c642ebb1339c3701570e78ff5b8c8aa2a521e5a505e28d9666e89ec"; + }; + + patches = [ ./libsearpc.pc.patch ]; + + buildInputs = [ automake autoconf pkgconfig libtool python pythonPackages.simplejson ]; + propagatedBuildInputs = [ glib jansson ]; + + preConfigure = "./autogen.sh"; + + buildPhase = "make -j1"; + + meta = + { + homepage = "https://github.com/haiwen/libsearpc"; + description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System."; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.calrama ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/libraries/libsearpc/libsearpc.pc.patch b/pkgs/development/libraries/libsearpc/libsearpc.pc.patch new file mode 100644 index 00000000000..6f30932ba6d --- /dev/null +++ b/pkgs/development/libraries/libsearpc/libsearpc.pc.patch @@ -0,0 +1,10 @@ +From: Aaron Lindsay <aaron@aclindsay.com> + +--- a/libsearpc.pc.in 2013-01-10 01:35:24.000000000 -0500 ++++ b/libsearpc.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/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 0a06452d5d8..c201eda69e6 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, cmake, zlib, libgcrypt }: +{ stdenv, fetchurl, pkgconfig, cmake, zlib, libgcrypt }: stdenv.mkDerivation rec { - name = "libssh-0.5.5"; + name = "libssh-0.6.3"; src = fetchurl { - url = "https://red.libssh.org/attachments/download/51/${name}.tar.gz"; - sha256 = "17cfdff4hc0ijzrr15biq29fiabafz0bw621zlkbwbc1zh2hzpy0"; + url = "https://red.libssh.org/attachments/download/87/${name}.tar.xz"; + sha256 = "1jyaj9h1iglvn02hrvcchbx8ycjpj8b91h8mi459k7q5jp2xgd9b"; }; buildInputs = [ zlib libgcrypt ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkgconfig ]; cmakeFlags = "-DWITH_GCRYPT=ON"; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index c34934400d0..d883f1da9ca 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -4,47 +4,57 @@ , dnsmasq }: -let version = "1.2.0"; in +let version = "1.2.2"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "libvirt-${version}"; src = fetchurl { - url = "http://libvirt.org/sources/libvirt-${version}.tar.gz"; - sha256 = "1p9dn96j8qqp20lr0kvc7zyjjcpgsa9k41slyk2jmnv1g2p7ird8"; + url = "http://libvirt.org/sources/${name}.tar.gz"; + sha256 = "1hxvgh2fp2fk3wva7fnbz2pk6g5217wrmf9xwikiphn50zipg0x4"; }; - buildInputs = - [ pkgconfig libxml2 gnutls devicemapper perl python readline lvm2 - utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl makeWrapper - libcap_ng - ]; - - preConfigure = - '' - PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${udev}/sbin:${dnsmasq}/bin:$PATH - patchShebangs . # fixes /usr/bin/python references - ''; - - configureFlags = "--localstatedir=/var --sysconfdir=/etc --with-init-script=redhat --without-macvtap"; - - installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc"; - - postInstall = - '' - substituteInPlace $out/libexec/libvirt-guests.sh \ - --replace "$out/bin" "${gettext}/bin" - wrapProgram $out/sbin/libvirtd \ - --prefix PATH : ${iptables}/sbin:${iproute}/sbin:${pmutils}/bin - ''; + buildInputs = [ + pkgconfig libxml2 gnutls devicemapper perl python readline lvm2 + utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl makeWrapper + libcap_ng + ]; + + preConfigure = '' + PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${udev}/sbin:${dnsmasq}/bin:$PATH + patchShebangs . # fixes /usr/bin/python references + ''; + + configureFlags = [ + "--localstatedir=/var" + "--sysconfdir=/etc" + "--with-init-script=redhat" + "--without-macvtap" + ]; + + installFlags = [ + "localstatedir=$(TMPDIR)/var" + "sysconfdir=$(out)/etc" + ]; + + postInstall = '' + substituteInPlace $out/libexec/libvirt-guests.sh \ + --replace "$out/bin" "${gettext}/bin" + wrapProgram $out/sbin/libvirtd \ + --prefix PATH : ${iptables}/sbin:${iproute}/sbin:${pmutils}/bin + ''; enableParallelBuilding = true; + NIX_CFLAGS_COMPILE = "-fno-stack-protector"; - meta = { + meta = with stdenv.lib; { homepage = http://libvirt.org/; - description = "A toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes)"; - license = "LGPLv2+"; - platforms = stdenv.lib.platforms.linux; + description = '' + A toolkit to interact with the virtualization capabilities of recent + versions of Linux (and other OSes) + ''; + license = licenses.lgpl2Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix new file mode 100644 index 00000000000..90692569f08 --- /dev/null +++ b/pkgs/development/libraries/libzdb/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl, sqlite}: + +stdenv.mkDerivation rec +{ + version = "3.0"; + name = "libzdb-${version}"; + + src = fetchurl + { + url = "http://www.tildeslash.com/libzdb/dist/libzdb-${version}.tar.gz"; + sha256 = "e334bcb9ca1410e863634a164e3b1b5784018eb6e90b6c2b527780fc29a123c8"; + }; + + buildInputs = [ sqlite ]; + + meta = + { + homepage = "http://www.tildeslash.com/libzdb/"; + description = "A small, easy to use Open Source Database Connection Pool Library."; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.calrama ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix new file mode 100644 index 00000000000..8e2e202f432 --- /dev/null +++ b/pkgs/development/libraries/menu-cache/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, glib, pkgconfig }: + +stdenv.mkDerivation { + name = "menu-cache-0.5.1"; + src = fetchurl { + url = "mirror://sourceforge/lxde/menu-cache-0.5.1.tar.gz"; + sha256 = "08m1msgbl6j7j72cwcg18klb99jif8h1phkcnbplxkdf3w15irh8"; + }; + + buildInputs = [ glib pkgconfig ]; + + meta = with stdenv.lib; { + homepage = "http://blog.lxde.org/?tag=menu-cache"; + license = licenses.gpl2Plus; + description = "Library to read freedesktop.org menu files"; + maintainers = [ maintainers.ttuegel ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/openssl/cert-file.patch b/pkgs/development/libraries/openssl/cert-file.patch index 6b7a60e9026..26b51c0295e 100644 --- a/pkgs/development/libraries/openssl/cert-file.patch +++ b/pkgs/development/libraries/openssl/cert-file.patch @@ -12,7 +12,7 @@ diff -ru -x '*~' openssl-1.0.0e-orig/crypto/x509/x509_def.c openssl-1.0.0e/crypt #include "cryptlib.h" #include <openssl/crypto.h> #include <openssl/x509.h> -@@ -71,7 +75,19 @@ +@@ -71,7 +75,25 @@ { return(X509_CERT_DIR); } const char *X509_get_default_cert_file(void) @@ -23,9 +23,15 @@ diff -ru -x '*~' openssl-1.0.0e-orig/crypto/x509/x509_def.c openssl-1.0.0e/crypt + if (!init) { + init = 1; + char * s = getenv("OPENSSL_X509_CERT_FILE"); -+ if (s && getuid() == geteuid()) { -+ strncpy(buf, s, sizeof(buf)); -+ buf[sizeof(buf) - 1] = 0; ++ if (s) { ++#ifndef OPENSSL_SYS_WINDOWS ++ if (getuid() == geteuid()) { ++#endif ++ strncpy(buf, s, sizeof(buf)); ++ buf[sizeof(buf) - 1] = 0; ++#ifndef OPENSSL_SYS_WINDOWS ++ } ++#endif + } + } + return buf; diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 51279701d4a..7138c44da64 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, unicodeSupport ? true, cplusplusSupport ? true }: +{ stdenv, fetchurl, unicodeSupport ? true, cplusplusSupport ? true +, windows ? null +}: + +with stdenv.lib; stdenv.mkDerivation rec { name = "pcre-8.34"; @@ -16,12 +20,16 @@ stdenv.mkDerivation rec { --enable-jit ${if unicodeSupport then "--enable-unicode-properties" else ""} ${if !cplusplusSupport then "--disable-cpp" else ""} - '' + stdenv.lib.optionalString stdenv.isDarwin "CXXFLAGS=-O0"; + '' + optionalString stdenv.isDarwin "CXXFLAGS=-O0"; doCheck = with stdenv; !(isCygwin || isFreeBSD); # XXX: test failure on Cygwin # we are running out of stack on both freeBSDs on Hydra + crossAttrs = optionalAttrs (stdenv.cross.libc == "msvcrt") { + buildInputs = [ windows.mingw_w64_pthreads.crossDrv ]; + }; + meta = { homepage = "http://www.pcre.org/"; description = "A library for Perl Compatible Regular Expressions"; @@ -35,7 +43,7 @@ stdenv.mkDerivation rec { PCRE library is free, even for building proprietary software. ''; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.simons ]; + platforms = platforms.all; + maintainers = [ maintainers.simons ]; }; } diff --git a/pkgs/development/libraries/poppler/0.18.nix b/pkgs/development/libraries/poppler/0.18.nix deleted file mode 100644 index 123d229f2ba..00000000000 --- a/pkgs/development/libraries/poppler/0.18.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ fetchurl, stdenv, cairo, freetype, fontconfig, zlib -, libjpeg, curl, libpthreadstubs, xorg, openjpeg -, libxml2, pkgconfig, cmake, lcms, libiconvOrEmpty -, glibSupport ? false, glib, gtk3Support ? false, gtk3 # gtk2 no longer accepted -, qt4Support ? false, qt4 ? null -}: - -stdenv.mkDerivation rec { - name = "poppler-0.18.4"; - - src = fetchurl { - url = "${meta.homepage}${name}.tar.gz"; - sha256 = "0bnl05al7mjndp2h0355946j59nfw76f5v0x57d47q68rm412hik"; - }; - - propagatedBuildInputs = with xorg; - [ zlib cairo freetype fontconfig libjpeg lcms curl - libpthreadstubs libxml2 stdenv.gcc.libc - libXau libXdmcp libxcb libXrender libXext - openjpeg - ] - ++ stdenv.lib.optional glibSupport glib - ++ stdenv.lib.optional gtk3Support gtk3 - ++ stdenv.lib.optional qt4Support qt4; - - nativeBuildInputs = [ pkgconfig cmake ] ++ libiconvOrEmpty; - - cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON"; - - patches = [ ./datadir_env.patch ]; - - # XXX: The Poppler/Qt4 test suite refers to non-existent PDF files - # such as `../../../test/unittestcases/UseNone.pdf'. - #doCheck = !qt4Support; - checkTarget = "test"; - - enableParallelBuilding = true; - - meta = { - homepage = http://poppler.freedesktop.org/; - description = "Poppler, a PDF rendering library"; - - longDescription = '' - Poppler is a PDF rendering library based on the xpdf-3.0 code base. - ''; - - platforms = if qt4Support - then qt4.meta.platforms - else stdenv.lib.platforms.all; - - license = "GPLv2"; - }; -} diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 34d5bac6adb..f405e30433f 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, alsaLib, pkgconfig }: stdenv.mkDerivation rec { - name = "portaudio-19-20111121"; + name = "portaudio-19-20140130"; src = fetchurl { - url = http://www.portaudio.com/archives/pa_stable_v19_20111121.tgz; - sha256 = "168vmcag3c5y3zwf7h5298ydh83g72q5bznskrw9cr2h1lrx29lw"; + url = http://www.portaudio.com/archives/pa_stable_v19_20140130.tgz; + sha256 = "0mwddk4qzybaf85wqfhxqlf0c5im9il8z03rd4n127k8y2jj9q4g"; }; buildInputs = [ pkgconfig ] diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 16bd1ee65d2..1bd027f5298 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -148,8 +148,7 @@ stdenv.mkDerivation rec { ''; crossAttrs = let - isMingw = stdenv.cross.config == "i686-pc-mingw32" || - stdenv.cross.config == "x86_64-w64-mingw32"; + isMingw = stdenv.cross.libc == "msvcrt"; in { # I've not tried any case other than i686-pc-mingw32. # -nomake tools: it fails linking some asian language symbols diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 20b24d10fe6..cd56287f6ca 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation { description = "A collection of Fortran77 subroutines to solve large scale eigenvalue problems"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.ttuegel ]; }; } diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index f6aa7c35f39..f874804c001 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "An advanced font engine"; maintainers = [ stdenv.lib.maintainers.raskin ]; - hydraPlatforms = stdenv.lib.platforms.linux; + hydraPlatforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix index 9a4ba00e1d3..ebd8699dc17 100644 --- a/pkgs/development/libraries/t1lib/default.nix +++ b/pkgs/development/libraries/t1lib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11, libXaw, libXpm}: +{stdenv, fetchurl, xlibsWrapper, libXaw, libXpm}: stdenv.mkDerivation { name = "t1lib-5.1.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0nbvjpnmcznib1nlgg8xckrmsw3haa154byds2h90y2g0nsjh4w2"; }; - buildInputs = [x11 libXaw libXpm]; + buildInputs = [xlibsWrapper libXaw libXpm]; buildFlags = "without_doc"; } diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index 516ebc5f273..78d2d520050 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -2,11 +2,11 @@ , gobjectIntrospection, valaSupport ? true, vala }: stdenv.mkDerivation rec { - name = "telepathy-glib-0.22.0"; + name = "telepathy-glib-0.22.1"; src = fetchurl { url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz"; - sha256 = "0mqrq2azw70rm50vy21acfnzn8mmh0w7dxh87mwr1lyk0jn1n232"; + sha256 = "0vf2drh7g55nxyd0mxyn9sf99m981dagnvv9yc3q9f4k8x092a78"; }; configureFlags = stdenv.lib.optional valaSupport "--enable-vala-bindings"; diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 5130abc9a96..97251e15c49 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation rec { name = "vigra-1.9.0"; src = fetchurl { - url = "${meta.homepage}/${name}-src.tar.gz"; + urls = [ + "${meta.homepage}/${name}-src.tar.gz" + "${meta.homepage}-old-versions/${name}-src.tar.gz" + ]; sha256 = "00fg64da6dj9k42d90dz6y7x91xw1xqppcla14im74m4afswrgcg"; }; @@ -17,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Novel computer vision C++ library with customizable algorithms and data structures"; - homepage = http://hci.iwr.uni-heidelberg.de/vigra/; + homepage = http://hci.iwr.uni-heidelberg.de/vigra; license = "MIT"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 067a1cdf2e2..d0234c29ed9 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -3,7 +3,7 @@ (http://pypi.python.org/pypi/setuptools/), which represents a large number of Python packages nowadays. */ -{ python, setuptools, wrapPython, lib, recursivePthLoader, distutils-cfg }: +{ python, setuptools, unzip, wrapPython, lib, recursivePthLoader, distutils-cfg }: { name @@ -38,6 +38,12 @@ , meta ? {} +# Execute before shell hook +, preShellHook ? "" + +# Execute after shell hook +, postShellHook ? "" + , ... } @ attrs: # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. @@ -46,7 +52,11 @@ python.stdenv.mkDerivation (attrs // { name = namePrefix + name; - buildInputs = [ python wrapPython setuptools (distutils-cfg.override { extraCfg = distutilsExtraCfg; }) ] ++ buildInputs ++ pythonPath; + buildInputs = [ + python wrapPython setuptools + (distutils-cfg.override { extraCfg = distutilsExtraCfg; }) + ] ++ buildInputs ++ pythonPath + ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip); propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ]; @@ -146,6 +156,16 @@ python.stdenv.mkDerivation (attrs // { done ''; + shellHook = attrs.shellHook or '' + mkdir -p /tmp/$name/lib/${python.libPrefix}/site-packages + ${preShellHook} + export PATH="/tmp/$name/bin:$PATH" + export PYTHONPATH="/tmp/$name/lib/${python.libPrefix}/site-packages:$PYTHONPATH" + python setup.py develop --prefix /tmp/$name + ${postShellHook} + return + ''; + meta = with lib.maintainers; { # default to python's platforms platforms = python.meta.platforms; diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index a7c839799b1..282aeca9ed1 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -5,7 +5,7 @@ wrapPythonPrograms() { wrapPythonProgramsIn() { local dir="$1" local pythonPath="$2" - local python="$(type -p python)" + local python="@executable@" local i declare -A pythonPathsSeen=() @@ -18,11 +18,11 @@ wrapPythonProgramsIn() { for i in $(find "$dir" -type f -perm +0100); do # Rewrite "#! .../env python" to "#! /nix/store/.../python". - if head -n1 "$i" | grep -q '#!.*/env.*python'; then - sed -i "$i" -e "1 s^.*/env[ ]*python^#! $python^" + if head -n1 "$i" | grep -q '#!.*/env.*\(python\|pypy\)'; then + sed -i "$i" -e "1 s^.*/env[ ]*\(python\|pypy\)^#! $python^" fi - if head -n1 "$i" | grep -q /python; then + if head -n1 "$i" | grep -q '/python\|/pypy'; then # dont wrap EGG-INFO scripts since they are called from python if echo "$i" | grep -v EGG-INFO/scripts; then echo "wrapping \`$i'..." diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 35630be2255..e33c815d23b 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { dst=$out/lib/${python.libPrefix}/site-packages mkdir -p $dst PYTHONPATH="$dst:$PYTHONPATH" - ${python}/bin/${python.executable} setup.py install --prefix=$out + ${python}/bin/${python.executable} setup.py install --prefix=$out --install-lib=$out/lib/${python.libPrefix}/site-packages wrapPythonPrograms ''; diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 5b2de20e33f..b3769245bbe 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -4,14 +4,14 @@ let name = "cppcheck"; - version = "1.63"; + version = "1.64"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2"; - sha256 = "0r10z44qydqxxxlxiggl2nzksd3gkb7bp784dfmpnnr1jd2zqjwj"; + sha256 = "0n2hrg99rsp77b3plpip315pyk0x4gh8gljs9z3iwcbcg14mliff"; }; configurePhase = "makeFlags=PREFIX=$out"; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 97b50d0019f..f8466e5aafd 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip, jdk, makeWrapper }: stdenv.mkDerivation rec { - name = "gradle-1.8"; + name = "gradle-1.11"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "00spxad9b5vddshp02cic0ds8icgb1clknl7494f467x2pxbnhm3"; + sha256 = "14a0qdzjiar97l9a0i3ds2y48p1lrqkj7skkkvhz0r29hbgkbqh7"; }; installPhase = '' @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeWrapper ${jdk}/bin/java $out/bin/gradle \ --set JAVA_HOME ${jdk} \ - --add-flags "-classpath $out/lib/gradle-launcher-1.8.jar org.gradle.launcher.GradleMain" + --add-flags "-classpath $out/lib/gradle-launcher-1.11.jar org.gradle.launcher.GradleMain" ''; phases = "unpackPhase installPhase"; diff --git a/pkgs/development/tools/build-managers/leiningen/builder.sh b/pkgs/development/tools/build-managers/leiningen/builder.sh index e1dd9d5a786..c28854ca089 100644 --- a/pkgs/development/tools/build-managers/leiningen/builder.sh +++ b/pkgs/development/tools/build-managers/leiningen/builder.sh @@ -20,4 +20,5 @@ patchShebangs $out wrapProgram $out_bin \ --prefix PATH ":" "${rlwrap}/bin:${coreutils}/bin:${findutils}/bin" \ - --set LEIN_GPG ${gnupg}/bin/gpg + --set LEIN_GPG ${gnupg}/bin/gpg \ + --set JAVA_CMD ${jdk}/bin/java diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 2c039b3fa0c..ff21e518936 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patches = ./lein_2.3.0.patch; - inherit rlwrap clojure gnupg findutils coreutils; + inherit rlwrap clojure gnupg findutils coreutils jdk; builder = ./builder.sh; diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix index 33e5339a5f0..6c128c25073 100644 --- a/pkgs/development/tools/haskell/HaRe/default.nix +++ b/pkgs/development/tools/haskell/HaRe/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "HaRe"; - version = "0.7.1.2"; - sha256 = "1bplcjh0rx6m8ja8vpb18cfky349gmi27rlpsg0pw5nr3l4gcwyl"; + version = "0.7.1.4"; + sha256 = "000vdvm38a3d3jpjg3cgsfl11w8jzvl0haqz78fy3zblqlndxy1m"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -24,7 +24,7 @@ cabal.mkDerivation (self: { ]; jailbreak = true; meta = { - homepage = "http://www.cs.kent.ac.uk/projects/refactor-fp"; + homepage = "https://github.com/RefactoringTools/HaRe/wiki"; description = "the Haskell Refactorer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix index 53e2c5a7419..b8cf2466b10 100644 --- a/pkgs/development/tools/haskell/keter/default.nix +++ b/pkgs/development/tools/haskell/keter/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "keter"; - version = "1.1.0.1"; - sha256 = "04hvwfs1dskaxl1fw29lf52389hy1yr3hwd05bl294zgfh995i0s"; + version = "1.2.0"; + sha256 = "06iz01ci1mcxjqs7dknxgjlkl783sdf680b54schxxirg268cxh3"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/misc/binutils-cross/builder.sh b/pkgs/development/tools/misc/binutils-cross/builder.sh deleted file mode 100644 index 29d3b3779b6..00000000000 --- a/pkgs/development/tools/misc/binutils-cross/builder.sh +++ /dev/null @@ -1,26 +0,0 @@ -source $stdenv/setup - -if test $cross = "arm-linux" ; then - configureFlags="--target=arm-linux" -elif test $cross = "mips-linux" ; then - configureFlags="--target=mips-linux" -elif test $cross = "mipsel-linux" ; then - configureFlags="--target=mipsel-linux" -elif test $cross = "sparc-linux" ; then - configureFlags="--target=sparc-linux" -elif test $cross = "powerpc-linux" ; then - configureFlags="--target=powerpc-linux" -elif test $cross = "ppc-linux" ; then - configureFlags="--target=powerpc-linux" -fi - -patchConfigure() { - # Clear the default library search path. - if test "$noSysDirs" = "1"; then - echo 'NATIVE_LIB_DIRS=' >> ld/configure.tgt - fi -} - -preConfigure=patchConfigure - -genericBuild diff --git a/pkgs/development/tools/misc/binutils-cross/default.nix b/pkgs/development/tools/misc/binutils-cross/default.nix deleted file mode 100644 index 7d77baced37..00000000000 --- a/pkgs/development/tools/misc/binutils-cross/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, noSysDirs, cross}: - -stdenv.mkDerivation { - name = "binutils-2.16.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://ftp.nluug.nl/gnu/binutils/binutils-2.16.1.tar.bz2; - md5 = "6a9d529efb285071dad10e1f3d2b2967"; - }; - inherit noSysDirs; - #configureFlags = if cross=="arm-linux" then "--target=arm-linux" else if cross=="mips-linux" then "--target=mips-linux" else if cross=="sparc-linux" then "--target=sparc-linux"; - inherit cross; -} diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix index 3978d96400c..5d7da48cced 100644 --- a/pkgs/development/tools/misc/cl-launch/default.nix +++ b/pkgs/development/tools/misc/cl-launch/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="cl-launch"; - version="3.22.1"; + version="4.0.2.2"; name="${baseName}-${version}"; - hash="08lb8nm4dvkbgraqclw5xd7j6xskw9hgjpg9ql087gib5a90k09i"; - url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-3.22.1.tar.gz"; - sha256="08lb8nm4dvkbgraqclw5xd7j6xskw9hgjpg9ql087gib5a90k09i"; + hash="1a7nwm1gkvpypfbhl29gj4gba50r5b069g3c87cfvrk2n4plm65b"; + url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.0.2.2.tar.gz"; + sha256="1a7nwm1gkvpypfbhl29gj4gba50r5b069g3c87cfvrk2n4plm65b"; }; buildInputs = [ ]; diff --git a/pkgs/development/tools/misc/cl-launch/default.upstream b/pkgs/development/tools/misc/cl-launch/default.upstream index 1ff5daca02c..ff7ee9446d2 100644 --- a/pkgs/development/tools/misc/cl-launch/default.upstream +++ b/pkgs/development/tools/misc/cl-launch/default.upstream @@ -1,2 +1,2 @@ url http://common-lisp.net/project/xcvb/cl-launch/ -version_link '.-[0-9].*[0-9][.]tar[.].*' +version_link '.-[0-9].*[0-9][.]tar[.][a-z0-9]*$' diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix index 2f86e8ad012..8d03d8ee4cb 100644 --- a/pkgs/development/tools/misc/cpphs/default.nix +++ b/pkgs/development/tools/misc/cpphs/default.nix @@ -1,11 +1,12 @@ -{ cabal }: +{ cabal, polyparse }: cabal.mkDerivation (self: { pname = "cpphs"; - version = "1.18.2"; - sha256 = "0b8hkb2sfacmpi3rwr62myn4kfpwbfdlv9k0vnhk3wvl1v4wf29l"; + version = "1.18.3"; + sha256 = "0m2083ynjfxad4ykvpm6c7q1clrm7nsvbwv10abhyzqkpazyzzxy"; isLibrary = true; isExecutable = true; + buildDepends = [ polyparse ]; meta = { homepage = "http://projects.haskell.org/cpphs/"; description = "A liberalised re-implementation of cpp, the C pre-processor"; diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix new file mode 100644 index 00000000000..93dceb60f8d --- /dev/null +++ b/pkgs/development/tools/misc/dfu-programmer/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, libusb1 }: +let + version = "0.6.2"; +in +stdenv.mkDerivation rec { + name="dfu-programmer-${version}"; + + buildInputs = [ libusb1 ]; + + src = fetchurl { + url = "mirror://sourceforge/dfu-programmer/${name}.tar.gz"; + sha256 = "0rdg4h5alpa3py3v3xgvn2vcgmnbj077am90jqj83nad89m9c801"; + }; + + preConfigure = '' + substituteInPlace configure \ + --replace "/usr/include/libusb-1.0" "${libusb1}/include/libusb-1.0" + ''; + + meta = with stdenv.lib; { + license = licenses.gpl2; + description = "A Device Firmware Update based USB programmer for Atmel chips with a USB bootloader."; + homepage = http://dfu-programmer.sourceforge.net/; + maintainers = [ maintainers.the-kenny ]; + }; +} diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 356b004aa4e..953035342fd 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="luarocks"; - version="2.1.1"; + version="2.1.2"; name="${baseName}-${version}"; - hash="1b0qscmzdn80kxnn31v5q0rpafkwq1fr0766dzyh7dc2r6ws2nwr"; - url="http://luarocks.org/releases/luarocks-2.1.1.tar.gz"; - sha256="1b0qscmzdn80kxnn31v5q0rpafkwq1fr0766dzyh7dc2r6ws2nwr"; + hash="1wwz71ymzjcyw8pz36yiw2x87c6v8nx5vdcd7zibm1n815v5qqk2"; + url="http://luarocks.org/releases/luarocks-2.1.2.tar.gz"; + sha256="1wwz71ymzjcyw8pz36yiw2x87c6v8nx5vdcd7zibm1n815v5qqk2"; }; buildInputs = [ lua curl diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index c625f147400..36a57e8fe96 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { buildInputs = [ libftdi libusb1 ]; + postInstall = '' + mkdir -p "$out/etc/udev/rules.d" + ln -s "$out/share/openocd/contrib/openocd.udev" "$out/etc/udev/rules.d/99-openocd.rules" + ''; + meta = { homepage = http://openocd.sourceforge.net/; description = "OpenOCD, an on-chip debugger"; diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index 8fcf254e8ca..2fa7194cf07 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -3,6 +3,8 @@ # Suggested udev rules to be able to access the Logic device without being root: # SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="0925", ATTR{idProduct}=="3881", MODE="0666" # SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="21a9", ATTR{idProduct}=="1001", MODE="0666" +# +# In NixOS, simply add this package to services.udev.packages. { stdenv, fetchurl, unzip, glib, libSM, libICE, gtk, libXext, libXft , fontconfig, libXrender, libXfixes, libX11, libXi, libXrandr, libXcursor @@ -79,6 +81,10 @@ stdenv.mkDerivation rec { # Copy the generated .desktop file mkdir -p "$out/share/applications" cp "$desktopItem"/share/applications/* "$out/share/applications/" + + # Install provided udev rules + mkdir -p "$out/etc/udev/rules.d" + cp Drivers/99-SaleaeLogic.rules "$out/etc/udev/rules.d/" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/swig/2.x.nix b/pkgs/development/tools/misc/swig/2.x.nix index 2066ead51a1..b51ce0f2d5a 100644 --- a/pkgs/development/tools/misc/swig/2.x.nix +++ b/pkgs/development/tools/misc/swig/2.x.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { # Licensing is a mess: http://www.swig.org/Release/LICENSE . license = "BSD-style"; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ urkud ]; }; } diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index 1f37fd87f8a..d489feba4dc 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { # Licensing is a mess: http://www.swig.org/Release/LICENSE . license = "BSD-style"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 80fc093822f..d0870e82b72 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -4,18 +4,18 @@ assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; stdenv.mkDerivation rec { - name = "vagrant-1.4.0"; + name = "vagrant-1.4.3"; src = if stdenv.system == "x86_64-linux" then fetchurl { - url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.0_x86_64.deb; - sha256 = "0hggajqdwk1qlkhf5sgdlmyxhan33q3pdgks9n5i2cw6f2ckw3rh"; + url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.3_x86_64.deb; + sha256 = "dbd06de0f3560e2d046448d627bca0cbb0ee34b036ef605aa87ed20e6ad2684b"; } else fetchurl { - url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.0_i686.deb; - sha256 = "03jcmsdl4na5n08phyvx65dnfv1gq9vgn07kcyqc2f8nq7vmcmkm"; + url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.3_i686.deb; + sha256 = "66e613fc1c9e31ecaf8e5f1d07d2ae4fca3d4fc2e43593543962664258d9af9b"; }; meta = with stdenv.lib; { diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index c9fd9706c0e..93277eb15a2 100644 --- a/pkgs/games/LambdaHack/default.nix +++ b/pkgs/games/LambdaHack/default.nix @@ -1,18 +1,19 @@ -{ cabal, assertFailure, binary, ConfigFile, deepseq, enummapsetTh -, filepath, gtk, hashable, keys, miniutter, mtl, prettyShow, random -, stm, text, transformers, unorderedContainers, zlib +{ cabal, assertFailure, binary, deepseq, enummapsetTh, filepath +, gtk, hashable, hsini, keys, miniutter, mtl, prettyShow, random +, stm, text, transformers, unorderedContainers, vector +, vectorBinaryInstances, zlib }: cabal.mkDerivation (self: { pname = "LambdaHack"; - version = "0.2.10.6"; - sha256 = "19ak0ygw38b51wkm4p10xgdk3h9mh5vvb8c60qhs7cmgzjcph38n"; + version = "0.2.12"; + sha256 = "0ics1z376qyagkzg58mqqw7cbkjpkik57l8570qmk589nkhck86n"; isLibrary = true; isExecutable = true; buildDepends = [ - assertFailure binary ConfigFile deepseq enummapsetTh filepath gtk - hashable keys miniutter mtl prettyShow random stm text transformers - unorderedContainers zlib + assertFailure binary deepseq enummapsetTh filepath gtk hashable + hsini keys miniutter mtl prettyShow random stm text transformers + unorderedContainers vector vectorBinaryInstances zlib ]; jailbreak = true; meta = { diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix index 45411263876..97414c07bda 100644 --- a/pkgs/games/xboard/default.nix +++ b/pkgs/games/xboard/default.nix @@ -5,11 +5,11 @@ let s = # Generated upstream information rec { baseName="xboard"; - version="4.7.2"; + version="4.7.3"; name="${baseName}-${version}"; - hash="1vm95fjp3pkvvjvamfs7zqw4l4b4v7v52h2npvf9j5059fckcrwv"; - url="http://ftp.gnu.org/gnu/xboard/xboard-4.7.2.tar.gz"; - sha256="1vm95fjp3pkvvjvamfs7zqw4l4b4v7v52h2npvf9j5059fckcrwv"; + hash="1amy9krr0qkvcc7gnp3i9x9ma91fc5cq8hy3gdc7rmfsaczv1l3z"; + url="http://ftp.gnu.org/gnu/xboard/xboard-4.7.3.tar.gz"; + sha256="1amy9krr0qkvcc7gnp3i9x9ma91fc5cq8hy3gdc7rmfsaczv1l3z"; }; buildInputs = [ libX11 xproto libXt libXaw libSM libICE libXmu diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index b6eb1038f93..bf55f93db5b 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -7,12 +7,12 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; let - version = "1.7.12"; + version = "1.7.14"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "14mkh32lxjmbacz1f5pl5kr31n5dx0rfdqw5v88brhmsz1xzzk9d"; + sha256 = "029y4vsjz2jxy31g5nylpl7wm5qhw37dsbx4f0za6swk51z97w9d"; }; gecko = fetchurl { diff --git a/pkgs/misc/seafile-shared/0003-Add-autoconfiguration-for-libjansson.patch b/pkgs/misc/seafile-shared/0003-Add-autoconfiguration-for-libjansson.patch new file mode 100644 index 00000000000..7966d1e683b --- /dev/null +++ b/pkgs/misc/seafile-shared/0003-Add-autoconfiguration-for-libjansson.patch @@ -0,0 +1,121 @@ +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 new file mode 100644 index 00000000000..53092e3a8b7 --- /dev/null +++ b/pkgs/misc/seafile-shared/default.nix @@ -0,0 +1,43 @@ +{stdenv, fetchurl, which, automake, autoconf, pkgconfig, libtool, vala, python, intltool, fuse, ccnet}: + +stdenv.mkDerivation rec +{ + version = "2.1.1"; + name = "seafile-shared-${version}"; + + src = fetchurl + { + url = "https://github.com/haiwen/seafile/archive/v${version}.tar.gz"; + sha256 = "f07b09ab1eb1cb33f92cee74e499d0350941624396910a4c1a7d79abb45acaa6"; + }; + + patches = [ ./0003-Add-autoconfiguration-for-libjansson.patch ]; + + buildInputs = [ which automake autoconf pkgconfig libtool vala python intltool fuse ]; + propagatedBuildInputs = [ ccnet ]; + + preConfigure = '' + sed -ie 's|/bin/bash|/bin/sh|g' ./autogen.sh + ./autogen.sh + ''; + + configureFlags = "--disable-server --disable-console"; + + buildPhase = "make -j1"; + + postInstall = '' + # Remove seafile binary + rm -rf "$out/bin/seafile" + # Remove cli client binary + rm -rf "$out/bin/seaf-cli" + ''; + + meta = + { + homepage = "https://github.com/haiwen/seafile"; + description = "Shared components of Seafile: seafile-daemon, libseafile, libseafile python bindings, manuals, and icons"; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.calrama ]; + }; +} diff --git a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix index 9bee6c81a8a..88807ab6dea 100644 --- a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix +++ b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix @@ -2,12 +2,12 @@ cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }: stdenv.mkDerivation rec { - version = "1.4.3"; + version = "1.4.4"; name = "oxygen-gtk2-${version}"; src = fetchurl { url = "mirror://kde/stable/oxygen-gtk2/${version}/src/${name}.tar.bz2"; - sha256 = "1611zkblfy8ahadyz4a1hc0vjfwkh8mdbnwjqm02i30vnhv3iy1j"; + sha256 = "1w3300v7kclpaccvd0wsajgay4mgg2fbbi1nd0zak0p5nn40sqf8"; }; buildInputs = [ cmake dbus_glib glib gtk gdk_pixbuf diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix index 017a47349a9..ec5feb27c85 100644 --- a/pkgs/misc/themes/qtcurve/default.nix +++ b/pkgs/misc/themes/qtcurve/default.nix @@ -28,10 +28,11 @@ stdenv.mkDerivation { -DQTC_QT4_ENABLE_KWIN=ON ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/QtCurve/qtcurve; description = "Widget styles for Qt4/KDE4 and gtk2"; - platforms = stdenv.lib.platforms.linux; - license = "LGPLv2.1+"; + platforms = platforms.linux; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.ttuegel ]; }; } diff --git a/pkgs/os-specific/linux/can-utils/default.nix b/pkgs/os-specific/linux/can-utils/default.nix new file mode 100644 index 00000000000..6a3fbd33d68 --- /dev/null +++ b/pkgs/os-specific/linux/can-utils/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation rec { + name = "can-utils-${version}"; + # There are no releases (source archives or git tags), so use the date of the + # latest commit in git master as version number. + version = "20140227"; + + src = fetchgit { + url = "https://git.gitorious.org/linux-can/can-utils.git"; + rev = "67a2bdcd336e6becfa5784742e18c88dbeddc973"; + sha256 = "0pnnjl141wf3kbf256m6qz9mxz0144z36qqb43skialzcnlhga38"; + }; + + preConfigure = ''makeFlagsArray+=(PREFIX="$out")''; + + meta = with stdenv.lib; { + description = "CAN userspace utilities and tools (for use with Linux SocketCAN)"; + homepage = "https://gitorious.org/linux-can/can-utils"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/os-specific/linux/kernel/linux-3.13.nix b/pkgs/os-specific/linux/kernel/linux-3.13.nix index 05a4f55d020..361106bf065 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.13.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.13.5"; + version = "3.13.6"; extraMeta.branch = "3.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "03yggix59k2i2lf0m3kkqslcvvfcg19xx96ywbrfkfbb7vplw67w"; + sha256 = "10j1rc63y0rcrnc2rx8jyczqg42gcbijd83qqd795qrrp5wnf7qw"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index e63ff168a61..e0d880a626a 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -81,22 +81,22 @@ rec { grsecurity_3_0_3_2_55 = { name = "grsecurity-3.0-3.2.55"; patch = fetchurl { - url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403022154.patch; - sha256 = "0pqp8mfj4zbgb94c7g6ykh0amlwlilxjiqsyc6smmwwbg6klgvkr"; + url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403072107.patch; + sha256 = "128dbspwg8hvshz6rjykcl42kam5g0db50rbyaagskh9jm9a0zyz"; }; features.grsecurity = true; # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.55 features.apparmor = true; }; - grsecurity_3_0_3_13_5 = - { name = "grsecurity-3.0-3.13.5"; + grsecurity_3_0_3_13_6 = + { name = "grsecurity-3.0-3.13.6"; patch = fetchurl { - url = http://grsecurity.net/test/grsecurity-3.0-3.13.5-201403031445.patch; - sha256 = "0b22jbm9swghhj7a9c07z5yprk88bgp0iv3c8xmfqqyy0yighq1l"; + url = http://grsecurity.net/test/grsecurity-3.0-3.13.6-201403072241.patch; + sha256 = "006w89pvb9jasb7413nnphz5mrdmq10mkpmjcglbhs5ps915jczy"; }; features.grsecurity = true; - # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.5 + # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.6 features.apparmor = true; }; diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/os-specific/linux/ldm/default.nix index df98b5260c6..202831309f0 100644 --- a/pkgs/os-specific/linux/ldm/default.nix +++ b/pkgs/os-specific/linux/ldm/default.nix @@ -3,17 +3,18 @@ assert mountPath != ""; let - name = "ldm-0.4.2"; + version = "v0.4.2"; + git = https://github.com/LemonBoy/ldm.git; in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + name = "ldm-${version}"; # There is a stable release, but we'll use the lvm branch, which # contains important fixes for LVM setups. src = fetchgit { - url = "https://github.com/LemonBoy/ldm.git"; - rev = "26633ce07b"; - sha256 = "bb733d3b9b3bd5843b9cf1507a04a063c5aa45b398480411709fc727ae10b8b1"; + url = meta.repositories.git; + rev = "refs/tags/${version}"; + sha256 = "1fdm3l00csjyvz40py6wlsh8s441rbp4az3sc2i14ag7srh2yim8"; }; buildInputs = [ udev utillinux ]; @@ -34,5 +35,6 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.the-kenny ]; + repositories.git = git; }; } diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index e6895bb517f..d59bb142f9f 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "lxc-1.0.0"; + name = "lxc-1.0.1"; src = fetchurl { url = "http://github.com/lxc/lxc/archive/${name}.tar.gz"; - sha256 = "1dv78xd7mdb50x8dgjvnv2v6sdj2xv2vvar7y402ll2wh8ixmi91"; + sha256 = "14fjzicv1s3niwag301i7m9vb9jlh3hnd9ks9jjkzp8xyxgb0rrv"; }; buildInputs = [ libcap apparmor perl docbook2x gnutls autoreconfHook pkgconfig ]; diff --git a/pkgs/os-specific/linux/nvidiabl/default.nix b/pkgs/os-specific/linux/nvidiabl/default.nix new file mode 100644 index 00000000000..6260134bf11 --- /dev/null +++ b/pkgs/os-specific/linux/nvidiabl/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, kernel }: + +stdenv.mkDerivation { + name = "nvidiabl-0.85-${kernel.version}"; + + src = fetchurl { + url = "https://github.com/guillaumezin/nvidiabl/archive/v0.85.tar.gz"; + sha256 = "1c7ar39wc8jpqh67sw03lwnyp0m9l6dad469ybqrgcywdiwxspwj"; + }; + + preConfigure = '' + sed -i 's|/sbin/depmod|#/sbin/depmod|' Makefile + ''; + + makeFlags = [ + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "DESTDIR=$(out)" + ]; + + meta = { + description = "Linux driver for setting the backlight brightness on laptops using NVIDIA GPU"; + homepage = https://github.com/guillaumezin/nvidiabl; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index ec2c704cfb5..5ee25ea976a 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -5,13 +5,13 @@ assert readlineSupport -> readline != null; stdenv.mkDerivation rec { - version = "2.0"; + version = "2.1"; name = "wpa_supplicant-${version}"; src = fetchurl { url = "http://hostap.epitest.fi/releases/${name}.tar.gz"; - sha256 = "02cy6wrs4nzm7wbq9mc1vby8lnj58k4sb10h718ks8mmzc4mc49c"; + sha256 = "0xxjw7lslvql1ykfbwmbhdrnjsjljf59fbwf837418s97dz2wqwi"; }; extraConfig = @@ -38,18 +38,24 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - patches = [ ./libnl.patch ]; + patches = [ ./libnl.patch + # remove this patch after wpa_supplicant 2.1 + (fetchurl { + url ="http://projects.archlinux.org/svntogit/packages.git/plain/trunk/0001-Revert-OpenSSL-Do-not-accept-SSL-Client-certificate-.patch?h=packages/wpa_supplicant"; + sha256 = "0x1wl2nbl7v9kv80qvysfjhhg5a7lmgygv1y723flps6y8ngm19w"; + }) + ]; postInstall = '' mkdir -p $out/share/man/man5 $out/share/man/man8 - cp -v doc/docbook/*.5 $out/share/man/man5/ - cp -v doc/docbook/*.8 $out/share/man/man8/ + cp -v "doc/docbook/"*.5 $out/share/man/man5/ + cp -v "doc/docbook/"*.8 $out/share/man/man8/ mkdir -p $out/etc/dbus-1/system.d $out/share/dbus-1/system-services $out/etc/systemd/system - cp -v dbus/*service $out/share/dbus-1/system-services - sed -e "s@/sbin/wpa_supplicant@$out&@" -i $out/share/dbus-1/system-services/* + cp -v "dbus/"*service $out/share/dbus-1/system-services + sed -e "s@/sbin/wpa_supplicant@$out&@" -i "$out/share/dbus-1/system-services/"* cp -v dbus/dbus-wpa_supplicant.conf $out/etc/dbus-1/system.d - cp -v systemd/*.service $out/etc/systemd/system - ''; # */ + cp -v "systemd/"*.service $out/etc/systemd/system + ''; meta = { homepage = http://hostap.epitest.fi/wpa_supplicant/; diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index c358565c455..bf15b208e1a 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -1,30 +1,30 @@ -{stdenv, fetchurl, binutilsCross ? null, gccCross ? null, onlyHeaders ? false}: +{ stdenv, fetchurl, binutilsCross ? null, gccCross ? null +, onlyHeaders ? false +, onlyPthreads ? false +}: let - name = "mingw-w64-2.0.3"; + name = "mingw-w64-3.1.0"; in stdenv.mkDerivation (rec { inherit name; src = fetchurl { - url = "mirror://sourceforge/mingw-w64/mingw-w64-v2.0.3.tar.gz"; - sha256 = "043jk6z90f9pxs9kfn6ckh2vlnbgcv6yfbp5ybahrj3z58dcijp5"; + url = "mirror://sourceforge/mingw-w64/mingw-w64-v3.1.0.tar.bz2"; + sha256 = "1lhpw381gc59w8b1r9zzdwa9cdi2wx6qx7s6rvajapmbw7ksgrzc"; }; - - # I don't know what's that $host directory about, I put the - # files inside include as usual. - postInstall = '' - rmdir $out/include - mv $out/x86_64-w64-mingw32/* $out - rm -R $out/x86_64-w64-mingw32 - ''; } // (if onlyHeaders then { name = name + "-headers"; - preConfingure = '' + preConfigure = '' cd mingw-w64-headers ''; - configureFlags = "--without-crt --host=x86_64-w64-mingw32"; + configureFlags = "--without-crt"; +} else if onlyPthreads then { + name = name + "-pthreads"; + preConfigure = '' + cd mingw-w64-libraries/winpthreads + ''; } else { buildInputs = [ gccCross binutilsCross ]; diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index 4504d49edbb..f2bc0765636 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -5,10 +5,10 @@ , moreheaders ? false}: let - version = "1.4.5"; + version = "1.4.6"; mainSrc = fetchurl { url = "http://nginx.org/download/nginx-${version}.tar.gz"; - sha256 = "0zh7w1bz8rcxrs5bwp39m91nzm454mxlf3m5krkv1wm8ar1h5sdd"; + sha256 = "1ihjb3dqw4icc5pvgaqbp740cyr4m8zxjfvj3v3bkd88swamp2vs"; }; rtmp-ext = fetchgit { diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 3d7a32a00c9..522d0b60f00 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "opensmtpd-${version}"; - version = "201402281146p1"; + version = "5.4.2p1"; buildInputs = [ libevent zlib openssl db bison pam ]; src = fetchurl { url = "http://www.opensmtpd.org/archives/${name}.tar.gz"; - sha256 = "0q287lx6pcz1bz6b334fb977dpbcg4rpyli3zrxj27wql4x0dg6b"; + sha256 = "18nrzfjhv9znb5dbhc5k3fi31a3vr1r8j36q3fzghkh47n6z9yjg"; }; configureFlags = [ @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { "--with-sock-dir=/run" "--with-privsep-user=smtpd" "--with-queue-user=smtpq" + "--with-ca-file=/etc/ssl/certs/ca-bundle.crt" ]; meta = { diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index c39045cd9af..7a2f3538fb8 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -27,10 +27,10 @@ let mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; in stdenv.mkDerivation rec { - name = "mpd-0.18.8"; + name = "mpd-0.18.9"; src = fetchurl { url = "http://www.musicpd.org/download/mpd/stable/${name}.tar.gz"; - sha256 = "1ryqh0xf76xv4mpwy1gjwy275ar4wmbzifa9ccjim9r7lk2hgp5v"; + sha256 = "0mgfyrhjlalwngx9j3xxfpfwygh9a31k1ni1isi898bb2x8zsl08"; }; buildInputs = [ pkgconfig glib ] diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index f91f78c4d57..58d7159034a 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { LC_ALL = "C"; + patches = [ ./less-is-more.patch ]; + passthru = { inherit readline; }; meta = { diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index c50c6a4aba2..033328cbcfe 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { LC_ALL = "C"; + patches = [ ./less-is-more.patch ]; + passthru = { inherit readline; psqlSchema = "9.0"; diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 9bc971b9dfd..7e876322808 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { LC_ALL = "C"; + patches = [ ./less-is-more.patch ]; + postInstall = '' mkdir -p $out/share/man diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index 3d1e0d6ec33..da0516a9618 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "world" ]; - patches = [ ./disable-resolve_symlinks.patch ]; + patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ]; installTargets = [ "install-world" ]; diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix index 2230c370335..7f6e2d25d18 100644 --- a/pkgs/servers/sql/postgresql/9.3.x.nix +++ b/pkgs/servers/sql/postgresql/9.3.x.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "world" ]; - patches = [ ./disable-resolve_symlinks.patch ]; + patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ]; installTargets = [ "install-world" ]; diff --git a/pkgs/servers/sql/postgresql/less-is-more.patch b/pkgs/servers/sql/postgresql/less-is-more.patch new file mode 100644 index 00000000000..d640d24bdaa --- /dev/null +++ b/pkgs/servers/sql/postgresql/less-is-more.patch @@ -0,0 +1,12 @@ +diff -Naur postgresql-9.2.7-orig/src/bin/psql/print.h postgresql-9.2.7/src/bin/psql/print.h +--- postgresql-9.2.7-orig/src/bin/psql/print.h 2014-02-17 14:38:15.000000000 -0500 ++++ postgresql-9.2.7/src/bin/psql/print.h 2014-03-04 14:42:28.874014415 -0500 +@@ -178,7 +178,7 @@ + extern const printTextFormat *get_line_style(const printTableOpt *opt); + + #ifndef __CYGWIN__ +-#define DEFAULT_PAGER "more" ++#define DEFAULT_PAGER "less" + #else + #define DEFAULT_PAGER "less" + #endif diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index ccfea341771..c77517fa177 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="zpaq"; - version="643"; + version="649"; name="${baseName}-${version}"; - hash="1sgrhvvzrjb9gm9lffs1ai602v8p1mav0kc2sa7wlcx7kj1d3hxr"; - url="http://mattmahoney.net/dc/zpaq643.zip"; - sha256="1sgrhvvzrjb9gm9lffs1ai602v8p1mav0kc2sa7wlcx7kj1d3hxr"; + hash="0rspkd8vdp06hyjlrhgqjrv37bwvnzvqw0smlcy5fjbny502s5nn"; + url="http://mattmahoney.net/dc/zpaq649.zip"; + sha256="0rspkd8vdp06hyjlrhgqjrv37bwvnzvqw0smlcy5fjbny502s5nn"; }; buildInputs = [ unzip diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index ec4c00880d4..8a9db4e5701 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, librsync, ncftp, gnupg, boto, makeWrapper }: +{ stdenv, fetchurl, python, librsync, ncftp, gnupg, boto, makeWrapper, lockfile }: let version = "0.6.23"; @@ -14,10 +14,10 @@ stdenv.mkDerivation { installPhase = '' python setup.py install --prefix=$out wrapProgram $out/bin/duplicity \ - --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${boto})" \ + --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" \ --prefix PATH : "${gnupg}/bin:${ncftp}/bin" wrapProgram $out/bin/rdiffdir \ - --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${boto})" \ + --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" \ ''; buildInputs = [ python librsync makeWrapper ]; diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/tools/bluetooth/obex-data-server/default.nix index 790b57f4a76..53e854c34eb 100644 --- a/pkgs/tools/bluetooth/obex-data-server/default.nix +++ b/pkgs/tools/bluetooth/obex-data-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus_glib, bluez, openobex }: +{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus_glib, bluez, openobex, dbus_libs }: stdenv.mkDerivation rec { name = "obex-data-server-0.4.6"; @@ -8,7 +8,14 @@ stdenv.mkDerivation rec { sha256 = "0kq940wqs9j8qjnl58d6l3zhx0jaszci356xprx23l6nvdfld6dk"; }; - buildInputs = [ pkgconfig libusb glib dbus_glib bluez openobex ]; + buildInputs = [ pkgconfig libusb glib dbus_glib bluez openobex dbus_libs ]; + + patches = [ ./obex-data-server-0.4.6-build-fixes-1.patch ]; + + preConfigure = '' + addToSearchPath PKG_CONFIG_PATH ${openobex}/lib64/pkgconfig + export PKG_CONFIG_PATH="${dbus_libs}/lib/pkgconfig:$PKG_CONFIG_PATH" + ''; meta = { homepage = http://wiki.muiline.com/obex-data-server; diff --git a/pkgs/tools/bluetooth/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch b/pkgs/tools/bluetooth/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch new file mode 100644 index 00000000000..b5fde8db589 --- /dev/null +++ b/pkgs/tools/bluetooth/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch @@ -0,0 +1,56 @@ +Submitted By: Armin K. <krejzi at email dot com> +Date: 2012-07-06 +Initial Package Version: 0.4.6 +Upstream Status: Unknown +Origin: Self +Description: Some build fixes. + +--- obex-data-server.orig/src/ods-obex.c 2011-02-10 10:14:42.000000000 +0100 ++++ obex-data-server/src/ods-obex.c 2012-07-06 20:10:09.208712553 +0200 +@@ -412,7 +412,7 @@ + goto err; + } + +- interfaces_num = OBEX_FindInterfaces(obex_context->obex_handle, &obex_intf); ++ interfaces_num = OBEX_EnumerateInterfaces(obex_context->obex_handle); + if (intf_num >= interfaces_num) { + g_set_error (error, ODS_ERROR, ODS_ERROR_FAILED, "Invalid interface number"); + goto err; +@@ -1928,7 +1928,7 @@ + gchar *uname; + gsize uname_len; + +- if (action != OBEX_ACTION_SETPERM) ++ if (action != 0x03) + g_assert (src && dst); + + object = OBEX_ObjectNew (obex_context->obex_handle, OBEX_CMD_ACTION); +@@ -1974,7 +1974,7 @@ + OBEX_HDR_ACTION_ID, hv, 1, 0); + + /* permissions header */ +- if (action == OBEX_ACTION_SETPERM) { ++ if (action == 0x03) { + hv.bq4 = perms; + ret = OBEX_ObjectAddHeader (obex_context->obex_handle, object, + OBEX_HDR_PERMISSIONS, hv, 4, 0); +--- obex-data-server.orig/src/ods-session.c 2011-02-10 09:57:31.000000000 +0100 ++++ obex-data-server/src/ods-session.c 2012-07-06 20:10:09.208712553 +0200 +@@ -1761,7 +1761,7 @@ + DBusGMethodInvocation *context) + { + return ods_session_remote_action (session, remote_source, +- remote_destination, OBEX_ACTION_COPY, ++ remote_destination, 0x00, + context); + } + +@@ -1772,7 +1772,7 @@ + DBusGMethodInvocation *context) + { + return ods_session_remote_action (session, remote_source, +- remote_destination, OBEX_ACTION_MOVE, ++ remote_destination, 0x01, + context); + } + diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/tools/cd-dvd/vobsub2srt/default.nix new file mode 100644 index 00000000000..30ae07f9dbd --- /dev/null +++ b/pkgs/tools/cd-dvd/vobsub2srt/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchgit, cmake, libtiff, pkgconfig, tesseract }: + +let rev = "b70b6f584e8151f70f9d90df054af0911ea7475e"; + shortRev = builtins.substring 0 7 rev; +in +stdenv.mkDerivation { + name = "vobsub2srt-git-20140226-${shortRev}"; + + src = fetchgit { + inherit rev; + url = https://github.com/ruediger/VobSub2SRT.git; + sha256 = "15437eba07e674cec66bc54cfa42ffe8b05816975401c9950bf9016e3881cd6a"; + }; + + buildInputs = [ cmake libtiff pkgconfig ]; + propagatedBuildInputs = [ tesseract ]; + + meta = { + homepage = https://github.com/ruediger/VobSub2SRT; + description = "Converts VobSub subtitles into SRT subtitles"; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index a431cd30a21..55fca6ca3cb 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation { crossAttrs = { patchPhase = '' + sed -i -e '/<sys\\stat\.h>/s|\\|/|' bzip2.c sed -i -e 's/CC=gcc/CC=${stdenv.cross.config}-gcc/' \ -e 's/AR=ar/AR=${stdenv.cross.config}-ar/' \ -e 's/RANLIB=ranlib/RANLIB=${stdenv.cross.config}-ranlib/' \ diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index b9f10105918..6bd6bfe368c 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dosfstools-3.0.24"; + name = "dosfstools-3.0.26"; src = fetchurl { url = "http://daniel-baumann.ch/files/software/dosfstools/${name}.tar.xz"; - sha256 = "1hblhb98wm9gm60y32psdqm5jprs4a6dqzrapzgb6bw7r3kvf88y"; + sha256 = "0x9yi6s1419k678pr9h3a5bjccbrcxxpzmjwgl262ffrikz45126"; }; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 9d4168b2d7d..2cb599f6a64 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="glusterfs"; - version="3.4.1"; + version="3.4.2"; name="${baseName}-${version}"; - hash="0fdp3bifd7n20xlmsmj374pbp11k7np71f7ibzycsvmqqviv9wdm"; - url="http://download.gluster.org/pub/gluster/glusterfs/3.4/3.4.1/glusterfs-3.4.1.tar.gz"; - sha256="0fdp3bifd7n20xlmsmj374pbp11k7np71f7ibzycsvmqqviv9wdm"; + hash="1vzdihsy4da11jsa46n1n2xk6d40g7v0zrlqvs3pb9k07fql5kag"; + url="http://download.gluster.org/pub/gluster/glusterfs/3.4/3.4.2/glusterfs-3.4.2.tar.gz"; + sha256="1vzdihsy4da11jsa46n1n2xk6d40g7v0zrlqvs3pb9k07fql5kag"; }; buildInputs = [ fuse bison flex openssl python ncurses readline diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index 4befab17b6f..98cf3c533ae 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, fuse }: stdenv.mkDerivation rec { - name = "sshfs-fuse-2.4"; + name = "sshfs-fuse-2.5"; src = fetchurl { url = "mirror://sourceforge/fuse/${name}.tar.gz"; - sha256 = "1ladfxflg0pzd5br0p9n5790sf1975va7igr9z4r702n4a2vm4rw"; + sha256 = "0gp6qr33l2p0964j0kds0dfmvyyf5lpgsn11daf0n5fhwm9185z9"; }; buildInputs = [ pkgconfig glib fuse ]; diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix new file mode 100644 index 00000000000..219cb2139f5 --- /dev/null +++ b/pkgs/tools/misc/apt-offline/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, bash, buildPythonPackage }: + +buildPythonPackage rec { + version = "1.3"; + name = "apt-offline-${version}"; + + src = fetchurl { + #url = "https://alioth.debian.org/frs/download.php/file/3855/${name}.tar.gz"; + # The above URL has two problems: it requires one to be logged in, and it + # uses a CA that curl doesn't know about. Instead, we use this mirror: + url = "http://www.falsifian.org/a/cFi5/${name}.tar.gz"; + sha256 = "1sp7ai2abzhbg9y84700qziybphvpzl2nk3mz1d1asivzyjvxlxy"; + }; + + buildInputs = [ ]; + + doCheck = false; + + # Requires python-qt4 (feel free to get it working). + preFixup = ''rm "$out/bin/apt-offline-gui"''; + + meta = with stdenv.lib; { + description = "offline APT package manager"; + license = licenses.gpl3; + maintainers = [ maintainers.falsifian ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/kde-gtk-config/default.nix b/pkgs/tools/misc/kde-gtk-config/default.nix index e9f0af2815a..873d2adde7f 100644 --- a/pkgs/tools/misc/kde-gtk-config/default.nix +++ b/pkgs/tools/misc/kde-gtk-config/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { -DKDE4_LIBEXEC_INSTALL_DIR=lib/kde4/libexec ''; - meta = { + meta = with stdenv.lib; { homepage = https://projects.kde.org/projects/extragear/base/kde-gtk-config; description = "GTK configuration module for KDE System Settings"; longDescription = '' @@ -43,7 +43,8 @@ stdenv.mkDerivation { - Select GTK applications default fonts. - Easily browse and install new GTK2 and GTK3 themes. ''; - platforms = stdenv.lib.platforms.linux; - license = "GPLv3"; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = [ maintainers.ttuegel ]; }; } diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index ded669a6feb..5bf9e755ae9 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip }: let - version = "2014.02.28"; + version = "2014.03.07.1"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "1xizqk47f3wd1g1mqs87iand4v3pjxxdzh4z7s6525hlkb8z5813"; + sha256 = "1yhjb5gk6l3y5p5fw246pww5yq661sr02zs17pqyxxbs2gx9kr4p"; }; buildInputs = [ python ]; diff --git a/pkgs/tools/networking/badvpn/default.nix b/pkgs/tools/networking/badvpn/default.nix index d2e53d677e2..64f669a480e 100644 --- a/pkgs/tools/networking/badvpn/default.nix +++ b/pkgs/tools/networking/badvpn/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="badvpn"; - version="1.999.128"; + version="1.999.129"; name="${baseName}-${version}"; - hash="1z4v1jydv8zkkszsq7scc17rw5dqz9zlpcc40ldxsw34arfqvcnn"; - url="http://badvpn.googlecode.com/files/badvpn-1.999.128.tar.bz2"; - sha256="1z4v1jydv8zkkszsq7scc17rw5dqz9zlpcc40ldxsw34arfqvcnn"; + hash="078gax6yifkf9y9g01wn1p0dypvgiwcsdmzp1bhwwfi0fbpnzzgl"; + url="https://github.com/ambrop72/badvpn/archive/1.999.129.tar.gz"; + sha256="078gax6yifkf9y9g01wn1p0dypvgiwcsdmzp1bhwwfi0fbpnzzgl"; }; buildInputs = [ cmake openssl nss pkgconfig nspr diff --git a/pkgs/tools/networking/badvpn/default.upstream b/pkgs/tools/networking/badvpn/default.upstream index 1c746698fef..2a85ba7cb51 100644 --- a/pkgs/tools/networking/badvpn/default.upstream +++ b/pkgs/tools/networking/badvpn/default.upstream @@ -1,3 +1,3 @@ -url http://gc.codehum.com/p/badvpn/downloads/list -version_link '[.]tar[.][a-z0-9]+$' -process 'gc.codehum.com//' '' +url https://github.com/ambrop72/badvpn/releases +version_link '[0-9][.]tar[.][a-z0-9]+$' +version '.*/([0-9.]+)[.]tar[.].*' '\1' diff --git a/pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch b/pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch new file mode 100644 index 00000000000..83cdbad7bba --- /dev/null +++ b/pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch @@ -0,0 +1,72 @@ +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 new file mode 100644 index 00000000000..14b88ddafe8 --- /dev/null +++ b/pkgs/tools/networking/ccnet/default.nix @@ -0,0 +1,37 @@ +{stdenv, fetchurl, which, automake, autoconf, pkgconfig, libtool, vala, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}: + +stdenv.mkDerivation rec +{ + version = "1.4.0"; + seafileVersion = "2.1.1"; + name = "ccnet-${version}"; + + src = fetchurl + { + url = "https://github.com/haiwen/ccnet/archive/v${seafileVersion}.tar.gz"; + sha256 = "6882eb1a3066897e4f91fb60a3405b3f58b4b794334deaca73617003f77a7eb0"; + }; + + 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 ]; + + preConfigure = '' + sed -ie 's|/bin/bash|/bin/sh|g' ./autogen.sh + ./autogen.sh + ''; + + configureFlags = "--enable-server"; + + buildPhase = "make -j1"; + + meta = + { + homepage = "https://github.com/haiwen/ccnet"; + description = "A framework for writing networked applications in C."; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.calrama ]; + }; +} diff --git a/pkgs/tools/networking/ccnet/libccnet.pc.patch b/pkgs/tools/networking/ccnet/libccnet.pc.patch new file mode 100644 index 00000000000..0d9fea552bc --- /dev/null +++ b/pkgs/tools/networking/ccnet/libccnet.pc.patch @@ -0,0 +1,10 @@ +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/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 41eb1a8f77a..ac7055e20f2 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { - name = "chrony-1.29"; + name = "chrony-1.29.1"; src = fetchurl { url = "http://download.tuxfamily.org/chrony/${name}.tar.gz"; - sha256 = "16ykdb8pnqcr30pdsaa6rabvsin2n858fmkzd81anqq6p9rg11f6"; + sha256 = "09xgcmh9yrprsazsrm3bm0xl3y75csi9lhh815yyrn68v2s9p335"; }; buildInputs = [ readline ] ++ stdenv.lib.optional stdenv.isLinux libcap; @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Sets your computer's clock from time servers on the Net"; - homepage = "http://chrony.tuxfamily.org/"; + homepage = http://chrony.tuxfamily.org/; + repository.git = git://git.tuxfamily.org/gitroot/chrony/chrony.git; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/tools/package-management/cabal-install/1.18.0.2.nix b/pkgs/tools/package-management/cabal-install/1.18.0.3.nix index 3c1c6ddd133..041cc471cab 100644 --- a/pkgs/tools/package-management/cabal-install/1.18.0.2.nix +++ b/pkgs/tools/package-management/cabal-install/1.18.0.3.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "cabal-install"; - version = "1.18.0.2"; - sha256 = "0ah9yzp486p3cvs9b7nid0jmf0a56fg65s3jx2r8lb84pi50d92c"; + version = "1.18.0.3"; + sha256 = "0h01mz6p4fwl8h6k2ybrlp598f0j3n2zasrr63fy0vjbjibmgf41"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -20,9 +20,6 @@ cabal.mkDerivation (self: { mkdir $out/etc mv bash-completion $out/etc/bash_completion.d ''; - patchPhase = '' - sed -i -e 's|array .*,|array,|' cabal-install.cabal - ''; meta = { homepage = "http://www.haskell.org/cabal/"; description = "The command-line interface for Cabal and Hackage"; diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 33b304eec4c..7f52950aa36 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.7pre3520_1017bd6"; + name = "nix-1.7pre3522_f7e077a"; src = fetchurl { - url = "http://hydra.nixos.org/build/9253720/download/4/${name}.tar.xz"; - sha256 = "7144ad4b4a7ff77165dc96424366fa28fb1a9e19b4f7c26d123b5f6bccf53d2d"; + url = "http://hydra.nixos.org/build/9342392/download/4/${name}.tar.xz"; + sha256 = "f1fce2cc7bde1a7bd5d8d491153ed805542970768211ebb7b121d9630033afc2"; }; nativeBuildInputs = [ perl pkgconfig ]; diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index cd1fda47e43..2554e999e0d 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -15,6 +15,9 @@ let ]; }; + ldLibraryPath = if bits == "64" then torEnv+"/lib:"+torEnv+"/lib64" + else torEnv+"/lib"; + in stdenv.mkDerivation rec { name = "tor-browser-${version}"; version = "3.5"; @@ -36,7 +39,7 @@ in stdenv.mkDerivation rec { # Just do a simple test if all libraries get loaded by running help on # firefox and tor echo "Checking firefox..." - LD_LIBRARY_PATH=${torEnv}/lib Browser/firefox --help 1> /dev/null + LD_LIBRARY_PATH=${ldLibraryPath} Browser/firefox --help 1> /dev/null echo "Checking tor..." LD_LIBRARY_PATH=${torEnv}/lib:Tor Tor/tor --help 1> /dev/null ''; @@ -53,7 +56,7 @@ in stdenv.mkDerivation rec { echo "pref(\"extensions.torlauncher.tordatadir_path\", \"\$HOME/Data/Tor/\");" >> \ ~/Data/Browser/profile.default/preferences/extension-overrides.js fi - export LD_LIBRARY_PATH=${torEnv}/lib:$out/share/tor-browser/Tor + export LD_LIBRARY_PATH=${ldLibraryPath}:$out/share/tor-browser/Tor $out/share/tor-browser/Browser/firefox -no-remote -profile ~/Data/Browser/profile.default "$@" EOF chmod +x $out/bin/tor-browser @@ -65,6 +68,6 @@ in stdenv.mkDerivation rec { description = "Tor Browser Bundle for GNU/Linux, everything you need to safely browse the Internet"; homepage = https://www.torproject.org/; platforms = ["i686-linux" "x86_64-linux"]; - maintainers = [ maintainers.offline ]; + maintainers = [ maintainers.offline maintainers.matejc ]; }; } diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 37283fc18a4..c76a1a13677 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "collectd-5.4.0"; + name = "collectd-5.4.1"; src = fetchurl { url = "http://collectd.org/files/${name}.tar.bz2"; - sha256 = "0gljf5c60q6i0nrii6addxy1p76qqixww8zy17a7a1zil6a3i5wh"; + sha256 = "1q365zx6d1wyhv7n97bagfxqnqbhj2j14zz552nhmjviy8lj2ibm"; }; NIX_LDFLAGS = "-lgcc_s"; # for pthread_cancel diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix index 57f9a1a57d5..9c7f0413421 100644 --- a/pkgs/tools/system/dd_rescue/default.nix +++ b/pkgs/tools/system/dd_rescue/default.nix @@ -1,63 +1,37 @@ -x@{builderDefsPackage - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, autoconf }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="dd_rescue"; - version="1.22"; - name="${baseName}-${version}"; +stdenv.mkDerivation rec { + name = "dd_rescue-1.42.1"; + + src = fetchurl { + sha256 = "0g2d292m1cnp8syy19hh5jvly3zy7lcvcj563wgjnf20ppm2diaq"; url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.gz"; - hash="0n0vs4cn5csdcsmlndg3z36ws68zlckj17zrbm6wynrbs8iirclp"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; - dd_rhelp_src = a.fetchurl { - url = "http://www.kalysto.org/pkg/dd_rhelp-0.1.2.tar.gz"; - sha256 = "0fhzkflg1ygiaj5ha0bf594d76vlgjsfwlpcmwrbady9frxvlkvv"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + dd_rhelp_src = fetchurl { + url = "http://www.kalysto.org/pkg/dd_rhelp-0.3.0.tar.gz"; + sha256 = "0br6fs23ybmic3i5s1w4k4l8c2ph85ax94gfp2lzjpxbvl73cz1g"; + }; - /* doConfigure should be removed if not needed */ - phaseNames = ["doMakeInstall" "install_dd_rhelp" "fixPaths"]; - makeFlags=[ - ''prefix="$out"'' - ''DESTDIR="$out"'' - ''INSTASROOT='' - ]; + buildInputs = [ autoconf ]; - fixPaths = a.doPatchShebangs ''$out/bin''; + preBuild = '' + substituteInPlace Makefile \ + --replace "\$(DESTDIR)/usr" "$out" \ + --replace "-o root" "" \ + --replace "-g root" "" + ''; + makeFlags = [ "LIBDIR=$out" ]; - install_dd_rhelp = a.fullDepEntry ('' + postInstall = '' mkdir -p "$out/share/dd_rescue" "$out/bin" tar xf "${dd_rhelp_src}" -C "$out/share/dd_rescue" cp "$out/share/dd_rescue"/dd_rhelp*/dd_rhelp "$out/bin" - '') ["minInit" "defEnsureDir"]; + ''; - meta = { + meta = with stdenv.lib; { description = "A tool to copy data from a damaged block device"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - }; - passthru = { - updateInfo = { - downloadPage = "http://www.garloff.de/kurt/linux/ddrescue/"; - }; + maintainers = with maintainers; [ raskin iElectric ]; + platforms = with platforms; linux; }; -}) x - +} diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index 9afad675bb9..d2ace27b1fd 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, lzip }: stdenv.mkDerivation rec { - name = "ddrescue-1.16"; + name = "ddrescue-1.17"; src = fetchurl { - url = "mirror://gnu/ddrescue/${name}.tar.gz"; - sha256 = "1rixya7p8c4jrn4p0flf6h5dqwybrilf3hrj4r7x41h3zgjz5cvn"; + url = "mirror://gnu/ddrescue/${name}.tar.lz"; + sha256 = "0bvmsbzli2j4czwkabzs978n1y6vx31axh02kpgcf7033cc6rydy"; }; + buildInputs = [ lzip ]; + doCheck = true; meta = { @@ -41,6 +43,6 @@ stdenv.mkDerivation rec { license = "GPLv3+"; platforms = stdenv.lib.platforms.all; - maintainers = [ ]; + maintainers = with stdenv.lib.maintainers; [ iElectric ]; }; } diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix new file mode 100644 index 00000000000..1769a59520b --- /dev/null +++ b/pkgs/tools/typesetting/biber/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, buildPerlPackage, autovivification, BusinessISBN +, BusinessISMN, BusinessISSN, ConfigAutoConf, DataCompare, DataDump, DateSimple +, EncodeEUCJPASCII, EncodeHanExtra, EncodeJIS2K, ExtUtilsLibBuilder +, FileSlurp, IPCRun3, Log4Perl, LWPProtocolHttps, ListAllUtils, ListMoreUtils +, ModuleBuild, MozillaCA, ReadonlyXS, RegexpCommon, TextBibTeX, UnicodeCollate +, UnicodeLineBreak, URI, XMLLibXMLSimple, XMLLibXSLT, XMLWriter }: + +let + version = "1.8"; + pn = "biblatex-biber"; +in +buildPerlPackage { + name = "biber-${version}"; + src = fetchurl { + url = "mirror://sourceforge/project/${pn}/${pn}/${version}/${pn}.tar.gz"; + sha256 = "0ffry64pdvg5g487r7qab5b3cs4kq8rq8n3bymxrr1qh3mp79k4n"; + }; + + buildInputs = [ + autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf + DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K + ExtUtilsLibBuilder FileSlurp IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils + ListMoreUtils ModuleBuild MozillaCA ReadonlyXS RegexpCommon TextBibTeX + UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter + ]; + preConfigure = "touch Makefile.PL"; + buildPhase = "perl Build.PL --prefix=$out; ./Build build"; + checkPhase = "./Build test"; + installPhase = "./Build install"; + + # Tests seem to be broken + doCheck = false; + + meta = { + description = "Backend for BibLaTeX"; + license = "perl"; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 3158f285933..98a8a0fd810 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -5,14 +5,16 @@ rec { sha256 = "1idgyim6r4bi3id245k616qrdarfh65xv3gi2psarqqmsw504yhd"; }; + texmfVersion = "2013.20140215"; texmfSrc = fetchurl { - url = mirror://debian/pool/main/t/texlive-base/texlive-base_2013.20140123.orig.tar.xz; - sha256 = "1lwvqryfykz0d9pcjkhq1qh7dlcb6lsvjp7fizl18ji6166159iw"; + url = "mirror://debian/pool/main/t/texlive-base/texlive-base_${texmfVersion}.orig.tar.xz"; + sha256 = "0f1xqa1a1yklsiqz12rgihdc6viw8ghdbx2s2pw2k3h0dfsd6ss3"; }; + langTexmfVersion = "2013.20140215"; langTexmfSrc = fetchurl { - url = mirror://debian/pool/main/t/texlive-lang/texlive-lang_2013.20140123.orig.tar.xz; - sha256 = "1smzkg31msn9ci7fc69xq5klhxab00z8bcxmz5daqzcal8ak3d2d"; + url = "mirror://debian/pool/main/t/texlive-lang/texlive-lang_${langTexmfVersion}.orig.tar.xz"; + sha256 = "0igz9kpd1rfbq7smb1wyd75cz396rinbh25rk19lxqh25dix0xzj"; }; passthru = { inherit texmfSrc langTexmfSrc; }; @@ -43,7 +45,7 @@ rec { NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${icu}/include/layout"; - ./Build --prefix="$out" --datadir="$out/share" --mandir "$out/share/man" --infodir "$out/share/info" \ + ./Build --prefix="$out" --datadir="$out/share" --mandir="$out/share/man" --infodir="$out/share/info" \ ${args.lib.concatStringsSep " " configureFlags} cd Work '' ) [ "minInit" "doUnpack" "addInputs" "defEnsureDir" ]; @@ -114,14 +116,22 @@ rec { configureFlags = [ "--with-x11" "--enable-ipc" "--with-mktexfmt" "--enable-shared" "--disable-native-texlive-build" "--with-system-zziplib" - "--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2" - "--with-system-freetype=no" "--disable-ttf2pk" "--enable-ttf2pk2" - ] - ++ ( if stdenv.isDarwin - # ironically, couldn't get xetex compiling on darwin - then [ "--disable-xetex" "--disable-xdv2pdf" "--disable-xdvipdfmx" ] - # couldn't seem to get system icu working on darwin - else [ "--with-system-icu" ] ); + "--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2" + "--with-system-freetype=no" "--disable-ttf2pk" "--enable-ttf2pk2" ] + ++ stdenv.lib.optionals stdenv.isDarwin [ + # Complains about a missing ICU directory + "--disable-bibtex-x" + + # TODO: We should be able to fix these tests + "--disable-devnag" + "--disable-dvisvgm" + "--disable-xdv2pdf" + "--disable-xdvipdfmx" + "--disable-xetex" + + "--with-system-harfbuzz=no" + "--with-system-icu=no" + ]; phaseNames = [ "addInputs" "doMainBuild" "doMakeInstall" "doPostInstall" ]; diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix index c6624e469e5..056c7e0bf4e 100644 --- a/pkgs/tools/typesetting/tex/texlive/extra.nix +++ b/pkgs/tools/typesetting/tex/texlive/extra.nix @@ -1,9 +1,11 @@ args: with args; rec { - name = "texlive-extra-2013"; + name = "texlive-extra-2013"; + version = "2013.20140215"; + src = fetchurl { - url = mirror://debian/pool/main/t/texlive-extra/texlive-extra_2013.20131219.orig.tar.xz; - sha256 = "09iijzq0y5kq16f3lv2jrln190ldbbzywpwr33hrmnw5yp3izmrh"; + url = "mirror://debian/pool/main/t/texlive-extra/texlive-extra_${version}.orig.tar.xz"; + sha256 = "04a67pns6q8kw1nl2v6x5p443kvhk8fr26qkcj7z098n68fpwls8"; }; buildInputs = [texLive xz]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9109e1e5952..c959f2c6b65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -434,6 +434,8 @@ let analog = callPackage ../tools/admin/analog {}; + apt-offline = callPackage ../tools/misc/apt-offline { }; + archivemount = callPackage ../tools/filesystems/archivemount { }; arandr = callPackage ../tools/X11/arandr { }; @@ -572,6 +574,8 @@ let catdoc = callPackage ../tools/text/catdoc { }; + ccnet = callPackage ../tools/networking/ccnet { }; + ditaa = callPackage ../tools/graphics/ditaa { }; direnv = callPackage ../tools/misc/direnv { }; @@ -614,6 +618,15 @@ let bgs = callPackage ../tools/X11/bgs { }; + biber = callPackage ../tools/typesetting/biber { + inherit (perlPackages) + autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf + DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K + ExtUtilsLibBuilder FileSlurp IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils + ListMoreUtils ModuleBuild MozillaCA ReadonlyXS RegexpCommon TextBibTeX + UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter; + }; + bibtextools = callPackage ../tools/typesetting/bibtex-tools { inherit (strategoPackages016) strategoxt sdf; }; @@ -650,6 +663,8 @@ let cabextract = callPackage ../tools/archivers/cabextract { }; + can-utils = callPackage ../os-specific/linux/can-utils { }; + ccid = callPackage ../tools/security/ccid { }; ccrypt = callPackage ../tools/security/ccrypt { }; @@ -837,7 +852,7 @@ let dtach = callPackage ../tools/misc/dtach { }; duplicity = callPackage ../tools/backup/duplicity { - inherit (pythonPackages) boto; + inherit (pythonPackages) boto lockfile; gnupg = gnupg1; }; @@ -991,7 +1006,8 @@ let g500-control = callPackage ../tools/misc/g500-control { }; - gawk = lowPrio (callPackage ../tools/text/gawk { }); + gawk = callPackage ../tools/text/gawk { }; + gawkInteractive = appendToName "interactive" (gawk.override { readlineSupport = true; }); @@ -1570,9 +1586,9 @@ let pam = if stdenv.isLinux then pam else null; }; - openssh_hpn = lowPrio (pkgs.appendToName "hpn" (openssh.override { hpnSupport = true; })); + openssh_hpn = pkgs.appendToName "with-hpn" (openssh.override { hpnSupport = true; }); - openssh_with_kerberos = lowPrio (pkgs.appendToName "with-kerberos" (openssh.override { withKerberos = true; })); + openssh_with_kerberos = pkgs.appendToName "with-kerberos" (openssh.override { withKerberos = true; }); opensp = callPackage ../tools/text/sgml/opensp { }; @@ -1980,6 +1996,8 @@ let tinc = callPackage ../tools/networking/tinc { }; + tiny8086 = callPackage ../applications/virtualization/8086tiny { }; + tmpwatch = callPackage ../tools/misc/tmpwatch { }; tmux = callPackage ../tools/misc/tmux { }; @@ -2056,6 +2074,8 @@ let vobcopy = callPackage ../tools/cd-dvd/vobcopy { }; + vobsub2srt = callPackage ../tools/cd-dvd/vobsub2srt { }; + vorbisgain = callPackage ../tools/misc/vorbisgain { }; vpnc = callPackage ../tools/networking/vpnc { }; @@ -2428,12 +2448,10 @@ let gcc_realCross = gcc48_realCross; gccCrossStageStatic = let - isMingw = (stdenv.cross.libc == "msvcrt"); - isMingw64 = isMingw && stdenv.cross.config == "x86_64-w64-mingw32"; - isDarwin = stdenv.cross.libc == "libSystem"; - libcCross1 = if isMingw64 then windows.mingw_w64_headers else - if isMingw then windows.mingw_headers1 else - if isDarwin then darwin.xcode else null; + libcCross1 = + if stdenv.cross.libc == "msvcrt" then windows.mingw_w64_headers + else if stdenv.cross.libc == "libSystem" then darwin.xcode + else null; in wrapGCCCross { gcc = forceNativeDrv (lib.addMetaAttrs { hydraPlatforms = []; } ( @@ -2787,12 +2805,12 @@ let jdkdistro = installjdk: pluginSupport: assert supportsJDK; - (if pluginSupport then appendToName "plugin" else x: x) + (if pluginSupport then appendToName "with-plugin" else x: x) (callPackage ../development/compilers/jdk/jdk6-linux.nix { }); oraclejdk7distro = installjdk: pluginSupport: assert supportsJDK; - (if pluginSupport then appendToName "plugin" else x: x) + (if pluginSupport then appendToName "with-plugin" else x: x) (callPackage ../development/compilers/jdk/jdk7-linux.nix { inherit installjdk; }); jikes = callPackage ../development/compilers/jikes { }; @@ -3397,6 +3415,8 @@ let guile_ncurses = callPackage ../development/guile-modules/guile-ncurses { }; + guile-xcb = callPackage ../development/guile-modules/guile-xcb { }; + srecord = callPackage ../development/tools/misc/srecord { }; windowssdk = ( @@ -3549,6 +3569,8 @@ let inherit (gnome3) gnome_icon_theme; }; + dfu-programmer = callPackage ../development/tools/misc/dfu-programmer { }; + ddd = callPackage ../development/tools/misc/ddd { }; distcc = callPackage ../development/tools/misc/distcc { }; @@ -3579,9 +3601,11 @@ let inherit python pil makeWrapper; }; - doxygen = lowPrio (doxygen_gui.override { qt4 = null; }); + doxygen = callPackage ../development/tools/documentation/doxygen { + qt4 = null; + }; - doxygen_gui = callPackage ../development/tools/documentation/doxygen { }; + doxygen_gui = lowPrio (doxygen.override { inherit qt4; }); drush = callPackage ../development/tools/misc/drush { }; @@ -3740,7 +3764,7 @@ let remake = callPackage ../development/tools/build-managers/remake { }; - saleaeLogic = callPackage ../development/tools/misc/saleae-logic { }; + saleae-logic = callPackage ../development/tools/misc/saleae-logic { }; # couldn't find the source yet seleniumRCBin = callPackage ../development/tools/selenium/remote-control { @@ -4167,6 +4191,8 @@ let gamin = callPackage ../development/libraries/gamin { }; + ganv = callPackage ../development/libraries/ganv { }; + gav = callPackage ../games/gav { }; gsb = callPackage ../games/gsb { }; @@ -4250,9 +4276,7 @@ let # We can choose: libcCrossChooser = name : if name == "glibc" then glibcCross else if name == "uclibc" then uclibcCross - else if name == "msvcrt" && stdenv.cross.config == "x86_64-w64-mingw32" then - windows.mingw_w64 - else if name == "msvcrt" then windows.mingw_headers3 + else if name == "msvcrt" then windows.mingw_w64 else if name == "libSystem" then darwin.xcode else throw "Unknown libc"; @@ -4368,20 +4392,16 @@ let gnu-efi = callPackage ../development/libraries/gnu-efi { }; gnutls = gnutls32; - gnutls31 = callPackage ../development/libraries/gnutls { - guileBindings = config.gnutls.guile or true; - }; - gnutls2 = callPackage ../development/libraries/gnutls/2.12.nix { - guileBindings = config.gnutls.guile or true; + gnutls31 = callPackage ../development/libraries/gnutls/3.1.nix { + guileBindings = config.gnutls.guile or false; }; gnutls32 = callPackage ../development/libraries/gnutls/3.2.nix { - guileBindings = config.gnutls.guile or true; + guileBindings = config.gnutls.guile or false; }; - gnutls_without_guile = lowPrio (gnutls.override { guileBindings = false; }); - gnutls2_without_guile = lowPrio (gnutls2.override { guileBindings = false; }); + gnutls_with_guile = lowPrio (gnutls.override { guileBindings = true; }); gpac = callPackage ../applications/video/gpac { }; @@ -4730,6 +4750,8 @@ let libelf = callPackage ../development/libraries/libelf { }; + libfm = callPackage ../development/libraries/libfm { }; + libgadu = callPackage ../development/libraries/libgadu { }; libgdata = gnome3.libgdata; @@ -4989,7 +5011,11 @@ let libpaper = callPackage ../development/libraries/libpaper { }; - libproxy = callPackage ../development/libraries/libproxy { }; + libproxy = callPackage ../development/libraries/libproxy { + stdenv = if stdenv.isDarwin + then overrideGCC stdenv gcc + else stdenv; + }; libpseudo = callPackage ../development/libraries/libpseudo { }; @@ -5001,6 +5027,8 @@ let librsync = callPackage ../development/libraries/librsync { }; + libsearpc = callPackage ../development/libraries/libsearpc { }; + libsigcxx = callPackage ../development/libraries/libsigcxx { }; libsigcxx12 = callPackage ../development/libraries/libsigcxx/1.2.nix { }; @@ -5159,6 +5187,8 @@ let libzip = callPackage ../development/libraries/libzip { }; + libzdb = callPackage ../development/libraries/libzdb { }; + libzrtpcpp = callPackage ../development/libraries/libzrtpcpp { }; libzrtpcpp_1_6 = callPackage ../development/libraries/libzrtpcpp/1.6.nix { ccrtp = ccrtp_1_8; @@ -5198,6 +5228,8 @@ let # failed to build mediastreamer = callPackage ../development/libraries/mediastreamer { }; + menu-cache = callPackage ../development/libraries/menu-cache { }; + mesaSupported = lib.elem system lib.platforms.mesaPlatforms; mesa_original = callPackage ../development/libraries/mesa { llvm = llvm_33; }; @@ -5419,13 +5451,6 @@ let poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; popplerQt4 = poppler.poppler_qt4; - poppler_0_18 = callPackage ../development/libraries/poppler/0.18.nix { - lcms = lcms2; - glibSupport = true; - gtk3Support = false; - qt4Support = false; - }; - popt = callPackage ../development/libraries/popt { }; portaudio = callPackage ../development/libraries/portaudio { @@ -5528,6 +5553,8 @@ let rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {}; + raul = callPackage ../development/libraries/audio/raul { }; + readline = readline6; readline4 = callPackage ../development/libraries/readline/readline4.nix { }; @@ -5557,6 +5584,8 @@ let lv2 = callPackage ../development/libraries/audio/lv2 { }; + lvtk = callPackage ../development/libraries/audio/lvtk { }; + qrupdate = callPackage ../development/libraries/qrupdate { }; redland = pkgs.librdf_redland; @@ -6057,7 +6086,6 @@ let # regardless. python26Packages = import ./python-packages.nix { inherit pkgs; - inherit (lib) lowPrio; python = python26; }; @@ -6065,31 +6093,26 @@ let python33Packages = recurseIntoAttrs (import ./python-packages.nix { inherit pkgs; - inherit (lib) lowPrio; python = python33; }); python34Packages = import ./python-packages.nix { inherit pkgs; - inherit (lib) lowPrio; python = python34; }; python32Packages = import ./python-packages.nix { inherit pkgs; - inherit (lib) lowPrio; python = python32; }; python27Packages = recurseIntoAttrs (import ./python-packages.nix { inherit pkgs; - inherit (lib) lowPrio; python = python27; }); pypyPackages = recurseIntoAttrs (import ./python-packages.nix { inherit pkgs; - inherit (lib) lowPrio; python = pypy; }); @@ -6742,7 +6765,7 @@ let })) (args: grsecurityOverrider args)); linux_3_13_grsecurity = lowPrio (lib.overrideDerivation (linux_3_13.override (args: { - kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_5 kernelPatches.grsec_path ]; + kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_6 kernelPatches.grsec_path ]; argsOverride = { modDirVersion = "${linux_3_13.modDirVersion}-grsec"; }; @@ -6873,6 +6896,8 @@ let broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { }; + nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; + nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { }; @@ -7239,6 +7264,10 @@ let onlyHeaders = true; }; + mingw_w64_pthreads = callPackage ../os-specific/windows/mingw-w64 { + onlyPthreads = true; + }; + pthreads = callPackage ../os-specific/windows/pthread-w32 { mingw_headers = mingw_headers3; }; @@ -7383,6 +7412,8 @@ let stdmanpages = callPackage ../data/documentation/std-man-pages { }; + symbola = callPackage ../data/fonts/symbola { }; + iana_etc = callPackage ../data/misc/iana-etc { }; poppler_data = callPackage ../data/misc/poppler-data { }; @@ -7463,6 +7494,8 @@ let alchemy = callPackage ../applications/graphics/alchemy { }; + ams-lv2 = callPackage ../applications/audio/ams-lv2 { }; + amsn = callPackage ../applications/networking/instant-messengers/amsn { }; antiword = callPackage ../applications/office/antiword {}; @@ -7537,9 +7570,7 @@ let bitcoin = callPackage ../applications/misc/bitcoin { }; bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { - # For some reason, TLS support is broken when using GnuTLS 3.0 (can't - # connect to jabber.org, for instance.) - gnutls = gnutls2; + gnutls = gnutls; libotr = libotr_3_2; }; @@ -7631,6 +7662,7 @@ let comical = callPackage ../applications/graphics/comical { }; conkeror = callPackage ../applications/networking/browsers/conkeror { }; + conkerorWrapper = wrapFirefox { browser = conkeror; browserName = "conkeror"; @@ -7926,12 +7958,16 @@ let fftw = fftwFloat; }; + gnuradio-osmosdr = callPackage ../applications/misc/gnuradio-osmosdr { }; + goldendict = callPackage ../applications/misc/goldendict { }; google-musicmanager = callPackage ../applications/audio/google-musicmanager { }; gpicview = callPackage ../applications/graphics/gpicview { }; + gqrx = callPackage ../applications/misc/gqrx { }; + grass = import ../applications/misc/grass { inherit (xlibs) libXmu libXext libXp libX11 libXt libSM libICE libXpm libXaw libXrender; @@ -7987,7 +8023,7 @@ let inherit (gnome) libIDL; }; - firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; }); + firefox13Wrapper = wrapFirefox { browser = firefox13Pkgs.firefox; }; firefoxPkgs = callPackage ../applications/networking/browsers/firefox { inherit (gnome) libIDL; @@ -8200,6 +8236,8 @@ let herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; + hexchat = callPackage ../applications/networking/irc/hexchat { }; + hexedit = callPackage ../applications/editors/hexedit { }; hipchat = callPackage_i686 ../applications/networking/instant-messengers/hipchat { }; @@ -8317,6 +8355,8 @@ let jigdo = callPackage ../applications/misc/jigdo { }; + jitsi = callPackage ../applications/networking/instant-messengers/jitsi { }; + joe = callPackage ../applications/editors/joe { }; jbrout = callPackage ../applications/graphics/jbrout { @@ -8382,7 +8422,6 @@ let freefont_ttf xorg.fontmiscmisc xorg.fontbhttf ]; }; - poppler = poppler_0_18; clucene_core = clucene_core_2; lcms = lcms2; mdds = mdds_0_7_1; @@ -8439,7 +8478,7 @@ let guiSupport = false; # use mercurialFull to get hgk GUI }; - mercurialFull = lowPrio (appendToName "full" (pkgs.mercurial.override { guiSupport = true; })); + mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); merkaartor = callPackage ../applications/misc/merkaartor { }; @@ -8565,6 +8604,8 @@ let mutt = callPackage ../applications/networking/mailreaders/mutt { }; + pcmanfm = callPackage ../applications/misc/pcmanfm { }; + ruby_gpgme = callPackage ../development/libraries/ruby_gpgme { ruby = ruby19; hoe = rubyLibs.hoe; @@ -8794,6 +8835,8 @@ let enableCopyDevicesPatch = (config.rsync.enableCopyDevicesPatch or false); }; + rtl-sdr = callPackage ../applications/misc/rtl-sdr { }; + rubyripper = callPackage ../applications/audio/rubyripper {}; rxvt = callPackage ../applications/misc/rxvt { }; @@ -8816,6 +8859,8 @@ let inherit (gnome) libart_lgpl; }; + seafile-client = callPackage ../applications/networking/seafile-client { }; + seeks = callPackage ../tools/networking/p2p/seeks { opencv = opencv_2_1; }; @@ -8917,11 +8962,11 @@ let sasl = cyrus_sasl; }; - subversionClient = lowPrio (appendToName "client" (subversion.override { + subversionClient = appendToName "client" (subversion.override { bdbSupport = false; perlBindings = true; pythonBindings = true; - })); + }); surf = callPackage ../applications/misc/surf { libsoup = gnome.libsoup; @@ -8962,6 +9007,8 @@ let taskwarrior = callPackage ../applications/misc/taskwarrior { }; + telegram-cli = callPackage ../applications/networking/instant-messengers/telegram-cli/default.nix { }; + telepathy_gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { inherit (pkgs.gnome) libsoup; }; @@ -9072,6 +9119,11 @@ let else stdenv; }; + vimwrapper = callPackage ../applications/editors/vim/wrapper.nix { + inherit vim; + vimrc = config.vim.vimrc or null; + }; + vimHugeX = vim_configurable; vim_configurable = callPackage ../applications/editors/vim/configurable.nix { @@ -9463,6 +9515,8 @@ let icbm3d = callPackage ../games/icbm3d { }; + ingen = callPackage ../applications/audio/ingen { }; + instead = callPackage ../games/instead { lua = lua5; }; @@ -10354,6 +10408,8 @@ let saneFrontends = callPackage ../applications/graphics/sane/frontends.nix { }; + seafile-shared = callPackage ../misc/seafile-shared { }; + slock = callPackage ../misc/screensavers/slock { }; sourceAndTags = import ../misc/source-and-tags { @@ -10476,13 +10532,13 @@ let wineStable = callPackage_i686 ../misc/emulators/wine/stable.nix { bison = bison2; }; + wineUnstable = lowPrio (callPackage_i686 ../misc/emulators/wine/unstable.nix { bison = bison2; }); + wine = wineStable; - # winetricks is a shell script with no binary components. Safe to just use the current platforms - # build instead of the i686 specific build. winetricks = callPackage ../misc/emulators/wine/winetricks.nix { inherit (gnome2) zenity; }; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index a3c3a10b44c..0856bf50378 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -19,8 +19,8 @@ self : self.haskellPlatformArgs_future self // { haskellPlatform = null; extensibleExceptions = self.extensibleExceptions_0_1_1_4; - cabalInstall_1_18_0_2 = self.cabalInstall_1_18_0_2.override { Cabal = null; }; - cabalInstall = self.cabalInstall_1_18_0_2.override { Cabal = null; }; + cabalInstall_1_18_0_3 = self.cabalInstall_1_18_0_3.override { Cabal = null; }; + cabalInstall = self.cabalInstall_1_18_0_3.override { Cabal = null; }; }; ghc763Prefs = @@ -80,7 +80,7 @@ cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; prettyShow = self.prettyShow_1_2; binary = self.binary_0_6_0_0; - Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; }; + Cabal_1_18_1_3 = self.Cabal_1_18_1_3.override { deepseq = self.deepseq_1_3_0_2; }; quickcheckIo = self.quickcheckIo.override { HUnit = self.HUnit_1_2_5_2; QuickCheck = self.QuickCheck2; @@ -102,7 +102,7 @@ cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; prettyShow = self.prettyShow_1_2; binary = self.binary_0_6_0_0; - Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; }; + Cabal_1_18_1_3 = self.Cabal_1_18_1_3.override { deepseq = self.deepseq_1_3_0_2; }; quickcheckIo = self.quickcheckIo.override { HUnit = self.HUnit_1_2_5_2; QuickCheck = self.QuickCheck2; @@ -126,7 +126,7 @@ cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; prettyShow = self.prettyShow_1_2; binary = self.binary_0_6_0_0; - Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; }; + Cabal_1_18_1_3 = self.Cabal_1_18_1_3.override { deepseq = self.deepseq_1_3_0_2; }; quickcheckIo = self.quickcheckIo.override { HUnit = self.HUnit_1_2_5_2; QuickCheck = self.QuickCheck2; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 401baa1d025..aa83e06d351 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -142,7 +142,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x haskellPlatformArgs_future = self : { inherit (self) cabal ghc; async = self.async_2_0_1_5; - attoparsec = self.attoparsec_0_11_1_0; + attoparsec = self.attoparsec_0_11_2_1; caseInsensitive = self.caseInsensitive_1_1_0_3; cgi = self.cgi_3001_1_8_5; fgl = self.fgl_5_4_2_4; @@ -167,13 +167,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x split = self.split_0_2_2; stm = self.stm_2_4_2; syb = self.syb_0_4_1; - text = self.text_1_1_0_0; + text = self.text_1_1_0_1; transformers = self.transformers_0_3_0_0; # this has become a core package in GHC 7.7 unorderedContainers = self.unorderedContainers_0_2_3_3; vector = self.vector_0_10_9_1; xhtml = self.xhtml_3000_2_1; zlib = self.zlib_0_5_4_1; - cabalInstall = self.cabalInstall_1_18_0_2; + cabalInstall = self.cabalInstall_1_18_0_3; alex = self.alex_3_1_3; haddock = self.haddock_2_13_2_1; happy = self.happy_1_19_3; @@ -526,11 +526,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x adjunctions = callPackage ../development/libraries/haskell/adjunctions {}; - aeson_0_6_2_1 = callPackage ../development/libraries/haskell/aeson/0.6.2.1.nix {}; - aeson_0_7_0_1 = callPackage ../development/libraries/haskell/aeson/0.7.0.1.nix { + aeson = callPackage ../development/libraries/haskell/aeson { blazeBuilder = if (pkgs.stdenv.lib.versionOlder ghc.version "7.6") then self.blazeBuilder else null; }; - aeson = self.aeson_0_7_0_1; aesonLens = callPackage ../development/libraries/haskell/aeson-lens {}; @@ -555,14 +553,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ansiWlPprint = callPackage ../development/libraries/haskell/ansi-wl-pprint {}; ariadne = callPackage ../development/libraries/haskell/ariadne { - Cabal = self.Cabal_1_18_1_2; + Cabal = self.Cabal_1_18_1_3; haskellPackages = self.haskellPackages.override { - Cabal = self.Cabal_1_18_1_2; + Cabal = self.Cabal_1_18_1_3; }; haskellNames = self.haskellNames.override { - Cabal = self.Cabal_1_18_1_2; + Cabal = self.Cabal_1_18_1_3; haskellPackages = self.haskellPackages.override { - Cabal = self.Cabal_1_18_1_2; + Cabal = self.Cabal_1_18_1_3; }; }; }; @@ -595,7 +593,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x attoLisp = callPackage ../development/libraries/haskell/atto-lisp {}; attoparsec_0_10_4_0 = callPackage ../development/libraries/haskell/attoparsec/0.10.4.0.nix {}; - attoparsec_0_11_1_0 = callPackage ../development/libraries/haskell/attoparsec/0.11.1.0.nix {}; + attoparsec_0_11_2_1 = callPackage ../development/libraries/haskell/attoparsec/0.11.2.1.nix {}; attoparsec = self.attoparsec_0_10_4_0; attoparsecBinary = callPackage ../development/libraries/haskell/attoparsec-binary {}; @@ -709,7 +707,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix { cabal = self.cabal.override { Cabal = null; }; }; Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix { cabal = self.cabal.override { Cabal = null; }; }; - Cabal_1_18_1_2 = callPackage ../development/libraries/haskell/Cabal/1.18.1.2.nix { cabal = self.cabal.override { Cabal = null; }; }; + Cabal_1_18_1_3 = callPackage ../development/libraries/haskell/Cabal/1.18.1.3.nix { cabal = self.cabal.override { Cabal = null; }; }; Cabal = null; # core package in GHC cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {}; @@ -943,24 +941,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x dice = callPackage ../development/libraries/haskell/dice {}; diagrams = callPackage ../development/libraries/haskell/diagrams/diagrams.nix {}; - diagramsCairo = callPackage ../development/libraries/haskell/diagrams/cairo.nix { - lens = self.lens_3_10_2; - }; - diagramsCore = callPackage ../development/libraries/haskell/diagrams/core.nix { - lens = self.lens_3_10_2; - }; - diagramsContrib = callPackage ../development/libraries/haskell/diagrams/contrib.nix { - lens = self.lens_3_10_2; - }; - diagramsLib = callPackage ../development/libraries/haskell/diagrams/lib.nix { - lens = self.lens_3_10_2; - }; - diagramsPostscript = callPackage ../development/libraries/haskell/diagrams/postscript.nix { - lens = self.lens_3_10_2; - }; - diagramsSvg = callPackage ../development/libraries/haskell/diagrams/svg.nix { - lens = self.lens_3_10_2; - }; + diagramsCairo = callPackage ../development/libraries/haskell/diagrams/cairo.nix {}; + diagramsCore = callPackage ../development/libraries/haskell/diagrams/core.nix {}; + diagramsContrib = callPackage ../development/libraries/haskell/diagrams/contrib.nix {}; + diagramsLib = callPackage ../development/libraries/haskell/diagrams/lib.nix {}; + diagramsPostscript = callPackage ../development/libraries/haskell/diagrams/postscript.nix {}; + diagramsSvg = callPackage ../development/libraries/haskell/diagrams/svg.nix {}; Diff = callPackage ../development/libraries/haskell/Diff {}; @@ -1127,9 +1113,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x foldl = callPackage ../development/libraries/haskell/foldl {}; - forceLayout = callPackage ../development/libraries/haskell/force-layout { - lens = self.lens_3_10_2; - }; + forceLayout = callPackage ../development/libraries/haskell/force-layout {}; free = callPackage ../development/libraries/haskell/free {}; @@ -1157,6 +1141,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cabal = self.cabal.override { enableLibraryProfiling = false; }; # pkg cannot be built with profiling enabled }; + ghcjsDom = callPackage ../development/libraries/haskell/ghcjs-codemirror {}; + + ghcjsCodemirror = callPackage ../development/libraries/haskell/ghcjs-codemirror {}; + ghcMod = callPackage ../development/libraries/haskell/ghc-mod { inherit (pkgs) emacs; }; @@ -1431,6 +1419,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x HSH = callPackage ../development/libraries/haskell/HSH {}; + hsini = callPackage ../development/libraries/haskell/hsini {}; + HsSyck = callPackage ../development/libraries/haskell/HsSyck {}; HsOpenSSL = callPackage ../development/libraries/haskell/HsOpenSSL {}; @@ -1507,6 +1497,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x interlude = callPackage ../development/libraries/haskell/interlude {}; + interpolate = callPackage ../development/libraries/haskell/interpolate {}; + interpolatedstringPerl6 = callPackage ../development/libraries/haskell/interpolatedstring-perl6 {}; intervals = callPackage ../development/libraries/haskell/intervals {}; @@ -1582,14 +1574,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix {}; - lens_3_10_2 = callPackage ../development/libraries/haskell/lens/3.10.2.nix {}; - lens_4_0_4 = callPackage ../development/libraries/haskell/lens/4.0.4.nix {}; - lens = self.lens_4_0_4; + lens = callPackage ../development/libraries/haskell/lens {}; lensAeson = callPackage ../development/libraries/haskell/lens-aeson {}; lensDatetime = callPackage ../development/libraries/haskell/lens-datetime {}; + lensFamilyCore = callPackage ../development/libraries/haskell/lens-family-core {}; + lenses = callPackage ../development/libraries/haskell/lenses {}; libffi = callPackage ../development/libraries/haskell/libffi { @@ -1753,6 +1745,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x mwcRandom = callPackage ../development/libraries/haskell/mwc-random {}; + mysql = callPackage ../development/libraries/haskell/mysql { + mysqlConfig = pkgs.mysql; + inherit (pkgs) zlib; + }; + + mysqlSimple = callPackage ../development/libraries/haskell/mysql-simple {}; + NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {}; nanospec = callPackage ../development/libraries/haskell/nanospec {}; @@ -1918,6 +1917,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x pipesAttoparsec = callPackage ../development/libraries/haskell/pipes-attoparsec {}; + pipesBinary = callPackage ../development/libraries/haskell/pipes-binary { + binary = self.binary_0_7_1_0; + }; + pipesBytestring = callPackage ../development/libraries/haskell/pipes-bytestring {}; pipesConcurrency = callPackage ../development/libraries/haskell/pipes-concurrency {}; @@ -2306,9 +2309,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x stringbuilder = callPackage ../development/libraries/haskell/stringbuilder {}; - stripe = callPackage ../development/libraries/haskell/stripe { - aeson = self.aeson_0_6_2_1; - }; + stripe = callPackage ../development/libraries/haskell/stripe {}; svgcairo = callPackage ../development/libraries/haskell/svgcairo { libc = pkgs.stdenv.gcc.libc; @@ -2387,8 +2388,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x text_0_11_2_0 = callPackage ../development/libraries/haskell/text/0.11.2.0.nix {}; text_0_11_2_3 = callPackage ../development/libraries/haskell/text/0.11.2.3.nix {}; text_0_11_3_1 = callPackage ../development/libraries/haskell/text/0.11.3.1.nix {}; - text_1_1_0_0 = callPackage ../development/libraries/haskell/text/1.1.0.0.nix {}; - text = self.text_1_1_0_0; + text_1_1_0_1 = callPackage ../development/libraries/haskell/text/1.1.0.1.nix {}; + text = self.text_1_1_0_1; textFormat = callPackage ../development/libraries/haskell/text-format {}; @@ -2415,7 +2416,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x threepennyGui = callPackage ../development/libraries/haskell/threepenny-gui {}; time_1_1_2_4 = callPackage ../development/libraries/haskell/time/1.1.2.4.nix {}; - time_1_4_1 = callPackage ../development/libraries/haskell/time/1.4.1.nix {}; + time_1_4_2 = callPackage ../development/libraries/haskell/time/1.4.2.nix {}; # time is in the core package set. It should only be necessary to # pass it explicitly in rare circumstances. time = null; @@ -2509,10 +2510,16 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x vacuumCairo = callPackage ../development/libraries/haskell/vacuum-cairo {}; + vado = callPackage ../development/libraries/haskell/vado {}; + vault = callPackage ../development/libraries/haskell/vault {}; + vcsgui = callPackage ../development/libraries/haskell/vcsgui {}; + vcsRevision = callPackage ../development/libraries/haskell/vcs-revision {}; + vcswrapper = callPackage ../development/libraries/haskell/vcswrapper {}; + Vec = callPackage ../development/libraries/haskell/Vec {}; vect = callPackage ../development/libraries/haskell/vect {}; @@ -2845,10 +2852,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {}; 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 {}; - cabalInstall_1_18_0_2 = callPackage ../tools/package-management/cabal-install/1.18.0.2.nix { - Cabal = self.Cabal_1_18_1_2; + cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix { + Cabal = self.Cabal_1_18_1_3; }; - cabalInstall = self.cabalInstall_1_18_0_2; + cabalInstall = self.cabalInstall_1_18_0_3; gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {}; @@ -2868,7 +2875,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x # Games. - LambdaHack = callPackage ../games/LambdaHack {}; + LambdaHack = callPackage ../games/LambdaHack { + binary = self.binary_0_7_1_0; + vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_1_0; }; + }; MazesOfMonad = callPackage ../games/MazesOfMonad {}; diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index d3220d30e5c..93e965235fc 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -1,6 +1,25 @@ { self, fetchurl, fetchgit ? null, lib }: { + by-spec."Base64"."~0.2.0" = + self.by-version."Base64"."0.2.0"; + by-version."Base64"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-Base64-0.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/Base64/-/Base64-0.2.0.tgz"; + name = "Base64-0.2.0.tgz"; + sha1 = "448879efb6803979daaf7f36e7807e8a1d291205"; + }) + ]; + buildInputs = + (self.nativeDeps."Base64" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "Base64" ]; + }; by-spec."CSSselect"."0.x" = self.by-version."CSSselect"."0.5.0"; by-version."CSSselect"."0.5.0" = lib.makeOverridable self.buildNodePackage { @@ -15,7 +34,7 @@ buildInputs = (self.nativeDeps."CSSselect" or []); deps = [ - self.by-version."CSSwhat"."0.4.2" + self.by-version."CSSwhat"."0.4.5" self.by-version."domutils"."1.4.0" self.by-version."boolbase"."1.0.0" self.by-version."nth-check"."1.0.0" @@ -38,7 +57,7 @@ buildInputs = (self.nativeDeps."CSSselect" or []); deps = [ - self.by-version."CSSwhat"."0.4.2" + self.by-version."CSSwhat"."0.4.5" self.by-version."domutils"."1.4.0" ]; peerDependencies = [ @@ -46,14 +65,14 @@ passthru.names = [ "CSSselect" ]; }; by-spec."CSSwhat"."0.4" = - self.by-version."CSSwhat"."0.4.2"; - by-version."CSSwhat"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "node-CSSwhat-0.4.2"; + self.by-version."CSSwhat"."0.4.5"; + by-version."CSSwhat"."0.4.5" = lib.makeOverridable self.buildNodePackage { + name = "node-CSSwhat-0.4.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.2.tgz"; - name = "CSSwhat-0.4.2.tgz"; - sha1 = "7291585b71c5707ee7f49bbf3e9ae413ea715ff5"; + url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.5.tgz"; + name = "CSSwhat-0.4.5.tgz"; + sha1 = "85d7b2799ff3d98055353c802949e39913e16a62"; }) ]; buildInputs = @@ -64,6 +83,48 @@ ]; passthru.names = [ "CSSwhat" ]; }; + by-spec."JSONStream"."~0.6.4" = + self.by-version."JSONStream"."0.6.4"; + by-version."JSONStream"."0.6.4" = lib.makeOverridable self.buildNodePackage { + name = "node-JSONStream-0.6.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.6.4.tgz"; + name = "JSONStream-0.6.4.tgz"; + sha1 = "4b2c8063f8f512787b2375f7ee9db69208fa2dcb"; + }) + ]; + buildInputs = + (self.nativeDeps."JSONStream" or []); + deps = [ + self.by-version."jsonparse"."0.0.5" + self.by-version."through"."2.2.7" + ]; + peerDependencies = [ + ]; + passthru.names = [ "JSONStream" ]; + }; + by-spec."JSONStream"."~0.7.1" = + self.by-version."JSONStream"."0.7.1"; + by-version."JSONStream"."0.7.1" = lib.makeOverridable self.buildNodePackage { + name = "node-JSONStream-0.7.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.7.1.tgz"; + name = "JSONStream-0.7.1.tgz"; + sha1 = "0a6bf7f85459beb1319486927d293c7cef8a0260"; + }) + ]; + buildInputs = + (self.nativeDeps."JSONStream" or []); + deps = [ + self.by-version."jsonparse"."0.0.5" + self.by-version."through"."2.2.7" + ]; + peerDependencies = [ + ]; + passthru.names = [ "JSONStream" ]; + }; by-spec."StringScanner"."~0.0.3" = self.by-version."StringScanner"."0.0.3"; by-version."StringScanner"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -106,6 +167,27 @@ self.by-version."abbrev"."1.0.4"; by-spec."abbrev"."~1.0.4" = self.by-version."abbrev"."1.0.4"; + by-spec."accepts"."1.0.0" = + self.by-version."accepts"."1.0.0"; + by-version."accepts"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-accepts-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/accepts/-/accepts-1.0.0.tgz"; + name = "accepts-1.0.0.tgz"; + sha1 = "3604c765586c3b9cf7877b6937cdbd4587f947dc"; + }) + ]; + buildInputs = + (self.nativeDeps."accepts" or []); + deps = [ + self.by-version."mime"."1.2.11" + self.by-version."negotiator"."0.3.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "accepts" ]; + }; by-spec."active-x-obfuscator"."0.0.1" = self.by-version."active-x-obfuscator"."0.0.1"; by-version."active-x-obfuscator"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -466,6 +548,25 @@ }; by-spec."argparse"."~ 0.1.11" = self.by-version."argparse"."0.1.15"; + by-spec."ascii-json"."~0.2" = + self.by-version."ascii-json"."0.2.0"; + by-version."ascii-json"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-ascii-json-0.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ascii-json/-/ascii-json-0.2.0.tgz"; + name = "ascii-json-0.2.0.tgz"; + sha1 = "10ddb361fd48f72595309fd10a6ea2e7bf2c9218"; + }) + ]; + buildInputs = + (self.nativeDeps."ascii-json" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "ascii-json" ]; + }; by-spec."ascli"."*" = self.by-version."ascli"."0.3.0"; by-version."ascli"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -527,6 +628,8 @@ passthru.names = [ "assert" ]; }; "assert" = self.by-version."assert"."1.1.1"; + by-spec."assert"."~1.1.0" = + self.by-version."assert"."1.1.1"; by-spec."assert-plus"."0.1.2" = self.by-version."assert-plus"."0.1.2"; by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage { @@ -565,6 +668,26 @@ ]; passthru.names = [ "assertion-error" ]; }; + by-spec."astw"."~0.1.0" = + self.by-version."astw"."0.1.0"; + by-version."astw"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-astw-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/astw/-/astw-0.1.0.tgz"; + name = "astw-0.1.0.tgz"; + sha1 = "098be2758a6e9e9e15465d4fc4ba36265de11085"; + }) + ]; + buildInputs = + (self.nativeDeps."astw" or []); + deps = [ + self.by-version."esprima-six"."0.0.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "astw" ]; + }; by-spec."async"."*" = self.by-version."async"."0.2.10"; by-version."async"."0.2.10" = lib.makeOverridable self.buildNodePackage { @@ -648,6 +771,8 @@ self.by-version."async"."0.2.10"; by-spec."async"."~0.1.22" = self.by-version."async"."0.1.22"; + by-spec."async"."~0.2.10" = + self.by-version."async"."0.2.10"; by-spec."async"."~0.2.6" = self.by-version."async"."0.2.10"; by-spec."async"."~0.2.7" = @@ -796,6 +921,25 @@ ]; passthru.names = [ "backoff" ]; }; + by-spec."base64-js"."~0.0.4" = + self.by-version."base64-js"."0.0.6"; + by-version."base64-js"."0.0.6" = lib.makeOverridable self.buildNodePackage { + name = "node-base64-js-0.0.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.6.tgz"; + name = "base64-js-0.0.6.tgz"; + sha1 = "7b859f79f0bbbd55867ba67a7fab397e24a20947"; + }) + ]; + buildInputs = + (self.nativeDeps."base64-js" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "base64-js" ]; + }; by-spec."base64id"."0.1.0" = self.by-version."base64id"."0.1.0"; by-version."base64id"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -1041,7 +1185,7 @@ self.by-version."decompress-zip"."0.0.4" self.by-version."fstream"."0.1.25" self.by-version."fstream-ignore"."0.0.7" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" self.by-version."graceful-fs"."2.0.2" self.by-version."handlebars"."1.0.12" self.by-version."inquirer"."0.3.5" @@ -1235,14 +1379,14 @@ passthru.names = [ "bower-registry-client" ]; }; by-spec."bower2nix"."*" = - self.by-version."bower2nix"."3.0.0"; - by-version."bower2nix"."3.0.0" = lib.makeOverridable self.buildNodePackage { - name = "bower2nix-3.0.0"; + self.by-version."bower2nix"."2.1.0"; + by-version."bower2nix"."2.1.0" = lib.makeOverridable self.buildNodePackage { + name = "bower2nix-2.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/bower2nix/-/bower2nix-3.0.0.tgz"; - name = "bower2nix-3.0.0.tgz"; - sha1 = "afe3c676baff67b86e06f5514a325be45b317184"; + url = "http://registry.npmjs.org/bower2nix/-/bower2nix-2.1.0.tgz"; + name = "bower2nix-2.1.0.tgz"; + sha1 = "213f507a729b20a1c3cb48f995a034f9c05f53e6"; }) ]; buildInputs = @@ -1251,6 +1395,9 @@ self.by-version."temp"."0.6.0" self.by-version."fs.extra"."1.2.1" self.by-version."bower-json"."0.4.0" + self.by-version."bower-endpoint-parser"."0.2.1" + self.by-version."bower-logger"."0.2.1" + self.by-version."bower"."1.2.8" self.by-version."argparse"."0.1.15" self.by-version."clone"."0.1.11" self.by-version."semver"."2.2.1" @@ -1260,7 +1407,7 @@ ]; passthru.names = [ "bower2nix" ]; }; - "bower2nix" = self.by-version."bower2nix"."3.0.0"; + "bower2nix" = self.by-version."bower2nix"."2.1.0"; by-spec."broadway"."0.2.9" = self.by-version."broadway"."0.2.9"; by-version."broadway"."0.2.9" = lib.makeOverridable self.buildNodePackage { @@ -1287,15 +1434,59 @@ }; by-spec."broadway"."0.2.x" = self.by-version."broadway"."0.2.9"; + by-spec."browser-pack"."~2.0.0" = + self.by-version."browser-pack"."2.0.1"; + by-version."browser-pack"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "browser-pack-2.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/browser-pack/-/browser-pack-2.0.1.tgz"; + name = "browser-pack-2.0.1.tgz"; + sha1 = "5d1c527f56c582677411c4db2a128648ff6bf150"; + }) + ]; + buildInputs = + (self.nativeDeps."browser-pack" or []); + deps = [ + self.by-version."JSONStream"."0.6.4" + self.by-version."through"."2.3.4" + self.by-version."combine-source-map"."0.3.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "browser-pack" ]; + }; + by-spec."browser-resolve"."~1.2.1" = + self.by-version."browser-resolve"."1.2.2"; + by-version."browser-resolve"."1.2.2" = lib.makeOverridable self.buildNodePackage { + name = "node-browser-resolve-1.2.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.2.2.tgz"; + name = "browser-resolve-1.2.2.tgz"; + sha1 = "83b1eaed8f120b906f56078e134669db0a4a5c11"; + }) + ]; + buildInputs = + (self.nativeDeps."browser-resolve" or []); + deps = [ + self.by-version."resolve"."0.6.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "browser-resolve" ]; + }; + by-spec."browser-resolve"."~1.2.2" = + self.by-version."browser-resolve"."1.2.2"; by-spec."browserchannel"."*" = - self.by-version."browserchannel"."1.0.8"; - by-version."browserchannel"."1.0.8" = lib.makeOverridable self.buildNodePackage { - name = "node-browserchannel-1.0.8"; + self.by-version."browserchannel"."1.1.1"; + by-version."browserchannel"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-browserchannel-1.1.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.0.8.tgz"; - name = "browserchannel-1.0.8.tgz"; - sha1 = "96da83d139d8943f5bd616c334f148bd008dbac4"; + url = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.1.1.tgz"; + name = "browserchannel-1.1.1.tgz"; + sha1 = "223aeddf06892314e11f15fd2d4e2ade64a1bba5"; }) ]; buildInputs = @@ -1304,12 +1495,77 @@ self.by-version."hat"."0.0.3" self.by-version."connect"."2.13.0" self.by-version."request"."2.34.0" + self.by-version."ascii-json"."0.2.0" ]; peerDependencies = [ ]; passthru.names = [ "browserchannel" ]; }; - "browserchannel" = self.by-version."browserchannel"."1.0.8"; + "browserchannel" = self.by-version."browserchannel"."1.1.1"; + by-spec."browserify"."~3.31.2" = + self.by-version."browserify"."3.31.2"; + by-version."browserify"."3.31.2" = lib.makeOverridable self.buildNodePackage { + name = "browserify-3.31.2"; + src = [ + (self.patchSource fetchurl { + url = "http://registry.npmjs.org/browserify/-/browserify-3.31.2.tgz"; + name = "browserify-3.31.2.tgz"; + sha1 = "ec5bbd7fff284645db59280c340d972868e0ab1b"; + }) + ]; + buildInputs = + (self.nativeDeps."browserify" or []); + deps = [ + self.by-version."module-deps"."1.7.1" + self.by-version."browser-pack"."2.0.1" + self.by-version."deps-sort"."0.1.1" + self.by-version."shell-quote"."0.0.1" + self.by-version."through"."2.3.4" + self.by-version."duplexer"."0.1.1" + self.by-version."stream-combiner"."0.0.4" + self.by-version."concat-stream"."1.4.1" + self.by-version."insert-module-globals"."3.2.0" + self.by-version."syntax-error"."0.1.0" + self.by-version."browser-resolve"."1.2.2" + self.by-version."inherits"."2.0.1" + self.by-version."JSONStream"."0.7.1" + self.by-version."umd"."2.0.0" + self.by-version."parents"."0.0.2" + self.by-version."deep-equal"."0.1.2" + self.by-version."constants-browserify"."0.0.1" + self.by-version."os-browserify"."0.1.1" + self.by-version."console-browserify"."1.0.3" + self.by-version."vm-browserify"."0.0.4" + self.by-version."zlib-browserify"."0.0.3" + self.by-version."assert"."1.1.1" + self.by-version."http-browserify"."1.3.2" + self.by-version."crypto-browserify"."1.0.9" + self.by-version."util"."0.10.3" + self.by-version."events"."1.0.0" + self.by-version."buffer"."2.1.4" + self.by-version."url"."0.7.9" + self.by-version."https-browserify"."0.0.0" + self.by-version."path-browserify"."0.0.0" + self.by-version."querystring"."0.2.0" + self.by-version."stream-browserify"."0.1.3" + self.by-version."string_decoder"."0.0.1" + self.by-version."tty-browserify"."0.0.0" + self.by-version."timers-browserify"."1.0.1" + self.by-version."punycode"."1.2.4" + self.by-version."defined"."0.0.0" + self.by-version."domain-browser"."1.1.1" + self.by-version."derequire"."0.6.1" + self.by-version."commondir"."0.0.1" + self.by-version."shallow-copy"."0.0.1" + self.by-version."subarg"."0.0.1" + self.by-version."resolve"."0.6.1" + self.by-version."glob"."3.2.9" + self.by-version."builtins"."0.0.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "browserify" ]; + }; by-spec."bson"."0.1.8" = self.by-version."bson"."0.1.8"; by-version."bson"."0.1.8" = lib.makeOverridable self.buildNodePackage { @@ -1367,15 +1623,15 @@ ]; passthru.names = [ "bson" ]; }; - by-spec."bson"."0.2.6" = - self.by-version."bson"."0.2.6"; - by-version."bson"."0.2.6" = lib.makeOverridable self.buildNodePackage { - name = "node-bson-0.2.6"; + by-spec."bson"."0.2.7" = + self.by-version."bson"."0.2.7"; + by-version."bson"."0.2.7" = lib.makeOverridable self.buildNodePackage { + name = "node-bson-0.2.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/bson/-/bson-0.2.6.tgz"; - name = "bson-0.2.6.tgz"; - sha1 = "d001aa3d20b92e3f9cbc19d542515a748586a743"; + url = "http://registry.npmjs.org/bson/-/bson-0.2.7.tgz"; + name = "bson-0.2.7.tgz"; + sha1 = "6793161c40e5a9757091d7ee7d52a4717950236b"; }) ]; buildInputs = @@ -1387,6 +1643,27 @@ ]; passthru.names = [ "bson" ]; }; + by-spec."buffer"."~2.1.4" = + self.by-version."buffer"."2.1.4"; + by-version."buffer"."2.1.4" = lib.makeOverridable self.buildNodePackage { + name = "node-buffer-2.1.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/buffer/-/buffer-2.1.4.tgz"; + name = "buffer-2.1.4.tgz"; + sha1 = "0283e62870b4f450b636e00eb9fd527cd9ae1341"; + }) + ]; + buildInputs = + (self.nativeDeps."buffer" or []); + deps = [ + self.by-version."base64-js"."0.0.6" + self.by-version."ieee754"."1.1.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "buffer" ]; + }; by-spec."buffer-crc32"."0.1.1" = self.by-version."buffer-crc32"."0.1.1"; by-version."buffer-crc32"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -1485,6 +1762,25 @@ ]; passthru.names = [ "buffertools" ]; }; + by-spec."builtins"."0.0.2" = + self.by-version."builtins"."0.0.2"; + by-version."builtins"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-builtins-0.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/builtins/-/builtins-0.0.2.tgz"; + name = "builtins-0.0.2.tgz"; + sha1 = "b738db1ea166b752f7e0144c76f6ad5289448e51"; + }) + ]; + buildInputs = + (self.nativeDeps."builtins" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "builtins" ]; + }; by-spec."bunyan"."0.21.1" = self.by-version."bunyan"."0.21.1"; by-version."bunyan"."0.21.1" = lib.makeOverridable self.buildNodePackage { @@ -1585,6 +1881,25 @@ }; by-spec."bytes"."~0.2.1" = self.by-version."bytes"."0.2.1"; + by-spec."callsite"."~1.0.0" = + self.by-version."callsite"."1.0.0"; + by-version."callsite"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-callsite-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz"; + name = "callsite-1.0.0.tgz"; + sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20"; + }) + ]; + buildInputs = + (self.nativeDeps."callsite" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "callsite" ]; + }; by-spec."cardinal"."~0.4.0" = self.by-version."cardinal"."0.4.4"; by-version."cardinal"."0.4.4" = lib.makeOverridable self.buildNodePackage { @@ -1599,7 +1914,7 @@ buildInputs = (self.nativeDeps."cardinal" or []); deps = [ - self.by-version."redeyed"."0.4.2" + self.by-version."redeyed"."0.4.4" self.by-version."ansicolors"."0.2.1" ]; peerDependencies = [ @@ -1648,6 +1963,28 @@ ]; passthru.names = [ "chainsaw" ]; }; + by-spec."chalk"."^0.4.0" = + self.by-version."chalk"."0.4.0"; + by-version."chalk"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "node-chalk-0.4.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz"; + name = "chalk-0.4.0.tgz"; + sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"; + }) + ]; + buildInputs = + (self.nativeDeps."chalk" or []); + deps = [ + self.by-version."has-color"."0.1.4" + self.by-version."ansi-styles"."1.0.0" + self.by-version."strip-ansi"."0.1.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "chalk" ]; + }; by-spec."chalk"."~0.1.1" = self.by-version."chalk"."0.1.1"; by-version."chalk"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -1715,26 +2052,6 @@ }; by-spec."chalk"."~0.4.0" = self.by-version."chalk"."0.4.0"; - by-version."chalk"."0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "node-chalk-0.4.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz"; - name = "chalk-0.4.0.tgz"; - sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"; - }) - ]; - buildInputs = - (self.nativeDeps."chalk" or []); - deps = [ - self.by-version."has-color"."0.1.4" - self.by-version."ansi-styles"."1.0.0" - self.by-version."strip-ansi"."0.1.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "chalk" ]; - }; by-spec."character-parser"."1.2.0" = self.by-version."character-parser"."1.2.0"; by-version."character-parser"."1.2.0" = lib.makeOverridable self.buildNodePackage { @@ -1916,35 +2233,15 @@ ]; passthru.names = [ "class-extend" ]; }; - by-spec."clean-css"."2.0.x" = - self.by-version."clean-css"."2.0.8"; - by-version."clean-css"."2.0.8" = lib.makeOverridable self.buildNodePackage { - name = "clean-css-2.0.8"; + by-spec."clean-css"."2.1.x" = + self.by-version."clean-css"."2.1.4"; + by-version."clean-css"."2.1.4" = lib.makeOverridable self.buildNodePackage { + name = "clean-css-2.1.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/clean-css/-/clean-css-2.0.8.tgz"; - name = "clean-css-2.0.8.tgz"; - sha1 = "e937cdfdcc5781a00817aec4079e85b3ec157a20"; - }) - ]; - buildInputs = - (self.nativeDeps."clean-css" or []); - deps = [ - self.by-version."commander"."2.0.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "clean-css" ]; - }; - by-spec."clean-css"."~2.1.0" = - self.by-version."clean-css"."2.1.1"; - by-version."clean-css"."2.1.1" = lib.makeOverridable self.buildNodePackage { - name = "clean-css-2.1.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/clean-css/-/clean-css-2.1.1.tgz"; - name = "clean-css-2.1.1.tgz"; - sha1 = "eb0a46987629bee4550e2a1b8e6b6d6259d1e677"; + url = "http://registry.npmjs.org/clean-css/-/clean-css-2.1.4.tgz"; + name = "clean-css-2.1.4.tgz"; + sha1 = "82b59182c8aa02d7050329b0b977f7651bf9875e"; }) ]; buildInputs = @@ -1956,6 +2253,8 @@ ]; passthru.names = [ "clean-css" ]; }; + by-spec."clean-css"."~2.1.0" = + self.by-version."clean-css"."2.1.4"; by-spec."cli"."0.4.x" = self.by-version."cli"."0.4.5"; by-version."cli"."0.4.5" = lib.makeOverridable self.buildNodePackage { @@ -1970,7 +2269,7 @@ buildInputs = (self.nativeDeps."cli" or []); deps = [ - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" ]; peerDependencies = [ ]; @@ -2349,6 +2648,28 @@ ]; passthru.names = [ "columnify" ]; }; + by-spec."combine-source-map"."~0.3.0" = + self.by-version."combine-source-map"."0.3.0"; + by-version."combine-source-map"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-combine-source-map-0.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz"; + name = "combine-source-map-0.3.0.tgz"; + sha1 = "d9e74f593d9cd43807312cb5d846d451efaa9eb7"; + }) + ]; + buildInputs = + (self.nativeDeps."combine-source-map" or []); + deps = [ + self.by-version."inline-source-map"."0.3.0" + self.by-version."convert-source-map"."0.3.3" + self.by-version."source-map"."0.1.33" + ]; + peerDependencies = [ + ]; + passthru.names = [ "combine-source-map" ]; + }; by-spec."combined-stream"."~0.0.4" = self.by-version."combined-stream"."0.0.4"; by-version."combined-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -2447,8 +2768,6 @@ ]; passthru.names = [ "commander" ]; }; - by-spec."commander"."2.0.x" = - self.by-version."commander"."2.0.0"; by-spec."commander"."2.1.0" = self.by-version."commander"."2.1.0"; by-version."commander"."2.1.0" = lib.makeOverridable self.buildNodePackage { @@ -2472,6 +2791,25 @@ self.by-version."commander"."2.1.0"; by-spec."commander"."~0.6.1" = self.by-version."commander"."0.6.1"; + by-spec."commondir"."0.0.1" = + self.by-version."commondir"."0.0.1"; + by-version."commondir"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-commondir-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz"; + name = "commondir-0.0.1.tgz"; + sha1 = "89f00fdcd51b519c578733fec563e6a6da7f5be2"; + }) + ]; + buildInputs = + (self.nativeDeps."commondir" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "commondir" ]; + }; by-spec."compressible"."1.0.0" = self.by-version."compressible"."1.0.0"; by-version."compressible"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -2491,6 +2829,30 @@ ]; passthru.names = [ "compressible" ]; }; + by-spec."concat-stream"."^1.4.1" = + self.by-version."concat-stream"."1.4.1"; + by-version."concat-stream"."1.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-concat-stream-1.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.1.tgz"; + name = "concat-stream-1.4.1.tgz"; + sha1 = "20358b86fe36e5ac3de29cec76f4d04ad8ff1423"; + }) + ]; + buildInputs = + (self.nativeDeps."concat-stream" or []); + deps = [ + self.by-version."inherits"."2.0.1" + self.by-version."typedarray"."0.0.5" + self.by-version."readable-stream"."1.1.11" + ]; + peerDependencies = [ + ]; + passthru.names = [ "concat-stream" ]; + }; + by-spec."concat-stream"."~1.4.1" = + self.by-version."concat-stream"."1.4.1"; by-spec."config"."0.4.15" = self.by-version."config"."0.4.15"; by-version."config"."0.4.15" = lib.makeOverridable self.buildNodePackage { @@ -2575,7 +2937,7 @@ (self.nativeDeps."configstore" or []); deps = [ self.by-version."mkdirp"."0.3.5" - self.by-version."js-yaml"."3.0.1" + self.by-version."js-yaml"."3.0.2" self.by-version."osenv"."0.0.3" self.by-version."graceful-fs"."2.0.2" self.by-version."uuid"."1.4.1" @@ -2849,7 +3211,7 @@ buildInputs = (self.nativeDeps."connect-jade-static" or []); deps = [ - self.by-version."jade"."1.1.5" + self.by-version."jade"."1.3.0" ]; peerDependencies = [ ]; @@ -2915,6 +3277,25 @@ ]; passthru.names = [ "console-browserify" ]; }; + by-spec."console-browserify"."~1.0.1" = + self.by-version."console-browserify"."1.0.3"; + by-version."console-browserify"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "node-console-browserify-1.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/console-browserify/-/console-browserify-1.0.3.tgz"; + name = "console-browserify-1.0.3.tgz"; + sha1 = "d3898d2c3a93102f364197f8874b4f92b5286a8e"; + }) + ]; + buildInputs = + (self.nativeDeps."console-browserify" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "console-browserify" ]; + }; by-spec."constantinople"."~1.0.1" = self.by-version."constantinople"."1.0.2"; by-version."constantinople"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -2937,6 +3318,64 @@ }; by-spec."constantinople"."~1.0.2" = self.by-version."constantinople"."1.0.2"; + by-spec."constantinople"."~2.0.0" = + self.by-version."constantinople"."2.0.0"; + by-version."constantinople"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-constantinople-2.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/constantinople/-/constantinople-2.0.0.tgz"; + name = "constantinople-2.0.0.tgz"; + sha1 = "0558c3f340095a43acf2386149e5537074330e49"; + }) + ]; + buildInputs = + (self.nativeDeps."constantinople" or []); + deps = [ + self.by-version."uglify-js"."2.4.12" + ]; + peerDependencies = [ + ]; + passthru.names = [ "constantinople" ]; + }; + by-spec."constants-browserify"."~0.0.1" = + self.by-version."constants-browserify"."0.0.1"; + by-version."constants-browserify"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-constants-browserify-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz"; + name = "constants-browserify-0.0.1.tgz"; + sha1 = "92577db527ba6c4cf0a4568d84bc031f441e21f2"; + }) + ]; + buildInputs = + (self.nativeDeps."constants-browserify" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "constants-browserify" ]; + }; + by-spec."convert-source-map"."~0.3.0" = + self.by-version."convert-source-map"."0.3.3"; + by-version."convert-source-map"."0.3.3" = lib.makeOverridable self.buildNodePackage { + name = "node-convert-source-map-0.3.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.3.tgz"; + name = "convert-source-map-0.3.3.tgz"; + sha1 = "f77f130ded4e611d313a1bcf78f988990831c69b"; + }) + ]; + buildInputs = + (self.nativeDeps."convert-source-map" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "convert-source-map" ]; + }; by-spec."cookie"."0.0.4" = self.by-version."cookie"."0.0.4"; by-version."cookie"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -3070,6 +3509,25 @@ ]; passthru.names = [ "cookie-signature" ]; }; + by-spec."cookie-signature"."1.0.3" = + self.by-version."cookie-signature"."1.0.3"; + by-version."cookie-signature"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "node-cookie-signature-1.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz"; + name = "cookie-signature-1.0.3.tgz"; + sha1 = "91cd997cc51fb641595738c69cda020328f50ff9"; + }) + ]; + buildInputs = + (self.nativeDeps."cookie-signature" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "cookie-signature" ]; + }; by-spec."cookiejar"."1.3.0" = self.by-version."cookiejar"."1.3.0"; by-version."cookiejar"."1.3.0" = lib.makeOverridable self.buildNodePackage { @@ -3290,6 +3748,25 @@ ]; passthru.names = [ "crypto" ]; }; + by-spec."crypto-browserify"."~1.0.9" = + self.by-version."crypto-browserify"."1.0.9"; + by-version."crypto-browserify"."1.0.9" = lib.makeOverridable self.buildNodePackage { + name = "node-crypto-browserify-1.0.9"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-1.0.9.tgz"; + name = "crypto-browserify-1.0.9.tgz"; + sha1 = "cc5449685dfb85eb11c9828acc7cb87ab5bbfcc0"; + }) + ]; + buildInputs = + (self.nativeDeps."crypto-browserify" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "crypto-browserify" ]; + }; by-spec."css"."~1.0.8" = self.by-version."css"."1.0.8"; by-version."css"."1.0.8" = lib.makeOverridable self.buildNodePackage { @@ -3658,6 +4135,27 @@ ]; passthru.names = [ "deep-equal" ]; }; + by-spec."deep-equal"."~0.0.0" = + self.by-version."deep-equal"."0.0.0"; + by-spec."deep-equal"."~0.1.0" = + self.by-version."deep-equal"."0.1.2"; + by-version."deep-equal"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-deep-equal-0.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz"; + name = "deep-equal-0.1.2.tgz"; + sha1 = "b246c2b80a570a47c11be1d9bd1070ec878b87ce"; + }) + ]; + buildInputs = + (self.nativeDeps."deep-equal" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "deep-equal" ]; + }; by-spec."deep-extend"."~0.2.5" = self.by-version."deep-extend"."0.2.8"; by-version."deep-extend"."0.2.8" = lib.makeOverridable self.buildNodePackage { @@ -3677,8 +4175,27 @@ ]; passthru.names = [ "deep-extend" ]; }; - by-spec."deep-extend"."~0.2.6" = + by-spec."deep-extend"."~0.2.8" = self.by-version."deep-extend"."0.2.8"; + by-spec."defined"."~0.0.0" = + self.by-version."defined"."0.0.0"; + by-version."defined"."0.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-defined-0.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/defined/-/defined-0.0.0.tgz"; + name = "defined-0.0.0.tgz"; + sha1 = "f35eea7d705e933baf13b2f03b3f83d921403b3e"; + }) + ]; + buildInputs = + (self.nativeDeps."defined" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "defined" ]; + }; by-spec."delayed-stream"."0.0.5" = self.by-version."delayed-stream"."0.0.5"; by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { @@ -3698,6 +4215,71 @@ ]; passthru.names = [ "delayed-stream" ]; }; + by-spec."deps-sort"."~0.1.1" = + self.by-version."deps-sort"."0.1.1"; + by-version."deps-sort"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "deps-sort-0.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/deps-sort/-/deps-sort-0.1.1.tgz"; + name = "deps-sort-0.1.1.tgz"; + sha1 = "940d9da1f84a3891c7218ad240ec5ed6084bc8d6"; + }) + ]; + buildInputs = + (self.nativeDeps."deps-sort" or []); + deps = [ + self.by-version."through"."2.3.4" + self.by-version."JSONStream"."0.6.4" + self.by-version."minimist"."0.0.8" + ]; + peerDependencies = [ + ]; + passthru.names = [ "deps-sort" ]; + }; + by-spec."derequire"."~0.6.0" = + self.by-version."derequire"."0.6.1"; + by-version."derequire"."0.6.1" = lib.makeOverridable self.buildNodePackage { + name = "node-derequire-0.6.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/derequire/-/derequire-0.6.1.tgz"; + name = "derequire-0.6.1.tgz"; + sha1 = "cce8ee25380de715deb61900f0bdd38222928788"; + }) + ]; + buildInputs = + (self.nativeDeps."derequire" or []); + deps = [ + self.by-version."estraverse"."1.5.0" + self.by-version."esprima-six"."0.0.3" + self.by-version."esrefactor"."0.1.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "derequire" ]; + }; + by-spec."detective"."~2.4.0" = + self.by-version."detective"."2.4.1"; + by-version."detective"."2.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-detective-2.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/detective/-/detective-2.4.1.tgz"; + name = "detective-2.4.1.tgz"; + sha1 = "943b8eec4c346f6ac501de25da2ea1a57ed77819"; + }) + ]; + buildInputs = + (self.nativeDeps."detective" or []); + deps = [ + self.by-version."escodegen"."1.1.0" + self.by-version."esprima-six"."0.0.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "detective" ]; + }; by-spec."di"."~0.0.1" = self.by-version."di"."0.0.1"; by-version."di"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -3799,6 +4381,25 @@ ]; passthru.names = [ "dkim-signer" ]; }; + by-spec."domain-browser"."~1.1.0" = + self.by-version."domain-browser"."1.1.1"; + by-version."domain-browser"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-domain-browser-1.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/domain-browser/-/domain-browser-1.1.1.tgz"; + name = "domain-browser-1.1.1.tgz"; + sha1 = "0123c1b9afe3bb7c8a9e856177b2059440957de0"; + }) + ]; + buildInputs = + (self.nativeDeps."domain-browser" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "domain-browser" ]; + }; by-spec."domelementtype"."1" = self.by-version."domelementtype"."1.1.1"; by-version."domelementtype"."1.1.1" = lib.makeOverridable self.buildNodePackage { @@ -4194,6 +4795,8 @@ passthru.names = [ "escape-html" ]; }; "escape-html" = self.by-version."escape-html"."1.0.1"; + by-spec."escape-html"."1.0.1" = + self.by-version."escape-html"."1.0.1"; by-spec."escodegen"."*" = self.by-version."escodegen"."1.2.0"; by-version."escodegen"."1.2.0" = lib.makeOverridable self.buildNodePackage { @@ -4211,7 +4814,7 @@ self.by-version."esprima"."1.0.4" self.by-version."estraverse"."1.5.0" self.by-version."esutils"."1.0.0" - self.by-version."source-map"."0.1.32" + self.by-version."source-map"."0.1.33" ]; peerDependencies = [ ]; @@ -4233,7 +4836,7 @@ deps = [ self.by-version."esprima"."1.0.4" self.by-version."estraverse"."0.0.4" - self.by-version."source-map"."0.1.32" + self.by-version."source-map"."0.1.33" ]; peerDependencies = [ ]; @@ -4256,12 +4859,55 @@ self.by-version."esprima"."1.0.4" self.by-version."estraverse"."1.5.0" self.by-version."esutils"."1.0.0" - self.by-version."source-map"."0.1.32" + self.by-version."source-map"."0.1.33" ]; peerDependencies = [ ]; passthru.names = [ "escodegen" ]; }; + by-spec."escodegen"."~1.1.0" = + self.by-version."escodegen"."1.1.0"; + by-version."escodegen"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "escodegen-1.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/escodegen/-/escodegen-1.1.0.tgz"; + name = "escodegen-1.1.0.tgz"; + sha1 = "c663923f6e20aad48d0c0fa49f31c6d4f49360cf"; + }) + ]; + buildInputs = + (self.nativeDeps."escodegen" or []); + deps = [ + self.by-version."esprima"."1.0.4" + self.by-version."estraverse"."1.5.0" + self.by-version."esutils"."1.0.0" + self.by-version."source-map"."0.1.33" + ]; + peerDependencies = [ + ]; + passthru.names = [ "escodegen" ]; + }; + by-spec."escope"."~0.0.13" = + self.by-version."escope"."0.0.16"; + by-version."escope"."0.0.16" = lib.makeOverridable self.buildNodePackage { + name = "node-escope-0.0.16"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/escope/-/escope-0.0.16.tgz"; + name = "escope-0.0.16.tgz"; + sha1 = "418c7a0afca721dafe659193fd986283e746538f"; + }) + ]; + buildInputs = + (self.nativeDeps."escope" or []); + deps = [ + self.by-version."estraverse"."1.5.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "escope" ]; + }; by-spec."esprima"."1.0.x" = self.by-version."esprima"."1.0.4"; by-version."esprima"."1.0.4" = lib.makeOverridable self.buildNodePackage { @@ -4283,12 +4929,53 @@ }; by-spec."esprima"."~ 1.0.2" = self.by-version."esprima"."1.0.4"; - by-spec."esprima"."~1.0.0" = - self.by-version."esprima"."1.0.4"; by-spec."esprima"."~1.0.2" = self.by-version."esprima"."1.0.4"; by-spec."esprima"."~1.0.4" = self.by-version."esprima"."1.0.4"; + by-spec."esprima-six"."0.0.3" = + self.by-version."esprima-six"."0.0.3"; + by-version."esprima-six"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "esprima-six-0.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/esprima-six/-/esprima-six-0.0.3.tgz"; + name = "esprima-six-0.0.3.tgz"; + sha1 = "8eb750435b02d3e50cf09b5736cbce4606a4399f"; + }) + ]; + buildInputs = + (self.nativeDeps."esprima-six" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "esprima-six" ]; + }; + by-spec."esprima-six"."~0.0.3" = + self.by-version."esprima-six"."0.0.3"; + by-spec."esrefactor"."~0.1.0" = + self.by-version."esrefactor"."0.1.0"; + by-version."esrefactor"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-esrefactor-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/esrefactor/-/esrefactor-0.1.0.tgz"; + name = "esrefactor-0.1.0.tgz"; + sha1 = "d142795a282339ab81e936b5b7a21b11bf197b13"; + }) + ]; + buildInputs = + (self.nativeDeps."esrefactor" or []); + deps = [ + self.by-version."esprima"."1.0.4" + self.by-version."estraverse"."0.0.4" + self.by-version."escope"."0.0.16" + ]; + peerDependencies = [ + ]; + passthru.names = [ "esrefactor" ]; + }; by-spec."estraverse"."*" = self.by-version."estraverse"."1.5.0"; by-version."estraverse"."1.5.0" = lib.makeOverridable self.buildNodePackage { @@ -4308,6 +4995,8 @@ ]; passthru.names = [ "estraverse" ]; }; + by-spec."estraverse".">= 0.0.2" = + self.by-version."estraverse"."1.5.0"; by-spec."estraverse"."~0.0.4" = self.by-version."estraverse"."0.0.4"; by-version."estraverse"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -4428,6 +5117,25 @@ }; by-spec."eventemitter2"."~0.4.13" = self.by-version."eventemitter2"."0.4.13"; + by-spec."events"."~1.0.0" = + self.by-version."events"."1.0.0"; + by-version."events"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-events-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/events/-/events-1.0.0.tgz"; + name = "events-1.0.0.tgz"; + sha1 = "63c0f80c74d1435e8eb03b54306a9d8e8f6f9da0"; + }) + ]; + buildInputs = + (self.nativeDeps."events" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "events" ]; + }; by-spec."events.node".">= 0.4.0" = self.by-version."events.node"."0.4.9"; by-version."events.node"."0.4.9" = lib.makeOverridable self.buildNodePackage { @@ -4517,37 +5225,39 @@ by-spec."exit"."~0.1.1" = self.by-version."exit"."0.1.2"; by-spec."express"."*" = - self.by-version."express"."3.4.8"; - by-version."express"."3.4.8" = lib.makeOverridable self.buildNodePackage { - name = "express-3.4.8"; + self.by-version."express"."4.0.0-rc2"; + by-version."express"."4.0.0-rc2" = lib.makeOverridable self.buildNodePackage { + name = "node-express-4.0.0-rc2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.4.8.tgz"; - name = "express-3.4.8.tgz"; - sha1 = "aa7a8986de07053337f4bc5ed9a6453d9cc8e2e1"; + url = "http://registry.npmjs.org/express/-/express-4.0.0-rc2.tgz"; + name = "express-4.0.0-rc2.tgz"; + sha1 = "0b3fc3b853b393cdb5042dc9960498015ed06b96"; }) ]; buildInputs = (self.nativeDeps."express" or []); deps = [ - self.by-version."connect"."2.12.0" - self.by-version."commander"."1.3.2" - self.by-version."range-parser"."0.0.4" - self.by-version."mkdirp"."0.3.5" + self.by-version."accepts"."1.0.0" + self.by-version."type-is"."1.0.0" + self.by-version."range-parser"."1.0.0" self.by-version."cookie"."0.1.0" self.by-version."buffer-crc32"."0.2.1" - self.by-version."fresh"."0.2.0" + self.by-version."fresh"."0.2.2" self.by-version."methods"."0.1.0" - self.by-version."send"."0.1.4" - self.by-version."cookie-signature"."1.0.1" - self.by-version."merge-descriptors"."0.0.1" + self.by-version."send"."0.2.0" + self.by-version."cookie-signature"."1.0.3" + self.by-version."merge-descriptors"."0.0.2" + self.by-version."utils-merge"."1.0.0" + self.by-version."escape-html"."1.0.1" + self.by-version."qs"."0.6.6" self.by-version."debug"."0.7.4" ]; peerDependencies = [ ]; passthru.names = [ "express" ]; }; - "express" = self.by-version."express"."3.4.8"; + "express" = self.by-version."express"."4.0.0-rc2"; by-spec."express"."2.5.11" = self.by-version."express"."2.5.11"; by-version."express"."2.5.11" = lib.makeOverridable self.buildNodePackage { @@ -4633,6 +5343,35 @@ }; by-spec."express"."3.x" = self.by-version."express"."3.4.8"; + by-version."express"."3.4.8" = lib.makeOverridable self.buildNodePackage { + name = "express-3.4.8"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/express/-/express-3.4.8.tgz"; + name = "express-3.4.8.tgz"; + sha1 = "aa7a8986de07053337f4bc5ed9a6453d9cc8e2e1"; + }) + ]; + buildInputs = + (self.nativeDeps."express" or []); + deps = [ + self.by-version."connect"."2.12.0" + self.by-version."commander"."1.3.2" + self.by-version."range-parser"."0.0.4" + self.by-version."mkdirp"."0.3.5" + self.by-version."cookie"."0.1.0" + self.by-version."buffer-crc32"."0.2.1" + self.by-version."fresh"."0.2.0" + self.by-version."methods"."0.1.0" + self.by-version."send"."0.1.4" + self.by-version."cookie-signature"."1.0.1" + self.by-version."merge-descriptors"."0.0.1" + self.by-version."debug"."0.7.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "express" ]; + }; by-spec."express"."~3.1.1" = self.by-version."express"."3.1.2"; by-version."express"."3.1.2" = lib.makeOverridable self.buildNodePackage { @@ -4668,14 +5407,14 @@ by-spec."express"."~3.4.8" = self.by-version."express"."3.4.8"; by-spec."express-form"."*" = - self.by-version."express-form"."0.10.1"; - by-version."express-form"."0.10.1" = lib.makeOverridable self.buildNodePackage { - name = "node-express-form-0.10.1"; + self.by-version."express-form"."0.12.0"; + by-version."express-form"."0.12.0" = lib.makeOverridable self.buildNodePackage { + name = "node-express-form-0.12.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express-form/-/express-form-0.10.1.tgz"; - name = "express-form-0.10.1.tgz"; - sha1 = "542f43cf276c33f8ec8836b571aa3365505609a8"; + url = "http://registry.npmjs.org/express-form/-/express-form-0.12.0.tgz"; + name = "express-form-0.12.0.tgz"; + sha1 = "0525ce1365760fd90fb785829a430122aceb893a"; }) ]; buildInputs = @@ -4690,7 +5429,7 @@ ]; passthru.names = [ "express-form" ]; }; - "express-form" = self.by-version."express-form"."0.10.1"; + "express-form" = self.by-version."express-form"."0.12.0"; by-spec."express-partials"."0.0.6" = self.by-version."express-partials"."0.0.6"; by-version."express-partials"."0.0.6" = lib.makeOverridable self.buildNodePackage { @@ -4867,7 +5606,7 @@ self.by-version."bower-endpoint-parser"."0.2.1" self.by-version."bower-logger"."0.2.1" self.by-version."bower"."1.2.8" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" ]; peerDependencies = [ ]; @@ -4915,7 +5654,7 @@ self.by-version."lodash"."2.1.0" self.by-version."iconv-lite"."0.2.11" self.by-version."rimraf"."2.2.6" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" self.by-version."minimatch"."0.2.14" self.by-version."findup-sync"."0.1.2" self.by-version."isbinaryfile"."0.1.9" @@ -4941,21 +5680,21 @@ (self.nativeDeps."fileset" or []); deps = [ self.by-version."minimatch"."0.2.14" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" ]; peerDependencies = [ ]; passthru.names = [ "fileset" ]; }; by-spec."findit".">=1.1.0 <2.0.0" = - self.by-version."findit"."1.1.0"; - by-version."findit"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-findit-1.1.0"; + self.by-version."findit"."1.1.1"; + by-version."findit"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-findit-1.1.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/findit/-/findit-1.1.0.tgz"; - name = "findit-1.1.0.tgz"; - sha1 = "7104c60060f838d2298bd526b16add6ce733f9ac"; + url = "http://registry.npmjs.org/findit/-/findit-1.1.1.tgz"; + name = "findit-1.1.1.tgz"; + sha1 = "b460e2f7633d78ed2c217c77c4209ecacaf8262a"; }) ]; buildInputs = @@ -5359,7 +6098,7 @@ ]; passthru.names = [ "fresh" ]; }; - by-spec."fresh"."~0.2.1" = + by-spec."fresh"."0.2.2" = self.by-version."fresh"."0.2.2"; by-version."fresh"."0.2.2" = lib.makeOverridable self.buildNodePackage { name = "node-fresh-0.2.2"; @@ -5378,6 +6117,8 @@ ]; passthru.names = [ "fresh" ]; }; + by-spec."fresh"."~0.2.1" = + self.by-version."fresh"."0.2.2"; by-spec."fs-extra"."~0.6.1" = self.by-version."fs-extra"."0.6.4"; by-version."fs-extra"."0.6.4" = lib.makeOverridable self.buildNodePackage { @@ -5767,14 +6508,14 @@ passthru.names = [ "github-url-from-username-repo" ]; }; by-spec."glob"."3" = - self.by-version."glob"."3.2.8"; - by-version."glob"."3.2.8" = lib.makeOverridable self.buildNodePackage { - name = "node-glob-3.2.8"; + self.by-version."glob"."3.2.9"; + by-version."glob"."3.2.9" = lib.makeOverridable self.buildNodePackage { + name = "node-glob-3.2.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-3.2.8.tgz"; - name = "glob-3.2.8.tgz"; - sha1 = "5506f4311721bcc618c7d8dba144188750307073"; + url = "http://registry.npmjs.org/glob/-/glob-3.2.9.tgz"; + name = "glob-3.2.9.tgz"; + sha1 = "56af2289aa43d07d7702666480373eb814d91d40"; }) ]; buildInputs = @@ -5831,13 +6572,13 @@ passthru.names = [ "glob" ]; }; by-spec."glob"."3.2.x" = - self.by-version."glob"."3.2.8"; + self.by-version."glob"."3.2.9"; by-spec."glob"."3.x" = - self.by-version."glob"."3.2.8"; + self.by-version."glob"."3.2.9"; by-spec."glob".">= 3.1.4" = - self.by-version."glob"."3.2.8"; + self.by-version."glob"."3.2.9"; by-spec."glob".">=3.2.7 <4" = - self.by-version."glob"."3.2.8"; + self.by-version."glob"."3.2.9"; by-spec."glob"."~3.1.21" = self.by-version."glob"."3.1.21"; by-version."glob"."3.1.21" = lib.makeOverridable self.buildNodePackage { @@ -5861,13 +6602,15 @@ passthru.names = [ "glob" ]; }; by-spec."glob"."~3.2.0" = - self.by-version."glob"."3.2.8"; + self.by-version."glob"."3.2.9"; by-spec."glob"."~3.2.1" = - self.by-version."glob"."3.2.8"; + self.by-version."glob"."3.2.9"; by-spec."glob"."~3.2.6" = - self.by-version."glob"."3.2.8"; + self.by-version."glob"."3.2.9"; by-spec."glob"."~3.2.7" = - self.by-version."glob"."3.2.8"; + self.by-version."glob"."3.2.9"; + by-spec."glob"."~3.2.8" = + self.by-version."glob"."3.2.9"; by-spec."graceful-fs"."2" = self.by-version."graceful-fs"."2.0.2"; by-version."graceful-fs"."2.0.2" = lib.makeOverridable self.buildNodePackage { @@ -6011,6 +6754,8 @@ ]; passthru.names = [ "grunt" ]; }; + by-spec."grunt"."^0.4.0" = + self.by-version."grunt"."0.4.2"; by-spec."grunt"."~0.4" = self.by-version."grunt"."0.4.2"; by-spec."grunt"."~0.4.0" = @@ -6069,29 +6814,29 @@ by-spec."grunt-cli"."~0.1.7" = self.by-version."grunt-cli"."0.1.13"; by-spec."grunt-contrib-cssmin"."*" = - self.by-version."grunt-contrib-cssmin"."0.8.0"; - by-version."grunt-contrib-cssmin"."0.8.0" = lib.makeOverridable self.buildNodePackage { - name = "node-grunt-contrib-cssmin-0.8.0"; + self.by-version."grunt-contrib-cssmin"."0.9.0"; + by-version."grunt-contrib-cssmin"."0.9.0" = lib.makeOverridable self.buildNodePackage { + name = "node-grunt-contrib-cssmin-0.9.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.8.0.tgz"; - name = "grunt-contrib-cssmin-0.8.0.tgz"; - sha1 = "eb58cbfa466e6c96136c0220f191789eb22908b8"; + url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.9.0.tgz"; + name = "grunt-contrib-cssmin-0.9.0.tgz"; + sha1 = "27241f0160a8866659dab40dc8c2776c01ec7ce2"; }) ]; buildInputs = (self.nativeDeps."grunt-contrib-cssmin" or []); deps = [ self.by-version."chalk"."0.4.0" - self.by-version."clean-css"."2.1.1" - self.by-version."grunt-lib-contrib"."0.6.1" + self.by-version."clean-css"."2.1.4" + self.by-version."maxmin"."0.1.0" ]; peerDependencies = [ self.by-version."grunt"."0.4.2" ]; passthru.names = [ "grunt-contrib-cssmin" ]; }; - "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.8.0"; + "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.9.0"; by-spec."grunt-contrib-jshint"."*" = self.by-version."grunt-contrib-jshint"."0.8.0"; by-version."grunt-contrib-jshint"."0.8.0" = lib.makeOverridable self.buildNodePackage { @@ -6115,20 +6860,20 @@ }; "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.8.0"; by-spec."grunt-contrib-less"."*" = - self.by-version."grunt-contrib-less"."0.9.0"; - by-version."grunt-contrib-less"."0.9.0" = lib.makeOverridable self.buildNodePackage { - name = "node-grunt-contrib-less-0.9.0"; + self.by-version."grunt-contrib-less"."0.10.0"; + by-version."grunt-contrib-less"."0.10.0" = lib.makeOverridable self.buildNodePackage { + name = "node-grunt-contrib-less-0.10.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.9.0.tgz"; - name = "grunt-contrib-less-0.9.0.tgz"; - sha1 = "af1e6e76511c2bc328ef8d284058643ca5887675"; + url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.10.0.tgz"; + name = "grunt-contrib-less-0.10.0.tgz"; + sha1 = "542bf636ffb35f6e14c2e931855c1151b4a291b3"; }) ]; buildInputs = (self.nativeDeps."grunt-contrib-less" or []); deps = [ - self.by-version."less"."1.6.3" + self.by-version."less"."1.7.0" self.by-version."grunt-lib-contrib"."0.6.1" self.by-version."chalk"."0.4.0" ]; @@ -6137,16 +6882,16 @@ ]; passthru.names = [ "grunt-contrib-less" ]; }; - "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.9.0"; + "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.10.0"; by-spec."grunt-contrib-requirejs"."*" = - self.by-version."grunt-contrib-requirejs"."0.4.1"; - by-version."grunt-contrib-requirejs"."0.4.1" = lib.makeOverridable self.buildNodePackage { - name = "node-grunt-contrib-requirejs-0.4.1"; + self.by-version."grunt-contrib-requirejs"."0.4.3"; + by-version."grunt-contrib-requirejs"."0.4.3" = lib.makeOverridable self.buildNodePackage { + name = "node-grunt-contrib-requirejs-0.4.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-requirejs/-/grunt-contrib-requirejs-0.4.1.tgz"; - name = "grunt-contrib-requirejs-0.4.1.tgz"; - sha1 = "862ba167141b8a8f36af5444feab3272bb8cf4bd"; + url = "http://registry.npmjs.org/grunt-contrib-requirejs/-/grunt-contrib-requirejs-0.4.3.tgz"; + name = "grunt-contrib-requirejs-0.4.3.tgz"; + sha1 = "ac243dc312af5c85cd095169da1b3177bfe89c59"; }) ]; buildInputs = @@ -6159,31 +6904,31 @@ ]; passthru.names = [ "grunt-contrib-requirejs" ]; }; - "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.1"; + "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.3"; by-spec."grunt-contrib-uglify"."*" = - self.by-version."grunt-contrib-uglify"."0.3.2"; - by-version."grunt-contrib-uglify"."0.3.2" = lib.makeOverridable self.buildNodePackage { - name = "node-grunt-contrib-uglify-0.3.2"; + self.by-version."grunt-contrib-uglify"."0.4.0"; + by-version."grunt-contrib-uglify"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "node-grunt-contrib-uglify-0.4.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.3.2.tgz"; - name = "grunt-contrib-uglify-0.3.2.tgz"; - sha1 = "865b00ae0d11d1f5fafca3967c9b099f8929684b"; + url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.4.0.tgz"; + name = "grunt-contrib-uglify-0.4.0.tgz"; + sha1 = "6a4df3e85ccf4bbae484b0328cc71c9f102e80be"; }) ]; buildInputs = (self.nativeDeps."grunt-contrib-uglify" or []); deps = [ self.by-version."uglify-js"."2.4.12" - self.by-version."grunt-lib-contrib"."0.6.1" self.by-version."chalk"."0.4.0" + self.by-version."maxmin"."0.1.0" ]; peerDependencies = [ self.by-version."grunt"."0.4.2" ]; passthru.names = [ "grunt-contrib-uglify" ]; }; - "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.3.2"; + "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.4.0"; by-spec."grunt-karma"."*" = self.by-version."grunt-karma"."0.7.2"; by-version."grunt-karma"."0.7.2" = lib.makeOverridable self.buildNodePackage { @@ -6207,7 +6952,7 @@ passthru.names = [ "grunt-karma" ]; }; "grunt-karma" = self.by-version."grunt-karma"."0.7.2"; - by-spec."grunt-lib-contrib"."~0.6.0" = + by-spec."grunt-lib-contrib"."~0.6.1" = self.by-version."grunt-lib-contrib"."0.6.1"; by-version."grunt-lib-contrib"."0.6.1" = lib.makeOverridable self.buildNodePackage { name = "node-grunt-lib-contrib-0.6.1"; @@ -6227,8 +6972,6 @@ ]; passthru.names = [ "grunt-lib-contrib" ]; }; - by-spec."grunt-lib-contrib"."~0.6.1" = - self.by-version."grunt-lib-contrib"."0.6.1"; by-spec."grunt-sed"."*" = self.by-version."grunt-sed"."0.1.1"; by-version."grunt-sed"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -6266,7 +7009,7 @@ (self.nativeDeps."guifi-earth" or []); deps = [ self.by-version."coffee-script"."1.7.1" - self.by-version."jade"."1.1.5" + self.by-version."jade"."1.3.0" self.by-version."q"."1.0.0" self.by-version."xml2js"."0.4.1" self.by-version."msgpack"."0.2.2" @@ -6276,6 +7019,27 @@ passthru.names = [ "guifi-earth" ]; }; "guifi-earth" = self.by-version."guifi-earth"."0.2.1"; + by-spec."gzip-size"."^0.1.0" = + self.by-version."gzip-size"."0.1.0"; + by-version."gzip-size"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "gzip-size-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/gzip-size/-/gzip-size-0.1.0.tgz"; + name = "gzip-size-0.1.0.tgz"; + sha1 = "2beaecdaf4917bd151fe9a9d43ae199392d6c32a"; + }) + ]; + buildInputs = + (self.nativeDeps."gzip-size" or []); + deps = [ + self.by-version."concat-stream"."1.4.1" + self.by-version."zlib-browserify"."0.0.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "gzip-size" ]; + }; by-spec."gzippo"."*" = self.by-version."gzippo"."0.2.0"; by-version."gzippo"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -6719,6 +7483,27 @@ ]; passthru.names = [ "http-auth" ]; }; + by-spec."http-browserify"."~1.3.1" = + self.by-version."http-browserify"."1.3.2"; + by-version."http-browserify"."1.3.2" = lib.makeOverridable self.buildNodePackage { + name = "node-http-browserify-1.3.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/http-browserify/-/http-browserify-1.3.2.tgz"; + name = "http-browserify-1.3.2.tgz"; + sha1 = "b562c34479349a690d7a6597df495aefa8c604f5"; + }) + ]; + buildInputs = + (self.nativeDeps."http-browserify" or []); + deps = [ + self.by-version."Base64"."0.2.0" + self.by-version."inherits"."2.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "http-browserify" ]; + }; by-spec."http-proxy"."git://github.com/samalba/node-http-proxy" = self.by-version."http-proxy"."0.10.3"; by-version."http-proxy"."0.10.3" = lib.makeOverridable self.buildNodePackage { @@ -6809,6 +7594,25 @@ ]; passthru.names = [ "http-signature" ]; }; + by-spec."https-browserify"."~0.0.0" = + self.by-version."https-browserify"."0.0.0"; + by-version."https-browserify"."0.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-https-browserify-0.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz"; + name = "https-browserify-0.0.0.tgz"; + sha1 = "b3ffdfe734b2a3d4a9efd58e8654c91fce86eafd"; + }) + ]; + buildInputs = + (self.nativeDeps."https-browserify" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "https-browserify" ]; + }; by-spec."humanize"."~0.0.9" = self.by-version."humanize"."0.0.9"; by-version."humanize"."0.0.9" = lib.makeOverridable self.buildNodePackage { @@ -6915,6 +7719,44 @@ }; by-spec."iconv-lite"."~0.2.11" = self.by-version."iconv-lite"."0.2.11"; + by-spec."ieee754"."~1.1.1" = + self.by-version."ieee754"."1.1.3"; + by-version."ieee754"."1.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-ieee754-1.1.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ieee754/-/ieee754-1.1.3.tgz"; + name = "ieee754-1.1.3.tgz"; + sha1 = "1d4baae872e15ba69f6ab7588a965e09d485ec50"; + }) + ]; + buildInputs = + (self.nativeDeps."ieee754" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "ieee754" ]; + }; + by-spec."indexof"."0.0.1" = + self.by-version."indexof"."0.0.1"; + by-version."indexof"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-indexof-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"; + name = "indexof-0.0.1.tgz"; + sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; + }) + ]; + buildInputs = + (self.nativeDeps."indexof" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "indexof" ]; + }; by-spec."inherits"."1" = self.by-version."inherits"."1.0.0"; by-version."inherits"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -6961,6 +7803,8 @@ self.by-version."inherits"."1.0.0"; by-spec."inherits"."~2.0.0" = self.by-version."inherits"."2.0.1"; + by-spec."inherits"."~2.0.1" = + self.by-version."inherits"."2.0.1"; by-spec."ini"."1" = self.by-version."ini"."1.1.0"; by-version."ini"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -7002,12 +7846,32 @@ self.by-version."read"."1.0.5" self.by-version."read-package-json"."1.1.7" self.by-version."semver"."2.2.1" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" ]; peerDependencies = [ ]; passthru.names = [ "init-package-json" ]; }; + by-spec."inline-source-map"."~0.3.0" = + self.by-version."inline-source-map"."0.3.0"; + by-version."inline-source-map"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-inline-source-map-0.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.0.tgz"; + name = "inline-source-map-0.3.0.tgz"; + sha1 = "ad2acca97d82fcb9d0a56221ee72e8043116424a"; + }) + ]; + buildInputs = + (self.nativeDeps."inline-source-map" or []); + deps = [ + self.by-version."source-map"."0.1.33" + ]; + peerDependencies = [ + ]; + passthru.names = [ "inline-source-map" ]; + }; by-spec."inquirer"."~0.3.0" = self.by-version."inquirer"."0.3.5"; by-version."inquirer"."0.3.5" = lib.makeOverridable self.buildNodePackage { @@ -7060,6 +7924,30 @@ ]; passthru.names = [ "inquirer" ]; }; + by-spec."insert-module-globals"."~3.2.0" = + self.by-version."insert-module-globals"."3.2.0"; + by-version."insert-module-globals"."3.2.0" = lib.makeOverridable self.buildNodePackage { + name = "insert-module-globals-3.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-3.2.0.tgz"; + name = "insert-module-globals-3.2.0.tgz"; + sha1 = "5692a834207adebb3effa9f9def7cf314890a63b"; + }) + ]; + buildInputs = + (self.nativeDeps."insert-module-globals" or []); + deps = [ + self.by-version."lexical-scope"."0.1.0" + self.by-version."process"."0.5.2" + self.by-version."through"."2.3.4" + self.by-version."JSONStream"."0.7.1" + self.by-version."concat-stream"."1.4.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "insert-module-globals" ]; + }; by-spec."insight"."~0.3.0" = self.by-version."insight"."0.3.1"; by-version."insight"."0.3.1" = lib.makeOverridable self.buildNodePackage { @@ -7124,14 +8012,14 @@ self.by-version."nconf"."0.6.9" self.by-version."fs-walk"."0.0.1" self.by-version."async"."0.2.10" - self.by-version."express"."3.4.8" - self.by-version."jade"."1.1.5" + self.by-version."express"."4.0.0-rc2" + self.by-version."jade"."1.3.0" self.by-version."passport"."0.2.0" self.by-version."passport-http"."0.2.2" - self.by-version."js-yaml"."3.0.1" + self.by-version."js-yaml"."3.0.2" self.by-version."mongoose"."3.8.8" self.by-version."gridfs-stream"."0.4.1" - self.by-version."temp"."0.6.0" + self.by-version."temp"."0.7.0" self.by-version."kue"."0.7.5" self.by-version."redis"."0.10.1" self.by-version."hiredis"."0.1.16" @@ -7225,7 +8113,7 @@ self.by-version."abbrev"."1.0.4" self.by-version."wordwrap"."0.0.2" self.by-version."resolve"."0.6.1" - self.by-version."js-yaml"."3.0.1" + self.by-version."js-yaml"."3.0.2" ]; peerDependencies = [ ]; @@ -7263,14 +8151,14 @@ passthru.names = [ "istanbul" ]; }; by-spec."jade"."*" = - self.by-version."jade"."1.1.5"; - by-version."jade"."1.1.5" = lib.makeOverridable self.buildNodePackage { - name = "jade-1.1.5"; + self.by-version."jade"."1.3.0"; + by-version."jade"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "jade-1.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jade/-/jade-1.1.5.tgz"; - name = "jade-1.1.5.tgz"; - sha1 = "e884d3d3565807e280f5ba760f68addb176627a3"; + url = "http://registry.npmjs.org/jade/-/jade-1.3.0.tgz"; + name = "jade-1.3.0.tgz"; + sha1 = "776cae93f1ad5af6b61eff2340fcdc19a3225d48"; }) ]; buildInputs = @@ -7281,14 +8169,14 @@ self.by-version."transformers"."2.1.0" self.by-version."character-parser"."1.2.0" self.by-version."monocle"."1.1.51" - self.by-version."with"."2.0.0" - self.by-version."constantinople"."1.0.2" + self.by-version."with"."3.0.0" + self.by-version."constantinople"."2.0.0" ]; peerDependencies = [ ]; passthru.names = [ "jade" ]; }; - "jade" = self.by-version."jade"."1.1.5"; + "jade" = self.by-version."jade"."1.3.0"; by-spec."jade"."0.26.3" = self.by-version."jade"."0.26.3"; by-version."jade"."0.26.3" = lib.makeOverridable self.buildNodePackage { @@ -7333,8 +8221,32 @@ }; by-spec."jade"."1.1.5" = self.by-version."jade"."1.1.5"; + by-version."jade"."1.1.5" = lib.makeOverridable self.buildNodePackage { + name = "jade-1.1.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/jade/-/jade-1.1.5.tgz"; + name = "jade-1.1.5.tgz"; + sha1 = "e884d3d3565807e280f5ba760f68addb176627a3"; + }) + ]; + buildInputs = + (self.nativeDeps."jade" or []); + deps = [ + self.by-version."commander"."2.1.0" + self.by-version."mkdirp"."0.3.5" + self.by-version."transformers"."2.1.0" + self.by-version."character-parser"."1.2.0" + self.by-version."monocle"."1.1.51" + self.by-version."with"."2.0.0" + self.by-version."constantinople"."1.0.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "jade" ]; + }; by-spec."jade".">= 0.0.1" = - self.by-version."jade"."1.1.5"; + self.by-version."jade"."1.3.0"; by-spec."jade"."~0.35.0" = self.by-version."jade"."0.35.0"; by-version."jade"."0.35.0" = lib.makeOverridable self.buildNodePackage { @@ -7362,14 +8274,14 @@ passthru.names = [ "jade" ]; }; by-spec."jayschema"."*" = - self.by-version."jayschema"."0.2.4"; - by-version."jayschema"."0.2.4" = lib.makeOverridable self.buildNodePackage { - name = "jayschema-0.2.4"; + self.by-version."jayschema"."0.2.5"; + by-version."jayschema"."0.2.5" = lib.makeOverridable self.buildNodePackage { + name = "jayschema-0.2.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.4.tgz"; - name = "jayschema-0.2.4.tgz"; - sha1 = "de51c61702a472c579cf50adf70652b7e23977ae"; + url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.5.tgz"; + name = "jayschema-0.2.5.tgz"; + sha1 = "314e87687eac703a0a2557d77dbb3f175a0e7ada"; }) ]; buildInputs = @@ -7381,7 +8293,7 @@ ]; passthru.names = [ "jayschema" ]; }; - "jayschema" = self.by-version."jayschema"."0.2.4"; + "jayschema" = self.by-version."jayschema"."0.2.5"; by-spec."jedediah"."~0.1.0" = self.by-version."jedediah"."0.1.1"; by-version."jedediah"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -7402,14 +8314,14 @@ passthru.names = [ "jedediah" ]; }; by-spec."js-yaml"."*" = - self.by-version."js-yaml"."3.0.1"; - by-version."js-yaml"."3.0.1" = lib.makeOverridable self.buildNodePackage { - name = "js-yaml-3.0.1"; + self.by-version."js-yaml"."3.0.2"; + by-version."js-yaml"."3.0.2" = lib.makeOverridable self.buildNodePackage { + name = "js-yaml-3.0.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.0.1.tgz"; - name = "js-yaml-3.0.1.tgz"; - sha1 = "76405fea5bce30fc8f405d48c6dca7f0a32c6afe"; + url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.0.2.tgz"; + name = "js-yaml-3.0.2.tgz"; + sha1 = "9937865f8e897a5e894e73c2c5cf2e89b32eb771"; }) ]; buildInputs = @@ -7422,7 +8334,7 @@ ]; passthru.names = [ "js-yaml" ]; }; - "js-yaml" = self.by-version."js-yaml"."3.0.1"; + "js-yaml" = self.by-version."js-yaml"."3.0.2"; by-spec."js-yaml"."0.3.x" = self.by-version."js-yaml"."0.3.7"; by-version."js-yaml"."0.3.7" = lib.makeOverridable self.buildNodePackage { @@ -7465,8 +8377,27 @@ }; by-spec."js-yaml"."3.0.1" = self.by-version."js-yaml"."3.0.1"; + by-version."js-yaml"."3.0.1" = lib.makeOverridable self.buildNodePackage { + name = "js-yaml-3.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.0.1.tgz"; + name = "js-yaml-3.0.1.tgz"; + sha1 = "76405fea5bce30fc8f405d48c6dca7f0a32c6afe"; + }) + ]; + buildInputs = + (self.nativeDeps."js-yaml" or []); + deps = [ + self.by-version."argparse"."0.1.15" + self.by-version."esprima"."1.0.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "js-yaml" ]; + }; by-spec."js-yaml"."3.x" = - self.by-version."js-yaml"."3.0.1"; + self.by-version."js-yaml"."3.0.2"; by-spec."js-yaml"."~2.0.5" = self.by-version."js-yaml"."2.0.5"; by-version."js-yaml"."2.0.5" = lib.makeOverridable self.buildNodePackage { @@ -7510,7 +8441,7 @@ passthru.names = [ "js-yaml" ]; }; by-spec."js-yaml"."~3.0.1" = - self.by-version."js-yaml"."3.0.1"; + self.by-version."js-yaml"."3.0.2"; by-spec."jsesc"."0.4.3" = self.by-version."jsesc"."0.4.3"; by-version."jsesc"."0.4.3" = lib.makeOverridable self.buildNodePackage { @@ -7637,6 +8568,44 @@ ]; passthru.names = [ "jsonfile" ]; }; + by-spec."jsonify"."~0.0.0" = + self.by-version."jsonify"."0.0.0"; + by-version."jsonify"."0.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-jsonify-0.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; + name = "jsonify-0.0.0.tgz"; + sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; + }) + ]; + buildInputs = + (self.nativeDeps."jsonify" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "jsonify" ]; + }; + by-spec."jsonparse"."0.0.5" = + self.by-version."jsonparse"."0.0.5"; + by-version."jsonparse"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "node-jsonparse-0.0.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz"; + name = "jsonparse-0.0.5.tgz"; + sha1 = "330542ad3f0a654665b778f3eb2d9a9fa507ac64"; + }) + ]; + buildInputs = + (self.nativeDeps."jsonparse" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "jsonparse" ]; + }; by-spec."jsontool"."*" = self.by-version."jsontool"."7.0.1"; by-version."jsontool"."7.0.1" = lib.makeOverridable self.buildNodePackage { @@ -7715,7 +8684,7 @@ self.by-version."di"."0.0.1" self.by-version."socket.io"."0.9.16" self.by-version."chokidar"."0.8.1" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" self.by-version."minimatch"."0.2.14" self.by-version."http-proxy"."0.10.4" self.by-version."optimist"."0.6.1" @@ -7725,11 +8694,11 @@ self.by-version."colors"."0.6.2" self.by-version."lodash"."2.4.1" self.by-version."mime"."1.2.11" - self.by-version."log4js"."0.6.10" + self.by-version."log4js"."0.6.12" self.by-version."useragent"."2.0.7" self.by-version."graceful-fs"."2.0.2" self.by-version."connect"."2.12.0" - self.by-version."source-map"."0.1.32" + self.by-version."source-map"."0.1.33" ]; peerDependencies = [ ]; @@ -7869,7 +8838,7 @@ buildInputs = (self.nativeDeps."karma-sauce-launcher" or []); deps = [ - self.by-version."wd"."0.2.10" + self.by-version."wd"."0.2.11" self.by-version."sauce-connect-launcher"."0.2.2" self.by-version."q"."0.9.7" self.by-version."saucelabs"."0.1.1" @@ -8139,22 +9108,22 @@ buildInputs = (self.nativeDeps."lcov-result-merger" or []); deps = [ - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" ]; peerDependencies = [ ]; passthru.names = [ "lcov-result-merger" ]; }; "lcov-result-merger" = self.by-version."lcov-result-merger"."0.0.2"; - by-spec."less"."~1.6.0" = - self.by-version."less"."1.6.3"; - by-version."less"."1.6.3" = lib.makeOverridable self.buildNodePackage { - name = "less-1.6.3"; + by-spec."less"."~1.7.0" = + self.by-version."less"."1.7.0"; + by-version."less"."1.7.0" = lib.makeOverridable self.buildNodePackage { + name = "less-1.7.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/less/-/less-1.6.3.tgz"; - name = "less-1.6.3.tgz"; - sha1 = "71ce89ec30b774b3567f254c67958f2f2c193bde"; + url = "http://registry.npmjs.org/less/-/less-1.7.0.tgz"; + name = "less-1.7.0.tgz"; + sha1 = "6f1293bac1f402c932c2ce21ba7337f7c635ba84"; }) ]; buildInputs = @@ -8163,13 +9132,33 @@ self.by-version."mime"."1.2.11" self.by-version."request"."2.34.0" self.by-version."mkdirp"."0.3.5" - self.by-version."clean-css"."2.0.8" - self.by-version."source-map"."0.1.32" + self.by-version."clean-css"."2.1.4" + self.by-version."source-map"."0.1.33" ]; peerDependencies = [ ]; passthru.names = [ "less" ]; }; + by-spec."lexical-scope"."~0.1.0" = + self.by-version."lexical-scope"."0.1.0"; + by-version."lexical-scope"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-lexical-scope-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lexical-scope/-/lexical-scope-0.1.0.tgz"; + name = "lexical-scope-0.1.0.tgz"; + sha1 = "8f30004c80234ffac083b990079d7b267e18441b"; + }) + ]; + buildInputs = + (self.nativeDeps."lexical-scope" or []); + deps = [ + self.by-version."astw"."0.1.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "lexical-scope" ]; + }; by-spec."libxmljs"."~0.8.1" = self.by-version."libxmljs"."0.8.1"; by-version."libxmljs"."0.8.1" = lib.makeOverridable self.buildNodePackage { @@ -8585,14 +9574,14 @@ passthru.names = [ "log-driver" ]; }; by-spec."log4js"."~0.6.3" = - self.by-version."log4js"."0.6.10"; - by-version."log4js"."0.6.10" = lib.makeOverridable self.buildNodePackage { - name = "node-log4js-0.6.10"; + self.by-version."log4js"."0.6.12"; + by-version."log4js"."0.6.12" = lib.makeOverridable self.buildNodePackage { + name = "node-log4js-0.6.12"; src = [ (fetchurl { - url = "http://registry.npmjs.org/log4js/-/log4js-0.6.10.tgz"; - name = "log4js-0.6.10.tgz"; - sha1 = "3a47a2551dc6362672901b73f7f47aee6310f785"; + url = "http://registry.npmjs.org/log4js/-/log4js-0.6.12.tgz"; + name = "log4js-0.6.12.tgz"; + sha1 = "ef806ec669ea3fc7bf5be92a95891fb67517e642"; }) ]; buildInputs = @@ -8804,6 +9793,30 @@ ]; passthru.names = [ "mailcomposer" ]; }; + by-spec."maxmin"."^0.1.0" = + self.by-version."maxmin"."0.1.0"; + by-version."maxmin"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-maxmin-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/maxmin/-/maxmin-0.1.0.tgz"; + name = "maxmin-0.1.0.tgz"; + sha1 = "95d81c5289e3a9d30f7fc7dc559c024e5030c9d0"; + }) + ]; + buildInputs = + (self.nativeDeps."maxmin" or []); + deps = [ + self.by-version."gzip-size"."0.1.0" + self.by-version."pretty-bytes"."0.1.0" + self.by-version."chalk"."0.4.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "maxmin" ]; + }; + by-spec."maxmin"."~0.1.0" = + self.by-version."maxmin"."0.1.0"; by-spec."meat"."*" = self.by-version."meat"."0.2.5"; by-version."meat"."0.2.5" = lib.makeOverridable self.buildNodePackage { @@ -8871,6 +9884,25 @@ ]; passthru.names = [ "merge-descriptors" ]; }; + by-spec."merge-descriptors"."0.0.2" = + self.by-version."merge-descriptors"."0.0.2"; + by-version."merge-descriptors"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-merge-descriptors-0.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz"; + name = "merge-descriptors-0.0.2.tgz"; + sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7"; + }) + ]; + buildInputs = + (self.nativeDeps."merge-descriptors" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "merge-descriptors" ]; + }; by-spec."methods"."0.0.1" = self.by-version."methods"."0.0.1"; by-version."methods"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -9117,6 +10149,8 @@ ]; passthru.names = [ "minimist" ]; }; + by-spec."minimist"."~0.0.5" = + self.by-version."minimist"."0.0.8"; by-spec."minimist"."~0.0.7" = self.by-version."minimist"."0.0.8"; by-spec."ministyle"."~0.1.3" = @@ -9283,6 +10317,33 @@ passthru.names = [ "mocha-unfunk-reporter" ]; }; "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.4.0"; + by-spec."module-deps"."~1.7.0" = + self.by-version."module-deps"."1.7.1"; + by-version."module-deps"."1.7.1" = lib.makeOverridable self.buildNodePackage { + name = "module-deps-1.7.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/module-deps/-/module-deps-1.7.1.tgz"; + name = "module-deps-1.7.1.tgz"; + sha1 = "1e9a6809727282323abf1d5eee5ce8860b2e7bbf"; + }) + ]; + buildInputs = + (self.nativeDeps."module-deps" or []); + deps = [ + self.by-version."through"."2.3.4" + self.by-version."JSONStream"."0.7.1" + self.by-version."browser-resolve"."1.2.2" + self.by-version."resolve"."0.6.1" + self.by-version."concat-stream"."1.4.1" + self.by-version."minimist"."0.0.8" + self.by-version."parents"."0.0.2" + self.by-version."detective"."2.4.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "module-deps" ]; + }; by-spec."moment"."2.1.0" = self.by-version."moment"."2.1.0"; by-version."moment"."2.1.0" = lib.makeOverridable self.buildNodePackage { @@ -9321,7 +10382,7 @@ ]; passthru.names = [ "moment" ]; }; - by-spec."moment"."~2.5.0" = + by-spec."moment"."~2.5.1" = self.by-version."moment"."2.5.1"; by-version."moment"."2.5.1" = lib.makeOverridable self.buildNodePackage { name = "node-moment-2.5.1"; @@ -9341,27 +10402,27 @@ passthru.names = [ "moment" ]; }; by-spec."mongodb"."*" = - self.by-version."mongodb"."1.4.0-rc7"; - by-version."mongodb"."1.4.0-rc7" = lib.makeOverridable self.buildNodePackage { - name = "node-mongodb-1.4.0-rc7"; + self.by-version."mongodb"."1.4.0-rc8"; + by-version."mongodb"."1.4.0-rc8" = lib.makeOverridable self.buildNodePackage { + name = "node-mongodb-1.4.0-rc8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc7.tgz"; - name = "mongodb-1.4.0-rc7.tgz"; - sha1 = "efa6da4ef5d1bf0fdf48b4f0e369e3d2186d3401"; + url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc8.tgz"; + name = "mongodb-1.4.0-rc8.tgz"; + sha1 = "3c6048070935d2b1c7e997dd77be70119e33cced"; }) ]; buildInputs = (self.nativeDeps."mongodb" or []); deps = [ - self.by-version."bson"."0.2.6" + self.by-version."bson"."0.2.7" self.by-version."kerberos"."0.0.3" ]; peerDependencies = [ ]; passthru.names = [ "mongodb" ]; }; - "mongodb" = self.by-version."mongodb"."1.4.0-rc7"; + "mongodb" = self.by-version."mongodb"."1.4.0-rc8"; by-spec."mongodb"."1.2.14" = self.by-version."mongodb"."1.2.14"; by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage { @@ -10029,6 +11090,8 @@ ]; passthru.names = [ "negotiator" ]; }; + by-spec."negotiator"."~0.3.0" = + self.by-version."negotiator"."0.3.0"; by-spec."net-ping"."1.1.7" = self.by-version."net-ping"."1.1.7"; by-version."net-ping"."1.1.7" = lib.makeOverridable self.buildNodePackage { @@ -10134,7 +11197,7 @@ self.by-version."semver"."2.1.0" self.by-version."sprintf"."0.1.3" self.by-version."temp"."0.6.0" - self.by-version."wrench"."1.5.7" + self.by-version."wrench"."1.5.8" self.by-version."uglify-js"."2.3.6" self.by-version."xmldom"."0.1.19" ]; @@ -10164,6 +11227,39 @@ }; "node-expat" = self.by-version."node-expat"."2.1.4"; by-spec."node-gyp"."*" = + self.by-version."node-gyp"."0.13.0"; + by-version."node-gyp"."0.13.0" = lib.makeOverridable self.buildNodePackage { + name = "node-gyp-0.13.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.13.0.tgz"; + name = "node-gyp-0.13.0.tgz"; + sha1 = "84e216991a64ce5f03d50c95518bd72ca9e10f1e"; + }) + ]; + buildInputs = + (self.nativeDeps."node-gyp" or []); + deps = [ + self.by-version."glob"."3.2.9" + self.by-version."graceful-fs"."2.0.2" + self.by-version."fstream"."0.1.25" + self.by-version."minimatch"."0.2.14" + self.by-version."mkdirp"."0.3.5" + self.by-version."nopt"."2.2.0" + self.by-version."npmlog"."0.0.6" + self.by-version."osenv"."0.0.3" + self.by-version."request"."2.34.0" + self.by-version."rimraf"."2.2.6" + self.by-version."semver"."2.2.1" + self.by-version."tar"."0.1.19" + self.by-version."which"."1.0.5" + ]; + peerDependencies = [ + ]; + passthru.names = [ "node-gyp" ]; + }; + "node-gyp" = self.by-version."node-gyp"."0.13.0"; + by-spec."node-gyp"."~0.12.2" = self.by-version."node-gyp"."0.12.2"; by-version."node-gyp"."0.12.2" = lib.makeOverridable self.buildNodePackage { name = "node-gyp-0.12.2"; @@ -10177,7 +11273,7 @@ buildInputs = (self.nativeDeps."node-gyp" or []); deps = [ - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" self.by-version."graceful-fs"."2.0.2" self.by-version."fstream"."0.1.25" self.by-version."minimatch"."0.2.14" @@ -10195,9 +11291,6 @@ ]; passthru.names = [ "node-gyp" ]; }; - "node-gyp" = self.by-version."node-gyp"."0.12.2"; - by-spec."node-gyp"."~0.12.2" = - self.by-version."node-gyp"."0.12.2"; by-spec."node-inspector"."*" = self.by-version."node-inspector"."0.7.0"; by-version."node-inspector"."0.7.0" = lib.makeOverridable self.buildNodePackage { @@ -10214,7 +11307,7 @@ deps = [ self.by-version."express"."3.4.8" self.by-version."async"."0.2.10" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" self.by-version."rc"."0.3.4" self.by-version."strong-data-uri"."0.1.1" self.by-version."debug"."0.7.4" @@ -10438,7 +11531,7 @@ (self.nativeDeps."nodemailer" or []); deps = [ self.by-version."mailcomposer"."0.2.8" - self.by-version."simplesmtp"."0.3.21" + self.by-version."simplesmtp"."0.3.22" self.by-version."optimist"."0.6.1" ]; peerDependencies = [ @@ -10657,7 +11750,7 @@ self.by-version."text-table"."0.2.0" self.by-version."ansicolors"."0.3.2" self.by-version."ansistyles"."0.1.3" - self.by-version."path-is-inside"."1.0.0" + self.by-version."path-is-inside"."1.0.1" self.by-version."columnify"."0.1.2" self.by-version."npm-install-checks"."1.0.0" ]; @@ -10744,34 +11837,8 @@ ]; passthru.names = [ "npm-registry-client" ]; }; - by-spec."npm-registry-client"."~0.3.3" = - self.by-version."npm-registry-client"."0.3.6"; - by-version."npm-registry-client"."0.3.6" = lib.makeOverridable self.buildNodePackage { - name = "node-npm-registry-client-0.3.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.3.6.tgz"; - name = "npm-registry-client-0.3.6.tgz"; - sha1 = "c48a2a03643769acc49672860f7920ec6bffac6e"; - }) - ]; - buildInputs = - (self.nativeDeps."npm-registry-client" or []); - deps = [ - self.by-version."request"."2.34.0" - self.by-version."graceful-fs"."2.0.2" - self.by-version."semver"."2.2.1" - self.by-version."slide"."1.1.5" - self.by-version."chownr"."0.0.1" - self.by-version."mkdirp"."0.3.5" - self.by-version."rimraf"."2.2.6" - self.by-version."retry"."0.6.0" - self.by-version."npmlog"."0.0.6" - ]; - peerDependencies = [ - ]; - passthru.names = [ "npm-registry-client" ]; - }; + by-spec."npm-registry-client"."~0.4.4" = + self.by-version."npm-registry-client"."0.4.4"; by-spec."npm-user-validate"."0.0.3" = self.by-version."npm-user-validate"."0.0.3"; by-version."npm-user-validate"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -10812,7 +11879,7 @@ self.by-version."tar"."0.1.17" self.by-version."temp"."0.6.0" self.by-version."fs.extra"."1.2.1" - self.by-version."findit"."1.1.0" + self.by-version."findit"."1.1.1" ]; peerDependencies = [ ]; @@ -10900,6 +11967,8 @@ ]; passthru.names = [ "npmconf" ]; }; + by-spec."npmconf"."~0.1.13" = + self.by-version."npmconf"."0.1.13"; by-spec."npmconf"."~0.1.2" = self.by-version."npmconf"."0.1.13"; by-spec."npmlog"."*" = @@ -11294,6 +12363,8 @@ self.by-version."optimist"."0.3.7"; by-spec."optimist"."~0.6.0" = self.by-version."optimist"."0.6.1"; + by-spec."optimist"."~0.6.1" = + self.by-version."optimist"."0.6.1"; by-spec."options".">=0.0.5" = self.by-version."options"."0.0.5"; by-version."options"."0.0.5" = lib.makeOverridable self.buildNodePackage { @@ -11354,6 +12425,25 @@ "optparse" = self.by-version."optparse"."1.0.5"; by-spec."optparse".">= 1.0.3" = self.by-version."optparse"."1.0.5"; + by-spec."os-browserify"."~0.1.1" = + self.by-version."os-browserify"."0.1.1"; + by-version."os-browserify"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-os-browserify-0.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/os-browserify/-/os-browserify-0.1.1.tgz"; + name = "os-browserify-0.1.1.tgz"; + sha1 = "c1c6b8b27be18cb09da7fa87476e0bcf3b465cbe"; + }) + ]; + buildInputs = + (self.nativeDeps."os-browserify" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "os-browserify" ]; + }; by-spec."osenv"."0" = self.by-version."osenv"."0.0.3"; by-version."osenv"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -11417,6 +12507,27 @@ ]; passthru.names = [ "p-throttler" ]; }; + by-spec."parents"."0.0.2" = + self.by-version."parents"."0.0.2"; + by-version."parents"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "parents-0.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/parents/-/parents-0.0.2.tgz"; + name = "parents-0.0.2.tgz"; + sha1 = "67147826e497d40759aaf5ba4c99659b6034d302"; + }) + ]; + buildInputs = + (self.nativeDeps."parents" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "parents" ]; + }; + by-spec."parents"."~0.0.1" = + self.by-version."parents"."0.0.2"; by-spec."passport"."*" = self.by-version."passport"."0.2.0"; by-version."passport"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -11460,10 +12571,10 @@ ]; passthru.names = [ "passport" ]; }; - by-spec."passport"."~0.1.18" = - self.by-version."passport"."0.1.18"; by-spec."passport"."~0.1.3" = self.by-version."passport"."0.1.18"; + by-spec."passport"."~0.2.0" = + self.by-version."passport"."0.2.0"; by-spec."passport-http"."*" = self.by-version."passport-http"."0.2.2"; by-version."passport-http"."0.2.2" = lib.makeOverridable self.buildNodePackage { @@ -11529,15 +12640,34 @@ ]; passthru.names = [ "passport-strategy" ]; }; + by-spec."path-browserify"."~0.0.0" = + self.by-version."path-browserify"."0.0.0"; + by-version."path-browserify"."0.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-path-browserify-0.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"; + name = "path-browserify-0.0.0.tgz"; + sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a"; + }) + ]; + buildInputs = + (self.nativeDeps."path-browserify" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "path-browserify" ]; + }; by-spec."path-is-inside"."~1.0.0" = - self.by-version."path-is-inside"."1.0.0"; - by-version."path-is-inside"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-path-is-inside-1.0.0"; + self.by-version."path-is-inside"."1.0.1"; + by-version."path-is-inside"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-path-is-inside-1.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.0.tgz"; - name = "path-is-inside-1.0.0.tgz"; - sha1 = "8ec1c42a4c1a039e3e75f6e9e6029bd0c699016e"; + url = "http://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz"; + name = "path-is-inside-1.0.1.tgz"; + sha1 = "98d8f1d030bf04bd7aeee4a1ba5485d40318fd89"; }) ]; buildInputs = @@ -11714,6 +12844,44 @@ ]; passthru.names = [ "posix-getopt" ]; }; + by-spec."pretty-bytes"."^0.1.0" = + self.by-version."pretty-bytes"."0.1.0"; + by-version."pretty-bytes"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "pretty-bytes-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-0.1.0.tgz"; + name = "pretty-bytes-0.1.0.tgz"; + sha1 = "2cad1cdd7838fe59018ae5e0ccf7cae741942f8e"; + }) + ]; + buildInputs = + (self.nativeDeps."pretty-bytes" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "pretty-bytes" ]; + }; + by-spec."process"."~0.5.1" = + self.by-version."process"."0.5.2"; + by-version."process"."0.5.2" = lib.makeOverridable self.buildNodePackage { + name = "node-process-0.5.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/process/-/process-0.5.2.tgz"; + name = "process-0.5.2.tgz"; + sha1 = "1638d8a8e34c2f440a91db95ab9aeb677fc185cf"; + }) + ]; + buildInputs = + (self.nativeDeps."process" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "process" ]; + }; by-spec."promise"."~2.0" = self.by-version."promise"."2.0.0"; by-version."promise"."2.0.0" = lib.makeOverridable self.buildNodePackage { @@ -11877,6 +13045,25 @@ ]; passthru.names = [ "punycode" ]; }; + by-spec."punycode".">=1.0.0 <1.1.0" = + self.by-version."punycode"."1.0.0"; + by-version."punycode"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-punycode-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/punycode/-/punycode-1.0.0.tgz"; + name = "punycode-1.0.0.tgz"; + sha1 = "ce9e6c6e9c1db5827174fceb12ff4938700a1bd3"; + }) + ]; + buildInputs = + (self.nativeDeps."punycode" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "punycode" ]; + }; by-spec."punycode"."~1.2.3" = self.by-version."punycode"."1.2.4"; by-spec."q".">= 0.0.1" = @@ -12064,6 +13251,44 @@ self.by-version."qs"."0.5.6"; by-spec."qs"."~0.6.0" = self.by-version."qs"."0.6.6"; + by-spec."querystring".">=0.1.0 <0.2.0" = + self.by-version."querystring"."0.1.0"; + by-version."querystring"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-querystring-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/querystring/-/querystring-0.1.0.tgz"; + name = "querystring-0.1.0.tgz"; + sha1 = "cb76a26cda0a10a94163fcdb3e132827f04b7b10"; + }) + ]; + buildInputs = + (self.nativeDeps."querystring" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "querystring" ]; + }; + by-spec."querystring"."https://github.com/substack/querystring/archive/0.2.0-ie8.tar.gz" = + self.by-version."querystring"."0.2.0"; + by-version."querystring"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-querystring-0.2.0"; + src = [ + (fetchurl { + url = "https://github.com/substack/querystring/archive/0.2.0-ie8.tar.gz"; + name = "querystring-0.2.0.tgz"; + sha256 = "9476079402605957bae231ea3ec5ae83b454b2de68ddaa3450096821996be8f5"; + }) + ]; + buildInputs = + (self.nativeDeps."querystring" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "querystring" ]; + }; by-spec."rai"."~0.1" = self.by-version."rai"."0.1.9"; by-version."rai"."0.1.9" = lib.makeOverridable self.buildNodePackage { @@ -12102,7 +13327,7 @@ ]; passthru.names = [ "range-parser" ]; }; - by-spec."range-parser"."~1.0.0" = + by-spec."range-parser"."1.0.0" = self.by-version."range-parser"."1.0.0"; by-version."range-parser"."1.0.0" = lib.makeOverridable self.buildNodePackage { name = "node-range-parser-1.0.0"; @@ -12121,7 +13346,9 @@ ]; passthru.names = [ "range-parser" ]; }; - by-spec."raven"."~0.6.0" = + by-spec."range-parser"."~1.0.0" = + self.by-version."range-parser"."1.0.0"; + by-spec."raven"."~0.6.2" = self.by-version."raven"."0.6.2"; by-version."raven"."0.6.2" = lib.makeOverridable self.buildNodePackage { name = "raven-0.6.2"; @@ -12244,7 +13471,7 @@ ]; passthru.names = [ "rc" ]; }; - by-spec."rc"."~0.3.2" = + by-spec."rc"."~0.3.4" = self.by-version."rc"."0.3.4"; by-spec."read"."1" = self.by-version."read"."1.0.5"; @@ -12332,7 +13559,7 @@ buildInputs = (self.nativeDeps."read-package-json" or []); deps = [ - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" self.by-version."lru-cache"."2.5.0" self.by-version."normalize-package-data"."0.2.12" self.by-version."graceful-fs"."2.0.2" @@ -12438,14 +13665,14 @@ passthru.names = [ "readline2" ]; }; by-spec."redeyed"."~0.4.0" = - self.by-version."redeyed"."0.4.2"; - by-version."redeyed"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "node-redeyed-0.4.2"; + self.by-version."redeyed"."0.4.4"; + by-version."redeyed"."0.4.4" = lib.makeOverridable self.buildNodePackage { + name = "node-redeyed-0.4.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/redeyed/-/redeyed-0.4.2.tgz"; - name = "redeyed-0.4.2.tgz"; - sha1 = "f0133b990cb972bdbcf2d2dce0aec36595f419bc"; + url = "http://registry.npmjs.org/redeyed/-/redeyed-0.4.4.tgz"; + name = "redeyed-0.4.4.tgz"; + sha1 = "37e990a6f2b21b2a11c2e6a48fd4135698cba97f"; }) ]; buildInputs = @@ -12732,7 +13959,7 @@ ]; passthru.names = [ "request" ]; }; - by-spec."request".">=2.12.0" = + by-spec."request".">=2.33.0" = self.by-version."request"."2.34.0"; by-spec."request"."~2" = self.by-version."request"."2.34.0"; @@ -12971,7 +14198,7 @@ ]; passthru.names = [ "resolve" ]; }; - by-spec."resolve"."0.6.x" = + by-spec."resolve"."0.6.1" = self.by-version."resolve"."0.6.1"; by-version."resolve"."0.6.1" = lib.makeOverridable self.buildNodePackage { name = "node-resolve-0.6.1"; @@ -12990,7 +14217,9 @@ ]; passthru.names = [ "resolve" ]; }; - by-spec."resolve"."~0.3.1" = + by-spec."resolve"."0.6.x" = + self.by-version."resolve"."0.6.1"; + by-spec."resolve"."~0.3.0" = self.by-version."resolve"."0.3.1"; by-version."resolve"."0.3.1" = lib.makeOverridable self.buildNodePackage { name = "node-resolve-0.3.1"; @@ -13009,6 +14238,12 @@ ]; passthru.names = [ "resolve" ]; }; + by-spec."resolve"."~0.3.1" = + self.by-version."resolve"."0.3.1"; + by-spec."resolve"."~0.6.0" = + self.by-version."resolve"."0.6.1"; + by-spec."resolve"."~0.6.1" = + self.by-version."resolve"."0.6.1"; by-spec."restify"."2.4.1" = self.by-version."restify"."2.4.1"; by-version."restify"."2.4.1" = lib.makeOverridable self.buildNodePackage { @@ -13106,6 +14341,29 @@ ]; passthru.names = [ "revalidator" ]; }; + by-spec."rfile"."~1.0" = + self.by-version."rfile"."1.0.0"; + by-version."rfile"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-rfile-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/rfile/-/rfile-1.0.0.tgz"; + name = "rfile-1.0.0.tgz"; + sha1 = "59708cf90ca1e74c54c3cfc5c36fdb9810435261"; + }) + ]; + buildInputs = + (self.nativeDeps."rfile" or []); + deps = [ + self.by-version."callsite"."1.0.0" + self.by-version."resolve"."0.3.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "rfile" ]; + }; + by-spec."rfile"."~1.0.0" = + self.by-version."rfile"."1.0.0"; by-spec."rimraf"."1.x.x" = self.by-version."rimraf"."1.0.9"; by-version."rimraf"."1.0.9" = lib.makeOverridable self.buildNodePackage { @@ -13196,6 +14454,29 @@ self.by-version."rimraf"."2.2.6"; by-spec."rimraf"."~2.2.5" = self.by-version."rimraf"."2.2.6"; + by-spec."rimraf"."~2.2.6" = + self.by-version."rimraf"."2.2.6"; + by-spec."ruglify"."~1.0.0" = + self.by-version."ruglify"."1.0.0"; + by-version."ruglify"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-ruglify-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ruglify/-/ruglify-1.0.0.tgz"; + name = "ruglify-1.0.0.tgz"; + sha1 = "dc8930e2a9544a274301cc9972574c0d0986b675"; + }) + ]; + buildInputs = + (self.nativeDeps."ruglify" or []); + deps = [ + self.by-version."rfile"."1.0.0" + self.by-version."uglify-js"."2.2.5" + ]; + peerDependencies = [ + ]; + passthru.names = [ "ruglify" ]; + }; by-spec."s3http"."*" = self.by-version."s3http"."0.0.5"; by-version."s3http"."0.0.5" = lib.makeOverridable self.buildNodePackage { @@ -13527,6 +14808,8 @@ ]; passthru.names = [ "send" ]; }; + by-spec."send"."0.2.0" = + self.by-version."send"."0.2.0"; by-spec."sequence"."2.2.1" = self.by-version."sequence"."2.2.1"; by-version."sequence"."2.2.1" = lib.makeOverridable self.buildNodePackage { @@ -13569,6 +14852,44 @@ ]; passthru.names = [ "sha" ]; }; + by-spec."shallow-copy"."0.0.1" = + self.by-version."shallow-copy"."0.0.1"; + by-version."shallow-copy"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-shallow-copy-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz"; + name = "shallow-copy-0.0.1.tgz"; + sha1 = "415f42702d73d810330292cc5ee86eae1a11a170"; + }) + ]; + buildInputs = + (self.nativeDeps."shallow-copy" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "shallow-copy" ]; + }; + by-spec."shell-quote"."~0.0.1" = + self.by-version."shell-quote"."0.0.1"; + by-version."shell-quote"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-shell-quote-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/shell-quote/-/shell-quote-0.0.1.tgz"; + name = "shell-quote-0.0.1.tgz"; + sha1 = "1a41196f3c0333c482323593d6886ecf153dd986"; + }) + ]; + buildInputs = + (self.nativeDeps."shell-quote" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "shell-quote" ]; + }; by-spec."shelljs"."0.1.x" = self.by-version."shelljs"."0.1.4"; by-version."shelljs"."0.1.4" = lib.makeOverridable self.buildNodePackage { @@ -13610,14 +14931,14 @@ passthru.names = [ "shelljs" ]; }; by-spec."should"."*" = - self.by-version."should"."3.1.2"; - by-version."should"."3.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-should-3.1.2"; + self.by-version."should"."3.1.3"; + by-version."should"."3.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-should-3.1.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/should/-/should-3.1.2.tgz"; - name = "should-3.1.2.tgz"; - sha1 = "4bc206253d736c2fb902153477982c2b2e988c02"; + url = "http://registry.npmjs.org/should/-/should-3.1.3.tgz"; + name = "should-3.1.3.tgz"; + sha1 = "900ff485c1497f873de0aa3bfcf9d8b913fdda24"; }) ]; buildInputs = @@ -13628,7 +14949,7 @@ ]; passthru.names = [ "should" ]; }; - "should" = self.by-version."should"."3.1.2"; + "should" = self.by-version."should"."3.1.3"; by-spec."sigmund"."~1.0.0" = self.by-version."sigmund"."1.0.0"; by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -13691,14 +15012,14 @@ passthru.names = [ "simple-lru-cache" ]; }; by-spec."simplesmtp".">= 0.1.22" = - self.by-version."simplesmtp"."0.3.21"; - by-version."simplesmtp"."0.3.21" = lib.makeOverridable self.buildNodePackage { - name = "node-simplesmtp-0.3.21"; + self.by-version."simplesmtp"."0.3.22"; + by-version."simplesmtp"."0.3.22" = lib.makeOverridable self.buildNodePackage { + name = "node-simplesmtp-0.3.22"; src = [ (fetchurl { - url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.21.tgz"; - name = "simplesmtp-0.3.21.tgz"; - sha1 = "79aa14d72a915bb5853ff53a8a44b0823fbe1a8f"; + url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.22.tgz"; + name = "simplesmtp-0.3.22.tgz"; + sha1 = "5bef8fef60e7e3c4ff57117e3502190447de11e5"; }) ]; buildInputs = @@ -13997,14 +15318,14 @@ }; "sockjs" = self.by-version."sockjs"."0.3.8"; by-spec."source-map"."*" = - self.by-version."source-map"."0.1.32"; - by-version."source-map"."0.1.32" = lib.makeOverridable self.buildNodePackage { - name = "node-source-map-0.1.32"; + self.by-version."source-map"."0.1.33"; + by-version."source-map"."0.1.33" = lib.makeOverridable self.buildNodePackage { + name = "node-source-map-0.1.33"; src = [ (fetchurl { - url = "http://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz"; - name = "source-map-0.1.32.tgz"; - sha1 = "c8b6c167797ba4740a8ea33252162ff08591b266"; + url = "http://registry.npmjs.org/source-map/-/source-map-0.1.33.tgz"; + name = "source-map-0.1.33.tgz"; + sha1 = "c659297a73af18c073b0aa2e7cc91e316b5c570c"; }) ]; buildInputs = @@ -14016,17 +15337,17 @@ ]; passthru.names = [ "source-map" ]; }; - "source-map" = self.by-version."source-map"."0.1.32"; + "source-map" = self.by-version."source-map"."0.1.33"; by-spec."source-map"."0.1.x" = - self.by-version."source-map"."0.1.32"; + self.by-version."source-map"."0.1.33"; by-spec."source-map".">= 0.1.2" = - self.by-version."source-map"."0.1.32"; + self.by-version."source-map"."0.1.33"; by-spec."source-map"."~0.1.30" = - self.by-version."source-map"."0.1.32"; + self.by-version."source-map"."0.1.33"; by-spec."source-map"."~0.1.31" = - self.by-version."source-map"."0.1.32"; + self.by-version."source-map"."0.1.33"; by-spec."source-map"."~0.1.7" = - self.by-version."source-map"."0.1.32"; + self.by-version."source-map"."0.1.33"; by-spec."spdy"."1.7.1" = self.by-version."spdy"."1.7.1"; by-version."spdy"."1.7.1" = lib.makeOverridable self.buildNodePackage { @@ -14088,27 +15409,6 @@ ]; passthru.names = [ "ssh-agent" ]; }; - by-spec."ssh2"."~0.2.16" = - self.by-version."ssh2"."0.2.17"; - by-version."ssh2"."0.2.17" = lib.makeOverridable self.buildNodePackage { - name = "node-ssh2-0.2.17"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ssh2/-/ssh2-0.2.17.tgz"; - name = "ssh2-0.2.17.tgz"; - sha1 = "ce7773e4c7c4f78a8ab19227dcc3afae0b149291"; - }) - ]; - buildInputs = - (self.nativeDeps."ssh2" or []); - deps = [ - self.by-version."streamsearch"."0.1.2" - self.by-version."asn1"."0.1.11" - ]; - peerDependencies = [ - ]; - passthru.names = [ "ssh2" ]; - }; by-spec."stack-trace"."0.0.7" = self.by-version."stack-trace"."0.0.7"; by-version."stack-trace"."0.0.7" = lib.makeOverridable self.buildNodePackage { @@ -14210,6 +15510,27 @@ passthru.names = [ "statsd-librato-backend" ]; }; "statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.2"; + by-spec."stream-browserify"."~0.1.0" = + self.by-version."stream-browserify"."0.1.3"; + by-version."stream-browserify"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-stream-browserify-0.1.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/stream-browserify/-/stream-browserify-0.1.3.tgz"; + name = "stream-browserify-0.1.3.tgz"; + sha1 = "95cf1b369772e27adaf46352265152689c6c4be9"; + }) + ]; + buildInputs = + (self.nativeDeps."stream-browserify" or []); + deps = [ + self.by-version."inherits"."2.0.1" + self.by-version."process"."0.5.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "stream-browserify" ]; + }; by-spec."stream-combiner"."~0.0.2" = self.by-version."stream-combiner"."0.0.4"; by-version."stream-combiner"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -14291,43 +15612,43 @@ passthru.names = [ "stream-splitter-transform" ]; }; "stream-splitter-transform" = self.by-version."stream-splitter-transform"."0.0.4"; - by-spec."streamsearch"."0.1.2" = - self.by-version."streamsearch"."0.1.2"; - by-version."streamsearch"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-streamsearch-0.1.2"; + by-spec."string"."1.6.1" = + self.by-version."string"."1.6.1"; + by-version."string"."1.6.1" = lib.makeOverridable self.buildNodePackage { + name = "node-string-1.6.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz"; - name = "streamsearch-0.1.2.tgz"; - sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; + url = "http://registry.npmjs.org/string/-/string-1.6.1.tgz"; + name = "string-1.6.1.tgz"; + sha1 = "eabe0956da7a8291c6de7486f7b35e58d031cd55"; }) ]; buildInputs = - (self.nativeDeps."streamsearch" or []); + (self.nativeDeps."string" or []); deps = [ ]; peerDependencies = [ ]; - passthru.names = [ "streamsearch" ]; + passthru.names = [ "string" ]; }; - by-spec."string"."1.6.1" = - self.by-version."string"."1.6.1"; - by-version."string"."1.6.1" = lib.makeOverridable self.buildNodePackage { - name = "node-string-1.6.1"; + by-spec."string_decoder"."~0.0.0" = + self.by-version."string_decoder"."0.0.1"; + by-version."string_decoder"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-string_decoder-0.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/string/-/string-1.6.1.tgz"; - name = "string-1.6.1.tgz"; - sha1 = "eabe0956da7a8291c6de7486f7b35e58d031cd55"; + url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.0.1.tgz"; + name = "string_decoder-0.0.1.tgz"; + sha1 = "f5472d0a8d1650ec823752d24e6fd627b39bf141"; }) ]; buildInputs = - (self.nativeDeps."string" or []); + (self.nativeDeps."string_decoder" or []); deps = [ ]; peerDependencies = [ ]; - passthru.names = [ "string" ]; + passthru.names = [ "string_decoder" ]; }; by-spec."string_decoder"."~0.10.x" = self.by-version."string_decoder"."0.10.25"; @@ -14407,6 +15728,31 @@ passthru.names = [ "strong-data-uri" ]; }; by-spec."stylus"."*" = + self.by-version."stylus"."0.42.3"; + by-version."stylus"."0.42.3" = lib.makeOverridable self.buildNodePackage { + name = "stylus-0.42.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/stylus/-/stylus-0.42.3.tgz"; + name = "stylus-0.42.3.tgz"; + sha1 = "23e8b3e71eb7f60bc4a657de498c8feb9c366c32"; + }) + ]; + buildInputs = + (self.nativeDeps."stylus" or []); + deps = [ + self.by-version."css-parse"."1.7.0" + self.by-version."mkdirp"."0.3.5" + self.by-version."debug"."0.7.4" + self.by-version."sax"."0.5.8" + self.by-version."glob"."3.2.9" + ]; + peerDependencies = [ + ]; + passthru.names = [ "stylus" ]; + }; + "stylus" = self.by-version."stylus"."0.42.3"; + by-spec."stylus"."0.42.2" = self.by-version."stylus"."0.42.2"; by-version."stylus"."0.42.2" = lib.makeOverridable self.buildNodePackage { name = "stylus-0.42.2"; @@ -14424,15 +15770,32 @@ self.by-version."mkdirp"."0.3.5" self.by-version."debug"."0.7.4" self.by-version."sax"."0.5.8" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" ]; peerDependencies = [ ]; passthru.names = [ "stylus" ]; }; - "stylus" = self.by-version."stylus"."0.42.2"; - by-spec."stylus"."0.42.2" = - self.by-version."stylus"."0.42.2"; + by-spec."subarg"."0.0.1" = + self.by-version."subarg"."0.0.1"; + by-version."subarg"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-subarg-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/subarg/-/subarg-0.0.1.tgz"; + name = "subarg-0.0.1.tgz"; + sha1 = "3d56b07dacfbc45bbb63f7672b43b63e46368e3a"; + }) + ]; + buildInputs = + (self.nativeDeps."subarg" or []); + deps = [ + self.by-version."minimist"."0.0.8" + ]; + peerDependencies = [ + ]; + passthru.names = [ "subarg" ]; + }; by-spec."sudo-block"."~0.2.0" = self.by-version."sudo-block"."0.2.1"; by-version."sudo-block"."0.2.1" = lib.makeOverridable self.buildNodePackage { @@ -14591,6 +15954,48 @@ }; by-spec."sylvester".">= 0.0.8" = self.by-version."sylvester"."0.0.21"; + by-spec."syntax-error"."~0.1.0" = + self.by-version."syntax-error"."0.1.0"; + by-version."syntax-error"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-syntax-error-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/syntax-error/-/syntax-error-0.1.0.tgz"; + name = "syntax-error-0.1.0.tgz"; + sha1 = "8cb515e730fe4f19d3a887035f8630e6494aac65"; + }) + ]; + buildInputs = + (self.nativeDeps."syntax-error" or []); + deps = [ + self.by-version."esprima-six"."0.0.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "syntax-error" ]; + }; + by-spec."tape"."~0.2.2" = + self.by-version."tape"."0.2.2"; + by-version."tape"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "tape-0.2.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tape/-/tape-0.2.2.tgz"; + name = "tape-0.2.2.tgz"; + sha1 = "64ccfa4b7ecf4a0060007e61716d424781671637"; + }) + ]; + buildInputs = + (self.nativeDeps."tape" or []); + deps = [ + self.by-version."jsonify"."0.0.0" + self.by-version."deep-equal"."0.0.0" + self.by-version."defined"."0.0.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "tape" ]; + }; by-spec."tar"."*" = self.by-version."tar"."0.1.19"; by-version."tar"."0.1.19" = lib.makeOverridable self.buildNodePackage { @@ -14645,6 +16050,27 @@ by-spec."tar"."~0.1.19" = self.by-version."tar"."0.1.19"; by-spec."temp"."*" = + self.by-version."temp"."0.7.0"; + by-version."temp"."0.7.0" = lib.makeOverridable self.buildNodePackage { + name = "node-temp-0.7.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/temp/-/temp-0.7.0.tgz"; + name = "temp-0.7.0.tgz"; + sha1 = "d34bdc8e7f955da2a6a473fea07ad601d68ba78f"; + }) + ]; + buildInputs = + (self.nativeDeps."temp" or []); + deps = [ + self.by-version."rimraf"."2.2.6" + ]; + peerDependencies = [ + ]; + passthru.names = [ "temp" ]; + }; + "temp" = self.by-version."temp"."0.7.0"; + by-spec."temp"."0.6.0" = self.by-version."temp"."0.6.0"; by-version."temp"."0.6.0" = lib.makeOverridable self.buildNodePackage { name = "node-temp-0.6.0"; @@ -14665,9 +16091,6 @@ ]; passthru.names = [ "temp" ]; }; - "temp" = self.by-version."temp"."0.6.0"; - by-spec."temp"."0.6.0" = - self.by-version."temp"."0.6.0"; by-spec."temp"."~0.5.1" = self.by-version."temp"."0.5.1"; by-version."temp"."0.5.1" = lib.makeOverridable self.buildNodePackage { @@ -14690,6 +16113,8 @@ }; by-spec."temp"."~0.6.0" = self.by-version."temp"."0.6.0"; + by-spec."temp"."~0.7.0" = + self.by-version."temp"."0.7.0"; by-spec."tempfile"."~0.1.2" = self.by-version."tempfile"."0.1.2"; by-version."tempfile"."0.1.2" = lib.makeOverridable self.buildNodePackage { @@ -14767,6 +16192,25 @@ ]; passthru.names = [ "throttleit" ]; }; + by-spec."through"."~2.2.7" = + self.by-version."through"."2.2.7"; + by-version."through"."2.2.7" = lib.makeOverridable self.buildNodePackage { + name = "node-through-2.2.7"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/through/-/through-2.2.7.tgz"; + name = "through-2.2.7.tgz"; + sha1 = "6e8e21200191d4eb6a99f6f010df46aa1c6eb2bd"; + }) + ]; + buildInputs = + (self.nativeDeps."through" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "through" ]; + }; by-spec."through"."~2.3.4" = self.by-version."through"."2.3.4"; by-version."through"."2.3.4" = lib.makeOverridable self.buildNodePackage { @@ -14807,6 +16251,26 @@ ]; passthru.names = [ "through2" ]; }; + by-spec."timers-browserify"."~1.0.1" = + self.by-version."timers-browserify"."1.0.1"; + by-version."timers-browserify"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-timers-browserify-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.0.1.tgz"; + name = "timers-browserify-1.0.1.tgz"; + sha1 = "7c93257b543cb1e3003d3663b57d560ee1d27057"; + }) + ]; + buildInputs = + (self.nativeDeps."timers-browserify" or []); + deps = [ + self.by-version."process"."0.5.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "timers-browserify" ]; + }; by-spec."timespan"."~2.3.0" = self.by-version."timespan"."2.3.0"; by-version."timespan"."2.3.0" = lib.makeOverridable self.buildNodePackage { @@ -14893,7 +16357,7 @@ self.by-version."sprintf"."0.1.3" self.by-version."temp"."0.6.0" self.by-version."winston"."0.6.2" - self.by-version."wrench"."1.5.7" + self.by-version."wrench"."1.5.8" ]; peerDependencies = [ ]; @@ -15039,6 +16503,25 @@ ]; passthru.names = [ "truncate" ]; }; + by-spec."tty-browserify"."~0.0.0" = + self.by-version."tty-browserify"."0.0.0"; + by-version."tty-browserify"."0.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-tty-browserify-0.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"; + name = "tty-browserify-0.0.0.tgz"; + sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6"; + }) + ]; + buildInputs = + (self.nativeDeps."tty-browserify" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "tty-browserify" ]; + }; by-spec."tunnel-agent"."~0.2.0" = self.by-version."tunnel-agent"."0.2.0"; by-version."tunnel-agent"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -15096,6 +16579,26 @@ ]; passthru.names = [ "type-detect" ]; }; + by-spec."type-is"."1.0.0" = + self.by-version."type-is"."1.0.0"; + by-version."type-is"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-type-is-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/type-is/-/type-is-1.0.0.tgz"; + name = "type-is-1.0.0.tgz"; + sha1 = "4ff424e97349a1ee1910b4bfc488595ecdc443fc"; + }) + ]; + buildInputs = + (self.nativeDeps."type-is" or []); + deps = [ + self.by-version."mime"."1.2.11" + ]; + peerDependencies = [ + ]; + passthru.names = [ "type-is" ]; + }; by-spec."typechecker"."~2.0.1" = self.by-version."typechecker"."2.0.8"; by-version."typechecker"."2.0.8" = lib.makeOverridable self.buildNodePackage { @@ -15115,6 +16618,25 @@ ]; passthru.names = [ "typechecker" ]; }; + by-spec."typedarray"."~0.0.5" = + self.by-version."typedarray"."0.0.5"; + by-version."typedarray"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "node-typedarray-0.0.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.5.tgz"; + name = "typedarray-0.0.5.tgz"; + sha1 = "c4158fcd96c8ef91ef03cc72584c95e032877664"; + }) + ]; + buildInputs = + (self.nativeDeps."typedarray" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "typedarray" ]; + }; by-spec."uglify-js"."1.2.5" = self.by-version."uglify-js"."1.2.5"; by-version."uglify-js"."1.2.5" = lib.makeOverridable self.buildNodePackage { @@ -15149,7 +16671,30 @@ (self.nativeDeps."uglify-js" or []); deps = [ self.by-version."async"."0.2.10" - self.by-version."source-map"."0.1.32" + self.by-version."source-map"."0.1.33" + self.by-version."optimist"."0.3.7" + self.by-version."uglify-to-browserify"."1.0.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "uglify-js" ]; + }; + by-spec."uglify-js"."^2.4.0" = + self.by-version."uglify-js"."2.4.12"; + by-version."uglify-js"."2.4.12" = lib.makeOverridable self.buildNodePackage { + name = "uglify-js-2.4.12"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.12.tgz"; + name = "uglify-js-2.4.12.tgz"; + sha1 = "2354d9659f85330c1e3e2910f8acd77fe14bb4a8"; + }) + ]; + buildInputs = + (self.nativeDeps."uglify-js" or []); + deps = [ + self.by-version."async"."0.2.10" + self.by-version."source-map"."0.1.33" self.by-version."optimist"."0.3.7" self.by-version."uglify-to-browserify"."1.0.2" ]; @@ -15176,7 +16721,7 @@ ]; passthru.names = [ "uglify-js" ]; }; - by-spec."uglify-js"."~2.2.5" = + by-spec."uglify-js"."~2.2" = self.by-version."uglify-js"."2.2.5"; by-version."uglify-js"."2.2.5" = lib.makeOverridable self.buildNodePackage { name = "uglify-js-2.2.5"; @@ -15190,13 +16735,15 @@ buildInputs = (self.nativeDeps."uglify-js" or []); deps = [ - self.by-version."source-map"."0.1.32" + self.by-version."source-map"."0.1.33" self.by-version."optimist"."0.3.7" ]; peerDependencies = [ ]; passthru.names = [ "uglify-js" ]; }; + by-spec."uglify-js"."~2.2.5" = + self.by-version."uglify-js"."2.2.5"; by-spec."uglify-js"."~2.3" = self.by-version."uglify-js"."2.3.6"; by-version."uglify-js"."2.3.6" = lib.makeOverridable self.buildNodePackage { @@ -15212,7 +16759,7 @@ (self.nativeDeps."uglify-js" or []); deps = [ self.by-version."async"."0.2.10" - self.by-version."source-map"."0.1.32" + self.by-version."source-map"."0.1.33" self.by-version."optimist"."0.3.7" ]; peerDependencies = [ @@ -15223,27 +16770,8 @@ self.by-version."uglify-js"."2.3.6"; by-spec."uglify-js"."~2.4.0" = self.by-version."uglify-js"."2.4.12"; - by-version."uglify-js"."2.4.12" = lib.makeOverridable self.buildNodePackage { - name = "uglify-js-2.4.12"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.12.tgz"; - name = "uglify-js-2.4.12.tgz"; - sha1 = "2354d9659f85330c1e3e2910f8acd77fe14bb4a8"; - }) - ]; - buildInputs = - (self.nativeDeps."uglify-js" or []); - deps = [ - self.by-version."async"."0.2.10" - self.by-version."source-map"."0.1.32" - self.by-version."optimist"."0.3.7" - self.by-version."uglify-to-browserify"."1.0.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "uglify-js" ]; - }; + by-spec."uglify-js"."~2.4.12" = + self.by-version."uglify-js"."2.4.12"; by-spec."uglify-to-browserify"."~1.0.0" = self.by-version."uglify-to-browserify"."1.0.2"; by-version."uglify-to-browserify"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -15301,6 +16829,29 @@ ]; passthru.names = [ "uid2" ]; }; + by-spec."umd"."~2.0.0" = + self.by-version."umd"."2.0.0"; + by-version."umd"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "umd-2.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/umd/-/umd-2.0.0.tgz"; + name = "umd-2.0.0.tgz"; + sha1 = "749683b0d514728ae0e1b6195f5774afc0ad4f8f"; + }) + ]; + buildInputs = + (self.nativeDeps."umd" or []); + deps = [ + self.by-version."rfile"."1.0.0" + self.by-version."ruglify"."1.0.0" + self.by-version."through"."2.3.4" + self.by-version."uglify-js"."2.4.12" + ]; + peerDependencies = [ + ]; + passthru.names = [ "umd" ]; + }; by-spec."underscore"."*" = self.by-version."underscore"."1.6.0"; by-version."underscore"."1.6.0" = lib.makeOverridable self.buildNodePackage { @@ -15438,14 +16989,14 @@ passthru.names = [ "unfunk-diff" ]; }; by-spec."ungit"."*" = - self.by-version."ungit"."0.6.2"; - by-version."ungit"."0.6.2" = lib.makeOverridable self.buildNodePackage { - name = "ungit-0.6.2"; + self.by-version."ungit"."0.7.1"; + by-version."ungit"."0.7.1" = lib.makeOverridable self.buildNodePackage { + name = "ungit-0.7.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/ungit/-/ungit-0.6.2.tgz"; - name = "ungit-0.6.2.tgz"; - sha1 = "e1a01531bdd987c27bd9890d973c0a8549f1e191"; + url = "http://registry.npmjs.org/ungit/-/ungit-0.7.1.tgz"; + name = "ungit-0.7.1.tgz"; + sha1 = "9b1b768ecd97a66f7b97b5d7a1b36f29682e2bf7"; }) ]; buildInputs = @@ -15454,20 +17005,19 @@ self.by-version."express"."3.4.8" self.by-version."superagent"."0.16.0" self.by-version."lodash"."2.4.1" - self.by-version."temp"."0.6.0" + self.by-version."temp"."0.7.0" self.by-version."socket.io"."0.9.16" self.by-version."moment"."2.5.1" - self.by-version."async"."0.2.9" - self.by-version."ssh2"."0.2.17" + self.by-version."async"."0.2.10" self.by-version."rc"."0.3.4" self.by-version."uuid"."1.4.1" self.by-version."winston"."0.7.2" - self.by-version."passport"."0.1.18" + self.by-version."passport"."0.2.0" self.by-version."passport-local"."0.1.6" self.by-version."semver"."2.2.1" self.by-version."forever-monitor"."1.1.0" self.by-version."open"."0.0.4" - self.by-version."optimist"."0.6.0" + self.by-version."optimist"."0.6.1" self.by-version."crossroads"."0.12.0" self.by-version."signals"."1.0.0" self.by-version."hasher"."1.2.0" @@ -15478,15 +17028,17 @@ self.by-version."deep-extend"."0.2.8" self.by-version."raven"."0.6.2" self.by-version."knockout"."3.0.0" - self.by-version."npm-registry-client"."0.3.6" + self.by-version."npm-registry-client"."0.4.4" self.by-version."npmconf"."0.1.13" self.by-version."mkdirp"."0.3.5" + self.by-version."less"."1.7.0" + self.by-version."browserify"."3.31.2" ]; peerDependencies = [ ]; passthru.names = [ "ungit" ]; }; - "ungit" = self.by-version."ungit"."0.6.2"; + "ungit" = self.by-version."ungit"."0.7.1"; by-spec."update-notifier"."~0.1.3" = self.by-version."update-notifier"."0.1.7"; by-version."update-notifier"."0.1.7" = lib.makeOverridable self.buildNodePackage { @@ -15512,6 +17064,27 @@ }; by-spec."update-notifier"."~0.1.7" = self.by-version."update-notifier"."0.1.7"; + by-spec."url"."~0.7.9" = + self.by-version."url"."0.7.9"; + by-version."url"."0.7.9" = lib.makeOverridable self.buildNodePackage { + name = "node-url-0.7.9"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/url/-/url-0.7.9.tgz"; + name = "url-0.7.9.tgz"; + sha1 = "1959b1a8b361fc017b59513a7c7fa9827f5e4ed0"; + }) + ]; + buildInputs = + (self.nativeDeps."url" or []); + deps = [ + self.by-version."querystring"."0.1.0" + self.by-version."punycode"."1.0.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "url" ]; + }; by-spec."useragent"."~2.0.4" = self.by-version."useragent"."2.0.7"; by-version."useragent"."2.0.7" = lib.makeOverridable self.buildNodePackage { @@ -15591,6 +17164,26 @@ ]; passthru.names = [ "util" ]; }; + by-spec."util"."~0.10.1" = + self.by-version."util"."0.10.3"; + by-version."util"."0.10.3" = lib.makeOverridable self.buildNodePackage { + name = "node-util-0.10.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/util/-/util-0.10.3.tgz"; + name = "util-0.10.3.tgz"; + sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; + }) + ]; + buildInputs = + (self.nativeDeps."util" or []); + deps = [ + self.by-version."inherits"."2.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "util" ]; + }; by-spec."utile"."0.1.x" = self.by-version."utile"."0.1.7"; by-version."utile"."0.1.7" = lib.makeOverridable self.buildNodePackage { @@ -15647,6 +17240,25 @@ self.by-version."utile"."0.1.7"; by-spec."utile"."~0.2.1" = self.by-version."utile"."0.2.1"; + by-spec."utils-merge"."1.0.0" = + self.by-version."utils-merge"."1.0.0"; + by-version."utils-merge"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-utils-merge-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; + name = "utils-merge-1.0.0.tgz"; + sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; + }) + ]; + buildInputs = + (self.nativeDeps."utils-merge" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "utils-merge" ]; + }; by-spec."uuid"."1.4.1" = self.by-version."uuid"."1.4.1"; by-version."uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { @@ -15809,6 +17421,26 @@ passthru.names = [ "view-helpers" ]; }; "view-helpers" = self.by-version."view-helpers"."0.1.4"; + by-spec."vm-browserify"."~0.0.1" = + self.by-version."vm-browserify"."0.0.4"; + by-version."vm-browserify"."0.0.4" = lib.makeOverridable self.buildNodePackage { + name = "node-vm-browserify-0.0.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz"; + name = "vm-browserify-0.0.4.tgz"; + sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"; + }) + ]; + buildInputs = + (self.nativeDeps."vm-browserify" or []); + deps = [ + self.by-version."indexof"."0.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "vm-browserify" ]; + }; by-spec."vows".">=0.5.13" = self.by-version."vows"."0.7.0"; by-version."vows"."0.7.0" = lib.makeOverridable self.buildNodePackage { @@ -15910,14 +17542,14 @@ passthru.names = [ "watch" ]; }; by-spec."wd"."~0.2.8" = - self.by-version."wd"."0.2.10"; - by-version."wd"."0.2.10" = lib.makeOverridable self.buildNodePackage { - name = "wd-0.2.10"; + self.by-version."wd"."0.2.11"; + by-version."wd"."0.2.11" = lib.makeOverridable self.buildNodePackage { + name = "wd-0.2.11"; src = [ (fetchurl { - url = "http://registry.npmjs.org/wd/-/wd-0.2.10.tgz"; - name = "wd-0.2.10.tgz"; - sha1 = "c4ac58eff5f32cc8e79e8f272a4c365c4240a68e"; + url = "http://registry.npmjs.org/wd/-/wd-0.2.11.tgz"; + name = "wd-0.2.11.tgz"; + sha1 = "27889d290facf3d19e050b3c789f2e852ca03f10"; }) ]; buildInputs = @@ -15936,14 +17568,14 @@ passthru.names = [ "wd" ]; }; by-spec."webdrvr"."*" = - self.by-version."webdrvr"."2.39.0-0"; - by-version."webdrvr"."2.39.0-0" = lib.makeOverridable self.buildNodePackage { - name = "webdrvr-2.39.0-0"; + self.by-version."webdrvr"."2.40.0"; + by-version."webdrvr"."2.40.0" = lib.makeOverridable self.buildNodePackage { + name = "webdrvr-2.40.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.39.0-0.tgz"; - name = "webdrvr-2.39.0-0.tgz"; - sha1 = "07b4867993c2d3e35869269cb8fe096e81571e0f"; + url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.40.0.tgz"; + name = "webdrvr-2.40.0.tgz"; + sha1 = "689f5d3fad5008ffc7b273d607eea9dd7d26ca42"; }) ]; buildInputs = @@ -15961,7 +17593,7 @@ ]; passthru.names = [ "webdrvr" ]; }; - "webdrvr" = self.by-version."webdrvr"."2.39.0-0"; + "webdrvr" = self.by-version."webdrvr"."2.40.0"; by-spec."websocket-driver".">=0.3.0" = self.by-version."websocket-driver"."0.3.2"; by-version."websocket-driver"."0.3.2" = lib.makeOverridable self.buildNodePackage { @@ -16168,6 +17800,26 @@ ]; passthru.names = [ "with" ]; }; + by-spec."with"."~3.0.0" = + self.by-version."with"."3.0.0"; + by-version."with"."3.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-with-3.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/with/-/with-3.0.0.tgz"; + name = "with-3.0.0.tgz"; + sha1 = "38f5d5859bb974c9dad8812372b51dae4b9594cc"; + }) + ]; + buildInputs = + (self.nativeDeps."with" or []); + deps = [ + self.by-version."uglify-js"."2.4.12" + ]; + peerDependencies = [ + ]; + passthru.names = [ "with" ]; + }; by-spec."wordwrap"."0.0.x" = self.by-version."wordwrap"."0.0.2"; by-version."wordwrap"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -16211,14 +17863,14 @@ passthru.names = [ "wrench" ]; }; by-spec."wrench"."~1.5.0" = - self.by-version."wrench"."1.5.7"; - by-version."wrench"."1.5.7" = lib.makeOverridable self.buildNodePackage { - name = "node-wrench-1.5.7"; + self.by-version."wrench"."1.5.8"; + by-version."wrench"."1.5.8" = lib.makeOverridable self.buildNodePackage { + name = "node-wrench-1.5.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/wrench/-/wrench-1.5.7.tgz"; - name = "wrench-1.5.7.tgz"; - sha1 = "95fcbb5a35b748ba8e29d755c9490ba69f033819"; + url = "http://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz"; + name = "wrench-1.5.8.tgz"; + sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5"; }) ]; buildInputs = @@ -16230,7 +17882,7 @@ passthru.names = [ "wrench" ]; }; by-spec."wrench"."~1.5.4" = - self.by-version."wrench"."1.5.7"; + self.by-version."wrench"."1.5.8"; by-spec."ws"."0.4.x" = self.by-version."ws"."0.4.31"; by-version."ws"."0.4.31" = lib.makeOverridable self.buildNodePackage { @@ -16518,7 +18170,7 @@ self.by-version."underscore.string"."2.3.3" self.by-version."lodash"."1.3.1" self.by-version."mkdirp"."0.3.5" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" self.by-version."debug"."0.7.4" self.by-version."isbinaryfile"."0.1.9" self.by-version."dargs"."0.1.0" @@ -16555,7 +18207,7 @@ self.by-version."underscore.string"."2.3.3" self.by-version."lodash"."2.2.1" self.by-version."mkdirp"."0.3.5" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" self.by-version."debug"."0.7.4" self.by-version."isbinaryfile"."0.1.9" self.by-version."dargs"."0.1.0" @@ -16595,7 +18247,7 @@ self.by-version."underscore.string"."2.3.3" self.by-version."lodash"."2.4.1" self.by-version."mkdirp"."0.3.5" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" self.by-version."debug"."0.7.4" self.by-version."isbinaryfile"."2.0.1" self.by-version."dargs"."0.1.0" @@ -16711,4 +18363,26 @@ ]; passthru.names = [ "zlib-browserify" ]; }; + by-spec."zlib-browserify"."^0.0.3" = + self.by-version."zlib-browserify"."0.0.3"; + by-version."zlib-browserify"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "node-zlib-browserify-0.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/zlib-browserify/-/zlib-browserify-0.0.3.tgz"; + name = "zlib-browserify-0.0.3.tgz"; + sha1 = "240ccdbfd0203fa842b130deefb1414122c8cc50"; + }) + ]; + buildInputs = + (self.nativeDeps."zlib-browserify" or []); + deps = [ + self.by-version."tape"."0.2.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "zlib-browserify" ]; + }; + by-spec."zlib-browserify"."~0.0.3" = + self.by-version."zlib-browserify"."0.0.3"; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 902d28c685f..d5cd011bbae 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -304,6 +304,19 @@ let self = _self // overrides; _self = with self; { }; }; + autovivification = buildPerlPackage { + name = "autovivification-0.12"; + src = fetchurl { + url = mirror://cpan/authors/id/V/VP/VPIT/autovivification-0.12.tar.gz; + sha256 = "6ef8686766c63571389880e5d87a0ca1d46f7d127982e8ef38aca7568c44840c"; + }; + meta = { + homepage = http://search.cpan.org/dist/autovivification/; + description = "Lexically disable autovivification"; + license = "perl"; + }; + }; + BerkeleyDB = import ../development/perl-modules/BerkeleyDB { inherit buildPerlPackage fetchurl; inherit (pkgs) db; @@ -385,6 +398,56 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ModuleBuildWithXSpp ExtUtilsTypemapsDefault ]; }; + BusinessISBN = buildPerlPackage { + name = "Business-ISBN-2.07"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-2.07.tar.gz; + sha256 = "4c11279580872bf3cc7176bb75c25b165d4b59a2828fc43d9a355cec3d0a45ff"; + }; + propagatedBuildInputs = [ BusinessISBNData URI ]; + meta = { + description = "Parse and validate ISBNs"; + license = "perl"; + }; + }; + + BusinessISBNData = buildPerlPackage { + name = "Business-ISBN-Data-20120719.001"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-Data-20120719.001.tar.gz; + sha256 = "745f6bf8f7bd912c0a1865aa5f7e49343804de27783f544b2e2c714e14a704a3"; + }; + meta = { + description = "Data pack for Business::ISBN"; + license = "perl"; + }; + }; + + BusinessISMN = buildPerlPackage { + name = "Business-ISMN-1.11"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISMN-1.11.tar.gz; + sha256 = "76d5240a5672c7a8b1ba9e9ea8238a5c8882139911acbb67b7059b5ee3da342d"; + }; + propagatedBuildInputs = [ TieCycle ]; + meta = { + description = "Work with International Standard Music Numbers"; + license = "perl"; + }; + }; + + BusinessISSN = buildPerlPackage { + name = "Business-ISSN-0.91"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-0.91.tar.gz; + sha256 = "f15b192c0f547bb2967811072b3d343b94bc5ea58d02704c19122f7ae0a9d6b5"; + }; + meta = { + description = "Work with International Standard Serial Numbers"; + license = "perl"; + }; + }; + CacheCache = buildPerlPackage rec { name = "Cache-Cache-1.06"; src = fetchurl { @@ -1935,6 +1998,17 @@ let self = _self // overrides; _self = with self; { }; }; + DateSimple = buildPerlPackage { + name = "Date-Simple-3.03"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IZ/IZUT/Date-Simple-3.03.tar.gz; + sha256 = "29a1926314ce1681a312d6155c29590c771ddacf91b7485873ce449ef209dd04"; + }; + meta = { + license = "unknown"; + }; + }; + DateTime = buildPerlModule { name = "DateTime-1.07"; src = fetchurl { @@ -2996,6 +3070,40 @@ let self = _self // overrides; _self = with self; { }; }; + EncodeEUCJPASCII = buildPerlPackage { + name = "Encode-EUCJPASCII-0.03"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NE/NEZUMI/Encode-EUCJPASCII-0.03.tar.gz; + sha256 = "f998d34d55fd9c82cf910786a0448d1edfa60bf68e2c2306724ca67c629de861"; + }; + meta = { + description = "EucJP-ascii - An eucJP-open mapping"; + license = "perl"; + }; + }; + + EncodeHanExtra = buildPerlPackage { + name = "Encode-HanExtra-0.23"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AU/AUDREYT/Encode-HanExtra-0.23.tar.gz; + sha256 = "1fd4b06cada70858003af153f94c863b3b95f2e3d03ba18d0451a81d51db443a"; + }; + meta = { + description = "Extra sets of Chinese encodings"; + license = "mit"; + }; + }; + + EncodeJIS2K = buildPerlPackage { + name = "Encode-JIS2K-0.02"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-JIS2K-0.02.tar.gz; + sha256 = "5d718add5857f37fc270f24360bc9d100b72e0e13a11ca3149fe4e4d7c7cc4bf"; + }; + meta = { + }; + }; + EncodeLocale = buildPerlPackage rec { name = "Encode-Locale-1.03"; src = fetchurl { @@ -5027,6 +5135,18 @@ let self = _self // overrides; _self = with self; { }; }; + MIMECharset = buildPerlPackage { + name = "MIME-Charset-1.011.1"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NE/NEZUMI/MIME-Charset-1.011.1.tar.gz; + sha256 = "2955a3b617fe12654efc2a13ae1dc7d32aad81d35cfae21f74337213cf2435d5"; + }; + meta = { + description = "Charset Information for MIME"; + license = "perl"; + }; + }; + mimeConstruct = buildPerlPackage rec { name = "mime-construct-1.11"; src = fetchurl { @@ -5138,6 +5258,19 @@ let self = _self // overrides; _self = with self; { }; }; + ModuleInfo = buildPerlPackage rec { + name = "Module-Info-0.35"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MB/MBARBON/Module-Info-0.35.tar.gz"; + sha256 = "0r7vxg1iy3lam0jgb2sk8ghgpmp3x5fskvzqlgkb09bssq83s1xb"; + }; + buildInputs = [ TestPod TestPodCoverage ]; + meta = { + description = "Information about Perl modules"; + license = "perl"; + }; + }; + ModuleInstall = buildPerlPackage { name = "Module-Install-1.06"; src = fetchurl { @@ -5901,6 +6034,18 @@ let self = _self // overrides; _self = with self; { doCheck = false; # check can't find its own Mouse::Tiny module }; + MozillaCA = buildPerlPackage { + name = "Mozilla-CA-20130114"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AB/ABH/Mozilla-CA-20130114.tar.gz; + sha256 = "82342614add1dbca8a00daa1ee55af3e0036245aed7d445537918c045008ccd7"; + }; + meta = { + description = "Mozilla's CA cert bundle in PEM format"; + license = "unknown"; + }; + }; + MROCompat = buildPerlPackage { name = "MRO-Compat-0.12"; src = fetchurl { @@ -8885,6 +9030,18 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DevelStackTrace Moose ]; }; + TieCycle = buildPerlPackage { + name = "Tie-Cycle-1.19"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BD/BDFOY/Tie-Cycle-1.19.tar.gz; + sha256 = "bd315874c85feaf8948eeb2f40fe2768a6ca00f089e35b32bfe88f3f384f9ca1"; + }; + meta = { + description = "Cycle through a list of values via a scalar"; + license = "perl"; + }; + }; + TieIxHash = buildPerlPackage { name = "Tie-IxHash-1.22"; src = fetchurl { @@ -9037,6 +9194,18 @@ let self = _self // overrides; _self = with self; { }; }; + UnicodeCollate = buildPerlPackage { + name = "Unicode-Collate-1.04"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SA/SADAHIRO/Unicode-Collate-1.04.tar.gz; + sha256 = "4e3a2300b961d3aaf3789cdbfb95601edaaffb4109ed6cdb912a664d5c7bd706"; + }; + meta = { + description = "Unicode Collation Algorithm"; + license = "perl"; + }; + }; + UnicodeICUCollator = buildPerlPackage { name = "Unicode-ICU-Collator-0.002"; src = fetchurl { @@ -9052,6 +9221,19 @@ let self = _self // overrides; _self = with self; { buildInputs = [ pkgs.icu ]; }; + UnicodeLineBreak = buildPerlPackage { + name = "Unicode-LineBreak-2013.11"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NE/NEZUMI/Unicode-LineBreak-2013.11.tar.gz; + sha256 = "8946b883ae687ff652e93d6185e23a936c7f337f2e115851fdfed72e1f73c7f9"; + }; + propagatedBuildInputs = [ MIMECharset ]; + meta = { + description = "UAX #14 Unicode Line Breaking Algorithm"; + license = "perl"; + }; + }; + UnixGetrusage = buildPerlPackage { name = "Unix-Getrusage-0.03"; src = fetchurl { @@ -9233,6 +9415,17 @@ let self = _self // overrides; _self = with self; { doCheck = false; }; + X11Protocol = buildPerlPackage rec { + name = "X11-Protocol-0.56"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SM/SMCCAM/${name}.tar.gz"; + sha256 = "1dq89bh6fqv7l5mbffqcismcljpq5f869bx7g8lg698zgindv5ny"; + }; + buildInputs = [pkgs.x11]; + NIX_CFLAGS_LINK = "-lX11"; + doCheck = false; # requires an X server + }; + X11GUITest = buildPerlPackage rec { name = "X11-GUITest-0.21"; src = fetchurl { @@ -9264,6 +9457,19 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ XMLSAX ]; }; + XMLLibXMLSimple = buildPerlPackage { + name = "XML-LibXML-Simple-0.93"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MARKOV/XML-LibXML-Simple-0.93.tar.gz; + sha256 = "f2eb1c1523d6414cf2a646a289b0325b489954382c862928d165a03a7cce767c"; + }; + propagatedBuildInputs = [ FileSlurp XMLLibXML ]; + meta = { + description = "XML::LibXML based XML::Simple clone"; + license = "perl"; + }; + }; + XMLLibXSLT = buildPerlPackage rec { name = "XML-LibXSLT-1.87"; src = fetchurl { diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix index e7308e2b816..29a9bc91a1e 100644 --- a/pkgs/top-level/python-packages-generated.nix +++ b/pkgs/top-level/python-packages-generated.nix @@ -5349,5 +5349,26 @@ in }; + "xlrd" = self."xlrd-0.9.2"; + + "xlrd-0.9.2" = self.buildPythonPackage { + name = "xlrd-0.9.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/x/xlrd/xlrd-0.9.2.tar.gz"; + md5 = "91a81ee76233e9f3115acaaa1b251b0e"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + meta = { + description = '' + Library for developers to extract data from Microsoft Excel (tm) spreadsheet files + ''; + homepage = "http://www.python-excel.org/"; + license = "BSD"; + }; + }; + } diff --git a/pkgs/top-level/python-packages.json b/pkgs/top-level/python-packages.json index aefd911a558..b5b7afab85b 100644 --- a/pkgs/top-level/python-packages.json +++ b/pkgs/top-level/python-packages.json @@ -134,6 +134,8 @@ { "name": "psycopg2", "buildInputs": [ "pkgs.postgresql" ], "doCheck": false + }, + { "name": "xlrd", + "doCheck": false } - ] diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2525aacfffe..fae34f3747a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1,24 +1,38 @@ -{ pkgs, python, lowPrio }: +{ pkgs, python }: + with pkgs.lib; let -isPy26 = python.majorVersion == "2.6"; -isPy27 = python.majorVersion == "2.7"; -optional = pkgs.lib.optional; -optionals = pkgs.lib.optionals; -modules = python.modules or { readline = null; sqlite3 = null; curses = null; curses_panel = null; ssl = null; crypt = null; }; + isPy26 = python.majorVersion == "2.6"; + isPy27 = python.majorVersion == "2.7"; + isPy33 = python.majorVersion == "3.3"; + isPy34 = python.majorVersion == "3.4"; + isPyPy = python.executable == "pypy"; + + # Unique python version identifier + pythonName = + if isPy26 then "python26" else + if isPy27 then "python27" else + if isPy33 then "python33" else + if isPy34 then "python34" else + if isPyPy then "pypy" else ""; + + modules = python.modules or { readline = null; sqlite3 = null; curses = null; curses_panel = null; ssl = null; crypt = null; }; pythonPackages = modules // import ./python-packages-generated.nix { inherit pkgs python; inherit (pkgs) stdenv fetchurl; self = pythonPackages; -} // rec { +} // - inherit python; - inherit (pkgs) fetchurl fetchsvn fetchgit stdenv; +# Python packages for all python versions +rec { + + inherit python isPy26 isPy27 isPy33 isPy34 isPyPy pythonName; + inherit (pkgs) fetchurl fetchsvn fetchgit stdenv unzip; # helpers - callPackage = pkgs.lib.callPackageWith (pkgs // pythonPackages); + callPackage = callPackageWith (pkgs // pythonPackages); # global distutils config used by buildPythonPackage distutils-cfg = callPackage ../development/python-modules/distutils-cfg { }; @@ -28,6 +42,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { wrapPython = pkgs.makeSetupHook { deps = pkgs.makeWrapper; substitutions.libPrefix = python.libPrefix; + substitutions.executable = "${python}/bin/${python.executable}"; } ../development/python-modules/generic/wrap.sh; @@ -255,7 +270,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { buildInputs = [ pkgs.which - pkgs.unzip pythonPackages.coverage pythonPackages.mock pythonPackages.tissue @@ -375,7 +389,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { sha1 = "fa4aec08e59fa5964197f59ba42408d64031675b"; }; - buildInputs = [ pkgs.unzip pkgs.sqlite ]; + buildInputs = [ pkgs.sqlite ]; # python: double free or corruption (fasttop): 0x0000000002fd4660 *** doCheck = false; @@ -425,8 +439,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { sha256 = "192174mys40m0bwk6l5jlfnzps0xi81sxm34cqms6dc3c454pbyx"; }; - buildInputs = [ pkgs.unzip ]; - # error: invalid command 'test' doCheck = false; @@ -556,7 +568,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { homepage = http://beets.radbox.org; description = "Music tagger and library organizer"; - license = pkgs.lib.licenses.mit; + license = licenses.mit; maintainers = [ stdenv.lib.maintainers.iElectric ]; }; }; @@ -577,7 +589,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { homepage = https://github.com/Sheeprider/BitBucket-api; description = "Python library to interact with BitBucket REST API"; - license = pkgs.lib.licenses.mit; + license = licenses.mit; }; }; @@ -590,8 +602,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { sha256 = "1i1p3rkj4ad108f23xyib34r4rcy571gy65paml6fk77knh0k66p"; }; - buildInputs = [ pkgs.unzip ]; - # error: invalid command 'test' doCheck = false; @@ -771,7 +781,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { homepage = "http://www.buildout.org"; description = "A software build and configuration system"; - license = pkgs.lib.licenses.zpt21; + license = licenses.zpt21; maintainers = [ stdenv.lib.maintainers.garbas ]; }; }; @@ -786,7 +796,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { homepage = "http://www.buildout.org"; description = "A software build and configuration system"; - license = pkgs.lib.licenses.zpt21; + license = licenses.zpt21; maintainers = [ stdenv.lib.maintainers.garbas ]; }; }; @@ -807,7 +817,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { homepage = "http://www.buildout.org"; description = "A software build and configuration system"; - license = pkgs.lib.licenses.zpt21; + license = licenses.zpt21; maintainers = [ stdenv.lib.maintainers.garbas ]; }; }; @@ -985,7 +995,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { description = "Simple, lightweight, and easily extensible STOMP message broker"; homepage = http://code.google.com/p/coilmq/; - license = pkgs.lib.licenses.asl20; + license = licenses.asl20; }; }); @@ -1027,7 +1037,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { description = "Autogenerate Colander schemas based on SQLAlchemy models."; homepage = https://github.com/stefanofontanelli/ColanderAlchemy; - license = pkgs.lib.licenses.mit; + license = licenses.mit; }; }; @@ -1046,7 +1056,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { description = "Config file reading, writing and validation."; homepage = http://pypi.python.org/pypi/configobj; - license = pkgs.lib.licenses.bsd3; + license = licenses.bsd3; maintainers = [ stdenv.lib.maintainers.garbas ]; }; }); @@ -1106,7 +1116,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { description = "Code coverage measurement for python"; homepage = http://nedbatchelder.com/code/coverage/; - license = pkgs.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -1283,7 +1293,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { md5 = "9c0b8efe9d43b460f8cf049fa46ce14d"; }; - buildInputs = [ pkgs.unzip pytest ]; + buildInputs = [ pytest ]; propagatedBuildInputs = [ execnet ]; meta = { @@ -1310,7 +1320,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { sha256 = "139yfm9yz9k33kgqw4khsljs10rkhhxyywbq9i82bh2r31cil1pp"; }; - buildInputs = [ pkgs.unzip pythonPackages.mock ]; + buildInputs = [ pythonPackages.mock ]; # couple of failing tests doCheck = false; @@ -1563,8 +1573,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { md5 = "be885ccd9612966bb81839670d2da099"; }; - buildInputs = [ pkgs.unzip ]; - meta = { description = "rapid multi-Python deployment"; license = stdenv.lib.licenses.gpl2; @@ -1811,6 +1819,23 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + pew = buildPythonPackage rec { + name = "pew-0.1.9"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/pew/${name}.tar.gz"; + md5 = "90a82400074b50a9e73c3045ed9ac217"; + }; + + propagatedBuildInputs = [ virtualenv virtualenv-clone ]; + + meta = with stdenv.lib; { + description = "Tools to manage multiple virtualenvs written in pure python, a virtualenvwrapper rewrite"; + license = licenses.mit; + platforms = platforms.all; + }; + }; + pudb = buildPythonPackage rec { name = "pudb-2013.3.6"; @@ -1915,7 +1940,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { md5 = "a6728117cad24749ddb39d2827cd9033"; }; - buildInputs = [ pkgs.unzip webtest ]; + buildInputs = [ webtest ]; propagatedBuildInputs = [ jinja2 pyramid ]; meta = { @@ -2050,7 +2075,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { md5 = "36aa2c96dec4cfeea57f54da2b733eb9"; }; - buildInputs = [ pkgs.unzip zope_interface zope_location zope_schema ]; + buildInputs = [ zope_interface zope_location zope_schema ]; meta = { maintainers = [ stdenv.lib.maintainers.iElectric ]; @@ -2727,7 +2752,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { description = "code checking using pep8 and pyflakes."; homepage = http://pypi.python.org/pypi/flake8; - license = pkgs.lib.licenses.mit; + license = licenses.mit; maintainers = [ stdenv.lib.maintainers.garbas ]; }; }); @@ -3019,7 +3044,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { src = fetchurl { url = "https://github.com/nicolargo/glances/archive/v${meta.version}.tar.gz"; - sha256 = "0g2yg9qf7qgjwv13x0rx51rzhn99pcmjpb3vk0g3gmmdsqyqi0d6"; + sha256 = "19pin04whc1z4gmwv2rqa7mh08d6007r8dyrhihnxj0v35ghp5i0"; }; buildInputs = [ pkgs.hddtemp ]; @@ -3033,7 +3058,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { ''; meta = { - version = "1.7.1"; + version = "1.7.4"; homepage = "http://nicolargo.github.io/glances/"; description = "Cross-platform curses-based monitoring tool"; }; @@ -3205,7 +3230,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { homepage = http://code.google.com/p/httplib2; description = "A comprehensive HTTP client library"; - license = pkgs.lib.licenses.mit; + license = licenses.mit; maintainers = [ stdenv.lib.maintainers.garbas ]; }; }; @@ -3267,7 +3292,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { description = "Google's IP address manipulation library"; homepage = http://code.google.com/p/ipaddr-py/; - license = pkgs.lib.licenses.asl20; + license = licenses.asl20; }; }; @@ -3301,7 +3326,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { homepage = "https://github.com/davidhalter/jedi"; description = "An autocompletion tool for Python that can be used for text editors."; - license = pkgs.lib.licenses.lgpl3Plus; + license = licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.garbas ]; }; }); @@ -3363,7 +3388,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; buildInputs = - [ pkgs.unzip fs gdata python_keyczar mock pyasn1 pycrypto pytest ]; + [ fs gdata python_keyczar mock pyasn1 pycrypto pytest ]; }; kitchen = buildPythonPackage (rec { @@ -3391,7 +3416,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { homepage = http://code.google.com/p/pylast/; description = "A python interface to last.fm (and compatibles)"; - license = pkgs.lib.licenses.asl20; + license = licenses.asl20; }; }; @@ -3676,7 +3701,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { description = "McCabe checker, plugin for flake8"; homepage = "https://github.com/flintwork/mccabe"; - license = pkgs.lib.licenses.mit; + license = licenses.mit; maintainers = [ stdenv.lib.maintainers.garbas ]; }; }); @@ -3779,7 +3804,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { version = "0.9"; description = ''Man-in-the-middle proxy''; homepage = "http://mitmproxy.org/"; - license = pkgs.lib.licenses.mit; + license = licenses.mit; }; }; @@ -3857,8 +3882,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { export LC_ALL="en_US.UTF-8" ''; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ argparse jinja2 six modules.readline ] ++ (optionals isPy26 [ importlib ordereddict ]); @@ -3883,7 +3906,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { homepage = http://bmc.github.com/munkres/; description = "Munkres algorithm for the Assignment Problem"; - license = pkgs.lib.licenses.bsd3; + license = licenses.bsd3; maintainers = [ stdenv.lib.maintainers.iElectric ]; }; }; @@ -3900,7 +3923,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { homepage = http://alastair/python-musicbrainz-ngs; description = "Python bindings for musicbrainz NGS webservice"; - license = pkgs.lib.licenses.bsd2; + license = licenses.bsd2; maintainers = [ stdenv.lib.maintainers.iElectric ]; }; }; @@ -4069,7 +4092,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { version = "0.9"; description = ''Man-in-the-middle proxy''; homepage = "https://github.com/cortesi/netlib"; - license = pkgs.lib.licenses.mit; + license = licenses.mit; }; }; @@ -4115,12 +4138,12 @@ pythonPackages = modules // import ./python-packages-generated.nix { }); nose = buildPythonPackage rec { - version = "1.3.0"; + version = "1.3.1"; name = "nose-${version}"; src = fetchurl { url = "http://pypi.python.org/packages/source/n/nose/${name}.tar.gz"; - sha256 = "0q2j9zz39h3liwbp6lb94kl3sxb9z9rbwh5dzyccyxfy4lrwqqsf"; + sha256 = "1fmn5b7v183ym793ghrbh76b27aww9qv0lhl7dz31f9xmf3kn9w5"; }; buildInputs = [ coverage ]; @@ -4129,7 +4152,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { checkPhase = if python.is_py3k or false then '' ${python}/bin/${python.executable} setup.py build_tests '' else "" + '' - rm functional_tests/test_multiprocessing/test_concurrent_shared.py # see https://github.com/nose-devs/nose/commit/226bc671c73643887b36b8467b34ad485c2df062 + rm functional_tests/test_multiprocessing/test_concurrent_shared.py* # see https://github.com/nose-devs/nose/commit/226bc671c73643887b36b8467b34ad485c2df062 ${python}/bin/${python.executable} selftest.py ''; @@ -4147,7 +4170,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { sha256 = "0lgrfgp3sq8xi8d9grrg0z8jsyk0wl8a3rxw31hb7vdncin5b7n5"; }; - buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ nose ]; meta = { @@ -4215,7 +4237,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { sha256 = "1kh4spwgqxm534qlzzf2ijchckvs0pwjxl1irhicjmlg7mybnfvx"; }; - patches = pkgs.lib.singleton (fetchurl { + patches = singleton (fetchurl { name = "libnotify07.patch"; url = "http://pkgs.fedoraproject.org/cgit/notify-python.git/plain/" + "libnotify07.patch?id2=289573d50ae4838a1658d573d2c9f4c75e86db0c"; @@ -4328,7 +4350,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { homepage = "https://github.com/simplegeo/python-oauth2"; description = "library for OAuth version 1.0"; - license = pkgs.lib.licenses.mit; + license = licenses.mit; maintainers = [ stdenv.lib.maintainers.garbas ]; platforms = stdenv.lib.platforms.linux; }; @@ -4593,7 +4615,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { homepage = "http://pep8.readthedocs.org/"; description = "Python style guide checker"; - license = pkgs.lib.licenses.mit; + license = licenses.mit; maintainers = [ stdenv.lib.maintainers.garbas ]; }; }; @@ -4642,8 +4664,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { sha256 = "0kdc4rg47k1qkq22inghd50xlxjdkfcilym8mxff8wy4h091xykw"; }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ pytz ]; meta = { @@ -4686,7 +4706,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { md5 = "56b6614499aacb7d6b5983c4914daea7"; }; - buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.unzip pkgs.zlib pkgs.libtiff pkgs.libwebp ]; + buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp ]; # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. preConfigure = '' @@ -4745,7 +4765,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { description = "A library to manipulate gettext files (po and mo files)"; homepage = "http://bitbucket.org/izi/polib/"; - license = pkgs.lib.licenses.mit; + license = licenses.mit; }; }; @@ -4869,17 +4889,17 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { description = "Allows to get the public suffix of a domain name"; homepage = "http://pypi.python.org/pypi/publicsuffix/"; - license = pkgs.lib.licenses.mit; + license = licenses.mit; }; }; py = buildPythonPackage rec { - name = "py-1.4.19"; + name = "py-1.4.20"; src = fetchurl { url = "https://pypi.python.org/packages/source/p/py/${name}.tar.gz"; - md5 = "d2e24b4363d834bf9192247f143435bc"; + md5 = "5f1708be5482f3ff6711dfd6cafd45e0"; }; }; @@ -5122,7 +5142,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { homepage = "https://launchpad.net/pyflakes"; description = "A simple program which checks Python source files for errors."; - license = pkgs.lib.licenses.mit; + license = licenses.mit; maintainers = [ stdenv.lib.maintainers.garbas ]; }; }; @@ -5137,7 +5157,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { patchPhase = let libs = [ pkgs.mesa pkgs.xlibs.libX11 pkgs.freetype pkgs.fontconfig ]; - paths = pkgs.lib.concatStringsSep "," (map (l: "\"${l}/lib\"") libs); + paths = concatStringsSep "," (map (l: "\"${l}/lib\"") libs); in "sed -i -e 's|directories\.extend.*lib[^]]*|&,${paths}|' pyglet/lib.py"; doCheck = false; @@ -5182,7 +5202,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { homepage = "https://launchpad.net/pygpgme"; description = "A Python wrapper for the GPGME library."; - license = pkgs.lib.licenses.lgpl21; + license = licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.garbas ]; }; }; @@ -5207,7 +5227,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { homepage = https://github.com/seb-m/pyinotify/wiki; description = "Monitor filesystems events on Linux platforms with inotify"; - license = pkgs.lib.licenses.mit; + license = licenses.mit; }; }; @@ -5237,7 +5257,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { homepage = "http://fedoraproject.org/wiki/Pykickstart"; description = "Read and write Fedora kickstart files"; - license = pkgs.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; }; }; @@ -5250,7 +5270,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { sha256 = "0ldkm8xws91j7zbvpqb413hvdz8r66bslr451q3qc0xi8cnmydfq"; }; - buildInputs = [ pkgs.unzip pkgs.libiodbc ]; + buildInputs = [ pkgs.libiodbc ]; meta = with stdenv.lib; { description = "Python ODBC module to connect to almost any database"; @@ -5294,7 +5314,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { sed -i -e ' s|e\.path\.startswith("/tmp/temp-device-")|"temp-device-" in e.path| ' tests/test__ped_ped.py - '' + pkgs.lib.optionalString stdenv.isi686 '' + '' + optionalString stdenv.isi686 '' # remove some integers in this test case which overflow on 32bit systems sed -i -r -e '/class *UnitGetSizeTestCase/,/^$/{/[0-9]{11}/d}' \ tests/test__ped_ped.py @@ -5588,7 +5608,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { md5 = "c57cba33626ac4b1e3d1974923d59232"; }; - buildInputs = [ pkgs.unzip ]; meta = { homepage = "https://code.google.com/p/pysphere/"; license = "BSD"; @@ -5793,7 +5812,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { sha256 = "1r127fa354ppb667f4acxlzwxixap1jgzjrr790bw8mcpxv2hqaa"; }; - buildInputs = [ pkgs.unzip pkgs.pyrex ]; + buildInputs = [ pkgs.pyrex ]; propagatedBuildInputs = [ pkgs.libyaml ]; meta = { @@ -5820,7 +5839,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { reportlab = - let freetype = pkgs.lib.overrideDerivation pkgs.freetype (args: { configureFlags = "--enable-static --enable-shared"; }); + let freetype = overrideDerivation pkgs.freetype (args: { configureFlags = "--enable-static --enable-shared"; }); in buildPythonPackage rec { name = "reportlab-2.5"; @@ -5854,6 +5873,21 @@ pythonPackages = modules // import ./python-packages-generated.nix { homepage = http://docs.python-requests.org/en/latest/; }; }; + + + requests2 = buildPythonPackage rec { + name = "requests-2.2.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz"; + md5 = "ac27081135f58d1a43e4fb38258d6f4e"; + }; + + meta = { + description = "Requests is an Apache2 Licensed HTTP library, written in Python, for human beings.."; + homepage = http://docs.python-requests.org/en/latest/; + }; + }; requests_oauthlib = buildPythonPackage rec { @@ -6011,7 +6045,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { # error: invalid command 'test' #doCheck = false; - buildInputs = [ unittest2 pkgs.unzip ]; + buildInputs = [ unittest2 ]; propagatedBuildInputs = [ robotframework lxml ]; meta = with stdenv.lib; { @@ -6603,7 +6637,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { description = "Joyent SmartDataCenter CloudAPI connector using http-signature authentication via Requests"; homepage = https://github.com/atl/py-smartdc; - license = pkgs.lib.licenses.mit; + license = licenses.mit; }; }; @@ -6720,46 +6754,44 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }); - - sqlalchemy = buildPythonPackage rec { - name = "sqlalchemy-${version}"; - version = "0.7.10"; - + sqlalchemy = pkgs.lib.overrideDerivation sqlalchemy9 (args: rec { + name = "SQLAlchemy-0.7.10"; src = fetchurl { - url = "http://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz"; + url = "http://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz"; sha256 = "0rhxgr85xdhjn467qfs0dkyj8x46zxcv6ad3dfx3w14xbkb3kakp"; }; - patches = [ # see https://groups.google.com/forum/#!searchin/sqlalchemy/module$20logging$20handlers/sqlalchemy/ukuGhmQ2p6g/2_dOpBEYdDYJ # waiting for 0.7.11 release ../development/python-modules/sqlalchemy-0.7.10-test-failures.patch ]; + }); - buildInputs = [ nose ]; - - propagatedBuildInputs = [ modules.sqlite3 ]; - meta = { - homepage = http://www.sqlalchemy.org/; - description = "A Python SQL toolkit and Object Relational Mapper"; + sqlalchemy8 = pkgs.lib.overrideDerivation sqlalchemy9 (args: rec { + name = "SQLAlchemy-0.8.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz"; + md5 = "ecf0738eaf1229bae27ad2be0f9978a8"; }; - }; - - - sqlalchemy8 = buildPythonPackage rec { - name = "SQLAlchemy-${version}"; - version = "0.8.2"; + }); + + sqlalchemy9 = buildPythonPackage rec { + name = "SQLAlchemy-0.9.3"; src = fetchurl { url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz"; - md5 = "5a33fb43dea93468dbb2a6562ee80b54"; + md5 = "a27989b9d4b3f14ea0b1600aa45559c4"; }; buildInputs = [ nose mock ]; propagatedBuildInputs = [ modules.sqlite3 ]; + checkPhase = '' + ${python.executable} sqla_nose.py + ''; + meta = { homepage = http://www.sqlalchemy.org/; description = "A Python SQL toolkit and Object Relational Mapper"; @@ -6791,7 +6823,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { homepage = https://github.com/crosspop/sqlalchemy-imageattach; description = "SQLAlchemy extension for attaching images to entity objects"; - license = pkgs.lib.licenses.mit; + license = licenses.mit; }; }; @@ -6837,7 +6869,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { description = "A client for Etsy's node-js statsd server"; homepage = https://github.com/WoLpH/python-statsd; - license = pkgs.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -6857,7 +6889,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { description = "Lightweight and extensible STOMP messaging client"; homepage = http://bitbucket.org/hozn/stompclient; - license = pkgs.lib.licenses.asl20; + license = licenses.asl20; }; }); @@ -6876,7 +6908,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { description = "A streaming protocol for test results"; homepage = https://launchpad.net/subunit; - license = pkgs.lib.licenses.asl20; + license = licenses.asl20; }; }; @@ -6994,7 +7026,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { description = "A set of extensions to the Python standard library's unit testing framework"; homepage = http://pypi.python.org/pypi/testtools; - license = pkgs.lib.licenses.mit; + license = licenses.mit; }; }; @@ -7014,7 +7046,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { description = "A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges."; homepage = https://code.google.com/p/mimeparse/; - license = pkgs.lib.licenses.mit; + license = licenses.mit; }; }; @@ -7034,22 +7066,24 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { description = "A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges."; homepage = https://code.google.com/p/mimeparse/; - license = pkgs.lib.licenses.mit; + license = licenses.mit; }; }; # TODO - # py.error.EACCES: [Permission denied]: mkdir('/homeless-shelter',) - # builder for `/nix/store/0czwg0n3pfkmpjphqv1jxfjlgkbziwsx-python-tox-1.4.3.drv' failed with exit code 1 + # Installs correctly but fails tests that involve simple things like: + # cmd.run("tox", "-h") + # also, buildPythonPackage needs to supply the tox.ini correctly for projects that use tox for their tests + # # tox = buildPythonPackage rec { - # name = "tox-1.4.3"; + # name = "tox-1.7.0"; # - # buildInputs = [ py virtualenv ]; + # propagatedBuildInputs = [ py virtualenv ]; # # src = fetchurl { - # url = "https://pypi.python.org/packages/source/t/tox/tox-1.4.3.tar.gz"; - # md5 = "3727d5b0600d92edf2229a7ce6a0f752"; + # url = "https://pypi.python.org/packages/source/t/tox/${name}.tar.gz"; + # md5 = "5314ceca2b179ad4a9c79f4d817b8a99"; # }; # }; @@ -7143,7 +7177,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { homepage = "https://github.com/alejandrogomez/turses"; description = "A Twitter client for the console."; - license = pkgs.lib.licenses.gpl3; + license = licenses.gpl3; maintainers = [ stdenv.lib.maintainers.garbas ]; platforms = stdenv.lib.platforms.linux; }; @@ -7160,7 +7194,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { homepage = "https://github.com/tweepy/tweepy"; description = "Twitter library for python"; - license = pkgs.lib.licenses.mit; + license = licenses.mit; maintainers = [ stdenv.lib.maintainers.garbas ]; platforms = stdenv.lib.platforms.linux; }; @@ -7194,7 +7228,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { and licensed under the MIT license. ''; - license = pkgs.lib.licenses.mit; + license = licenses.mit; maintainers = [ ]; }; @@ -7263,16 +7297,16 @@ pythonPackages = modules // import ./python-packages-generated.nix { description = "A full-featured console (xterm et al.) user interface library"; homepage = http://excess.org/urwid; repositories.git = git://github.com/wardi/urwid.git; - license = pkgs.lib.licenses.lgpl21; + license = licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.garbas ]; }; }); virtualenv = buildPythonPackage rec { - name = "virtualenv-1.11"; + name = "virtualenv-1.11.4"; src = fetchurl { url = "http://pypi.python.org/packages/source/v/virtualenv/${name}.tar.gz"; - md5 = "d1a7cf95b539a861a8215827f387c4eb"; + md5 = "9accc2d3f0ec1da479ce2c3d1fdff06e"; }; inherit recursivePthLoader; @@ -7294,6 +7328,27 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + virtualenv-clone = buildPythonPackage rec { + name = "virtualenv-clone-0.2.4"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/v/virtualenv-clone/${name}.tar.gz"; + md5 = "71168b975eaaa91e65559bcc79290b3b"; + }; + + buildInputs = [pytest]; + propagatedBuildInputs = [virtualenv]; + + # needs tox to run the tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Script to clone virtualenvs"; + license = licenses.mit; + platforms = platforms.all; + }; + }; + waitress = buildPythonPackage rec { name = "waitress-0.8.7"; @@ -7401,7 +7456,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { # XXX: skipping two tests fails in python2.6 doCheck = ! isPy26; - buildInputs = [ pkgs.unzip ] ++ optionals isPy26 [ pythonPackages.ordereddict unittest2 ]; + buildInputs = optionals isPy26 [ pythonPackages.ordereddict unittest2 ]; propagatedBuildInputs = [ nose @@ -7442,7 +7497,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { wokkel = buildPythonPackage (rec { url = "http://wokkel.ik.nu/releases/0.7.0/wokkel-0.7.0.tar.gz"; - name = pkgs.lib.nameFromURL url ".tar"; + name = nameFromURL url ".tar"; src = fetchurl { inherit url; sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml"; @@ -7665,7 +7720,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { md5 = "eff24d7918099a3e899ee63a9c31bee6"; }; - buildInputs = [ pkgs.unzip zope_interface ]; + buildInputs = [ zope_interface ]; meta = { maintainers = [ stdenv.lib.maintainers.goibhniu ]; @@ -7681,8 +7736,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { md5 = "4ff0ddbf64c45bfcc3189e35f4214ded"; }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface ]; meta = { @@ -7757,8 +7810,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { md5 = "c6ac80e6887de4108a383f349fbdf332"; }; - buildInputs = [ pkgs.unzip ]; - meta = { maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; @@ -7994,7 +8045,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { md5 = "8b317b41244fc2e67f2f286890ba59a0"; }; - buildInputs = [ pkgs.unzip sqlalchemy zope_testing zope_interface setuptools ]; + buildInputs = [ sqlalchemy zope_testing zope_interface setuptools ]; propagatedBuildInputs = [ sqlalchemy transaction ]; meta = { @@ -8016,7 +8067,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { md5 = "01c30c342c6a18002a762bd5d320a6e9"; }; - buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ zope_interface zope_exceptions zope_location ]; meta = { @@ -8037,8 +8087,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { md5 = "1d689abad000419891494b30dd7d8190"; }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ] ++ optional (!python.is_py3k or false) subunit; # a test is failing @@ -8061,8 +8109,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { md5 = "eaad8fc7bbef126f9f8616b074ec00aa"; }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_location zope_security zope_publisher ]; meta = { @@ -8151,7 +8197,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { sha256 = "0ri6gj883k042xaxa2d5ymmhbw2bfcxdzhh4bz7700ibxwxxj62h"; }; - buildInputs = [ pkgs.unzip unittest2 nose mock ]; + buildInputs = [ unittest2 nose mock ]; propagatedBuildInputs = [ modules.curses libarchive ]; # tests are still failing @@ -8178,7 +8224,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { url = "http://pypi.python.org/packages/source/p/pyzmq/pyzmq-13.0.0.zip"; md5 = "fa2199022e54a393052d380c6e1a0934"; }; - buildInputs = [ pkgs.unzip pkgs.zeromq3 ]; + buildInputs = [ pkgs.zeromq3 ]; propagatedBuildInputs = [ ]; doCheck = false; }; @@ -8361,7 +8407,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { homepage = http://pypi.python.org/pypi/Unidecode/; description = "ASCII transliterations of Unicode text"; - license = pkgs.lib.licenses.gpl2; + license = licenses.gpl2; maintainers = [ stdenv.lib.maintainers.iElectric ]; }; }; @@ -8523,7 +8569,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { homepage = https://code.google.com/p/gdata-python-client/; description = "Python client library for Google data APIs"; - license = pkgs.lib.licenses.asl20; + license = licenses.asl20; }; }; @@ -8543,7 +8589,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { homepage = http://imapclient.freshfoo.com/; description = "Easy-to-use, Pythonic and complete IMAP client library"; - license = pkgs.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -8560,17 +8606,17 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { homepage = http://pythonhosted.org/Logbook/; description = "A logging replacement for Python"; - license = pkgs.lib.licenses.bsd3; + license = licenses.bsd3; }; }; libvirt = pkgs.stdenv.mkDerivation rec { name = "libvirt-python-${version}"; - version = "1.2.0"; + version = "1.2.2"; src = fetchurl { url = "http://libvirt.org/sources/python/${name}.tar.gz"; - sha256 = "0azml1yv9iqnpj4sdg1wwsa70q7kb06lv85p63qwyd8vrd0y7rrg"; + sha256 = "0fccpyppz79kbbnzwdgsiza3cxq7jlnnp1dqi33gc4305dk9vmwl"; }; buildInputs = [ python pkgs.pkgconfig pkgs.libvirt lxml ]; @@ -8582,7 +8628,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { homepage = http://www.libvirt.org/; description = "libvirt Python bindings"; - license = "LGPLv2"; + license = pkgs.lib.license.lgpl2; }; }; @@ -8657,8 +8703,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; -# python2.7 specific eggs -} // pkgs.lib.optionalAttrs (python.majorVersion == "2.7") { +# python2.7 specific packages +} // optionalAttrs isPy27 ( + with pythonPackages; + +{ pypi2nix = pythonPackages.buildPythonPackage rec { rev = "04a68d8577acbceb88bdf51b1231a9dbdead7003"; @@ -8679,4 +8728,4 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; -}; in pythonPackages +}); in pythonPackages diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 6871567ca8d..cef3d2dffbd 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -140,11 +140,11 @@ in { crossUltraSparcLinux = mapTestOnCross crossSystem basic; }) // ( -/* Test some cross builds on mingw32 */ +/* Test some cross builds on 32 bit mingw-w64 */ let crossSystem = { - config = "i686-pc-mingw32"; - arch = "x86"; + config = "i686-w64-mingw32"; + arch = "x86"; # Irrelevant libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain platform = {}; }; @@ -161,11 +161,10 @@ in { }; }) // ( -/* Test some cross builds on mingw-w64 */ +/* Test some cross builds on 64 bit mingw-w64 */ let crossSystem = { - # That's the triplet they use in the mingw-w64 docs, - # and it's relevant for nixpkgs conditions. + # That's the triplet they use in the mingw-w64 docs. config = "x86_64-w64-mingw32"; arch = "x86_64"; # Irrelevant libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain |