diff options
Diffstat (limited to 'pkgs')
626 files changed, 14546 insertions, 5832 deletions
diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 49b02f46e9b4..3ab113c92e89 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -4,20 +4,19 @@ , mpg123, neon, faad2 }: -let - version = "3.5.1"; -in +let version = "3.5.2"; in + stdenv.mkDerivation { name = "audacious-${version}"; src = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; - sha256 = "01wmlvpp540gdjw759wif3byh98h3b3q6f5wawzp0b0ivqd0wf6z"; + sha256 = "0mhrdj76h0g6q197wgp8rxk6gqsrirrw49hfidcb5b7q5rlvj59r"; }; pluginsSrc = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; - sha256 = "09lyvi15hbn3pvb2izyz2bm4021917mhcdrwxrn3q3sjvx337np6"; + sha256 = "1nacd8n46q3pqnwavq3i2ayls609gvxfcp3qqpcsfcdfz3bh15hp"; }; buildInputs = diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 10baf254dc73..773f3dd82bb3 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake -, withQt4 ? true, qt4 -, withQt5 ? false, qt5 +, withQt4 ? false, qt4 +, withQt5 ? true, qt5 # I'm unable to make KDE work here, crashes at runtime so I simply # make Qt4 the default until someone who wants KDE can figure it out. @@ -39,7 +39,7 @@ assert withOnlineServices -> withTaglib; assert withReplaygain -> withTaglib; let - version = "1.5.0"; + version = "1.5.1"; pname = "cantata"; fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF"); fstats = x: map (fstat x); @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { src = fetchurl { inherit name; - url = "https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60c0pFbEtldEk1UnM"; - sha256 = "0gnqfp3ps79d500hrivxj2xkkia042knhg86md6w8ycl3945611p"; + url = "https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60UktwaTRMTjRIUW8"; + sha256 = "0y7y3nbiqgh1ghb47n4lfyp163wvazvhavlshb1c18ik03fkn5sp"; }; buildInputs = diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix new file mode 100644 index 000000000000..c1b5aef333b8 --- /dev/null +++ b/pkgs/applications/audio/cava/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchgit, alsaLib, fftw }: + +stdenv.mkDerivation rec { + name = "cava-${version}"; + version = "27dbdf47daae44c780db9998c760007b3bf63738"; + + buildInputs = [ alsaLib fftw ]; + + src = fetchgit { + url = "https://github.com/karlstav/cava"; + rev = version; + sha256 = "1a61e2c869376276cf78e6446cd1cc7f96b3e378fa8bc0bc4c5ca81945429909"; + }; + + installPhase = '' + mkdir -p $out/bin + cp cava $out/bin + ''; + + meta = with stdenv.lib; { + description = "Console-based Audio Visualizer for Alsa"; + homepage = https://github.com/karlstav/cava; + maintainers = with maintainers; [offline]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index d4927cc1a718..2d738f55c286 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib , libvorbis, libogg, flac, itstool, libxml2, gsettings_desktop_schemas -, makeWrapper, gnome_icon_theme +, makeWrapper, gnome_icon_theme, dconf }: stdenv.mkDerivation rec { @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram $out/bin/easytag \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \ + --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" ''; NIX_LDFLAGS = "-lid3tag -lz"; @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ pkgconfig intltool gtk3 glib libid3tag id3lib taglib libvorbis libogg flac - itstool libxml2 gsettings_desktop_schemas gnome_icon_theme + itstool libxml2 gsettings_desktop_schemas gnome_icon_theme dconf ]; meta = { diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index c151deddd70e..7cc8aeda3677 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { url = http://download.sarine.nl/Programs/gmpc/11.8/libmpd-11.8.17.tar.gz; sha256 = "10vspwsgr8pwf3qp2bviw6b2l8prgdiswgv7qiqiyr0h1mmk487y"; }; + patches = [ ./libmpd-11.8.17-remove-strndup.patch ]; buildInputs = [ pkgconfig glib ]; }; diff --git a/pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch b/pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch new file mode 100644 index 000000000000..ad4fdc02ef3e --- /dev/null +++ b/pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch @@ -0,0 +1,15 @@ +diff --git a/src/libmpd-internal.h b/src/libmpd-internal.h +index c84c3a4..51be441 100644 +--- a/src/libmpd-internal.h ++++ b/src/libmpd-internal.h +@@ -206,10 +206,6 @@ int mpd_unlock_conn(MpdObj *mi); + MpdData * mpd_misc_sort_tag_list(MpdData *data); + + +-#ifndef HAVE_STRNDUP +-char * strndup (const char *s, size_t n); +-#endif +- + int mpd_server_get_allowed_commands(MpdObj *mi); + typedef enum _MpdSearchType { + MPD_SEARCH_TYPE_NONE, diff --git a/pkgs/applications/audio/mimms/default.nix b/pkgs/applications/audio/mimms/default.nix new file mode 100644 index 000000000000..b337dbf6d821 --- /dev/null +++ b/pkgs/applications/audio/mimms/default.nix @@ -0,0 +1,31 @@ +{ fetchurl, stdenv, pythonPackages, libmms }: + +let version = "3.2"; +in + pythonPackages.buildPythonPackage { + name = "mimms-${version}"; + src = fetchurl { + url = "http://download.savannah.gnu.org/releases/mimms/mimms-${version}.tar.bz2"; + sha256 = "0zmcd670mpq85cs3nvdq3i805ba0d1alqahfy1m9cpf7kxrivfml"; + }; + + postInstall = '' + wrapProgram $out/bin/mimms \ + --prefix LD_LIBRARY_PATH : ${libmms}/lib + ''; + + meta = { + homepage = https://savannah.nongnu.org/projects/mimms/; + license = stdenv.lib.licenses.gpl3; + description = "An mms (e.g. mms://) stream downloader"; + + longDescription = '' + mimms is a program designed to allow you to download streams + using the MMS protocol and save them to your computer, as + opposed to watching them live. Similar functionality is + available in full media player suites such as Xine, MPlayer, + and VLC, but mimms is quick and easy to use and, for the time + being, remains a useful program. + ''; + }; + } diff --git a/pkgs/applications/audio/morituri/default.nix b/pkgs/applications/audio/morituri/default.nix index 6af08cf0221a..6498f48351da 100644 --- a/pkgs/applications/audio/morituri/default.nix +++ b/pkgs/applications/audio/morituri/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, python, pythonPackages, cdparanoia, cdrdao , pygobject, gst_python, gst_plugins_base, gst_plugins_good -, setuptools, utillinux, makeWrapper }: +, setuptools, utillinux, makeWrapper, substituteAll }: stdenv.mkDerivation rec { name = "morituri-${version}"; version = "0.2.3"; + namePrefix = ""; src = fetchurl { url = "http://thomas.apestaart.org/download/morituri/${name}.tar.bz2"; @@ -21,23 +22,12 @@ stdenv.mkDerivation rec { gst_plugins_base gst_plugins_good ] ++ pythonPath; - patches = [ ./paths.patch ]; - - postPatch = '' - substituteInPlace morituri/extern/python-command/scripts/help2man \ - --replace /usr/bin/python ${python}/bin/python - - substituteInPlace morituri/common/program.py \ - --replace umount ${utillinux}/bin/umount \ - --replace \'eject \'${utillinux}/bin/eject - - substituteInPlace morituri/program/cdparanoia.py \ - --replace '"cdparanoia"' '"${cdparanoia}/bin/cdparanoia"' - - substituteInPlace morituri/program/cdrdao.py \ - --replace "['cdrdao', ]" "['${cdrdao}/bin/cdrdao', ]" \ - --replace '"cdrdao"' '"${cdrdao}/bin/cdrdao"' - ''; + patches = [ + (substituteAll { + src = ./paths.patch; + inherit cdrdao cdparanoia python utillinux; + }) + ]; # This package contains no binaries to patch or strip. dontPatchELF = true; diff --git a/pkgs/applications/audio/morituri/paths.patch b/pkgs/applications/audio/morituri/paths.patch index 12f1d5b761c8..efabc1d200c2 100644 --- a/pkgs/applications/audio/morituri/paths.patch +++ b/pkgs/applications/audio/morituri/paths.patch @@ -1,6 +1,6 @@ diff -Nurp morituri-0.2.3-orig/doc/Makefile.in morituri-0.2.3/doc/Makefile.in ---- morituri-0.2.3-orig/doc/Makefile.in 2014-11-01 00:13:01.231364181 +0100 -+++ morituri-0.2.3/doc/Makefile.in 2014-11-01 00:13:56.691812229 +0100 +--- morituri-0.2.3-orig/doc/Makefile.in 2014-12-23 12:44:46.222410092 +0100 ++++ morituri-0.2.3/doc/Makefile.in 2014-12-23 12:46:49.619756940 +0100 @@ -486,7 +486,7 @@ morituri.ics: $(top_srcdir)/morituri.doa -moap doap -f $(top_srcdir)/morituri.doap ical > morituri.ics @@ -10,3 +10,82 @@ diff -Nurp morituri-0.2.3-orig/doc/Makefile.in morituri-0.2.3/doc/Makefile.in clean-local: @rm -rf reference +diff -Nurp morituri-0.2.3-orig/morituri/common/program.py morituri-0.2.3/morituri/common/program.py +--- morituri-0.2.3-orig/morituri/common/program.py 2014-12-23 12:44:46.218410048 +0100 ++++ morituri-0.2.3/morituri/common/program.py 2014-12-23 12:46:49.647757245 +0100 +@@ -92,13 +92,13 @@ class Program(log.Loggable): + """ + Load the given device. + """ +- os.system('eject -t %s' % device) ++ os.system('@utillinux@/bin/eject -t %s' % device) + + def ejectDevice(self, device): + """ + Eject the given device. + """ +- os.system('eject %s' % device) ++ os.system('@utillinux@/bin/eject %s' % device) + + def unmountDevice(self, device): + """ +@@ -112,7 +112,7 @@ class Program(log.Loggable): + proc = open('/proc/mounts').read() + if device in proc: + print 'Device %s is mounted, unmounting' % device +- os.system('umount %s' % device) ++ os.system('@utillinux@/bin/umount %s' % device) + + def getFastToc(self, runner, toc_pickle, device): + """ +diff -Nurp morituri-0.2.3-orig/morituri/extern/python-command/scripts/help2man morituri-0.2.3/morituri/extern/python-command/scripts/help2man +--- morituri-0.2.3-orig/morituri/extern/python-command/scripts/help2man 2014-12-23 12:44:46.206409916 +0100 ++++ morituri-0.2.3/morituri/extern/python-command/scripts/help2man 2014-12-23 12:46:49.631757074 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!@python@/bin/python + + # -*- Mode: Python -*- + # vi:si:et:sw=4:sts=4:ts=4 +diff -Nurp morituri-0.2.3-orig/morituri/program/cdparanoia.py morituri-0.2.3/morituri/program/cdparanoia.py +--- morituri-0.2.3-orig/morituri/program/cdparanoia.py 2014-12-23 12:44:46.202409873 +0100 ++++ morituri-0.2.3/morituri/program/cdparanoia.py 2014-12-23 12:46:49.659757376 +0100 +@@ -278,7 +278,7 @@ class ReadTrackTask(log.Loggable, task.T + stopTrack, stopOffset) + + bufsize = 1024 +- argv = ["cdparanoia", "--stderr-progress", ++ argv = ["@cdparanoia@/bin/cdparanoia", "--stderr-progress", + "--sample-offset=%d" % self._offset, ] + if self._device: + argv.extend(["--force-cdrom-device", self._device, ]) +@@ -551,7 +551,7 @@ _VERSION_RE = re.compile( + + def getCdParanoiaVersion(): + getter = common.VersionGetter('cdparanoia', +- ["cdparanoia", "-V"], ++ ["@cdparanoia@/bin/cdparanoia", "-V"], + _VERSION_RE, + "%(version)s %(release)s") + +diff -Nurp morituri-0.2.3-orig/morituri/program/cdrdao.py morituri-0.2.3/morituri/program/cdrdao.py +--- morituri-0.2.3-orig/morituri/program/cdrdao.py 2014-12-23 12:44:46.202409873 +0100 ++++ morituri-0.2.3/morituri/program/cdrdao.py 2014-12-23 12:46:49.667757463 +0100 +@@ -257,7 +257,7 @@ class CDRDAOTask(ctask.PopenTask): + + def start(self, runner): + self.debug('Starting cdrdao with options %r', self.options) +- self.command = ['cdrdao', ] + self.options ++ self.command = ['@cdrdao@/bin/cdrdao', ] + self.options + + ctask.PopenTask.start(self, runner) + +@@ -515,7 +515,7 @@ _VERSION_RE = re.compile( + + def getCDRDAOVersion(): + getter = common.VersionGetter('cdrdao', +- ["cdrdao"], ++ ["@cdrdao@/bin/cdrdao"], + _VERSION_RE, + "%(version)s") + diff --git a/pkgs/applications/audio/mp3gain/default.nix b/pkgs/applications/audio/mp3gain/default.nix new file mode 100644 index 000000000000..340658f813d7 --- /dev/null +++ b/pkgs/applications/audio/mp3gain/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation { + name = "mp3gain-1.5.2"; + src = fetchurl { + url = "http://downloads.sourceforge.net/mp3gain/mp3gain-1_5_2-src.zip"; + sha256 = "1jkgry59m8cnnfq05b9y1h4x4wpy3iq8j68slb9qffwa3ajcgbfv"; + }; + + buildInputs = [ unzip ]; + + sourceRoot = "."; + + buildFlags = [ "OSTYPE=linux" ]; + + installPhase = '' + mkdir -p $out/usr/bin + cp mp3gain $out/usr/bin + ''; + + meta = { + description = "Lossless mp3 normalizer with statistical analysis"; + homepage = http://mp3gain.sourceforge.net/; + license = stdenv.lib.licenses.lgpl21; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.devhell ]; + }; +} diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 6e4ddcb1e9cb..e83e5a8ca74e 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -2,12 +2,12 @@ , libiconvOrEmpty, boost, readline }: stdenv.mkDerivation rec { - version = "0.6.1"; + version = "0.6.2"; name = "ncmpcpp-${version}"; src = fetchurl { url = "http://ncmpcpp.rybczak.net/stable/ncmpcpp-${version}.tar.bz2"; - sha256 = "033a18hj0q0smm5n0ykld9az7w95myr7jm2b1bjm0h2q5927x8qm"; + sha256 = "1mrd6m6ph0fscxp9x96ipxh6ai7w0n1miapcfqrqfy058qx5zbck"; }; configureFlags = "BOOST_LIB_SUFFIX="; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Curses-based interface for MPD (music player daemon)"; homepage = http://unkart.ovh.org/ncmpcpp/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ lovek323 mornfall ]; + maintainers = with maintainers; [ lovek323 mornfall koral ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 538e1cdf9d0d..8696b1c055d0 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, intltool, pulseaudio, gtkmm3 -, libcanberra_gtk3 }: +, libcanberra_gtk3, makeWrapper, gnome3 }: stdenv.mkDerivation rec { name = "pavucontrol-2.0"; @@ -9,7 +9,13 @@ stdenv.mkDerivation rec { sha256 = "02s775m1531sshwlbvfddk3pz8zjmwkv1sgzggn386ja3gc9vwi2"; }; - buildInputs = [ pulseaudio gtkmm3 libcanberra_gtk3 ]; + preFixup = '' + wrapProgram "$out/bin/pavucontrol" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" + ''; + + buildInputs = [ pulseaudio gtkmm3 libcanberra_gtk3 makeWrapper + gnome3.gnome_icon_theme ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index d0c3f010e6e1..210b2e0813b9 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -6,6 +6,7 @@ let version = "1.3"; in buildPythonPackage { name = "picard-${version}"; + namePrefix = ""; src = fetchurl { url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/picard-${version}.tar.gz"; diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index fec93f0183d9..eb26e2b66c4d 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, pkgconfig, attica, boost, gnutls, libechonest -, liblastfm, lucenepp, phonon, phonon_backend_vlc, qca2, qjson, qt4, qtkeychain -, quazip, sparsehash, taglib, websocketpp +, liblastfm, lucenepp, phonon, phonon_backend_vlc, qca2, qca2_ossl, qjson, qt4 +, qtkeychain, quazip, sparsehash, taglib, websocketpp, makeWrapper , enableXMPP ? true, libjreen ? null , enableKDE ? false, kdelibs ? null @@ -15,11 +15,11 @@ let quazipQt4 = quazip.override { qt = qt4; }; in stdenv.mkDerivation rec { name = "tomahawk-${version}"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { - url = "http://download.tomahawk-player.org/tomahawk-0.8.1.tar.bz2"; - sha256 = "0ca6fah30a2s8nnlryav95wyzhwys1ikjfwakrqf2hb0y5aczdpw"; + url = "http://download.tomahawk-player.org/${name}.tar.bz2"; + sha256 = "1bmkkpqhflpm42sn6zf7hxv3936h3p0kdiqzmj88jm7qfgw2wbaj"; }; cmakeFlags = [ @@ -30,11 +30,21 @@ in stdenv.mkDerivation rec { buildInputs = [ cmake pkgconfig attica boost gnutls libechonest liblastfm lucenepp phonon qca2 qjson qt4 qtkeychain quazipQt4 sparsehash taglib websocketpp + makeWrapper ] ++ stdenv.lib.optional enableXMPP libjreen ++ stdenv.lib.optional enableKDE kdelibs ++ stdenv.lib.optional enableTelepathy telepathy_qt; - propagatedBuildInputs = [ phonon_backend_vlc ]; + postInstall = let + pluginPath = stdenv.lib.concatStringsSep ":" [ + "${phonon_backend_vlc}/lib/kde4/plugins" + "${qca2_ossl}/lib/qt4/plugins" + ]; + in '' + for i in "$out"/bin/*; do + wrapProgram "$i" --prefix QT_PLUGIN_PATH : "${pluginPath}" + done + ''; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/vimus/default.nix b/pkgs/applications/audio/vimus/default.nix index 6bd51760e884..7118f1876dcf 100644 --- a/pkgs/applications/audio/vimus/default.nix +++ b/pkgs/applications/audio/vimus/default.nix @@ -25,5 +25,6 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ jzellner ]; + broken = self.stdenv.isLinux && self.stdenv.isi686; }; }) diff --git a/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch b/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch new file mode 100644 index 000000000000..005164848905 --- /dev/null +++ b/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch @@ -0,0 +1,8 @@ +--- ./scripts/CrashPlanDesktop 2014-12-18 09:51:14.050804325 +0100 ++++ ./scripts/CrashPlanDesktop-1 2014-12-18 09:51:32.271009382 +0100 +@@ -9,4 +9,4 @@ + + cd ${TARGETDIR} + +-${JAVACOMMON} ${GUI_JAVA_OPTS} -classpath "./lib/com.backup42.desktop.jar:./lang:./skin" com.backup42.desktop.CPDesktop > ${TARGETDIR}/log/ui_output.log 2> ${TARGETDIR}/log/ui_error.log & ++${JAVACOMMON} ${GUI_JAVA_OPTS} -classpath "./lib/com.backup42.desktop.jar:./lang:./skin" com.backup42.desktop.CPDesktop & diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix index 1a78dea21578..5a0e8c7cfbdc 100644 --- a/pkgs/applications/backup/crashplan/default.nix +++ b/pkgs/applications/backup/crashplan/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { description = "An online/offline backup solution"; homepage = "http://www.crashplan.org"; license = licenses.unfree; - maintainers = with maintainers; [ sztupi ]; + maintainers = with maintainers; [ sztupi iElectric ]; }; buildInputs = [ makeWrapper cpio ]; @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { manifestdir = "${vardir}/manifest"; - patches = [ ./CrashPlanEngine.patch ]; + patches = [ ./CrashPlanEngine.patch ./CrashPlanDesktop.patch ]; installPhase = '' mkdir $out @@ -45,6 +45,7 @@ in stdenv.mkDerivation rec { install -D -m 644 run.conf $out/bin/run.conf install -D -m 755 scripts/CrashPlanDesktop $out/bin/CrashPlanDesktop install -D -m 755 scripts/CrashPlanEngine $out/bin/CrashPlanEngine + install -D -m 644 scripts/CrashPlan.desktop $out/share/applications/CrashPlan.desktop rm -r $out/log ln -s $vardir/log $out/log @@ -72,6 +73,10 @@ in stdenv.mkDerivation rec { substituteInPlace $f --replace sed ${gnused}/bin/sed substituteInPlace $f --replace grep ${gnugrep}/bin/grep done + + substituteInPlace $out/share/applications/CrashPlan.desktop \ + --replace /usr/local $out \ + --replace crashplan/skin skin wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${gtk2}/lib:${glib}/lib:${libXtst}/lib" ''; diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index 4e569fc68a57..71b2ccb6fb8f 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A powerful editor targeted towards programmers and webdevelopers"; homepage = http://bluefish.openoffice.nl/; license = licenses.gpl3Plus; - maintainer = [maintainers.vbgl]; + maintainers = [maintainers.vbgl]; platforms = platforms.all; }; } diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix index 3f4b93dc6381..7f4373c41ba6 100644 --- a/pkgs/applications/editors/emacs-modes/haskell/default.nix +++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix @@ -1,18 +1,25 @@ { stdenv, fetchurl, emacs, texinfo }: -stdenv.mkDerivation rec { - name = "haskell-mode-13.10"; +let + version = "13.10"; +in +stdenv.mkDerivation { + name = "haskell-mode-${version}"; src = fetchurl { - url = "https://github.com/haskell/haskell-mode/archive/v13.10.tar.gz"; + url = "https://github.com/haskell/haskell-mode/archive/v${version}.tar.gz"; sha256 = "0hcg7wpalcdw8j36m8vd854zrrgym074r7m903rpwfrhx9mlg02b"; }; buildInputs = [ emacs texinfo ]; + makeFlags = "VERSION=${version} GIT_VERSION=${version}"; + installPhase = '' - mkdir -p "$out/share/emacs/site-lisp" - cp *.el *.elc *.hs "$out/share/emacs/site-lisp/" + mkdir -p $out/share/emacs/site-lisp + cp *.el *.elc *.hs $out/share/emacs/site-lisp/ + mkdir -p $out/share/info + cp -v *.info* $out/share/info/ ''; meta = { diff --git a/pkgs/applications/editors/emacs-modes/haskell/git.nix b/pkgs/applications/editors/emacs-modes/haskell/git.nix new file mode 100644 index 000000000000..72f49592b51f --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/haskell/git.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, emacs, texinfo }: + +let + version = "13.10-299-g74b5a3c"; # git describe --tags +in +stdenv.mkDerivation { + name = "haskell-mode-${version}"; + + src = fetchFromGitHub { + owner = "haskell"; + repo = "haskell-mode"; + rev = "v${version}"; + sha256 = "1qjrc1c4jsgbbhnhssvadg00qffn80a8slrxc9g1hnzp632kv8wl"; + }; + + buildInputs = [ emacs texinfo ]; + + makeFlags = "VERSION=v${version} GIT_VERSION=v${version}"; + + installPhase = '' + mkdir -p $out/share/emacs/site-lisp + cp *.el *.elc *.hs $out/share/emacs/site-lisp/ + mkdir -p $out/share/info + cp -v *.info* $out/share/info/ + ''; + + # The test suite must run *after* copying the generated files to $out + # because "make check" implies "make clean". + doInstallCheck = true; + installCheckTarget = "check"; + + meta = { + homepage = "http://github.com/haskell/haskell-mode"; + description = "Haskell mode for Emacs"; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index f1e3a078b70e..4cd88d536790 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -74,12 +74,6 @@ let && jdk=${jdk}/lib/openjdk \ || jdk=${jdk} - if [ "${stdenv.system}" == "x86_64-linux" ]; then - makeWrapper "$out/$name/bin/fsnotifier64" "$out/bin/fsnotifier64" - else - makeWrapper "$out/$name/bin/fsnotifier" "$out/bin/fsnotifier" - fi - makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${loName}" \ --prefix PATH : "${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \ --prefix LD_RUN_PATH : "${stdenv.gcc.gcc}/lib/" \ @@ -295,13 +289,13 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "8.0.1"; - build = "PS-138.2001"; + version = "8.0.2"; + build = "PS-139.732"; description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "http://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "0d46442aa32174fe16846c3c31428178ab69b827d2e0ce31f633f13b64c01afc"; + sha256 = "01b8vx6swi71sd0rc7i1jnicilqp11ch3zrm8gwb6xh1pmmpdirf"; }; }; diff --git a/pkgs/applications/editors/zed/default.nix b/pkgs/applications/editors/zed/default.nix index 4673029ed000..e46cb66de56a 100644 --- a/pkgs/applications/editors/zed/default.nix +++ b/pkgs/applications/editors/zed/default.nix @@ -3,7 +3,7 @@ let name = "zed-${version}"; - version = "0.13"; + version = "1.0.0"; # When upgrading node.nix / node packages: # fetch package.json from Zed's repository @@ -31,7 +31,7 @@ let src = fetchgit { url = "git://github.com/zedapp/zed"; rev = "refs/tags/v${version}"; - sha256 = "023nq4y6dgh57xpsgawdn2zqvfyhjz1p00ldnsfsjajyy4nn6yb1"; + sha256 = "1kdvj9mvdwm4cswqw6nn9j6kgqvs4d7vycpsmmfha9a2rkryw9zh"; }; buildInputs = [ makeWrapper zip ]; diff --git a/pkgs/applications/editors/zed/node.nix b/pkgs/applications/editors/zed/node.nix index f2c08fde0cd4..cd75f2d58fa9 100644 --- a/pkgs/applications/editors/zed/node.nix +++ b/pkgs/applications/editors/zed/node.nix @@ -2,21 +2,21 @@ { by-spec."accepts"."~1.1.0" = - self.by-version."accepts"."1.1.0"; - by-version."accepts"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-accepts-1.1.0"; + self.by-version."accepts"."1.1.1"; + by-version."accepts"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-accepts-1.1.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/accepts/-/accepts-1.1.0.tgz"; - name = "accepts-1.1.0.tgz"; - sha1 = "43ba6d946374c80f91823eaec6bb43dc4955500b"; + url = "http://registry.npmjs.org/accepts/-/accepts-1.1.1.tgz"; + name = "accepts-1.1.1.tgz"; + sha1 = "3b40bf6abc3fe3bc004534f4672ae1efd0063a96"; }) ]; buildInputs = (self.nativeDeps."accepts" or []); deps = [ - self.by-version."mime-types"."2.0.1" - self.by-version."negotiator"."0.4.7" + self.by-version."mime-types"."2.0.2" + self.by-version."negotiator"."0.4.8" ]; peerDependencies = [ ]; @@ -119,33 +119,33 @@ passthru.names = [ "block-stream" ]; }; by-spec."body-parser"."^1.6.3" = - self.by-version."body-parser"."1.8.1"; - by-version."body-parser"."1.8.1" = lib.makeOverridable self.buildNodePackage { - name = "node-body-parser-1.8.1"; + self.by-version."body-parser"."1.9.0"; + by-version."body-parser"."1.9.0" = lib.makeOverridable self.buildNodePackage { + name = "node-body-parser-1.9.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/body-parser/-/body-parser-1.8.1.tgz"; - name = "body-parser-1.8.1.tgz"; - sha1 = "f9f96d221c435c95d18aeaad2bcdea1371902aad"; + url = "http://registry.npmjs.org/body-parser/-/body-parser-1.9.0.tgz"; + name = "body-parser-1.9.0.tgz"; + sha1 = "95d72943b1a4f67f56bbac9e0dcc837b68703605"; }) ]; buildInputs = (self.nativeDeps."body-parser" or []); deps = [ self.by-version."bytes"."1.0.0" - self.by-version."depd"."0.4.4" + self.by-version."depd"."1.0.0" self.by-version."iconv-lite"."0.4.4" self.by-version."media-typer"."0.3.0" self.by-version."on-finished"."2.1.0" - self.by-version."qs"."2.2.3" + self.by-version."qs"."2.2.4" self.by-version."raw-body"."1.3.0" - self.by-version."type-is"."1.5.1" + self.by-version."type-is"."1.5.2" ]; peerDependencies = [ ]; passthru.names = [ "body-parser" ]; }; - "body-parser" = self.by-version."body-parser"."1.8.1"; + "body-parser" = self.by-version."body-parser"."1.9.0"; by-spec."boom"."0.4.x" = self.by-version."boom"."0.4.2"; by-version."boom"."0.4.2" = lib.makeOverridable self.buildNodePackage { @@ -166,25 +166,6 @@ ]; passthru.names = [ "boom" ]; }; - by-spec."buffer-crc32"."0.2.3" = - self.by-version."buffer-crc32"."0.2.3"; - by-version."buffer-crc32"."0.2.3" = lib.makeOverridable self.buildNodePackage { - name = "node-buffer-crc32-0.2.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.3.tgz"; - name = "buffer-crc32-0.2.3.tgz"; - sha1 = "bb54519e95d107cbd2400e76d0cab1467336d921"; - }) - ]; - buildInputs = - (self.nativeDeps."buffer-crc32" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "buffer-crc32" ]; - }; by-spec."bytes"."1" = self.by-version."bytes"."1.0.0"; by-version."bytes"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -283,6 +264,25 @@ ]; passthru.names = [ "cookie-signature" ]; }; + by-spec."crc"."3.0.0" = + self.by-version."crc"."3.0.0"; + by-version."crc"."3.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-crc-3.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/crc/-/crc-3.0.0.tgz"; + name = "crc-3.0.0.tgz"; + sha1 = "d11e97ec44a844e5eb15a74fa2c7875d0aac4b22"; + }) + ]; + buildInputs = + (self.nativeDeps."crc" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "crc" ]; + }; by-spec."cryptiles"."0.2.x" = self.by-version."cryptiles"."0.2.2"; by-version."cryptiles"."0.2.2" = lib.makeOverridable self.buildNodePackage { @@ -361,15 +361,34 @@ ]; passthru.names = [ "delayed-stream" ]; }; - by-spec."depd"."0.4.4" = - self.by-version."depd"."0.4.4"; - by-version."depd"."0.4.4" = lib.makeOverridable self.buildNodePackage { - name = "node-depd-0.4.4"; + by-spec."depd"."0.4.5" = + self.by-version."depd"."0.4.5"; + by-version."depd"."0.4.5" = lib.makeOverridable self.buildNodePackage { + name = "node-depd-0.4.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/depd/-/depd-0.4.4.tgz"; - name = "depd-0.4.4.tgz"; - sha1 = "07091fae75f97828d89b4a02a2d4778f0e7c0662"; + url = "http://registry.npmjs.org/depd/-/depd-0.4.5.tgz"; + name = "depd-0.4.5.tgz"; + sha1 = "1a664b53388b4a6573e8ae67b5f767c693ca97f1"; + }) + ]; + buildInputs = + (self.nativeDeps."depd" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "depd" ]; + }; + by-spec."depd"."~1.0.0" = + self.by-version."depd"."1.0.0"; + by-version."depd"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-depd-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/depd/-/depd-1.0.0.tgz"; + name = "depd-1.0.0.tgz"; + sha1 = "2fda0d00e98aae2845d4991ab1bf1f2a199073d5"; }) ]; buildInputs = @@ -437,47 +456,46 @@ ]; passthru.names = [ "escape-html" ]; }; - by-spec."etag"."~1.3.0" = - self.by-version."etag"."1.3.0"; - by-version."etag"."1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-etag-1.3.0"; + by-spec."etag"."~1.4.0" = + self.by-version."etag"."1.4.0"; + by-version."etag"."1.4.0" = lib.makeOverridable self.buildNodePackage { + name = "node-etag-1.4.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/etag/-/etag-1.3.0.tgz"; - name = "etag-1.3.0.tgz"; - sha1 = "c837debfbfe0baf7eb8e2f0bbb3d1d9cc3229697"; + url = "http://registry.npmjs.org/etag/-/etag-1.4.0.tgz"; + name = "etag-1.4.0.tgz"; + sha1 = "3050991615857707c04119d075ba2088e0701225"; }) ]; buildInputs = (self.nativeDeps."etag" or []); deps = [ - self.by-version."buffer-crc32"."0.2.3" + self.by-version."crc"."3.0.0" ]; peerDependencies = [ ]; passthru.names = [ "etag" ]; }; by-spec."express"."^4.8.3" = - self.by-version."express"."4.9.0"; - by-version."express"."4.9.0" = lib.makeOverridable self.buildNodePackage { - name = "node-express-4.9.0"; + self.by-version."express"."4.9.5"; + by-version."express"."4.9.5" = lib.makeOverridable self.buildNodePackage { + name = "node-express-4.9.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-4.9.0.tgz"; - name = "express-4.9.0.tgz"; - sha1 = "9b2ea4ebce57c7ac710604c74f6c303ab344a7f3"; + url = "http://registry.npmjs.org/express/-/express-4.9.5.tgz"; + name = "express-4.9.5.tgz"; + sha1 = "7f62aa84ac8f5e96acfb98e2944dde0bf1cf8688"; }) ]; buildInputs = (self.nativeDeps."express" or []); deps = [ - self.by-version."accepts"."1.1.0" - self.by-version."buffer-crc32"."0.2.3" + self.by-version."accepts"."1.1.1" self.by-version."cookie-signature"."1.0.5" self.by-version."debug"."2.0.0" - self.by-version."depd"."0.4.4" + self.by-version."depd"."0.4.5" self.by-version."escape-html"."1.0.1" - self.by-version."etag"."1.3.0" + self.by-version."etag"."1.4.0" self.by-version."finalhandler"."0.2.0" self.by-version."fresh"."0.2.4" self.by-version."media-typer"."0.3.0" @@ -485,12 +503,12 @@ self.by-version."on-finished"."2.1.0" self.by-version."parseurl"."1.3.0" self.by-version."path-to-regexp"."0.1.3" - self.by-version."proxy-addr"."1.0.1" - self.by-version."qs"."2.2.3" + self.by-version."proxy-addr"."1.0.3" + self.by-version."qs"."2.2.4" self.by-version."range-parser"."1.0.2" - self.by-version."send"."0.9.1" - self.by-version."serve-static"."1.6.1" - self.by-version."type-is"."1.5.1" + self.by-version."send"."0.9.3" + self.by-version."serve-static"."1.6.3" + self.by-version."type-is"."1.5.2" self.by-version."vary"."1.0.0" self.by-version."cookie"."0.1.2" self.by-version."merge-descriptors"."0.0.2" @@ -500,7 +518,7 @@ ]; passthru.names = [ "express" ]; }; - "express" = self.by-version."express"."4.9.0"; + "express" = self.by-version."express"."4.9.5"; by-spec."finalhandler"."0.2.0" = self.by-version."finalhandler"."0.2.0"; by-version."finalhandler"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -563,6 +581,25 @@ ]; passthru.names = [ "form-data" ]; }; + by-spec."forwarded"."~0.1.0" = + self.by-version."forwarded"."0.1.0"; + by-version."forwarded"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-forwarded-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"; + name = "forwarded-0.1.0.tgz"; + sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363"; + }) + ]; + buildInputs = + (self.nativeDeps."forwarded" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "forwarded" ]; + }; by-spec."fresh"."0.2.4" = self.by-version."fresh"."0.2.4"; by-version."fresh"."0.2.4" = lib.makeOverridable self.buildNodePackage { @@ -728,15 +765,15 @@ }; by-spec."inherits"."~2.0.0" = self.by-version."inherits"."2.0.1"; - by-spec."ipaddr.js"."0.1.2" = - self.by-version."ipaddr.js"."0.1.2"; - by-version."ipaddr.js"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-ipaddr.js-0.1.2"; + by-spec."ipaddr.js"."0.1.3" = + self.by-version."ipaddr.js"."0.1.3"; + by-version."ipaddr.js"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-ipaddr.js-0.1.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz"; - name = "ipaddr.js-0.1.2.tgz"; - sha1 = "6a1fd3d854f5002965c34d7bbcd9b4a8d4b0467e"; + url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.3.tgz"; + name = "ipaddr.js-0.1.3.tgz"; + sha1 = "27a9ca37f148d2102b0ef191ccbf2c51a8f025c6"; }) ]; buildInputs = @@ -846,15 +883,15 @@ self.by-version."mime"."1.2.11"; by-spec."mime"."~1.2.9" = self.by-version."mime"."1.2.11"; - by-spec."mime-db"."~1.0.1" = - self.by-version."mime-db"."1.0.1"; - by-version."mime-db"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-mime-db-1.0.1"; + by-spec."mime-db"."~1.1.0" = + self.by-version."mime-db"."1.1.0"; + by-version."mime-db"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-mime-db-1.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.0.1.tgz"; - name = "mime-db-1.0.1.tgz"; - sha1 = "35d99b0965967253bb30633a7d07a8de9975a952"; + url = "http://registry.npmjs.org/mime-db/-/mime-db-1.1.0.tgz"; + name = "mime-db-1.1.0.tgz"; + sha1 = "4613f418ab995450bf4bda240cd0ab38016a07a9"; }) ]; buildInputs = @@ -865,28 +902,26 @@ ]; passthru.names = [ "mime-db" ]; }; - by-spec."mime-types"."~2.0.0" = - self.by-version."mime-types"."2.0.1"; - by-version."mime-types"."2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-mime-types-2.0.1"; + by-spec."mime-types"."~2.0.2" = + self.by-version."mime-types"."2.0.2"; + by-version."mime-types"."2.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-mime-types-2.0.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.1.tgz"; - name = "mime-types-2.0.1.tgz"; - sha1 = "7f5b4712592e7dd46ca733fd1c5f5d71356de615"; + url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.2.tgz"; + name = "mime-types-2.0.2.tgz"; + sha1 = "c74b779f2896c367888622bd537aaaad4c0a2c08"; }) ]; buildInputs = (self.nativeDeps."mime-types" or []); deps = [ - self.by-version."mime-db"."1.0.1" + self.by-version."mime-db"."1.1.0" ]; peerDependencies = [ ]; passthru.names = [ "mime-types" ]; }; - by-spec."mime-types"."~2.0.1" = - self.by-version."mime-types"."2.0.1"; by-spec."minimist"."0.0.8" = self.by-version."minimist"."0.0.8"; by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage { @@ -964,15 +999,15 @@ ]; passthru.names = [ "nan" ]; }; - by-spec."negotiator"."0.4.7" = - self.by-version."negotiator"."0.4.7"; - by-version."negotiator"."0.4.7" = lib.makeOverridable self.buildNodePackage { - name = "node-negotiator-0.4.7"; + by-spec."negotiator"."0.4.8" = + self.by-version."negotiator"."0.4.8"; + by-version."negotiator"."0.4.8" = lib.makeOverridable self.buildNodePackage { + name = "node-negotiator-0.4.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz"; - name = "negotiator-0.4.7.tgz"; - sha1 = "a4160f7177ec806738631d0d3052325da42abdc8"; + url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.8.tgz"; + name = "negotiator-0.4.8.tgz"; + sha1 = "96010b23b63c387f47a4bed96762a831cda39eab"; }) ]; buildInputs = @@ -1044,14 +1079,14 @@ by-spec."on-finished"."~2.1.0" = self.by-version."on-finished"."2.1.0"; by-spec."options".">=0.0.5" = - self.by-version."options"."0.0.5"; - by-version."options"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-options-0.0.5"; + self.by-version."options"."0.0.6"; + by-version."options"."0.0.6" = lib.makeOverridable self.buildNodePackage { + name = "node-options-0.0.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/options/-/options-0.0.5.tgz"; - name = "options-0.0.5.tgz"; - sha1 = "9a3806378f316536d79038038ba90ccb724816c3"; + url = "http://registry.npmjs.org/options/-/options-0.0.6.tgz"; + name = "options-0.0.6.tgz"; + sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; }) ]; buildInputs = @@ -1100,21 +1135,22 @@ ]; passthru.names = [ "path-to-regexp" ]; }; - by-spec."proxy-addr"."1.0.1" = - self.by-version."proxy-addr"."1.0.1"; - by-version."proxy-addr"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-proxy-addr-1.0.1"; + by-spec."proxy-addr"."~1.0.3" = + self.by-version."proxy-addr"."1.0.3"; + by-version."proxy-addr"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "node-proxy-addr-1.0.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.1.tgz"; - name = "proxy-addr-1.0.1.tgz"; - sha1 = "c7c566d5eb4e3fad67eeb9c77c5558ccc39b88a8"; + url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.3.tgz"; + name = "proxy-addr-1.0.3.tgz"; + sha1 = "17d824aac844707441249da6d1ea5e889007cdd6"; }) ]; buildInputs = (self.nativeDeps."proxy-addr" or []); deps = [ - self.by-version."ipaddr.js"."0.1.2" + self.by-version."forwarded"."0.1.0" + self.by-version."ipaddr.js"."0.1.3" ]; peerDependencies = [ ]; @@ -1139,15 +1175,15 @@ ]; passthru.names = [ "punycode" ]; }; - by-spec."qs"."2.2.3" = - self.by-version."qs"."2.2.3"; - by-version."qs"."2.2.3" = lib.makeOverridable self.buildNodePackage { - name = "node-qs-2.2.3"; + by-spec."qs"."2.2.4" = + self.by-version."qs"."2.2.4"; + by-version."qs"."2.2.4" = lib.makeOverridable self.buildNodePackage { + name = "node-qs-2.2.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-2.2.3.tgz"; - name = "qs-2.2.3.tgz"; - sha1 = "6139c1f47960eff5655e56aab0ef9f6dd16d4eeb"; + url = "http://registry.npmjs.org/qs/-/qs-2.2.4.tgz"; + name = "qs-2.2.4.tgz"; + sha1 = "2e9fbcd34b540e3421c924ecd01e90aa975319c8"; }) ]; buildInputs = @@ -1177,7 +1213,7 @@ ]; passthru.names = [ "qs" ]; }; - by-spec."range-parser"."~1.0.0" = + by-spec."range-parser"."~1.0.2" = self.by-version."range-parser"."1.0.2"; by-version."range-parser"."1.0.2" = lib.makeOverridable self.buildNodePackage { name = "node-range-parser-1.0.2"; @@ -1196,8 +1232,6 @@ ]; passthru.names = [ "range-parser" ]; }; - by-spec."range-parser"."~1.0.2" = - self.by-version."range-parser"."1.0.2"; by-spec."raw-body"."1.3.0" = self.by-version."raw-body"."1.3.0"; by-version."raw-body"."1.3.0" = lib.makeOverridable self.buildNodePackage { @@ -1270,25 +1304,25 @@ ]; passthru.names = [ "rimraf" ]; }; - by-spec."send"."0.9.1" = - self.by-version."send"."0.9.1"; - by-version."send"."0.9.1" = lib.makeOverridable self.buildNodePackage { - name = "node-send-0.9.1"; + by-spec."send"."0.9.3" = + self.by-version."send"."0.9.3"; + by-version."send"."0.9.3" = lib.makeOverridable self.buildNodePackage { + name = "node-send-0.9.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/send/-/send-0.9.1.tgz"; - name = "send-0.9.1.tgz"; - sha1 = "d93689f7c9ce36bd32f8ee572bb60bda032edc23"; + url = "http://registry.npmjs.org/send/-/send-0.9.3.tgz"; + name = "send-0.9.3.tgz"; + sha1 = "b43a7414cd089b7fbec9b755246f7c37b7b85cc0"; }) ]; buildInputs = (self.nativeDeps."send" or []); deps = [ self.by-version."debug"."2.0.0" - self.by-version."depd"."0.4.4" + self.by-version."depd"."0.4.5" self.by-version."destroy"."1.0.3" self.by-version."escape-html"."1.0.1" - self.by-version."etag"."1.3.0" + self.by-version."etag"."1.4.0" self.by-version."fresh"."0.2.4" self.by-version."mime"."1.2.11" self.by-version."ms"."0.6.2" @@ -1299,15 +1333,15 @@ ]; passthru.names = [ "send" ]; }; - by-spec."serve-static"."~1.6.1" = - self.by-version."serve-static"."1.6.1"; - by-version."serve-static"."1.6.1" = lib.makeOverridable self.buildNodePackage { - name = "node-serve-static-1.6.1"; + by-spec."serve-static"."~1.6.3" = + self.by-version."serve-static"."1.6.3"; + by-version."serve-static"."1.6.3" = lib.makeOverridable self.buildNodePackage { + name = "node-serve-static-1.6.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/serve-static/-/serve-static-1.6.1.tgz"; - name = "serve-static-1.6.1.tgz"; - sha1 = "2f257563afbe931d28cee4aa3dfeddc975a87193"; + url = "http://registry.npmjs.org/serve-static/-/serve-static-1.6.3.tgz"; + name = "serve-static-1.6.3.tgz"; + sha1 = "b214235d4d4516db050ea9f7b429b46212e79132"; }) ]; buildInputs = @@ -1315,7 +1349,7 @@ deps = [ self.by-version."escape-html"."1.0.1" self.by-version."parseurl"."1.3.0" - self.by-version."send"."0.9.1" + self.by-version."send"."0.9.3" self.by-version."utils-merge"."1.0.0" ]; peerDependencies = [ @@ -1424,21 +1458,21 @@ passthru.names = [ "tunnel-agent" ]; }; by-spec."type-is"."~1.5.1" = - self.by-version."type-is"."1.5.1"; - by-version."type-is"."1.5.1" = lib.makeOverridable self.buildNodePackage { - name = "node-type-is-1.5.1"; + self.by-version."type-is"."1.5.2"; + by-version."type-is"."1.5.2" = lib.makeOverridable self.buildNodePackage { + name = "node-type-is-1.5.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/type-is/-/type-is-1.5.1.tgz"; - name = "type-is-1.5.1.tgz"; - sha1 = "5c1e62d874f79199fb16b34d16972dba376ccbed"; + url = "http://registry.npmjs.org/type-is/-/type-is-1.5.2.tgz"; + name = "type-is-1.5.2.tgz"; + sha1 = "8291bbe845a904acfaffd05a41fdeb234bfa9e5f"; }) ]; buildInputs = (self.nativeDeps."type-is" or []); deps = [ self.by-version."media-typer"."0.3.0" - self.by-version."mime-types"."2.0.1" + self.by-version."mime-types"."2.0.2" ]; peerDependencies = [ ]; @@ -1499,7 +1533,7 @@ self.by-version."commander"."2.1.0" self.by-version."nan"."1.0.0" self.by-version."tinycolor"."0.0.1" - self.by-version."options"."0.0.5" + self.by-version."options"."0.0.6" ]; peerDependencies = [ ]; diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 82f1bc382d71..231533e580ea 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, x11, sqlite, gsl, - pyqt4, qwt, fcgi, python, libspatialindex, libspatialite, sip }: + pyqt4, qwt, fcgi, python, libspatialindex, libspatialite }: stdenv.mkDerivation rec { name = "qgis-2.4.0"; - buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 sip qwt + buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt fcgi libspatialindex libspatialite ]; nativeBuildInputs = [ cmake python ]; diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix new file mode 100644 index 000000000000..c2f963f001b7 --- /dev/null +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchgit, cmake, python, libX11, qt4 }: + +stdenv.mkDerivation { + name = "apitrace-09519af205"; + + src = fetchgit { + url = git://github.com/apitrace/apitrace.git; + rev = "09519af2056879ce0ea59f7085ac4b282c7d01d0"; + sha256 = "1ka34fhl85k90r7kvp89awlqb6prkbqx0kg1whb3535rnvficxdv"; + }; + + buildInputs = [ cmake python libX11 qt4 ]; + + buildPhase = '' + cmake + make + ''; + + meta = with stdenv.lib; { + homepage = https://apitrace.github.io; + description = "A set of tools to trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index c4e2a7534af3..f15c5addf98c 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -9,12 +9,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "1.4.2"; + version = "1.6.0"; name = "darktable-${version}"; src = fetchurl { - url = "mirror://sourceforge/darktable/darktable/1.2/darktable-${version}.tar.xz"; - sha256 = "02875rnabw5m9aqfls59901889iyxkmm4xk445fvh1v06dp1lcf1"; + url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; + sha256 = "0zjrcd9a73ikn9g8yx9lixz1ifwbmy2vg2ipc24lnkpqhrbb1y1b"; }; buildInputs = @@ -46,9 +46,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Virtual lighttable and darkroom for photographers"; - homepage = http://darktable.sourceforge.net; + homepage = http://www.darktable.org; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu maintainers.rickynils ]; + maintainers = [ maintainers.goibhniu maintainers.rickynils maintainers.flosse ]; }; } diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index d23f42fdbf99..e40a5fd0630e 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A light-weight image viewer"; homepage = https://derf.homelinux.org/projects/feh/; - license = "BSD"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix index 7558b0aef4b6..cbde1879d312 100644 --- a/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/pkgs/applications/graphics/luminance-hdr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchurl, pkgconfig, qt5, boost, exiv2, fftwFloat, gsl +{ stdenv, cmake, fetchurl, fetchpatch, pkgconfig, qt5, boost, exiv2, fftwFloat, gsl , ilmbase, lcms2, libraw, libtiff, openexr }: @@ -10,6 +10,13 @@ stdenv.mkDerivation rec { sha256 = "00fldbcizrx8jcnjgq74n3zmbm27dxzl96fxa7q49689mfnlw08l"; }; + patches = [(fetchpatch { + name = "fix-qt53-build.diff"; + url = "http://anonscm.debian.org/cgit/pkg-phototools/luminance-hdr.git/" + + "plain/debian/patches/51_qt5_printsupport.diff?id=00c869a860062dac181303f2c03a3513c0e210bc"; + sha256 = "0nzvfxd3ybxx61rj6vxcaaxfrsxrl9af3h8jj7pr3rncisnl9gkl"; + })]; + NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; buildInputs = [ qt5 boost exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr ]; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 48044fba1666..223f632f937d 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite, webkitgtk24x , pkgconfig, gnome3, gst_all_1, which, udev, libraw, glib, json_glib, gettext, desktop_file_utils -, lcms2, gdk_pixbuf, librsvg, makeWrapper, gnome_doc_utils }: +, lcms2, gdk_pixbuf, librsvg, makeWrapper, gnome_doc_utils, hicolor_icon_theme }: # for dependencies see http://www.yorba.org/projects/shotwell/install/ @@ -42,7 +42,8 @@ in stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/shotwell" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" rm $out/share/icons/hicolor/icon-theme.cache ''; @@ -50,7 +51,9 @@ in stdenv.mkDerivation rec { buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk24x pkgconfig gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee which udev gnome3.gexiv2 libraw rest json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg - makeWrapper gnome_doc_utils ]; + makeWrapper gnome_doc_utils + gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic + hicolor_icon_theme ]; meta = with stdenv.lib; { description = "Popular photo organizer for the GNOME desktop"; diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index 2929513952e1..4299d49ae65f 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = http://www.yworks.com/en/products/yfiles/yed/; description = "A powerful desktop application that can be used to quickly and effectively generate high-quality diagrams"; platforms = jre.meta.platforms; - maintainer = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 01f9b861bf27..4c48324baba9 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -4,6 +4,7 @@ , zlib, fftw , jackaudioSupport ? false, jack2 , cudaSupport ? false, cudatoolkit6 +, colladaSupport ? true, opencollada }: with lib; @@ -22,7 +23,8 @@ stdenv.mkDerivation rec { opencolorio openexr openimageio /* openjpeg */ python zlib fftw ] ++ optional jackaudioSupport jack2 - ++ optional cudaSupport cudatoolkit6; + ++ optional cudaSupport cudatoolkit6 + ++ optional colladaSupport opencollada; postUnpack = '' @@ -30,8 +32,7 @@ stdenv.mkDerivation rec { ''; cmakeFlags = - [ "-DWITH_OPENCOLLADA=OFF" - "-DWITH_MOD_OCEANSIM=ON" + [ "-DWITH_MOD_OCEANSIM=ON" "-DWITH_CODEC_FFMPEG=ON" "-DWITH_CODEC_SNDFILE=ON" "-DWITH_INSTALL_PORTABLE=OFF" @@ -41,7 +42,8 @@ stdenv.mkDerivation rec { "-DPYTHON_VERSION=${python.majorVersion}" ] ++ optional jackaudioSupport "-DWITH_JACK=ON" - ++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON"; + ++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON" + ++ optional colladaSupport "-DWITH_OPENCOLLADA=ON"; NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}m"; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 4656e5add13f..ba4946ecc4b1 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-2.12.0"; + name = "calibre-2.13.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "1qp3aq6f6ngfy8m0bj6rzdf6p2vmk4bxycxfby2n8byfhr8gaclf"; + sha256 = "0sd9yanl4n1bmbxpvdvl68bisp0bgvfk6naddkvcahy9h7qc6h33"; }; inherit python; diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 039b4ac688bf..33371c93b866 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -12,11 +12,6 @@ stdenv.mkDerivation rec { sha256 = "0x95f57s0a96c4lifxdpf73v706iggwmdw8742mabbjnxq55l1qs"; }; - patchPhase = '' - substituteInPlace "settings.c" \ - --replace "xdgConfigOpen(\"dunst/dunstrc\", \"r\", &xdg" "fopen(\"$out/share/dunst/dunstrc\", \"r\"" - ''; - buildInputs = [ coreutils unzip which pkgconfig dbus freetype libnotify gdk_pixbuf xdg_utils libXext glib pango cairo libX11 libxdg_basedir diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index c35a2c7ff821..97ffd02e7514 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchurl, pythonPackages, slowaes, ecdsa, pyqt4 }: +{ stdenv, fetchurl, buildPythonPackage, slowaes, ecdsa, pyqt4 }: -pythonPackages.buildPythonPackage rec { +buildPythonPackage rec { + namePrefix = ""; name = "electrum-${version}"; version = "1.9.8"; @@ -11,7 +12,7 @@ pythonPackages.buildPythonPackage rec { buildInputs = [ slowaes ecdsa ]; - propagatedBuildInputs = [ + propagatedBuildInputs = [ slowaes ecdsa pyqt4 @@ -29,4 +30,4 @@ pythonPackages.buildPythonPackage rec { license = stdenv.lib.licenses.gpl3; maintainers = [ "emery@vfemail.net" ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix index ea72dc032695..43631ecdb249 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/applications/misc/gosmore/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "gosmore-r${version}"; src = fetchsvn { url = http://svn.openstreetmap.org/applications/rendering/gosmore; - sha256 = "0qyvrb4xgy4msc7f65widzkvjzc8mlddc4dyr1i76b7wd3gpk0xj"; + sha256 = "0d8ddfa0nhz51ambwj9y5jjbizl9y9w44sviisk3ysqvn8q0phds"; rev = "${version}"; }; diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix index d0a57e4cec27..169331ceb733 100644 --- a/pkgs/applications/misc/gqrx/default.nix +++ b/pkgs/applications/misc/gqrx/default.nix @@ -8,11 +8,11 @@ assert pulseaudioSupport -> pulseaudio != null; stdenv.mkDerivation rec { name = "gqrx-${version}"; - version = "2.3.0"; + version = "2.3.2"; src = fetchurl { url = "mirror://sourceforge/project/gqrx/${version}/${name}.tar.xz"; - sha256 = "0fyfkdd2ailg54ppv1y2fy2c692jmlmsyl1lxr20lyn6bvd9gpyn"; + sha256 = "1vfqqa976xlbapqkpc9nka364zydvsy18xiwfqjy015kpasshdz1"; }; buildInputs = [ diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/pkgs/applications/misc/gtk2fontsel/default.nix new file mode 100644 index 000000000000..ea3f4b8f2b92 --- /dev/null +++ b/pkgs/applications/misc/gtk2fontsel/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchurl, pkgconfig, gtk }: + +stdenv.mkDerivation rec { + version = "0.1"; + name = "gtk2fontsel-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/gtk2fontsel/${name}.tar.gz"; + sha256 = "0s2sj19n8ys92q9832hkn36ld91bb4qavicc6nygkry6qdpkkmjw"; + }; + + buildInputs = [ stdenv pkgconfig gtk ]; + + preferLocalBuild = true; + + meta = with stdenv.lib; { + description = "A font selection program for X11 using the GTK2 toolkit"; + longDescription = '' + Font selection tool similar to xfontsel implemented using GTK+ 2. + Trivial, but useful nonetheless. + ''; + homepage = http://gtk2fontsel.sourceforge.net/; + downloadPage = http://sourceforge.net/projects/gtk2fontsel/; + license = licenses.gpl2; + maintainers = [ maintainers.prikhi ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 6c5371a62990..9c592fcbb2d0 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -96,7 +96,7 @@ in stdenv.mkDerivation rec { -ljbig2dec -ljpeg -lopenjp2 -lpng -lfreetype -lpthread -lmujs \ -lPgm2asc -llept -ltesseract -lcrypto - mkdir -p $out/bin + mkdir -p $out/bin cp k2pdfopt $out/bin ''; diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix index b220c9127de6..fbe6c48264cf 100644 --- a/pkgs/applications/misc/k3b/default.nix +++ b/pkgs/applications/misc/k3b/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, cmake, qt4, perl, shared_mime_info, libvorbis, taglib +{ stdenv, fetchurl, makeWrapper, cmake, qt4, perl, shared_mime_info, libvorbis, taglib , flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext -, transcode, cdrdao, dvdplusrwtools, vcdimager +, transcode, cdrdao, dvdplusrwtools, vcdimager, cdparanoia , kdelibs, kdemultimedia, automoc4, phonon, libkcddb ? null }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { flac libsamplerate libdvdread lame libsndfile libmad gettext stdenv.gcc.libc kdelibs kdemultimedia automoc4 phonon - libkcddb + libkcddb makeWrapper cdparanoia ]; enableParallelBuilding = true; @@ -26,6 +26,11 @@ stdenv.mkDerivation rec { # eMovix, growisofs, mkisofs, normalize, readcd, transcode, vcdxbuild, # vcdxminfo, and vcdxrip propagatedUserEnvPkgs = [ transcode dvdplusrwtools cdrdao vcdimager ]; + + postInstall = '' + wrapProgram $out/bin/k3b \ + --prefix LD_LIBRARY_PATH ":" "${cdparanoia}/lib" + ''; meta = with stdenv.lib; { description = "CD/DVD Burning Application for KDE"; diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 5284d441b44f..258b8cac9403 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -1,5 +1,5 @@ { stdenv, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf, lablgl -, gtk3, openjpeg, jbig2dec, mujs }: +, gtk3, openjpeg, jbig2dec, mujs, xsel }: let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; in stdenv.mkDerivation rec { @@ -28,7 +28,8 @@ in stdenv.mkDerivation rec { install link.so $out/lib wrapProgram $out/bin/llpp \ --prefix CAML_LD_LIBRARY_PATH ":" "${lablgl}/lib/ocaml/${ocamlVersion}/site-lib/lablgl" \ - --prefix CAML_LD_LIBRARY_PATH ":" "$out/lib" + --prefix CAML_LD_LIBRARY_PATH ":" "$out/lib" \ + --prefix PATH ":" "${xsel}/bin" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix new file mode 100644 index 000000000000..8013cbe3669d --- /dev/null +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }: + +let version = "0.7.71"; in + +stdenv.mkDerivation { + name = "mediainfo-gui-${version}"; + src = fetchurl { + url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.bz2"; + sha256 = "0sf0ym0v5ds5w4bxk66712adybr1prxxqwvrf9clm57ibs602jfq"; + }; + + buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ]; + + sourceRoot = "./MediaInfo/Project/GNU/GUI/"; + + preConfigure = "sh autogen"; + + meta = { + description = "Supplies technical and tag information about a video or audio file (GUI version)"; + longDescription = '' + MediaInfo is a convenient unified display of the most relevant technical + and tag data for video and audio files. + ''; + homepage = http://mediaarea.net/; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.devhell ]; + }; +} diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix new file mode 100644 index 000000000000..a3393a0a99fb --- /dev/null +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }: + +let version = "0.7.71"; in + +stdenv.mkDerivation { + name = "mediainfo-${version}"; + src = fetchurl { + url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.bz2"; + sha256 = "0sf0ym0v5ds5w4bxk66712adybr1prxxqwvrf9clm57ibs602jfq"; + }; + + buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ]; + + sourceRoot = "./MediaInfo/Project/GNU/CLI/"; + + configureFlags = [ "--with-libmediainfo=${libmediainfo}" ]; + preConfigure = "sh autogen"; + + meta = { + description = "Supplies technical and tag information about a video or audio file"; + longDescription = '' + MediaInfo is a convenient unified display of the most relevant technical + and tag data for video and audio files. + ''; + homepage = http://mediaarea.net/; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.devhell ]; + }; +} diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index 17da22cbaafc..7d17e6c4a95c 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -5,10 +5,10 @@ let s = # Generated upstream information rec { baseName="qpdfview"; - version="0.4.12"; + version = "0.4.13"; name="${baseName}-${version}"; url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz"; - sha256="1h6lrrh1vblqkxrd89nmid7d21anyn30iahj24z62yny35lidf0g"; + sha256 = "0hcfy9wrgs6vygmq790rqipw2132br3av3nhzrm4gpxlbw2n7xcg"; }; buildInputs = [ qt4 popplerQt4 pkgconfig djvulibre libspectre cups file ghostscript diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 2a518b9d7cc9..746b5e5ef465 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "synergy-${version}"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "synergy"; repo = "synergy"; - rev = "1.6.1"; - sha256 = "1043101c4phv1nbxiqp2jn1jhgzspv9q6v75z0kfzwgii5n5xq1c"; + rev = version; + sha256 = "0himg6c50x5wz5nc6rgd54rph1w6nin6j9f08pa4spsxn9b5h8ks"; }; patches = optional stdenv.isLinux ./cryptopp.patch; diff --git a/pkgs/applications/misc/taffybar/default.nix b/pkgs/applications/misc/taffybar/default.nix index 1f5481fc5a9c..8f2f95193fbb 100644 --- a/pkgs/applications/misc/taffybar/default.nix +++ b/pkgs/applications/misc/taffybar/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "taffybar"; - version = "0.4.3"; - sha256 = "1h7acdzq3bndy44lyvgnm3gvxpbhzcs0ymvkrhmn3y41bfcwaac2"; + version = "0.4.4"; + sha256 = "046nfp878mqj9acsid94mqp8q1yqnm1hsdkv88m5qpmn182xljwh"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 09edb086c9f2..0bc2170340c8 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { homepage = http://xca.sourceforge.net/; platforms = platforms.all; license = licenses.bsd3; - broken = true; }; } diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index fdcdd4770d0e..2e690dcce090 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -1,5 +1,5 @@ { enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false -, stdenv, fetchurl, x11 ? null, motif ? null, freetype ? null, t1lib ? null +, stdenv, fetchurl, zlib, libpng, x11 ? null, motif ? null, freetype ? null, t1lib ? null , base14Fonts ? null }: @@ -10,14 +10,14 @@ assert useT1Lib -> t1lib != null; assert !useT1Lib; # t1lib has multiple unpatched security vulnerabilities stdenv.mkDerivation { - name = "xpdf-3.03"; + name = "xpdf-3.04"; src = fetchurl { - url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.03.tar.gz; - sha256 = "1jnfzdqc54wa73lw28kjv0m7120mksb0zkcn81jdlvijyvc67kq2"; + url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.04.tar.gz; + sha256 = "1rbp54mr3z2x3a3a1qmz8byzygzi223vckfam9ib5g1sfds0qf8i"; }; - buildInputs = + buildInputs = [ zlib libpng ] ++ stdenv.lib.optionals enableGUI [x11 motif] ++ stdenv.lib.optional useT1Lib t1lib ++ stdenv.lib.optional enablePDFtoPPM freetype; diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix index 73f8be7d93dc..f4b36d5e7567 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, dconf }: stdenv.mkDerivation { - name = "dwb-2014-09-20"; + name = "dwb-2014-12-15"; src = fetchgit { - url = "https://bitbucket.org/portix/dwb.git"; - rev = "6a0e483533021157fa83ce7533c1b25c71254f00"; - sha256 = "0l8ryz4aqcw6ax6w7y22yl9bh8fs3gxnlppbas1jq7q7hjk1qs31"; + url = "https://bitbucket.org/0mark/dwb_collect"; + rev = "b94785470b11a0b6b52eecfc3bae276796b83a0d"; + sha256 = "09xbifj223mflj62rfhi6q7cvnkpkzkwyyqhkm8w067pdscdhyvs"; }; buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup webkitgtk2 gtk2 gnutls json_c m4 ]; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index eba0deb627e4..330bf6def59e 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -1,5 +1,5 @@ { stdenv, lib, browser, makeDesktopItem, makeWrapper, plugins, gst_plugins, libs, gtk_modules -, browserName, desktopName, nameSuffix, icon +, browserName, desktopName, nameSuffix, icon, libtrick ? true }: let p = builtins.parseDrvName browser.name; in @@ -33,7 +33,21 @@ stdenv.mkDerivation { --suffix-each GTK_PATH ':' "$gtk_modules" \ --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ - --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" + --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \ + --set MOZ_OBJDIR "$(ls -d "${browser}/lib/${browserName}*")" + + ${ lib.optionalString libtrick + '' + sed -e "s@exec @exec -a '$out/bin/${browserName}${nameSuffix}' @" -i "$out/bin/${browserName}${nameSuffix}" + libdirname="$(echo "${browser}/lib/${browserName}"*)" + libdirbasename="$(basename "$libdirname")" + mkdir -p "$out/lib/$libdirbasename" + ln -s "$libdirname"/* "$out/lib/$libdirbasename" + script_location="$(mktemp "$out/lib/$libdirbasename/${browserName}${nameSuffix}.XXXXXX")" + mv "$out/bin/${browserName}${nameSuffix}" "$script_location" + ln -s "$script_location" "$out/bin/${browserName}${nameSuffix}" + '' + } mkdir -p $out/share/applications cp $desktopItem/share/applications/* $out/share/applications diff --git a/pkgs/applications/networking/browsers/kwebkitpart/CVE-2014-8600.diff b/pkgs/applications/networking/browsers/kwebkitpart/CVE-2014-8600.diff new file mode 100644 index 000000000000..0c65e68f2167 --- /dev/null +++ b/pkgs/applications/networking/browsers/kwebkitpart/CVE-2014-8600.diff @@ -0,0 +1,33 @@ +--- a/src/webpage.cpp ++++ b/src/webpage.cpp +@@ -226,23 +226,26 @@ + doc += QL1S( "<h3>" ); + doc += i18n( "Details of the Request:" ); + doc += QL1S( "</h3><ul><li>" ); +- doc += i18n( "URL: %1", reqUrl.url() ); ++ // escape URL twice: once for i18n, and once for HTML. ++ doc += i18n( "URL: %1", Qt::escape( Qt::escape( reqUrl.prettyUrl() ) ) ); + doc += QL1S( "</li><li>" ); + + const QString protocol (reqUrl.protocol()); + if ( !protocol.isNull() ) { +- doc += i18n( "Protocol: %1", protocol ); ++ // escape protocol twice: once for i18n, and once for HTML. ++ doc += i18n( "Protocol: %1", Qt::escape( Qt::escape( protocol ) ) ); + doc += QL1S( "</li><li>" ); + } + + doc += i18n( "Date and Time: %1", + KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), KLocale::LongDate) ); + doc += QL1S( "</li><li>" ); +- doc += i18n( "Additional Information: %1" , text ); ++ // escape text twice: once for i18n, and once for HTML. ++ doc += i18n( "Additional Information: %1", Qt::escape( Qt::escape( text ) ) ); + doc += QL1S( "</li></ul><h3>" ); + doc += i18n( "Description:" ); + doc += QL1S( "</h3><p>" ); +- doc += description; ++ doc += Qt::escape( description ); + doc += QL1S( "</p>" ); + + if ( causes.count() ) { diff --git a/pkgs/applications/networking/browsers/kwebkitpart/default.nix b/pkgs/applications/networking/browsers/kwebkitpart/default.nix index 5ced048fe649..cb3a0e9eac49 100644 --- a/pkgs/applications/networking/browsers/kwebkitpart/default.nix +++ b/pkgs/applications/networking/browsers/kwebkitpart/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0kszffgg3zpf319lmzlmdba5gq8kdr5xwb69xwy4s2abc9nvwvbi"; }; + patches = [ ./CVE-2014-8600.diff ]; + buildInputs = [ kdelibs ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index 11a17709ade3..73fd39b75e98 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -11,14 +11,18 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight WebKitGTK+ web browser"; - homepage = "http://www.midori-browser.org"; + homepage = "http://midori-browser.org"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ raskin iyzsong ]; }; src = fetchurl { - url = "${meta.homepage}/downloads/midori_${version}_all_.tar.bz2"; + urls = [ + "${meta.homepage}/downloads/midori_${version}_all_.tar.bz2" + "http://mirrors-ru.go-parts.com/blfs/conglomeration/midori/midori_${version}_all_.tar.bz2" + ]; + name = "midori_${version}_all_.tar.bz2"; sha256 = "10ckm98rfqfbwr84b8mc1ssgj84wjgkr4dadvx2l7c64sigi66dg"; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index f04a5f12ea2d..e8b0b2bb5d57 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -36,7 +36,7 @@ let # -> http://get.adobe.com/flashplayer/ - version = "11.2.202.424"; + version = "11.2.202.425"; src = if stdenv.system == "x86_64-linux" then @@ -47,7 +47,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "1nkk77lbvvq9x17rlygwlkprq2pgnci5riwxvvriknkqr277dhz8"; + sha256 = "1bk0xh213jbinq0y587m01vklsbxskhqfgi2a2x8w8a7qyw42alf"; } else if stdenv.system == "i686-linux" then if debug then @@ -60,7 +60,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "1zwlzc7z6q8vr5hjzx6jywjcx9r0g9jxz141hlf6lqzicf4x6qan"; + sha256 = "0jcip60g0dwca304y4vmzyfw06zdagpyzvm66jxqy1sy6j78br0b"; } else throw "Flash Player is not supported on this platform"; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix new file mode 100644 index 000000000000..16a31f6f3ba1 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, glib, pkgconfig, dbus_glib, telepathy_glib, libxslt }: + +stdenv.mkDerivation rec { + pname = "telepathy-idle"; + version = "0.2.0"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; + sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh"; + }; + + buildInputs = [ pkgconfig glib telepathy_glib dbus_glib libxslt ]; + + meta = { + description = "IRC connection manager for the Telepathy framework"; + license = stdenv.lib.licenses.lgpl21; + platforms = stdenv.lib.platforms.gnu; + }; +} diff --git a/pkgs/applications/networking/irc/weechat/devel.nix b/pkgs/applications/networking/irc/weechat/devel.nix deleted file mode 100644 index a2f32e2b3d3c..000000000000 --- a/pkgs/applications/networking/irc/weechat/devel.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchgit, ncurses, openssl, perl, python, aspell, gnutls -, zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile -, pythonPackages, cacert, cmake, makeWrapper }: - -stdenv.mkDerivation rec { - rev = "124b2668fe4e97e3926caea85ed2c9f7082c4df9"; - version = "1.0-rev${rev}"; - name = "weechat-${version}"; - - src = fetchgit { - inherit rev; - url = "git://github.com/weechat/weechat.git"; - sha256 = "1xl5scyrxmyqaycpalhl3j50s65w2gjdm43vahd618yyykdffr8b"; - }; - - buildInputs = - [ ncurses perl python openssl aspell gnutls zlib curl pkgconfig - libgcrypt ruby lua5 tcl guile pythonPackages.pycrypto makeWrapper - cacert cmake ] - ++ stdenv.lib.optional stdenv.isDarwin pythonPackages.pync; - - NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}"; - - postInstall = '' - NIX_PYTHON_PATH="$out/lib/${python.libPrefix}/site-packages" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - NIX_PYTHON_PATH+="${pythonPackages.pync}/lib/${python.libPrefix}/site-packages" - '' + '' - wrapProgram "$out/bin/weechat" \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix PYTHONPATH : "$NIX_PYTHONPATH" - ''; - - meta = { - homepage = http://www.weechat.org/; - description = "A fast, light and extensible chat client"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny ]; - platforms = stdenv.lib.platforms.unix; - broken = true; # we have a newer stable that builds - }; -} diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 6e7755c7bf43..7c04abebb54c 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { description = "Synchronise your ownCloud with your computer using this desktop client"; homepage = https://owncloud.org; maintainers = with stdenv.lib.maintainers; [ qknight ]; + meta.platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index 8fa5cb6c2ee6..01ba9ff47eaa 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -17,7 +17,11 @@ stdenv.mkDerivation rec { rm $out/share/icons/hicolor/icon-theme.cache ''; - meta = { - description = "GTK remote control for the Transmission BitTorrent client"; - }; + meta = with stdenv.lib; + { description = "GTK remote control for the Transmission BitTorrent client"; + homepage = http://code.google.com/p/transmission-remote-gtk/; + license = licenses.gpl2; + maintainers = [ maintainers.emery ]; + platforms = platforms.linux; + }; } diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix index 1f08b9873d44..2e196cdf8cf3 100644 --- a/pkgs/applications/networking/umurmur/default.nix +++ b/pkgs/applications/networking/umurmur/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { configureFlags = "--with-ssl=openssl"; - meta = { + meta = with stdenv.lib; { description = "Minimalistic Murmur (Mumble server)"; - license = "BSD"; + license = licenses.bsd3; homepage = http://code.google.com/p/umurmur/; }; } diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 3c58d367ab1e..9f18095beb83 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "calligra-2.8.6"; + name = "calligra-2.8.7"; src = fetchurl { url = "mirror://kde/stable/${name}/${name}.tar.xz"; - sha256 = "587dda4a340f46e28fe69de8f292fa33a3cf237445013f6ce5ceafa191cb3694"; + sha256 = "1d8fx0xn8n8y6jglw8hhpk7kr6kbhsbaxqwqlfzmnzh7x9s8nsxg"; }; nativeBuildInputs = [ cmake perl pkgconfig ]; diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index 34aa7c769d01..350bb4d713cf 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { homepage = "http://ledger-cli.org/"; description = "A double-entry accounting system with a command-line reporting interface"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; longDescription = '' Ledger is a powerful, double-entry accounting system that is accessed diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index ceb1a9eab865..78eaa78ee10a 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -176,7 +176,8 @@ stdenv.mkDerivation rec { ln -s $out/lib/libreoffice/share/xdg $out/share/applications for f in $out/share/applications/*.desktop; do - substituteInPlace "$f" --replace "Exec=libreoffice4.0" "Exec=$out/bin/soffice" + substituteInPlace "$f" --replace "Exec=libreofficedev${major}.${minor}" "Exec=$out/bin/soffice" + substituteInPlace "$f" --replace "Exec=libreoffice${major}.${minor}" "Exec=$out/bin/soffice" substituteInPlace "$f" --replace "Exec=libreoffice" "Exec=$out/bin/soffice" done ''; diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index a12849cf2099..52dd08e1e0d8 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxslt, kdelibs, kdepimlibs, grantlee, qjson, qca2, libofx, sqlite, gettext }: +{ stdenv, fetchurl, libxslt, kdelibs, kdepimlibs, grantlee, qjson, qca2, libofx, sqlite, gettext, boost }: stdenv.mkDerivation rec { name = "skrooge-1.10.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0rsw2xdgws5bvnf3h4hg16liahigcxgaxls7f8hzr9wipxx5xqda"; }; - buildInputs = [ libxslt kdelibs kdepimlibs grantlee qjson qca2 libofx sqlite ]; + buildInputs = [ libxslt kdelibs kdepimlibs grantlee qjson qca2 libofx sqlite boost ]; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 6cd8697cd7d7..5acc8caf6b84 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchurl, bash, callPackage, libIDL, pysqlite }: +{ stdenv, fetchurl, useGoldLinker, bash, callPackage, gnome, xlibs }: assert (stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"); let /* Zotero always has a hard upper bound on its firefox/xulrunner dependency. - * Use private versions of firefox and xulrunner to prevent breakage when the - * system packages are updated. Please update these dependencies whenever - * zotero is updated; it should be as simple as copying the system firefox - * and xulrunner Nix expressions into place. + * Use private version of firefox to prevent breakage when the system + * packages are updated. Please update this dependency whenever zotero is + * updated; it should be as simple as copying the system firefox expression + * into place. */ - firefox = callPackage ./firefox.nix { inherit libIDL pysqlite; }; - xulrunner = callPackage ./xulrunner.nix { inherit libIDL pysqlite firefox; }; - # Please update the firefox and xulrunner dependencies when zotero is updated! + firefox = callPackage ./firefox-bin { + gconf = gnome.GConf; + inherit (gnome) libgnome libgnomeui; + inherit (xlibs) libX11 libXScrnSaver libXcomposite libXdamage libXext + libXfixes libXinerama libXrender libXt; + }; + + # Please update the firefox dependency when zotero is updated! version = "4.0.23"; arch = if stdenv.system == "x86_64-linux" then "linux-x86_64" @@ -32,7 +37,7 @@ stdenv.mkDerivation { # Strip the bundled xulrunner prePatch = ''rm -fr run-zotero.sh zotero xulrunner/''; - inherit bash xulrunner; + inherit bash firefox; installPhase = '' mkdir -p "$out/libexec/zotero" cp -vR * "$out/libexec/zotero/" diff --git a/pkgs/applications/office/zotero/firefox-bin/default.nix b/pkgs/applications/office/zotero/firefox-bin/default.nix new file mode 100644 index 000000000000..3f85467fe315 --- /dev/null +++ b/pkgs/applications/office/zotero/firefox-bin/default.nix @@ -0,0 +1,162 @@ +{ stdenv, fetchurl, config +, alsaLib +, atk +, cairo +, cups +, dbus_glib +, dbus_libs +, fontconfig +, freetype +, gconf +, gdk_pixbuf +, glib +, glibc +, gst_plugins_base +, gstreamer +, gtk +, libX11 +, libXScrnSaver +, libXcomposite +, libXdamage +, libXext +, libXfixes +, libXinerama +, libXrender +, libXt +, libcanberra +, libgnome +, libgnomeui +, mesa +, nspr +, nss +, pango +, heimdal +, pulseaudio +, systemd +}: + +assert stdenv.isLinux; + +# imports `version` and `sources` +with (import ./sources.nix); + +let + arch = if stdenv.system == "i686-linux" + then "linux-i686" + else "linux-x86_64"; + + isPrefixOf = prefix: string: + builtins.substring 0 (builtins.stringLength prefix) string == prefix; + + sourceMatches = locale: source: + (isPrefixOf source.locale locale) && source.arch == arch; + + systemLocale = config.i18n.defaultLocale or "en-US"; + + defaultSource = stdenv.lib.findFirst (sourceMatches "en-US") {} sources; + + source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources; + +in + +stdenv.mkDerivation { + name = "firefox-bin-${version}"; + + src = fetchurl { + url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/${version}/${source.arch}/${source.locale}/firefox-${version}.tar.bz2"; + inherit (source) sha1; + }; + + phases = "unpackPhase installPhase"; + + libPath = stdenv.lib.makeLibraryPath + [ stdenv.gcc.gcc + alsaLib + atk + cairo + cups + dbus_glib + dbus_libs + fontconfig + freetype + gconf + gdk_pixbuf + glib + glibc + gst_plugins_base + gstreamer + gtk + libX11 + libXScrnSaver + libXcomposite + libXdamage + libXext + libXfixes + libXinerama + libXrender + libXt + libcanberra + libgnome + libgnomeui + mesa + nspr + nss + pango + heimdal + pulseaudio + systemd + ] + ":" + stdenv.lib.makeSearchPath "lib64" [ + stdenv.gcc.gcc + ]; + + # "strip" after "patchelf" may break binaries. + # See: https://github.com/NixOS/patchelf/issues/10 + dontStrip = 1; + + installPhase = + '' + mkdir -p "$prefix/usr/lib/firefox-bin-${version}" + cp -r * "$prefix/usr/lib/firefox-bin-${version}" + + mkdir -p "$out/bin" + ln -s "$prefix/usr/lib/firefox-bin-${version}/firefox" "$out/bin/" + + for executable in \ + firefox mozilla-xremote-client firefox-bin plugin-container \ + updater crashreporter webapprt-stub + do + patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + "$out/usr/lib/firefox-bin-${version}/$executable" + done + + for executable in \ + firefox mozilla-xremote-client firefox-bin plugin-container \ + updater crashreporter webapprt-stub libxul.so + do + patchelf --set-rpath "$libPath" \ + "$out/usr/lib/firefox-bin-${version}/$executable" + done + + # Create a desktop item. + mkdir -p $out/share/applications + cat > $out/share/applications/firefox.desktop <<EOF + [Desktop Entry] + Type=Application + Exec=$out/bin/firefox + Icon=$out/lib/firefox-bin-${version}/chrome/icons/default/default256.png + Name=Firefox + GenericName=Web Browser + Categories=Application;Network; + EOF + ''; + + meta = with stdenv.lib; { + description = "Mozilla Firefox, free web browser (binary package)"; + homepage = http://www.mozilla.org/firefox/; + license = { + free = false; + url = http://www.mozilla.org/en-US/foundation/trademarks/policy/; + }; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/office/zotero/firefox-bin/generate_sources.rb b/pkgs/applications/office/zotero/firefox-bin/generate_sources.rb new file mode 100644 index 000000000000..eabff067f750 --- /dev/null +++ b/pkgs/applications/office/zotero/firefox-bin/generate_sources.rb @@ -0,0 +1,48 @@ +# TODO share code with thunderbird-bin/generate_sources.rb + +require "open-uri" + +version = if ARGV.empty? + "latest" + else + ARGV[0] + end + +base_path = "http://download-installer.cdn.mozilla.net/pub/firefox/releases" + +Source = Struct.new(:hash, :arch, :locale, :filename) + +sources = open("#{base_path}/#{version}/SHA1SUMS") do |input| + input.readlines +end.select do |line| + /\/firefox-.*\.tar\.bz2$/ === line && !(/source/ === line) +end.map do |line| + hash, name = line.chomp.split(/ +/) + Source.new(hash, *(name.split("/"))) +end.sort_by do |source| + [source.locale, source.arch] +end + +real_version = sources[0].filename.match(/firefox-([0-9.]*)\.tar\.bz2/)[1] + +arches = ["linux-i686", "linux-x86_64"] + +puts(<<"EOH") +# This file is generated from generate_nix.rb. DO NOT EDIT. +# Execute the following command in a temporary directory to update the file. +# +# ruby generate_source.rb > source.nix + +{ + version = "#{real_version}"; + sources = [ +EOH + +sources.each do |source| + puts(%Q| { locale = "#{source.locale}"; arch = "#{source.arch}"; sha1 = "#{source.hash}"; }|) +end + +puts(<<'EOF') + ]; +} +EOF diff --git a/pkgs/applications/office/zotero/firefox-bin/sources.nix b/pkgs/applications/office/zotero/firefox-bin/sources.nix new file mode 100644 index 000000000000..c052a007beb4 --- /dev/null +++ b/pkgs/applications/office/zotero/firefox-bin/sources.nix @@ -0,0 +1,192 @@ +# This file is generated from generate_nix.rb. DO NOT EDIT. +# Execute the following command in a temporary directory to update the file. +# +# ruby generate_source.rb > source.nix + +{ + version = "33.1"; + sources = [ + { locale = "ach"; arch = "linux-i686"; sha1 = "f6ecc5e1d1470a4d79d0f680f3a194857674c5a1"; } + { locale = "ach"; arch = "linux-x86_64"; sha1 = "d28450930e53f168c11e7e0c4e7df46c20d50882"; } + { locale = "af"; arch = "linux-i686"; sha1 = "2865493140bd8838e7981749f9fe7a734fa59745"; } + { locale = "af"; arch = "linux-x86_64"; sha1 = "8f94c2be8ba8e496ff917f78206ab9a9294e4de1"; } + { locale = "an"; arch = "linux-i686"; sha1 = "3f6ecaab216f91759a39e255571edaf9b48d4733"; } + { locale = "an"; arch = "linux-x86_64"; sha1 = "ae0fce83ae2aa416dc3acda327dec98f2c7c0b98"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "aeaed8574b13046d1afb129ad9d3cc0ee22b2bff"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "997495abb13611591ce9ab5ea81cc65dd7ee579a"; } + { locale = "as"; arch = "linux-i686"; sha1 = "84193f01192c8341905a0f8d2e7b3d198c39e113"; } + { locale = "as"; arch = "linux-x86_64"; sha1 = "f7e9278e9d4b0d3b45f453a16b5840bb84598ccc"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "e52fb5a1e813e1d91ec7562bd7e94632f661c5a4"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "89f13d927c9d8596899ed09f8c9f7d97c26d78f5"; } + { locale = "az"; arch = "linux-i686"; sha1 = "bc0972e18db99f9d6fdbe100dd09d62bb2c3afbd"; } + { locale = "az"; arch = "linux-x86_64"; sha1 = "4552aa92a799086b7f79178eb8d846a84e77e094"; } + { locale = "be"; arch = "linux-i686"; sha1 = "4c2577170f9df45a313c6728076cc35504f7ad80"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "dea774633ab5c1ab5c74380984253b0597d53d2c"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "5f770c719895ddec1a8c27bda298361341b2e924"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "5581f70176eb35cf01d5ebb368741130420b505e"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "f0853164e4d1497be6dcffd6dd365eaf56b6582b"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "0ccb11141eb9c339cfe652aee6e902ed0cd700e4"; } + { locale = "bn-IN"; arch = "linux-i686"; sha1 = "36448e2198e3650f0e5a107af3ae10dbdc8273ce"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "804668a7692b378f6686ea56dae3b9e047bce4a1"; } + { locale = "br"; arch = "linux-i686"; sha1 = "396a845931ee25c79baaa2147c94b7eea6c8505f"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "87d9567073d22f09abe6c45a044fd3b4ee4d925b"; } + { locale = "bs"; arch = "linux-i686"; sha1 = "e3263e2215862dad2268686242a2374e460d1868"; } + { locale = "bs"; arch = "linux-x86_64"; sha1 = "714597790f46b03289a4a91e20f797c82672f849"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "0dfc5d9abcac90e5ab254bb72ae20d987ff206f3"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "2eac6e7cb6eae8ca0714dd219eb08b3f7d846191"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "505764e55d673a282d38c3bca7db4ac29325ead1"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "bd32e999d5c61b20bb3a5983032227ff2a7d6d84"; } + { locale = "csb"; arch = "linux-i686"; sha1 = "ae5065363647da475901fb7cc156a4ecdecc528b"; } + { locale = "csb"; arch = "linux-x86_64"; sha1 = "df0de3d7e5b2aa84e37097b5f65168d732bfd3de"; } + { locale = "cy"; arch = "linux-i686"; sha1 = "3e1e7991983277f4c07486d1f2896e2a192d5f85"; } + { locale = "cy"; arch = "linux-x86_64"; sha1 = "20232e85c69830eb08b4387f69e3d26637b3d06c"; } + { locale = "da"; arch = "linux-i686"; sha1 = "1a3a3913876fe8eea20b4b6d33b939b9e531fd34"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "f89864c28eb750655fb212d77569fcfdfbd38ee9"; } + { locale = "de"; arch = "linux-i686"; sha1 = "da97ff54467b5d0cad8142158e01514a1e75f457"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "988c4cd52388368d21cfb1e6002c28f3e8fb57b1"; } + { locale = "dsb"; arch = "linux-i686"; sha1 = "0997a81282c73a8faf8a784a296bbe9102c823bd"; } + { locale = "dsb"; arch = "linux-x86_64"; sha1 = "d6573147c354d29f0ba928888916882aafb92268"; } + { locale = "el"; arch = "linux-i686"; sha1 = "df53cedb977f9f1cff6b43351fa19801c51e53d9"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "e124b8586af6fb23371c006be0fbe3525dafc8a9"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "738a7335b42e4d324bb3c8411666c3d64e481f85"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "788abe682ac80e08739edf0fabfd4f160eee44da"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "9aeaab7265640c4dfdde57b0ef7eebac26c1d1ec"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "e4bdb638b0a4c90ecb664a9b64351a31ad237ee5"; } + { locale = "en-ZA"; arch = "linux-i686"; sha1 = "381749003d0755cec8dbf29cd1d4ebfa806576f8"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "518c307bb0b23592ff711943594ea76ffdf0d0c3"; } + { locale = "eo"; arch = "linux-i686"; sha1 = "f570024c9c665b36bd8646f44b2b27ff7021f590"; } + { locale = "eo"; arch = "linux-x86_64"; sha1 = "fb777076f2a2a7d911a381a0561c02701dd54878"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "20cac134a4312d5cee8ad1f144b2c44108e96b8e"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "d4757bfb61d84d6d3e4b484377f1037b1ff2728c"; } + { locale = "es-CL"; arch = "linux-i686"; sha1 = "0416114a667fbc9144186d9a74ce2cf3e09944cc"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "73eeff57047143e8d4217bb22a3831555f87341f"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "66d8288cb4af4d4e8584dcebefc14d9aaf46f4bc"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "d0830ffc8634ab47033b932dcac51e7d042c4f19"; } + { locale = "es-MX"; arch = "linux-i686"; sha1 = "592df3f8ee6e6a6fc56991a7b1e9f55a1ea1b8e8"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "cf0d2afac587dbb4f640ea672ea01190f2425905"; } + { locale = "et"; arch = "linux-i686"; sha1 = "441a5dbb69fe61e28e06ec3ed29f34d067ec2ade"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "633b25f83507b61829a934385766628c8764544e"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "f8f6ddf346afb5bb0420ab092463d61e5e6abfe7"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "cc7cfc43d8e6db5ac08f846e81a416e5a75b37b6"; } + { locale = "fa"; arch = "linux-i686"; sha1 = "796ee1d052e97372a870f113390ef25f26047203"; } + { locale = "fa"; arch = "linux-x86_64"; sha1 = "3810bd3727a7de7474070e329ddeabfb98f4aeee"; } + { locale = "ff"; arch = "linux-i686"; sha1 = "436b6732f58bb6a128c6e3027358089bca0d753e"; } + { locale = "ff"; arch = "linux-x86_64"; sha1 = "ed7e3e1a90d31e40cd47645474246adba30eaa1d"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "1d7909cbfe55f6234b6789addae5c9a2dbcf1e49"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "d7734ee040a5ff56aa6d7149d6d5a78541f533fb"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "a8614ef406ed6d4ce7f64f14335b5c4a13fd1ee2"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "98d5e3476784ee4d759b7995e2ff936910a1b213"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "3c7a1c5e1fb9e0f2320a33771bde1cbd774eb6bf"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "10178c5fc56dd8f510f80748767e7e5961bac6ff"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "235c5016eb77c9369ee10e51514961a6986f3c78"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "023c3aafa794faa30cc25576e411f2482cc83131"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "e86c734f2afb872f407f78e867735ecda7ceb622"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "29b695a5c8291f23b22871dcec4d6e66f918e21c"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "c13ac4e21e70e5d3bcf0b2149bfc3e6090c383ce"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "70116ba4463b6937382dc9c7c8da465f5aa78c07"; } + { locale = "gu-IN"; arch = "linux-i686"; sha1 = "7b687b19b72543d411c9eeb4055015c4e4ebaa4b"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "d2cc38aafa2311808d92f1c927b6b6fd86c35d59"; } + { locale = "he"; arch = "linux-i686"; sha1 = "24027663a19be1d27379167585936591ffe01650"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "0ab9ec52df1e0debad953b2c658c16396a7c336d"; } + { locale = "hi-IN"; arch = "linux-i686"; sha1 = "d72b91be0e392a853d3b894f2809bb16d4ed77f5"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "560a3562b66a46f7b5c235e5f0c9a37518dc60f4"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "319c19a36f1d9f087f59470cb14ad0b9429cb751"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "2c98ac830fb0eff611cb82690d068dc61fa6fb21"; } + { locale = "hsb"; arch = "linux-i686"; sha1 = "f8b2f8a85b7e5d8d4c551f0e64340cfe491695c4"; } + { locale = "hsb"; arch = "linux-x86_64"; sha1 = "5b6533ac4222a3e18c3d4ba74e0aa459bfa413d1"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "93308746df2c99182d2919fece807b47db688b3d"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "9fd5cd46a04bed5b8fb079aeb59050664c5d93e0"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "d889d18ccef0c7c25dc2e1fc71b9eaa6aaeb4229"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "2ef01a1c2f01825d80d6a0846d59ff6ad77e90e1"; } + { locale = "id"; arch = "linux-i686"; sha1 = "1c5cb9d1d4b20b2060a8fd07d2851067a4b71d6a"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "82c871d7554fe8411d8f6fccf5e3c7f0d7798885"; } + { locale = "is"; arch = "linux-i686"; sha1 = "1e697fa5802915b826e29ea73805b7101a32312c"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "44b0d19bc285462f305abf8137aefd9477715e8f"; } + { locale = "it"; arch = "linux-i686"; sha1 = "16e00713bd355373c676e05a032933d9c210ba87"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "c32e8d9e9dde6c61092e4b72a3192f50e70bcfa9"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "d2d4d0a2c32769ae9fb6d27dfb71e52f146824c3"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "271d50bcf97440e61bf7b952a48fe3992c40faf0"; } + { locale = "kk"; arch = "linux-i686"; sha1 = "bc1e2c28b01b7bffde01d88e6aa6aec1a8868f3d"; } + { locale = "kk"; arch = "linux-x86_64"; sha1 = "94a66d608cec6de58fb8d72b116395c77198494d"; } + { locale = "km"; arch = "linux-i686"; sha1 = "99fdf2ae88c34db6fe9234d236caffeb50cbb843"; } + { locale = "km"; arch = "linux-x86_64"; sha1 = "78645872859dc627c5d12e6aa86aef6e3528b3d9"; } + { locale = "kn"; arch = "linux-i686"; sha1 = "ef5dcee189c685ee5b71a76cb19138e65f22a0be"; } + { locale = "kn"; arch = "linux-x86_64"; sha1 = "87b064a5ce23ffd1397b8a480e6a158b1de4cd67"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "95e6290a38025af724c34272f8e2a4d531e4f06a"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "e989184dfda401f19a895275519f729597a27e97"; } + { locale = "ku"; arch = "linux-i686"; sha1 = "c1004b96937b848d9e1e53f9fe4a8507d218572d"; } + { locale = "ku"; arch = "linux-x86_64"; sha1 = "a4e61d630ab6ce54a06ff1a90c7df3b76b235181"; } + { locale = "lij"; arch = "linux-i686"; sha1 = "be5da1e0d17c7b51da616c082932d8190a33a74e"; } + { locale = "lij"; arch = "linux-x86_64"; sha1 = "35e29b7825124dd5c68d02e7c1a15e9cdefaec22"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "c09c5cf5f25eac88f90f4aeb48495f688d78d80d"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "7f4f6511d9cf4b70e34b37c823c12bd13409a7e8"; } + { locale = "lv"; arch = "linux-i686"; sha1 = "7fc81c00badbbd877a67d5e1998f16560dd41f3e"; } + { locale = "lv"; arch = "linux-x86_64"; sha1 = "5edb8fac36c755db3e3270a0cf4320970696ff4c"; } + { locale = "mai"; arch = "linux-i686"; sha1 = "4d49ecb2e195c9c65382155128ff02d857937703"; } + { locale = "mai"; arch = "linux-x86_64"; sha1 = "96d0dac8116f20972469e527757d17cf7c22792b"; } + { locale = "mk"; arch = "linux-i686"; sha1 = "b72b07ab4d69430d62fb9c497c047f2987636ea1"; } + { locale = "mk"; arch = "linux-x86_64"; sha1 = "441918ac58ff166851921bf1566e7dda24ce2377"; } + { locale = "ml"; arch = "linux-i686"; sha1 = "b7947f50a0618ba9b8fb5fa9f1adff13dbfc0147"; } + { locale = "ml"; arch = "linux-x86_64"; sha1 = "3c98db55a6b9c707957786cc40a03d69e9b4e619"; } + { locale = "mr"; arch = "linux-i686"; sha1 = "f1e5109a2fe72d1c7d8a32f83918064d607efa1a"; } + { locale = "mr"; arch = "linux-x86_64"; sha1 = "820f056eb3413fc0e1979f192e9542db0c9e0e79"; } + { locale = "ms"; arch = "linux-i686"; sha1 = "6a9f01f286fbe0b63f6c171f0171f2883fa5b474"; } + { locale = "ms"; arch = "linux-x86_64"; sha1 = "f8cccf1c87845947693c631fd60300d1a5ec7436"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "2dbe61442b310777b427d27159ee767d82a4b254"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "b7a437552fc540966478832bf89a85dc81b16766"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "36f65d56954e59bd758b4a1c09abec85872eb140"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "0c1ed8b52afdd3d15f163fc8899e14caeb0a4497"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "729144a52c95cbcb2665da00e953cbdb269c0665"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "5298026198b8d6c7eb0b816ca29bbd26f0f65907"; } + { locale = "or"; arch = "linux-i686"; sha1 = "33aaf77833a3c3a504559c399a270061a582ffbb"; } + { locale = "or"; arch = "linux-x86_64"; sha1 = "a2dca791375b174d0f888ce56555fe21e5b2eaf4"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "3670a8492dde8b19e1f5fba10d54eabd003183e1"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "376576536d6a7d373ec5c453e107f63261819cf1"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "53af2036a170d77f828e80d455edf6cddf826cfb"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "01e04cf2530c1b51bd9e8ee5114ac9ba5317e0e4"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "0fec2a4ea90ecb6d7e09041d45a4b0647c37ebe0"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "f7f1dd1f7d78b3647cb77f282b87a3d7224ec567"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "cf46849b5fbd06b51c468f2dc6dab3eb9e8ffde1"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "e6bae39233b0c3735fb122b9e56ac4e82d435749"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "41ed6d9c3816647069b0416d1b7edda97fe1abff"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "36a83ca4594ba79a3b01ee21a5cfde45b13b323e"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "d70284aea6297688eb25835a482d9ca349eac313"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "78079d94b0ad83e6cd687433c335b7e0012c8cb8"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "354fb775dbddfe9f87e78982e7456f20d01476bb"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "30a29bb1cbf967fb24e5bbc6abefcdf074b316cc"; } + { locale = "si"; arch = "linux-i686"; sha1 = "b20089f3f2ef670426a29e409426a9cd3569090a"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "bee5b374f0ca41a858e9b61fe0b43a56bf303180"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "6c9d83b2cef140bdf513c7226854fc991d087785"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "57595905385b6b7e77eee34f54a40562d041169d"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "63b3edf9aec8a6beabdf1a4b4a9fb0fb835345fc"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "3afafa985ee73cfe378e39881665d2242a6943c9"; } + { locale = "son"; arch = "linux-i686"; sha1 = "e6b6b56ebee586bb10511d197b11d93aefae6316"; } + { locale = "son"; arch = "linux-x86_64"; sha1 = "f95cb4b571fa389df4e182632b12216699cc9f0a"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "18dfa5b40bd31a0d23884f6e9af357b0be01c4b2"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "f9d026e9d5a85eaad008d65b736ae8c63cb5064d"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "a5ed16491244d9ab6237546e241335005572c1c0"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "2ed29dec3a28949b93f82d0652a38a5539fb2304"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "594eae45b36645a47b12d9579826789e3255b275"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "0cec1133910c8ae87878ca56fd63b610651f99ca"; } + { locale = "ta"; arch = "linux-i686"; sha1 = "86da5bfa06e670359b831226822db6a40a7ec7c3"; } + { locale = "ta"; arch = "linux-x86_64"; sha1 = "86b3749d396a7be3628face4bf7ed7278b98c5ab"; } + { locale = "te"; arch = "linux-i686"; sha1 = "7020a27e9173b52a54c8e442e8e2ffc60a888e2c"; } + { locale = "te"; arch = "linux-x86_64"; sha1 = "417ea3e749a9f7309b11d50f99bd5c1b916a0c77"; } + { locale = "th"; arch = "linux-i686"; sha1 = "539293f4f6183ec2941fa83705f7c91bf5e65776"; } + { locale = "th"; arch = "linux-x86_64"; sha1 = "362d3c39936725437d63576f2c8ee6deaf9429ea"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "eb0d205cf6eac45a8405d072b89856293d4cb63e"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "84c19d6ec3446ecbe03f0751822501d3628699a8"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "5ef72696a4180c91483f406627ea040bede2f30c"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "9de7bcc3ff254234e1844860c3bc907317c02ae6"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "3338130b87e4dd9ee7b8e7120dd158065a772290"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "53ebf9890f9b4ccdc786fa65dcae739fae7b8f7c"; } + { locale = "xh"; arch = "linux-i686"; sha1 = "83ae4b1f84c64733d196b9bec58ab1468b126577"; } + { locale = "xh"; arch = "linux-x86_64"; sha1 = "da5b9dca0277dd2be1027251c96f7524e0204f2f"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "bc3e12000156a886e00a64bf536c5b2c35bb727d"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "1ac45fd506eb1d5bb92a86ee3a9686e8c93b5c9e"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "5377236c138066df6f67083ae8ed348c6d611a81"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "8733a47e10d1bd025507c09a443acf80dd614643"; } + { locale = "zu"; arch = "linux-i686"; sha1 = "a653e724fe28431b2b5ca5f2553654da4ffa526f"; } + { locale = "zu"; arch = "linux-x86_64"; sha1 = "81c967fc251d77a38de24519dba0f4465326fcd8"; } + ]; +} diff --git a/pkgs/applications/office/zotero/firefox.nix b/pkgs/applications/office/zotero/firefox.nix deleted file mode 100644 index 60befdbaad53..000000000000 --- a/pkgs/applications/office/zotero/firefox.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, zlib, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite -, hunspell, libevent, libstartup_notification, libvpx -, cairo, gstreamer, gst_plugins_base, icu -, debugBuild ? false -, # If you want the resulting program to call itself "Firefox" instead - # of "Shiretoko" or whatever, enable this option. However, those - # binaries may not be distributed without permission from the - # Mozilla Foundation, see - # http://www.mozilla.org/foundation/trademarks/. - enableOfficialBranding ? false -}: - -assert stdenv.gcc ? libc && stdenv.gcc.libc != null; - -let version = "33.1.1"; in - -stdenv.mkDerivation rec { - name = "firefox-${version}"; - - src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; - sha1 = "1e9e3176e7d221c4f2ce479f37ee7c432236a0ec"; - }; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr nss libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite - xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper - hunspell libevent libstartup_notification libvpx cairo - gstreamer gst_plugins_base icu - ]; - - configureFlags = - [ "--enable-application=browser" - "--disable-javaxpcom" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - "--with-system-nspr" - "--with-system-nss" - "--with-system-libevent" - "--with-system-libvpx" - # "--with-system-png" # needs APNG support - # "--with-system-icu" # causes ‘ar: invalid option -- 'L'’ in Firefox 28.0 - "--enable-system-ffi" - "--enable-system-hunspell" - "--enable-system-pixman" - "--enable-system-sqlite" - "--enable-system-cairo" - "--enable-gstreamer" - "--enable-startup-notification" - # "--enable-content-sandbox" # available since 26.0, but not much info available - # "--enable-content-sandbox-reporter" # keeping disabled for now - "--disable-crashreporter" - "--disable-tests" - "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-installer" - "--disable-updater" - "--disable-pulseaudio" - ] - ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"] - else [ "--disable-debug" "--enable-release" - "--enable-optimize${lib.optionalString (stdenv.system == "i686-linux") "=-O1"}" - "--enable-strip" ]) - ++ lib.optional enableOfficialBranding "--enable-official-branding"; - - enableParallelBuilding = true; - - preConfigure = - '' - mkdir ../objdir - cd ../objdir - configureScript=../mozilla-release/configure - ''; - - preInstall = - '' - # The following is needed for startup cache creation on grsecurity kernels. - paxmark m ../objdir/dist/bin/xpcshell - ''; - - postInstall = - '' - # For grsecurity kernels - paxmark m $out/lib/${name}/{firefox,firefox-bin,plugin-container} - - # Remove SDK cruft. FIXME: move to a separate output? - rm -rf $out/share/idl $out/include $out/lib/firefox-devel-* - ''; - - meta = { - description = "Web browser"; - homepage = http://www.mozilla.com/en-US/firefox/; - maintainers = with lib.maintainers; [ eelco ]; - platforms = lib.platforms.linux; - }; - - passthru = { - inherit gtk nspr version; - isFirefox3Like = true; - }; -} diff --git a/pkgs/applications/office/zotero/xulrunner.nix b/pkgs/applications/office/zotero/xulrunner.nix deleted file mode 100644 index 4dd1095c0ce8..000000000000 --- a/pkgs/applications/office/zotero/xulrunner.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, zlib, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite -, hunspell, libevent, libstartup_notification, libvpx -, cairo, gstreamer, gst_plugins_base, icu, firefox -, debugBuild ? false -}: - -assert stdenv.gcc ? libc && stdenv.gcc.libc != null; - -let version = firefox.version; in - -stdenv.mkDerivation rec { - name = "xulrunner-${version}"; - - src = firefox.src; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr nss libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite - xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper - hunspell libevent libstartup_notification libvpx cairo - gstreamer gst_plugins_base icu - ]; - - configureFlags = - [ "--enable-application=xulrunner" - "--disable-javaxpcom" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - "--with-system-nspr" - "--with-system-nss" - "--with-system-libevent" - "--with-system-libvpx" - # "--with-system-png" # needs APNG support - # "--with-system-icu" # causes ‘ar: invalid option -- 'L'’ in Firefox 28.0 - "--enable-system-ffi" - "--enable-system-hunspell" - "--enable-system-pixman" - "--enable-system-sqlite" - "--enable-system-cairo" - "--enable-gstreamer" - "--enable-startup-notification" - # "--enable-content-sandbox" # available since 26.0, but not much info available - # "--enable-content-sandbox-reporter" # keeping disabled for now - "--disable-crashreporter" - "--disable-tests" - "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-installer" - "--disable-updater" - "--disable-pulseaudio" - ] - ++ (if debugBuild - then [ "--enable-debug" "--enable-profiling"] - else [ "--disable-debug" "--enable-release" "--enable-strip" - "--enable-optimize${lib.optionalString (stdenv.system == "i686-linux") "=-O1"}" ]); - - enableParallelBuilding = true; - - preConfigure = - '' - mkdir ../objdir - cd ../objdir - configureScript=../mozilla-release/configure - ''; - - meta = { - description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.com/en-US/firefox/; - maintainers = [ lib.maintainers.eelco ]; - platforms = lib.platforms.linux; - }; - - passthru = { inherit gtk version; }; -} diff --git a/pkgs/applications/office/zotero/zotero.sh b/pkgs/applications/office/zotero/zotero.sh index c80d5e8189ea..8941097fc422 100644 --- a/pkgs/applications/office/zotero/zotero.sh +++ b/pkgs/applications/office/zotero/zotero.sh @@ -1,3 +1,3 @@ #!@bash@/bin/bash -exec "@xulrunner@/bin/xulrunner" "@out@/libexec/zotero/application.ini" "${@}" +exec "@firefox@/bin/firefox" -app "@out@/libexec/zotero/application.ini" "${@}" diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix index edf3091ef169..7b5d1ce62b4e 100644 --- a/pkgs/applications/science/logic/coq/HEAD.nix +++ b/pkgs/applications/science/logic/coq/HEAD.nix @@ -3,7 +3,7 @@ {stdenv, fetchgit, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}: let - version = "8.5pre-52f51fb3"; + version = "8.5pre-0c999f02"; coq-version = "8.5"; buildIde = lablgtk != null; ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; @@ -17,8 +17,8 @@ stdenv.mkDerivation { src = fetchgit { url = git://scm.gforge.inria.fr/coq/coq.git; - rev = "52f51fb385d6a1c90bd7d055185fee50ef2670be"; - sha256 = "0pgp59j2j8vk7nmcja5smly39dpkqfhpp29wpsn71piq6n52pql3"; + rev = "0c999f02ffcd61fcace0cc2d045056a82992a100"; + sha256 = "1wk9lxdmw152665hr5cvnnzgnbbq7kg2845qkb4ag99nnfpsi26s"; }; buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index dc8e975ce1d1..a7cdf7f3097d 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation { checking. ''; homepage = "http://hol.sourceforge.net/"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix index 8f673eb0f15a..95012f90a944 100644 --- a/pkgs/applications/science/logic/leo2/default.nix +++ b/pkgs/applications/science/logic/leo2/default.nix @@ -55,7 +55,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "BSD"; + license = a.lib.licenses.bsd3; inherit (sourceInfo) version; homepage = "http://page.mi.fu-berlin.de/cbenzmueller/leo/"; downloadPage = "http://page.mi.fu-berlin.de/cbenzmueller/leo/download.html"; diff --git a/pkgs/applications/science/logic/spass/default.nix b/pkgs/applications/science/logic/spass/default.nix index 2c6144baf0e8..5327ed6a42aa 100644 --- a/pkgs/applications/science/logic/spass/default.nix +++ b/pkgs/applications/science/logic/spass/default.nix @@ -38,7 +38,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "BSD"; + license = a.lib.licenses.bsd2; }; passthru = { updateInfo = { diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index ddd5dc5d6bb4..ffc16a330542 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -2,7 +2,7 @@ let name = "maxima"; - version = "5.34.1"; + version = "5.35.1"; searchPath = stdenv.lib.makeSearchPath "bin" @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "1dw9vfzldpj7lv303xbw0wpyn6ra6i2yzwlrjbcx7j0jm5n43ji0"; + sha256 = "1wwqvay9z6gal7bsyyyhhcwh0fy5ak4h2a446ali0x6zmybaklcy"; }; buildInputs = [sbcl texinfo perl makeWrapper]; @@ -29,10 +29,9 @@ stdenv.mkDerivation { ln -s ../maxima/${version}/doc $out/share/doc/maxima ''; - # Failures in the regression test suite are not going to abort the - # build process. We run the suite mostly so that potential errors show - # up in the build log. See also: - # <http://sourceforge.net/tracker/?func=detail&aid=3365831&group_id=4933&atid=104933>. + # Failures in the regression test suite won't abort the build process. We run + # the suite only so that potential errors show up in the build log. See also: + # http://sourceforge.net/tracker/?func=detail&aid=3365831&group_id=4933&atid=104933. doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 06eceea65c95..a73e3dbcec04 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -2,14 +2,14 @@ let name = "wxmaxima"; - version = "14.09.0"; + version = "14.12.1"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/wxMaxima/${version}/wxmaxima-${version}.tar.gz"; - sha256 = "1wqiw9dgjc9vg94dqk4kif8xs7nlmn34xj3v4zm13fh1jihraksq"; + sha256 = "0sjxvh0y5w5p2xdq3qzz3yhlsigrg3ynib9dkymhynpfnb51x82z"; }; buildInputs = [wxGTK maxima makeWrapper]; diff --git a/pkgs/applications/science/misc/root/cmake.patch b/pkgs/applications/science/misc/root/cmake.patch index b6efd7444fe9..6d2d4cdc70d8 100644 --- a/pkgs/applications/science/misc/root/cmake.patch +++ b/pkgs/applications/science/misc/root/cmake.patch @@ -1,5 +1,5 @@ ---- cmake/modules/RootBuildOptions.cmake 1969-12-31 20:30:01.000000000 -0330 -+++ cmake/modules/RootBuildOptions.cmake 2014-01-10 14:09:29.424937408 -0330 +--- a/cmake/modules/RootBuildOptions.cmake 1969-12-31 20:30:01.000000000 -0330 ++++ b/cmake/modules/RootBuildOptions.cmake 2014-01-10 14:09:29.424937408 -0330 @@ -149,7 +149,7 @@ #---General Build options---------------------------------------------------------------------- diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 1227e76ac0c5..57d9fc40ab50 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, cmake, mesa, libX11, gfortran, libXpm, libXft, libXext, zlib }: +{ stdenv, fetchurl, fetchpatch, cmake, mesa, gfortran +, libX11,libXpm, libXft, libXext, zlib }: stdenv.mkDerivation rec { name = "root-${version}"; @@ -14,8 +15,15 @@ stdenv.mkDerivation rec { # CMAKE_INSTALL_RPATH_USE_LINK_PATH is set to FALSE in # <rootsrc>/cmake/modules/RootBuildOptions.cmake. # This patch sets it to TRUE. - patches = [ ./cmake.patch ]; - patchFlags = "-p0"; + patches = [ + ./cmake.patch + (fetchpatch { + name = "fix-tm_t-member.diff"; + url = "https://github.com/root-mirror/root/commit/" + + "08b08412bafc24fa635b0fdb832097a3aa2fa1d2.diff"; + sha256 = "0apbp51pk8471gl06agx3i88dn76p6gpkgf1ssfhcyam0bjl8907"; + }) + ]; enableParallelBuilding = true; diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index c2793190e892..8cc8920d4a1a 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { from the others by being extremely simple to setup and operate. ''; homepage = http://www.fossil-scm.org/; - license = "BSD"; + license = stdenv.lib.licenses.bsd2; platforms = with stdenv.lib.platforms; all; maintainers = [ #Add your name here! stdenv.lib.maintainers.z77z diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 69e88f32c41d..73e2565e457e 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -10,7 +10,7 @@ let - version = "2.1.3"; + version = "2.1.4"; svn = subversionClient.override { perlBindings = true; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0mvgvr2hz25p49dhhizcw9591f2h17y2699mpmndis3kzap0c6zy"; + sha256 = "0gh57mfxz1qrxzfp1lpcaqswhixc246kmajlf0db7g0cn6wnhjd0"; }; patches = [ diff --git a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix index 5b1e2041e4aa..39af61f5bb5d 100644 --- a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix +++ b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "github-backup"; - version = "1.20141110"; - sha256 = "0675zcijfap757076r3j7js4iadnj1jbihmchf6ikzaanczmq1kg"; + version = "1.20141204"; + sha256 = "0asj0ix81k6vi95rwlhs7ikk936lzfsav4gw0gvyzf31ggmf4j4c"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix new file mode 100644 index 000000000000..3d4ae689f6b6 --- /dev/null +++ b/pkgs/applications/version-management/gitlab-shell/default.nix @@ -0,0 +1,59 @@ +{ stdenv, ruby, rubyLibs, fetchgit }: + +stdenv.mkDerivation rec { + version = "2.1.0"; + name = "gitlab-shell-${version}"; + + srcs = fetchgit { + url = "https://gitlab.com/gitlab-org/gitlab-shell.git"; + rev = "823aba63e444afa2f45477819770fec3cb5f0159"; + sha256 = "0ppf547xs9pvmk49v4h043d0j93k5n4q0yx3b9ssrc4qf2smflgq"; + }; + + buildInputs = [ + ruby rubyLibs.bundler + ]; + + installPhase = '' + mkdir -p $out/ + cp -R . $out/ + + # Nothing to install ATM for non-development but keeping the + # install command anyway in case that changes in the future: + export HOME=$(pwd) + bundle install -j4 --verbose --local --deployment --without development test + ''; + + # gitlab-shell will try to read its config relative to the source + # code by default which doesn't work in nixos because it's a + # read-only filesystem + postPatch = '' + substituteInPlace lib/gitlab_config.rb --replace\ + "File.join(ROOT_PATH, 'config.yml')"\ + "ENV['GITLAB_SHELL_CONFIG_PATH']" + substituteInPlace lib/gitlab_net.rb --replace\ + "File.read File.join(ROOT_PATH, '.gitlab_shell_secret')"\ + "File.read ENV['GITLAB_SHELL_SECRET_PATH']" + + # Note that we're running gitlab-shell from current-system/sw + # because otherwise updating gitlab-shell won't be reflected in + # the hardcoded path of the authorized-keys file: + substituteInPlace lib/gitlab_keys.rb --replace\ + "auth_line = \"command=\\\"#{ROOT_PATH}/bin/gitlab-shell"\ + "auth_line = \"command=\\\"GITLAB_SHELL_CONFIG_PATH=#{ENV['GITLAB_SHELL_CONFIG_PATH']} GITLAB_SHELL_SECRET_PATH=#{ENV['GITLAB_SHELL_SECRET_PATH']} /run/current-system/sw/bin/gitlab-shell" + + # We're setting GITLAB_SHELL_CONFIG_PATH in the ssh authorized key + # environment because we need it in gitlab_configrb + # . unsetenv_others will remove that so we're not doing it for + # now. + # + # TODO: Are there any security implications? The commit adding + # unsetenv_others didn't mention anything... + # + # Kernel::exec({'PATH' => ENV['PATH'], 'LD_LIBRARY_PATH' => ENV['LD_LIBRARY_PATH'], 'GL_ID' => ENV['GL_ID']}, *args, unsetenv_others: true) + substituteInPlace lib/gitlab_shell.rb --replace\ + " *args, unsetenv_others: true)"\ + " *args)" + ''; + +} diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock new file mode 100644 index 000000000000..8a1141d08611 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -0,0 +1,705 @@ +GEM + remote: https://rubygems.org/ + specs: + RedCloth (4.2.9) + ace-rails-ap (2.0.1) + actionmailer (4.1.1) + actionpack (= 4.1.1) + actionview (= 4.1.1) + mail (~> 2.5.4) + actionpack (4.1.1) + actionview (= 4.1.1) + activesupport (= 4.1.1) + rack (~> 1.5.2) + rack-test (~> 0.6.2) + actionview (4.1.1) + activesupport (= 4.1.1) + builder (~> 3.1) + erubis (~> 2.7.0) + activemodel (4.1.1) + activesupport (= 4.1.1) + builder (~> 3.1) + activerecord (4.1.1) + activemodel (= 4.1.1) + activesupport (= 4.1.1) + arel (~> 5.0.0) + activesupport (4.1.1) + i18n (~> 0.6, >= 0.6.9) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.1) + tzinfo (~> 1.1) + acts-as-taggable-on (2.4.1) + rails (>= 3, < 5) + addressable (2.3.5) + annotate (2.6.0) + activerecord (>= 2.3.0) + rake (>= 0.8.7) + arel (5.0.1.20140414130214) + asciidoctor (0.1.4) + awesome_print (1.2.0) + axiom-types (0.0.5) + descendants_tracker (~> 0.0.1) + ice_nine (~> 0.9) + bcrypt (3.1.7) + better_errors (1.0.1) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + binding_of_caller (0.7.2) + debug_inspector (>= 0.0.1) + bootstrap-sass (3.0.3.0) + sass (~> 3.2) + builder (3.2.2) + capybara (2.2.1) + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + carrierwave (0.9.0) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + json (>= 1.7) + celluloid (0.15.2) + timers (~> 1.1.0) + charlock_holmes (0.6.9.4) + cliver (0.3.2) + code_analyzer (0.4.3) + sexp_processor + coderay (1.1.0) + coercible (1.0.0) + descendants_tracker (~> 0.0.1) + coffee-rails (4.0.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.0) + coffee-script (2.2.0) + coffee-script-source + execjs + coffee-script-source (1.6.3) + colored (1.2) + colorize (0.5.8) + connection_pool (1.2.0) + coveralls (0.7.0) + multi_json (~> 1.3) + rest-client + simplecov (>= 0.7) + term-ansicolor + thor + crack (0.4.1) + safe_yaml (~> 0.9.0) + creole (0.3.8) + d3_rails (3.1.10) + railties (>= 3.1.0) + daemons (1.1.9) + database_cleaner (1.3.0) + debug_inspector (0.0.2) + default_value_for (3.0.0) + activerecord (>= 3.2.0, < 5.0) + descendants_tracker (0.0.3) + devise (3.2.4) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 3.2.6, < 5) + thread_safe (~> 0.1) + warden (~> 1.2.3) + devise-async (0.9.0) + devise (~> 3.2) + diff-lcs (1.2.5) + diffy (3.0.3) + docile (1.1.5) + dotenv (0.9.0) + dropzonejs-rails (0.4.14) + rails (> 3.1) + email_spec (1.5.0) + launchy (~> 2.1) + mail (~> 2.2) + emoji (1.0.1) + json + enumerize (0.7.0) + activesupport (>= 3.2) + equalizer (0.0.8) + erubis (2.7.0) + escape_utils (0.2.4) + eventmachine (1.0.3) + excon (0.32.1) + execjs (2.0.2) + expression_parser (0.9.0) + factory_girl (4.3.0) + activesupport (>= 3.0.0) + factory_girl_rails (4.3.0) + factory_girl (~> 4.3.0) + railties (>= 3.0.0) + faraday (0.8.9) + multipart-post (~> 1.2.0) + faraday_middleware (0.9.0) + faraday (>= 0.7.4, < 0.9) + ffaker (1.22.1) + ffi (1.9.3) + fog (1.21.0) + fog-brightbox + fog-core (~> 1.21, >= 1.21.1) + fog-json + nokogiri (~> 1.5, >= 1.5.11) + fog-brightbox (0.0.1) + fog-core + fog-json + fog-core (1.21.1) + builder + excon (~> 0.32) + formatador (~> 0.2.0) + mime-types + net-scp (~> 1.1) + net-ssh (>= 2.1.3) + fog-json (1.0.0) + multi_json (~> 1.0) + font-awesome-rails (4.2.0.0) + railties (>= 3.2, < 5.0) + foreman (0.63.0) + dotenv (>= 0.7) + thor (>= 0.13.6) + formatador (0.2.4) + gemnasium-gitlab-service (0.2.2) + rugged (~> 0.19) + gherkin-ruby (0.3.1) + racc + github-markup (1.1.0) + gitlab-flowdock-git-hook (0.4.2.2) + gitlab-grit (>= 2.4.1) + multi_json + gitlab-grack (2.0.0.pre) + rack (~> 1.5.1) + gitlab-grit (2.6.12) + charlock_holmes (~> 0.6) + diff-lcs (~> 1.1) + mime-types (~> 1.15) + posix-spawn (~> 0.3) + gitlab-linguist (3.0.0) + charlock_holmes (~> 0.6.6) + escape_utils (~> 0.2.4) + mime-types (~> 1.19) + gitlab_emoji (0.0.1.1) + emoji (~> 1.0.1) + gitlab_git (7.0.0.rc10) + activesupport (~> 4.0) + charlock_holmes (~> 0.6) + gitlab-linguist (~> 3.0) + rugged (~> 0.21.0) + gitlab_meta (7.0) + gitlab_omniauth-ldap (1.1.0) + net-ldap (~> 0.7.0) + omniauth (~> 1.0) + pyu-ruby-sasl (~> 0.0.3.1) + rubyntlm (~> 0.1.1) + gollum-lib (3.0.0) + github-markup (~> 1.1.0) + gitlab-grit (~> 2.6.5) + nokogiri (~> 1.6.1) + rouge (~> 1.3.3) + sanitize (~> 2.1.0) + stringex (~> 2.5.1) + gon (5.0.1) + actionpack (>= 2.3.0) + json + grape (0.6.1) + activesupport + builder + hashie (>= 1.2.0) + multi_json (>= 1.3.2) + multi_xml (>= 0.5.2) + rack (>= 1.3.0) + rack-accept + rack-mount + virtus (>= 1.0.0) + grape-entity (0.4.2) + activesupport + multi_json (>= 1.3.2) + growl (1.0.3) + guard (2.2.4) + formatador (>= 0.2.4) + listen (~> 2.1) + lumberjack (~> 1.0) + pry (>= 0.9.12) + thor (>= 0.18.1) + guard-rspec (4.2.0) + guard (>= 2.1.1) + rspec (>= 2.14, < 4.0) + guard-spinach (0.0.2) + guard (>= 1.1) + spinach + haml (4.0.5) + tilt + haml-rails (0.5.3) + actionpack (>= 4.0.1) + activesupport (>= 4.0.1) + haml (>= 3.1, < 5.0) + railties (>= 4.0.1) + hashie (2.1.2) + hike (1.2.3) + hipchat (0.14.0) + httparty + httparty + html-pipeline (1.11.0) + activesupport (>= 2) + nokogiri (~> 1.4) + html-pipeline-gitlab (0.1.5) + actionpack (~> 4) + gitlab_emoji (~> 0.0.1) + html-pipeline (~> 1.11.0) + sanitize (~> 2.1) + http_parser.rb (0.5.3) + httparty (0.13.0) + json (~> 1.8) + multi_xml (>= 0.5.2) + httpauth (0.2.1) + i18n (0.6.11) + ice_nine (0.10.0) + jasmine (2.0.2) + jasmine-core (~> 2.0.0) + phantomjs + rack (>= 1.2.1) + rake + jasmine-core (2.0.0) + jquery-atwho-rails (0.3.3) + jquery-rails (3.1.0) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + jquery-scrollto-rails (1.4.3) + railties (> 3.1, < 5.0) + jquery-turbolinks (2.0.1) + railties (>= 3.1.0) + turbolinks + jquery-ui-rails (4.2.1) + railties (>= 3.2.16) + json (1.8.1) + jwt (0.1.13) + multi_json (>= 1.5) + kaminari (0.15.1) + actionpack (>= 3.0.0) + activesupport (>= 3.0.0) + kgio (2.8.1) + launchy (2.4.2) + addressable (~> 2.3) + letter_opener (1.1.2) + launchy (~> 2.2) + listen (2.3.1) + celluloid (>= 0.15.2) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + lumberjack (1.0.4) + mail (2.5.4) + mime-types (~> 1.16) + treetop (~> 1.4.8) + method_source (0.8.2) + mime-types (1.25.1) + mini_portile (0.6.0) + minitest (5.3.5) + mousetrap-rails (1.4.6) + multi_json (1.10.1) + multi_xml (0.5.5) + multipart-post (1.2.0) + net-ldap (0.7.0) + net-scp (1.1.2) + net-ssh (>= 2.6.5) + net-ssh (2.8.0) + newrelic_rpm (3.9.4.245) + nokogiri (1.6.2.1) + mini_portile (= 0.6.0) + nprogress-rails (0.1.2.3) + oauth (0.4.7) + oauth2 (0.8.1) + faraday (~> 0.8) + httpauth (~> 0.1) + jwt (~> 0.1.4) + multi_json (~> 1.0) + rack (~> 1.2) + omniauth (1.1.4) + hashie (>= 1.2, < 3) + rack + omniauth-github (1.1.1) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.1) + omniauth-google-oauth2 (0.2.5) + omniauth (> 1.0) + omniauth-oauth2 (~> 1.1) + omniauth-oauth (1.0.1) + oauth + omniauth (~> 1.0) + omniauth-oauth2 (1.1.1) + oauth2 (~> 0.8.0) + omniauth (~> 1.0) + omniauth-shibboleth (1.1.1) + omniauth (>= 1.0.0) + omniauth-twitter (1.0.1) + multi_json (~> 1.3) + omniauth-oauth (~> 1.0) + org-ruby (0.9.9) + rubypants (~> 0.2) + orm_adapter (0.5.0) + pg (0.15.1) + phantomjs (1.9.2.0) + poltergeist (1.5.1) + capybara (~> 2.1) + cliver (~> 0.3.1) + multi_json (~> 1.0) + websocket-driver (>= 0.2.0) + polyglot (0.3.4) + posix-spawn (0.3.9) + pry (0.9.12.4) + coderay (~> 1.0) + method_source (~> 0.8) + slop (~> 3.4) + pyu-ruby-sasl (0.0.3.3) + quiet_assets (1.0.2) + railties (>= 3.1, < 5.0) + racc (1.4.10) + rack (1.5.2) + rack-accept (0.4.5) + rack (>= 0.4) + rack-attack (2.3.0) + rack + rack-cors (0.2.9) + rack-mini-profiler (0.9.0) + rack (>= 1.1.3) + rack-mount (0.8.3) + rack (>= 1.0.0) + rack-protection (1.5.1) + rack + rack-test (0.6.2) + rack (>= 1.0) + rails (4.1.1) + actionmailer (= 4.1.1) + actionpack (= 4.1.1) + actionview (= 4.1.1) + activemodel (= 4.1.1) + activerecord (= 4.1.1) + activesupport (= 4.1.1) + bundler (>= 1.3.0, < 2.0) + railties (= 4.1.1) + sprockets-rails (~> 2.0) + rails_autolink (1.1.6) + rails (> 3.1) + rails_best_practices (1.14.4) + activesupport + awesome_print + code_analyzer (>= 0.4.3) + colored + erubis + i18n + require_all + ruby-progressbar + railties (4.1.1) + actionpack (= 4.1.1) + activesupport (= 4.1.1) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + raindrops (0.12.0) + rake (10.3.2) + raphael-rails (2.1.2) + rb-fsevent (0.9.3) + rb-inotify (0.9.2) + ffi (>= 0.5.0) + rdoc (3.12.2) + json (~> 1.4) + redcarpet (3.1.2) + redis (3.0.6) + redis-actionpack (4.0.0) + actionpack (~> 4) + redis-rack (~> 1.5.0) + redis-store (~> 1.1.0) + redis-activesupport (4.0.0) + activesupport (~> 4) + redis-store (~> 1.1.0) + redis-namespace (1.4.1) + redis (~> 3.0.4) + redis-rack (1.5.0) + rack (~> 1.5) + redis-store (~> 1.1.0) + redis-rails (4.0.0) + redis-actionpack (~> 4) + redis-activesupport (~> 4) + redis-store (~> 1.1.0) + redis-store (1.1.4) + redis (>= 2.2) + request_store (1.0.5) + require_all (1.3.2) + rest-client (1.6.7) + mime-types (>= 1.16) + rinku (1.7.3) + rouge (1.3.3) + rspec (2.14.1) + rspec-core (~> 2.14.0) + rspec-expectations (~> 2.14.0) + rspec-mocks (~> 2.14.0) + rspec-core (2.14.7) + rspec-expectations (2.14.4) + diff-lcs (>= 1.1.3, < 2.0) + rspec-mocks (2.14.4) + rspec-rails (2.14.0) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 2.14.0) + rspec-expectations (~> 2.14.0) + rspec-mocks (~> 2.14.0) + ruby-progressbar (1.2.0) + rubyntlm (0.1.1) + rubypants (0.2.0) + rugged (0.21.0) + safe_yaml (0.9.7) + sanitize (2.1.0) + nokogiri (>= 1.4.4) + sass (3.2.19) + sass-rails (4.0.3) + railties (>= 4.0.0, < 5.0) + sass (~> 3.2.0) + sprockets (~> 2.8, <= 2.11.0) + sprockets-rails (~> 2.0) + sdoc (0.3.20) + json (>= 1.1.3) + rdoc (~> 3.10) + seed-fu (2.3.1) + activerecord (>= 3.1, < 4.2) + activesupport (>= 3.1, < 4.2) + select2-rails (3.5.2) + thor (~> 0.14) + semantic-ui-sass (0.16.1.0) + sass (~> 3.2) + settingslogic (2.0.9) + sexp_processor (4.4.0) + shoulda-matchers (2.1.0) + activesupport (>= 3.0.0) + sidekiq (2.17.0) + celluloid (>= 0.15.2) + connection_pool (>= 1.0.0) + json + redis (>= 3.0.4) + redis-namespace (>= 1.3.1) + simple_oauth (0.1.9) + simplecov (0.9.0) + docile (~> 1.1.0) + multi_json + simplecov-html (~> 0.8.0) + simplecov-html (0.8.0) + sinatra (1.4.4) + rack (~> 1.4) + rack-protection (~> 1.4) + tilt (~> 1.3, >= 1.3.4) + six (0.2.0) + slack-notifier (0.3.2) + slim (2.0.2) + temple (~> 0.6.6) + tilt (>= 1.3.3, < 2.1) + slop (3.4.7) + spinach (0.8.7) + colorize (= 0.5.8) + gherkin-ruby (>= 0.3.1) + spinach-rails (0.2.1) + capybara (>= 2.0.0) + railties (>= 3) + spinach (>= 0.4) + spring (1.1.3) + spring-commands-rspec (1.0.1) + spring (>= 0.9.1) + spring-commands-spinach (1.0.0) + spring (>= 0.9.1) + sprockets (2.11.0) + hike (~> 1.2) + multi_json (~> 1.0) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) + sprockets-rails (2.1.3) + actionpack (>= 3.0) + activesupport (>= 3.0) + sprockets (~> 2.8) + stamp (0.5.0) + state_machine (1.2.0) + stringex (2.5.1) + temple (0.6.7) + term-ansicolor (1.2.2) + tins (~> 0.8) + test_after_commit (0.2.2) + thin (1.6.1) + daemons (>= 1.0.9) + eventmachine (>= 1.0.0) + rack (>= 1.0.0) + thor (0.19.1) + thread_safe (0.3.4) + tilt (1.4.1) + timers (1.1.0) + tinder (1.9.3) + eventmachine (~> 1.0) + faraday (~> 0.8) + faraday_middleware (~> 0.9) + hashie (>= 1.0, < 3) + json (~> 1.8.0) + mime-types (~> 1.19) + multi_json (~> 1.7) + twitter-stream (~> 0.1) + tins (0.13.1) + treetop (1.4.15) + polyglot + polyglot (>= 0.3.1) + turbolinks (2.0.0) + coffee-rails + twitter-stream (0.1.16) + eventmachine (>= 0.12.8) + http_parser.rb (~> 0.5.1) + simple_oauth (~> 0.1.4) + tzinfo (1.2.2) + thread_safe (~> 0.1) + uglifier (2.3.2) + execjs (>= 0.3.0) + json (>= 1.8.0) + underscore-rails (1.4.4) + unf (0.1.4) + unf_ext + unf_ext (0.0.6) + unicorn (4.6.3) + kgio (~> 2.6) + rack + raindrops (~> 0.7) + unicorn-worker-killer (0.4.2) + unicorn (~> 4) + version_sorter (1.1.0) + virtus (1.0.1) + axiom-types (~> 0.0.5) + coercible (~> 1.0) + descendants_tracker (~> 0.0.1) + equalizer (~> 0.0.7) + warden (1.2.3) + rack (>= 1.0) + webmock (1.16.0) + addressable (>= 2.2.7) + crack (>= 0.3.2) + websocket-driver (0.3.3) + wikicloth (0.8.1) + builder + expression_parser + rinku + xpath (2.0.0) + nokogiri (~> 1.3) + +PLATFORMS + ruby + +DEPENDENCIES + RedCloth + ace-rails-ap + acts-as-taggable-on + annotate (~> 2.6.0.beta2) + asciidoctor (= 0.1.4) + awesome_print + better_errors + binding_of_caller + bootstrap-sass (~> 3.0) + capybara (~> 2.2.1) + carrierwave + coffee-rails + colored + coveralls + creole (~> 0.3.6) + d3_rails (~> 3.1.4) + database_cleaner + default_value_for (~> 3.0.0) + devise (= 3.2.4) + devise-async (= 0.9.0) + diffy (~> 3.0.3) + dropzonejs-rails + email_spec + enumerize + factory_girl_rails + ffaker + fog (~> 1.14) + font-awesome-rails (~> 4.2) + foreman + gemnasium-gitlab-service (~> 0.2) + github-markup + gitlab-flowdock-git-hook (~> 0.4.2) + gitlab-grack (~> 2.0.0.pre) + gitlab-linguist (~> 3.0.0) + gitlab_emoji (~> 0.0.1.1) + gitlab_git (= 7.0.0.rc10) + gitlab_meta (= 7.0) + gitlab_omniauth-ldap (= 1.1.0) + gollum-lib (~> 3.0.0) + gon (~> 5.0.0) + grape (~> 0.6.1) + grape-entity (~> 0.4.2) + growl + guard-rspec + guard-spinach + haml-rails + hipchat (~> 0.14.0) + html-pipeline-gitlab (~> 0.1.0) + httparty + jasmine (= 2.0.2) + jquery-atwho-rails (~> 0.3.3) + jquery-rails + jquery-scrollto-rails + jquery-turbolinks + jquery-ui-rails + kaminari (~> 0.15.1) + launchy + letter_opener + minitest (~> 5.3.0) + mousetrap-rails + mysql2 + newrelic_rpm + nprogress-rails + omniauth (~> 1.1.3) + omniauth-github + omniauth-google-oauth2 + omniauth-shibboleth + omniauth-twitter + org-ruby (= 0.9.9) + pg + poltergeist (~> 1.5.1) + pry + quiet_assets (~> 1.0.1) + rack-attack + rack-cors + rack-mini-profiler + rails (~> 4.1.0) + rails_autolink (~> 1.1) + rails_best_practices + raphael-rails (~> 2.1.2) + rb-fsevent + rb-inotify + rdoc (~> 3.6) + redcarpet (~> 3.1.2) + redis-rails + request_store + rspec-rails + sanitize (~> 2.0) + sass-rails (~> 4.0.2) + sdoc + seed-fu + select2-rails + semantic-ui-sass (~> 0.16.1.0) + settingslogic + shoulda-matchers (~> 2.1.0) + sidekiq (= 2.17.0) + simplecov + sinatra + six + slack-notifier (~> 0.3.2) + slim + spinach-rails + spring (= 1.1.3) + spring-commands-rspec (= 1.0.1) + spring-commands-spinach (= 1.0.0) + stamp + state_machine + test_after_commit + thin + tinder (~> 1.9.2) + turbolinks + uglifier + underscore-rails (~> 1.4.4) + unf + unicorn (~> 4.6.3) + unicorn-worker-killer + version_sorter + virtus + webmock + wikicloth (= 0.8.1) diff --git a/pkgs/applications/version-management/gitlab/Gemfile.nix b/pkgs/applications/version-management/gitlab/Gemfile.nix new file mode 100644 index 000000000000..2e05d883abf2 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/Gemfile.nix @@ -0,0 +1,1508 @@ +[ +{ +name = "RedCloth"; +hash = "b4cf450a8868ca00a48d6ea43346d75dac183a8590774dd5590f4e967d87ea1a"; +url = "http://rubygems.org/downloads/RedCloth-4.2.9.gem"; +version = "4.2.9"; +} +{ +name = "ace-rails-ap"; +hash = "7bfbec4e8f7c7b6d2733fada398253f885ee48acd08201126a47a636b3085620"; +url = "http://rubygems.org/downloads/ace-rails-ap-2.0.1.gem"; +version = "2.0.1"; +} +{ +name = "actionmailer"; +hash = "ddf61f96ecf52b918522f063effb28985d0f76deb5c3ad85ab8cf5ec39adab92"; +url = "http://rubygems.org/downloads/actionmailer-4.1.1.gem"; +version = "4.1.1"; +} +{ +name = "actionpack"; +hash = "c11be56442eb570ba44d3b3ac74f6949f882c8dc76c56fceeb071daf64c5111d"; +url = "http://rubygems.org/downloads/actionpack-4.1.1.gem"; +version = "4.1.1"; +} +{ +name = "actionview"; +hash = "5892b097fc3556c4ac25307f3c406ba697b6520ca7c34b7d1ff17e0c93d79072"; +url = "http://rubygems.org/downloads/actionview-4.1.1.gem"; +version = "4.1.1"; +} +{ +name = "activemodel"; +hash = "c1d808d85b5e7f90593cb66ac7694f9288c819cdd1cb029790617f60cfed3232"; +url = "http://rubygems.org/downloads/activemodel-4.1.1.gem"; +version = "4.1.1"; +} +{ +name = "activerecord"; +hash = "df9f2227e00779826ea8abe13ed1c6aa9ba5422b35e37c1b82f62480d2ea13a0"; +url = "http://rubygems.org/downloads/activerecord-4.1.1.gem"; +version = "4.1.1"; +} +{ +name = "activesupport"; +hash = "7342801d69c8ca68c9005cafbc4a8f67069d3b51c0a4f5e2bbd061dcb26bba85"; +url = "http://rubygems.org/downloads/activesupport-4.1.1.gem"; +version = "4.1.1"; +} +{ +name = "acts-as-taggable-on"; +hash = "4b75dd427cb721f38fe354e8a37d8c3d217779c9db204398890984694def753d"; +url = "http://rubygems.org/downloads/acts-as-taggable-on-2.4.1.gem"; +version = "2.4.1"; +} +{ +name = "addressable"; +hash = "e74d0e825fe79b12943c7e3cbd3a5c92f7e3ebb94485b2493d320d6876321b86"; +url = "http://rubygems.org/downloads/addressable-2.3.5.gem"; +version = "2.3.5"; +} +{ +name = "annotate"; +hash = "d92ab99c6d10d98fec361bb5501ee91f8f30d1a7b2a6267334d74a1c6b363656"; +url = "http://rubygems.org/downloads/annotate-2.6.0.gem"; +version = "2.6.0"; +} +{ +name = "arel"; +hash = "c941f07bad89af26e8837c73d8a399b7777c721609f759eda015ed0081601636"; +url = "http://rubygems.org/downloads/arel-5.0.1.20140414130214.gem"; +version = "5.0.1.20140414130214"; +} +{ +name = "asciidoctor"; +hash = "2a2d6f9aed31200c9c74e5b81dba1673eda2f7936599df016cbe608dd8e1cf92"; +url = "http://rubygems.org/downloads/asciidoctor-0.1.4.gem"; +version = "0.1.4"; +} +{ +name = "awesome_print"; +hash = "f9fb1d1bafddc4739266c68f3a043e409716a620aea937d54d1ae07c278305cd"; +url = "http://rubygems.org/downloads/awesome_print-1.2.0.gem"; +version = "1.2.0"; +} +{ +name = "axiom-types"; +hash = "f67b87e9d7276f78cbee8f09f9bd474d63d7b357d271c63bfac5092b4670d54c"; +url = "http://rubygems.org/downloads/axiom-types-0.0.5.gem"; +version = "0.0.5"; +} +{ +name = "bcrypt"; +hash = "1c30953152c7151eac21aa59eed7ea933a7bc5d5838edea1d30d79b005955702"; +url = "http://rubygems.org/downloads/bcrypt-3.1.7.gem"; +version = "3.1.7"; +} +{ +name = "better_errors"; +hash = "eec93a02c996a8105cd9409cff2a2156a16ff1609b93b9b0d38c623cdb42186c"; +url = "http://rubygems.org/downloads/better_errors-1.0.1.gem"; +version = "1.0.1"; +} +{ +name = "binding_of_caller"; +hash = "d327682ce1d8e8cc46e282a46052946af0de16bef734014c63df0aac66334f96"; +url = "http://rubygems.org/downloads/binding_of_caller-0.7.2.gem"; +version = "0.7.2"; +} +{ +name = "bootstrap-sass"; +hash = "3f9269bae459b9f48bcb46524497fe7c422919708d12d9d9b1096b45339654c7"; +url = "http://rubygems.org/downloads/bootstrap-sass-3.0.3.0.gem"; +version = "3.0.3.0"; +} +{ +name = "builder"; +hash = "62fb9ad70ea42219a0c8d209a30281803712c717df7cb8f5ce5f63b4d489d191"; +url = "http://rubygems.org/downloads/builder-3.2.2.gem"; +version = "3.2.2"; +} +{ +name = "capybara"; +hash = "0081ff6eaa33f4b5b0427db7ef0ca0af015a9bf6606126f41016db6feb58cdeb"; +url = "http://rubygems.org/downloads/capybara-2.2.1.gem"; +version = "2.2.1"; +} +{ +name = "carrierwave"; +hash = "859069a445ffe03551cce9e239da424dabcc3b9a855e5f615ec62f6655d82aac"; +url = "http://rubygems.org/downloads/carrierwave-0.9.0.gem"; +version = "0.9.0"; +} +{ +name = "celluloid"; +hash = "2bb549276898d262355818b54eee45161d565af08728a5fe83e51277ea49ea52"; +url = "http://rubygems.org/downloads/celluloid-0.15.2.gem"; +version = "0.15.2"; +} +{ +name = "charlock_holmes"; +hash = "e52db7af0f7a652f55244455f84b4f1c09144f0d5e416f677a912f9147d6dfef"; +url = "http://rubygems.org/downloads/charlock_holmes-0.6.9.4.gem"; +version = "0.6.9.4"; +} +{ +name = "cliver"; +hash = "8775445218c612bb57f50c392c4906a1ab5cca067eab093bde3cc77d6426ce24"; +url = "http://rubygems.org/downloads/cliver-0.3.2.gem"; +version = "0.3.2"; +} +{ +name = "code_analyzer"; +hash = "27b610b987b3421d17a615cbab0c712f90bca45e82391ab9082670af97360bed"; +url = "http://rubygems.org/downloads/code_analyzer-0.4.3.gem"; +version = "0.4.3"; +} +{ +name = "coderay"; +hash = "5a943c59e36f7ef9dd2677855735656413af02e3f302431e9c548aabe89f3c15"; +url = "http://rubygems.org/downloads/coderay-1.1.0.gem"; +version = "1.1.0"; +} +{ +name = "coercible"; +hash = "5081ad24352cc8435ce5472bc2faa30260c7ea7f2102cc6a9f167c4d9bffaadc"; +url = "http://rubygems.org/downloads/coercible-1.0.0.gem"; +version = "1.0.0"; +} +{ +name = "coffee-rails"; +hash = "2f6e36f2c7a2b5ea4ba2aae5d8f70b443e47f010e1f645aec28368d783e1d88a"; +url = "http://rubygems.org/downloads/coffee-rails-4.0.1.gem"; +version = "4.0.1"; +} +{ +name = "coffee-script"; +hash = "acdd9f907950cfcf2342bc621ac9d11c9b0f34e2be8ab02de7845c673fb96c8c"; +url = "http://rubygems.org/downloads/coffee-script-2.2.0.gem"; +version = "2.2.0"; +} +{ +name = "coffee-script-source"; +hash = "64a5e37557b367c3a087643ed033b1dce485d6c21f96262aecc806d93280635c"; +url = "http://rubygems.org/downloads/coffee-script-source-1.6.3.gem"; +version = "1.6.3"; +} +{ +name = "colored"; +hash = "9d82b47ac589ce7f6cab64b1f194a2009e9fd00c326a5357321f44afab2c1d2c"; +url = "http://rubygems.org/downloads/colored-1.2.gem"; +version = "1.2"; +} +{ +name = "colorize"; +hash = "0f3d2c56f6a9da8dd6e8bb7c4448dab91a682615ef49feff415a8a6999dedfe5"; +url = "http://rubygems.org/downloads/colorize-0.5.8.gem"; +version = "0.5.8"; +} +{ +name = "connection_pool"; +hash = "41c0f1ff0c5a697869344ff50ae0d952fe99b52b26c21744b06fac34323adcb9"; +url = "http://rubygems.org/downloads/connection_pool-1.2.0.gem"; +version = "1.2.0"; +} +{ +name = "coveralls"; +hash = "449284ddd071e2297d06d0a9d18fe4c2b4027848263b1087d4180fb44e03e36b"; +url = "http://rubygems.org/downloads/coveralls-0.7.0.gem"; +version = "0.7.0"; +} +{ +name = "crack"; +hash = "4f9690bc66278494e0c525989b8ebfa89ce44087cd1733857d6ca9162dd16271"; +url = "http://rubygems.org/downloads/crack-0.4.1.gem"; +version = "0.4.1"; +} +{ +name = "creole"; +hash = "88ceda907e86402e629557002dfdc3a64c96ece2f85af8d787b96422639998f3"; +url = "http://rubygems.org/downloads/creole-0.3.8.gem"; +version = "0.3.8"; +} +{ +name = "d3_rails"; +hash = "28c6b97d4167481b78525cb2e2aa6b066fff6a086bb68a25762dec502cdf24d9"; +url = "http://rubygems.org/downloads/d3_rails-3.1.10.gem"; +version = "3.1.10"; +} +{ +name = "daemons"; +hash = "fee738586059ac5051ed89b40b63d02bdc9a19254f9b6e58848dea1c2f3135c8"; +url = "http://rubygems.org/downloads/daemons-1.1.9.gem"; +version = "1.1.9"; +} +{ +name = "database_cleaner"; +hash = "f675eb78d4fed65ae1e8503ccef4dfd25f4a3c3702bfb792789720a39a2f82a7"; +url = "http://rubygems.org/downloads/database_cleaner-1.3.0.gem"; +version = "1.3.0"; +} +{ +name = "debug_inspector"; +hash = "1594188ffd35b9973fa1e048497e4aa63abad0c3cbba0670e17935005e302781"; +url = "http://rubygems.org/downloads/debug_inspector-0.0.2.gem"; +version = "0.0.2"; +} +{ +name = "default_value_for"; +hash = "1fbd89cb5e7dab1820f7da6bbf5972c36e41acaa25101f129a7adffe9b987021"; +url = "http://rubygems.org/downloads/default_value_for-3.0.0.gem"; +version = "3.0.0"; +} +{ +name = "descendants_tracker"; +hash = "01d7079bc81d4743e138bf77a7cc1ece123834fa6883f4241646163401922920"; +url = "http://rubygems.org/downloads/descendants_tracker-0.0.3.gem"; +version = "0.0.3"; +} +{ +name = "devise"; +hash = "a37345a41049b5c4e02da561bcf922920b406cdd41970d1eb0023315050244fd"; +url = "http://rubygems.org/downloads/devise-3.2.4.gem"; +version = "3.2.4"; +} +{ +name = "devise-async"; +hash = "b51aec324bfa56f5e51b00e5429546e9eeab4be99ac0971625afdeffde799486"; +url = "http://rubygems.org/downloads/devise-async-0.9.0.gem"; +version = "0.9.0"; +} +{ +name = "diff-lcs"; +hash = "a1d3dde665292317a883d319066792e3f0e6a24cade4bc4cc47605d27664c9ed"; +url = "http://rubygems.org/downloads/diff-lcs-1.2.5.gem"; +version = "1.2.5"; +} +{ +name = "diffy"; +hash = "15a1d91b0ea81cada6ef5977543e7c255b4f8c5c3d361e557c8aee52cdf58d62"; +url = "http://rubygems.org/downloads/diffy-3.0.3.gem"; +version = "3.0.3"; +} +{ +name = "docile"; +hash = "5d3ee40b3a6567fe460601f3f4a3e199a98de37434ebfa242d751d0c79181255"; +url = "http://rubygems.org/downloads/docile-1.1.5.gem"; +version = "1.1.5"; +} +{ +name = "dotenv"; +hash = "838e235fa00d343c3138dbc05aa2cf1ec626ff9f065d521917a79a86b4a980be"; +url = "http://rubygems.org/downloads/dotenv-0.9.0.gem"; +version = "0.9.0"; +} +{ +name = "dropzonejs-rails"; +hash = "de86f5f58ca2e6f7212709db879f72d3eec16477a92296f03effabdd928c122b"; +url = "http://rubygems.org/downloads/dropzonejs-rails-0.4.14.gem"; +version = "0.4.14"; +} +{ +name = "email_spec"; +hash = "2607e556f41ab7fb90dabd3eda3d21acec5c2afd3ee607ab713664473dda503f"; +url = "http://rubygems.org/downloads/email_spec-1.5.0.gem"; +version = "1.5.0"; +} +{ +name = "emoji"; +hash = "2a74a4c6ff196cdc81e63198d30d8660b39b1147a59bd5f3639b39edf8fccf05"; +url = "http://rubygems.org/downloads/emoji-1.0.1.gem"; +version = "1.0.1"; +} +{ +name = "enumerize"; +hash = "4608034132557260e16a936c0eef54bf26c21eda261da25f89e49edd475de665"; +url = "http://rubygems.org/downloads/enumerize-0.7.0.gem"; +version = "0.7.0"; +} +{ +name = "equalizer"; +hash = "d66d02ece6935c217e3a81b2e33487825633fd203144e495b6e29f07278909da"; +url = "http://rubygems.org/downloads/equalizer-0.0.8.gem"; +version = "0.0.8"; +} +{ +name = "erubis"; +hash = "63653f5174a7997f6f1d6f465fbe1494dcc4bdab1fb8e635f6216989fb1148ba"; +url = "http://rubygems.org/downloads/erubis-2.7.0.gem"; +version = "2.7.0"; +} +{ +name = "escape_utils"; +hash = "8f14b54e78845b9673d4ade8ec7f748652e18e19cd9800605f810ba0d4bbe555"; +url = "http://rubygems.org/downloads/escape_utils-0.2.4.gem"; +version = "0.2.4"; +} +{ +name = "eventmachine"; +hash = "34424c87fc517f70ba137fe2281d16b53ce9c13f5cbfc2dda3ada56e96a65827"; +url = "http://rubygems.org/downloads/eventmachine-1.0.3.gem"; +version = "1.0.3"; +} +{ +name = "excon"; +hash = "aa1018571cb72248f82a9b88ab631b53179d0de0f8169957eebe512404805f79"; +url = "http://rubygems.org/downloads/excon-0.32.1.gem"; +version = "0.32.1"; +} +{ +name = "execjs"; +hash = "5a2e097ea0ae440cbbe6aebf54d83cf8596324fa85b7a725dfdb1e8afd5cf398"; +url = "http://rubygems.org/downloads/execjs-2.0.2.gem"; +version = "2.0.2"; +} +{ +name = "expression_parser"; +hash = "2b56db3cffc48c3337f4f29f5bc2374c86e7ba29acb40269c74bb55af9f868a4"; +url = "http://rubygems.org/downloads/expression_parser-0.9.0.gem"; +version = "0.9.0"; +} +{ +name = "factory_girl"; +hash = "bfa55ba5d3218c8e86adf251be79a3f936adadcae563f0d7462cfcb38802e28f"; +url = "http://rubygems.org/downloads/factory_girl-4.3.0.gem"; +version = "4.3.0"; +} +{ +name = "factory_girl_rails"; +hash = "1fe68aa430afa25807a135ac348b5157ec5b70608fb7741e598d46570df540ca"; +url = "http://rubygems.org/downloads/factory_girl_rails-4.3.0.gem"; +version = "4.3.0"; +} +{ +name = "faraday"; +hash = "289c3b5b57821b52988bdb5178d3e1149741f2bae5fbee2a80bc83feb44ba79d"; +url = "http://rubygems.org/downloads/faraday-0.8.9.gem"; +version = "0.8.9"; +} +{ +name = "faraday_middleware"; +hash = "02b37848159983ed1e4374f46f02325bf0364e8eb1e0a38839d2b4deb4889bcf"; +url = "http://rubygems.org/downloads/faraday_middleware-0.9.0.gem"; +version = "0.9.0"; +} +{ +name = "ffaker"; +hash = "18e03e1390c5bf0fc7ebf9a457fcce365b5e51e937b79c9e0c03e1191cc4f79f"; +url = "http://rubygems.org/downloads/ffaker-1.22.1.gem"; +version = "1.22.1"; +} +{ +name = "ffi"; +hash = "57977d095c1c324ac1cb134863180b34d5743fed2b6d7528adc5ec71a581e320"; +url = "http://rubygems.org/downloads/ffi-1.9.3.gem"; +version = "1.9.3"; +} +{ +name = "fog"; +hash = "ee28b0bae7004a98e139f65d8fe606d666534f4b5f96cef247bdd0374ec10b92"; +url = "http://rubygems.org/downloads/fog-1.21.0.gem"; +version = "1.21.0"; +} +{ +name = "fog-brightbox"; +hash = "7362f7497c45e7aa9621a23d4486211c90126afd86d0a5603270d88894bb2b48"; +url = "http://rubygems.org/downloads/fog-brightbox-0.0.1.gem"; +version = "0.0.1"; +} +{ +name = "fog-core"; +hash = "64e023ca8de23a0317ff3608c65068bbf722691c07a26c00752b9e51168d9df1"; +url = "http://rubygems.org/downloads/fog-core-1.21.1.gem"; +version = "1.21.1"; +} +{ +name = "fog-json"; +hash = "dcd321b42f551a9ed3a2a5d43bdfe703b7588dcac5a9e504577501ba50d52794"; +url = "http://rubygems.org/downloads/fog-json-1.0.0.gem"; +version = "1.0.0"; +} +{ +name = "font-awesome-rails"; +hash = "00ca8028187d17176a397588003c6db779ed14197dbbe28d369561ae2919dde4"; +url = "http://rubygems.org/downloads/font-awesome-rails-4.2.0.0.gem"; +version = "4.2.0.0"; +} +{ +name = "foreman"; +hash = "937e1b895042139d578936b1c099bc1989dcb7188c0f4798e79154997a941e7b"; +url = "http://rubygems.org/downloads/foreman-0.63.0.gem"; +version = "0.63.0"; +} +{ +name = "formatador"; +hash = "2238f3794fc3b5d69578fdd9bad7ea82116540a3587a67a966a39a686098f55d"; +url = "http://rubygems.org/downloads/formatador-0.2.4.gem"; +version = "0.2.4"; +} +{ +name = "gemnasium-gitlab-service"; +hash = "82b9b6ef02f625a30198cefe5fd46b8c4551ec749a320d3b56fdcd1ebef07228"; +url = "http://rubygems.org/downloads/gemnasium-gitlab-service-0.2.2.gem"; +version = "0.2.2"; +} +{ +name = "gherkin-ruby"; +hash = "9856207d67c184a07e7e35e91fd4322f89ad15704ba1f3764307f8798864f482"; +url = "http://rubygems.org/downloads/gherkin-ruby-0.3.1.gem"; +version = "0.3.1"; +} +{ +name = "github-markup"; +hash = "ef345d335058b050ecbe0f2e59450e1f6648574fa67f31b8537cdead9ea4fa1b"; +url = "http://rubygems.org/downloads/github-markup-1.1.0.gem"; +version = "1.1.0"; +} +{ +name = "gitlab-flowdock-git-hook"; +hash = "9bdb3455e46de3a6642d72a23f8f62b57669d1d0f2ea98561c653736ffe4d064"; +url = "http://rubygems.org/downloads/gitlab-flowdock-git-hook-0.4.2.2.gem"; +version = "0.4.2.2"; +} +{ +name = "gitlab-grack"; +hash = "197qdlymn6cf0qk3698kn0miizv7x9hr1429g9l900rnc85a5rdb"; +url = "https://rubygems.org/downloads/gitlab-grack-2.0.0.pre.gem"; +version = "2.0.0.pre"; +} +{ +name = "gitlab-grit"; +hash = "88996ec1e14017bfd4c70baae6e72110317704ae689f3fdb26e3bd371887cf03"; +url = "http://rubygems.org/downloads/gitlab-grit-2.6.12.gem"; +version = "2.6.12"; +} +{ +name = "gitlab-linguist"; +hash = "6652604cdf0168832ba5fe6662251f792730fbcb9253869625658cb1e8d9563c"; +url = "http://rubygems.org/downloads/gitlab-linguist-3.0.0.gem"; +version = "3.0.0"; +} +{ +name = "gitlab_emoji"; +hash = "760fc5df13080ef39bb8f06878b5b49b7206d4259471d6569fbb0e56f0821d33"; +url = "http://rubygems.org/downloads/gitlab_emoji-0.0.1.1.gem"; +version = "0.0.1.1"; +} +{ +name = "gitlab_git"; +hash = "0kjljz76wh4344z05mv3wiad7qdf6nwaa0yl1jls1j0hk9i4bb4k"; +url = "https://rubygems.org/downloads/gitlab_git-7.0.0.rc10.gem"; +version = "7.0.0.rc10"; +} +{ +name = "gitlab_meta"; +hash = "e96e1ced109b39bfcbefb30623e31c8eab4dc7d385a01bf7ba9ed1f5ce866a93"; +url = "http://rubygems.org/downloads/gitlab_meta-7.0.gem"; +version = "7.0"; +} +{ +name = "gitlab_omniauth-ldap"; +hash = "07df91c1993de0e5fa2fda845e2109e7b0bce228960bf41f770350873e82fa2e"; +url = "http://rubygems.org/downloads/gitlab_omniauth-ldap-1.1.0.gem"; +version = "1.1.0"; +} +{ +name = "gollum-lib"; +hash = "7a0896cae6d443e42b19e1353f1f900684b63109844cfdb52c48d40f2824e7a1"; +url = "http://rubygems.org/downloads/gollum-lib-3.0.0.gem"; +version = "3.0.0"; +} +{ +name = "gon"; +hash = "f593d15ba8616a0c9482b53113e03bc8a69cd0392e21f0189b2a96338837eaa5"; +url = "http://rubygems.org/downloads/gon-5.0.1.gem"; +version = "5.0.1"; +} +{ +name = "grape"; +hash = "e83ff1ae19bb2a402a75bdf81372ae31d25399ec6079f4e31d6be1572f9854ea"; +url = "http://rubygems.org/downloads/grape-0.6.1.gem"; +version = "0.6.1"; +} +{ +name = "grape-entity"; +hash = "93bc04e43bac2ab8959d66beffcac3d60e88681cb7c09de923c80a0e8fbc7b97"; +url = "http://rubygems.org/downloads/grape-entity-0.4.2.gem"; +version = "0.4.2"; +} +{ +name = "growl"; +hash = "c926f6fa77800a1cfab1c0a9e4c3608c93b5619145062cf6ba545949553d1e68"; +url = "http://rubygems.org/downloads/growl-1.0.3.gem"; +version = "1.0.3"; +} +{ +name = "guard"; +hash = "182ecf687c58d19de444a711892a44b6ef607589073f16c413c8ffcb663e827c"; +url = "http://rubygems.org/downloads/guard-2.2.4.gem"; +version = "2.2.4"; +} +{ +name = "guard-rspec"; +hash = "1631dd0b0172e528d23d92de3ad8c2903fcae195707bb18bdac023c4592a8158"; +url = "http://rubygems.org/downloads/guard-rspec-4.2.0.gem"; +version = "4.2.0"; +} +{ +name = "guard-spinach"; +hash = "2d76e05c747fc3ef163449c3f5d0b850af92bbd66f7133f3b79bfbe8a23750bb"; +url = "http://rubygems.org/downloads/guard-spinach-0.0.2.gem"; +version = "0.0.2"; +} +{ +name = "haml"; +hash = "05b1cde6e0d770e800cb74f6bf1212446bc4573bbbfecc4002e1085c2658bff6"; +url = "http://rubygems.org/downloads/haml-4.0.5.gem"; +version = "4.0.5"; +} +{ +name = "haml-rails"; +hash = "4598b9c3204a04ce27dfe5ce88f278af0a1069c7a5f2708a80c49df5026ce439"; +url = "http://rubygems.org/downloads/haml-rails-0.5.3.gem"; +version = "0.5.3"; +} +{ +name = "hashie"; +hash = "a9e1e4928bf4f5a5683ea9c7ef29e50fb93f72542f9a9550e205fe33a6568923"; +url = "http://rubygems.org/downloads/hashie-2.1.2.gem"; +version = "2.1.2"; +} +{ +name = "hike"; +hash = "154e2f2593845e5bcd8ed2ba3092600c55c6ad8c630722857de3fdaf334ccc44"; +url = "http://rubygems.org/downloads/hike-1.2.3.gem"; +version = "1.2.3"; +} +{ +name = "hipchat"; +hash = "1678c4ee7de2beacc2986792c29dbe5008b09247f1088046f02a062155896bf8"; +url = "http://rubygems.org/downloads/hipchat-0.14.0.gem"; +version = "0.14.0"; +} +{ +name = "html-pipeline"; +hash = "3461d1f709ef4812f11cc9789bdebb801813ba726e5544df3aad6c62336d93f9"; +url = "http://rubygems.org/downloads/html-pipeline-1.11.0.gem"; +version = "1.11.0"; +} +{ +name = "html-pipeline-gitlab"; +hash = "cf36fa0aded375a210d38586e023642a88585360b9fc203621a210ac8f4430be"; +url = "http://rubygems.org/downloads/html-pipeline-gitlab-0.1.5.gem"; +version = "0.1.5"; +} +{ +name = "http_parser.rb"; +hash = "d64f525eb1c580598d5bdef4fad98e948b6e016fa7803f45e13ac8714a2b8e3b"; +url = "http://rubygems.org/downloads/http_parser.rb-0.5.3.gem"; +version = "0.5.3"; +} +{ +name = "httparty"; +hash = "5c8ad1664ebd51c7bded6a96138d804549c030b413ad685b8b3940dea137aae1"; +url = "http://rubygems.org/downloads/httparty-0.13.0.gem"; +version = "0.13.0"; +} +{ +name = "httpauth"; +hash = "0d4991e48dfe46aae27ec709b896e54b7a1c402d84a4dbc93a6fe86d8353b4f9"; +url = "http://rubygems.org/downloads/httpauth-0.2.1.gem"; +version = "0.2.1"; +} +{ +name = "i18n"; +hash = "b37dda25b30484f2674a851e24ae098a38564a61c976fa91a34bf8fceaa3923b"; +url = "http://rubygems.org/downloads/i18n-0.6.11.gem"; +version = "0.6.11"; +} +{ +name = "ice_nine"; +hash = "108f7538b32819623db949583895a962f5934dcfd183e7fff8b7e6d70db04c42"; +url = "http://rubygems.org/downloads/ice_nine-0.10.0.gem"; +version = "0.10.0"; +} +{ +name = "jasmine"; +hash = "39426ce310c74f2efbe8dfae6efb3770f58687a11bb84a4115e15a528b2a1fec"; +url = "http://rubygems.org/downloads/jasmine-2.0.2.gem"; +version = "2.0.2"; +} +{ +name = "jasmine-core"; +hash = "f23bfecc48cca26fe2f81bb7b1782f1a853168f7a0c14c187a8aabec9b4d39bb"; +url = "http://rubygems.org/downloads/jasmine-core-2.0.0.gem"; +version = "2.0.0"; +} +{ +name = "jquery-atwho-rails"; +hash = "7abb6386fb377165e7ed8cb1665536f4b340c3c208400addc7441be2f10c1cb9"; +url = "http://rubygems.org/downloads/jquery-atwho-rails-0.3.3.gem"; +version = "0.3.3"; +} +{ +name = "jquery-rails"; +hash = "9d192f83aaa54196b380753cb20b42ca1ad210715063ef0fb15fac63ec430a8c"; +url = "http://rubygems.org/downloads/jquery-rails-3.1.0.gem"; +version = "3.1.0"; +} +{ +name = "jquery-scrollto-rails"; +hash = "77dbb8add00d4f1baec5f34859b992649a86a9ca054b1c2a7d3e03c3fb072c8a"; +url = "http://rubygems.org/downloads/jquery-scrollto-rails-1.4.3.gem"; +version = "1.4.3"; +} +{ +name = "jquery-turbolinks"; +hash = "6d9a82a44ddf652f74b6181e5892860cdbda3f000eb1497fa91e3dc098d9ca34"; +url = "http://rubygems.org/downloads/jquery-turbolinks-2.0.1.gem"; +version = "2.0.1"; +} +{ +name = "jquery-ui-rails"; +hash = "5b349e7066150b16d7a784183f040c083d51af3357937b8564aa0cc8b1cd59bd"; +url = "http://rubygems.org/downloads/jquery-ui-rails-4.2.1.gem"; +version = "4.2.1"; +} +{ +name = "json"; +hash = "961bfbbfa9fda1e857e9c791e964e6664e0d43bf687b19669dfbc7cdbc5e0200"; +url = "http://rubygems.org/downloads/json-1.8.1.gem"; +version = "1.8.1"; +} +{ +name = "jwt"; +hash = "5653fb76aa0b4b280624b314cd6c00a64de7cb2d61c2ab27587b434b8ad7880d"; +url = "http://rubygems.org/downloads/jwt-0.1.13.gem"; +version = "0.1.13"; +} +{ +name = "kaminari"; +hash = "6d8c87cdcd1bff99cc97436160ec31dae3228403a04169c33421c3522e7cc7d4"; +url = "http://rubygems.org/downloads/kaminari-0.15.1.gem"; +version = "0.15.1"; +} +{ +name = "kgio"; +hash = "92e59a3b97d044177b354f1434f6ebddfe50309d18d84754ab08d632a61dfc6e"; +url = "http://rubygems.org/downloads/kgio-2.8.1.gem"; +version = "2.8.1"; +} +{ +name = "launchy"; +hash = "3b22fd75759a8af480e1a7545c17e10eada3146605e1789cc162da8b33ad3644"; +url = "http://rubygems.org/downloads/launchy-2.4.2.gem"; +version = "2.4.2"; +} +{ +name = "letter_opener"; +hash = "b43060c7b223b00caa94dafe7016b424d809c83378326fbf24d041830cabebcf"; +url = "http://rubygems.org/downloads/letter_opener-1.1.2.gem"; +version = "1.1.2"; +} +{ +name = "listen"; +hash = "5549b607337a95bb3248a97660ccaa0c3eeec70e01e61b8a08d4a6c36dd93720"; +url = "http://rubygems.org/downloads/listen-2.3.1.gem"; +version = "2.3.1"; +} +{ +name = "lumberjack"; +hash = "2d85f466e25623f5c1d8476523f5e4b7903fa622007ac109fd7b560b45a846d6"; +url = "http://rubygems.org/downloads/lumberjack-1.0.4.gem"; +version = "1.0.4"; +} +{ +name = "mail"; +hash = "446585c38b062121252688dcc9cc70af1f470822e30db021bb97d185969e257c"; +url = "http://rubygems.org/downloads/mail-2.5.4.gem"; +version = "2.5.4"; +} +{ +name = "method_source"; +hash = "c2e9d0f4ebefd6b37efe38fe2964337b1d315fe198cad850681fd2da0027b1bc"; +url = "http://rubygems.org/downloads/method_source-0.8.2.gem"; +version = "0.8.2"; +} +{ +name = "mime-types"; +hash = "88ef3c596481678710ffd4018fa40f1999b02d97babea39682ba7d5badd21f56"; +url = "http://rubygems.org/downloads/mime-types-1.25.1.gem"; +version = "1.25.1"; +} +{ +name = "mini_portile"; +hash = "762b3e241362de24b2eb2bb1b98638399b931e9e51bece5f8e2df7611eb16c26"; +url = "http://rubygems.org/downloads/mini_portile-0.6.0.gem"; +version = "0.6.0"; +} +{ +name = "minitest"; +hash = "b99fb077a6ace47d496f981041395ec565b9a1a59c45a73a2edd880bb27493a2"; +url = "http://rubygems.org/downloads/minitest-5.3.5.gem"; +version = "5.3.5"; +} +{ +name = "mousetrap-rails"; +hash = "555caf5075543bb0f5bf642ea11ce02d08001ddb48041400de64667e4b1ec102"; +url = "http://rubygems.org/downloads/mousetrap-rails-1.4.6.gem"; +version = "1.4.6"; +} +{ +name = "multi_json"; +hash = "2c98979877e87df0b338ebf5c86091b390f53d62c11a8232bd51ca007e0b82d2"; +url = "http://rubygems.org/downloads/multi_json-1.10.1.gem"; +version = "1.10.1"; +} +{ +name = "multi_xml"; +hash = "08936dc294586ee1d178217cce577febe26315d7880e01e4f8e97cf2753b1945"; +url = "http://rubygems.org/downloads/multi_xml-0.5.5.gem"; +version = "0.5.5"; +} +{ +name = "multipart-post"; +hash = "ccf26a61706f128a2a3f3745aba0f79fde7b6fee068e03490eb189c2aaa5e78a"; +url = "http://rubygems.org/downloads/multipart-post-1.2.0.gem"; +version = "1.2.0"; +} +{ +name = "net-ldap"; +hash = "d39d341c992abb7273d8b83cbe32a38e69fdeb4eab684dbd2db1232e4065a4b4"; +url = "http://rubygems.org/downloads/net-ldap-0.7.0.gem"; +version = "0.7.0"; +} +{ +name = "net-scp"; +hash = "f3d8848f63f9b7670e57af2e2c308e9bd6fddb7c5440a36e892478a1e62b5977"; +url = "http://rubygems.org/downloads/net-scp-1.1.2.gem"; +version = "1.1.2"; +} +{ +name = "net-ssh"; +hash = "42f5c53fc4b8fb8c75de7c6b996613d7915e6f7387d4b5f7394fa51402500951"; +url = "http://rubygems.org/downloads/net-ssh-2.8.0.gem"; +version = "2.8.0"; +} +{ +name = "newrelic_rpm"; +hash = "36faff761a443f00d6e36502b23de96007ec007b3428215f701ac7cab9093d64"; +url = "http://rubygems.org/downloads/newrelic_rpm-3.9.4.245.gem"; +version = "3.9.4.245"; +} +{ +name = "nokogiri"; +hash = "dfb23254b87672a93582981c4ac5880d178ff32db6878fc351d75198aa544836"; +url = "http://rubygems.org/downloads/nokogiri-1.6.2.1.gem"; +version = "1.6.2.1"; +} +{ +name = "nprogress-rails"; +hash = "048ca784af666dde59940a804801f2471ad791952b2dc43cfbdb7d6cbd54f899"; +url = "http://rubygems.org/downloads/nprogress-rails-0.1.2.3.gem"; +version = "0.1.2.3"; +} +{ +name = "oauth"; +hash = "bca47d77c946af466872269e37e470837858b1305d5143e5a56c50356e02b2cc"; +url = "http://rubygems.org/downloads/oauth-0.4.7.gem"; +version = "0.4.7"; +} +{ +name = "oauth2"; +hash = "e18808a91165f22b8ce7939a216a51bb50d16a90b592347084b5112a4815f3a1"; +url = "http://rubygems.org/downloads/oauth2-0.8.1.gem"; +version = "0.8.1"; +} +{ +name = "omniauth"; +hash = "d47132daf1c59b8c97b4c51f3f2e379b5b6ae2cd9e169d0a3e46de45b335efbd"; +url = "http://rubygems.org/downloads/omniauth-1.1.4.gem"; +version = "1.1.4"; +} +{ +name = "omniauth-github"; +hash = "94b41beb49cc16b1e7c5f7a91999d867b76d84a33c9a44e5839178289b8ddac2"; +url = "http://rubygems.org/downloads/omniauth-github-1.1.1.gem"; +version = "1.1.1"; +} +{ +name = "omniauth-google-oauth2"; +hash = "1c11a1c330f91a9a77e5c51b7f1b378aa8b06b548a3bc1545056cee28360ebdd"; +url = "http://rubygems.org/downloads/omniauth-google-oauth2-0.2.5.gem"; +version = "0.2.5"; +} +{ +name = "omniauth-oauth"; +hash = "9f1bfb30fe6ba823935330d2036e08a5406e980f1e20c9b1271b82ee34fbe759"; +url = "http://rubygems.org/downloads/omniauth-oauth-1.0.1.gem"; +version = "1.0.1"; +} +{ +name = "omniauth-oauth2"; +hash = "72b8ba77b9ead4320e7f4e430aee0f3ef759aed79ae52c3b0e8fb2f41785eb68"; +url = "http://rubygems.org/downloads/omniauth-oauth2-1.1.1.gem"; +version = "1.1.1"; +} +{ +name = "omniauth-shibboleth"; +hash = "b0a92a0bc1e47d96c70f1bec982425c73029725da331dcda2022af762b929276"; +url = "http://rubygems.org/downloads/omniauth-shibboleth-1.1.1.gem"; +version = "1.1.1"; +} +{ +name = "omniauth-twitter"; +hash = "cd110801549953505a6152ae1426956785aca0cb749ff82835e8d49898b30f18"; +url = "http://rubygems.org/downloads/omniauth-twitter-1.0.1.gem"; +version = "1.0.1"; +} +{ +name = "org-ruby"; +hash = "ea272d4c7d0ac0310c8bb58ac503ca04c5180ca5c64642be0c96569d514327e5"; +url = "http://rubygems.org/downloads/org-ruby-0.9.9.gem"; +version = "0.9.9"; +} +{ +name = "orm_adapter"; +hash = "aa5d0be5d540cbb46d3a93e88061f4ece6a25f6e97d6a47122beb84fe595e9b9"; +url = "http://rubygems.org/downloads/orm_adapter-0.5.0.gem"; +version = "0.5.0"; +} +{ +name = "pg"; +hash = "ba6827400e0614f8fd464543f6e10b307aadef58c59280c6560e6f2548599ed3"; +url = "http://rubygems.org/downloads/pg-0.15.1.gem"; +version = "0.15.1"; +} +{ +name = "phantomjs"; +hash = "42f3d5b561832a383076c1d49720ed4d2711f29acb85c701a07015b412436f33"; +url = "http://rubygems.org/downloads/phantomjs-1.9.2.0.gem"; +version = "1.9.2.0"; +} +{ +name = "poltergeist"; +hash = "db4580c0197729b1e7d2cc872ab3d1c5d98b759ac67720c0ba77fbc8752a6a23"; +url = "http://rubygems.org/downloads/poltergeist-1.5.1.gem"; +version = "1.5.1"; +} +{ +name = "polyglot"; +hash = "05409d9f736e1fd39635f8700b24e1156ae8e308e785d5d0f939c603fd529649"; +url = "http://rubygems.org/downloads/polyglot-0.3.4.gem"; +version = "0.3.4"; +} +{ +name = "posix-spawn"; +hash = "634746d6f090c1b15d2f92fa90c5ed4868e59c8752ca56a5d83af8f79c0a5110"; +url = "http://rubygems.org/downloads/posix-spawn-0.3.9.gem"; +version = "0.3.9"; +} +{ +name = "pry"; +hash = "3a521a98344c62096561773ab5b831f862432bc40ce3798bbbdead1c7f86b159"; +url = "http://rubygems.org/downloads/pry-0.9.12.4.gem"; +version = "0.9.12.4"; +} +{ +name = "pyu-ruby-sasl"; +hash = "5683a6bc5738db5a1bf5ceddeaf545405fb241b4184dd4f2587e679a7e9497e5"; +url = "http://rubygems.org/downloads/pyu-ruby-sasl-0.0.3.3.gem"; +version = "0.0.3.3"; +} +{ +name = "quiet_assets"; +hash = "3fbc8728462a42d58cd9101b0ad8a240d3cb90a248d5d4072af432fa946a2fa8"; +url = "http://rubygems.org/downloads/quiet_assets-1.0.2.gem"; +version = "1.0.2"; +} +{ +name = "racc"; +hash = "6282f61f123f4e1d39bac5ad19027e34c336a5e1d80f9e4769c80b16db11b583"; +url = "http://rubygems.org/downloads/racc-1.4.10.gem"; +version = "1.4.10"; +} +{ +name = "rack"; +hash = "e64af00234e8faaa69ea81ef4e3800f40743c69560f0dda8fc9969660e775fa7"; +url = "http://rubygems.org/downloads/rack-1.5.2.gem"; +version = "1.5.2"; +} +{ +name = "rack-accept"; +hash = "66247b5449db64ebb93ae2ec4af4764b87d1ae8a7463c7c68893ac13fa8d4da2"; +url = "http://rubygems.org/downloads/rack-accept-0.4.5.gem"; +version = "0.4.5"; +} +{ +name = "rack-attack"; +hash = "f910e5d0a54b7cc7e086bf111481a0e455260caf8184a33bbb9e96f8064ef49c"; +url = "http://rubygems.org/downloads/rack-attack-2.3.0.gem"; +version = "2.3.0"; +} +{ +name = "rack-cors"; +hash = "5a256bda2673c7bbba014587b1f93fd2e6fd80b7ac9804a0f90665add6ba087d"; +url = "http://rubygems.org/downloads/rack-cors-0.2.9.gem"; +version = "0.2.9"; +} +{ +name = "rack-mini-profiler"; +hash = "1c77870679e17b54c5657ce3e15a3b7f54813844c4ab3ff292181f2904d1404b"; +url = "http://rubygems.org/downloads/rack-mini-profiler-0.9.0.gem"; +version = "0.9.0"; +} +{ +name = "rack-mount"; +hash = "a25100725157aea263dcea4f75aaab4e23922dc0e09fffd60c94eade95c34125"; +url = "http://rubygems.org/downloads/rack-mount-0.8.3.gem"; +version = "0.8.3"; +} +{ +name = "rack-protection"; +hash = "ad8d7e99b47418e1361ae8aaa0a8591671c8065b958bcedaef92da121a2db863"; +url = "http://rubygems.org/downloads/rack-protection-1.5.1.gem"; +version = "1.5.1"; +} +{ +name = "rack-test"; +hash = "7e920b6aac888e4a3846e5997fb1cbf456bdb5846322b58dc31697a54a38b306"; +url = "http://rubygems.org/downloads/rack-test-0.6.2.gem"; +version = "0.6.2"; +} +{ +name = "rails"; +hash = "602275642419e731637c91421cf498f2994c2d9f1b94f6c713f3b7b8757b2aa5"; +url = "http://rubygems.org/downloads/rails-4.1.1.gem"; +version = "4.1.1"; +} +{ +name = "rails_autolink"; +hash = "384c17bee71ca5dc44f49401762f91abb6bc356dd564f380713fc974d2c25671"; +url = "http://rubygems.org/downloads/rails_autolink-1.1.6.gem"; +version = "1.1.6"; +} +{ +name = "rails_best_practices"; +hash = "859371ff63fcfe6a33e7012ce3e18df0c0f00579520c684a544dccfd33c7c691"; +url = "http://rubygems.org/downloads/rails_best_practices-1.14.4.gem"; +version = "1.14.4"; +} +{ +name = "railties"; +hash = "0cef786bd54741f6b6c2ff0bfb769a200222f7e8928b93caf61f87c7325f8ee6"; +url = "http://rubygems.org/downloads/railties-4.1.1.gem"; +version = "4.1.1"; +} +{ +name = "raindrops"; +hash = "2077f24017dad9637bc4e20e77f3cc533054190516e9e330476678e3cc7a689a"; +url = "http://rubygems.org/downloads/raindrops-0.12.0.gem"; +version = "0.12.0"; +} +{ +name = "rake"; +hash = "b504ad9d610b85ef0856a4771d024e4a66656c63a17121a3ed1d4d7db39c775b"; +url = "http://rubygems.org/downloads/rake-10.3.2.gem"; +version = "10.3.2"; +} +{ +name = "raphael-rails"; +hash = "6c89daf65f82621f7ff59948db1db0ca2f41422ceadf905ba18a58b7ab57516a"; +url = "http://rubygems.org/downloads/raphael-rails-2.1.2.gem"; +version = "2.1.2"; +} +{ +name = "rb-fsevent"; +hash = "e1aed0fa5b42f74ecc1321dd807296d688b0f4fada96e87a9b2113d91befb62d"; +url = "http://rubygems.org/downloads/rb-fsevent-0.9.3.gem"; +version = "0.9.3"; +} +{ +name = "rb-inotify"; +hash = "3b1e16da8b00849dfa3c6348cc6df6888a2d35d2bf432bc50267f4ec1e74a21c"; +url = "http://rubygems.org/downloads/rb-inotify-0.9.2.gem"; +version = "0.9.2"; +} +{ +name = "rdoc"; +hash = "a8e2b78f7e5ec4cc4716cd863975645f2f2377dc6db267a15e427e5fae2633ed"; +url = "http://rubygems.org/downloads/rdoc-3.12.2.gem"; +version = "3.12.2"; +} +{ +name = "redcarpet"; +hash = "ff5397c2b0d1344f065d07e58ed157f5bc25b49d44e723348620693ba928d71c"; +url = "http://rubygems.org/downloads/redcarpet-3.1.2.gem"; +version = "3.1.2"; +} +{ +name = "redis"; +hash = "e3c8203afbfb9e0cfe915a0610f6795e02ba2298e72e9326076eed2c048142c1"; +url = "http://rubygems.org/downloads/redis-3.0.6.gem"; +version = "3.0.6"; +} +{ +name = "redis-actionpack"; +hash = "e49029df46b15434591962cc004a1f0b07ab11276e00fd53ec835b85c7064d55"; +url = "http://rubygems.org/downloads/redis-actionpack-4.0.0.gem"; +version = "4.0.0"; +} +{ +name = "redis-activesupport"; +hash = "cd802d06716638fb000e209a769f1a3932285c8ba2b328aa0c501f0999fcb4a2"; +url = "http://rubygems.org/downloads/redis-activesupport-4.0.0.gem"; +version = "4.0.0"; +} +{ +name = "redis-namespace"; +hash = "c7c119c0a8c3876b7d7f0dc0ae2e3343352f1dfc6d978c9711b63b58518a6639"; +url = "http://rubygems.org/downloads/redis-namespace-1.4.1.gem"; +version = "1.4.1"; +} +{ +name = "redis-rack"; +hash = "68be24901183f1973059e837b1acc421cebd34766753ca6f6e7902fb50ef35f8"; +url = "http://rubygems.org/downloads/redis-rack-1.5.0.gem"; +version = "1.5.0"; +} +{ +name = "redis-rails"; +hash = "a7224c9a7c9bfc9d6080a0418b3c290b9d27ff88b481022b3958a1b2e0e1fc45"; +url = "http://rubygems.org/downloads/redis-rails-4.0.0.gem"; +version = "4.0.0"; +} +{ +name = "redis-store"; +hash = "9fb47e5dbc6bce6ab4206899f49c6ee8d4a0c6d4830bb0f042ea49df72804249"; +url = "http://rubygems.org/downloads/redis-store-1.1.4.gem"; +version = "1.1.4"; +} +{ +name = "request_store"; +hash = "70adb9485eb22113bd165e259b929a449dfe2d2410a880566f06df6a164fc1cf"; +url = "http://rubygems.org/downloads/request_store-1.0.5.gem"; +version = "1.0.5"; +} +{ +name = "require_all"; +hash = "1d4e5729811a1d976916465b64c508481c7fe229bc1ca88c8b1665ad4c46809a"; +url = "http://rubygems.org/downloads/require_all-1.3.2.gem"; +version = "1.3.2"; +} +{ +name = "rest-client"; +hash = "a3203433b8b0c914648caea54395a8791a61e0df7d401c81f4e2b7f8a8fac75a"; +url = "http://rubygems.org/downloads/rest-client-1.6.7.gem"; +version = "1.6.7"; +} +{ +name = "rinku"; +hash = "eb5cec33af86da3002e66470d9a741a0726d6864a69b580abc798931b4b706ca"; +url = "http://rubygems.org/downloads/rinku-1.7.3.gem"; +version = "1.7.3"; +} +{ +name = "rouge"; +hash = "b41278cf37dcef392e1d195519b482f03d1b80878837926a8322c7db9cef0251"; +url = "http://rubygems.org/downloads/rouge-1.3.3.gem"; +version = "1.3.3"; +} +{ +name = "rspec"; +hash = "4f9fc6c58696faa22571ca80d710fd0e4f30eaeb700155968d36df303f279e8c"; +url = "http://rubygems.org/downloads/rspec-2.14.1.gem"; +version = "2.14.1"; +} +{ +name = "rspec-core"; +hash = "e714621feb592e515c3ca19a685505af1c2bbb2d713b85c0610ab80985624348"; +url = "http://rubygems.org/downloads/rspec-core-2.14.7.gem"; +version = "2.14.7"; +} +{ +name = "rspec-expectations"; +hash = "3cb74fd8427a56321ca09e598f2db509231bae0996800b12f30084d7c3882f3a"; +url = "http://rubygems.org/downloads/rspec-expectations-2.14.4.gem"; +version = "2.14.4"; +} +{ +name = "rspec-mocks"; +hash = "e745b215de211099681d3b128fc8af15616eb19101bdd76da47dca1c1dd86b8b"; +url = "http://rubygems.org/downloads/rspec-mocks-2.14.4.gem"; +version = "2.14.4"; +} +{ +name = "rspec-rails"; +hash = "6ee4375e977d03ca4945fd5d79debfa72239f7f35f3de9a162ab4adcd4d735e9"; +url = "http://rubygems.org/downloads/rspec-rails-2.14.0.gem"; +version = "2.14.0"; +} +{ +name = "ruby-progressbar"; +hash = "94265728146504d311c3d6a3c040fc4d45ada6fc9bf42b58dbef208c6cc97d9b"; +url = "http://rubygems.org/downloads/ruby-progressbar-1.2.0.gem"; +version = "1.2.0"; +} +{ +name = "rubyntlm"; +hash = "a07b9bacc0cf531c76d4f71ed0813b4055fe881447aede2bc7cd7e89ec808870"; +url = "http://rubygems.org/downloads/rubyntlm-0.1.1.gem"; +version = "0.1.1"; +} +{ +name = "rubypants"; +hash = "f07e38eac793655a0323fe91946081052341b9e69807026fcf102346589eedee"; +url = "http://rubygems.org/downloads/rubypants-0.2.0.gem"; +version = "0.2.0"; +} +{ +name = "rugged"; +hash = "e536ec53d7f08109960e159e5401e682dd03f6ab386f84f93ef71e1968817529"; +url = "http://rubygems.org/downloads/rugged-0.21.0.gem"; +version = "0.21.0"; +} +{ +name = "safe_yaml"; +hash = "139285ff8e70413d2a3721da4e742c736b4948682f0b80330a353e34d5dd6478"; +url = "http://rubygems.org/downloads/safe_yaml-0.9.7.gem"; +version = "0.9.7"; +} +{ +name = "sanitize"; +hash = "c3be075f5b38a1b02404be5778b181e50fba9ab253bac851cb217d9a71375b77"; +url = "http://rubygems.org/downloads/sanitize-2.1.0.gem"; +version = "2.1.0"; +} +{ +name = "sass"; +hash = "ddcd7d76d98daa8f3ebbaec196972500a6cf6e854f9c328fcfc9aa556f29bfac"; +url = "http://rubygems.org/downloads/sass-3.2.19.gem"; +version = "3.2.19"; +} +{ +name = "sass-rails"; +hash = "b57665f95f63f063137e365d3e8a1c6d1340ec892d875aeeab93fb60e13f2ec8"; +url = "http://rubygems.org/downloads/sass-rails-4.0.3.gem"; +version = "4.0.3"; +} +{ +name = "sdoc"; +hash = "c2f54086862252f487e0c4b05fc46d8659a4dba6deb2ad0a24ff9046c1c4889e"; +url = "http://rubygems.org/downloads/sdoc-0.3.20.gem"; +version = "0.3.20"; +} +{ +name = "seed-fu"; +hash = "eb09cfeb574f46a22b313e38fe7d4ae6bf2c6a57554d3f157778756b58bc81db"; +url = "http://rubygems.org/downloads/seed-fu-2.3.1.gem"; +version = "2.3.1"; +} +{ +name = "select2-rails"; +hash = "dcae2d6f92f94975080c14bee21a2b9745675135824f7ec298a9c94e329e9f7e"; +url = "http://rubygems.org/downloads/select2-rails-3.5.2.gem"; +version = "3.5.2"; +} +{ +name = "semantic-ui-sass"; +hash = "54a9f7c3ac28203f91e99f4f929c2851356796e3d7d2de3468ff060528db71a1"; +url = "http://rubygems.org/downloads/semantic-ui-sass-0.16.1.0.gem"; +version = "0.16.1.0"; +} +{ +name = "settingslogic"; +hash = "5925a91d0d48dfb59a6e48ae2bb9c9b801fe6fab25a8e8d302ce8699d92f2ae6"; +url = "http://rubygems.org/downloads/settingslogic-2.0.9.gem"; +version = "2.0.9"; +} +{ +name = "sexp_processor"; +hash = "71591ddbda99b5e12e4a46d377c87513850ca7aa4b1aa800ae02792cadee6be7"; +url = "http://rubygems.org/downloads/sexp_processor-4.4.0.gem"; +version = "4.4.0"; +} +{ +name = "shoulda-matchers"; +hash = "da4ce8e10970a5dfa88d30b7be06dbef87caf2aca4508343b31a59c434449fc6"; +url = "http://rubygems.org/downloads/shoulda-matchers-2.1.0.gem"; +version = "2.1.0"; +} +{ +name = "sidekiq"; +hash = "81c57e05311c7176e8e71373cf78874c9365f00ed40b9fd1a969863e56a10c53"; +url = "http://rubygems.org/downloads/sidekiq-2.17.0.gem"; +version = "2.17.0"; +} +{ +name = "simple_oauth"; +hash = "723f19781f5562182e075a0f31bca11a955962d933064abb23bce98ed035602d"; +url = "http://rubygems.org/downloads/simple_oauth-0.1.9.gem"; +version = "0.1.9"; +} +{ +name = "simplecov"; +hash = "4f205752a4f3730fd4c58678bbab4c83f4e2a6ca3bbea4cdf18cd86a70589eb7"; +url = "http://rubygems.org/downloads/simplecov-0.9.0.gem"; +version = "0.9.0"; +} +{ +name = "simplecov-html"; +hash = "69393ce932c2898dd5074913e360078f651f094a9b7300b286a78f43b11c164a"; +url = "http://rubygems.org/downloads/simplecov-html-0.8.0.gem"; +version = "0.8.0"; +} +{ +name = "sinatra"; +hash = "1a16a552d559be0fff6cefd2c84c1fecafcc54668fba540e99fe8f2692033e8a"; +url = "http://rubygems.org/downloads/sinatra-1.4.4.gem"; +version = "1.4.4"; +} +{ +name = "six"; +hash = "83c73d4aa60ff76172ec257f45b098c66f7a8b89883bcaaec42517287dbc0aae"; +url = "http://rubygems.org/downloads/six-0.2.0.gem"; +version = "0.2.0"; +} +{ +name = "slack-notifier"; +hash = "64166343518084e3b1cdf03bb49ff42469dae8aab868fafa001c9f6a4f8d4604"; +url = "http://rubygems.org/downloads/slack-notifier-0.3.2.gem"; +version = "0.3.2"; +} +{ +name = "slim"; +hash = "07cdf67f971b99a360c9ded6ea70ae5351e1236182997dff8118ef5ea242a7ea"; +url = "http://rubygems.org/downloads/slim-2.0.2.gem"; +version = "2.0.2"; +} +{ +name = "slop"; +hash = "568b7d1d48d675ce2778e5fd1b9de56ff754e3eb4b589e4918f2cf8d25e56df4"; +url = "http://rubygems.org/downloads/slop-3.4.7.gem"; +version = "3.4.7"; +} +{ +name = "spinach"; +hash = "a43718a977de8c2bb0fd952af23d56a69c046d28dac687057405c7301ccfdf0c"; +url = "http://rubygems.org/downloads/spinach-0.8.7.gem"; +version = "0.8.7"; +} +{ +name = "spinach-rails"; +hash = "e0d045ae1266f46549570c148d1696ac7d4baa518f8b974a7c8ed949bd63cad9"; +url = "http://rubygems.org/downloads/spinach-rails-0.2.1.gem"; +version = "0.2.1"; +} +{ +name = "spring"; +hash = "92aa8cf28fec20b0f760e2cf8efd1990be2c30c2e79167cdd19e8344420b72c5"; +url = "http://rubygems.org/downloads/spring-1.1.3.gem"; +version = "1.1.3"; +} +{ +name = "spring-commands-rspec"; +hash = "61d75e234afd79f247942dca387c3a7fffc0de9527f16aea4d5fdd66fd82cffc"; +url = "http://rubygems.org/downloads/spring-commands-rspec-1.0.1.gem"; +version = "1.0.1"; +} +{ +name = "spring-commands-spinach"; +hash = "694fbf041b5f357bd29fab2ff44013f42e894bf1af498bcce726498f5b56128d"; +url = "http://rubygems.org/downloads/spring-commands-spinach-1.0.0.gem"; +version = "1.0.0"; +} +{ +name = "sprockets"; +hash = "b06a4a66a74cce8a3dbd53a9078c9b71b94f5652a6fe92809f28786d8fcd5920"; +url = "http://rubygems.org/downloads/sprockets-2.11.0.gem"; +version = "2.11.0"; +} +{ +name = "sprockets-rails"; +hash = "9e134d28c4d05f86f3c8ebcdecd50ec060bd33e8bdcb6461cfcf0f2b77f26d8a"; +url = "http://rubygems.org/downloads/sprockets-rails-2.1.3.gem"; +version = "2.1.3"; +} +{ +name = "stamp"; +hash = "1ad6622d000cd390b9b523eb9270fc902abd24a685ce0c73529f344d6a9fa4f0"; +url = "http://rubygems.org/downloads/stamp-0.5.0.gem"; +version = "0.5.0"; +} +{ +name = "state_machine"; +hash = "80fcddc91976baec8713c37c28b5bc0655f5f2e0a1412a1a4a3aac41082cc2ed"; +url = "http://rubygems.org/downloads/state_machine-1.2.0.gem"; +version = "1.2.0"; +} +{ +name = "stringex"; +hash = "dbd556b4b59d994de64c8fa91ef959667338d840b814fc72531f8253dbba179d"; +url = "http://rubygems.org/downloads/stringex-2.5.1.gem"; +version = "2.5.1"; +} +{ +name = "temple"; +hash = "3374f339c3b54611538b9811c0c46db8e06b48ed212db741cd7f52baf59caa26"; +url = "http://rubygems.org/downloads/temple-0.6.7.gem"; +version = "0.6.7"; +} +{ +name = "term-ansicolor"; +hash = "b9534713ba4c2a48f2291fadf9ce2edae9f2dc96157ee812fe8fe16a70c081ac"; +url = "http://rubygems.org/downloads/term-ansicolor-1.2.2.gem"; +version = "1.2.2"; +} +{ +name = "test_after_commit"; +hash = "8be009b5b7dd8f6e712ea92a079625b9a84f9a010ef2d5d5e44bcd45c353fa8f"; +url = "http://rubygems.org/downloads/test_after_commit-0.2.2.gem"; +version = "0.2.2"; +} +{ +name = "thin"; +hash = "a0b80e1632d3529a5c4b87e07d9ab146e0dde5e506c20f3a740fe8b364d5bd18"; +url = "http://rubygems.org/downloads/thin-1.6.1.gem"; +version = "1.6.1"; +} +{ +name = "thor"; +hash = "9ff834f031b5550c743bb8a3139317fefdae9cdebd02d60de376658f427fe522"; +url = "http://rubygems.org/downloads/thor-0.19.1.gem"; +version = "0.19.1"; +} +{ +name = "thread_safe"; +hash = "16315baa971c48d00104bcd35e8934e3f9ccfd3b8f429e3fca7ee2dfd81734b2"; +url = "http://rubygems.org/downloads/thread_safe-0.3.4.gem"; +version = "0.3.4"; +} +{ +name = "tilt"; +hash = "39820562c4f5db45fe18de87ccc30a0e77a998bf5334b1d8c10a2f7dbc1f5903"; +url = "http://rubygems.org/downloads/tilt-1.4.1.gem"; +version = "1.4.1"; +} +{ +name = "timers"; +hash = "3bbb9651a73e43e47950a5e13a7fa62f852cd5c46e421bb671e9ade1fbb47b74"; +url = "http://rubygems.org/downloads/timers-1.1.0.gem"; +version = "1.1.0"; +} +{ +name = "tinder"; +hash = "0b06fd2a72ed424e82b1896852dd9ebb10791ef6ab8412e74ad2fa9069f6bd47"; +url = "http://rubygems.org/downloads/tinder-1.9.3.gem"; +version = "1.9.3"; +} +{ +name = "tins"; +hash = "c53bf237462be8d61cfa2a5f4b48f372d010825b0dc594c952d9857fe4c3ef30"; +url = "http://rubygems.org/downloads/tins-0.13.1.gem"; +version = "0.13.1"; +} +{ +name = "treetop"; +hash = "ffa68f201c0f62c26b0a1d13233d73194400596964696843f87ebb5d812f12ff"; +url = "http://rubygems.org/downloads/treetop-1.4.15.gem"; +version = "1.4.15"; +} +{ +name = "turbolinks"; +hash = "d92fd8f1627a6eadfaa39b76da83c257181e786557f54859d81ab2b08d73e8ff"; +url = "http://rubygems.org/downloads/turbolinks-2.0.0.gem"; +version = "2.0.0"; +} +{ +name = "twitter-stream"; +hash = "3866afdfbdf083e773b46afb3037ff3e3b1ebf8014ab88353153daddc70b4847"; +url = "http://rubygems.org/downloads/twitter-stream-0.1.16.gem"; +version = "0.1.16"; +} +{ +name = "tzinfo"; +hash = "fdb1d3fdf2776d490c82a0e589a08e7cbde70ac1ae7d2b1f0b7e77f3e6b801b0"; +url = "http://rubygems.org/downloads/tzinfo-1.2.2.gem"; +version = "1.2.2"; +} +{ +name = "uglifier"; +hash = "5e942f02d11d9e4f6e18aa84cfd909e569fe887b12c3ecf66d92e8cf4162acf0"; +url = "http://rubygems.org/downloads/uglifier-2.3.2.gem"; +version = "2.3.2"; +} +{ +name = "underscore-rails"; +hash = "e229a9668f799ea169616fa59da3f6cf48f259d9c1dd2ef52ff2a151bd6be3f5"; +url = "http://rubygems.org/downloads/underscore-rails-1.4.4.gem"; +version = "1.4.4"; +} +{ +name = "unf"; +hash = "4999517a531f2a955750f8831941891f6158498ec9b6cb1c81ce89388e63022e"; +url = "http://rubygems.org/downloads/unf-0.1.4.gem"; +version = "0.1.4"; +} +{ +name = "unf_ext"; +hash = "afcdba30a57665a4540c5d43b2833c6a3677a3296428fa70fbd7b4c8feaceb1f"; +url = "http://rubygems.org/downloads/unf_ext-0.0.6.gem"; +version = "0.0.6"; +} +{ +name = "unicorn"; +hash = "fd0b12148a24acfd8bf28a0322e4116061e64e271253e077999e4ec531a74966"; +url = "http://rubygems.org/downloads/unicorn-4.6.3.gem"; +version = "4.6.3"; +} +{ +name = "unicorn-worker-killer"; +hash = "6d2819347c514ff65bcdbda745a416a2c93e18e90e1e347c6f4931e7b1a6c78b"; +url = "http://rubygems.org/downloads/unicorn-worker-killer-0.4.2.gem"; +version = "0.4.2"; +} +{ +name = "version_sorter"; +hash = "aeeae527de4fb3146bbdaa9283f3fb087fedbe0cee80645c12d1970fe4947873"; +url = "http://rubygems.org/downloads/version_sorter-1.1.0.gem"; +version = "1.1.0"; +} +{ +name = "virtus"; +hash = "03d81d65377a603894b058c0ee78130dda1c3e6d56918d40444f11dba5d644a6"; +url = "http://rubygems.org/downloads/virtus-1.0.1.gem"; +version = "1.0.1"; +} +{ +name = "warden"; +hash = "97769e5b5d230fec4f77e91b1116b28fdd27428f4acab68dc5ed025af9d37f7a"; +url = "http://rubygems.org/downloads/warden-1.2.3.gem"; +version = "1.2.3"; +} +{ +name = "webmock"; +hash = "89e8ced0a58bcf68bec818f901ce966b4f8938dd20b101044bd6408589a957f8"; +url = "http://rubygems.org/downloads/webmock-1.16.0.gem"; +version = "1.16.0"; +} +{ +name = "websocket-driver"; +hash = "4e9a04c1e370dada829738ee1433a98e6721e7fa83b98fceef089fe6bce97638"; +url = "http://rubygems.org/downloads/websocket-driver-0.3.3.gem"; +version = "0.3.3"; +} +{ +name = "wikicloth"; +hash = "7ac8a9ca0a948cf472851e521afc6c2a6b04a8f91ef1d824ba6a61ffbd60e6ca"; +url = "http://rubygems.org/downloads/wikicloth-0.8.1.gem"; +version = "0.8.1"; +} +{ +name = "xpath"; +hash = "9ca4a1cc88d9ab16c591468cce7b5d00ee06a8a76b841f8438970c7a44c86c12"; +url = "http://rubygems.org/downloads/xpath-2.0.0.gem"; +version = "2.0.0"; +} +] diff --git a/pkgs/applications/version-management/gitlab/README b/pkgs/applications/version-management/gitlab/README new file mode 100644 index 000000000000..cd8d4748e700 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/README @@ -0,0 +1,5 @@ +to regenerate Gemfile.nix and Gemfile.lock you need to + + % nix-build bootstrap.nix + % cp result/Gemfile.nix ./ + % cp result/Gemfile.lock ./ diff --git a/pkgs/applications/version-management/gitlab/bootstrap.nix b/pkgs/applications/version-management/gitlab/bootstrap.nix new file mode 100644 index 000000000000..a983ede333a8 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/bootstrap.nix @@ -0,0 +1,45 @@ +{ pkgs ? import <nixpkgs> {} +}: + +with pkgs; + +let + +in stdenv.mkDerivation rec { + version = "7.4.2"; + name = "gitlab-${version}"; + __noChroot = true; + src = fetchurl { + url = "https://github.com/gitlabhq/gitlabhq/archive/v${version}.zip"; + sha256 = "01iplkpa4scr0wcap6vjrc960dj15z4ciclaqswj0sz5hrp9glw6"; + }; + buildInputs = [ + ruby rubyLibs.bundler libiconv libxslt libxml2 pkgconfig + libffi postgresql which stdenv unzip + ]; + installPhase = '' + unset http_proxy + unset ftp_proxy + + cp -R . $out + cp ${./generate_nix_requirements.rb} $out/generate_nix_requirements.rb + cd $out + + cat > config/database.yml <<EOF + production: + adapter: postgresql + EOF + + substituteInPlace Gemfile --replace 'gem "therubyracer"' "" + + bundle config --local build.nokogiri --use-system-libraries \ + --with-iconv-dir=${libiconv} \ + --with-xslt-dir=${libxslt} \ + --with-xml2-dir=${libxml2} \ + --with-pkg-config \ + --with-pg-config=${postgresql}/bin/pg_config + + HOME="/tmp/gitlab-${version}" ruby generate_nix_requirements.rb + rm -R /tmp/gems + ''; +} diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix new file mode 100644 index 000000000000..2e0fcc43eb74 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -0,0 +1,87 @@ +{ stdenv, fetchurl, ruby, rubyLibs, libiconv, libxslt, libxml2, pkgconfig, libffi, postgresql, libyaml, ncurses, curl, openssh, redis, zlib, icu, checkinstall, logrotate, docutils, cmake, git, gdbm, readline, unzip, gnumake, which, tzdata, nodejs }: + +let + gemspec = map (gem: fetchurl { url=gem.url; sha256=gem.hash; }) (import ./Gemfile.nix); + + +in stdenv.mkDerivation rec { + version = "7.4.2"; + name = "gitlab-${version}"; + + src = fetchurl { + url = "https://github.com/gitlabhq/gitlabhq/archive/v${version}.zip"; + sha256 = "01iplkpa4scr0wcap6vjrc960dj15z4ciclaqswj0sz5hrp9glw6"; + }; + + buildInputs = [ + ruby rubyLibs.bundler libyaml gdbm readline ncurses curl openssh redis zlib + postgresql libxslt libxml2 pkgconfig libffi icu checkinstall logrotate docutils nodejs + git unzip gnumake which cmake + ]; + + # cmake is required by a build depdenceny, not the main binary: + dontUseCmakeConfigure = true; + + patches = [ + ./remove-hardcoded-locations.patch + ]; + postPatch = '' + mv config/gitlab.yml.example config/gitlab.yml + ''; + + installPhase = '' + mkdir -p $out/share/gitlab + cp -R . $out/share/gitlab + cd $out/share/gitlab + + export HOME=$(pwd) + export GITLAB_EMAIL_FROM="required@to-make-it-work.org" + + # required for some gems: + cat > config/database.yml <<EOF + production: + adapter: postgresql + database: gitlab + host: <%= ENV["GITLAB_DATABASE_HOST"] || "127.0.0.1" %> + password: <%= ENV["GITLAB_DATABASE_PASSWORD"] || "blerg" %> + username: gitlab + encoding: utf8 + EOF + + mkdir -p vendor/cache + ${stdenv.lib.concatStrings (map (gem: "ln -s ${gem} vendor/cache/${gem.name};") gemspec)} + + cp ${./Gemfile.lock} Gemfile.lock + substituteInPlace Gemfile --replace 'gem "therubyracer"' "" + + bundle config build.nokogiri \ + --use-system-libraries \ + --with-xslt-dir=${libxslt} \ + --with-xml2-dir=${libxml2} \ + --with-pkg-config=${pkgconfig}/bin/pkg-config \ + --with-pg-config=${postgresql}/bin/pg_config + + # See https://github.com/gitlabhq/gitlab-public-wiki/wiki/Trouble-Shooting-Guide: + bundle install -j4 --verbose --local --deployment --without development test mysql + + # Fix timezone data directory + substituteInPlace $out/share/gitlab/vendor/bundle/ruby/*/gems/tzinfo-*/lib/tzinfo/zoneinfo_data_source.rb \ + --replace "/etc/zoneinfo" "${tzdata}/share/zoneinfo" + + # For reasons I don't understand "bundle exec" ignores the + # RAILS_ENV causing tests to be executed that fail because we're + # not installing development and test gems above. Deleting the + # tests works though.: + rm $out/share/gitlab/lib/tasks/test.rake + + # Assets + bundle exec rake assets:precompile RAILS_ENV=production + ''; + + meta = with stdenv.lib; { + homepage = http://www.gitlab.com/; + platforms = platforms.linux; + maintainers = [ ]; + license = licenses.mit; + }; +} diff --git a/pkgs/applications/version-management/gitlab/generate_nix_requirements.rb b/pkgs/applications/version-management/gitlab/generate_nix_requirements.rb new file mode 100755 index 000000000000..ed47d52c9c1b --- /dev/null +++ b/pkgs/applications/version-management/gitlab/generate_nix_requirements.rb @@ -0,0 +1,56 @@ +#!/usr/bin/env ruby + +require 'rubygems' +require 'bundler' +require 'fileutils' +require 'net/http' +require 'net/https' +require 'uri' + +TMP_DIR = "/tmp/gems" + +FileUtils.rm_rf(TMP_DIR) if File.exists?(TMP_DIR) +FileUtils.mkdir TMP_DIR + +GEMSERVER = "http://rubygems.org" + +# inspect Gemfile.lock +lockfile = Bundler::LockfileParser.new(Bundler.read_file("Gemfile.lock")) + +to_mirror = {} + +uri = URI(GEMSERVER) +http = Net::HTTP.new(uri.host, uri.port) +http.use_ssl = uri.scheme == 'https' + +requirements = {} + +lockfile.specs.each do |s| + possible_gem_name = "#{s.name}-#{s.version.to_s}.gem" + + Dir.chdir TMP_DIR do + filename = `gem fetch #{s.name} -v #{s.version.to_s}`.split()[1] + hash = `sha256sum #{filename}.gem` + url = "#{GEMSERVER}/downloads/#{filename}.gem" + puts url + requirements[s.name] = { :version => s.version.to_s, + :hash => hash.split().first, + :url => url,} + + end +end + +filename = 'Gemfile.nix' + +File.open(filename, 'w') do |file| + file.puts "[" + requirements.each do |name, info| + file.puts "{" + file.puts ['name = ', '"', name, '";'].join('') + file.puts ['hash = ', '"', info[:hash], '";'].join('') + file.puts ['url = ', '"', info[:url], '";'].join('') + file.puts ['version = ', '"', info[:version], '";'].join('') + file.puts "}" + end + file.puts "]" +end diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch new file mode 100644 index 000000000000..f5532bbd67c9 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch @@ -0,0 +1,109 @@ +diff --git a/config/environments/production.rb b/config/environments/production.rb +index 78bf543..9b37122 100644 +--- a/config/environments/production.rb ++++ b/config/environments/production.rb +@@ -66,10 +66,10 @@ Gitlab::Application.configure do + + config.action_mailer.delivery_method = :sendmail + # Defaults to: +- # # config.action_mailer.sendmail_settings = { +- # # location: '/usr/sbin/sendmail', +- # # arguments: '-i -t' +- # # } ++ config.action_mailer.sendmail_settings = { ++ location: '/var/setuid-wrappers/sendmail', ++ arguments: '-i -t' ++ } + config.action_mailer.perform_deliveries = true + config.action_mailer.raise_delivery_errors = true + +diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example +index e7a8d08..834ecaf 100644 +--- a/config/gitlab.yml.example ++++ b/config/gitlab.yml.example +@@ -17,8 +17,8 @@ production: &base + ## GitLab settings + gitlab: + ## Web server settings (note: host is the FQDN, do not include http://) +- host: localhost +- port: 80 # Set to 443 if using HTTPS, see installation.md#using-https for additional HTTPS configuration details ++ host: <%= ENV['GITLAB_HOST'] || 'localhost' %> ++ port: <%= ENV['GITLAB_PORT'] || 80 %> + https: false # Set to true if using HTTPS, see installation.md#using-https for additional HTTPS configuration details + + # Uncommment this line below if your ssh host is different from HTTP/HTTPS one +@@ -31,11 +31,11 @@ production: &base + # relative_url_root: /gitlab + + # Uncomment and customize if you can't use the default user to run GitLab (default: 'git') +- # user: git ++ user: gitlab + + ## Email settings + # Email address used in the "From" field in mails sent by GitLab +- email_from: example@example.com ++ email_from: <%= ENV['GITLAB_EMAIL_FROM'] %> + + # Email server smtp settings are in [a separate file](initializers/smtp_settings.rb.sample). + +@@ -230,12 +230,12 @@ production: &base + # GitLab Satellites + satellites: + # Relative paths are relative to Rails.root (default: tmp/repo_satellites/) +- path: /home/git/gitlab-satellites/ ++ path: <%= ENV['GITLAB_SATELLITES_PATH'] %> + timeout: 30 + + ## Backup settings + backup: +- path: "tmp/backups" # Relative paths are relative to Rails.root (default: tmp/backups/) ++ path: <%= ENV['GITLAB_BACKUP_PATH'] %> + # keep_time: 604800 # default: 0 (forever) (in seconds) + # upload: + # # Fog storage connection settings, see http://fog.io/storage/ . +@@ -249,11 +249,11 @@ production: &base + + ## GitLab Shell settings + gitlab_shell: +- path: /home/git/gitlab-shell/ ++ path: <%= ENV['GITLAB_SHELL_PATH'] %> + + # REPOS_PATH MUST NOT BE A SYMLINK!!! +- repos_path: /home/git/repositories/ +- hooks_path: /home/git/gitlab-shell/hooks/ ++ repos_path: <%= ENV['GITLAB_REPOSITORIES_PATH'] %> ++ hooks_path: <%= ENV['GITLAB_SHELL_HOOKS_PATH'] %> + + # Git over HTTP + upload_pack: true +@@ -266,7 +266,7 @@ production: &base + # CAUTION! + # Use the default values unless you really know what you are doing + git: +- bin_path: /usr/bin/git ++ bin_path: git + # The next value is the maximum memory size grit can use + # Given in number of bytes per git object (e.g. a commit) + # This value can be increased if you have very large commits +@@ -299,7 +299,7 @@ test: + gravatar: + enabled: true + gitlab: +- host: localhost ++ host: <%= ENV['GITLAB_HOST'] %> + port: 80 + + # When you run tests we clone and setup gitlab-shell +diff --git a/lib/gitlab/app_logger.rb b/lib/gitlab/app_logger.rb +index 8e4717b..abfe2e4 100644 +--- a/lib/gitlab/app_logger.rb ++++ b/lib/gitlab/app_logger.rb +@@ -1,7 +1,7 @@ + module Gitlab + class AppLogger < Gitlab::Logger + def self.file_name +- 'application.log' ++ ENV["GITLAB_APPLICATION_LOG_PATH"] + end + + def format_message(severity, timestamp, progname, msg) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 82d92fd79e88..8cb34a7f9fa5 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 - version = "3.1.2"; + version = "3.2.2"; name = "mercurial-${version}"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://mercurial.selenic.com/release/${name}.tar.gz"; - sha256 = "0fldlypjpzn12az2gk4b3am615wih3r6ld69im97iqq76zmmrgjx"; + sha256 = "1311ba2cgdc17ap8sl7pswzngc702pnkr4cd2rx6znb0w9jzgpmg"; }; inherit python; # pass it so that the same version can be used in hg2git diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 4655a16671ee..a4254384e5b8 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ruby, rubyLibs, libiconv, libxslt, libxml2, pkgconfig, libffi, imagemagickBig, postgresql }: +{ stdenv, fetchurl, ruby, rubyLibs, libiconv, libiconvOrNull, libiconvOrLibc, libxslt, libxml2, pkgconfig, libffi, glibc, imagemagickBig, postgresql }: let gemspec = map (gem: fetchurl { url=gem.url; sha256=gem.hash; }) (import ./Gemfile.nix); @@ -25,7 +25,9 @@ in stdenv.mkDerivation rec { ''; buildInputs = [ - ruby rubyLibs.bundler libiconv libxslt libxml2 pkgconfig libffi + ruby rubyLibs.bundler + ] ++ (if (libiconvOrNull != null) then [libiconv] else []) ++ [ + libxslt libxml2 pkgconfig libffi imagemagickBig postgresql ]; @@ -46,7 +48,7 @@ in stdenv.mkDerivation rec { bundle config build.nokogiri \ --use-system-libraries \ - --with-iconv-dir=${libiconv} \ + --with-iconv-dir=${libiconvOrLibc} \ --with-xslt-dir=${libxslt} \ --with-xml2-dir=${libxml2} \ --with-pkg-config \ diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 1ec4866f1aa4..6e329ebdf715 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -17,13 +17,13 @@ assert javahlBindings -> jdk != null && perl != null; stdenv.mkDerivation rec { - version = "1.8.10"; + version = "1.8.11"; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion/${name}.tar.bz2"; - sha256 = "1k3xskg2kjfp3zipl46lqx4fq4lhqnswd79qxp1kfhwplz401j8w"; + sha1 = "161edaee328f4fdcfd2a7c10ecd3fbcd51c61275"; }; buildInputs = [ zlib apr aprutil sqlite ] diff --git a/pkgs/applications/video/cc1394/default.nix b/pkgs/applications/video/cc1394/default.nix index d555e1b7885a..1040f8e009a3 100644 --- a/pkgs/applications/video/cc1394/default.nix +++ b/pkgs/applications/video/cc1394/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.alliedvisiontec.com/us/products/software/linux/avt-fire4linux.html; description = "AVT Viewer application for AVT cameras"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; # because libdc1394avt is broken diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix new file mode 100644 index 000000000000..b48f0f42936d --- /dev/null +++ b/pkgs/applications/video/devede/default.nix @@ -0,0 +1,30 @@ +{ pkgs, stdenv, fetchurl, pythonPackages, buildPythonPackage, pygtk, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor }: + +let + inherit (pythonPackages) dbus; + +in buildPythonPackage rec { + name = "devede-3.23.0"; + namePrefix = ""; + + src = fetchurl { + url = "http://www.rastersoft.com/descargas/${name}.tar.bz2"; + sha256 = "9e217ca46f5f275cb0c3cadbe8c830fa1fde774c004bd95a343d1255be6f25e1"; + }; + + buildInputs = [ ffmpeg ]; + + pythonPath = [ pygtk dbus ffmpeg mplayer dvdauthor vcdimager cdrkit ]; + + postPatch = '' + substituteInPlace devede --replace "/usr/share/devede" "$out/share/devede" + + ''; + + meta = with stdenv.lib; { + description = "DVD Creator for Linux"; + homepage = http://www.rastersoft.com/programas/devede.html; + license = licenses.gpl3; + maintainers = [ maintainers.bdimcheff ]; + }; +} diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix index 6889e4d9ef86..cab7b4112d03 100644 --- a/pkgs/applications/video/dvdauthor/default.nix +++ b/pkgs/applications/video/dvdauthor/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib, pkgconfig }: +{ stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib, pkgconfig +, flex, bison }: stdenv.mkDerivation rec{ name = "dvdauthor-0.7.1"; @@ -8,9 +9,15 @@ stdenv.mkDerivation rec{ sha256 = "1s8zqlim0s3hk5sbdsilip3qqh0yv05l1jwx49d9rsy614dv27sh"; }; - buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick ]; + buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick flex bison]; nativeBuildInputs = [ pkgconfig ]; + patches = [ + ./dvdauthor-0.7.1-automake-1.13.patch + ./dvdauthor-0.7.1-mga-strndup.patch + ./dvdauthor-imagemagick-0.7.0.patch + ]; + meta = { description = "Tools for generating DVD files to be played on standalone DVD players"; homepage = http://dvdauthor.sourceforge.net/; diff --git a/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch b/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch new file mode 100644 index 000000000000..786f0c968556 --- /dev/null +++ b/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch @@ -0,0 +1,10 @@ +--- dvdauthor/configure.ac~ 2013-01-04 08:27:40.713197029 +0800 ++++ dvdauthor/configure.ac 2013-01-04 08:27:53.273525273 +0800 +@@ -1,6 +1,6 @@ + AC_INIT(DVDAuthor,0.7.1,dvdauthor-users@lists.sourceforge.net) + +-AM_CONFIG_HEADER(src/config.h) ++AC_CONFIG_HEADERS(src/config.h) + AC_CONFIG_AUX_DIR(autotools) + + AM_INIT_AUTOMAKE diff --git a/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch b/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch new file mode 100644 index 000000000000..5f77a68081a4 --- /dev/null +++ b/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch @@ -0,0 +1,24 @@ +Index: dvdauthor/src/dvdvml.l +=================================================================== +--- dvdauthor/src/dvdvml.l ++++ dvdauthor/src/dvdvml.l 2014-09-14 19:36:05.098847465 +0000 +@@ -19,6 +19,7 @@ + * USA + */ + ++#include "config.h" + #include "compat.h" /* needed for bool */ + #include "dvdvm.h" + #include "dvdvmy.h" +Index: dvdauthor/src/dvdvmy.y +=================================================================== +--- dvdauthor/src/dvdvmy.y ++++ dvdauthor/src/dvdvmy.y 2014-09-14 19:36:28.251618378 +0000 +@@ -19,6 +19,7 @@ + * USA + */ + ++#include "config.h" + #include "compat.h" /* needed for bool */ + #include "dvdvm.h" + diff --git a/pkgs/applications/video/dvdauthor/dvdauthor-imagemagick-0.7.0.patch b/pkgs/applications/video/dvdauthor/dvdauthor-imagemagick-0.7.0.patch new file mode 100644 index 000000000000..52b6cc44cd59 --- /dev/null +++ b/pkgs/applications/video/dvdauthor/dvdauthor-imagemagick-0.7.0.patch @@ -0,0 +1,11 @@ +--- dvdauthor/configure.ac.orig 2010-10-23 04:26:49.000000000 +0200 ++++ dvdauthor/configure.ac 2010-10-24 14:37:45.489064778 +0200 +@@ -31,7 +31,7 @@ + + usemagick=0 + +-AC_CHECK_PROGS(MAGICKCONFIG, [Magick-config]) ++AC_CHECK_PROGS(MAGICKCONFIG, [MagickCore-config]) + if test -n "$MAGICKCONFIG"; then + ac_save_CPPFLAGS="$CPPFLAGS" + ac_save_LIBS="$LIBS" diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix index 553b86a3801e..8d4a328cc094 100644 --- a/pkgs/applications/video/kmplayer/default.nix +++ b/pkgs/applications/video/kmplayer/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation { name = "kmplayer-0.11.3d"; src = fetchurl { - url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.3d.tar.bz2; + #url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.3d.tar.bz2; + url = "mirror://gentoo/distfiles/kmplayer-0.11.3d.tar.bz2"; sha256 = "1yvbkb1hh5y7fqfvixjf2rryzm0fm0fpkx4lmvhi7k7d0v4wpgky"; }; diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix new file mode 100644 index 000000000000..8735b8a78a1a --- /dev/null +++ b/pkgs/applications/video/kodi/default.nix @@ -0,0 +1,120 @@ +{ stdenv, lib, fetchurl, makeWrapper +, pkgconfig, cmake, gnumake, yasm, pythonFull +, boost, avahi, libdvdcss, lame, autoreconfHook +, gettext, pcre, yajl, fribidi, which +, openssl, gperf, tinyxml2, taglib, libssh, swig, jre +, libX11, xproto, inputproto, libxml2 +, libXt, libXmu, libXext, xextproto +, libXinerama, libXrandr, randrproto +, libXtst, libXfixes, fixesproto, systemd +, SDL, SDL_image, SDL_mixer, alsaLib +, mesa, glew, fontconfig, freetype, ftgl +, libjpeg, jasper, libpng, libtiff +, libmpeg2, libsamplerate, libmad +, libogg, libvorbis, flac, libxslt +, lzo, libcdio, libmodplug, libass, libbluray +, sqlite, mysql, nasm, gnutls, libva, wayland +, curl, bzip2, zip, unzip, glxinfo, xdpyinfo +, dbus_libs ? null, dbusSupport ? true +, udev, udevSupport ? true +, libusb ? null, usbSupport ? false +, samba ? null, sambaSupport ? true +, libmicrohttpd, bash +# TODO: would be nice to have nfsSupport (needs libnfs library) +# TODO: librtmp +, libvdpau ? null, vdpauSupport ? true +, pulseaudio ? null, pulseSupport ? true +, libcec ? null, cecSupport ? true +}: + +assert dbusSupport -> dbus_libs != null; +assert udevSupport -> udev != null; +assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used if udev is avaliable +assert sambaSupport -> samba != null; +assert vdpauSupport -> libvdpau != null; +assert pulseSupport -> pulseaudio != null; +assert cecSupport -> libcec != null; + +let + ffmpeg_2_4_4 = fetchurl { + url = "https://github.com/xbmc/FFmpeg/archive/2.4.4-Helix.tar.gz"; + sha256 = "1pkkmnq0kbwb13ps1wk01709lp3l2dzbfay6l29zj1204lbc3anb"; + }; +in stdenv.mkDerivation rec { + name = "kodi-14.0"; + + src = fetchurl { + url = "https://github.com/xbmc/xbmc/archive/14.0-Helix.tar.gz"; + sha256 = "14hip50gg3qgfb0mw7wrdqvw77mxdg9x1abfrqv1ydjrrjansx0i"; + }; + + buildInputs = [ + makeWrapper libxml2 gnutls + pkgconfig cmake gnumake yasm pythonFull + boost libmicrohttpd autoreconfHook + gettext pcre yajl fribidi libva + openssl gperf tinyxml2 taglib libssh swig jre + libX11 xproto inputproto which + libXt libXmu libXext xextproto + libXinerama libXrandr randrproto + libXtst libXfixes fixesproto + SDL SDL_image SDL_mixer alsaLib + mesa glew fontconfig freetype ftgl + libjpeg jasper libpng libtiff wayland + libmpeg2 libsamplerate libmad + libogg libvorbis flac libxslt systemd + lzo libcdio libmodplug libass libbluray + sqlite mysql nasm avahi libdvdcss lame + curl bzip2 zip unzip glxinfo xdpyinfo + ] + ++ lib.optional dbusSupport dbus_libs + ++ lib.optional udevSupport udev + ++ lib.optional usbSupport libusb + ++ lib.optional sambaSupport samba + ++ lib.optional vdpauSupport libvdpau + ++ lib.optional pulseSupport pulseaudio + ++ lib.optional cecSupport libcec; + + dontUseCmakeConfigure = true; + + postPatch = '' + substituteInPlace xbmc/linux/LinuxTimezone.cpp \ + --replace 'usr/share/zoneinfo' 'etc/zoneinfo' + substituteInPlace tools/depends/target/ffmpeg/autobuild.sh \ + --replace "/bin/bash" "${bash}/bin/bash -ex" + cp ${ffmpeg_2_4_4} tools/depends/target/ffmpeg/ffmpeg-2.4.4-Helix.tar.gz + ''; + + preConfigure = '' + ./bootstrap + ''; + + configureFlags = [ + "--enable-external-libraries" + ] + ++ lib.optional (!sambaSupport) "--disable-samba" + ++ lib.optional vdpauSupport "--enable-vdpau" + ++ lib.optional pulseSupport "--enable-pulse"; + + postInstall = '' + for p in $(ls $out/bin/) ; do + wrapProgram $out/bin/$p \ + --prefix PATH ":" "${pythonFull}/bin" \ + --prefix PATH ":" "${glxinfo}/bin" \ + --prefix PATH ":" "${xdpyinfo}/bin" \ + --prefix LD_LIBRARY_PATH ":" "${curl}/lib" \ + --prefix LD_LIBRARY_PATH ":" "${systemd}/lib" \ + --prefix LD_LIBRARY_PATH ":" "${libmad}/lib" \ + --prefix LD_LIBRARY_PATH ":" "${libvdpau}/lib" \ + --prefix LD_LIBRARY_PATH ":" "${libcec}/lib" + done + ''; + + meta = with stdenv.lib; { + homepage = http://kodi.tv/; + description = "Media center"; + license = stdenv.lib.licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.iElectric maintainers.titanous ]; + }; +} diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index a6c2ff0b822a..b958b5d02a4a 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { expat wxGTK zlib ruby gettext pkgconfig curl ]; + configureFlags = "--with-boost-libdir=${boost.lib}/lib"; buildPhase = '' ruby ./drake ''; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 5acdcac97372..052add92a1fe 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -58,11 +58,11 @@ in stdenv.mkDerivation rec { name = "mpv-${version}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz"; - sha256 = "0rz8dp44yag442gamaa2vdmf69h25gqh2bgybx89prkfh8n4hy8x"; + sha256 = "1grnmhj7hymi77ivvyzpgykj4wwrjd7a9apm5vyz2xqrankn3hyc"; }; buildInputs = with stdenv.lib; @@ -120,7 +120,7 @@ stdenv.mkDerivation rec { ''; homepage = http://mpv.io; license = licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = with stdenv.lib.maintainers; [ AndersonTorres fuuzetsu ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 79fd26204a90..484e28972cb2 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -34,5 +34,9 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; + + # after qt5 bump it probably needs to be updated, + # but newer versions seem to need newer than the latest stable mlt + broken = true; }; } diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index f1d3cf836adb..97cc2f7e0a81 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { version = "2.1.5"; src = fetchurl { - url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz"; + url = "http://download.videolan.org/vlc/${version}/${name}.tar.xz"; sha256 = "0whzbn7ahn5maarcwl1yhk9lq10b0q0y9w5pjl9kh3frdjmncrbg"; }; diff --git a/pkgs/applications/video/xbmc/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch b/pkgs/applications/video/xbmc/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch new file mode 100644 index 000000000000..91811194c9b7 --- /dev/null +++ b/pkgs/applications/video/xbmc/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch @@ -0,0 +1,32 @@ +From 9f1e45a10860dd23239de35673643e9e0e4a74f8 Mon Sep 17 00:00:00 2001 +From: Lars Op den Kamp <lars@opdenkamp.eu> +Date: Tue, 28 Oct 2014 14:52:16 +0100 +Subject: [PATCH 5/8] [CEC] renamed the iDoubleTapTimeoutMs in the new libCEC + for clarity. does not change binary compatibility + +--- + xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp +index 1d068dc..ad123d9 100644 +--- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp ++++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp +@@ -1347,8 +1347,13 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void) + m_configuration.bPowerOffOnStandby = iStandbyAction == 13011 ? 1 : 0; + m_configuration.bShutdownOnStandby = iStandbyAction == 13005 ? 1 : 0; + ++#if defined(CEC_DOUBLE_TAP_TIMEOUT_MS_OLD) + // double tap prevention timeout in ms +- m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); ++ m_configuration.iDoubleTapTimeout50Ms = GetSettingInt("double_tap_timeout_ms") / 50; ++#else ++ // backwards compatibility. will be removed once the next major release of libCEC is out ++ m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); ++#endif + } + + void CPeripheralCecAdapter::ReadLogicalAddresses(const CStdString &strString, cec_logical_addresses &addresses) +-- +2.1.2 + diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix index f7bddc50ef82..cb6f4346e168 100644 --- a/pkgs/applications/video/xbmc/default.nix +++ b/pkgs/applications/video/xbmc/default.nix @@ -72,6 +72,8 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; + patches = [ ./0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch ]; + preConfigure = '' substituteInPlace xbmc/linux/LinuxTimezone.cpp \ --replace 'usr/share/zoneinfo' 'etc/zoneinfo' diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 54d697d42751..388248c5aa86 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -1,4 +1,4 @@ -{ stdenv, edk2 }: +{ stdenv, edk2, nasm, iasl }: let @@ -12,8 +12,9 @@ let in stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" { - name = "OVMF-2014-02-01"; + name = "OVMF-2014-12-10"; + buildInputs = [nasm iasl]; unpackPhase = '' for file in \ "${edk2.src}"/{OvmfPkg,UefiCpuPkg,MdeModulePkg,IntelFrameworkModulePkg,PcAtChipsetPkg,FatBinPkg,EdkShellBinPkg,MdePkg,ShellPkg,OptionRomPkg,IntelFrameworkPkg}; @@ -25,7 +26,7 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" { meta = { description = "Sample UEFI firmware for QEMU and KVM"; homepage = http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF; - license = "BSD"; + license = stdenv.lib.licenses.bsd2; maintainers = [ stdenv.lib.maintainers.shlevy ]; platforms = ["x86_64-linux" "i686-linux"]; }; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 354666f3374b..3483b0ac6d20 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -3,11 +3,11 @@ btrfsProgs, iptables, bash, e2fsprogs, xz}: stdenv.mkDerivation rec { name = "docker-${version}"; - version = "1.3.1"; + version = "1.3.3"; src = fetchurl { url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz"; - sha256 = "0w1gz1apkcrmhgng2rkkzy7wmxm68zgs6a16bi4cx3a38n4mgday"; + sha256 = "1jxvbm81zinh0achh8r2aac3x650aqiwn3w6iq1fg57fir1lw1cw"; }; buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables e2fsprogs]; diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index b49bd40136f3..842687cfdaf3 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -1,8 +1,12 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp -, libgcrypt, gnupg, cyrus_sasl, spiceSupport ? true, spice_gtk, shared_mime_info -, libvirt, libcap_ng, yajl +, libgcrypt, gnupg, cyrus_sasl, shared_mime_info, libvirt, libcap_ng, yajl +, gsettings_desktop_schemas, makeWrapper +, spiceSupport ? true, spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null }: +assert spiceSupport -> + spice_gtk != null && spice_protocol != null && libcap != null && gdbm != null; + with stdenv.lib; let sourceInfo = rec { @@ -23,8 +27,14 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig intltool glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl - shared_mime_info libvirt libcap_ng yajl - ] ++ optional spiceSupport spice_gtk; + shared_mime_info libvirt libcap_ng yajl gsettings_desktop_schemas makeWrapper + ] ++ optionals spiceSupport [ spice_gtk spice_protocol libcap gdbm ]; + + postInstall = '' + for f in "$out"/bin/*; do + wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + done + ''; meta = { description = "A viewer for remote virtual machines"; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index cbdf13b21589..7f12d2fa8f8c 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,34 +1,36 @@ { stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext , libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel, lvm2 -, which, alsaLib, curl, libvpx, gawk -, xorriso, makeself, perl, pkgconfig +, which, alsaLib, curl, libvpx, gawk, nettools +, xorriso, makeself, perl, pkgconfig, nukeReferences , javaBindings ? false, jdk ? null , pythonBindings ? false, python ? null , enableExtensionPack ? false, requireFile ? null, patchelf ? null, fakeroot ? null , pulseSupport ? false, pulseaudio ? null -, enableHardening ? true +, enableHardening ? false }: with stdenv.lib; let + buildType = "release"; version = "4.3.20"; # changes ./guest-additions as well forEachModule = action: '' for mod in \ - $sourcedir/out/linux.*/release/bin/src/vboxdrv \ - $sourcedir/out/linux.*/release/bin/src/vboxpci \ - $sourcedir/out/linux.*/release/bin/src/vboxnetadp \ - $sourcedir/out/linux.*/release/bin/src/vboxnetflt + out/linux.*/${buildType}/bin/src/vboxdrv \ + out/linux.*/${buildType}/bin/src/vboxpci \ + out/linux.*/${buildType}/bin/src/vboxnetadp \ + out/linux.*/${buildType}/bin/src/vboxnetflt do if [ "x$(basename "$mod")" != xvboxdrv -a ! -e "$mod/Module.symvers" ] then - cp -v $sourcedir/out/linux.*/release/bin/src/vboxdrv/Module.symvers \ - "$mod/Module.symvers" + cp -v out/linux.*/${buildType}/bin/src/vboxdrv/Module.symvers \ + "$mod/Module.symvers" fi INSTALL_MOD_PATH="$out" INSTALL_MOD_DIR=misc \ - make -C "$MODULES_BUILD_DIR" "M=$mod" DEPMOD=/do_not_use_depmod ${action} + make -C "$MODULES_BUILD_DIR" DEPMOD=/do_not_use_depmod \ + "M=\$(PWD)/$mod" BUILD_TYPE="${buildType}" ${action} done ''; @@ -64,7 +66,7 @@ in stdenv.mkDerivation { buildInputs = [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL libcap glib lvm2 python alsaLib curl libvpx pam xorriso makeself perl - pkgconfig which libXmu ] + pkgconfig which libXmu nukeReferences ] ++ optional javaBindings jdk ++ optional pythonBindings python ++ optional pulseSupport pulseaudio; @@ -86,8 +88,12 @@ in stdenv.mkDerivation { patches = optional enableHardening ./hardened.patch; + postPatch = '' + sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ + src/apps/adpctl/VBoxNetAdpCtl.cpp + ''; + configurePhase = '' - sourcedir="$(pwd)" cat >> LocalConfig.kmk <<LOCAL_CONFIG VBOX_WITH_TESTCASES := VBOX_WITH_TESTSUITE := @@ -124,18 +130,18 @@ in stdenv.mkDerivation { buildPhase = '' source env.sh - kmk + kmk BUILD_TYPE="${buildType}" ${forEachModule "modules"} ''; installPhase = '' - libexec=$out/libexec/virtualbox - share=$out/share/virtualbox + libexec="$out/libexec/virtualbox" + share="${if enableHardening then "$out/share/virtualbox" else "$libexec"}" # Install VirtualBox files - cd out/linux.*/release/bin - mkdir -p $libexec - cp -av * $libexec + mkdir -p "$libexec" + find out/linux.*/${buildType}/bin -mindepth 1 -maxdepth 1 \ + -name src -o -exec cp -avt "$libexec" {} + # Install kernel modules ${forEachModule "modules_install"} @@ -168,6 +174,9 @@ in stdenv.mkDerivation { mkdir -p $out/share/icons/hicolor/$size/apps ln -s $libexec/icons/$size/*.png $out/share/icons/hicolor/$size/apps done + + # Get rid of a reference to linux.dev. + nuke-refs $out/lib/modules/*/misc/*.ko ''; passthru = { inherit version; /* for guest additions */ }; diff --git a/pkgs/applications/virtualization/virtualbox/hardened.patch b/pkgs/applications/virtualization/virtualbox/hardened.patch index a0184b68f079..aad9171b68e8 100644 --- a/pkgs/applications/virtualization/virtualbox/hardened.patch +++ b/pkgs/applications/virtualization/virtualbox/hardened.patch @@ -1,3 +1,64 @@ +diff --git a/include/iprt/mangling.h b/include/iprt/mangling.h +index 70c596a..78972ed 100644 +--- a/include/iprt/mangling.h ++++ b/include/iprt/mangling.h +@@ -1068,6 +1068,7 @@ + # define RTPathStripSuffix RT_MANGLER(RTPathStripSuffix) + # define RTPathStripFilename RT_MANGLER(RTPathStripFilename) + # define RTPathStripTrailingSlash RT_MANGLER(RTPathStripTrailingSlash) ++# define RTPathSuidDir RT_MANGLER(RTPathSuidDir) + # define RTPathTemp RT_MANGLER(RTPathTemp) + # define RTPathTraverseList RT_MANGLER(RTPathTraverseList) + # define RTPathUnlink RT_MANGLER(RTPathUnlink) +@@ -1105,6 +1106,7 @@ + # define RTProcGetAffinityMask RT_MANGLER(RTProcGetAffinityMask) + # define RTProcGetExecutablePath RT_MANGLER(RTProcGetExecutablePath) + # define RTProcGetPriority RT_MANGLER(RTProcGetPriority) ++# define RTProcGetSuidPath RT_MANGLER(RTProcGetSuidPath) + # define RTProcIsRunningByName RT_MANGLER(RTProcIsRunningByName) + # define RTProcQueryParent RT_MANGLER(RTProcQueryParent) + # define RTProcQueryUsername RT_MANGLER(RTProcQueryUsername) +diff --git a/include/iprt/path.h b/include/iprt/path.h +index 7e42754..b4de4c8 100644 +--- a/include/iprt/path.h ++++ b/include/iprt/path.h +@@ -1049,6 +1049,15 @@ RTDECL(int) RTPathCalcRelative(char *pszPathDst, size_t cbPathDst, + RTDECL(int) RTPathExecDir(char *pszPath, size_t cchPath); + + /** ++ * Gets the path to the NixOS setuid wrappers directory. ++ * ++ * @returns iprt status code. ++ * @param pszPath Buffer where to store the path. ++ * @param cchPath Buffer size in bytes. ++ */ ++RTDECL(int) RTPathSuidDir(char *pszPath, size_t cchPath); ++ ++/** + * Gets the user home directory. + * + * @returns iprt status code. +diff --git a/include/iprt/process.h b/include/iprt/process.h +index 2760306..0ce6c92 100644 +--- a/include/iprt/process.h ++++ b/include/iprt/process.h +@@ -313,6 +313,16 @@ RTR3DECL(const char *) RTProcShortName(void); + RTR3DECL(char *) RTProcGetExecutablePath(char *pszExecPath, size_t cbExecPath); + + /** ++ * Gets the path to the NixOS setuid wrappers directory. ++ * ++ * @returns pszExecPath on success. NULL on buffer overflow or other errors. ++ * ++ * @param pszExecPath Where to store the path. ++ * @param cbExecPath The size of the buffer. ++ */ ++RTR3DECL(char *) RTProcGetSuidPath(char *pszExecPath, size_t cbExecPath); ++ ++/** + * Daemonize the current process, making it a background process. + * + * The way this work is that it will spawn a detached / backgrounded / diff --git a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp b/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp index c39d2f7..cd19186 100644 --- a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp @@ -37,3 +98,108 @@ index 95dc9a7..39170bc 100644 size_t cchBufLeft = strlen(szPath); szPath[cchBufLeft++] = RTPATH_DELIMITER; szPath[cchBufLeft] = 0; +diff --git a/src/VBox/Main/src-server/NATNetworkServiceRunner.cpp b/src/VBox/Main/src-server/NATNetworkServiceRunner.cpp +index 090018e..7dcfc7a 100644 +--- a/src/VBox/Main/src-server/NATNetworkServiceRunner.cpp ++++ b/src/VBox/Main/src-server/NATNetworkServiceRunner.cpp +@@ -75,7 +75,7 @@ int NATNetworkServiceRunner::start() + + /* get the path to the executable */ + char exePathBuf[RTPATH_MAX]; +- const char *exePath = RTProcGetExecutablePath(exePathBuf, RTPATH_MAX); ++ const char *exePath = RTProcGetSuidPath(exePathBuf, RTPATH_MAX); + char *substrSl = strrchr(exePathBuf, '/'); + char *substrBs = strrchr(exePathBuf, '\\'); + char *suffix = substrSl ? substrSl : substrBs; +diff --git a/src/VBox/Main/src-server/NetworkServiceRunner.cpp b/src/VBox/Main/src-server/NetworkServiceRunner.cpp +index e9e1ba62..4d1c1e1 100644 +--- a/src/VBox/Main/src-server/NetworkServiceRunner.cpp ++++ b/src/VBox/Main/src-server/NetworkServiceRunner.cpp +@@ -79,7 +79,7 @@ int NetworkServiceRunner::start() + + /* get the path to the executable */ + char exePathBuf[RTPATH_MAX]; +- const char *exePath = RTProcGetExecutablePath(exePathBuf, RTPATH_MAX); ++ const char *exePath = RTProcGetSuidPath(exePathBuf, RTPATH_MAX); + char *substrSl = strrchr(exePathBuf, '/'); + char *substrBs = strrchr(exePathBuf, '\\'); + char *suffix = substrSl ? substrSl : substrBs; +diff --git a/src/VBox/Main/src-server/generic/NetIf-generic.cpp b/src/VBox/Main/src-server/generic/NetIf-generic.cpp +index 8559d2a..2177f27 100644 +--- a/src/VBox/Main/src-server/generic/NetIf-generic.cpp ++++ b/src/VBox/Main/src-server/generic/NetIf-generic.cpp +@@ -47,7 +47,7 @@ static int NetIfAdpCtl(const char * pcszIfName, const char *pszAddr, const char + const char *args[] = { NULL, pcszIfName, pszAddr, pszOption, pszMask, NULL }; + + char szAdpCtl[RTPATH_MAX]; +- int rc = RTPathExecDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME)); ++ int rc = RTPathSuidDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME)); + if (RT_FAILURE(rc)) + { + LogRel(("NetIfAdpCtl: failed to get program path, rc=%Rrc.\n", rc)); +@@ -90,7 +90,7 @@ static int NetIfAdpCtl(HostNetworkInterface * pIf, const char *pszAddr, const ch + int NetIfAdpCtlOut(const char * pcszName, const char * pcszCmd, char *pszBuffer, size_t cBufSize) + { + char szAdpCtl[RTPATH_MAX]; +- int rc = RTPathExecDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME " ") - strlen(pcszCmd)); ++ int rc = RTPathSuidDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME " ") - strlen(pcszCmd)); + if (RT_FAILURE(rc)) + { + LogRel(("NetIfAdpCtlOut: Failed to get program path, rc=%Rrc\n", rc)); +@@ -202,7 +202,7 @@ int NetIfCreateHostOnlyNetworkInterface(VirtualBox *pVirtualBox, + progress.queryInterfaceTo(aProgress); + + char szAdpCtl[RTPATH_MAX]; +- int rc = RTPathExecDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME " add")); ++ int rc = RTPathSuidDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME " add")); + if (RT_FAILURE(rc)) + { + progress->i_notifyComplete(E_FAIL, +diff --git a/src/VBox/Runtime/r3/path.cpp b/src/VBox/Runtime/r3/path.cpp +index be2ad8f..7ddf105 100644 +--- a/src/VBox/Runtime/r3/path.cpp ++++ b/src/VBox/Runtime/r3/path.cpp +@@ -81,6 +81,12 @@ RTDECL(int) RTPathExecDir(char *pszPath, size_t cchPath) + } + + ++RTDECL(int) RTPathSuidDir(char *pszPath, size_t cchPath) ++{ ++ return RTStrCopy(pszPath, cchPath, "/var/setuid-wrappers"); ++} ++ ++ + RTDECL(int) RTPathAppPrivateNoArch(char *pszPath, size_t cchPath) + { + #if !defined(RT_OS_WINDOWS) && defined(RTPATH_APP_PRIVATE) +diff --git a/src/VBox/Runtime/r3/process.cpp b/src/VBox/Runtime/r3/process.cpp +index 7bde6af..2656cae 100644 +--- a/src/VBox/Runtime/r3/process.cpp ++++ b/src/VBox/Runtime/r3/process.cpp +@@ -111,6 +111,26 @@ RTR3DECL(char *) RTProcGetExecutablePath(char *pszExecPath, size_t cbExecPath) + return NULL; + } + ++/* ++ * Note the / at the end! This is important, because the functions using this ++ * will cut off everything after the rightmost / as this function is analogous ++ * to RTProcGetExecutablePath(). ++ */ ++#define SUIDDIR "/var/setuid-wrappers/" ++ ++RTR3DECL(char *) RTProcGetSuidPath(char *pszExecPath, size_t cbExecPath) ++{ ++ if (cbExecPath >= sizeof(SUIDDIR)) ++ { ++ memcpy(pszExecPath, SUIDDIR, sizeof(SUIDDIR)); ++ pszExecPath[sizeof(SUIDDIR)] = '\0'; ++ return pszExecPath; ++ } ++ ++ AssertMsgFailed(("Buffer too small (%zu <= %zu)\n", cbExecPath, sizeof(SUIDDIR))); ++ return NULL; ++} ++ + + RTR3DECL(const char *) RTProcShortName(void) + { diff --git a/pkgs/applications/window-managers/awesome/3.4.nix b/pkgs/applications/window-managers/awesome/3.4.nix index 3db2bde6540d..961296c6eecf 100644 --- a/pkgs/applications/window-managers/awesome/3.4.nix +++ b/pkgs/applications/window-managers/awesome/3.4.nix @@ -47,4 +47,9 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; + + passthru = { + inherit lua; + }; + } diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 713ca591578d..20cd15abf1cb 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, lua, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf +{ stdenv, fetchurl, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf , xlibs, libstartup_notification, libxdg_basedir, libpthreadstubs -, xcb-util-cursor, lgi, makeWrapper, pango, gobjectIntrospection, unclutter +, xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, rxvt_unicode , which, dbus, nettools, git, asciidoc, doxygen, xmlto, docbook_xml_dtd_45 , docbook_xsl }: let version = "3.5.5"; -in +in with luaPackages; stdenv.mkDerivation rec { name = "awesome-${version}"; @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { dbus doxygen gdk_pixbuf + gobjectIntrospection git imagemagick lgi @@ -60,18 +61,22 @@ stdenv.mkDerivation rec { LD_LIBRARY_PATH = "${cairo}/lib:${pango}/lib:${gobjectIntrospection}/lib"; GI_TYPELIB_PATH = "${pango}/lib/girepository-1.0"; - LUA_CPATH = "${lgi}/lib/lua/5.1/?.so"; - LUA_PATH = "${lgi}/share/lua/5.1/?.lua;${lgi}/share/lua/5.1/lgi/?.lua"; + LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so"; + LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"; postInstall = '' wrapProgram $out/bin/awesome \ - --set LUA_CPATH '"${lgi}/lib/lua/5.1/?.so"' \ - --set LUA_PATH '"${lgi}/share/lua/5.1/?.lua;${lgi}/share/lua/5.1/lgi/?.lua"' \ - --set GI_TYPELIB_PATH "${pango}/lib/girepository-1.0" \ + --prefix LUA_CPATH ";" '"${lgi}/lib/lua/${lua.luaversion}/?.so"' \ + --prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix LD_LIBRARY_PATH : "${cairo}/lib:${pango}/lib:${gobjectIntrospection}/lib" \ --prefix PATH : "${compton}/bin:${unclutter}/bin:${procps}/bin:${iproute}/sbin:${coreutils}/bin:${curl}/bin:${alsaUtils}/bin:${findutils}/bin:${rxvt_unicode}/bin" wrapProgram $out/bin/awesome-client \ --prefix PATH : "${which}/bin" ''; + + passthru = { + inherit lua; + }; } diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index 0b36d922df4c..c17107ae97b8 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "A tiling window manager based on binary space partitioning"; homepage = http://github.com/baskerville/bspwm; maintainers = [ stdenv.lib.maintainers.meisternu ]; - license = "BSD"; + license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix index b73d636aaa58..b8e342fb5d12 100644 --- a/pkgs/applications/window-managers/compiz/default.nix +++ b/pkgs/applications/window-managers/compiz/default.nix @@ -15,11 +15,11 @@ let s = # Generated upstream information rec { baseName="compiz"; - version="0.9.11.2"; + version="0.9.12.0"; name="${baseName}-${version}"; - hash="1czk4snv9j9l7b587nwf2y305lkn112zspm7f9l7yfk7jmkx1hqy"; - url="https://launchpad.net/compiz/0.9.11/0.9.11.2/+download/compiz-0.9.11.2.tar.bz2"; - sha256="1czk4snv9j9l7b587nwf2y305lkn112zspm7f9l7yfk7jmkx1hqy"; + hash="1n7y413bkykcby9imgmj5f1nbjfjc0hnbwmdkq2n77d4kv1rilxr"; + url="https://launchpad.net/compiz/0.9.12/0.9.12.0/+download/compiz-0.9.12.0.tar.bz2"; + sha256="1n7y413bkykcby9imgmj5f1nbjfjc0hnbwmdkq2n77d4kv1rilxr"; }; buildInputs = [cmake pkgconfig libXrender renderproto gtk libwnck pango cairo diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index 7c4cb4934c9f..c4b265f4b41a 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A manual tiling window manager for X"; homepage = "http://herbstluftwm.org/"; - license = "BSD"; # Simplified BSD License + license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix index 03563a4f8121..af368d0a0425 100644 --- a/pkgs/applications/window-managers/sxhkd/default.nix +++ b/pkgs/applications/window-managers/sxhkd/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple X hotkey daemon"; homepage = "http://github.com/baskerville/sxhkd"; - license = "BSD"; + license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 6284655e5e97..9641378f0185 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -426,4 +426,9 @@ rec { http://sagemath.org/src-old/ ]; + # MySQL mirrors + mysql = [ + http://mysql.mirrors.pair.com/Downloads/ + http://cdn.mysql.com/Downloads/ + ]; } diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix index 12fb69ba8efd..dd927ed83633 100644 --- a/pkgs/build-support/fetchzip/default.nix +++ b/pkgs/build-support/fetchzip/default.nix @@ -12,7 +12,7 @@ , url , ... } @ args: -fetchurl ({ +lib.overrideDerivation (fetchurl ({ name = args.name or (baseNameOf url); recursiveHash = true; @@ -39,4 +39,6 @@ fetchurl ({ mv $out/$fn/* "$out/" rmdir "$out/$fn" ''; -} // args) +} // args)) +# Hackety-hack: we actually need unzip hooks, too +(x: {nativeBuildInputs = x.nativeBuildInputs++ [unzip];}) diff --git a/pkgs/build-support/gcc-wrapper-old/add-flags b/pkgs/build-support/gcc-wrapper-old/add-flags new file mode 100644 index 000000000000..26e536f6d575 --- /dev/null +++ b/pkgs/build-support/gcc-wrapper-old/add-flags @@ -0,0 +1,28 @@ +# `-B@out@/bin' forces gcc to use ld-wrapper.sh when calling ld. +export NIX_CFLAGS_COMPILE="-B@out@/bin/ $NIX_CFLAGS_COMPILE" + +if test -e @out@/nix-support/libc-cflags; then + export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE" +fi + +if test -e @out@/nix-support/gcc-cflags; then + export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/gcc-cflags) $NIX_CFLAGS_COMPILE" +fi + +if test -e @out@/nix-support/gnat-cflags; then + export NIX_GNATFLAGS_COMPILE="$(cat @out@/nix-support/gnat-cflags) $NIX_GNATFLAGS_COMPILE" +fi + +if test -e @out@/nix-support/libc-ldflags; then + export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/libc-ldflags)" +fi + +if test -e @out@/nix-support/gcc-ldflags; then + export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/gcc-ldflags)" +fi + +if test -e @out@/nix-support/libc-ldflags-before; then + export NIX_LDFLAGS_BEFORE="$(cat @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE" +fi + +export NIX_GCC_WRAPPER_FLAGS_SET=1 diff --git a/pkgs/build-support/gcc-wrapper-old/builder.sh b/pkgs/build-support/gcc-wrapper-old/builder.sh new file mode 100644 index 000000000000..c79680712ee7 --- /dev/null +++ b/pkgs/build-support/gcc-wrapper-old/builder.sh @@ -0,0 +1,214 @@ +source $stdenv/setup + + +mkdir -p $out/bin +mkdir -p $out/nix-support + + +if test -z "$nativeLibc"; then + dynamicLinker="$libc/lib/$dynamicLinker" + echo $dynamicLinker > $out/nix-support/dynamic-linker + + if test -e $libc/lib/32/ld-linux.so.2; then + echo $libc/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 + fi + + # The "-B$libc/lib/" flag is a quick hack to force gcc to link + # against the crt1.o from our own glibc, rather than the one in + # /usr/lib. (This is only an issue when using an `impure' + # compiler/linker, i.e., one that searches /usr/lib and so on.) + # + # Unfortunately, setting -B appears to override the default search + # path. Thus, the gcc-specific "../includes-fixed" directory is + # now longer searched and glibc's <limits.h> header fails to + # compile, because it uses "#include_next <limits.h>" to find the + # limits.h file in ../includes-fixed. To remedy the problem, + # another -idirafter is necessary to add that directory again. + echo "-B$libc/lib/ -idirafter $libc/include -idirafter $gcc/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags + + echo "-L$libc/lib" > $out/nix-support/libc-ldflags + + # The dynamic linker is passed in `ldflagsBefore' to allow + # explicit overrides of the dynamic linker by callers to gcc/ld + # (the *last* value counts, so ours should come first). + echo "-dynamic-linker" $dynamicLinker > $out/nix-support/libc-ldflags-before +fi + +if test -n "$nativeTools"; then + gccPath="$nativePrefix/bin" + ldPath="$nativePrefix/bin" +else + if test -e "$gcc/lib64"; then + gccLDFlags="$gccLDFlags -L$gcc/lib64" + fi + gccLDFlags="$gccLDFlags -L$gcc/lib" + if [ -n "$langVhdl" ]; then + gccLDFlags="$gccLDFlags -L$zlib/lib" + fi + echo "$gccLDFlags" > $out/nix-support/gcc-ldflags + + # GCC shows $gcc/lib in `gcc -print-search-dirs', but not + # $gcc/lib64 (even though it does actually search there...).. + # This confuses libtool. So add it to the compiler tool search + # path explicitly. + if test -e "$gcc/lib64"; then + gccCFlags="$gccCFlags -B$gcc/lib64" + fi + + # Find the gcc libraries path (may work only without multilib) + if [ -n "$langAda" ]; then + basePath=`echo $gcc/lib/*/*/*` + gccCFlags="$gccCFlags -B$basePath -I$basePath/adainclude" + + gnatCFlags="-aI$basePath/adainclude -aO$basePath/adalib" + echo "$gnatCFlags" > $out/nix-support/gnat-cflags + fi + echo "$gccCFlags" > $out/nix-support/gcc-cflags + + gccPath="$gcc/bin" + # On Illumos/Solaris we might prefer native ld + if test -n "$nativePrefix"; then + ldPath="$nativePrefix/bin" + else + ldPath="$binutils/bin" + fi; +fi + + +doSubstitute() { + local src=$1 + local dst=$2 + local ld="$ldPath/ld" + if $ld -V 2>&1 |grep Solaris; then + # Use Solaris specific linker wrapper + ld="$out/bin/ld-solaris" + fi + # Can't use substitute() here, because replace may not have been + # built yet (in the bootstrap). + sed \ + -e "s^@out@^$out^g" \ + -e "s^@shell@^$shell^g" \ + -e "s^@gcc@^$gcc^g" \ + -e "s^@gccProg@^$gccProg^g" \ + -e "s^@gnatProg@^$gnatProg^g" \ + -e "s^@gnatlinkProg@^$gnatlinkProg^g" \ + -e "s^@binutils@^$binutils^g" \ + -e "s^@coreutils@^$coreutils^g" \ + -e "s^@libc@^$libc^g" \ + -e "s^@ld@^$ld^g" \ + < "$src" > "$dst" +} + + +# Make wrapper scripts around gcc, g++, and gfortran. Also make symlinks +# cc, c++, and f77. +mkGccWrapper() { + local dst=$1 + local src=$2 + + if ! test -f "$src"; then + echo "$src does not exist (skipping)" + return 1 + fi + + gccProg="$src" + doSubstitute "$gccWrapper" "$dst" + chmod +x "$dst" +} + +mkGnatWrapper() { + local dst=$1 + local src=$2 + + if ! test -f "$src"; then + echo "$src does not exist (skipping)" + return 1 + fi + + gnatProg="$src" + doSubstitute "$gnatWrapper" "$dst" + chmod +x "$dst" +} + +mkGnatLinkWrapper() { + local dst=$1 + local src=$2 + + if ! test -f "$src"; then + echo "$src does not exist (skipping)" + return 1 + fi + + gnatlinkProg="$src" + doSubstitute "$gnatlinkWrapper" "$dst" + chmod +x "$dst" +} + +if mkGccWrapper $out/bin/gcc $gccPath/gcc +then + ln -sv gcc $out/bin/cc +fi + +if mkGccWrapper $out/bin/g++ $gccPath/g++ +then + ln -sv g++ $out/bin/c++ +fi + +mkGccWrapper $out/bin/cpp $gccPath/cpp || true + +if mkGccWrapper $out/bin/gfortran $gccPath/gfortran +then + ln -sv gfortran $out/bin/g77 + ln -sv gfortran $out/bin/f77 +fi + +mkGccWrapper $out/bin/gcj $gccPath/gcj || true + +mkGccWrapper $out/bin/gccgo $gccPath/gccgo || true + +mkGccWrapper $out/bin/gnatgcc $gccPath/gnatgcc || true +mkGnatWrapper $out/bin/gnatmake $gccPath/gnatmake || true +mkGnatWrapper $out/bin/gnatbind $gccPath/gnatbind || true +mkGnatLinkWrapper $out/bin/gnatlink $gccPath/gnatlink || true + +if [ -f $gccPath/ghdl ]; then + ln -sf $gccPath/ghdl $out/bin/ghdl +fi + + +# Create a symlink to as (the assembler). This is useful when a +# gcc-wrapper is installed in a user environment, as it ensures that +# the right assembler is called. +ln -s $ldPath/as $out/bin/as + + +# Make a wrapper around the linker. +doSubstitute "$ldWrapper" "$out/bin/ld" +chmod +x "$out/bin/ld" + +# Copy solaris ld wrapper if needed +if $ldPath/ld -V 2>&1 |grep Solaris; then + # Use Solaris specific linker wrapper + sed -e "s^@ld@^$ldPath/ld^g" < "$ldSolarisWrapper" > "$out/bin/ld-solaris" + chmod +x "$out/bin/ld-solaris" +fi + + +# Emit a setup hook. Also store the path to the original GCC and +# Glibc. +test -n "$gcc" && echo $gcc > $out/nix-support/orig-gcc +test -n "$libc" && echo $libc > $out/nix-support/orig-libc + +doSubstitute "$addFlags" "$out/nix-support/add-flags.sh" + +doSubstitute "$setupHook" "$out/nix-support/setup-hook" + +cp -p $utils $out/nix-support/utils.sh + + +# Propagate the wrapped gcc so that if you install the wrapper, you get +# tools like gcov, the manpages, etc. as well (including for binutils +# and Glibc). +if test -z "$nativeTools"; then + echo $gcc $binutils $libc > $out/nix-support/propagated-user-env-packages +fi diff --git a/pkgs/build-support/gcc-wrapper-old/default.nix b/pkgs/build-support/gcc-wrapper-old/default.nix new file mode 100644 index 000000000000..8e8b0b909454 --- /dev/null +++ b/pkgs/build-support/gcc-wrapper-old/default.nix @@ -0,0 +1,97 @@ +# The Nix `gcc' stdenv.mkDerivation is not directly usable, since it doesn't +# know where the C library and standard header files are. Therefore +# the compiler produced by that package cannot be installed directly +# in a user environment and used from the command line. This +# stdenv.mkDerivation provides a wrapper that sets up the right environment +# variables so that the compiler and the linker just "work". + +{ name ? "", stdenv, nativeTools, nativeLibc, nativePrefix ? "" +, gcc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? "" +, zlib ? null +}: + +assert nativeTools -> nativePrefix != ""; +assert !nativeTools -> gcc != null && binutils != null && coreutils != null; +assert !nativeLibc -> libc != null; + +# For ghdl (the vhdl language provider to gcc) we need zlib in the wrapper +assert (gcc != null && gcc ? langVhdl && gcc.langVhdl) -> zlib != null; + +let + + gccVersion = (builtins.parseDrvName gcc.name).version; + gccName = (builtins.parseDrvName gcc.name).name; + + langGo = if nativeTools then false else gcc ? langGo && gcc.langGo; +in + +stdenv.mkDerivation { + name = + (if name != "" then name else gccName + "-wrapper") + + (if gcc != null && gccVersion != "" then "-" + gccVersion else ""); + + builder = ./builder.sh; + setupHook = ./setup-hook.sh; + gccWrapper = ./gcc-wrapper.sh; + gnatWrapper = ./gnat-wrapper.sh; + gnatlinkWrapper = ./gnatlink-wrapper.sh; + ldWrapper = ./ld-wrapper.sh; + ldSolarisWrapper = ./ld-solaris-wrapper.sh; + utils = ./utils.sh; + addFlags = ./add-flags; + + inherit nativeTools nativeLibc nativePrefix gcc; + libc = if nativeLibc then null else libc; + binutils = if nativeTools then null else binutils; + # The wrapper scripts use 'cat', so we may need coreutils + coreutils = if nativeTools then null else coreutils; + + langC = if nativeTools then true else gcc.langC; + langCC = if nativeTools then true else gcc.langCC; + langFortran = if nativeTools then false else gcc ? langFortran; + langAda = if nativeTools then false else gcc ? langAda && gcc.langAda; + langVhdl = if nativeTools then false else gcc ? langVhdl && gcc.langVhdl; + zlib = if gcc != null && gcc ? langVhdl then zlib else null; + shell = if shell == "" then stdenv.shell else + if builtins.isAttrs shell then (shell + shell.shellPath) + else shell; + + crossAttrs = { + shell = shell.crossDrv + shell.crossDrv.shellPath; + libc = stdenv.gccCross.libc; + coreutils = coreutils.crossDrv; + binutils = binutils.crossDrv; + gcc = gcc.crossDrv; + # + # This is not the best way to do this. I think the reference should be + # the style in the gcc-cross-wrapper, but to keep a stable stdenv now I + # do this sufficient if/else. + dynamicLinker = + (if stdenv.cross.arch == "arm" then "ld-linux.so.3" else + if stdenv.cross.arch == "mips" then "ld.so.1" else + if stdenv.lib.hasSuffix "pc-gnu" stdenv.cross.config then "ld.so.1" else + abort "don't know the name of the dynamic linker for this platform"); + }; + + preferLocalBuild = true; + + meta = + let gcc_ = if gcc != null then gcc else {}; in + (if gcc_ ? meta then removeAttrs gcc.meta ["priority"] else {}) // + { description = + stdenv.lib.attrByPath ["meta" "description"] "System C compiler" gcc_ + + " (wrapper script)"; + }; + + # The dynamic linker has different names on different Linux platforms. + dynamicLinker = + if !nativeLibc then + (if stdenv.system == "i686-linux" then "ld-linux.so.2" else + if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else + # ARM with a wildcard, which can be "" or "-armhf". + if stdenv.isArm then "ld-linux*.so.3" else + if stdenv.system == "powerpc-linux" then "ld.so.1" else + if stdenv.system == "mips64el-linux" then "ld.so.1" else + abort "don't know the name of the dynamic linker for this platform") + else ""; +} diff --git a/pkgs/build-support/gcc-wrapper-old/gcc-wrapper-old.sh b/pkgs/build-support/gcc-wrapper-old/gcc-wrapper-old.sh new file mode 100644 index 000000000000..ac6312a25cac --- /dev/null +++ b/pkgs/build-support/gcc-wrapper-old/gcc-wrapper-old.sh @@ -0,0 +1,146 @@ +#! @shell@ -e + +if [ -n "$NIX_GCC_WRAPPER_START_HOOK" ]; then + source "$NIX_GCC_WRAPPER_START_HOOK" +fi + +if [ -z "$NIX_GCC_WRAPPER_FLAGS_SET" ]; then + source @out@/nix-support/add-flags.sh +fi + +source @out@/nix-support/utils.sh + + +# Figure out if linker flags should be passed. GCC prints annoying +# warnings when they are not needed. +dontLink=0 +getVersion=0 +nonFlagArgs=0 + +for i in "$@"; do + if [ "$i" = -c ]; then + dontLink=1 + elif [ "$i" = -S ]; then + dontLink=1 + elif [ "$i" = -E ]; then + dontLink=1 + elif [ "$i" = -E ]; then + dontLink=1 + elif [ "$i" = -M ]; then + dontLink=1 + elif [ "$i" = -MM ]; then + dontLink=1 + elif [ "$i" = -x ]; then + # At least for the cases c-header or c++-header we should set dontLink. + # I expect no one use -x other than making precompiled headers. + dontLink=1 + elif [ "${i:0:1}" != - ]; then + nonFlagArgs=1 + elif [ "$i" = -m32 ]; then + if [ -e @out@/nix-support/dynamic-linker-m32 ]; then + NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)" + fi + fi +done + +# If we pass a flag like -Wl, then gcc will call the linker unless it +# can figure out that it has to do something else (e.g., because of a +# "-c" flag). So if no non-flag arguments are given, don't pass any +# linker flags. This catches cases like "gcc" (should just print +# "gcc: no input files") and "gcc -v" (should print the version). +if [ "$nonFlagArgs" = 0 ]; then + dontLink=1 +fi + + +# Optionally filter out paths not refering to the store. +params=("$@") +if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" ]; then + rest=() + n=0 + while [ $n -lt ${#params[*]} ]; do + p=${params[n]} + p2=${params[$((n+1))]} + if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then + skip $p + elif [ "$p" = -L ] && badPath "$p2"; then + n=$((n + 1)); skip $p2 + elif [ "${p:0:3}" = -I/ ] && badPath "${p:2}"; then + skip $p + elif [ "$p" = -I ] && badPath "$p2"; then + n=$((n + 1)); skip $p2 + elif [ "$p" = -isystem ] && badPath "$p2"; then + n=$((n + 1)); skip $p2 + else + rest=("${rest[@]}" "$p") + fi + n=$((n + 1)) + done + params=("${rest[@]}") +fi + + +# Add the flags for the C compiler proper. +extraAfter=($NIX_CFLAGS_COMPILE) +extraBefore=() + +# When enforcing purity, pretend gcc can't find the current date and +# time +if [ "$NIX_ENFORCE_PURITY" = 1 ]; then + extraAfter+=('-D__DATE__="Jan 01 1970"' + '-D__TIME__="00:00:01"' + ) +fi + + +if [ "$dontLink" != 1 ]; then + + # Add the flags that should only be passed to the compiler when + # linking. + extraAfter+=($NIX_CFLAGS_LINK) + + # Add the flags that should be passed to the linker (and prevent + # `ld-wrapper' from adding NIX_LDFLAGS again). + for i in $NIX_LDFLAGS_BEFORE; do + extraBefore=(${extraBefore[@]} "-Wl,$i") + done + for i in $NIX_LDFLAGS; do + if [ "${i:0:3}" = -L/ ]; then + extraAfter+=("$i") + else + extraAfter+=("-Wl,$i") + fi + done + export NIX_LDFLAGS_SET=1 +fi + +# As a very special hack, if the arguments are just `-v', then don't +# add anything. This is to prevent `gcc -v' (which normally prints +# out the version number and returns exit code 0) from printing out +# `No input files specified' and returning exit code 1. +if [ "$*" = -v ]; then + extraAfter=() + extraBefore=() +fi + +# Optionally print debug info. +if [ -n "$NIX_DEBUG" ]; then + echo "original flags to @prog@:" >&2 + for i in "${params[@]}"; do + echo " $i" >&2 + done + echo "extraBefore flags to @prog@:" >&2 + for i in ${extraBefore[@]}; do + echo " $i" >&2 + done + echo "extraAfter flags to @prog@:" >&2 + for i in ${extraAfter[@]}; do + echo " $i" >&2 + done +fi + +if [ -n "$NIX_GCC_WRAPPER_EXEC_HOOK" ]; then + source "$NIX_GCC_WRAPPER_EXEC_HOOK" +fi + +exec @prog@ ${extraBefore[@]} "${params[@]}" "${extraAfter[@]}" diff --git a/pkgs/build-support/gcc-wrapper-old/gcc-wrapper.sh b/pkgs/build-support/gcc-wrapper-old/gcc-wrapper.sh new file mode 100644 index 000000000000..2ad7783a442c --- /dev/null +++ b/pkgs/build-support/gcc-wrapper-old/gcc-wrapper.sh @@ -0,0 +1,147 @@ +#! @shell@ -e + +if test -n "$NIX_GCC_WRAPPER_START_HOOK"; then + source "$NIX_GCC_WRAPPER_START_HOOK" +fi + +if test -z "$NIX_GCC_WRAPPER_FLAGS_SET"; then + source @out@/nix-support/add-flags.sh +fi + +source @out@/nix-support/utils.sh + + +# Figure out if linker flags should be passed. GCC prints annoying +# warnings when they are not needed. +dontLink=0 +getVersion=0 +nonFlagArgs=0 + +for i in "$@"; do + if test "$i" = "-c"; then + dontLink=1 + elif test "$i" = "-S"; then + dontLink=1 + elif test "$i" = "-E"; then + dontLink=1 + elif test "$i" = "-E"; then + dontLink=1 + elif test "$i" = "-M"; then + dontLink=1 + elif test "$i" = "-MM"; then + dontLink=1 + elif test "$i" = "-x"; then + # At least for the cases c-header or c++-header we should set dontLink. + # I expect no one use -x other than making precompiled headers. + dontLink=1 + elif test "${i:0:1}" != "-"; then + nonFlagArgs=1 + elif test "$i" = "-m32"; then + if test -e @out@/nix-support/dynamic-linker-m32; then + NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)" + fi + fi +done + +# If we pass a flag like -Wl, then gcc will call the linker unless it +# can figure out that it has to do something else (e.g., because of a +# "-c" flag). So if no non-flag arguments are given, don't pass any +# linker flags. This catches cases like "gcc" (should just print +# "gcc: no input files") and "gcc -v" (should print the version). +if test "$nonFlagArgs" = "0"; then + dontLink=1 +fi + + +# Optionally filter out paths not refering to the store. +params=("$@") +if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then + rest=() + n=0 + while test $n -lt ${#params[*]}; do + p=${params[n]} + p2=${params[$((n+1))]} + if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then + skip $p + elif test "$p" = "-L" && badPath "$p2"; then + n=$((n + 1)); skip $p2 + elif test "${p:0:3}" = "-I/" && badPath "${p:2}"; then + skip $p + elif test "$p" = "-I" && badPath "$p2"; then + n=$((n + 1)); skip $p2 + elif test "$p" = "-isystem" && badPath "$p2"; then + n=$((n + 1)); skip $p2 + else + rest=("${rest[@]}" "$p") + fi + n=$((n + 1)) + done + params=("${rest[@]}") +fi + + +# Add the flags for the C compiler proper. +extraAfter=($NIX_CFLAGS_COMPILE) +extraBefore=() + +if test "$dontLink" != "1"; then + + # Add the flags that should only be passed to the compiler when + # linking. + extraAfter=(${extraAfter[@]} $NIX_CFLAGS_LINK) + + # Add the flags that should be passed to the linker (and prevent + # `ld-wrapper' from adding NIX_LDFLAGS again). + for i in $NIX_LDFLAGS_BEFORE; do + extraBefore=(${extraBefore[@]} "-Wl,$i") + done + for i in $NIX_LDFLAGS; do + if test "${i:0:3}" = "-L/"; then + extraAfter=(${extraAfter[@]} "$i") + else + extraAfter=(${extraAfter[@]} "-Wl,$i") + fi + done + export NIX_LDFLAGS_SET=1 +fi + +# As a very special hack, if the arguments are just `-v', then don't +# add anything. This is to prevent `gcc -v' (which normally prints +# out the version number and returns exit code 0) from printing out +# `No input files specified' and returning exit code 1. +if test "$*" = "-v"; then + extraAfter=() + extraBefore=() +fi + +# Optionally print debug info. +if test "$NIX_DEBUG" = "1"; then + echo "original flags to @gccProg@:" >&2 + for i in "${params[@]}"; do + echo " $i" >&2 + done + echo "extraBefore flags to @gccProg@:" >&2 + for i in ${extraBefore[@]}; do + echo " $i" >&2 + done + echo "extraAfter flags to @gccProg@:" >&2 + for i in ${extraAfter[@]}; do + echo " $i" >&2 + done +fi + +if test -n "$NIX_GCC_WRAPPER_EXEC_HOOK"; then + source "$NIX_GCC_WRAPPER_EXEC_HOOK" +fi + + +# Call the real `gcc'. Filter out warnings from stderr about unused +# `-B' flags, since they confuse some programs. Deep bash magic to +# apply grep to stderr (by swapping stdin/stderr twice). +if test -z "$NIX_GCC_NEEDS_GREP"; then + @gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} +else + (@gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} 3>&2 2>&1 1>&3- \ + | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3- + exit $? +fi diff --git a/pkgs/build-support/gcc-wrapper-old/gnat-wrapper.sh b/pkgs/build-support/gcc-wrapper-old/gnat-wrapper.sh new file mode 100644 index 000000000000..f6fa4b18400a --- /dev/null +++ b/pkgs/build-support/gcc-wrapper-old/gnat-wrapper.sh @@ -0,0 +1,113 @@ +#! @shell@ -e + +if test -n "$NIX_GNAT_WRAPPER_START_HOOK"; then + source "$NIX_GNAT_WRAPPER_START_HOOK" +fi + +if test -z "$NIX_GNAT_WRAPPER_FLAGS_SET"; then + source @out@/nix-support/add-flags.sh +fi + +source @out@/nix-support/utils.sh + + +# Figure out if linker flags should be passed. GCC prints annoying +# warnings when they are not needed. +dontLink=0 +getVersion=0 +nonFlagArgs=0 + +for i in "$@"; do + if test "$i" = "-c"; then + dontLink=1 + elif test "$i" = "-M"; then + dontLink=1 + elif test "${i:0:1}" != "-"; then + nonFlagArgs=1 + elif test "$i" = "-m32"; then + if test -e @out@/nix-support/dynamic-linker-m32; then + NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)" + fi + fi +done + +# If we pass a flag like -Wl, then gcc will call the linker unless it +# can figure out that it has to do something else (e.g., because of a +# "-c" flag). So if no non-flag arguments are given, don't pass any +# linker flags. This catches cases like "gcc" (should just print +# "gcc: no input files") and "gcc -v" (should print the version). +if test "$nonFlagArgs" = "0"; then + dontLink=1 +fi + + +# Optionally filter out paths not refering to the store. +params=("$@") +if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then + rest=() + n=0 + while test $n -lt ${#params[*]}; do + p=${params[n]} + p2=${params[$((n+1))]} + if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then + skip $p + elif test "${p:0:3}" = "-I/" && badPath "${p:2}"; then + skip $p + elif test "${p:0:4}" = "-aI/" && badPath "${p:3}"; then + skip $p + elif test "${p:0:4}" = "-aO/" && badPath "${p:3}"; then + skip $p + else + rest=("${rest[@]}" "$p") + fi + n=$((n + 1)) + done + params=("${rest[@]}") +fi + + +# Add the flags for the GNAT compiler proper. +extraAfter=($NIX_GNATFLAGS_COMPILE) +extraBefore=() + +if [ "`basename $0`x" = "gnatmakex" ]; then + extraBefore=("--GNATBIND=@out@/bin/gnatbind --GNATLINK=@out@/bin/gnatlink ") +fi + +# Add the flags that should be passed to the linker (and prevent +# `ld-wrapper' from adding NIX_LDFLAGS again). +#for i in $NIX_LDFLAGS_BEFORE; do +# extraBefore=(${extraBefore[@]} "-largs $i") +#done + +# Optionally print debug info. +if test "$NIX_DEBUG" = "1"; then + echo "original flags to @gnatProg@:" >&2 + for i in "${params[@]}"; do + echo " $i" >&2 + done + echo "extraBefore flags to @gnatProg@:" >&2 + for i in ${extraBefore[@]}; do + echo " $i" >&2 + done + echo "extraAfter flags to @gnatProg@:" >&2 + for i in ${extraAfter[@]}; do + echo " $i" >&2 + done +fi + +if test -n "$NIX_GNAT_WRAPPER_EXEC_HOOK"; then + source "$NIX_GNAT_WRAPPER_EXEC_HOOK" +fi + + +# Call the real `gcc'. Filter out warnings from stderr about unused +# `-B' flags, since they confuse some programs. Deep bash magic to +# apply grep to stderr (by swapping stdin/stderr twice). +if test -z "$NIX_GNAT_NEEDS_GREP"; then + @gnatProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} +else + (@gnatProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} 3>&2 2>&1 1>&3- \ + | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3- + exit $? +fi diff --git a/pkgs/build-support/gcc-wrapper-old/gnatlink-wrapper.sh b/pkgs/build-support/gcc-wrapper-old/gnatlink-wrapper.sh new file mode 100644 index 000000000000..25907108b4db --- /dev/null +++ b/pkgs/build-support/gcc-wrapper-old/gnatlink-wrapper.sh @@ -0,0 +1,43 @@ +#! @shell@ -e + +# Add the flags for the GNAT compiler proper. +extraAfter="--GCC=@out@/bin/gcc" +extraBefore=() + +# Add the flags that should be passed to the linker (and prevent +# `ld-wrapper' from adding NIX_LDFLAGS again). +#for i in $NIX_LDFLAGS_BEFORE; do +# extraBefore=(${extraBefore[@]} "-largs $i") +#done + +# Optionally print debug info. +if test "$NIX_DEBUG" = "1"; then + echo "original flags to @gnatlinkProg@:" >&2 + for i in "$@"; do + echo " $i" >&2 + done + echo "extraBefore flags to @gnatlinkProg@:" >&2 + for i in ${extraBefore[@]}; do + echo " $i" >&2 + done + echo "extraAfter flags to @gnatlinkProg@:" >&2 + for i in ${extraAfter[@]}; do + echo " $i" >&2 + done +fi + +if test -n "$NIX_GNAT_WRAPPER_EXEC_HOOK"; then + source "$NIX_GNAT_WRAPPER_EXEC_HOOK" +fi + + +# Call the real `gcc'. Filter out warnings from stderr about unused +# `-B' flags, since they confuse some programs. Deep bash magic to +# apply grep to stderr (by swapping stdin/stderr twice). +if test -z "$NIX_GNAT_NEEDS_GREP"; then + @gnatlinkProg@ ${extraBefore[@]} "$@" ${extraAfter[@]} +else + (@gnatlinkProg@ ${extraBefore[@]} "$@" ${extraAfter[@]} 3>&2 2>&1 1>&3- \ + | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3- + exit $? +fi diff --git a/pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh b/pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh new file mode 100644 index 000000000000..5a7b92b5ad7d --- /dev/null +++ b/pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh @@ -0,0 +1,40 @@ +#!/bin/bash + +set -e +set -u + +# I've also tried adding -z direct and -z lazyload, but it gave too many problems with C++ exceptions :'( +# Also made sure libgcc would not be lazy-loaded, as suggested here: https://www.illumos.org/issues/2534#note-3 +# but still no success. +cmd="@ld@ -z ignore" + +args=("$@"); + +# This loop makes sure all -L arguments are before -l arguments, or ld may complain it cannot find a library. +# GNU binutils does not have this problem: +# http://stackoverflow.com/questions/5817269/does-the-order-of-l-and-l-options-in-the-gnu-linker-matter +i=0; +while [[ $i -lt $# ]]; do + case "${args[$i]}" in + -L) cmd="$cmd ${args[$i]} ${args[($i+1)]}"; i=($i+1); ;; + -L*) cmd="$cmd ${args[$i]}" ;; + *) ;; + esac + i=($i+1); +done + +i=0; +while [[ $i -lt $# ]]; do + case "${args[$i]}" in + -L) i=($i+1); ;; + -L*) ;; + *) cmd="$cmd ${args[$i]}" ;; + esac + i=($i+1); +done + +# Trace: +set -x +exec $cmd + +exit 0 diff --git a/pkgs/build-support/gcc-wrapper-old/ld-wrapper.sh b/pkgs/build-support/gcc-wrapper-old/ld-wrapper.sh new file mode 100644 index 000000000000..822c4a03a218 --- /dev/null +++ b/pkgs/build-support/gcc-wrapper-old/ld-wrapper.sh @@ -0,0 +1,166 @@ +#! @shell@ -e + +if test -n "$NIX_LD_WRAPPER_START_HOOK"; then + source "$NIX_LD_WRAPPER_START_HOOK" +fi + +if test -z "$NIX_GCC_WRAPPER_FLAGS_SET"; then + source @out@/nix-support/add-flags.sh +fi + +source @out@/nix-support/utils.sh + + +# Optionally filter out paths not refering to the store. +params=("$@") +if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE" \ + -a \( -z "$NIX_IGNORE_LD_THROUGH_GCC" -o -z "$NIX_LDFLAGS_SET" \); then + rest=() + n=0 + while test $n -lt ${#params[*]}; do + p=${params[n]} + p2=${params[$((n+1))]} + if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then + skip $p + elif test "$p" = "-L" && badPath "$p2"; then + n=$((n + 1)); skip $p2 + elif test "$p" = "-rpath" && badPath "$p2"; then + n=$((n + 1)); skip $p2 + elif test "$p" = "-dynamic-linker" && badPath "$p2"; then + n=$((n + 1)); skip $p2 + elif test "${p:0:1}" = "/" && badPath "$p"; then + # We cannot skip this; barf. + echo "impure path \`$p' used in link" >&2 + exit 1 + elif test "${p:0:9}" = "--sysroot"; then + # Our ld is not built with sysroot support (Can we fix that?) + : + else + rest=("${rest[@]}" "$p") + fi + n=$((n + 1)) + done + params=("${rest[@]}") +fi + + +extra=() +extraBefore=() + +if test -z "$NIX_LDFLAGS_SET"; then + extra+=($NIX_LDFLAGS) + extraBefore+=($NIX_LDFLAGS_BEFORE) +fi + +extra+=($NIX_LDFLAGS_AFTER) + + +# Add all used dynamic libraries to the rpath. +if test "$NIX_DONT_SET_RPATH" != "1"; then + + libPath="" + addToLibPath() { + local path="$1" + if test "${path:0:1}" != "/"; then return 0; fi + case "$path" in + *..*|*./*|*/.*|*//*) + local path2 + if path2=$(readlink -f "$path"); then + path="$path2" + fi + ;; + esac + case $libPath in + *\ $path\ *) return 0 ;; + esac + libPath="$libPath $path " + } + + addToRPath() { + # If the path is not in the store, don't add it to the rpath. + # This typically happens for libraries in /tmp that are later + # copied to $out/lib. If not, we're screwed. + if test "${1:0:${#NIX_STORE}}" != "$NIX_STORE"; then return 0; fi + case $rpath in + *\ $1\ *) return 0 ;; + esac + rpath="$rpath $1 " + } + + libs="" + addToLibs() { + libs="$libs $1" + } + + rpath="" + + # First, find all -L... switches. + allParams=("${params[@]}" ${extra[@]}) + n=0 + while test $n -lt ${#allParams[*]}; do + p=${allParams[n]} + p2=${allParams[$((n+1))]} + if test "${p:0:3}" = "-L/"; then + addToLibPath ${p:2} + elif test "$p" = "-L"; then + addToLibPath ${p2} + n=$((n + 1)) + elif test "$p" = "-l"; then + addToLibs ${p2} + n=$((n + 1)) + elif test "${p:0:2}" = "-l"; then + addToLibs ${p:2} + elif test "$p" = "-dynamic-linker"; then + # Ignore the dynamic linker argument, or it + # will get into the next 'elif'. We don't want + # the dynamic linker path rpath to go always first. + n=$((n + 1)) + elif [[ "$p" =~ ^[^-].*\.so($|\.) ]]; then + # This is a direct reference to a shared library, so add + # its directory to the rpath. + path="$(dirname "$p")"; + addToRPath "${path}" + fi + n=$((n + 1)) + done + + # Second, for each directory in the library search path (-L...), + # see if it contains a dynamic library used by a -l... flag. If + # so, add the directory to the rpath. + # It's important to add the rpath in the order of -L..., so + # the link time chosen objects will be those of runtime linking. + + for i in $libPath; do + for j in $libs; do + if test -f "$i/lib$j.so"; then + addToRPath $i + break + fi + done + done + + + # Finally, add `-rpath' switches. + for i in $rpath; do + extra=(${extra[@]} -rpath $i) + done +fi + + +# Optionally print debug info. +if test "$NIX_DEBUG" = "1"; then + echo "original flags to @ld@:" >&2 + for i in "${params[@]}"; do + echo " $i" >&2 + done + echo "extra flags to @ld@:" >&2 + for i in ${extra[@]}; do + echo " $i" >&2 + done +fi + +if test -n "$NIX_LD_WRAPPER_EXEC_HOOK"; then + source "$NIX_LD_WRAPPER_EXEC_HOOK" +fi + +exec @ld@ ${extraBefore[@]} "${params[@]}" ${extra[@]} diff --git a/pkgs/build-support/gcc-wrapper-old/setup-hook.sh b/pkgs/build-support/gcc-wrapper-old/setup-hook.sh new file mode 100644 index 000000000000..298ade21d1f5 --- /dev/null +++ b/pkgs/build-support/gcc-wrapper-old/setup-hook.sh @@ -0,0 +1,33 @@ +addCVars () { + if test -d $1/include; then + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem $1/include" + fi + + if test -d $1/lib64; then + export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib64" + fi + + if test -d $1/lib; then + export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib" + fi +} + +envHooks=(${envHooks[@]} addCVars) + +# Note: these come *after* $out in the PATH (see setup.sh). + +if test -n "@gcc@"; then + addToSearchPath PATH @gcc@/bin +fi + +if test -n "@binutils@"; then + addToSearchPath PATH @binutils@/bin +fi + +if test -n "@libc@"; then + addToSearchPath PATH @libc@/bin +fi + +if test -n "@coreutils@"; then + addToSearchPath PATH @coreutils@/bin +fi diff --git a/pkgs/build-support/gcc-wrapper-old/utils.sh b/pkgs/build-support/gcc-wrapper-old/utils.sh new file mode 100644 index 000000000000..753b3772e956 --- /dev/null +++ b/pkgs/build-support/gcc-wrapper-old/utils.sh @@ -0,0 +1,24 @@ +skip () { + if test "$NIX_DEBUG" = "1"; then + echo "skipping impure path $1" >&2 + fi +} + + +# Checks whether a path is impure. E.g., `/lib/foo.so' is impure, but +# `/nix/store/.../lib/foo.so' isn't. +badPath() { + local p=$1 + + # Relative paths are okay (since they're presumably relative to + # the temporary build directory). + if test "${p:0:1}" != "/"; then return 1; fi + + # Otherwise, the path should refer to the store or some temporary + # directory (including the build directory). + test \ + "$p" != "/dev/null" -a \ + "${p:0:${#NIX_STORE}}" != "$NIX_STORE" -a \ + "${p:0:4}" != "/tmp" -a \ + "${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP" +} diff --git a/pkgs/build-support/setup-hooks/autoreconf.sh b/pkgs/build-support/setup-hooks/autoreconf.sh index f70a10870843..441d6b43baa2 100644 --- a/pkgs/build-support/setup-hooks/autoreconf.sh +++ b/pkgs/build-support/setup-hooks/autoreconf.sh @@ -1,11 +1,11 @@ preConfigurePhases+=" autoreconfPhase" -for i in @autoconf@ @automake@ @libtool@; do +for i in @autoconf@ @automake@ @libtool@ @gettext@; do findInputs $i nativePkgs propagated-native-build-inputs done autoreconfPhase() { runHook preAutoreconf - autoreconf ${autoreconfFlags:---install --force} + autoreconf ${autoreconfFlags:---install --force --verbose} runHook postAutoreconf } diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix index 0420b5ea4d22..da7a1bc5fb9e 100644 --- a/pkgs/data/fonts/dina/default.nix +++ b/pkgs/data/fonts/dina/default.nix @@ -13,14 +13,12 @@ stdenv.mkDerivation rec { dontBuild = true; patchPhase = "sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf"; - preInstall = '' - export _get_font_size() { + installPhase = '' + _get_font_size() { _pt=$\{1%.bdf} _pt=$\{_pt#*-} echo $_pt } - ''; - installPhase = '' for i in Dina_i400-*.bdf; do bdftopcf -t -o DinaItalic$(_get_font_size $i).pcf $i diff --git a/pkgs/data/fonts/gyre/default.nix b/pkgs/data/fonts/gyre/default.nix new file mode 100644 index 000000000000..46b947ce77a2 --- /dev/null +++ b/pkgs/data/fonts/gyre/default.nix @@ -0,0 +1,38 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation rec { + baseName = "gyre-fonts"; + version = "2.005"; + name="${baseName}-${version}"; + + src = fetchurl { + url = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-2.005otf.zip"; + sha256 = "0kph9l3g7jb2bpmxdbdg5zl56wacmnvdvsdn7is1gc750sqvsn31"; + }; + + buildInputs = [unzip]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp *.otf $out/share/fonts/truetype + ''; + + meta = { + description = "OpenType fonts from the Gyre project, suitable for use with (La)TeX"; + + longDescription = ''The Gyre project started in 2006, and will + eventually include enhanced releases of all 35 freely available + PostScript fonts distributed with Ghostscript v4.00. These are + being converted to OpenType and extended with diacritical marks + covering all modern European languages and then some''; + + homepage = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/index_html#Readings"; + + license = stdenv.lib.licenses.lppl13c; + + platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ bergey ]; + }; +} diff --git a/pkgs/data/fonts/league-of-moveable-type/default.nix b/pkgs/data/fonts/league-of-moveable-type/default.nix new file mode 100644 index 000000000000..c592ac2d38b8 --- /dev/null +++ b/pkgs/data/fonts/league-of-moveable-type/default.nix @@ -0,0 +1,79 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation rec { + baseName = "league-of-moveable-type"; + version = "2014-12"; + name="${baseName}-${version}"; + + srcs = [(fetchurl { + url = "https://www.theleagueofmoveabletype.com/league-gothic/download"; + sha256 = "0nbwsbwhs375kbis3lpk98dw05mnh455vghjg1cq0j2fsj1zb99b"; + name = "league-gothic.zip"; + }) + + (fetchurl { + url = "https://www.theleagueofmoveabletype.com/fanwood/download"; + sha256 = "1023da7hik8ci8s7rcy6lh4h9p6igx1kz9y1a2cv6sizbp819w8g"; + name = "fanwood.zip"; + }) + + (fetchurl { + url = "https://www.theleagueofmoveabletype.com/linden-hill/download"; + sha256 = "0rm92rz9kki91l5wcn149mdpwq1mfql4dv6d159hv534qmg3z3ks"; + name = "linden-hill.zip"; + }) + + (fetchurl { + url = "https://www.theleagueofmoveabletype.com/raleway/download"; + sha256 = "0f6anym0adq0ankqbdqx4lyzbysx824zqdj1x60gafyisjx48y87"; + name = "raleway.zip"; + }) + + (fetchurl { + url = "https://www.theleagueofmoveabletype.com/prociono/download"; + sha256 = "11hamjry5lx3cykzpjq7kwlp6h9cjqy470fmn9f2pi954b46xkdy"; + name = "prociono.zip"; + }) + + (fetchurl { + url = "https://www.theleagueofmoveabletype.com/goudy-bookletter-1911/download"; + sha256 = "01qganq5n7rgqw546lf45kj8j7ymfjr00i2bwp3qw7ibifg9pn4n"; + name = "goudy-bookletter-1911.zip"; + }) + + (fetchurl { + url = "https://www.theleagueofmoveabletype.com/sorts-mill-goudy/download"; + sha256 = "11aywj5lzapk04k2yzi1g96acbbm48x902ka0v9cfwwqpn6js9ra"; + name = "sorts-mill-goudy.zip"; + }) + + +]; + + buildInputs = [unzip]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp */*.otf $out/share/fonts/truetype + ''; + + + meta = { + description = "Font Collection by The League of Moveable Type"; + + longDescription = '' We're done with the tired old fontstacks of + yesteryear. The web is no longer limited, and now it's time to raise + our standards. Since 2009, The League has given only the most + well-made, free & open-source, @font-face ready fonts. + ''; + + homepage = "https://www.theleagueofmoveabletype.com/"; + + license = stdenv.lib.licenses.ofl; + + platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ bergey ]; + }; +} diff --git a/pkgs/data/fonts/nafees/default.nix b/pkgs/data/fonts/nafees/default.nix index aa0c1dbd77ba..bcbf57498106 100644 --- a/pkgs/data/fonts/nafees/default.nix +++ b/pkgs/data/fonts/nafees/default.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { license = "unknown"; platforms = stdenv.lib.platforms.all; - maintainers = [ "Daniel Bergey <bergey@teallabs.org>" ]; + maintainers = with stdenv.lib.maintainers; [ bergey ]; }; } diff --git a/pkgs/desktops/e19/default.nix b/pkgs/desktops/e19/default.nix index 5740337a11a1..9c862734dcc1 100644 --- a/pkgs/desktops/e19/default.nix +++ b/pkgs/desktops/e19/default.nix @@ -22,5 +22,6 @@ rec { #### APPLICATIONS econnman = callPackage ./econnman.nix { }; terminology = callPackage ./terminology.nix { }; + rage = callPackage ./rage.nix { }; } diff --git a/pkgs/desktops/e19/econnman.nix b/pkgs/desktops/e19/econnman.nix index 0c09317d24f7..c29a57af54a7 100644 --- a/pkgs/desktops/e19/econnman.nix +++ b/pkgs/desktops/e19/econnman.nix @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ makeWrapper pkgconfig e19.efl python27 dbus ]; - propagatedBuildInputs = [ python27Packages.pythonefl_1_11 python27Packages.dbus e19.elementary ]; + propagatedBuildInputs = [ python27Packages.pythonefl_1_12 python27Packages.dbus e19.elementary ]; postInstall = '' - wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_11}/lib/python2.7/site-packages + wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_12}/lib/python2.7/site-packages ''; meta = { diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix index 2367f47bac4d..6dae5f038778 100644 --- a/pkgs/desktops/e19/efl.nix +++ b/pkgs/desktops/e19/efl.nix @@ -1,19 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, wayland, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, lua5_2, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl }: +{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, lua5_2, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl }: stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.11.3"; + version = "1.12.2"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz"; - sha256 = "0s9pm3lfp7f2yf877xywjw8ihgr2yrns3gibak0gcwx7d8bfljfr"; + sha256 = "1knxm4xiqxpvpszhyqik43lw36hdwdfh8z7y62803a7093j3yjnw"; }; - buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-libav pulseaudio libsndfile xlibs.libXcursor xlibs.printproto xlibs.libX11 libdrm udev utillinuxCurses luajit ]; - - propagatedBuildInputs = [ wayland libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext bullet xlibs.libXScrnSaver ] ++ [ xlibs.libXrender xlibs.libXfixes xlibs.libXrandr xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat lua5_2 harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl ]; - - configureFlags = [ "--with-tests=none" "--enable-sdl" "--enable-drm" "--with-opengl=full" "--enable-image-loader-jp2k" "--enable-xinput22" "--enable-multisense" "--enable-systemd" "--enable-image-loader-webp" "--enable-harfbuzz" "--enable-wayland" "--enable-xine" "--enable-fb" "--disable-tslib" "--with-systemdunitdir=$out/systemd/user" ]; + buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa + giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-libav pulseaudio libsndfile xlibs.libXcursor xlibs.printproto + xlibs.libX11 libdrm udev utillinuxCurses luajit ]; + + propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite + xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext + bullet xlibs.libXScrnSaver xlibs.libXrender xlibs.libXfixes xlibs.libXrandr + xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat lua5_2 + harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl ]; + + configureFlags = [ "--with-tests=none" "--enable-sdl" "--enable-drm" "--with-opengl=full" + "--enable-image-loader-jp2k" "--enable-xinput22" "--enable-multisense" "--enable-systemd" + "--enable-image-loader-webp" "--enable-harfbuzz" "--enable-xine" "--enable-fb" + "--disable-tslib" "--with-systemdunitdir=$out/systemd/user" "--enable-lua-old" ]; NIX_CFLAGS_COMPILE = [ "-I${xlibs.libXtst}" "-I${dbus_libs}/include/dbus-1.0" "-I${dbus_libs}/lib/dbus-1.0/include" ]; diff --git a/pkgs/desktops/e19/elementary.nix b/pkgs/desktops/e19/elementary.nix index 4ee8c0b1a951..27400513f1b3 100644 --- a/pkgs/desktops/e19/elementary.nix +++ b/pkgs/desktops/e19/elementary.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, e19, libcap, gdbm }: stdenv.mkDerivation rec { name = "elementary-${version}"; - version = "1.11.3"; + version = "1.12.2"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz"; - sha256 = "1yr96imam9sckgagnp7wdvwmvr1xwakw29dih3gxp7nz7xsa0j8k"; + sha256 = "0qjbhdhnw6h5zc05r2w2j38yapcv9km92k5spcw3zsdnc784vf5i"; }; buildInputs = [ pkgconfig e19.efl gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; preConfigure = '' diff --git a/pkgs/desktops/e19/emotion.nix b/pkgs/desktops/e19/emotion.nix index 269bfe32dbcb..96c791d1b932 100644 --- a/pkgs/desktops/e19/emotion.nix +++ b/pkgs/desktops/e19/emotion.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, e19, vlc }: stdenv.mkDerivation rec { name = "emotion_generic_players-${version}"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.gz"; - sha256 = "0x6aigsqnfn9vcaj1rj6055s0vh811svzhwz5zghksg4lqipjbjx"; + sha256 = "1nm0qbdkhrpgvmj5qn7l4jj5l1g4zz77bda0ddy67fqkn5h3qarg"; }; buildInputs = [ pkgconfig e19.efl vlc ]; preConfigure = '' diff --git a/pkgs/desktops/e19/enlightenment.nix b/pkgs/desktops/e19/enlightenment.nix index 9faa03a63380..e00d4a66a459 100644 --- a/pkgs/desktops/e19/enlightenment.nix +++ b/pkgs/desktops/e19/enlightenment.nix @@ -1,18 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, e19, xlibs, libffi, pam, alsaLib, luajit, bzip2, libpthreadstubs, gdbm, libcap, set_freqset_setuid ? false }: - - +{ stdenv, fetchurl, pkgconfig, e19, xlibs, libffi, pam, alsaLib, luajit, bzip2 +, libpthreadstubs, gdbm, libcap, mesa_glu, xkeyboard_config, set_freqset_setuid ? false }: stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.19.1"; + version = "0.19.2"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "016z1vilhjarpxzn5bwcw696d8b66rklnhkrwzfa5mcxn8gpmvap"; + sha256 = "06il67mlbn24ra6rb7gws5ly67i80lfiprhi5cr71qfmnsr4xbqk"; }; - buildInputs = [ pkgconfig e19.efl e19.elementary xlibs.libXdmcp xlibs.libxcb xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2 libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; + buildInputs = [ pkgconfig e19.efl e19.elementary xlibs.libXdmcp xlibs.libxcb + xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2 + libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; preConfigure = '' export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eo-1 -I${e19.efl}/include/ecore-imf-1 -I${e19.efl}/include/ethumb-client-1 -I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" export USER_SESSION_DIR=$prefix/lib/systemd/user + + substituteInPlace src/modules/xkbswitch/e_mod_parse.c \ + --replace "/usr/share/X11/xkb/rules/xorg.lst" "${xkeyboard_config}/share/X11/xkb/rules/base.lst" ''; # this is a hack and without this cpufreq module is not working: diff --git a/pkgs/desktops/e19/evas.nix b/pkgs/desktops/e19/evas.nix index 756c7badb072..bc678c6aab8c 100644 --- a/pkgs/desktops/e19/evas.nix +++ b/pkgs/desktops/e19/evas.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, e19, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }: stdenv.mkDerivation rec { name = "evas_generic_loaders-${version}"; - version = "1.11.2"; + version = "1.12.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz"; - sha256 = "03p6v7l2fxvldiymqk16pqnbm9llygp6i19qhn3rmrqy1hkjkry6"; + sha256 = "0viph73wv83xw9g6rgjhhiav9n896m0ixnz2m27cnmmn8llchcf5"; }; buildInputs = [ pkgconfig e19.efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ]; meta = { diff --git a/pkgs/desktops/e19/rage.nix b/pkgs/desktops/e19/rage.nix new file mode 100644 index 000000000000..6cb6d3d24e83 --- /dev/null +++ b/pkgs/desktops/e19/rage.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, e19, automake, autoconf, libtool, pkgconfig, gst_all_1 +, makeWrapper, lib }: +stdenv.mkDerivation rec { + name = "rage-${version}"; + version = "0.1.0"; + src = fetchurl { + url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.gz"; + sha256 = "0d87n0rl24s7b8y3bdcg6i3yrzhil5f5vmgrmh451i4y38k84swk"; + }; + buildInputs = [ e19.elementary e19.efl automake autoconf libtool pkgconfig + makeWrapper ]; + NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/evas-1" + "-I${e19.efl}/include/ecore-1" + "-I${e19.efl}/include/eina-1" + "-I${e19.efl}/include/eina-1/eina" + "-I${e19.efl}/include/eet-1" + "-I${e19.efl}/include/eo-1" + "-I${e19.efl}/include/ecore-evas-1" + "-I${e19.efl}/include/ecore-imf-1" + "-I${e19.efl}/include/ecore-con-1" + "-I${e19.efl}/include/ecore-file-1" + "-I${e19.efl}/include/ecore-input-1" + "-I${e19.efl}/include/eldbus-1" + "-I${e19.efl}/include/efreet-1" + "-I${e19.efl}/include/ethumb-client-1" + "-I${e19.efl}/include/ethumb-1" ]; + GST_PLUGIN_PATH = lib.makeSearchPath "lib/gstreamer-1.0" [ + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad ]; + configurePhase = '' + ./autogen.sh --prefix=$out + ''; + postInstall = '' + wrapProgram $out/bin/rage \ + --prefix GST_PLUGIN_PATH : "$GST_PLUGIN_PATH" + ''; + meta = { + description = "Video + Audio player along the lines of mplayer"; + homepage = http://enlightenment.org/; + maintainers = with stdenv.lib.maintainers; [ matejc ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.bsd2; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix new file mode 100644 index 000000000000..6289fd4a6db5 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchurl, makeWrapper, intltool, pkgconfig, gobjectIntrospection, glib +, gtk3, telepathy_glib, gnome3, telepathy_idle, telepathy_logger, libsoup +, gdk_pixbuf, librsvg }: + +stdenv.mkDerivation rec { + name = "polari-3.12.2"; + + src = fetchurl { + url = "https://download.gnome.org/sources/polari/3.12/${name}.tar.xz"; + sha256 = "8b10f369fac9e5e48a7bed51320754262d00c1bb14899a321b02843e20c0a995"; + }; + + buildInputs = [ makeWrapper intltool pkgconfig gobjectIntrospection glib gtk3 + telepathy_glib gnome3.gjs telepathy_logger libsoup + gdk_pixbuf librsvg + gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic ]; + + propagatedUserEnvPkgs = [ telepathy_idle ]; + + preFixup = '' + wrapProgram "$out/bin/polari" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Internet Relay Chat (IRC) client designed for GNOME 3"; + homepage = https://wiki.gnome.org/Apps/Polari; + platforms = platforms.linux; + maintainers = [ maintainers.lethalman ]; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix index a60e1a85bca0..7a972925f667 100644 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ b/pkgs/desktops/gnome-3/3.12/default.nix @@ -234,6 +234,8 @@ rec { seahorse = callPackage ./apps/seahorse { }; + polari = callPackage ./apps/polari { }; + pomodoro = callPackage ./apps/pomodoro { }; #### Dev http://ftp.gnome.org/pub/GNOME/devtools/ diff --git a/pkgs/desktops/kde-4.14/CVE-2014-8600.diff b/pkgs/desktops/kde-4.14/CVE-2014-8600.diff new file mode 100644 index 000000000000..1fe26484605e --- /dev/null +++ b/pkgs/desktops/kde-4.14/CVE-2014-8600.diff @@ -0,0 +1,19 @@ +--- a/kioslave/bookmarks/kio_bookmarks.cpp ++++ b/kioslave/bookmarks/kio_bookmarks.cpp +@@ -22,6 +22,7 @@ + #include <stdlib.h> + + #include <qregexp.h> ++#include <qtextdocument.h> + + #include <kapplication.h> + #include <kcmdlineargs.h> +@@ -197,7 +198,7 @@ + echoImage(regexp.cap(1), regexp.cap(2), url.queryItem("size")); + } else { + echoHead(); +- echo("<p class=\"message\">" + i18n("Wrong request: %1",path) + "</p>"); ++ echo("<p class=\"message\">" + i18n("Bad request: %1", Qt::escape(Qt::escape(url.prettyUrl()))) + "</p>"); + } + finished(); + } diff --git a/pkgs/desktops/kde-4.14/applications/kate.nix b/pkgs/desktops/kde-4.14/applications/kate.nix index e7a6476dd6df..2440d73e7e8e 100644 --- a/pkgs/desktops/kde-4.14/applications/kate.nix +++ b/pkgs/desktops/kde-4.14/applications/kate.nix @@ -1,8 +1,8 @@ -{ stdenv, kde, kdelibs, kactivities, qjson, pyqt4, sip, python, pykde4}: +{ stdenv, kde, kdelibs, kactivities, qjson, pyqt4, python, pykde4}: kde { - buildInputs = [ kdelibs kactivities qjson pyqt4 sip python pykde4 ]; + buildInputs = [ kdelibs kactivities qjson pyqt4 python pykde4 ]; meta = { description = "Kate, the KDE Advanced Text Editor, as well as KWrite"; diff --git a/pkgs/desktops/kde-4.14/default.nix b/pkgs/desktops/kde-4.14/default.nix index 2a20bde568b5..2b8e5d313cc7 100644 --- a/pkgs/desktops/kde-4.14/default.nix +++ b/pkgs/desktops/kde-4.14/default.nix @@ -1,4 +1,4 @@ -{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.14.1" }: +{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.14.3" }: let branch = "4.14"; diff --git a/pkgs/desktops/kde-4.14/kde-package/4.14.1.nix b/pkgs/desktops/kde-4.14/kde-package/4.14.1.nix deleted file mode 100644 index 477e116e5e08..000000000000 --- a/pkgs/desktops/kde-4.14/kde-package/4.14.1.nix +++ /dev/null @@ -1,627 +0,0 @@ -{stable=true; -hashes=builtins.listToAttrs[ - {name="amor";value="143fhmgbmy7nlhhlbgh4s9ripqiidlx9bfrcrhamhgl11jjdr0mc";} - {name="analitza";value="18w35j4pag0s075d6yykkqg9cwfgx88zv0qgzas58qhzd3kjcijf";} - {name="ark";value="17imd7pfzjd1vfr69499fg51hmymzspax8l64gskmygdwbx7shh8";} - {name="artikulate";value="1gqvwz5amwssgjkldzg9gnixi88i5vdmk3s1bq94i0z3p0y3h88a";} - {name="audiocd-kio";value="02aq2qs01kz79jdi0sqr6hs7y1z8f4lf9mpv687pfv4g82fg2jh7";} - {name="baloo";value="0nvq2j81y75zf0f2p08av8iw7dc84826fsa93l14334ci245lar7";} - {name="baloo-widgets";value="11ma80nsb6x1wfh83k4g5aafwqsz6j9c4xmnbcc8bm57wssd8jxc";} - {name="blinken";value="11mmm12465bfikpzl486pznprj2rgcnxvpr4mniqfdjcijsfwdwd";} - {name="bomber";value="1lkn2nasyynf4kyrard39mckgfq558255ry07r3z7cvn9m8hc08y";} - {name="bovo";value="0sfb24ksh8gg6b7269skmxs72kkgd9cbgz0xs1hvd5y8w9cmz3yl";} - {name="cantor";value="07i5p439b15wl106h7fq2c016cd6jpdi18rz5m9sylaaj87a5d26";} - {name="cervisia";value="0sspkafcbma2vig9r5dl1z70p95nm2y3rfzssng7i6kam6fr4yqd";} - {name="dolphin-plugins";value="0a4pvxz1s44lszy8mqvw8rzilmq3vrjb30y08j0gp7id1xc3lpn0";} - {name="dragon";value="0dnfhmpifcabc9y5w393pg7rw2425kqslh88ljkz4bh6yw767ihd";} - {name="ffmpegthumbs";value="1dmwwx96pp5vnrxk3f4vr08qwjny7ydmkdvzj1hmgsid1s283i6v";} - {name="filelight";value="03gr0ldpkbf2q3nx1w07mhgmilrn8mx0wy81140gd1wjwilk5d7x";} - {name="granatier";value="0dph80h7jj9d0wh67bp9m98i0imrq6dxv11rqylnfzsf70lp2xzs";} - {name="gwenview";value="0mybmdvblf05kif5aa1wc2g1sv30bnkd30kwn0f7s0xiq3kckf38";} - {name="jovie";value="1sgm1v93868sgjdjpfjn3kv7kjpg92lajm91qy1m49w2isg60f4v";} - {name="juk";value="1gqdidzq1bqbjkhf40abpfj2b0fkk4bpi8kb6crk3zfjhsfa7rbq";} - {name="kaccessible";value="002dwar3c965783si4y1q7qpv56s8mqddqz6mbx1qhmzy88br5q1";} - {name="kactivities";value="12l9brpq8mr9hqqmnlz9xfsfr8ry6283b32nfqfx0p3f7w19vjy7";} - {name="kajongg";value="07cpw5k03rg8f54g3a1vx6z5ihfid561yza8qihsmzyjay4v2hya";} - {name="kalgebra";value="132awnbgcr66xfb99mgqcnh7viyrvr7vdqxm9wwgmpa14n7lk56q";} - {name="kalzium";value="03rz0gl5pihs7xnw7i415bla8ck2afqzrb717xsf1lb7ihrsky8d";} - {name="kamera";value="0593gai9ysd6pb5qir5wikj9szj7dj35iy435rikfpc8gwfpnsaj";} - {name="kanagram";value="1s1pq7ldjgarwbf2m49r5pi6w88c1yn38b5d023qhrgjbw2kfbpy";} - {name="kapman";value="1lcm7miqrjjg469h5765gaqrcxzhm5279nps4v2x4vkng3s2pj1a";} - {name="kapptemplate";value="0h0gcc00l0mq5lmac2656xnadz8sp14vbzjq2zsxr5y0m3nmcfg4";} - {name="kate";value="0izgfkd15755g4g0hll0q9nbn21w0a0p0qa5mlxrhxdsik3f580q";} - {name="katomic";value="0f53q39vsk23r8ldikk24f083n52747jrkgd1hvama9amga74hlm";} - {name="kblackbox";value="0wndkaqmfj5c2s64sw8jhjrr6y7mrkmjgmnnadpw8gmkhkml6qzi";} - {name="kblocks";value="0rl2sf1jz3zh790vijazmg88wy1hj7r2pgmql6x2ccbd6pp8j9qw";} - {name="kbounce";value="1mq2xmx3886pgjyb91fk501kwyw6k49zm5qijyi7bw735dfcvqry";} - {name="kbreakout";value="1ba7n2392gxdsz4ijws01pv1w4djirqjbdqidqaknr2rrknfchk3";} - {name="kbruch";value="044p4q5668ng0gbbykmcb7xivx8djijp133ch8vy2gbg38xi81lj";} - {name="kcachegrind";value="12h7s1a5hz9l015qcjzm7w5xzk7v6h66qm7sfww49m6h0w1g41v8";} - {name="kcalc";value="02gkap5phz59h4sflz44f4az3xww97g6bsl8nin3x0skll0nxnlr";} - {name="kcharselect";value="0df30c854blqfzkarlpfxhls04gpi8d3sy9p9b1landaaqbbln9w";} - {name="kcolorchooser";value="1hxlizxk8ljxn9jgn7wn42i1h5zksdgvhiak7sgz1ci5x68622zw";} - {name="kcron";value="0g9yi9xg215n89rmqmkwnd55mv85m9nq6irmxvcmwy0x1cci23rp";} - {name="kdeartwork";value="18f36p9zfz6jgswnc7k45g6ahqd6glqxzp35q6pndk0bp448dg08";} - {name="kde-baseapps";value="0jclvwiwbkcd6l0k39v3hxn0pcj8lfn6g4rynq55ca4h3wwkwmdq";} - {name="kde-base-artwork";value="09gfxr4md2yl9c8alghpxn0hxlz931b7d000zv8hg4nvw00qrnaj";} - {name="kde-dev-scripts";value="12an5jhin26kdvk6kyc477dv00vfvwbg250402vmzx8ngs4crlg8";} - {name="kde-dev-utils";value="17ag4vl3lyvsg7m0chs83wvm67i4k49xhlkw4kvj4xryzbnf11m1";} - {name="kdegraphics-mobipocket";value="15nrzgh49zs73ja21ihd7pi6nzxm4c3zh4s7jjidz369qbafyj4x";} - {name="kdegraphics-strigi-analyzer";value="0wr8rq0mmp7jbj8y5zn2wccna7mv3myspvwlrpkplga0f3mxbnm7";} - {name="kdegraphics-thumbnailers";value="0iw0pslmqdrj94j26lj8sgvx6a8yy3pf6daxc5q4l580l5djq1k2";} - {name="kdelibs";value="0904qa0a8i1nhqcya9r3k6i5b1zyvm18g6a8w0abxm9fd089ps9p";} - {name="kdenetwork-filesharing";value="015rqw7gxapxnh0wxivyii36fg0n0spzsqv1x4qssj8ld8imvagv";} - {name="kdenetwork-strigi-analyzers";value="09m3zr8acwxy912lpdlk9p1daris2yh6fzfj3m76j822223knh83";} - {name="kdepim";value="0f9m59q30w9bdhjlhv3z72b9zrqnrjggafnsq26py8d58hg2lxms";} - {name="kdepimlibs";value="05ki1iacaraiwbabyiwzlr83f6askn4qf440cbsah8dyfm27srgb";} - {name="kdepim-runtime";value="0kc86l2qbb24w3389yrwwh4ww4yvnnj9wygmzm7cm51hbfjvd12p";} - {name="kdeplasma-addons";value="1nlnvj7k205cpkqkrbm0qpcfgc7rpb47xzv3r1z5iil9hz7d5jx6";} - {name="kde-runtime";value="1b6ag633jh519f1ncmmdy8j3ri6k7niblqsjmgk56xv4a9iy4cmg";} - {name="kdesdk-kioslaves";value="0brykgby8mh5laym4iwq7nz8q9slb79kc89jjlh4ci5n496h06v5";} - {name="kdesdk-strigi-analyzers";value="1gpp4pi59cd81kw6d1z26q02vifl0pz7rbk7ipvxmy8n873q42pn";} - {name="kdesdk-thumbnailers";value="0l662gzmm8gx6dcpw23lqnyfv0pdn7dfqqnxnwsnfycw9vd493g9";} - {name="kde-wallpapers";value="1ai36ii25m0yl8g42nidbimf3chsc8gh4rixyl8iqhf50wsghw94";} - {name="kdewebdev";value="1z87fffcnj1b2dimr05p702pcra80f1p1hcz45rf903cxgy6y1bf";} - {name="kde-workspace";value="0bwlz92q8fgdp5n0kc15l7f3642nqr3yrpyykf8zq15pq4daxn09";} - {name="kdf";value="04j3w1h6h2nb6566pb1yifjy2m25mi6dk4mvjxl680mwlqaaj3rz";} - {name="kdiamond";value="1lzx3alcczxx9xb7bvzarypfw6dcgcb6wngxmli2ppb1ghl4pnds";} - {name="kfilemetadata";value="1r4zdx32qsjzszym0riw65nn5rrcjm57a0yawik96fzxrrvrvzkc";} - {name="kfloppy";value="01lar9p26g4b2a6cz83jy9l6bd943jsysv18hr9lyxwm98747axa";} - {name="kfourinline";value="0193nc2g3mcm6m3s732dg6ha5kh6mgdkih0pf0zay9ahfhkrpziw";} - {name="kgamma";value="1fj9xnj3i8i18m5y2jhmclw337akyb8nmajksgwnd573s040zh84";} - {name="kgeography";value="1j1d62lfziz403qhwc41frx737sl25kz060crz60ix3sam7arvkl";} - {name="kget";value="1ndgd960iyvgshmikplr2fqq13zijc6g8rbavqpcs4az8bp2h6zy";} - {name="kgoldrunner";value="05346q4366qrm3idh3dbgi1ddajplbncrwn28vlhxbqkqb8qp51y";} - {name="kgpg";value="1nwrpdczf4wmmwasa5wiggs7cjc8ivr005q77vzj5094ajq457dy";} - {name="khangman";value="1jf10ixqwrn9f9wbhpppw6j3jpcp9ss4g4gairrklmr7v5cp59lr";} - {name="kig";value="07f85rab71kb6fn0zdqx068im3a63l2irqci9dha8cfh805jyl8y";} - {name="kigo";value="0vk2wq9z6xi86plx84agrl2j07jx98y1i9dsvimyvrxah32ykdka";} - {name="killbots";value="15azd5391247h2qn4shv0c4cz5hmr77xcbld2va5357xrbhzirx9";} - {name="kimono";value="0z4g580nn62zsf6rmxcg4z13n9vd9n24s1fzhc4d5kk6niszbjap";} - {name="kiriki";value="0mh7v16haiqkkfiapq8qivmbhyyczsq5sm8kzpddh40814p3sy9w";} - {name="kiten";value="12s7h19ybpm48gha23jkh86a2p71yqb3h93bs4mnkfgidjssvd43";} - {name="kjumpingcube";value="01wffw1s5crv11s3hg54ipwp09i8kgp7wjw038c83jgrvcw52ql5";} - {name="klettres";value="13bayjpny80d4avm77vmhm5f8ma4ckwiz63sximz8hyr6rg5i7fc";} - {name="klickety";value="0cmzzy2nf3zpmpyfsmrmfcklppib7qmg0pbxsm03y7az0qrz03bm";} - {name="klines";value="0k4xi6p4ikp0sb54jbb4rzdbhlwyhf4r117pgmmvb3n2aq6w4n9f";} - {name="kmag";value="1c3z1r0qk69pprivak6lgb4mk491pd17hqb9474fv645nk9jh48h";} - {name="kmahjongg";value="0lfnjzshcm7d91cq6x6s5l2n4p5q6ya4d7c3r94ad2fqpy3425c1";} - {name="kmines";value="1fxb8cwy9wfsijgf36ji4v1c2yaqbnxbppa4c4pld9fi9vnds0w7";} - {name="kmix";value="084prv50nsh7j1db2dd3i4gkfj6wh430azlq60a4j4667ih483l9";} - {name="kmousetool";value="1gr1nvxnapmmw5p9hk35g76rlxs3f5l7wbsfmczlzlxwszfg05lc";} - {name="kmouth";value="0f8s6ikrx069cp8pd3405g2s4czvk0vpv6d48jgvkbxnxfasli1c";} - {name="kmplot";value="1si0dl1m4zabmnrnmih0g5dxfwsws3p626j0kgvrqnd5hlwl6ar6";} - {name="knavalbattle";value="1llrj7d79s2k66qp9cx6zbjs5f69xnvc8gr0yi2jdbycaiq9q9lj";} - {name="knetwalk";value="13gy2pqqfysh69pmx4mcq9nx6qcxmzp08sqvf2b6c6v7f90ic2kx";} - {name="kolf";value="0808js28c4y1wllzs62sw4j02hzspijvl6n7i6vbhim47blvn3yq";} - {name="kollision";value="1mn9agdzw15gkyb27pqg80anbk4a6iv6r1mvn8m2hksfqwv8c1mf";} - {name="kolourpaint";value="0nj4a8sjyip0nmq3xkba00qigmg9z6bfck5gfb53sm5z6mdrdvd6";} - {name="kompare";value="13123ylhm1r5kkc5q9dzc3n03nxa89vfy1nrffa501awhyhb6qvl";} - {name="konquest";value="1m06chqvanlqklymdrl78hyqi9wzlkmnzbq3sg920jzqjvac8yq1";} - {name="konsole";value="1j5z5ma7mljis1s6rfpcli02vbnmrdhs8zr1gm2rgpyii9k3xykn";} - {name="kopete";value="1s87ln4qjdx4k1313r87glzmazah85siv0nddzndvz50330gnqrv";} - {name="korundum";value="1a7nwi8lk1n3r5m7qsfkzb4dgj37ff7i5il3i6fabmkmbwmikm82";} - {name="kpat";value="1lb5arhhx4zz6zrcag2kmsa7hrmjl3zd7jaklkcbd86bm57xmzry";} - {name="kppp";value="16p6gfr2lyhcmyldzclj8md4sr31rmmxp0m3afnhi4bwvd76d4sc";} - {name="kqtquickcharts";value="0sx7jahhaz2v0sp9qix4xxinxry2k50hnxfrf9hd5877s4ngdi3h";} - {name="krdc";value="1jyyrj4g854ki39p0k056mmca21d5yiqa25sa2wxb3v7g128lvl8";} - {name="kremotecontrol";value="0f5hfdlwfqqygc6vd6lgchh0bdh0z9crikkv7pjah43x5h0sys14";} - {name="kreversi";value="1cl8dbrgsv60zhxfqry0wd4gn4lyas9xb8yy5m3f71dkcb4xmhrz";} - {name="krfb";value="1yzp00kyww6wrdbhy8idxbpn8nr597h116rzxa57xalq7cj4px5m";} - {name="kross-interpreters";value="01a6w2iqx3k32fdwnlz2z8h7p1isf9sf2i261gaixf510drz3mqs";} - {name="kruler";value="0sbxvaxvixyka4qy2h17i8bgblxppp76j6b9jgsgqq8w20ppj0yd";} - {name="ksaneplugin";value="134cccd2v7xygg18xlggsk942hlcmpilmpaljksh2w6dzjig8ag9";} - {name="kscd";value="1r7ffan61ps9h3awbwyr4kn2ismk8l8dnb0rdyjmp2rsmrci3xmy";} - {name="kshisen";value="0b4zny2nxhx45k540mjpqzfpa9xnfnyk1hgs3xziihg5iij1vdnf";} - {name="ksirk";value="0xladrvxvj8mfagl9531842bffixbk2z7ymwp178xlrz3c4b07xs";} - {name="ksnakeduel";value="1q901qphmb09642whn3ad0viv9lgvls2rggc5xnxxjccchz98ggh";} - {name="ksnapshot";value="168ya0d15966j9kkgxqpp67kfhmsw7xj875dr8cfqbcmgf6ghjdm";} - {name="kspaceduel";value="0fidkh52vwbjbabrjvbcvr144vcgig0nz12g5f5fzfbl04336x12";} - {name="ksquares";value="1w91mp1a22gzq546w87767aq02gl2jl9mrsv83hv327q0i4r55ng";} - {name="kstars";value="0z7045cpb8fwkrmlcgjz2606zhcl4irs0lafgwv3hdg3g6k5xj0n";} - {name="ksudoku";value="1vdqd7nxm9q0xmj90ix1k6j1cn7zc2imfkz13xjlkjgrbb7nn4dr";} - {name="ksystemlog";value="1rh3c54jpd1s6ggcshx0p2q2gsv6flh04qqjnk9bnkw374ad6an7";} - {name="kteatime";value="0akd8kr2pj8j4abvwf7cs9vk5mswj4mfki3vxk1kmyaanrxb6wrq";} - {name="ktimer";value="1hnmw4rw7mzc7arlqn1wiap9l00x97bp1z03ls7v133wga6hy56f";} - {name="ktouch";value="0z83pdh027h7nl15g6qqc7y4v8nlm07g0c4a2cl0j86r53vv4jrp";} - {name="ktuberling";value="05hngh9pgsl4q3qnv2vqw1lggn2glc4c2b3jxgkccagp5igqj2nb";} - {name="kturtle";value="1f3j3w6lgdkcn8p6zy29b42bm0k93a864njf827j1ri2vrjifdag";} - {name="ktux";value="0j15i5f7x6jq7xrrx675f6h92qjzb89xcwmv43snd87sj0yaymgs";} - {name="kubrick";value="1np1d913fhanfva26cfy4wabf0h69qs824kdmawr89f24689xpjl";} - {name="kuser";value="12xw1qhilh88xfaky5iv44hybwmzf0f4fkp5ahgskysx2whvk7dh";} - {name="kwalletmanager";value="0h71nm5mpp2rvv5xs0a7153583zdwzc1i9vv9xkwwmq84qwar06w";} - {name="kwordquiz";value="0w2a1df2ipynarfxjr27jk896jhq8hsbkxhf3rzpflzs902afrfn";} - {name="libkcddb";value="153cgh9mxfqfdxdg5glphs3fvyhd89cmdzpvwpn29gdfshbpc9np";} - {name="libkcompactdisc";value="1y4f3b4yx8giyz83nan0nl75l3k1fyfw1fnbma6ch1901yxbliqq";} - {name="libkdcraw";value="03lgy6h9fy8j72ryfrsxpsbnb7l5i1n8wihfw117y2m5h23x6va2";} - {name="libkdeedu";value="06w2pfj0whcl8pz89cck2y0bkn7r54n93l95vnqvj7v0zq704imd";} - {name="libkdegames";value="0yx77i8yanv2fjmc0gcz3fzywkmpzq7jrc1g1frcwc9qcbd652sb";} - {name="libkexiv2";value="0fibx70n5c11absj97c20p1d7crhfx5wc1p7h77dyjv76zxb0rjk";} - {name="libkipi";value="09vihz0sm32acbh2xqmg4r0c48m40xsf6fcvfcjy4w08dvxb26jd";} - {name="libkmahjongg";value="09q0vvznag2dk03vwzlaip3qvjgwi8kk0ypvpwbga48vi9wy5qih";} - {name="libkomparediff2";value="1ihdpcsmkvnhs0i4xwx4ardy54gk5fcbh4byam3h9x8156d1gi60";} - {name="libksane";value="0dvprckc0d8vc8rcj7ib22ycsib1g8bi9m6i24961ccgbn3mhbha";} - {name="lokalize";value="1ad6vqvaa1ijcc9vjq46986z8q8bm5kjcaxdjzrq956m5kgx96wm";} - {name="lskat";value="00iva59g8rgrzp9w273cja1z2kbnxpb8gdm2a29qnld862l586x8";} - {name="marble";value="1gk75xl6kdqxh9kyfiialp937jhb203ycnza6x5sdnky8n7dchzs";} - {name="mplayerthumbs";value="1lg51si9iy4kn91s1cpa7irpk7iind1lfc4nb0a3s3dw685jf3z4";} - {name="nepomuk-core";value="1krwfrkrk0dj08wqfbx8lfdxriff9w5pqhjaccvmdj3bmlik542f";} - {name="nepomuk-widgets";value="1k1zxbpplal5fw2lziv8rr850nl5a6y1vwng96f8zqqgda6nnbqz";} - {name="okteta";value="0h7jb7zhpdw1sbdl2mqajnnvn11hisxp0p33km4qxh1jxdn44apc";} - {name="okular";value="13lva2rasrh1za65wr5zjn1mwx6nzd9n1ci3i940px8qfgqjbysx";} - {name="oxygen-icons";value="15daai2vx5ccll1mdxf77pc0i52365m9a6j2jy956sybwpzmfkmx";} - {name="pairs";value="002hsh5vp1grc8gdhgj93bmrmnzf4mnaax6zs5j7f0jsv60czh9m";} - {name="palapeli";value="0qrcfg1p3ipa84l0kp8mxg9h4098jmaz3n0fakc8fkvfdgg70x5c";} - {name="parley";value="1z0yz7x53w23rq22pn0z3hiwzgajqmq6v9bishqgm5r7layqj0v5";} - {name="perlkde";value="07p1g8mv5xw3qys4h2jrh72kvf6yyl7yz5rnk4bg04rl4dg7n3j2";} - {name="perlqt";value="1fk2g1xam8gf6n1mpix7kkw2jm6p3d57jbph2vfc5gszdddlb0z1";} - {name="picmi";value="1n6h9rzfqr2pvmz172bk04bmc1mm9b1rvakqdyqdf4j6b7inlnqh";} - {name="poxml";value="0y9x29fd0fzxcb9lpsy6sd4kcwwjp0d6yi4qgklqxb2xw5d519rc";} - {name="print-manager";value="0k2lmdcw72ifbq2mbalnq78sq5brl3wkny8lxl5ia9q2wq6c5nbl";} - {name="pykde4";value="1lknacs02gk0lh96jgj1hjyphnw04yljpxamhhvz9l0nn82dh5ip";} - {name="qtruby";value="0nlldf06z0rhmdgmrd6wambywn6xfd2ini6zliakspk7s8c851nd";} - {name="qyoto";value="0wh5zf057bkxr7rs7k2psjh74j10ri943qfk8hv07jw25652xpzb";} - {name="rocs";value="1i3s0kjrc6qqn9v219s8m10w2fyp1cdvra736pv0ld9gg5a71fc8";} - {name="smokegen";value="0lzkfp09rfkcxn5k18x789wwbiq94hypsiwyxg3fd5ybkx725j55";} - {name="smokekde";value="1admv2k41i6xh4s0n8yydmpqjkwank6f8mpaapa9a8dnj918ydll";} - {name="smokeqt";value="1fnnma8sls8rf958cwlfars26gaxk68plx3fzv979rwwb1n7h3jg";} - {name="step";value="11prsrpf0nvrrb0n9gz7w2shyq60v3hv3av6ggaxy5i7qq2jkcmw";} - {name="superkaramba";value="1p7ks4cyx66dmfxwrdzd890h3sa9bqm5rh2x6i1b81v5g3dg09s7";} - {name="svgpart";value="0gwc68hzw29lfj1kmikqpmsyignlcghvv86amlmylnvrypkjypk7";} - {name="sweeper";value="1dxqspva4rql2r92y0y16m3f0jf3anvb26x36bxk71ad5fpph9yl";} - {name="umbrello";value="1l9zq8sk46nd8nyk48vy4rdlbx7s8l5pif0n1y38ymbppc157lqi";} - {name="zeroconf-ioslave";value="0ds85m35p34cv2bv2mkvdvmygvykssssbr736g02jbiasivmclk5";} -]; -versions=builtins.listToAttrs[ - {name="amor";value="4.14.1";} - {name="analitza";value="4.14.1";} - {name="ark";value="4.14.1";} - {name="artikulate";value="4.14.1";} - {name="audiocd-kio";value="4.14.1";} - {name="baloo";value="4.14.1";} - {name="baloo-widgets";value="4.14.1";} - {name="blinken";value="4.14.1";} - {name="bomber";value="4.14.1";} - {name="bovo";value="4.14.1";} - {name="cantor";value="4.14.1";} - {name="cervisia";value="4.14.1";} - {name="dolphin-plugins";value="4.14.1";} - {name="dragon";value="4.14.1";} - {name="ffmpegthumbs";value="4.14.1";} - {name="filelight";value="4.14.1";} - {name="granatier";value="4.14.1";} - {name="gwenview";value="4.14.1";} - {name="jovie";value="4.14.1";} - {name="juk";value="4.14.1";} - {name="kaccessible";value="4.14.1";} - {name="kactivities";value="4.13.3";} - {name="kajongg";value="4.14.1";} - {name="kalgebra";value="4.14.1";} - {name="kalzium";value="4.14.1";} - {name="kamera";value="4.14.1";} - {name="kanagram";value="4.14.1";} - {name="kapman";value="4.14.1";} - {name="kapptemplate";value="4.14.1";} - {name="kate";value="4.14.1";} - {name="katomic";value="4.14.1";} - {name="kblackbox";value="4.14.1";} - {name="kblocks";value="4.14.1";} - {name="kbounce";value="4.14.1";} - {name="kbreakout";value="4.14.1";} - {name="kbruch";value="4.14.1";} - {name="kcachegrind";value="4.14.1";} - {name="kcalc";value="4.14.1";} - {name="kcharselect";value="4.14.1";} - {name="kcolorchooser";value="4.14.1";} - {name="kcron";value="4.14.1";} - {name="kdeartwork";value="4.14.1";} - {name="kde-baseapps";value="4.14.1";} - {name="kde-base-artwork";value="4.14.1";} - {name="kde-dev-scripts";value="4.14.1";} - {name="kde-dev-utils";value="4.14.1";} - {name="kdegraphics-mobipocket";value="4.14.1";} - {name="kdegraphics-strigi-analyzer";value="4.14.1";} - {name="kdegraphics-thumbnailers";value="4.14.1";} - {name="kdelibs";value="4.14.1";} - {name="kdenetwork-filesharing";value="4.14.1";} - {name="kdenetwork-strigi-analyzers";value="4.14.1";} - {name="kdepim";value="4.14.1";} - {name="kdepimlibs";value="4.14.1";} - {name="kdepim-runtime";value="4.14.1";} - {name="kdeplasma-addons";value="4.14.1";} - {name="kde-runtime";value="4.14.1";} - {name="kdesdk-kioslaves";value="4.14.1";} - {name="kdesdk-strigi-analyzers";value="4.14.1";} - {name="kdesdk-thumbnailers";value="4.14.1";} - {name="kde-wallpapers";value="4.14.1";} - {name="kdewebdev";value="4.14.1";} - {name="kde-workspace";value="4.11.12";} - {name="kdf";value="4.14.1";} - {name="kdiamond";value="4.14.1";} - {name="kfilemetadata";value="4.14.1";} - {name="kfloppy";value="4.14.1";} - {name="kfourinline";value="4.14.1";} - {name="kgamma";value="4.14.1";} - {name="kgeography";value="4.14.1";} - {name="kget";value="4.14.1";} - {name="kgoldrunner";value="4.14.1";} - {name="kgpg";value="4.14.1";} - {name="khangman";value="4.14.1";} - {name="kig";value="4.14.1";} - {name="kigo";value="4.14.1";} - {name="killbots";value="4.14.1";} - {name="kimono";value="4.14.1";} - {name="kiriki";value="4.14.1";} - {name="kiten";value="4.14.1";} - {name="kjumpingcube";value="4.14.1";} - {name="klettres";value="4.14.1";} - {name="klickety";value="4.14.1";} - {name="klines";value="4.14.1";} - {name="kmag";value="4.14.1";} - {name="kmahjongg";value="4.14.1";} - {name="kmines";value="4.14.1";} - {name="kmix";value="4.14.1";} - {name="kmousetool";value="4.14.1";} - {name="kmouth";value="4.14.1";} - {name="kmplot";value="4.14.1";} - {name="knavalbattle";value="4.14.1";} - {name="knetwalk";value="4.14.1";} - {name="kolf";value="4.14.1";} - {name="kollision";value="4.14.1";} - {name="kolourpaint";value="4.14.1";} - {name="kompare";value="4.14.1";} - {name="konquest";value="4.14.1";} - {name="konsole";value="4.14.1";} - {name="kopete";value="4.14.1";} - {name="korundum";value="4.14.1";} - {name="kpat";value="4.14.1";} - {name="kppp";value="4.14.1";} - {name="kqtquickcharts";value="4.14.1";} - {name="krdc";value="4.14.1";} - {name="kremotecontrol";value="4.14.1";} - {name="kreversi";value="4.14.1";} - {name="krfb";value="4.14.1";} - {name="kross-interpreters";value="4.14.1";} - {name="kruler";value="4.14.1";} - {name="ksaneplugin";value="4.14.1";} - {name="kscd";value="4.14.1";} - {name="kshisen";value="4.14.1";} - {name="ksirk";value="4.14.1";} - {name="ksnakeduel";value="4.14.1";} - {name="ksnapshot";value="4.14.1";} - {name="kspaceduel";value="4.14.1";} - {name="ksquares";value="4.14.1";} - {name="kstars";value="4.14.1";} - {name="ksudoku";value="4.14.1";} - {name="ksystemlog";value="4.14.1";} - {name="kteatime";value="4.14.1";} - {name="ktimer";value="4.14.1";} - {name="ktouch";value="4.14.1";} - {name="ktuberling";value="4.14.1";} - {name="kturtle";value="4.14.1";} - {name="ktux";value="4.14.1";} - {name="kubrick";value="4.14.1";} - {name="kuser";value="4.14.1";} - {name="kwalletmanager";value="4.14.1";} - {name="kwordquiz";value="4.14.1";} - {name="libkcddb";value="4.14.1";} - {name="libkcompactdisc";value="4.14.1";} - {name="libkdcraw";value="4.14.1";} - {name="libkdeedu";value="4.14.1";} - {name="libkdegames";value="4.14.1";} - {name="libkexiv2";value="4.14.1";} - {name="libkipi";value="4.14.1";} - {name="libkmahjongg";value="4.14.1";} - {name="libkomparediff2";value="4.14.1";} - {name="libksane";value="4.14.1";} - {name="lokalize";value="4.14.1";} - {name="lskat";value="4.14.1";} - {name="marble";value="4.14.1";} - {name="mplayerthumbs";value="4.14.1";} - {name="nepomuk-core";value="4.14.1";} - {name="nepomuk-widgets";value="4.14.1";} - {name="okteta";value="4.14.1";} - {name="okular";value="4.14.1";} - {name="oxygen-icons";value="4.14.1";} - {name="pairs";value="4.14.1";} - {name="palapeli";value="4.14.1";} - {name="parley";value="4.14.1";} - {name="perlkde";value="4.14.1";} - {name="perlqt";value="4.14.1";} - {name="picmi";value="4.14.1";} - {name="poxml";value="4.14.1";} - {name="print-manager";value="4.14.1";} - {name="pykde4";value="4.14.1";} - {name="qtruby";value="4.14.1";} - {name="qyoto";value="4.14.1";} - {name="rocs";value="4.14.1";} - {name="smokegen";value="4.14.1";} - {name="smokekde";value="4.14.1";} - {name="smokeqt";value="4.14.1";} - {name="step";value="4.14.1";} - {name="superkaramba";value="4.14.1";} - {name="svgpart";value="4.14.1";} - {name="sweeper";value="4.14.1";} - {name="umbrello";value="4.14.1";} - {name="zeroconf-ioslave";value="4.14.1";} -]; -modules=[ -{ - module="kdemultimedia"; - split=true; - pkgs=[ - { name="audiocd-kio"; sane="audiocd_kio"; } - { name="dragon"; } - { name="ffmpegthumbs"; } - { name="juk"; } - { name="kmix"; } - { name="kscd"; } - { name="libkcddb"; } - { name="libkcompactdisc"; } - { name="mplayerthumbs"; } - ]; -} -{ - module="kdegraphics"; - split=true; - pkgs=[ - { name="gwenview"; } - { name="kamera"; } - { name="kcolorchooser"; } - { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; } - { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; } - { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; } - { name="kgamma"; } - { name="kolourpaint"; } - { name="kruler"; } - { name="ksaneplugin"; } - { name="ksnapshot"; } - { name="libkdcraw"; } - { name="libkexiv2"; } - { name="libkipi"; } - { name="libksane"; } - { name="okular"; } - { name="svgpart"; } - ]; -} -{ - module="kdelibs"; - split=true; - pkgs=[ - { name="kdelibs"; } - { name="baloo"; } - { name="baloo-widgets"; sane="baloo_widgets"; } - { name="kfilemetadata"; } - { name="nepomuk-core"; sane="nepomuk_core"; } - { name="nepomuk-widgets"; sane="nepomuk_widgets"; } - ]; -} -{ - module="kdenetwork"; - split=true; - pkgs=[ - { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; } - { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; } - { name="kget"; } - { name="kopete"; } - { name="kppp"; } - { name="krdc"; } - { name="krfb"; } - { name="zeroconf-ioslave"; sane="zeroconf_ioslave"; } - ]; -} -{ - module="kdeutils"; - split=true; - pkgs=[ - { name="ark"; } - { name="filelight"; } - { name="kcalc"; } - { name="kcharselect"; } - { name="kdf"; } - { name="kfloppy"; } - { name="kgpg"; } - { name="kremotecontrol"; } - { name="ktimer"; } - { name="kwalletmanager"; } - { name="print-manager"; sane="print_manager"; } - { name="superkaramba"; } - { name="sweeper"; } - ]; -} -{ - module="applications"; - split=true; - pkgs=[ - { name="kate"; } - { name="konsole"; } - ]; -} -{ - module="kdetoys"; - split=true; - pkgs=[ - { name="amor"; } - { name="kteatime"; } - { name="ktux"; } - ]; -} -{ - module="kdesdk"; - split=true; - pkgs=[ - { name="cervisia"; } - { name="dolphin-plugins"; sane="dolphin_plugins"; } - { name="kapptemplate"; } - { name="kcachegrind"; } - { name="kde-dev-scripts"; sane="kde_dev_scripts"; } - { name="kde-dev-utils"; sane="kde_dev_utils"; } - { name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; } - { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; } - { name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; } - { name="kompare"; } - { name="libkomparediff2"; } - { name="lokalize"; } - { name="okteta"; } - { name="poxml"; } - { name="umbrello"; } - ]; -} -{ - module="kdegames"; - split=true; - pkgs=[ - { name="bomber"; } - { name="bovo"; } - { name="granatier"; } - { name="kajongg"; } - { name="kapman"; } - { name="katomic"; } - { name="kblackbox"; } - { name="kblocks"; } - { name="kbounce"; } - { name="kbreakout"; } - { name="kdiamond"; } - { name="kfourinline"; } - { name="kgoldrunner"; } - { name="kigo"; } - { name="killbots"; } - { name="kiriki"; } - { name="kjumpingcube"; } - { name="klickety"; } - { name="klines"; } - { name="kmahjongg"; } - { name="kmines"; } - { name="knavalbattle"; } - { name="knetwalk"; } - { name="kolf"; } - { name="kollision"; } - { name="konquest"; } - { name="kpat"; } - { name="kreversi"; } - { name="kshisen"; } - { name="ksirk"; } - { name="ksnakeduel"; } - { name="kspaceduel"; } - { name="ksquares"; } - { name="ksudoku"; } - { name="ktuberling"; } - { name="kubrick"; } - { name="libkdegames"; } - { name="libkmahjongg"; } - { name="lskat"; } - { name="palapeli"; } - { name="picmi"; } - ]; -} -{ - module="kdeedu"; - split=true; - pkgs=[ - { name="analitza"; } - { name="artikulate"; } - { name="blinken"; } - { name="cantor"; } - { name="kalgebra"; } - { name="kalzium"; } - { name="kanagram"; } - { name="kbruch"; } - { name="kgeography"; } - { name="khangman"; } - { name="kig"; } - { name="kiten"; } - { name="klettres"; } - { name="kmplot"; } - { name="kqtquickcharts"; } - { name="kstars"; } - { name="ktouch"; } - { name="kturtle"; } - { name="kwordquiz"; } - { name="libkdeedu"; } - { name="marble"; } - { name="pairs"; } - { name="parley"; } - { name="rocs"; } - { name="step"; } - ]; -} -{ - module="kdeadmin"; - split=true; - pkgs=[ - { name="kcron"; } - { name="ksystemlog"; } - { name="kuser"; } - ]; -} -{ - module="kdebindings"; - split=true; - pkgs=[ - { name="kimono"; } - { name="korundum"; } - { name="kross-interpreters"; sane="kross_interpreters"; } - { name="perlkde"; } - { name="perlqt"; } - { name="pykde4"; } - { name="qtruby"; } - { name="qyoto"; } - { name="smokegen"; } - { name="smokekde"; } - { name="smokeqt"; } - ]; -} -{ - module="kdeaccessibility"; - split=true; - pkgs=[ - { name="jovie"; } - { name="kaccessible"; } - { name="kmag"; } - { name="kmousetool"; } - { name="kmouth"; } - ]; -} -{ - module="kde-baseapps"; -sane="kde_baseapps"; split=true; - pkgs=[ - { name="kde-baseapps"; sane="kde_baseapps"; } - ]; -} -{ module="kactivities"; split=false;} -{ module="kdeartwork"; split=false; - pkgs=[ - { name="ColorSchemes"; } - { name="IconThemes"; } - { name="emoticons"; } - { name="kscreensaver"; } - { name="kwin-styles"; sane="kwin_styles";} - { name="styles"; } - { name="wallpapers"; } - { name="HighResolutionWallpapers"; } - { name="WeatherWallpapers"; } - { name="desktopthemes"; } - ]; - -} -{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;} -{ module="kdepim"; split=false;} -{ module="kdepimlibs"; split=false;} -{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;} -{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;} -{ module="kde-runtime"; sane="kde_runtime"; split=false;} -{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;} -{ module="kdewebdev"; split=false; - pkgs=[ - { name="klinkstatus"; } - { name="kfilereplace"; } - { name="kimagemapeditor"; } - { name="kommander"; } - ]; - -} -{ module="kde-workspace"; sane="kde_workspace"; split=false;} -{ module="oxygen-icons"; sane="oxygen_icons"; split=false;} -]; -} diff --git a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix new file mode 100644 index 000000000000..d29840735abc --- /dev/null +++ b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix @@ -0,0 +1,626 @@ +{stable=true; +hashes=builtins.listToAttrs[ + {name="amor";value="1n9qhy7pcprhh7a5v5i9xi5pr3a3lbg08j315kbahn89py2wqk6x";} + {name="analitza";value="08p4rky4q4c1r5mkw087s31k38xvc8k50fyahf6y0bkc03v7q8h0";} + {name="ark";value="1p5q96i7hxp80c3hzxaqfixc3rn16cdnhhhjdaqz7k5zkgmgfbnb";} + {name="artikulate";value="1spb3qwf62agc76vnji7hgm1xsahb7i2fg818gmqwd9ndd4rf0fk";} + {name="audiocd-kio";value="0572hwlzn4l53d3xi2w20pgdf6wsyankr49q4522ckfjw9zh2p33";} + {name="baloo";value="0p3awsrc20q79kq04x0vjz84acxz6gjm9jc7j2al4kybkyzx5p4y";} + {name="baloo-widgets";value="1lxwm8cb1f1dy91zr1d54alw0f67d30kixhr7hnbpqlanfw44sbv";} + {name="blinken";value="0zmfvj64xzgi9mmdx92csknm6nrgq57z458dmqr82glvdq6sy53w";} + {name="bomber";value="09bwp2fnyhi2jq6j36ssvcd02gxihd162b14hj4h76p50q9142ly";} + {name="bovo";value="0pflfpnxni01nfmljrb356bvb9sq7xg1yx7ylli8ws591s1wjv2f";} + {name="cantor";value="1qb58pnrpn23qr94j1nrdyj87yxc6gr9drra76mq583acra19j4g";} + {name="cervisia";value="1dgg0m8l2vb1ypkzq2lvp8d5faxn005z9fylf4pg6yczgj51y2m0";} + {name="dolphin-plugins";value="1vb5q9xwxplwxwfs57fqy1bi2hsq96cy1z705lbyiy1pq1g0xw5p";} + {name="dragon";value="195hv0l3w6n32qghdbqj3jzl4833lkbw90q53rnay56ia3azd7nk";} + {name="ffmpegthumbs";value="1waj02snh48qk8h021p1agy9pifpb7k7848ni9cyr1q76xmqbw3r";} + {name="filelight";value="16pp16zdvm8l6aaywj0cvvmpc1fgwr1ik1nf9s3vnj6pnqw91mc1";} + {name="granatier";value="08fs7nvhgg33cr54v2ib5p64lc9kmzshl12swsa88sp1fzakpdlj";} + {name="gwenview";value="1817nhd3qwghimbh4v57nxpbk9y2z9gh33i9s7rr190fqa5x2ci0";} + {name="jovie";value="06cvnycbab5w1vgws6fyfbpdnps63mvss2gnsv6ig1gm18pq8kh4";} + {name="juk";value="02dv0v34dbac9wpfj0p1kh438b380025qg0mpnhdisw9ng4igx83";} + {name="kaccessible";value="0blkyalm45c1q670wp9jn6mmqq4igw16hlsa39bv1dj82m5f0bkb";} + {name="kajongg";value="1f4fv1s1x2bg9ghf317br0kl6lgj9nacmck6fv1g3r14j60z5sfn";} + {name="kalgebra";value="0zgnppmnm2g0anq4yldlyd4bncjabr72b66h4s9ns6wd7kk9z6rs";} + {name="kalzium";value="1r8phdshq9whcglb7nyjcg8qjqnqya8rj1rm91mwax18jin0i3ab";} + {name="kamera";value="09n11d1hvl6xxfsp9j72q6ja103vda54gmrl7lqscnp5nvlfl2vg";} + {name="kanagram";value="0ns95365rdzx4v7akrsnbz1vgyl10d5h4jnavg1x08yrq7sm3rcm";} + {name="kapman";value="1c27dlpdnnmvxqwsr5359ixl386z54ijs5ysb5vd7f0nw980kjk0";} + {name="kapptemplate";value="089znigfd0c4gb318qjbxhyk3gc6j9z4vb4lw76g3nwjkk52s35s";} + {name="kate";value="0zbhgrhpa3f9zaf8a9b0s69p05m17rg6harvmyfbb9kgqgi4lgai";} + {name="katomic";value="1j3y0zfwcms2wfv2v3jpn6lisl2qw5zhvwswhyc2k44wq934vwq6";} + {name="kblackbox";value="1vlc37il59xh6k4zcap7cs25b1r70cbzi0b6jybpwhxrq2zh1zmz";} + {name="kblocks";value="16k8j3h8dvjz2yqdb22dkb9z6mi3k28c4wkhpa1l5q151kb8q6ba";} + {name="kbounce";value="16g2f6vvax74gqz3jn1b9rfwcdaia7dphnwg37d03ayflp2s7mji";} + {name="kbreakout";value="1011gcbajlk4h5z16nyr8xxkqz5k86vwgn1h5k4fqqpbl2g9aryr";} + {name="kbruch";value="0jrd0hqqiaghyhj1rw66j0skqs1f7p21czx3adiy2v50ni70i84z";} + {name="kcachegrind";value="0954zvzzhfc76msbs7pc10c9nqd4ganqwqdyn051n4204np1fyd6";} + {name="kcalc";value="03px8j0ga6bbla6bxbj3ahcw4jxwb4kkqhls0rxldbfkjwz2q1wz";} + {name="kcharselect";value="0js5wxdjmzg2yq83m0kpil9mdjwb1bschh8d9hsk044327i9wmz7";} + {name="kcolorchooser";value="1z5snm4vxn6whdhxh64kd18bvl58i65qb4p4xdznrc0gyrgnl92a";} + {name="kcron";value="1d685808rya0fjysn2smh0d1p6xqcg7a1r3ah54hnj58y4r3rxyc";} + {name="kdeartwork";value="1x0fz21xi54gxz4dkk7qhpv9a5j3nc0crgvygpq32jrkvv5ygp4k";} + {name="kde-baseapps";value="1nz6mm257rd916dklnbrix4r25scylvjil99b1djb35blx1aynqj";} + {name="kde-base-artwork";value="14l83fd6drwpl9j4v876afp3k7na3dirpjwh03c1a7lcn27grzkn";} + {name="kde-dev-scripts";value="17zw6ckbvq5iqykc3ijdnp7j0nh4k06jgqwfsrnqnvp5fqqcf1vn";} + {name="kde-dev-utils";value="16kdr5i48jlflzdv1y5n2xca2kws5whwlymliqdqy7wlcgy0lh7q";} + {name="kdegraphics-mobipocket";value="0m41s8scy5hym6mk0kfmjj54dc3yxahsdrliaadixhp0fx02cx0v";} + {name="kdegraphics-strigi-analyzer";value="08d2vrghwqkw4mg4vmgsynfnhygxpavxnscvs3z70hdff7i001f0";} + {name="kdegraphics-thumbnailers";value="1lhb7m298mbz7dk50savqdz3p6lkbscn0gi6bqapji24464vlb8k";} + {name="kdelibs";value="17pxihhcbinr3jpwvi1iwfnqs2wiqh0jgf1is05yz13122hns87q";} + {name="kdenetwork-filesharing";value="0a8vw6jj0kz0lq96mj3mfzpdvb6xpw8xvccwxhjqp164bzqdz66d";} + {name="kdenetwork-strigi-analyzers";value="14px6ddp8flqd40bww0sl71jmn5bfqm9j3v6rqm63ii7z87qk6xl";} + {name="kdepim";value="0i7r68r5nzflmpdkkzpj5xc3fwxg5903g1fj5g1yn79v5zx1gzd3";} + {name="kdepimlibs";value="1mv8k0wr0wr0hnlb1al50nmz8d77vbm73p2hhipipgliq6zb3vb5";} + {name="kdepim-runtime";value="03xmm9c5whr96bwrdrdmaq8w53qg251g0kd479g02x3br20yi3rd";} + {name="kdeplasma-addons";value="094gj8z1xx4d5vlkq8izifpgvh6sfq36bh08n8ylfa976qq8xm8j";} + {name="kde-runtime";value="01c6pjsq4xp75yma8wbfpg92lrvvppp9ighlxvy7z2afkd8lx9vq";} + {name="kdesdk-kioslaves";value="0k0ff1nq10z0gajr3rnrbhm1rml42d2fi9ahwxdjnxyaav31ml24";} + {name="kdesdk-strigi-analyzers";value="12r17q7mg74prir52h80prc61bn5rq1031cbp3xswh658srf1lg0";} + {name="kdesdk-thumbnailers";value="1kmdpb52kg04smgp9v5a51bjjrw6fsh347ajnxhr8ygg7d8zw763";} + {name="kde-wallpapers";value="05jb5ry6ziz64lqxrmi7c53n8j5hpgrz3lii4y1wnr204342ln6k";} + {name="kdewebdev";value="0sclb72i6nbrsz4a5jlxf7mgngdn7wbd669fqa7xw6axrsjj1cgn";} + {name="kde-workspace";value="00bf708i0vzl47dgcr8mp61n7k0xjzqnlb8j1smliy5bydiaa86g";} + {name="kdf";value="0y5d6d6wl5ycmcswrkgwc301jbj77jnb46sgl38i9q4nf7b3ham0";} + {name="kdiamond";value="0z8c07vx3k466ysri1syka0wm0bkz581kb72d5sns86np0rg0wmp";} + {name="kfilemetadata";value="0wak1nphnphcam8r6pba7m2gld4w04dkk8qn23myjammv3myc59i";} + {name="kfloppy";value="02sv0k6cqvd9zf7hwsjxgb6l3jawx5fkg1siffbb62cgp49y8fw0";} + {name="kfourinline";value="0zhvpbgmk89cn7pjzgdzc4kah8rkjj3w97yym205phc8fc36nwa4";} + {name="kgamma";value="1cpm1d0sr3zphkqpfg11farqal2h2hl6gcdnf8p1b10np1b8rxwk";} + {name="kgeography";value="125772x1kbh136ymja903w2k7vgahs2d1nw471nr8fx511pnxcj4";} + {name="kget";value="1v1j5sfsym1sz8w6ll23il0n4qq74sjx9c9ij29zhdwxy21xasv9";} + {name="kgoldrunner";value="1mc93hwl1diygjlpalf2wdzhdnhcjq1mj9srlxhr5f1w0687pzar";} + {name="kgpg";value="0ihc5pp1mxsa67ynrvf2mpxwhyni6lkcdarj1xmvpcf56nlkfzdw";} + {name="khangman";value="0wddflgsfslbhdpkl39qipnc2xx6b23ci1gr19ipyiyif8d74zix";} + {name="kig";value="1kp3rhsfprp9c9f0wp264x9d6n454ff26ysfnli9gl5l2imxhw9f";} + {name="kigo";value="1gdsr31ybc07bkcyfrrm4fz081l3l5h5rv46ld0f6rfmxm3xv01j";} + {name="killbots";value="1d31pxvjls5a9m521a9n7rynl317585ald1nn4bpk2f138475d12";} + {name="kimono";value="17n1nx66kqcc2wfp6ql7xpn8lq9y3b6djf6y1n3ajvyjh8m357jf";} + {name="kiriki";value="00iis3vx95nlcarysy9mrbz4jnw4rbxgmjpy48z85imdd7yydd8x";} + {name="kiten";value="17n6q1kan8dlxqhnhk73nzn4jg39yw1hh88vsndswmx1s4k68x7r";} + {name="kjumpingcube";value="0p9kswv2wnxqgmlvwbcwxrb27b0h6by1zx91k5vmv16qm789gfk9";} + {name="klettres";value="01vf6cdiafncv0n35cp5v44azxkjjzn1rp1r8rw05vlmh2296p0l";} + {name="klickety";value="0c156fkchcpfybmvc3qkvdqizc62b758drkdqc8pawal8766ff27";} + {name="klines";value="1w8k18azfqsb0q90aijn7xfkkfrbnrnfwn6w66wc8xn2b6hibahl";} + {name="kmag";value="091h7vb3wcp5zg06mp240a2vdhj18xqw40i25djkl7a861xxhpb8";} + {name="kmahjongg";value="0qb933kjv205narrkgr83ha516pldpfxi65l8yhm7801nhljhpsg";} + {name="kmines";value="103lzgr7p2ic29afn8imk6mh7ab0pfpcrdwlsg21zkvrrbrcaq6k";} + {name="kmix";value="153fif25m7w94g8g20ahg5fjppkf3bi8rn4njq1zl1g0bsnrgpfp";} + {name="kmousetool";value="1z62h71mcxdrp4y2dl497x89295m6mlilaqnvp9ijpw6fm4b9czd";} + {name="kmouth";value="06n6srd6011bk29w5xnqihvs6pbhmg0sf5h7mwfwp4szvm167hc4";} + {name="kmplot";value="1xajighandffidp85rjjch4si0gb3mfjks3yh5i8sig8j4797b86";} + {name="knavalbattle";value="1fmh6qds3ql5w3nsw6zk18ia0z4immpwj8sl35qq2kkx1g0hbv0c";} + {name="knetwalk";value="0h17ck55fdwipvsdqfdhmn612jb1nrq6vkj0g9i3qchvw9qz0hcs";} + {name="kolf";value="006h7iqwn55bjrgsc9p6316lgvxvda0kvcdxxfd4sqg2ain64h7q";} + {name="kollision";value="1hc07r3z4w8gqby0pyb5m1ylp8izmvx0ib3dlpmh2jd5khp0qyhj";} + {name="kolourpaint";value="0kf6wjxcd80mc4hxb4nhpksxj0bm9339i835iwpsbjfn8xs1s55h";} + {name="kompare";value="0zhpw7kz1c9hcmqfhnvsg39xw4zhi36q39bgifcbyfvjs0ymbvi4";} + {name="konquest";value="125ciy00h77y7byrlnqv0zhw3pxp9a5i5clz12dlc1z251z3l588";} + {name="konsole";value="0mgi0fw5sc216cy8j45g4zd733d02l2d6z4wjcxqm7rh61lhwx9g";} + {name="kopete";value="0i9qq7k19vyss1k22ppr6xq3y3bb6mndg8b5323f0cvjlpgcc8xs";} + {name="korundum";value="0zapd60frhq652p1xnpaj680vpaqr595dqbhha552c4dfabvgv4j";} + {name="kpat";value="0kfvhkwamrfllgmd8yl6p3xlc0jmivxy0rsdrxpabvpb0vcqh9ml";} + {name="kppp";value="01pj8q1m3gwww6wvgwnd24lgbyvzfm6gskv2c802lzjcj7p9218m";} + {name="kqtquickcharts";value="1vml9scxva9gr8bb6rkxl8gaaghx3lyvwcwcifq5hz0154q875d5";} + {name="krdc";value="07p67z8gh9xnnr71kjy8g6ki07w22c767qbrk2fzar2zvc8dgnw6";} + {name="kremotecontrol";value="06nkg9chkimmzs1ww0sbxglssibby3157jkw6bncg661yfbsd48r";} + {name="kreversi";value="1pjjw3vim3pjazcxggs9axglkl7l1g0fpzqgjdxxn0p8vfh84jgg";} + {name="krfb";value="08qpw93slflx7whp9jbq1bsq1ikm0pgdvys11idvhmzl2lg86j1d";} + {name="kross-interpreters";value="1v6xjdpflzx3gi12vaf6ywzhb4ycrnawb839pjbpw3cy83p1m6pa";} + {name="kruler";value="08b54gimg0z4hl9lgndsbl797r5h88mjlamzzv10k0rf7rsd0924";} + {name="ksaneplugin";value="1rcmjkzr3yxanpvkfvbvf06dg57m1mmfmmy4n6ixy51ir0mh1v5j";} + {name="kscd";value="01nchy6pb4spvbhgmkfqglmrm8jgkslg6k1q1vzvahyns4lv8b6d";} + {name="kshisen";value="0i9imqb4zz2yvc80dgvbz08s3pxncm8dnvvwxjaw674nks0jxlh8";} + {name="ksirk";value="1lnsz5fg86vqdks3d5dfsxzkdxs8kzakjrwx4ixpab5xhq05vzls";} + {name="ksnakeduel";value="0721xwg3rjwib3aazgzhdmph0bpl2p5zkha8jbmq7aqr5i8ddkx0";} + {name="ksnapshot";value="10grzlp7sq367g91858d16sadzipzmgwczhnb5xvy0437lqhhz7c";} + {name="kspaceduel";value="0cwgmpv2xcjwz914hqx6rivi5sk4x66imcdqy7pjnj5vk4f197m7";} + {name="ksquares";value="1zzg6y6zfqd1a0939hd1wy7ix4wld7ixp5pz2qs315g51m9lpn7i";} + {name="kstars";value="1pjvy476yjir4z6x1j7192xjr9m0zcxq3x3lpvsxf92pk3l4c73p";} + {name="ksudoku";value="0qgjx7fbawhn63vv37wv4z56jf0gi4chs64aw9bllbq52syirmgb";} + {name="ksystemlog";value="11xh1psqhq7vimymb394kxjk83yax3gzi9fdckjspk6p10cycln2";} + {name="kteatime";value="16rrlxc67afkin3afdf1s9dlr7z2281dfsja64pdrrdilwwpyqwi";} + {name="ktimer";value="02yw6zgp5wbgfvq38adbnn8mqpjc69chz4rndphmyskvflszz6n4";} + {name="ktouch";value="110haqrk8ixq7hmsb8hymkbqw7jygybxh467p4ag0pczr09gr3d3";} + {name="ktuberling";value="1jpnzb6dbmcv2f0hb7y3alqn9jqq589jzz2chbvlsm7p7xnpv2h2";} + {name="kturtle";value="1z6mx1ls5ymh5biyzf5f99q6qapr4a2jgxdi2za0qclqjsla4hrf";} + {name="ktux";value="1n854lccqs540c0lsg6794g0ir25zli1h6z92vyccsvranjb6k9r";} + {name="kubrick";value="1sa53z2bdk4rnvr5fs73nazl1aisbcg9yyianazggqshhy0l6w8k";} + {name="kuser";value="1rkjah60cwpkp355ldcbvb7cwap9ib1mvj1aska9zn2kad0dg8n1";} + {name="kwalletmanager";value="1w3csapcddpzn7l7v4a2802wwh6d1zm8vqx9lz3wmajczpx6xjab";} + {name="kwordquiz";value="0zvxzva65cvqin64v105zh9hwbv0yi8mx9lll4ybbp915dw8701q";} + {name="libkcddb";value="0xrmg53p5lh4ral2l5zh96angaf9czhih3zzvwr9qr9h9ks5vrn1";} + {name="libkcompactdisc";value="14hjlql1vzzszfpxhz0rzvjpi0q7f20ry5857lpdbqhnrc0p3bmg";} + {name="libkdcraw";value="0ksarwq8aaxc77cp0ryfnw1n311wkykzdlhj03rln8jjlbdm3j3q";} + {name="libkdeedu";value="1i2sfby6ya8cfkdk28a9ia5zixwbixy56ql488v41w29mf1jnvzx";} + {name="libkdegames";value="0rd24v67fg09h5ilr4r7g9q21z165q1pm37y17l2qgjzr04czwn4";} + {name="libkexiv2";value="1z8fmxfphx7szf4a17fs7zfjyxj6wncbvsphfvf6i5rlqy60g1y4";} + {name="libkipi";value="0fjm96pwird4km4wlhag1b67czwi03vsc2anng9iw3l4avavmvfw";} + {name="libkmahjongg";value="1ab66zgxya23yi7l3ga78yrm1kkr0l6hl709khyyk667kgzfqf16";} + {name="libkomparediff2";value="0bx672rysz78y2322lmm8a0i1k9v755wx8vmh538amk5smq936mz";} + {name="libksane";value="18nd90hrfmrgwmm6p5hgdr9dwc7z9978v2ibmjiim8dv44myk2is";} + {name="lokalize";value="1ig5mvzcspyz6ihr43fmwnhw560pby2kij0bz598xjkvb5hwfn8g";} + {name="lskat";value="01vgf40apf9x322k4f3i78n9ha01maga3xh3zvw4kmbs8kd662bi";} + {name="marble";value="1w603miykq0s84jk6j17b7pg44rd4az0dhzgq7j7d6dfcz7nfrjd";} + {name="mplayerthumbs";value="0zin10mah7wm7f5v3hqffbwq2pqs7v39i2qhdizrijp85wsp925v";} + {name="nepomuk-core";value="0gdb7vk3qjvv04a5xqwlv0f4bjn391a3k3hkgibkql9ggxbjbrvl";} + {name="nepomuk-widgets";value="1qbrs56af9zdzhfb8964p44706gdf4j0bmj378xy5jva7km9cypx";} + {name="okteta";value="1vgs9kwp1bb5fvp1ja5hzvgll1s7n3ds5gg4500khy47k2z2cvmx";} + {name="okular";value="0ijw71vkk1lj873hqczc23vllhkc9s0miipsbllxblx57rgi5qp6";} + {name="oxygen-icons";value="1nwjjcm0isjnn3i8xf75nk6mhbg1zm20farlmyrzx261r2cj68lv";} + {name="pairs";value="124rpv22cx6bi65ixz5889zk46q17913w4l80d94pp9l6aypn4fm";} + {name="palapeli";value="08rklllik0zsrw19ff6b6l0ijxkyxy8wn5mxm3i07h9pbzv1ga5k";} + {name="parley";value="1mx0s7dmcmprrr44iim3pzr782cacndqiqiy7zz1zdw41mif3q16";} + {name="perlkde";value="0aiv8wmv08yp19rk228m7wirh43dagz4yapp3f7bgg50f4c6rpkb";} + {name="perlqt";value="0villxkgqwscx0sipfqnacxdyi3kzkmma4p9fkjq0hvqzq1b4pd0";} + {name="picmi";value="0x6nv6ahgsb90brckgv97grsmdb4za5m9izrkcyz6rg5gnn848c4";} + {name="poxml";value="020lf3wc7vn9d01pqqn1ygvvx7699vxkk5n9hq8zw7rf6n25gifx";} + {name="print-manager";value="0df1zca0cdk3qdyjfsymhghdadixz3fwm5w4h833iwf7fgr3c5q8";} + {name="pykde4";value="1z40gnkyjlv6ds3cmpzvv99394rhmydr6rxx7qj33m83xnsxgfbz";} + {name="qtruby";value="179wjl7w8vdm1606m1dzphhmcqxynfbdrcnrjzpyyvhibsdyfl10";} + {name="qyoto";value="0inwdnwhmi3cf82z0ni1abf621l6322r84kq447cqia6rkmf59j4";} + {name="rocs";value="1z6lk3xzbrw6581gy8hd3lm3ry4vkphg9wcdl8l03az1nyk2xp61";} + {name="smokegen";value="1if43r4icp7fz8ngmfw8i5wdylak48j79pp3bdvizfwn4pazl2s3";} + {name="smokekde";value="099c4qkpwwhbj9yibsm5zkgczv22qs4vd6s84v1p347kxr5in1hd";} + {name="smokeqt";value="02drfr1bnhac27a4c8pvbvvag250pmg71iz7ig968bp2gqvxcf99";} + {name="step";value="14f4a2k2al21ynkmwqrh5c33fgn6bhw3g461yhvmnq2sf8fwg8wb";} + {name="superkaramba";value="1jf3dck707svpbnbpwv46mlcgf5x52djnix5wjsg3wmkipgs4w88";} + {name="svgpart";value="1bj9gaaj6nqdgchmqnn381288aqw09ky0kbm1naddqa82pk196f6";} + {name="sweeper";value="0fhq9n1ffhcka37j6m9gs0rdxs0dzfn7lnl66v9wpgw075lfiaxx";} + {name="umbrello";value="0cvks49ij449grh3ldbpmmagz3yx61zq1g0fsg2ii9pqzbd6hn3x";} + {name="zeroconf-ioslave";value="0hhm5jj0kbi1y18m4x50hnpnfi1cjgh6mglggbscp8xr32jgmgjm";} +]; +versions=builtins.listToAttrs[ + {name="amor";value="4.14.3";} + {name="analitza";value="4.14.3";} + {name="ark";value="4.14.3";} + {name="artikulate";value="4.14.3";} + {name="audiocd-kio";value="4.14.3";} + {name="baloo";value="4.14.3";} + {name="baloo-widgets";value="4.14.3";} + {name="blinken";value="4.14.3";} + {name="bomber";value="4.14.3";} + {name="bovo";value="4.14.3";} + {name="cantor";value="4.14.3";} + {name="cervisia";value="4.14.3";} + {name="dolphin-plugins";value="4.14.3";} + {name="dragon";value="4.14.3";} + {name="ffmpegthumbs";value="4.14.3";} + {name="filelight";value="4.14.3";} + {name="granatier";value="4.14.3";} + {name="gwenview";value="4.14.3";} + {name="jovie";value="4.14.3";} + {name="juk";value="4.14.3";} + {name="kaccessible";value="4.14.3";} + {name="kactivities";value="4.13.3";} + {name="kajongg";value="4.14.3";} + {name="kalgebra";value="4.14.3";} + {name="kalzium";value="4.14.3";} + {name="kamera";value="4.14.3";} + {name="kanagram";value="4.14.3";} + {name="kapman";value="4.14.3";} + {name="kapptemplate";value="4.14.3";} + {name="kate";value="4.14.3";} + {name="katomic";value="4.14.3";} + {name="kblackbox";value="4.14.3";} + {name="kblocks";value="4.14.3";} + {name="kbounce";value="4.14.3";} + {name="kbreakout";value="4.14.3";} + {name="kbruch";value="4.14.3";} + {name="kcachegrind";value="4.14.3";} + {name="kcalc";value="4.14.3";} + {name="kcharselect";value="4.14.3";} + {name="kcolorchooser";value="4.14.3";} + {name="kcron";value="4.14.3";} + {name="kdeartwork";value="4.14.3";} + {name="kde-baseapps";value="4.14.3";} + {name="kde-base-artwork";value="4.14.3";} + {name="kde-dev-scripts";value="4.14.3";} + {name="kde-dev-utils";value="4.14.3";} + {name="kdegraphics-mobipocket";value="4.14.3";} + {name="kdegraphics-strigi-analyzer";value="4.14.3";} + {name="kdegraphics-thumbnailers";value="4.14.3";} + {name="kdelibs";value="4.14.3";} + {name="kdenetwork-filesharing";value="4.14.3";} + {name="kdenetwork-strigi-analyzers";value="4.14.3";} + {name="kdepim";value="4.14.3";} + {name="kdepimlibs";value="4.14.3";} + {name="kdepim-runtime";value="4.14.3";} + {name="kdeplasma-addons";value="4.14.3";} + {name="kde-runtime";value="4.14.3";} + {name="kdesdk-kioslaves";value="4.14.3";} + {name="kdesdk-strigi-analyzers";value="4.14.3";} + {name="kdesdk-thumbnailers";value="4.14.3";} + {name="kde-wallpapers";value="4.14.3";} + {name="kdewebdev";value="4.14.3";} + {name="kde-workspace";value="4.11.14";} + {name="kdf";value="4.14.3";} + {name="kdiamond";value="4.14.3";} + {name="kfilemetadata";value="4.14.3";} + {name="kfloppy";value="4.14.3";} + {name="kfourinline";value="4.14.3";} + {name="kgamma";value="4.14.3";} + {name="kgeography";value="4.14.3";} + {name="kget";value="4.14.3";} + {name="kgoldrunner";value="4.14.3";} + {name="kgpg";value="4.14.3";} + {name="khangman";value="4.14.3";} + {name="kig";value="4.14.3";} + {name="kigo";value="4.14.3";} + {name="killbots";value="4.14.3";} + {name="kimono";value="4.14.3";} + {name="kiriki";value="4.14.3";} + {name="kiten";value="4.14.3";} + {name="kjumpingcube";value="4.14.3";} + {name="klettres";value="4.14.3";} + {name="klickety";value="4.14.3";} + {name="klines";value="4.14.3";} + {name="kmag";value="4.14.3";} + {name="kmahjongg";value="4.14.3";} + {name="kmines";value="4.14.3";} + {name="kmix";value="4.14.3";} + {name="kmousetool";value="4.14.3";} + {name="kmouth";value="4.14.3";} + {name="kmplot";value="4.14.3";} + {name="knavalbattle";value="4.14.3";} + {name="knetwalk";value="4.14.3";} + {name="kolf";value="4.14.3";} + {name="kollision";value="4.14.3";} + {name="kolourpaint";value="4.14.3";} + {name="kompare";value="4.14.3";} + {name="konquest";value="4.14.3";} + {name="konsole";value="4.14.3";} + {name="kopete";value="4.14.3";} + {name="korundum";value="4.14.3";} + {name="kpat";value="4.14.3";} + {name="kppp";value="4.14.3";} + {name="kqtquickcharts";value="4.14.3";} + {name="krdc";value="4.14.3";} + {name="kremotecontrol";value="4.14.3";} + {name="kreversi";value="4.14.3";} + {name="krfb";value="4.14.3";} + {name="kross-interpreters";value="4.14.3";} + {name="kruler";value="4.14.3";} + {name="ksaneplugin";value="4.14.3";} + {name="kscd";value="4.14.3";} + {name="kshisen";value="4.14.3";} + {name="ksirk";value="4.14.3";} + {name="ksnakeduel";value="4.14.3";} + {name="ksnapshot";value="4.14.3";} + {name="kspaceduel";value="4.14.3";} + {name="ksquares";value="4.14.3";} + {name="kstars";value="4.14.3";} + {name="ksudoku";value="4.14.3";} + {name="ksystemlog";value="4.14.3";} + {name="kteatime";value="4.14.3";} + {name="ktimer";value="4.14.3";} + {name="ktouch";value="4.14.3";} + {name="ktuberling";value="4.14.3";} + {name="kturtle";value="4.14.3";} + {name="ktux";value="4.14.3";} + {name="kubrick";value="4.14.3";} + {name="kuser";value="4.14.3";} + {name="kwalletmanager";value="4.14.3";} + {name="kwordquiz";value="4.14.3";} + {name="libkcddb";value="4.14.3";} + {name="libkcompactdisc";value="4.14.3";} + {name="libkdcraw";value="4.14.3";} + {name="libkdeedu";value="4.14.3";} + {name="libkdegames";value="4.14.3";} + {name="libkexiv2";value="4.14.3";} + {name="libkipi";value="4.14.3";} + {name="libkmahjongg";value="4.14.3";} + {name="libkomparediff2";value="4.14.3";} + {name="libksane";value="4.14.3";} + {name="lokalize";value="4.14.3";} + {name="lskat";value="4.14.3";} + {name="marble";value="4.14.3";} + {name="mplayerthumbs";value="4.14.3";} + {name="nepomuk-core";value="4.14.3";} + {name="nepomuk-widgets";value="4.14.3";} + {name="okteta";value="4.14.3";} + {name="okular";value="4.14.3";} + {name="oxygen-icons";value="4.14.3";} + {name="pairs";value="4.14.3";} + {name="palapeli";value="4.14.3";} + {name="parley";value="4.14.3";} + {name="perlkde";value="4.14.3";} + {name="perlqt";value="4.14.3";} + {name="picmi";value="4.14.3";} + {name="poxml";value="4.14.3";} + {name="print-manager";value="4.14.3";} + {name="pykde4";value="4.14.3";} + {name="qtruby";value="4.14.3";} + {name="qyoto";value="4.14.3";} + {name="rocs";value="4.14.3";} + {name="smokegen";value="4.14.3";} + {name="smokekde";value="4.14.3";} + {name="smokeqt";value="4.14.3";} + {name="step";value="4.14.3";} + {name="superkaramba";value="4.14.3";} + {name="svgpart";value="4.14.3";} + {name="sweeper";value="4.14.3";} + {name="umbrello";value="4.14.3";} + {name="zeroconf-ioslave";value="4.14.3";} +]; +modules=[ +{ + module="kdemultimedia"; + split=true; + pkgs=[ + { name="audiocd-kio"; sane="audiocd_kio"; } + { name="dragon"; } + { name="ffmpegthumbs"; } + { name="juk"; } + { name="kmix"; } + { name="kscd"; } + { name="libkcddb"; } + { name="libkcompactdisc"; } + { name="mplayerthumbs"; } + ]; +} +{ + module="kdegraphics"; + split=true; + pkgs=[ + { name="gwenview"; } + { name="kamera"; } + { name="kcolorchooser"; } + { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; } + { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; } + { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; } + { name="kgamma"; } + { name="kolourpaint"; } + { name="kruler"; } + { name="ksaneplugin"; } + { name="ksnapshot"; } + { name="libkdcraw"; } + { name="libkexiv2"; } + { name="libkipi"; } + { name="libksane"; } + { name="okular"; } + { name="svgpart"; } + ]; +} +{ + module="kdelibs"; + split=true; + pkgs=[ + { name="kdelibs"; } + { name="baloo"; } + { name="baloo-widgets"; sane="baloo_widgets"; } + { name="kfilemetadata"; } + { name="nepomuk-core"; sane="nepomuk_core"; } + { name="nepomuk-widgets"; sane="nepomuk_widgets"; } + ]; +} +{ + module="kdenetwork"; + split=true; + pkgs=[ + { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; } + { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; } + { name="kget"; } + { name="kopete"; } + { name="kppp"; } + { name="krdc"; } + { name="krfb"; } + { name="zeroconf-ioslave"; sane="zeroconf_ioslave"; } + ]; +} +{ + module="kdeutils"; + split=true; + pkgs=[ + { name="ark"; } + { name="filelight"; } + { name="kcalc"; } + { name="kcharselect"; } + { name="kdf"; } + { name="kfloppy"; } + { name="kgpg"; } + { name="kremotecontrol"; } + { name="ktimer"; } + { name="kwalletmanager"; } + { name="print-manager"; sane="print_manager"; } + { name="superkaramba"; } + { name="sweeper"; } + ]; +} +{ + module="applications"; + split=true; + pkgs=[ + { name="kate"; } + { name="konsole"; } + ]; +} +{ + module="kdetoys"; + split=true; + pkgs=[ + { name="amor"; } + { name="kteatime"; } + { name="ktux"; } + ]; +} +{ + module="kdesdk"; + split=true; + pkgs=[ + { name="cervisia"; } + { name="dolphin-plugins"; sane="dolphin_plugins"; } + { name="kapptemplate"; } + { name="kcachegrind"; } + { name="kde-dev-scripts"; sane="kde_dev_scripts"; } + { name="kde-dev-utils"; sane="kde_dev_utils"; } + { name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; } + { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; } + { name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; } + { name="kompare"; } + { name="libkomparediff2"; } + { name="lokalize"; } + { name="okteta"; } + { name="poxml"; } + { name="umbrello"; } + ]; +} +{ + module="kdegames"; + split=true; + pkgs=[ + { name="bomber"; } + { name="bovo"; } + { name="granatier"; } + { name="kajongg"; } + { name="kapman"; } + { name="katomic"; } + { name="kblackbox"; } + { name="kblocks"; } + { name="kbounce"; } + { name="kbreakout"; } + { name="kdiamond"; } + { name="kfourinline"; } + { name="kgoldrunner"; } + { name="kigo"; } + { name="killbots"; } + { name="kiriki"; } + { name="kjumpingcube"; } + { name="klickety"; } + { name="klines"; } + { name="kmahjongg"; } + { name="kmines"; } + { name="knavalbattle"; } + { name="knetwalk"; } + { name="kolf"; } + { name="kollision"; } + { name="konquest"; } + { name="kpat"; } + { name="kreversi"; } + { name="kshisen"; } + { name="ksirk"; } + { name="ksnakeduel"; } + { name="kspaceduel"; } + { name="ksquares"; } + { name="ksudoku"; } + { name="ktuberling"; } + { name="kubrick"; } + { name="libkdegames"; } + { name="libkmahjongg"; } + { name="lskat"; } + { name="palapeli"; } + { name="picmi"; } + ]; +} +{ + module="kdeedu"; + split=true; + pkgs=[ + { name="analitza"; } + { name="artikulate"; } + { name="blinken"; } + { name="cantor"; } + { name="kalgebra"; } + { name="kalzium"; } + { name="kanagram"; } + { name="kbruch"; } + { name="kgeography"; } + { name="khangman"; } + { name="kig"; } + { name="kiten"; } + { name="klettres"; } + { name="kmplot"; } + { name="kqtquickcharts"; } + { name="kstars"; } + { name="ktouch"; } + { name="kturtle"; } + { name="kwordquiz"; } + { name="libkdeedu"; } + { name="marble"; } + { name="pairs"; } + { name="parley"; } + { name="rocs"; } + { name="step"; } + ]; +} +{ + module="kdeadmin"; + split=true; + pkgs=[ + { name="kcron"; } + { name="ksystemlog"; } + { name="kuser"; } + ]; +} +{ + module="kdebindings"; + split=true; + pkgs=[ + { name="kimono"; } + { name="korundum"; } + { name="kross-interpreters"; sane="kross_interpreters"; } + { name="perlkde"; } + { name="perlqt"; } + { name="pykde4"; } + { name="qtruby"; } + { name="qyoto"; } + { name="smokegen"; } + { name="smokekde"; } + { name="smokeqt"; } + ]; +} +{ + module="kdeaccessibility"; + split=true; + pkgs=[ + { name="jovie"; } + { name="kaccessible"; } + { name="kmag"; } + { name="kmousetool"; } + { name="kmouth"; } + ]; +} +{ + module="kde-baseapps"; +sane="kde_baseapps"; split=true; + pkgs=[ + { name="kde-baseapps"; sane="kde_baseapps"; } + ]; +} +{ module="kactivities"; split=false;} +{ module="kdeartwork"; split=false; + pkgs=[ + { name="ColorSchemes"; } + { name="IconThemes"; } + { name="emoticons"; } + { name="kscreensaver"; } + { name="kwin-styles"; sane="kwin_styles";} + { name="styles"; } + { name="wallpapers"; } + { name="HighResolutionWallpapers"; } + { name="WeatherWallpapers"; } + { name="desktopthemes"; } + ]; + +} +{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;} +{ module="kdepim"; split=false;} +{ module="kdepimlibs"; split=false;} +{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;} +{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;} +{ module="kde-runtime"; sane="kde_runtime"; split=false;} +{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;} +{ module="kdewebdev"; split=false; + pkgs=[ + { name="klinkstatus"; } + { name="kfilereplace"; } + { name="kimagemapeditor"; } + { name="kommander"; } + ]; + +} +{ module="kde-workspace"; sane="kde_workspace"; split=false;} +{ module="oxygen-icons"; sane="oxygen_icons"; split=false;} +]; +} diff --git a/pkgs/desktops/kde-4.14/kde-runtime.nix b/pkgs/desktops/kde-4.14/kde-runtime.nix index 1c9706f4f4bf..2b8df4757de0 100644 --- a/pkgs/desktops/kde-4.14/kde-runtime.nix +++ b/pkgs/desktops/kde-4.14/kde-runtime.nix @@ -4,6 +4,8 @@ }: kde { + patches = [ ./CVE-2014-8600.diff ]; + buildInputs = [ kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack qca2 samba libcanberra pulseaudio gpgme diff --git a/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix index f86412147d3b..191b96380e6f 100644 --- a/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix +++ b/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies, +{ kde, kdelibs, python, pyqt4, kdepimlibs, shared_desktop_ontologies, polkit_qt4, boost, lndir, pkgconfig }: let pydir = "lib/python${python.majorVersion}"; in @@ -14,7 +14,7 @@ kde { nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ pyqt4 sip ]; + propagatedBuildInputs = [ pyqt4 ]; preConfigure = '' diff --git a/pkgs/desktops/kde-4.14/kdelibs/baloo.nix b/pkgs/desktops/kde-4.14/kdelibs/baloo.nix index 0976639e8033..8883c03274df 100644 --- a/pkgs/desktops/kde-4.14/kdelibs/baloo.nix +++ b/pkgs/desktops/kde-4.14/kdelibs/baloo.nix @@ -1,4 +1,4 @@ -{ stdenv, kde, kdelibs, pkgconfig, doxygen, kdepimlibs, xapian, qjson, akonadi, kfilemetadata +{ stdenv, kde, kdelibs, pkgconfig, doxygen, kdepimlibs, xapian, qjson, akonadi, kfilemetadata, boost }: kde { @@ -6,7 +6,7 @@ kde { # TODO: qmobipocket buildInputs = [ - kdelibs kdepimlibs xapian qjson akonadi kfilemetadata + kdelibs kdepimlibs xapian qjson akonadi kfilemetadata boost ]; nativeBuildInputs = [ pkgconfig doxygen ]; diff --git a/pkgs/desktops/kde-4.14/kdepimlibs.nix b/pkgs/desktops/kde-4.14/kdepimlibs.nix index 8301e9f4b188..e0f355acdd95 100644 --- a/pkgs/desktops/kde-4.14/kdepimlibs.nix +++ b/pkgs/desktops/kde-4.14/kdepimlibs.nix @@ -6,11 +6,14 @@ kde { nativeBuildInputs = [ pkgconfig ]; buildInputs = - [ gpgme libical libxslt qjson prison + [ boost gpgme libical libxslt qjson prison openldap cyrus_sasl akonadi shared_desktop_ontologies ]; - propagatedBuildInputs = [ kdelibs nepomuk_core boost ]; + propagatedBuildInputs = [ kdelibs nepomuk_core ]; + + # Prevent a dependency on boost.dev. FIXME: move this cmake file to .dev. + postInstall = "rm $out/lib/gpgmepp/GpgmeppConfig.cmake"; meta = { description = "KDE PIM libraries"; diff --git a/pkgs/desktops/kde-4.14/l10n/manifest-4.14.1.nix b/pkgs/desktops/kde-4.14/l10n/manifest-4.14.1.nix deleted file mode 100644 index 922bf46adcfa..000000000000 --- a/pkgs/desktops/kde-4.14/l10n/manifest-4.14.1.nix +++ /dev/null @@ -1,267 +0,0 @@ -[ -{ - lang = "ar"; - saneName = "ar"; - sha256 = "1hprszswsrmlbbbi6yian9v55yg78ca0y18ass0wvqpa0wk1yjhl"; -} -{ - lang = "bg"; - saneName = "bg"; - sha256 = "0vbxv671h88sq3mjsz8cs8y4cqf38xsqar517mwvzkav17jdgsin"; -} -{ - lang = "bs"; - saneName = "bs"; - sha256 = "1s6jqrldp28a2c7y74f6kwp6wy01d9n667p3wnfjbs2x4r7q5yag"; -} -{ - lang = "ca"; - saneName = "ca"; - sha256 = "1aqs3jr5w7kwzkdw7a00b6yslzphrwvaib8w37fz21ppijsyhb55"; -} -{ - lang = "ca@valencia"; - saneName = "ca_valencia"; - sha256 = "0ns7jqv9yil38m5ymy0q6ghmv0807wqjjp68z2z2c3n50ky4a9nn"; -} -{ - lang = "cs"; - saneName = "cs"; - sha256 = "0bs92lxdffyqd4yrzar0xwa43j1zb6hj4z0kw99aj2gwdn6kripr"; -} -{ - lang = "da"; - saneName = "da"; - sha256 = "129g2zb7di4w51dcykpbm4ilr23f0a00f62yw96583lnm7cmnxyh"; -} -{ - lang = "de"; - saneName = "de"; - sha256 = "0vahrfrrnqxj3mhm13wavykrrs4r7r3yff9v19n8b6j2v1frcj21"; -} -{ - lang = "el"; - saneName = "el"; - sha256 = "1rbclbbcgylxnfkf7j9k1vm1b40lhgl5lghbqz488i2pkkm0sxdi"; -} -{ - lang = "en_GB"; - saneName = "en_GB"; - sha256 = "060zw53mdh872agsp3qszqb2a04kfrzr6mfnbh3fa3kqdkdk9czq"; -} -{ - lang = "es"; - saneName = "es"; - sha256 = "117gvv3280fy9ir8964xvpjc89nd1igp6g43s7gbg7w7dq3ssm9n"; -} -{ - lang = "et"; - saneName = "et"; - sha256 = "15z7zqdh8i7rq5wdzbri73ifdd8nxac4izs1lgyj73nhbj5wfqkf"; -} -{ - lang = "eu"; - saneName = "eu"; - sha256 = "1386aj4gfh6014kb746vwq7dh8bbps9q55x1narhp85v430mqbb5"; -} -{ - lang = "fa"; - saneName = "fa"; - sha256 = "0izpc6k2ly2s70wzd2zawl6051fxds27arkq6z9cbrn535697790"; -} -{ - lang = "fi"; - saneName = "fi"; - sha256 = "0k6grdvik887gmhr1f2la6xpj0c7hfqk4x2p9akb7v62byl1f85h"; -} -{ - lang = "fr"; - saneName = "fr"; - sha256 = "1cqbxk82lc6k7f3y2aj5nflm9l4nqgzg7rs45xw5sbjrcbkkifhy"; -} -{ - lang = "ga"; - saneName = "ga"; - sha256 = "1cyhsr7yvbpkllkzc4lc57r03x53xyxsk973dy3gw3nhj90b3wj3"; -} -{ - lang = "gl"; - saneName = "gl"; - sha256 = "0ywnk0rn983i2pbyj7iqxvkl1z3szh3l1ikj0mwrbk63y5xdrxkw"; -} -{ - lang = "he"; - saneName = "he"; - sha256 = "1125cajwik5n6mdqx3m0wiaj3aw828sk9gi4yff8ki8710p7yff5"; -} -{ - lang = "hi"; - saneName = "hi"; - sha256 = "12v5m86pi35q9dyd9iph16iqlr8hz12q49h0fpqq8rn6m6l7q2cb"; -} -{ - lang = "hr"; - saneName = "hr"; - sha256 = "0dyjp6j1xhmfkmvvqql6d6viqg7c6qqjbi709fq2d41jmrk9b6mp"; -} -{ - lang = "hu"; - saneName = "hu"; - sha256 = "004pq9sw834ksj988w8sf4plfqzbbzkwyvgjv3fsb96a3dq86w76"; -} -{ - lang = "ia"; - saneName = "ia"; - sha256 = "00y28i5f0q6vzdwbdjb2mvc3yb4sdswqhn5ajr2pig5wrd95l4mf"; -} -{ - lang = "id"; - saneName = "id"; - sha256 = "1z5hpyd3s3j78403ffyp6bw82n2qncqx3nw3bgc8ivsmls99zm1i"; -} -{ - lang = "is"; - saneName = "is"; - sha256 = "19kswci8x4q5cz0qcy0bba5ix3a9jjzmdpn3idsd42p2hn95dzjg"; -} -{ - lang = "it"; - saneName = "it"; - sha256 = "1shx1nmq0if35qlw97bq0kmbdjqzkzy61m0pdmlwg85i6z3fv9x0"; -} -{ - lang = "ja"; - saneName = "ja"; - sha256 = "1y5g9bgg7c5f9nmcci0h2zi8bmk8xphwd0vkzjh6mqdhx4mckawh"; -} -{ - lang = "kk"; - saneName = "kk"; - sha256 = "0318wnd31q2gsizhcsp2rgdzsd64vvrmm42rihin01325nx58nzi"; -} -{ - lang = "km"; - saneName = "km"; - sha256 = "1jjprhshr6ll4v1fin7bv00wgv243hg3an9b6f6jk75q146bdv8v"; -} -{ - lang = "ko"; - saneName = "ko"; - sha256 = "06r0yh1yqvay6swbyr3qpyx67z1sdf0f71bj02y3zalp53q33n2x"; -} -{ - lang = "lt"; - saneName = "lt"; - sha256 = "09slsn1frwpf9agwyp8chwlb9mzfaqpd9h21dnbpahz3yxzcr4zk"; -} -{ - lang = "lv"; - saneName = "lv"; - sha256 = "10zrn03iir9z4fhpf6kqczn04808axgpxaa60qijdpr7h0wa3nkx"; -} -{ - lang = "mr"; - saneName = "mr"; - sha256 = "1g8r6zx9mpyzahi5nmciwjcpc4llylj35yarwypghp53pbmqy1qz"; -} -{ - lang = "nb"; - saneName = "nb"; - sha256 = "0lkbm0yfn32yfmbrfp9ip98gydcpg553fv9f2lwn0xh369qsqi8w"; -} -{ - lang = "nds"; - saneName = "nds"; - sha256 = "0lgs7qw2k2w2sxdhs5mkp3ifswc09q17l37q6y8qc7sk6bpsxgam"; -} -{ - lang = "nl"; - saneName = "nl"; - sha256 = "143piqk6sdqs440qzws251i4h08gqm908g244frjkaswmd44a67s"; -} -{ - lang = "nn"; - saneName = "nn"; - sha256 = "1j391h00alzl2bsfa5nxrkh9z3j4jjf1wlg54mjnaxm2n9r13f7a"; -} -{ - lang = "pa"; - saneName = "pa"; - sha256 = "0c9805q6b3pswc33wr4lwfnm1knqm7i984dsdx50w66b2fh3jldh"; -} -{ - lang = "pl"; - saneName = "pl"; - sha256 = "1w7jihagpw8n6ljm965mqx8shjywh4zanybb2kc94cwyx5dpg6ia"; -} -{ - lang = "pt"; - saneName = "pt"; - sha256 = "0yh203s8v5r3yf1c98lwyk220ppwbndn879c4z71r88jww9g2xaw"; -} -{ - lang = "pt_BR"; - saneName = "pt_BR"; - sha256 = "1r3krrpwvwdpailmdn7ilaamcjhahg6kpq8lmgqx85aybaqwllqa"; -} -{ - lang = "ro"; - saneName = "ro"; - sha256 = "1nnzmzj90jh97nbrjbdyyfc9vlgsra622y63mg3dps4vzmv7sfji"; -} -{ - lang = "ru"; - saneName = "ru"; - sha256 = "0l3pzvpjzsw8fs1wwx0vzl3r46sz3lcgjzjjwxnxjwjjvrlnsr8g"; -} -{ - lang = "sk"; - saneName = "sk"; - sha256 = "13r77k8q6idn2wxwhp46vry3jynyg4i3dcamamw55w3qgb3bd2ri"; -} -{ - lang = "sl"; - saneName = "sl"; - sha256 = "1mx54f4m75zg0rdbq6gz65xl0bf6w63ij0d3ziq5fj7fpz4jnlqb"; -} -{ - lang = "sr"; - saneName = "sr"; - sha256 = "1grl665j40vq39y0kchfxx2wz13wbr88h7paz6fgc3kskwwj9i4z"; -} -{ - lang = "sv"; - saneName = "sv"; - sha256 = "0gf84fyg3hzipf3ja6wnn8h82v2vaaqpgs6k7k72p484b7a34881"; -} -{ - lang = "tr"; - saneName = "tr"; - sha256 = "0r3afsnkv478byc3wnpg7jv1ik0malks5l204kdxanczlcy64x97"; -} -{ - lang = "ug"; - saneName = "ug"; - sha256 = "0kpm91m0rnk3xij2ba1dbr6063034fcg7kvpyl1qbzr2hvr453sa"; -} -{ - lang = "uk"; - saneName = "uk"; - sha256 = "0hrvz8wm2p05ch41w26pbk19jcgsxw27n94axmyp3lb8vlhmf7xm"; -} -{ - lang = "wa"; - saneName = "wa"; - sha256 = "0rhxpbas2dcf2sn88adi4ymm206gmd1arv32k3mnvh3gm60ik2s6"; -} -{ - lang = "zh_CN"; - saneName = "zh_CN"; - sha256 = "1sjzbh0577gcmq29qd9p077szybylhhz4krji7x2cbbkimx6insv"; -} -{ - lang = "zh_TW"; - saneName = "zh_TW"; - sha256 = "0zlz7y1xpngvs3d2mhkvl5p7bfyb5nzshf73ljghghljniv412ky"; -} -] diff --git a/pkgs/desktops/kde-4.14/l10n/manifest-4.14.3.nix b/pkgs/desktops/kde-4.14/l10n/manifest-4.14.3.nix new file mode 100644 index 000000000000..a6d48ae51bf2 --- /dev/null +++ b/pkgs/desktops/kde-4.14/l10n/manifest-4.14.3.nix @@ -0,0 +1,267 @@ +[ +{ + lang = "ar"; + saneName = "ar"; + sha256 = "1amzzwa4zhwm0r1b1fdi0fjp883wpbjh12wn9q42g04xzza6nq04"; +} +{ + lang = "bg"; + saneName = "bg"; + sha256 = "1x1yx6lw86bwv2d7lcfb061k1pqgqw6abqwrga7pnzfmk2fcaawb"; +} +{ + lang = "bs"; + saneName = "bs"; + sha256 = "148195dk6wmymk6jib467a10w9jajh3bmx1igxl29l7vp33xpgng"; +} +{ + lang = "ca"; + saneName = "ca"; + sha256 = "04bgjfwr5pwn79lh3wixajswmccfcqll5dnjhf84zw7p09138m0v"; +} +{ + lang = "ca@valencia"; + saneName = "ca_valencia"; + sha256 = "0p257jjilkmjrq9ddvwfdh41911b2yrcrid1j31g7gg9gp7iriq4"; +} +{ + lang = "cs"; + saneName = "cs"; + sha256 = "0kjn9pq9p8bfja6ca4pcpqgli9k1mfyh77j6i8p28i37wfmgv0cn"; +} +{ + lang = "da"; + saneName = "da"; + sha256 = "1w0ylqnxkbqz6camk8045nrxpz1n4dbz8cgl559l31m7zacq1rmb"; +} +{ + lang = "de"; + saneName = "de"; + sha256 = "0i97h1jcm8lpv3pap7wiz8nvjwf00jav5z5ymsbklagvmbmwyfyk"; +} +{ + lang = "el"; + saneName = "el"; + sha256 = "1br19741hmn08g3vzmx8dilx2kdfbg5zv1rjxnigdfwi0zphqyw9"; +} +{ + lang = "en_GB"; + saneName = "en_GB"; + sha256 = "1flp57prc12ri2rhh6vwf6hb5mqj8w1sj94pnji02ylmkghcc466"; +} +{ + lang = "es"; + saneName = "es"; + sha256 = "0waccr5mih5nv4q31k6xn07iws2by8n67riij6k9nsfsrlrxv21g"; +} +{ + lang = "et"; + saneName = "et"; + sha256 = "1bqd4jaws8890r2zjzpf6pw1k9v7h2lr7xk1dzfs8ak7gny32fm9"; +} +{ + lang = "eu"; + saneName = "eu"; + sha256 = "0q4cac4vp1s7fda328xxyzhqll0iqinn5v9syb93xfj29kij4ja2"; +} +{ + lang = "fa"; + saneName = "fa"; + sha256 = "0avabmdm9bxyb5b5d0mrv8mmwp6j1r4ch7y0ab7b4zl380blw7d3"; +} +{ + lang = "fi"; + saneName = "fi"; + sha256 = "0lk0r03r2wmqpf8n9zvwpsbl7s11dipa8kc3lmkh1yrjk8c4z2sw"; +} +{ + lang = "fr"; + saneName = "fr"; + sha256 = "1gzwc6yj7x7x3jx0270ap5nf70ckl25lqccrxiyzwx3mqfxgfbx2"; +} +{ + lang = "ga"; + saneName = "ga"; + sha256 = "0bkf62cqj4rfgz81yj9jspv5jfa932hsyhk4kq0r2hqsm8gndddd"; +} +{ + lang = "gl"; + saneName = "gl"; + sha256 = "00m4m480fqls5i1cvdidkq3nb8xzqhgyqqp0zk3j3qybxfq98yg5"; +} +{ + lang = "he"; + saneName = "he"; + sha256 = "1488lk7jniv0hj77wcfxplxw10srp3df6lv6llss8b5m3yqb061a"; +} +{ + lang = "hi"; + saneName = "hi"; + sha256 = "16ni7257b1ch0wabncvq17569c57ncz7pzqgqm830bj8ldpk9zzv"; +} +{ + lang = "hr"; + saneName = "hr"; + sha256 = "1si90cnwjsvw553pmppb0aakfk7fan2jk44ag0j191kdiir2b3xk"; +} +{ + lang = "hu"; + saneName = "hu"; + sha256 = "1x2s2cd521ffp5azzrzq2w2cr4sjz6gpg1a1h9jg4749xwqfhc1a"; +} +{ + lang = "ia"; + saneName = "ia"; + sha256 = "1ybaihygv0lviw6bq3a6ki40glgs49gsk29abq4y95bi9ymlrryc"; +} +{ + lang = "id"; + saneName = "id"; + sha256 = "1s8zliwc737avc04n2l27rhhh9isz9ag81nsajai27yxif0ncn7x"; +} +{ + lang = "is"; + saneName = "is"; + sha256 = "1x2mag8jwlmbh8v8y3rmvp9n69sv2xfwwsxw7c9vb8qg4cybax1c"; +} +{ + lang = "it"; + saneName = "it"; + sha256 = "1ng2hzrbvcak3nhbmlb3h64a15h34zfrgabzwrjvi2b0fv8liycw"; +} +{ + lang = "ja"; + saneName = "ja"; + sha256 = "01klhf9bmha9x6s39r4wnd0hxn35jg5bh7h9rwqij3nf06rddfrj"; +} +{ + lang = "kk"; + saneName = "kk"; + sha256 = "149fi65z1x64svs00rn82njmw6l0pncgs4b5d66fb18ah3bjlfg2"; +} +{ + lang = "km"; + saneName = "km"; + sha256 = "17hjv0gi2fqa5gkjgmqkxb4k7z3zizrxax6inq8s03g4f2vfibaz"; +} +{ + lang = "ko"; + saneName = "ko"; + sha256 = "19yhacc0v5grxc35bmks9r4qy091qij26yfi2qvs3rca7cc374jp"; +} +{ + lang = "lt"; + saneName = "lt"; + sha256 = "0y0nkvqidc12paf8ghk4p6z213gxcyv27nvglk120l2602980idj"; +} +{ + lang = "lv"; + saneName = "lv"; + sha256 = "0msw54v8d9p08c7prw6m20w29qf8f0yb32s378knhsql6abv5gln"; +} +{ + lang = "mr"; + saneName = "mr"; + sha256 = "05kcm7x7jj4lppn6fd1jlzl37r3gs9wrz0cckwpscc2m6y2g7p55"; +} +{ + lang = "nb"; + saneName = "nb"; + sha256 = "0wsdr8yyjjik2h30xy7y38i5hagy4jya98cqjbcrrab35i677l9a"; +} +{ + lang = "nds"; + saneName = "nds"; + sha256 = "0lr5z1r8v3fkqpkcjvnml2s9jh50wmqsqiyls9ivr46ygwm8wcbq"; +} +{ + lang = "nl"; + saneName = "nl"; + sha256 = "09w8cniq3z11900axjcdlm24jbzjjsqcpdwpvhvc9z78hfsjqp36"; +} +{ + lang = "nn"; + saneName = "nn"; + sha256 = "1b304wg1143pk7ib8k451g2riq87c1h0611khslghy428q4rviwd"; +} +{ + lang = "pa"; + saneName = "pa"; + sha256 = "02y56ld5hiywph88khh55hqg0gpcvmqcqrbpsidzx3qdgh5j40nl"; +} +{ + lang = "pl"; + saneName = "pl"; + sha256 = "137mfrr7wza2pg4yzqqi93bsmsrjvj0ar27gi3lk1qh6zniwyjai"; +} +{ + lang = "pt"; + saneName = "pt"; + sha256 = "1zb454rg4pigkldg9jp97r2r7k8azwxbal77zscky2q6rbw0sjcn"; +} +{ + lang = "pt_BR"; + saneName = "pt_BR"; + sha256 = "1zrn09k99pfscnc5zyxh1jzyrbirhy8ilwacbgg913maaanjprny"; +} +{ + lang = "ro"; + saneName = "ro"; + sha256 = "1lkr14if7jmfcxmb10pf11a6xjxxqxrq45lwdx19kj3djgr5l4pc"; +} +{ + lang = "ru"; + saneName = "ru"; + sha256 = "1ldf4y9wck339n0jq8x43x9h57jvfg3qk0spfv9d5fw9qyxygwwi"; +} +{ + lang = "sk"; + saneName = "sk"; + sha256 = "1n4qjwvpkddwizl8k3gr1xwv8icwd6lqsg09cypax049g3q2sy4p"; +} +{ + lang = "sl"; + saneName = "sl"; + sha256 = "1k111r9ssprgali6sg3wpbvp635hb56ckmcgpdhyvk6bbkcbnbmr"; +} +{ + lang = "sr"; + saneName = "sr"; + sha256 = "0pini77jlnrv2fhl0j99wjxylwlj77bihcbfvnkf5bganffgwc11"; +} +{ + lang = "sv"; + saneName = "sv"; + sha256 = "0ykxy95a4q0pp5ibmw20ckg33b3h89g2m86p6fcfnqf6350nxs2v"; +} +{ + lang = "tr"; + saneName = "tr"; + sha256 = "15vcfpyc30ia6bsjgwv3zhydv2nlnmggr8i2yjpnb5dlynn3sywh"; +} +{ + lang = "ug"; + saneName = "ug"; + sha256 = "0qhzfbd3j0d7grg4ghzn7y5vrl031iz9krifv7dv6jgp68fzz1h0"; +} +{ + lang = "uk"; + saneName = "uk"; + sha256 = "03n2myhwx9lvm1vzqvrg2sgl3y1m0rrrskqa22m06fjmh4vxawhx"; +} +{ + lang = "wa"; + saneName = "wa"; + sha256 = "11b7gyy31n2zfhkaj304pd4lkr14sp1sgi4pzv86c824sr6lp01v"; +} +{ + lang = "zh_CN"; + saneName = "zh_CN"; + sha256 = "1r5gxadd94ckdpkwcchwa8k735g2y9x7bi6px6hm7qlxdbi9sjmq"; +} +{ + lang = "zh_TW"; + saneName = "zh_TW"; + sha256 = "04bvvb3na4arns483fz27npjs045hf3s53p2rkd2nvq9gwvn0kmi"; +} +] diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix index 81a0aebb75ce..2a1e772e4a5e 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { p_name = "xfce4-power-manager"; ver_maj = "1.3"; - ver_min = "0"; + ver_min = "2"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1q0mnj9hjqw4zpk7wqnfayy6zzbjbhzd1mcplfjik2h753gaxgh5"; + sha256 = "0lv29ycws185qr89xn01vcddkvpddk7q6hni0s6d0nqvjavycg0j"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix index 697ff2bfb8ae..6353f6d6c330 100644 --- a/pkgs/desktops/xfce/core/xfdesktop.nix +++ b/pkgs/desktops/xfce/core/xfdesktop.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { p_name = "xfdesktop"; ver_maj = "4.10"; - ver_min = "2"; + ver_min = "3"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0zbrvfj4fxnjz593brxjsjy9pv5bbf12jnbydy4pwc1ya6zf19j9"; + sha256 = "1kkj6axcbj82v3n2hkzsdranpqrxaarnyjxkpfs29dyqajjjpjh9"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/development/compilers/agda/default.nix b/pkgs/development/compilers/agda/default.nix index b37f6ce1ab30..573f7c6b8904 100644 --- a/pkgs/development/compilers/agda/default.nix +++ b/pkgs/development/compilers/agda/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "Agda"; - version = "2.4.2.1"; - sha256 = "094x1rdhqxm630f0kgllhivgr1vdy4xrd9pgh737b1gbb2vf3awm"; + version = "2.4.2.2"; + sha256 = "1hxvapnvlkx6imifswc70ng869zll0zfsygivhc2mjyhaiv10i13"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix index 0e210343a72f..1ddda71c2d3e 100644 --- a/pkgs/development/compilers/chicken/default.nix +++ b/pkgs/development/compilers/chicken/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.call-cc.org/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = with stdenv.lib.platforms; allBut darwin; description = "A portable compiler for the Scheme programming language"; diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 9787d0da9292..02e22e820290 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -10,12 +10,12 @@ else throw "Unsupported architecture"; edk2 = stdenv.mkDerivation { - name = "edk2-2014-02-01"; + name = "edk2-2014-12-10"; src = fetchgit { url = git://github.com/tianocore/edk2; - rev = "2818c158de6a164d012e6afb0fc145656aed4e4b"; - sha256 = "a756b5de3a3e71d82ce1de8c7832bc69d2affb98d704894b26540571f9f5e214"; + rev = "684a565a04"; + sha256 = "1l46396f48v91z5b8lh3b0f0lcd7z5f86i1nrpc7l5gf7gx3117j"; }; buildInputs = [ libuuid pythonFull ]; @@ -33,8 +33,8 @@ edk2 = stdenv.mkDerivation { meta = { description = "Intel EFI development kit"; - homepage = http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=EDK2; - license = "BSD"; + homepage = http://sourceforge.net/projects/edk2/; + license = stdenv.lib.licenses.bsd2; maintainers = [ stdenv.lib.maintainers.shlevy ]; platforms = ["x86_64-linux" "i686-linux"]; }; diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index 0f08a908bfd4..feca5137f6d3 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -46,15 +46,12 @@ assert stdenv.isDarwin -> gnused != null; with stdenv.lib; with builtins; -let version = "4.6.3"; +let version = "4.6.4"; # Whether building a cross-compiler for GNU/Hurd. crossGNU = cross != null && cross.config == "i586-pc-gnu"; - patches = - [ # Fix building on Glibc 2.16. - ./siginfo_t_fix.patch - ] + patches = [ ] ++ optional (cross != null) ./libstdc++-target.patch ++ optional noSysDirs ./no-sys-dirs.patch # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its diff --git a/pkgs/development/compilers/gcc/4.6/siginfo_t_fix.patch b/pkgs/development/compilers/gcc/4.6/siginfo_t_fix.patch deleted file mode 100644 index 1409c552c7d0..000000000000 --- a/pkgs/development/compilers/gcc/4.6/siginfo_t_fix.patch +++ /dev/null @@ -1,211 +0,0 @@ -Partly taken from: -http://gcc.gnu.org/git/?p=gcc.git;a=patch;h=5617a3db5d04630d0bfb71a3578894b4442f266d - -Adapted to gcc 4.6.3. Original commit text follows. - -From 5617a3db5d04630d0bfb71a3578894b4442f266d Mon Sep 17 00:00:00 2001 -From: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4> -Date: Fri, 20 Apr 2012 07:44:50 +0000 -Subject: [PATCH] struct siginfo vs. siginfo_t - -gcc/ - * config/alpha/linux-unwind.h (alpha_fallback_frame_state): Use - siginfo_t instead of struct siginfo. - * config/bfin/linux-unwind.h (bfin_fallback_frame_state): Likewise. - * config/i386/linux-unwind.h (x86_fallback_frame_state): Likewise. - * config/ia64/linux-unwind.h (ia64_fallback_frame_state) - (ia64_handle_unwabi): Likewise. - * config/mips/linux-unwind.h (mips_fallback_frame_state): Likewise. - * config/pa/linux-unwind.h (pa32_fallback_frame_state): Likewise. - * config/sh/linux-unwind.h (shmedia_fallback_frame_state) - (sh_fallback_frame_state): Likewise. - * config/xtensa/linux-unwind.h (xtensa_fallback_frame_state): Likewise. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@186610 138bc75d-0d04-0410-961f-82ee72b054a4 - -diff --git a/gcc/config/alpha/linux-unwind.h b/gcc/config/alpha/linux-unwind.h -index 4c811dc..8c04b3b 100644 ---- a/gcc/config/alpha/linux-unwind.h -+++ b/gcc/config/alpha/linux-unwind.h -@@ -1,5 +1,5 @@ - /* DWARF2 EH unwinding support for Alpha Linux. -- Copyright (C) 2004, 2005, 2009, 2011 Free Software Foundation, Inc. -+ Copyright (C) 2004, 2005, 2009, 2011, 2012 Free Software Foundation, Inc. - - This file is part of GCC. - -@@ -49,7 +49,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context, - else if (pc[1] == 0x201f015f) /* lda $0,NR_rt_sigreturn */ - { - struct rt_sigframe { -- struct siginfo info; -+ siginfo_t info; - struct ucontext uc; - } *rt_ = context->cfa; - sc = &rt_->uc.uc_mcontext; -diff --git a/gcc/config/bfin/linux-unwind.h b/gcc/config/bfin/linux-unwind.h -index 88c8285..15bb2f1 100644 ---- a/gcc/config/bfin/linux-unwind.h -+++ b/gcc/config/bfin/linux-unwind.h -@@ -1,5 +1,5 @@ - /* DWARF2 EH unwinding support for Blackfin. -- Copyright (C) 2007, 2009 Free Software Foundation, Inc. -+ Copyright (C) 2007, 2009, 2012 Free Software Foundation, Inc. - - This file is part of GCC. - -@@ -48,10 +48,10 @@ bfin_fallback_frame_state (struct _Unwind_Context *context, - { - struct rt_sigframe { - int sig; -- struct siginfo *pinfo; -+ siginfo_t *pinfo; - void *puc; - char retcode[8]; -- struct siginfo info; -+ siginfo_t info; - struct ucontext uc; - } *rt_ = context->cfa; - -diff --git a/gcc/config/i386/linux-unwind.h b/gcc/config/i386/linux-unwind.h -index ad0ccfa..02b1897 100644 ---- a/gcc/config/i386/linux-unwind.h -+++ b/gcc/config/i386/linux-unwind.h -@@ -136,9 +136,9 @@ x86_fallback_frame_state (struct _Unwind_Context *context, - { - struct rt_sigframe { - int sig; -- struct siginfo *pinfo; -+ siginfo_t *pinfo; - void *puc; -- struct siginfo info; -+ siginfo_t info; - struct ucontext uc; - } *rt_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. -diff --git a/gcc/config/ia64/linux-unwind.h b/gcc/config/ia64/linux-unwind.h -index 93f762d..da31259 100644 ---- a/gcc/config/ia64/linux-unwind.h -+++ b/gcc/config/ia64/linux-unwind.h -@@ -1,5 +1,5 @@ - /* DWARF2 EH unwinding support for IA64 Linux. -- Copyright (C) 2004, 2005, 2009 Free Software Foundation, Inc. -+ Copyright (C) 2004, 2005, 2009, 2012 Free Software Foundation, Inc. - - This file is part of GCC. - -@@ -47,7 +47,7 @@ ia64_fallback_frame_state (struct _Unwind_Context *context, - struct sigframe { - char scratch[16]; - unsigned long sig_number; -- struct siginfo *info; -+ siginfo_t *info; - struct sigcontext *sc; - } *frame_ = (struct sigframe *)context->psp; - struct sigcontext *sc = frame_->sc; -@@ -137,7 +137,7 @@ ia64_handle_unwabi (struct _Unwind_Context *context, _Unwind_FrameState *fs) - struct sigframe { - char scratch[16]; - unsigned long sig_number; -- struct siginfo *info; -+ siginfo_t *info; - struct sigcontext *sc; - } *frame = (struct sigframe *)context->psp; - struct sigcontext *sc = frame->sc; -diff --git a/gcc/config/mips/linux-unwind.h b/gcc/config/mips/linux-unwind.h -index 02f7cd5..094ff58 100644 ---- a/gcc/config/mips/linux-unwind.h -+++ b/gcc/config/mips/linux-unwind.h -@@ -1,5 +1,6 @@ - /* DWARF2 EH unwinding support for MIPS Linux. -- Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+ Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2012 Free Software -+ Foundation, Inc. - - This file is part of GCC. - -@@ -75,7 +76,7 @@ mips_fallback_frame_state (struct _Unwind_Context *context, - struct rt_sigframe { - u_int32_t ass[4]; /* Argument save space for o32. */ - u_int32_t trampoline[2]; -- struct siginfo info; -+ siginfo_t info; - _sig_ucontext_t uc; - } *rt_ = context->cfa; - sc = &rt_->uc.uc_mcontext; -diff --git a/gcc/config/pa/linux-unwind.h b/gcc/config/pa/linux-unwind.h -index a0560e9..38b4eda 100644 ---- a/gcc/config/pa/linux-unwind.h -+++ b/gcc/config/pa/linux-unwind.h -@@ -1,5 +1,5 @@ - /* DWARF2 EH unwinding support for PA Linux. -- Copyright (C) 2004, 2005, 2009 Free Software Foundation, Inc. -+ Copyright (C) 2004, 2005, 2009, 2012 Free Software Foundation, Inc. - - This file is part of GCC. - -@@ -63,7 +63,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context, - int i; - struct sigcontext *sc; - struct rt_sigframe { -- struct siginfo info; -+ siginfo_t info; - struct ucontext uc; - } *frame; - -diff --git a/gcc/config/sh/linux-unwind.h b/gcc/config/sh/linux-unwind.h -index 94ed95d..5a78e31 100644 ---- a/gcc/config/sh/linux-unwind.h -+++ b/gcc/config/sh/linux-unwind.h -@@ -1,5 +1,6 @@ - /* DWARF2 EH unwinding support for SH Linux. -- Copyright (C) 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc. -+ Copyright (C) 2004, 2005, 2006, 2007, 2009, 2012 Free Software Foundation, -+ Inc. - - This file is part of GCC. - -@@ -80,9 +81,9 @@ shmedia_fallback_frame_state (struct _Unwind_Context *context, - && (*(unsigned long *) (pc+11) == 0x6ff0fff0)) - { - struct rt_sigframe { -- struct siginfo *pinfo; -+ siginfo_t *pinfo; - void *puc; -- struct siginfo info; -+ siginfo_t info; - struct ucontext uc; - } *rt_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. -@@ -179,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context, - && (*(unsigned short *) (pc+14) == 0x00ad)))) - { - struct rt_sigframe { -- struct siginfo info; -+ siginfo_t info; - struct ucontext uc; - } *rt_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. -diff --git a/gcc/config/xtensa/linux-unwind.h b/gcc/config/xtensa/linux-unwind.h -index 32e9349..2456497 100644 ---- a/gcc/config/xtensa/linux-unwind.h -+++ b/gcc/config/xtensa/linux-unwind.h -@@ -1,5 +1,5 @@ - /* DWARF2 EH unwinding support for Xtensa. -- Copyright (C) 2008, 2009 Free Software Foundation, Inc. -+ Copyright (C) 2008, 2009, 2012 Free Software Foundation, Inc. - - This file is part of GCC. - -@@ -62,7 +62,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context, - struct sigcontext *sc; - - struct rt_sigframe { -- struct siginfo info; -+ siginfo_t info; - struct ucontext uc; - } *rt_; - --- -1.7.3.4 - diff --git a/pkgs/development/compilers/gcc/4.6/sources.nix b/pkgs/development/compilers/gcc/4.6/sources.nix index fd347aa8bda2..ca50160def46 100644 --- a/pkgs/development/compilers/gcc/4.6/sources.nix +++ b/pkgs/development/compilers/gcc/4.6/sources.nix @@ -1,31 +1,27 @@ /* Automatically generated by `update-gcc.sh', do not edit. - For GCC 4.6.3. */ + For GCC 4.6.4. */ { fetchurl, optional, version, langC, langCC, langFortran, langJava, langAda, langGo }: -assert version == "4.6.3"; +assert version == "4.6.4"; optional /* langC */ true (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2"; - sha256 = "283e00881c0de258fafc5170843e4d9b14ee2a7dc4426f0d426e6be0400251c1"; + sha256 = "48b566f1288f099dff8fba868499a320f83586245ec69b8c82a9042566a5bf62"; }) ++ optional langCC (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2"; - sha256 = "b3e0c733e900e99096b0c5480f57e22e3e583ec3d83596cc2cb9986bd64b29e8"; + sha256 = "4eaa347f9cd3ab7d5e14efbb9c5c03009229cd714b558fc55fa56e8996b74d42"; }) ++ optional langFortran (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2"; - sha256 = "fe1bdf3485f33e6d0a998ff7bcb42526fbf3083dbfc107c3d95a88c00739eadb"; + sha256 = "4f402e0d27995a02354570f0a63047f27463c72c62f1ba3c08ef5a7c6c9c3d1c"; }) ++ optional langJava (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2"; - sha256 = "d0f9aafbd8fe95fdee5797cd02a9a734de0078aa62a9a249b0752adabf76d6e6"; + sha256 = "4441d0c3cc04f2162f981c6b4bf29cdd9f6c16d294ce24c6bc4a05d8277abf28"; }) ++ optional langAda (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-ada-${version}.tar.bz2"; - sha256 = "7bb213ec3948646df72720580fcba3489c84aa452bd0e4238712607ef83cbdf6"; -}) ++ -optional langGo (fetchurl { - url = "mirror://gcc/releases/gcc-${version}/gcc-go-${version}.tar.bz2"; - sha256 = "7589c16f33ad383769510bb5b9c1aeb7f865f3ae0b89b07b2370d988a4c1fe6d"; + sha256 = "2a09bbf942b2557839722d4807e67559123037356f5cb1a3b12f44539968d0ad"; }) ++ [] diff --git a/pkgs/development/compilers/ghc/7.8.3.nix b/pkgs/development/compilers/ghc/7.8.4.nix index 9f5fc4b4e50d..ccc3f4c875ba 100644 --- a/pkgs/development/compilers/ghc/7.8.3.nix +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses }: stdenv.mkDerivation rec { - version = "7.8.3"; + version = "7.8.4"; name = "ghc-${version}"; src = fetchurl { - url = "http://www.haskell.org/ghc/dist/7.8.3/${name}-src.tar.xz"; - sha256 = "0n5rhwl83yv8qm0zrbaxnyrf8x1i3b6si927518mwfxs96jrdkdh"; + url = "http://www.haskell.org/ghc/dist/7.8.4/${name}-src.tar.xz"; + sha256 = "1i4254akbb4ym437rf469gc0m40bxm31blp6s1z1g15jmnacs6f3"; }; buildInputs = [ ghc perl gmp ncurses ]; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index c50a79b84747..462007b1a3bb 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,32 +1,29 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses, happy, alex }: stdenv.mkDerivation rec { - version = "7.9.20141106"; + version = "7.9.20141217"; name = "ghc-${version}"; src = fetchurl { - url = "http://deb.haskell.org/dailies/2014-11-06/ghc_${version}.orig.tar.bz2"; - sha256 = "1si8wx8a2lrg5ba13vwpisssxa3rcxi5a7fqxhgapa8d2i2w7gaz"; + url = "http://deb.haskell.org/dailies/2014-12-17/ghc_${version}.orig.tar.bz2"; + sha256 = "1yfdi9r07aqbnv6xfdhs6cpj0y0yjdr03l5sa4dv0j1xs3lh1wkv"; }; - buildInputs = [ ghc perl gmp ncurses happy alex ]; - - enableParallelBuilding = true; - - buildMK = '' - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" - DYNAMIC_BY_DEFAULT = NO - ''; + buildInputs = [ ghc perl ncurses happy alex ]; preConfigure = '' - echo "${buildMK}" > mk/build.mk + echo >mk/build.mk "DYNAMIC_BY_DEFAULT = NO" sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" ''; - configureFlags = "--with-gcc=${stdenv.gcc}/bin/gcc"; + configureFlags = [ + "--with-gcc=${stdenv.gcc}/bin/gcc" + "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib" + ]; + + enableParallelBuilding = true; # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort @@ -35,11 +32,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = [ - stdenv.lib.maintainers.marcweber - stdenv.lib.maintainers.andres - stdenv.lib.maintainers.simons - ]; + maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; inherit (ghc.meta) license platforms; }; diff --git a/pkgs/development/compilers/hhvm/3918a2ccceb98230ff517601ad60aa6bee36e2c4.patch b/pkgs/development/compilers/hhvm/3918a2ccceb98230ff517601ad60aa6bee36e2c4.patch new file mode 100644 index 000000000000..8ee5b31925f8 --- /dev/null +++ b/pkgs/development/compilers/hhvm/3918a2ccceb98230ff517601ad60aa6bee36e2c4.patch @@ -0,0 +1,40 @@ +From 3918a2ccceb98230ff517601ad60aa6bee36e2c4 Mon Sep 17 00:00:00 2001 +From: Alex Malyshev <alexanderm@fb.com> +Date: Tue, 28 Oct 2014 15:55:34 -0700 +Subject: [PATCH] Replace use of MAX macro with std::max in ZendPack + +Summary: This has randomly bitten me in open source builds. I intermittently get +an error saying that MAX isn't defined. + +Instead of trying to figure out what's going on, I'm just gonna switch +it to std::max. + +Reviewed By: @paulbiss + +Differential Revision: D1636740 +--- + hphp/runtime/base/zend-pack.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/hphp/runtime/base/zend-pack.cpp b/hphp/runtime/base/zend-pack.cpp +index d878ea4..c3ee14d 100644 +--- a/hphp/runtime/base/zend-pack.cpp ++++ b/hphp/runtime/base/zend-pack.cpp +@@ -21,6 +21,8 @@ + #include "hphp/runtime/base/builtin-functions.h" + #include "hphp/util/tiny-vector.h" + ++#include <algorithm> ++ + namespace HPHP { + + #define INC_OUTPUTPOS(a,b) \ +@@ -294,7 +296,7 @@ Variant ZendPack::pack(const String& fmt, const Array& argv) { + case 'a': + case 'A': + case 'Z': { +- int arg_cp = (code != 'Z') ? arg : MAX(0, arg - 1); ++ int arg_cp = (code != 'Z') ? arg : std::max(0, arg - 1); + memset(&output[outputpos], (code != 'A') ? '\0' : ' ', arg); + val = argv[currentarg++].toString(); + s = val.c_str(); diff --git a/pkgs/development/compilers/hhvm/8207a31c26cc42fee79363a14c4a8f4fcbfffe63.patch b/pkgs/development/compilers/hhvm/8207a31c26cc42fee79363a14c4a8f4fcbfffe63.patch new file mode 100644 index 000000000000..f7cf29b739f0 --- /dev/null +++ b/pkgs/development/compilers/hhvm/8207a31c26cc42fee79363a14c4a8f4fcbfffe63.patch @@ -0,0 +1,40 @@ +From 8207a31c26cc42fee79363a14c4a8f4fcbfffe63 Mon Sep 17 00:00:00 2001 +From: Jordan DeLong <jdelong@fb.com> +Date: Mon, 6 Oct 2014 18:30:28 -0700 +Subject: [PATCH] Remove some MIN/MAX macro uses in the emitter + +Summary: <algorithm> has preferable type-safe versions that don't double-eval +their args. + +Reviewed By: @paulbiss + +Differential Revision: D1599803 +--- + hphp/compiler/analysis/emitter.cpp | 6 +++--- + hphp/util/compatibility.h | 4 ---- + 2 files changed, 3 insertions(+), 7 deletions(-) + +diff --git a/hphp/compiler/analysis/emitter.cpp b/hphp/compiler/analysis/emitter.cpp +index 321e637..b1d3f2d 100644 +--- a/hphp/compiler/analysis/emitter.cpp ++++ b/hphp/compiler/analysis/emitter.cpp +@@ -799,8 +799,8 @@ void SymbolicStack::push(char sym) { + if (sym != StackSym::W && sym != StackSym::K && sym != StackSym::L && + sym != StackSym::T && sym != StackSym::I && sym != StackSym::H) { + m_actualStack.push_back(m_symStack.size()); +- *m_actualStackHighWaterPtr = MAX(*m_actualStackHighWaterPtr, +- (int)m_actualStack.size()); ++ *m_actualStackHighWaterPtr = std::max(*m_actualStackHighWaterPtr, ++ (int)m_actualStack.size()); + } + m_symStack.push_back(SymEntry(sym)); + } +@@ -1010,7 +1010,7 @@ int SymbolicStack::sizeActual() const { + + void SymbolicStack::pushFDesc() { + m_fdescCount += kNumActRecCells; +- *m_fdescHighWaterPtr = MAX(*m_fdescHighWaterPtr, m_fdescCount); ++ *m_fdescHighWaterPtr = std::max(*m_fdescHighWaterPtr, m_fdescCount); + } + + void SymbolicStack::popFDesc() { diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index c48e6d5a81e1..bc2629513a55 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -2,22 +2,28 @@ , libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php, re2c , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng -, libxslt, ocaml, freetype +, libxslt, ocaml, freetype, gdb }: stdenv.mkDerivation rec { name = "hhvm-${version}"; - version = "3.2.0"; + version = "3.3.0"; + # use git version since we need submodules src = fetchgit { url = "https://github.com/facebook/hhvm.git"; - rev = "01228273b8cf709aacbd3df1c51b1e690ecebac8"; - sha256 = "418d5a55ac4ba5335a42329ebfb7dd96fdb8d5edbc2700251c86e9fa2ae4a967"; + rev = "e0c98e21167b425dddf1fc9efe78c9f7a36db268"; + sha256 = "0s32v713xgf4iim1zb9sg08sg1r1fs49czar3jxajsi0dwc0lkj9"; fetchSubmodules = true; }; + patches = [ + ./3918a2ccceb98230ff517601ad60aa6bee36e2c4.patch + ./8207a31c26cc42fee79363a14c4a8f4fcbfffe63.patch + ]; + buildInputs = - [ cmake pkgconfig boost libunwind mariadb libmemcached pcre + [ cmake pkgconfig boost libunwind mariadb libmemcached pcre gdb libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml @@ -34,7 +40,7 @@ stdenv.mkDerivation rec { # work around broken build system NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; - patchPhase = '' + prePatch = '' substituteInPlace hphp/util/generate-buildinfo.sh \ --replace /bin/bash ${stdenv.shell} substituteInPlace ./configure \ diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 6a07c7af69e2..3c0ace0ac934 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -61,7 +61,12 @@ stdenv.mkDerivation rec { makeFlagsArray+=(CUPS_HEADERS_PATH=$cupsDir) ''; - patches = [ ./cppflags-include-fix.patch ./fix-java-home.patch ./paxctl.patch ]; + patches = [ + ./cppflags-include-fix.patch + ./fix-java-home.patch + ./paxctl.patch + ./read-truststore-from-env.patch + ]; NIX_NO_SELF_RPATH = true; diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env.patch b/pkgs/development/compilers/openjdk/read-truststore-from-env.patch new file mode 100644 index 000000000000..8fb0f409d0ab --- /dev/null +++ b/pkgs/development/compilers/openjdk/read-truststore-from-env.patch @@ -0,0 +1,21 @@ +diff -ur openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java +--- openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-07-17 12:12:14.000000000 +0200 ++++ openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-12-09 13:31:27.821960372 +0100 +@@ -158,6 +158,7 @@ + /* + * Try: + * javax.net.ssl.trustStore (if this variable exists, stop) ++ * system environment variable JAVAX_NET_SSL_TRUSTSTORE + * jssecacerts + * cacerts + * +@@ -165,6 +166,9 @@ + */ + + storeFileName = props.get("trustStore"); ++ if (storeFileName == null) { ++ storeFileName = System.getenv("JAVAX_NET_SSL_TRUSTSTORE"); ++ } + if (!"NONE".equals(storeFileName)) { + if (storeFileName != null) { + storeFile = new File(storeFileName); diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index cc3fabb244e7..6cc866c63a8a 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, which, file, perl, curl, python27, makeWrapper -, tzdata, git, valgrind +, tzdata, git, valgrind, procps, coreutils }: assert stdenv.gcc.gcc != null; @@ -18,19 +18,19 @@ assert stdenv.gcc.gcc != null; */ -with ((import ./common.nix) {inherit stdenv; version = "0.13.0-pre-1673-g3a325c6";}); +with ((import ./common.nix) {inherit stdenv; version = "0.13.0-pre-2604-g2f3cff6";}); let snapshot = if stdenv.system == "i686-linux" - then "c8342e762a1720be939ed7c6a39bdaa27892f66f" + then "3daf531aed03f5769402f2fef852377e2838db98" else if stdenv.system == "x86_64-linux" - then "7a7fe6f5ed47b9cc66261f880e166c7c8738b73e" + then "4f3c8b092dd4fe159d6f25a217cf62e0e899b365" else if stdenv.system == "i686-darwin" - then "63e8644512bd5665c14389a83d5af564c7c0b103" + then "2a3e647b9c400505bd49cfe56091e866c83574ca" else if stdenv.system == "x86_64-darwin" - then "7933ae0e974d1b897806138b7052cb2b4514585f" + then "5e730efc34d79a33f464a87686c10eace0760a2e" else abort "no-snapshot for platform ${stdenv.system}"; - snapshotDate = "2014-11-21"; - snapshotRev = "c9f6d69"; + snapshotDate = "2014-12-20"; + snapshotRev = "8443b09"; snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; in stdenv.mkDerivation { @@ -40,8 +40,8 @@ in stdenv.mkDerivation { src = fetchgit { url = https://github.com/rust-lang/rust; - rev = "3a325c666d2cb7e297bf3057ff2442f96a79428b"; - sha256 = "0a0byglfaf0wfsnlm53vng1gqkkz4i29zphdwqg93v26mciqqc61"; + rev = "2f3cff6956d56048ef7afb6d33e17cbdb2dcf038"; + sha256 = "113y74sd1gr7f0xs1lsgjw3jkvhz8s4dxx34r9cxlw5vjr7fp066"; }; # We need rust to build rust. If we don't provide it, configure will try to download it. @@ -73,9 +73,12 @@ in stdenv.mkDerivation { --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc" substituteInPlace src/librustc_back/archive.rs \ --subst-var-by "arPath" "${stdenv.gcc.binutils}/bin/ar" + + substituteInPlace src/rust-installer/gen-install-script.sh \ + --replace /bin/echo "${coreutils}/bin/echo" ''; - buildInputs = [ which file perl curl python27 makeWrapper git valgrind ]; + buildInputs = [ which file perl curl python27 makeWrapper git valgrind procps ]; enableParallelBuilding = false; # disabled due to rust-lang/rust#16305 diff --git a/pkgs/development/compilers/yasm/default.nix b/pkgs/development/compilers/yasm/default.nix index f752ad35a6d4..738b63fe1ad7 100644 --- a/pkgs/development/compilers/yasm/default.nix +++ b/pkgs/development/compilers/yasm/default.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { sha256 = "0gv0slmm0qpq91za3v2v9glff3il594x5xsrbgab7xcmnh0ndkix"; }; - meta = { + meta = with stdenv.lib; { homepage = http://www.tortall.net/projects/yasm/; description = "Complete rewrite of the NASM assembler"; - license = "BSD"; - platforms = stdenv.lib.platforms.unix; + license = licenses.bsd2; + platforms = platforms.unix; }; } diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index a7378e69c3a5..667e513769bd 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}"; - version = "17.3"; + version = "17.4"; src = fetchurl { url = "http://www.erlang.org/download/otp_src_${version}.tar.gz"; - sha256 = "1r3n7drzgmwcv46n4lzic9ki19psgx1vjgnmjp5g85k06kmh7gnl"; + sha256 = "0mhzfs64wa00g0bv9hwf0sbl8lgs83jj8cq9c3wg1iksmskfv0hd"; }; buildInputs = @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { postInstall = let manpages = fetchurl { url = "http://www.erlang.org/download/otp_doc_man_${version}.tar.gz"; - sha256 = "1dys0903snk0ppip8hfckfd656pl9z3s4vqqv3yk4i2rn30dmarz"; + sha256 = "0n4sczblx8mjcck56rpxvyvz186hkzg0c1xjqrnpnz1nkn7dn73c"; }; in '' ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 9a2bd0ff328f..d271edfe2077 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "groovy-${version}"; - version = "2.3.8"; + version = "2.3.9"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/groovy-binary-${version}.zip"; - sha256 = "0fgsn1s7vhxcrwb2wa6zvrdzff7zbb2s6f7xj6c9x7gl9mdfcwpn"; + sha256 = "1lk942v7gd3ism4cw8gqk9ndr6yjwkgxc55z7p366khiv8d4f608"; }; installPhase = '' diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix index 9c09038051ef..3668fedf0518 100644 --- a/pkgs/development/interpreters/j/default.nix +++ b/pkgs/development/interpreters/j/default.nix @@ -37,14 +37,19 @@ rec { builtins.trace "assuming ${a.stdenv.system} is 32 bits" "32"; doBuildJ = a.fullDepEntry '' - sed -i bin/jconfig -e 's@bits=32@bits=${bits}@g; s@readline=0@readline=1@; s@LIBREADLINE=""@LIBREADLINE=" -lreadline "@' + sed -i bin/jconfig -e ' + s@bits=32@bits=${bits}@g; + s@readline=0@readline=1@; + s@LIBREADLINE=""@LIBREADLINE=" -lreadline "@; + s@-W1,soname,libj.so@-Wl,-soname,libj.so@ + ' sed -i bin/build_libj -e 's@>& make.txt@ 2>\&1 | tee make.txt@' touch *.c *.h - sh bin/build_jconsole - sh bin/build_libj - sh bin/build_defs - sh bin/build_tsdll + sh -o errexit bin/build_jconsole + sh -o errexit bin/build_libj + sh -o errexit bin/build_defs + sh -o errexit bin/build_tsdll sed -i j/bin/profile.ijs -e "s@userx=[.] *'.j'@userx=. '/.j'@; s@bin,'/profilex.ijs'@user,'/profilex.ijs'@ ; diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index 7ef475ddab88..e21216ffe5e1 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = git://git.ghostscript.com/mujs.git; - rev = "6afabf445cad0dd9afbc1f5870dba730801f09c0"; - sha256 = "1afzmncw3jvfq6smhhhsi1ywfmdpxkjpzswb86pdmdh3p04g1r0n"; + rev = "9bc5fec0804381d59ef8dc62304ed6892fb7c4ca"; + sha256 = "0ba6p92ygcssfzd4ij89vilfr2kwql2d1jpyqxflh5wyh1i92wjl"; }; buildInputs = [ clang ]; diff --git a/pkgs/development/interpreters/php/5.3-freetype-dirs.patch b/pkgs/development/interpreters/php/5.3-freetype-dirs.patch deleted file mode 100644 index 3b78f9b309bb..000000000000 --- a/pkgs/development/interpreters/php/5.3-freetype-dirs.patch +++ /dev/null @@ -1,64 +0,0 @@ -From a0955f351c7eb1022da7ae36970ffef3b00c8aff Mon Sep 17 00:00:00 2001 -From: Adam Harvey <aharvey@php.net> -Date: Sat, 7 Dec 2013 19:39:40 -0800 -Subject: [PATCH] Switch to using freetype-config for freetype detection. - -This fixes GD compilation against libfreetype 2.5.1 and later after they made -the rather interesting decision to change their include directory layout in a -point release. - -The original suggestion in the bug was to use pkg-config, but my inclination is -to use freetype-config instead: we should be able to get the same configuration -information without actually needing pkg-config installed, since pkg-config is -by no means guaranteed to exist on many Unices and distros, whereas -freetype-config should always be present if a libfreetype build environment is -installed. Let's try it out and see what happens. - -Fixes bug #64405 (Use freetype-config for determining freetype2 dir(s)). - -diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 -index 0e35ece..732e14c 100644 ---- a/ext/gd/config.m4 -+++ b/ext/gd/config.m4 -@@ -193,30 +193,25 @@ AC_DEFUN([PHP_GD_FREETYPE2],[ - if test "$PHP_FREETYPE_DIR" != "no"; then - - for i in $PHP_FREETYPE_DIR /usr/local /usr; do -- if test -f "$i/include/freetype2/freetype/freetype.h"; then -+ if test -f "$i/bin/freetype-config"; then - FREETYPE2_DIR=$i -- FREETYPE2_INC_DIR=$i/include/freetype2 -+ FREETYPE2_CONFIG="$i/bin/freetype-config" - break - fi - done - - if test -z "$FREETYPE2_DIR"; then -- AC_MSG_ERROR([freetype.h not found.]) -+ AC_MSG_ERROR([freetype-config not found.]) - fi - -- PHP_CHECK_LIBRARY(freetype, FT_New_Face, -- [ -- PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) -- PHP_ADD_INCLUDE($FREETYPE2_DIR/include) -- PHP_ADD_INCLUDE($FREETYPE2_INC_DIR) -- AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ]) -- AC_DEFINE(HAVE_LIBFREETYPE,1,[ ]) -- AC_DEFINE(ENABLE_GD_TTF,1,[ ]) -- ],[ -- AC_MSG_ERROR([Problem with freetype.(a|so). Please check config.log for more information.]) -- ],[ -- -L$FREETYPE2_DIR/$PHP_LIBDIR -- ]) -+ FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` -+ FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs` -+ -+ PHP_EVAL_INCLINE($FREETYPE2_CFLAGS) -+ PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD) -+ AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ]) -+ AC_DEFINE(HAVE_LIBFREETYPE,1,[ ]) -+ AC_DEFINE(ENABLE_GD_TTF,1,[ ]) - else - AC_MSG_RESULT([If configure fails try --with-freetype-dir=<DIR>]) - fi diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix deleted file mode 100644 index 4de87f20d8ed..000000000000 --- a/pkgs/development/interpreters/php/5.3.nix +++ /dev/null @@ -1,245 +0,0 @@ -{ stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison -, apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext -, openssl, pkgconfig, sqlite, config, libjpeg, libpng, freetype, libxslt -, libmcrypt, bzip2, icu, libssh2, makeWrapper, libiconvOrEmpty, libiconv, uwimap -, pam }: - -let - libmcryptOverride = libmcrypt.override { disablePosixThreads = true; }; -in - -composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - - version = "5.3.29"; - - name = "php-${version}"; - - enableParallelBuilding = true; - - buildInputs - = [ flex bison pkgconfig ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libssh2 makeWrapper ]; - - # need to include the C++ standard library when compiling on darwin - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lstdc++"; - - # need to specify where the dylib for icu is stored - DYLD_LIBRARY_PATH = stdenv.lib.optionalString stdenv.isDarwin "${icu}/lib"; - - flags = { - - # much left to do here... - - # SAPI modules: - - apxs2 = { - configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs"]; - buildInputs = [apacheHttpd]; - }; - - # Extensions - - curl = { - configureFlags = ["--with-curl=${curl}" "--with-curlwrappers"]; - buildInputs = [curl openssl]; - }; - - pcntl = { - configureFlags = [ "--enable-pcntl" ]; - }; - - zlib = { - configureFlags = ["--with-zlib=${zlib}"]; - buildInputs = [zlib]; - }; - - libxml2 = { - configureFlags - = [ "--with-libxml-dir=${libxml2}" ] - ++ stdenv.lib.optional (libiconvOrEmpty != []) - [ "--with-iconv=${libiconv}" ]; - buildInputs = [ libxml2 ] ++ libiconvOrEmpty; - }; - - readline = { - configureFlags = ["--with-readline=${readline}"]; - buildInputs = [ readline ]; - }; - - sqlite = { - configureFlags = ["--with-pdo-sqlite=${sqlite}"]; - buildInputs = [ sqlite ]; - }; - - postgresql = { - configureFlags = ["--with-pgsql=${postgresql}"]; - buildInputs = [ postgresql ]; - }; - - mysql = { - configureFlags = ["--with-mysql=${mysql}"]; - buildInputs = [ mysql ]; - }; - - mysqli = { - configureFlags = ["--with-mysqli=${mysql}/bin/mysql_config"]; - buildInputs = [ mysql]; - }; - - mysqli_embedded = { - configureFlags = ["--enable-embedded-mysqli"]; - depends = "mysqli"; - assertion = fixed.mysqliSupport; - }; - - pdo_mysql = { - configureFlags = ["--with-pdo-mysql=${mysql}"]; - buildInputs = [ mysql ]; - }; - - bcmath = { - configureFlags = ["--enable-bcmath"]; - }; - - gd = { - configureFlags = [ - "--with-gd=${gd}" - "--with-png-dir=${libpng}" - "--with-jpeg-dir=${libjpeg}" - ]; - buildInputs = [gd libpng libjpeg freetype]; - }; - - soap = { - configureFlags = ["--enable-soap"]; - }; - - sockets = { - configureFlags = ["--enable-sockets"]; - }; - - openssl = { - configureFlags = ["--with-openssl=${openssl}"]; - buildInputs = ["openssl"]; - }; - - mbstring = { - configureFlags = ["--enable-mbstring"]; - }; - - gettext = { - configureFlags = ["--with-gettext=${gettext}"]; - buildInputs = [gettext]; - }; - - imap = { - configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" ] - # uwimap builds with kerberos on darwin - ++ stdenv.lib.optional (stdenv.isDarwin) "--with-kerberos"; - buildInputs = [ uwimap openssl ] - ++ stdenv.lib.optional (!stdenv.isDarwin) pam; - }; - - intl = { - configureFlags = ["--enable-intl"]; - buildInputs = [icu]; - }; - - exif = { - configureFlags = ["--enable-exif"]; - }; - - xsl = { - configureFlags = ["--with-xsl=${libxslt}"]; - buildInputs = [libxslt]; - }; - - mcrypt = { - configureFlags = ["--with-mcrypt=${libmcrypt}"]; - buildInputs = [libmcryptOverride]; - }; - - bz2 = { - configureFlags = ["--with-bz2=${bzip2}"]; - buildInputs = [bzip2]; - }; - - zip = { - configureFlags = ["--enable-zip"]; - }; - - ftp = { - configureFlags = ["--enable-ftp"]; - }; - - fpm = { - configureFlags = ["--enable-fpm"]; - }; - }; - - cfg = { - apxs2Support = config.php.apxs2 or true; - bcmathSupport = config.php.bcmath or true; - bz2Support = config.php.bz2 or false; - curlSupport = config.php.curl or true; - exifSupport = config.php.exif or true; - ftpSupport = config.php.ftp or true; - fpmSupport = config.php.fpm or false; - gdSupport = config.php.gd or true; - gettextSupport = config.php.gettext or true; - imapSupport = config.php.imap or false; - intlSupport = config.php.intl or true; - libxml2Support = config.php.libxml2 or true; - mbstringSupport = config.php.mbstring or true; - mcryptSupport = config.php.mcrypt or false; - mysqlSupport = config.php.mysql or true; - mysqliSupport = config.php.mysqli or true; - opensslSupport = config.php.openssl or true; - pcntlSupport = config.php.pcntl or true; - pdo_mysqlSupport = config.php.pdo_mysql or true; - postgresqlSupport = config.php.postgresql or true; - readlineSupport = config.php.readline or true; - soapSupport = config.php.soap or true; - socketsSupport = config.php.sockets or true; - sqliteSupport = config.php.sqlite or true; - xslSupport = config.php.xsl or false; - zipSupport = config.php.zip or true; - zlibSupport = config.php.zlib or true; - }; - - configurePhase = '' - iniFile=$out/etc/php-recommended.ini - [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin - ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags - echo configurePhase end - '' + stdenv.lib.optionalString stdenv.isDarwin '' - # don't build php.dSYM as the php binary - sed -i 's/EXEEXT = \.dSYM/EXEEXT =/' Makefile - ''; - - installPhase = '' - unset installPhase; installPhase; - cp php.ini-production $iniFile - '' + ( stdenv.lib.optionalString stdenv.isDarwin '' - for prog in $out/bin/*; do - wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "$DYLD_LIBRARY_PATH" - done - '' ); - - src = fetchurl { - url = "http://www.php.net/distributions/php-${version}.tar.bz2"; - sha256 = "1480pfp4391byqzmvdmbxkdkqwdzhdylj63sfzrcgadjf9lwzqf4"; - name = "php-${version}.tar.bz2"; - }; - - meta = { - description = "An HTML-embedded scripting language"; - homepage = http://www.php.net/; - license = "PHP-3"; - maintainers = with stdenv.lib.maintainers; [ lovek323 ]; - platforms = stdenv.lib.platforms.unix; - }; - - patches = [ ./fix.patch ./5.3-freetype-dirs.patch ]; - -}) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index c9a3ae61862f..a5fbac680f90 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -41,10 +41,14 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; curl = { - configureFlags = ["--with-curl=${curl}" "--with-curlwrappers"]; + configureFlags = ["--with-curl=${curl}"]; buildInputs = [curl openssl]; }; + curlWrappers = { + configureFlags = ["--with-curlwrappers"]; + }; + zlib = { configureFlags = ["--with-zlib=${zlib}"]; buildInputs = [zlib]; @@ -199,6 +203,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) bcmathSupport = config.php.bcmath or true; socketsSupport = config.php.sockets or true; curlSupport = config.php.curl or true; + curlWrappersSupport = config.php.curlWrappers or false; gettextSupport = config.php.gettext or true; pcntlSupport = config.php.pcntl or true; postgresqlSupport = config.php.postgresql or true; @@ -243,7 +248,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) src = fetchurl { url = "http://www.php.net/distributions/php-${version}.tar.bz2"; - sha256 = "0d425zxka3m1l0ygsls4r56qy374rf6skl4ggim0k2y1y08fmm2p"; + sha256 = "0svlp5alqvm3fxzf2044ygziacy2ks9vbrnimkpqnxqgrmjl5nwc"; }; meta = { diff --git a/pkgs/development/interpreters/pypy/2.4/default.nix b/pkgs/development/interpreters/pypy/2.4/default.nix index 31024b179251..5f00950a9589 100644 --- a/pkgs/development/interpreters/pypy/2.4/default.nix +++ b/pkgs/development/interpreters/pypy/2.4/default.nix @@ -72,8 +72,9 @@ let # disable test_os because test_urandom_failure fails # disable test_urllib2net and test_urllibnet because it requires networking (example.com) # disable test_zipfile64 because it randomly timeouts - # disable test_default_ciphers because of error message mismatch - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not (test_sqlite or test_default_ciphers or test_urllib2net or test_urllibnet or test_socket or test_os or test_shutil or test_mhlib or test_multiprocessing or test_zipfile64)' lib-python + # disable test_cpickle because timeouts + # disable test_ssl because no shared cipher' not found in '[Errno 1] error:14077410:SSL routines:SSL23_GET_SERVER_HELLO:sslv3 alert handshake failure + ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not (test_ssl or test_cpickle or test_sqlite or test_urllib2net or test_urllibnet or test_socket or test_os or test_shutil or test_mhlib or test_multiprocessing or test_zipfile64)' lib-python ''; installPhase = '' diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 3201d7520d13..d61b4129bfc1 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -7,11 +7,11 @@ with stdenv.lib; let majorVersion = "2.7"; - version = "${majorVersion}.8"; + version = "${majorVersion}.9"; src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; - sha256 = "0nh7d3dp75f1aj0pamn4hla8s0l7nbaq4a38brry453xrfh11ppd"; + sha256 = "05j9in7yygfgl6nml0rixfvj1bbip982w3l54q05f0vyx8a7xllh"; }; patches = @@ -27,9 +27,6 @@ let # patch python to put zero timestamp into pyc # if DETERMINISTIC_BUILD env var is set ./deterministic-build.patch - - # http://bugs.python.org/issue21963 - ./remove-avoid-daemon-thread-shutdown.patch ]; preConfigure = '' diff --git a/pkgs/development/interpreters/python/2.7/remove-avoid-daemon-thread-shutdown.patch b/pkgs/development/interpreters/python/2.7/remove-avoid-daemon-thread-shutdown.patch deleted file mode 100644 index 650f276f08a3..000000000000 --- a/pkgs/development/interpreters/python/2.7/remove-avoid-daemon-thread-shutdown.patch +++ /dev/null @@ -1,170 +0,0 @@ -changeset: 93046:61ad2208a5ce -branch: 2.7 -tag: tip -user: William A. Kennington III <william@wkennington.com> -date: Mon Oct 13 13:57:12 2014 -0700 -summary: Revert: 91229:7741d0dd66ca to fix i21963 - -diff -r ed4098380799 -r 61ad2208a5ce Include/pythonrun.h ---- a/Include/pythonrun.h Mon Oct 13 12:58:03 2014 -0700 -+++ b/Include/pythonrun.h Mon Oct 13 13:57:12 2014 -0700 -@@ -147,8 +147,6 @@ - PyAPI_FUNC(void) PyByteArray_Fini(void); - PyAPI_FUNC(void) _PyRandom_Fini(void); - --PyAPI_DATA(PyThreadState *) _Py_Finalizing; -- - /* Stuff with no proper home (yet) */ - PyAPI_FUNC(char *) PyOS_Readline(FILE *, FILE *, char *); - PyAPI_DATA(int) (*PyOS_InputHook)(void); -diff -r ed4098380799 -r 61ad2208a5ce Lib/test/test_threading.py ---- a/Lib/test/test_threading.py Mon Oct 13 12:58:03 2014 -0700 -+++ b/Lib/test/test_threading.py Mon Oct 13 13:57:12 2014 -0700 -@@ -700,49 +700,6 @@ - output = "end of worker thread\nend of main thread\n" - self.assertScriptHasOutput(script, output) - -- @unittest.skipIf(sys.platform in platforms_to_skip, "due to known OS bug") -- def test_6_daemon_threads(self): -- # Check that a daemon thread cannot crash the interpreter on shutdown -- # by manipulating internal structures that are being disposed of in -- # the main thread. -- script = """if True: -- import os -- import random -- import sys -- import time -- import threading -- -- thread_has_run = set() -- -- def random_io(): -- '''Loop for a while sleeping random tiny amounts and doing some I/O.''' -- while True: -- in_f = open(os.__file__, 'rb') -- stuff = in_f.read(200) -- null_f = open(os.devnull, 'wb') -- null_f.write(stuff) -- time.sleep(random.random() / 1995) -- null_f.close() -- in_f.close() -- thread_has_run.add(threading.current_thread()) -- -- def main(): -- count = 0 -- for _ in range(40): -- new_thread = threading.Thread(target=random_io) -- new_thread.daemon = True -- new_thread.start() -- count += 1 -- while len(thread_has_run) < count: -- time.sleep(0.001) -- # Trigger process shutdown -- sys.exit(0) -- -- main() -- """ -- rc, out, err = assert_python_ok('-c', script) -- self.assertFalse(err) -- - @unittest.skipUnless(hasattr(os, 'fork'), "needs os.fork()") - @unittest.skipIf(sys.platform in platforms_to_skip, "due to known OS bug") - def test_reinit_tls_after_fork(self): -diff -r ed4098380799 -r 61ad2208a5ce Misc/NEWS ---- a/Misc/NEWS Mon Oct 13 12:58:03 2014 -0700 -+++ b/Misc/NEWS Mon Oct 13 13:57:12 2014 -0700 -@@ -96,10 +96,6 @@ - - Issue #21831: Avoid integer overflow when large sizes and offsets are given to - the buffer type. - --- Issue #1856: Avoid crashes and lockups when daemon threads run while the -- interpreter is shutting down; instead, these threads are now killed when they -- try to take the GIL. -- - - Issue #19656: Running Python with the -3 option now also warns about - non-ascii bytes literals. - -diff -r ed4098380799 -r 61ad2208a5ce Python/ceval.c ---- a/Python/ceval.c Mon Oct 13 12:58:03 2014 -0700 -+++ b/Python/ceval.c Mon Oct 13 13:57:12 2014 -0700 -@@ -355,12 +355,6 @@ - if (interpreter_lock) { - int err = errno; - PyThread_acquire_lock(interpreter_lock, 1); -- /* _Py_Finalizing is protected by the GIL */ -- if (_Py_Finalizing && tstate != _Py_Finalizing) { -- PyThread_release_lock(interpreter_lock); -- PyThread_exit_thread(); -- assert(0); /* unreachable */ -- } - errno = err; - } - #endif -@@ -1024,13 +1018,6 @@ - /* Other threads may run now */ - - PyThread_acquire_lock(interpreter_lock, 1); -- -- /* Check if we should make a quick exit. */ -- if (_Py_Finalizing && _Py_Finalizing != tstate) { -- PyThread_release_lock(interpreter_lock); -- PyThread_exit_thread(); -- } -- - if (PyThreadState_Swap(tstate) != NULL) - Py_FatalError("ceval: orphan tstate"); - -diff -r ed4098380799 -r 61ad2208a5ce Python/pythonrun.c ---- a/Python/pythonrun.c Mon Oct 13 12:58:03 2014 -0700 -+++ b/Python/pythonrun.c Mon Oct 13 13:57:12 2014 -0700 -@@ -91,8 +91,6 @@ - int Py_NoUserSiteDirectory = 0; /* for -s and site.py */ - int Py_HashRandomizationFlag = 0; /* for -R and PYTHONHASHSEED */ - --PyThreadState *_Py_Finalizing = NULL; -- - - /* Hack to force loading of object files */ - int (*_PyOS_mystrnicmp_hack)(const char *, const char *, Py_ssize_t) = \ -@@ -165,7 +163,6 @@ - if (initialized) - return; - initialized = 1; -- _Py_Finalizing = NULL; - - if ((p = Py_GETENV("PYTHONDEBUG")) && *p != '\0') - Py_DebugFlag = add_flag(Py_DebugFlag, p); -@@ -425,16 +422,12 @@ - * the threads created via Threading. - */ - call_sys_exitfunc(); -+ initialized = 0; - - /* Get current thread state and interpreter pointer */ - tstate = PyThreadState_GET(); - interp = tstate->interp; - -- /* Remaining threads (e.g. daemon threads) will automatically exit -- after taking the GIL (in PyEval_RestoreThread()). */ -- _Py_Finalizing = tstate; -- initialized = 0; -- - /* Disable signal handling */ - PyOS_FiniInterrupts(); - -diff -r ed4098380799 -r 61ad2208a5ce Python/thread_pthread.h ---- a/Python/thread_pthread.h Mon Oct 13 12:58:03 2014 -0700 -+++ b/Python/thread_pthread.h Mon Oct 13 13:57:12 2014 -0700 -@@ -242,9 +242,9 @@ - PyThread_exit_thread(void) - { - dprintf(("PyThread_exit_thread called\n")); -- if (!initialized) -+ if (!initialized) { - exit(0); -- pthread_exit(0); -+ } - } - - #ifdef USE_SEMAPHORES - diff --git a/pkgs/development/interpreters/ruby/gem.nix b/pkgs/development/interpreters/ruby/gem.nix index 22801aa5b044..b5be8cf2b657 100644 --- a/pkgs/development/interpreters/ruby/gem.nix +++ b/pkgs/development/interpreters/ruby/gem.nix @@ -3,7 +3,7 @@ let gemDefaults = { name, basename, requiredGems, sha256, meta }: { - buildInputs = [rubygems ruby makeWrapper]; + buildInputs = [rubygems makeWrapper]; unpackPhase = ":"; configurePhase=":"; bulidPhase=":"; @@ -15,7 +15,8 @@ let name = "ruby-${name}"; - propagatedBuildInputs = requiredGems; + propagatedBuildInputs = requiredGems ++ [ruby]; + inherit meta; installPhase = '' diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index f3b47025547e..d07a5e779d3b 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -14,14 +14,14 @@ g: # Get dependencies from patched gems arel = g.arel_5_0_1_20140414130214; atoulme_Antwrap = g.atoulme_Antwrap_0_7_5; autotest_rails = g.autotest_rails_4_2_1; - aws_sdk = g.aws_sdk_1_59_0; - aws_sdk_v1 = g.aws_sdk_v1_1_59_0; + aws_sdk = g.aws_sdk_1_59_1; + aws_sdk_v1 = g.aws_sdk_v1_1_59_1; backports = g.backports_3_6_4; bitbucket_backup = g.bitbucket_backup_0_3_1; blankslate = g.blankslate_2_1_2_4; builder = g.builder_3_2_2; - buildr = g.buildr_1_4_20; - bundler = g.bundler_1_7_7; + buildr = g.buildr_1_4_21; + bundler = g.bundler_1_7_9; celluloid = g.celluloid_0_16_0; childprocess = g.childprocess_0_5_5; chronic = g.chronic_0_10_2; @@ -45,7 +45,7 @@ g: # Get dependencies from patched gems ethon = g.ethon_0_7_1; eventmachine = g.eventmachine_1_0_3; eventmachine_tail = g.eventmachine_tail_0_6_4; - excon = g.excon_0_41_0; + excon = g.excon_0_42_1; execjs = g.execjs_2_2_2; fakes3 = g.fakes3_0_1_6_1; faraday = g.faraday_0_9_0; @@ -57,8 +57,8 @@ g: # Get dependencies from patched gems gettext = g.gettext_3_1_4; gh = g.gh_0_13_2; gherkin = g.gherkin_2_12_2; - heroku = g.heroku_3_16_2; - heroku_api = g.heroku_api_0_3_20; + heroku = g.heroku_3_20_0; + heroku_api = g.heroku_api_0_3_21; highline = g.highline_1_6_21; hike = g.hike_1_2_3; hitimes = g.hitimes_1_2_2; @@ -70,8 +70,8 @@ g: # Get dependencies from patched gems jekyll_coffeescript = g.jekyll_coffeescript_1_0_1; jekyll_gist = g.jekyll_gist_1_1_0; jekyll_paginate = g.jekyll_paginate_1_1_0; - jekyll_sass_converter = g.jekyll_sass_converter_1_2_1; - jekyll_watch = g.jekyll_watch_1_1_2; + jekyll_sass_converter = g.jekyll_sass_converter_1_3_0; + jekyll_watch = g.jekyll_watch_1_2_0; jsduck = g.jsduck_5_3_4; json = g.json_1_8_1; json_pure = g.json_pure_1_8_0; @@ -89,7 +89,7 @@ g: # Get dependencies from patched gems mime_types = g.mime_types_2_4_3; mini_portile = g.mini_portile_0_6_1; minitar = g.minitar_0_5_4; - minitest = g.minitest_5_4_3; + minitest = g.minitest_5_5_0; multi_json = g.multi_json_1_10_1; multi_test = g.multi_test_0_1_1; multipart_post = g.multipart_post_2_0_0; @@ -98,7 +98,8 @@ g: # Get dependencies from patched gems net_http_pipeline = g.net_http_pipeline_1_0_1; net_sftp = g.net_sftp_2_1_2; net_ssh = g.net_ssh_2_9_1; - netrc = g.netrc_0_7_9; + netrc = g.netrc_0_10_1; + newrelic_plugin = g.newrelic_plugin_1_3_1; nix = g.nix_0_1_1; nokogiri = g.nokogiri_1_6_5; ntlm_http = g.ntlm_http_0_1_1; @@ -111,23 +112,25 @@ g: # Get dependencies from patched gems pry = g.pry_0_9_12_6; pusher_client = g.pusher_client_0_6_0; pygments_rb = g.pygments_rb_0_6_0; + rabbitmq_manager = g.rabbitmq_manager_0_1_0; rack = g.rack_1_5_2; rack_protection = g.rack_protection_1_5_3; rack_test = g.rack_test_0_6_2; rails = g.rails_4_1_8; railties = g.railties_4_1_8; - rake = g.rake_10_4_0; + rake = g.rake_10_4_2; rb_fsevent = g.rb_fsevent_0_9_4; rb_inotify = g.rb_inotify_0_9_5; rdiscount = g.rdiscount_2_1_7_1; - rdoc = g.rdoc_4_1_2; - redcarpet = g.redcarpet_3_2_1; + rdoc = g.rdoc_4_2_0; + redcarpet = g.redcarpet_3_2_2; + redis = g.redis_3_2_0; remote_syslog = g.remote_syslog_1_6_14; rest_client = g.rest_client_1_6_7; riemann_dash = g.riemann_dash_0_2_9; right_aws = g.right_aws_3_1_0; right_http_connection = g.right_http_connection_1_5_0; - rjb = g.rjb_1_5_1; + rjb = g.rjb_1_5_2; rkelly_remix = g.rkelly_remix_0_0_6; rmail = g.rmail_1_0_0; rspec = g.rspec_2_14_1; @@ -161,7 +164,7 @@ g: # Get dependencies from patched gems trollop = g.trollop_2_0; typhoeus = g.typhoeus_0_6_9; tzinfo = g.tzinfo_1_2_2; - uglifier = g.uglifier_2_5_3; + uglifier = g.uglifier_2_6_0; unf = g.unf_0_1_4; unf_ext = g.unf_ext_0_0_6; uuid = g.uuid_2_3_7; @@ -173,7 +176,7 @@ g: # Get dependencies from patched gems xml_simple = g.xml_simple_1_1_2; yajl_ruby = g.yajl_ruby_1_2_1; }; - gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''compass'' ''cucumber'' ''erubis'' ''execjs'' ''fakes3'' ''foreman'' ''gettext'' ''heroku'' ''iconv'' ''jekyll'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''rdoc'' ''remote_syslog'' ''riemann-dash'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''terminal-notifier'' ''thin'' ''tmuxinator'' ''travis'' ''trollop'' ''uglifier'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ''yajl-ruby'' ]; + gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''compass'' ''cucumber'' ''erubis'' ''execjs'' ''fakes3'' ''foreman'' ''gettext'' ''heroku'' ''iconv'' ''jekyll'' ''jsduck'' ''lockfile'' ''mechanize'' ''newrelic_plugin'' ''nix'' ''papertrail-cli'' ''rabbitmq_manager-0.1.0'' ''rails'' ''rake'' ''rb-fsevent'' ''rdoc'' ''redis'' ''remote_syslog'' ''riemann-dash'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''terminal-notifier'' ''thin'' ''tmuxinator'' ''travis'' ''trollop'' ''uglifier'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ''yajl-ruby'' ]; gems = { ZenTest_4_11_0 = { basename = ''ZenTest''; @@ -269,7 +272,7 @@ installed versions.''; longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.''; }; name = ''activesupport-4.1.8''; - requiredGems = [ g.i18n_0_6_11 g.json_1_8_1 g.tzinfo_1_2_2 g.minitest_5_4_3 g.thread_safe_0_3_4 ]; + requiredGems = [ g.i18n_0_6_11 g.json_1_8_1 g.tzinfo_1_2_2 g.minitest_5_5_0 g.thread_safe_0_3_4 ]; sha256 = ''012w64jqmkkhcah4rzmcmmd53ihrxdn81nifi6dgrg8i40cxqb8r''; }; addressable_2_3_6 = { @@ -313,17 +316,17 @@ database compatibility and query generation.''; == FEATURES/PROBLEMS: - Antwrap runs on the native Ruby interpreter via the RJB (Ruby Java Bridge gem) and on the JRuby interpreter. Antwrap is compatible with Ant versions 1.5.4, - 1.6.5 and 1.7.0. For more information, see the Project Info (http://rubyforge.org/projects/antwrap/) page. - + Antwrap runs on the native Ruby interpreter via the RJB (Ruby Java Bridge gem) and on the JRuby interpreter. Antwrap is compatible with Ant versions 1.5.4, + 1.6.5 and 1.7.0. For more information, see the Project Info (http://rubyforge.org/projects/antwrap/) page. + == SYNOPSIS: - Antwrap is a Ruby library that can be used to invoke Ant tasks. It is being used in the Buildr (http://incubator.apache.org/buildr/) project to execute - Ant (http://ant.apache.org/) tasks in a Java project. If you are tired of fighting with Ant or Maven XML files in your Java project, take some time to + Antwrap is a Ruby library that can be used to invoke Ant tasks. It is being used in the Buildr (http://incubator.apache.org/buildr/) project to execute + Ant (http://ant.apache.org/) tasks in a Java project. If you are tired of fighting with Ant or Maven XML files in your Java project, take some time to check out Buildr!''; }; name = ''atoulme-Antwrap-0.7.5''; - requiredGems = [ g.rjb_1_5_1 ]; + requiredGems = [ g.rjb_1_5_2 ]; sha256 = ''05s3iw44lqa81f8nfy5f0xjj808600h82zb9bsh46b9kcq2w2kmz''; }; autotest_rails_4_2_1 = { @@ -338,7 +341,7 @@ rails support and extra plugins for migrations and fixtures.''; requiredGems = [ g.ZenTest_4_11_0 ]; sha256 = ''1v1dm9zlhdlrxvk90zs8d439ldar674ix41s7pncddgyswcfgg5l''; }; - aws_sdk_1_59_0 = { + aws_sdk_1_59_1 = { basename = ''aws_sdk''; meta = { description = ''AWS SDK for Ruby V1''; @@ -347,11 +350,11 @@ rails support and extra plugins for migrations and fixtures.''; Use `aws-sdk-v1` if you want to load v1 and v2 of the Ruby SDK in the same application.''; }; - name = ''aws-sdk-1.59.0''; - requiredGems = [ g.aws_sdk_v1_1_59_0 ]; - sha256 = ''0vv3w326mz601970a16vbhmllfja1lk64a6dfb1lqrcx83g9v49f''; + name = ''aws-sdk-1.59.1''; + requiredGems = [ g.aws_sdk_v1_1_59_1 ]; + sha256 = ''1g20jj507l98x8nijfy3dwzmagr201rv1wy949bnh1y3hzs83dh4''; }; - aws_sdk_v1_1_59_0 = { + aws_sdk_v1_1_59_1 = { basename = ''aws_sdk_v1''; meta = { description = ''AWS SDK for Ruby V1''; @@ -360,9 +363,9 @@ application.''; Use `aws-sdk-v1` if you want to load v1 and v2 of the Ruby SDK in the same application.''; }; - name = ''aws-sdk-v1-1.59.0''; + name = ''aws-sdk-v1-1.59.1''; requiredGems = [ g.nokogiri_1_6_5 g.json_1_8_1 ]; - sha256 = ''1y07wbbxhhgl2j30mq7bs2hljfpjf0b38iaajlrzi93y577xwxfa''; + sha256 = ''0wxmzxaly1jkp694wshkyh7rg9lf6ai1amn6mj9ib8azxw7mgcsg''; }; backports_3_6_4 = { basename = ''backports''; @@ -412,7 +415,7 @@ simple to do. Currently the following builder objects are supported: requiredGems = [ ]; sha256 = ''14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2''; }; - buildr_1_4_20 = { + buildr_1_4_21 = { basename = ''buildr''; meta = { description = ''Build like you code''; @@ -424,20 +427,20 @@ to do, and it takes care of the rest. But also something we can easily extend for those one-off tasks, with a language that's a joy to use. ''; }; - name = ''buildr-1.4.20''; - requiredGems = [ g.rake_0_9_2_2 g.builder_3_2_2 g.net_ssh_2_7_0 g.net_sftp_2_1_2 g.rubyzip_0_9_9 g.json_pure_1_8_0 g.hoe_3_7_1 g.rjb_1_4_9 g.atoulme_Antwrap_0_7_5 g.diff_lcs_1_2_4 g.rspec_expectations_2_14_3 g.rspec_mocks_2_14_3 g.rspec_core_2_14_5 g.rspec_2_14_1 g.xml_simple_1_1_2 g.minitar_0_5_4 g.bundler_1_7_7 g.orderedhash_0_0_6 ]; - sha256 = ''0x4ffblw7jg0z49ywfm5abfxgg23di3d661czndwi904cvmghrkv''; + name = ''buildr-1.4.21''; + requiredGems = [ g.rake_0_9_2_2 g.builder_3_2_2 g.net_ssh_2_7_0 g.net_sftp_2_1_2 g.rubyzip_0_9_9 g.json_pure_1_8_0 g.hoe_3_7_1 g.rjb_1_5_1 g.atoulme_Antwrap_0_7_5 g.diff_lcs_1_2_4 g.rspec_expectations_2_14_3 g.rspec_mocks_2_14_3 g.rspec_core_2_14_5 g.rspec_2_14_1 g.xml_simple_1_1_2 g.minitar_0_5_4 g.bundler_1_7_9 g.orderedhash_0_0_6 ]; + sha256 = ''0a7x5vckpy9f8fdvb1w4swl095g8pw1zim2a19f3bfz9g2nd37i2''; }; - bundler_1_7_7 = { + bundler_1_7_9 = { basename = ''bundler''; meta = { description = ''The best way to manage your application's dependencies''; homepage = ''http://bundler.io''; longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably''; }; - name = ''bundler-1.7.7''; + name = ''bundler-1.7.9''; requiredGems = [ ]; - sha256 = ''1911jd33nlzr89dapbkllxfwi63c06zg93cmwsx17l2hh5zzggdh''; + sha256 = ''1gd201rh17xykab9pbqp0dkxfm7b9jri02llyvmrc0c5bz2vhycm''; }; celluloid_0_16_0 = { basename = ''celluloid''; @@ -770,16 +773,16 @@ using TCP/IP, especially if custom protocols are required.''; requiredGems = [ g.eventmachine_1_0_3 ]; sha256 = ''1pvlb34vdzd81kf9f3xyibb4f55xjqm7lqqy28dgyci5cyv50y61''; }; - excon_0_41_0 = { + excon_0_42_1 = { basename = ''excon''; meta = { description = ''speed, persistence, http(s)''; homepage = ''https://github.com/excon/excon''; longDescription = ''EXtended http(s) CONnections''; }; - name = ''excon-0.41.0''; + name = ''excon-0.42.1''; requiredGems = [ ]; - sha256 = ''136cffvp65ng50idp323v1sdpydl16csf287ylanrvfv0nbmmhi0''; + sha256 = ''1za1jmp83149qmykih2bfgxlwyyz3hrpaq4kxww7467fvgwh58xj''; }; execjs_2_2_2 = { basename = ''execjs''; @@ -904,27 +907,27 @@ So you can use GNU gettext tools for maintaining. requiredGems = [ g.multi_json_1_10_1 ]; sha256 = ''1mxfgw15pii1jmq00xxbyp77v71mh3bp99ndgwzfwkxvbcisha25''; }; - heroku_3_16_2 = { + heroku_3_20_0 = { basename = ''heroku''; meta = { description = ''Client library and CLI to deploy apps on Heroku.''; homepage = ''http://heroku.com/''; longDescription = ''Client library and command-line tool to deploy and manage apps on Heroku.''; }; - name = ''heroku-3.16.2''; - requiredGems = [ g.heroku_api_0_3_20 g.launchy_2_4_3 g.netrc_0_7_9 g.rest_client_1_6_7 g.rubyzip_0_9_9 g.multi_json_1_10_1 ]; - sha256 = ''0p21qfcpkgf35s3hwpc94lrdib85rirsdl31nqsrw9wifjqiabc4''; + name = ''heroku-3.20.0''; + requiredGems = [ g.heroku_api_0_3_21 g.launchy_2_4_3 g.netrc_0_10_1 g.rest_client_1_6_7 g.rubyzip_0_9_9 g.multi_json_1_10_1 ]; + sha256 = ''0iw3x413sbc5a5f2r3aicdprghw3vnmj5lrbd9gdh9pm4v7saf8b''; }; - heroku_api_0_3_20 = { + heroku_api_0_3_21 = { basename = ''heroku_api''; meta = { description = ''Ruby Client for the Heroku API''; homepage = ''http://github.com/heroku/heroku.rb''; longDescription = ''Ruby Client for the Heroku API''; }; - name = ''heroku-api-0.3.20''; - requiredGems = [ g.excon_0_41_0 g.multi_json_1_10_1 ]; - sha256 = ''0c8dfjxzx3prgw7c3xmwzik268wziplv9jhzg0b70mpambvj0h18''; + name = ''heroku-api-0.3.21''; + requiredGems = [ g.excon_0_42_1 g.multi_json_1_10_1 ]; + sha256 = ''0f41zzx4sshpba5p013hmjmk7lxkk5dfasb292zvx1cfi4l60lwd''; }; highline_1_6_21 = { basename = ''highline''; @@ -980,7 +983,7 @@ below. For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; }; name = ''hoe-3.7.1''; - requiredGems = [ g.rake_10_4_0 ]; + requiredGems = [ g.rake_10_4_2 ]; sha256 = ''0lyrdbzxj4isxzyfp93w0q1g9sqw6grkjp91xirzlw1z1714qsw3''; }; http_cookie_1_0_2 = { @@ -1024,7 +1027,7 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; longDescription = ''Jekyll is a simple, blog aware, static site generator.''; }; name = ''jekyll-2.5.2''; - requiredGems = [ g.liquid_2_6_1 g.kramdown_1_5_0 g.mercenary_0_3_5 g.safe_yaml_1_0_4 g.colorator_0_1 g.pygments_rb_0_6_0 g.redcarpet_3_2_1 g.toml_0_1_2 g.jekyll_paginate_1_1_0 g.jekyll_gist_1_1_0 g.jekyll_coffeescript_1_0_1 g.jekyll_sass_converter_1_2_1 g.jekyll_watch_1_1_2 g.classifier_reborn_2_0_2 ]; + requiredGems = [ g.liquid_2_6_1 g.kramdown_1_5_0 g.mercenary_0_3_5 g.safe_yaml_1_0_4 g.colorator_0_1 g.pygments_rb_0_6_0 g.redcarpet_3_2_2 g.toml_0_1_2 g.jekyll_paginate_1_1_0 g.jekyll_gist_1_1_0 g.jekyll_coffeescript_1_0_1 g.jekyll_sass_converter_1_3_0 g.jekyll_watch_1_2_0 g.classifier_reborn_2_0_2 ]; sha256 = ''03ka7jcfk5byvphy5ks35w75i78ahshrrgm3zbnsxj8xvbxg9bgi''; }; jekyll_coffeescript_1_0_1 = { @@ -1057,25 +1060,25 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''0r7bcs8fq98zldih4787zk5i9w24nz5wa26m84ssja95n3sas2l8''; }; - jekyll_sass_converter_1_2_1 = { + jekyll_sass_converter_1_3_0 = { basename = ''jekyll_sass_converter''; meta = { description = ''A basic Sass converter for Jekyll.''; homepage = ''https://github.com/jekyll/jekyll-sass-converter''; }; - name = ''jekyll-sass-converter-1.2.1''; + name = ''jekyll-sass-converter-1.3.0''; requiredGems = [ g.sass_3_4_9 ]; - sha256 = ''1w221nzcpaqh2llflciwhbzw1sqxjavwwzbri9n4qkj057a73ar1''; + sha256 = ''1xqmlr87xmzpalf846gybkbfqkj48y3fva81r7c7175my9p4ykl1''; }; - jekyll_watch_1_1_2 = { + jekyll_watch_1_2_0 = { basename = ''jekyll_watch''; meta = { description = ''Rebuild your Jekyll site when a file changes with the `--watch` switch.''; homepage = ''https://github.com/jekyll/jekyll-watch''; }; - name = ''jekyll-watch-1.1.2''; + name = ''jekyll-watch-1.2.0''; requiredGems = [ g.listen_2_8_3 ]; - sha256 = ''0pgyl015akxslrj7d89gc0z61d6s7iqz5kiba5c4sal6vh0w5ckm''; + sha256 = ''0ivw66jww4wlw067pspapgd8ibw781xfwdi6r5mzswjz4nvyf056''; }; jsduck_5_3_4 = { basename = ''jsduck''; @@ -1316,7 +1319,7 @@ with some types added by the users of mime-types.''; requiredGems = [ ]; sha256 = ''1vpdjfmdq1yc4i620frfp9af02ia435dnpj8ybsd7dc3rypkvbka''; }; - minitest_5_4_3 = { + minitest_5_5_0 = { basename = ''minitest''; meta = { description = ''minitest provides a complete suite of testing facilities supporting TDD, BDD, mocking, and benchmarking''; @@ -1375,9 +1378,9 @@ classes, modules, inheritance, methods. This means you only have to learn ruby to use minitest and all of your regular OO practices like extract-method refactorings still apply.''; }; - name = ''minitest-5.4.3''; + name = ''minitest-5.5.0''; requiredGems = [ ]; - sha256 = ''1ws2cphg9jh45nrvs43s2ww5r14nb026bwlbwwpi0jz6qsqm86x4''; + sha256 = ''1kzq25l8fh2ngshlwy7k535ncb15n2piqmha86272frh71vw0xq2''; }; multi_json_1_10_1 = { basename = ''multi_json''; @@ -1506,16 +1509,27 @@ The server will respond in-order.''; requiredGems = [ ]; sha256 = ''1vscp4r58jisiigqc6d6752w19m1m6hmi3jkzmp3ydxai7h3jb2j''; }; - netrc_0_7_9 = { + netrc_0_10_1 = { basename = ''netrc''; meta = { description = ''Library to read and write netrc files.''; homepage = ''https://github.com/geemus/netrc''; longDescription = ''This library can read and update netrc files, preserving formatting including comments and whitespace.''; }; - name = ''netrc-0.7.9''; + name = ''netrc-0.10.1''; requiredGems = [ ]; - sha256 = ''11622ccf1gp1m0bkw6y1h5mgsajwszng4rhrfiii264gz4rhhwp5''; + sha256 = ''1f7ba1zadvydjh0vs16b0spsxpqq2y9jim4h38wahd3sqygiwifc''; + }; + newrelic_plugin_1_3_1 = { + basename = ''newrelic_plugin''; + meta = { + description = ''New Relic Ruby Plugin SDK''; + homepage = ''http://newrelic.com''; + longDescription = ''The New Relic Plugin Gem is used to send plugin data to New Relic from non-application sources.''; + }; + name = ''newrelic_plugin-1.3.1''; + requiredGems = [ g.json_1_8_1 ]; + sha256 = ''0vmm82mjb9spbs6sb9b94yk8b58dzhflzvgzpyhv7jb3rfdng7ak''; }; nix_0_1_1 = { basename = ''nix''; @@ -1650,6 +1664,17 @@ enough of it.''; requiredGems = [ g.yajl_ruby_1_1_0 g.posix_spawn_0_3_9 ]; sha256 = ''0jszj99cirbkxaqllbgnp9718v32xhvg08rfldvr10gy8i7bhy2s''; }; + rabbitmq_manager_0_1_0 = { + basename = ''rabbitmq_manager''; + meta = { + description = ''Ruby wrapper for RabbitMQ management HTTP API''; + homepage = ''https://github.com/carlhoerberg/rabbitmq_manager''; + longDescription = ''Ruby wrapper for RabbitMQ management HTTP API''; + }; + name = ''rabbitmq_manager-0.1.0''; + requiredGems = [ g.faraday_0_9_0 g.faraday_middleware_0_9_1 ]; + sha256 = ''0364ljnk9y13b7lj0i2mks62g6c9ywv4py4v17p6fzrfx693mmbc''; + }; rack_1_5_2 = { basename = ''rack''; meta = { @@ -1701,7 +1726,7 @@ request helpers feature.''; longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.''; }; name = ''rails-4.1.8''; - requiredGems = [ g.activesupport_4_1_8 g.actionpack_4_1_8 g.actionview_4_1_8 g.activemodel_4_1_8 g.activerecord_4_1_8 g.actionmailer_4_1_8 g.railties_4_1_8 g.bundler_1_7_7 g.sprockets_rails_2_2_2 ]; + requiredGems = [ g.activesupport_4_1_8 g.actionpack_4_1_8 g.actionview_4_1_8 g.activemodel_4_1_8 g.activerecord_4_1_8 g.actionmailer_4_1_8 g.railties_4_1_8 g.bundler_1_7_9 g.sprockets_rails_2_2_2 ]; sha256 = ''17ar4gvnvkcw233cn77x4ps3q6ln3i5kpbqwfa2hbi6s61na9x10''; }; railties_4_1_8 = { @@ -1712,7 +1737,7 @@ request helpers feature.''; longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.''; }; name = ''railties-4.1.8''; - requiredGems = [ g.activesupport_4_1_8 g.actionpack_4_1_8 g.rake_10_4_0 g.thor_0_19_1 ]; + requiredGems = [ g.activesupport_4_1_8 g.actionpack_4_1_8 g.rake_10_4_2 g.thor_0_19_1 ]; sha256 = ''171h23zr4135qynz74n61zly2pr0pzvspdi48dwxvc9xrzgzhznm''; }; rake_0_9_2_2 = { @@ -1726,7 +1751,7 @@ request helpers feature.''; requiredGems = [ ]; sha256 = ''19n4qp5gzbcqy9ajh56kgwqv9p9w2hnczhyvaqz0nlvk9diyng6q''; }; - rake_10_4_0 = { + rake_10_4_2 = { basename = ''rake''; meta = { description = ''Rake is a Make-like program implemented in Ruby''; @@ -1754,9 +1779,9 @@ Rake has the following features: * Supports parallel execution of tasks.''; }; - name = ''rake-10.4.0''; + name = ''rake-10.4.2''; requiredGems = [ ]; - sha256 = ''0a10xzqc1lh6gjkajkslr0n40wjrniyiyzxkp9m5fc8wf7b74zw8''; + sha256 = ''1rn03rqlf1iv6n87a78hkda2yqparhhaivfjpizblmxvlw2hk5r8''; }; rb_fsevent_0_9_4 = { basename = ''rb_fsevent''; @@ -1790,7 +1815,7 @@ Rake has the following features: requiredGems = [ ]; sha256 = ''1g70vsgv7mdwcyk9rxja7wm4qqap67prqwkj335c460vlzs6pqii''; }; - rdoc_4_1_2 = { + rdoc_4_2_0 = { basename = ''rdoc''; meta = { description = ''RDoc produces HTML and command-line documentation for Ruby projects''; @@ -1799,20 +1824,34 @@ Rake has the following features: includes the +rdoc+ and +ri+ tools for generating and displaying documentation from the command-line.''; }; - name = ''rdoc-4.1.2''; + name = ''rdoc-4.2.0''; requiredGems = [ g.json_1_8_1 ]; - sha256 = ''0cqhjidw657d8irkypxsrv6dr4y9r8csg9inaq40c3iz110cc8w6''; + sha256 = ''1k4hfa26r06ib1sxcig67arphy0a07cywcpsl37v57d6hhsgw6rr''; }; - redcarpet_3_2_1 = { + redcarpet_3_2_2 = { basename = ''redcarpet''; meta = { description = ''Markdown that smells nice''; homepage = ''http://github.com/vmg/redcarpet''; longDescription = ''A fast, safe and extensible Markdown to (X)HTML parser''; }; - name = ''redcarpet-3.2.1''; + name = ''redcarpet-3.2.2''; requiredGems = [ ]; - sha256 = ''194gm78cj5kzy60yx8lng26rqgn1qyl4kxhvj60a3f7s1ymssnk7''; + sha256 = ''1yf93kxnyk8dy3cdzq1lbdv8f47svns0k042w81kn8ilj1w88zhg''; + }; + redis_3_2_0 = { + basename = ''redis''; + meta = { + description = ''A Ruby client library for Redis''; + homepage = ''https://github.com/redis/redis-rb''; + longDescription = '' A Ruby client that tries to match Redis' API one-to-one, while still + providing an idiomatic interface. It features thread-safety, + client-side sharding, pipelining, and an obsession for performance. +''; + }; + name = ''redis-3.2.0''; + requiredGems = [ ]; + sha256 = ''10h6a0dsh7yk1x6q6g75z5dlpbn8qg8z3wk9ymwqm3zv0r3himh6''; }; remote_syslog_1_6_14 = { basename = ''remote_syslog''; @@ -1914,7 +1953,7 @@ algorithm for low-level network errors. requiredGems = [ ]; sha256 = ''0shd8v24aqxdvim1gdqzwxpanjhfgkhdaw0m0lzz7sybkb02j8qf''; }; - rjb_1_4_9 = { + rjb_1_5_1 = { basename = ''rjb''; meta = { description = ''Ruby Java bridge''; @@ -1922,11 +1961,11 @@ algorithm for low-level network errors. longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface. ''; }; - name = ''rjb-1.4.9''; + name = ''rjb-1.5.1''; requiredGems = [ ]; - sha256 = ''062f7bjwz6iz6da49nzzbbx4xn8ahqqha2smqvqhbf0i7kd5v0yz''; + sha256 = ''1mfmx80r00ka5zn4qa3bnwsvapsnn4g0xr13g1kf95f2fgymy0yv''; }; - rjb_1_5_1 = { + rjb_1_5_2 = { basename = ''rjb''; meta = { description = ''Ruby Java bridge''; @@ -1934,9 +1973,9 @@ algorithm for low-level network errors. longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface. ''; }; - name = ''rjb-1.5.1''; + name = ''rjb-1.5.2''; requiredGems = [ ]; - sha256 = ''1mfmx80r00ka5zn4qa3bnwsvapsnn4g0xr13g1kf95f2fgymy0yv''; + sha256 = ''1adg5bxdb7f95cw3mazj596d9zn2laz7l0wygcabkzrxbkbfif3r''; }; rkelly_remix_0_0_6 = { basename = ''rkelly_remix''; @@ -2373,16 +2412,16 @@ specify.''; requiredGems = [ g.thread_safe_0_3_4 ]; sha256 = ''1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx''; }; - uglifier_2_5_3 = { + uglifier_2_6_0 = { basename = ''uglifier''; meta = { description = ''Ruby wrapper for UglifyJS JavaScript compressor''; homepage = ''http://github.com/lautis/uglifier''; longDescription = ''Uglifier minifies JavaScript files by wrapping UglifyJS to be accessible in Ruby''; }; - name = ''uglifier-2.5.3''; + name = ''uglifier-2.6.0''; requiredGems = [ g.execjs_2_2_2 g.json_1_8_1 ]; - sha256 = ''0rlx9nrcavpfffyacsrh7xyvz3adv7jvylz0sv0jnix1mj5rkpd9''; + sha256 = ''1lih36zfw8bclsbgrh2ai0b923716lv12qzpfd27i3889gfsq2xb''; }; unf_0_1_4 = { basename = ''unf''; diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/development/interpreters/scsh/default.nix index 010d7c504d3a..98b4f55f79b8 100644 --- a/pkgs/development/interpreters/scsh/default.nix +++ b/pkgs/development/interpreters/scsh/default.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation { }; meta = { - description = "a Scheme shell"; + description = "A Scheme shell"; longDescription = '' SCSH is an implementation of the Scheme shell. It is implemented as a heap image which is interpreted by the Scheme 48 virtual machine. ''; homepage = http://www.scsh.net/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix index d29349abe0cf..c29512b86a04 100644 --- a/pkgs/development/libraries/afflib/default.nix +++ b/pkgs/development/libraries/afflib/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - version = "3.7.5"; + version = "3.7.6"; name = "afflib-${version}"; src = fetchgit { url = "https://github.com/sshock/AFFLIBv3/"; rev = "refs/tags/v${version}"; - sha256 = "06dr3y6bd7vfjf0p9v85yp1xzg43x515zsa9587jcx7yy5h5ams5"; + sha256 = "11wpjbyja6cn0828sw3951s7dbly11abijk41my3cpy9wnvmiggh"; name = "afflib-${version}-checkout"; }; @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsdOriginal; maintainers = [ stdenv.lib.maintainers.raskin ]; inherit version; - downloadPage = "http://digitalcorpora.org/downloads/afflib/"; - updateWalker = true; + downloadPage = "https://github.com/sshock/AFFLIBv3/tags"; }; } diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index a4ea804b7762..b2500d1f49be 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake perl ]; enableParallelBuilding = true; + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; installPhase = '' mkdir -p $out/bin $out/include $out/lib diff --git a/pkgs/development/libraries/confuse/default.nix b/pkgs/development/libraries/confuse/default.nix index 67fe669a0374..e11e0ae0a1c8 100644 --- a/pkgs/development/libraries/confuse/default.nix +++ b/pkgs/development/libraries/confuse/default.nix @@ -10,6 +10,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.nongnu.org/confuse/; description = "Configuration file parser library"; - license = "BSD"; + license = stdenv.lib.licenses.isc; }; } diff --git a/pkgs/development/libraries/cppnetlib/default.nix b/pkgs/development/libraries/cppnetlib/default.nix deleted file mode 100644 index 818e28b0a769..000000000000 --- a/pkgs/development/libraries/cppnetlib/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{stdenv, fetchurl, cmake, openssl, boost}: - -stdenv.mkDerivation rec { - name = "cpp-netlib-0.9.2"; - - src = fetchurl { - url = "https://github.com/downloads/cpp-netlib/cpp-netlib/${name}.tar.bz2"; - sha256 = "0llmiyp9l7byavwdyb7vpks27yfv3g85170bm81paps748bcyb1p"; - }; - - buildInputs = [ cmake boost openssl ]; - - /* Tests fail to build ... - https://github.com/cpp-netlib/cpp-netlib/issues/85 - - Once working, we could do: - checkTarget = "test"; - doCheck = true; - */ - - preConfigure = '' - sed -i /test/d CMakeLists.txt - ''; - - /* The build phase just builds examples. That's at least some testing. - That's how to install the lib - copy the headers. */ - installPhase = '' - # We are at sourcepath/build - mkdir -p $out/include - cp -R ../boost $out/include/ - mkdir -p $out/lib - cp -R libs/network/src/*.a $out/lib/ - ''; - - meta = { - homepage = http://cpp-netlib.github.com/; - description = "Provides application layer network support at boost style"; - license = stdenv.lib.licenses.boost; - }; -} diff --git a/pkgs/development/libraries/czmq/default.nix b/pkgs/development/libraries/czmq/default.nix new file mode 100644 index 000000000000..8c513978cfdb --- /dev/null +++ b/pkgs/development/libraries/czmq/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, zeromq4}: + +stdenv.mkDerivation rec { + baseName="czmq"; + version="3.0.0-rc1"; + name="${baseName}-${version}"; + + src = fetchurl { + url = "http://download.zeromq.org/${name}.tar.gz"; + sha256 = "1g3rk3fz7xzsbqcdcwn0x18nmiyr70k47kg00gdrq8g10li8mmd9"; + }; + + buildInputs = [ zeromq4 ]; + + meta = { + license = stdenv.lib.licenses.mpl20; + homepage = "http://czmq.zeromq.org/"; + description = "High-level C Binding for ZeroMQ"; + }; +} diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index 14308dc0eb05..758f687fb73b 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, cmake}: let - version = "3.2.2"; + version = "3.2.3"; in stdenv.mkDerivation { name = "eigen-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; name = "eigen-${version}.tar.gz"; - sha256 = "0pwykjkz5n8wfyg9cjj7smgs54a9zc80m9gi106w43n2m72ni39i"; + sha256 = "14l5hlgxxymwyava5mx97ipyk3ma3alaj586aaz1xh1r700a7sxm"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/enginepkcs11/default.nix b/pkgs/development/libraries/enginepkcs11/default.nix index 8c570c5421d6..ff40a110a33e 100644 --- a/pkgs/development/libraries/enginepkcs11/default.nix +++ b/pkgs/development/libraries/enginepkcs11/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.opensc-project.org/engine_pkcs11/; - license = "BSD"; + license = stdenv.lib.licenses.bsdOriginal; description = "Engine for OpenSSL to use smart cards in PKCS#11 format"; }; } diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/development/libraries/eventlog/default.nix index 7a8ab8e464b4..12da7e896038 100644 --- a/pkgs/development/libraries/eventlog/default.nix +++ b/pkgs/development/libraries/eventlog/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { combination of description and tag/value pairs. ''; homepage = "http://www.balabit.com/support/community/products/"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/ffmpeg/2.3.x.nix b/pkgs/development/libraries/ffmpeg/2.2.x.nix index 2b4b0569b552..51a6bb8c880c 100644 --- a/pkgs/development/libraries/ffmpeg/2.3.x.nix +++ b/pkgs/development/libraries/ffmpeg/2.2.x.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.3.3"; + version = "2.2.11"; name = "ffmpeg-${version}"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "0ik4c06anh49r5b0d3rq9if4zl6ysjsa341655kzw22fl880sk5v"; + sha256 = "06sli7xvihh97ss6a2mkdq4dcj3rg1w8zffrmjfc1hvyjxhc8f2r"; }; subtitleSupport = config.ffmpeg.subtitle or true; diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix index bdd4b0392b9a..db69e2d69790 100644 --- a/pkgs/development/libraries/ffmpeg/2.x.nix +++ b/pkgs/development/libraries/ffmpeg/2.x.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.4.4"; + version = "2.5.1"; name = "ffmpeg-${version}"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "1z2a940fjryabwqzg5pw5k1r7ivkqdch4p2wbihb5f0z43043l4s"; + sha256 = "0lpgqw3pcsxjnj167fgsp70zycbhndhcji7icvj4i58hz6r51kq3"; }; subtitleSupport = config.ffmpeg.subtitle or true; diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix index 4e4391a50f75..bffb124dc68f 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = { homepage = http://people.cs.ubc.ca/~mariusm/flann/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; description = "Fast approximate nearest neighbor searches in high dimensional spaces"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 27c7b6738050..66d4f73096b8 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { description = "A YAML parser and emitter for C++"; homepage = https://code.google.com/p/yaml-cpp/; license = licenses.mit; - platforms = platforms.unix; + # 32bit is not supported: https://github.com/facebook/folly/issues/103 + platforms = [ "x86_64-linux" ]; maintainers = maintainers.abbradar; }; } diff --git a/pkgs/development/libraries/fontconfig-ultimate/confd.nix b/pkgs/development/libraries/fontconfig-ultimate/confd.nix index ce734527162a..e522cead8220 100644 --- a/pkgs/development/libraries/fontconfig-ultimate/confd.nix +++ b/pkgs/development/libraries/fontconfig-ultimate/confd.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation { rm $out/etc/fonts/conf.d/10-base-rendering.conf # Options controlled by NixOS module + rm $out/etc/fonts/conf.d/35-repl-custom.conf + rm $out/etc/fonts/conf.d/38-repl-*.conf rm $out/etc/fonts/conf.d/82-*.conf rm $out/etc/fonts/conf.d/83-*.conf diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index a13e399ab0fe..e9e393075b3e 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -7,30 +7,29 @@ }: let - version = "2.5.3"; + version = "2.5.4"; fetch_bohoomil = name: sha256: fetchpatch { - url = https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/8a155db28f264520596cc3e76eb44824bdb30f8e/01_freetype2-iu/ + name; + url = https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/e4c99bcf5ac9595e2c64393c0661377685c0ad24/01_freetype2-iu/ + name; inherit sha256; }; in -with { inherit (stdenv.lib) optional optionalString; }; +with { inherit (stdenv.lib) optional optionals optionalString; }; stdenv.mkDerivation rec { name = "freetype-${version}"; src = fetchurl { url = "mirror://sourceforge/freetype/${name}.tar.bz2"; - sha256 = "0pppcn73b5pwd7zdi9yfx16f5i93y18q7q4jmlkwmwrfsllqp160"; + sha256 = "1fxsbk4lp6ymifldzrb86g3x6mz771jmrzphkz92mcrkddk2qkiv"; }; - patches = [ ./enable-validation.patch ] # from Gentoo - ++ [ - (fetch_bohoomil "freetype-2.5.3-pkgconfig.patch" "1dpfdh8kmka3gzv14glz7l79i545zizah6wma937574v5z2iy3nn") - (fetch_bohoomil "fix_segfault_with_harfbuzz.diff" "1nx36inqrw717b86cla2miprdb3hii4vndw95k0jbbhfmax9k6fy") - ] - ++ optional useEncumberedCode - (fetch_bohoomil "infinality-2.5.3.patch" "0mxiybcb4wwbicrjiinh1b95rv543bh05sdqk1v0ipr3fxfrb47q") - ; + patches = [ ./enable-validation.patch ] # from Gentoo, bohoomil has the same patch as well + ++ [ ./fix-pcf.patch ] + ++ optionals useEncumberedCode [ + (fetch_bohoomil "02-ftsmooth-2.5.4.patch" "11w4wb7gwgpijc788mpkxj92d7rfdwrdv7jzrpxwv5w5cgpx9iw9") + (fetch_bohoomil "03-upstream-2014.12.07.patch" "0gq7y63mg3gc5z69nfkv2kl7xad0bjzsvnl6j1j9q79jjbvaqdq0") + (fetch_bohoomil "04-infinality-2.5.4-2014.12.07.patch" "1gph7z9s2221gy5dxn01v3lga0m9yib8yqsaqj5km74bqx1vlalh") + ]; propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype # dependence on harfbuzz is looser than the reverse dependence diff --git a/pkgs/development/libraries/freetype/fix-pcf.patch b/pkgs/development/libraries/freetype/fix-pcf.patch new file mode 100644 index 000000000000..bb301bcd9caa --- /dev/null +++ b/pkgs/development/libraries/freetype/fix-pcf.patch @@ -0,0 +1,132 @@ +Upstream fixes for pcf fonts. + +http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=74af85c4b62b35e55b0ce9dec55ee10cbc4962a2 +http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=06842c7b49c21f13c0ab61201daab6ff5a358fcc + +diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c +index 998cbed..e3caf82 100644 +--- a/src/pcf/pcfread.c ++++ b/src/pcf/pcfread.c +@@ -2,7 +2,7 @@ + + FreeType font driver for pcf fonts + +- Copyright 2000-2010, 2012, 2013 by ++ Copyright 2000-2010, 2012-2014 by + Francesco Zappa Nardelli + + Permission is hereby granted, free of charge, to any person obtaining a copy +@@ -78,7 +78,7 @@ THE SOFTWARE. + FT_FRAME_START( 16 ), + FT_FRAME_ULONG_LE( type ), + FT_FRAME_ULONG_LE( format ), +- FT_FRAME_ULONG_LE( size ), ++ FT_FRAME_ULONG_LE( size ), /* rounded up to a multiple of 4 */ + FT_FRAME_ULONG_LE( offset ), + FT_FRAME_END + }; +@@ -95,9 +95,11 @@ THE SOFTWARE. + FT_Memory memory = FT_FACE( face )->memory; + FT_UInt n; + ++ FT_ULong size; + +- if ( FT_STREAM_SEEK ( 0 ) || +- FT_STREAM_READ_FIELDS ( pcf_toc_header, toc ) ) ++ ++ if ( FT_STREAM_SEEK( 0 ) || ++ FT_STREAM_READ_FIELDS( pcf_toc_header, toc ) ) + return FT_THROW( Cannot_Open_Resource ); + + if ( toc->version != PCF_FILE_VERSION || +@@ -154,14 +156,35 @@ THE SOFTWARE. + break; + } + +- /* we now check whether the `size' and `offset' values are reasonable: */ +- /* `offset' + `size' must not exceed the stream size */ ++ /* ++ * We now check whether the `size' and `offset' values are reasonable: ++ * `offset' + `size' must not exceed the stream size. ++ * ++ * Note, however, that X11's `pcfWriteFont' routine (used by the ++ * `bdftopcf' program to create PDF font files) has two special ++ * features. ++ * ++ * - It always assigns the accelerator table a size of 100 bytes in the ++ * TOC, regardless of its real size, which can vary between 34 and 72 ++ * bytes. ++ * ++ * - Due to the way the routine is designed, it ships out the last font ++ * table with its real size, ignoring the TOC's size value. Since ++ * the TOC size values are always rounded up to a multiple of 4, the ++ * difference can be up to three bytes for all tables except the ++ * accelerator table, for which the difference can be as large as 66 ++ * bytes. ++ * ++ */ ++ + tables = face->toc.tables; +- for ( n = 0; n < toc->count; n++ ) ++ size = stream->size; ++ ++ for ( n = 0; n < toc->count - 1; n++ ) + { + /* we need two checks to avoid overflow */ +- if ( ( tables->size > stream->size ) || +- ( tables->offset > stream->size - tables->size ) ) ++ if ( ( tables->size > size ) || ++ ( tables->offset > size - tables->size ) ) + { + error = FT_THROW( Invalid_Table ); + goto Exit; +@@ -169,6 +192,15 @@ THE SOFTWARE. + tables++; + } + ++ /* no check of `tables->size' for last table element ... */ ++ if ( ( tables->offset > size ) ) ++ { ++ error = FT_THROW( Invalid_Table ); ++ goto Exit; ++ } ++ /* ... instead, we adjust `tables->size' to the real value */ ++ tables->size = size - tables->offset; ++ + #ifdef FT_DEBUG_LEVEL_TRACE + + { +@@ -733,8 +765,8 @@ THE SOFTWARE. + + FT_TRACE4(( " number of bitmaps: %d\n", nbitmaps )); + +- /* XXX: PCF_Face->nmetrics is singed FT_Long, see pcf.h */ +- if ( face->nmetrics < 0 || nbitmaps != ( FT_ULong )face->nmetrics ) ++ /* XXX: PCF_Face->nmetrics is signed FT_Long, see pcf.h */ ++ if ( face->nmetrics < 0 || nbitmaps != (FT_ULong)face->nmetrics ) + return FT_THROW( Invalid_File_Format ); + + if ( FT_NEW_ARRAY( offsets, nbitmaps ) ) +diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c +index e3caf82..a29a9e3 100644 +--- a/src/pcf/pcfread.c ++++ b/src/pcf/pcfread.c +@@ -192,14 +192,15 @@ THE SOFTWARE. + tables++; + } + +- /* no check of `tables->size' for last table element ... */ ++ /* only check `tables->offset' for last table element ... */ + if ( ( tables->offset > size ) ) + { + error = FT_THROW( Invalid_Table ); + goto Exit; + } +- /* ... instead, we adjust `tables->size' to the real value */ +- tables->size = size - tables->offset; ++ /* ... and adjust `tables->size' to the real value if necessary */ ++ if ( tables->size > size - tables->offset ) ++ tables->size = size - tables->offset; + + #ifdef FT_DEBUG_LEVEL_TRACE + diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index c397013750ba..76c896d64ddf 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,28 +1,30 @@ { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib -, postgresql, mysql, libgeotiff, python, pythonPackages}: +, postgresql, mysql, libgeotiff, python, pythonPackages, proj}: composableDerivation.composableDerivation {} (fixed: rec { - name = "gdal-1.11.0"; + version = "1.11.1"; + name = "gdal-${version}"; src = fetchurl { - url = "http://download.osgeo.org/gdal/1.11.0/${name}.tar.gz"; - md5 = "9fdf0f2371a3e9863d83e69951c71ec4"; + url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz"; + sha256 = "0h1kib2pzv4nbppdnxv6vhngvk9ic531y8rzcwb8bg6am125jszl"; }; - buildInputs = [ unzip libjpeg libtiff python pythonPackages.numpy]; + buildInputs = [ unzip libjpeg libtiff python pythonPackages.numpy proj]; # don't use optimization for gcc >= 4.3. That's said to be causeing segfaults preConfigure = "export CFLAGS=-O0; export CXXFLAGS=-O0"; configureFlags = [ "--with-jpeg=${libjpeg}" - "--with-libtiff=${libtiff}" # optional (without largetiff support - "--with-libz=${zlib}" # optional + "--with-libtiff=${libtiff}" # optional (without largetiff support + "--with-libz=${zlib}" # optional "--with-pg=${postgresql}/bin/pg_config" "--with-mysql=${mysql}/bin/mysql_config" "--with-geotiff=${libgeotiff}" - "--with-python" # optional + "--with-python" # optional + "--with-static-proj4=${proj}" # optional ]; meta = { diff --git a/pkgs/development/libraries/glibc/multi.nix b/pkgs/development/libraries/glibc/multi.nix index ad4a34152b65..e0a9fa46b969 100644 --- a/pkgs/development/libraries/glibc/multi.nix +++ b/pkgs/development/libraries/glibc/multi.nix @@ -1,7 +1,10 @@ { runCommand, glibc, glibc32 }: -runCommand "${glibc.name}-multi" +let + nameVersion = builtins.parseDrvName glibc.name; +in +runCommand "${nameVersion.name}-multi-${nameVersion.version}" { inherit glibc32; glibc64 = glibc; } diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index d3f74f4043a9..9e26d8ecf052 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.google.com/p/google-glog/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; description = "Library for application-level logging"; }; } diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/development/libraries/gnet/default.nix index f294889dd327..6b05bda1b3a7 100644 --- a/pkgs/development/libraries/gnet/default.nix +++ b/pkgs/development/libraries/gnet/default.nix @@ -1,12 +1,22 @@ -{stdenv, fetchurl, pkgconfig, glib}: - -assert pkgconfig != null && glib != null; +{stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, glib, libtool }: stdenv.mkDerivation { - name = "gnet-2.0.7"; - src = fetchurl { - url = http://www.gnetlibrary.org/src/gnet-2.0.7.tar.gz; - md5 = "3a7a40411775688fe4c42141ab007048"; + name = "gnet-2.0.8"; + src = fetchFromGitHub { + owner = "GNOME"; + repo = "gnet"; + rev = "GNET_2_0_8"; + sha256 = "1cy78kglzi235md964ikvm0rg801bx0yk9ya8zavndjnaarzqq87"; + }; + + buildInputs = [ pkgconfig autoconf automake glib libtool ]; + + preConfigure = "./autogen.sh"; + + meta = with stdenv.lib; { + description = "A network library, written in C, object-oriented, and built upon GLib"; + homepage = https://developer.gnome.org/gnet/; + platforms = platforms.linux; + maintainers = with maintainers; [ pSub ]; }; - buildInputs = [pkgconfig glib]; } diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index e30e2d7cf70f..c77500906e67 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -11,11 +11,11 @@ let "${gnupg}/bin/gpg2"; in stdenv.mkDerivation rec { - name = "gpgme-1.5.2"; + name = "gpgme-1.5.3"; src = fetchurl { url = "ftp://ftp.gnupg.org/gcrypt/gpgme/${name}.tar.bz2"; - sha256 = "1m7i0krffw4717jx7211d0pk4wi2rldg2bp7xgl6a0kgl6hb160y"; + sha256 = "1jgwmra6cf0i5x2prj92w77vl7hmj276qmmll3lwysbyn32l1c0d"; }; propagatedBuildInputs = [ libgpgerror glib libassuan pth ]; diff --git a/pkgs/development/libraries/haskell/DRBG/default.nix b/pkgs/development/libraries/haskell/DRBG/default.nix index c192ad4302ef..741368799d14 100644 --- a/pkgs/development/libraries/haskell/DRBG/default.nix +++ b/pkgs/development/libraries/haskell/DRBG/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "DRBG"; - version = "0.5.2"; - sha256 = "0c8w8h2mxpk2avj6321q9a1smzp970cyn87aj98vn8dln7h9cqsi"; + version = "0.5.3"; + sha256 = "197kp2bchkj3zrl3f06glba9lbjf51mp710sx0qj8i4spvf3jfr8"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/FontyFruity/default.nix b/pkgs/development/libraries/haskell/FontyFruity/default.nix index 1a613492f430..325ed34c5d6f 100644 --- a/pkgs/development/libraries/haskell/FontyFruity/default.nix +++ b/pkgs/development/libraries/haskell/FontyFruity/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "FontyFruity"; - version = "0.3"; - sha256 = "0ivz7hkz5mx8bqqv5av56a8rw4231wyzzg0dhz6465d59iqmjhd4"; + version = "0.4"; + sha256 = "0nrlsiwav1mwbmp555vwnc24250yn166yr5fjazjg9g7a0ikkivf"; buildDepends = [ binary deepseq filepath text vector ]; meta = { description = "A true type file format loader"; diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix index 2305756f93b5..e8c1c610e899 100644 --- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix +++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix @@ -6,14 +6,14 @@ cabal.mkDerivation (self: { pname = "JuicyPixels"; - version = "3.1.7.1"; - sha256 = "0mhsknqdrhxnm622mgrswvj4kvksh87x18s5ddgk4ylf0s2fjlap"; + version = "3.2"; + sha256 = "1z4i0464zdijv54b7wzc55zrp8h67ahm6mrdk7a6gi2qm0nihmy5"; buildDepends = [ binary deepseq mtl primitive transformers vector zlib ]; meta = { homepage = "https://github.com/Twinside/Juicy.Pixels"; - description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tiff and radiance)"; + description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/libraries/haskell/MonadRandom/0.3.nix b/pkgs/development/libraries/haskell/MonadRandom/0.3.0.1.nix index 8b522b5de43b..0362804ed45e 100644 --- a/pkgs/development/libraries/haskell/MonadRandom/0.3.nix +++ b/pkgs/development/libraries/haskell/MonadRandom/0.3.0.1.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "MonadRandom"; - version = "0.3"; - sha256 = "0bmsccjcz6glb0x0nkjlq3qywfibf0wxxv4dvdhjfw5sx6im9qx3"; + version = "0.3.0.1"; + sha256 = "0bbj6rkxskrvl14lngpggql4q41pw21cj4z8h592mizrxjfa3rj0"; buildDepends = [ mtl random transformers ]; meta = { description = "Random-number generation monad"; diff --git a/pkgs/development/libraries/haskell/Rasterific/default.nix b/pkgs/development/libraries/haskell/Rasterific/default.nix index c53e9f728580..5380cb596592 100644 --- a/pkgs/development/libraries/haskell/Rasterific/default.nix +++ b/pkgs/development/libraries/haskell/Rasterific/default.nix @@ -1,16 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, binary, criterion, deepseq, dlist, filepath, FontyFruity -, free, JuicyPixels, mtl, QuickCheck, statistics, vector +, free, JuicyPixels, mtl, primitive, QuickCheck, statistics, vector , vectorAlgorithms }: cabal.mkDerivation (self: { pname = "Rasterific"; - version = "0.3"; - sha256 = "1chbcfcb5il7fbzivszap60qfwcwrq85kpx9y6qdr2pim39199fa"; + version = "0.4"; + sha256 = "1cw8lalxp9cs3w3kfr4ayp5h0kd71fdnyih99xpljy8zxw28hv3z"; buildDepends = [ - dlist FontyFruity free JuicyPixels mtl vector vectorAlgorithms + dlist FontyFruity free JuicyPixels mtl primitive vector + vectorAlgorithms ]; testDepends = [ binary criterion deepseq filepath FontyFruity JuicyPixels diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix index a13113cde4e2..02764c108f8c 100644 --- a/pkgs/development/libraries/haskell/active/default.nix +++ b/pkgs/development/libraries/haskell/active/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "active"; - version = "0.1.0.16"; - sha256 = "0x4z9n0avk9pr9v64vfmbbpxx2n6cl32d8sw8y2w61345s2z628k"; + version = "0.1.0.17"; + sha256 = "1asp0han2737vfk92gasij804z4jsw8v2bc0m4nrmn3v80vmh7qb"; buildDepends = [ newtype semigroupoids semigroups vectorSpace ]; testDepends = [ newtype QuickCheck semigroupoids semigroups vectorSpace diff --git a/pkgs/development/libraries/haskell/ad/default.nix b/pkgs/development/libraries/haskell/ad/default.nix index afe8992aeeaf..72c53b5178a3 100644 --- a/pkgs/development/libraries/haskell/ad/default.nix +++ b/pkgs/development/libraries/haskell/ad/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "ad"; - version = "4.2.1"; - sha256 = "05ndr26lsc4xa18vfb3qdjcp03gsq2bhc8dc0yr5g1x9dybq6dx2"; + version = "4.2.1.1"; + sha256 = "1zdpfh4k93ygrm91m7lw1la6n4yvaq3k2sqswgia04naf2wcmjka"; buildDepends = [ comonad dataReify erf free nats reflection tagged transformers ]; diff --git a/pkgs/development/libraries/haskell/aeson-pretty/default.nix b/pkgs/development/libraries/haskell/aeson-pretty/default.nix index 7bc2beb3b301..8e1959c401c5 100644 --- a/pkgs/development/libraries/haskell/aeson-pretty/default.nix +++ b/pkgs/development/libraries/haskell/aeson-pretty/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "aeson-pretty"; - version = "0.7.1"; - sha256 = "0gmm1kmdbanfyfdyij1gnazycp1x9703qfa5hgrz39j9046zg3y6"; + version = "0.7.2"; + sha256 = "03ap81853qi8yd9kdgczllrrni23a6glsfxrwj8zab6ipjrbh234"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/algebra/default.nix b/pkgs/development/libraries/haskell/algebra/default.nix index 1e054a1cdb4f..2044c8ad8723 100644 --- a/pkgs/development/libraries/haskell/algebra/default.nix +++ b/pkgs/development/libraries/haskell/algebra/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "algebra"; - version = "4.1"; - sha256 = "1wcwpngaqnr9w89p5dycmpsaihdwqqrs2vjap6jfwrscq16yyyc6"; + version = "4.2"; + sha256 = "1b74c55326qsnpyqzyhyq87j61wp3zrpsqhipgw8db8nm2lq9nhs"; buildDepends = [ adjunctions distributive mtl nats semigroupoids semigroups tagged transformers void diff --git a/pkgs/development/libraries/haskell/ariadne/default.nix b/pkgs/development/libraries/haskell/ariadne/default.nix index f087787f67f3..2d282fae0223 100644 --- a/pkgs/development/libraries/haskell/ariadne/default.nix +++ b/pkgs/development/libraries/haskell/ariadne/default.nix @@ -27,5 +27,6 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/atto-lisp/default.nix b/pkgs/development/libraries/haskell/atto-lisp/default.nix index 9ee9ecd7a28c..6e69e3615853 100644 --- a/pkgs/development/libraries/haskell/atto-lisp/default.nix +++ b/pkgs/development/libraries/haskell/atto-lisp/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "atto-lisp"; - version = "0.2.1.2"; - sha256 = "0xl5b0gblab3v2sfaxvx3z96660r9xp1m2n3ri6aph3kldbpkfcg"; + version = "0.2.2"; + sha256 = "13lhdalam4gn9faa58c3c7nssdwp2y0jsfl1lnnvr3dx6wzp0jhc"; buildDepends = [ attoparsec blazeBuilder blazeTextual deepseq text ]; diff --git a/pkgs/development/libraries/haskell/aws/default.nix b/pkgs/development/libraries/haskell/aws/default.nix index 8f0818f43d61..1069c9da1e9d 100644 --- a/pkgs/development/libraries/haskell/aws/default.nix +++ b/pkgs/development/libraries/haskell/aws/default.nix @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { pname = "aws"; - version = "0.10.5"; - sha256 = "1d82q2477wp08zavlkzsksalbkiczz3vzy17ijk2z5xsw5yslqnj"; + version = "0.11"; + sha256 = "19q7r74c5xw04vpwl2fwm675bvkp3vhlak63iqfl1927z2jsyva9"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/base-prelude/default.nix b/pkgs/development/libraries/haskell/base-prelude/default.nix index fdbd2b855102..5cf966f35bd0 100644 --- a/pkgs/development/libraries/haskell/base-prelude/default.nix +++ b/pkgs/development/libraries/haskell/base-prelude/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "base-prelude"; - version = "0.1.6"; - sha256 = "1lc8j3wfaqh42pqshlizkpr67ghkr1m90m1g9xiw8h36p8n72fcm"; + version = "0.1.7"; + sha256 = "0xzgwj5sqx7y57biby77d6vrsghcmq85ha3frn8k4xq7wqqk4aqp"; meta = { homepage = "https://github.com/nikita-volkov/base-prelude"; description = "The most complete prelude formed from only the \"base\" package"; diff --git a/pkgs/development/libraries/haskell/bindings-portaudio/default.nix b/pkgs/development/libraries/haskell/bindings-portaudio/default.nix new file mode 100644 index 000000000000..6ae304d6c75c --- /dev/null +++ b/pkgs/development/libraries/haskell/bindings-portaudio/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, bindingsDSL, portaudio }: + +cabal.mkDerivation (self: { + pname = "bindings-portaudio"; + version = "0.1"; + sha256 = "0wcxq300ijfkf4zc7p4xwsd9wzhnlss0kxjf04fka01mf9bh3ai2"; + buildDepends = [ bindingsDSL ]; + pkgconfigDepends = [ portaudio ]; + meta = { + description = "Low-level bindings to portaudio library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/bound/default.nix b/pkgs/development/libraries/haskell/bound/default.nix index 31e7b053add3..dd1f288a1b97 100644 --- a/pkgs/development/libraries/haskell/bound/default.nix +++ b/pkgs/development/libraries/haskell/bound/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "bound"; - version = "1.0.3"; - sha256 = "0nfcxq87i9lzdkrg7g65cprn4rg9rhn9nyk2jpjh4c1rc7gdn0aq"; + version = "1.0.4"; + sha256 = "17qnrjmqhx07cpzwd1z4lp2d42jx1lfxl6b86d65g4fd79miipky"; buildDepends = [ bifunctors binary bytes cereal comonad hashable hashableExtras preludeExtras profunctors transformers diff --git a/pkgs/development/libraries/haskell/bytes/default.nix b/pkgs/development/libraries/haskell/bytes/default.nix index 4f6387781c26..1ad3446bd0cf 100644 --- a/pkgs/development/libraries/haskell/bytes/default.nix +++ b/pkgs/development/libraries/haskell/bytes/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "bytes"; - version = "0.14.1.1"; - sha256 = "11bsl31352h5lj7ad68byqqc27d5iz53kwx7b433l44g9kaijrvc"; + version = "0.14.1.2"; + sha256 = "1v1nnp1m5i4bfr0fshbps163v6yn6var53p0vcvav6g4w5wffd7d"; buildDepends = [ binary cereal mtl text time transformers transformersCompat void ]; diff --git a/pkgs/development/libraries/haskell/call/default.nix b/pkgs/development/libraries/haskell/call/default.nix new file mode 100644 index 000000000000..c11a07ae94c1 --- /dev/null +++ b/pkgs/development/libraries/haskell/call/default.nix @@ -0,0 +1,30 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, bindingsPortaudio, boundingboxes, cleanUnions, colors +, controlBool, deepseq, distributive, elevator, filepath, freetype2 +, GLFWB, hashable, JuicyPixels, JuicyPixelsUtil, lens, linear +, minioperational, mtl, objective, OpenGL, OpenGLRaw, random +, reflection, text, transformers, vector, WAVE +}: + +cabal.mkDerivation (self: { + pname = "call"; + version = "0.1.1.2"; + sha256 = "1g96asydq0lc07xf2c709zdv99r6ljs5a7jm6fvlyjswqnbrwy9s"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + bindingsPortaudio boundingboxes cleanUnions colors controlBool + deepseq distributive elevator filepath freetype2 GLFWB hashable + JuicyPixels JuicyPixelsUtil lens linear minioperational mtl + objective OpenGL OpenGLRaw random reflection text transformers + vector WAVE + ]; + meta = { + homepage = "https://github.com/fumieval/call"; + description = "The call game engine"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/cgrep/default.nix b/pkgs/development/libraries/haskell/cgrep/default.nix index a49697bccf9d..91f7920fceaf 100644 --- a/pkgs/development/libraries/haskell/cgrep/default.nix +++ b/pkgs/development/libraries/haskell/cgrep/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "cgrep"; - version = "6.4.8"; - sha256 = "0xz2kzrvxxaa67x21dckv7l01s7jhmak7ka0rp8qygx6zjf836wy"; + version = "6.4.9"; + sha256 = "1g5np8r5h8hxgyxr3m7595xh7fiq1b8h9w6vm0ly81949lbwclga"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/cheapskate/default.nix b/pkgs/development/libraries/haskell/cheapskate/default.nix index e3b13cdd8069..7d96433a588c 100644 --- a/pkgs/development/libraries/haskell/cheapskate/default.nix +++ b/pkgs/development/libraries/haskell/cheapskate/default.nix @@ -1,17 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, blazeHtml, dataDefault, mtl, syb, text, uniplate -, xssSanitize +{ cabal, aeson, blazeHtml, dataDefault, httpTypes, mtl, syb, text +, uniplate, wai, waiExtra, xssSanitize }: cabal.mkDerivation (self: { pname = "cheapskate"; - version = "0.1.0.1"; - sha256 = "0slrvbaamnwxx89kqjcr62058j00s2dw4c16q1swf817az2p66h8"; + version = "0.1.0.2"; + sha256 = "1bz3zi2w5vm128csg21swcz4cm7h8ybqylpknr4fnyxmg3gxdd7d"; isLibrary = true; isExecutable = true; buildDepends = [ - blazeHtml dataDefault mtl syb text uniplate xssSanitize + aeson blazeHtml dataDefault httpTypes mtl syb text uniplate wai + waiExtra xssSanitize ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index bd06ff10a86f..6fcecac9eb51 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "clientsession"; - version = "0.9.1"; - sha256 = "1hq4f5iq4xb9jilr6qprww9lql314vpfw5khwmizljry9cwd2gq7"; + version = "0.9.1.1"; + sha256 = "08h0461ydhfymw2pya472n81kx5rqp7awfgxlbz2r851rl5kqmn9"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/concurrent-extra/default.nix b/pkgs/development/libraries/haskell/concurrent-extra/default.nix index 43230662fe07..69c1d1edddcc 100644 --- a/pkgs/development/libraries/haskell/concurrent-extra/default.nix +++ b/pkgs/development/libraries/haskell/concurrent-extra/default.nix @@ -1,24 +1,22 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, async, baseUnicodeSymbols, HUnit, random, stm -, testFramework, testFrameworkHunit, unboundedDelays +{ cabal, async, HUnit, random, stm, testFramework +, testFrameworkHunit, unboundedDelays }: cabal.mkDerivation (self: { pname = "concurrent-extra"; - version = "0.7.0.8"; - sha256 = "0q6n7wlakvnvfrjr3zmxbn9i0dxq96071j565vffp0r5abxkn83q"; - buildDepends = [ baseUnicodeSymbols stm unboundedDelays ]; + version = "0.7.0.9"; + sha256 = "19bqm0brnbhhmp5nypi995p27mna7kd33xzw0kf7yx2w2p2kb1aw"; + buildDepends = [ stm unboundedDelays ]; testDepends = [ - async baseUnicodeSymbols HUnit random stm testFramework - testFrameworkHunit unboundedDelays + async HUnit random stm testFramework testFrameworkHunit + unboundedDelays ]; meta = { homepage = "https://github.com/basvandijk/concurrent-extra"; description = "Extra concurrency primitives"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix index b9ddeec104fb..8a551de35165 100644 --- a/pkgs/development/libraries/haskell/conduit-extra/default.nix +++ b/pkgs/development/libraries/haskell/conduit-extra/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "conduit-extra"; - version = "1.1.4.2"; - sha256 = "0s2ggca6g2104dylbrkn090xwsfrp0946bhwf7fgpfpg9gi1sz1g"; + version = "1.1.5"; + sha256 = "1i38n3pdibjpi9kg37wvv4m6krfbsdd4baik804ss2ml1ry7gm4p"; buildDepends = [ attoparsec blazeBuilder conduit filepath monadControl network primitive resourcet stm streamingCommons text transformers diff --git a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix index bd4b4f9639fd..a8979fef3153 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "crypto-pubkey"; - version = "0.2.4"; - sha256 = "0mdjr6zma2q7r2z9qibp2bwf73bis6zrv7ss62i4pz42kndb9hh4"; + version = "0.2.5"; + sha256 = "18rxm6mgxp8x4ns2725pw6ja2g6n6k64dj9cbwdlsb13pkdh3lxq"; buildDepends = [ byteable cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandom ]; diff --git a/pkgs/development/libraries/haskell/csv-conduit/default.nix b/pkgs/development/libraries/haskell/csv-conduit/default.nix new file mode 100644 index 000000000000..f0c01481dbd4 --- /dev/null +++ b/pkgs/development/libraries/haskell/csv-conduit/default.nix @@ -0,0 +1,31 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, attoparsec, attoparsecConduit, blazeBuilder, conduit +, conduitExtra, dataDefault, HUnit, mmorph, monadControl, mtl +, primitive, resourcet, testFramework, testFrameworkHunit, text +, transformers, unorderedContainers, vector +}: + +cabal.mkDerivation (self: { + pname = "csv-conduit"; + version = "0.6.3"; + sha256 = "1db1wlpl0ryyf8cmkrg1hgz4ggsvzy6z9ayzcc6n6rdywpfi29z4"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + attoparsec attoparsecConduit blazeBuilder conduit conduitExtra + dataDefault mmorph monadControl mtl primitive resourcet text + transformers unorderedContainers vector + ]; + testDepends = [ + HUnit mtl primitive testFramework testFrameworkHunit text + transformers vector + ]; + meta = { + homepage = "http://github.com/ozataman/csv-conduit"; + description = "A flexible, fast, conduit-based CSV parser library for Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ bergey ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix index 7e09fc12f70f..f281998890f5 100644 --- a/pkgs/development/libraries/haskell/cuda/default.nix +++ b/pkgs/development/libraries/haskell/cuda/default.nix @@ -4,8 +4,10 @@ cabal.mkDerivation (self: { pname = "cuda"; - version = "0.6.5.0"; - sha256 = "0q4c2xgffkchn8kxhiwjganmb3ki4yjhx5665zwfd18bgvmlnp60"; + version = "0.6.5.1"; + sha256 = "04j57inw4wmd0l74ryxdgpjcbf3zkklgkqw9bv7yp4n96n40mp0y"; + isLibrary = true; + isExecutable = true; buildTools = [ c2hs ]; extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.gcc ]; doCheck = false; diff --git a/pkgs/development/libraries/haskell/data-lens-light/default.nix b/pkgs/development/libraries/haskell/data-lens-light/default.nix index 2eca446c714c..017e5e706db6 100644 --- a/pkgs/development/libraries/haskell/data-lens-light/default.nix +++ b/pkgs/development/libraries/haskell/data-lens-light/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "data-lens-light"; - version = "0.1.2"; - sha256 = "1xxphcd36vw1ib48rfmrg207h0i1hlby01bm3xsxnq90ygizvxk7"; + version = "0.1.2.1"; + sha256 = "038vfzb4vxk1qb0246l2kgv9br37wg59wnlhzyjpn97lypwlf68w"; buildDepends = [ mtl ]; meta = { homepage = "https://github.com/feuerbach/data-lens-light"; diff --git a/pkgs/development/libraries/haskell/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix index 81aee9c42b44..dc88a6133505 100644 --- a/pkgs/development/libraries/haskell/dbus/default.nix +++ b/pkgs/development/libraries/haskell/dbus/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "dbus"; - version = "0.10.8"; - sha256 = "1pqcb6fk6l2xzwyy3n9sa2q2k3qykym1f98n2zf75545ix46b1r6"; + version = "0.10.9"; + sha256 = "0sjnmxy0ikvg21sip7yadg4qr3lniy1wwpavkg48dc87gv98ymdb"; buildDepends = [ cereal libxmlSax network parsec random text transformers vector xmlTypes diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix index a958c0b62660..78ed983650f7 100644 --- a/pkgs/development/libraries/haskell/diagrams/contrib.nix +++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "diagrams-contrib"; - version = "1.1.2.3"; - sha256 = "00bn9p2a6h26q7hfqqzwimfgr2avf7ilf61z3anz25raz8jqvfxc"; + version = "1.1.2.4"; + sha256 = "0iq5psy5wjm664hqsaprynba0b7x3ijxngh7mbk6hkh004vsna1w"; 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 0ce9a5590590..518b5594cb6c 100644 --- a/pkgs/development/libraries/haskell/diagrams/core.nix +++ b/pkgs/development/libraries/haskell/diagrams/core.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "diagrams-core"; - version = "1.2.0.3"; - sha256 = "1pmdz75v2xl8y0clqifs017gq40syxqpfa2h2mc50pip3484a7m5"; + version = "1.2.0.4"; + sha256 = "1axkgprqs4jvzh5vfr118nzr1h0m48axr5jfiqqrqvy5xyjcagkq"; buildDepends = [ dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace vectorSpacePoints diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index 3b42584bb285..d2e25254f678 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "diagrams-lib"; - version = "1.2.0.5"; - sha256 = "0km2j74riybmlhpb3jp4i3xilz4q2ngkifnsq6bsk8d0m3kqizd6"; + version = "1.2.0.7"; + sha256 = "12ddlipp47j2mifwhi0ilb2fjdh2whk24s4d5h6ais2znj3hh99a"; buildDepends = [ active colour dataDefaultClass diagramsCore dualTree filepath fingertree hashable intervals JuicyPixels lens MemoTrie diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix index 73bc954de5d5..841487305ef4 100644 --- a/pkgs/development/libraries/haskell/diagrams/postscript.nix +++ b/pkgs/development/libraries/haskell/diagrams/postscript.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "diagrams-postscript"; - version = "1.1.0.2"; - sha256 = "1djvra4igw43746wqhwg1ms76w2qlrsdwhr0b795si4wdx8k28b3"; + version = "1.1.0.3"; + sha256 = "172r7q9jzhy2kv5bsbakakwv6gpvy308gvp8xpirbch9mrvnjxhz"; buildDepends = [ dataDefaultClass diagramsCore diagramsLib dlist filepath hashable lens monoidExtras mtl semigroups split vectorSpace diff --git a/pkgs/development/libraries/haskell/diagrams/rasterific.nix b/pkgs/development/libraries/haskell/diagrams/rasterific.nix index 0aa953537ce7..8e494241f74e 100644 --- a/pkgs/development/libraries/haskell/diagrams/rasterific.nix +++ b/pkgs/development/libraries/haskell/diagrams/rasterific.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "diagrams-rasterific"; - version = "0.1.0.4"; - sha256 = "0l6072blz56rc4nxr2s7gh5p3zdcyq8cfndbqgzndsfak6wyixgb"; + version = "0.1.0.5"; + sha256 = "1a95l8g55jsmqhbv9flk5kfkfa40z93axbjfz6xb74lyvl6xccwr"; buildDepends = [ dataDefaultClass diagramsCore diagramsLib filepath FontyFruity JuicyPixels lens mtl optparseApplicative Rasterific split diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix index 00ce51e8d974..1994905c1d4b 100644 --- a/pkgs/development/libraries/haskell/diagrams/svg.nix +++ b/pkgs/development/libraries/haskell/diagrams/svg.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "diagrams-svg"; - version = "1.1.0.2"; - sha256 = "0dzws9c3swgnrx70a64614m9pc8rszfajgh674n7x56fbbp3ra1n"; + version = "1.1.0.3"; + sha256 = "0byqxwz9h1hi2yrq2vz32gv0az9q3l94qa2q3nl3j8sa64qmpdwq"; buildDepends = [ base64Bytestring blazeMarkup blazeSvg colour diagramsCore diagramsLib filepath hashable JuicyPixels lens monoidExtras mtl diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix index 24375cb277a9..0232a02c8af5 100644 --- a/pkgs/development/libraries/haskell/distributed-process/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "distributed-process"; - version = "0.5.1"; - sha256 = "1c654l7r3cn89nknh67vsg7crnfhgswh4523qyrmn8z4ykyd0zfk"; + version = "0.5.2"; + sha256 = "04llhz9z28365idgj13hhwkp98zwqv6mhhy9i7416wk5d3r70g7l"; buildDepends = [ binary dataAccessor deepseq distributedStatic hashable mtl networkTransport random rank1dynamic stm syb time transformers diff --git a/pkgs/development/libraries/haskell/distributed-static/default.nix b/pkgs/development/libraries/haskell/distributed-static/default.nix index 8f7f61da8f69..4dce7cc1deda 100644 --- a/pkgs/development/libraries/haskell/distributed-static/default.nix +++ b/pkgs/development/libraries/haskell/distributed-static/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "distributed-static"; - version = "0.3.0.0"; - sha256 = "1g8jr01jxlfshsz3mrpzl21q290whwz4va3zjp1h0d1pnfwz6jcj"; + version = "0.3.1.0"; + sha256 = "190b6vjcipgrvnfl72c0ssw8crza02gfw9kwyvwg043jcznihj08"; buildDepends = [ binary rank1dynamic ]; meta = { homepage = "http://haskell-distributed.github.com"; diff --git a/pkgs/development/libraries/haskell/dual-tree/default.nix b/pkgs/development/libraries/haskell/dual-tree/default.nix index f9cf3b13b413..7efdcce85261 100644 --- a/pkgs/development/libraries/haskell/dual-tree/default.nix +++ b/pkgs/development/libraries/haskell/dual-tree/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "dual-tree"; - version = "0.2.0.4"; - sha256 = "0visavx0zqgmcjcq07vfhk6dn867269w2gxa8nvc79gya56c6wdp"; + version = "0.2.0.5"; + sha256 = "077njr9m6x9n2id0419rn6v4xwb9nvxshrmas9pkknp52va4ljg5"; buildDepends = [ monoidExtras newtype semigroups ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/ekg-bosun/default.nix b/pkgs/development/libraries/haskell/ekg-bosun/default.nix index 23876662f2ae..e4074ddd1ff7 100644 --- a/pkgs/development/libraries/haskell/ekg-bosun/default.nix +++ b/pkgs/development/libraries/haskell/ekg-bosun/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "ekg-bosun"; - version = "1.0.2"; - sha256 = "0q32yvl5j59s22v357j8vx0i3b5cd0gygh7gyibym5ka5d5xd82m"; + version = "1.0.3"; + sha256 = "0mlfsmw1aa24p6fhml8m2dj2v7hrp91a9d3cfl74rr8z8am61mqc"; buildDepends = [ aeson ekgCore httpClient lens network networkUri text time unorderedContainers vector wreq diff --git a/pkgs/development/libraries/haskell/ekg/default.nix b/pkgs/development/libraries/haskell/ekg/default.nix index c19ec4ec8811..05dd7d998771 100644 --- a/pkgs/development/libraries/haskell/ekg/default.nix +++ b/pkgs/development/libraries/haskell/ekg/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "ekg"; - version = "0.4.0.4"; - sha256 = "1v1kskl1fwwpv72lay8c7nlvg2dswf6wij176fjfml1v8lmll2lr"; + version = "0.4.0.5"; + sha256 = "0ak06yz88p79bhayy8byy3j9yw9bix7zhw8yxfcdnxjwgnx621h0"; buildDepends = [ aeson ekgCore filepath network snapCore snapServer text time transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/elevator/default.nix b/pkgs/development/libraries/haskell/elevator/default.nix new file mode 100644 index 000000000000..a93e52a0ba08 --- /dev/null +++ b/pkgs/development/libraries/haskell/elevator/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, cleanUnions, transformers }: + +cabal.mkDerivation (self: { + pname = "elevator"; + version = "0.1.3"; + sha256 = "0z7rj70ilv4y95prfdj3fjlw4icr64d66lqgyr6jp28zxrxw1535"; + buildDepends = [ cleanUnions transformers ]; + meta = { + homepage = "https://github.com/fumieval/elevator"; + description = "Immediately lifts to a desired level"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/engine-io/default.nix b/pkgs/development/libraries/haskell/engine-io/default.nix index 141d54ab23c8..d275a2f2b0f5 100644 --- a/pkgs/development/libraries/haskell/engine-io/default.nix +++ b/pkgs/development/libraries/haskell/engine-io/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "engine-io"; - version = "1.2.2"; - sha256 = "1d8323nxklbhva2y8ymgm5h57j2p86sdjfh0yi1fjjr8p26dh2py"; + version = "1.2.3"; + sha256 = "05sc939x24f3na6nxywgbq0yx4wdamh6zk4spdclqgq65j7v0hxc"; buildDepends = [ aeson async attoparsec base64Bytestring either free monadLoops mwcRandom stm stmDelay text transformers unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/equational-reasoning/default.nix b/pkgs/development/libraries/haskell/equational-reasoning/default.nix index fa88fbfe2e80..b9562573f8f2 100644 --- a/pkgs/development/libraries/haskell/equational-reasoning/default.nix +++ b/pkgs/development/libraries/haskell/equational-reasoning/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "0.2.0.4"; sha256 = "1f94y6h7qg7rck7rxf6j8sygkh1xmfk0z1lr71inx6s74agjyc9j"; buildDepends = [ singletons tagged void ]; + jailbreak = true; meta = { description = "Proof assistant for Haskell using DataKinds & PolyKinds"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix index 86bc90fae815..c85ff455180d 100644 --- a/pkgs/development/libraries/haskell/esqueleto/default.nix +++ b/pkgs/development/libraries/haskell/esqueleto/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "esqueleto"; - version = "2.1.2"; - sha256 = "18wcr5jwf7iz0rfrx07b4mm3j15rqwc43a6hycrabijik6s0v95v"; + version = "2.1.2.1"; + sha256 = "0lynhkbrxxrngvdj5d4xlmi92s4m3dzdpd7gs1k408slil2i7r7i"; buildDepends = [ conduit monadLogger persistent resourcet tagged text transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/extensible-effects/default.nix b/pkgs/development/libraries/haskell/extensible-effects/default.nix index 2bae81325ae8..e7f1f16059d4 100644 --- a/pkgs/development/libraries/haskell/extensible-effects/default.nix +++ b/pkgs/development/libraries/haskell/extensible-effects/default.nix @@ -2,16 +2,17 @@ { cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, transformers, transformersBase +, typeAligned, void }: cabal.mkDerivation (self: { pname = "extensible-effects"; - version = "1.7.1.2"; - sha256 = "1mvyiqlga6al81j4b4rg9yl46ml5s0hnx1g2hyvqljzr12njmajv"; - buildDepends = [ transformers transformersBase ]; + version = "1.9.0.1"; + sha256 = "17hl4x4052jfn7xs6xhnc6d3x75a8haw2zsbnjd6rr5gsd1hq5kx"; + buildDepends = [ transformers transformersBase typeAligned void ]; testDepends = [ HUnit QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 + testFrameworkQuickcheck2 void ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/extra/default.nix b/pkgs/development/libraries/haskell/extra/default.nix index dfbdf73a2ae9..9e90fe2bb05b 100644 --- a/pkgs/development/libraries/haskell/extra/default.nix +++ b/pkgs/development/libraries/haskell/extra/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "extra"; - version = "0.8"; - sha256 = "06ydgniar294i9xzviz7qmr3xpnlkpvyvgigwxqfz50kv77w8ijw"; + version = "1.0"; + sha256 = "0ainwq8f2mp1wc30srl971xy4qnrcyrcyig1kmrxx951hgav1dkb"; buildDepends = [ filepath time ]; testDepends = [ filepath QuickCheck time ]; meta = { diff --git a/pkgs/development/libraries/haskell/fay-base/default.nix b/pkgs/development/libraries/haskell/fay-base/default.nix index e978d5ec9394..466dd4782617 100644 --- a/pkgs/development/libraries/haskell/fay-base/default.nix +++ b/pkgs/development/libraries/haskell/fay-base/default.nix @@ -4,14 +4,15 @@ cabal.mkDerivation (self: { pname = "fay-base"; - version = "0.19.2.1"; - sha256 = "19vzrdbd1c8wws4mccycpq70594qy2ka3mr5x5fsdya56ff4xgld"; + version = "0.19.4.1"; + sha256 = "1pk1jjwyh2n9fg583v4cd0ll5qglphwnfm08q95klcvc61p4wqg6"; buildDepends = [ fay ]; meta = { - homepage = "https://github.com/faylang/fay-base"; + homepage = "https://github.com/faylang/fay/"; description = "The base package for Fay"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; + inherit (fay.meta) broken; }; }) diff --git a/pkgs/development/libraries/haskell/fay-text/default.nix b/pkgs/development/libraries/haskell/fay-text/default.nix index 7f80072335ad..05b2505d7622 100644 --- a/pkgs/development/libraries/haskell/fay-text/default.nix +++ b/pkgs/development/libraries/haskell/fay-text/default.nix @@ -4,13 +4,14 @@ cabal.mkDerivation (self: { pname = "fay-text"; - version = "0.3.1"; - sha256 = "0blr39vah0zd3i6clzzgmsfhxncwj8q6j4widk27iz3l27nlyin8"; + version = "0.3.2"; + sha256 = "1yjsn188ixpfqdr75xyl57rbv53dybik4g28h6p3jv73q494552m"; buildDepends = [ fay fayBase text ]; meta = { homepage = "https://github.com/faylang/fay-text"; description = "Fay Text type represented as JavaScript strings"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; + inherit (fay.meta) broken; }; }) diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix index bcb58a44e08e..9a268a9b34fe 100644 --- a/pkgs/development/libraries/haskell/fay/default.nix +++ b/pkgs/development/libraries/haskell/fay/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "fay"; - version = "0.21.0.2"; - sha256 = "0hq9jfyl5ki3jcwffb9q7cxrgpchajgwk4j44kz37y1wji63lk96"; + version = "0.21.2.1"; + sha256 = "06ijfkm1x5a15hac9f4cs4f16rva2hkf07xfh0mm9q3wkamqxlfm"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -19,11 +19,13 @@ cabal.mkDerivation (self: { sourcemap split spoon syb text time transformers uniplate unorderedContainers utf8String vector ]; + jailbreak = true; meta = { homepage = "https://github.com/faylang/fay/wiki"; description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix index e516eb3613a0..5837cc448c2d 100644 --- a/pkgs/development/libraries/haskell/free/default.nix +++ b/pkgs/development/libraries/haskell/free/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "free"; - version = "4.9"; - sha256 = "01pa9ax9i4pkh9a5achndx5s7sxvhnk6rm57g8rzav79hzsr4cnx"; + version = "4.10.0.1"; + sha256 = "0vs080bbcbncjqa7z0l6zd10kpmilj8khxiqdn4bq24mifyryhvq"; buildDepends = [ bifunctors comonad distributive mtl preludeExtras profunctors semigroupoids semigroups transformers diff --git a/pkgs/development/libraries/haskell/generics-sop/default.nix b/pkgs/development/libraries/haskell/generics-sop/default.nix index 2fce6c66be59..d7724a7b1ba6 100644 --- a/pkgs/development/libraries/haskell/generics-sop/default.nix +++ b/pkgs/development/libraries/haskell/generics-sop/default.nix @@ -4,13 +4,15 @@ cabal.mkDerivation (self: { pname = "generics-sop"; - version = "0.1.0.2"; - sha256 = "01s3v3a29wdsps9vas8in2ks5p4d2arqp3qvmzqa7v2sz786xjra"; + version = "0.1.0.4"; + sha256 = "00rjlqsjb7hba5q0kbfwg4ajk75a4sd7m72wx18fa9rlz92qbx2j"; buildDepends = [ tagged ]; meta = { description = "Generic Programming using True Sums of Products"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ + aycanirican ocharles + ]; }; }) diff --git a/pkgs/development/libraries/haskell/ghc-server/default.nix b/pkgs/development/libraries/haskell/ghc-server/default.nix deleted file mode 100644 index ac9cb852704d..000000000000 --- a/pkgs/development/libraries/haskell/ghc-server/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, async, attoLisp, attoparsec, conduit, conduitExtra -, ghcPaths, mtl, network, syb, text -}: - -cabal.mkDerivation (self: { - pname = "ghc-server"; - version = "1.1"; - sha256 = "1rgrgx9xakq6vy6nanvwzwfvzbfg287pmm8pdm9lbd7kf7ls5ml4"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - async attoLisp attoparsec conduit conduitExtra ghcPaths mtl network - syb text - ]; - meta = { - description = "A server interface to GHC"; - license = self.stdenv.lib.licenses.bsd3; - 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 index 6605c43e4dd7..fe5d30be27c3 100644 --- a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix +++ b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghcjs-dom"; - version = "0.1.1.0"; - sha256 = "0ywxkp13n78skbcr0d1m5mgz23xds27sdfxswfc9zjcsb513w3gg"; + version = "0.1.1.1"; + sha256 = "0fwwm658gf4fp32zmfskfayi480ddsf40y2cfla88a7l1rbacwif"; buildDepends = [ ghcjsBase mtl text ]; meta = { description = "DOM library that supports both GHCJS and WebKitGTK"; diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix index 86e344dc2ca4..3e2b84a93db3 100644 --- a/pkgs/development/libraries/haskell/github/default.nix +++ b/pkgs/development/libraries/haskell/github/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "github"; - version = "0.13"; - sha256 = "1vvfrlz6p43mrzskvhp9skh6xbgd5pqcn06wvxw31plpamf5pmzn"; + version = "0.13.1"; + sha256 = "0rz89lpswxxsdyfjb63v9md96bxr3abxzwqryh1a2jxhm7f1ia5l"; buildDepends = [ aeson attoparsec base16Bytestring byteable caseInsensitive conduit cryptohash dataDefault failure hashable HTTP httpConduit httpTypes diff --git a/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix b/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix index 287f98d661da..bb7206803ebd 100644 --- a/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix +++ b/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "gitlib-libgit2"; - version = "3.1.0"; - sha256 = "1kjwc36fd14j2ipw53j8hdsy29gxir1qrm54wxgpp5n4q2kcs9pq"; + version = "3.1.0.1"; + sha256 = "0rqx1cqj7rciy7kr5dfzh4crvjk0s6amm3d5nzyawkkkdda54dcs"; buildDepends = [ conduit conduitCombinators exceptions fastLogger filepath gitlib hlibgit2 liftedAsync liftedBase missingForeign mmorph monadControl @@ -26,7 +26,6 @@ cabal.mkDerivation (self: { description = "Libgit2 backend for gitlib"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; maintainers = with self.stdenv.lib.maintainers; [ ianwookim ]; }; }) diff --git a/pkgs/development/libraries/haskell/gitlib-test/default.nix b/pkgs/development/libraries/haskell/gitlib-test/default.nix index e8ab6aca6cf0..130a0efdcd11 100644 --- a/pkgs/development/libraries/haskell/gitlib-test/default.nix +++ b/pkgs/development/libraries/haskell/gitlib-test/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "gitlib-test"; - version = "3.1.0"; - sha256 = "0hnwx5r9fdkxvx0zmqffpym921dvf1x2lky8w11y3rfhk9i1g7l4"; + version = "3.1.0.1"; + sha256 = "1c65v86brvw3sy48vg79j0ijc5n4cpafksqsmbjs50h3v80zkdm3"; buildDepends = [ conduit conduitCombinators exceptions gitlib hspec hspecExpectations HUnit monadControl tagged text time transformers @@ -18,6 +18,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ianwookim ]; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/gloss-banana/default.nix b/pkgs/development/libraries/haskell/gloss-banana/default.nix index 7edbb8649f9a..58adb03fc780 100644 --- a/pkgs/development/libraries/haskell/gloss-banana/default.nix +++ b/pkgs/development/libraries/haskell/gloss-banana/default.nix @@ -13,5 +13,6 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ twey ]; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/gloss-raster/default.nix b/pkgs/development/libraries/haskell/gloss-raster/default.nix index ff5e202ae737..16316b165907 100644 --- a/pkgs/development/libraries/haskell/gloss-raster/default.nix +++ b/pkgs/development/libraries/haskell/gloss-raster/default.nix @@ -1,12 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, gloss, llvm, repa }: +{ cabal, gloss, glossRendering, llvm, repa }: cabal.mkDerivation (self: { pname = "gloss-raster"; - version = "1.8.2.1"; - sha256 = "0ls8rlwrbpisrmq2xigf9926pak028dmld6shrblcmdbykaz55ha"; - buildDepends = [ gloss repa ]; + version = "1.9.2.1"; + sha256 = "0vz03hw9rck9vcbh1lvy7dncij9ykgh7mslb3hwsz8z570dbnacw"; + buildDepends = [ gloss glossRendering repa ]; extraLibraries = [ llvm ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/gloss-rendering/default.nix b/pkgs/development/libraries/haskell/gloss-rendering/default.nix new file mode 100644 index 000000000000..190993e44fc2 --- /dev/null +++ b/pkgs/development/libraries/haskell/gloss-rendering/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, bmp, GLUT, OpenGL }: + +cabal.mkDerivation (self: { + pname = "gloss-rendering"; + version = "1.9.2.1"; + sha256 = "05wdiadwjykz8x0fimznp3q1drm4v3vnv6cv6wjkj1xsclmhb99k"; + buildDepends = [ bmp GLUT OpenGL ]; + meta = { + description = "Gloss picture data types and rendering functions"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index 079914a84fcd..da6eb98776f6 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -1,12 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, bmp, GLUT, OpenGL }: +{ cabal, bmp, glossRendering, GLUT, OpenGL }: cabal.mkDerivation (self: { pname = "gloss"; - version = "1.8.2.2"; - sha256 = "1v3rvx3jidbh98znmnl122rqgg5r9zcl22h5ibzag9h5d31c5vzr"; - buildDepends = [ bmp GLUT OpenGL ]; + version = "1.9.2.1"; + sha256 = "1fk7472lw4621gv64fv4mna8z1av15f7d0didpc9r22rdlkpa80l"; + buildDepends = [ bmp glossRendering GLUT OpenGL ]; meta = { homepage = "http://gloss.ouroborus.net"; description = "Painless 2D vector graphics, animations and simulations"; diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix index e9a90659a95f..effbd57f7996 100644 --- a/pkgs/development/libraries/haskell/gtk/default.nix +++ b/pkgs/development/libraries/haskell/gtk/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "gtk"; - version = "0.13.0.3"; - sha256 = "1l42hn3mhycq2b7z517jjyz3s8kvf5nyy0m674da0h2rixw9r5fh"; + version = "0.13.3"; + sha256 = "016v6r53py659ncx0nvlcvvs3j3kj6rrbrm7lk8sggdhm7jvz6w7"; buildDepends = [ cairo gio glib mtl pango text ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; diff --git a/pkgs/development/libraries/haskell/gtk3/default.nix b/pkgs/development/libraries/haskell/gtk3/default.nix index 2bcb6848e59b..d39adf4e5e43 100644 --- a/pkgs/development/libraries/haskell/gtk3/default.nix +++ b/pkgs/development/libraries/haskell/gtk3/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "gtk3"; - version = "0.13.1"; - sha256 = "063my2y0fjsr2dgw066l6ck3mbcp1ahx5rqlzyb5xx1sbafrpl6a"; + version = "0.13.3"; + sha256 = "0246d4dxgmfvq7g8avswjry2rh5lfj1kzcf0vqwchgvlvcfhgzlh"; isLibrary = true; isExecutable = true; buildDepends = [ cairo gio glib mtl pango text time transformers ]; diff --git a/pkgs/development/libraries/haskell/hackage-db/default.nix b/pkgs/development/libraries/haskell/hackage-db/default.nix index 4940caff5857..e4243def8b48 100644 --- a/pkgs/development/libraries/haskell/hackage-db/default.nix +++ b/pkgs/development/libraries/haskell/hackage-db/default.nix @@ -4,12 +4,12 @@ cabal.mkDerivation (self: { pname = "hackage-db"; - version = "1.9.1"; - sha256 = "1cfbxdq8p904f5iif35k45psskx2j422rwjppcdja11j5dkax5sb"; + version = "1.11"; + sha256 = "14jjy3i5pjdcw2cx3n5ipg72zahvy9vh87vlcgnz44slw8av6dcq"; buildDepends = [ Cabal filepath tar utf8String ]; meta = { homepage = "http://github.com/peti/hackage-db"; - description = "provide access to the Hackage database via Data.Map"; + description = "access Hackage's package database via Data.Map"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ simons ]; diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 03730449a1aa..7eeacd238ba7 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.6.1.0"; - sha256 = "19yw5yp84vli228zmyz23vs6d5mb14rjbb81kvyra8fi8mmy2l6b"; + version = "4.6.1.1"; + sha256 = "1y1bc25ivj6sgq9909qgwsm54dn6sdisd1znkk9r5x9c7ajv6gaa"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/half/default.nix b/pkgs/development/libraries/haskell/half/default.nix index 009c141660fc..e113f6730d99 100644 --- a/pkgs/development/libraries/haskell/half/default.nix +++ b/pkgs/development/libraries/haskell/half/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "half"; - version = "0.2"; - sha256 = "0p5fw17mvcr6yizgdjy681a1gqdidb5yp80gksxrdm1dv6qf6xcp"; + version = "0.2.0.1"; + sha256 = "0lwh5bv8pnp9fzq64z1fg1i4fv8h2lcchs1298agq881hcay19qw"; meta = { homepage = "http://github.com/ekmett/half"; description = "Half-precision floating-point"; diff --git a/pkgs/development/libraries/haskell/hashable/default.nix b/pkgs/development/libraries/haskell/hashable/default.nix index bfd9ec03c0ec..ba2690e6ce84 100644 --- a/pkgs/development/libraries/haskell/hashable/default.nix +++ b/pkgs/development/libraries/haskell/hashable/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hashable"; - version = "1.2.2.0"; - sha256 = "08cfm1rzhf3d8dzn0iqadfs35151ff6szhnh4bwrpxcs6sq90fh3"; + version = "1.2.3.0"; + sha256 = "02akgpwjzj2w5jnn31xp6yvgs4xmyircm8wcbq9v0icza6yb11qi"; buildDepends = [ text ]; testDepends = [ HUnit QuickCheck random testFramework testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix index c941e08da35d..ddccebeb48d8 100644 --- a/pkgs/development/libraries/haskell/hashtables/default.nix +++ b/pkgs/development/libraries/haskell/hashtables/default.nix @@ -1,11 +1,15 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, hashable, primitive, vector }: +{ cabal, fetchgit, hashable, primitive, vector }: cabal.mkDerivation (self: { pname = "hashtables"; - version = "1.1.2.1"; - sha256 = "1166baqalpp9v735821drjvyasr44p4znbcs7njyr09fx87r23f5"; + version = "1.2.0.1"; + src = fetchgit { + url = "git://github.com/gregorycollins/hashtables.git"; + sha256 = "1622ba3eb37e72cbedf01ae17162e045ca6506dea8a78750cc85805fe8e86129"; + rev = "a045fa90f4bc3923f38d1b468ce4d3982cef85e0"; + }; buildDepends = [ hashable primitive vector ]; meta = { homepage = "http://github.com/gregorycollins/hashtables"; diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix index f8ec4d67a0b5..5185c1037a87 100644 --- a/pkgs/development/libraries/haskell/haskell-names/default.nix +++ b/pkgs/development/libraries/haskell/haskell-names/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "haskell-names"; - version = "0.4.1"; - sha256 = "1zkfq54s7n17g77sqzfhhc4bmqwdwbynz0gzwyaf3m4nmz6lkfl8"; + version = "0.5.0"; + sha256 = "07fwdnhiqz6w323iw4xspar8m6sc6mv85i5f2vzbb5y8mrv352zr"; buildDepends = [ aeson Cabal dataLensLight filepath haskellPackages haskellSrcExts hseCpp mtl tagged transformers traverseWithClass typeEq uniplate diff --git a/pkgs/development/libraries/haskell/hindent/default.nix b/pkgs/development/libraries/haskell/hindent/default.nix index 36fe2f7113de..ea5e13a1b5f3 100644 --- a/pkgs/development/libraries/haskell/hindent/default.nix +++ b/pkgs/development/libraries/haskell/hindent/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hindent"; - version = "3.9.1"; - sha256 = "1q1a5smykjs36y29cn34kws443kw0w26xjjfdvv0kf69jpcm4b2f"; + version = "4.0"; + sha256 = "1l4dhp55ps92zvz2nmhs1j4hfsbs0r5f2b7idjcy8ibng8sgb361"; isLibrary = true; isExecutable = true; buildDepends = [ dataDefault haskellSrcExts monadLoops mtl text ]; diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix index cbb4a44655db..afc5833d5e28 100644 --- a/pkgs/development/libraries/haskell/hmatrix/default.nix +++ b/pkgs/development/libraries/haskell/hmatrix/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hmatrix"; - version = "0.16.0.6"; - sha256 = "13xbz0dx153m6nc7lv522gihvav5n6a4kiavwsqwh27ql4zyind7"; + version = "0.16.1.0"; + sha256 = "0jdkh9cq3dzc2fdkqv2zpv70knfkr0i01wv83zw3gjjv081gcn5h"; buildDepends = [ binary deepseq random split storableComplex vector ]; diff --git a/pkgs/development/libraries/haskell/hspec-core/default.nix b/pkgs/development/libraries/haskell/hspec-core/default.nix index 5e8378dd8713..313153c55c03 100644 --- a/pkgs/development/libraries/haskell/hspec-core/default.nix +++ b/pkgs/development/libraries/haskell/hspec-core/default.nix @@ -1,21 +1,21 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, ansiTerminal, async, deepseq, ghcPaths, hspecExpectations -, hspecMeta, HUnit, QuickCheck, quickcheckIo, random, setenv -, silently, tfRandom, time, transformers +{ cabal, ansiTerminal, async, deepseq, hspecExpectations, hspecMeta +, HUnit, QuickCheck, quickcheckIo, random, setenv, silently +, tfRandom, time, transformers }: cabal.mkDerivation (self: { pname = "hspec-core"; - version = "2.0.2"; - sha256 = "19nssrvwnpa9yib9qqrhf1hi8m624si97874hhdh2hqc7kjqr332"; + version = "2.1.2"; + sha256 = "1mvsfr175g5dbk1xz48d0p4lv4gvv4z3ss3n2s7d2h83i25bmjvh"; buildDepends = [ ansiTerminal async deepseq hspecExpectations HUnit QuickCheck quickcheckIo random setenv tfRandom time transformers ]; testDepends = [ - ansiTerminal async deepseq ghcPaths hspecExpectations hspecMeta - HUnit QuickCheck quickcheckIo random setenv silently tfRandom time + ansiTerminal async deepseq hspecExpectations hspecMeta HUnit + QuickCheck quickcheckIo random setenv silently tfRandom time transformers ]; meta = { diff --git a/pkgs/development/libraries/haskell/hspec-discover/default.nix b/pkgs/development/libraries/haskell/hspec-discover/default.nix index bf7d280fca0f..8a4a79eae97f 100644 --- a/pkgs/development/libraries/haskell/hspec-discover/default.nix +++ b/pkgs/development/libraries/haskell/hspec-discover/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hspec-discover"; - version = "2.0.2"; - sha256 = "1439134sdgwimjihjy06g4vq3bkym97da4z1zkgxgj91ljfwlb2i"; + version = "2.1.2"; + sha256 = "0zv215br94agvg8dbz0f5az5cahgnw8gdx0z84zlrpjxkzf3rb19"; isLibrary = true; isExecutable = true; buildDepends = [ filepath ]; diff --git a/pkgs/development/libraries/haskell/hspec-laws/default.nix b/pkgs/development/libraries/haskell/hspec-laws/default.nix new file mode 100644 index 000000000000..b7b2a57d5342 --- /dev/null +++ b/pkgs/development/libraries/haskell/hspec-laws/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, hspec, markdownUnlit, QuickCheck }: + +cabal.mkDerivation (self: { + pname = "hspec-laws"; + version = "0.0.0"; + sha256 = "15mcspn20znjxjsjqivrfvpndjd2i3kic5nyij13lfwyd3p2al0j"; + buildDepends = [ hspec QuickCheck ]; + testDepends = [ hspec markdownUnlit QuickCheck ]; + meta = { + description = "Document and test laws for standard type classes"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index fc60a54cd733..8f8b66b39d32 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hspec"; - version = "2.0.2"; - sha256 = "19zxsadp1xwxdyp6zksaz4czdnmjd0x3gmbh7pqv6l4dxmd0545a"; + version = "2.1.2"; + sha256 = "04n34g7gbmbkyqzp9by4qdcf87m1gasmc2hnm8i0dqpcnssv05py"; buildDepends = [ hspecCore hspecDiscover hspecExpectations HUnit QuickCheck transformers diff --git a/pkgs/development/libraries/haskell/hspec2/default.nix b/pkgs/development/libraries/haskell/hspec2/default.nix index c833b80bb9fd..c6f64c92182c 100644 --- a/pkgs/development/libraries/haskell/hspec2/default.nix +++ b/pkgs/development/libraries/haskell/hspec2/default.nix @@ -12,5 +12,6 @@ cabal.mkDerivation (self: { description = "Alpha version of Hspec 2.0"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix index 12e69b7c7238..9ab96c6dfe87 100644 --- a/pkgs/development/libraries/haskell/http-client/default.nix +++ b/pkgs/development/libraries/haskell/http-client/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "http-client"; - version = "0.4.5"; - sha256 = "04ikxigxhppayzw4bfh52zznly6cd9vfd9gn3a12xz4js6q3pwva"; + version = "0.4.6"; + sha256 = "0zv1jncacwxxk8dj1jlicjdlfhxigpl23frq2vrp4w76d1lsa0d8"; buildDepends = [ base64Bytestring blazeBuilder caseInsensitive cookie dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes diff --git a/pkgs/development/libraries/haskell/httpd-shed/default.nix b/pkgs/development/libraries/haskell/httpd-shed/default.nix index 4ae04b2c7264..4a4334be7328 100644 --- a/pkgs/development/libraries/haskell/httpd-shed/default.nix +++ b/pkgs/development/libraries/haskell/httpd-shed/default.nix @@ -1,19 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, network }: +{ cabal, network, networkUri }: cabal.mkDerivation (self: { pname = "httpd-shed"; - version = "0.4.0.2"; - sha256 = "0w37ra59xhk6gqrxpk83m1wmm7mqygcg59y5nl00x279c77qzxj3"; + version = "0.4.0.3"; + sha256 = "064jy1mqhnf1hvq6s04wlhmp916rd522x58djb9qixv13vc8gzxh"; isLibrary = true; isExecutable = true; - buildDepends = [ network ]; + buildDepends = [ network networkUri ]; jailbreak = true; meta = { description = "A simple web-server with an interact style API"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix index 28eaff157f11..db2badaaaf22 100644 --- a/pkgs/development/libraries/haskell/hxt/default.nix +++ b/pkgs/development/libraries/haskell/hxt/default.nix @@ -18,5 +18,6 @@ cabal.mkDerivation (self: { description = "A collection of tools for processing XML with Haskell"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; }; }) diff --git a/pkgs/development/libraries/haskell/io-streams/default.nix b/pkgs/development/libraries/haskell/io-streams/default.nix index a046c234e63f..3963add1825e 100644 --- a/pkgs/development/libraries/haskell/io-streams/default.nix +++ b/pkgs/development/libraries/haskell/io-streams/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "io-streams"; - version = "1.2.0.1"; - sha256 = "12r7j8dzj80f4s9942a6pi60pd9jh44sqyl6hcn0npzmdyl7hg1k"; + version = "1.2.1.1"; + sha256 = "1pvrscyw7wcv910p8d9j4a9jdm0vm7m74g5kgzpc5hnxdfibhqj1"; buildDepends = [ attoparsec blazeBuilder network primitive text time transformers vector zlibBindings diff --git a/pkgs/development/libraries/haskell/jwt/default.nix b/pkgs/development/libraries/haskell/jwt/default.nix index 27eb104f4dff..400bd6c9e9d8 100644 --- a/pkgs/development/libraries/haskell/jwt/default.nix +++ b/pkgs/development/libraries/haskell/jwt/default.nix @@ -2,22 +2,24 @@ { cabal, aeson, base64Bytestring, cryptohash, dataDefault , httpTypes, HUnit, network, networkUri, QuickCheck, scientific -, tasty, tastyHunit, tastyQuickcheck, tastyTh, text, time -, unorderedContainers +, semigroups, tasty, tastyHunit, tastyQuickcheck, tastyTh, text +, time, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "jwt"; - version = "0.4.2"; - sha256 = "167qm37y5f3d05spr0z2jwkbm2sszz3khs6zd1p0az5q4nhq295w"; + version = "0.5.0"; + sha256 = "0445biw5rj4plbz4nbmzrn446dfsjnggzrrcn1m292g3dqp6gzgh"; buildDepends = [ aeson base64Bytestring cryptohash dataDefault httpTypes network - networkUri scientific text time unorderedContainers + networkUri scientific semigroups text time unorderedContainers + vector ]; testDepends = [ aeson base64Bytestring cryptohash dataDefault httpTypes HUnit - network networkUri QuickCheck scientific tasty tastyHunit - tastyQuickcheck tastyTh text time unorderedContainers + network networkUri QuickCheck scientific semigroups tasty + tastyHunit tastyQuickcheck tastyTh text time unorderedContainers + vector ]; meta = { homepage = "https://bitbucket.org/ssaasen/haskell-jwt"; diff --git a/pkgs/development/libraries/haskell/kan-extensions/default.nix b/pkgs/development/libraries/haskell/kan-extensions/default.nix index dce273d60a62..d359cebd6e14 100644 --- a/pkgs/development/libraries/haskell/kan-extensions/default.nix +++ b/pkgs/development/libraries/haskell/kan-extensions/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "kan-extensions"; - version = "4.1.0.1"; - sha256 = "1jrs5cp5bhv3sjfi3d2zl16x40fr086zadp69r8yigj43bgkwkkd"; + version = "4.1.1"; + sha256 = "0g7z37c2jvhvq08ynnd5z2spp7w56vqhpg5biscj62rw7fzssnar"; buildDepends = [ adjunctions comonad contravariant distributive free mtl pointed semigroupoids tagged transformers diff --git a/pkgs/development/libraries/haskell/lens-aeson/default.nix b/pkgs/development/libraries/haskell/lens-aeson/default.nix index 44097f2c9d4e..f1fcd255b5f9 100644 --- a/pkgs/development/libraries/haskell/lens-aeson/default.nix +++ b/pkgs/development/libraries/haskell/lens-aeson/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "lens-aeson"; - version = "1.0.0.2"; - sha256 = "1hq0zs1h4wapy1n9vyr4yiysnwbv26di8gl6msx3jkcahvlnkvlp"; + version = "1.0.0.3"; + sha256 = "0wfbnazarwcza5dn3icsdvsmkyf9ki5lr5d5yidmgijhs63ak7ac"; buildDepends = [ aeson attoparsec lens scientific text unorderedContainers vector ]; diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index 2729e42be61e..f82368422e4a 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "lens"; - version = "4.5"; - sha256 = "009wdzybzmk7cs27fzigsmxknim6f9s7lp7iivgcsfn49pd8imwv"; + version = "4.6.0.1"; + sha256 = "099hhkca39zxfj9xavd2rafzgm2r4nm8clngcsgcrn1qsy8knvz2"; buildDepends = [ bifunctors comonad contravariant distributive exceptions filepath free hashable mtl parallel primitive profunctors reflection diff --git a/pkgs/development/libraries/haskell/libnotify/default.nix b/pkgs/development/libraries/haskell/libnotify/default.nix new file mode 100644 index 000000000000..8ed4e80d49f3 --- /dev/null +++ b/pkgs/development/libraries/haskell/libnotify/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, glib, gtk, libnotify }: + +cabal.mkDerivation (self: { + pname = "libnotify"; + version = "0.1.1.0"; + sha256 = "1wc19v14agadj7dzi81lm3qzk2x33apaj5ylmg7x232k56xzfvr0"; + buildDepends = [ glib gtk ]; + extraLibraries = [ libnotify ]; + meta = { + description = "Bindings to libnotify library"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix index 3e4f95521bb5..80961ba86c87 100644 --- a/pkgs/development/libraries/haskell/lifted-base/default.nix +++ b/pkgs/development/libraries/haskell/lifted-base/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "lifted-base"; - version = "0.2.3.0"; - sha256 = "0wbh9l7hsbgvfplxyamvpb8nq6w147zsd2yskylfmpw7kyz6yp9n"; + version = "0.2.3.1"; + sha256 = "1ga2kvacb44syvv1l0gaqyzlp12h7rrqn8k5fvy7ca5ffxwy5472"; buildDepends = [ monadControl transformersBase ]; testDepends = [ HUnit monadControl testFramework testFrameworkHunit transformers diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix index bbe0763cd23a..6301d8d42d67 100644 --- a/pkgs/development/libraries/haskell/linear/default.nix +++ b/pkgs/development/libraries/haskell/linear/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "linear"; - version = "1.15.4"; - sha256 = "0xpprafv7dndihnk2mapgvhy4cpz2d24k5j1p3q5crrsi2wj7k0b"; + version = "1.15.5"; + sha256 = "17fxz49zj6vklgfs583zpn7naqgp5mv2zsvmxrv80ym8r52mp5mi"; buildDepends = [ adjunctions binary distributive hashable lens reflection semigroupoids semigroups tagged transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/list-t/default.nix b/pkgs/development/libraries/haskell/list-t/default.nix new file mode 100644 index 000000000000..9df455650f5d --- /dev/null +++ b/pkgs/development/libraries/haskell/list-t/default.nix @@ -0,0 +1,21 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, basePrelude, HTF, mmorph, monadControl, mtlPrelude +, transformers, transformersBase +}: + +cabal.mkDerivation (self: { + pname = "list-t"; + version = "0.3.0"; + sha256 = "091gz47gisajd2p0iwx0mw99bivfl7wpyddg1ypsvjv2qax94cm9"; + buildDepends = [ + basePrelude mmorph monadControl transformers transformersBase + ]; + testDepends = [ basePrelude HTF mtlPrelude ]; + meta = { + homepage = "https://github.com/nikita-volkov/list-t"; + description = "ListT done right"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/lzma-conduit/default.nix b/pkgs/development/libraries/haskell/lzma-conduit/default.nix index f93a53c8670f..9b80409ddd42 100644 --- a/pkgs/development/libraries/haskell/lzma-conduit/default.nix +++ b/pkgs/development/libraries/haskell/lzma-conduit/default.nix @@ -20,5 +20,6 @@ cabal.mkDerivation (self: { description = "Conduit interface for lzma/xz compression"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + broken = self.stdenv.isLinux && self.stdenv.isi686; }; }) diff --git a/pkgs/development/libraries/haskell/machines/default.nix b/pkgs/development/libraries/haskell/machines/default.nix index 02b2ec272b02..bb01e9f655ef 100644 --- a/pkgs/development/libraries/haskell/machines/default.nix +++ b/pkgs/development/libraries/haskell/machines/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "machines"; - version = "0.4.0.1"; - sha256 = "11h1b6hls7v4ifz3p7v1gdsgxqgyx92v978pjfyp81ianwjyclqg"; + version = "0.4.1"; + sha256 = "1wripnvpzfdnf7i2aygjyh33cp7srkb5638snwyn700bjbi2j7gb"; buildDepends = [ comonad free mtl pointed profunctors semigroups transformers void ]; diff --git a/pkgs/development/libraries/haskell/markdown/default.nix b/pkgs/development/libraries/haskell/markdown/default.nix index d2d7ef843756..cd0bcd3cfee3 100644 --- a/pkgs/development/libraries/haskell/markdown/default.nix +++ b/pkgs/development/libraries/haskell/markdown/default.nix @@ -1,17 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, attoparsec, blazeHtml, conduit, conduitExtra, dataDefault -, hspec, systemFileio, systemFilepath, text, transformers -, xssSanitize +{ cabal, attoparsec, blazeHtml, blazeMarkup, conduit, conduitExtra +, dataDefault, hspec, systemFileio, systemFilepath, text +, transformers, xssSanitize }: cabal.mkDerivation (self: { pname = "markdown"; - version = "0.1.12"; - sha256 = "19qpr9k3yz5c77i4y4qldq4ak0m8iy6ca5wjx6mix9krlnwxkrid"; + version = "0.1.13"; + sha256 = "1r04h641d9y8p88h59isrz9g42gq7vdykx3n8bhk499ici800134"; buildDepends = [ - attoparsec blazeHtml conduit conduitExtra dataDefault text - transformers xssSanitize + attoparsec blazeHtml blazeMarkup conduit conduitExtra dataDefault + text transformers xssSanitize ]; testDepends = [ blazeHtml conduit conduitExtra hspec systemFileio systemFilepath diff --git a/pkgs/development/libraries/haskell/minioperational/default.nix b/pkgs/development/libraries/haskell/minioperational/default.nix index d037645682f2..04da7e27e2c4 100644 --- a/pkgs/development/libraries/haskell/minioperational/default.nix +++ b/pkgs/development/libraries/haskell/minioperational/default.nix @@ -1,16 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, transformers }: +{ cabal, cleanUnions, elevator, transformers }: cabal.mkDerivation (self: { pname = "minioperational"; - version = "0.4.6"; - sha256 = "0ir15l9ks4wik5wmhc9v23d2wlh4v499a52pzzsl8w40406lm5ln"; - buildDepends = [ transformers ]; + version = "0.4.8.1"; + sha256 = "02nkgbpf1dky7h3n99j9m3101wyfahcdx5wk5vidvf9snl5vy1w9"; + buildDepends = [ cleanUnions elevator transformers ]; meta = { homepage = "https://github.com/fumieval/minioperational"; description = "fast and simple operational monad"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; }; }) diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix index 4cb44acf652e..68e3c0164c08 100644 --- a/pkgs/development/libraries/haskell/monad-logger/default.nix +++ b/pkgs/development/libraries/haskell/monad-logger/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "monad-logger"; - version = "0.3.8"; - sha256 = "08mvz78ak6rf22s2z0b50iky36cnd6f498262aj57l7j0l7zsy7r"; + version = "0.3.11"; + sha256 = "0ydxv4pdq660dh3cdmsd5lgjkfhh7c62kb5vcl8jl6qmjf8kvmdq"; buildDepends = [ blazeBuilder conduit conduitExtra exceptions fastLogger liftedBase monadControl monadLoops mtl resourcet stm stmChans text diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.7.nix index d43379da7f96..c9d6cf71ae57 100644 --- a/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix +++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.7.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "monad-par"; - version = "0.3.4.6"; - sha256 = "1k345fpq31jg0mvfk8ap03wscnx8dvlp65gr567vai9ym1ahk6zy"; + version = "0.3.4.7"; + sha256 = "12n27hs274nrfkpa6hx0gdkrc76wxzliqf53x6689idl363sdf13"; buildDepends = [ abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom parallel diff --git a/pkgs/development/libraries/haskell/monad-parallel/default.nix b/pkgs/development/libraries/haskell/monad-parallel/default.nix index db53712d4ef1..bff520fab83e 100644 --- a/pkgs/development/libraries/haskell/monad-parallel/default.nix +++ b/pkgs/development/libraries/haskell/monad-parallel/default.nix @@ -1,12 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, parallel, transformers }: +{ cabal, parallel, transformers, transformersCompat }: cabal.mkDerivation (self: { pname = "monad-parallel"; - version = "0.7.1.2"; - sha256 = "0ybifm54dwaz5jqccw7hwlykjw4bcnl924808bi01j5i7ggyz5wj"; - buildDepends = [ parallel transformers ]; + version = "0.7.1.3"; + sha256 = "150ich9fzpmwdvvhsd7ri97nm8zsqn86gr3bh0aqb0wgrg4hbmkx"; + buildDepends = [ parallel transformers transformersCompat ]; meta = { homepage = "http://trac.haskell.org/SCC/wiki/monad-parallel"; description = "Parallel execution of monadic computations"; diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix index 3c0a742a1f3d..f7ae10ce08da 100644 --- a/pkgs/development/libraries/haskell/monoid-extras/default.nix +++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "monoid-extras"; - version = "0.3.3.4"; - sha256 = "0jbly9zxnsm15a5d3xg7i6w1mpqi4irdc76996xm5slg8bh0cji6"; + version = "0.3.3.5"; + sha256 = "07xll4pz0ijjxj75z0s0bz1lia2f65hsm61snlx0jv3aybrnw280"; buildDepends = [ groups semigroupoids semigroups ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/mtl-prelude/default.nix b/pkgs/development/libraries/haskell/mtl-prelude/default.nix new file mode 100644 index 000000000000..3bf2395cb3a0 --- /dev/null +++ b/pkgs/development/libraries/haskell/mtl-prelude/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, mtl, transformers }: + +cabal.mkDerivation (self: { + pname = "mtl-prelude"; + version = "1.0.1"; + sha256 = "09zdsgh4y4b5chl847n1dz4vys2sdyxmf0v39ad449s5rv5l92hj"; + buildDepends = [ mtl transformers ]; + meta = { + homepage = "https://github.com/nikita-volkov/mtl-prelude"; + description = "Reexports of most definitions from \"mtl\" and \"transformers\""; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/nats/default.nix b/pkgs/development/libraries/haskell/nats/default.nix index e870d171383b..3c4130eddc48 100644 --- a/pkgs/development/libraries/haskell/nats/default.nix +++ b/pkgs/development/libraries/haskell/nats/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "nats"; - version = "0.2"; - sha256 = "05skqs5ahbrnwlsxjihkvmsw0n49k9mqdhrv9nqh4dmd1j622r73"; + version = "1"; + sha256 = "0r6s8l4s0yq3x2crrkv0b8zac13magfasr9v8hnq6rn1icsfhic0"; buildDepends = [ hashable ]; meta = { homepage = "http://github.com/ekmett/nats/"; diff --git a/pkgs/development/libraries/haskell/network-fancy/default.nix b/pkgs/development/libraries/haskell/network-fancy/default.nix index 8e0cf7578345..92e6e9e34c7e 100644 --- a/pkgs/development/libraries/haskell/network-fancy/default.nix +++ b/pkgs/development/libraries/haskell/network-fancy/default.nix @@ -1,14 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { pname = "network-fancy"; - version = "0.1.5.2"; - sha256 = "039yrrir17sphkzarwl7hncj7fb4x471mh2lvpqixl3a6nij141c"; + version = "0.2.2"; + sha256 = "12q2ifjwg4ss5l2pv42nfhsawncbwm6y4dwrspadkjv9b8idl91j"; meta = { homepage = "http://github.com/taruti/network-fancy"; description = "Networking support with a cleaner API"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; - preConfigure = ''substituteInPlace Setup.hs --replace '-> rt' '-> return ()' ''; }) diff --git a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix index b4a70eb68436..cd467f5d2ab7 100644 --- a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix +++ b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix @@ -6,19 +6,16 @@ cabal.mkDerivation (self: { pname = "network-transport-tcp"; - version = "0.4.0"; - sha256 = "1jjf1dj67a7l3jg3qgbg0hrjfnx1kr9n7hfvqssq7kr8sq1sc49v"; + version = "0.4.1"; + sha256 = "11fj0f2yrvdqn3sivfb4p0chs74bx26a0yc49fh160kkcmk42yaf"; buildDepends = [ dataAccessor network networkTransport ]; testDepends = [ network networkTransport networkTransportTests ]; doCheck = false; - patchPhase = '' - sed -i -e 's|network >=.*,|network,|' -e 's|network >=.*|network|' network-transport-tcp.cabal - ''; meta = { homepage = "http://haskell-distributed.github.com"; description = "TCP instantiation of Network.Transport"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = with self.stdenv.lib.maintainers; [ andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/network-transport-tests/default.nix b/pkgs/development/libraries/haskell/network-transport-tests/default.nix index 2dc5036899b0..5ee1edec2e98 100644 --- a/pkgs/development/libraries/haskell/network-transport-tests/default.nix +++ b/pkgs/development/libraries/haskell/network-transport-tests/default.nix @@ -4,15 +4,14 @@ cabal.mkDerivation (self: { pname = "network-transport-tests"; - version = "0.1.0.1"; - sha256 = "15vdkjq10mm378iyci1lpj6b77m7sil5mk3yhzf6vcbfj54pwca6"; + version = "0.2.1.0"; + sha256 = "17qf52a76an9ignhb85alz92j9vk3p0ydmaqys8b1ss5mkqipm64"; buildDepends = [ ansiTerminal mtl networkTransport random ]; + jailbreak = true; meta = { - homepage = "http://github.com/haskell-distributed/distributed-process"; + homepage = "http://haskell-distributed.github.com"; description = "Unit tests for Network.Transport implementations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/network-transport/default.nix b/pkgs/development/libraries/haskell/network-transport/default.nix index c59a3fbb235e..410e6076f291 100644 --- a/pkgs/development/libraries/haskell/network-transport/default.nix +++ b/pkgs/development/libraries/haskell/network-transport/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "network-transport"; - version = "0.4.0.0"; - sha256 = "1485w86wzszlg4dvl0fkr7wa47snvpw825llrvdgrrkcxamhsmrz"; + version = "0.4.1.0"; + sha256 = "0xn879ngrbnm71i1wsbxxiih22sdb6csy6aip6fgqyafqlpc1c93"; buildDepends = [ binary hashable transformers ]; meta = { homepage = "http://haskell-distributed.github.com"; diff --git a/pkgs/development/libraries/haskell/objective/default.nix b/pkgs/development/libraries/haskell/objective/default.nix index 9ed48a45e923..4051efb42f71 100644 --- a/pkgs/development/libraries/haskell/objective/default.nix +++ b/pkgs/development/libraries/haskell/objective/default.nix @@ -1,12 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, cleanUnions, free, transformers }: +{ cabal, cleanUnions, elevator, minioperational, profunctors +, transformers +}: cabal.mkDerivation (self: { pname = "objective"; - version = "0.4"; - sha256 = "0zcls4b6i5b9yazy6d6fq2vpc6gbq16cqbycyc909bm7kkqzmb86"; - buildDepends = [ cleanUnions free transformers ]; + version = "0.6.1"; + sha256 = "1rnlh16r9kcrxffih6z8rprds9nxhlqksqba9wdgdkkwhrhq0ah6"; + buildDepends = [ + cleanUnions elevator minioperational profunctors transformers + ]; meta = { homepage = "https://github.com/fumieval/objective"; description = "Extensible objects"; diff --git a/pkgs/development/libraries/haskell/ofx/default.nix b/pkgs/development/libraries/haskell/ofx/default.nix new file mode 100644 index 000000000000..d7fd805f5e81 --- /dev/null +++ b/pkgs/development/libraries/haskell/ofx/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, parsec, time }: + +cabal.mkDerivation (self: { + pname = "ofx"; + version = "0.4.0.2"; + sha256 = "0vhr2pydnfc0ma7w1qdn5p5yylzlj3n47fnm16mlbhlb5ydnjshg"; + buildDepends = [ parsec time ]; + jailbreak = true; + meta = { + homepage = "http://www.github.com/massysett/ofx"; + description = "Parser for OFX data"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/opaleye/default.nix b/pkgs/development/libraries/haskell/opaleye/default.nix index 850267648b07..918bef94fbae 100644 --- a/pkgs/development/libraries/haskell/opaleye/default.nix +++ b/pkgs/development/libraries/haskell/opaleye/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "opaleye"; - version = "0.2"; - sha256 = "08qlgsr8jcwn7sx2j08nk5lggx37mh0wc8gggj6gxqpafm0jn247"; + version = "0.3"; + sha256 = "1jq2q0dswgj5jksdd5xn2ny66d1nfqmwf7cv835gg59g4rd2yyrx"; buildDepends = [ contravariant postgresqlSimple productProfunctors profunctors semigroups text time transformers uuid diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.4.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.5.nix index e1d1b24286d0..987ee8c5bdc3 100644 --- a/pkgs/development/libraries/haskell/parallel/3.2.0.4.nix +++ b/pkgs/development/libraries/haskell/parallel/3.2.0.5.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "parallel"; - version = "3.2.0.4"; - sha256 = "0v8l2rbczjadynbz4q4r00k8a1mqj70y63zbklpxckafq1zn7nwc"; + version = "3.2.0.5"; + sha256 = "16hhsi8pr29qqg9ssks0y9j0vmnvpyy1qk46s0c0vgj3pyzl38mm"; buildDepends = [ deepseq ]; meta = { description = "Parallel programming library"; diff --git a/pkgs/development/libraries/haskell/pipes-http/default.nix b/pkgs/development/libraries/haskell/pipes-http/default.nix index 5406a5797990..5f432bc9dd98 100644 --- a/pkgs/development/libraries/haskell/pipes-http/default.nix +++ b/pkgs/development/libraries/haskell/pipes-http/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "pipes-http"; - version = "1.0.1"; - sha256 = "15jmhf6lgqxv9zn08dky8biiv8cp4s3vf0xmp78pbllaqkvm4z9w"; + version = "1.0.2"; + sha256 = "0hqab1pzcj11qwvc4dznis0qsyn1zc1d0riqxy6b5k04p9i2jbzk"; buildDepends = [ httpClient httpClientTls pipes ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/pointed/default.nix b/pkgs/development/libraries/haskell/pointed/default.nix index f486737765ed..82ee1a418c7c 100644 --- a/pkgs/development/libraries/haskell/pointed/default.nix +++ b/pkgs/development/libraries/haskell/pointed/default.nix @@ -1,16 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, comonad, dataDefaultClass, semigroupoids, semigroups, stm -, tagged, transformers +, tagged, transformers, transformersCompat }: cabal.mkDerivation (self: { pname = "pointed"; - version = "4.1"; - sha256 = "1l40nl1sx16hbqz1kv70g6jp2igvvj93p5db8b6bsgjxx9ibck6g"; + version = "4.1.1"; + sha256 = "183ix3cax4qvph6grghpj5n4m7bd5xznqahjbgwz88gkf9rp2gbj"; buildDepends = [ comonad dataDefaultClass semigroupoids semigroups stm tagged - transformers + transformers transformersCompat ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index 3285a9209aa7..d48e80e30143 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -1,17 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, aeson, attoparsec, base16Bytestring, blazeBuilder -, blazeTextual, cryptohash, hashable, HUnit, postgresqlLibpq -, scientific, text, time, transformers, uuid, vector +, blazeTextual, caseInsensitive, cryptohash, hashable, HUnit +, postgresqlLibpq, scientific, text, time, transformers, uuid +, vector }: cabal.mkDerivation (self: { pname = "postgresql-simple"; - version = "0.4.7.0"; - sha256 = "17cs5f7pfh30y2n8b3w76v832sd5z9m5xswpfa5w6r2vf18xpkqs"; + version = "0.4.8.0"; + sha256 = "09mflczxjm7a8nixi4a989nq1ijhpikl4j9kqvzcpmfgb8sx38nm"; buildDepends = [ - aeson attoparsec blazeBuilder blazeTextual hashable postgresqlLibpq - scientific text time transformers uuid vector + aeson attoparsec blazeBuilder blazeTextual caseInsensitive hashable + postgresqlLibpq scientific text time transformers uuid vector ]; testDepends = [ aeson base16Bytestring cryptohash HUnit text time vector diff --git a/pkgs/development/libraries/haskell/presburger/default.nix b/pkgs/development/libraries/haskell/presburger/default.nix index fed380b9bd0c..a8efaf7554e5 100644 --- a/pkgs/development/libraries/haskell/presburger/default.nix +++ b/pkgs/development/libraries/haskell/presburger/default.nix @@ -1,11 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal }: +{ cabal, QuickCheck }: cabal.mkDerivation (self: { pname = "presburger"; - version = "1.1"; - sha256 = "0pb0rabhhzrrrsr8260lgjpp168pm8ldqwfqbc2i1wy95n7wxk7c"; + version = "1.2"; + sha256 = "1kx51ydpjg5dv762p85qh9w76qm038rw9pgfnd0az1vms97r1kpm"; + testDepends = [ QuickCheck ]; meta = { homepage = "http://github.com/yav/presburger"; description = "A decision procedure for quantifier-free linear arithmetic"; diff --git a/pkgs/development/libraries/haskell/present/default.nix b/pkgs/development/libraries/haskell/present/default.nix index 7c5f3afbd988..ee63eccf005b 100644 --- a/pkgs/development/libraries/haskell/present/default.nix +++ b/pkgs/development/libraries/haskell/present/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "present"; - version = "1.1"; - sha256 = "1hmzq3qi4hz74xr7cnc33kpwki9ziyinvrwazag8hh77d02fl11z"; + version = "2.2"; + sha256 = "1z9zvmszda7h1h4inq4b6ig9bd205mskqq85ns3rzsffxaj471p4"; buildDepends = [ aeson attoLisp dataDefault mtl semigroups text ]; meta = { description = "Make presentations for data types"; diff --git a/pkgs/development/libraries/haskell/product-profunctors/default.nix b/pkgs/development/libraries/haskell/product-profunctors/default.nix index 0e5e18de3397..444baa76a1a9 100644 --- a/pkgs/development/libraries/haskell/product-profunctors/default.nix +++ b/pkgs/development/libraries/haskell/product-profunctors/default.nix @@ -4,9 +4,10 @@ cabal.mkDerivation (self: { pname = "product-profunctors"; - version = "0.5"; - sha256 = "02hkcq4vzk4641hkm1rf2v2qdbaqalbfgnwfdk7yfz497qv9lmad"; + version = "0.6"; + sha256 = "1qhl2v0shzip5yh7x7b6k7xsnd4d5spf1f69h0qr0l57lm6jywl4"; buildDepends = [ contravariant profunctors ]; + testDepends = [ profunctors ]; jailbreak = true; meta = { homepage = "https://github.com/tomjaguarpaw/product-profunctors"; diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix index 3a521ea121b8..4fa383337c4a 100644 --- a/pkgs/development/libraries/haskell/purescript/default.nix +++ b/pkgs/development/libraries/haskell/purescript/default.nix @@ -1,19 +1,20 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, cmdtheline, fileEmbed, filepath, haskeline, monadUnify -, mtl, nodejs, parsec, patternArrows, time, transformers +{ cabal, fileEmbed, filepath, haskeline, monadUnify, mtl, nodejs +, optparseApplicative, parsec, patternArrows, time, transformers , unorderedContainers, utf8String }: cabal.mkDerivation (self: { pname = "purescript"; - version = "0.6.1.2"; - sha256 = "0j1fmfcal2m75ji937xxl9cizzpw6v4pr31hxfjmal8fdcf677ma"; + version = "0.6.2"; + sha256 = "1zf2yyk3rdwk5992fhvqyd7b5w7mkzjcc0iyp75bscnjsggs31k0"; isLibrary = true; isExecutable = true; buildDepends = [ - cmdtheline fileEmbed filepath haskeline monadUnify mtl parsec - patternArrows time transformers unorderedContainers utf8String + fileEmbed filepath haskeline monadUnify mtl optparseApplicative + parsec patternArrows time transformers unorderedContainers + utf8String ]; testDepends = [ filepath mtl nodejs parsec transformers utf8String diff --git a/pkgs/development/libraries/haskell/quickcheck-unicode/default.nix b/pkgs/development/libraries/haskell/quickcheck-unicode/default.nix new file mode 100644 index 000000000000..edc2924f09b9 --- /dev/null +++ b/pkgs/development/libraries/haskell/quickcheck-unicode/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, QuickCheck }: + +cabal.mkDerivation (self: { + pname = "quickcheck-unicode"; + version = "1.0.0.0"; + sha256 = "0yp7d2hwvipw2sdjf4sm45v3iiijc1yi4qk21kq12fi6x6xxwcxq"; + buildDepends = [ QuickCheck ]; + meta = { + homepage = "https://github.com/bos/quickcheck-unicode"; + description = "Generator and shrink functions for testing Unicode-related software"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index affeff4d1b0e..3d312a6809f2 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "1.1.3"; - sha256 = "0qai73ip4fwghd27c9ddpbl4kw338xhp17n9r5gh8v9awxc5ppap"; + version = "1.1.3.1"; + sha256 = "13g8vj9hc59q8n696j0w79k5bhp3mgs923y4d2cffnd0p7yd8r8x"; buildDepends = [ exceptions liftedBase mmorph monadControl mtl transformers transformersBase diff --git a/pkgs/development/libraries/haskell/rest-core/default.nix b/pkgs/development/libraries/haskell/rest-core/default.nix index bea8d8655e15..ce01091c0663 100644 --- a/pkgs/development/libraries/haskell/rest-core/default.nix +++ b/pkgs/development/libraries/haskell/rest-core/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "rest-core"; - version = "0.33.1.1"; - sha256 = "0sdknsh2y2lag4n59vdvwq95h0x32s3nvr1alddnpfpw6fsd7m2s"; + version = "0.33.1.2"; + sha256 = "0axl6d28agyzklrnl264413a8hpfi7ih296i453r6fg4c63ma5h4"; buildDepends = [ aeson aesonUtils either errors fclabels hxt hxtPickleUtils jsonSchema mtl multipart random restStringmap restTypes safe split diff --git a/pkgs/development/libraries/haskell/rest-gen/default.nix b/pkgs/development/libraries/haskell/rest-gen/default.nix index f876f25c2d98..f97d701fba11 100644 --- a/pkgs/development/libraries/haskell/rest-gen/default.nix +++ b/pkgs/development/libraries/haskell/rest-gen/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "rest-gen"; - version = "0.16.1.2"; - sha256 = "1w2b4b52qa57z5kd9w7czimimzydwbh3qdz7cr22p69ihism38c9"; + version = "0.16.1.3"; + sha256 = "1nh3rjnn36v13ikvvxc7xahrj3gsswhiq2w54xclrxjl2fzsqz3a"; buildDepends = [ aeson blazeHtml Cabal codeBuilder fclabels filepath hashable haskellSrcExts hslogger HStringTemplate hxt jsonSchema restCore diff --git a/pkgs/development/libraries/haskell/rest-types/default.nix b/pkgs/development/libraries/haskell/rest-types/default.nix index 23a112730baa..9b9d9f62d26e 100644 --- a/pkgs/development/libraries/haskell/rest-types/default.nix +++ b/pkgs/development/libraries/haskell/rest-types/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "rest-types"; - version = "1.11.1"; - sha256 = "1dqjch3h3hv4s1v0wkbd4spn26f068bqpsz6mr0vdacdbhjwnigg"; + version = "1.11.1.1"; + sha256 = "0xr9h1bivw3miyg4xill0jwn95lybsbqgrnw2323pwxlbbnaa25a"; buildDepends = [ aeson genericAeson hxt jsonSchema mtl regular regularXmlpickler restStringmap text uuid diff --git a/pkgs/development/libraries/haskell/sbv/default.nix b/pkgs/development/libraries/haskell/sbv/default.nix index 088fc38d0f8c..492dcd816ed3 100644 --- a/pkgs/development/libraries/haskell/sbv/default.nix +++ b/pkgs/development/libraries/haskell/sbv/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "sbv"; - version = "3.2"; - sha256 = "0hqibdl2bhxyc0akfy97j41mkp9s39ahdz25nyrzpjj89b9hzzi0"; + version = "3.3"; + sha256 = "193k7njrd7b0qp865ahbjh32h49b86kyc58laifgq6ka2zv64x2f"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/scientific/0.3.3.2.nix b/pkgs/development/libraries/haskell/scientific/0.3.3.3.nix index e43b6734d774..10e294b42145 100644 --- a/pkgs/development/libraries/haskell/scientific/0.3.3.2.nix +++ b/pkgs/development/libraries/haskell/scientific/0.3.3.3.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "scientific"; - version = "0.3.3.2"; - sha256 = "17lxxjfbmmlr0ppkrhw42lqhcg42nk21n5l2x9i6b87g8qr37jii"; + version = "0.3.3.3"; + sha256 = "1hngkmd1kggc84sz4mddc0yj2vyzc87dz5dkkywjgxczys51mhqn"; buildDepends = [ deepseq hashable text ]; testDepends = [ QuickCheck smallcheck tasty tastyAntXml tastyHunit tastyQuickcheck diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix index 23e48c02fd08..8cd94e9079ff 100644 --- a/pkgs/development/libraries/haskell/semigroups/default.nix +++ b/pkgs/development/libraries/haskell/semigroups/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "semigroups"; - version = "0.15.4"; - sha256 = "17jr1wz44avcdws3pxh8jif9myylx7d1gwfv0paiq6yb6r089y68"; + version = "0.16"; + sha256 = "0mq5c6py0z3jaxr1j0aalz4vjd1v6ygffv91h7nh5621rcv4ga4s"; buildDepends = [ deepseq hashable nats text unorderedContainers ]; meta = { homepage = "http://github.com/ekmett/semigroups/"; diff --git a/pkgs/development/libraries/haskell/servant-client/default.nix b/pkgs/development/libraries/haskell/servant-client/default.nix new file mode 100644 index 000000000000..d11e25222ea3 --- /dev/null +++ b/pkgs/development/libraries/haskell/servant-client/default.nix @@ -0,0 +1,27 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, attoparsec, deepseq, either, exceptions, hspec +, httpClient, httpTypes, network, networkUri, QuickCheck, safe +, servant, servantServer, stringConversions, text, transformers +, wai, warp +}: + +cabal.mkDerivation (self: { + pname = "servant-client"; + version = "0.2.1"; + sha256 = "1mwmca96sld3s6n4hxq3zl9pjw24halwa061awjb23kc49cmp4pn"; + buildDepends = [ + aeson attoparsec either exceptions httpClient httpTypes networkUri + safe servant stringConversions text transformers + ]; + testDepends = [ + aeson deepseq either hspec httpTypes network QuickCheck servant + servantServer wai warp + ]; + meta = { + homepage = "http://haskell-servant.github.io/"; + description = "automatical derivation of querying functions for servant webservices"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/servant-docs/default.nix b/pkgs/development/libraries/haskell/servant-docs/default.nix new file mode 100644 index 000000000000..3da6936532c9 --- /dev/null +++ b/pkgs/development/libraries/haskell/servant-docs/default.nix @@ -0,0 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, hashable, lens, servant, stringConversions +, systemFilepath, text, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "servant-docs"; + version = "0.2.1"; + sha256 = "1wchqdpfrc3hxc629ij6rbpr29dzc0flpc7z8phykpmf59106pcv"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson hashable lens servant stringConversions systemFilepath text + unorderedContainers + ]; + meta = { + homepage = "http://haskell-servant.github.io/"; + description = "generate API docs for your servant webservice"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/servant-jquery/default.nix b/pkgs/development/libraries/haskell/servant-jquery/default.nix new file mode 100644 index 000000000000..2a85cb191063 --- /dev/null +++ b/pkgs/development/libraries/haskell/servant-jquery/default.nix @@ -0,0 +1,22 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, filepath, lens, servant, servantServer, stm +, transformers, warp +}: + +cabal.mkDerivation (self: { + pname = "servant-jquery"; + version = "0.2.1"; + sha256 = "1wyfnkzb44m08icfjvdbn1m0b0a1ydsznp1czfdnmq2818rrip8v"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson filepath lens servant servantServer stm transformers warp + ]; + meta = { + homepage = "http://haskell-servant.github.io/"; + description = "Automatically derive jquery-based javascript functions to query servant webservices"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/servant-pool/default.nix b/pkgs/development/libraries/haskell/servant-pool/default.nix deleted file mode 100644 index 692d694ed468..000000000000 --- a/pkgs/development/libraries/haskell/servant-pool/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, resourcePool, servant, time }: - -cabal.mkDerivation (self: { - pname = "servant-pool"; - version = "0.1"; - sha256 = "0if4lxb0fpdd4lnkz9j7z6vhjbrcc80pvz9jb6sdb9p6sbbgqf69"; - buildDepends = [ resourcePool servant time ]; - meta = { - homepage = "http://github.com/zalora/servant-pool"; - description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/servant-postgresql/default.nix b/pkgs/development/libraries/haskell/servant-postgresql/default.nix deleted file mode 100644 index 154eefea320e..000000000000 --- a/pkgs/development/libraries/haskell/servant-postgresql/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, postgresqlSimple, servant, servantPool, servantResponse }: - -cabal.mkDerivation (self: { - pname = "servant-postgresql"; - version = "0.1"; - sha256 = "1svy1v6sl5pq0zs8ms4qf7wn6zar63bqmfiyfqgz84ryli0wxrhj"; - buildDepends = [ - postgresqlSimple servant servantPool servantResponse - ]; - meta = { - homepage = "http://github.com/zalora/servant-postgresql"; - description = "Useful functions and instances for using servant with a PostgreSQL context"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/servant-response/default.nix b/pkgs/development/libraries/haskell/servant-response/default.nix deleted file mode 100644 index 3f7f9c1eee05..000000000000 --- a/pkgs/development/libraries/haskell/servant-response/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, aeson, httpTypes, text }: - -cabal.mkDerivation (self: { - pname = "servant-response"; - version = "0.1"; - sha256 = "0vgzi6nm3f1vjbnvhzcr6v2fh75fsl18wsps54ya0mbmfn2v6chy"; - buildDepends = [ aeson httpTypes text ]; - meta = { - homepage = "http://github.com/zalora/servant"; - description = "Machinery to express how servant should turn results of database operations into proper JSON-encodable response types"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/servant-scotty/default.nix b/pkgs/development/libraries/haskell/servant-scotty/default.nix deleted file mode 100644 index 732b2c95cc7e..000000000000 --- a/pkgs/development/libraries/haskell/servant-scotty/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, aeson, httpTypes, scotty, servant, servantResponse, text -, transformers -}: - -cabal.mkDerivation (self: { - pname = "servant-scotty"; - version = "0.1.1"; - sha256 = "0d3yc7aa2p1izizqnj81iscj9hbgbkpyav1ncmxzkr48svr6h783"; - buildDepends = [ - aeson httpTypes scotty servant servantResponse text transformers - ]; - meta = { - homepage = "http://github.com/zalora/servant"; - description = "Generate a web service for servant 'Resource's using scotty and JSON"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/servant-server/default.nix b/pkgs/development/libraries/haskell/servant-server/default.nix new file mode 100644 index 000000000000..7776af8036d1 --- /dev/null +++ b/pkgs/development/libraries/haskell/servant-server/default.nix @@ -0,0 +1,31 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, attoparsec, either, exceptions, hspec, hspecWai +, httpTypes, network, networkUri, parsec, QuickCheck, safe, servant +, split, stringConversions, systemFilepath, temporary, text +, transformers, wai, waiAppStatic, waiExtra, warp +}: + +cabal.mkDerivation (self: { + pname = "servant-server"; + version = "0.2.1"; + sha256 = "1b2aqxnn9nf5qabbl8k9kq9b2mpn591j9jpjy33sis7ni469bayj"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson attoparsec either httpTypes networkUri safe servant split + stringConversions systemFilepath text transformers wai waiAppStatic + warp + ]; + testDepends = [ + aeson either exceptions hspec hspecWai httpTypes network parsec + QuickCheck servant stringConversions temporary text transformers + wai waiExtra warp + ]; + meta = { + homepage = "http://haskell-servant.github.io/"; + description = "A family of combinators for defining webservices APIs and serving them"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/servant/default.nix b/pkgs/development/libraries/haskell/servant/default.nix index 38f89764c4c8..1c206c1ab223 100644 --- a/pkgs/development/libraries/haskell/servant/default.nix +++ b/pkgs/development/libraries/haskell/servant/default.nix @@ -1,14 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal }: +{ cabal, hspec, parsec, QuickCheck, stringConversions, text }: cabal.mkDerivation (self: { pname = "servant"; - version = "0.1"; - sha256 = "1bm5223rjgcm8rb3s2mclmfj2df7j059jjh572a5py0rdqzg3yj0"; + version = "0.2.1"; + sha256 = "1i7yvxvil65lp1gizh99dn4gj1r7vcqslq1w7sqykj88y9h22p3x"; + buildDepends = [ parsec stringConversions text ]; + testDepends = [ hspec parsec QuickCheck stringConversions text ]; meta = { - homepage = "http://github.com/zalora/servant"; - description = "A library to generate REST-style webservices on top of scotty, handling all the boilerplate for you"; + homepage = "http://haskell-servant.github.io/"; + description = "A family of combinators for defining webservices APIs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix index 1983f80b60d7..fca81a974fb2 100644 --- a/pkgs/development/libraries/haskell/shake/default.nix +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "shake"; - version = "0.14.1"; - sha256 = "101sdrp3whp1yvx4n8zri0rjkagq3hkmpd2xpkidzj9ssaz4x4fa"; + version = "0.14.2"; + sha256 = "0wb4rvnkw6gag1jffv9z2by7y8gifp58pnw3n7dyc01yglbys72m"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/shell-conduit/default.nix b/pkgs/development/libraries/haskell/shell-conduit/default.nix index 409c572603ed..ce5507832e13 100644 --- a/pkgs/development/libraries/haskell/shell-conduit/default.nix +++ b/pkgs/development/libraries/haskell/shell-conduit/default.nix @@ -1,20 +1,21 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, async, conduit, conduitExtra, controlMonadLoop, filepath -, monadControl, monadsTf, resourcet, semigroups, split, text, these +, monadControl, monadsTf, resourcet, semigroups, split, text , transformers, transformersBase }: cabal.mkDerivation (self: { pname = "shell-conduit"; - version = "4.4"; - sha256 = "023cqmj5c45d65rcv07m2w1w2b5lhlfhzwv18fxxl3v8s6gr3wb8"; + version = "4.5"; + sha256 = "1vgqfba6k0nv8nwa48fv2hkr9xlrrfrdh2awgpllrimnh0yww41g"; buildDepends = [ async conduit conduitExtra controlMonadLoop filepath monadControl - monadsTf resourcet semigroups split text these transformers + monadsTf resourcet semigroups split text transformers transformersBase ]; meta = { + homepage = "https://github.com/chrisdone/shell-conduit"; description = "Write shell scripts with Conduit"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index 5fcd9df46429..c60bf97d54f4 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "skein"; - version = "1.0.9"; - sha256 = "08hy40c0gzlalrpmgcvhc1v51a44idipamjjbh7zzwsvbxmp1cbb"; + version = "1.0.9.2"; + sha256 = "1j8bhqm25r9vd4qb4v12g32r0dv6xyhk48cq287wfbzjraayi1gw"; buildDepends = [ cereal cryptoApi tagged ]; testDepends = [ cereal cryptoApi filepath hspec tagged ]; jailbreak = true; diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 14769499c21d..bb4afe88512c 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.13.3.1"; - sha256 = "016azx90gxjkhmncpnqvqrwsk9kbkz315z088wm7y67s97lpnr9c"; + version = "0.13.3.2"; + sha256 = "1k6sd2ww8zqkbfv4v5ryqwgicx6yprfil8cd5rgdvygyjs88fcrp"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -21,9 +21,6 @@ cabal.mkDerivation (self: { snapCore snapServer stm syb text time transformers unorderedContainers vector vectorAlgorithms xmlhtml ]; - patchPhase = '' - sed -i -e 's|lens *>=.*|lens|' snap.cabal - ''; meta = { homepage = "http://snapframework.com/"; description = "Top-level package for the Snap Web Framework"; diff --git a/pkgs/development/libraries/haskell/socket-io/default.nix b/pkgs/development/libraries/haskell/socket-io/default.nix index c64c7c48edc2..57827d495f3e 100644 --- a/pkgs/development/libraries/haskell/socket-io/default.nix +++ b/pkgs/development/libraries/haskell/socket-io/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "socket-io"; - version = "1.1.1"; - sha256 = "0zr5kj519hw90rlicang5f573dd325rxv24psf12fxl6vmyxx1zc"; + version = "1.2.0"; + sha256 = "1271qmd83q669dcs6ni0f84i5kgvh8vgr4xgx2lcprirbzkx0gdl"; buildDepends = [ aeson attoparsec engineIo mtl stm text transformers unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/stm-containers/default.nix b/pkgs/development/libraries/haskell/stm-containers/default.nix index 052c913a98e6..157e8cd5f2b2 100644 --- a/pkgs/development/libraries/haskell/stm-containers/default.nix +++ b/pkgs/development/libraries/haskell/stm-containers/default.nix @@ -1,19 +1,21 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, basePrelude, focus, free, hashable, HTF, lochTh, mtl -, placeholders, primitive, QuickCheck, unorderedContainers +{ cabal, basePrelude, focus, free, hashable, HTF, listT, lochTh +, mtl, mtlPrelude, placeholders, primitive, QuickCheck +, transformers, unorderedContainers }: cabal.mkDerivation (self: { pname = "stm-containers"; - version = "0.1.4"; - sha256 = "15h7qxxbr1ifkvmxsj30k0v3hp83m04iq25bvi3jmagvvk5hv5bj"; + version = "0.2.6"; + sha256 = "1kmrkwqqhgmbmycnxf86mdcc5yf3v8irbga3nmpi9wz1hmb0vcjy"; buildDepends = [ - basePrelude focus hashable lochTh placeholders primitive + basePrelude focus hashable listT lochTh placeholders primitive + transformers ]; testDepends = [ - basePrelude focus free hashable HTF lochTh mtl placeholders - primitive QuickCheck unorderedContainers + basePrelude focus free hashable HTF listT lochTh mtl mtlPrelude + placeholders primitive QuickCheck transformers unorderedContainers ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/streaming-commons/default.nix b/pkgs/development/libraries/haskell/streaming-commons/default.nix index ba9b8794eb53..c4d19f611884 100644 --- a/pkgs/development/libraries/haskell/streaming-commons/default.nix +++ b/pkgs/development/libraries/haskell/streaming-commons/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "streaming-commons"; - version = "0.1.6"; - sha256 = "0wapq6h7c0c3wciqfjz7j4z8kgf7wdr1s0al493jcrdyfy5k43dh"; + version = "0.1.7.3"; + sha256 = "12sm59dhjrygly215888i2xcsn5m5a393ir0mm6w62883x49wzxb"; buildDepends = [ blazeBuilder network random stm text transformers zlib ]; diff --git a/pkgs/development/libraries/haskell/tasty-hspec/default.nix b/pkgs/development/libraries/haskell/tasty-hspec/default.nix index 6f8ff2e9add9..459a0f1123ab 100644 --- a/pkgs/development/libraries/haskell/tasty-hspec/default.nix +++ b/pkgs/development/libraries/haskell/tasty-hspec/default.nix @@ -1,15 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, hspec, QuickCheck, random, tasty, tastyQuickcheck -, tastySmallcheck +{ cabal, hspec, hspecCore, QuickCheck, random, tasty +, tastyQuickcheck, tastySmallcheck }: cabal.mkDerivation (self: { pname = "tasty-hspec"; - version = "0.2"; - sha256 = "04qnmsyrlxgxf36lww3z6xkgpf6x5gprwrrwza3kcjl13wcm2rml"; + version = "1.1"; + sha256 = "15ly6jf4kgdc15k6b584d99j18xb41alas62gyakw5sf8y0y02i6"; buildDepends = [ - hspec QuickCheck random tasty tastyQuickcheck tastySmallcheck + hspec hspecCore QuickCheck random tasty tastyQuickcheck + tastySmallcheck ]; meta = { homepage = "http://github.com/mitchellwrosen/tasty-hspec"; @@ -17,6 +18,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix index 8692daaa4828..36b22a30f537 100644 --- a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix +++ b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty-quickcheck"; - version = "0.8.3.1"; - sha256 = "0shmph95vys2l0ik3k615aigcvfas0f2079c1lbw73d0wrm841gn"; + version = "0.8.3.2"; + sha256 = "1q1fghmsjrdl6jkcnajmsvw4d893m6cyhzpai9vvrhxy9vdy0l1v"; buildDepends = [ QuickCheck tagged tasty ]; testDepends = [ pcreLight tasty tastyHunit ]; meta = { diff --git a/pkgs/development/libraries/haskell/text/1.2.0.0.nix b/pkgs/development/libraries/haskell/text/1.2.0.3.nix index c588c65ba94a..d0d2112a5e20 100644 --- a/pkgs/development/libraries/haskell/text/1.2.0.0.nix +++ b/pkgs/development/libraries/haskell/text/1.2.0.3.nix @@ -1,17 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, deepseq, HUnit, QuickCheck, random, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2 +{ cabal, deepseq, HUnit, QuickCheck, quickcheckUnicode, random +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 }: cabal.mkDerivation (self: { pname = "text"; - version = "1.2.0.0"; - sha256 = "0c681yaqq68imj77qzy0j4iag8q90mhnnaalfwc08nzv8cr6c8z6"; + version = "1.2.0.3"; + sha256 = "11prz0vli6rclj04vpx5dnzfyznvsrq7i2jmh4sjy37nic5bqf0x"; buildDepends = [ deepseq ]; testDepends = [ - deepseq HUnit QuickCheck random testFramework testFrameworkHunit - testFrameworkQuickcheck2 + deepseq HUnit QuickCheck quickcheckUnicode random testFramework + testFrameworkHunit testFrameworkQuickcheck2 ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/th-lift/default.nix b/pkgs/development/libraries/haskell/th-lift/default.nix index a27360632b9b..28fdedbde750 100644 --- a/pkgs/development/libraries/haskell/th-lift/default.nix +++ b/pkgs/development/libraries/haskell/th-lift/default.nix @@ -4,11 +4,12 @@ cabal.mkDerivation (self: { pname = "th-lift"; - version = "0.6.1"; - sha256 = "0m1ips0n06jnjr5lssq7x4jaa5878sw03l8iaprya37bnkxxak5d"; + version = "0.7"; + sha256 = "1mh5k6ifmc3mjavlrpkcq55ng737yb3nqv1q67fv8irkv5m6qpza"; meta = { + homepage = "http://github.com/mboes/th-lift"; description = "Derive Template Haskell's Lift class for datatypes"; - license = "unknown"; + license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; }) diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix index 25118d1ff648..7c18f2c555b6 100644 --- a/pkgs/development/libraries/haskell/thyme/default.nix +++ b/pkgs/development/libraries/haskell/thyme/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "thyme"; - version = "0.3.5.4"; - sha256 = "00qsd0ig1zjj7lni7xw5xaxk8w2zwq8jbii8admigrfqsj5qcnam"; + version = "0.3.5.5"; + sha256 = "0v3rbjl92bqggsdra72zdq6rxzb2qf1268424p94225lnwgp1il4"; buildDepends = [ aeson attoparsec deepseq mtl profunctors QuickCheck random text time vector vectorSpace vectorThUnbox diff --git a/pkgs/development/libraries/haskell/timezone-olson/default.nix b/pkgs/development/libraries/haskell/timezone-olson/default.nix index 236cedc9c1fa..8b8704c0de78 100644 --- a/pkgs/development/libraries/haskell/timezone-olson/default.nix +++ b/pkgs/development/libraries/haskell/timezone-olson/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "timezone-olson"; - version = "0.1.4"; - sha256 = "1l5j6gqi9vlx7sifn7vv3by4z9ha3h6klfds4ywqv3dv0gh5725k"; + version = "0.1.6"; + sha256 = "0gg1fq85km5d48966a267q6z0wwl1dz88xq88v0l1jlkwd9jsb0z"; buildDepends = [ binary extensibleExceptions time timezoneSeries ]; meta = { homepage = "http://projects.haskell.org/time-ng/"; diff --git a/pkgs/development/libraries/haskell/timezone-series/default.nix b/pkgs/development/libraries/haskell/timezone-series/default.nix index d12ae9aec058..d46f2d812548 100644 --- a/pkgs/development/libraries/haskell/timezone-series/default.nix +++ b/pkgs/development/libraries/haskell/timezone-series/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "timezone-series"; - version = "0.1.3"; - sha256 = "0b13a929wrgfl1agkyp3d5wy89aw69zm4l0src7p16rh3kr38w73"; + version = "0.1.4"; + sha256 = "06p5v0dimhwmra100gwkhkz3ll492i2bvafw0qx2qzcxx4yxff40"; buildDepends = [ time ]; meta = { homepage = "http://projects.haskell.org/time-ng/"; diff --git a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix b/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix deleted file mode 100644 index 4ff5df9d1c54..000000000000 --- a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, transformers }: - -cabal.mkDerivation (self: { - pname = "transformers-compat"; - version = "0.3.3"; - sha256 = "14lmwqr6q79k1f7byvb0jcm4r7lprhxkl85z72pr6ghn7bsvqwps"; - buildDepends = [ transformers ]; - meta = { - homepage = "http://github.com/ekmett/transformers-compat/"; - description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms."; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.4.nix b/pkgs/development/libraries/haskell/transformers-compat/default.nix index d0dc4ae024d2..d0dc4ae024d2 100644 --- a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.4.nix +++ b/pkgs/development/libraries/haskell/transformers-compat/default.nix diff --git a/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix b/pkgs/development/libraries/haskell/transformers/0.4.2.0.nix index d705040387bd..3557941a9a87 100644 --- a/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix +++ b/pkgs/development/libraries/haskell/transformers/0.4.2.0.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "transformers"; - version = "0.4.1.0"; - sha256 = "0jlnz86f87jndv4sifg1zpv5b2g2cxy1x2575x727az6vyaarwwg"; + version = "0.4.2.0"; + sha256 = "0a364zfcm17mhpy0c4ms2j88sys4yvgd6071qsgk93la2wjm8mkr"; noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11"; meta = { description = "Concrete functor and monad transformers"; diff --git a/pkgs/development/libraries/haskell/type-aligned/default.nix b/pkgs/development/libraries/haskell/type-aligned/default.nix new file mode 100644 index 000000000000..a1e547ca0e26 --- /dev/null +++ b/pkgs/development/libraries/haskell/type-aligned/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "type-aligned"; + version = "0.9.3"; + sha256 = "1wkjbb6giq71j5j72w4018hifn58gpgwxppbhgi5a8xdcxp8afl0"; + meta = { + homepage = "https://github.com/atzeus/type-aligned"; + description = "Various type-aligned sequence data structures"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/unbound-generics/default.nix b/pkgs/development/libraries/haskell/unbound-generics/default.nix index 602b28d0aa66..351df38fc0d1 100644 --- a/pkgs/development/libraries/haskell/unbound-generics/default.nix +++ b/pkgs/development/libraries/haskell/unbound-generics/default.nix @@ -1,13 +1,15 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, contravariant, mtl, tasty, tastyHunit, transformers }: +{ cabal, contravariant, mtl, QuickCheck, tasty, tastyHunit +, tastyQuickcheck, transformers +}: cabal.mkDerivation (self: { pname = "unbound-generics"; - version = "0.0.1"; - sha256 = "0iwg1292dpwl8icr8p4nyhns4n0r44q8wv4l22j6i9m61li68al1"; + version = "0.0.2"; + sha256 = "0zgajq411bp16xwv31i2igsz62lad923rylhfprklsism13rk5ai"; buildDepends = [ contravariant mtl transformers ]; - testDepends = [ mtl tasty tastyHunit ]; + testDepends = [ mtl QuickCheck tasty tastyHunit tastyQuickcheck ]; meta = { homepage = "http://github.com/lambdageek/unbound-generics"; description = "Reimplementation of Unbound using GHC Generics"; diff --git a/pkgs/development/libraries/haskell/uuid/default.nix b/pkgs/development/libraries/haskell/uuid/default.nix index 44fb5bde2bf8..c688c5921270 100644 --- a/pkgs/development/libraries/haskell/uuid/default.nix +++ b/pkgs/development/libraries/haskell/uuid/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "uuid"; - version = "1.3.4"; - sha256 = "03gab2dg52i4ysxw6vdzdd018qy0lycq7x3gcbx0r9c8vsqvafmc"; + version = "1.3.5"; + sha256 = "1pbla9fqadk5ia42c45qvdn1617gl8nv3b0bsb5yy3lh414v32q9"; buildDepends = [ binary cryptohash deepseq hashable networkInfo random time ]; diff --git a/pkgs/development/libraries/haskell/validation/default.nix b/pkgs/development/libraries/haskell/validation/default.nix index 2ae7e9c66e52..903165b2f5fe 100644 --- a/pkgs/development/libraries/haskell/validation/default.nix +++ b/pkgs/development/libraries/haskell/validation/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "validation"; - version = "0.4.1"; - sha256 = "05mws9gqlqjmzcw6d3kclrh9dybchhp61qsfwg77h31n44j7w0mh"; + version = "0.4.2"; + sha256 = "0rsa3n3zawywbpi1gvhfrfglxf9mkmkidkc216ld3s02pmsdmclm"; buildDepends = [ bifunctors lens semigroupoids semigroups transformers ]; diff --git a/pkgs/development/libraries/haskell/vcsgui/default.nix b/pkgs/development/libraries/haskell/vcsgui/default.nix index 08605391fc25..5e1d6ebf5b8e 100644 --- a/pkgs/development/libraries/haskell/vcsgui/default.nix +++ b/pkgs/development/libraries/haskell/vcsgui/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "vcsgui"; - version = "0.1.0.0"; - sha256 = "0wxalzil8ypvwp0z754m7g3848963znwwrjysdxp5q33imzbp60z"; + version = "0.1.1.0"; + sha256 = "1sjkg1ncmpymv9m5ag1f4ia4pdak05bgb03d28jd84p24qvshqyk"; isLibrary = true; isExecutable = true; buildDepends = [ filepath gtk3 mtl text vcswrapper ]; diff --git a/pkgs/development/libraries/haskell/vcswrapper/default.nix b/pkgs/development/libraries/haskell/vcswrapper/default.nix index ca739b1d9230..335c5b319bcf 100644 --- a/pkgs/development/libraries/haskell/vcswrapper/default.nix +++ b/pkgs/development/libraries/haskell/vcswrapper/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "vcswrapper"; - version = "0.1.0"; - sha256 = "058xbfgxsp3g4x4rwbp57dqgr9mwnmj623js39dbmiqkixsda31a"; + version = "0.1.1"; + sha256 = "056gdgmyprvbz61gfffkpwfyh4m7f9fnglk69jp4xh4jfx1wr7ni"; isLibrary = true; isExecutable = true; buildDepends = [ filepath hxt mtl parsec split text ]; diff --git a/pkgs/development/libraries/haskell/vector/0.10.12.1.nix b/pkgs/development/libraries/haskell/vector/0.10.12.2.nix index e83a53b57a1d..011c9b367fad 100644 --- a/pkgs/development/libraries/haskell/vector/0.10.12.1.nix +++ b/pkgs/development/libraries/haskell/vector/0.10.12.2.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "vector"; - version = "0.10.12.1"; - sha256 = "0m4m650yxv92dz8xgcjfkbhsl46hgnf02viwgdja5xmvg3aa8fcp"; + version = "0.10.12.2"; + sha256 = "01hc71k1z9m0g0dv4zsvq5d2dvbgyc5p01hryw5c53792yi2fm25"; buildDepends = [ deepseq primitive ]; testDepends = [ QuickCheck random testFramework testFrameworkQuickcheck2 diff --git a/pkgs/development/libraries/haskell/vk-posix-pty/default.nix b/pkgs/development/libraries/haskell/vk-posix-pty/default.nix index 533b9ae7215a..52a57bd0cae7 100644 --- a/pkgs/development/libraries/haskell/vk-posix-pty/default.nix +++ b/pkgs/development/libraries/haskell/vk-posix-pty/default.nix @@ -4,13 +4,12 @@ cabal.mkDerivation (self: { pname = "vk-posix-pty"; - version = "0.2.0.2"; - sha256 = "0dp9kpn1qzfqykmyq20sg0snyk8zrqa2g8c5xp9rfp0zfgmh37dh"; + version = "0.2.1"; + sha256 = "1kj06niwcsb4lyhppv5bs67cf8frcs4g8fyyzv3cpipn0xdhsr97"; isLibrary = true; isExecutable = true; meta = { - homepage = "https://bitbucket.org/merijnv/posix-pty -https://github.com/proger/posix-pty/tree/fork"; + homepage = "https://github.com/proger/posix-pty/tree/fork"; description = "Pseudo terminal interaction with subprocesses"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/void/default.nix b/pkgs/development/libraries/haskell/void/default.nix index f6cc8eaa4d93..16f4bfeb8ef7 100644 --- a/pkgs/development/libraries/haskell/void/default.nix +++ b/pkgs/development/libraries/haskell/void/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "void"; - version = "0.6.1"; - sha256 = "09pa0n17b7cz7sa699gjdmp1hxcshl3170nl5sx2x99zvxz2mv42"; + version = "0.7"; + sha256 = "0ivgr4minxb5v56v4kbd045iwqk1c2w89c830731l75mkg8qa6wq"; buildDepends = [ hashable semigroups ]; meta = { homepage = "http://github.com/ekmett/void"; diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix index 023c6de30716..d91f04f6f268 100644 --- a/pkgs/development/libraries/haskell/vty/default.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "vty"; - version = "5.2.5"; - sha256 = "15c49nzmkld4vcdmjbh0azlzsqrqmfb0z87zfixqxcl0bafpzrjy"; + version = "5.2.6"; + sha256 = "05d5vczifyzg36w1d4wwa9h27fpwgxaxws5ilmg47gq4zr1a6yxi"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/wai-conduit/default.nix b/pkgs/development/libraries/haskell/wai-conduit/default.nix index 6174784a134e..5c5c11343966 100644 --- a/pkgs/development/libraries/haskell/wai-conduit/default.nix +++ b/pkgs/development/libraries/haskell/wai-conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai-conduit"; - version = "3.0.0"; - sha256 = "0v92jyxkigq7yj3hzy7kg360036nav986ny7b558l6j7zc90jsdg"; + version = "3.0.0.1"; + sha256 = "0m5mfr6plzb873by4pab9d4g4cwfcpxl6g5c5qyljb8sydfzhhym"; buildDepends = [ blazeBuilder conduit httpTypes transformers wai ]; meta = { homepage = "https://github.com/yesodweb/wai"; diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 39514c8a3bd3..480a61014876 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -1,16 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, ansiTerminal, base64Bytestring, blazeBuilder -, caseInsensitive, dataDefault, dataDefaultClass, deepseq -, fastLogger, hspec, httpTypes, HUnit, liftedBase, network -, resourcet, streamingCommons, stringsearch, text, time -, transformers, void, wai, waiLogger, word8, zlib +, caseInsensitive, dataDefaultClass, deepseq, fastLogger, hspec +, httpTypes, HUnit, liftedBase, network, resourcet +, streamingCommons, stringsearch, text, time, transformers, void +, wai, waiLogger, word8, zlib }: cabal.mkDerivation (self: { pname = "wai-extra"; - version = "3.0.2.1"; - sha256 = "02jamvina7m9wjz0hd7gj309d1vcmhgdwyh9y1bfpvq29ngqkkca"; + version = "3.0.2.2"; + sha256 = "0lbm5z4fzsss1y4749598ish967j64nfvlvdmgj27nvshi7qn4s9"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder caseInsensitive dataDefaultClass deepseq fastLogger httpTypes liftedBase network @@ -18,8 +18,8 @@ cabal.mkDerivation (self: { wai waiLogger word8 ]; testDepends = [ - blazeBuilder dataDefault fastLogger hspec httpTypes HUnit resourcet - text transformers wai zlib + fastLogger hspec httpTypes HUnit resourcet text transformers wai + zlib ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index abca63eaf1bf..ae3632918033 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "3.0.2.3"; - sha256 = "16fwqd3nnw0bpa2a8ki0ynxif8a90qa20fvw5fmyngyvysl8g7qn"; + version = "3.0.4"; + sha256 = "0kykf3nki9a7mqr1z9jhk4z0cbzlmk9lyc7zw5y36285mx9id0dr"; buildDepends = [ autoUpdate blazeBuilder caseInsensitive hashable httpDate httpTypes network simpleSendfile streamingCommons text unixCompat void wai diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix index 2b80e524d4a8..79e03b748e62 100644 --- a/pkgs/development/libraries/haskell/websockets/default.nix +++ b/pkgs/development/libraries/haskell/websockets/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "websockets"; - version = "0.9.1.0"; - sha256 = "18q2dax5d4qh7didr2jhsns07lsybab4v231wjxn6iiyf9f7f16i"; + version = "0.9.2.1"; + sha256 = "11pdh5dc7r9svg789yx66lff5gcmzs6yg7m74ciz3ybb2i4p855s"; buildDepends = [ attoparsec base64Bytestring binary blazeBuilder caseInsensitive entropy mtl network random SHA text diff --git a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix index 0165e0a82ea9..0507b1ea1a64 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "wl-pprint-extras"; - version = "3.5.0.2"; - sha256 = "1wh8nm7h8bbr1xxf0q3cwb837jk5y1cq4l2h6lw63wavwqqvjfw6"; + version = "3.5.0.3"; + sha256 = "124wb4hqd97f3naha0589v18lvi9xbn39bmn8jwaylvyg6s5fyyp"; buildDepends = [ nats semigroupoids semigroups text utf8String ]; testDepends = [ HUnit testFramework testFrameworkHunit ]; meta = { diff --git a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix index 30636f6b97ca..6f2e62008f58 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "wl-pprint-terminfo"; - version = "3.7.1.2"; - sha256 = "17c5ys8730hhhpy0swk4yxrjs1042w4m7aypsfnzzk3b0cw94q56"; + version = "3.7.1.3"; + sha256 = "19z5cr1wqc3xcy39dswx78b6fpxhb41798zkiwkmb97nnvzwbdmv"; buildDepends = [ nats semigroups terminfo text transformers wlPprintExtras ]; diff --git a/pkgs/development/libraries/haskell/wreq/default.nix b/pkgs/development/libraries/haskell/wreq/default.nix index c16df5863a01..8b6e71512732 100644 --- a/pkgs/development/libraries/haskell/wreq/default.nix +++ b/pkgs/development/libraries/haskell/wreq/default.nix @@ -1,30 +1,33 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, attoparsec, doctest, exceptions, filepath -, httpClient, httpClientTls, httpTypes, HUnit, lens, lensAeson -, mimeTypes, temporary, testFramework, testFrameworkHunit, text -, time, fetchpatch +{ cabal, aeson, aesonPretty, aesonQq, attoparsec, base16Bytestring +, base64Bytestring, byteable, caseInsensitive, cryptohash, doctest +, exceptions, filepath, hashable, httpClient, httpClientTls +, httpTypes, HUnit, lens, lensAeson, mimeTypes, networkInfo +, PSQueue, QuickCheck, snapCore, snapServer, temporary +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text +, time, transformers, unixCompat, unorderedContainers, uuid }: cabal.mkDerivation (self: { pname = "wreq"; - version = "0.2.0.0"; - sha256 = "0ajrwn4yn6h65v97jfhbb4x3j307gdf34dyjnnhsrmsf7911l44d"; + version = "0.3.0.1"; + sha256 = "13apqr8sfx2vi794ldqprmgqch79sqli9scgyk3k41v7wcwqaal4"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson attoparsec exceptions httpClient httpClientTls httpTypes lens - lensAeson mimeTypes text time + aeson attoparsec base16Bytestring byteable caseInsensitive + cryptohash exceptions hashable httpClient httpClientTls httpTypes + lens lensAeson mimeTypes PSQueue text time unorderedContainers ]; testDepends = [ - aeson doctest filepath httpClient httpTypes HUnit lens lensAeson - temporary testFramework testFrameworkHunit text + aeson aesonPretty aesonQq base64Bytestring caseInsensitive doctest + filepath hashable httpClient httpTypes HUnit lens lensAeson + networkInfo QuickCheck snapCore snapServer temporary testFramework + testFrameworkHunit testFrameworkQuickcheck2 text transformers + unixCompat uuid ]; doCheck = false; - patches = [ (fetchpatch { - url = "https://github.com/relrod/wreq/commit/9a91d57b50a09646ecbda88d126918e49aeb2de4.diff"; - sha256 = "09px4hbqkc9b0ykx7alzq2llzp0nxb2c5zsbaa05rcq9cb3nrq4m"; - })]; meta = { homepage = "http://www.serpentine.com/wreq"; description = "An easy-to-use HTTP client library"; diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index e00e7c4712d0..bf63586eed44 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -1,23 +1,23 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, aesonQq, attoparsec, conduit, filepath, hspec -, HUnit, resourcet, scientific, text, transformers -, unorderedContainers, vector +{ cabal, aeson, aesonQq, attoparsec, conduit, enclosedExceptions +, filepath, hspec, hspecExpectations, HUnit, resourcet, scientific +, text, transformers, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "yaml"; - version = "0.8.10"; - sha256 = "1m51h253gcp77a0sjsckccrwz5ajd991ppczvyhnprphx1y210ig"; + version = "0.8.10.1"; + sha256 = "1a8v8digg6mcc4gx4kgfg8wzgj18wdf40wv1b7n72dg1c8kr2xz9"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson attoparsec conduit filepath resourcet scientific text - transformers unorderedContainers vector + aeson attoparsec conduit enclosedExceptions filepath resourcet + scientific text transformers unorderedContainers vector ]; testDepends = [ - aeson aesonQq conduit hspec HUnit resourcet text transformers - unorderedContainers vector + aeson aesonQq conduit hspec hspecExpectations HUnit resourcet text + transformers unorderedContainers vector ]; meta = { homepage = "http://github.com/snoyberg/yaml/"; diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index 4809609036bd..7033bff4d158 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.4.0.9"; - sha256 = "0pm45wi72v0kx9cqbwsbq9g6w93cb8aknps6aa153vbv7k8ikn7v"; + version = "1.4.1"; + sha256 = "0kzhnq0mv8s4qdkzqj05c7jdmp2xllv02kqgihwhyr2s4wvqmviw"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 88b33620edca..8c87981a6932 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -13,8 +13,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.4.4.4"; - sha256 = "0l4a49a3y1m257zkzmvqwg5cm6shxzssgd143qqzhg1svikavv82"; + version = "1.4.6"; + sha256 = "1xlqqiyn2p0c1qxrkx0mlkp4cra0adhlpw27y03icvj0c93xi27g"; buildDepends = [ aeson autoUpdate blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit conduitExtra cookie dataDefault diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index f8645b3d108f..f052a38357d0 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.4.1.1"; - sha256 = "0as2hgl78hqyci0f9ysa7sy3r7c8vq1a0a0y7wpbybz0c4690pqi"; + version = "1.4.3"; + sha256 = "08ivcqq4glyyvjm60fsmd4linqr6kkh6wn4bbcpzinvpv6asr6mr"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable dataDefault emailValidate networkUri persistent resourcet diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 2860cab4d1a3..04b4ebee52f1 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.4.1"; - sha256 = "1h4l78qjaiv3aqw02cj3qakkxv7ds946iagdccm8pav2wlkdl5pw"; + version = "1.4.1.1"; + sha256 = "0p95f6gjpcl28ysl82hbyxh7fjql6lr5csndmnrd264h2pd88pxx"; buildDepends = [ aeson blazeHtml blazeMarkup conduitExtra dataDefault fastLogger monadControl monadLogger safe semigroups shakespeare diff --git a/pkgs/development/libraries/haskell/zip-archive/0.2.3.4.nix b/pkgs/development/libraries/haskell/zip-archive/0.2.3.5.nix index a77323677109..8369b2a3eb50 100644 --- a/pkgs/development/libraries/haskell/zip-archive/0.2.3.4.nix +++ b/pkgs/development/libraries/haskell/zip-archive/0.2.3.5.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "zip-archive"; - version = "0.2.3.4"; - sha256 = "1c589cpl1jax1r60b92az1800b67zrva3dndhv9hcxidlgyf46gp"; + version = "0.2.3.5"; + sha256 = "0qa3qvaj0xkh4qw7s96rkbdmkyhnql6g92yplm7m6n7z7nxrcs18"; isLibrary = true; isExecutable = true; buildDepends = [ binary digest filepath mtl text time zlib ]; diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 29e15e08f696..7b4e3834af76 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Insight Segmentation and Registration Toolkit"; homepage = http://www.itk.org/; - license = "BSD"; + license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index ed51a0a28206..94e6cba4ee4c 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -8,13 +8,19 @@ stdenv.mkDerivation rec { sha256 = "154l7zk7yh3v8l2l6zm5s2alvd2fzkp6c9i18iajfbna5af5m43b"; }; + patches = [ + ./jasper-CVE-2014-8137-variant2.diff ./jasper-CVE-2014-8137-noabort.diff + ./jasper-CVE-2014-8138.diff + ./jasper-CVE-2014-9029.diff + ]; + nativeBuildInputs = [unzip]; propagatedBuildInputs = [ libjpeg ]; configureFlags = "--enable-shared"; meta = { - homepage = http://www.ece.uvic.ca/~mdadams/jasper/; + homepage = https://www.ece.uvic.ca/~frodo/jasper/; description = "JPEG2000 Library"; }; } diff --git a/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-noabort.diff b/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-noabort.diff new file mode 100644 index 000000000000..47b57d5c8098 --- /dev/null +++ b/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-noabort.diff @@ -0,0 +1,16 @@ +From RedHat: https://bugzilla.redhat.com/attachment.cgi?id=967284&action=diff + +--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:30:54.193209780 +0100 ++++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:36:46.313217814 +0100 +@@ -291,7 +291,10 @@ jas_image_t *jp2_decode(jas_stream_t *in + case JP2_COLR_ICC: + iccprof = jas_iccprof_createfrombuf(dec->colr->data.colr.iccp, + dec->colr->data.colr.iccplen); +- assert(iccprof); ++ if (!iccprof) { ++ jas_eprintf("error: failed to parse ICC profile\n"); ++ goto error; ++ } + jas_iccprof_gethdr(iccprof, &icchdr); + jas_eprintf("ICC Profile CS %08x\n", icchdr.colorspc); + jas_image_setclrspc(dec->image, fromiccpcs(icchdr.colorspc)); diff --git a/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-variant2.diff b/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-variant2.diff new file mode 100644 index 000000000000..243300dd70ee --- /dev/null +++ b/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-variant2.diff @@ -0,0 +1,45 @@ +From RedHat: https://bugzilla.redhat.com/attachment.cgi?id=967283&action=diff + +--- jasper-1.900.1.orig/src/libjasper/base/jas_icc.c 2014-12-11 14:06:44.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/base/jas_icc.c 2014-12-11 15:16:37.971272386 +0100 +@@ -1009,7 +1009,6 @@ static int jas_icccurv_input(jas_iccattr + return 0; + + error: +- jas_icccurv_destroy(attrval); + return -1; + } + +@@ -1127,7 +1126,6 @@ static int jas_icctxtdesc_input(jas_icca + #endif + return 0; + error: +- jas_icctxtdesc_destroy(attrval); + return -1; + } + +@@ -1206,8 +1204,6 @@ static int jas_icctxt_input(jas_iccattrv + goto error; + return 0; + error: +- if (txt->string) +- jas_free(txt->string); + return -1; + } + +@@ -1328,7 +1324,6 @@ static int jas_icclut8_input(jas_iccattr + goto error; + return 0; + error: +- jas_icclut8_destroy(attrval); + return -1; + } + +@@ -1497,7 +1492,6 @@ static int jas_icclut16_input(jas_iccatt + goto error; + return 0; + error: +- jas_icclut16_destroy(attrval); + return -1; + } + diff --git a/pkgs/development/libraries/jasper/jasper-CVE-2014-8138.diff b/pkgs/development/libraries/jasper/jasper-CVE-2014-8138.diff new file mode 100644 index 000000000000..cbf0899d807a --- /dev/null +++ b/pkgs/development/libraries/jasper/jasper-CVE-2014-8138.diff @@ -0,0 +1,16 @@ +From RedHat: https://bugzilla.redhat.com/attachment.cgi?id=967280&action=diff + +--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:06:44.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:06:26.000000000 +0100 +@@ -386,6 +386,11 @@ jas_image_t *jp2_decode(jas_stream_t *in + /* Determine the type of each component. */ + if (dec->cdef) { + for (i = 0; i < dec->numchans; ++i) { ++ /* Is the channel number reasonable? */ ++ if (dec->cdef->data.cdef.ents[i].channo >= dec->numchans) { ++ jas_eprintf("error: invalid channel number in CDEF box\n"); ++ goto error; ++ } + jas_image_setcmpttype(dec->image, + dec->chantocmptlut[dec->cdef->data.cdef.ents[i].channo], + jp2_getct(jas_image_clrspc(dec->image), diff --git a/pkgs/development/libraries/jasper/jasper-CVE-2014-9029.diff b/pkgs/development/libraries/jasper/jasper-CVE-2014-9029.diff new file mode 100644 index 000000000000..01db7f03cdf8 --- /dev/null +++ b/pkgs/development/libraries/jasper/jasper-CVE-2014-9029.diff @@ -0,0 +1,31 @@ +From RedHat: https://bugzilla.redhat.com/attachment.cgi?id=961994&action=diff + +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c 2014-11-27 12:45:44.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_dec.c 2014-11-27 12:44:58.000000000 +0100 +@@ -1281,7 +1281,7 @@ static int jpc_dec_process_coc(jpc_dec_t + jpc_coc_t *coc = &ms->parms.coc; + jpc_dec_tile_t *tile; + +- if (JAS_CAST(int, coc->compno) > dec->numcomps) { ++ if (JAS_CAST(int, coc->compno) >= dec->numcomps) { + jas_eprintf("invalid component number in COC marker segment\n"); + return -1; + } +@@ -1307,7 +1307,7 @@ static int jpc_dec_process_rgn(jpc_dec_t + jpc_rgn_t *rgn = &ms->parms.rgn; + jpc_dec_tile_t *tile; + +- if (JAS_CAST(int, rgn->compno) > dec->numcomps) { ++ if (JAS_CAST(int, rgn->compno) >= dec->numcomps) { + jas_eprintf("invalid component number in RGN marker segment\n"); + return -1; + } +@@ -1356,7 +1356,7 @@ static int jpc_dec_process_qcc(jpc_dec_t + jpc_qcc_t *qcc = &ms->parms.qcc; + jpc_dec_tile_t *tile; + +- if (JAS_CAST(int, qcc->compno) > dec->numcomps) { ++ if (JAS_CAST(int, qcc->compno) >= dec->numcomps) { + jas_eprintf("invalid component number in QCC marker segment\n"); + return -1; + } diff --git a/pkgs/development/libraries/java/classpath/default.nix b/pkgs/development/libraries/java/classpath/default.nix index 898813be7f88..215234f91760 100644 --- a/pkgs/development/libraries/java/classpath/default.nix +++ b/pkgs/development/libraries/java/classpath/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, javac, jvm, antlr, pkgconfig, gtk, gconf }: +{ fetchurl, stdenv, javac, jvm, antlr, pkgconfig, gtk, gconf, ecj }: stdenv.mkDerivation rec { name = "classpath-0.99"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = [ ./missing-casts.patch ]; - buildInputs = [ javac jvm antlr pkgconfig gtk gconf ]; + buildInputs = [ javac jvm antlr pkgconfig gtk gconf ecj ]; configurePhase = '' # GCJ tries to compile all of Classpath during the `configure' run when diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index 21c95066b336..01aeeecc6f6e 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Library with the aim of simplifying DNS programming in C"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; homepage = "http://www.nlnetlabs.nl/projects/ldns/"; }; } diff --git a/pkgs/development/libraries/lgi/default.nix b/pkgs/development/libraries/lgi/default.nix deleted file mode 100644 index 663185831f63..000000000000 --- a/pkgs/development/libraries/lgi/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, lua, glib }: - -stdenv.mkDerivation { - name = "lgi-0.7.2"; - - src = fetchurl { - url = https://github.com/pavouk/lgi/archive/0.7.2.tar.gz; - sha256 = "0ihl7gg77b042vsfh0k7l53b7sl3d7mmrq8ns5lrsf71dzrr19bn"; - }; - - meta = with stdenv.lib; { - description = "Gobject-introspection based dynamic Lua binding to GObject based libraries"; - homepage = https://github.com/pavouk/lgi; - license = "custom"; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - }; - - buildInputs = [ glib gobjectIntrospection lua pkgconfig ]; - - preBuild = '' - sed -i "s|/usr/local|$out|" lgi/Makefile - ''; -} diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index 2bcf7e5d21c7..e625334cefaf 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pth, libgpgerror }: stdenv.mkDerivation rec { - name = "libassuan-2.1.2"; + name = "libassuan-2.2.0"; src = fetchurl { url = "mirror://gnupg/libassuan/${name}.tar.bz2"; - sha256 = "0yxp3mdsxg75aj3h2r94vzad5i1y2mh0df9pv76ggals6k4sgy1r"; + sha256 = "1ikf9whfi7rg71qa610ynyv12qrw20zkn7zxgvvr9dp41gbqxxbx"; }; propagatedBuildInputs = [ libgpgerror pth ]; diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index 853786c34045..6eca14767c5a 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, udev }: -let version = "2.1.4"; in +let version = "2.2.0"; in stdenv.mkDerivation { name = "libcec-${version}"; src = fetchurl { - url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz"; - sha256 = "0iz11zclbs3gk4ddq0pm4vyq015qmvy4nb9sra3vk6jw58izbgkr"; + url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}-repack.tar.gz"; + sha256 = "1kdfak8y96v14d5vp2apkjjs0fvvim9phc0nkhlq5pjlagk8v32x"; }; buildInputs = [ autoreconfHook pkgconfig udev ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - description = "USB CEC adapter communication library"; + description = "Allows you (with the right hardware) to control your device with your TV remote control using existing HDMI cabling"; homepage = "http://libcec.pulse-eight.com"; repositories.git = "https://github.com/Pulse-Eight/libcec.git"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libcello/default.nix b/pkgs/development/libraries/libcello/default.nix index 4a7bc56568e2..f45fb378374e 100644 --- a/pkgs/development/libraries/libcello/default.nix +++ b/pkgs/development/libraries/libcello/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { }; meta = { - homepage = "http://libcello.org/"; + homepage = http://libcello.org/; description = "Higher level programming in C"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index a29107c38967..841edd3dff61 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,11 +2,11 @@ pkgconfig, perl, git, libevent, openssl}: stdenv.mkDerivation { - name = "libcouchbase-2.4.1"; + name = "libcouchbase-2.4.4"; src = fetchgit { url = "https://github.com/couchbase/libcouchbase.git"; - rev = "bd3a20f9e18a69dca199134956fd4ad3e1b80ca8"; - sha256 = "0gimvfxvbmhm6zy4vgs2630ygilhryxl8apfmv3iqs23pafwzm8r"; + rev = "4410eebcd813844b6cd6f9c7eeb4ab3dfa2ab8ac"; + sha256 = "02lzv5l6fvnqr2l9bqfha0pzkzlzjfddn3w5zcbjz36kw4p2p4h9"; leaveDotGit = true; }; @@ -24,6 +24,5 @@ stdenv.mkDerivation { homepage = "https://github.com/couchbase/libcouchbase"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; - }; } \ No newline at end of file diff --git a/pkgs/development/libraries/libdnet/default.nix b/pkgs/development/libraries/libdnet/default.nix index acd930ddd015..2bdeffb204d8 100644 --- a/pkgs/development/libraries/libdnet/default.nix +++ b/pkgs/development/libraries/libdnet/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Provides a simplified, portable interface to several low-level networking routines"; homepage = http://code.google.com/p/libdnet/; - license = "BSD"; # New BSD license + license = stdenv.lib.licenses.bsd3; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix index 3f800c2086e0..3123bb33d45b 100644 --- a/pkgs/development/libraries/libf2c/default.nix +++ b/pkgs/development/libraries/libf2c/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { meta = { description = "F2c converts Fortran 77 source code to C"; homepage = http://www.netlib.org/f2c/; - license = "BSD"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 9c825f42166b..d7fab5ecac75 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, mtdev, udev, libevdev }: stdenv.mkDerivation rec { - name = "libinput-0.6.0"; + name = "libinput-0.7.0"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "1g5za42f60vw87982vjh0n6r78qajj34l323p7623fbw3rvmbd9h"; + sha256 = "17jps5iz8kvhbgbd0h436grzb6fbjwf9k4qjcja96jjyzrd4i7qj"; }; buildInputs = [ pkgconfig mtdev udev libevdev ]; diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix new file mode 100644 index 000000000000..6b0274d3f0c7 --- /dev/null +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }: + +let version = "0.7.71"; in + +stdenv.mkDerivation { + name = "libmediainfo-${version}"; + src = fetchurl { + url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.bz2"; + sha256 = "088v7qsn7d5pijr88fx4azwb31g6d7bp5ykrzgwhskmj80y3rlp2"; + }; + + buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ]; + + sourceRoot = "./MediaInfoLib/Project/GNU/Library/"; + + configureFlags = [ "--enable-shared" ]; + preConfigure = "sh autogen"; + + postInstall = '' + install -vD -m 644 libmediainfo.pc "$out/lib/pkgconfig/libmediainfo.pc" + ''; + + meta = { + description = "Shared library for mediainfo"; + homepage = http://mediaarea.net/; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.devhell ]; + }; +} diff --git a/pkgs/development/libraries/libmusclecard/default.nix b/pkgs/development/libraries/libmusclecard/default.nix index af235b833826..fa8b41a17724 100644 --- a/pkgs/development/libraries/libmusclecard/default.nix +++ b/pkgs/development/libraries/libmusclecard/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Library for MUSCLE smartcard applications"; homepage = http://pcsclite.alioth.debian.org/; - license = "BSD"; + license = stdenv.lib.licenses.lgpl21; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; broken = true; diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index cb1e83467424..4a4159bfdc72 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - name = "libnftnl-1.0.2"; + name = "libnftnl-1.0.3"; src = fetchurl { url = "netfilter.org/projects/libnftnl/files/${name}.tar.bz2"; - sha256 = "1p268cv85l4ipd1p9ipjdrfgba14cblp01apv7wc44zmwfr2gkkq"; + sha256 = "1xr7gis51z9r96s5m5z3dw3f5jx2m1qb7mpvl69631m6nvmff2ng"; }; buildInputs = [ pkgconfig libmnl ]; diff --git a/pkgs/development/libraries/libodfgen/default.nix b/pkgs/development/libraries/libodfgen/default.nix index 2e6c58c804e0..4f4a028176fc 100644 --- a/pkgs/development/libraries/libodfgen/default.nix +++ b/pkgs/development/libraries/libodfgen/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="libodfgen"; - version="0.1.1"; + version="0.1.2"; name="${baseName}-${version}"; - hash="1p335m2l19c7glsss30rrm5dxfcyajk9fvj7rsclgn0kmb4y48cm"; - url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.1/libodfgen-0.1.1.tar.xz"; - sha256="1p335m2l19c7glsss30rrm5dxfcyajk9fvj7rsclgn0kmb4y48cm"; + hash="05f0l90a715kw6n1hbq393alwyjipyp0dcqqqrwm2l0s4p151bpd"; + url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.2/libodfgen-0.1.2.tar.xz"; + sha256="05f0l90a715kw6n1hbq393alwyjipyp0dcqqqrwm2l0s4p151bpd"; }; buildInputs = [ boost pkgconfig cppunit zlib libwpg libwpd librevenge diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 78b264506f01..557e448e2d49 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Open, royalty-free, highly versatile audio codec"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; homepage = http://www.opus-codec.org/; }; } diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 25b4f6617bea..ad4026857bb1 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, zlib, openssl}: stdenv.mkDerivation rec { - version = "0.4.10"; + version = "0.4.11"; name = "libre-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/re-${version}.tar.gz"; - sha256 = "1ckp5rwdqlhr6n8nwzfd3jwxa6f6n4gxh9ny3c1wcrbzvpkkhkv3"; + sha256 = "10jqra8b1nzy1q440ax72fxymxasgjyvpy0x4k67l77wy4p1jr42"; }; buildInputs = [zlib openssl]; makeFlags = [ diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index c201eda69e61..88af054654b9 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,23 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, cmake, zlib, libgcrypt }: +{ stdenv, fetchurl, pkgconfig, cmake, zlib, libgcrypt, openssl }: stdenv.mkDerivation rec { - name = "libssh-0.6.3"; + name = "libssh-0.6.4"; src = fetchurl { - url = "https://red.libssh.org/attachments/download/87/${name}.tar.xz"; - sha256 = "1jyaj9h1iglvn02hrvcchbx8ycjpj8b91h8mi459k7q5jp2xgd9b"; + url = "https://red.libssh.org/attachments/download/107/${name}.tar.gz"; + sha256 = "0lkb45sc7w0wd67p46yh8rsprglssnkqar1sp0impwsvx7i0acky"; }; - buildInputs = [ zlib libgcrypt ]; + # option we don't provide (yet): use libgcrypt instead of openssl + buildInputs = [ zlib /*libgcrypt*/ openssl ]; nativeBuildInputs = [ cmake pkgconfig ]; - cmakeFlags = "-DWITH_GCRYPT=ON"; - - meta = { + meta = with stdenv.lib; { description = "SSH client library"; - license = "LGPL"; + license = licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ sander urkud ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index d569cf28c37c..de224f6b613b 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchurl, autoconf, libtool, automake, libsodium, ncurses, libopus +{ stdenv, fetchFromGitHub, autoconf, libtool, automake, libsodium, ncurses, libopus , libvpx, check, libconfig, pkgconfig }: let version = "f6b3e6e8fe98d2457827ac6da944e715f008a08a"; - date = "20141203"; + date = "20141219"; in stdenv.mkDerivation rec { - name = "tox-core-${date}-${version}"; + name = "tox-core-${date}-${builtins.substring 0 7 version}"; - src = fetchurl { - url = "https://github.com/irungentoo/toxcore/tarball/${version}"; - name = "${name}.tar.gz"; - sha256 = "1zsx7saqs25vva3pp0bw31yqzrn40fx84w42ig6fiv723k9gpdzy"; + src = fetchFromGitHub { + owner = "irungentoo"; + repo = "toxcore"; + rev = version; + sha256 = "1wd817kix3zjyzzb68jz02iir3z4y5k5p40dgl7a29757yb9m608"; }; NIX_LDFLAGS = "-lgcc_s"; @@ -33,6 +34,7 @@ stdenv.mkDerivation rec { "--with-libsodium-headers=${libsodium}/include" "--with-libsodium-libs=${libsodium}/lib" "--enable-ntox" + "--enable-daemon" ]; buildInputs = [ diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 61f519dfe51a..785ed0db7d7e 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl , pkgconfig, libxml2, glibmm, perl }: stdenv.mkDerivation rec { - name = "libxml++-2.37.1"; + name = "libxml++-2.37.2"; src = fetchurl { url = "mirror://gnome/sources/libxml++/2.37/${name}.tar.xz"; - sha256 = "17xkdndcambij33k25cb5c4mg2457wi114kiaprjma9j0mh87cgk"; + sha256 = "0fvpm95iapi5qrz6sil6vnqqdrsd7f9a16c415hzr44f2ji10gmv"; }; buildInputs = [ pkgconfig glibmm perl ]; diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 33376cbdad3d..667298922ca8 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: let version = "0.1.6"; in @@ -10,6 +10,12 @@ stdenv.mkDerivation { sha256 = "0j9731s5zjb8mjx7wzf6vh7bsqi38ay564x6s9nri2nh9cdrg9kx"; }; + patches = [(fetchpatch { + name = "CVE-2014-9130.diff"; + url = "http://bitbucket.org/xi/libyaml/commits/2b915675/raw/"; + sha256 = "1vrkga2wk060wccg61c2mj5prcyv181qikgdfi1z4hz8ygmpvl04"; + })]; + meta = with stdenv.lib; { homepage = http://pyyaml.org/; description = "A YAML 1.1 parser and emitter written in C"; diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix new file mode 100644 index 000000000000..5a2723487a44 --- /dev/null +++ b/pkgs/development/libraries/libzen/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig }: + +let version = "0.4.30"; in + +stdenv.mkDerivation { + name = "libzen-${version}"; + src = fetchurl { + url = "http://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2"; + sha256 = "1ripvyzz2lw9nx2j8mkjgjfpabrz6knwxri52asqf1abnszbry64"; + }; + + buildInputs = [ automake autoconf libtool pkgconfig ]; + configureFlags = [ "--enable-shared" ]; + + sourceRoot = "./ZenLib/Project/GNU/Library/"; + + preConfigure = "sh autogen"; + + meta = { + description = "Shared library for libmediainfo and mediainfo"; + homepage = http://mediaarea.net/; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.devhell ]; + }; +} diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix new file mode 100644 index 000000000000..20003f238745 --- /dev/null +++ b/pkgs/development/libraries/opencollada/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2, pcre }: + +# The exact revision specified by Blender's install_deps.sh script. +let rev = "18da7f4109a8eafaa290a33f5550501cc4c8bae8"; in + +stdenv.mkDerivation { + name = "opencollada-1.3-${rev}"; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "OpenCOLLADA"; + inherit rev; + sha256 = "0ach32ws95mh0ijd8sr22kxka3riq72bb9ng46vs3615dxn7h18d"; + }; + + buildInputs = [ cmake pkgconfig ]; + + propagatedBuildInputs = [ libxml2 pcre ]; + + enableParallelBuilding = true; + + meta = { + description = "A library for handling the COLLADA file format"; + homepage = https://github.com/KhronosGroup/OpenCOLLADA/; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/opencv/2.1.nix b/pkgs/development/libraries/opencv/2.1.nix index 4b0ccc0903ff..302ac10d4ab0 100644 --- a/pkgs/development/libraries/opencv/2.1.nix +++ b/pkgs/development/libraries/opencv/2.1.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = http://opencv.willowgarage.com/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; broken = true; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 45ac75340b12..fe4aaecbfe38 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -2,14 +2,14 @@ , pkgconfig, gstreamer, xineLib, glib, python27, python27Packages, unzip , enableBloat ? false }: -let v = "2.4.9"; in +let v = "2.4.10"; in stdenv.mkDerivation rec { name = "opencv-${v}"; src = fetchurl { url = "mirror://sourceforge/opencvlibrary/opencv-${v}.zip"; - sha256 = "0wacpc00dr57w4lxfvllqa177cnbgy2zmcx8pnf8x62lh6210c40"; + sha256 = "1ilnfm7id8jqg5xmfjhbq81sjxx64av90kwxcs8zv5rp523wpx0v"; }; buildInputs = @@ -20,11 +20,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + ]; + meta = { description = "Open Computer Vision Library with more than 500 algorithms"; - homepage = http://opencv.willowgarage.com/; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric]; + homepage = http://opencv.org/; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [viric flosse]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index 979812184781..7f23929efb08 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.openjpeg.org/; description = "Open-source JPEG 2000 codec written in C language"; - license = "BSD"; + license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index b9943b443318..a71709b554b4 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { homepage = http://pointclouds.org/; description = "Open project for 2D/3D image and point cloud processing"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; broken = true; diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix index 5067a3bd2c25..844c2e580093 100644 --- a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix +++ b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix @@ -1,39 +1,28 @@ -{ stdenv, fetchurl, cmake, automoc4, pkgconfig, gst_all_1 -, phonon, qt4 ? null, qt5 ? null, withQt5 ? false }: - -with stdenv.lib; - -assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null); +{ stdenv, fetchurl, cmake, automoc4, qt4, pkgconfig, phonon, gstreamer +, gst_plugins_base }: let - version = "4.8.0"; + version = "4.7.2"; pname = "phonon-backend-gstreamer"; - qt = if withQt5 then qt5 else qt4; - # Force same Qt version in phonon - phonon_ = phonon.override { inherit qt4 qt5 withQt5; }; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/phonon/${pname}/${version}/${name}.tar.xz"; - sha256 = "0zjqf1gpj6h9hj27225vihg5gj0fjgvh4n9nkrbij7kf57bcn6gq"; + url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz"; + sha256 = "1cfjk450aajr8hfhnfq7zbmryprxiwr9ha5x585dsh7mja82mdw0"; }; - buildInputs = with gst_all_1; [ phonon_ qt gstreamer gst-plugins-base ]; + buildInputs = [ phonon qt4 gstreamer gst_plugins_base ]; nativeBuildInputs = [ cmake automoc4 pkgconfig ]; - cmakeFlags = - [ "-DCMAKE_INSTALL_LIBDIR=lib" - ] ++ optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON"; + cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; meta = { homepage = http://phonon.kde.org/; description = "GStreamer backend for Phonon"; - platforms = platforms.linux; - maintainers = with maintainers; [ ttuegel ]; - license = licenses.lgpl21Plus; - }; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/libraries/poker-eval/default.nix b/pkgs/development/libraries/poker-eval/default.nix new file mode 100644 index 000000000000..1291617ad6fa --- /dev/null +++ b/pkgs/development/libraries/poker-eval/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "poker-eval-138.0"; + + src = fetchurl { + url = "http://download.gna.org/pokersource/sources/${name}.tar.gz"; + sha256 = "0s6gvcdwdi6j7nrg6mmb5l971gclk0p99bcbfsynx1gnj159wrcj"; + }; + + patchPhase = '' + sed -i -e 's#pkgincludedir = $(includedir)/@PACKAGE@#pkgincludedir = $(includedir)#g' Makefile.in + sed -i -e 's#pkgincludedir = $(includedir)/@PACKAGE@#pkgincludedir = $(includedir)#g' include/Makefile.in + sed -i -e 's#includedir=@includedir@/poker-eval#includedir=@includedir@/#g' poker-eval.pc.in + ''; + + meta = { + homepage = http://pokersource.org/poker-eval/; + description = "poker hand evaluator"; + license = stdenv.lib.licenses.gpl3; + maintainers = [stdenv.lib.maintainers.mtreskin]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/qimageblitz/default.nix b/pkgs/development/libraries/qimageblitz/default.nix index 1f820b33e811..dcf453fd8e1d 100644 --- a/pkgs/development/libraries/qimageblitz/default.nix +++ b/pkgs/development/libraries/qimageblitz/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Graphical effect and filter library for KDE4"; - license = "BSD"; + license = stdenv.lib.licenses.bsd2; homepage = "http://${pn}.sourceforge.net"; }; } diff --git a/pkgs/development/libraries/sodium/default.nix b/pkgs/development/libraries/sodium/default.nix index 7e51d411bc4f..207e3d023f9a 100644 --- a/pkgs/development/libraries/sodium/default.nix +++ b/pkgs/development/libraries/sodium/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="sodium"; - version="1.0.0"; + version="1.0.1"; name="${baseName}-${version}"; - hash="19f9vf0shfp4rc4l791r6xjg06z4i8psj1zkjkm3z5b640yzxlff"; - url="http://download.dnscrypt.org/libsodium/releases/libsodium-1.0.0.tar.gz"; - sha256="19f9vf0shfp4rc4l791r6xjg06z4i8psj1zkjkm3z5b640yzxlff"; + hash="1x9src824c3ansgvnphhnnnnyrd0spspf7hwmxijv7pglj3hh2f3"; + url="http://download.dnscrypt.org/libsodium/releases/libsodium-1.0.1.tar.gz"; + sha256="1x9src824c3ansgvnphhnnnnyrd0spspf7hwmxijv7pglj3hh2f3"; }; buildInputs = [ ]; diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/development/libraries/soundtouch/default.nix new file mode 100644 index 000000000000..dcb09af84f95 --- /dev/null +++ b/pkgs/development/libraries/soundtouch/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, autoconf, automake, libtool}: + +stdenv.mkDerivation rec { + pName = "soundtouch"; + name = "${pName}-1.8.0"; + src = fetchurl { + url = "http://www.surina.net/soundtouch/${name}.tar.gz"; + sha256 = "3d4161d74ca25c5a98c69dbb8ea10fd2be409ba1a3a0bf81db407c4c261f166b"; + }; + + buildInputs = [ autoconf automake libtool ]; + + preConfigurePhases = "./bootstrap"; + + meta = { + description = "A program and library for changing the tempo, pitch and playback rate of audio"; + homepage = http://www.surina.net/soundtouch/; + downloadPage = http://www.surina.net/soundtouch/sourcecode.html; + license = stdenv.lib.licenses.lgpl21; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index 2683a01a2902..b4b29b54881e 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.freedesktop.org/software/startup-notification; description = "Application startup notification and feedback library"; - license = "BSD"; + license = stdenv.lib.licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index 6c0806ec4cd1..9167ecc76d4a 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { buildInputs = [pkgconfig libxslt] ++ stdenv.lib.optional valaSupport vala; + preConfigure = '' + substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires + ''; + meta = { homepage = http://telepathy.freedesktop.org; }; diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index 53c3ddc35393..a09a8a530a5f 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -1,35 +1,32 @@ -{ stdenv, fetchgit, boost, zlib, libevent, openssl, python, automake, autoconf -, libtool, pkgconfig, bison, flex +{ stdenv, fetchurl, boost, zlib, libevent, openssl, python, pkgconfig, bison +, flex }: -stdenv.mkDerivation { - name = "thrift-0.9.1"; +stdenv.mkDerivation rec { + name = "thrift-${version}"; + version = "0.9.2"; - # I take git, because the tarball is broken. - # http://stackoverflow.com/questions/18643642/libtool-error-building-thrift-0-9-1-on-ubuntu-13-04 - src = fetchgit { - url = "https://git-wip-us.apache.org/repos/asf/thrift.git"; - rev = "ff980c1432936c6bc897c60469ab05b5e0c6cb5e"; - md5 = "466aca9e43e43df868f4385af50e32f6"; + src = fetchurl { + url = "http://archive.apache.org/dist/thrift/${version}/${name}.tar.gz"; + sha256 = "0w4m6hjmgr1wqac9p5zyfxx2wwqay730qi14fzxba7f46hwhvxff"; }; #enableParallelBuilding = true; problems on hydra - # Fixes build error: <flex>/lib/libfl.so: undefined reference to `yylex'. - # Patch exists in upstream git repo, so it can be removed on the next version - # bump. - patches = [ ./yylex.patch ]; - # Workaround to make the python wrapper not drop this package: # pythonFull.buildEnv.override { extraLibs = [ thrift ]; } pythonPath = []; buildInputs = [ - boost zlib libevent openssl python automake autoconf libtool pkgconfig - bison flex + boost zlib libevent openssl python pkgconfig bison flex ]; - preConfigure = "sh bootstrap.sh; export PY_PREFIX=$out"; + preConfigure = "export PY_PREFIX=$out"; + + # TODO: package boost-test, so we can run the test suite. (Currently it fails + # to find libboost_unit_test_framework.a.) + configureFlags = "--enable-tests=no"; + doCheck = false; meta = with stdenv.lib; { description = "Library for scalable cross-language services"; diff --git a/pkgs/development/libraries/thrift/yylex.patch b/pkgs/development/libraries/thrift/yylex.patch deleted file mode 100644 index 3700bc6a4363..000000000000 --- a/pkgs/development/libraries/thrift/yylex.patch +++ /dev/null @@ -1,23 +0,0 @@ -Fixes build error: - - <flex>/lib/libfl.so: undefined reference to `yylex' - -The same patch exists in upstream thrift git repo, commit -ec8daae71004b3c2346bf12b2d74e52ed0815337 -"THRIFT-2386: Thrift refuses to link yylex". -diff --git a/compiler/cpp/src/main.h b/compiler/cpp/src/main.h -index 87af5f6..27285f5 100644 ---- a/compiler/cpp/src/main.h -+++ b/compiler/cpp/src/main.h -@@ -28,8 +28,9 @@ - /** - * Defined in the flex library - */ -- --int yylex(void); -+extern "C" { -+ int yylex(void); -+} - - int yyparse(void); - diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix index d55ea6166e8b..c8eb6e3bdab9 100644 --- a/pkgs/development/libraries/tremor/default.nix +++ b/pkgs/development/libraries/tremor/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://xiph.org/tremor/; description = "Fixed-point version of the Ogg Vorbis decoder"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 9d16edb0f2e7..62fce3c1d2d3 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source libraries for 3D computer graphics, image processing and visualization"; homepage = http://www.vtk.org/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ viric bbenoist ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix index a0466091a526..e074a4c46468 100644 --- a/pkgs/development/misc/avr8-burn-omat/default.nix +++ b/pkgs/development/misc/avr8-burn-omat/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation { - name = "avr8-burn-omat-2.0.1"; + name = "avr8-burn-omat-2.1.2"; src = fetchurl { - url = http://avr8-burn-o-mat.brischalle.de/AVR8_Burn-O-Mat_2_0_1.zip; - sha256 = "0nqlrbsx7z5r3b9y9wb6b7wawa3yxwx07zn7l4g4s59scxah2skk"; + url = http://avr8-burn-o-mat.aaabbb.de/AVR8_Burn-O-Mat_2_1_2.zip; + sha256 = "1sik243xqx7kbdddcq3va8h8q2wijf9ffhgp752hx725x3pjh9ss"; }; - buildInputs = [unzip]; + buildInputs = [ unzip ]; phases = "unpackPhase installPhase"; @@ -24,9 +24,10 @@ stdenv.mkDerivation { chmod +x $out/bin/avr8-burn-omat ''; - meta = { + meta = with stdenv.lib; { description = "GUI tool for avrdude"; - homepage = http://avr8-burn-o-mat.brischalle.de/avr8_burn_o_mat_avrdude_gui_en.html; + homepage = http://avr8-burn-o-mat.aaabbb.de/avr8_burn_o_mat_avrdude_gui_en.html; license = stdenv.lib.licenses.gpl3; + platforms = platforms.all; }; } diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 533c605cf24a..9018f94b8b15 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -9,19 +9,19 @@ stdenv.mkDerivation rec { name = "android-sdk-${version}"; - version = "23.0.2"; - + version = "24.0.1"; + src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "http://dl.google.com/android/android-sdk_r${version}-linux.tgz"; - md5 = "94a8c62086a7398cc0e73e1c8e65f71e"; + sha1 = "fb46b9afa04e09d3c33fa9bfee5c99e9ec6a9523"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "http://dl.google.com/android/android-sdk_r${version}-macosx.zip"; - md5 = "322787b0e6c629d926c28690c79ac0d8"; + sha1 = "7097c09c72645d7ad33c81a37b1a1363a9df2a54"; } else throw "platform not ${stdenv.system} supported!"; - + buildCommand = '' mkdir -p $out/libexec cd $out/libexec diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index 11beb29f3cea..dab1b92d1e42 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,18 +1,18 @@ {stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit}: stdenv.mkDerivation { - name = "android-build-tools-r20"; + name = "android-build-tools-r21.1.2"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = https://dl-ssl.google.com/android/repository/build-tools_r20-linux.zip; - sha1 = "b688905526a5584d1327a662d871a635ff502758"; + url = https://dl-ssl.google.com/android/repository/build-tools_r21.1.2-linux.zip; + sha1 = "5e35259843bf2926113a38368b08458735479658"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = https://dl-ssl.google.com/android/repository/build-tools_r20-macosx.zip; - sha1 = "1240f629411c108a714c4ddd756937c7fab93f83"; + url = https://dl-ssl.google.com/android/repository/build-tools_r21.1.2-macosx.zip; + sha1 = "e7c906b4ba0eea93b32ba36c610dbd6b204bff48"; } else throw "System ${stdenv.system} not supported!"; - + buildCommand = '' mkdir -p $out/build-tools cd $out/build-tools diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 37e4db458220..513b0763446d 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -128,6 +128,12 @@ rec { useGoogleAPIs = true; }; + androidsdk_5_0_1 = androidsdk { + platformVersions = [ "21" ]; + abiVersions = [ "armeabi-v7a" "x86" ]; + useGoogleAPIs = true; + }; + androidndk = import ./androidndk.nix { inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper; inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which; diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index a7a2661bd376..ee65951c8c0b 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -1,18 +1,23 @@ {stdenv, stdenv_32bit, fetchurl, unzip}: +let + version = "21"; + +in + stdenv.mkDerivation { - name = "android-platform-tools-r19"; + name = "android-platform-tools-r${version}"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = https://dl-ssl.google.com/android/repository/platform-tools_r19-linux.zip; - sha1 = "66ee37daf8a2a8f1aa8939ccd4093658e30aa49b"; + url = "https://dl-ssl.google.com/android/repository/platform-tools_r${version}-linux.zip"; + sha256 = "35a1762b355451e000a816d97d9af640ca99ae6c5b5b406a3e680210af8106ad"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = https://dl-ssl.google.com/android/repository/platform-tools_r19-macosx.zip; - sha1 = "69af30f488163dfc3da8cef1bb6cc7e8a6df5681"; + url = "https://dl-ssl.google.com/android/repository/platform-tools_r${version}-macosx.zip"; + sha256 = "30ae8724da3db772a776d616b4746516f24ae81330e84315a7ce0c49e0b0b3cb"; } else throw "System ${stdenv.system} not supported!"; - + buildCommand = '' mkdir -p $out cd $out diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix index feb967d01082..4ce1e421478a 100644 --- a/pkgs/development/mobile/androidenv/platforms-linux.nix +++ b/pkgs/development/mobile/androidenv/platforms-linux.nix @@ -229,6 +229,16 @@ in }; }; - + + platform_21 = buildPlatform { + name = "android-platform-5.0.1"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-21_r02.zip; + sha1 = "53536556059bb29ae82f414fd2e14bc335a4eb4c"; + }; + meta = { + description = "Android SDK Platform 5.0.1"; + }; + }; + } - \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix index 0e93ed9412be..1f41d8dda9e2 100644 --- a/pkgs/development/mobile/androidenv/platforms-macosx.nix +++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix @@ -229,6 +229,17 @@ in }; }; + + platform_21 = buildPlatform { + name = "android-platform-5.0.1"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-21_r02.zip; + sha1 = "53536556059bb29ae82f414fd2e14bc335a4eb4c"; + }; + meta = { + description = "Android SDK Platform 5.0.1"; + }; + }; + } - \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/support-repository.nix b/pkgs/development/mobile/androidenv/support-repository.nix index 66a532328b1b..6905cb24993f 100644 --- a/pkgs/development/mobile/androidenv/support-repository.nix +++ b/pkgs/development/mobile/androidenv/support-repository.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "android-support-repository-r5"; + name = "android-support-repository-r9"; src = fetchurl { - url = http://dl-ssl.google.com/android/repository/android_m2repository_r05.zip; - sha1 = "2ee9723da079ba0d4fe2a185e00ded842de96f13"; + url = http://dl-ssl.google.com/android/repository/android_m2repository_r09.zip; + sha256 = "e5295cdbc086251a2904c081038a7f10056359481c66ecff40e59177fd1c753c"; }; buildCommand = '' diff --git a/pkgs/development/mobile/androidenv/support.nix b/pkgs/development/mobile/androidenv/support.nix index ca1988527e2c..d9d24f9bf9f4 100644 --- a/pkgs/development/mobile/androidenv/support.nix +++ b/pkgs/development/mobile/androidenv/support.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "android-support-r18"; + name = "android-support-r21"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/support_r18.zip; - sha1 = "bd67b4b8a6bac629f24c8aea75c3619a26d9a568"; + url = https://dl-ssl.google.com/android/repository/support_r21.zip; + sha1 = "f9ef8def5c64f17cd8bc41c5efddd37cb155f0be"; }; buildCommand = '' @@ -14,4 +14,4 @@ stdenv.mkDerivation { ''; buildInputs = [ unzip ]; -} \ No newline at end of file +} diff --git a/pkgs/development/ocaml-modules/dypgen/default.nix b/pkgs/development/ocaml-modules/dypgen/default.nix index 9de4df9288b3..63a48219b15e 100644 --- a/pkgs/development/ocaml-modules/dypgen/default.nix +++ b/pkgs/development/ocaml-modules/dypgen/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { homepage = http://dypgen.free.fr; description = "Dypgen GLR self extensible parser generator"; license = stdenv.lib.licenses.cecill-b; -# maintainers = [ stdenv.lib.maintainers.roconnor ]; + platforms = ocaml.meta.platforms; }; } diff --git a/pkgs/development/ocaml-modules/fieldslib/default.nix b/pkgs/development/ocaml-modules/fieldslib/default.nix new file mode 100644 index 000000000000..28b83d3af46f --- /dev/null +++ b/pkgs/development/ocaml-modules/fieldslib/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, camlp4 }: + +assert stdenv.lib.versionOlder "4.00" (stdenv.lib.getVersion ocaml); + +stdenv.mkDerivation { + name = "ocaml-fieldslib-109.20.03"; + + src = fetchurl { + url = https://ocaml.janestreet.com/ocaml-core/109.20.00/individual/fieldslib-109.20.03.tar.gz; + sha256 = "1dkzk0wf26rhvji80dz1r56dp6x9zqrnp87wldd4pj56jli94vir"; + }; + + buildInputs = [ ocaml findlib ]; + propagatedBuildInputs = [ ocaml_typeconv camlp4 ]; + + createFindlibDestdir = true; + + meta = with stdenv.lib; { + homepage = https://ocaml.janestreet.com/; + description = "OCaml syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values"; + license = licenses.asl20; + maintainers = [ maintainers.vbgl ]; + platforms = ocaml.meta.platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix index 72efaa0606d7..123641ba1ac0 100644 --- a/pkgs/development/ocaml-modules/ulex/default.nix +++ b/pkgs/development/ocaml-modules/ulex/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation { homepage = http://www.cduce.org/download.html; description = "ulex is a lexer generator for Unicode and OCaml"; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/perl-modules/MooseXAttributeHelpers-perl-5.20.patch b/pkgs/development/perl-modules/MooseXAttributeHelpers-perl-5.20.patch new file mode 100644 index 000000000000..161f79a637be --- /dev/null +++ b/pkgs/development/perl-modules/MooseXAttributeHelpers-perl-5.20.patch @@ -0,0 +1,33 @@ +diff --git a/t/003_basic_hash.t b/t/003_basic_hash.t +index 1f842ae..c21ac52 100644 +--- a/t/003_basic_hash.t ++++ b/t/003_basic_hash.t +@@ -170,10 +170,10 @@ is_deeply($options->provides, { + is($options->type_constraint->type_parameter, 'Str', '... got the right container type'); + + $stuff->set_option( oink => "blah", xxy => "flop" ); +-my @key_value = $stuff->key_value; ++my @key_value = sort{ $a->[0] cmp $b->[0] } $stuff->key_value; + is_deeply( + \@key_value, +- [ [ 'xxy', 'flop' ], [ 'quantity', 4 ], [ 'oink', 'blah' ] ], ++ [ sort{ $a->[0] cmp $b->[0] } [ 'xxy', 'flop' ], [ 'quantity', 4 ], [ 'oink', 'blah' ] ], + '... got the right key value pairs' + ); + +diff --git a/t/203_trait_hash.t b/t/203_trait_hash.t +index 8e876b1..451c0bb 100644 +--- a/t/203_trait_hash.t ++++ b/t/203_trait_hash.t +@@ -156,10 +156,10 @@ is_deeply($options->provides, { + is($options->type_constraint->type_parameter, 'Str', '... got the right container type'); + + $stuff->set_option( oink => "blah", xxy => "flop" ); +-my @key_value = $stuff->key_value; ++my @key_value = sort{ $a->[0] cmp $b->[0] } $stuff->key_value; + is_deeply( + \@key_value, +- [ [ 'xxy', 'flop' ], [ 'quantity', 4 ], [ 'oink', 'blah' ] ], ++ [ sort{ $a->[0] cmp $b->[0] } [ 'xxy', 'flop' ], [ 'quantity', 4 ], [ 'oink', 'blah' ] ], + '... got the right key value pairs' + ); diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 552def7241b3..2216b898bcc6 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonPackage rec { - name = "pylint-1.2.1"; + name = "pylint-1.4.0"; namePrefix = ""; src = fetchurl { url = "https://pypi.python.org/packages/source/p/pylint/${name}.tar.gz"; - sha256 = "0q7zj5hgmz27wifhcqyaddc9yc5b2q6p16788zzm3da6qshv7xk3"; + md5 = "c164738f90213981db5d3297a60b4138"; }; propagatedBuildInputs = with pythonPackages; [ astroid ]; diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index 92a5fd2dc07f..92b74c952fac 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, python, sip, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }: +{ stdenv, fetchurl, python, pythonPackages, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }: -let version = "4.10.2"; # kde410.pykde4 doesn't build with 4.10.3 +let version = "4.11.3"; in stdenv.mkDerivation { name = "PyQt-x11-gpl-${version}"; src = fetchurl { url = "mirror://sourceforge/pyqt/PyQt4/PyQt-${version}/PyQt-x11-gpl-${version}.tar.gz"; - sha256 = "1zp69caqq195ymp911d0cka8619q78hzmfxvj7c51w2y53zg4z3l"; + sha256 = "11jnfjw79s0b0qdd9s6kd69w87vf16dhagbhbmwbmrp2vgf80dw5"; }; configurePhase = '' @@ -30,7 +30,7 @@ stdenv.mkDerivation { buildInputs = [ python pkgconfig makeWrapper qt4 lndir ]; - propagatedBuildInputs = [ sip ]; + propagatedBuildInputs = [ pythonPackages.sip_4_16 ]; postInstall = '' for i in $out/bin/*; do diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 2d2a2ed51511..83dac459284c 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -29,7 +29,8 @@ in stdenv.mkDerivation { export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages substituteInPlace configure.py \ - --replace 'install_dir=pydbusmoddir' "install_dir='$out/lib/${python.libPrefix}/site-packages/dbus/mainloop'" + --replace 'install_dir=pydbusmoddir' "install_dir='$out/lib/${python.libPrefix}/site-packages/dbus/mainloop'" \ + --replace "ModuleMetadata(qmake_QT=['webkitwidgets'])" "ModuleMetadata(qmake_QT=['webkitwidgets', 'printsupport'])" ${python.executable} configure.py -w \ --confirm-license \ diff --git a/pkgs/development/python-modules/sip/4.16.nix b/pkgs/development/python-modules/sip/4.16.nix index 210346062f9e..b10852d17f39 100644 --- a/pkgs/development/python-modules/sip/4.16.nix +++ b/pkgs/development/python-modules/sip/4.16.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python, isPyPy }: if isPyPy then throw "sip not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { - name = "sip-4.16.1"; + name = "sip-4.16.4"; src = fetchurl { url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz"; - sha256 = "1hknl71ij924syc9ik9nk4z051q3n75y7w27q9i07awpd39sp7m4"; + sha256 = "1xapklcz5ndilax0gr2h1fqzhdzh7yvxfb3y0rxfcag1qlzl9nnf"; }; configurePhase = '' diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index c2ab7a334fe8..992d797c1892 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -1,17 +1,27 @@ -{ stdenv, fetchFromGitHub, cmake, libpfm, zlib }: +{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, python }: stdenv.mkDerivation rec { - version = "2.0.0"; + version = "3.0.0"; name = "rr-${version}"; src = fetchFromGitHub { owner = "mozilla"; repo = "rr"; rev = version; - sha256 = "0mlxkj35zmm15dgnc7rfynnh2s2hpym01147vwc8pwv8qgab903s"; + sha256 = "1h4ddq7mmi0sfj6mh1qg2bfs3x7gz5qmn9dlnmpkrp38rqgnnhrg"; }; - buildInputs = [ cmake libpfm zlib ]; + patchPhase = '' + substituteInPlace src/Command.cc --replace '_BSD_SOURCE' '_DEFAULT_SOURCE' + '' + # On 64bit machines, don't build the 32-bit components for debugging + # 32-bit binaries. This sucks but I don't know how to make 'gcc' cooperate + # easily with how CMake works to build 32 and 64bit binaries at once. + + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' + substituteInPlace CMakeLists.txt --replace 'if(rr_64BIT)' 'if(false)' + ''; + + buildInputs = [ cmake libpfm zlib python ]; cmakeFlags = "-DCMAKE_C_FLAGS_RELEASE:STRING= -DCMAKE_CXX_FLAGS_RELEASE:STRING="; meta = { @@ -25,7 +35,7 @@ stdenv.mkDerivation rec { ''; license = "custom"; - maintainers = [ stdenv.lib.maintainers.pierron ]; - platforms = [ "i686-linux" ]; + maintainers = with stdenv.lib.maintainers; [ pierron thoughtpolice ]; + platforms = stdenv.lib.platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 27fd739ed544..28456d931e0a 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl, perl, gdb }: stdenv.mkDerivation rec { - name = "valgrind-3.10.0"; + name = "valgrind-3.10.1"; src = fetchurl { url = "http://valgrind.org/downloads/${name}.tar.bz2"; - sha256 = "1jgd42vsx0bcblp91bd61hd5wpy0gghh09wxgm65m666vy17y103"; + sha256 = "15xrzhfnwwn7n1sfbkwvdbvs6zk0zx718n6zd5i1nrnvdp13s9gs"; }; - patches = [ ./glibc-2.19.patch ]; - # Perl is needed for `cg_annotate'. # GDB is needed to provide a sane default for `--db-command'. nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/tools/analysis/valgrind/glibc-2.19.patch b/pkgs/development/tools/analysis/valgrind/glibc-2.19.patch deleted file mode 100644 index 137b0a325b04..000000000000 --- a/pkgs/development/tools/analysis/valgrind/glibc-2.19.patch +++ /dev/null @@ -1,39 +0,0 @@ -https://projects.archlinux.org/svntogit/packages.git/plain/trunk/valgrind-3.9.0-glibc-2.19.patch?h=packages/valgrind - -diff -Naur valgrind-3.9.0-orig/configure valgrind-3.9.0/configure ---- valgrind-3.9.0-orig/configure 2013-11-01 09:33:32.000000000 +1000 -+++ valgrind-3.9.0/configure 2014-02-08 09:28:06.063248544 +1000 -@@ -6689,6 +6689,16 @@ - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.19) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.19 family" >&5 -+$as_echo "2.19 family" >&6; } -+ -+$as_echo "#define GLIBC_2_19 1" >>confdefs.h -+ -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; - darwin) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5 - $as_echo "Darwin" >&6; } -diff -Naur valgrind-3.9.0-orig/configure.ac valgrind-3.9.0/configure.ac ---- valgrind-3.9.0-orig/configure.ac 2013-11-01 09:28:16.000000000 +1000 -+++ valgrind-3.9.0/configure.ac 2014-02-08 09:27:38.870385366 +1000 -@@ -918,6 +918,13 @@ - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.19) -+ AC_MSG_RESULT(2.19 family) -+ AC_DEFINE([GLIBC_2_19], 1, [Define to 1 if you're using glibc 2.19.x]) -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; - darwin) - AC_MSG_RESULT(Darwin) - AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin]) diff --git a/pkgs/development/tools/build-managers/buildbot-slave/default.nix b/pkgs/development/tools/build-managers/buildbot-slave/default.nix index 870664c252a5..715b009a17ef 100644 --- a/pkgs/development/tools/build-managers/buildbot-slave/default.nix +++ b/pkgs/development/tools/build-managers/buildbot-slave/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchurl, coreutils, twisted }: buildPythonPackage (rec { - name = "buildbot-slave-0.8.8"; + name = "buildbot-slave-0.8.10"; namePrefix = ""; src = fetchurl { - url = "http://buildbot.googlecode.com/files/${name}.tar.gz"; - sha256 = "1k1pk3y0rk6j01wc491jblryr4ajqg1ing9m3sjaw9s5sga34xcb"; + url = "https://pypi.python.org/packages/source/b/buildbot-slave/${name}.tar.gz"; + sha256 = "09pncw44c7vqrl7zyn1nvfismiqi9s51axk9cqxn9gq7jhj38mpg"; }; patchPhase = '' diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index ccbf74e528e2..8193845770cf 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -9,12 +9,12 @@ assert enableDebugClient -> pygobject != null && pyGtkGlade != null; buildPythonPackage (rec { - name = "buildbot-0.8.8"; + name = "buildbot-0.8.10"; namePrefix = ""; src = fetchurl { - url = "http://buildbot.googlecode.com/files/${name}.tar.gz"; - sha256 = "1l1rsy82zv8582wypw00ac0k0wsr82ky74f3np4clbrxv3ry64sh"; + url = "https://pypi.python.org/packages/source/b/buildbot/${name}.tar.gz"; + sha256 = "1x5513mjvd3mwwadawk6v3ca2wh5mcmgnn5h9jhq1jw1plp4v5n4"; }; patchPhase = diff --git a/pkgs/development/tools/build-managers/cargo/common.nix b/pkgs/development/tools/build-managers/cargo/common.nix index 447aed275700..0eb728bad28e 100644 --- a/pkgs/development/tools/build-managers/cargo/common.nix +++ b/pkgs/development/tools/build-managers/cargo/common.nix @@ -14,16 +14,16 @@ rec { else throw "no snapshot to boostrap for this platform (missing platform url suffix)"; snapshotHash = if stdenv.system == "i686-linux" - then "3204c8a38721199f69d2971db887d1dc71a63825" + then "4dea04e278192c5409f43794a98f20a8f59df2d9" else if stdenv.system == "x86_64-linux" - then "39ca0d02eac184bc764ff9c1f645ca361715c5c2" + then "3e48c573d3c4d26591feb7bfe988174720f08374" else if stdenv.system == "i686-darwin" - then "ebc1836424c4b3ba49f9adef271c50d2a8e134c0" + then "dc3d498c0567af4a0820e91756dcfff8fde0efac" else if stdenv.system == "x86_64-darwin" - then "a2045e95984b65eab4a704152566f8ab9a3be518" + then "f301bd8c3c93a5c88698c69190e464af1525ac96" else throw "no snapshot for platform ${stdenv.system}"; - snapshotDate = "2014-11-22"; + snapshotDate = "2014-12-21"; snapshotName = "cargo-nightly-${platform}.tar.gz"; snapshot = stdenv.mkDerivation { diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 62662d273c8b..3bbfff9221ba 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-2.1"; + name = "gradle-2.2.1"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0y7qifc61nng24zn73bdwh5d0m25dnllfiwfkyw220mblag4zviy"; + sha256 = "420aa50738299327b611c10b8304b749e8d3a579407ee9e755b15921d95ff418"; }; 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-2.1.jar org.gradle.launcher.GradleMain" + --add-flags "-classpath $out/lib/gradle-launcher-2.2.1.jar org.gradle.launcher.GradleMain" ''; phases = "unpackPhase installPhase"; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 7ba30991d20e..4b9a8280f5e4 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "1.579"; + version = "1.594"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "1l2a8h3js42gkqn8kiysbgrxksqmhmmfp9l4kbrmw609q2wn5119"; + sha256 = "1ypinl78avvir9499xargjbrzxv2b8kspjicsg8xzk5wsymzybn1"; }; meta = with stdenv.lib; { description = "An extendable open source continuous integration server"; diff --git a/pkgs/development/tools/haskell/c2hs/default.nix b/pkgs/development/tools/haskell/c2hs/default.nix index fe8992e9989f..830283d6420a 100644 --- a/pkgs/development/tools/haskell/c2hs/default.nix +++ b/pkgs/development/tools/haskell/c2hs/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "c2hs"; - version = "0.19.1"; - sha256 = "18vk4q43bn4n59mcjid382dlm113nwll94hsqhqvk52sp1jkmjn3"; + version = "0.20.1"; + sha256 = "1w2w9zxirzjd5lniwqakq59glgsh4mw3565x2l9qrin0bfjxkn3h"; isLibrary = false; isExecutable = true; buildDepends = [ dlist filepath languageC ]; diff --git a/pkgs/development/tools/haskell/ghc-events-analyze/default.nix b/pkgs/development/tools/haskell/ghc-events-analyze/default.nix index b58d8d1429bc..cbf871820ff8 100644 --- a/pkgs/development/tools/haskell/ghc-events-analyze/default.nix +++ b/pkgs/development/tools/haskell/ghc-events-analyze/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "ghc-events-analyze"; - version = "0.2.0"; - sha256 = "04px1p0pnx54414m7sdpmdhj2dpsi1z8bjm8jq2yzh66854xiyh4"; + version = "0.2.1"; + sha256 = "0lf063p2wj2d1hxb5hx4bcid3a3ni3g9x8sglm5q5kfbmdk7awj4"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 0699337640f1..17813ac1a33a 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hlint"; - version = "1.9.12"; - sha256 = "0ga66b7lpvgx2w1fg5gnilncg75dfxcjcrx9hvjyxh7fin4y1z6a"; + version = "1.9.13"; + sha256 = "1cj487l3jvrp43acwk3ihc5mzyqwxxa0nqahad27sd3bbmx86p4a"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/haskell/packdeps/default.nix b/pkgs/development/tools/haskell/packdeps/default.nix new file mode 100644 index 000000000000..292f6af944fc --- /dev/null +++ b/pkgs/development/tools/haskell/packdeps/default.nix @@ -0,0 +1,19 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, Cabal, filepath, split, tar, text, time }: + +cabal.mkDerivation (self: { + pname = "packdeps"; + version = "0.4.0.3"; + sha256 = "08an9nwg448d3w4yds67l02mgikmjmn52pvva3i386fv4hfkabhp"; + isLibrary = true; + isExecutable = true; + buildDepends = [ Cabal filepath split tar text time ]; + meta = { + homepage = "http://packdeps.haskellers.com/"; + description = "Check your cabal packages for lagging dependencies"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ bergey ]; + }; +}) diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix new file mode 100644 index 000000000000..0e6ca01c625e --- /dev/null +++ b/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, xz }: +stdenv.mkDerivation rec { + name = "autoconf-archive-${version}"; + version = "2014.10.15"; + + src = fetchurl { + url = "http://ftp.heanet.ie/mirrors/gnu/autoconf-archive/autoconf-archive-${version}.tar.xz"; + sha256 = "198yrdf8bhrpl7insdyzn65zd60qll0gr9vpz7fl7dpcj78yc7gy"; + }; + buildInputs = [ xz ]; + + meta = with stdenv.lib; { + description = "Archive of autoconf m4 macros."; + homepage = http://www.gnu.org/software/autoconf-archive/; + license = licenses.gpl3; + }; +} diff --git a/pkgs/development/tools/misc/gdb/pstack.nix b/pkgs/development/tools/misc/gdb/pstack.nix deleted file mode 100644 index 12cdc6542609..000000000000 --- a/pkgs/development/tools/misc/gdb/pstack.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, gdb }: -stdenv.mkDerivation { - name = "pstack-20120823"; - buildCommand = '' - mkdir -p $out/bin - cat > $out/bin/pstack <<EOF - ${gdb}/bin/gdb -ex "set pagination 0" -ex "thread apply all bt" --batch -p \$1 - EOF - chmod a+x $out/bin/pstack - ''; -} diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index a27b2318b95f..0872560f431c 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev, libX11, libXext, libXv, libXrandr, glib, bison }: stdenv.mkDerivation rec { - name = "intel-gpu-tools-1.8"; + name = "intel-gpu-tools-1.9"; src = fetchurl { url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2"; - sha256 = "0n9pzwjzx4xiffcy3nkc7q7689sid2ry8m9xx4vgxxspr8ds3qpz"; + sha256 = "1lqy1adplb2bqpddznsavjc2fxn6rvzxnndmi8cnq7pyw25c5r0x"; }; - configureFlags = [ "--disable-tests" ]; - buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11 libXext libXv libXrandr glib bison ]; meta = with stdenv.lib; { @@ -17,5 +15,6 @@ stdenv.mkDerivation rec { description = "Tools for development and testing of the Intel DRM driver"; license = licenses.mit; platforms = platforms.unix; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 7cc878a28395..a4cd9b286079 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "strace-4.8"; + name = "strace-4.9"; src = fetchurl { url = "mirror://sourceforge/strace/${name}.tar.xz"; - sha256 = "1y6pw4aj4rw5470lqks1ml0n8jh5xbhwr5c3gb00bj570wgjk4pl"; + sha256 = "0rbgznvrxzw7vfah7mwzb4j4mm9gp4hkpiyaghlivfa0qnjzwnq9"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix index 48a6b3c1f64d..986bd4609d5c 100644 --- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix +++ b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation { description = "Omake build system"; homepage = "${webpage}"; license = "GPL"; + platforms = ocaml.meta.platforms; }; } diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix index 39e2daf6b3ab..fd3f48b8b823 100644 --- a/pkgs/development/tools/slimerjs/default.nix +++ b/pkgs/development/tools/slimerjs/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="slimerjs"; - version="0.9.3"; + version="0.9.4"; name="${baseName}-${version}"; - hash="17vfnz6njn8zk39ywpg7bd9wp98ppxjvna6gn2443ylgh428v707"; - url="http://download.slimerjs.org/releases/0.9.3/slimerjs-0.9.3.zip"; - sha256="17vfnz6njn8zk39ywpg7bd9wp98ppxjvna6gn2443ylgh428v707"; + hash="0g00mb4z8z5if3sf52bad75w9xdx8p81y5p4p46c2v577v42s5z3"; + url="http://download.slimerjs.org/releases/0.9.4/slimerjs-0.9.4.zip"; + sha256="0g00mb4z8z5if3sf52bad75w9xdx8p81y5p4p46c2v577v42s5z3"; }; buildInputs = [ unzip zip diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index f796567b5556..06aeec77fbdf 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -8,7 +8,7 @@ let ln -sv /usr/sbin/dtrace $out/bin ''; - version = if unstableVersion then "0.11.13" else "0.10.32"; + version = if unstableVersion then "0.11.13" else "0.10.33"; # !!! Should we also do shared libuv? deps = { @@ -37,7 +37,7 @@ in stdenv.mkDerivation { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; sha256 = if unstableVersion then "1642zj3sajhqflfhb8fsvy84w9mm85wagm8w8300gydd2q6fkmhm" - else "040g0gh2nl593ml1fcqp68vxa5kj7aiw1nqirda1c69d7l70s4n2"; + else "07h8vl750svjg8x5zhxhwjkx03jpy2m6h3fbj7fd1rj4671jdp3m"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps); diff --git a/pkgs/development/web/wml/default.nix b/pkgs/development/web/wml/default.nix new file mode 100644 index 000000000000..d3c67ec14d35 --- /dev/null +++ b/pkgs/development/web/wml/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, perlPackages, ncurses, lynx, makeWrapper }: + +perlPackages.buildPerlPackage rec { + name = "wml-2.0.11"; + + src = fetchurl { + url = "http://thewml.org/distrib/${name}.tar.gz"; + sha256 = "0jjxpq91x7y2mgixz7ghqp01m24qa37wl3zz515rrzv7x8cyy4cf"; + }; + + # Getting lots of Non-ASCII character errors from pod2man. + # Inserting =encoding utf8 before the first =head occurrence. + # Wasn't able to fix mp4h. + preConfigure = '' + touch Makefile.PL + for i in wml_backend/p6_asubst/asubst.src wml_aux/freetable/freetable.src wml_docs/*.pod wml_include/des/*.src wml_include/fmt/*.src; do + sed -i '0,/^=head/{s/^=head/=encoding utf8\n=head/}' $i + done + sed -i 's/ doc / /g' wml_backend/p2_mp4h/Makefile.in + sed -i '/p2_mp4h\/doc/d' Makefile.in + ''; + + buildInputs = [ perlPackages.perl ncurses lynx makeWrapper ]; + + patches = [ ./redhat-with-thr.patch ./dynaloader.patch ./no_bitvector.patch ]; + + preFixup = '' + substituteInPlace $out/bin/wml \ + --replace "File::PathConvert::realpath" "Cwd::realpath" \ + --replace "File::PathConvert::abs2rel" "File::Spec->abs2rel" \ + --replace "File::PathConvert" "File::Spec" + + wrapProgram $out/bin/wml \ + --set PERL5LIB ${with perlPackages; stdenv.lib.makePerlPath [ + BitVector TermReadKey ImageSize + ]} + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://thewml.org/; + description = "Off-line HTML generation toolkit for Unix"; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/development/web/wml/dynaloader.patch b/pkgs/development/web/wml/dynaloader.patch new file mode 100644 index 000000000000..89b9f0427f9b --- /dev/null +++ b/pkgs/development/web/wml/dynaloader.patch @@ -0,0 +1,11 @@ +--- a/wml_backend/p3_eperl/configure 2009-10-03 19:12:29.000000000 -0500 ++++ b/wml_backend/p3_eperl/configure 2009-10-03 19:12:45.000000000 -0500 +@@ -678,7 +678,7 @@ + #define HAVE_PERL_DYNALOADER 1 + EOF + +- perl_dla=$perl_archlib/auto/DynaLoader/DynaLoader.a ++ perl_dla=$perl_archlib/CORE/libperl.so + ;; + * ) + rc=no \ No newline at end of file diff --git a/pkgs/development/web/wml/no_bitvector.patch b/pkgs/development/web/wml/no_bitvector.patch new file mode 100644 index 000000000000..d5fe926c4c7d --- /dev/null +++ b/pkgs/development/web/wml/no_bitvector.patch @@ -0,0 +1,10 @@ +--- a/wml_common/Makefile.in 2014-12-17 00:28:25.156736048 +0100 ++++ b/wml_common/Makefile.in 2014-12-17 00:28:30.501817958 +0100 +@@ -45,7 +45,6 @@ + have_gd=0 + + SUBDIRS = \ +- bitvector \ + filepathconvert \ + gd \ + getoptlong \ diff --git a/pkgs/development/web/wml/redhat-with-thr.patch b/pkgs/development/web/wml/redhat-with-thr.patch new file mode 100644 index 000000000000..4b06ccb3f56a --- /dev/null +++ b/pkgs/development/web/wml/redhat-with-thr.patch @@ -0,0 +1,19 @@ +Description: Fix FTBFS with Perl 5.16 + Patch taken from Fedora +Debian-Bug: 676263 +Fedora-Bug: 839609 +Author: Jitka Plesnikova +Origin: https://bugzilla.redhat.com/show_bug.cgi?id=839609 + +--- a/wml_backend/p3_eperl/eperl_perl5.h 2012-07-27 10:49:27.048508799 +0200 ++++ b/wml_backend/p3_eperl/eperl_perl5.h 2012-07-27 10:50:16.288714291 +0200 +@@ -72,9 +72,6 @@ + # define PL_curstash curstash + #endif + +-#ifndef WITH_THR +-# define PL_defoutgv defoutgv +-#endif + + /* + Initialization of locales when building a new Perl interpreter. \ No newline at end of file diff --git a/pkgs/games/Allure/default.nix b/pkgs/games/Allure/default.nix index 532ef092f094..63d6a0a2fb27 100644 --- a/pkgs/games/Allure/default.nix +++ b/pkgs/games/Allure/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "Allure"; - version = "0.4.99.0"; - sha256 = "1i4v1h4ynx4aap0nmf8qn2qx22wqfgypr83l7bh38fd4qibsvx3q"; + version = "0.4.100.0"; + sha256 = "15rkj5xab23wqr2d44xbri7hggbb3zmmka41xfiscqq4ifagfj4m"; isLibrary = false; isExecutable = true; buildDepends = [ enummapsetTh filepath LambdaHack text ]; @@ -13,7 +13,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://allureofthestars.com"; description = "Near-future Sci-Fi roguelike and tactical squad game"; - license = "unknown"; + license = "AGPL"; platforms = self.ghc.meta.platforms; }; }) diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index eb4edf2b36a9..2130c423cfeb 100644 --- a/pkgs/games/LambdaHack/default.nix +++ b/pkgs/games/LambdaHack/default.nix @@ -1,28 +1,30 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, assertFailure, async, binary, deepseq, enummapsetTh -, filepath, gtk, hashable, hsini, keys, miniutter, mtl, prettyShow -, random, stm, text, transformers, unorderedContainers, vector -, vectorBinaryInstances, x11, zlib +{ cabal, assertFailure, async, binary, dataDefault, 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.4.99.0"; - sha256 = "1mcz44akf706a0q1xr4h7hlf1gj60570bi8im6jpg73k728314cp"; + version = "0.4.100.0"; + sha256 = "15v3aagwsh180603an3wd7rfgbjzgamdw270ciw2m03v8pkg9d28"; isLibrary = true; isExecutable = true; buildDepends = [ - assertFailure async binary deepseq enummapsetTh filepath gtk - hashable hsini keys miniutter mtl prettyShow random stm text - transformers unorderedContainers vector vectorBinaryInstances zlib + assertFailure async binary dataDefault deepseq enummapsetTh + filepath gtk hashable hsini keys miniutter mtl prettyShow random + stm text transformers unorderedContainers vector + vectorBinaryInstances zlib ]; testDepends = [ - assertFailure async binary deepseq enummapsetTh filepath hashable - hsini keys miniutter mtl prettyShow random stm text transformers - unorderedContainers vector vectorBinaryInstances zlib + assertFailure async binary dataDefault deepseq enummapsetTh + filepath hashable hsini keys miniutter mtl prettyShow random stm + text transformers unorderedContainers vector vectorBinaryInstances + zlib ]; - pkgconfigDepends = [ gtk x11 ]; + pkgconfigDepends = [ gtk ]; meta = { homepage = "http://github.com/LambdaHack/LambdaHack"; description = "A game engine library for roguelike dungeon crawlers"; diff --git a/pkgs/games/atanks/default.nix b/pkgs/games/atanks/default.nix index 587fefe600b2..edad4b4b456e 100644 --- a/pkgs/games/atanks/default.nix +++ b/pkgs/games/atanks/default.nix @@ -11,11 +11,11 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="atanks"; - version = "6.0"; + version = "6.1"; name="${baseName}-${version}"; project="${baseName}"; url="mirror://sourceforge/project/${project}/${baseName}/${name}/${name}.tar.gz"; - sha256 = "0460zwzd800vcgsmd1dzb7j5wcy3lf9hsdw152f6p2mbd0nq5pds"; + sha256 = "1azs9amqkgs7qglx0vk9bg2fhn73lq89372scnfp45hinrh52vqi"; }; in rec { diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index ac037efe88a3..5756611df20a 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -4,17 +4,17 @@ let baseVersion = "40"; - patchVersion = "18"; + patchVersion = "19"; srcs = { df_unfuck = fetchgit { url = "https://github.com/svenstaro/dwarf_fortress_unfuck"; - rev = "f7ef8d4fa92bcbbf8e4790056c6c3668e3c3b20b"; - sha256 = "0kpb3gzjllvi1lahhi74cp2ny1dl7kvnhdlca7i2yxkmyzaaj9qy"; + rev = "dadf3d48e93a2800db5d4f98d775ba8453ca55a4"; + sha256 = "011pbcfc3a0mnwqg3pkhngnb1h7z1jbx4qbvj03blpzfjia075sv"; }; df = fetchurl { url = "http://www.bay12games.com/dwarves/df_${baseVersion}_${patchVersion}_linux.tar.bz2"; - sha256 = "0l29dn24xhkyj8fvmz8318i5sz2wpl420mwy1ccpdd3yfd3hrjmb"; + sha256 = "16xb6py7l1hf9hc7gn50nwajqgmv01zdhbkh7g6a8gnx7wlhl2p9"; }; }; @@ -25,6 +25,7 @@ assert stdenv.system == "i686-linux"; stdenv.mkDerivation rec { name = "dwarf-fortress-0.${baseVersion}.${patchVersion}"; + inherit baseVersion patchVersion; buildInputs = [ SDL SDL_image SDL_ttf gtk2 glib glew mesa ncurses openal glibc libsndfile pango atk cmake gdk_pixbuf]; src = "${srcs.df_unfuck} ${srcs.df}"; @@ -46,6 +47,10 @@ stdenv.mkDerivation rec { cd ../../ cp -r ./df_linux/* $out/share/df_linux rm $out/share/df_linux/libs/lib* + + # Store the original hash for dwarf-therapist + echo $(md5sum $out/share/df_linux/libs/Dwarf_Fortress | cut -c1-8) > $out/share/df_linux/hash.md5.orig + # Fix rpath patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.glibc ]}:$out/share/df_linux/libs" $out/share/df_linux/libs/Dwarf_Fortress cp -f ./git-export/build/libgraphics.so $out/share/df_linux/libs/libgraphics.so @@ -53,6 +58,9 @@ stdenv.mkDerivation rec { patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 $out/share/df_linux/libs/Dwarf_Fortress + # Store new hash for dwarf-therapist + echo $(md5sum $out/share/df_linux/libs/Dwarf_Fortress | cut -c1-8) > $out/share/df_linux/hash.md5.patched + cat > $out/bin/dwarf-fortress << EOF #!${stdenv.shell} diff --git a/pkgs/games/dwarf-therapist/default.nix b/pkgs/games/dwarf-therapist/default.nix index 8cc1b9933cde..9ecfe3c0acdd 100644 --- a/pkgs/games/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-therapist/default.nix @@ -1,39 +1,30 @@ -{ stdenv, coreutils, fetchhg, qt4, dwarf_fortress, bash, makeWrapper }: +{ stdenv, coreutils, fetchurl, qt4, dwarf_fortress, bash, makeWrapper }: +let + version = "30.1.0"; + df = dwarf_fortress; +in stdenv.mkDerivation rec { - name = "dwarf-therapist-${rev}"; - rev = "eeeac8544d94"; + name = "dwarf-therapist-${version}"; - src = fetchhg { - url = "https://code.google.com/r/splintermind-attributes/"; - inherit rev; - sha256 = "0a9m967q6p2q3plrl6qysg1xrdmg65jzil6awjh2wr3g10x2x15z"; + src = fetchurl { + url = "https://github.com/splintermind/Dwarf-Therapist/archive/v${version}.tar.gz"; + sha256 = "1x9dkis6b3f8iqcfrc2cj9mcgkwf0rzhxhq2lgy4xdr2n0yjkyv7"; }; # Needed for hashing - dwarfBinary = "${dwarf_fortress}/share/df_linux/libs/Dwarf_Fortress"; + dfHashFile = "${df}/share/df_linux/hash.md5"; - buildInputs = [ coreutils qt4 dwarf_fortress makeWrapper ]; + buildInputs = [ coreutils qt4 df makeWrapper ]; enableParallelBuilding = false; - preConfigure = '' + configurePhase = '' substituteInPlace dwarftherapist.pro \ --replace /usr/bin $out/bin \ --replace /usr/share $out/share \ --replace "INSTALLS += doc" "" - ''; - - preBuild = '' - # Log to current directory, otherwise it crashes if log/ doesn't - # exist Note: Whis is broken because we cd to the nix store in the - # wrapper-script - substituteInPlace src/dwarftherapist.cpp \ - --replace "log/run.log" "dwarf-therapist.log" - ''; - buildPhase = '' - qmake INSTALL_PREFIX=$out; - make; + qmake INSTALL_PREFIX=$out ''; postInstall = '' @@ -46,8 +37,8 @@ stdenv.mkDerivation rec { postFixup = '' # Fix checksum of memory access directives - substituteInPlace $out/share/dwarftherapist/etc/memory_layouts/linux/v034.11.ini \ - --replace "e966ee88" $(md5sum ${dwarfBinary} | cut -c1-8) + substituteInPlace $out/share/dwarftherapist/memory_layouts/linux/v0${df.baseVersion}.${df.patchVersion}.ini \ + --replace $(cat "${dfHashFile}.orig") $(cat "${dfHashFile}.patched") ''; meta = { @@ -58,4 +49,4 @@ stdenv.mkDerivation rec { hydraPlatforms = []; homepage = https://code.google.com/r/splintermind-attributes/; }; -} +} diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index 1d93b24d38ab..cc47f9482404 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; buildPhase = '' - make OPTLEVEL=0 + make OPTLEVEL=0 USE_LIBPNG=0 ''; installPhase = '' diff --git a/pkgs/games/gltron/default.nix b/pkgs/games/gltron/default.nix index d925c8810bf3..ebdd95f70735 100644 --- a/pkgs/games/gltron/default.nix +++ b/pkgs/games/gltron/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + broken = true; # see http://sourceforge.net/p/gltron/bugs/15 }; } diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index a1af42814d12..d8ae07705c63 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -17,6 +17,12 @@ stdenv.mkDerivation rec { "--without-liblzo2" ]; + # NOTE: Remove this patch in 1.4.5 or greater + patches = [ + # Adapted from svn r27079 + ./fix-freetype-1.4.4.patch + ]; + makeFlags = "INSTALL_PERSONAL_DIR="; postInstall = '' diff --git a/pkgs/games/openttd/fix-freetype-1.4.4.patch b/pkgs/games/openttd/fix-freetype-1.4.4.patch new file mode 100644 index 000000000000..37706ce05c96 --- /dev/null +++ b/pkgs/games/openttd/fix-freetype-1.4.4.patch @@ -0,0 +1,31 @@ +diff --git a/src/fontcache.cpp b/src/fontcache.cpp +=================================================================== +--- a/src/fontcache.cpp ++++ b/src/fontcache.cpp +@@ -537,6 +537,6 @@ + + /* Add 1 pixel for the shadow on the medium font. Our sprite must be at least 1x1 pixel */ +- int width = max(1, slot->bitmap.width + (this->fs == FS_NORMAL)); +- int height = max(1, slot->bitmap.rows + (this->fs == FS_NORMAL)); ++ unsigned int width = max(1U, (unsigned int)slot->bitmap.width + (this->fs == FS_NORMAL)); ++ unsigned int height = max(1U, (unsigned int)slot->bitmap.rows + (this->fs == FS_NORMAL)); + + /* Limit glyph size to prevent overflows later on. */ +@@ -554,6 +554,6 @@ + /* Draw shadow for medium size */ + if (this->fs == FS_NORMAL && !aa) { +- for (int y = 0; y < slot->bitmap.rows; y++) { +- for (int x = 0; x < slot->bitmap.width; x++) { ++ for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) { ++ for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) { + if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) { + sprite.data[1 + x + (1 + y) * sprite.width].m = SHADOW_COLOUR; +@@ -564,6 +564,6 @@ + } + +- for (int y = 0; y < slot->bitmap.rows; y++) { +- for (int x = 0; x < slot->bitmap.width; x++) { ++ for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) { ++ for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) { + if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) { + sprite.data[x + y * sprite.width].m = FACE_COLOUR; diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index 11b04a3e7425..773b2f477b6f 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; assert stdenv.isi686; stdenv.mkDerivation { - name = "tibia-10.64"; + name = "tibia-10.71"; src = fetchurl { - url = http://static.tibia.com/download/tibia1064.tgz; - sha256 = "0g3hg65aclbhdm3sfpxxzyc4cdv1q6i2mzzgq2h8bpyc1m3in1j9"; + url = http://static.tibia.com/download/tibia1071.tgz; + sha256 = "183949xfvbbxbhj4i85ybcfv7h9j1f4va4c61wjzbhyjf55vj69a"; }; shell = stdenv.shell; diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 0f99902badb7..883de8d2b9db 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ openssl ]; - configureFlags = "--localstatedir=/var --enable-dbus"; # --with-dbusdir + configureFlags = "--localstatedir=/var --sysconfdir=/etc --enable-dbus"; # --with-dbusdir installFlags = [ # Don't try to write in /var at build time. @@ -31,6 +31,7 @@ stdenv.mkDerivation { "DBUSDIR=$(out)/etc/dbus-1" "INITDIR=$(out)/etc/rc.d" "XINETD=$(out)/etc/xinetd.d" + "SERVERROOT=$(out)/etc/cups" # Idem for /usr. "MENUDIR=$(out)/share/applications" "ICONDIR=$(out)/share/icons" @@ -38,6 +39,12 @@ stdenv.mkDerivation { "CUPS_PRIMARY_SYSTEM_GROUP=root" ]; + postInstall = + '' + # Delete obsolete stuff that conflicts with cups-filters. + rm -rf $out/share/cups/banners $out/share/cups/data/testprint + ''; + meta = { homepage = "http://www.cups.org/"; description = "A standards-based printing system for UNIX"; diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 31ef0bc0efcd..524662a0ee6c 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, cups, poppler, fontconfig -, libjpeg, libpng, perl, ijs, qpdf, dbus }: +, libjpeg, libpng, perl, ijs, qpdf, dbus, substituteAll, bash }: stdenv.mkDerivation rec { name = "cups-filters-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1bq48nnrarlbf6qc93bz1n5wlh6j420gppbck3r45sinwhz5wa7m"; }; - buildInputs = [ + buildInputs = [ pkgconfig cups poppler fontconfig libjpeg libpng perl ijs qpdf dbus ]; @@ -18,9 +18,36 @@ stdenv.mkDerivation rec { preBuild = '' substituteInPlace Makefile --replace "/etc/rc.d" "$out/etc/rc.d" ''; + configureFlags = "--with-pdftops=pdftops --enable-imagefilters"; + makeFlags = "CUPS_SERVERBIN=$(out)/lib/cups CUPS_DATADIR=$(out)/share/cups CUPS_SERVERROOT=$(out)/etc/cups"; + postConfigure = + '' + # Ensure that bannertopdf can find the PDF templates in + # $out. (By default, it assumes that cups and cups-filters are + # installed in the same prefix.) + substituteInPlace config.h --replace ${cups}/share/cups/data $out/share/cups/data + + # Ensure that gstoraster can find gs in $PATH. + substituteInPlace filter/gstoraster.c --replace execve execvpe + ''; + + patches = [ + (substituteAll { + src = ./longer-shell-path.patch; + bash = "${bash}/bin/bash"; + }) + ]; + + postInstall = + '' + for i in $out/lib/cups/filter/{pstopdf,texttops,imagetops}; do + substituteInPlace $i --replace 'which ' 'type -p ' + done + ''; + meta = { homepage = http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters; description = "Backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc"; diff --git a/pkgs/misc/cups/longer-shell-path.patch b/pkgs/misc/cups/longer-shell-path.patch new file mode 100644 index 000000000000..a15fd4832258 --- /dev/null +++ b/pkgs/misc/cups/longer-shell-path.patch @@ -0,0 +1,13 @@ +diff --git a/filter/foomatic-rip/foomaticrip.c b/filter/foomatic-rip/foomaticrip.c +index 1c019aa..431d2f9 100644 +--- a/filter/foomatic-rip/foomaticrip.c ++++ b/filter/foomatic-rip/foomaticrip.c +@@ -174,7 +174,7 @@ char cupsfilterpath[PATH_MAX] = "/usr/local/lib/cups/filter:" + "/opt/cups/filter:" + "/usr/lib/cups/filter"; + +-char modern_shell[64] = "/bin/bash"; ++char modern_shell[128] = "@bash@"; + + void config_set_option(const char *key, const char *value) + { diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index becf5e60db6c..1bb23911c86d 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -30,7 +30,9 @@ stdenv.mkDerivation rec { homepage = http://dolphin-emu.org/; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARM"; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ MP2E ]; + # x86_32 is an unsupported platform. + # Enable generic build if you really want a JIT-less binary. + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/misc/emulators/nestopia/build-fix.patch b/pkgs/misc/emulators/nestopia/build-fix.patch new file mode 100644 index 000000000000..a7d82ead15ca --- /dev/null +++ b/pkgs/misc/emulators/nestopia/build-fix.patch @@ -0,0 +1,18 @@ +diff -wbBur rdanbrook-nestopia-f1dde9b/Makefile rdanbrook-nestopia-f1dde9b.my/Makefile +--- rdanbrook-nestopia-f1dde9b/Makefile 2013-01-20 20:10:25.000000000 +0400 ++++ rdanbrook-nestopia-f1dde9b.my/Makefile 2013-01-21 15:18:54.727577673 +0400 +@@ -197,11 +197,11 @@ + install -m 0644 NstDatabase.xml $(DATADIR) + install -m 0644 source/unix/icons/*.png $(DATADIR)/icons + install -m 0644 source/unix/icons/*.svg $(DATADIR)/icons +- install -m 0644 source/unix/icons/nestopia.svg $(PREFIX)/share/pixmaps +- xdg-desktop-menu install --novendor $(DATADIR)/nestopia.desktop ++ install -m 0644 source/unix/icons/nestopia.svg $(PREFIX)/share/pixmaps/nestopia.svg ++ install -Dm0644 $(DATADIR)/nestopia.desktop $(PREFIX)/share/applications/nestopia.desktop + + uninstall: +- xdg-desktop-menu uninstall $(DATADIR)/nestopia.desktop ++ rm $(PREFIX)/share/applications/nestopia.desktop + rm $(PREFIX)/share/pixmaps/nestopia.svg + rm $(BINDIR)/$(BIN) + rm -rf $(DATADIR) diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix new file mode 100644 index 000000000000..f2aa1e06ec80 --- /dev/null +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, pkgconfig, SDL2, alsaLib, gtk3, mesa_glu, makeWrapper +, mesa, libarchive, libao, unzip, xdg_utils, gsettings_desktop_schemas }: + +stdenv.mkDerivation rec { + name = "nestopia-1.46.2"; + src = fetchurl { + url = https://github.com/rdanbrook/nestopia/archive/1.46.2.tar.gz; + sha256 = "07h49xwvg61dx20rk5p4r3ax2ar5y0ppvm60cqwqljyi9rdfbh7p"; + }; + + enableParallelBuilding = true; + + buildInputs = [ pkgconfig SDL2 alsaLib gtk3 mesa_glu mesa makeWrapper + libarchive libao unzip xdg_utils gsettings_desktop_schemas ]; + + installPhase = '' + mkdir -p $out/{bin,share/nestopia} + make install PREFIX=$out + ''; + + preFixup = '' + for f in $out/bin/*; do + wrapProgram $f \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" + done + ''; + + patches = [ ./build-fix.patch ]; + + meta = { + homepage = http://0ldsk00l.ca/nestopia/; + description = "NES emulator with a focus on accuracy"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ MP2E ]; + }; +} + diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index aa99d696f5f2..acbea4ba4eb8 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.30"; + version = "1.7.33"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "0v08w2av46y4wxrl8q4k9fhbi2cgawjaxclahqnpfw098bqcmxqh"; + sha256 = "0xcjsh3635i8wpzixzsl05m3dkq74vq193x3ipjr3fy0l9prslg3"; }; gecko = fetchurl { diff --git a/pkgs/misc/gxemul/default.nix b/pkgs/misc/gxemul/default.nix index 5cad3c964e45..8538932339c0 100644 --- a/pkgs/misc/gxemul/default.nix +++ b/pkgs/misc/gxemul/default.nix @@ -1,4 +1,4 @@ -{ composableDerivation, fetchurl }: +{ stdenv, composableDerivation, fetchurl }: let edf = composableDerivation.edf; name = "gxemul-0.4.6"; @@ -29,9 +29,9 @@ composableDerivation.composableDerivation {} { configurePhase = "./configure"; meta = { - license = "BSD"; + license = stdenv.lib.licenses.bsd3; description = "A Machine Emulator, mainly emulates MIPS, but supports other CPU types"; - homepage = http://gavare.se/gxemul/; + homepage = http://gxemul.sourceforge.net/; }; mergeAttrBy = { installPhase = a : b : "${a}\n${b}"; }; diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix index 9db2fe45ed31..c2405c9c380f 100644 --- a/pkgs/misc/screensavers/alock/default.nix +++ b/pkgs/misc/screensavers/alock/default.nix @@ -2,13 +2,13 @@ , libX11, pam, libgcrypt, libXrender, imlib2 }: stdenv.mkDerivation rec { - date = "20140724"; + date = "20141209"; name = "alock-${date}"; src = fetchgit { url = https://github.com/Arkq/alock; - rev = "928ae09a85627570b7f6986fe161b71327405fc0"; - sha256 = "0z605w2cf0pc988qq931b2zis6dqavm0wcjfdmr6q4vamvinjfv0"; + rev = "5ab7e6014faa1659c2d55bf9734bfa3ce7137443"; + sha256 = "07wf3vxh54ncxslp3zf8m7szpqbissxf8q9rs5zgvg333zdqd49s"; }; preConfigure = "autoreconf -fvi"; diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 29acf04000ca..cb937a940006 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - version = "5.30"; + version = "5.32"; name = "xscreensaver-${version}"; src = fetchurl { url = "http://www.jwz.org/xscreensaver/${name}.tar.gz"; - sha256 = "0ljx10fsypdddcx43lwhrwqa9ksp9djv7p4i1y7760m4frl1fw9p"; + sha256 = "1gckra8lsd383av15r7lv9rszw6mp8n1gpcb5qs5nbrdkl3sclj2"; }; buildInputs = diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index e1ae7a6d4d49..f68b436bed1c 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -77,9 +77,13 @@ stdenv.mkDerivation rec { cd .. cp -r kernel-patches $out ''; - installPhase = '' + + installPhase = let + perlVersion = (builtins.parseDrvName perl.name).version; + in '' for i in $out/bin/*; do - wrapProgram $i --prefix PERL5LIB : "$PERL5LIB:$out/lib/perl5/5.10.1/i686-linux-thread-multi/" + wrapProgram $i --prefix PERL5LIB : \ + "$PERL5LIB:$out/lib/perl5/${perlVersion}/${stdenv.system}-thread-multi/" done ''; diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh index 325fb869a707..8df039101462 100644 --- a/pkgs/os-specific/linux/ati-drivers/builder.sh +++ b/pkgs/os-specific/linux/ati-drivers/builder.sh @@ -224,6 +224,7 @@ fi # libstdc++ and gcc are needed by some libs patchelf --set-rpath $gcc/$lib_arch $out/lib/libatiadlxx.so + patchelf --set-rpath $gcc/$lib_arch $out/lib/xorg/modules/glesx.so } if test -z "$libsOnly"; then diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 11657d342917..9c7afb929c08 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -31,7 +31,7 @@ assert (!libsOnly) -> kernel != null; with stdenv.lib; stdenv.mkDerivation { - name = "ati-drivers-14.4" + (optionalString (!libsOnly) "-${kernel.version}"); + name = "ati-drivers-14.12" + (optionalString (!libsOnly) "-${kernel.version}"); builder = ./builder.sh; @@ -39,13 +39,12 @@ stdenv.mkDerivation { gcc = stdenv.gcc.gcc; src = fetchurl { - url = http://www2.ati.com/drivers/linux/amd-catalyst-14-4-rev2-linux-x86-x86-64-may6.zip; - sha256 = "1xbhn55yifis9b0lzb3s03hc1bcq8jmy7l96m4x8d842n7ji7qlk"; + url = http://www2.ati.com/drivers/linux/amd-catalyst-omega-14.12-linux-run-installers.zip; + sha256 = "0jd2scrdlyapynxfjdrarnwcdzxjqrk5fg5i10g3bm0ay8v9hrk8"; curlOpts = "--referer http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64"; }; - # most patches are taken from gentoo - patchPhase = "patch -p1 < ${./gentoo-patches.patch}"; + patchPhase = "patch -p1 < ${./fglrx_3.17rc6-no_hotplug.patch}"; patchPhaseSamples = "patch -p2 < ${./patch-samples.patch}"; buildInputs = diff --git a/pkgs/os-specific/linux/ati-drivers/fglrx_3.17rc6-no_hotplug.patch b/pkgs/os-specific/linux/ati-drivers/fglrx_3.17rc6-no_hotplug.patch new file mode 100644 index 000000000000..7afd54a59c50 --- /dev/null +++ b/pkgs/os-specific/linux/ati-drivers/fglrx_3.17rc6-no_hotplug.patch @@ -0,0 +1,31 @@ +source: https://aur.archlinux.org/packages/catalyst/ + +diff -uNr 14.9/common/lib/modules/fglrx/build_mod/firegl_public.c 14.9/common/lib/modules/fglrx/build_mod/firegl_public.c +--- 14.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2014-09-09 16:10:17.000000000 +0200 ++++ 14.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2014-09-26 19:01:44.000000000 +0200 +@@ -1093,6 +1093,9 @@ + // directly here to allow suspend/resume without X server start. + firegl_pci_save_state((KCL_PCI_DevHandle)pdev, privdev); + pci_disable_device(pdev); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) ++ pci_ignore_hotplug(pdev); ++#endif + PMSG_EVENT(pdev->dev.power.power_state) = state; + } + else +diff -uNr 14.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c 14.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c +--- 14.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2014-09-09 16:10:17.000000000 +0200 ++++ 14.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2014-09-26 18:57:27.000000000 +0200 +@@ -840,10 +840,12 @@ + if(tdev != NULL) + { + device = (acpi_device_adr(tdev) >> 16) & 0xffff; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0) + if(PCI_SLOT(pdev->devfn) == device) + { + tdev->flags.no_hotplug = true; + } ++#endif + } + #endif + return 0; diff --git a/pkgs/os-specific/linux/ati-drivers/gentoo-patches.patch b/pkgs/os-specific/linux/ati-drivers/gentoo-patches.patch deleted file mode 100644 index fd1d12cccb62..000000000000 --- a/pkgs/os-specific/linux/ati-drivers/gentoo-patches.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c -index d3ad3ce..9362b58 100755 ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c -@@ -34,6 +34,11 @@ - #include <linux/autoconf.h> - #endif - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) -+#include <linux/uidgid.h> -+#endif -+ -+ - #if !defined(CONFIG_X86) - #if !defined(CONFIG_X86_PC) - #if !defined(CONFIG_X86_XEN) -@@ -1543,9 +1548,17 @@ KCL_TYPE_Pid ATI_API_CALL KCL_GetTgid(void) - KCL_TYPE_Uid ATI_API_CALL KCL_GetEffectiveUid(void) - { - #ifdef current_euid -+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) -+ return __kuid_val(current_euid()); -+# else - return current_euid(); -+# endif - #else -+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) -+ return __kuid_val(current->euid); -+# else - return current->euid; -+# endif - #endif - } diff --git a/pkgs/os-specific/linux/broadcom-sta/cfg80211_inform_bss-3.18.patch b/pkgs/os-specific/linux/broadcom-sta/cfg80211_inform_bss-3.18.patch new file mode 100644 index 000000000000..100ac9161a6f --- /dev/null +++ b/pkgs/os-specific/linux/broadcom-sta/cfg80211_inform_bss-3.18.patch @@ -0,0 +1,21 @@ +Found on a random place http://web.archiveorange.com/archive/v/CcRuxYExfvTxfKcBFLah +Nicolas Viéville, Oct 27 2014 +diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_cfg80211_hybrid.c hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_cfg80211_hybrid.c +--- hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_cfg80211_hybrid.c 2014-09-10 19:27:13.301316000 +0200 ++++ hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_cfg80211_hybrid.c 2014-10-27 11:21:58.213536239 +0100 +@@ -2025,7 +2025,15 @@ + notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset); + notify_ielen = le32_to_cpu(bi->ie_length); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) ++ cbss = cfg80211_inform_bss(wiphy, channel, ++ (mgmt_type == IEEE80211_STYPE_PROBE_RESP) ? CFG80211_BSS_FTYPE_PRESP : CFG80211_BSS_FTYPE_BEACON, ++ (const u8 *)(bi->BSSID.octet), ++ 0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int, ++ (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL); ++#else + cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet), + 0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int, + (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL); ++#endif + if (unlikely(!cbss)) + return -ENOMEM; diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index e88b41a36ae7..94f519112952 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation { ./license.patch ./cfg80211_ibss_joined-channel-parameter.patch ./netdev-3.17.patch + ./cfg80211_inform_bss-3.18.patch ]; makeFlags = "KBASE=${kernel.dev}/lib/modules/${kernel.modDirVersion}"; diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index 43cb9c4a5d69..16eb933e176c 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -18,6 +18,24 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; + configureFlags = [ + "--localstatedir=/var" + "--sysconfdir=/etc" + ]; + makeFlags = [ + "hwdb_bin=/var/lib/udev/hwdb.bin" + "udevrulesdir=/etc/udev/rules.d" + ]; + installFlags = + [ + "localstatedir=$(TMPDIR)/var" + "sysconfdir=$(out)/etc" + "udevconfdir=$(out)/etc/udev" + "udevhwdbbin=$(out)/var/lib/udev/hwdb.bin" + "udevhwdbdir=$(out)/var/lib/udev/hwdb.d" + "udevrulesdir=$(out)/var/lib/udev/rules.d" + ]; + enableParallelBuilding = true; meta = { inherit (s) version; description = ''An udev fork by Gentoo''; diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index eb8e7cf390ae..9f3397fc8efd 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="firejail"; - version="0.9.16"; + version="0.9.18"; name="${baseName}-${version}"; - hash="1213ln6rqb1w0ba98zwi5p40f7gzpz4rqn621zz72v0z1q1vfkrp"; - url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.16-rc1.tar.bz2"; - sha256="1213ln6rqb1w0ba98zwi5p40f7gzpz4rqn621zz72v0z1q1vfkrp"; + hash="0qsjbnx9xzvzcbq7wdcf51v5abi4ml9jsai7w6xmns51qx4325a2"; + url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.18-rc1.tar.bz2"; + sha256="0qsjbnx9xzvzcbq7wdcf51v5abi4ml9jsai7w6xmns51qx4325a2"; }; buildInputs = [ ]; diff --git a/pkgs/os-specific/linux/ftop/default.nix b/pkgs/os-specific/linux/ftop/default.nix new file mode 100644 index 000000000000..4733ce95bb27 --- /dev/null +++ b/pkgs/os-specific/linux/ftop/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + name = "ftop-1.0"; + + src = fetchurl { + url = "http://ftop.googlecode.com/files/${name}.tar.bz2"; + sha256 = "3a705f4f291384344cd32c3dd5f5f6a7cd7cea7624c83cb7e923966dbcd47f82"; + }; + + buildInputs = [ ncurses ]; + + patches = [ + ./ftop-fix_buffer_overflow.patch + ./ftop-fix_printf_format.patch + ]; + patchFlags = "-p0"; + + postPatch = '' + substituteInPlace configure --replace "curses" "ncurses" + ''; + + meta = with stdenv.lib; { + description = "Show progress of open files and file systems"; + homepage = https://code.google.com/p/ftop/; + license = with licenses; gpl3Plus; + longDescription = '' + Ftop is to files what top is to processes. The progress of all open files + and file systems can be monitored. If run as a regular user, the set of + open files will be limited to those in that user's processes (which is + generally all that is of interest to the user). + As with top, the items are displayed in order from most to least active. + ''; + maintainers = with maintainers; [ nckx ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/os-specific/linux/ftop/ftop-fix_buffer_overflow.patch b/pkgs/os-specific/linux/ftop/ftop-fix_buffer_overflow.patch new file mode 100644 index 000000000000..f10fa6a33b85 --- /dev/null +++ b/pkgs/os-specific/linux/ftop/ftop-fix_buffer_overflow.patch @@ -0,0 +1,11 @@ +--- src/ftop.c.orig 2010-06-15 21:42:15.000000000 +0200 ++++ src/ftop.c 2010-06-15 21:45:38.000000000 +0200 +@@ -935,7 +935,7 @@ + { + if (bar_used > 0) + { +- snprintf(rate_buf, bar_used + 1, "%s", tmp_buf); ++ snprintf(rate_buf, bar_used >= sizeof(rate_buf) ? sizeof(rate_buf) : bar_used + 1, "%s", tmp_buf); + p_attron(p, A_REVERSE); + p_printf(p, "%s", rate_buf); + if (bar_used > bytes) diff --git a/pkgs/os-specific/linux/ftop/ftop-fix_printf_format.patch b/pkgs/os-specific/linux/ftop/ftop-fix_printf_format.patch new file mode 100644 index 000000000000..afb04306428a --- /dev/null +++ b/pkgs/os-specific/linux/ftop/ftop-fix_printf_format.patch @@ -0,0 +1,20 @@ +--- src/ftop.c.orig 2010-06-15 23:14:50.000000000 +0200 ++++ src/ftop.c 2010-06-15 23:15:52.000000000 +0200 +@@ -222,7 +222,7 @@ + p_eol(p, part); + + cols = snprintf(tmp_buf, sizeof(tmp_buf), +- "Processes: %u total, %u unreadable", ++ "Processes: %zu total, %zu unreadable", + s->num_processes + s->num_unreadable_processes, + s->num_unreadable_processes); + +@@ -244,7 +244,7 @@ + p_eol(p, part); + + snprintf(tmp_buf, sizeof(tmp_buf), +- "Open Files: %u regular, %u dir, %u chr, %u blk, %u pipe, %u sock, %u misc", ++ "Open Files: %zu regular, %zu dir, %zu chr, %zu blk, %zu pipe, %zu sock, %zu misc", + s->num_reg, s->num_dir, s->num_chr, s->num_blk, s->num_pipe, + s->num_sock, s->num_misc); + diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index 0e022e0c4a11..2221250d57c0 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -1,7 +1,8 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "iptables-1.4.21"; + name = "iptables-${version}"; + version = "1.4.21"; src = fetchurl { url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2"; @@ -17,5 +18,8 @@ stdenv.mkDerivation rec { description = "A program to configure the Linux IP packet filtering ruleset"; homepage = http://www.netfilter.org/projects/iptables/index.html; platforms = stdenv.lib.platforms.linux; + downloadPage = "http://www.netfilter.org/projects/iptables/files/"; + updateWalker = true; + inherit version; }; } diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index a3b2f23c8c78..262b673822b3 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Tool to use nl80211"; homepage = http://wireless.kernel.org/en/users/Documentation/iw; - license = "BSD"; + license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 88e00e2f3bda..80143bb49050 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.61"; + version = "3.10.63"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1pxkm4ix1051qma535087zkshwmwhirb73wyfhqaqrxp4177rja2"; + sha256 = "0ajgw7xr4ilbssr9lcs4078584kr5nlycc3gc28ywc29z7vi8sjm"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 8c68a09a5359..1dd49edf6d78 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.33"; + version = "3.12.35"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "18vrlrda8xa6j7771x8bwl7vrhvi2kmrp91nlwhkqr4siwkh0jxp"; + sha256 = "1krzd21hi93kwmffaxfbmyh8cbxl6afgma3yk14xm5ff5z0nlaxy"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index c301a312112e..7d4c741193f9 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.25"; + version = "3.14.27"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "07zwiywmijg5z8iy628w9f8rhi8j4hjd3raczq9pm7dqryayyaj2"; + sha256 = "09fxykm280zy3jq2zak6qiglsgv4756ryqwmx23hl014rk8bzszn"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.17.nix b/pkgs/os-specific/linux/kernel/linux-3.17.nix index cc77f4409db9..fd21f3c285cc 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.17.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.17.4"; + version = "3.17.7"; # Remember to update grsecurity! extraMeta.branch = "3.17"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0ayh9y58iv38h76jl2r77856af2cazzkwcdhjqmccibajjf42maa"; + sha256 = "074f56sz22wqnn21gamwf63llhsqc2hgb7dzkbkd5gqjx6pfdj53"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix new file mode 100644 index 000000000000..7e8fd723dd23 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, ... } @ args: + +import ./generic.nix (args // rec { + version = "3.18.1"; + extraMeta.branch = "3.18"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "13m0s2m0zg304w86yvcmxgbjl41c4kc420044avi8rnr1xwcscsq"; + }; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index ee7bd59f2556..330b643e46a2 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.2.64"; + version = "3.2.65"; extraMeta.branch = "3.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0niw4pbfc5dd46wzgvfnza8isyl01v1lva4njlwnrzag6x9fj0qp"; + sha256 = "1j9ibivhrkav5dfb7pv5m2j2y4577nqxp63npcpmna7wp7y132wm"; }; # We don't provide these patches if grsecurity is enabled, because diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 868918ef9459..d4da722f6c2b 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.104"; + version = "3.4.105"; extraMeta.branch = "3.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0xf2w4lccws2pps89hmh7ry8n43wr9p65yvdajba4qfxxy5jvx4b"; + sha256 = "0xhwdkpcmvbvk1rq0mz2f2pmh322flly7wr66wdd5bypfvanrk23"; }; kernelPatches = args.kernelPatches ++ diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index e4892cf8c9f4..561eadf2f21a 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -60,17 +60,17 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.25"; - revision = "201412040016"; + { kversion = "3.14.27"; + revision = "201412211908"; branch = "stable"; - sha256 = "0mifqb67v9y8qdsq6kr08gmd05c57575cv2xz1k0djgmjb3hvnpp"; + sha256 = "1xs34v1k970sv4i0a9qjcgk7i4cihl2xlgp1q7v320idpxrcym3a"; }; grsecurity_unstable = grsecPatch - { kversion = "3.17.4"; - revision = "201412040017"; + { kversion = "3.17.7"; + revision = "201412211910"; branch = "test"; - sha256 = "1mzqsqc8b4zbjy53vvvy7zl4gbzk7462ljr5x4jvah1mb08i5dmp"; + sha256 = "1s3ksf44mah398ix4ar49m6d8xwkk991pl1m8m441yhpm8h1ss3w"; }; grsec_fix_path = diff --git a/pkgs/os-specific/linux/ktap/default.nix b/pkgs/os-specific/linux/ktap/default.nix index b91fc871350a..2cb4f60f75b9 100644 --- a/pkgs/os-specific/linux/ktap/default.nix +++ b/pkgs/os-specific/linux/ktap/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchgit, kernel, useFFI ? false }: +assert builtins.substring 0 4 kernel.version != "3.18"; + let ffiArgs = stdenv.lib.optionalString useFFI "FFI=1"; in diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index c469fe93493d..29b6d80445a5 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libsepol-${version}"; version = "2.3"; se_release = "20140506"; - se_url = "${meta.homepage}/releases"; + se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases"; src = fetchurl { url = "${se_url}/${se_release}/libsepol-${version}.tar.gz"; diff --git a/pkgs/os-specific/linux/lttng-modules/6f0af2643c40b57280796eaa4fe60ce4f678b6dc.patch b/pkgs/os-specific/linux/lttng-modules/6f0af2643c40b57280796eaa4fe60ce4f678b6dc.patch new file mode 100644 index 000000000000..2c9cb9835d1c --- /dev/null +++ b/pkgs/os-specific/linux/lttng-modules/6f0af2643c40b57280796eaa4fe60ce4f678b6dc.patch @@ -0,0 +1,71 @@ +From 6f0af2643c40b57280796eaa4fe60ce4f678b6dc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Goddard=20Rosa?= <andre.goddard@gmail.com> +Date: Thu, 13 Nov 2014 21:33:02 -0800 +Subject: [PATCH] Fix compilation on Linux kernel >= 3.18.0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Since kernel commit 8a9522d2fe compilation fails as kvm_age_page +tracepoint had its signature changed, so update it accordingly. + +Tested pointing to kernels: + git reset --hard v3.17; make init/version.o + git reset --hard v3.18-rc1; make init/version.o + +Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com> +Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> +--- + instrumentation/events/lttng-module/kvm.h | 29 +++++++++++++++++++++++++++++ + 1 file changed, 29 insertions(+) + mode change 100644 => 100755 instrumentation/events/lttng-module/kvm.h + +diff --git a/instrumentation/events/lttng-module/kvm.h b/instrumentation/events/lttng-module/kvm.h +old mode 100644 +new mode 100755 +index c0d42e2..4f95095 +--- a/instrumentation/events/lttng-module/kvm.h ++++ b/instrumentation/events/lttng-module/kvm.h +@@ -232,6 +232,34 @@ LTTNG_TRACEPOINT_EVENT(kvm_fpu, + TP_printk("%s", __print_symbolic(__entry->load, kvm_fpu_load_symbol)) + ) + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)) ++ ++LTTNG_TRACEPOINT_EVENT(kvm_age_page, ++ TP_PROTO(ulong gfn, int level, struct kvm_memory_slot *slot, int ref), ++ TP_ARGS(gfn, level, slot, ref), ++ ++ TP_STRUCT__entry( ++ __field( u64, hva ) ++ __field( u64, gfn ) ++ __field( u8, level ) ++ __field( u8, referenced ) ++ ), ++ ++ TP_fast_assign( ++ tp_assign(gfn, gfn) ++ tp_assign(level, level) ++ tp_assign(hva, ((gfn - slot->base_gfn) << ++ PAGE_SHIFT) + slot->userspace_addr) ++ tp_assign(referenced, ref) ++ ), ++ ++ TP_printk("hva %llx gfn %llx level %u %s", ++ __entry->hva, __entry->gfn, __entry->level, ++ __entry->referenced ? "YOUNG" : "OLD") ++) ++ ++#else ++ + LTTNG_TRACEPOINT_EVENT(kvm_age_page, + TP_PROTO(ulong hva, struct kvm_memory_slot *slot, int ref), + TP_ARGS(hva, slot, ref), +@@ -254,6 +282,7 @@ LTTNG_TRACEPOINT_EVENT(kvm_age_page, + __entry->referenced ? "YOUNG" : "OLD") + ) + #endif ++#endif + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) + diff --git a/pkgs/os-specific/linux/lttng-modules/build-fix.patch b/pkgs/os-specific/linux/lttng-modules/build-fix.patch new file mode 100644 index 000000000000..76f449b8b2c6 --- /dev/null +++ b/pkgs/os-specific/linux/lttng-modules/build-fix.patch @@ -0,0 +1,30 @@ +[PATCH] Update compaction instrumentation for 3.14.x stable kernels + +Conditional compilation introduced by lttng-modules commit + + 0007344741ef65259bc52dea72259173dfbf96c0 + +needs to be applied to kernels 3.14.25 and up in the 3.14.x branch. + +Signed-off-by: Simon Marchi <simon.marchi at polymtl.ca> +Reported-by: Bjørn Forsman <bjorn.forsman at gmail.com> +--- + instrumentation/events/lttng-module/compaction.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/instrumentation/events/lttng-module/compaction.h b/instrumentation/events/lttng-module/compaction.h +index ee23aa9..773a6ad 100644 +--- a/instrumentation/events/lttng-module/compaction.h ++++ b/instrumentation/events/lttng-module/compaction.h +@@ -46,7 +46,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_compaction_isolate_template, mm_compaction_is + TP_ARGS(nr_scanned, nr_taken) + ) + +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) ++#if LTTNG_KERNEL_RANGE(3,14,25, 3,15,0) || \ ++ (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) + LTTNG_TRACEPOINT_EVENT(mm_compaction_migratepages, + + TP_PROTO(unsigned long nr_all, +-- +2.1.3 diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 315265f82033..871edf87b7a0 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { sha256 = "01gha02ybbzr86v6s6bqn649jiw5k89kb363b9s1iv8igrdlzhl1"; }; + # from upstream ML, should be in the next release + patches = [ ./build-fix.patch ./6f0af2643c40b57280796eaa4fe60ce4f678b6dc.patch ]; + preConfigure = '' export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" export INSTALL_MOD_PATH="$out" diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index dbce76023018..1d4ecdec98d4 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils, enable_dmeventd ? false }: let - version = "2.02.111"; + version = "2.02.114"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz"; - sha256 = "096xjcay4l2ph2dlyknic11pmz65jfgjs34fblqi9xh7zrr3x3vd"; + sha256 = "19bl536yylyi873p46prfwv086bg0sg0q5l4c7x6lnlwzfnb176y"; }; configureFlags = diff --git a/pkgs/os-specific/linux/macchanger/default.nix b/pkgs/os-specific/linux/macchanger/default.nix index 1bbad958bfd0..1f046de40edd 100644 --- a/pkgs/os-specific/linux/macchanger/default.nix +++ b/pkgs/os-specific/linux/macchanger/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "A utility for viewing/manipulating the MAC address of network interfaces"; - maintainer = with stdenv.lib.maintainers; [ joachifm ]; + maintainers = with stdenv.lib.maintainers; [ joachifm ]; license = with stdenv.lib.licenses; gpl2Plus; homepage = "https://www.gnu.org/software/macchanger"; platform = with stdenv.lib.platforms; linux; diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index e8dd56ab9e26..9834443a74d4 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, docbook2x, docbook_xml_dtd_45 +{ stdenv, fetchurl, pkgconfig, docbook2x, docbook_xml_dtd_45 , flex, bison, libmnl, libnftnl, gmp, readline }: stdenv.mkDerivation rec { - name = "nftables-0.3"; + name = "nftables-0.4"; src = fetchurl { url = "http://netfilter.org/projects/nftables/files/${name}.tar.bz2"; - sha256 = "0bww48hc424svxfx3fpqxmbmp0n42ahs1f28f5f6g29d8i2jcdsd"; + sha256 = "0g0x6mf5580kr1azrff0ryxxym43qr72fwir7agmz4b8bjvnkjpn"; }; configureFlags = [ @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; - buildInputs = [ docbook2x flex bison libmnl libnftnl gmp readline ]; + buildInputs = [ pkgconfig docbook2x flex bison libmnl libnftnl gmp readline ]; meta = with stdenv.lib; { description = "the project that aims to replace the existing {ip,ip6,arp,eb}tables framework"; diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh new file mode 100755 index 000000000000..4291116f4ef4 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -0,0 +1,107 @@ +source $stdenv/setup + +dontPatchELF=1 # must keep libXv, $out in RPATH + + +unpackFile() { + skip=$(sed 's/^skip=//; t; d' $src) + tail -n +$skip $src | xz -d | tar xvf - + sourceRoot=. +} + + +buildPhase() { + if test -z "$libsOnly"; then + # Create the module. + echo "Building linux driver against kernel: $kernel"; + cd kernel + kernelVersion=$(cd $kernel/lib/modules && ls) + sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source) + sysOut=$(echo $kernel/lib/modules/$kernelVersion/build) + unset src # used by the nv makefile + make SYSSRC=$sysSrc SYSOUT=$sysOut module + cd uvm + make SYSSRC=$sysSrc SYSOUT=$sysOut module + cd .. + cd .. + fi +} + + +installPhase() { + + if test -z "$libsOnly"; then + # Install the kernel module. + mkdir -p $out/lib/modules/$kernelVersion/misc + cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc + cp kernel/uvm/nvidia-uvm.ko $out/lib/modules/$kernelVersion/misc + + # Install the X driver. + mkdir -p $out/lib/xorg/modules + cp -p libnvidia-wfb.* $out/lib/xorg/modules/ + mkdir -p $out/lib/xorg/modules/drivers + cp -p nvidia_drv.so $out/lib/xorg/modules/drivers + mkdir -p $out/lib/xorg/modules/extensions + cp -p libglx.so.* $out/lib/xorg/modules/extensions + + #patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.* + + # Install the programs. + mkdir -p $out/bin + + for i in nvidia-settings nvidia-smi; do + cp $i $out/bin/$i + patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath $out/lib:$programPath:$glPath $out/bin/$i + done + + # Header files etc. + mkdir -p $out/include/nvidia + cp -p *.h $out/include/nvidia + + mkdir -p $out/share/man/man1 + cp -p *.1.gz $out/share/man/man1 + rm $out/share/man/man1/nvidia-xconfig.1.gz + + mkdir -p $out/share/applications + cp -p *.desktop $out/share/applications + + mkdir -p $out/share/pixmaps + cp -p nvidia-settings.png $out/share/pixmaps + + # Patch the `nvidia-settings.desktop' file. + substituteInPlace $out/share/applications/nvidia-settings.desktop \ + --replace '__UTILS_PATH__' $out/bin \ + --replace '__PIXMAP_PATH__' $out/share/pixmaps + + # Test a bit. + $out/bin/nvidia-settings --version + fi + + + # Install libGL and friends. + mkdir -p "$out/lib/vendors" + cp -p nvidia.icd $out/lib/vendors/ + + cp -prd *.so.* tls "$out/lib/" + rm "$out"/lib/lib{glx,nvidia-wfb}.so.* # handled separately + + for libname in `find "$out/lib/" -name '*.so.*'` + do + # I'm lazy to differentiate needed libs per-library, as the closure is the same. + # Unfortunately --shrink-rpath would strip too much. + patchelf --set-rpath "$out/lib:$allLibPath" "$libname" + + libname_short=`echo -n "$libname" | sed 's/so\..*/so/'` + ln -srnf "$libname" "$libname_short" + ln -srnf "$libname" "$libname_short.1" + done + + #patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.* + #patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.* + #patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.* + #patchelf --set-rpath $openclPath $out/lib/libnvidia-opencl.so.*.* +} + + +genericBuild diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix new file mode 100644 index 000000000000..e1a82da91f44 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl +, gtk, atk, pango, glib, gdk_pixbuf +, # Whether to build the libraries only (i.e. not the kernel module or + # nvidia-settings). Used to support 32-bit binaries on 64-bit + # Linux. + libsOnly ? false +}: + +with stdenv.lib; + +assert (!libsOnly) -> kernel != null; + +let + + versionNumber = "343.36"; + # Policy: use the highest stable version as the default (on our master). + inherit (stdenv.lib) makeLibraryPath; +in + +stdenv.mkDerivation { + name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; + + builder = ./builder.sh; + + src = + if stdenv.system == "i686-linux" then + fetchurl { + url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; + sha256 = "17l23dp725883xcyy1n178pcl6lj27psrgbxymc356x2pngwkhcc"; + } + else if stdenv.system == "x86_64-linux" then + fetchurl { + url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; + sha256 = "0djvh9wmazrfvpgyiqrz81kjk2war20xyjjr2kncxyplzk28mw97"; + } + else throw "nvidia-x11 does not support platform ${stdenv.system}"; + + inherit versionNumber libsOnly; + + kernel = if libsOnly then null else kernel.dev; + + dontStrip = true; + + glPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; + cudaPath = makeLibraryPath [zlib stdenv.gcc.gcc]; + openclPath = makeLibraryPath [zlib]; + allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.gcc.gcc]; + + programPath = optionalString (!libsOnly) (makeLibraryPath + [ gtk atk pango glib gdk_pixbuf xlibs.libXv ] ); + + buildInputs = [ perl ]; + + meta = with stdenv.lib.meta; { + homepage = http://www.nvidia.com/object/unix.html; + description = "X.org driver and kernel module for NVIDIA graphics cards"; + license = licenses.unfreeRedistributable; + platforms = platforms.linux; + maintainers = [ maintainers.vcunat ]; + }; +} diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix index 9acaee797f0c..bec329a1a17f 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix @@ -8,7 +8,7 @@ with stdenv.lib; -let versionNumber = "304.123"; in +let versionNumber = "304.125"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; @@ -19,12 +19,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "09gljwxw14img7hw0xdxd24cvpvlymdxssmxa9gikdrw2w04j0ym"; + sha256 = "1xy4g3yc73mb932cfr25as648k12sxpyymppb8nia3lijakv7idf"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "0vxw4gp78g06h5inwkhl989p9mq0m8rqipz9a67rdc4s364r243s"; + sha256 = "08p6hikn7pbfg0apnsbaqyyh2s9m5r0ckqzgjvxirn5qcyll0g5a"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix index ad0c0c0b367a..fd68b9aafde9 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix @@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null; let - versionNumber = "340.58"; + versionNumber = "340.65"; /* This branch is needed for G8x, G9x, and GT2xx GPUs, and motherboard chipsets based on them. Ongoing support for new Linux kernels and X servers, as well as fixes for critical bugs, will be included in 340.* legacy releases through the end of 2019. @@ -29,12 +29,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "0nzvfqn3cv2n486i38r3badd5jlmfv7x6k9s47calrqnd3q8zi3w"; + sha256 = "0wyrxhkfyjpa0l5xxpy4g9h3c34dv5bqif8nk70cm53pbm1i31g7"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "0h78wmb1yyr1xah6x22ifk9gzd2jvg3vhhg091nvyhcvpmbjq806"; + sha256 = "0yabf3d3aq2qmlzxw99y5lasdm5y7dq2n7l3gvak8iqx0k9cihh3"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/os-specific/linux/ocz-toolbox/default.nix b/pkgs/os-specific/linux/ocz-toolbox/default.nix new file mode 100644 index 000000000000..b41fc34be3e5 --- /dev/null +++ b/pkgs/os-specific/linux/ocz-toolbox/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, libXrender, fontconfig, freetype, libXext, libX11 }: + +let arch = if stdenv.system == "x86_64-linux" then "64" + else if stdenv.system == "i686-linux" then "32" + else abort "OCZ Toolbox only support {x86-64,i686}-linux targets"; +in stdenv.mkDerivation rec { + version = "4.9.0.634"; + name = "ocz-toolbox-${version}"; + + src = fetchurl { + url = "http://ocz.com/consumer/download/firmware/OCZToolbox_v${version}_linux.tar.gz"; + sha256 = "0h51p5bg9h2smxxy1r4xkzzjjavhgql7yy12qmjk0vbh13flgx3y"; + }; + + prePatch = '' + cd linux${arch} + ''; + + libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc libXrender fontconfig freetype libXext libX11 ]; + + installPhase = '' + install -Dm755 OCZToolbox $out/bin/OCZToolbox + patchelf \ + --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath "$libPath" \ + $out/bin/OCZToolbox + ''; + + dontStrip = true; + + meta = with stdenv.lib; { + description = "Update firmware and BIOS, secure erase, view SMART attributes, and view drive details of your OCZ SSD"; + homepage = "http://ocz.com/consumer/download/firmware"; + license = licenses.unfree; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 7f1dad248e6f..0648be4e41a1 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -1,13 +1,17 @@ -{ stdenv, fetchurl, kernel, perl, autoconf, automake, libtool, coreutils, gawk }: +{ stdenv, fetchFromGitHub, kernel, perl, autoconf, automake, libtool, coreutils, gawk }: -stdenv.mkDerivation { - name = "spl-0.6.3-${kernel.version}"; - src = fetchurl { - url = http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.3.tar.gz; - sha256 = "1qqzyj2if5wai4jiwml4i8s6v8k7hbi7jmiph800lhkk5j8s72l9"; +stdenv.mkDerivation rec { + name = "spl-${version}-${kernel.version}"; + version = "0.6.3-1.2"; + + src = fetchFromGitHub { + owner = "zfsonlinux"; + repo = "spl"; + rev = "spl-${version}"; + sha256 = "0id0m3sfpkz8w7b2pc51px8kvz8xnaf8msps57ddarxidmxvb45g"; }; - patches = [ ./install_prefix.patch ./const.patch ./kernel-3.16.patch ./kernel-3.17.patch ]; + patches = [ ./install_prefix.patch ./const.patch ]; buildInputs = [ perl autoconf automake libtool ]; diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 1398b91303bc..6b9526c15b27 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -3,10 +3,10 @@ let inherit (stdenv.lib) optional optionalString; s = rec { baseName="sysdig"; - version = "0.1.91"; + version = "0.1.93"; name="${baseName}-${version}"; url="https://github.com/draios/sysdig/archive/${version}.tar.gz"; - sha256 = "0a34zinw54nkxawby847yzc3wzbw4dgi849pvwyd28391pxpxayy"; + sha256 = "0rcbls1i82z2mwd3kcsidvhbb0xf0f4p7l2z3168wbpsh5nm9clz"; }; buildInputs = [ cmake zlib luajit diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 69940ceb1328..28d6f0b21a8b 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -1,11 +1,10 @@ { stdenv, fetchurl, gettext, bzip2 }: - stdenv.mkDerivation rec { - name = "sysstat-11.0.1"; + name = "sysstat-11.0.2"; src = fetchurl { url = "http://perso.orange.fr/sebastien.godard/${name}.tar.xz"; - sha256 = "1cwgsxvs7jkr3il6r344mw46502yjnhrsbcp4217vh4b7xv6czaq"; + sha256 = "15hv3ylr5i6nrrdhyjnp4xld51gpv0cn3hjgy6068ybwpvgpzn5c"; }; buildInputs = [ gettext ]; @@ -15,10 +14,13 @@ stdenv.mkDerivation rec { export PATH_CHKCONFIG=/no-such-program export BZIP=${bzip2}/bin/bzip2 export SYSTEMCTL=systemctl - makeFlagsArray=(DESTDIR=$out SYSCONFIG_DIR=$out/etc IGNORE_MAN_GROUP=y CHOWN=true) - installTargets="install_base install_nls install_man" ''; + makeFlags = "SYSCONFIG_DIR=$(out)/etc IGNORE_MAN_GROUP=y CHOWN=true"; + installTargets = "install_base install_nls install_man"; + + patches = [ ./install.patch ]; + meta = { homepage = http://sebastien.godard.pagesperso-orange.fr/; description = "A collection of performance monitoring tools for Linux (such as sar, iostat and pidstat)"; diff --git a/pkgs/os-specific/linux/sysstat/install.patch b/pkgs/os-specific/linux/sysstat/install.patch new file mode 100644 index 000000000000..473fa30b98b4 --- /dev/null +++ b/pkgs/os-specific/linux/sysstat/install.patch @@ -0,0 +1,13 @@ +diff -rc sysstat-11.0.1/Makefile.in sysstat-11.0.1-new/Makefile.in +*** sysstat-11.0.1/Makefile.in 2014-08-30 15:38:39.000000000 +0200 +--- sysstat-11.0.1-new/Makefile.in 2014-12-18 14:40:45.466349009 +0100 +*************** +*** 331,337 **** + install_base: all sa1 sa2 sysstat.sysconfig install_man install_nls \ + contrib/isag/isag + mkdir -p $(DESTDIR)$(SA_LIB_DIR) +- mkdir -p $(DESTDIR)$(SA_DIR) + ifeq ($(CLEAN_SA_DIR),y) + find $(DESTDIR)$(SA_DIR) \( -name 'sar??' -o -name 'sa??' -o -name 'sar??.gz' -o -name 'sa??.gz' \) \ + -exec rm -f {} \; +--- 331,336 ---- diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 2df23cf0e16e..ef8d5891d250 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -20,11 +20,8 @@ stdenv.mkDerivation rec { patches = [ # These are all changes between upstream and - # https://github.com/edolstra/systemd/tree/nixos-v216. + # https://github.com/edolstra/systemd/tree/nixos-v217. ./fixes.patch - # Fixes systemd-journald so that it does not get killed - # by systemd-journal-flush starting too quickly - ./systemd-journald-type-notify.patch ]; buildInputs = diff --git a/pkgs/os-specific/linux/systemd/fixes.patch b/pkgs/os-specific/linux/systemd/fixes.patch index ff31b4a75d48..182927486c57 100644 --- a/pkgs/os-specific/linux/systemd/fixes.patch +++ b/pkgs/os-specific/linux/systemd/fixes.patch @@ -13,6 +13,186 @@ index e30d9a8..a3d399b 100644 # Ignore raid devices that are not yet assembled and started SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", TEST!="md/array_state", ENV{SYSTEMD_READY}="0" SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0" +diff --git a/src/core/job.c b/src/core/job.c +index eaa4bb1..db44fee 100644 +--- a/src/core/job.c ++++ b/src/core/job.c +@@ -352,6 +352,9 @@ bool job_type_is_redundant(JobType a, UnitActiveState b) { + return + b == UNIT_ACTIVATING; + ++ case JOB_NOP: ++ return true; ++ + default: + assert_not_reached("Invalid job type"); + } +diff --git a/src/core/job.h b/src/core/job.h +index 1e7c61b..ee8e54a 100644 +--- a/src/core/job.h ++++ b/src/core/job.h +@@ -49,9 +49,11 @@ enum JobType { + _JOB_TYPE_MAX_MERGING, + + /* JOB_NOP can enter into a transaction, but as it won't pull in +- * any dependencies, it won't have to merge with anything. +- * job_install() avoids the problem of merging JOB_NOP too (it's +- * special-cased, only merges with other JOB_NOPs). */ ++ * any dependencies and it uses the special 'nop_job' slot in Unit, ++ * it won't have to merge with anything (except possibly into another ++ * JOB_NOP, previously installed). JOB_NOP is special-cased in ++ * job_type_is_*() functions so that the transaction can be ++ * activated. */ + JOB_NOP = _JOB_TYPE_MAX_MERGING, /* do nothing */ + + _JOB_TYPE_MAX_IN_TRANSACTION, +@@ -190,11 +192,15 @@ _pure_ static inline bool job_type_is_mergeable(JobType a, JobType b) { + } + + _pure_ static inline bool job_type_is_conflicting(JobType a, JobType b) { +- return !job_type_is_mergeable(a, b); ++ return a != JOB_NOP && b != JOB_NOP && !job_type_is_mergeable(a, b); + } + + _pure_ static inline bool job_type_is_superset(JobType a, JobType b) { + /* Checks whether operation a is a "superset" of b in its actions */ ++ if (b == JOB_NOP) ++ return true; ++ if (a == JOB_NOP) ++ return false; + return a == job_type_lookup_merge(a, b); + } + +diff --git a/src/core/manager.c b/src/core/manager.c +index d427d88..256d6f7 100644 +--- a/src/core/manager.c ++++ b/src/core/manager.c +@@ -662,9 +662,11 @@ static int manager_setup_notify(Manager *m) { + return -errno; + } + +- if (m->running_as == SYSTEMD_SYSTEM) ++ if (m->running_as == SYSTEMD_SYSTEM) { + m->notify_socket = strdup("/run/systemd/notify"); +- else { ++ if (!m->notify_socket) ++ return log_oom(); ++ } else { + const char *e; + + e = getenv("XDG_RUNTIME_DIR"); +@@ -674,9 +676,11 @@ static int manager_setup_notify(Manager *m) { + } + + m->notify_socket = strappend(e, "/systemd/notify"); ++ if (!m->notify_socket) ++ return log_oom(); ++ ++ mkdir_parents_label(m->notify_socket, 0755); + } +- if (!m->notify_socket) +- return log_oom(); + + strncpy(sa.un.sun_path, m->notify_socket, sizeof(sa.un.sun_path)-1); + r = bind(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path)); +diff --git a/src/core/shutdown.c b/src/core/shutdown.c +index 20cf526..03cfddc 100644 +--- a/src/core/shutdown.c ++++ b/src/core/shutdown.c +@@ -75,7 +75,9 @@ static int parse_argv(int argc, char *argv[]) { + assert(argc >= 1); + assert(argv); + +- while ((c = getopt_long(argc, argv, "", options, NULL)) >= 0) ++ /* "-" prevents getopt from permuting argv[] and moving the verb away ++ * from argv[1]. Our interface to initrd promises it'll be there. */ ++ while ((c = getopt_long(argc, argv, "-", options, NULL)) >= 0) + switch (c) { + + case ARG_LOG_LEVEL: +@@ -113,6 +115,13 @@ static int parse_argv(int argc, char *argv[]) { + + break; + ++ case '\001': ++ if (!arg_verb) ++ arg_verb = optarg; ++ else ++ log_error("Excess arguments, ignoring"); ++ break; ++ + case '?': + return -EINVAL; + +@@ -120,15 +129,11 @@ static int parse_argv(int argc, char *argv[]) { + assert_not_reached("Unhandled option code."); + } + +- if (optind >= argc) { ++ if (!arg_verb) { + log_error("Verb argument missing."); + return -EINVAL; + } + +- arg_verb = argv[optind]; +- +- if (optind + 1 < argc) +- log_error("Excess arguments, ignoring"); + return 0; + } + +diff --git a/src/core/snapshot.c b/src/core/snapshot.c +index 5eed615..c2678cb 100644 +--- a/src/core/snapshot.c ++++ b/src/core/snapshot.c +@@ -208,7 +208,7 @@ int snapshot_create(Manager *m, const char *name, bool cleanup, sd_bus_error *e, + return sd_bus_error_setf(e, SD_BUS_ERROR_INVALID_ARGS, "Unit name %s lacks snapshot suffix.", name); + + if (manager_get_unit(m, name)) +- sd_bus_error_setf(e, BUS_ERROR_UNIT_EXISTS, "Snapshot %s exists already.", name); ++ return sd_bus_error_setf(e, BUS_ERROR_UNIT_EXISTS, "Snapshot %s exists already.", name); + + } else { + +diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in +index d5b86bf..9c66e7b 100644 +--- a/src/core/systemd.pc.in ++++ b/src/core/systemd.pc.in +@@ -14,8 +14,8 @@ systemduserunitdir=@userunitdir@ + systemduserpresetdir=@userpresetdir@ + systemdsystemconfdir=@pkgsysconfdir@/system + systemduserconfdir=@pkgsysconfdir@/user +-systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemdsystemunitdir}:/usr/lib/systemd/system:/lib/systemd/system +-systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemduserunitdir}:/usr/lib/systemd/user:/usr/share/systemd/user ++systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/etc/systemd-mutable/system:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/system:${systemdsystemunitdir} ++systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/etc/systemd-mutable/user:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/user:${systemduserunitdir} + systemdsystemgeneratordir=@systemgeneratordir@ + systemdusergeneratordir=@usergeneratordir@ + systemdsleepdir=@systemsleepdir@ +diff --git a/src/core/timer.c b/src/core/timer.c +index a3713e2..5c4e9f9 100644 +--- a/src/core/timer.c ++++ b/src/core/timer.c +@@ -521,6 +521,7 @@ fail: + + static int timer_start(Unit *u) { + Timer *t = TIMER(u); ++ TimerValue *v; + + assert(t); + assert(t->state == TIMER_DEAD || t->state == TIMER_FAILED); +@@ -530,6 +531,11 @@ static int timer_start(Unit *u) { + + t->last_trigger = DUAL_TIMESTAMP_NULL; + ++ /* Reenable all timers that depend on unit activation time */ ++ LIST_FOREACH(value, v, t->values) ++ if (v->base == TIMER_ACTIVE) ++ v->disabled = false; ++ + if (t->stamp_path) { + struct stat st; + diff --git a/src/core/umount.c b/src/core/umount.c index cffa453..4d1a9ff 100644 --- a/src/core/umount.c @@ -26,6 +206,19 @@ index cffa453..4d1a9ff 100644 #ifndef HAVE_SPLIT_USR || path_equal(m->path, "/usr") #endif +diff --git a/src/delta/delta.c b/src/delta/delta.c +index 25c4a0b..e1f2d6d 100644 +--- a/src/delta/delta.c ++++ b/src/delta/delta.c +@@ -487,7 +487,7 @@ static int parse_flags(const char *flag_str, int flags) { + const char *word, *state; + size_t l; + +- FOREACH_WORD(word, l, flag_str, state) { ++ FOREACH_WORD_SEPARATOR(word, l, flag_str, ",", state) { + if (strneq("masked", word, l)) + flags |= SHOW_MASKED; + else if (strneq ("equivalent", word, l)) diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c index 70a5918..1926e52 100644 --- a/src/fsck/fsck.c @@ -40,19 +233,377 @@ index 70a5918..1926e52 100644 cmdline[i++] = "-T"; /* +diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c +index e257c12..1e04553 100644 +--- a/src/fstab-generator/fstab-generator.c ++++ b/src/fstab-generator/fstab-generator.c +@@ -485,7 +485,7 @@ static int add_usr_mount(void) { + return log_oom(); + } + +- if (!arg_usr_what || !arg_usr_options) ++ if (!arg_usr_what) + return 0; + + what = fstab_node_to_udev_node(arg_usr_what); +@@ -494,7 +494,13 @@ static int add_usr_mount(void) { + return -1; + } + +- opts = arg_usr_options; ++ if (!arg_usr_options) ++ opts = arg_root_rw > 0 ? "rw" : "ro"; ++ else if (!mount_test_option(arg_usr_options, "ro") && ++ !mount_test_option(arg_usr_options, "rw")) ++ opts = strappenda(arg_usr_options, ",", arg_root_rw > 0 ? "rw" : "ro"); ++ else ++ opts = arg_usr_options; + + log_debug("Found entry what=%s where=/sysroot/usr type=%s", what, strna(arg_usr_fstype)); + return add_mount(what, +diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c +index e487369..ff4e9c9 100644 +--- a/src/hostname/hostnamectl.c ++++ b/src/hostname/hostnamectl.c +@@ -536,5 +536,5 @@ int main(int argc, char *argv[]) { + r = hostnamectl_main(bus, argc, argv); + + finish: +- return r < 0 ? EXIT_FAILURE : r; ++ return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; + } +diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c +index 8a2c0fc..9de3ddd 100644 +--- a/src/journal/journal-file.c ++++ b/src/journal/journal-file.c +@@ -1657,7 +1657,7 @@ static int generic_array_bisect( + } + } + +- if (k > n) { ++ if (k >= n) { + if (direction == DIRECTION_UP) { + i = n; + subtract_one = true; +diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c +index f50faf4..03579fd 100644 +--- a/src/journal/journalctl.c ++++ b/src/journal/journalctl.c +@@ -682,7 +682,7 @@ static int parse_argv(int argc, char *argv[]) { + assert_not_reached("Unhandled option"); + } + +- if (arg_follow && !arg_no_tail && arg_lines == ARG_LINES_DEFAULT) ++ if (arg_follow && !arg_no_tail && !arg_since && arg_lines == ARG_LINES_DEFAULT) + arg_lines = 10; + + if (!!arg_directory + !!arg_file + !!arg_machine > 1) { +diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c +index 12735c4..08b143b 100644 +--- a/src/journal/journald-server.c ++++ b/src/journal/journald-server.c +@@ -1655,6 +1655,7 @@ void server_done(Server *s) { + free(s->buffer); + free(s->tty_path); + free(s->cgroup_root); ++ free(s->hostname_field); + + if (s->mmap) + mmap_cache_unref(s->mmap); +diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c +index 372f3ed..d56ee51 100644 +--- a/src/libsystemd-network/network-internal.c ++++ b/src/libsystemd-network/network-internal.c +@@ -392,10 +392,12 @@ void serialize_dhcp_routes(FILE *f, const char *key, struct sd_dhcp_route *route + + fprintf(f, "%s=", key); + +- for (i = 0; i < size; i++) +- fprintf(f, "%s/%" PRIu8 ",%s%s", inet_ntoa(routes[i].dst_addr), +- routes[i].dst_prefixlen, inet_ntoa(routes[i].gw_addr), ++ for (i = 0; i < size; i++) { ++ fprintf(f, "%s/%" PRIu8, inet_ntoa(routes[i].dst_addr), ++ routes[i].dst_prefixlen); ++ fprintf(f, ",%s%s", inet_ntoa(routes[i].gw_addr), + (i < (size - 1)) ? " ": ""); ++ } + + fputs("\n", f); + } +diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c +index 0eba4c3..9986b52 100644 +--- a/src/libsystemd-network/sd-dhcp-client.c ++++ b/src/libsystemd-network/sd-dhcp-client.c +@@ -68,7 +68,6 @@ struct sd_dhcp_client { + uint32_t mtu; + uint32_t xid; + usec_t start_time; +- uint16_t secs; + unsigned int attempt; + usec_t request_sent; + sd_event_source *timeout_t1; +@@ -321,10 +320,12 @@ static int client_message_init(sd_dhcp_client *client, DHCPPacket **ret, + _cleanup_free_ DHCPPacket *packet; + size_t optlen, optoffset, size; + be16_t max_size; ++ usec_t time_now; ++ uint16_t secs; + int r; + + assert(client); +- assert(client->secs); ++ assert(client->start_time); + assert(ret); + assert(_optlen); + assert(_optoffset); +@@ -344,7 +345,15 @@ static int client_message_init(sd_dhcp_client *client, DHCPPacket **ret, + + /* Although 'secs' field is a SHOULD in RFC 2131, certain DHCP servers + refuse to issue an DHCP lease if 'secs' is set to zero */ +- packet->dhcp.secs = htobe16(client->secs); ++ r = sd_event_now(client->event, clock_boottime_or_monotonic(), &time_now); ++ if (r < 0) ++ return r; ++ assert(time_now >= client->start_time); ++ ++ /* seconds between sending first and last DISCOVER ++ * must always be strictly positive to deal with broken servers */ ++ secs = ((time_now - client->start_time) / USEC_PER_SEC) ? : 1; ++ packet->dhcp.secs = htobe16(secs); + + /* RFC2132 section 4.1 + A client that cannot receive unicast IP datagrams until its protocol +@@ -441,24 +450,12 @@ static int dhcp_client_send_raw(sd_dhcp_client *client, DHCPPacket *packet, + static int client_send_discover(sd_dhcp_client *client) { + _cleanup_free_ DHCPPacket *discover = NULL; + size_t optoffset, optlen; +- usec_t time_now; + int r; + + assert(client); + assert(client->state == DHCP_STATE_INIT || + client->state == DHCP_STATE_SELECTING); + +- /* See RFC2131 section 4.4.1 */ +- +- r = sd_event_now(client->event, clock_boottime_or_monotonic(), &time_now); +- if (r < 0) +- return r; +- assert(time_now >= client->start_time); +- +- /* seconds between sending first and last DISCOVER +- * must always be strictly positive to deal with broken servers */ +- client->secs = ((time_now - client->start_time) / USEC_PER_SEC) ? : 1; +- + r = client_message_init(client, &discover, DHCP_DISCOVER, + &optlen, &optoffset); + if (r < 0) +@@ -875,10 +872,8 @@ static int client_start(sd_dhcp_client *client) { + } + client->fd = r; + +- if (client->state == DHCP_STATE_INIT) { ++ if (client->state == DHCP_STATE_INIT || client->state == DHCP_STATE_INIT_REBOOT) + client->start_time = now(clock_boottime_or_monotonic()); +- client->secs = 0; +- } + + return client_initialize_events(client, client_receive_message_raw); + } +@@ -1269,6 +1264,9 @@ static int client_handle_message(sd_dhcp_client *client, DHCPMessage *message, + if (r >= 0) { + client->timeout_resend = + sd_event_source_unref(client->timeout_resend); ++ client->receive_message = ++ sd_event_source_unref(client->receive_message); ++ client->fd = asynchronous_close(client->fd); + + if (IN_SET(client->state, DHCP_STATE_REQUESTING, + DHCP_STATE_REBOOTING)) +diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c +index 4fb01c0..b7c9a07 100644 +--- a/src/libsystemd-network/sd-dhcp-lease.c ++++ b/src/libsystemd-network/sd-dhcp-lease.c +@@ -50,7 +50,7 @@ int sd_dhcp_lease_get_address(sd_dhcp_lease *lease, struct in_addr *addr) { + + int sd_dhcp_lease_get_lifetime(sd_dhcp_lease *lease, uint32_t *lifetime) { + assert_return(lease, -EINVAL); +- assert_return(lease, -EINVAL); ++ assert_return(lifetime, -EINVAL); + + *lifetime = lease->lifetime; + +diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c +index fa4f9b5..dbec1a2 100644 +--- a/src/libsystemd-network/sd-dhcp6-client.c ++++ b/src/libsystemd-network/sd-dhcp6-client.c +@@ -200,19 +200,19 @@ int sd_dhcp6_client_set_duid(sd_dhcp6_client *client, uint16_t type, uint8_t *du + + switch (type) { + case DHCP6_DUID_LLT: +- if (duid_len <= sizeof(client->duid.llt)) ++ if (duid_len <= sizeof(client->duid.llt) - 2) + return -EINVAL; + break; + case DHCP6_DUID_EN: +- if (duid_len != sizeof(client->duid.en)) ++ if (duid_len != sizeof(client->duid.en) - 2) + return -EINVAL; + break; + case DHCP6_DUID_LL: +- if (duid_len <= sizeof(client->duid.ll)) ++ if (duid_len <= sizeof(client->duid.ll) - 2) + return -EINVAL; + break; + case DHCP6_DUID_UUID: +- if (duid_len != sizeof(client->duid.uuid)) ++ if (duid_len != sizeof(client->duid.uuid) - 2) + return -EINVAL; + break; + default: +@@ -222,7 +222,7 @@ int sd_dhcp6_client_set_duid(sd_dhcp6_client *client, uint16_t type, uint8_t *du + + client->duid.raw.type = htobe16(type); + memcpy(&client->duid.raw.data, duid, duid_len); +- client->duid_len = duid_len; ++ client->duid_len = duid_len + 2; /* +2 for sizeof(type) */ + + return 0; + } +diff --git a/src/libsystemd/sd-bus/bus-match.c b/src/libsystemd/sd-bus/bus-match.c +index 18afe0f..5658c61 100644 +--- a/src/libsystemd/sd-bus/bus-match.c ++++ b/src/libsystemd/sd-bus/bus-match.c +@@ -537,7 +537,7 @@ static int bus_match_find_compare_value( + else if (BUS_MATCH_CAN_HASH(t)) + n = hashmap_get(c->compare.children, value_str); + else { +- for (n = c->child; !value_node_same(n, t, value_u8, value_str); n = n->next) ++ for (n = c->child; n && !value_node_same(n, t, value_u8, value_str); n = n->next) + ; + } + +diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c +index 0ab1119..6c3230a 100644 +--- a/src/libsystemd/sd-bus/bus-objects.c ++++ b/src/libsystemd/sd-bus/bus-objects.c +@@ -617,6 +617,9 @@ static int property_get_set_callbacks_run( + return r; + + } else { ++ const char *signature = NULL; ++ char type = 0; ++ + if (c->vtable->type != _SD_BUS_VTABLE_WRITABLE_PROPERTY) + return sd_bus_reply_method_errorf(m, SD_BUS_ERROR_PROPERTY_READ_ONLY, "Property '%s' is not writable.", c->member); + +@@ -628,6 +631,13 @@ static int property_get_set_callbacks_run( + + c->last_iteration = bus->iteration_counter; + ++ r = sd_bus_message_peek_type(m, &type, &signature); ++ if (r < 0) ++ return r; ++ ++ if (type != 'v' || !streq(strempty(signature), strempty(c->vtable->x.property.signature))) ++ return sd_bus_reply_method_errorf(m, SD_BUS_ERROR_INVALID_ARGS, "Incorrect parameters for property '%s', expected '%s', got '%s'.", c->member, strempty(c->vtable->x.property.signature), strempty(signature)); ++ + r = sd_bus_message_enter_container(m, 'v', c->vtable->x.property.signature); + if (r < 0) + return r; +diff --git a/src/libsystemd/sd-rtnl/rtnl-message.c b/src/libsystemd/sd-rtnl/rtnl-message.c +index b501a52..740133a 100644 +--- a/src/libsystemd/sd-rtnl/rtnl-message.c ++++ b/src/libsystemd/sd-rtnl/rtnl-message.c +@@ -36,6 +36,8 @@ + #define GET_CONTAINER(m, i) ((i) < (m)->n_containers ? (struct rtattr*)((uint8_t*)(m)->hdr + (m)->container_offsets[i]) : NULL) + #define PUSH_CONTAINER(m, new) (m)->container_offsets[(m)->n_containers ++] = (uint8_t*)(new) - (uint8_t*)(m)->hdr; + ++#define RTA_TYPE(rta) ((rta)->rta_type & NLA_TYPE_MASK) ++ + static int message_new_empty(sd_rtnl *rtnl, sd_rtnl_message **ret) { + sd_rtnl_message *m; + +@@ -566,8 +568,8 @@ int sd_rtnl_message_append_string(sd_rtnl_message *m, unsigned short type, const + size = (size_t)r; + + if (size) { +- length = strnlen(data, size); +- if (length >= size) ++ length = strnlen(data, size+1); ++ if (length > size) + return -EINVAL; + } else + length = strlen(data); +@@ -1066,7 +1068,7 @@ int rtnl_message_parse(sd_rtnl_message *m, + *rta_tb_size = max + 1; + + for (; RTA_OK(rta, rt_len); rta = RTA_NEXT(rta, rt_len)) { +- type = rta->rta_type; ++ type = RTA_TYPE(rta); + + /* if the kernel is newer than the headers we used + when building, we ignore out-of-range attributes +@@ -1222,7 +1224,7 @@ int socket_read_message(sd_rtnl *rtnl) { + } + } + +- for (new_msg = rtnl->rbuffer; NLMSG_OK(new_msg, len); new_msg = NLMSG_NEXT(new_msg, len)) { ++ for (new_msg = rtnl->rbuffer; NLMSG_OK(new_msg, len) && !done; new_msg = NLMSG_NEXT(new_msg, len)) { + _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL; + const NLType *nl_type; + +@@ -1237,7 +1239,8 @@ int socket_read_message(sd_rtnl *rtnl) { + if (new_msg->nlmsg_type == NLMSG_DONE) { + /* finished reading multi-part message */ + done = true; +- break; ++ ++ continue; + } + + /* check that we support this message type */ +diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c +index 2699374..e2afcb8 100644 +--- a/src/libudev/libudev-device.c ++++ b/src/libudev/libudev-device.c +@@ -730,8 +730,13 @@ _public_ struct udev_device *udev_device_new_from_syspath(struct udev *udev, con + return NULL; + } else { + /* everything else just needs to be a directory */ +- if (stat(path, &statbuf) != 0 || !S_ISDIR(statbuf.st_mode)) ++ if (stat(path, &statbuf) != 0) + return NULL; ++ ++ if (!S_ISDIR(statbuf.st_mode)) { ++ errno = EISDIR; ++ return NULL; ++ } + } + + udev_device = udev_device_new(udev); diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index b6d9bc6..04fbe57 100644 +index b6d9bc6..759794f 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -758,7 +758,7 @@ static int mount_binds(const char *dest, +@@ -758,7 +758,7 @@ static int mount_binds(const char *dest, char **l, bool ro) { * and char devices. */ if (S_ISDIR(source_st.st_mode)) { r = mkdir_label(where, 0755); - if (r < 0) { -+ if (r < 0 && r != -EEXIST) { ++ if (r < 0 && errno != EEXIST) { log_error("Failed to create mount point %s: %s", where, strerror(-r)); - + return r; +@@ -818,7 +818,7 @@ static int mount_tmpfs(const char *dest) { + return log_oom(); + + r = mkdir_label(where, 0755); +- if (r < 0) { ++ if (r < 0 && errno != EEXIST) { + log_error("creating mount point for tmpfs %s failed: %s", where, strerror(-r)); + + return r; @@ -3073,6 +3073,7 @@ int main(int argc, char *argv[]) { goto finish; } @@ -69,8 +620,234 @@ index b6d9bc6..04fbe57 100644 } } else { char template[] = "/tmp/nspawn-root-XXXXXX"; +diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c +index 7375f77..ec8efcc 100644 +--- a/src/resolve/resolved-dns-packet.c ++++ b/src/resolve/resolved-dns-packet.c +@@ -866,7 +866,7 @@ fail: + + int dns_packet_read_name(DnsPacket *p, char **_ret, + bool allow_compression, size_t *start) { +- size_t saved_rindex, after_rindex = 0; ++ size_t saved_rindex, after_rindex = 0, jump_barrier; + _cleanup_free_ char *ret = NULL; + size_t n = 0, allocated = 0; + bool first = true; +@@ -876,6 +876,7 @@ int dns_packet_read_name(DnsPacket *p, char **_ret, + assert(_ret); + + saved_rindex = p->rindex; ++ jump_barrier = p->rindex; + + for (;;) { + uint8_t c, d; +@@ -922,7 +923,7 @@ int dns_packet_read_name(DnsPacket *p, char **_ret, + goto fail; + + ptr = (uint16_t) (c & ~0xc0) << 8 | (uint16_t) d; +- if (ptr < DNS_PACKET_HEADER_SIZE || ptr >= saved_rindex) { ++ if (ptr < DNS_PACKET_HEADER_SIZE || ptr >= jump_barrier) { + r = -EBADMSG; + goto fail; + } +@@ -930,9 +931,13 @@ int dns_packet_read_name(DnsPacket *p, char **_ret, + if (after_rindex == 0) + after_rindex = p->rindex; + ++ /* Jumps are limited to a "prior occurence" (RFC-1035 4.1.4) */ ++ jump_barrier = ptr; + p->rindex = ptr; +- } else ++ } else { ++ r = -EBADMSG; + goto fail; ++ } + } + + if (!GREEDY_REALLOC(ret, allocated, n + 1)) { +diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c +index 7d258c9..6dd4cad 100644 +--- a/src/resolve/resolved.c ++++ b/src/resolve/resolved.c +@@ -108,7 +108,7 @@ int main(int argc, char *argv[]) { + + finish: + sd_notify(false, +- "STOPPIN=1\n" ++ "STOPPING=1\n" + "STATUS=Shutting down..."); + + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; +diff --git a/src/run/run.c b/src/run/run.c +index e3b6293..dcefb5c 100644 +--- a/src/run/run.c ++++ b/src/run/run.c +@@ -573,9 +573,12 @@ int main(int argc, char* argv[]) { + if (r <= 0) + goto finish; + +- r = find_binary(argv[optind], &command); ++ r = find_binary(argv[optind], arg_transport == BUS_TRANSPORT_LOCAL, &command); + if (r < 0) { +- log_error("Failed to find executable %s: %s", argv[optind], strerror(-r)); ++ log_error("Failed to find executable %s%s: %s", ++ argv[optind], ++ arg_transport == BUS_TRANSPORT_LOCAL ? "" : " on local system", ++ strerror(-r)); + goto finish; + } + argv[optind] = command; +diff --git a/src/shared/install.c b/src/shared/install.c +index 035b44c..cab93e8 100644 +--- a/src/shared/install.c ++++ b/src/shared/install.c +@@ -1620,12 +1620,10 @@ int unit_file_enable( + STRV_FOREACH(i, files) { + UnitFileState state; + ++ /* We only want to know if this unit is masked, so we ignore ++ * errors from unit_file_get_state, deferring other checks. ++ * This allows templated units to be enabled on the fly. */ + state = unit_file_get_state(scope, root_dir, *i); +- if (state < 0) { +- log_error("Failed to get unit file state for %s: %s", *i, strerror(-state)); +- return state; +- } +- + if (state == UNIT_FILE_MASKED || state == UNIT_FILE_MASKED_RUNTIME) { + log_error("Failed to enable unit: Unit %s is masked", *i); + return -ENOTSUP; +diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c +index 8f75a8e..c800e01 100644 +--- a/src/shared/path-lookup.c ++++ b/src/shared/path-lookup.c +@@ -86,17 +86,14 @@ static char** user_dirs( + const char * const config_unit_paths[] = { + USER_CONFIG_UNIT_PATH, + "/etc/systemd/user", ++ "/etc/systemd-mutable/user", + NULL + }; + + const char * const runtime_unit_path = "/run/systemd/user"; + + const char * const data_unit_paths[] = { +- "/usr/local/lib/systemd/user", +- "/usr/local/share/systemd/user", + USER_DATA_UNIT_PATH, +- "/usr/lib/systemd/user", +- "/usr/share/systemd/user", + NULL + }; + +@@ -260,13 +257,11 @@ int lookup_paths_init( + STRV_IFNOTNULL(generator_early), + USER_CONFIG_UNIT_PATH, + "/etc/systemd/user", ++ "/etc/systemd-mutable/user", ++ "/nix/var/nix/profiles/default/lib/systemd/user", + "/run/systemd/user", + STRV_IFNOTNULL(generator), +- "/usr/local/lib/systemd/user", +- "/usr/local/share/systemd/user", + USER_DATA_UNIT_PATH, +- "/usr/lib/systemd/user", +- "/usr/share/systemd/user", + STRV_IFNOTNULL(generator_late), + NULL); + } else +@@ -276,14 +271,11 @@ int lookup_paths_init( + STRV_IFNOTNULL(generator_early), + SYSTEM_CONFIG_UNIT_PATH, + "/etc/systemd/system", ++ "/etc/systemd-mutable/system", ++ "/nix/var/nix/profiles/default/lib/systemd/system", + "/run/systemd/system", + STRV_IFNOTNULL(generator), +- "/usr/local/lib/systemd/system", + SYSTEM_DATA_UNIT_PATH, +- "/usr/lib/systemd/system", +-#ifdef HAVE_SPLIT_USR +- "/lib/systemd/system", +-#endif + STRV_IFNOTNULL(generator_late), + NULL); + +diff --git a/src/shared/path-util.c b/src/shared/path-util.c +index 67566bc..be03695 100644 +--- a/src/shared/path-util.c ++++ b/src/shared/path-util.c +@@ -563,11 +563,11 @@ int path_is_os_tree(const char *path) { + return r >= 0; + } + +-int find_binary(const char *name, char **filename) { ++int find_binary(const char *name, bool local, char **filename) { + assert(name); + + if (is_path(name)) { +- if (access(name, X_OK) < 0) ++ if (local && access(name, X_OK) < 0) + return -errno; + + if (filename) { +@@ -657,7 +657,7 @@ int fsck_exists(const char *fstype) { + + checker = strappenda("fsck.", fstype); + +- r = find_binary(checker, &p); ++ r = find_binary(checker, true, &p); + if (r < 0) + return r; + +diff --git a/src/shared/path-util.h b/src/shared/path-util.h +index 8d171a5..bd0d324 100644 +--- a/src/shared/path-util.h ++++ b/src/shared/path-util.h +@@ -55,7 +55,7 @@ int path_is_mount_point(const char *path, bool allow_symlink); + int path_is_read_only_fs(const char *path); + int path_is_os_tree(const char *path); + +-int find_binary(const char *name, char **filename); ++int find_binary(const char *name, bool local, char **filename); + + bool paths_check_timestamp(const char* const* paths, usec_t *paths_ts_usec, bool update); + +diff --git a/src/shared/virt.c b/src/shared/virt.c +index f9c4e67..f10baab 100644 +--- a/src/shared/virt.c ++++ b/src/shared/virt.c +@@ -293,8 +293,26 @@ int detect_container(const char **id) { + + r = read_one_line_file("/run/systemd/container", &m); + if (r == -ENOENT) { +- r = 0; +- goto finish; ++ ++ /* Fallback for cases where PID 1 was not ++ * systemd (for example, cases where ++ * init=/bin/sh is used. */ ++ ++ r = getenv_for_pid(1, "container", &m); ++ if (r <= 0) { ++ ++ /* If that didn't work, give up, ++ * assume no container manager. ++ * ++ * Note: This means we still cannot ++ * detect containers if init=/bin/sh ++ * is passed but privileges dropped, ++ * as /proc/1/environ is only readable ++ * with privileges. */ ++ ++ r = 0; ++ goto finish; ++ } + } + if (r < 0) + return r; diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index 28eaa6a..6292c09 100644 +index 28eaa6a..3866308 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -2651,7 +2651,7 @@ static int start_unit_one( @@ -82,6 +859,89 @@ index 28eaa6a..6292c09 100644 return log_oom(); } +@@ -6917,8 +6917,13 @@ done: + + static int halt_now(enum action a) { + +-/* Make sure C-A-D is handled by the kernel from this +- * point on... */ ++ /* The kernel will automaticall flush ATA disks and suchlike ++ * on reboot(), but the file systems need to be synce'd ++ * explicitly in advance. */ ++ sync(); ++ ++ /* Make sure C-A-D is handled by the kernel from this point ++ * on... */ + reboot(RB_ENABLE_CAD); + + switch (a) { +diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c +index 63d64b2..57264de 100644 +--- a/src/test/test-path-util.c ++++ b/src/test/test-path-util.c +@@ -85,29 +85,30 @@ static void test_path(void) { + } + } + +-static void test_find_binary(const char *self) { ++static void test_find_binary(const char *self, bool local) { + char *p; + +- assert_se(find_binary("/bin/sh", &p) == 0); ++ assert_se(find_binary("/bin/sh", local, &p) == 0); + puts(p); + assert_se(streq(p, "/bin/sh")); + free(p); + +- assert_se(find_binary(self, &p) == 0); ++ assert_se(find_binary(self, local, &p) == 0); + puts(p); + assert_se(endswith(p, "/test-path-util")); + assert_se(path_is_absolute(p)); + free(p); + +- assert_se(find_binary("sh", &p) == 0); ++ assert_se(find_binary("sh", local, &p) == 0); + puts(p); + assert_se(endswith(p, "/sh")); + assert_se(path_is_absolute(p)); + free(p); + +- assert_se(find_binary("xxxx-xxxx", &p) == -ENOENT); ++ assert_se(find_binary("xxxx-xxxx", local, &p) == -ENOENT); + +- assert_se(find_binary("/some/dir/xxxx-xxxx", &p) == -ENOENT); ++ assert_se(find_binary("/some/dir/xxxx-xxxx", local, &p) == ++ (local ? -ENOENT : 0)); + } + + static void test_prefixes(void) { +@@ -244,7 +245,8 @@ static void test_strv_resolve(void) { + + int main(int argc, char **argv) { + test_path(); +- test_find_binary(argv[0]); ++ test_find_binary(argv[0], true); ++ test_find_binary(argv[0], false); + test_prefixes(); + test_path_join(); + test_fsck_exists(); +diff --git a/src/udev/udevd.c b/src/udev/udevd.c +index 2e6c713..193702c 100644 +--- a/src/udev/udevd.c ++++ b/src/udev/udevd.c +@@ -994,9 +994,9 @@ static void kernel_cmdline_options(struct udev *udev) { + if (r < 0) + log_warning("Invalid udev.exec-delay ignored: %s", opt + 16); + } else if (startswith(opt, "udev.event-timeout=")) { +- r = safe_atou64(opt + 16, &arg_event_timeout_usec); ++ r = safe_atou64(opt + 19, &arg_event_timeout_usec); + if (r < 0) { +- log_warning("Invalid udev.event-timeout ignored: %s", opt + 16); ++ log_warning("Invalid udev.event-timeout ignored: %s", opt + 19); + break; + } + arg_event_timeout_usec *= USEC_PER_SEC; diff --git a/units/console-getty.service.m4.in b/units/console-getty.service.m4.in index 8ac51a4..cae9fb5 100644 --- a/units/console-getty.service.m4.in @@ -95,11 +955,14 @@ index 8ac51a4..cae9fb5 100644 Restart=always RestartSec=0 diff --git a/units/container-getty@.service.m4.in b/units/container-getty@.service.m4.in -index 4f7794b..bad2a9a 100644 +index 4f7794b..6dfc2e9 100644 --- a/units/container-getty@.service.m4.in +++ b/units/container-getty@.service.m4.in -@@ -16,7 +16,6 @@ Before=getty.target +@@ -14,9 +14,9 @@ After=rc-local.service + )m4_dnl + Before=getty.target IgnoreOnIsolate=yes ++ConditionPathExists=/dev/pts/%I [Service] -ExecStart=-/sbin/agetty --noclear --keep-baud pts/%I 115200,38400,9600 $TERM @@ -216,25 +1079,34 @@ index ecf3de4..7e83446 100644 ExecStop=@rootlibexecdir@/systemd-backlight save %i +X-RestartIfChanged=false diff --git a/units/systemd-journal-flush.service.in b/units/systemd-journal-flush.service.in -index 699670b..2612220 100644 +index 699670b..ba22c6d 100644 --- a/units/systemd-journal-flush.service.in +++ b/units/systemd-journal-flush.service.in -@@ -10,8 +10,9 @@ Description=Trigger Flushing of Journal to Persistent Storage +@@ -10,8 +10,10 @@ Description=Trigger Flushing of Journal to Persistent Storage Documentation=man:systemd-journald.service(8) man:journald.conf(5) DefaultDependencies=no Requires=systemd-journald.service -After=systemd-journald.service local-fs.target remote-fs.target +After=systemd-journald.service ++After=systemd-remount-fs.service Before=systemd-user-sessions.service systemd-tmpfiles-setup.service +RequiresMountsFor=/var/log/journal [Service] ExecStart=@rootbindir@/journalctl --flush diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in -index 4de38fa..4b6daea 100644 +index 4de38fa..2f23c13 100644 --- a/units/systemd-journald.service.in +++ b/units/systemd-journald.service.in -@@ -26,3 +26,8 @@ WatchdogSec=1min +@@ -14,6 +14,7 @@ After=systemd-journald.socket systemd-journald-dev-log.socket syslog.socket + Before=sysinit.target + + [Service] ++Type=notify + Sockets=systemd-journald.socket systemd-journald-dev-log.socket + ExecStart=@rootlibexecdir@/systemd-journald + Restart=always +@@ -26,3 +27,8 @@ WatchdogSec=1min # Increase the default a bit in order to allow many simultaneous # services being run since we keep one fd open per service. LimitNOFILE=16384 diff --git a/pkgs/os-specific/linux/systemd/systemd-journald-type-notify.patch b/pkgs/os-specific/linux/systemd/systemd-journald-type-notify.patch deleted file mode 100644 index 820b23fbfa28..000000000000 --- a/pkgs/os-specific/linux/systemd/systemd-journald-type-notify.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a87a38c20196a4aeb56b6ba71d688eefd0b21c30 Mon Sep 17 00:00:00 2001 -From: Michal Schmidt <mschmidt@redhat.com> -Date: Tue, 4 Nov 2014 20:28:08 +0100 -Subject: [PATCH] units: make systemd-journald.service Type=notify - -It already calls sd_notify(), so it looks like an oversight. - -Without it, its ordering to systemd-journal-flush.service is -non-deterministic and the SIGUSR1 from flushing may kill journald before -it has its signal handlers set up. - -https://bugs.freedesktop.org/show_bug.cgi?id=85871 -https://bugzilla.redhat.com/show_bug.cgi?id=1159641 ---- -(foutrelis: dropped systemd-journald-audit.socket from Sockets= in order to - apply to systemd 217) - - units/systemd-journald.service.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in -index 7ee67fd..8d380c8 100644 ---- a/units/systemd-journald.service.in -+++ b/units/systemd-journald.service.in -@@ -14,6 +14,7 @@ After=systemd-journald.socket systemd-journald-dev-log.socket systemd-journald-a - Before=sysinit.target - - [Service] -+Type=notify - Sockets=systemd-journald.socket systemd-journald-dev-log.socket - ExecStart=@rootlibexecdir@/systemd-journald - Restart=always --- -2.1.3 - diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index 5b88d4c75560..127341412abe 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sed -i '/depmod/d' Makefile export PATH=${kmod}/sbin:$PATH ''; + + patches = [ ./kernel-3.18-fix.patch ]; buildInputs = [ kmod ]; diff --git a/pkgs/os-specific/linux/v4l2loopback/kernel-3.18-fix.patch b/pkgs/os-specific/linux/v4l2loopback/kernel-3.18-fix.patch new file mode 100644 index 000000000000..9f6dc57f322a --- /dev/null +++ b/pkgs/os-specific/linux/v4l2loopback/kernel-3.18-fix.patch @@ -0,0 +1,31 @@ +From 21195cd6d1ff767a271359dfa7d201078f766611 Mon Sep 17 00:00:00 2001 +From: tatokis <tasos@tasossah.com> +Date: Mon, 24 Nov 2014 16:28:33 +0200 +Subject: [PATCH] Updated v4l2loopback.c to compile on >= 3.18 kernel + +--- + v4l2loopback.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/v4l2loopback.c b/v4l2loopback.c +index bb228bb..67f6ed4 100644 +--- a/v4l2loopback.c ++++ b/v4l2loopback.c +@@ -498,10 +498,15 @@ static ssize_t attr_store_maxopeners(struct device *cd, + { + struct v4l2_loopback_device *dev = NULL; + unsigned long curr = 0; +- ++ ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0) ++ if (kstrtoul(buf, 0, &curr)) ++ return -EINVAL; ++ #else + if (strict_strtoul(buf, 0, &curr)) + return -EINVAL; +- ++ #endif ++ + dev = v4l2loopback_cd2dev(cd); + + if (dev->max_openers == curr) diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix index 2ad3087d6a17..f7e0c5ca5e22 100644 --- a/pkgs/os-specific/linux/v86d/default.nix +++ b/pkgs/os-specific/linux/v86d/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A userspace helper that runs x86 code in an emulated environment"; homepage = http://dev.gentoo.org/~spock/projects/uvesafb/; - license = "BSD"; + license = stdenv.lib.licenses.gpl2; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/os-specific/linux/zfs/bc151f7b312dea09c6ec5b9a320e65140789643a.patch b/pkgs/os-specific/linux/zfs/bc151f7b312dea09c6ec5b9a320e65140789643a.patch new file mode 100644 index 000000000000..382c8ce63eea --- /dev/null +++ b/pkgs/os-specific/linux/zfs/bc151f7b312dea09c6ec5b9a320e65140789643a.patch @@ -0,0 +1,84 @@ +From bc151f7b312dea09c6ec5b9a320e65140789643a Mon Sep 17 00:00:00 2001 +From: Ned Bass <bass6@llnl.gov> +Date: Thu, 16 Oct 2014 13:52:56 -0700 +Subject: [PATCH] Remove checks for mandatory locks + +The Linux VFS handles mandatory locks generically so we shouldn't +need to check for conflicting locks in zfs_read(), zfs_write(), or +zfs_freesp(). Linux 3.18 removed the lock_may_read() and +lock_may_write() interfaces which we were relying on for this +purpose. Rather than emulating those interfaces we remove the +redundant checks. + +Signed-off-by: Ned Bass <bass6@llnl.gov> +Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> +Closes #2804 +--- + module/zfs/zfs_vnops.c | 18 ------------------ + module/zfs/zfs_znode.c | 10 ---------- + 2 files changed, 28 deletions(-) + +diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c +index 33f9e0e..2f55e56 100644 +--- a/module/zfs/zfs_vnops.c ++++ b/module/zfs/zfs_vnops.c +@@ -474,15 +474,6 @@ zfs_read(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr) + } + + /* +- * Check for mandatory locks +- */ +- if (mandatory_lock(ip) && +- !lock_may_read(ip, uio->uio_loffset, uio->uio_resid)) { +- ZFS_EXIT(zsb); +- return (SET_ERROR(EAGAIN)); +- } +- +- /* + * If we're in FRSYNC mode, sync out this znode before reading it. + */ + if (ioflag & FRSYNC || zsb->z_os->os_sync == ZFS_SYNC_ALWAYS) +@@ -651,15 +642,6 @@ zfs_write(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr) + } + + /* +- * Check for mandatory locks before calling zfs_range_lock() +- * in order to prevent a deadlock with locks set via fcntl(). +- */ +- if (mandatory_lock(ip) && !lock_may_write(ip, woff, n)) { +- ZFS_EXIT(zsb); +- return (SET_ERROR(EAGAIN)); +- } +- +- /* + * Pre-fault the pages to ensure slow (eg NFS) pages + * don't hold up txg. + * Skip this if uio contains loaned arc_buf. +diff --git a/module/zfs/zfs_znode.c b/module/zfs/zfs_znode.c +index 90dbfd3..f02c021 100644 +--- a/module/zfs/zfs_znode.c ++++ b/module/zfs/zfs_znode.c +@@ -1546,7 +1546,6 @@ zfs_trunc(znode_t *zp, uint64_t end) + int + zfs_freesp(znode_t *zp, uint64_t off, uint64_t len, int flag, boolean_t log) + { +- struct inode *ip = ZTOI(zp); + dmu_tx_t *tx; + zfs_sb_t *zsb = ZTOZSB(zp); + zilog_t *zilog = zsb->z_log; +@@ -1567,15 +1566,6 @@ zfs_freesp(znode_t *zp, uint64_t off, uint64_t len, int flag, boolean_t log) + goto out; + } + +- /* +- * Check for any locks in the region to be freed. +- */ +- if (ip->i_flock && mandatory_lock(ip)) { +- uint64_t length = (len ? len : zp->z_size - off); +- if (!lock_may_write(ip, off, length)) +- return (SET_ERROR(EAGAIN)); +- } +- + if (len == 0) { + error = zfs_trunc(zp, off); + } else { diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index a5b8429c03a0..3661137fc295 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchurl, kernel, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }: +{ stdenv, fetchFromGitHub, kernel, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }: -stdenv.mkDerivation { - name = "zfs-0.6.3-${kernel.version}"; +stdenv.mkDerivation rec { + name = "zfs-${version}-${kernel.version}"; + version = "0.6.3-1.2"; - src = fetchurl { - url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.3.tar.gz; - sha256 = "06rrip9fxn13x6qnyp6br68r9pcygb95lld25hnnj88m2vagvg19"; + src = fetchFromGitHub { + owner = "zfsonlinux"; + repo = "zfs"; + rev = "zfs-${version}"; + sha256 = "1iqkh08ikmsg8zi7s2pr46z9z7lshbb65pv2ihg1llwmgcm42r9r"; }; patches = [ ./mount_zfs_prefix.patch ./nix-build.patch # Remove in >=0.6.4 - ./remove-lock-checks.patch # Remove in >=0.6.4 ]; buildInputs = [ spl perl autoconf automake libtool zlib libuuid coreutils ]; diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix index e5002bbbb3f3..fde5310deed2 100644 --- a/pkgs/os-specific/linux/zfs/git.nix +++ b/pkgs/os-specific/linux/zfs/git.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1yqsfdhyzh33aisfvwqd692n5kfgnlz7yjixd2gqn8vx9bv0dz0b"; }; - patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ]; + patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ./bc151f7b312dea09c6ec5b9a320e65140789643a.patch ]; buildInputs = [ spl_git perl autoconf automake libtool zlib libuuid coreutils ]; diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 899914b6446d..8803b8134f7a 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight high-performance web server"; homepage = http://www.lighttpd.net/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix index a946672f9a7e..009b091d15f1 100644 --- a/pkgs/servers/http/nginx/unstable.nix +++ b/pkgs/servers/http/nginx/unstable.nix @@ -10,10 +10,10 @@ with stdenv.lib; let - version = "1.7.7"; + version = "1.7.8"; mainSrc = fetchurl { url = "http://nginx.org/download/nginx-${version}.tar.gz"; - sha256 = "1lmzq36ysi0hwvqpiaz0dpmwvdwbrn9aw1rm1xcabkl2g855l0by"; + sha256 = "1rg8c2z6df6flz5vz6k7iixm4f3d27svnncf810vilyk0b1mxxqj"; }; rtmp-ext = fetchFromGitHub { diff --git a/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in b/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in index 219ab9763ada..1afe8854fed1 100644 --- a/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in +++ b/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in @@ -51,7 +51,7 @@ case "$QUERY_STRING" in *.narinfo) hash=${QUERY_STRING%.narinfo} hash=${hash#/} - path="$(echo "$STORE_DIR/$hash-"* )" + path="$(echo "$STORE_DIR/$hash-"* | @coreutils@/sort | @coreutils@/head -n 1)" if [ -n "$path" ] && [ -e "$path" ]; then header info="$( diff --git a/pkgs/servers/icecast/default.nix b/pkgs/servers/icecast/default.nix index 6b8a75e6901a..4a89c5ad83b1 100644 --- a/pkgs/servers/icecast/default.nix +++ b/pkgs/servers/icecast/default.nix @@ -3,11 +3,11 @@ , libvorbis, libtheora, speex, libkate, libopus }: stdenv.mkDerivation rec { - name = "icecast-2.4.0"; + name = "icecast-2.4.1"; src = fetchurl { url = "http://downloads.xiph.org/releases/icecast/${name}.tar.gz"; - sha256 = "0chg8v3c0wkbakjcw73rsfccx13f28arrmmbz9p5fsmiw5bykdqp"; + sha256 = "0js5lylrgklhvvaksx46zc8lc975qb1bns8h1ms545nv071rxy23"; }; buildInputs = [ libxml2 libxslt curl libvorbis libtheora speex libkate libopus ]; diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 7c442bf8c7ec..8cabb8cac942 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://www.postfix.org/; + homepage = https://www.opensmtpd.org/; description = '' A free implementation of the server-side SMTP protocol as defined by RFC 5321, with some additional standard extensions diff --git a/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/pkgs/servers/monitoring/newrelic-sysmond/default.nix new file mode 100644 index 000000000000..7551bdf96692 --- /dev/null +++ b/pkgs/servers/monitoring/newrelic-sysmond/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl }: + +assert stdenv.system == "x86_64-linux"; + +stdenv.mkDerivation rec { + name = "newrelic-sysmond-1.5.1.93"; + + src = fetchurl { + url = "http://download.newrelic.com/server_monitor/release/newrelic-sysmond-1.5.1.93-linux.tar.gz"; + + sha256 = "1bfwyczcf7pvji8lx566jxgy8dhyf1gmqmi64lj10673a86axnwz"; + }; + + installPhase = '' + mkdir -p $out/bin + install -v -m755 daemon/nrsysmond.x64 $out/bin/nrsysmond + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + $out/bin/nrsysmond + ''; + + meta = { + homepage = http://newrelic.com/; + + description = "System-wide monitoring for newrelic"; + + license = stdenv.lib.licenses.unfree; + + maintainers = [ stdenv.lib.maintainers.shlevy ]; + }; +} diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index ca4df9ce340a..47f1b7a867b0 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -2,11 +2,11 @@ let - version = "1.8.21"; + version = "1.8.22"; src = fetchurl { url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz"; - sha256 = "1ssqi31blkl1lyv9vjrsrrn494grdng187s8xwfv79adk2w94paw"; + sha256 = "0cjj3c4j4b9sl3hgh1fck330z9q0gz2k68g227y0paal6k6f54g7"; }; preConfigure = diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 6c5f6b0ca4fa..4b1e8569cd91 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -25,13 +25,13 @@ let opt = stdenv.lib.optional; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; major = "0.19"; - minor = "5"; + minor = "6"; in stdenv.mkDerivation rec { name = "mpd-${major}.${minor}"; src = fetchurl { url = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.gz"; - sha256 = "09rhppfspzhx7jjz3rv8b71gasrkg6i9l25xm94l9sf36jgd2m33"; + sha256 = "023h2d9x4yg1z2glnwf8h2j0p1xhn1hb0wf02mg70j3p0bz63imj"; }; buildInputs = [ pkgconfig glib boost ] diff --git a/pkgs/servers/nosql/hyperdex/busybee.nix b/pkgs/servers/nosql/hyperdex/busybee.nix new file mode 100644 index 000000000000..19482db6f5a6 --- /dev/null +++ b/pkgs/servers/nosql/hyperdex/busybee.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, unzip, autoconf, automake, libtool, + libpo6, libe, pkgconfig }: + +stdenv.mkDerivation rec { + name = "busybee-${version}"; + version = "0.5.2"; + + src = fetchurl { + url = "https://github.com/rescrv/busybee/archive/releases/${version}.zip"; + sha256 = "0gr5h2j9rzwarblgcgddnxj39i282rvgn9vqlrcd60dx8c4dkm29"; + }; + buildInputs = [ + autoconf + automake + libe + libpo6 + libtool + pkgconfig + unzip + ]; + preConfigure = "autoreconf -i"; + + meta = with stdenv.lib; { + description = "BusyBee is a high-performance messaging layer."; + homepage = https://github.com/rescrv/busybee; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/hyperdex/default.nix b/pkgs/servers/nosql/hyperdex/default.nix new file mode 100644 index 000000000000..036a3412b864 --- /dev/null +++ b/pkgs/servers/nosql/hyperdex/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchurl, makeWrapper, unzip, autoconf, automake, libtool, + python, sodium, pkgconfig, popt, glog, xz, json_c, gperf, yacc, + flex, haskellPackages, help2man, autoconf-archive, callPackage }: + +assert stdenv.isLinux; + +let +hyperleveldb = callPackage ./hyperleveldb.nix {}; +libpo6 = callPackage ./libpo6.nix {}; +libe = callPackage ./libe.nix { inherit libpo6; }; +busybee = callPackage ./busybee.nix { inherit libpo6 libe; }; +replicant = callPackage ./replicant.nix { + inherit libpo6 libe busybee hyperleveldb; +}; +libmacaroons = callPackage ./libmacaroons.nix { }; + +in +stdenv.mkDerivation rec { + name = "hyperdex-${version}"; + version = "1.5.0"; + + src = fetchurl { + url = "https://github.com/rescrv/HyperDex/archive/releases/${version}.zip"; + sha256 = "0s1capy2hj45f5rmdb4fk0wxy7vz69krplhba57f6wrkpcz1zb57"; + }; + + buildInputs = [ + autoconf + autoconf-archive + automake + busybee + glog + hyperleveldb + json_c + libe + libmacaroons + libpo6 + libtool + pkgconfig + popt + python + replicant + unzip + gperf + yacc + flex + help2man + haskellPackages.pandoc + ]; + preConfigure = "autoreconf -fi"; + + meta = with stdenv.lib; { + description = "HyperDex is a scalable, searchable key-value store"; + homepage = http://hyperdex.org; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/hyperdex/hyperleveldb.nix b/pkgs/servers/nosql/hyperdex/hyperleveldb.nix new file mode 100644 index 000000000000..c39f618f6cb1 --- /dev/null +++ b/pkgs/servers/nosql/hyperdex/hyperleveldb.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, unzip, autoconf, automake, libtool }: + +stdenv.mkDerivation rec { + name = "hyperleveldb-${version}"; + version = "1.2.1"; + + src = fetchurl { + url = "https://github.com/rescrv/HyperLevelDB/archive/releases/${version}.zip"; + sha256 = "0xrzhwkrm7f2wz3jn4iqn1dim2pmgjhmpb1fy23fwa06v0q18hw8"; + }; + buildInputs = [ unzip autoconf automake libtool ]; + preConfigure = "autoreconf -i"; + + meta = with stdenv.lib; { + description = ''A fork of LevelDB intended to meet the needs of + HyperDex while remaining compatible with LevelDB.''; + homepage = https://github.com/rescrv/HyperLevelDB; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/hyperdex/libe.nix b/pkgs/servers/nosql/hyperdex/libe.nix new file mode 100644 index 000000000000..cc5232e13f22 --- /dev/null +++ b/pkgs/servers/nosql/hyperdex/libe.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, unzip, autoconf, automake, libtool, libpo6, pkgconfig }: + +stdenv.mkDerivation rec { + name = "libe-${version}"; + version = "0.8.1"; + + src = fetchurl { + url = "https://github.com/rescrv/e/archive/releases/0.8.1.zip"; + sha256 = "1l13axsi52j2qaxbdnszdvfxksi7rwm2j1rrf0nlh990m6a3yg3s"; + }; + buildInputs = [ unzip autoconf automake libtool libpo6 pkgconfig ]; + preConfigure = "autoreconf -i"; + + meta = with stdenv.lib; { + description = "Library containing high-performance datastructures and utilities for C++"; + homepage = https://github.com/rescrv/e; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/hyperdex/libmacaroons.nix b/pkgs/servers/nosql/hyperdex/libmacaroons.nix new file mode 100644 index 000000000000..2d709c5bbd1d --- /dev/null +++ b/pkgs/servers/nosql/hyperdex/libmacaroons.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, unzip, autoconf, automake, libtool, + pkgconfig, sodium, python }: +stdenv.mkDerivation rec { + name = "libmacaroons-${version}"; + version = "HEAD"; + + src = fetchurl { + url = "https://github.com/rescrv/libmacaroons/archive/6febf3ce6c4c77a46d24b40ed29b03ffbfb175a7.zip"; + sha256 = "0b4qgim87398chvc3qhxfqv2l1cyl65rhyknln8lk0gq9y00p1ik"; + }; + buildInputs = [ unzip autoconf automake libtool python sodium pkgconfig ]; + preConfigure = "autoreconf -i"; + + meta = with stdenv.lib; { + description = ''Macaroons are flexible authorization credentials that + support decentralized delegation, attenuation, and verification.''; + homepage = https://github.com/rescrv/libmacaroons; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/hyperdex/libpo6.nix b/pkgs/servers/nosql/hyperdex/libpo6.nix new file mode 100644 index 000000000000..166a5e21c6b9 --- /dev/null +++ b/pkgs/servers/nosql/hyperdex/libpo6.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, unzip, autoconf, automake, libtool }: + +stdenv.mkDerivation rec { + name = "libpo6-${version}"; + version = "0.5.2"; + + src = fetchurl { + url = "https://github.com/rescrv/po6/archive/releases/${version}.zip"; + sha256 = "14g3ichshnc4wd0iq3q3ymgaq84gjsbqcyn6lri7c7djgkhqijjx"; + }; + buildInputs = [ unzip autoconf automake libtool ]; + preConfigure = "autoreconf -i"; + + meta = with stdenv.lib; { + description = "POSIX wrappers for C++"; + homepage = https://github.com/rescrv/po6; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/hyperdex/replicant.nix b/pkgs/servers/nosql/hyperdex/replicant.nix new file mode 100644 index 000000000000..c064aa419cde --- /dev/null +++ b/pkgs/servers/nosql/hyperdex/replicant.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, unzip, autoconf, automake, libtool, glog, + hyperleveldb, libe, pkgconfig, popt, libpo6, busybee }: + +stdenv.mkDerivation rec { + name = "replicant-${version}"; + version = "0.5.2"; + + src = fetchurl { + url = "https://github.com/rescrv/Replicant/archive/releases/0.6.3.zip"; + sha256 = "1fbagz0nbvinkqr5iw5y187dm4klkswrxnl5ysq8waglg2nj8zzi"; + }; + buildInputs = [ + autoconf + automake + busybee + glog + hyperleveldb + libe + libpo6 + libtool + pkgconfig + popt + unzip + ]; + preConfigure = "autoreconf -i"; + + meta = with stdenv.lib; { + description = "A system for maintaining replicated state machines."; + homepage = https://github.com/rescrv/Replicant; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 02cdc02cd4d8..62ea55d00c12 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; -let version = "2.6.5"; +let version = "2.6.6"; system-libraries = [ "pcre" "boost" @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz"; - sha256 = "0v58kyp4cj4yag0djnswfiifrcll5y7x772y99b3afg89xicpmjm"; + sha256 = "0shb069xsqyslazdq66smr7ifppvdclbzpdjhrj2y3qb78y70pbm"; }; nativeBuildInputs = [ scons ]; diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index e733ef3d009e..b9c2e83d5828 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://redis.io; description = "An open source, advanced key-value store"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; platforms = platforms.unix; maintainers = [ maintainers.berdario ]; }; diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index 4f4ec5cbc069..5c1b2c16c6d6 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -2,6 +2,7 @@ kernel, glibc, ncurses, perl, krb5 }: assert stdenv.isLinux; +assert builtins.substring 0 4 kernel.version != "3.18"; stdenv.mkDerivation { name = "openafs-1.6.9-${kernel.version}"; diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index 8d8a677647c2..31be5eef7c8c 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "ONC RPC portmapper"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; longDescription = '' Universal addresses to RPC program number mapper. ''; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index c0548f07dd33..3c36b1aad6ba 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mariadb-${version}"; - version = "10.0.14"; + version = "10.0.15"; src = fetchurl { url = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz"; - sha256 = "07g3w841q8qw0mwi6grk65a2iky9x3axpxkb4c2a72i7pd7cl3mc"; + sha256 = "1n09553brmprs9m6siwjc1ca4b9b1giqasv3mhdrnijda1lcnm4i"; }; buildInputs = [ cmake ncurses openssl bison boost libxml2 judy libevent groff ] diff --git a/pkgs/servers/sql/mysql/5.1.x.nix b/pkgs/servers/sql/mysql/5.1.x.nix index b422b9938320..3389f8114896 100644 --- a/pkgs/servers/sql/mysql/5.1.x.nix +++ b/pkgs/servers/sql/mysql/5.1.x.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "mysql-5.1.73"; src = fetchurl { - url = "http://cdn.mysql.com/Downloads/MySQL-5.1/${name}.tar.gz"; + url = "mirror://mysql/MySQL-5.1/${name}.tar.gz"; sha256 = "1dfwi4ck0vq6sdci6gz0031s7zz5lc3pddqlgm0292s00l9y5sq5"; }; diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 5c57ae87d202..64fbabb08001 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "5.5.40"; src = fetchurl { - url = "http://mysql.mirrors.pair.com/Downloads/MySQL-5.5/${name}.tar.gz"; + url = "mirror://mysql/MySQL-5.5/${name}.tar.gz"; sha256 = "0q29nzmmxm78b89qjfzgm93r0glaam3xw3zfx1k8ihii39v22dsd"; }; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 8e4566d906d4..4fe6354fd33d 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1561,8 +1561,8 @@ let url = mirror://xorg/individual/driver/xf86-video-intel-2.99.916.tar.bz2; sha256 = "00gd3v3xgrmj8aliwjxkml13gfqvcbjazb6l5m1wkry39agq36j0"; }; - buildInputs = [pkgconfig dri2proto dri3proto fontsproto glamoregl libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXvMC ]; - }) // {inherit dri2proto dri3proto fontsproto glamoregl libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXvMC ;}; + buildInputs = [pkgconfig dri2proto dri3proto fontsproto glamoregl libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; + }) // {inherit dri2proto dri3proto fontsproto glamoregl libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;}; xf86videomach64 = (mkDerivation "xf86videomach64" { name = "xf86-video-mach64-6.9.4"; @@ -1985,14 +1985,14 @@ let }) // {inherit ;}; xorgserver = (mkDerivation "xorgserver" { - name = "xorg-server-1.16.2"; + name = "xorg-server-1.16.2.901"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.16.2.tar.bz2; - sha256 = "0r6fhyvlifmg4zw9gm0pf4qybwbkmslhn060ivbwwsjmplz0qvj4"; + url = mirror://xorg/individual/xserver/xorg-server-1.16.2.901.tar.bz2; + sha256 = "19jb8v26wc332ramwjdg5vjh3s36kr7n46s6fdfaxrj1wif5m27g"; }; - buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ]; - }) // {inherit renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ;}; + buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ]; + }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ;}; xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" { name = "xorg-sgml-doctools-1.11"; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 9c6618d3b105..7b2c20e05eb6 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -36,6 +36,8 @@ $pcMap{"libudev"} = "udev"; $pcMap{"gl"} = "mesa"; $pcMap{"\$PIXMAN"} = "pixman"; $pcMap{"\$RENDERPROTO"} = "renderproto"; +$pcMap{"\$DRI3PROTO"} = "dri3proto"; +$pcMap{"\$DRI2PROTO"} = "dri2proto"; my $downloadCache = "./download-cache"; @@ -207,6 +209,7 @@ while (<>) { process \@requires, $1 while $file =~ /XDMCP_MODULES=\"(.*)\"/g; process \@requires, $1 while $file =~ /XORG_MODULES=\"(.*)\"/g; process \@requires, $1 while $file =~ /NEEDED=\"(.*)\"/g; + process \@requires, $1 while $file =~ /ivo_requires=\"(.*)\"/g; process \@requires, $1 while $file =~ /XORG_DRIVER_CHECK_EXT\([^,]*,([^\)]*)\)/g; push @requires, "libxslt" if $pkg =~ /libxcb/; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index a95d88186515..45122780cddf 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -266,7 +266,7 @@ in recordproto libXext pixman libXfont damageproto xcmiscproto bigreqsproto libpciaccess inputproto xextproto randrproto renderproto presentproto - dri2proto kbproto xineramaproto resourceproto scrnsaverproto videoproto + dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto ]; commonPatches = [ ./xorgserver-xkbcomp-path.patch ]; # XQuartz requires two compilations: the first to get X / XQuartz, diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 746880171528..0630488dcfac 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -171,7 +171,7 @@ mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.16.2.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.16.2.901.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix index b101e25f5744..09b2d30ea7ca 100644 --- a/pkgs/shells/ipython/default.nix +++ b/pkgs/shells/ipython/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages, pyqt4 ? null, sip ? null +{ stdenv, fetchurl, buildPythonPackage, pythonPackages, pyqt4 ? null , notebookSupport ? true # ipython notebook , qtconsoleSupport ? true # ipython qtconsole , pylabSupport ? true # ipython --pylab (backend: agg - no gui, just file) @@ -10,7 +10,7 @@ # pyqt4 for both. assert qtconsoleSupport == true -> pyqt4 != null; -assert pylabQtSupport == true -> pyqt4 != null && sip != null; +assert pylabQtSupport == true -> pyqt4 != null; buildPythonPackage rec { name = "ipython-2.3.1"; @@ -37,7 +37,6 @@ buildPythonPackage rec { ] ++ stdenv.lib.optionals pylabQtSupport [ pythonPackages.matplotlib pyqt4 - sip ]; doCheck = false; @@ -45,7 +44,7 @@ buildPythonPackage rec { meta = { homepage = http://ipython.scipy.org/; description = "An interactive computing environment for Python"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; longDescription = '' The goal of IPython is to create a comprehensive environment for interactive and exploratory computing. It consists of an diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix index f457d25fe1b9..684713bebb1a 100644 --- a/pkgs/tools/X11/primus/default.nix +++ b/pkgs/tools/X11/primus/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/amonakov/primus; description = "Faster OpenGL offloading for Bumblebee"; - maintainer = maintainers.coconnor; + maintainers = maintainers.coconnor; }; } diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix index 9224c3b2d9cd..2eeb61dfaf4c 100644 --- a/pkgs/tools/X11/xdotool/default.nix +++ b/pkgs/tools/X11/xdotool/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.semicomplete.com/projects/xdotool/; description = "Fake keyboard/mouse input, window management, and more"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix index 2f3a1b974878..0bfa81cb9478 100644 --- a/pkgs/tools/archivers/cpio/default.nix +++ b/pkgs/tools/archivers/cpio/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation { name = "cpio-2.11"; @@ -8,7 +8,15 @@ stdenv.mkDerivation { sha256 = "bb820bfd96e74fc6ce43104f06fe733178517e7f5d1cdee553773e8eff7d5bbd"; }; - patches = [ ./no-gets.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-fix.patch; + patches = [ + ./no-gets.patch + (fetchpatch { + name = "CVE-2014-9112.diff"; + url = "http://pkgs.fedoraproject.org/cgit/cpio.git/plain/cpio-2.11" + + "-CVE-2014-9112.patch?h=f21&id=b475b4d6f31c95e073edc95c742a33a39ef4ec95"; + sha256 = "0c9yrysvpwbmiq7ph84dk6mv46hddiyvkgya1zsmj76n9ypb1b4i"; + }) + ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-fix.patch; meta = { homepage = http://www.gnu.org/software/cpio/; diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 1ed5866a6920..f1338e9ecb5f 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="655"; + version="660"; name="${baseName}-${version}"; - hash="09wjss6vbziwvfmcngb64xd2yih79z1ypgrn4ni7ag8cifx9257c"; - url="http://mattmahoney.net/dc/zpaq655.zip"; - sha256="09wjss6vbziwvfmcngb64xd2yih79z1ypgrn4ni7ag8cifx9257c"; + hash="1p6b56zf676bkfc20lxhjh9bsgh92z6bln7b0kxibh8s8aa7vzjq"; + url="http://mattmahoney.net/dc/zpaq660.zip"; + sha256="1p6b56zf676bkfc20lxhjh9bsgh92z6bln7b0kxibh8s8aa7vzjq"; }; buildInputs = [ unzip @@ -29,14 +29,14 @@ stdenv.mkDerivation { }; sourceRoot = "."; buildPhase = '' - g++ -shared -O3 libzpaq.cpp ${compileFlags} -o libzpaq.so - g++ -O3 -L. -L"$out/lib" -lzpaq divsufsort.c zpaq.cpp -o zpaq + g++ -O3 -march=native -Dunix libzpaq.cpp -pthread --shared -o libzpaq.so -fPIC + g++ -O3 -march=native -Dunix zpaq.cpp -lzpaq -L. -L"$out/lib" -pthread -o zpaq ''; installPhase = '' mkdir -p "$out"/{bin,include,lib,share/doc/zpaq} cp libzpaq.so "$out/lib" cp zpaq "$out/bin" - cp libzpaq.h divsufsort.h "$out/include" + cp libzpaq.h "$out/include" cp readme.txt "$out/share/doc/zpaq" ''; meta = { diff --git a/pkgs/tools/backup/attic/default.nix b/pkgs/tools/backup/attic/default.nix new file mode 100644 index 000000000000..99190021e23c --- /dev/null +++ b/pkgs/tools/backup/attic/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchzip, python3Packages, openssl, acl }: + +python3Packages.buildPythonPackage rec { + name = "attic-0.14"; + namePrefix = ""; + + src = fetchzip { + url = "https://github.com/jborg/attic/archive/0.14.tar.gz"; + sha256 = "17y7kihykaf84sy9cm00fn4wcc7rnhv2792kcwplylz7dsm7ksiw"; + }; + + propagatedBuildInputs = with python3Packages; + [ cython msgpack openssl acl ]; + + preConfigure = '' + export ATTIC_OPENSSL_PREFIX="${openssl}" + ''; + + meta = with stdenv.lib; { + description = "A deduplication backup program"; + homepage = "https://attic-backup.org"; + license = licenses.bsd3; + maintainers = [ maintainers.wscott ]; + platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage + }; +} diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 5ac59327c4b1..ed94d8037fdf 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -9,12 +9,12 @@ assert sqlite != null || postgresql != null || mysql != null; with stdenv.lib; stdenv.mkDerivation rec { name = "bareos-${version}"; - version = "14.2.1"; + version = "14.2.2"; src = fetchgit { url = "git://github.com/bareos/bareos"; rev = "refs/tags/Release/${version}"; - sha256 = "0m7v1szi45m71zjhj3inn5hh9f4529slhiihm88rfw8006aqb6ly"; + sha256 = "05mkhhgnkz6y3m5msf1zq3b63k2l2fci9xg0k9347b3shmg61pqd"; }; buildInputs = [ diff --git a/pkgs/tools/filesystems/btrfsprogs/3.16.nix b/pkgs/tools/filesystems/btrfsprogs/3.16.nix deleted file mode 100644 index e1d4b8bd31cf..000000000000 --- a/pkgs/tools/filesystems/btrfsprogs/3.16.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, attr, acl, zlib, libuuid, e2fsprogs, lzo -, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: - -let version = "3.16"; in - -stdenv.mkDerivation rec { - name = "btrfs-progs-${version}"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "0phbrgipl04q8cdj9nnshik7b6p2bg51jxb3l1gvfc04dkgm2xls"; - }; - - buildInputs = [ - attr acl zlib libuuid e2fsprogs lzo - asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt - ]; - - # for btrfs to get the rpath to libgcc_s, needed for pthread_cancel to work - NIX_CFLAGS_LINK = "-lgcc_s"; - - makeFlags = "prefix=$(out)"; - - meta = with stdenv.lib; { - description = "Utilities for the btrfs filesystem"; - homepage = https://btrfs.wiki.kernel.org/; - license = licenses.gpl2; - maintainers = with maintainers; [ raskin wkennington ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index 2fa815102439..0a07ad8c1540 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, attr, acl, zlib, libuuid, e2fsprogs, lzo , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "3.17.2"; in +let version = "3.17.3"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "1ijn8kd13hliqph9vijfl9zzvnkb6d6i7fqggbiwjvhslhjcgv2h"; + sha256 = "0b5cvp8qk569r73003s2wisws6s8zlbmq9d1sdrmjlavv7w9zgg7"; }; buildInputs = [ diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index f316c8343165..93352e4d129a 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { name="ceph-${version}"; - version="0.89"; + version="0.90"; src = fetchgit { url = "git://github.com/ceph/ceph.git"; rev = "refs/tags/v${version}"; - sha256 = "1ky1j8qb2nz3qzlhdcb6ppdjx7wb3icq7n0l5mm9x3q2ijbwvhlz"; + sha256 = "17w06qw38cxmin30ssz981hkkpnh5kp7f8xpnwga7rb7fhi8w6ia"; }; patches = [ diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix new file mode 100644 index 000000000000..3e483a293649 --- /dev/null +++ b/pkgs/tools/filesystems/fatsort/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, help2man}: + +stdenv.mkDerivation { + name = "fatsort"; + src = fetchurl { + url = mirror://sourceforge/fatsort/fatsort-1.3.365.tar.gz; + sha256 = "0g9zn2ns86g7zmy0y8hw1w1zhnd51hy8yl6kflyhxs49n5sc7b3p"; + }; + + patches = [ ./fatsort-Makefiles.patch ]; + + buildInputs = [ help2man ]; + + meta = { + homepage = http://fatsort.sourceforge.net/; + description = "Sorts FAT partition table, for devices that don't do sorting of files."; + maintainers = [ stdenv.lib.maintainers.kovirobi ]; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch b/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch new file mode 100644 index 000000000000..9c9f58e97ab4 --- /dev/null +++ b/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch @@ -0,0 +1,31 @@ +diff -uNr fatsort-1.3.365-a/Makefile fatsort-1.3.365-b/Makefile +--- fatsort-1.3.365-a/Makefile 2014-04-08 19:19:36.000000000 +0100 ++++ fatsort-1.3.365-b/Makefile 2014-12-14 18:31:55.982857720 +0000 +@@ -1,4 +1,5 @@ +-MANDIR=/usr/local/share/man/man1 ++PREFIX=$(out) ++MANDIR=$(PREFIX)/share/man/man1 + + INSTALL_FLAGS=-m 0755 -p -D + +diff -uNr fatsort-1.3.365-a/src/Makefile fatsort-1.3.365-b/src/Makefile +--- fatsort-1.3.365-a/src/Makefile 2014-04-08 19:19:36.000000000 +0100 ++++ fatsort-1.3.365-b/src/Makefile 2014-12-14 18:32:08.282870461 +0000 +@@ -1,3 +1,5 @@ ++PREFIX=$(out) ++ + CC=gcc + LD=gcc + +@@ -33,9 +35,9 @@ + + # Mac OS X does not have a "/usr/local/sbin" + ifeq ($(UNAME),Darwin) +-SBINDIR=/usr/local/bin ++SBINDIR=$(PREFIX)/bin + else +-SBINDIR=/usr/local/sbin ++SBINDIR=$(PREFIX)/sbin + endif + + OBJ=fatsort.o FAT_fs.o fileio.o endianness.o signal.o entrylist.o errors.o options.o clusterchain.o sort.o misc.o natstrcmp.o stringlist.o diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index a101958d8284..28f14a9fe78e 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -4,11 +4,11 @@ let s = # Generated upstream information rec { baseName="glusterfs"; - version="3.6.0"; + version="3.6.1"; name="${baseName}-${version}"; - hash="1c4lscqc5kvn5yj5pspvml59n1czspfqqdwhz73hbjd5lbqak9ml"; - url="http://download.gluster.org/pub/gluster/glusterfs/3.6/3.6.0/glusterfs-3.6.0.tar.gz"; - sha256="1c4lscqc5kvn5yj5pspvml59n1czspfqqdwhz73hbjd5lbqak9ml"; + hash="1p16h5l3bg463l2zhw0rrbfdbkjnykssjmpwzlplsbq38aqqzcnh"; + url="http://download.gluster.org/pub/gluster/glusterfs/3.6/3.6.1/glusterfs-3.6.1.tar.gz"; + sha256="1p16h5l3bg463l2zhw0rrbfdbkjnykssjmpwzlplsbq38aqqzcnh"; }; buildInputs = [ fuse bison flex_2_5_35 openssl python ncurses readline @@ -19,12 +19,17 @@ stdenv.mkDerivation rec { inherit (s) name version; inherit buildInputs; + preConfigure = '' ./autogen.sh ''; + configureFlags = [ - ''--with-mountutildir="$out/sbin"'' + ''--with-mountutildir="$out/sbin" --localstatedir=/var'' ]; + + makeFlags = "DESTDIR=$(out)"; + preInstall = '' substituteInPlace api/examples/Makefile --replace '$(DESTDIR)' $out substituteInPlace geo-replication/syncdaemon/Makefile --replace '$(DESTDIR)' $out @@ -32,6 +37,12 @@ rec { substituteInPlace xlators/features/glupy/examples/Makefile --replace '$(DESTDIR)' $out substituteInPlace xlators/features/glupy/src/Makefile --replace '$(DESTDIR)' $out ''; + + postInstall = '' + cp -r $out/$out/* $out + rm -r $out/nix + ''; + src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix new file mode 100644 index 000000000000..01d2f86a3a91 --- /dev/null +++ b/pkgs/tools/filesystems/tmsu/default.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchgit, fetchFromGitHub, go, fuse }: + +stdenv.mkDerivation rec { + name = "tmsu-${version}"; + version = "0.4.3"; + + go-sqlite3 = fetchgit { + url = "git://github.com/mattn/go-sqlite3"; + rev = "c9a0db5d8951646743317f0756da0339fe144dd5"; + sha256 = "0j01nr3q89qs9n9zzp8gsr94hl9v0gnis6hmndl9ms554bhlv99p"; + }; + + go-fuse = fetchgit { + url = "git://github.com/hanwen/go-fuse"; + rev = "8c85ded140ac1889372a0e22d8d21e3d10a303bd"; + sha256 = "1kssndvrbcxvf85x6c6lgn5kpcl7d788z3sxrv1szik4acb6n2sa"; + }; + + src = fetchFromGitHub { + owner = "oniony"; + repo = "tmsu"; + rev = "v${version}"; + sha256 = "1jwmzqn3rd59malkp7ypjphd863afablhfsdxjnlap7zx72zb3dn"; + }; + + buildInputs = [ go fuse ]; + + preBuild = '' + mkdir -p src/github.com/mattn/go-sqlite3/ + ln -s ${go-sqlite3}/* src/github.com/mattn/go-sqlite3 + + mkdir -p src/github.com/hanwen/go-fuse + ln -s ${go-fuse}/* src/github.com/hanwen/go-fuse + + mkdir -p src/github.com/oniony/tmsu + ln -s ${src}/* src/github.com/oniony/tmsu + + export GOPATH=$PWD + ''; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/sbin + mkdir -p $out/share/man + mkdir -p $out/share/zsh/site-functions + make install INSTALL_DIR=$out/bin \ + MOUNT_INSTALL_DIR=$out/sbin \ + MAN_INSTALL_DIR=$out/share/man \ + ZSH_COMP_INSTALL_DIR=$out/share/zsh/site-functions + ''; + + meta = with stdenv.lib; { + homepage = http://www.tmsu.org; + description = "A tool for tagging your files using a virtual filesystem"; + maintainers = with maintainers; [ pSub ]; + license = licenses.gpl3; + platforms = platforms.all; + }; +} \ No newline at end of file diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index 019f2178204f..c01fc6ff4b32 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, gettext, libuuid, readline }: stdenv.mkDerivation rec { - name = "xfsprogs-3.2.1"; + name = "xfsprogs-3.2.2"; src = fetchurl { urls = map (dir: "ftp://oss.sgi.com/projects/xfs/${dir}/${name}.tar.gz") [ "cmd_tars" "previous" ]; - sha256 = "0rsp31qrz0wskr70dwzl5ignkac7j98j7m9cy6wl57zy716fmy43"; + sha256 = "1aszsqz7gkqdagads18ybslbfkyxq893rykmsz9lm7f33pi5qlhs"; }; prePatch = '' @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { ''; patches = [ - # This patch fixes shared libs installation, still not fixed in 3.2.1 - ./xfsprogs-3.1.11-sharelibs.patch + # This patch fixes shared libs installation, still not fixed in 3.2.2 + ./xfsprogs-3.2.2-sharedlibs.patch ]; buildInputs = [ gettext libuuid readline ]; diff --git a/pkgs/tools/filesystems/xfsprogs/xfsprogs-3.1.11-sharelibs.patch b/pkgs/tools/filesystems/xfsprogs/xfsprogs-3.2.2-sharedlibs.patch index 38599bd651fa..118874a5e998 100644 --- a/pkgs/tools/filesystems/xfsprogs/xfsprogs-3.1.11-sharelibs.patch +++ b/pkgs/tools/filesystems/xfsprogs/xfsprogs-3.2.2-sharedlibs.patch @@ -2,9 +2,33 @@ use libtool to do all installing. do not use the manual file install as that'll copy files directly from the .libs/ subdir which might have rpaths that we do not want. ---- a/libdisk/Makefile -+++ b/libdisk/Makefile -@@ -25,6 +25,7 @@ +--- xfsprogs-3.2.2/include/buildmacros ++++ xfsprogs-3.2.2/include/buildmacros +@@ -70,18 +70,9 @@ + # /usr/lib. + ifeq ($(ENABLE_SHARED),yes) + INSTALL_LTLIB_DEV = \ +- cd $(TOPDIR)/$(LIBNAME)/.libs; \ +- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ +- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \ +- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \ +- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \ +- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \ +- if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \ +- "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))"; ]; then \ +- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \ +- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \ +- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \ +- fi ++ set -e; cd $(TOPDIR)/$(LIBNAME); \ ++ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ ++ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la + else + INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) + endif +--- xfsprogs-3.2.2/libdisk/Makefile ++++ xfsprogs-3.2.2/libdisk/Makefile +@@ -31,6 +31,7 @@ install: default install-dev: default @@ -12,8 +36,8 @@ that we do not want. install-qa: install-dev ---- a/libhandle/Makefile -+++ b/libhandle/Makefile +--- xfsprogs-3.2.2/libhandle/Makefile ++++ xfsprogs-3.2.2/libhandle/Makefile @@ -20,7 +20,6 @@ include $(BUILDRULES) @@ -22,32 +46,33 @@ that we do not want. install-dev: default $(INSTALL_LTLIB_DEV) ---- a/libxcmd/Makefile -+++ b/libxcmd/Makefile -@@ -32,6 +32,11 @@ +--- xfsprogs-3.2.2/libxcmd/Makefile ++++ xfsprogs-3.2.2/libxcmd/Makefile +@@ -34,6 +34,11 @@ include $(BUILDRULES) -install install-dev install-qa: default +install: default + -+install-dev: default ++ install-dev: default + $(INSTALL_LTLIB_DEV) + +install-qa: default - -include .dep ---- a/libxfs/Makefile -+++ b/libxfs/Makefile -@@ -41,5 +41,6 @@ + -include .ltdep +--- xfsprogs-3.2.2/libxfs/Makefile ++++ xfsprogs-3.2.2/libxfs/Makefile +@@ -86,6 +86,7 @@ install: default install-dev: default + $(INSTALL_LTLIB_DEV) install-qa: default ---- a/libxlog/Makefile -+++ b/libxlog/Makefile + +--- xfsprogs-3.2.2/libxlog/Makefile ++++ xfsprogs-3.2.2/libxlog/Makefile @@ -12,6 +12,8 @@ CFILES = xfs_log_recover.c util.c @@ -69,10 +94,10 @@ that we do not want. + +install-qa: default - -include .dep ---- a/Makefile -+++ b/Makefile -@@ -66,6 +66,8 @@ + -include .ltdep +--- xfsprogs-3.2.2/Makefile ++++ xfsprogs-3.2.2/Makefile +@@ -63,6 +63,8 @@ mkfs: libxfs quota: libxcmd repair: libxfs libxlog @@ -81,26 +106,3 @@ that we do not want. ifneq ($(ENABLE_BLKID), yes) mkfs: libdisk ---- a/include/buildmacros -+++ b/include/buildmacros -@@ -71,17 +71,9 @@ - # /usr/lib. - ifeq ($(ENABLE_SHARED),yes) - INSTALL_LTLIB_DEV = \ -- cd $(TOPDIR)/$(LIBNAME)/.libs; \ -- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ -- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \ -- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \ -- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \ -- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \ -- if test "x$(PKG_LIB_DIR)" != "x$(PKG_ROOT_LIB_DIR)" ; then \ -- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \ -- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \ -- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \ -- fi -+ set -e; cd $(TOPDIR)/$(LIBNAME); \ -+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ -+ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la - else - INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) - endif diff --git a/pkgs/tools/misc/bfr/default.nix b/pkgs/tools/misc/bfr/default.nix index 78383f4185d5..3be824d9a404 100644 --- a/pkgs/tools/misc/bfr/default.nix +++ b/pkgs/tools/misc/bfr/default.nix @@ -1,18 +1,21 @@ { stdenv, fetchurl, perl }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "bfr-1.6"; + version = "1.6"; src = fetchurl { - url = http://www.glines.org/bin/pk/bfr-1.6.tar.bz2; + url = "http://www.sourcefiles.org/Utilities/Text_Utilities/bfr-${version}.tar.bz2"; sha256 = "0fadfssvj9klj4dq9wdrzys1k2a1z2j0p6kgnfgbjv0n1bq6h4cy"; }; buildInputs = [ perl ]; - meta = { - description = "general-purpose command-line pipe buffer"; + meta = with stdenv.lib; { + description = "A general-purpose command-line pipe buffer"; homepage = http://www.glines.org/wiki/bfr; license = stdenv.lib.licenses.gpl2; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/cv/default.nix b/pkgs/tools/misc/cv/default.nix index 28c6347a63dd..b953ffc1897b 100644 --- a/pkgs/tools/misc/cv/default.nix +++ b/pkgs/tools/misc/cv/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - name = "cv-2014-07-20"; + name = "cv-${version}"; + version = "0.6"; src = fetchFromGitHub { owner = "Xfennec"; repo = "cv"; - rev = "7441de974cc13f3b07903bb86c41be4e45c8e81b"; - sha256 = "19ky88b52a8zcv7lx802y4zi3sp0cdhya08cnax0yvlwwq43w6x9"; + rev = "v${version}"; + sha256 = "0nhhgkaghfp8rw23013j17yn9bqcwcrz0fylwkvx1krp5r8dalis"; }; - buildInputs = [ ]; + buildInputs = [ ncurses ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index 615063bbbcc8..f7790fd34689 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "less-470"; + name = "less-471"; src = fetchurl { url = "http://www.greenwoodsoftware.com/less/${name}.tar.gz"; - sha256 = "1vw6bp9wkr2ymvhmf0ikrv8m1zm5ww78s48ny7ks0zjf2i8xr4gi"; + sha256 = "1y17zfrn91fs71jry5gp9ibj7darglhr42krimw7hqsjkbx17xip"; }; # Look for ‘sysless’ in /etc. diff --git a/pkgs/tools/misc/logstash-forwarder/default.nix b/pkgs/tools/misc/logstash-forwarder/default.nix index 961dbc083352..0874ef38eb3d 100644 --- a/pkgs/tools/misc/logstash-forwarder/default.nix +++ b/pkgs/tools/misc/logstash-forwarder/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchgit, go_1_1 }: +{ stdenv, fetchgit, go }: stdenv.mkDerivation { - name = "logstash-forwarder-20140410"; + name = "logstash-forwarder-20141216"; src = fetchgit { url = https://github.com/elasticsearch/logstash-forwarder.git; - rev = "ec504792108ab6536b45bcf6dff6d26a6b56fef3"; - sha256 = "309545ceaec171bee997cad260bef1433e041b9f3bfe617d475bcf79924f943d"; + rev = "6082bd8aaecb2180f5b56f4fb1b2940a6935ef7b"; + sha256 = "1686rlx5p7d2806cg8y4376m4l7nvg1yjgg52ccrs0v4fnqs6292"; }; - buildInputs = [ go_1_1 ]; + buildInputs = [ go ]; installPhase = '' mkdir -p $out/bin cp build/bin/logstash-forwarder $out/bin @@ -15,6 +15,6 @@ stdenv.mkDerivation { meta = { license = stdenv.lib.licenses.asl20; homepage = https://github.com/elasticsearch/logstash-forwarder; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix new file mode 100644 index 000000000000..4c7bb9ad77e1 --- /dev/null +++ b/pkgs/tools/misc/moreutils/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, libxml2, libxslt, docbook-xsl, perl, IPCRun, TimeDate, TimeDuration, makeWrapper }: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "moreutils-${version}"; + version = "0.54"; + + src = fetchurl { + url = "http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_${version}.orig.tar.gz"; + sha256 = "17sj7d4l69gc7l17awwvq44rl137qc0lmi41z04apj5vdd6iqa2h"; + }; + + preBuild = '' + substituteInPlace Makefile --replace /usr/share/xml/docbook/stylesheet/docbook-xsl ${docbook-xsl}/xml/xsl/docbook + ''; + + buildInputs = [ libxml2 libxslt docbook-xsl makeWrapper ]; + + propagatedBuildInputs = [ perl IPCRun TimeDate TimeDuration ]; + + installFlags = "PREFIX=$(out)"; + + postInstall = "wrapProgram $out/bin/chronic --prefix PERL5LIB : $PERL5LIB"; + + meta = { + description = "Growing collection of the unix tools that nobody thought to write long ago when unix was young."; + homepage = https://joeyh.name/code/moreutils/; + maintainers = with maintainers; [ koral ]; + }; +} diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index 868e993737b0..6f9695ba363c 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -1,145 +1,11 @@ { stdenv, autoconf, automake, curl, fetchurl, jdk, jre, makeWrapper, nettools, python }: with stdenv.lib; -let - thirdPartyDeps = { - guava = { - "guava-18.0.jar" = fetchurl { - url = http://repo1.maven.org/maven2/com/google/guava/guava/18.0/guava-18.0.jar; - md5 = "947641f6bb535b1d942d1bc387c45290"; - }; - }; - gwt = { - "gwt-dev-2.6.0.jar" = fetchurl { - url = http://central.maven.org/maven2/com/google/gwt/gwt-dev/2.6.0/gwt-dev-2.6.0.jar; - md5 = "23d8bf52709230c2c7e6dd817261f9ee"; - }; - "gwt-user-2.6.0.jar" = fetchurl { - url = http://repo1.maven.org/maven2/com/google/gwt/gwt-user/2.6.0/gwt-user-2.6.0.jar; - md5 = "99226fc2764f2b8fd6db6e05d0847659"; - }; - }; - hamcrest = { - "hamcrest-core-1.3.jar" = fetchurl { - url = http://central.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar; - md5 = "6393363b47ddcbba82321110c3e07519"; - }; - }; - hbase = { - "asynchbase-1.6.0.jar" = fetchurl { - url = http://central.maven.org/maven2/org/hbase/asynchbase/1.6.0/asynchbase-1.6.0.jar; - md5 = "6738dd73fd48d30cbf5c78f62bc18852"; - }; - }; - jackson = { - "jackson-annotations-2.4.3.jar" = fetchurl { - url = http://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.4.3/jackson-annotations-2.4.3.jar; - md5 = "31ef4fa866f9d24960a6807c9c299e98"; - }; - "jackson-core-2.4.3.jar" = fetchurl { - url = http://central.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.4.3/jackson-core-2.4.3.jar; - md5 = "750ef3d86f04fe0d6d14d6ae904a6d2d"; - }; - "jackson-databind-2.4.3.jar" = fetchurl { - url = http://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.4.3/jackson-databind-2.4.3.jar; - md5 = "4fcb9f74280eaa21de10191212c65b11"; - }; - }; - javassist = { - "javassist-3.18.1-GA.jar" = fetchurl { - url = http://central.maven.org/maven2/org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA.jar; - md5 = "5bb83868c87334320562af7eded65cc2"; - }; - }; - junit = { - "junit-4.11.jar" = fetchurl { - url = http://repo1.maven.org/maven2/junit/junit/4.11/junit-4.11.jar; - md5 = "3c42be5ea7cbf3635716abbb429cb90d"; - }; - }; - logback = { - "logback-classic-1.0.13.jar" = fetchurl { - url = https://opentsdb.googlecode.com/files/logback-classic-1.0.13.jar; - md5 = "b4dc8eb42150aafd6d9fd3d211807621"; - }; - "logback-core-1.0.13.jar" = fetchurl { - url = https://opentsdb.googlecode.com/files/logback-core-1.0.13.jar; - md5 = "3d5f8ce8dca36e493d39177b71958bd4"; - }; - }; - mockito = { - "mockito-1.9.0.jar" = fetchurl { - url = https://opentsdb.googlecode.com/files/mockito-1.9.0.jar; - md5 = "cab21b44958a173a5b1d55a6aff0ab54"; - }; - "mockito-core-1.9.5.jar" = fetchurl { - url = https://opentsdb.googlecode.com/files/mockito-core-1.9.5.jar; - md5 = "98f3076e2a691d1ac291624e5a46b80b"; - }; - }; - netty = { - "netty-3.9.4.Final.jar" = fetchurl { - url = http://central.maven.org/maven2/io/netty/netty/3.9.4.Final/netty-3.9.4.Final.jar; - md5 = "b3701ef46c7518d0d63705e2f092dbe5"; - }; - }; - objenesis = { - "objenesis-1.3.jar" = fetchurl { - url = http://repo1.maven.org/maven2/org/objenesis/objenesis/1.3/objenesis-1.3.jar; - md5 = "2d649907bd6203f2661f70d430a6ade8"; - }; - }; - powermock = { - "powermock-mockito-release-full-1.5.4-full.jar" = fetchurl { - url = http://repo1.maven.org/maven2/org/powermock/powermock-mockito-release-full/1.5.4/powermock-mockito-release-full-1.5.4-full.jar; - md5 = "5dee1dce6952bb7338d4d053157ae647"; - }; - }; - protobuf = { - "protobuf-java-2.5.0.jar" = fetchurl { - url = http://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar; - md5 = "a44473b98947e2a54c54e0db1387d137"; - }; - }; - slf4j = { - "log4j-over-slf4j-1.7.7.jar" = fetchurl { - url = http://repo1.maven.org/maven2/org/slf4j/log4j-over-slf4j/1.7.7/log4j-over-slf4j-1.7.7.jar; - md5 = "93ab42a5216afd683c35988c6b6fc3d8"; - }; - "slf4j-api-1.7.7.jar" = fetchurl { - url = http://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar; - md5 = "ca4280bf93d64367723ae5c8d42dd0b9"; - }; - }; - suasync = { - "suasync-1.4.0.jar" = fetchurl { - url = https://opentsdb.googlecode.com/files/suasync-1.4.0.jar; - md5 = "289ce3f3e6a9bb17857981eacf6d74b6"; - }; - }; - validation-api = { - "validation-api-1.0.0.GA.jar" = fetchurl { - url = http://repo1.maven.org/maven2/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA.jar; - md5 = "40c1ee909493066397a6d4d9f8d375d8"; - }; - "validation-api-1.0.0.GA-sources.jar" = fetchurl { - url = http://repo1.maven.org/maven2/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA-sources.jar; - md5 = "f816682933b59c5ffe32bdb4ab4bf628"; - }; - }; - zookeeper = { - "zookeeper-3.3.6.jar" = fetchurl { - url = https://opentsdb.googlecode.com/files/zookeeper-3.3.6.jar; - md5 = "02786e11c19d1671640992f1bda4a858"; - }; - }; - }; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "opentsdb-2.1.0-rc1"; src = fetchurl { - url = https://github.com/OpenTSDB/opentsdb/archive/v2.1.0RC1.tar.gz; - sha256 = "01li02j8kjanmas2gxkcz3gsn54nyfyvqdylxz3fqqjgg6y7hrm7"; + url = https://github.com/OpenTSDB/opentsdb/releases/download/v2.1.0RC1/opentsdb-2.1.0RC1.tar.gz; + sha256 = "1vvhzdl2wgbzy2lvlyx40pks47ma6szs9ka4dwjf123xyixv0rmz"; }; buildInputs = [ autoconf automake curl jdk makeWrapper nettools python ]; @@ -150,23 +16,9 @@ in stdenv.mkDerivation rec { mkdir build cd build ../configure --prefix=$out - patchShebangs ./build-aux/ + patchShebangs ../build-aux/ ''; - buildPhase = - concatStringsSep - "\n" - (mapAttrsToList - (folder: jars: - "mkdir -p third_party/${folder}\n" + - (concatStringsSep - "\n" - (mapAttrsToList - (jar: src: - "ln -s ${src} third_party/${folder}/${jar}") - jars))) - thirdPartyDeps); - installPhase = '' make install wrapProgram $out/bin/tsdb \ diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index 42882c2701a7..5ead0e7c8bab 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -3,13 +3,13 @@ }: let - wine_patches_version = "1.7.30"; - wine_hash = "0v08w2av46y4wxrl8q4k9fhbi2cgawjaxclahqnpfw098bqcmxqh"; + wine_patches_version = "1.7.33"; + wine_hash = "0xcjsh3635i8wpzixzsl05m3dkq74vq193x3ipjr3fy0l9prslg3"; wine_patches = fetchgit { url = "git://github.com/compholio/wine-compholio.git"; rev = "refs/tags/v${wine_patches_version}"; - sha256 = "02i0bpxxiyxavlcd5qm7wv0q4bm9bxr3ng3w2k234ww7cyndm0ws"; + sha256 = "09af0cwdskz4clps39f48cp4lzm41kdzg30q8b511nyl0dppd75r"; }; wine_custom = @@ -45,13 +45,13 @@ let in stdenv.mkDerivation rec { - version = "0.2.7.3"; + version = "0.2.8"; name = "pipelight-${version}"; src = fetchurl { url = "https://bitbucket.org/mmueller2012/pipelight/get/v${version}.tar.gz"; - sha256 = "0lifgs3aakyxfk6r2f2p27z0iqzgz1dinqfgwx3vdh3l93s8aifv"; + sha256 = "1i440rf22fmd2w86dlm1mpi3nb7410rfczc0yldnhgsvp5p3sm5f"; }; buildInputs = [ wine_custom xlibs.libX11 gcc48_multi mesa curl ]; diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix new file mode 100644 index 000000000000..d3f017171cb6 --- /dev/null +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, rsync, glibc, gawk }: + +stdenv.mkDerivation rec { + version = "v5.53"; + name = "profile-sync-daemon-${version}"; + + src = fetchurl { + url = "http://github.com/graysky2/profile-sync-daemon/archive/${version}.tar.gz"; + sha256 = "0m7h9l7dndqgb5k3grpc00f6dpg73p6h4q5sgkf8bvyzvcbdafwx"; + }; + + installPhase = "PREFIX=\"\" DESTDIR=$out make install-systemd-all"; + + preferLocalBuild = true; + + meta = with stdenv.lib; { + description = "Syncs browser profile dirs to RAM"; + longDescription = '' + Profile-sync-daemon (psd) is a tiny pseudo-daemon designed to manage your + browser's profile in tmpfs and to periodically sync it back to your + physical disc (HDD/SSD). This is accomplished via a symlinking step and + an innovative use of rsync to maintain back-up and synchronization + between the two. One of the major design goals of psd is a completely + transparent user experience. + ''; + homepage = https://github.com/graysky2/profile-sync-daemon; + downloadPage = https://github.com/graysky2/profile-sync-daemon/releases; + license = licenses.mit; + maintainers = [ maintainers.prikhi ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 95d3b5f183f3..18137312a3d1 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl} : stdenv.mkDerivation { - name = "remind-3.1.8"; + name = "remind-3.1.13"; src = fetchurl { url = http://www.roaringpenguin.com/files/download/remind-03.01.13.tar.gz; sha256 = "0kzw1d53nlj90qfsibbs2gkzp1hamqqxpj57ip4kz1j1xgan69ng"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { homepage = http://www.roaringpenguin.com/products/remind; description = "Sophisticated calendar and alarm program for the console"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [viric raskin]; + maintainers = with stdenv.lib.maintainers; [viric raskin kovirobi]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index daf9d3444009..d4377c14fad4 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/screen/; - description = "a window manager that multiplexes a physical terminal"; + description = "A window manager that multiplexes a physical terminal"; license = stdenv.lib.licenses.gpl2Plus; longDescription = diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index afe75c572c02..664647514aa1 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -4,11 +4,11 @@ let inherit (composableDerivation) edf; in composableDerivation.composableDerivation {} { - name = "timidity-2.13.0"; + name = "timidity-2.14.0"; src = fetchurl { - url = mirror://sourceforge/timidity/TiMidity++-2.13.0.tar.bz2; - sha256 = "1jbmk0m375fh5nj2awqzns7pdjbi7dxpjdwcix04zipfcilppbmf"; + url = mirror://sourceforge/timidity/TiMidity++-2.14.0.tar.bz2; + sha256 = "0xk41w4qbk23z1fvqdyfblbz10mmxsllw0svxzjw5sa9y11vczzr"; }; mergeAttrBy.audioModes = a : b : "${a},${b}"; @@ -55,8 +55,10 @@ composableDerivation.composableDerivation {} { tar --strip-components=1 -xf $instruments -C $out/share/timidity/ ''; - meta = { + meta = with stdenv.lib; { + homepage = http://sourceforge.net/projects/timidity/; + license = licenses.gpl2; description = "A software MIDI renderer"; - maintainers = [ stdenv.lib.maintainers.marcweber ]; + maintainers = [ maintainers.marcweber ]; }; } diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix new file mode 100644 index 000000000000..30fc6a92d89e --- /dev/null +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, substituteAll, coreutils, python2, python2Packages }: + +assert stdenv.isLinux; + +python2Packages.buildPythonPackage rec { + name = "trash-cli-${version}"; + version = "0.12.9.14"; + namePrefix = ""; + + src = fetchurl { + url = "https://github.com/andreafrancia/trash-cli/archive/${version}.tar.gz"; + sha256 = "10idvzrlppj632pw6mpk1zy9arn1x4lly4d8nfy9cz4zqv06lhvh"; + }; + + + patches = [ + # Fix paths. + (substituteAll { + src = ./nix-paths.patch; + df = "${coreutils}/bin/df"; + python = "${python2}/bin/${python2.executable}"; + libc = "${stdenv.gcc.libc}/lib/libc.so.6"; + }) + + # Apply https://github.com/JaviMerino/trash-cli/commit/4f45a37a3 + # to fix failing test case. + ./fix_should_output_info_for_multiple_files.patch + ]; + + buildInputs = with python2Packages; [ nose mock ]; + + checkPhase = "nosetests"; + + meta = with stdenv.lib; { + homepage = https://github.com/andreafrancia/trash-cli; + description = "Command line tool for the desktop trash can"; + maintainer = [ maintainers.rycee ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/tools/misc/trash-cli/fix_should_output_info_for_multiple_files.patch b/pkgs/tools/misc/trash-cli/fix_should_output_info_for_multiple_files.patch new file mode 100644 index 000000000000..17947be74824 --- /dev/null +++ b/pkgs/tools/misc/trash-cli/fix_should_output_info_for_multiple_files.patch @@ -0,0 +1,60 @@ +From 4f45a37a390d7c844dd9c9b58fff7259a77ffff9 Mon Sep 17 00:00:00 2001 +From: Javi Merino <merino.jav@gmail.com> +Date: Sun, 31 Aug 2014 05:45:17 -0700 +Subject: [PATCH] Fix should_output_info_for_multiple_files + +Test should_output_info_for_multiple_files fails because the output is +not in the same order as the input. Add assert_equal_any_order() to +the OutputCollector, which sorts the expected and actual lines so that +the output matches even if the order in which they are shown in +trash-list is different. +--- + integration_tests/describe_trash_list.py | 8 +++++--- + integration_tests/output_collector.py | 8 ++++++++ + 2 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/integration_tests/describe_trash_list.py b/integration_tests/describe_trash_list.py +index 6dd8d30..3489a22 100644 +--- a/integration_tests/describe_trash_list.py ++++ b/integration_tests/describe_trash_list.py +@@ -73,9 +73,9 @@ def should_output_info_for_multiple_files(self): + + self.user.run_trash_list() + +- self.user.should_read_output( "2000-01-01 00:00:01 /file1\n" +- "2000-01-01 00:00:02 /file2\n" +- "2000-01-01 00:00:03 /file3\n") ++ self.user.should_read_output_any_order( "2000-01-01 00:00:01 /file1\n" ++ "2000-01-01 00:00:02 /file2\n" ++ "2000-01-01 00:00:03 /file3\n") + + @istest + def should_output_unknown_dates_with_question_marks(self): +@@ -294,6 +294,8 @@ def error(self): + raise ValueError() + def should_read_output(self, expected_value): + self.stdout.assert_equal_to(expected_value) ++ def should_read_output_any_order(self, expected_value): ++ self.stdout.assert_equal_any_order(expected_value) + def should_read_error(self, expected_value): + self.stderr.assert_equal_to(expected_value) + def output(self): +diff --git a/integration_tests/output_collector.py b/integration_tests/output_collector.py +index 06dc002..7f3704f 100644 +--- a/integration_tests/output_collector.py ++++ b/integration_tests/output_collector.py +@@ -9,6 +9,14 @@ def write(self,data): + self.stream.write(data) + def assert_equal_to(self, expected): + return self.should_be(expected) ++ def assert_equal_any_order(self, expected): ++ actual_sorted = sorted(self.stream.getvalue().splitlines(1)) ++ actual = "".join(actual_sorted) ++ ++ expected_sorted = sorted(expected.splitlines(1)) ++ expected = "".join(expected_sorted) ++ ++ assert_equals_with_unidiff(expected, actual) + def should_be(self, expected): + assert_equals_with_unidiff(expected, self.stream.getvalue()) + def should_match(self, regex): diff --git a/pkgs/tools/misc/trash-cli/nix-paths.patch b/pkgs/tools/misc/trash-cli/nix-paths.patch new file mode 100644 index 000000000000..29412027b7a5 --- /dev/null +++ b/pkgs/tools/misc/trash-cli/nix-paths.patch @@ -0,0 +1,39 @@ +diff -Nurp trash-cli-0.12.9.14-orig/integration_tests/test_trash_rm_script.py trash-cli-0.12.9.14/integration_tests/test_trash_rm_script.py +--- trash-cli-0.12.9.14-orig/integration_tests/test_trash_rm_script.py 2014-12-23 10:10:43.808470486 +0100 ++++ trash-cli-0.12.9.14/integration_tests/test_trash_rm_script.py 2014-12-23 10:11:02.688517975 +0100 +@@ -9,7 +9,7 @@ from pprint import pprint + @istest + class WhenNoArgs: + def setUp(self): +- process = Popen(['python', 'trashcli/rm.py'], ++ process = Popen(['@python@', 'trashcli/rm.py'], + env={'PYTHONPATH':'.'}, + stdin=None, + stdout=PIPE, +diff -Nurp trash-cli-0.12.9.14-orig/trashcli/list_mount_points.py trash-cli-0.12.9.14/trashcli/list_mount_points.py +--- trash-cli-0.12.9.14-orig/trashcli/list_mount_points.py 2014-12-23 10:10:43.808470486 +0100 ++++ trash-cli-0.12.9.14/trashcli/list_mount_points.py 2014-12-23 10:19:04.954796457 +0100 +@@ -12,7 +12,7 @@ def mount_points_from_getmnt(): + + def mount_points_from_df(): + import subprocess +- df_output = subprocess.Popen(["df", "-P"], stdout=subprocess.PIPE).stdout ++ df_output = subprocess.Popen(["@df@", "-P"], stdout=subprocess.PIPE).stdout + return list(_mount_points_from_df_output(df_output)) + + def _mount_points_from_df_output(df_output): +@@ -46,13 +46,7 @@ def _mounted_filesystems_from_getmnt() : + ("mnt_freq", c_int), # Dump frequency (in days). + ("mnt_passno", c_int)] # Pass number for `fsck'. + +- if sys.platform == "cygwin": +- libc_name = "cygwin1.dll" +- else: +- libc_name = find_library("c") +- +- if libc_name == None : +- libc_name="/lib/libc.so.6" # fix for my Gentoo 4.0 ++ libc_name = "@libc@" + + libc = cdll.LoadLibrary(libc_name) + libc.getmntent.restype = POINTER(mntent_struct) diff --git a/pkgs/tools/misc/wyrd/default.nix b/pkgs/tools/misc/wyrd/default.nix new file mode 100644 index 000000000000..d76e393aaaa7 --- /dev/null +++ b/pkgs/tools/misc/wyrd/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, ocaml, ncurses, remind }: + +stdenv.mkDerivation rec { + version = "1.4.6"; + name = "wyrd-${version}"; + + src = fetchurl { + url = "http://pessimization.com/software/wyrd/wyrd-${version}.tar.gz"; + sha256 = "0zlrg602q781q8dij62lwdprpfliyy9j1rqfqcz8p2wgndpivddj"; + }; + + buildInputs = [ ocaml ncurses remind ]; + + preferLocalBuild = true; + + meta = with stdenv.lib; { + description = "A text-based front-end to Remind"; + longDescription = '' + Wyrd is a text-based front-end to Remind, a sophisticated + calendar and alarm program. Remind's power lies in its + programmability, and Wyrd does not hide this capability behind + flashy GUI dialogs. Rather, Wyrd is designed to make you more + efficient at editing your reminder files directly. + ''; + homepage = http://pessimization.com/software/wyrd/; + downloadPage = http://pessimization.com/software/wyrd/; + license = licenses.gpl2; + maintainers = [ maintainers.prikhi ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 88d6ff1ff06d..585dead7354a 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.11.27"; + version = "2014.12.17.2"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0bmjlp3jk5nd2i9jpbqbv2smh5rdxcjajv7fccfinmi6v2bjm1aa"; + sha256 = "1yk8dw0p4nh68p4rcncwl95gcjwn147wyp2anfhn0gr8b95wcb1h"; }; buildInputs = [ python ]; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.unlicense; platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ bluescreen303 simons phreedom AndersonTorres ]; + maintainers = with stdenv.lib.maintainers; [ bluescreen303 simons phreedom AndersonTorres fuuzetsu ]; }; } diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index 4103d17bfa22..8726f4aae219 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -1,16 +1,18 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "axel-2.4"; +stdenv.mkDerivation rec { + name = "axel-${version}"; + version = "2.4"; + src = fetchurl { - urls = [ - #https://alioth.debian.org/frs/download.php/3016/axel-2.4.tar.bz2 - mirror://debian/pool/main/a/axel/axel_2.4.orig.tar.gz - ]; + url = "mirror://debian/pool/main/a/axel/axel_${version}.orig.tar.gz"; sha256 = "0dl0r9byd2ps90cq2nj1y7ib6gnkb5y9f3a3fmhcnjrm9smmg6im"; }; - meta = { + meta = with stdenv.lib; { description = "Console downloading program with some features for parallel connections for faster downloading"; + homepage = http://axel.alioth.debian.org/; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix index 8723c53c3229..5ccbc8d0cae1 100644 --- a/pkgs/tools/networking/connect/default.nix +++ b/pkgs/tools/networking/connect/default.nix @@ -1,22 +1,21 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { - name = "connect-1.95"; +let + + version = "1.104"; + +in stdenv.mkDerivation { + name = "connect-${version}"; src = fetchurl { - url = http://savannah.gnu.org/maintenance/connect.c; - sha256 = "11dx07pcanwaq71g4xh8d4blr5j7iy0ilmb0fkgpj8p22blb74mf"; + url = "https://bitbucket.org/gotoh/connect/get/${version}.tar.bz2"; + sha256 = "0h7bfh1b2kcw5ddpbif57phdxpf8if0cm01pgwc6avp6dqxcsqp2"; }; - phases = "unpackPhase buildPhase fixupPhase"; - - unpackPhase = '' - cp $src connect.c - ''; + makeFlags = [ "CC=cc" ]; # gcc and/or clang compat - buildPhase = '' - mkdir -p $out/bin - gcc -o $out/bin/connect connect.c + installPhase = '' + install -D -m ugo=rx connect $out/bin/connect ''; meta = { @@ -25,7 +24,7 @@ stdenv.mkDerivation rec { This proxy traversal tool is intended to assist OpenSSH (via ProxyCommand in ~/.ssh/config) and GIT (via $GIT_PROXY_COMMAND) utilize SOCKS and https proxies. ''; - homepage = http://bent.latency.net/bent/git/goto-san-connect-1.85/src/connect.html; # source URL is busted there + homepage = https://bitbucket.org/gotoh/connect/wiki/Home; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; maintainers = with stdenv.lib.maintainers; [ jcumming ]; diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 927d60e81249..c84a140d4bca 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "dhcpcd-6.5.1"; + name = "dhcpcd-6.6.6"; src = fetchurl { url = "mirror://roy/dhcpcd/${name}.tar.bz2"; - sha256 = "0y0falxxlahr2i630ydraq4ldr7d5mg8ar0s5np5ddl76w58dlrp"; + sha256 = "0893gixhz68ngqa1vcshmvkwy58kmlj3f1qvd877sgrir06bpg96"; }; patches = [ /* ./lxc_ro_promote_secondaries.patch */ ]; diff --git a/pkgs/tools/networking/dnstop/default.nix b/pkgs/tools/networking/dnstop/default.nix index 00984a4ee70a..c1a41d98f4bd 100644 --- a/pkgs/tools/networking/dnstop/default.nix +++ b/pkgs/tools/networking/dnstop/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "libpcap application that displays DNS traffic on your network"; - homepage = "http://dns.measurement-factory.com/tools/dnstop"; - license = "BSD"; + homepage = http://dns.measurement-factory.com/tools/dnstop; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix index 37d38555e618..3afa17b0a82c 100644 --- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix +++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Script to update your /etc/resolv.conf with DNS settings that come from the received push dhcp-options"; homepage = https://github.com/masterkorp/openvpn-update-resolv-conf/; - maintainer = maintainers.abbradar; + maintainers = maintainers.abbradar; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/tools/networking/oslrd/default.nix b/pkgs/tools/networking/oslrd/default.nix index 44f32e93474c..90f686f77ea6 100644 --- a/pkgs/tools/networking/oslrd/default.nix +++ b/pkgs/tools/networking/oslrd/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = { description = "An adhoc wireless mesh routing daemon"; - license = "BSD"; - homepage = "http://olsr.org/"; + license = stdenv.lib.licenses.bsd3; + homepage = http://olsr.org/; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index c6a57c238a48..2d2136907299 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, zlib, pcre, w3m, man }: stdenv.mkDerivation { - name = "privoxy-3.0.21"; + name = "privoxy-3.0.22"; src = fetchurl { - url = mirror://sourceforge/ijbswa/Sources/3.0.21%20%28stable%29/privoxy-3.0.21-stable-src.tar.gz; - sha256 = "1f6xb7aa47p90c26vqaw74y6drs9gpnhxsgby3mx0awdjh0ydisy"; + url = mirror://sourceforge/ijbswa/Sources/3.0.22%20%28stable%29/privoxy-3.0.22-stable-src.tar.gz; + sha256 = "0hfcxyb0i7dr6jfxw0y4kqcr09p8gjvcs7igyizyl5in3zn4y88s"; }; buildInputs = [ autoreconfHook zlib pcre w3m man ]; diff --git a/pkgs/tools/networking/slimrat/default.nix b/pkgs/tools/networking/slimrat/default.nix index 9006fadfcdb9..f73a1bc5bcc8 100644 --- a/pkgs/tools/networking/slimrat/default.nix +++ b/pkgs/tools/networking/slimrat/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { meta = { homepage = http://code.google.com/p/slimrat/; description = "Linux Rapidshare downloader"; - license = "BSD"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index a41bc5e5b8f0..871cd3e8f473 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp, pkgconfig, python }: +{ stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook }: stdenv.mkDerivation rec { name = "strongswan-5.2.1"; @@ -10,7 +10,13 @@ stdenv.mkDerivation rec { dontPatchELF = true; - buildInputs = [ gmp pkgconfig python ]; + buildInputs = [ gmp pkgconfig python autoreconfHook ]; + + patches = [ + ./ext_auth-path.patch + ./firewall_defaults.patch + ./updown-path.patch + ]; configureFlags = [ "--enable-swanctl" "--enable-cmd" ]; diff --git a/pkgs/tools/networking/strongswan/ext_auth-path.patch b/pkgs/tools/networking/strongswan/ext_auth-path.patch new file mode 100644 index 000000000000..397537ad8d84 --- /dev/null +++ b/pkgs/tools/networking/strongswan/ext_auth-path.patch @@ -0,0 +1,13 @@ +Index: strongswan-5.2.1/src/libcharon/plugins/ext_auth/ext_auth_listener.c +=================================================================== +--- strongswan-5.2.1.orig/src/libcharon/plugins/ext_auth/ext_auth_listener.c ++++ strongswan-5.2.1/src/libcharon/plugins/ext_auth/ext_auth_listener.c +@@ -101,6 +101,8 @@ METHOD(listener_t, authorize, bool, + + *success = FALSE; + ++ push_env(envp, countof(envp), "PATH=%s", getenv("PATH")); ++ + push_env(envp, countof(envp), "IKE_UNIQUE_ID=%u", + ike_sa->get_unique_id(ike_sa)); + push_env(envp, countof(envp), "IKE_NAME=%s", diff --git a/pkgs/tools/networking/strongswan/firewall_defaults.patch b/pkgs/tools/networking/strongswan/firewall_defaults.patch new file mode 100644 index 000000000000..12c446c8c9aa --- /dev/null +++ b/pkgs/tools/networking/strongswan/firewall_defaults.patch @@ -0,0 +1,32 @@ +Index: strongswan-5.2.1/src/starter/confread.c +=================================================================== +--- strongswan-5.2.1.orig/src/starter/confread.c ++++ strongswan-5.2.1/src/starter/confread.c +@@ -43,7 +43,7 @@ + static const char ike_defaults[] = "aes128-sha1-modp2048,3des-sha1-modp1536"; + static const char esp_defaults[] = "aes128-sha1,3des-sha1"; + +-static const char firewall_defaults[] = IPSEC_SCRIPT " _updown iptables"; ++static const char firewall_defaults[] = IPSEC_SBINDIR "/" IPSEC_SCRIPT " _updown iptables"; + + /** + * Provided by GPERF +Index: strongswan-5.2.1/src/starter/Makefile.am +=================================================================== +--- strongswan-5.2.1.orig/src/starter/Makefile.am ++++ strongswan-5.2.1/src/starter/Makefile.am +@@ -18,10 +18,12 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/src/libhydra \ + -I$(top_srcdir)/src/starter \ + -I$(top_srcdir)/src/stroke \ +- -DIPSEC_DIR=\"${ipsecdir}\" \ ++ -DIPSEC_BINDIR=\"${bindir}\" \ + -DIPSEC_CONFDIR=\"${sysconfdir}\" \ +- -DIPSEC_PIDDIR=\"${piddir}\" \ ++ -DIPSEC_DIR=\"${ipsecdir}\" \ + -DIPSEC_EAPDIR=\"${eapdir}\" \ ++ -DIPSEC_PIDDIR=\"${piddir}\" \ ++ -DIPSEC_SBINDIR=\"${sbindir}\" \ + -DIPSEC_SCRIPT=\"${ipsec_script}\" \ + -DDEV_RANDOM=\"${random_device}\" \ + -DDEV_URANDOM=\"${urandom_device}\" \ diff --git a/pkgs/tools/networking/strongswan/updown-path.patch b/pkgs/tools/networking/strongswan/updown-path.patch new file mode 100644 index 000000000000..f01da7d7bce6 --- /dev/null +++ b/pkgs/tools/networking/strongswan/updown-path.patch @@ -0,0 +1,26 @@ +Index: strongswan-5.2.1/src/_updown/_updown.in +=================================================================== +--- strongswan-5.2.1.orig/src/_updown/_updown.in ++++ strongswan-5.2.1/src/_updown/_updown.in +@@ -125,7 +125,7 @@ + # + + # define a minimum PATH environment in case it is not set +-PATH="/sbin:/bin:/usr/sbin:/usr/bin:@sbindir@" ++PATH="${PATH:-/sbin:/bin:/usr/sbin:/usr/bin}" + export PATH + + # uncomment to log VPN connections +Index: strongswan-5.2.1/src/libcharon/plugins/updown/updown_listener.c +=================================================================== +--- strongswan-5.2.1.orig/src/libcharon/plugins/updown/updown_listener.c ++++ strongswan-5.2.1/src/libcharon/plugins/updown/updown_listener.c +@@ -240,6 +240,8 @@ static void invoke_once(private_updown_l + process_t *process; + char *envp[128] = {}; + ++ push_env(envp, countof(envp), "PATH=%s", getenv("PATH")); ++ + me = ike_sa->get_my_host(ike_sa); + other = ike_sa->get_other_host(ike_sa); + diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index 037fddac4d5c..b12612578462 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: stdenv.mkDerivation rec { - name = "tinc-1.1pref57d53c"; + name = "tinc-1.1pre199573"; src = fetchgit { url = "git://tinc-vpn.org/tinc"; - rev = "f57d53c3ad9af89489e15a8cfd94b56937bf3179"; - sha256 = "0yangrl5krygdk8djryq50qfvxn0ng9zh3aj81q6shaji7gcgiyb"; + rev = "199573f1e834290290a1c278072a153b90443b05"; + sha256 = "0fdk99h742pv7aim1fjaxd5zz6qbabm43s307s6ncvcp1gp6l8x9"; }; buildInputs = [ autoreconfHook texinfo ncurses readline zlib lzo openssl ]; diff --git a/pkgs/tools/networking/trickle/default.nix b/pkgs/tools/networking/trickle/default.nix index 254dc168ec8c..d10e645dc874 100644 --- a/pkgs/tools/networking/trickle/default.nix +++ b/pkgs/tools/networking/trickle/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight userspace bandwidth shaper"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; homepage = http://monkey.org/~marius/pages/?page=trickle; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/package-management/cabal-install/1.20.0.3.nix b/pkgs/tools/package-management/cabal-install/1.20.0.4.nix index 1a18222ed6bc..a6222dfc6883 100644 --- a/pkgs/tools/package-management/cabal-install/1.20.0.3.nix +++ b/pkgs/tools/package-management/cabal-install/1.20.0.4.nix @@ -1,35 +1,36 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, Cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck -, random, stm, testFramework, testFrameworkHunit +{ cabal, Cabal, filepath, HTTP, HUnit, mtl, network, networkUri +, QuickCheck, random, stm, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, time, zlib }: cabal.mkDerivation (self: { pname = "cabal-install"; - version = "1.20.0.3"; - sha256 = "050b9dc4khfc1fs283p1635zni25z4b55gi5ffwvg4mfpkrmdgfj"; + version = "1.20.0.4"; + sha256 = "171lkr8jw5k3l58gn41jmbp47kf3b8iq9dds0v8qx7wxzlxy0kz1"; isLibrary = false; isExecutable = true; buildDepends = [ - Cabal filepath HTTP mtl network random stm time zlib + Cabal filepath HTTP mtl network networkUri random stm time zlib ]; testDepends = [ Cabal filepath HTTP HUnit mtl network QuickCheck stm testFramework testFrameworkHunit testFrameworkQuickcheck2 time zlib ]; + doCheck = false; postInstall = '' mkdir $out/etc mv bash-completion $out/etc/bash_completion.d ''; patchPhase = '' - sed -i -e 's|random .*1.1,|random,|' cabal-install.cabal + sed -i -e 's|random .*< 1.1,|random,|' cabal-install.cabal ''; meta = { homepage = "http://www.haskell.org/cabal/"; description = "The command-line interface for Cabal and Hackage"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = with self.stdenv.lib.maintainers; [ andres ]; }; }) diff --git a/pkgs/tools/package-management/nix-repl/default.nix b/pkgs/tools/package-management/nix-repl/default.nix index f812ea58a0b0..6877e01f3e19 100644 --- a/pkgs/tools/package-management/nix-repl/default.nix +++ b/pkgs/tools/package-management/nix-repl/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchgit, nix, readline, boehmgc }: +{ lib, stdenv, fetchFromGitHub, nix, readline, boehmgc }: -with stdenv.lib; +let rev = "f92408136ed08804bab14b3e2a2def9b8effd7eb"; in -stdenv.mkDerivation rec { - name = "nix-repl-${getVersion nix}-${substring 0 7 src.rev}"; +stdenv.mkDerivation { + name = "nix-repl-${lib.getVersion nix}-${lib.substring 0 7 rev}"; - src = fetchgit { - url = https://github.com/edolstra/nix-repl.git; - rev = "1734e8a1491ef831c83c2620b6b0f4a590b67c1f"; - sha256 = "12fld2780jh3ww2n59s9z7afwjkmfhwh4dqn3wjva4ff8fx3n0mf"; + src = fetchFromGitHub { + owner = "edolstra"; + repo = "nix-repl"; + inherit rev; + sha256 = "1vl36d3n7hrw4vy2n358zx210ygkj4lmd8zsiifna6x7w7q388bj"; }; - buildInputs = [ nix readline boehmgc ]; + buildInputs = [ nix readline ]; buildPhase = "true"; @@ -29,8 +30,8 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/edolstra/nix-repl; description = "An interactive environment for evaluating and building Nix expressions"; - maintainers = [ maintainers.eelco ]; - license = licenses.gpl3; + maintainers = [ lib.maintainers.eelco ]; + license = lib.licenses.gpl3; platforms = nix.meta.platforms; }; } diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix new file mode 100644 index 000000000000..9b42a722e96d --- /dev/null +++ b/pkgs/tools/package-management/nix-serve/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchFromGitHub, perl, nix, perlPackages }: + +let rev = "4c24e3ffa7d267d67d87135e7ac4c9198e449cd3"; in + +stdenv.mkDerivation rec { + name = "nix-serve-0.1-${lib.substring 0 7 rev}"; + + src = fetchFromGitHub { + owner = "edolstra"; + repo = "nix-serve"; + inherit rev; + sha256 = "1c0ip4w00j86412l2qf0dwzjr9jzimiygbx82x15r46kr3cpk7kp"; + }; + + buildInputs = [ perl nix perlPackages.Plack perlPackages.Starman ]; + + buildPhase = "true"; + + # FIXME: unfortunate cut&paste. + installPhase = + '' + mkdir -p $out/libexec/nix-serve + cp nix-serve.psgi $out/libexec/nix-serve/nix-serve.psgi + + mkdir -p $out/bin + cat > $out/bin/nix-serve <<EOF + #! ${stdenv.shell} + PERL5LIB=$PERL5LIB exec ${perlPackages.Starman}/bin/starman $out/libexec/nix-serve/nix-serve.psgi "\$@" + EOF + chmod +x $out/bin/nix-serve + ''; + + meta = { + homepage = https://github.com/edolstra/nix-serve; + description = "A utility for sharing a Nix store as a binary cache"; + maintainers = [ lib.maintainers.eelco ]; + license = lib.licenses.gpl3; + platforms = nix.meta.platforms; + }; +} diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 55f5b0aedc9c..f1dad6379dc5 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -5,16 +5,18 @@ }: stdenv.mkDerivation rec { - name = "nix-1.7"; + name = "nix-1.8"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "349163654f2ae3e1a17fb3da7ed164a4cac153728bbe9a26764e17556d3dcc92"; + sha256 = "a30a5e801bc1cb1019cbc3456d961a307c45c9c588b8692cf1293ea6588ef01c"; }; nativeBuildInputs = [ perl pkgconfig ]; - buildInputs = [ curl openssl boehmgc sqlite ]; + buildInputs = [ curl openssl sqlite ]; + + propagatedBuildInputs = [ boehmgc ]; # Note: bzip2 is not passed as a build input, because the unpack phase # would end up using the wrong bzip2 when cross-compiling. @@ -22,6 +24,7 @@ stdenv.mkDerivation rec { postUnpack = '' export CPATH="${bzip2}/include" export LIBRARY_PATH="${bzip2}/lib" + export CXXFLAGS="-Wno-error=reserved-user-defined-literal" ''; configureFlags = @@ -32,7 +35,6 @@ stdenv.mkDerivation rec { --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix} --disable-init-state --enable-gc - CFLAGS=-O3 CXXFLAGS=-O3 ''; makeFlags = "profiledir=$(out)/etc/profile.d"; @@ -55,7 +57,6 @@ stdenv.mkDerivation rec { --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix} --disable-init-state --enable-gc - CFLAGS=-O3 CXXFLAGS=-O3 '' + stdenv.lib.optionalString ( stdenv.cross ? nix && stdenv.cross.nix ? system ) ''--with-system=${stdenv.cross.nix.system}''; @@ -66,9 +67,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - # due to builder args bug; see - # https://github.com/NixOS/nix/commit/b224ac15201c57b40ea855f5a98b1bd166c1c7f6 - broken = stdenv.isDarwin; description = "Powerful package manager that makes package management reliable and reproducible"; longDescription = '' Nix is a powerful package manager for Linux and other Unix systems that diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index be370808d1e2..91c35b59964a 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null -, pkgconfig, boehmgc, perlPackages, bash +, pkgconfig, boehmgc, perlPackages , storeDir ? "/nix/store" , stateDir ? "/nix/var" }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { postUnpack = '' export CPATH="${bzip2}/include" export LIBRARY_PATH="${bzip2}/lib" - export CXXFLAGS="-O3 -Wno-error=reserved-user-defined-literal" + export CXXFLAGS="-Wno-error=reserved-user-defined-literal" ''; configureFlags = @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix} --disable-init-state --enable-gc - CFLAGS=-O3 ''; makeFlags = "profiledir=$(out)/etc/profile.d"; @@ -58,7 +57,6 @@ stdenv.mkDerivation rec { --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix} --disable-init-state --enable-gc - CFLAGS=-O3 CXXFLAGS=-O3 '' + stdenv.lib.optionalString ( stdenv.cross ? nix && stdenv.cross.nix ? system ) ''--with-system=${stdenv.cross.nix.system}''; diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix new file mode 100644 index 000000000000..17532039d913 --- /dev/null +++ b/pkgs/tools/package-management/nixops/unstable.nix @@ -0,0 +1,63 @@ +{ lib, pythonPackages, fetchgit, libxslt, docbook5_xsl, openssh }: + +let + + # Use this until the patches are upstreamed. + # Warning: will be rebased at will + libcloud = lib.overrideDerivation pythonPackages.libcloud ( args: { + src = fetchgit { + url = https://github.com/Phreedom/libcloud.git; + rev = "784427f549829a00d551e3468184a708420ad1ec"; + sha256 = "fd0e092b39fa1fde6a8847e6dc69855d30c2dad9e95ee0373297658ff53edf8a"; + }; + + preConfigure = "cp libcloud/test/secrets.py-dist libcloud/test/secrets.py"; + }); + +in + +pythonPackages.buildPythonPackage rec { + name = "nixops-1.3pre1362_2a616f8"; + namePrefix = ""; + + src = fetchgit { + url = https://github.com/NixOS/nixops; + rev = "2a616f8ddc18800c9e1c7013632078a55c06c3e3"; + sha256 = "12arppri2j9sblja73jlfdcbpz1z94cd35n9ypazcsw4irmya3k6"; + }; + + buildInputs = [ pythonPackages.nose pythonPackages.coverage ]; + + propagatedBuildInputs = + [ pythonPackages.prettytable + pythonPackages.boto + pythonPackages.hetzner + libcloud + pythonPackages.sqlite3 + ]; + + doCheck = true; + + postInstall = + '' + # Backward compatibility symlink. + ln -s nixops $out/bin/charon + + make -C doc/manual install \ + docdir=$out/share/doc/nixops mandir=$out/share/man + + mkdir -p $out/share/nix/nixops + cp -av nix/* $out/share/nix/nixops + + # Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL + # the version of openssh is causing errors when have big networks (40+) + wrapProgram $out/bin/nixops --prefix PATH : "${openssh}/bin" + ''; # */ + + meta = { + homepage = https://github.com/NixOS/nixops; + description = "NixOS cloud provisioning and deployment tool"; + maintainers = [ lib.maintainers.tv ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index 5348b579cd75..40f93a775c2e 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "afl-${version}"; - version = "0.85b"; + version = "0.89b"; src = fetchurl { url = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz"; - sha256 = "010sgsjxb76bsqaw7sa5mm9r4avpf4c0bw9q2898bymfqisji033"; + sha256 = "0fzxfainz6051aj9fyx2wslk0ardm6clb1g1ry9vfiby99djcns9"; }; buildPhase = "make PREFIX=$out"; diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index e1f849560c8e..d6fe93bab9c5 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "gnupg-2.1.0"; + name = "gnupg-2.1.1"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "12q5shx6ldqad3rky154nv8f2cy57sxy9idivz93ggqm1bsw7a0n"; + sha256 = "0jffj23a02gw7gmrh9j9ynp50bvl2pc2y74i9ii65nvm50fx1v3h"; }; patches = [ ./socket-activate.patch ]; diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index 97f67dfbd71f..fb1131b5f98b 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -6,6 +6,7 @@ stdenv.mkDerivation rec { name = "JohnTheRipper-${version}"; version = "8a3e3c1d"; buildInputs = [ openssl nss nspr krb5 gmp zlib libpcap re2 ]; + NIX_CFLAGS_COMPILE = "-DJOHN_SYSTEMWIDE=1"; preConfigure = ''cd src''; installPhase = '' ensureDir $out/share/john/ diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 9dfd7ff9052a..bd81b61e12ad 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -6,11 +6,11 @@ assert useGtk || useNcurses || useQt4; stdenv.mkDerivation rec { - name = "pinentry-0.8.4"; + name = "pinentry-0.9.0"; src = fetchurl { url = "mirror://gnupg/pinentry/${name}.tar.bz2"; - sha256 = "04jnlfncj9d5rg0j4gmsi2l1q9q7c6gjbvxfnfh3nx6b8szv779m"; + sha256 = "1awhajq21hcjgqfxg9czaxg555gij4bba6axrwg8w6lfmc3ml14h"; }; buildInputs = let opt = stdenv.lib.optional; in [] diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 1448aa93c7d7..783bd1ad7ff3 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -3,20 +3,20 @@ }: stdenv.mkDerivation rec { - name = "sudo-1.8.11"; + name = "sudo-1.8.11p2"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "0if82pvmz7m3qkj3sc9yy8mpcd7lmbn0mhrgnd1zpszvnpkps5x3"; + sha256 = "1bd1zf85q15z015268w9vchzwypzalc3v2dnddmwy67s32a88cw1"; }; configureFlags = [ "--with-env-editor" "--with-editor=/run/current-system/sw/bin/nano" - "--with-rundir=/var/run" + "--with-rundir=/run" "--with-vardir=/var/db/sudo" "--with-logpath=/var/log/sudo.log" "--with-sendmail=${sendmailPath}" @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postInstall = + postInstall = '' rm -f $out/share/doc/sudo/ChangeLog ''; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = { description = "A command to run commands as root"; - longDescription = + longDescription = '' Sudo (su "do") allows a system administrator to delegate authority to give certain users (or groups of users) the ability diff --git a/pkgs/tools/security/tcpcrypt/0001-Run-tcpcryptd-under-uid-93-instead-of-666.patch b/pkgs/tools/security/tcpcrypt/0001-Run-tcpcryptd-under-uid-93-instead-of-666.patch deleted file mode 100644 index addf00796a8a..000000000000 --- a/pkgs/tools/security/tcpcrypt/0001-Run-tcpcryptd-under-uid-93-instead-of-666.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4ef50d76a2da61be60fea448690e24f35bc37299 Mon Sep 17 00:00:00 2001 -From: Peter Simons <simons@cryp.to> -Date: Wed, 11 Sep 2013 17:19:29 +0200 -Subject: [PATCH] Run tcpcryptd under uid 93 instead of 666. - ---- - user/src/linux.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/user/src/linux.c b/user/src/linux.c -index b51e6b2..8199193 100644 ---- a/user/src/linux.c -+++ b/user/src/linux.c -@@ -198,7 +198,7 @@ void linux_drop_privs(void) - - cap_free(caps); - -- if (setuid(666) == -1) -+ if (setuid(93) == -1) - err(1, "setuid()"); - - caps = cap_init(); --- -1.8.3.4 - diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/pkgs/tools/security/tcpcrypt/default.nix index 17c6993826d8..be21f92cd760 100644 --- a/pkgs/tools/security/tcpcrypt/default.nix +++ b/pkgs/tools/security/tcpcrypt/default.nix @@ -1,26 +1,23 @@ -{ fetchurl, stdenv, autoconf, automake, libtool +{ fetchurl, stdenv, autoconf, automake, libtool, autoreconfHook , openssl, libcap, libnfnetlink, libnetfilter_queue }: -let - rev = "0e07772316061ad67b8770e7d98d5dd099c9c7c7"; -in stdenv.mkDerivation rec { - name = "tcpcrypt-2011.07.22"; + name = "tcpcrypt-0.3-rc1"; src = fetchurl { - url = "https://github.com/sorbo/tcpcrypt/archive/${rev}.tar.gz"; - sha256 = "1f1f1iawlvipnccwh31fxnb8yam1fgh36m0qcbc29qk1ggwrfnkk"; + url = "https://github.com/scslab/tcpcrypt/archive/v0.3-rc1.tar.gz"; + sha256 = "1k79xfip95kyy91b6rnmsgl66g52zrnm92ln4jms133nm2k9s4sa"; name = "${name}.tar.gz"; }; dontStrip = true; - buildInputs = [ autoconf automake libtool openssl libcap libnfnetlink libnetfilter_queue ]; + buildInputs = [ autoreconfHook autoconf automake libtool openssl libcap libnfnetlink libnetfilter_queue ]; - patches = [ ./0001-Run-tcpcryptd-under-uid-93-instead-of-666.patch ]; - - preConfigure = "cd user; autoreconf -i"; + postUnpack = '' + mkdir $sourceRoot/m4 + ''; meta = { homepage = "http://tcpcrypt.org/"; diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix index 8b65b27b66bd..29c29d6b93af 100644 --- a/pkgs/tools/security/thc-hydra/default.nix +++ b/pkgs/tools/security/thc-hydra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, libidn, ncurses, pcre, libssh }: +{ stdenv, fetchurl, openssl, libidn, ncurses, pcre, libssh, postgresql92 }: with stdenv.lib; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { }; preConfigure = '' - substituteInPlace configure --replace "\$LIBDIRS" "${openssl}/lib ${pcre}/lib ${libssh}/lib" - substituteInPlace configure --replace "\$INCDIRS" "${openssl}/include ${pcre}/include ${libssh}/include" + substituteInPlace configure --replace "\$LIBDIRS" "${openssl}/lib ${pcre}/lib ${libssh}/lib ${postgresql92}/lib" + substituteInPlace configure --replace "\$INCDIRS" "${openssl}/include ${pcre}/include ${libssh}/include ${postgresql92}/include" ''; buildInputs = [ openssl libidn ncurses pcre libssh ]; diff --git a/pkgs/tools/security/tor/tor-arm.nix b/pkgs/tools/security/tor/tor-arm.nix new file mode 100644 index 000000000000..6c4d61d825f9 --- /dev/null +++ b/pkgs/tools/security/tor/tor-arm.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, python, setuptools, lsof, nettools, makeWrapper +, pythonPackages, ncurses }: + +stdenv.mkDerivation rec { + name = "tor-arm-${version}"; + version = "1.4.5.0"; + + src = fetchurl { + url = "https://www.atagar.com/arm/resources/static/arm-${version}.tar.bz2"; + sha256 = "1yi87gdglkvi1a23hv5c3k7mc18g0rw7b05lfcw81qyxhlapf3pw"; + }; + + buildInputs = + [ python pythonPackages.curses setuptools lsof nettools makeWrapper ]; + + patchPhase = '' + substituteInPlace ./setup.py --replace "/usr/bin" "$out/bin" + substituteInPlace ./src/util/connections.py \ + --replace "lsof -wnPi" "${lsof}/bin/lsof" + substituteInPlace ./src/util/torTools.py \ + --replace "netstat -npl" "${nettools}/bin/netstat -npl" \ + --replace "lsof -wnPi" "${lsof}/bin/lsof" + + substituteInPlace ./arm --replace '"$0" = /usr/bin/arm' 'true' + substituteInPlace ./arm --replace "python" "${python}/bin/python" + + for i in ./install ./arm ./src/gui/controller.py ./src/cli/wizard.py ./src/resources/torrcOverride/override.h ./src/resources/torrcOverride/override.py ./src/resources/arm.1 ./setup.py; do + substituteInPlace $i --replace "/usr/share" "$out/share" + done + ''; + + installPhase = '' + mkdir -p $out/share/arm $out/bin $out/libexec + python setup.py install --prefix=$out + cp -R src/TorCtl $out/libexec + + for i in $(cd $out/bin && ls); do + wrapProgram $out/bin/$i \ + --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pythonPackages.curses}):$out/libexec:$PYTHONPATH" \ + --set TERMINFO "${ncurses}/share/terminfo" \ + --set TERM "xterm" + done + ''; + + meta = { + description = "Anonymizing relay monitor for Tor"; + homepage = "https://www.atagar.com/arm/"; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index c07d5d988054..343e532e34b4 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, libgcrypt, readline }: stdenv.mkDerivation rec { - version = "1.4.6"; + version = "1.4.7"; name = "freeipmi-${version}"; src = fetchurl { url = "mirror://gnu/freeipmi/${name}.tar.gz"; - sha256 = "1br68qlg0hw6mc4v64hliqydl83qg2ldfxc50yi4xvca6wll6h3f"; + sha256 = "1j33b2spj1vzjf1ymfrgka5h7imijmdwg9jdjfb92b2ccld9jj6l"; }; buildInputs = [ libgcrypt readline ]; diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/tools/system/gdmap/default.nix index e9592b366661..3d3809610e4d 100644 --- a/pkgs/tools/system/gdmap/default.nix +++ b/pkgs/tools/system/gdmap/default.nix @@ -12,8 +12,11 @@ stdenv.mkDerivation rec { patches = [ ./get_sensitive.patch ./set_flags.patch ]; - meta = { + meta = with stdenv.lib; { homepage = http://gdmap.sourceforge.net; description = "Recursive rectangle map of disk usage"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index 027017247b74..eedca8bd7fd5 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation { meta = { description = ''Command-line interface to IPMI-enabled devices''; - license = "BSD"; - homepage = "http://ipmitool.sourceforge.net"; + license = stdenv.lib.licenses.bsd3; + homepage = http://ipmitool.sourceforge.net; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh index 1bd40aca07b1..2131a5bad868 100644 --- a/pkgs/tools/system/plan9port/builder.sh +++ b/pkgs/tools/system/plan9port/builder.sh @@ -1,4 +1,3 @@ -set -e source $stdenv/setup tar xvfz $src @@ -13,8 +12,12 @@ for p in $patches; do patch -p1 < $p done -./INSTALL -r $out/plan9 - export PLAN9=$out/plan9 mkdir -p $PLAN9 + +for f in `grep -l -r /usr/local/plan9`; do + sed "s,/usr/local/plan9,${PLAN9},g" -i $f +done + +./INSTALL -r $PLAN9 cp -R * $PLAN9 diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 76087f553d67..709f83d3cbe9 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { homepage = "http://swtch.com/plan9port/"; description = "Plan 9 from User Space"; license = licenses.lpl-102; + maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/system/safe-rm/default.nix b/pkgs/tools/system/safe-rm/default.nix index 1cd7743e152a..6afb6a09f2e5 100644 --- a/pkgs/tools/system/safe-rm/default.nix +++ b/pkgs/tools/system/safe-rm/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "safe-rm-${version}"; - version = "0.11"; + version = "0.12"; src = fetchgit { url = "https://gitorious.org/safe-rm/mainline.git"; rev = "refs/tags/${name}"; - sha256 = "1csnqq22pfbg9dwhv13x60jih0gn07bn5rwg2nhi0dsslzk4l496"; + sha256 = "1n8ir96rwsg9r47lp3avl5sw548gvyh12zk5riflmmdvq907yi0s"; }; propagatedBuildInputs = [ perl coreutils ]; diff --git a/pkgs/tools/typesetting/pdf2djvu/default.upstream b/pkgs/tools/typesetting/pdf2djvu/default.upstream deleted file mode 100644 index 1bb4aebdc616..000000000000 --- a/pkgs/tools/typesetting/pdf2djvu/default.upstream +++ /dev/null @@ -1,10 +0,0 @@ -url http://code.google.com/p/pdf2djvu/downloads/list -version_link '[.]tar[.][a-z0-9]+$' -process 'code[.]google[.]com//' '' -version '.*_([0-9.]+[0-9]).*' '\1' - -do_overwrite () { - ensure_hash - set_var_value version "$CURRENT_VERSION" - set_var_value sha256 "$CURRENT_HASH" -} diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix new file mode 100644 index 000000000000..48eb68242e1e --- /dev/null +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -0,0 +1,34 @@ +{ lib, pythonPackages, fetchurl }: + +let version = "0.7.6"; + +in pythonPackages.buildPythonPackage rec { + name = "cloud-init-0.7.6"; + namePrefix = ""; + + src = fetchurl { + url = "https://launchpad.net/cloud-init/trunk/${version}/+download/cloud-init-${version}.tar.gz"; + sha256 = "1mry5zdkfaq952kn1i06wiggc66cqgfp6qgnlpk0mr7nnwpd53wy"; + }; + + preBuild = '' + patchShebangs ./tools + + substituteInPlace setup.py \ + --replace /usr $out \ + --replace /etc $out/etc \ + --replace /lib/systemd $out/lib/systemd \ + ''; + + pythonPath = with pythonPackages; [ cheetah jinja2 prettytable + oauth pyserial configobj pyyaml argparse requests jsonpatch ]; + + setupPyInstallFlags = ["--init-system systemd"]; + + meta = { + homepage = http://cloudinit.readthedocs.org; + description = "provides configuration and customization of cloud instance"; + maintainers = [ lib.maintainers.madjar ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4fd5b9dc3e0f..1d60754f0880 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -252,7 +252,7 @@ let }; autoreconfHook = makeSetupHook - { substitutions = { inherit autoconf automake libtool; }; } + { substitutions = { inherit autoconf automake libtool gettext; }; } ../build-support/setup-hooks/autoreconf.sh; buildEnv = import ../build-support/buildenv { @@ -499,6 +499,8 @@ let jre = jdk; }; + apitrace = callPackage ../applications/graphics/apitrace {}; + argyllcms = callPackage ../tools/graphics/argyllcms {}; arp-scan = callPackage ../tools/misc/arp-scan { }; @@ -514,6 +516,8 @@ let }; }; + attic = callPackage ../tools/backup/attic { }; + awscli = callPackage ../tools/admin/awscli { }; ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; @@ -609,7 +613,9 @@ let bchunk = callPackage ../tools/cd-dvd/bchunk { }; - bfr = callPackage ../tools/misc/bfr { }; + bfr = callPackage ../tools/misc/bfr { + perl = perl516; # Docs fail to build with newer versions + }; bindfs = callPackage ../tools/filesystems/bindfs { }; @@ -650,7 +656,6 @@ let bsod = callPackage ../misc/emulators/bsod { }; btrfsProgs = callPackage ../tools/filesystems/btrfsprogs { }; - btrfsProgs-3_16 = callPackage ../tools/filesystems/btrfsprogs/3.16.nix { }; bwm_ng = callPackage ../tools/networking/bwm-ng { }; @@ -662,6 +667,8 @@ let ccnet = callPackage ../tools/networking/ccnet { }; + cloud-init = callPackage ../tools/virtualization/cloud-init { }; + consul = callPackage ../servers/consul { inherit ruby rubyLibs; }; @@ -1140,6 +1147,8 @@ let fakechroot = callPackage ../tools/system/fakechroot { }; + fatsort = callPackage ../tools/filesystems/fatsort { }; + fatrace = callPackage ../os-specific/linux/fatrace { }; fcitx = callPackage ../tools/inputmethods/fcitx { }; @@ -1226,6 +1235,8 @@ let ftgl212 = callPackage ../development/libraries/ftgl/2.1.2.nix { }; + ftop = callPackage ../os-specific/linux/ftop { }; + fuppes = callPackage ../tools/networking/fuppes { ffmpeg = ffmpeg_0_6_90; }; @@ -1269,6 +1280,12 @@ let gifsicle = callPackage ../tools/graphics/gifsicle { }; + gitlab = callPackage ../applications/version-management/gitlab { + libiconv = libiconvOrLibc; + }; + + gitlab-shell = callPackage ../applications/version-management/gitlab-shell { }; + glusterfs = callPackage ../tools/filesystems/glusterfs { }; glmark2 = callPackage ../tools/graphics/glmark2 { }; @@ -1766,6 +1783,11 @@ let monit = callPackage ../tools/system/monit { }; + moreutils = callPackage ../tools/misc/moreutils { + inherit (perlPackages) IPCRun TimeDate TimeDuration; + docbook-xsl = docbook_xsl; + }; + mosh = callPackage ../tools/networking/mosh { inherit (perlPackages) IOTty; }; @@ -1818,6 +1840,8 @@ let ndjbdns = callPackage ../tools/networking/ndjbdns { }; + nestopia = callPackage ../misc/emulators/nestopia { }; + netatalk = callPackage ../tools/filesystems/netatalk { }; netcdf = callPackage ../development/libraries/netcdf { }; @@ -1904,7 +1928,6 @@ let nox = callPackage ../tools/package-management/nox { pythonPackages = python3Packages; - nix = nixUnstable; }; nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd {}; @@ -1942,6 +1965,8 @@ let obnam = callPackage ../tools/backup/obnam { }; + ocz-toolbox = callPackage ../os-specific/linux/ocz-toolbox { }; + odt2txt = callPackage ../tools/text/odt2txt { }; odamex = callPackage ../games/odamex { }; @@ -2163,6 +2188,8 @@ let prey-bash-client = callPackage ../tools/security/prey { }; + profile-sync-daemon = callPackage ../tools/misc/profile-sync-daemon { }; + projectm = callPackage ../applications/audio/projectm { }; proot = callPackage ../tools/system/proot { }; @@ -2536,8 +2563,12 @@ let tmin = callPackage ../tools/security/tmin { }; + tmsu = callPackage ../tools/filesystems/tmsu { }; + tor = callPackage ../tools/security/tor { }; + tor-arm = callPackage ../tools/security/tor/tor-arm.nix { }; + torbutton = callPackage ../tools/security/torbutton { }; torbrowser = callPackage ../tools/security/tor/torbrowser.nix { @@ -2552,6 +2583,8 @@ let traceroute = callPackage ../tools/networking/traceroute { }; + trash-cli = callPackage ../tools/misc/trash-cli { }; + trickle = callPackage ../tools/networking/trickle {}; trousers = callPackage ../tools/security/trousers { }; @@ -2785,10 +2818,14 @@ let inherit (xlibs) libX11 libXext libXrender; }; + wml = callPackage ../development/web/wml { }; + wv = callPackage ../tools/misc/wv { }; wv2 = callPackage ../tools/misc/wv2 { }; + wyrd = callPackage ../tools/misc/wyrd { }; + x86info = callPackage ../os-specific/linux/x86info { }; x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { }; @@ -3216,7 +3253,7 @@ let libXrandr xproto renderproto xextproto inputproto randrproto; }); - gnat = gnat45; + gnat = gnat45; # failed to make 4.6 or 4.8 build gnat45 = wrapGCC (gcc45.gcc.override { name = "gnat"; @@ -3231,20 +3268,7 @@ let ppl = null; }); - gnat46 = wrapGCC (gcc46.gcc.override { - name = "gnat"; - langCC = false; - langC = true; - langAda = true; - profiledCompiler = false; - gnatboot = gnat45; - # We can't use the ppl stuff, because we would have - # libstdc++ problems. - ppl = null; - cloog = null; - }); - - gnatboot = wrapGCC (import ../development/compilers/gnatboot { + gnatboot = wrapGCC-old (import ../development/compilers/gnatboot { inherit fetchurl stdenv; }); @@ -3328,7 +3352,7 @@ let builtins.substring 0 (builtins.stringLength "packages_") name == "packages_" ) haskell)); - haskellPackages = haskellPackages_ghc783; + haskellPackages = haskellPackages_ghc784; haskellPackages_ghc6104 = haskell.packages_ghc6104; haskellPackages_ghc6123 = haskell.packages_ghc6123; @@ -3336,9 +3360,9 @@ let haskellPackages_ghc722 = haskell.packages_ghc722; haskellPackages_ghc742 = haskell.packages_ghc742; haskellPackages_ghc763 = haskell.packages_ghc763; - haskellPackages_ghc783_no_profiling = recurseIntoAttrs haskell.packages_ghc783.noProfiling; - haskellPackages_ghc783_profiling = recurseIntoAttrs haskell.packages_ghc783.profiling; - haskellPackages_ghc783 = recurseIntoAttrs haskell.packages_ghc783.highPrio; + haskellPackages_ghc784_no_profiling = recurseIntoAttrs haskell.packages_ghc784.noProfiling; + haskellPackages_ghc784_profiling = recurseIntoAttrs haskell.packages_ghc784.profiling; + haskellPackages_ghc784 = recurseIntoAttrs haskell.packages_ghc784.highPrio; haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; haxe = callPackage ../development/compilers/haxe { }; @@ -3634,6 +3658,8 @@ let eliom = callPackage ../development/ocaml-modules/eliom { }; + fieldslib = callPackage ../development/ocaml-modules/fieldslib { }; + findlib = callPackage ../development/tools/ocaml/findlib { }; fix = callPackage ../development/ocaml-modules/fix { }; @@ -3905,6 +3931,8 @@ let }; wrapGCC = wrapGCCWith (makeOverridable (import ../build-support/gcc-wrapper)) glibc; + # legacy version, used for gnat bootstrapping + wrapGCC-old = wrapGCCWith (makeOverridable (import ../build-support/gcc-wrapper-old)) glibc; wrapGCCCross = {gcc, libc, binutils, cross, shell ? "", name ? "gcc-cross-wrapper"}: @@ -4031,7 +4059,6 @@ let mujs = callPackage ../development/interpreters/mujs { }; nix-exec = callPackage ../development/interpreters/nix-exec { - nix = nixUnstable; git = gitMinimal; }; @@ -4070,17 +4097,6 @@ let inherit php pkgs; }); - php53 = callPackage ../development/interpreters/php/5.3.nix { }; - - php_fpm53 = callPackage ../development/interpreters/php/5.3.nix { - config = config // { - php = (config.php or {}) // { - fpm = true; - apxs2 = false; - }; - }; - }; - php54 = callPackage ../development/interpreters/php/5.4.nix { }; picolisp = callPackage ../development/interpreters/picolisp {}; @@ -4314,6 +4330,8 @@ let autoconf = callPackage ../development/tools/misc/autoconf { }; + autoconf-archive = callPackage ../development/tools/misc/autoconf-archive { }; + autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { }; autocutsel = callPackage ../tools/X11/autocutsel{ }; @@ -4370,7 +4388,7 @@ let dateutil = pythonPackages.dateutil_1_5; }; - buildbotSlave = callPackage ../development/tools/build-managers/buildbot-slave { + buildbot-slave = callPackage ../development/tools/build-managers/buildbot-slave { inherit (pythonPackages) twisted; }; @@ -4674,8 +4692,6 @@ let premake = premake4; - pstack = callPackage ../development/tools/misc/gdb/pstack.nix { }; - racerRust = callPackage ../development/tools/rust/racer { rust = rustcMaster; }; radare = callPackage ../development/tools/analysis/radare { @@ -4704,7 +4720,7 @@ let remake = callPackage ../development/tools/build-managers/remake { }; - rr = callPackage_i686 ../development/tools/analysis/rr { }; + rr = callPackage ../development/tools/analysis/rr { }; saleae-logic = callPackage ../development/tools/misc/saleae-logic { }; @@ -5016,8 +5032,6 @@ let cppunit = callPackage ../development/libraries/cppunit { }; - cppnetlib = callPackage ../development/libraries/cppnetlib { }; - cracklib = callPackage ../development/libraries/cracklib { }; cryptopp = callPackage ../development/libraries/crypto++ { }; @@ -5134,7 +5148,7 @@ let vpxSupport = !stdenv.isMips; }; - ffmpeg_2_3 = callPackage ../development/libraries/ffmpeg/2.3.x.nix { }; + ffmpeg_2_2 = callPackage ../development/libraries/ffmpeg/2.2.x.nix { }; ffmpeg_2 = callPackage ../development/libraries/ffmpeg/2.x.nix { }; @@ -5636,8 +5650,6 @@ let libpng = libpng12; }; - lgi = callPackage ../development/libraries/lgi { }; - lib3ds = callPackage ../development/libraries/lib3ds { }; libaacs = callPackage ../development/libraries/libaacs { }; @@ -5910,6 +5922,8 @@ let libmcrypt = callPackage ../development/libraries/libmcrypt {}; + libmediainfo = callPackage ../development/libraries/libmediainfo { }; + libmhash = callPackage ../development/libraries/libmhash {}; libmodbus = callPackage ../development/libraries/libmodbus {}; @@ -6318,6 +6332,8 @@ let libyubikey = callPackage ../development/libraries/libyubikey { }; + libzen = callPackage ../development/libraries/libzen { }; + libzip = callPackage ../development/libraries/libzip { }; libzdb = callPackage ../development/libraries/libzdb { }; @@ -6524,6 +6540,8 @@ let opencascade_oce = callPackage ../development/libraries/opencascade/oce.nix { }; + opencollada = callPackage ../development/libraries/opencollada { }; + opencsg = callPackage ../development/libraries/opencsg { }; openct = callPackage ../development/libraries/openct { }; @@ -6604,13 +6622,7 @@ let qt4 = null; }; - phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer { inherit qt4; }; - - phonon_qt5_backend_gstreamer = phonon_backend_gstreamer.override { - withQt5 = true; - inherit qt5; - qt4 = null; - }; + phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer { }; phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc { inherit qt4; }; @@ -6632,6 +6644,8 @@ let podofo = callPackage ../development/libraries/podofo { lua5 = lua5_1; }; + poker-eval = callPackage ../development/libraries/poker-eval { }; + polkit = callPackage ../development/libraries/polkit { spidermonkey = spidermonkey_185; }; @@ -6742,6 +6756,7 @@ let qt5SDK = qtcreator.override { sdkBuild = true; qtLib = qt5Full; + withDocumentation = false; # fails to setup some paths }; qtcreator = callPackage ../development/qtcreator { @@ -6895,6 +6910,8 @@ let sord = callPackage ../development/libraries/sord {}; + soundtouch = callPackage ../development/libraries/soundtouch {}; + spandsp = callPackage ../development/libraries/spandsp {}; speechd = callPackage ../development/libraries/speechd { }; @@ -7204,6 +7221,8 @@ let cppzmq = callPackage ../development/libraries/cppzmq {}; + czmq = callPackage ../development/libraries/czmq { }; + zziplib = callPackage ../development/libraries/zziplib { }; ### DEVELOPMENT / LIBRARIES / AGDA @@ -7429,8 +7448,6 @@ let rhpl = callPackage ../development/python-modules/rhpl { }; - sip = pythonPackages.sip; - pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { stdenv = if stdenv.isDarwin then clangStdenv @@ -7723,6 +7740,8 @@ let influxdb = callPackage ../servers/nosql/influxdb { }; + hyperdex = callPackage ../servers/nosql/hyperdex { }; + mysql51 = import ../servers/sql/mysql/5.1.x.nix { inherit fetchurl ncurses zlib perl openssl stdenv; ps = procps; /* !!! Linux only */ @@ -7744,6 +7763,8 @@ let net_snmp = callPackage ../servers/monitoring/net-snmp { }; + newrelic-sysmond = callPackage ../servers/monitoring/newrelic-sysmond { }; + riemann = callPackage ../servers/monitoring/riemann { }; oidentd = callPackage ../servers/identd/oidentd { }; @@ -7948,6 +7969,7 @@ let apparmor = callPackage ../os-specific/linux/apparmor { inherit (perlPackages) LocaleGettext TermReadKey RpcXML; bison = bison2; + perl = perl516; # ${perl}/.../CORE/handy.h:124:34: error: 'bool' undeclared }; atop = callPackage ../os-specific/linux/atop { }; @@ -8242,7 +8264,7 @@ let ]; }; - linux_3_16 = makeOverridable (import ../os-specific/linux/kernel/linux-3.16.nix) { + linux_3_17 = makeOverridable (import ../os-specific/linux/kernel/linux-3.17.nix) { inherit fetchurl stdenv perl buildLinux; kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu @@ -8251,7 +8273,7 @@ let ]; }; - linux_3_17 = makeOverridable (import ../os-specific/linux/kernel/linux-3.17.nix) { + linux_3_18 = makeOverridable (import ../os-specific/linux/kernel/linux-3.18.nix) { inherit fetchurl stdenv perl buildLinux; kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu @@ -8340,11 +8362,10 @@ let nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; - nvidia_x11 = self.nvidia_x11_legacy340; - nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { }; nvidia_x11_legacy304 = callPackage ../os-specific/linux/nvidia-x11/legacy304.nix { }; nvidia_x11_legacy340 = callPackage ../os-specific/linux/nvidia-x11/legacy340.nix { }; + nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; openafsClient = callPackage ../servers/openafs-client { }; @@ -8401,8 +8422,8 @@ let linuxPackages = linuxPackages_3_14; # Update this when adding the newest kernel major version! - linux_latest = pkgs.linux_3_17; - linuxPackages_latest = pkgs.linuxPackages_3_17; + linux_latest = pkgs.linux_3_18; + linuxPackages_latest = pkgs.linuxPackages_3_18; # Build the kernel modules for the some of the kernels. linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2); @@ -8412,8 +8433,8 @@ let linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice; linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14); - linuxPackages_3_16 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_16 linuxPackages_3_16); linuxPackages_3_17 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_17 linuxPackages_3_17); + linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18 linuxPackages_3_18); linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing); # grsecurity flavors @@ -8888,6 +8909,8 @@ let inherit (gnome3) gsettings_desktop_schemas; + gyre-fonts = callPackage ../data/fonts/gyre {}; + hicolor_icon_theme = callPackage ../data/icons/hicolor-icon-theme { }; inconsolata = callPackage ../data/fonts/inconsolata {}; @@ -8900,6 +8923,8 @@ let kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; + league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; + liberation_ttf_from_source = callPackage ../data/fonts/redhat-liberation-fonts { }; liberation_ttf_binary = callPackage ../data/fonts/redhat-liberation-fonts/binary.nix { }; liberation_ttf = liberation_ttf_binary; @@ -9189,6 +9214,8 @@ let }; funpidgin = carrier; + cava = callPackage ../applications/audio/cava { }; + cc1394 = callPackage ../applications/video/cc1394 { }; cddiscid = callPackage ../applications/audio/cd-discid { }; @@ -9285,7 +9312,7 @@ let d4x = callPackage ../applications/misc/d4x { }; - darcs = with haskellPackages_ghc783; callPackage ../applications/version-management/darcs { + darcs = with haskellPackages_ghc784; callPackage ../applications/version-management/darcs { cabal = cabal.override { extension = self : super : { enableSharedExecutables = false; @@ -9339,6 +9366,8 @@ let dunst = callPackage ../applications/misc/dunst { }; + devede = callPackage ../applications/video/devede { }; + dvb_apps = callPackage ../applications/video/dvb-apps { }; dvdauthor = callPackage ../applications/video/dvdauthor { }; @@ -9444,6 +9473,7 @@ let gitModes = callPackage ../applications/editors/emacs-modes/git-modes { }; haskellMode = callPackage ../applications/editors/emacs-modes/haskell { }; + haskellModeGit = lowPrio (callPackage ../applications/editors/emacs-modes/haskell/git.nix { }); hsc3Mode = callPackage ../applications/editors/emacs-modes/hsc3 { }; @@ -9897,6 +9927,10 @@ let gpsd = callPackage ../servers/gpsd { }; + gtk2fontsel = callPackage ../applications/misc/gtk2fontsel { + inherit (gnome2) gtk; + }; + guitone = callPackage ../applications/version-management/guitone { graphviz = graphviz_2_32; }; @@ -10162,6 +10196,10 @@ let mda_lv2 = callPackage ../applications/audio/mda-lv2 { }; + mediainfo = callPackage ../applications/misc/mediainfo { }; + + mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { }; + meld = callPackage ../applications/version-management/meld { inherit (gnome) scrollkeeper; pygtk = pyGtkGlade; @@ -10203,6 +10241,8 @@ let minidjvu = callPackage ../applications/graphics/minidjvu { }; + mimms = callPackage ../applications/audio/mimms {}; + mirage = callPackage ../applications/graphics/mirage {}; mixxx = callPackage ../applications/audio/mixxx { @@ -10255,9 +10295,11 @@ let }; easytag = callPackage ../applications/audio/easytag { - inherit (gnome3) gnome_icon_theme; + inherit (gnome3) gnome_icon_theme dconf; }; + mp3gain = callPackage ../applications/audio/mp3gain { }; + mp3info = callPackage ../applications/audio/mp3info { }; mp3splt = callPackage ../applications/audio/mp3splt { }; @@ -10751,9 +10793,7 @@ let smartdeblur = callPackage ../applications/graphics/smartdeblur { }; - snapper = callPackage ../tools/misc/snapper { - btrfsProgs = btrfsProgs-3_16; - }; + snapper = callPackage ../tools/misc/snapper { }; snd = callPackage ../applications/audio/snd { }; @@ -10872,6 +10912,8 @@ let telepathy_salut = callPackage ../applications/networking/instant-messengers/telepathy/salut {}; + telepathy_idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {}; + terminator = callPackage ../applications/misc/terminator { vte = gnome.vte.override { pythonSupport = true; }; inherit (pythonPackages) notify; @@ -11078,11 +11120,9 @@ let }; vlc = callPackage ../applications/video/vlc { - ffmpeg = ffmpeg_2_3; + ffmpeg = ffmpeg_2_2; }; - libvlc = vlc.override { onlyLibVLC = true; }; - vmpk = callPackage ../applications/audio/vmpk { }; vnstat = callPackage ../applications/networking/vnstat { }; @@ -11103,8 +11143,6 @@ let weechat = callPackage ../applications/networking/irc/weechat { }; - weechatDevel = lowPrio (callPackage ../applications/networking/irc/weechat/devel.nix { }); - westonLite = callPackage ../applications/window-managers/weston { pango = null; freerdp = null; @@ -11159,6 +11197,7 @@ let in import ../applications/networking/browsers/firefox/wrapper.nix { inherit stdenv lib makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon; + libtrick = true; plugins = assert !(enableGnash && enableAdobeFlash); assert !(jre && icedtea); @@ -11177,7 +11216,7 @@ let ); libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false) (with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]); - gst_plugins = [ gst_plugins_base gst_plugins_good gst_ffmpeg ]; + gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly gst_ffmpeg ]; gtk_modules = [ libcanberra ]; }; @@ -11261,6 +11300,8 @@ let xbmc = xbmcPlain; }; + kodi = callPackage ../applications/video/kodi { }; + xbmc-retroarch-advanced-launchers = callPackage ../misc/emulators/retroarch/xbmc-advanced-launchers.nix { cores = retroArchCores; @@ -11437,10 +11478,7 @@ let pygtk = pyGtkGlade; }; - zotero = callPackage ../applications/office/zotero { - inherit (gnome) libIDL; - inherit (pythonPackages) pysqlite; - }; + zotero = callPackage ../applications/office/zotero {}; zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { }; @@ -12572,17 +12610,24 @@ let stateDir = config.nix.stateDir or "/nix/var"; }; + /* nixUnstable = callPackage ../tools/package-management/nix/unstable.nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; }; + */ + nixUnstable = nixStable; nixops = callPackage ../tools/package-management/nixops { }; + nixopsUnstable = callPackage ../tools/package-management/nixops/unstable.nix { }; + nix-prefetch-scripts = callPackage ../tools/package-management/nix-prefetch-scripts { }; nix-repl = callPackage ../tools/package-management/nix-repl { }; + nix-serve = callPackage ../tools/package-management/nix-serve { }; + nut = callPackage ../applications/misc/nut { }; solfege = callPackage ../misc/solfege { @@ -12930,6 +12975,7 @@ let htmlTidy = html-tidy; # added 2014-12-06 sqliteInteractive = sqlite-interactive; # added 2014-12-06 nfsUtils = nfs-utils; # added 2014-12-06 + buildbotSlave = buildbot-slave; # added 2014-12-09 opentsdb = callPackage ../tools/misc/opentsdb {}; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 9edabc13037f..6077c03b800e 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -15,19 +15,22 @@ # Older compilers inherit the overrides from newer ones. ghcHEADPrefs = self : super : super // { - cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = null; }; + cabalInstall_1_20_0_4 = super.cabalInstall_1_20_0_4.override { Cabal = null; }; mtl = self.mtl_2_2_1; - transformersCompat = super.transformersCompat_0_3_3; }; - ghc783Prefs = self : super : ghcHEADPrefs self super // { - cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = self.Cabal_1_20_0_2; }; + ghc784Prefs = self : super : ghcHEADPrefs self super // { + cabalInstall_1_20_0_4 = super.cabalInstall_1_20_0_4.override { Cabal = self.Cabal_1_20_0_2; }; codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_2; }; }; + jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_20_0_2; }; MonadRandom = self.MonadRandom_0_2_0_1; # newer versions require transformers >= 0.4.x mtl = self.mtl_2_1_3_1; + transformersCompat = super.transformersCompat.override { cabal = self.cabal.override { + extension = self: super: { configureFlags = "-fthree " + super.configureFlags or ""; }; + }; }; }; - ghc763Prefs = self : super : ghc783Prefs self super // { + ghc763Prefs = self : super : ghc784Prefs self super // { aeson = self.aeson_0_7_0_4; ariadne = super.ariadne.override { haskellNames = self.haskellNames.override { @@ -81,7 +84,6 @@ binary = self.binary_0_7_2_2; # core package in ghc >= 7.2.2 caseInsensitive = super.caseInsensitive; # undo the override from ghc 7.2.2 HsSyck = self.HsSyck_0_51; - jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_16_0_3; }; random = null; # core package in ghc <= 7.0.x }; @@ -94,6 +96,7 @@ deepseq = self.deepseq_1_2_0_1; dlist = super.dlist.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; exceptions = null; # none of our versions compile + jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_16_0_3; }; logict = super.logict.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; monadPar = self.monadPar_0_1_0_3; nats = null; # none of our versions compile @@ -223,10 +226,10 @@ }; }; - packages_ghc783 = - packages { ghcPath = ../development/compilers/ghc/7.8.3.nix; + packages_ghc784 = + packages { ghcPath = ../development/compilers/ghc/7.8.4.nix; ghcBinary = if stdenv.isDarwin then ghc783Binary else ghc742Binary; - prefFun = ghc783Prefs; + prefFun = ghc784Prefs; }; packages_ghc763 = diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 638bb45999c9..22a37a0061af 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -263,6 +263,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in libusb = pkgs.libusb1; }; + bindingsPortaudio = callPackage ../development/libraries/haskell/bindings-portaudio {}; + bindingsPosix = callPackage ../development/libraries/haskell/bindings-posix {}; bitarray = callPackage ../development/libraries/haskell/bitarray {}; @@ -343,6 +345,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in bzlib = callPackage ../development/libraries/haskell/bzlib {}; + call = callPackage ../development/libraries/haskell/call {}; + c2hs = callPackage ../development/tools/haskell/c2hs {}; c2hsc = callPackage ../development/tools/haskell/c2hsc {}; @@ -552,6 +556,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in csv = callPackage ../development/libraries/haskell/csv {}; + csv-conduit = callPackage ../development/libraries/haskell/csv-conduit {}; + cssText = callPackage ../development/libraries/haskell/css-text {}; cufft = callPackage ../development/libraries/haskell/cufft {}; @@ -776,6 +782,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in entropy = callPackage ../development/libraries/haskell/entropy {}; + elevator = callPackage ../development/libraries/haskell/elevator {}; + equationalReasoning = callPackage ../development/libraries/haskell/equational-reasoning {}; equivalence = callPackage ../development/libraries/haskell/equivalence {}; @@ -926,8 +934,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in ghcid = callPackage ../development/tools/haskell/ghcid {}; - ghcServer = callPackage ../development/libraries/haskell/ghc-server {}; - ghcjsDom = callPackage ../development/libraries/haskell/ghcjs-codemirror {}; ghcjsCodemirror = callPackage ../development/libraries/haskell/ghcjs-codemirror {}; @@ -993,6 +999,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in glossRasterAccelerate = callPackage ../development/libraries/haskell/gloss-raster-accelerate {}; + glossRendering = callPackage ../development/libraries/haskell/gloss-rendering {}; + glpkHs = callPackage ../development/libraries/haskell/glpk-hs {}; GLURaw = callPackage ../development/libraries/haskell/GLURaw {}; @@ -1202,9 +1210,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hi = callPackage ../development/libraries/haskell/hi {}; - hindent = callPackage ../development/libraries/haskell/hindent { - haskellSrcExts = self.haskellSrcExts_1_15_0_1; - }; + hindent = callPackage ../development/libraries/haskell/hindent {}; hint = callPackage ../development/libraries/haskell/hint {}; @@ -1342,6 +1348,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hspecDiscover = callPackage ../development/libraries/haskell/hspec-discover {}; + hspecLaws = callPackage ../development/libraries/haskell/hspec-laws {}; + hstatsd = callPackage ../development/libraries/haskell/hstatsd {}; hsyslog = callPackage ../development/libraries/haskell/hsyslog {}; @@ -1550,6 +1558,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in libmpd = callPackage ../development/libraries/haskell/libmpd {}; + libnotify = callPackage ../development/libraries/haskell/libnotify { inherit (pkgs) libnotify; }; + liblastfm = callPackage ../development/libraries/haskell/liblastfm {}; libsystemdJournal = callPackage ../development/libraries/haskell/libsystemd-journal {}; @@ -1572,6 +1582,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in lists = callPackage ../development/libraries/haskell/lists {}; + listT = callPackage ../development/libraries/haskell/list-t {}; + listExtras = callPackage ../development/libraries/haskell/listExtras {}; listTries = callPackage ../development/libraries/haskell/list-tries {}; @@ -1699,8 +1711,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in monadIO = callPackage ../development/libraries/haskell/monadIO {}; monadPar_0_1_0_3 = callPackage ../development/libraries/haskell/monad-par/0.1.0.3.nix {}; - monadPar_0_3_4_6 = callPackage ../development/libraries/haskell/monad-par/0.3.4.6.nix {}; - monadPar = self.monadPar_0_3_4_6; + monadPar_0_3_4_7 = callPackage ../development/libraries/haskell/monad-par/0.3.4.7.nix {}; + monadPar = self.monadPar_0_3_4_7; monadParallel = callPackage ../development/libraries/haskell/monad-parallel {}; @@ -1711,8 +1723,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in MonadPrompt = callPackage ../development/libraries/haskell/MonadPrompt {}; MonadRandom_0_2_0_1 = callPackage ../development/libraries/haskell/MonadRandom/0.2.0.1.nix {}; - MonadRandom_0_3 = callPackage ../development/libraries/haskell/MonadRandom/0.3.nix {}; - MonadRandom = self.MonadRandom_0_3; + MonadRandom_0_3_0_1 = callPackage ../development/libraries/haskell/MonadRandom/0.3.0.1.nix {}; + MonadRandom = self.MonadRandom_0_3_0_1; monadStm = callPackage ../development/libraries/haskell/monad-stm {}; @@ -1744,6 +1756,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in mtlparse = callPackage ../development/libraries/haskell/mtlparse {}; + mtlPrelude = callPackage ../development/libraries/haskell/mtl-prelude {}; + mueval = callPackage ../development/libraries/haskell/mueval {}; muevalWrapper = callPackage ../development/libraries/haskell/mueval/wrapper.nix {}; @@ -1850,6 +1864,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in oeis = callPackage ../development/libraries/haskell/oeis {}; + ofx = callPackage ../development/libraries/haskell/ofx {}; + opaleye = callPackage ../development/libraries/haskell/opaleye {}; OpenAL = callPackage ../development/libraries/haskell/OpenAL {}; @@ -1870,6 +1886,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in optparseApplicative_0_11_0_1 = callPackage ../development/libraries/haskell/optparse-applicative/0.11.0.1.nix {}; optparseApplicative = self.optparseApplicative_0_11_0_1; + packdeps = callPackage ../development/tools/haskell/packdeps {}; + pathPieces = callPackage ../development/libraries/haskell/path-pieces {}; patience = callPackage ../development/libraries/haskell/patience {}; @@ -1886,8 +1904,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in }; parallel_3_2_0_3 = callPackage ../development/libraries/haskell/parallel/3.2.0.3.nix {}; - parallel_3_2_0_4 = callPackage ../development/libraries/haskell/parallel/3.2.0.4.nix {}; - parallel = self.parallel_3_2_0_4; + parallel_3_2_0_5 = callPackage ../development/libraries/haskell/parallel/3.2.0.5.nix {}; + parallel = self.parallel_3_2_0_5; parallelIo = callPackage ../development/libraries/haskell/parallel-io {}; @@ -2074,6 +2092,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in quickcheckPropertyMonad = callPackage ../development/libraries/haskell/quickcheck-property-monad {}; + quickcheckUnicode = callPackage ../development/libraries/haskell/quickcheck-unicode {}; + qrencode = callPackage ../development/libraries/haskell/qrencode { inherit (pkgs) qrencode; }; @@ -2213,8 +2233,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in sbv = callPackage ../development/libraries/haskell/sbv {}; scientific_0_2_0_2 = callPackage ../development/libraries/haskell/scientific/0.2.0.2.nix {}; - scientific_0_3_3_2 = callPackage ../development/libraries/haskell/scientific/0.3.3.2.nix {}; - scientific = self.scientific_0_3_3_2; + scientific_0_3_3_3 = callPackage ../development/libraries/haskell/scientific/0.3.3.3.nix {}; + scientific = self.scientific_0_3_3_3; scotty = callPackage ../development/libraries/haskell/scotty {}; @@ -2236,13 +2256,13 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in servant = callPackage ../development/libraries/haskell/servant {}; - servantPool = callPackage ../development/libraries/haskell/servant-pool {}; + servantServer = callPackage ../development/libraries/haskell/servant-server {}; - servantPostgresql = callPackage ../development/libraries/haskell/servant-postgresql {}; + servantClient = callPackage ../development/libraries/haskell/servant-client {}; - servantResponse = callPackage ../development/libraries/haskell/servant-response {}; + servantDocs = callPackage ../development/libraries/haskell/servant-docs {}; - servantScotty = callPackage ../development/libraries/haskell/servant-scotty {}; + servantJquery = callPackage ../development/libraries/haskell/servant-jquery {}; setenv = callPackage ../development/libraries/haskell/setenv {}; @@ -2550,8 +2570,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in text_0_11_2_3 = callPackage ../development/libraries/haskell/text/0.11.2.3.nix {}; text_1_1_1_3 = callPackage ../development/libraries/haskell/text/1.1.1.3.nix {}; - text_1_2_0_0 = callPackage ../development/libraries/haskell/text/1.2.0.0.nix {}; - text = self.text_1_2_0_0; + text_1_2_0_3 = callPackage ../development/libraries/haskell/text/1.2.0.3.nix {}; + text = self.text_1_2_0_3; textBinary = callPackage ../development/libraries/haskell/text-binary {}; @@ -2614,14 +2634,12 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in tostring = callPackage ../development/libraries/haskell/tostring {}; transformers_0_3_0_0 = callPackage ../development/libraries/haskell/transformers/0.3.0.0.nix {}; - transformers_0_4_1_0 = callPackage ../development/libraries/haskell/transformers/0.4.1.0.nix {}; + transformers_0_4_2_0 = callPackage ../development/libraries/haskell/transformers/0.4.2.0.nix {}; transformers = null; # core package since ghc >= 7.8.x transformersBase = callPackage ../development/libraries/haskell/transformers-base {}; - transformersCompat_0_3_3 = callPackage ../development/libraries/haskell/transformers-compat/0.3.3.nix {}; - transformersCompat_0_3_3_4 = callPackage ../development/libraries/haskell/transformers-compat/0.3.3.4.nix {}; - transformersCompat = self.transformersCompat_0_3_3_4; + transformersCompat = callPackage ../development/libraries/haskell/transformers-compat {}; transformersFree = callPackage ../development/libraries/haskell/transformers-free {}; @@ -2641,6 +2659,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in twitterTypesLens = callPackage ../development/libraries/haskell/twitter-types-lens {}; + typeAligned = callPackage ../development/libraries/haskell/type-aligned {}; + TypeCompose = callPackage ../development/libraries/haskell/TypeCompose {}; typeEq = callPackage ../development/libraries/haskell/type-eq {}; @@ -2738,8 +2758,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in vect = callPackage ../development/libraries/haskell/vect {}; vector_0_10_9_3 = callPackage ../development/libraries/haskell/vector/0.10.9.3.nix {}; - vector_0_10_12_1 = callPackage ../development/libraries/haskell/vector/0.10.12.1.nix {}; - vector = self.vector_0_10_12_1; + vector_0_10_12_2 = callPackage ../development/libraries/haskell/vector/0.10.12.2.nix {}; + vector = self.vector_0_10_12_2; vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {}; @@ -2928,8 +2948,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in zeromq4Haskell = callPackage ../development/libraries/haskell/zeromq4-haskell { zeromq = pkgs.zeromq4; }; zipArchive_0_2_2_1 = callPackage ../development/libraries/haskell/zip-archive/0.2.2.1.nix {}; - zipArchive_0_2_3_4 = callPackage ../development/libraries/haskell/zip-archive/0.2.3.4.nix {}; - zipArchive = self.zipArchive_0_2_3_4; + zipArchive_0_2_3_5 = callPackage ../development/libraries/haskell/zip-archive/0.2.3.5.nix {}; + zipArchive = self.zipArchive_0_2_3_5; zipper = callPackage ../development/libraries/haskell/zipper {}; @@ -2945,7 +2965,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in # Compilers. - Agda = callPackage ../development/compilers/agda { haskellSrcExts = self.haskellSrcExts_1_15_0_1; }; + Agda = callPackage ../development/compilers/agda {}; epic = callPackage ../development/compilers/epic {}; @@ -3132,11 +3152,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix { Cabal = self.Cabal_1_16_0_3; }; cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix { Cabal = self.Cabal_1_18_1_3; }; - cabalInstall_1_20_0_3 = callPackage ../tools/package-management/cabal-install/1.20.0.3.nix { - HTTP = self.HTTP.override { network = self.network_2_5_0_0; }; - Cabal = self.Cabal_1_20_0_2; - }; - cabalInstall = self.cabalInstall_1_20_0_3; + cabalInstall_1_20_0_4 = callPackage ../tools/package-management/cabal-install/1.20.0.4.nix { Cabal = self.Cabal_1_20_0_2; }; + cabalInstall = self.cabalInstall_1_20_0_4; codex = callPackage ../development/tools/haskell/codex {}; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 245483e76b38..eeff4a47f9e1 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -5,8 +5,9 @@ for each package in a separate file: the call to the function would be almost as must code as the function itself. */ -{ fetchurl, stdenv, lua, callPackage, unzip, zziplib -, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat +{ fetchurl, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool +, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo +, perl, gtk, python, glib, gobjectIntrospection }: let @@ -14,6 +15,7 @@ let isLua52 = lua.luaversion == "5.2"; self = _self; _self = with self; { + inherit lua; inherit (stdenv.lib) maintainers; #define build lua package function @@ -255,4 +257,31 @@ let license = stdenv.lib.licenses.mit; }; }; + + lgi = stdenv.mkDerivation rec { + name = "lgi-${version}"; + version = "0.7.2"; + + src = fetchurl { + url = "https://github.com/pavouk/lgi/archive/${version}.tar.gz"; + sha256 = "0ihl7gg77b042vsfh0k7l53b7sl3d7mmrq8ns5lrsf71dzrr19bn"; + }; + + meta = with stdenv.lib; { + description = "GObject-introspection based dynamic Lua binding to GObject based libraries"; + homepage = https://github.com/pavouk/lgi; + license = "custom"; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; + + buildInputs = [ glib gobjectIntrospection lua pkgconfig ]; + + makeFlags = [ "LUA_VERSION=${lua.luaversion}" ]; + + preBuild = '' + sed -i "s|/usr/local|$out|" lgi/Makefile + ''; + }; + }; in self diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index b2ce39216cc4..10a19fda8aee 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -137,44 +137,22 @@ self.by-version."abbrev"."1.0.5"; by-spec."abbrev"."~1.0.5" = self.by-version."abbrev"."1.0.5"; - by-spec."accepts"."1.0.0" = - self.by-version."accepts"."1.0.0"; - by-version."accepts"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "accepts-1.0.0"; - bin = false; - 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 = { - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "negotiator-0.3.0" = self.by-version."negotiator"."0.3.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "accepts" ]; - }; by-spec."accepts"."~1.1.0" = - self.by-version."accepts"."1.1.3"; - by-version."accepts"."1.1.3" = lib.makeOverridable self.buildNodePackage { - name = "accepts-1.1.3"; + self.by-version."accepts"."1.1.4"; + by-version."accepts"."1.1.4" = lib.makeOverridable self.buildNodePackage { + name = "accepts-1.1.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/accepts/-/accepts-1.1.3.tgz"; - name = "accepts-1.1.3.tgz"; - sha1 = "14d99f8ee3ea69f8709d4bd17ffe153bef0f6c6d"; + url = "http://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz"; + name = "accepts-1.1.4.tgz"; + sha1 = "d71c96f7d41d0feda2c38cd14e8a27c04158df4a"; }) ]; buildInputs = (self.nativeDeps."accepts" or []); deps = { - "mime-types-2.0.3" = self.by-version."mime-types"."2.0.3"; + "mime-types-2.0.4" = self.by-version."mime-types"."2.0.4"; "negotiator-0.4.9" = self.by-version."negotiator"."0.4.9"; }; peerDependencies = [ @@ -182,9 +160,11 @@ passthru.names = [ "accepts" ]; }; by-spec."accepts"."~1.1.2" = - self.by-version."accepts"."1.1.3"; + self.by-version."accepts"."1.1.4"; by-spec."accepts"."~1.1.3" = - self.by-version."accepts"."1.1.3"; + self.by-version."accepts"."1.1.4"; + by-spec."accepts"."~1.1.4" = + self.by-version."accepts"."1.1.4"; by-spec."acorn"."^0.8.0" = self.by-version."acorn"."0.8.0"; by-version."acorn"."0.8.0" = lib.makeOverridable self.buildNodePackage { @@ -348,7 +328,7 @@ buildInputs = (self.nativeDeps."airplay-js" or []); deps = { - "mdns-js-0.2.2" = self.by-version."mdns-js"."0.2.2"; + "mdns-js-0.2.4" = self.by-version."mdns-js"."0.2.4"; "plist-with-patches-0.5.1" = self.by-version."plist-with-patches"."0.5.1"; }; peerDependencies = [ @@ -419,26 +399,6 @@ ]; passthru.names = [ "ansi" ]; }; - by-spec."ansi"."~0.2.1" = - self.by-version."ansi"."0.2.1"; - by-version."ansi"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "ansi-0.2.1"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ansi/-/ansi-0.2.1.tgz"; - name = "ansi-0.2.1.tgz"; - sha1 = "3ab568ec18cd0ab7753c83117d57dad684a1c017"; - }) - ]; - buildInputs = - (self.nativeDeps."ansi" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "ansi" ]; - }; by-spec."ansi"."~0.3.0" = self.by-version."ansi"."0.3.0"; by-version."ansi"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -501,6 +461,26 @@ }; by-spec."ansi-regex"."^0.2.1" = self.by-version."ansi-regex"."0.2.1"; + by-spec."ansi-regex"."^1.0.0" = + self.by-version."ansi-regex"."1.1.0"; + by-version."ansi-regex"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "ansi-regex-1.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.0.tgz"; + name = "ansi-regex-1.1.0.tgz"; + sha1 = "67792c5d6ad05c792d6cd6057ac8f5e69ebf4357"; + }) + ]; + buildInputs = + (self.nativeDeps."ansi-regex" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "ansi-regex" ]; + }; by-spec."ansi-remover"."*" = self.by-version."ansi-remover"."0.0.2"; by-version."ansi-remover"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -639,7 +619,7 @@ (self.nativeDeps."archiver" or []); deps = { "async-0.9.0" = self.by-version."async"."0.9.0"; - "buffer-crc32-0.2.4" = self.by-version."buffer-crc32"."0.2.4"; + "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5"; "glob-4.0.6" = self.by-version."glob"."4.0.6"; "lazystream-0.1.0" = self.by-version."lazystream"."0.1.0"; "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; @@ -718,7 +698,27 @@ passthru.names = [ "argparse" ]; }; by-spec."argparse"."~ 0.1.11" = - self.by-version."argparse"."0.1.15"; + self.by-version."argparse"."0.1.16"; + by-version."argparse"."0.1.16" = lib.makeOverridable self.buildNodePackage { + name = "argparse-0.1.16"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz"; + name = "argparse-0.1.16.tgz"; + sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c"; + }) + ]; + buildInputs = + (self.nativeDeps."argparse" or []); + deps = { + "underscore-1.7.0" = self.by-version."underscore"."1.7.0"; + "underscore.string-2.4.0" = self.by-version."underscore.string"."2.4.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "argparse" ]; + }; by-spec."array-filter"."~0.0.0" = self.by-version."array-filter"."0.0.1"; by-version."array-filter"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -841,7 +841,7 @@ ]; passthru.names = [ "asn1" ]; }; - by-spec."asn1.js".">=0.6.0-0 >=0.6.4-0 <0.7.0-0" = + by-spec."asn1.js".">=0.6.0-0 >=0.6.5-0 <0.7.0-0" = self.by-version."asn1.js"."0.6.5"; by-version."asn1.js"."0.6.5" = lib.makeOverridable self.buildNodePackage { name = "asn1.js-0.6.5"; @@ -864,7 +864,7 @@ }; by-spec."asn1.js"."^0.6.0" = self.by-version."asn1.js"."0.6.5"; - by-spec."asn1.js"."^0.6.4" = + by-spec."asn1.js"."^0.6.5" = self.by-version."asn1.js"."0.6.5"; by-spec."asn1.js-rfc3280"."^0.5.1" = self.by-version."asn1.js-rfc3280"."0.5.1"; @@ -1135,26 +1135,8 @@ self.by-version."async"."0.2.10"; by-spec."async"."~0.2.9" = self.by-version."async"."0.2.10"; - by-spec."async"."~0.8" = - self.by-version."async"."0.8.0"; - by-version."async"."0.8.0" = lib.makeOverridable self.buildNodePackage { - name = "async-0.8.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.8.0.tgz"; - name = "async-0.8.0.tgz"; - sha1 = "ee65ec77298c2ff1456bc4418a052d0f06435112"; - }) - ]; - buildInputs = - (self.nativeDeps."async" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "async" ]; - }; + by-spec."async"."~0.9" = + self.by-version."async"."0.9.0"; by-spec."async"."~0.9.0" = self.by-version."async"."0.9.0"; by-spec."async-each"."~0.1.5" = @@ -1199,15 +1181,15 @@ passthru.names = [ "async-some" ]; }; by-spec."aws-sdk"."*" = - self.by-version."aws-sdk"."2.0.29"; - by-version."aws-sdk"."2.0.29" = lib.makeOverridable self.buildNodePackage { - name = "aws-sdk-2.0.29"; + self.by-version."aws-sdk"."2.1.4"; + by-version."aws-sdk"."2.1.4" = lib.makeOverridable self.buildNodePackage { + name = "aws-sdk-2.1.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.29.tgz"; - name = "aws-sdk-2.0.29.tgz"; - sha1 = "01c8f18d43a1174637e04dad20cd04673385e18b"; + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1.4.tgz"; + name = "aws-sdk-2.1.4.tgz"; + sha1 = "228a70fb95bb8ccf721423b87ab1c60a147cd38d"; }) ]; buildInputs = @@ -1220,7 +1202,7 @@ ]; passthru.names = [ "aws-sdk" ]; }; - "aws-sdk" = self.by-version."aws-sdk"."2.0.29"; + "aws-sdk" = self.by-version."aws-sdk"."2.1.4"; by-spec."aws-sdk".">=1.2.0 <2" = self.by-version."aws-sdk"."1.18.0"; by-version."aws-sdk"."1.18.0" = lib.makeOverridable self.buildNodePackage { @@ -1365,6 +1347,26 @@ ]; passthru.names = [ "backoff" ]; }; + by-spec."balanced-match"."^0.2.0" = + self.by-version."balanced-match"."0.2.0"; + by-version."balanced-match"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "balanced-match-0.2.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"; + name = "balanced-match-0.2.0.tgz"; + sha1 = "38f6730c03aab6d5edbb52bd934885e756d71674"; + }) + ]; + buildInputs = + (self.nativeDeps."balanced-match" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "balanced-match" ]; + }; by-spec."base62"."0.1.1" = self.by-version."base62"."0.1.1"; by-version."base62"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -1757,7 +1759,7 @@ deps = { "bencode-0.6.0" = self.by-version."bencode"."0.6.0"; "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1"; - "compact2string-1.3.0" = self.by-version."compact2string"."1.3.0"; + "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0"; "debug-1.0.4" = self.by-version."debug"."1.0.4"; "hat-0.0.3" = self.by-version."hat"."0.0.3"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; @@ -1765,7 +1767,7 @@ "once-1.3.1" = self.by-version."once"."1.3.1"; "portfinder-0.2.1" = self.by-version."portfinder"."0.2.1"; "run-parallel-1.0.0" = self.by-version."run-parallel"."1.0.0"; - "string2compact-1.2.0" = self.by-version."string2compact"."1.2.0"; + "string2compact-1.2.1" = self.by-version."string2compact"."1.2.1"; }; peerDependencies = [ ]; @@ -1789,7 +1791,7 @@ "addr-to-ip-port-1.4.0" = self.by-version."addr-to-ip-port"."1.4.0"; "bencode-0.6.0" = self.by-version."bencode"."0.6.0"; "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1"; - "compact2string-1.3.0" = self.by-version."compact2string"."1.3.0"; + "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0"; "debug-2.1.0" = self.by-version."debug"."2.1.0"; "hat-0.0.3" = self.by-version."hat"."0.0.3"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; @@ -1797,22 +1799,22 @@ "k-bucket-0.4.2" = self.by-version."k-bucket"."0.4.2"; "once-1.3.1" = self.by-version."once"."1.3.1"; "run-parallel-1.0.0" = self.by-version."run-parallel"."1.0.0"; - "string2compact-1.2.0" = self.by-version."string2compact"."1.2.0"; + "string2compact-1.2.1" = self.by-version."string2compact"."1.2.1"; }; peerDependencies = [ ]; passthru.names = [ "bittorrent-dht" ]; }; by-spec."bittorrent-tracker"."^2.0.0" = - self.by-version."bittorrent-tracker"."2.9.1"; - by-version."bittorrent-tracker"."2.9.1" = lib.makeOverridable self.buildNodePackage { - name = "bittorrent-tracker-2.9.1"; + self.by-version."bittorrent-tracker"."2.10.0"; + by-version."bittorrent-tracker"."2.10.0" = lib.makeOverridable self.buildNodePackage { + name = "bittorrent-tracker-2.10.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-2.9.1.tgz"; - name = "bittorrent-tracker-2.9.1.tgz"; - sha1 = "a1168960898a02bc193f95d60d07504a31154cee"; + url = "http://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-2.10.0.tgz"; + name = "bittorrent-tracker-2.10.0.tgz"; + sha1 = "faa80f136d37432c2a3db6a9c21a4d92c89f2b56"; }) ]; buildInputs = @@ -1821,7 +1823,7 @@ "bencode-0.6.0" = self.by-version."bencode"."0.6.0"; "bn.js-0.15.2" = self.by-version."bn.js"."0.15.2"; "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1"; - "compact2string-1.3.0" = self.by-version."compact2string"."1.3.0"; + "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0"; "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; "debug-2.1.0" = self.by-version."debug"."2.1.0"; "extend.js-0.0.1" = self.by-version."extend.js"."0.0.1"; @@ -1830,14 +1832,15 @@ "ip-0.3.2" = self.by-version."ip"."0.3.2"; "once-1.3.1" = self.by-version."once"."1.3.1"; "portfinder-0.2.1" = self.by-version."portfinder"."0.2.1"; - "string2compact-1.2.0" = self.by-version."string2compact"."1.2.0"; + "run-series-1.0.2" = self.by-version."run-series"."1.0.2"; + "string2compact-1.2.1" = self.by-version."string2compact"."1.2.1"; }; peerDependencies = [ ]; passthru.names = [ "bittorrent-tracker" ]; }; by-spec."bittorrent-tracker"."^2.6.0" = - self.by-version."bittorrent-tracker"."2.9.1"; + self.by-version."bittorrent-tracker"."2.10.0"; by-spec."bl"."^0.9.0" = self.by-version."bl"."0.9.3"; by-version."bl"."0.9.3" = lib.makeOverridable self.buildNodePackage { @@ -1885,15 +1888,15 @@ by-spec."block-stream"."0.0.7" = self.by-version."block-stream"."0.0.7"; by-spec."bluebird".">= 1.2.1" = - self.by-version."bluebird"."2.3.11"; - by-version."bluebird"."2.3.11" = lib.makeOverridable self.buildNodePackage { - name = "bluebird-2.3.11"; + self.by-version."bluebird"."2.4.0"; + by-version."bluebird"."2.4.0" = lib.makeOverridable self.buildNodePackage { + name = "bluebird-2.4.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/bluebird/-/bluebird-2.3.11.tgz"; - name = "bluebird-2.3.11.tgz"; - sha1 = "15bb78ed32abf27b090640c0f85e4b91f615c8b6"; + url = "http://registry.npmjs.org/bluebird/-/bluebird-2.4.0.tgz"; + name = "bluebird-2.4.0.tgz"; + sha1 = "db8f4afa2682459cc625235e155e0782e719b279"; }) ]; buildInputs = @@ -1950,6 +1953,26 @@ self.by-version."bn.js"."0.15.2"; by-spec."bn.js"."^0.15.2" = self.by-version."bn.js"."0.15.2"; + by-spec."bn.js"."^0.16.0" = + self.by-version."bn.js"."0.16.0"; + by-version."bn.js"."0.16.0" = lib.makeOverridable self.buildNodePackage { + name = "bn.js-0.16.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bn.js/-/bn.js-0.16.0.tgz"; + name = "bn.js-0.16.0.tgz"; + sha1 = "5b6f7ea86ec2f8e065dee2b4d5f1540314bf523e"; + }) + ]; + buildInputs = + (self.nativeDeps."bn.js" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "bn.js" ]; + }; by-spec."bncode"."^0.2.3" = self.by-version."bncode"."0.2.3"; by-version."bncode"."0.2.3" = lib.makeOverridable self.buildNodePackage { @@ -2012,7 +2035,7 @@ "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0"; "qs-2.2.4" = self.by-version."qs"."2.2.4"; "raw-body-1.3.0" = self.by-version."raw-body"."1.3.0"; - "type-is-1.5.3" = self.by-version."type-is"."1.5.3"; + "type-is-1.5.4" = self.by-version."type-is"."1.5.4"; }; peerDependencies = [ ]; @@ -2040,7 +2063,7 @@ "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1"; "qs-2.3.3" = self.by-version."qs"."2.3.3"; "raw-body-1.3.1" = self.by-version."raw-body"."1.3.1"; - "type-is-1.5.3" = self.by-version."type-is"."1.5.3"; + "type-is-1.5.4" = self.by-version."type-is"."1.5.4"; }; peerDependencies = [ ]; @@ -2115,7 +2138,7 @@ "chmodr-0.1.0" = self.by-version."chmodr"."0.1.0"; "decompress-zip-0.0.8" = self.by-version."decompress-zip"."0.0.8"; "fstream-1.0.3" = self.by-version."fstream"."1.0.3"; - "fstream-ignore-1.0.1" = self.by-version."fstream-ignore"."1.0.1"; + "fstream-ignore-1.0.2" = self.by-version."fstream-ignore"."1.0.2"; "glob-4.0.6" = self.by-version."glob"."4.0.6"; "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "handlebars-2.0.0" = self.by-version."handlebars"."2.0.0"; @@ -2143,7 +2166,7 @@ "tar-fs-0.5.2" = self.by-version."tar-fs"."0.5.2"; "tmp-0.0.23" = self.by-version."tmp"."0.0.23"; "update-notifier-0.2.0" = self.by-version."update-notifier"."0.2.0"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; }; peerDependencies = [ ]; @@ -2362,6 +2385,28 @@ ]; passthru.names = [ "bplist-parser" ]; }; + by-spec."brace-expansion"."^1.0.0" = + self.by-version."brace-expansion"."1.1.0"; + by-version."brace-expansion"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "brace-expansion-1.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz"; + name = "brace-expansion-1.1.0.tgz"; + sha1 = "c9b7d03c03f37bc704be100e522b40db8f6cfcd9"; + }) + ]; + buildInputs = + (self.nativeDeps."brace-expansion" or []); + deps = { + "balanced-match-0.2.0" = self.by-version."balanced-match"."0.2.0"; + "concat-map-0.0.1" = self.by-version."concat-map"."0.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "brace-expansion" ]; + }; by-spec."brfs"."0.0.8" = self.by-version."brfs"."0.0.8"; by-version."brfs"."0.0.8" = lib.makeOverridable self.buildNodePackage { @@ -2529,28 +2574,28 @@ by-spec."browser-request"."~0.3.1" = self.by-version."browser-request"."0.3.3"; by-spec."browser-resolve"."^1.3.0" = - self.by-version."browser-resolve"."1.4.1"; - by-version."browser-resolve"."1.4.1" = lib.makeOverridable self.buildNodePackage { - name = "browser-resolve-1.4.1"; + self.by-version."browser-resolve"."1.5.0"; + by-version."browser-resolve"."1.5.0" = lib.makeOverridable self.buildNodePackage { + name = "browser-resolve-1.5.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.4.1.tgz"; - name = "browser-resolve-1.4.1.tgz"; - sha1 = "65ac7963f65bd49fa50711c877a1e273bb17a85b"; + url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.5.0.tgz"; + name = "browser-resolve-1.5.0.tgz"; + sha1 = "716cc9008aa2161a38e4c823bb5aa097cff40447"; }) ]; buildInputs = (self.nativeDeps."browser-resolve" or []); deps = { - "resolve-0.7.4" = self.by-version."resolve"."0.7.4"; + "resolve-1.0.0" = self.by-version."resolve"."1.0.0"; }; peerDependencies = [ ]; passthru.names = [ "browser-resolve" ]; }; by-spec."browser-resolve"."^1.3.1" = - self.by-version."browser-resolve"."1.4.1"; + self.by-version."browser-resolve"."1.5.0"; by-spec."browser-resolve"."~1.2.1" = self.by-version."browser-resolve"."1.2.4"; by-version."browser-resolve"."1.2.4" = lib.makeOverridable self.buildNodePackage { @@ -2590,8 +2635,8 @@ (self.nativeDeps."browserchannel" or []); deps = { "hat-0.0.3" = self.by-version."hat"."0.0.3"; - "connect-2.27.4" = self.by-version."connect"."2.27.4"; - "request-2.49.0" = self.by-version."request"."2.49.0"; + "connect-2.27.6" = self.by-version."connect"."2.27.6"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "ascii-json-0.2.0" = self.by-version."ascii-json"."0.2.0"; }; peerDependencies = [ @@ -2600,15 +2645,15 @@ }; "browserchannel" = self.by-version."browserchannel"."2.0.0"; by-spec."browserify"."*" = - self.by-version."browserify"."6.3.3"; - by-version."browserify"."6.3.3" = lib.makeOverridable self.buildNodePackage { - name = "browserify-6.3.3"; + self.by-version."browserify"."7.0.3"; + by-version."browserify"."7.0.3" = lib.makeOverridable self.buildNodePackage { + name = "browserify-7.0.3"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/browserify/-/browserify-6.3.3.tgz"; - name = "browserify-6.3.3.tgz"; - sha1 = "d2a5031a24aec8045eb8174b501bf3f6248455d4"; + url = "http://registry.npmjs.org/browserify/-/browserify-7.0.3.tgz"; + name = "browserify-7.0.3.tgz"; + sha1 = "b839f84ed22c24b67f79af68002e5684c73d534e"; }) ]; buildInputs = @@ -2617,29 +2662,29 @@ "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4"; "assert-1.1.2" = self.by-version."assert"."1.1.2"; "browser-pack-3.2.0" = self.by-version."browser-pack"."3.2.0"; - "browser-resolve-1.4.1" = self.by-version."browser-resolve"."1.4.1"; + "browser-resolve-1.5.0" = self.by-version."browser-resolve"."1.5.0"; "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4"; - "buffer-2.8.1" = self.by-version."buffer"."2.8.1"; + "buffer-2.8.2" = self.by-version."buffer"."2.8.2"; "builtins-0.0.7" = self.by-version."builtins"."0.0.7"; "commondir-0.0.1" = self.by-version."commondir"."0.0.1"; "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0"; "constants-browserify-0.0.1" = self.by-version."constants-browserify"."0.0.1"; - "crypto-browserify-3.6.0" = self.by-version."crypto-browserify"."3.6.0"; + "crypto-browserify-3.7.0" = self.by-version."crypto-browserify"."3.7.0"; "deep-equal-0.2.1" = self.by-version."deep-equal"."0.2.1"; "defined-0.0.0" = self.by-version."defined"."0.0.0"; "deps-sort-1.3.5" = self.by-version."deps-sort"."1.3.5"; "domain-browser-1.1.3" = self.by-version."domain-browser"."1.1.3"; "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2"; "events-1.0.2" = self.by-version."events"."1.0.2"; - "glob-4.2.2" = self.by-version."glob"."4.2.2"; + "glob-4.3.2" = self.by-version."glob"."4.3.2"; "http-browserify-1.7.0" = self.by-version."http-browserify"."1.7.0"; "https-browserify-0.0.0" = self.by-version."https-browserify"."0.0.0"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; "insert-module-globals-6.1.0" = self.by-version."insert-module-globals"."6.1.0"; "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; "labeled-stream-splicer-1.0.2" = self.by-version."labeled-stream-splicer"."1.0.2"; - "module-deps-3.5.10" = self.by-version."module-deps"."3.5.10"; + "module-deps-3.6.3" = self.by-version."module-deps"."3.6.3"; "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2"; "parents-0.0.3" = self.by-version."parents"."0.0.3"; "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0"; @@ -2668,7 +2713,7 @@ ]; passthru.names = [ "browserify" ]; }; - "browserify" = self.by-version."browserify"."6.3.3"; + "browserify" = self.by-version."browserify"."7.0.3"; by-spec."browserify"."3.46.0" = self.by-version."browserify"."3.46.0"; by-version."browserify"."3.46.0" = lib.makeOverridable self.buildNodePackage { @@ -2855,16 +2900,16 @@ ]; passthru.names = [ "browserify" ]; }; - by-spec."browserify-aes"."0.6.0" = - self.by-version."browserify-aes"."0.6.0"; - by-version."browserify-aes"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "browserify-aes-0.6.0"; + by-spec."browserify-aes"."0.6.1" = + self.by-version."browserify-aes"."0.6.1"; + by-version."browserify-aes"."0.6.1" = lib.makeOverridable self.buildNodePackage { + name = "browserify-aes-0.6.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/browserify-aes/-/browserify-aes-0.6.0.tgz"; - name = "browserify-aes-0.6.0.tgz"; - sha1 = "07df03037306a94f453da08cbaf1b42afcc3b18f"; + url = "http://registry.npmjs.org/browserify-aes/-/browserify-aes-0.6.1.tgz"; + name = "browserify-aes-0.6.1.tgz"; + sha1 = "a7466136ffcb0a2a955d98afa8dc2ced6dc6c004"; }) ]; buildInputs = @@ -2876,27 +2921,25 @@ ]; passthru.names = [ "browserify-aes" ]; }; - by-spec."browserify-sign"."2.4.0" = - self.by-version."browserify-sign"."2.4.0"; - by-version."browserify-sign"."2.4.0" = lib.makeOverridable self.buildNodePackage { - name = "browserify-sign-2.4.0"; + by-spec."browserify-sign"."2.6.0" = + self.by-version."browserify-sign"."2.6.0"; + by-version."browserify-sign"."2.6.0" = lib.makeOverridable self.buildNodePackage { + name = "browserify-sign-2.6.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/browserify-sign/-/browserify-sign-2.4.0.tgz"; - name = "browserify-sign-2.4.0.tgz"; - sha1 = "55bef52192091216336db4fb0bcc88c1d8f049fd"; + url = "http://registry.npmjs.org/browserify-sign/-/browserify-sign-2.6.0.tgz"; + name = "browserify-sign-2.6.0.tgz"; + sha1 = "35def87585f0d8f4b116783a55e1a3711a2c48e3"; }) ]; buildInputs = (self.nativeDeps."browserify-sign" or []); deps = { - "asn1.js-0.6.5" = self.by-version."asn1.js"."0.6.5"; - "asn1.js-rfc3280-0.5.1" = self.by-version."asn1.js-rfc3280"."0.5.1"; "bn.js-0.15.2" = self.by-version."bn.js"."0.15.2"; "elliptic-0.15.15" = self.by-version."elliptic"."0.15.15"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "pemstrip-0.0.1" = self.by-version."pemstrip"."0.0.1"; + "parse-asn1-1.2.0" = self.by-version."parse-asn1"."1.2.0"; "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; }; peerDependencies = [ @@ -2966,36 +3009,16 @@ ]; passthru.names = [ "bson" ]; }; - by-spec."bson"."0.2.5" = - self.by-version."bson"."0.2.5"; - by-version."bson"."0.2.5" = lib.makeOverridable self.buildNodePackage { - name = "bson-0.2.5"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/bson/-/bson-0.2.5.tgz"; - name = "bson-0.2.5.tgz"; - sha1 = "500d26d883ddc8e02f2c88011627636111c105c5"; - }) - ]; - buildInputs = - (self.nativeDeps."bson" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "bson" ]; - }; by-spec."bson"."~0.2" = - self.by-version."bson"."0.2.15"; - by-version."bson"."0.2.15" = lib.makeOverridable self.buildNodePackage { - name = "bson-0.2.15"; + self.by-version."bson"."0.2.16"; + by-version."bson"."0.2.16" = lib.makeOverridable self.buildNodePackage { + name = "bson-0.2.16"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/bson/-/bson-0.2.15.tgz"; - name = "bson-0.2.15.tgz"; - sha1 = "556402c74bf33d8008122cc3091dc8b3b90e330c"; + url = "http://registry.npmjs.org/bson/-/bson-0.2.16.tgz"; + name = "bson-0.2.16.tgz"; + sha1 = "c4d056d16631ec481e8ef33659c01e581d2b97ed"; }) ]; buildInputs = @@ -3008,15 +3031,15 @@ passthru.names = [ "bson" ]; }; by-spec."buffer"."^2.3.0" = - self.by-version."buffer"."2.8.1"; - by-version."buffer"."2.8.1" = lib.makeOverridable self.buildNodePackage { - name = "buffer-2.8.1"; + self.by-version."buffer"."2.8.2"; + by-version."buffer"."2.8.2" = lib.makeOverridable self.buildNodePackage { + name = "buffer-2.8.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/buffer/-/buffer-2.8.1.tgz"; - name = "buffer-2.8.1.tgz"; - sha1 = "6c632bf47cb7ec86509254ed42ab080937986114"; + url = "http://registry.npmjs.org/buffer/-/buffer-2.8.2.tgz"; + name = "buffer-2.8.2.tgz"; + sha1 = "d73c214c0334384dc29b04ee0ff5f5527c7974e7"; }) ]; buildInputs = @@ -3093,15 +3116,15 @@ passthru.names = [ "buffer-crc32" ]; }; by-spec."buffer-crc32"."~0.2.1" = - self.by-version."buffer-crc32"."0.2.4"; - by-version."buffer-crc32"."0.2.4" = lib.makeOverridable self.buildNodePackage { - name = "buffer-crc32-0.2.4"; + self.by-version."buffer-crc32"."0.2.5"; + by-version."buffer-crc32"."0.2.5" = lib.makeOverridable self.buildNodePackage { + name = "buffer-crc32-0.2.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.4.tgz"; - name = "buffer-crc32-0.2.4.tgz"; - sha1 = "f729c4c5d2eb39ba49f29422175cc20b0bf1b96f"; + url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz"; + name = "buffer-crc32-0.2.5.tgz"; + sha1 = "db003ac2671e62ebd6ece78ea2c2e1b405736e91"; }) ]; buildInputs = @@ -3710,21 +3733,21 @@ by-spec."chmodr"."~0.1.0" = self.by-version."chmodr"."0.1.0"; by-spec."chokidar".">=0.8.2" = - self.by-version."chokidar"."0.11.1"; - by-version."chokidar"."0.11.1" = lib.makeOverridable self.buildNodePackage { - name = "chokidar-0.11.1"; + self.by-version."chokidar"."0.12.5"; + by-version."chokidar"."0.12.5" = lib.makeOverridable self.buildNodePackage { + name = "chokidar-0.12.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/chokidar/-/chokidar-0.11.1.tgz"; - name = "chokidar-0.11.1.tgz"; - sha1 = "b00e01717de445783782ef5c48a803e05fed0fc4"; + url = "http://registry.npmjs.org/chokidar/-/chokidar-0.12.5.tgz"; + name = "chokidar-0.12.5.tgz"; + sha1 = "69ce0c49752dc4d32b5a45023b4b83661f858107"; }) ]; buildInputs = (self.nativeDeps."chokidar" or []); deps = { - "readdirp-1.1.0" = self.by-version."readdirp"."1.1.0"; + "readdirp-1.3.0" = self.by-version."readdirp"."1.3.0"; "async-each-0.1.6" = self.by-version."async-each"."0.1.6"; "fsevents-0.3.1" = self.by-version."fsevents"."0.3.1"; }; @@ -3753,15 +3776,15 @@ passthru.names = [ "chownr" ]; }; by-spec."clean-css"."2.2.x" = - self.by-version."clean-css"."2.2.19"; - by-version."clean-css"."2.2.19" = lib.makeOverridable self.buildNodePackage { - name = "clean-css-2.2.19"; + self.by-version."clean-css"."2.2.22"; + by-version."clean-css"."2.2.22" = lib.makeOverridable self.buildNodePackage { + name = "clean-css-2.2.22"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/clean-css/-/clean-css-2.2.19.tgz"; - name = "clean-css-2.2.19.tgz"; - sha1 = "b5863312e2e13fdf693e44d60b41ce45cbb6fdbd"; + url = "http://registry.npmjs.org/clean-css/-/clean-css-2.2.22.tgz"; + name = "clean-css-2.2.22.tgz"; + sha1 = "2346e4656bb16a0afc25f00bd75273fdcd53ff35"; }) ]; buildInputs = @@ -3774,7 +3797,7 @@ passthru.names = [ "clean-css" ]; }; by-spec."clean-css"."~2.2.0" = - self.by-version."clean-css"."2.2.19"; + self.by-version."clean-css"."2.2.22"; by-spec."cli"."0.6.x" = self.by-version."cli"."0.6.5"; by-version."cli"."0.6.5" = lib.makeOverridable self.buildNodePackage { @@ -3821,7 +3844,7 @@ ]; passthru.names = [ "cli-color" ]; }; - by-spec."cli-table"."^0.3.0" = + by-spec."cli-table"."^0.3.1" = self.by-version."cli-table"."0.3.1"; by-version."cli-table"."0.3.1" = lib.makeOverridable self.buildNodePackage { name = "cli-table-0.3.1"; @@ -3889,7 +3912,28 @@ passthru.names = [ "cliff" ]; }; by-spec."cliff"."~0.1.9" = - self.by-version."cliff"."0.1.9"; + self.by-version."cliff"."0.1.10"; + by-version."cliff"."0.1.10" = lib.makeOverridable self.buildNodePackage { + name = "cliff-0.1.10"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cliff/-/cliff-0.1.10.tgz"; + name = "cliff-0.1.10.tgz"; + sha1 = "53be33ea9f59bec85609ee300ac4207603e52013"; + }) + ]; + buildInputs = + (self.nativeDeps."cliff" or []); + deps = { + "colors-1.0.3" = self.by-version."colors"."1.0.3"; + "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; + "winston-0.8.3" = self.by-version."winston"."0.8.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "cliff" ]; + }; by-spec."clivas"."^0.1.4" = self.by-version."clivas"."0.1.4"; by-version."clivas"."0.1.4" = lib.makeOverridable self.buildNodePackage { @@ -3970,16 +4014,16 @@ ]; passthru.names = [ "clone" ]; }; - by-spec."clone"."^0.1.18" = - self.by-version."clone"."0.1.18"; - by-version."clone"."0.1.18" = lib.makeOverridable self.buildNodePackage { - name = "clone-0.1.18"; + by-spec."clone"."^0.2.0" = + self.by-version."clone"."0.2.0"; + by-version."clone"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "clone-0.2.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/clone/-/clone-0.1.18.tgz"; - name = "clone-0.1.18.tgz"; - sha1 = "64a0d5d57eaa85a1a8af380cd1db8c7b3a895f66"; + url = "http://registry.npmjs.org/clone/-/clone-0.2.0.tgz"; + name = "clone-0.2.0.tgz"; + sha1 = "c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"; }) ]; buildInputs = @@ -3990,10 +4034,28 @@ ]; passthru.names = [ "clone" ]; }; - by-spec."clone"."~0.1.18" = - self.by-version."clone"."0.1.18"; by-spec."clone"."~0.1.5" = - self.by-version."clone"."0.1.18"; + self.by-version."clone"."0.1.19"; + by-version."clone"."0.1.19" = lib.makeOverridable self.buildNodePackage { + name = "clone-0.1.19"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/clone/-/clone-0.1.19.tgz"; + name = "clone-0.1.19.tgz"; + sha1 = "613fb68639b26a494ac53253e15b1a6bd88ada85"; + }) + ]; + buildInputs = + (self.nativeDeps."clone" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "clone" ]; + }; + by-spec."clone"."~0.2.0" = + self.by-version."clone"."0.2.0"; by-spec."clone-stats"."^0.0.1" = self.by-version."clone-stats"."0.0.1"; by-version."clone-stats"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -4038,8 +4100,6 @@ ]; passthru.names = [ "cmd-shim" ]; }; - by-spec."cmd-shim"."~1.1.1" = - self.by-version."cmd-shim"."1.1.2"; by-spec."cmd-shim"."~2.0.1" = self.by-version."cmd-shim"."2.0.1"; by-version."cmd-shim"."2.0.1" = lib.makeOverridable self.buildNodePackage { @@ -4191,7 +4251,7 @@ (self.nativeDeps."color" or []); deps = { "color-convert-0.5.2" = self.by-version."color-convert"."0.5.2"; - "color-string-0.2.1" = self.by-version."color-string"."0.2.1"; + "color-string-0.2.4" = self.by-version."color-string"."0.2.4"; }; peerDependencies = [ ]; @@ -4217,22 +4277,42 @@ ]; passthru.names = [ "color-convert" ]; }; + by-spec."color-name"."1.0.x" = + self.by-version."color-name"."1.0.0"; + by-version."color-name"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "color-name-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/color-name/-/color-name-1.0.0.tgz"; + name = "color-name-1.0.0.tgz"; + sha1 = "ce3579a4ef43b672bee4f37e8876332b5a36e6b5"; + }) + ]; + buildInputs = + (self.nativeDeps."color-name" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "color-name" ]; + }; by-spec."color-string"."0.2.x" = - self.by-version."color-string"."0.2.1"; - by-version."color-string"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "color-string-0.2.1"; + self.by-version."color-string"."0.2.4"; + by-version."color-string"."0.2.4" = lib.makeOverridable self.buildNodePackage { + name = "color-string-0.2.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/color-string/-/color-string-0.2.1.tgz"; - name = "color-string-0.2.1.tgz"; - sha1 = "2f3c1e6c1d04ddf751633b28db7fbc152055d34e"; + url = "http://registry.npmjs.org/color-string/-/color-string-0.2.4.tgz"; + name = "color-string-0.2.4.tgz"; + sha1 = "221ff64234f71aaa3e13bc8c7e8c95f3cdd8f81a"; }) ]; buildInputs = (self.nativeDeps."color-string" or []); deps = { - "color-convert-0.5.2" = self.by-version."color-convert"."0.5.2"; + "color-name-1.0.0" = self.by-version."color-name"."1.0.0"; }; peerDependencies = [ ]; @@ -4302,42 +4382,24 @@ }; by-spec."colors"."~0.6.2" = self.by-version."colors"."0.6.2"; - by-spec."columnify"."0.1.2" = - self.by-version."columnify"."0.1.2"; - by-version."columnify"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "columnify-0.1.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/columnify/-/columnify-0.1.2.tgz"; - name = "columnify-0.1.2.tgz"; - sha1 = "ab1a1f1e37b26ba4b87c6920fb717fe51c827042"; - }) - ]; - buildInputs = - (self.nativeDeps."columnify" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "columnify" ]; - }; - by-spec."columnify"."~1.2.1" = - self.by-version."columnify"."1.2.1"; - by-version."columnify"."1.2.1" = lib.makeOverridable self.buildNodePackage { - name = "columnify-1.2.1"; + by-spec."colors"."~1.0.3" = + self.by-version."colors"."1.0.3"; + by-spec."columnify"."~1.3.2" = + self.by-version."columnify"."1.3.2"; + by-version."columnify"."1.3.2" = lib.makeOverridable self.buildNodePackage { + name = "columnify-1.3.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/columnify/-/columnify-1.2.1.tgz"; - name = "columnify-1.2.1.tgz"; - sha1 = "921ec51c178f4126d3c07e9acecd67a55c7953e4"; + url = "http://registry.npmjs.org/columnify/-/columnify-1.3.2.tgz"; + name = "columnify-1.3.2.tgz"; + sha1 = "61bd578a9269ae6fd949ce36fff589f3702c7867"; }) ]; buildInputs = (self.nativeDeps."columnify" or []); deps = { - "strip-ansi-1.0.0" = self.by-version."strip-ansi"."1.0.0"; + "strip-ansi-2.0.0" = self.by-version."strip-ansi"."2.0.0"; "wcwidth-1.0.0" = self.by-version."wcwidth"."1.0.0"; }; peerDependencies = [ @@ -4361,7 +4423,7 @@ deps = { "inline-source-map-0.3.0" = self.by-version."inline-source-map"."0.3.0"; "convert-source-map-0.3.5" = self.by-version."convert-source-map"."0.3.5"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; @@ -4472,8 +4534,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 { @@ -4534,16 +4594,16 @@ ]; passthru.names = [ "commander" ]; }; - by-spec."commander"."2.x" = - self.by-version."commander"."2.5.0"; - by-version."commander"."2.5.0" = lib.makeOverridable self.buildNodePackage { - name = "commander-2.5.0"; + by-spec."commander"."2.5.x" = + self.by-version."commander"."2.5.1"; + by-version."commander"."2.5.1" = lib.makeOverridable self.buildNodePackage { + name = "commander-2.5.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-2.5.0.tgz"; - name = "commander-2.5.0.tgz"; - sha1 = "d777b6a4d847d423e5d475da864294ac1ff5aa9d"; + url = "http://registry.npmjs.org/commander/-/commander-2.5.1.tgz"; + name = "commander-2.5.1.tgz"; + sha1 = "23c61f6e47be143cc02e7ad4bb1c47f5cd5a2883"; }) ]; buildInputs = @@ -4554,14 +4614,14 @@ ]; passthru.names = [ "commander" ]; }; + by-spec."commander"."2.x" = + self.by-version."commander"."2.5.1"; by-spec."commander"."~2.0.0" = self.by-version."commander"."2.0.0"; by-spec."commander"."~2.1.0" = self.by-version."commander"."2.1.0"; - by-spec."commander"."~2.3.0" = - self.by-version."commander"."2.3.0"; by-spec."commander"."~2.5.0" = - self.by-version."commander"."2.5.0"; + self.by-version."commander"."2.5.1"; by-spec."commondir"."0.0.1" = self.by-version."commondir"."0.0.1"; by-version."commondir"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -4585,20 +4645,21 @@ by-spec."commondir"."~0.0.1" = self.by-version."commondir"."0.0.1"; by-spec."compact2string"."^1.2.0" = - self.by-version."compact2string"."1.3.0"; - by-version."compact2string"."1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "compact2string-1.3.0"; + self.by-version."compact2string"."1.4.0"; + by-version."compact2string"."1.4.0" = lib.makeOverridable self.buildNodePackage { + name = "compact2string-1.4.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/compact2string/-/compact2string-1.3.0.tgz"; - name = "compact2string-1.3.0.tgz"; - sha1 = "5e5d32fe4d40ca853ec0f6f22f7952aa9fe36135"; + url = "http://registry.npmjs.org/compact2string/-/compact2string-1.4.0.tgz"; + name = "compact2string-1.4.0.tgz"; + sha1 = "a99cd96ea000525684b269683ae2222d6eea7b49"; }) ]; buildInputs = (self.nativeDeps."compact2string" or []); deps = { + "ipaddr.js-0.1.6" = self.by-version."ipaddr.js"."0.1.6"; }; peerDependencies = [ ]; @@ -4639,7 +4700,7 @@ buildInputs = (self.nativeDeps."compress-commons" or []); deps = { - "buffer-crc32-0.2.4" = self.by-version."buffer-crc32"."0.2.4"; + "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5"; "crc32-stream-0.3.1" = self.by-version."crc32-stream"."0.3.1"; "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; }; @@ -4682,7 +4743,7 @@ buildInputs = (self.nativeDeps."compressible" or []); deps = { - "mime-db-1.2.0" = self.by-version."mime-db"."1.2.0"; + "mime-db-1.3.1" = self.by-version."mime-db"."1.3.1"; }; peerDependencies = [ ]; @@ -4726,7 +4787,7 @@ buildInputs = (self.nativeDeps."compression" or []); deps = { - "accepts-1.1.3" = self.by-version."accepts"."1.1.3"; + "accepts-1.1.4" = self.by-version."accepts"."1.1.4"; "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; "compressible-2.0.1" = self.by-version."compressible"."2.0.1"; "debug-2.0.0" = self.by-version."debug"."2.0.0"; @@ -4737,22 +4798,22 @@ ]; passthru.names = [ "compression" ]; }; - by-spec."compression"."~1.2.1" = - self.by-version."compression"."1.2.1"; - by-version."compression"."1.2.1" = lib.makeOverridable self.buildNodePackage { - name = "compression-1.2.1"; + by-spec."compression"."~1.2.2" = + self.by-version."compression"."1.2.2"; + by-version."compression"."1.2.2" = lib.makeOverridable self.buildNodePackage { + name = "compression-1.2.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/compression/-/compression-1.2.1.tgz"; - name = "compression-1.2.1.tgz"; - sha1 = "12ebaac04d308ca6103618a9716ce5634b939e9c"; + url = "http://registry.npmjs.org/compression/-/compression-1.2.2.tgz"; + name = "compression-1.2.2.tgz"; + sha1 = "637604c25ed659c0d5c9fac1038fc2f2d5494dbf"; }) ]; buildInputs = (self.nativeDeps."compression" or []); deps = { - "accepts-1.1.3" = self.by-version."accepts"."1.1.3"; + "accepts-1.1.4" = self.by-version."accepts"."1.1.4"; "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; "compressible-2.0.1" = self.by-version."compressible"."2.0.1"; "debug-2.1.0" = self.by-version."debug"."2.1.0"; @@ -4763,6 +4824,26 @@ ]; passthru.names = [ "compression" ]; }; + by-spec."concat-map"."0.0.1" = + self.by-version."concat-map"."0.0.1"; + by-version."concat-map"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "concat-map-0.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + name = "concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }) + ]; + buildInputs = + (self.nativeDeps."concat-map" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "concat-map" ]; + }; by-spec."concat-stream"."^1.4.1" = self.by-version."concat-stream"."1.4.7"; by-version."concat-stream"."1.4.7" = lib.makeOverridable self.buildNodePackage { @@ -4811,7 +4892,7 @@ deps = { "js-yaml-0.3.7" = self.by-version."js-yaml"."0.3.7"; "coffee-script-1.8.0" = self.by-version."coffee-script"."1.8.0"; - "vows-0.8.1" = self.by-version."vows"."0.8.1"; + "vows-0.9.0-rc1" = self.by-version."vows"."0.9.0-rc1"; }; peerDependencies = [ ]; @@ -4886,7 +4967,7 @@ deps = { "qs-2.3.3" = self.by-version."qs"."2.3.3"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "formidable-1.0.15" = self.by-version."formidable"."1.0.15"; + "formidable-1.0.16" = self.by-version."formidable"."1.0.16"; }; peerDependencies = [ ]; @@ -4969,16 +5050,16 @@ ]; passthru.names = [ "connect" ]; }; - by-spec."connect"."2.27.4" = - self.by-version."connect"."2.27.4"; - by-version."connect"."2.27.4" = lib.makeOverridable self.buildNodePackage { - name = "connect-2.27.4"; + by-spec."connect"."2.27.6" = + self.by-version."connect"."2.27.6"; + by-version."connect"."2.27.6" = lib.makeOverridable self.buildNodePackage { + name = "connect-2.27.6"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.27.4.tgz"; - name = "connect-2.27.4.tgz"; - sha1 = "12592c9d105326c5191176f8d57e760d6650c830"; + url = "http://registry.npmjs.org/connect/-/connect-2.27.6.tgz"; + name = "connect-2.27.6.tgz"; + sha1 = "3a097322ce731ce302e736d42e262b6d3b753d48"; }) ]; buildInputs = @@ -4990,16 +5071,16 @@ "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; "cookie-parser-1.3.3" = self.by-version."cookie-parser"."1.3.3"; "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; - "compression-1.2.1" = self.by-version."compression"."1.2.1"; + "compression-1.2.2" = self.by-version."compression"."1.2.2"; "connect-timeout-1.4.0" = self.by-version."connect-timeout"."1.4.0"; "csurf-1.6.3" = self.by-version."csurf"."1.6.3"; "debug-2.1.0" = self.by-version."debug"."2.1.0"; "depd-1.0.0" = self.by-version."depd"."1.0.0"; "errorhandler-1.2.3" = self.by-version."errorhandler"."1.2.3"; - "express-session-1.9.2" = self.by-version."express-session"."1.9.2"; + "express-session-1.9.3" = self.by-version."express-session"."1.9.3"; "finalhandler-0.3.2" = self.by-version."finalhandler"."0.3.2"; "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "http-errors-1.2.7" = self.by-version."http-errors"."1.2.7"; + "http-errors-1.2.8" = self.by-version."http-errors"."1.2.8"; "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; "method-override-2.3.0" = self.by-version."method-override"."2.3.0"; "morgan-1.4.1" = self.by-version."morgan"."1.4.1"; @@ -5009,9 +5090,9 @@ "qs-2.3.3" = self.by-version."qs"."2.3.3"; "response-time-2.2.0" = self.by-version."response-time"."2.2.0"; "serve-favicon-2.1.7" = self.by-version."serve-favicon"."2.1.7"; - "serve-index-1.5.1" = self.by-version."serve-index"."1.5.1"; + "serve-index-1.5.3" = self.by-version."serve-index"."1.5.3"; "serve-static-1.7.1" = self.by-version."serve-static"."1.7.1"; - "type-is-1.5.3" = self.by-version."type-is"."1.5.3"; + "type-is-1.5.4" = self.by-version."type-is"."1.5.4"; "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; "vhost-3.0.0" = self.by-version."vhost"."3.0.0"; "pause-0.0.1" = self.by-version."pause"."0.0.1"; @@ -5109,7 +5190,7 @@ passthru.names = [ "connect" ]; }; by-spec."connect"."~2" = - self.by-version."connect"."2.27.4"; + self.by-version."connect"."2.27.6"; by-spec."connect"."~2.26.0" = self.by-version."connect"."2.26.6"; by-version."connect"."2.26.6" = lib.makeOverridable self.buildNodePackage { @@ -5151,7 +5232,7 @@ "serve-favicon-2.1.7" = self.by-version."serve-favicon"."2.1.7"; "serve-index-1.2.1" = self.by-version."serve-index"."1.2.1"; "serve-static-1.6.4" = self.by-version."serve-static"."1.6.4"; - "type-is-1.5.3" = self.by-version."type-is"."1.5.3"; + "type-is-1.5.4" = self.by-version."type-is"."1.5.4"; "vhost-3.0.0" = self.by-version."vhost"."3.0.0"; "pause-0.0.1" = self.by-version."pause"."0.0.1"; }; @@ -5215,7 +5296,7 @@ buildInputs = (self.nativeDeps."connect-jade-static" or []); deps = { - "jade-1.8.1" = self.by-version."jade"."1.8.1"; + "jade-1.8.2" = self.by-version."jade"."1.8.2"; }; peerDependencies = [ ]; @@ -5223,27 +5304,27 @@ }; "connect-jade-static" = self.by-version."connect-jade-static"."0.1.4"; by-spec."connect-mongo"."*" = - self.by-version."connect-mongo"."0.4.1"; - by-version."connect-mongo"."0.4.1" = lib.makeOverridable self.buildNodePackage { - name = "connect-mongo-0.4.1"; + self.by-version."connect-mongo"."0.4.2"; + by-version."connect-mongo"."0.4.2" = lib.makeOverridable self.buildNodePackage { + name = "connect-mongo-0.4.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.4.1.tgz"; - name = "connect-mongo-0.4.1.tgz"; - sha1 = "01ed3e71558fb3f0fdc97b784ef974f9909ddd11"; + url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.4.2.tgz"; + name = "connect-mongo-0.4.2.tgz"; + sha1 = "a9817a9a229d790460ab0bf946ee0ce8ac3ccba7"; }) ]; buildInputs = (self.nativeDeps."connect-mongo" or []); deps = { - "mongodb-1.3.23" = self.by-version."mongodb"."1.3.23"; + "mongodb-1.4.25" = self.by-version."mongodb"."1.4.25"; }; peerDependencies = [ ]; passthru.names = [ "connect-mongo" ]; }; - "connect-mongo" = self.by-version."connect-mongo"."0.4.1"; + "connect-mongo" = self.by-version."connect-mongo"."0.4.2"; by-spec."connect-timeout"."1.0.0" = self.by-version."connect-timeout"."1.0.0"; by-version."connect-timeout"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -5304,7 +5385,7 @@ (self.nativeDeps."connect-timeout" or []); deps = { "debug-2.1.0" = self.by-version."debug"."2.1.0"; - "http-errors-1.2.7" = self.by-version."http-errors"."1.2.7"; + "http-errors-1.2.8" = self.by-version."http-errors"."1.2.8"; "ms-0.6.2" = self.by-version."ms"."0.6.2"; "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; }; @@ -5390,7 +5471,7 @@ buildInputs = (self.nativeDeps."constantinople" or []); deps = { - "uglify-js-2.4.15" = self.by-version."uglify-js"."2.4.15"; + "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16"; }; peerDependencies = [ ]; @@ -5888,7 +5969,7 @@ buildInputs = (self.nativeDeps."couch-login" or []); deps = { - "request-2.49.0" = self.by-version."request"."2.49.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; }; peerDependencies = [ ]; @@ -5997,7 +6078,7 @@ (self.nativeDeps."crc32-stream" or []); deps = { "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; - "buffer-crc32-0.2.4" = self.by-version."buffer-crc32"."0.2.4"; + "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5"; }; peerDependencies = [ ]; @@ -6109,25 +6190,26 @@ passthru.names = [ "crypto" ]; }; by-spec."crypto-browserify"."^3.0.0" = - self.by-version."crypto-browserify"."3.6.0"; - by-version."crypto-browserify"."3.6.0" = lib.makeOverridable self.buildNodePackage { - name = "crypto-browserify-3.6.0"; + self.by-version."crypto-browserify"."3.7.0"; + by-version."crypto-browserify"."3.7.0" = lib.makeOverridable self.buildNodePackage { + name = "crypto-browserify-3.7.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.6.0.tgz"; - name = "crypto-browserify-3.6.0.tgz"; - sha1 = "6f74a6d30cf0bd11ef5168410bbdc7a65f6d01cb"; + url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.7.0.tgz"; + name = "crypto-browserify-3.7.0.tgz"; + sha1 = "5b9de9b65b04f22a087cb0339db5232f536323cc"; }) ]; buildInputs = (self.nativeDeps."crypto-browserify" or []); deps = { - "browserify-aes-0.6.0" = self.by-version."browserify-aes"."0.6.0"; - "browserify-sign-2.4.0" = self.by-version."browserify-sign"."2.4.0"; + "browserify-aes-0.6.1" = self.by-version."browserify-aes"."0.6.1"; "create-ecdh-1.0.0" = self.by-version."create-ecdh"."1.0.0"; "diffie-hellman-2.2.0" = self.by-version."diffie-hellman"."2.2.0"; + "browserify-sign-2.6.0" = self.by-version."browserify-sign"."2.6.0"; "pbkdf2-compat-2.0.1" = self.by-version."pbkdf2-compat"."2.0.1"; + "public-encrypt-1.0.1" = self.by-version."public-encrypt"."1.0.1"; "ripemd160-0.2.0" = self.by-version."ripemd160"."0.2.0"; "sha.js-2.3.0" = self.by-version."sha.js"."2.3.0"; }; @@ -6301,7 +6383,7 @@ "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; "csrf-2.0.2" = self.by-version."csrf"."2.0.2"; - "http-errors-1.2.7" = self.by-version."http-errors"."1.2.7"; + "http-errors-1.2.8" = self.by-version."http-errors"."1.2.8"; }; peerDependencies = [ ]; @@ -6643,7 +6725,7 @@ }; by-spec."debug"."^0.8.1" = self.by-version."debug"."0.8.1"; - by-spec."debug"."^1.0.0" = + by-spec."debug"."^1.0" = self.by-version."debug"."1.0.4"; by-version."debug"."1.0.4" = lib.makeOverridable self.buildNodePackage { name = "debug-1.0.4"; @@ -6664,16 +6746,18 @@ ]; passthru.names = [ "debug" ]; }; + by-spec."debug"."^1.0.0" = + self.by-version."debug"."1.0.4"; by-spec."debug"."^1.0.2" = self.by-version."debug"."1.0.4"; by-spec."debug"."^2.0.0" = self.by-version."debug"."2.1.0"; by-spec."debug"."^2.1.0" = self.by-version."debug"."2.1.0"; + by-spec."debug"."~0.7.2" = + self.by-version."debug"."0.7.4"; by-spec."debug"."~0.7.4" = self.by-version."debug"."0.7.4"; - by-spec."debug"."~0.8" = - self.by-version."debug"."0.8.1"; by-spec."debug"."~0.8.1" = self.by-version."debug"."0.8.1"; by-spec."debug"."~0.x" = @@ -6856,6 +6940,26 @@ ]; passthru.names = [ "deep-extend" ]; }; + by-spec."deep-is"."~0.1.2" = + self.by-version."deep-is"."0.1.3"; + by-version."deep-is"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "deep-is-0.1.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; + name = "deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }) + ]; + buildInputs = + (self.nativeDeps."deep-is" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "deep-is" ]; + }; by-spec."deepmerge"."*" = self.by-version."deepmerge"."0.2.7"; by-version."deepmerge"."0.2.7" = lib.makeOverridable self.buildNodePackage { @@ -6892,7 +6996,7 @@ buildInputs = (self.nativeDeps."defaults" or []); deps = { - "clone-0.1.18" = self.by-version."clone"."0.1.18"; + "clone-0.1.19" = self.by-version."clone"."0.1.19"; }; peerDependencies = [ ]; @@ -7152,7 +7256,7 @@ deps = { "acorn-0.9.0" = self.by-version."acorn"."0.9.0"; "defined-0.0.0" = self.by-version."defined"."0.0.0"; - "escodegen-1.4.1" = self.by-version."escodegen"."1.4.1"; + "escodegen-1.4.3" = self.by-version."escodegen"."1.4.3"; }; peerDependencies = [ ]; @@ -7290,8 +7394,26 @@ }; by-spec."diff"."~1.0.7" = self.by-version."diff"."1.0.8"; - by-spec."diff"."~1.0.8" = - self.by-version."diff"."1.0.8"; + by-spec."diff"."~1.2.0" = + self.by-version."diff"."1.2.0"; + by-version."diff"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "diff-1.2.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/diff/-/diff-1.2.0.tgz"; + name = "diff-1.2.0.tgz"; + sha1 = "52166e04bef0e146541015d0af19a7860ff95644"; + }) + ]; + buildInputs = + (self.nativeDeps."diff" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "diff" ]; + }; by-spec."diffie-hellman"."2.2.0" = self.by-version."diffie-hellman"."2.2.0"; by-version."diffie-hellman"."2.2.0" = lib.makeOverridable self.buildNodePackage { @@ -7314,16 +7436,16 @@ ]; passthru.names = [ "diffie-hellman" ]; }; - by-spec."director"."1.2.3" = - self.by-version."director"."1.2.3"; - by-version."director"."1.2.3" = lib.makeOverridable self.buildNodePackage { - name = "director-1.2.3"; + by-spec."director"."1.2.7" = + self.by-version."director"."1.2.7"; + by-version."director"."1.2.7" = lib.makeOverridable self.buildNodePackage { + name = "director-1.2.7"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/director/-/director-1.2.3.tgz"; - name = "director-1.2.3.tgz"; - sha1 = "ba68a09312751bb77c52acc75e1f9fd9d3cb15bf"; + url = "http://registry.npmjs.org/director/-/director-1.2.7.tgz"; + name = "director-1.2.7.tgz"; + sha1 = "bfd3741075fd7fb1a5b2e13658c5f4bec77736f3"; }) ]; buildInputs = @@ -7523,36 +7645,38 @@ }; by-spec."duplexer2"."~0.0.2" = self.by-version."duplexer2"."0.0.2"; - by-spec."editor"."0.0.4" = - self.by-version."editor"."0.0.4"; - by-version."editor"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "editor-0.0.4"; - bin = true; + by-spec."each-async"."^1.1.0" = + self.by-version."each-async"."1.1.0"; + by-version."each-async"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "each-async-1.1.0"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/editor/-/editor-0.0.4.tgz"; - name = "editor-0.0.4.tgz"; - sha1 = "478920f77bca6c1c1749d5e3edde4bd5966efda8"; + url = "http://registry.npmjs.org/each-async/-/each-async-1.1.0.tgz"; + name = "each-async-1.1.0.tgz"; + sha1 = "d7473d5140a870414d5736a337e596fee14d369b"; }) ]; buildInputs = - (self.nativeDeps."editor" or []); + (self.nativeDeps."each-async" or []); deps = { + "onetime-1.0.0" = self.by-version."onetime"."1.0.0"; + "setimmediate-1.0.2" = self.by-version."setimmediate"."1.0.2"; }; peerDependencies = [ ]; - passthru.names = [ "editor" ]; + passthru.names = [ "each-async" ]; }; - by-spec."editor"."0.0.5" = - self.by-version."editor"."0.0.5"; - by-version."editor"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "editor-0.0.5"; - bin = false; + by-spec."editor"."0.0.4" = + self.by-version."editor"."0.0.4"; + by-version."editor"."0.0.4" = lib.makeOverridable self.buildNodePackage { + name = "editor-0.0.4"; + bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/editor/-/editor-0.0.5.tgz"; - name = "editor-0.0.5.tgz"; - sha1 = "8c38877781f2547011c1aeffdbe50cafcc59794a"; + url = "http://registry.npmjs.org/editor/-/editor-0.0.4.tgz"; + name = "editor-0.0.4.tgz"; + sha1 = "478920f77bca6c1c1749d5e3edde4bd5966efda8"; }) ]; buildInputs = @@ -7688,6 +7812,31 @@ ]; passthru.names = [ "elliptic" ]; }; + by-spec."empty-trash"."*" = + self.by-version."empty-trash"."1.1.0"; + by-version."empty-trash"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "empty-trash-1.1.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/empty-trash/-/empty-trash-1.1.0.tgz"; + name = "empty-trash-1.1.0.tgz"; + sha1 = "6b3527ffb5edc2a27ed7e15886414af37a2c3e8e"; + }) + ]; + buildInputs = + (self.nativeDeps."empty-trash" or []); + deps = { + "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; + "run-applescript-1.0.1" = self.by-version."run-applescript"."1.0.1"; + "update-notifier-0.2.2" = self.by-version."update-notifier"."0.2.2"; + "xdg-empty-trash-1.0.0" = self.by-version."xdg-empty-trash"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "empty-trash" ]; + }; + "empty-trash" = self.by-version."empty-trash"."1.1.0"; by-spec."encoding"."~0.1.7" = self.by-version."encoding"."0.1.11"; by-version."encoding"."0.1.11" = lib.makeOverridable self.buildNodePackage { @@ -7851,7 +8000,7 @@ buildInputs = (self.nativeDeps."errorhandler" or []); deps = { - "accepts-1.1.3" = self.by-version."accepts"."1.1.3"; + "accepts-1.1.4" = self.by-version."accepts"."1.1.4"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; }; peerDependencies = [ @@ -7978,6 +8127,26 @@ "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."escape-string-applescript"."^1.0.0" = + self.by-version."escape-string-applescript"."1.0.0"; + by-version."escape-string-applescript"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "escape-string-applescript-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/escape-string-applescript/-/escape-string-applescript-1.0.0.tgz"; + name = "escape-string-applescript-1.0.0.tgz"; + sha1 = "6f1c2294245d82c63bc03338dc19a94aa8428892"; + }) + ]; + buildInputs = + (self.nativeDeps."escape-string-applescript" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "escape-string-applescript" ]; + }; by-spec."escape-string-regexp"."1.0.2" = self.by-version."escape-string-regexp"."1.0.2"; by-version."escape-string-regexp"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -8016,7 +8185,7 @@ (self.nativeDeps."escodegen" or []); deps = { "esprima-1.2.2" = self.by-version."esprima"."1.2.2"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; @@ -8039,7 +8208,7 @@ deps = { "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; "estraverse-0.0.4" = self.by-version."estraverse"."0.0.4"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; @@ -8063,31 +8232,32 @@ "esutils-1.0.0" = self.by-version."esutils"."1.0.0"; "estraverse-1.5.1" = self.by-version."estraverse"."1.5.1"; "esprima-1.1.1" = self.by-version."esprima"."1.1.1"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; passthru.names = [ "escodegen" ]; }; by-spec."escodegen"."^1.4.1" = - self.by-version."escodegen"."1.4.1"; - by-version."escodegen"."1.4.1" = lib.makeOverridable self.buildNodePackage { - name = "escodegen-1.4.1"; + self.by-version."escodegen"."1.4.3"; + by-version."escodegen"."1.4.3" = lib.makeOverridable self.buildNodePackage { + name = "escodegen-1.4.3"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/escodegen/-/escodegen-1.4.1.tgz"; - name = "escodegen-1.4.1.tgz"; - sha1 = "8c2562ff45da348975953e8c0a57f40848962ec7"; + url = "http://registry.npmjs.org/escodegen/-/escodegen-1.4.3.tgz"; + name = "escodegen-1.4.3.tgz"; + sha1 = "2b2422bf18c95e2542effaabc0c998712d490291"; }) ]; buildInputs = (self.nativeDeps."escodegen" or []); deps = { - "estraverse-1.8.0" = self.by-version."estraverse"."1.8.0"; + "estraverse-1.9.0" = self.by-version."estraverse"."1.9.0"; "esutils-1.1.6" = self.by-version."esutils"."1.1.6"; "esprima-1.2.2" = self.by-version."esprima"."1.2.2"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "optionator-0.4.0" = self.by-version."optionator"."0.4.0"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; @@ -8111,7 +8281,7 @@ "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; "estraverse-1.5.1" = self.by-version."estraverse"."1.5.1"; "esutils-1.0.0" = self.by-version."esutils"."1.0.0"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; @@ -8132,7 +8302,7 @@ buildInputs = (self.nativeDeps."escope" or []); deps = { - "estraverse-1.8.0" = self.by-version."estraverse"."1.8.0"; + "estraverse-1.9.0" = self.by-version."estraverse"."1.9.0"; }; peerDependencies = [ ]; @@ -8334,15 +8504,15 @@ passthru.names = [ "esrefactor" ]; }; by-spec."estraverse".">= 0.0.2" = - self.by-version."estraverse"."1.8.0"; - by-version."estraverse"."1.8.0" = lib.makeOverridable self.buildNodePackage { - name = "estraverse-1.8.0"; + self.by-version."estraverse"."1.9.0"; + by-version."estraverse"."1.9.0" = lib.makeOverridable self.buildNodePackage { + name = "estraverse-1.9.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/estraverse/-/estraverse-1.8.0.tgz"; - name = "estraverse-1.8.0.tgz"; - sha1 = "3f1264fb62c8500dbae5e4f73705cd576d6af428"; + url = "http://registry.npmjs.org/estraverse/-/estraverse-1.9.0.tgz"; + name = "estraverse-1.9.0.tgz"; + sha1 = "738824ba445fab7ff2e42c7a7a98e7cf7ac2becf"; }) ]; buildInputs = @@ -8353,8 +8523,8 @@ ]; passthru.names = [ "estraverse" ]; }; - by-spec."estraverse"."^1.5.1" = - self.by-version."estraverse"."1.8.0"; + by-spec."estraverse"."^1.9.0" = + self.by-version."estraverse"."1.9.0"; by-spec."estraverse"."~0.0.4" = self.by-version."estraverse"."0.0.4"; by-version."estraverse"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -8397,7 +8567,25 @@ }; by-spec."estraverse"."~1.8.0" = self.by-version."estraverse"."1.8.0"; - by-spec."esutils"."^1.1.4" = + by-version."estraverse"."1.8.0" = lib.makeOverridable self.buildNodePackage { + name = "estraverse-1.8.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/estraverse/-/estraverse-1.8.0.tgz"; + name = "estraverse-1.8.0.tgz"; + sha1 = "3f1264fb62c8500dbae5e4f73705cd576d6af428"; + }) + ]; + buildInputs = + (self.nativeDeps."estraverse" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "estraverse" ]; + }; + by-spec."esutils"."^1.1.6" = self.by-version."esutils"."1.1.6"; by-version."esutils"."1.1.6" = lib.makeOverridable self.buildNodePackage { name = "esutils-1.1.6"; @@ -8544,10 +8732,10 @@ ]; passthru.names = [ "eventemitter2" ]; }; - by-spec."eventemitter2"."~0.4.11" = - self.by-version."eventemitter2"."0.4.14"; by-spec."eventemitter2"."~0.4.13" = self.by-version."eventemitter2"."0.4.14"; + by-spec."eventemitter2"."~0.4.14" = + self.by-version."eventemitter2"."0.4.14"; by-spec."eventemitter3"."*" = self.by-version."eventemitter3"."0.1.6"; by-version."eventemitter3"."0.1.6" = lib.makeOverridable self.buildNodePackage { @@ -8623,7 +8811,7 @@ buildInputs = (self.nativeDeps."everyauth" or []); deps = { - "oauth-0.9.11" = self.by-version."oauth"."0.9.11"; + "oauth-0.9.12" = self.by-version."oauth"."0.9.12"; "request-2.9.203" = self.by-version."request"."2.9.203"; "connect-2.3.9" = self.by-version."connect"."2.3.9"; "openid-0.5.9" = self.by-version."openid"."0.5.9"; @@ -8631,7 +8819,7 @@ "node-swt-0.1.1" = self.by-version."node-swt"."0.1.1"; "node-wsfederation-0.1.1" = self.by-version."node-wsfederation"."0.1.1"; "debug-0.5.0" = self.by-version."debug"."0.5.0"; - "express-3.18.4" = self.by-version."express"."3.18.4"; + "express-3.18.6" = self.by-version."express"."3.18.6"; }; peerDependencies = [ ]; @@ -8676,7 +8864,7 @@ buildInputs = (self.nativeDeps."express" or []); deps = { - "accepts-1.1.3" = self.by-version."accepts"."1.1.3"; + "accepts-1.1.4" = self.by-version."accepts"."1.1.4"; "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; "debug-2.1.0" = self.by-version."debug"."2.1.0"; @@ -8695,7 +8883,7 @@ "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; "send-0.10.1" = self.by-version."send"."0.10.1"; "serve-static-1.7.1" = self.by-version."serve-static"."1.7.1"; - "type-is-1.5.3" = self.by-version."type-is"."1.5.3"; + "type-is-1.5.4" = self.by-version."type-is"."1.5.4"; "vary-1.0.0" = self.by-version."vary"."1.0.0"; "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; @@ -8750,7 +8938,7 @@ "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4"; "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; "cookie-0.0.5" = self.by-version."cookie"."0.0.5"; - "buffer-crc32-0.2.4" = self.by-version."buffer-crc32"."0.2.4"; + "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5"; "fresh-0.1.0" = self.by-version."fresh"."0.1.0"; "methods-0.0.1" = self.by-version."methods"."0.0.1"; "send-0.1.0" = self.by-version."send"."0.1.0"; @@ -8793,22 +8981,22 @@ passthru.names = [ "express" ]; }; by-spec."express"."3.x" = - self.by-version."express"."3.18.4"; - by-version."express"."3.18.4" = lib.makeOverridable self.buildNodePackage { - name = "express-3.18.4"; + self.by-version."express"."3.18.6"; + by-version."express"."3.18.6" = lib.makeOverridable self.buildNodePackage { + name = "express-3.18.6"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.18.4.tgz"; - name = "express-3.18.4.tgz"; - sha1 = "7b40ad2c10a987692ee97a387c21593011f03712"; + url = "http://registry.npmjs.org/express/-/express-3.18.6.tgz"; + name = "express-3.18.6.tgz"; + sha1 = "cbcc7cb610d061ac619e5d090a5539353a3e870b"; }) ]; buildInputs = (self.nativeDeps."express" or []); deps = { "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0"; - "connect-2.27.4" = self.by-version."connect"."2.27.4"; + "connect-2.27.6" = self.by-version."connect"."2.27.6"; "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; "commander-1.3.2" = self.by-version."commander"."1.3.2"; "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; @@ -8835,6 +9023,50 @@ }; by-spec."express".">=3.0.0" = self.by-version."express"."5.0.0-alpha.1"; + by-spec."express"."^4.0" = + self.by-version."express"."4.10.6"; + by-version."express"."4.10.6" = lib.makeOverridable self.buildNodePackage { + name = "express-4.10.6"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/express/-/express-4.10.6.tgz"; + name = "express-4.10.6.tgz"; + sha1 = "a9015979ccf38b11a39c0f726dcf6c4b85a4e758"; + }) + ]; + buildInputs = + (self.nativeDeps."express" or []); + deps = { + "accepts-1.1.4" = self.by-version."accepts"."1.1.4"; + "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; + "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + "depd-1.0.0" = self.by-version."depd"."1.0.0"; + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "etag-1.5.1" = self.by-version."etag"."1.5.1"; + "finalhandler-0.3.2" = self.by-version."finalhandler"."0.3.2"; + "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; + "methods-1.1.0" = self.by-version."methods"."1.1.0"; + "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3"; + "proxy-addr-1.0.4" = self.by-version."proxy-addr"."1.0.4"; + "qs-2.3.3" = self.by-version."qs"."2.3.3"; + "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; + "send-0.10.1" = self.by-version."send"."0.10.1"; + "serve-static-1.7.1" = self.by-version."serve-static"."1.7.1"; + "type-is-1.5.4" = self.by-version."type-is"."1.5.4"; + "vary-1.0.0" = self.by-version."vary"."1.0.0"; + "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; + "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; + "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; + }; + 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 { @@ -8855,7 +9087,7 @@ "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4"; "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; "cookie-0.0.5" = self.by-version."cookie"."0.0.5"; - "buffer-crc32-0.2.4" = self.by-version."buffer-crc32"."0.2.4"; + "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5"; "fresh-0.1.0" = self.by-version."fresh"."0.1.0"; "methods-0.0.1" = self.by-version."methods"."0.0.1"; "send-0.1.0" = self.by-version."send"."0.1.0"; @@ -8898,87 +9130,8 @@ ]; passthru.names = [ "express" ]; }; - by-spec."express"."~4.0" = - self.by-version."express"."4.0.0"; - by-version."express"."4.0.0" = lib.makeOverridable self.buildNodePackage { - name = "express-4.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/express/-/express-4.0.0.tgz"; - name = "express-4.0.0.tgz"; - sha1 = "274dc82933c9f574cc38a0ce5ea8172be9c6b094"; - }) - ]; - buildInputs = - (self.nativeDeps."express" or []); - deps = { - "parseurl-1.0.1" = self.by-version."parseurl"."1.0.1"; - "accepts-1.0.0" = self.by-version."accepts"."1.0.0"; - "type-is-1.0.0" = self.by-version."type-is"."1.0.0"; - "range-parser-1.0.0" = self.by-version."range-parser"."1.0.0"; - "cookie-0.1.0" = self.by-version."cookie"."0.1.0"; - "buffer-crc32-0.2.1" = self.by-version."buffer-crc32"."0.2.1"; - "fresh-0.2.2" = self.by-version."fresh"."0.2.2"; - "methods-0.1.0" = self.by-version."methods"."0.1.0"; - "send-0.2.0" = self.by-version."send"."0.2.0"; - "cookie-signature-1.0.3" = self.by-version."cookie-signature"."1.0.3"; - "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; - "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "qs-0.6.6" = self.by-version."qs"."0.6.6"; - "serve-static-1.0.1" = self.by-version."serve-static"."1.0.1"; - "path-to-regexp-0.1.2" = self.by-version."path-to-regexp"."0.1.2"; - "debug-0.8.1" = self.by-version."debug"."0.8.1"; - }; - peerDependencies = [ - ]; - passthru.names = [ "express" ]; - }; by-spec."express"."~4.10.3" = - self.by-version."express"."4.10.4"; - by-version."express"."4.10.4" = lib.makeOverridable self.buildNodePackage { - name = "express-4.10.4"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/express/-/express-4.10.4.tgz"; - name = "express-4.10.4.tgz"; - sha1 = "31aa70acdad6b6093945c30523df8537336deb58"; - }) - ]; - buildInputs = - (self.nativeDeps."express" or []); - deps = { - "accepts-1.1.3" = self.by-version."accepts"."1.1.3"; - "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; - "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; - "debug-2.1.0" = self.by-version."debug"."2.1.0"; - "depd-1.0.0" = self.by-version."depd"."1.0.0"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "etag-1.5.1" = self.by-version."etag"."1.5.1"; - "finalhandler-0.3.2" = self.by-version."finalhandler"."0.3.2"; - "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; - "methods-1.1.0" = self.by-version."methods"."1.1.0"; - "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1"; - "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3"; - "proxy-addr-1.0.4" = self.by-version."proxy-addr"."1.0.4"; - "qs-2.3.3" = self.by-version."qs"."2.3.3"; - "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; - "send-0.10.1" = self.by-version."send"."0.10.1"; - "serve-static-1.7.1" = self.by-version."serve-static"."1.7.1"; - "type-is-1.5.3" = self.by-version."type-is"."1.5.3"; - "vary-1.0.0" = self.by-version."vary"."1.0.0"; - "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; - "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; - "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "express" ]; - }; + self.by-version."express"."4.10.6"; by-spec."express-form"."*" = self.by-version."express-form"."0.12.4"; by-version."express-form"."0.12.4" = lib.makeOverridable self.buildNodePackage { @@ -9080,15 +9233,15 @@ passthru.names = [ "express-session" ]; }; by-spec."express-session"."~1.9.2" = - self.by-version."express-session"."1.9.2"; - by-version."express-session"."1.9.2" = lib.makeOverridable self.buildNodePackage { - name = "express-session-1.9.2"; + self.by-version."express-session"."1.9.3"; + by-version."express-session"."1.9.3" = lib.makeOverridable self.buildNodePackage { + name = "express-session-1.9.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/express-session/-/express-session-1.9.2.tgz"; - name = "express-session-1.9.2.tgz"; - sha1 = "cb831ff8d2d9cb6e64c167f678af6f62ae6bb076"; + url = "http://registry.npmjs.org/express-session/-/express-session-1.9.3.tgz"; + name = "express-session-1.9.3.tgz"; + sha1 = "7d2fc387af6fd928775213bfe9d635a5705a84ce"; }) ]; buildInputs = @@ -9108,6 +9261,8 @@ ]; passthru.names = [ "express-session" ]; }; + by-spec."express-session"."~1.9.3" = + self.by-version."express-session"."1.9.3"; by-spec."extend"."*" = self.by-version."extend"."2.0.0"; by-version."extend"."2.0.0" = lib.makeOverridable self.buildNodePackage { @@ -9272,6 +9427,8 @@ }; by-spec."eyes"."~0.1.6" = self.by-version."eyes"."0.1.8"; + by-spec."eyes"."~0.1.8" = + self.by-version."eyes"."0.1.8"; by-spec."falafel"."~0.1.6" = self.by-version."falafel"."0.1.6"; by-version."falafel"."0.1.6" = lib.makeOverridable self.buildNodePackage { @@ -9293,7 +9450,51 @@ ]; passthru.names = [ "falafel" ]; }; + by-spec."fast-levenshtein"."~1.0.0" = + self.by-version."fast-levenshtein"."1.0.6"; + by-version."fast-levenshtein"."1.0.6" = lib.makeOverridable self.buildNodePackage { + name = "fast-levenshtein-1.0.6"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.6.tgz"; + name = "fast-levenshtein-1.0.6.tgz"; + sha1 = "3bedb184e39f95cb0d88928688e6b1ee3273446a"; + }) + ]; + buildInputs = + (self.nativeDeps."fast-levenshtein" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "fast-levenshtein" ]; + }; by-spec."faye-websocket"."*" = + self.by-version."faye-websocket"."0.9.1"; + by-version."faye-websocket"."0.9.1" = lib.makeOverridable self.buildNodePackage { + name = "faye-websocket-0.9.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.1.tgz"; + name = "faye-websocket-0.9.1.tgz"; + sha1 = "01a206fbf2aae351f1ef6e7d3adf6069dd7ccc13"; + }) + ]; + buildInputs = + (self.nativeDeps."faye-websocket" or []); + deps = { + "websocket-driver-0.5.1" = self.by-version."websocket-driver"."0.5.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "faye-websocket" ]; + }; + "faye-websocket" = self.by-version."faye-websocket"."0.9.1"; + by-spec."faye-websocket".">= 0.4.1" = + self.by-version."faye-websocket"."0.9.1"; + by-spec."faye-websocket"."^0.7.3 || ^0.8.0" = self.by-version."faye-websocket"."0.8.1"; by-version."faye-websocket"."0.8.1" = lib.makeOverridable self.buildNodePackage { name = "faye-websocket-0.8.1"; @@ -9308,17 +9509,12 @@ buildInputs = (self.nativeDeps."faye-websocket" or []); deps = { - "websocket-driver-0.4.0" = self.by-version."websocket-driver"."0.4.0"; + "websocket-driver-0.5.1" = self.by-version."websocket-driver"."0.5.1"; }; peerDependencies = [ ]; passthru.names = [ "faye-websocket" ]; }; - "faye-websocket" = self.by-version."faye-websocket"."0.8.1"; - by-spec."faye-websocket".">= 0.4.1" = - self.by-version."faye-websocket"."0.8.1"; - by-spec."faye-websocket"."^0.7.3 || ^0.8.0" = - self.by-version."faye-websocket"."0.8.1"; by-spec."faye-websocket"."~0.7.0" = self.by-version."faye-websocket"."0.7.3"; by-version."faye-websocket"."0.7.3" = lib.makeOverridable self.buildNodePackage { @@ -9334,7 +9530,7 @@ buildInputs = (self.nativeDeps."faye-websocket" or []); deps = { - "websocket-driver-0.4.0" = self.by-version."websocket-driver"."0.4.0"; + "websocket-driver-0.5.1" = self.by-version."websocket-driver"."0.5.1"; }; peerDependencies = [ ]; @@ -9381,7 +9577,7 @@ deps = { "colors-0.6.2" = self.by-version."colors"."0.6.2"; "keypress-0.2.1" = self.by-version."keypress"."0.2.1"; - "sprintf-0.1.4" = self.by-version."sprintf"."0.1.4"; + "sprintf-0.1.5" = self.by-version."sprintf"."0.1.5"; }; peerDependencies = [ ]; @@ -9601,15 +9797,15 @@ passthru.names = [ "flagged-respawn" ]; }; by-spec."flatiron"."*" = - self.by-version."flatiron"."0.4.2"; - by-version."flatiron"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "flatiron-0.4.2"; + self.by-version."flatiron"."0.4.3"; + by-version."flatiron"."0.4.3" = lib.makeOverridable self.buildNodePackage { + name = "flatiron-0.4.3"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/flatiron/-/flatiron-0.4.2.tgz"; - name = "flatiron-0.4.2.tgz"; - sha1 = "cffae218dae8229d6668c34453eefd9a44c0e418"; + url = "http://registry.npmjs.org/flatiron/-/flatiron-0.4.3.tgz"; + name = "flatiron-0.4.3.tgz"; + sha1 = "248cf79a3da7d7dc379e2a11c92a2719cbb540f6"; }) ]; buildInputs = @@ -9618,15 +9814,15 @@ "broadway-0.3.6" = self.by-version."broadway"."0.3.6"; "optimist-0.6.0" = self.by-version."optimist"."0.6.0"; "prompt-0.2.14" = self.by-version."prompt"."0.2.14"; - "director-1.2.3" = self.by-version."director"."1.2.3"; + "director-1.2.7" = self.by-version."director"."1.2.7"; }; peerDependencies = [ ]; passthru.names = [ "flatiron" ]; }; - "flatiron" = self.by-version."flatiron"."0.4.2"; + "flatiron" = self.by-version."flatiron"."0.4.3"; by-spec."flatiron"."~0.4.2" = - self.by-version."flatiron"."0.4.2"; + self.by-version."flatiron"."0.4.3"; by-spec."follow-redirects"."0.0.3" = self.by-version."follow-redirects"."0.0.3"; by-version."follow-redirects"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -9705,11 +9901,11 @@ (self.nativeDeps."forever" or []); deps = { "colors-0.6.2" = self.by-version."colors"."0.6.2"; - "cliff-0.1.9" = self.by-version."cliff"."0.1.9"; - "flatiron-0.4.2" = self.by-version."flatiron"."0.4.2"; + "cliff-0.1.10" = self.by-version."cliff"."0.1.10"; + "flatiron-0.4.3" = self.by-version."flatiron"."0.4.3"; "forever-monitor-1.5.2" = self.by-version."forever-monitor"."1.5.2"; "nconf-0.6.9" = self.by-version."nconf"."0.6.9"; - "nssocket-0.5.2" = self.by-version."nssocket"."0.5.2"; + "nssocket-0.5.3" = self.by-version."nssocket"."0.5.3"; "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; "timespan-2.3.0" = self.by-version."timespan"."2.3.0"; "utile-0.2.1" = self.by-version."utile"."0.2.1"; @@ -9906,7 +10102,30 @@ ]; passthru.names = [ "form-data" ]; }; - by-spec."formatio"."~1.1.1" = + by-spec."form-data"."~0.2.0" = + self.by-version."form-data"."0.2.0"; + by-version."form-data"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "form-data-0.2.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz"; + name = "form-data-0.2.0.tgz"; + sha1 = "26f8bc26da6440e299cbdcfb69035c4f77a6e466"; + }) + ]; + buildInputs = + (self.nativeDeps."form-data" or []); + deps = { + "async-0.9.0" = self.by-version."async"."0.9.0"; + "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; + "mime-types-2.0.4" = self.by-version."mime-types"."2.0.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "form-data" ]; + }; + by-spec."formatio"."1.1.1" = self.by-version."formatio"."1.1.1"; by-version."formatio"."1.1.1" = lib.makeOverridable self.buildNodePackage { name = "formatio-1.1.1"; @@ -9921,7 +10140,7 @@ buildInputs = (self.nativeDeps."formatio" or []); deps = { - "samsam-1.1.1" = self.by-version."samsam"."1.1.1"; + "samsam-1.1.2" = self.by-version."samsam"."1.1.2"; }; peerDependencies = [ ]; @@ -9988,15 +10207,15 @@ passthru.names = [ "formidable" ]; }; by-spec."formidable"."1.0.x" = - self.by-version."formidable"."1.0.15"; - by-version."formidable"."1.0.15" = lib.makeOverridable self.buildNodePackage { - name = "formidable-1.0.15"; + self.by-version."formidable"."1.0.16"; + by-version."formidable"."1.0.16" = lib.makeOverridable self.buildNodePackage { + name = "formidable-1.0.16"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/formidable/-/formidable-1.0.15.tgz"; - name = "formidable-1.0.15.tgz"; - sha1 = "91363d59cc51ddca2be84ca0336ec0135606c155"; + url = "http://registry.npmjs.org/formidable/-/formidable-1.0.16.tgz"; + name = "formidable-1.0.16.tgz"; + sha1 = "4916cfdfc4cbed020b257a6a9505a9ab38c2cd0e"; }) ]; buildInputs = @@ -10109,6 +10328,30 @@ }; by-spec."fresh"."~0.2.1" = self.by-version."fresh"."0.2.4"; + by-spec."fs-extra"."^0.12.0" = + self.by-version."fs-extra"."0.12.0"; + by-version."fs-extra"."0.12.0" = lib.makeOverridable self.buildNodePackage { + name = "fs-extra-0.12.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.12.0.tgz"; + name = "fs-extra-0.12.0.tgz"; + sha1 = "407cf6e11321e440d66f9486fba1cc9eb4c21868"; + }) + ]; + buildInputs = + (self.nativeDeps."fs-extra" or []); + deps = { + "ncp-0.6.0" = self.by-version."ncp"."0.6.0"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "jsonfile-2.0.0" = self.by-version."jsonfile"."2.0.0"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + }; + peerDependencies = [ + ]; + passthru.names = [ "fs-extra" ]; + }; 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 { @@ -10133,22 +10376,23 @@ ]; passthru.names = [ "fs-extra" ]; }; - by-spec."fs-vacuum"."~1.2.2" = - self.by-version."fs-vacuum"."1.2.2"; - by-version."fs-vacuum"."1.2.2" = lib.makeOverridable self.buildNodePackage { - name = "fs-vacuum-1.2.2"; + by-spec."fs-vacuum"."~1.2.5" = + self.by-version."fs-vacuum"."1.2.5"; + by-version."fs-vacuum"."1.2.5" = lib.makeOverridable self.buildNodePackage { + name = "fs-vacuum-1.2.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.2.tgz"; - name = "fs-vacuum-1.2.2.tgz"; - sha1 = "0e26ca2b14eb4ceb4b590a92aad585756ed18e40"; + url = "http://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.5.tgz"; + name = "fs-vacuum-1.2.5.tgz"; + sha1 = "a5cbaa844b4b3a7cff139f3cc90e7f7007e5fbb8"; }) ]; buildInputs = (self.nativeDeps."fs-vacuum" or []); deps = { "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; + "path-is-inside-1.0.1" = self.by-version."path-is-inside"."1.0.1"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; }; peerDependencies = [ @@ -10294,9 +10538,11 @@ }; by-spec."fstream"."^1.0.2" = self.by-version."fstream"."1.0.3"; - by-spec."fstream"."~0.1.23" = + by-spec."fstream"."~0.1.17" = + self.by-version."fstream"."0.1.31"; + by-spec."fstream"."~0.1.22" = self.by-version."fstream"."0.1.31"; - by-spec."fstream"."~0.1.25" = + by-spec."fstream"."~0.1.23" = self.by-version."fstream"."0.1.31"; by-spec."fstream"."~0.1.28" = self.by-version."fstream"."0.1.31"; @@ -10306,16 +10552,39 @@ self.by-version."fstream"."1.0.3"; by-spec."fstream"."~1.0.3" = self.by-version."fstream"."1.0.3"; + by-spec."fstream-ignore"."0.0.7" = + self.by-version."fstream-ignore"."0.0.7"; + by-version."fstream-ignore"."0.0.7" = lib.makeOverridable self.buildNodePackage { + name = "fstream-ignore-0.0.7"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz"; + name = "fstream-ignore-0.0.7.tgz"; + sha1 = "eea3033f0c3728139de7b57ab1b0d6d89c353c63"; + }) + ]; + buildInputs = + (self.nativeDeps."fstream-ignore" or []); + deps = { + "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; + "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "fstream-ignore" ]; + }; by-spec."fstream-ignore"."^1.0.0" = - self.by-version."fstream-ignore"."1.0.1"; - by-version."fstream-ignore"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "fstream-ignore-1.0.1"; + self.by-version."fstream-ignore"."1.0.2"; + by-version."fstream-ignore"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "fstream-ignore-1.0.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.1.tgz"; - name = "fstream-ignore-1.0.1.tgz"; - sha1 = "153df36c4fa2cb006fb915dc71ac9d75f6a17c82"; + url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.2.tgz"; + name = "fstream-ignore-1.0.2.tgz"; + sha1 = "18c891db01b782a74a7bff936a0f24997741c7ab"; }) ]; buildInputs = @@ -10323,14 +10592,14 @@ deps = { "fstream-1.0.3" = self.by-version."fstream"."1.0.3"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; + "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1"; }; peerDependencies = [ ]; passthru.names = [ "fstream-ignore" ]; }; by-spec."fstream-ignore"."~1.0.1" = - self.by-version."fstream-ignore"."1.0.1"; + self.by-version."fstream-ignore"."1.0.2"; by-spec."fstream-npm"."~0.1.3" = self.by-version."fstream-npm"."0.1.8"; by-version."fstream-npm"."0.1.8" = lib.makeOverridable self.buildNodePackage { @@ -10346,15 +10615,13 @@ buildInputs = (self.nativeDeps."fstream-npm" or []); deps = { - "fstream-ignore-1.0.1" = self.by-version."fstream-ignore"."1.0.1"; + "fstream-ignore-1.0.2" = self.by-version."fstream-ignore"."1.0.2"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; }; peerDependencies = [ ]; passthru.names = [ "fstream-npm" ]; }; - by-spec."fstream-npm"."~0.1.6" = - self.by-version."fstream-npm"."0.1.8"; by-spec."fstream-npm"."~1.0.1" = self.by-version."fstream-npm"."1.0.1"; by-version."fstream-npm"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -10370,7 +10637,7 @@ buildInputs = (self.nativeDeps."fstream-npm" or []); deps = { - "fstream-ignore-1.0.1" = self.by-version."fstream-ignore"."1.0.1"; + "fstream-ignore-1.0.2" = self.by-version."fstream-ignore"."1.0.2"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; }; peerDependencies = [ @@ -10482,15 +10749,15 @@ passthru.names = [ "getobject" ]; }; by-spec."git-run"."*" = - self.by-version."git-run"."0.3.0"; - by-version."git-run"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "git-run-0.3.0"; + self.by-version."git-run"."0.3.1"; + by-version."git-run"."0.3.1" = lib.makeOverridable self.buildNodePackage { + name = "git-run-0.3.1"; bin = true; src = [ (self.patchSource fetchurl { - url = "http://registry.npmjs.org/git-run/-/git-run-0.3.0.tgz"; - name = "git-run-0.3.0.tgz"; - sha1 = "6ac02b93a93e10803ebfec8a5703fb416cafc0b1"; + url = "http://registry.npmjs.org/git-run/-/git-run-0.3.1.tgz"; + name = "git-run-0.3.1.tgz"; + sha1 = "34a59d4a90c1501d491ea87d478d26c877808415"; }) ]; buildInputs = @@ -10503,27 +10770,7 @@ ]; passthru.names = [ "git-run" ]; }; - "git-run" = self.by-version."git-run"."0.3.0"; - by-spec."github-url-from-git"."1.1.1" = - self.by-version."github-url-from-git"."1.1.1"; - by-version."github-url-from-git"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "github-url-from-git-1.1.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.1.1.tgz"; - name = "github-url-from-git-1.1.1.tgz"; - sha1 = "1f89623453123ef9623956e264c60bf4c3cf5ccf"; - }) - ]; - buildInputs = - (self.nativeDeps."github-url-from-git" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "github-url-from-git" ]; - }; + "git-run" = self.by-version."git-run"."0.3.1"; by-spec."github-url-from-git"."^1.3.0" = self.by-version."github-url-from-git"."1.4.0"; by-version."github-url-from-git"."1.4.0" = lib.makeOverridable self.buildNodePackage { @@ -10546,28 +10793,26 @@ }; by-spec."github-url-from-git"."~1.1.1" = self.by-version."github-url-from-git"."1.1.1"; - by-spec."github-url-from-git"."~1.4.0" = - self.by-version."github-url-from-git"."1.4.0"; - by-spec."github-url-from-username-repo"."0.0.2" = - self.by-version."github-url-from-username-repo"."0.0.2"; - by-version."github-url-from-username-repo"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "github-url-from-username-repo-0.0.2"; + by-version."github-url-from-git"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "github-url-from-git-1.1.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.0.2.tgz"; - name = "github-url-from-username-repo-0.0.2.tgz"; - sha1 = "0d9ee8e2bca36d5f065a1bcd23eb3f1fa3d636bd"; + url = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.1.1.tgz"; + name = "github-url-from-git-1.1.1.tgz"; + sha1 = "1f89623453123ef9623956e264c60bf4c3cf5ccf"; }) ]; buildInputs = - (self.nativeDeps."github-url-from-username-repo" or []); + (self.nativeDeps."github-url-from-git" or []); deps = { }; peerDependencies = [ ]; - passthru.names = [ "github-url-from-username-repo" ]; + passthru.names = [ "github-url-from-git" ]; }; + by-spec."github-url-from-git"."~1.4.0" = + self.by-version."github-url-from-git"."1.4.0"; by-spec."github-url-from-username-repo"."^0.1.0" = self.by-version."github-url-from-username-repo"."0.1.0"; by-version."github-url-from-username-repo"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -10635,15 +10880,15 @@ passthru.names = [ "glob" ]; }; by-spec."glob"."3 || 4" = - self.by-version."glob"."4.2.2"; - by-version."glob"."4.2.2" = lib.makeOverridable self.buildNodePackage { - name = "glob-4.2.2"; + self.by-version."glob"."4.3.2"; + by-version."glob"."4.3.2" = lib.makeOverridable self.buildNodePackage { + name = "glob-4.3.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-4.2.2.tgz"; - name = "glob-4.2.2.tgz"; - sha1 = "ad2b047653a58c387e15deb43a19497f83fd2a80"; + url = "http://registry.npmjs.org/glob/-/glob-4.3.2.tgz"; + name = "glob-4.3.2.tgz"; + sha1 = "351ec7dafc29256b253ad86cd6b48c5a3404b76d"; }) ]; buildInputs = @@ -10651,7 +10896,7 @@ deps = { "inflight-1.0.4" = self.by-version."inflight"."1.0.4"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; + "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; }; peerDependencies = [ @@ -10710,15 +10955,17 @@ passthru.names = [ "glob" ]; }; by-spec."glob"."4.x" = - self.by-version."glob"."4.2.2"; + self.by-version."glob"."4.3.2"; by-spec."glob".">=3.2.7 <4" = self.by-version."glob"."3.2.11"; - by-spec."glob"."^4.0.0" = - self.by-version."glob"."4.2.2"; + by-spec."glob"."^3.2.1" = + self.by-version."glob"."3.2.11"; by-spec."glob"."^4.0.2" = - self.by-version."glob"."4.2.2"; + self.by-version."glob"."4.3.2"; by-spec."glob"."^4.0.5" = - self.by-version."glob"."4.2.2"; + self.by-version."glob"."4.3.2"; + by-spec."glob"."^4.3.1" = + self.by-version."glob"."4.3.2"; by-spec."glob"."~ 3.2.1" = self.by-version."glob"."3.2.11"; by-spec."glob"."~3.1.21" = @@ -10748,8 +10995,6 @@ self.by-version."glob"."3.2.11"; by-spec."glob"."~3.2.3" = self.by-version."glob"."3.2.11"; - by-spec."glob"."~3.2.6" = - self.by-version."glob"."3.2.11"; by-spec."glob"."~3.2.7" = self.by-version."glob"."3.2.11"; by-spec."glob"."~3.2.8" = @@ -10760,25 +11005,25 @@ self.by-version."glob"."4.0.6"; by-spec."glob"."~4.0.6" = self.by-version."glob"."4.0.6"; - by-spec."glob"."~4.2.1" = - self.by-version."glob"."4.2.2"; + by-spec."glob"."~4.3.1" = + self.by-version."glob"."4.3.2"; by-spec."glob-stream"."^3.1.5" = - self.by-version."glob-stream"."3.1.17"; - by-version."glob-stream"."3.1.17" = lib.makeOverridable self.buildNodePackage { - name = "glob-stream-3.1.17"; + self.by-version."glob-stream"."3.1.18"; + by-version."glob-stream"."3.1.18" = lib.makeOverridable self.buildNodePackage { + name = "glob-stream-3.1.18"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/glob-stream/-/glob-stream-3.1.17.tgz"; - name = "glob-stream-3.1.17.tgz"; - sha1 = "bc3093856149bf9b7454935abe523ec7ab26ec1e"; + url = "http://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz"; + name = "glob-stream-3.1.18.tgz"; + sha1 = "9170a5f12b790306fdfe598f313f8f7954fd143b"; }) ]; buildInputs = (self.nativeDeps."glob-stream" or []); deps = { - "glob-4.2.2" = self.by-version."glob"."4.2.2"; - "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; + "glob-4.3.2" = self.by-version."glob"."4.3.2"; + "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1"; "ordered-read-streams-0.1.0" = self.by-version."ordered-read-streams"."0.1.0"; "glob2base-0.0.12" = self.by-version."glob2base"."0.0.12"; "unique-stream-1.0.0" = self.by-version."unique-stream"."1.0.0"; @@ -10874,6 +11119,27 @@ ]; passthru.names = [ "got" ]; }; + by-spec."got"."^1.0.1" = + self.by-version."got"."1.2.2"; + by-version."got"."1.2.2" = lib.makeOverridable self.buildNodePackage { + name = "got-1.2.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/got/-/got-1.2.2.tgz"; + name = "got-1.2.2.tgz"; + sha1 = "d9430ba32f6a30218243884418767340aafc0400"; + }) + ]; + buildInputs = + (self.nativeDeps."got" or []); + deps = { + "object-assign-1.0.0" = self.by-version."object-assign"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "got" ]; + }; by-spec."graceful-fs"."1.2" = self.by-version."graceful-fs"."1.2.3"; by-version."graceful-fs"."1.2.3" = lib.makeOverridable self.buildNodePackage { @@ -10960,7 +11226,7 @@ self.by-version."graceful-fs"."3.0.5"; by-spec."graceful-fs"."~3.0.2" = self.by-version."graceful-fs"."3.0.5"; - by-spec."graceful-fs"."~3.0.4" = + by-spec."graceful-fs"."~3.0.5" = self.by-version."graceful-fs"."3.0.5"; by-spec."gridfs-stream"."*" = self.by-version."gridfs-stream"."0.5.3"; @@ -11052,7 +11318,7 @@ "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; "lodash-0.9.2" = self.by-version."lodash"."0.9.2"; "underscore.string-2.2.1" = self.by-version."underscore.string"."2.2.1"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; "js-yaml-2.0.5" = self.by-version."js-yaml"."2.0.5"; "exit-0.1.2" = self.by-version."exit"."0.1.2"; "getobject-0.1.0" = self.by-version."getobject"."0.1.0"; @@ -11109,7 +11375,7 @@ (self.nativeDeps."grunt-contrib-cssmin" or []); deps = { "chalk-0.4.0" = self.by-version."chalk"."0.4.0"; - "clean-css-2.2.19" = self.by-version."clean-css"."2.2.19"; + "clean-css-2.2.22" = self.by-version."clean-css"."2.2.22"; "maxmin-0.2.2" = self.by-version."maxmin"."0.2.2"; }; peerDependencies = [ @@ -11133,7 +11399,7 @@ buildInputs = (self.nativeDeps."grunt-contrib-jshint" or []); deps = { - "jshint-2.5.10" = self.by-version."jshint"."2.5.10"; + "jshint-2.5.11" = self.by-version."jshint"."2.5.11"; "hooker-0.2.3" = self.by-version."hooker"."0.2.3"; }; peerDependencies = [ @@ -11210,7 +11476,7 @@ "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "maxmin-1.0.0" = self.by-version."maxmin"."1.0.0"; - "uglify-js-2.4.15" = self.by-version."uglify-js"."2.4.15"; + "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16"; "uri-path-0.0.2" = self.by-version."uri-path"."0.0.2"; }; peerDependencies = [ @@ -11288,7 +11554,7 @@ "exit-0.1.2" = self.by-version."exit"."0.1.2"; "underscore.string-2.2.1" = self.by-version."underscore.string"."2.2.1"; "getobject-0.1.0" = self.by-version."getobject"."0.1.0"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; }; peerDependencies = [ ]; @@ -11333,7 +11599,7 @@ (self.nativeDeps."guifi-earth" or []); deps = { "coffee-script-1.8.0" = self.by-version."coffee-script"."1.8.0"; - "jade-1.8.1" = self.by-version."jade"."1.8.1"; + "jade-1.8.2" = self.by-version."jade"."1.8.2"; "q-2.0.2" = self.by-version."q"."2.0.2"; "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4"; "msgpack-0.2.4" = self.by-version."msgpack"."0.2.4"; @@ -11362,14 +11628,14 @@ "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; "deprecated-0.0.1" = self.by-version."deprecated"."0.0.1"; "gulp-util-3.0.1" = self.by-version."gulp-util"."3.0.1"; - "interpret-0.3.8" = self.by-version."interpret"."0.3.8"; + "interpret-0.3.10" = self.by-version."interpret"."0.3.10"; "liftoff-0.13.6" = self.by-version."liftoff"."0.13.6"; "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; "orchestrator-0.3.7" = self.by-version."orchestrator"."0.3.7"; "pretty-hrtime-0.2.2" = self.by-version."pretty-hrtime"."0.2.2"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; "tildify-1.0.0" = self.by-version."tildify"."1.0.0"; - "v8flags-1.0.5" = self.by-version."v8flags"."1.0.5"; + "v8flags-1.0.6" = self.by-version."v8flags"."1.0.6"; "vinyl-fs-0.3.13" = self.by-version."vinyl-fs"."0.3.13"; }; peerDependencies = [ @@ -11400,7 +11666,7 @@ "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; "multipipe-0.1.2" = self.by-version."multipipe"."0.1.2"; "through2-0.6.3" = self.by-version."through2"."0.6.3"; - "vinyl-0.4.5" = self.by-version."vinyl"."0.4.5"; + "vinyl-0.4.6" = self.by-version."vinyl"."0.4.6"; }; peerDependencies = [ ]; @@ -12045,15 +12311,15 @@ passthru.names = [ "http-browserify" ]; }; by-spec."http-errors"."~1.2.7" = - self.by-version."http-errors"."1.2.7"; - by-version."http-errors"."1.2.7" = lib.makeOverridable self.buildNodePackage { - name = "http-errors-1.2.7"; + self.by-version."http-errors"."1.2.8"; + by-version."http-errors"."1.2.8" = lib.makeOverridable self.buildNodePackage { + name = "http-errors-1.2.8"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/http-errors/-/http-errors-1.2.7.tgz"; - name = "http-errors-1.2.7.tgz"; - sha1 = "b881fa12c59b0079fd4ced456bf8dbc9610d3b78"; + url = "http://registry.npmjs.org/http-errors/-/http-errors-1.2.8.tgz"; + name = "http-errors-1.2.8.tgz"; + sha1 = "8ee5fe0b51982221d796c0c4712d76f72097a4d0"; }) ]; buildInputs = @@ -12066,6 +12332,8 @@ ]; passthru.names = [ "http-errors" ]; }; + by-spec."http-errors"."~1.2.8" = + self.by-version."http-errors"."1.2.8"; by-spec."http-proxy"."1.0.2" = self.by-version."http-proxy"."1.0.2"; by-version."http-proxy"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -12220,27 +12488,28 @@ passthru.names = [ "i" ]; }; by-spec."i18next"."*" = - self.by-version."i18next"."1.7.4"; - by-version."i18next"."1.7.4" = lib.makeOverridable self.buildNodePackage { - name = "i18next-1.7.4"; + self.by-version."i18next"."1.7.8"; + by-version."i18next"."1.7.8" = lib.makeOverridable self.buildNodePackage { + name = "i18next-1.7.8"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/i18next/-/i18next-1.7.4.tgz"; - name = "i18next-1.7.4.tgz"; - sha1 = "b61629c9de95a5c076acb2f954f8a882ac0772af"; + url = "http://registry.npmjs.org/i18next/-/i18next-1.7.8.tgz"; + name = "i18next-1.7.8.tgz"; + sha1 = "d100ad29ec5906b61de766479786fe00ce68e5c3"; }) ]; buildInputs = (self.nativeDeps."i18next" or []); deps = { "cookies-0.5.0" = self.by-version."cookies"."0.5.0"; + "json5-0.2.0" = self.by-version."json5"."0.2.0"; }; peerDependencies = [ ]; passthru.names = [ "i18next" ]; }; - "i18next" = self.by-version."i18next"."1.7.4"; + "i18next" = self.by-version."i18next"."1.7.8"; by-spec."ibrik"."~2.0.0" = self.by-version."ibrik"."2.0.0"; by-version."ibrik"."2.0.0" = lib.makeOverridable self.buildNodePackage { @@ -12258,9 +12527,9 @@ deps = { "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "coffee-script-1.8.0" = self.by-version."coffee-script"."1.8.0"; - "istanbul-0.3.2" = self.by-version."istanbul"."0.3.2"; + "istanbul-0.3.5" = self.by-version."istanbul"."0.3.5"; "estraverse-1.8.0" = self.by-version."estraverse"."1.8.0"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; "esprima-1.2.2" = self.by-version."esprima"."1.2.2"; @@ -12543,51 +12812,26 @@ ]; passthru.names = [ "init-package-json" ]; }; - by-spec."init-package-json"."0.0.14" = - self.by-version."init-package-json"."0.0.14"; - by-version."init-package-json"."0.0.14" = lib.makeOverridable self.buildNodePackage { - name = "init-package-json-0.0.14"; + by-spec."init-package-json"."~1.1.3" = + self.by-version."init-package-json"."1.1.3"; + by-version."init-package-json"."1.1.3" = lib.makeOverridable self.buildNodePackage { + name = "init-package-json-1.1.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.14.tgz"; - name = "init-package-json-0.0.14.tgz"; - sha1 = "bd5f7b2d73b54957388cca3ce61190340c8a05b7"; + url = "http://registry.npmjs.org/init-package-json/-/init-package-json-1.1.3.tgz"; + name = "init-package-json-1.1.3.tgz"; + sha1 = "1d633c151a4909891afc8ee13cace8b336c0c9c2"; }) ]; buildInputs = (self.nativeDeps."init-package-json" or []); deps = { + "glob-4.3.2" = self.by-version."glob"."4.3.2"; "promzard-0.2.2" = self.by-version."promzard"."0.2.2"; "read-1.0.5" = self.by-version."read"."1.0.5"; "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; - "semver-2.3.2" = self.by-version."semver"."2.3.2"; - "glob-3.2.11" = self.by-version."glob"."3.2.11"; - }; - peerDependencies = [ - ]; - passthru.names = [ "init-package-json" ]; - }; - by-spec."init-package-json"."~1.1.2" = - self.by-version."init-package-json"."1.1.2"; - by-version."init-package-json"."1.1.2" = lib.makeOverridable self.buildNodePackage { - name = "init-package-json-1.1.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/init-package-json/-/init-package-json-1.1.2.tgz"; - name = "init-package-json-1.1.2.tgz"; - sha1 = "bc6c02d1da87253141600972f0d6bdcdd016990e"; - }) - ]; - buildInputs = - (self.nativeDeps."init-package-json" or []); - deps = { - "glob-4.2.2" = self.by-version."glob"."4.2.2"; - "promzard-0.2.2" = self.by-version."promzard"."0.2.2"; - "read-1.0.5" = self.by-version."read"."1.0.5"; - "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; }; peerDependencies = [ ]; @@ -12608,7 +12852,7 @@ buildInputs = (self.nativeDeps."inline-source-map" or []); deps = { - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; @@ -12635,7 +12879,7 @@ "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4"; "readline2-0.1.0" = self.by-version."readline2"."0.1.0"; - "rx-2.3.18" = self.by-version."rx"."2.3.18"; + "rx-2.3.22" = self.by-version."rx"."2.3.22"; "through-2.3.6" = self.by-version."through"."2.3.6"; }; peerDependencies = [ @@ -12662,7 +12906,7 @@ "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4"; "readline2-0.1.0" = self.by-version."readline2"."0.1.0"; - "rx-2.3.18" = self.by-version."rx"."2.3.18"; + "rx-2.3.22" = self.by-version."rx"."2.3.22"; "through-2.3.6" = self.by-version."through"."2.3.6"; }; peerDependencies = [ @@ -12796,7 +13040,7 @@ "lodash.debounce-2.4.1" = self.by-version."lodash.debounce"."2.4.1"; "object-assign-1.0.0" = self.by-version."object-assign"."1.0.0"; "os-name-1.0.1" = self.by-version."os-name"."1.0.1"; - "request-2.49.0" = self.by-version."request"."2.49.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; }; peerDependencies = [ @@ -12804,15 +13048,15 @@ passthru.names = [ "insight" ]; }; by-spec."interpret"."^0.3.2" = - self.by-version."interpret"."0.3.8"; - by-version."interpret"."0.3.8" = lib.makeOverridable self.buildNodePackage { - name = "interpret-0.3.8"; + self.by-version."interpret"."0.3.10"; + by-version."interpret"."0.3.10" = lib.makeOverridable self.buildNodePackage { + name = "interpret-0.3.10"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/interpret/-/interpret-0.3.8.tgz"; - name = "interpret-0.3.8.tgz"; - sha1 = "23c65e60ed18a3e21cddccf96e8a6658548cda8b"; + url = "http://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz"; + name = "interpret-0.3.10.tgz"; + sha1 = "088c25de731c6c5b112a90f0071cfaf459e5a7bb"; }) ]; buildInputs = @@ -12864,15 +13108,15 @@ passthru.names = [ "ip" ]; }; by-spec."ip-regex"."^1.0.0" = - self.by-version."ip-regex"."1.0.1"; - by-version."ip-regex"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "ip-regex-1.0.1"; + self.by-version."ip-regex"."1.0.2"; + by-version."ip-regex"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "ip-regex-1.0.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/ip-regex/-/ip-regex-1.0.1.tgz"; - name = "ip-regex-1.0.1.tgz"; - sha1 = "3f1da464e47290591023a70617e45361b41123f7"; + url = "http://registry.npmjs.org/ip-regex/-/ip-regex-1.0.2.tgz"; + name = "ip-regex-1.0.2.tgz"; + sha1 = "1e7daad2c2d0c268729ecca91f8ec463ad58f56b"; }) ]; buildInputs = @@ -12924,7 +13168,7 @@ ]; passthru.names = [ "ipaddr.js" ]; }; - by-spec."ipaddr.js"."^0.1.5" = + by-spec."ipaddr.js".">= 0.1.5" = self.by-version."ipaddr.js"."0.1.6"; by-version."ipaddr.js"."0.1.6" = lib.makeOverridable self.buildNodePackage { name = "ipaddr.js-0.1.6"; @@ -12944,6 +13188,8 @@ ]; passthru.names = [ "ipaddr.js" ]; }; + by-spec."ipaddr.js"."^0.1.5" = + self.by-version."ipaddr.js"."0.1.6"; by-spec."ironhorse"."*" = self.by-version."ironhorse"."0.0.10"; by-version."ironhorse"."0.0.10" = lib.makeOverridable self.buildNodePackage { @@ -12965,14 +13211,14 @@ "fs-walk-0.0.1" = self.by-version."fs-walk"."0.0.1"; "async-0.9.0" = self.by-version."async"."0.9.0"; "express-5.0.0-alpha.1" = self.by-version."express"."5.0.0-alpha.1"; - "jade-1.8.1" = self.by-version."jade"."1.8.1"; + "jade-1.8.2" = self.by-version."jade"."1.8.2"; "passport-0.2.1" = self.by-version."passport"."0.2.1"; "passport-http-0.2.2" = self.by-version."passport-http"."0.2.2"; - "js-yaml-3.2.3" = self.by-version."js-yaml"."3.2.3"; - "mongoose-3.8.19" = self.by-version."mongoose"."3.8.19"; + "js-yaml-3.2.4" = self.by-version."js-yaml"."3.2.4"; + "mongoose-3.8.21" = self.by-version."mongoose"."3.8.21"; "gridfs-stream-0.5.3" = self.by-version."gridfs-stream"."0.5.3"; "temp-0.8.1" = self.by-version."temp"."0.8.1"; - "kue-0.8.9" = self.by-version."kue"."0.8.9"; + "kue-0.8.11" = self.by-version."kue"."0.8.11"; "redis-0.12.1" = self.by-version."redis"."0.12.1"; "hiredis-0.1.17" = self.by-version."hiredis"."0.1.17"; }; @@ -13036,12 +13282,32 @@ buildInputs = (self.nativeDeps."is-ip" or []); deps = { - "ip-regex-1.0.1" = self.by-version."ip-regex"."1.0.1"; + "ip-regex-1.0.2" = self.by-version."ip-regex"."1.0.2"; }; peerDependencies = [ ]; passthru.names = [ "is-ip" ]; }; + by-spec."is-npm"."^1.0.0" = + self.by-version."is-npm"."1.0.0"; + by-version."is-npm"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "is-npm-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz"; + name = "is-npm-1.0.0.tgz"; + sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4"; + }) + ]; + buildInputs = + (self.nativeDeps."is-npm" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "is-npm" ]; + }; by-spec."is-promise"."~1" = self.by-version."is-promise"."1.0.1"; by-version."is-promise"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -13125,15 +13391,15 @@ by-spec."isarray"."~0.0.1" = self.by-version."isarray"."0.0.1"; by-spec."isstream"."0.1.x" = - self.by-version."isstream"."0.1.0"; - by-version."isstream"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "isstream-0.1.0"; + self.by-version."isstream"."0.1.1"; + by-version."isstream"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "isstream-0.1.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/isstream/-/isstream-0.1.0.tgz"; - name = "isstream-0.1.0.tgz"; - sha1 = "1fc062509b8c8902ee78d0a8d015ad3251472285"; + url = "http://registry.npmjs.org/isstream/-/isstream-0.1.1.tgz"; + name = "isstream-0.1.1.tgz"; + sha1 = "48332c5999893996ba253c81c7bd6e7ae0905c4f"; }) ]; buildInputs = @@ -13145,15 +13411,15 @@ passthru.names = [ "isstream" ]; }; by-spec."istanbul"."*" = - self.by-version."istanbul"."0.3.2"; - by-version."istanbul"."0.3.2" = lib.makeOverridable self.buildNodePackage { - name = "istanbul-0.3.2"; + self.by-version."istanbul"."0.3.5"; + by-version."istanbul"."0.3.5" = lib.makeOverridable self.buildNodePackage { + name = "istanbul-0.3.5"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/istanbul/-/istanbul-0.3.2.tgz"; - name = "istanbul-0.3.2.tgz"; - sha1 = "e1ce9a9ec80d51dcbbeca82149f3befdc21d6835"; + url = "http://registry.npmjs.org/istanbul/-/istanbul-0.3.5.tgz"; + name = "istanbul-0.3.5.tgz"; + sha1 = "ef9ca4c1d5e6a5deac2245842051b59763a2de37"; }) ]; buildInputs = @@ -13165,43 +13431,42 @@ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; "fileset-0.1.5" = self.by-version."fileset"."0.1.5"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; "async-0.9.0" = self.by-version."async"."0.9.0"; "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2"; "resolve-0.7.4" = self.by-version."resolve"."0.7.4"; - "js-yaml-3.2.3" = self.by-version."js-yaml"."3.2.3"; + "js-yaml-3.2.4" = self.by-version."js-yaml"."3.2.4"; "once-1.3.1" = self.by-version."once"."1.3.1"; }; peerDependencies = [ ]; passthru.names = [ "istanbul" ]; }; - "istanbul" = self.by-version."istanbul"."0.3.2"; + "istanbul" = self.by-version."istanbul"."0.3.5"; by-spec."istanbul"."~0.3.0" = - self.by-version."istanbul"."0.3.2"; + self.by-version."istanbul"."0.3.5"; by-spec."istanbul"."~0.3.2" = - self.by-version."istanbul"."0.3.2"; + self.by-version."istanbul"."0.3.5"; by-spec."jade"."*" = - self.by-version."jade"."1.8.1"; - by-version."jade"."1.8.1" = lib.makeOverridable self.buildNodePackage { - name = "jade-1.8.1"; + self.by-version."jade"."1.8.2"; + by-version."jade"."1.8.2" = lib.makeOverridable self.buildNodePackage { + name = "jade-1.8.2"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/jade/-/jade-1.8.1.tgz"; - name = "jade-1.8.1.tgz"; - sha1 = "7f28dfd42832fda613e4a28fd0febb3f423c464f"; + url = "http://registry.npmjs.org/jade/-/jade-1.8.2.tgz"; + name = "jade-1.8.2.tgz"; + sha1 = "0db3630b2cb8145f6bf144d760b56e6b0bbb0aa0"; }) ]; buildInputs = (self.nativeDeps."jade" or []); deps = { "character-parser-1.2.1" = self.by-version."character-parser"."1.2.1"; - "commander-2.5.0" = self.by-version."commander"."2.5.0"; + "commander-2.5.1" = self.by-version."commander"."2.5.1"; "constantinople-3.0.1" = self.by-version."constantinople"."3.0.1"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "monocle-1.1.51" = self.by-version."monocle"."1.1.51"; "transformers-2.1.0" = self.by-version."transformers"."2.1.0"; "void-elements-1.0.0" = self.by-version."void-elements"."1.0.0"; "with-4.0.0" = self.by-version."with"."4.0.0"; @@ -13210,7 +13475,7 @@ ]; passthru.names = [ "jade" ]; }; - "jade" = self.by-version."jade"."1.8.1"; + "jade" = self.by-version."jade"."1.8.2"; by-spec."jade"."0.26.3" = self.by-version."jade"."0.26.3"; by-version."jade"."0.26.3" = lib.makeOverridable self.buildNodePackage { @@ -13283,7 +13548,7 @@ passthru.names = [ "jade" ]; }; by-spec."jade".">= 0.0.1" = - self.by-version."jade"."1.8.1"; + self.by-version."jade"."1.8.2"; by-spec."jade"."~0.35.0" = self.by-version."jade"."0.35.0"; by-version."jade"."0.35.0" = lib.makeOverridable self.buildNodePackage { @@ -13334,53 +13599,53 @@ }; "jayschema" = self.by-version."jayschema"."0.3.1"; by-spec."jfs"."*" = - self.by-version."jfs"."0.2.3"; - by-version."jfs"."0.2.3" = lib.makeOverridable self.buildNodePackage { - name = "jfs-0.2.3"; + self.by-version."jfs"."0.2.4"; + by-version."jfs"."0.2.4" = lib.makeOverridable self.buildNodePackage { + name = "jfs-0.2.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/jfs/-/jfs-0.2.3.tgz"; - name = "jfs-0.2.3.tgz"; - sha1 = "1b87551f83055e69b509fe8c3066d0c702b01574"; + url = "http://registry.npmjs.org/jfs/-/jfs-0.2.4.tgz"; + name = "jfs-0.2.4.tgz"; + sha1 = "62f95459de0930af30fb6c570ec68237bc2fdd76"; }) ]; buildInputs = (self.nativeDeps."jfs" or []); deps = { "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "async-0.9.0" = self.by-version."async"."0.9.0"; - "clone-0.1.18" = self.by-version."clone"."0.1.18"; + "clone-0.2.0" = self.by-version."clone"."0.2.0"; }; peerDependencies = [ ]; passthru.names = [ "jfs" ]; }; - "jfs" = self.by-version."jfs"."0.2.3"; + "jfs" = self.by-version."jfs"."0.2.4"; by-spec."js-yaml"."*" = - self.by-version."js-yaml"."3.2.3"; - by-version."js-yaml"."3.2.3" = lib.makeOverridable self.buildNodePackage { - name = "js-yaml-3.2.3"; + self.by-version."js-yaml"."3.2.4"; + by-version."js-yaml"."3.2.4" = lib.makeOverridable self.buildNodePackage { + name = "js-yaml-3.2.4"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.2.3.tgz"; - name = "js-yaml-3.2.3.tgz"; - sha1 = "a3af632d13df5bfa95f3b8f3c4b61efe212cd750"; + url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.2.4.tgz"; + name = "js-yaml-3.2.4.tgz"; + sha1 = "f2cfb5f5e1d251ff438f41d63139750001021083"; }) ]; buildInputs = (self.nativeDeps."js-yaml" or []); deps = { - "argparse-0.1.15" = self.by-version."argparse"."0.1.15"; + "argparse-0.1.16" = self.by-version."argparse"."0.1.16"; "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; }; peerDependencies = [ ]; passthru.names = [ "js-yaml" ]; }; - "js-yaml" = self.by-version."js-yaml"."3.2.3"; + "js-yaml" = self.by-version."js-yaml"."3.2.4"; 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 { @@ -13416,7 +13681,7 @@ buildInputs = (self.nativeDeps."js-yaml" or []); deps = { - "argparse-0.1.15" = self.by-version."argparse"."0.1.15"; + "argparse-0.1.16" = self.by-version."argparse"."0.1.16"; "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; }; peerDependencies = [ @@ -13438,7 +13703,7 @@ buildInputs = (self.nativeDeps."js-yaml" or []); deps = { - "argparse-0.1.15" = self.by-version."argparse"."0.1.15"; + "argparse-0.1.16" = self.by-version."argparse"."0.1.16"; "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; }; peerDependencies = [ @@ -13446,7 +13711,7 @@ passthru.names = [ "js-yaml" ]; }; by-spec."js-yaml"."3.x" = - self.by-version."js-yaml"."3.2.3"; + self.by-version."js-yaml"."3.2.4"; 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 { @@ -13462,7 +13727,7 @@ buildInputs = (self.nativeDeps."js-yaml" or []); deps = { - "argparse-0.1.15" = self.by-version."argparse"."0.1.15"; + "argparse-0.1.16" = self.by-version."argparse"."0.1.16"; "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; }; peerDependencies = [ @@ -13484,7 +13749,7 @@ buildInputs = (self.nativeDeps."js-yaml" or []); deps = { - "argparse-0.1.15" = self.by-version."argparse"."0.1.15"; + "argparse-0.1.16" = self.by-version."argparse"."0.1.16"; "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; }; peerDependencies = [ @@ -13514,15 +13779,15 @@ by-spec."jsesc"."~0.4.3" = self.by-version."jsesc"."0.4.3"; by-spec."jshint"."*" = - self.by-version."jshint"."2.5.10"; - by-version."jshint"."2.5.10" = lib.makeOverridable self.buildNodePackage { - name = "jshint-2.5.10"; + self.by-version."jshint"."2.5.11"; + by-version."jshint"."2.5.11" = lib.makeOverridable self.buildNodePackage { + name = "jshint-2.5.11"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/jshint/-/jshint-2.5.10.tgz"; - name = "jshint-2.5.10.tgz"; - sha1 = "2fef47ee0901914e31832123d5d3f434c28060ef"; + url = "http://registry.npmjs.org/jshint/-/jshint-2.5.11.tgz"; + name = "jshint-2.5.11.tgz"; + sha1 = "e2d95858bbb1aa78300108a2e81099fb095622e0"; }) ]; buildInputs = @@ -13541,9 +13806,9 @@ ]; passthru.names = [ "jshint" ]; }; - "jshint" = self.by-version."jshint"."2.5.10"; + "jshint" = self.by-version."jshint"."2.5.11"; by-spec."jshint"."~2.5.0" = - self.by-version."jshint"."2.5.10"; + self.by-version."jshint"."2.5.11"; by-spec."json-schema"."0.2.2" = self.by-version."json-schema"."0.2.2"; by-version."json-schema"."0.2.2" = lib.makeOverridable self.buildNodePackage { @@ -13645,6 +13910,46 @@ ]; passthru.names = [ "json-stringify-safe" ]; }; + by-spec."json5"."^0.2.0" = + self.by-version."json5"."0.2.0"; + by-version."json5"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "json5-0.2.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/json5/-/json5-0.2.0.tgz"; + name = "json5-0.2.0.tgz"; + sha1 = "b6d7035c70c4570f883c7edc759de3ae03db3343"; + }) + ]; + buildInputs = + (self.nativeDeps."json5" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "json5" ]; + }; + by-spec."jsonfile"."^2.0.0" = + self.by-version."jsonfile"."2.0.0"; + by-version."jsonfile"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "jsonfile-2.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/jsonfile/-/jsonfile-2.0.0.tgz"; + name = "jsonfile-2.0.0.tgz"; + sha1 = "c3944f350bd3c078b392e0aa1633b44662fcf06b"; + }) + ]; + buildInputs = + (self.nativeDeps."jsonfile" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "jsonfile" ]; + }; by-spec."jsonfile"."~1.0.1" = self.by-version."jsonfile"."1.0.1"; by-version."jsonfile"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -13830,7 +14135,7 @@ deps = { "di-0.0.1" = self.by-version."di"."0.0.1"; "socket.io-0.9.17" = self.by-version."socket.io"."0.9.17"; - "chokidar-0.11.1" = self.by-version."chokidar"."0.11.1"; + "chokidar-0.12.5" = self.by-version."chokidar"."0.12.5"; "glob-3.2.11" = self.by-version."glob"."3.2.11"; "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; "http-proxy-0.10.4" = self.by-version."http-proxy"."0.10.4"; @@ -13844,7 +14149,7 @@ "useragent-2.0.10" = self.by-version."useragent"."2.0.10"; "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; "connect-2.26.6" = self.by-version."connect"."2.26.6"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; @@ -13862,15 +14167,15 @@ by-spec."karma"."~0.12.0" = self.by-version."karma"."0.12.28"; by-spec."karma-chrome-launcher"."*" = - self.by-version."karma-chrome-launcher"."0.1.5"; - by-version."karma-chrome-launcher"."0.1.5" = lib.makeOverridable self.buildNodePackage { - name = "karma-chrome-launcher-0.1.5"; + self.by-version."karma-chrome-launcher"."0.1.7"; + by-version."karma-chrome-launcher"."0.1.7" = lib.makeOverridable self.buildNodePackage { + name = "karma-chrome-launcher-0.1.7"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.5.tgz"; - name = "karma-chrome-launcher-0.1.5.tgz"; - sha1 = "70e95dca5c4d7a15884850daa3ab60d648dbfe8b"; + url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.7.tgz"; + name = "karma-chrome-launcher-0.1.7.tgz"; + sha1 = "c248cc01d5ae17dafdb16319d0badf637dfb6e59"; }) ]; buildInputs = @@ -13882,7 +14187,7 @@ ]; passthru.names = [ "karma-chrome-launcher" ]; }; - "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.5"; + "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.7"; by-spec."karma-coverage"."*" = self.by-version."karma-coverage"."0.2.7"; by-version."karma-coverage"."0.2.7" = lib.makeOverridable self.buildNodePackage { @@ -13898,7 +14203,7 @@ buildInputs = (self.nativeDeps."karma-coverage" or []); deps = { - "istanbul-0.3.2" = self.by-version."istanbul"."0.3.2"; + "istanbul-0.3.5" = self.by-version."istanbul"."0.3.5"; "ibrik-2.0.0" = self.by-version."ibrik"."2.0.0"; "dateformat-1.0.11" = self.by-version."dateformat"."1.0.11"; "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0"; @@ -13933,15 +14238,15 @@ }; "karma-junit-reporter" = self.by-version."karma-junit-reporter"."0.2.2"; by-spec."karma-mocha"."*" = - self.by-version."karma-mocha"."0.1.9"; - by-version."karma-mocha"."0.1.9" = lib.makeOverridable self.buildNodePackage { - name = "karma-mocha-0.1.9"; + self.by-version."karma-mocha"."0.1.10"; + by-version."karma-mocha"."0.1.10" = lib.makeOverridable self.buildNodePackage { + name = "karma-mocha-0.1.10"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.9.tgz"; - name = "karma-mocha-0.1.9.tgz"; - sha1 = "d777a98d655e08330f7893e833c369f82bd10191"; + url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.10.tgz"; + name = "karma-mocha-0.1.10.tgz"; + sha1 = "29ed51d4b121af1373444ec555b20a905bf42b92"; }) ]; buildInputs = @@ -13954,7 +14259,7 @@ ]; passthru.names = [ "karma-mocha" ]; }; - "karma-mocha" = self.by-version."karma-mocha"."0.1.9"; + "karma-mocha" = self.by-version."karma-mocha"."0.1.10"; by-spec."karma-requirejs"."*" = self.by-version."karma-requirejs"."0.2.2"; by-version."karma-requirejs"."0.2.2" = lib.makeOverridable self.buildNodePackage { @@ -14086,6 +14391,27 @@ ]; passthru.names = [ "kerberos" ]; }; + by-spec."kerberos"."0.0.7" = + self.by-version."kerberos"."0.0.7"; + by-version."kerberos"."0.0.7" = lib.makeOverridable self.buildNodePackage { + name = "kerberos-0.0.7"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.7.tgz"; + name = "kerberos-0.0.7.tgz"; + sha1 = "48db5e268e59ebb1626fd3c76ff8ff7f267a9852"; + }) + ]; + buildInputs = + (self.nativeDeps."kerberos" or []); + deps = { + "nan-1.3.0" = self.by-version."nan"."1.3.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "kerberos" ]; + }; by-spec."kew"."0.4.0" = self.by-version."kew"."0.4.0"; by-version."kew"."0.4.0" = lib.makeOverridable self.buildNodePackage { @@ -14235,15 +14561,15 @@ }; "knox" = self.by-version."knox"."0.9.1"; by-spec."kue"."*" = - self.by-version."kue"."0.8.9"; - by-version."kue"."0.8.9" = lib.makeOverridable self.buildNodePackage { - name = "kue-0.8.9"; + self.by-version."kue"."0.8.11"; + by-version."kue"."0.8.11" = lib.makeOverridable self.buildNodePackage { + name = "kue-0.8.11"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/kue/-/kue-0.8.9.tgz"; - name = "kue-0.8.9.tgz"; - sha1 = "6fb2c7d4014f26a64ebf76c092085fe9db16fdcb"; + url = "http://registry.npmjs.org/kue/-/kue-0.8.11.tgz"; + name = "kue-0.8.11.tgz"; + sha1 = "0e18c6f827b73deb68a6ee06b55c14d4797450b0"; }) ]; buildInputs = @@ -14262,7 +14588,7 @@ ]; passthru.names = [ "kue" ]; }; - "kue" = self.by-version."kue"."0.8.9"; + "kue" = self.by-version."kue"."0.8.11"; by-spec."labeled-stream-splicer"."^1.0.0" = self.by-version."labeled-stream-splicer"."1.0.2"; by-version."labeled-stream-splicer"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -14307,6 +14633,27 @@ ]; passthru.names = [ "latest-version" ]; }; + by-spec."latest-version"."^1.0.0" = + self.by-version."latest-version"."1.0.0"; + by-version."latest-version"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "latest-version-1.0.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/latest-version/-/latest-version-1.0.0.tgz"; + name = "latest-version-1.0.0.tgz"; + sha1 = "84f40e5c90745c7e4f7811624d6152c381d931d9"; + }) + ]; + buildInputs = + (self.nativeDeps."latest-version" or []); + deps = { + "package-json-1.0.1" = self.by-version."package-json"."1.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "latest-version" ]; + }; by-spec."lazy"."~1.0.11" = self.by-version."lazy"."1.0.11"; by-version."lazy"."1.0.11" = lib.makeOverridable self.buildNodePackage { @@ -14409,9 +14756,9 @@ deps = { "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "request-2.49.0" = self.by-version."request"."2.49.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; "promise-6.0.1" = self.by-version."promise"."6.0.1"; }; peerDependencies = [ @@ -14438,13 +14785,35 @@ "mime-1.2.11" = self.by-version."mime"."1.2.11"; "request-2.40.0" = self.by-version."request"."2.40.0"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "clean-css-2.2.19" = self.by-version."clean-css"."2.2.19"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "clean-css-2.2.22" = self.by-version."clean-css"."2.2.22"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; passthru.names = [ "less" ]; }; + by-spec."levn"."~0.2.5" = + self.by-version."levn"."0.2.5"; + by-version."levn"."0.2.5" = lib.makeOverridable self.buildNodePackage { + name = "levn-0.2.5"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/levn/-/levn-0.2.5.tgz"; + name = "levn-0.2.5.tgz"; + sha1 = "ba8d339d0ca4a610e3a3f145b9caf48807155054"; + }) + ]; + buildInputs = + (self.nativeDeps."levn" or []); + deps = { + "prelude-ls-1.1.1" = self.by-version."prelude-ls"."1.1.1"; + "type-check-0.3.1" = self.by-version."type-check"."0.3.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "levn" ]; + }; by-spec."lexical-scope"."~0.0.14" = self.by-version."lexical-scope"."0.0.15"; by-version."lexical-scope"."0.0.15" = lib.makeOverridable self.buildNodePackage { @@ -15361,32 +15730,32 @@ passthru.names = [ "lsmod" ]; }; by-spec."ltx"."*" = - self.by-version."ltx"."0.7.2"; - by-version."ltx"."0.7.2" = lib.makeOverridable self.buildNodePackage { - name = "ltx-0.7.2"; + self.by-version."ltx"."0.8.0"; + by-version."ltx"."0.8.0" = lib.makeOverridable self.buildNodePackage { + name = "ltx-0.8.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/ltx/-/ltx-0.7.2.tgz"; - name = "ltx-0.7.2.tgz"; - sha1 = "70a6aa8fa5fd426a422a41ba3d54a15ccdde680c"; + url = "http://registry.npmjs.org/ltx/-/ltx-0.8.0.tgz"; + name = "ltx-0.8.0.tgz"; + sha1 = "08aeb2f68c4c7d20ab35e9dcb7519fd80824c529"; }) ]; buildInputs = (self.nativeDeps."ltx" or []); deps = { "sax-0.6.1" = self.by-version."sax"."0.6.1"; - "node-expat-2.3.3" = self.by-version."node-expat"."2.3.3"; + "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; }; peerDependencies = [ ]; passthru.names = [ "ltx" ]; }; - "ltx" = self.by-version."ltx"."0.7.2"; + "ltx" = self.by-version."ltx"."0.8.0"; by-spec."ltx"."0.x" = - self.by-version."ltx"."0.7.2"; + self.by-version."ltx"."0.8.0"; by-spec."ltx".">= 0.2.0" = - self.by-version."ltx"."0.7.2"; + self.by-version."ltx"."0.8.0"; by-spec."ltx"."^0.5.2" = self.by-version."ltx"."0.5.2"; by-version."ltx"."0.5.2" = lib.makeOverridable self.buildNodePackage { @@ -15403,7 +15772,7 @@ (self.nativeDeps."ltx" or []); deps = { "sax-0.6.1" = self.by-version."sax"."0.6.1"; - "node-expat-2.3.3" = self.by-version."node-expat"."2.3.3"; + "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; }; peerDependencies = [ ]; @@ -15411,6 +15780,26 @@ }; by-spec."ltx"."^0.7.2" = self.by-version."ltx"."0.7.2"; + by-version."ltx"."0.7.2" = lib.makeOverridable self.buildNodePackage { + name = "ltx-0.7.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ltx/-/ltx-0.7.2.tgz"; + name = "ltx-0.7.2.tgz"; + sha1 = "70a6aa8fa5fd426a422a41ba3d54a15ccdde680c"; + }) + ]; + buildInputs = + (self.nativeDeps."ltx" or []); + deps = { + "sax-0.6.1" = self.by-version."sax"."0.6.1"; + "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "ltx" ]; + }; by-spec."ltx"."~0.3.2" = self.by-version."ltx"."0.3.4"; by-version."ltx"."0.3.4" = lib.makeOverridable self.buildNodePackage { @@ -15451,14 +15840,14 @@ (self.nativeDeps."ltx" or []); deps = { "sax-0.6.1" = self.by-version."sax"."0.6.1"; - "node-expat-2.3.3" = self.by-version."node-expat"."2.3.3"; + "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; }; peerDependencies = [ ]; passthru.names = [ "ltx" ]; }; by-spec."ltx"."~0.x" = - self.by-version."ltx"."0.7.2"; + self.by-version."ltx"."0.8.0"; by-spec."m8".">= 0.4.3" = self.by-version."m8"."0.4.4"; by-version."m8"."0.4.4" = lib.makeOverridable self.buildNodePackage { @@ -15611,7 +16000,7 @@ "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; "figures-1.3.5" = self.by-version."figures"."1.3.5"; "gzip-size-1.0.0" = self.by-version."gzip-size"."1.0.0"; - "pretty-bytes-1.0.1" = self.by-version."pretty-bytes"."1.0.1"; + "pretty-bytes-1.0.2" = self.by-version."pretty-bytes"."1.0.2"; }; peerDependencies = [ ]; @@ -15642,37 +16031,37 @@ passthru.names = [ "maxmin" ]; }; by-spec."mdns-js"."git+https://github.com/guerrerocarlos/node-mdns-js" = - self.by-version."mdns-js"."0.2.2"; - by-version."mdns-js"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "mdns-js-0.2.2"; + self.by-version."mdns-js"."0.2.4"; + by-version."mdns-js"."0.2.4" = lib.makeOverridable self.buildNodePackage { + name = "mdns-js-0.2.4"; bin = false; src = [ (fetchgit { url = "https://github.com/guerrerocarlos/node-mdns-js"; - rev = "25b81ef88fa2f9ad8ebc875ac3e1d3f36a87ed61"; - sha256 = "1f6fee2a00345e9c82e0d49818f7137cf3288072bddfdc6225b738184804e103"; + rev = "36fc8ed207a6c7d571d1f98a186b8d3686c7f261"; + sha256 = "b14121656f33817843d09452ff3d562bbedda28cda2cba3e8ba436c9541f75ee"; }) ]; buildInputs = (self.nativeDeps."mdns-js" or []); deps = { "debug-0.8.1" = self.by-version."debug"."0.8.1"; - "mdns-js-packet-0.1.3" = self.by-version."mdns-js-packet"."0.1.3"; + "mdns-js-packet-0.1.8" = self.by-version."mdns-js-packet"."0.1.8"; }; peerDependencies = [ ]; passthru.names = [ "mdns-js" ]; }; by-spec."mdns-js-packet"."0.1.x" = - self.by-version."mdns-js-packet"."0.1.3"; - by-version."mdns-js-packet"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "mdns-js-packet-0.1.3"; + self.by-version."mdns-js-packet"."0.1.8"; + by-version."mdns-js-packet"."0.1.8" = lib.makeOverridable self.buildNodePackage { + name = "mdns-js-packet-0.1.8"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mdns-js-packet/-/mdns-js-packet-0.1.3.tgz"; - name = "mdns-js-packet-0.1.3.tgz"; - sha1 = "a98ad52e1e74e96b00aab239af4354687a16db01"; + url = "http://registry.npmjs.org/mdns-js-packet/-/mdns-js-packet-0.1.8.tgz"; + name = "mdns-js-packet-0.1.8.tgz"; + sha1 = "e5a205c6e26e22a1df58e5f38057e80a6f84ee26"; }) ]; buildInputs = @@ -16117,15 +16506,15 @@ by-spec."mime"."~1.2.9" = self.by-version."mime"."1.2.11"; by-spec."mime-db"."1.x" = - self.by-version."mime-db"."1.2.0"; - by-version."mime-db"."1.2.0" = lib.makeOverridable self.buildNodePackage { - name = "mime-db-1.2.0"; + self.by-version."mime-db"."1.3.1"; + by-version."mime-db"."1.3.1" = lib.makeOverridable self.buildNodePackage { + name = "mime-db-1.3.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.2.0.tgz"; - name = "mime-db-1.2.0.tgz"; - sha1 = "76b92e7ecac673f5dab066a10b66faea1be2f01f"; + url = "http://registry.npmjs.org/mime-db/-/mime-db-1.3.1.tgz"; + name = "mime-db-1.3.1.tgz"; + sha1 = "b1cd51ee8c4a674c49e03a96d67565fc768ce941"; }) ]; buildInputs = @@ -16136,8 +16525,8 @@ ]; passthru.names = [ "mime-db" ]; }; - by-spec."mime-db"."~1.2.0" = - self.by-version."mime-db"."1.2.0"; + by-spec."mime-db"."~1.3.0" = + self.by-version."mime-db"."1.3.1"; by-spec."mime-types"."~1.0.1" = self.by-version."mime-types"."1.0.2"; by-version."mime-types"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -16159,26 +16548,28 @@ passthru.names = [ "mime-types" ]; }; by-spec."mime-types"."~2.0.3" = - self.by-version."mime-types"."2.0.3"; - by-version."mime-types"."2.0.3" = lib.makeOverridable self.buildNodePackage { - name = "mime-types-2.0.3"; + self.by-version."mime-types"."2.0.4"; + by-version."mime-types"."2.0.4" = lib.makeOverridable self.buildNodePackage { + name = "mime-types-2.0.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.3.tgz"; - name = "mime-types-2.0.3.tgz"; - sha1 = "70b5cb5165b55dcb4972839f16d6077b0bb506f4"; + url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.4.tgz"; + name = "mime-types-2.0.4.tgz"; + sha1 = "855a612979141d806ba5104294a28c731c6ea790"; }) ]; buildInputs = (self.nativeDeps."mime-types" or []); deps = { - "mime-db-1.2.0" = self.by-version."mime-db"."1.2.0"; + "mime-db-1.3.1" = self.by-version."mime-db"."1.3.1"; }; peerDependencies = [ ]; passthru.names = [ "mime-types" ]; }; + by-spec."mime-types"."~2.0.4" = + self.by-version."mime-types"."2.0.4"; by-spec."mimelib"."~0.2.15" = self.by-version."mimelib"."0.2.18"; by-version."mimelib"."0.2.18" = lib.makeOverridable self.buildNodePackage { @@ -16334,9 +16725,30 @@ by-spec."minimatch"."1.0.x" = self.by-version."minimatch"."1.0.0"; by-spec."minimatch".">=0.2.4" = - self.by-version."minimatch"."1.0.0"; + self.by-version."minimatch"."2.0.1"; + by-version."minimatch"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "minimatch-2.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz"; + name = "minimatch-2.0.1.tgz"; + sha1 = "6c3760b45f66ed1cd5803143ee8d372488f02c37"; + }) + ]; + buildInputs = + (self.nativeDeps."minimatch" or []); + deps = { + "brace-expansion-1.1.0" = self.by-version."brace-expansion"."1.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "minimatch" ]; + }; by-spec."minimatch"."^1.0.0" = self.by-version."minimatch"."1.0.0"; + by-spec."minimatch"."^2.0.1" = + self.by-version."minimatch"."2.0.1"; by-spec."minimatch"."~0.2" = self.by-version."minimatch"."0.2.14"; by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage { @@ -16359,18 +16771,20 @@ ]; passthru.names = [ "minimatch" ]; }; + by-spec."minimatch"."~0.2.0" = + self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2.11" = self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2.12" = self.by-version."minimatch"."0.2.14"; - by-spec."minimatch"."~0.2.14" = - self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2.9" = self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.3.0" = self.by-version."minimatch"."0.3.0"; by-spec."minimatch"."~1.0.0" = self.by-version."minimatch"."1.0.0"; + by-spec."minimatch"."~2.0.1" = + self.by-version."minimatch"."2.0.1"; by-spec."minimist"."0.0.8" = self.by-version."minimist"."0.0.8"; by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage { @@ -16391,26 +16805,6 @@ ]; passthru.names = [ "minimist" ]; }; - by-spec."minimist"."^0.1.0" = - self.by-version."minimist"."0.1.0"; - by-version."minimist"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "minimist-0.1.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz"; - name = "minimist-0.1.0.tgz"; - sha1 = "99df657a52574c21c9057497df742790b2b4c0de"; - }) - ]; - buildInputs = - (self.nativeDeps."minimist" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "minimist" ]; - }; by-spec."minimist"."^1.1.0" = self.by-version."minimist"."1.1.0"; by-version."minimist"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -16498,15 +16892,15 @@ passthru.names = [ "ministyle" ]; }; by-spec."miniwrite"."~0.1.3" = - self.by-version."miniwrite"."0.1.3"; - by-version."miniwrite"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "miniwrite-0.1.3"; + self.by-version."miniwrite"."0.1.4"; + by-version."miniwrite"."0.1.4" = lib.makeOverridable self.buildNodePackage { + name = "miniwrite-0.1.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/miniwrite/-/miniwrite-0.1.3.tgz"; - name = "miniwrite-0.1.3.tgz"; - sha1 = "9e893efb435f853454ca0321b86a44378e8c50c6"; + url = "http://registry.npmjs.org/miniwrite/-/miniwrite-0.1.4.tgz"; + name = "miniwrite-0.1.4.tgz"; + sha1 = "72f02385c0ac37d542efe27dc6764b31908725ce"; }) ]; buildInputs = @@ -16723,15 +17117,15 @@ passthru.names = [ "mocha" ]; }; by-spec."mocha-phantomjs"."*" = - self.by-version."mocha-phantomjs"."3.5.1"; - by-version."mocha-phantomjs"."3.5.1" = lib.makeOverridable self.buildNodePackage { - name = "mocha-phantomjs-3.5.1"; + self.by-version."mocha-phantomjs"."3.5.2"; + by-version."mocha-phantomjs"."3.5.2" = lib.makeOverridable self.buildNodePackage { + name = "mocha-phantomjs-3.5.2"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.5.1.tgz"; - name = "mocha-phantomjs-3.5.1.tgz"; - sha1 = "e5460eff3e859b98be73a743f11cb5cae3c58d00"; + url = "http://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.5.2.tgz"; + name = "mocha-phantomjs-3.5.2.tgz"; + sha1 = "4d7474d373acc9f828c90d868035be527cdf367b"; }) ]; buildInputs = @@ -16745,7 +17139,7 @@ ]; passthru.names = [ "mocha-phantomjs" ]; }; - "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.5.1"; + "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.5.2"; by-spec."mocha-unfunk-reporter"."*" = self.by-version."mocha-unfunk-reporter"."0.4.0"; by-version."mocha-unfunk-reporter"."0.4.0" = lib.makeOverridable self.buildNodePackage { @@ -16763,7 +17157,7 @@ deps = { "jsesc-0.4.3" = self.by-version."jsesc"."0.4.3"; "unfunk-diff-0.0.2" = self.by-version."unfunk-diff"."0.0.2"; - "miniwrite-0.1.3" = self.by-version."miniwrite"."0.1.3"; + "miniwrite-0.1.4" = self.by-version."miniwrite"."0.1.4"; "ministyle-0.1.4" = self.by-version."ministyle"."0.1.4"; }; peerDependencies = [ @@ -16771,23 +17165,23 @@ passthru.names = [ "mocha-unfunk-reporter" ]; }; "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.4.0"; - by-spec."module-deps"."^3.5.0" = - self.by-version."module-deps"."3.5.10"; - by-version."module-deps"."3.5.10" = lib.makeOverridable self.buildNodePackage { - name = "module-deps-3.5.10"; + by-spec."module-deps"."^3.6.3" = + self.by-version."module-deps"."3.6.3"; + by-version."module-deps"."3.6.3" = lib.makeOverridable self.buildNodePackage { + name = "module-deps-3.6.3"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/module-deps/-/module-deps-3.5.10.tgz"; - name = "module-deps-3.5.10.tgz"; - sha1 = "2754737d4f9e52b60daa4abb242ade6c85ecde99"; + url = "http://registry.npmjs.org/module-deps/-/module-deps-3.6.3.tgz"; + name = "module-deps-3.6.3.tgz"; + sha1 = "4ffec778d74eb4c75d3102c1f414789fb6b6f277"; }) ]; buildInputs = (self.nativeDeps."module-deps" or []); deps = { "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4"; - "browser-resolve-1.4.1" = self.by-version."browser-resolve"."1.4.1"; + "browser-resolve-1.5.0" = self.by-version."browser-resolve"."1.5.0"; "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; "detective-4.0.0" = self.by-version."detective"."4.0.0"; "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2"; @@ -16992,45 +17386,46 @@ ]; passthru.names = [ "mongodb" ]; }; - by-spec."mongodb"."1.3.x" = - self.by-version."mongodb"."1.3.23"; - by-version."mongodb"."1.3.23" = lib.makeOverridable self.buildNodePackage { - name = "mongodb-1.3.23"; + by-spec."mongodb"."1.4.12" = + self.by-version."mongodb"."1.4.12"; + by-version."mongodb"."1.4.12" = lib.makeOverridable self.buildNodePackage { + name = "mongodb-1.4.12"; bin = false; src = [ - (fetchurl { - url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.23.tgz"; - name = "mongodb-1.3.23.tgz"; - sha1 = "874a5212162b16188aeeaee5e06067766c8e9e86"; + (self.patchSource fetchurl { + url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.12.tgz"; + name = "mongodb-1.4.12.tgz"; + sha1 = "65cdd46ec127861e941168fdccf82bf17ad71c4d"; }) ]; buildInputs = (self.nativeDeps."mongodb" or []); deps = { - "bson-0.2.5" = self.by-version."bson"."0.2.5"; - "kerberos-0.0.3" = self.by-version."kerberos"."0.0.3"; + "bson-0.2.16" = self.by-version."bson"."0.2.16"; + "kerberos-0.0.4" = self.by-version."kerberos"."0.0.4"; + "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; }; peerDependencies = [ ]; passthru.names = [ "mongodb" ]; }; - by-spec."mongodb"."1.4.12" = - self.by-version."mongodb"."1.4.12"; - by-version."mongodb"."1.4.12" = lib.makeOverridable self.buildNodePackage { - name = "mongodb-1.4.12"; + by-spec."mongodb"."1.4.x" = + self.by-version."mongodb"."1.4.25"; + by-version."mongodb"."1.4.25" = lib.makeOverridable self.buildNodePackage { + name = "mongodb-1.4.25"; bin = false; src = [ (self.patchSource fetchurl { - url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.12.tgz"; - name = "mongodb-1.4.12.tgz"; - sha1 = "65cdd46ec127861e941168fdccf82bf17ad71c4d"; + url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.25.tgz"; + name = "mongodb-1.4.25.tgz"; + sha1 = "58c09f9f2143db564ef2370fe9375a81f3daf96e"; }) ]; buildInputs = (self.nativeDeps."mongodb" or []); deps = { - "bson-0.2.15" = self.by-version."bson"."0.2.15"; - "kerberos-0.0.4" = self.by-version."kerberos"."0.0.4"; + "bson-0.2.16" = self.by-version."bson"."0.2.16"; + "kerberos-0.0.7" = self.by-version."kerberos"."0.0.7"; "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; }; peerDependencies = [ @@ -17094,15 +17489,15 @@ }; "mongoose" = self.by-version."mongoose"."3.6.20"; by-spec."mongoose"."3.8.x" = - self.by-version."mongoose"."3.8.19"; - by-version."mongoose"."3.8.19" = lib.makeOverridable self.buildNodePackage { - name = "mongoose-3.8.19"; + self.by-version."mongoose"."3.8.21"; + by-version."mongoose"."3.8.21" = lib.makeOverridable self.buildNodePackage { + name = "mongoose-3.8.21"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.19.tgz"; - name = "mongoose-3.8.19.tgz"; - sha1 = "53b82129c895bbb1e91094cb34d4a03920b1dcb4"; + url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.21.tgz"; + name = "mongoose-3.8.21.tgz"; + sha1 = "ba96d6e73b7b73a5c133ca886de316994df2a2f0"; }) ]; buildInputs = @@ -17274,6 +17669,27 @@ ]; passthru.names = [ "morgan" ]; }; + by-spec."mount-point"."^1.0.0" = + self.by-version."mount-point"."1.0.3"; + by-version."mount-point"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "mount-point-1.0.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mount-point/-/mount-point-1.0.3.tgz"; + name = "mount-point-1.0.3.tgz"; + sha1 = "43adac2467a9dc8abf4b784a0d7b7453ab58df4d"; + }) + ]; + buildInputs = + (self.nativeDeps."mount-point" or []); + deps = { + "node-df-0.1.1" = self.by-version."node-df"."0.1.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "mount-point" ]; + }; by-spec."mout"."~0.9.0" = self.by-version."mout"."0.9.1"; by-version."mout"."0.9.1" = lib.makeOverridable self.buildNodePackage { @@ -17418,6 +17834,26 @@ ]; passthru.names = [ "ms" ]; }; + by-spec."ms"."0.7.0" = + self.by-version."ms"."0.7.0"; + by-version."ms"."0.7.0" = lib.makeOverridable self.buildNodePackage { + name = "ms-0.7.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ms/-/ms-0.7.0.tgz"; + name = "ms-0.7.0.tgz"; + sha1 = "865be94c2e7397ad8a57da6a633a6e2f30798b83"; + }) + ]; + buildInputs = + (self.nativeDeps."ms" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "ms" ]; + }; by-spec."msgpack".">= 0.0.1" = self.by-version."msgpack"."0.2.4"; by-version."msgpack"."0.2.4" = lib.makeOverridable self.buildNodePackage { @@ -17567,21 +18003,23 @@ passthru.names = [ "mv" ]; }; by-spec."mz"."1" = - self.by-version."mz"."1.1.0"; - by-version."mz"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "mz-1.1.0"; + self.by-version."mz"."1.2.0"; + by-version."mz"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "mz-1.2.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mz/-/mz-1.1.0.tgz"; - name = "mz-1.1.0.tgz"; - sha1 = "fa63f08f20a1f6985cc1d9a33efa8db608cd6b9c"; + url = "http://registry.npmjs.org/mz/-/mz-1.2.0.tgz"; + name = "mz-1.2.0.tgz"; + sha1 = "efc279d54f32f54e6169cf0bed838c22fc417fe8"; }) ]; buildInputs = (self.nativeDeps."mz" or []); deps = { "native-or-bluebird-1.1.2" = self.by-version."native-or-bluebird"."1.1.2"; + "thenify-2.0.0" = self.by-version."thenify"."2.0.0"; + "thenify-all-1.0.0" = self.by-version."thenify-all"."1.0.0"; }; peerDependencies = [ ]; @@ -17891,6 +18329,26 @@ ]; passthru.names = [ "ncp" ]; }; + by-spec."ncp"."^0.6.0" = + self.by-version."ncp"."0.6.0"; + by-version."ncp"."0.6.0" = lib.makeOverridable self.buildNodePackage { + name = "ncp-0.6.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ncp/-/ncp-0.6.0.tgz"; + name = "ncp-0.6.0.tgz"; + sha1 = "df8ce021e262be21b52feb3d3e5cfaab12491f0d"; + }) + ]; + buildInputs = + (self.nativeDeps."ncp" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "ncp" ]; + }; by-spec."ncp"."~0.4.2" = self.by-version."ncp"."0.4.2"; by-spec."ncp"."~1.0.1" = @@ -17993,8 +18451,6 @@ ]; 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 { @@ -18142,11 +18598,11 @@ "diff-1.0.8" = self.by-version."diff"."1.0.8"; "dox-0.4.6" = self.by-version."dox"."0.4.6"; "jade-0.35.0" = self.by-version."jade"."0.35.0"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; "request-2.27.0" = self.by-version."request"."2.27.0"; "semver-2.1.0" = self.by-version."semver"."2.1.0"; - "sprintf-0.1.4" = self.by-version."sprintf"."0.1.4"; + "sprintf-0.1.5" = self.by-version."sprintf"."0.1.5"; "temp-0.6.0" = self.by-version."temp"."0.6.0"; "wrench-1.5.8" = self.by-version."wrench"."1.5.8"; "uglify-js-2.3.6" = self.by-version."uglify-js"."2.3.6"; @@ -18156,16 +18612,37 @@ ]; passthru.names = [ "node-appc" ]; }; + by-spec."node-df"."^0.1.1" = + self.by-version."node-df"."0.1.1"; + by-version."node-df"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-df-0.1.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-df/-/node-df-0.1.1.tgz"; + name = "node-df-0.1.1.tgz"; + sha1 = "42ec5a15b7b491164b3de7edeef2e346a0e500ea"; + }) + ]; + buildInputs = + (self.nativeDeps."node-df" or []); + deps = { + "underscore-1.7.0" = self.by-version."underscore"."1.7.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "node-df" ]; + }; by-spec."node-expat"."*" = - self.by-version."node-expat"."2.3.3"; - by-version."node-expat"."2.3.3" = lib.makeOverridable self.buildNodePackage { - name = "node-expat-2.3.3"; + self.by-version."node-expat"."2.3.4"; + by-version."node-expat"."2.3.4" = lib.makeOverridable self.buildNodePackage { + name = "node-expat-2.3.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-expat/-/node-expat-2.3.3.tgz"; - name = "node-expat-2.3.3.tgz"; - sha1 = "fd7bfe475c9dd30b634cc1279c7a68aea900ebfa"; + url = "http://registry.npmjs.org/node-expat/-/node-expat-2.3.4.tgz"; + name = "node-expat-2.3.4.tgz"; + sha1 = "f2659ee57ca6226d0d0a3957eeae71c1b3f67f61"; }) ]; buildInputs = @@ -18179,9 +18656,9 @@ ]; passthru.names = [ "node-expat" ]; }; - "node-expat" = self.by-version."node-expat"."2.3.3"; + "node-expat" = self.by-version."node-expat"."2.3.4"; by-spec."node-expat".">=1.4.1" = - self.by-version."node-expat"."2.3.3"; + self.by-version."node-expat"."2.3.4"; by-spec."node-expat"."~2.1.4" = self.by-version."node-expat"."2.1.4"; by-version."node-expat"."2.1.4" = lib.makeOverridable self.buildNodePackage { @@ -18204,9 +18681,9 @@ passthru.names = [ "node-expat" ]; }; by-spec."node-expat"."~2.3.0" = - self.by-version."node-expat"."2.3.3"; + self.by-version."node-expat"."2.3.4"; by-spec."node-expat"."~2.3.1" = - self.by-version."node-expat"."2.3.3"; + self.by-version."node-expat"."2.3.4"; by-spec."node-gyp"."*" = self.by-version."node-gyp"."1.0.2"; by-version."node-gyp"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -18223,18 +18700,18 @@ (self.nativeDeps."node-gyp" or []); deps = { "fstream-1.0.3" = self.by-version."fstream"."1.0.3"; - "glob-4.2.2" = self.by-version."glob"."4.2.2"; + "glob-4.3.2" = self.by-version."glob"."4.3.2"; "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; - "request-2.49.0" = self.by-version."request"."2.49.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; "tar-1.0.3" = self.by-version."tar"."1.0.3"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; }; peerDependencies = [ ]; @@ -18264,82 +18741,82 @@ "nopt-2.2.1" = self.by-version."nopt"."2.2.1"; "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; - "request-2.49.0" = self.by-version."request"."2.49.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; "semver-2.1.0" = self.by-version."semver"."2.1.0"; "tar-0.1.20" = self.by-version."tar"."0.1.20"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; }; peerDependencies = [ ]; passthru.names = [ "node-gyp" ]; }; - 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"; + by-spec."node-gyp"."~1.0.2" = + self.by-version."node-gyp"."1.0.2"; + by-spec."node-inspector"."*" = + self.by-version."node-inspector"."0.8.1"; + by-version."node-inspector"."0.8.1" = lib.makeOverridable self.buildNodePackage { + name = "node-inspector-0.8.1"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.12.2.tgz"; - name = "node-gyp-0.12.2.tgz"; - sha1 = "bdca7e7025feb308ddd7fd3434300e47703ec57a"; + url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.8.1.tgz"; + name = "node-inspector-0.8.1.tgz"; + sha1 = "2e7e88d47c4dc0761497f2fba520ca2310985950"; }) ]; buildInputs = - (self.nativeDeps."node-gyp" or []); + (self.nativeDeps."node-inspector" or []); deps = { + "express-4.10.6" = self.by-version."express"."4.10.6"; + "serve-favicon-2.2.0" = self.by-version."serve-favicon"."2.2.0"; + "async-0.9.0" = self.by-version."async"."0.9.0"; "glob-3.2.11" = self.by-version."glob"."3.2.11"; - "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; - "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; - "minimatch-0.4.0" = self.by-version."minimatch"."0.4.0"; - "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "nopt-2.2.1" = self.by-version."nopt"."2.2.1"; - "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; - "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; - "request-2.49.0" = self.by-version."request"."2.49.0"; - "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "semver-2.2.1" = self.by-version."semver"."2.2.1"; - "tar-0.1.20" = self.by-version."tar"."0.1.20"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "rc-0.5.4" = self.by-version."rc"."0.5.4"; + "strong-data-uri-0.1.1" = self.by-version."strong-data-uri"."0.1.1"; + "debug-1.0.4" = self.by-version."debug"."1.0.4"; + "ws-0.4.32" = self.by-version."ws"."0.4.32"; + "opener-1.4.0" = self.by-version."opener"."1.4.0"; + "yargs-1.3.3" = self.by-version."yargs"."1.3.3"; + "which-1.0.8" = self.by-version."which"."1.0.8"; + "v8-debug-0.3.1" = self.by-version."v8-debug"."0.3.1"; + "v8-profiler-5.2.1" = self.by-version."v8-profiler"."5.2.1"; + "semver-3.0.1" = self.by-version."semver"."3.0.1"; }; peerDependencies = [ ]; - passthru.names = [ "node-gyp" ]; + passthru.names = [ "node-inspector" ]; }; - by-spec."node-gyp"."~1.0.1" = - self.by-version."node-gyp"."1.0.2"; - by-spec."node-inspector"."*" = - self.by-version."node-inspector"."0.7.4"; - by-version."node-inspector"."0.7.4" = lib.makeOverridable self.buildNodePackage { - name = "node-inspector-0.7.4"; + "node-inspector" = self.by-version."node-inspector"."0.8.1"; + by-spec."node-pre-gyp"."0.5.x" = + self.by-version."node-pre-gyp"."0.5.31"; + by-version."node-pre-gyp"."0.5.31" = lib.makeOverridable self.buildNodePackage { + name = "node-pre-gyp-0.5.31"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.4.tgz"; - name = "node-inspector-0.7.4.tgz"; - sha1 = "3d07234f0834e7f1e21a1669eceaa224a7be43f2"; + url = "http://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.5.31.tgz"; + name = "node-pre-gyp-0.5.31.tgz"; + sha1 = "8c91516f0009e4691413c8c3f2d8a060deb607ba"; }) ]; buildInputs = - (self.nativeDeps."node-inspector" or []); + (self.nativeDeps."node-pre-gyp" or []); deps = { - "express-4.0.0" = self.by-version."express"."4.0.0"; - "async-0.8.0" = self.by-version."async"."0.8.0"; - "glob-3.2.11" = self.by-version."glob"."3.2.11"; - "rc-0.3.5" = self.by-version."rc"."0.3.5"; - "strong-data-uri-0.1.1" = self.by-version."strong-data-uri"."0.1.1"; - "debug-0.8.1" = self.by-version."debug"."0.8.1"; - "ws-0.4.32" = self.by-version."ws"."0.4.32"; - "opener-1.3.0" = self.by-version."opener"."1.3.0"; - "yargs-1.2.6" = self.by-version."yargs"."1.2.6"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; + "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; + "request-2.51.0" = self.by-version."request"."2.51.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; + "tar-1.0.3" = self.by-version."tar"."1.0.3"; + "tar-pack-2.0.0" = self.by-version."tar-pack"."2.0.0"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "rc-0.5.4" = self.by-version."rc"."0.5.4"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; }; peerDependencies = [ ]; - passthru.names = [ "node-inspector" ]; + passthru.names = [ "node-pre-gyp" ]; }; - "node-inspector" = self.by-version."node-inspector"."0.7.4"; by-spec."node-protobuf"."*" = self.by-version."node-protobuf"."1.2.2"; by-version."node-protobuf"."1.2.2" = lib.makeOverridable self.buildNodePackage { @@ -18512,15 +18989,15 @@ }; "node-uptime" = self.by-version."node-uptime"."3.2.0"; by-spec."node-uuid"."*" = - self.by-version."node-uuid"."1.4.1"; - by-version."node-uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { - name = "node-uuid-1.4.1"; - bin = false; + self.by-version."node-uuid"."1.4.2"; + by-version."node-uuid"."1.4.2" = lib.makeOverridable self.buildNodePackage { + name = "node-uuid-1.4.2"; + bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; - name = "node-uuid-1.4.1.tgz"; - sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; + url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz"; + name = "node-uuid-1.4.2.tgz"; + sha1 = "907db3d11b7b6a2cf4f905fb7199f14ae7379ba0"; }) ]; buildInputs = @@ -18531,7 +19008,7 @@ ]; passthru.names = [ "node-uuid" ]; }; - "node-uuid" = self.by-version."node-uuid"."1.4.1"; + "node-uuid" = self.by-version."node-uuid"."1.4.2"; by-spec."node-uuid"."1.3.3" = self.by-version."node-uuid"."1.3.3"; by-version."node-uuid"."1.3.3" = lib.makeOverridable self.buildNodePackage { @@ -18574,12 +19051,32 @@ }; by-spec."node-uuid"."1.4.1" = self.by-version."node-uuid"."1.4.1"; + by-version."node-uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-uuid-1.4.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; + name = "node-uuid-1.4.1.tgz"; + sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; + }) + ]; + buildInputs = + (self.nativeDeps."node-uuid" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "node-uuid" ]; + }; by-spec."node-uuid"."^1.4.1" = - self.by-version."node-uuid"."1.4.1"; + self.by-version."node-uuid"."1.4.2"; by-spec."node-uuid"."~1.4.0" = - self.by-version."node-uuid"."1.4.1"; + self.by-version."node-uuid"."1.4.2"; by-spec."node-uuid"."~1.4.1" = - self.by-version."node-uuid"."1.4.1"; + self.by-version."node-uuid"."1.4.2"; + by-spec."node-uuid"."~1.4.2" = + self.by-version."node-uuid"."1.4.2"; by-spec."node-wsfederation".">=0.1.1" = self.by-version."node-wsfederation"."0.1.1"; by-version."node-wsfederation"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -18616,17 +19113,17 @@ buildInputs = (self.nativeDeps."node-xmpp" or []); deps = { - "node-expat-2.3.3" = self.by-version."node-expat"."2.3.3"; - "ltx-0.7.2" = self.by-version."ltx"."0.7.2"; - "request-2.49.0" = self.by-version."request"."2.49.0"; + "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; + "ltx-0.8.0" = self.by-version."ltx"."0.8.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3"; - "faye-websocket-0.8.1" = self.by-version."faye-websocket"."0.8.1"; + "faye-websocket-0.9.1" = self.by-version."faye-websocket"."0.9.1"; "browserify-3.19.1" = self.by-version."browserify"."3.19.1"; "brfs-0.0.8" = self.by-version."brfs"."0.0.8"; "node-xmpp-component-1.0.0-alpha1" = self.by-version."node-xmpp-component"."1.0.0-alpha1"; - "node-xmpp-client-1.0.0-alpha18" = self.by-version."node-xmpp-client"."1.0.0-alpha18"; + "node-xmpp-client-1.0.0-alpha19" = self.by-version."node-xmpp-client"."1.0.0-alpha19"; "node-xmpp-server-1.0.0-alpha11" = self.by-version."node-xmpp-server"."1.0.0-alpha11"; - "node-xmpp-core-1.0.0-alpha11" = self.by-version."node-xmpp-core"."1.0.0-alpha11"; + "node-xmpp-core-1.0.0-alpha12" = self.by-version."node-xmpp-core"."1.0.0-alpha12"; }; peerDependencies = [ ]; @@ -18648,11 +19145,11 @@ buildInputs = (self.nativeDeps."node-xmpp" or []); deps = { - "node-expat-2.3.3" = self.by-version."node-expat"."2.3.3"; - "ltx-0.7.2" = self.by-version."ltx"."0.7.2"; - "request-2.49.0" = self.by-version."request"."2.49.0"; + "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; + "ltx-0.8.0" = self.by-version."ltx"."0.8.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3"; - "faye-websocket-0.8.1" = self.by-version."faye-websocket"."0.8.1"; + "faye-websocket-0.9.1" = self.by-version."faye-websocket"."0.9.1"; "browserify-3.19.1" = self.by-version."browserify"."3.19.1"; "brfs-0.0.8" = self.by-version."brfs"."0.0.8"; "node-xmpp-component-0.3.0" = self.by-version."node-xmpp-component"."0.3.0"; @@ -18692,15 +19189,15 @@ }; "node-xmpp-client" = self.by-version."node-xmpp-client"."1.0.0-alpha9"; by-spec."node-xmpp-client"."git+https://github.com/node-xmpp/node-xmpp-client.git" = - self.by-version."node-xmpp-client"."1.0.0-alpha18"; - by-version."node-xmpp-client"."1.0.0-alpha18" = lib.makeOverridable self.buildNodePackage { - name = "node-xmpp-client-1.0.0-alpha18"; + self.by-version."node-xmpp-client"."1.0.0-alpha19"; + by-version."node-xmpp-client"."1.0.0-alpha19" = lib.makeOverridable self.buildNodePackage { + name = "node-xmpp-client-1.0.0-alpha19"; bin = false; src = [ (fetchgit { url = "https://github.com/node-xmpp/node-xmpp-client.git"; - rev = "7a7b32a65405e087a72e37f534dfb62aa0dc005a"; - sha256 = "5744e791465babfd1c2678304c3ef08a23371f9d1f9b45364d9dfd7e7a62e1c3"; + rev = "74bf98a62700bee8e32ba7723abd35320917b8d7"; + sha256 = "7dd69c6b8a4b8d7fef0109432c5b8add5560c9a108955b0adce7ee29507b5a26"; }) ]; buildInputs = @@ -18757,7 +19254,7 @@ buildInputs = (self.nativeDeps."node-xmpp-component" or []); deps = { - "ltx-0.7.2" = self.by-version."ltx"."0.7.2"; + "ltx-0.8.0" = self.by-version."ltx"."0.8.0"; "node-xmpp-core-1.0.0-alpha1" = self.by-version."node-xmpp-core"."1.0.0-alpha1"; }; peerDependencies = [ @@ -18833,7 +19330,7 @@ "node-stringprep-0.6.2" = self.by-version."node-stringprep"."0.6.2"; "reconnect-core-0.0.1" = self.by-version."reconnect-core"."0.0.1"; "tls-connect-0.2.2" = self.by-version."tls-connect"."0.2.2"; - "ltx-0.7.2" = self.by-version."ltx"."0.7.2"; + "ltx-0.8.0" = self.by-version."ltx"."0.8.0"; "debug-0.8.1" = self.by-version."debug"."0.8.1"; }; peerDependencies = [ @@ -18847,15 +19344,15 @@ by-spec."node-xmpp-core"."^1.0.0-alpha9" = self.by-version."node-xmpp-core"."1.0.0-alpha9"; by-spec."node-xmpp-core"."git+https://github.com/node-xmpp/node-xmpp-core.git" = - self.by-version."node-xmpp-core"."1.0.0-alpha11"; - by-version."node-xmpp-core"."1.0.0-alpha11" = lib.makeOverridable self.buildNodePackage { - name = "node-xmpp-core-1.0.0-alpha11"; + self.by-version."node-xmpp-core"."1.0.0-alpha12"; + by-version."node-xmpp-core"."1.0.0-alpha12" = lib.makeOverridable self.buildNodePackage { + name = "node-xmpp-core-1.0.0-alpha12"; bin = false; src = [ (self.patchSource fetchgit { url = "https://github.com/node-xmpp/node-xmpp-core.git"; - rev = "f10cef6ab105c1542f698c5648c47e685adc38ad"; - sha256 = "734a4681af2078d8f3daf1e8aeb2b4121003115a804e1666e416e87b48720ebc"; + rev = "ba6ec76654191dbb338a83dc5cd8b5d3c264ad7f"; + sha256 = "714ae11501ba59fffe06ed8c312672628363f55640c9c8d78c4654ad63976971"; }) ]; buildInputs = @@ -18911,13 +19408,13 @@ buildInputs = (self.nativeDeps."node-xmpp-joap" or []); deps = { - "node-expat-2.3.3" = self.by-version."node-expat"."2.3.3"; + "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; "node-xmpp-0.15.0" = self.by-version."node-xmpp"."0.15.0"; "node-stringprep-0.6.2" = self.by-version."node-stringprep"."0.6.2"; "ltx-0.6.0" = self.by-version."ltx"."0.6.0"; "async-0.9.0" = self.by-version."async"."0.9.0"; "toobusy-0.2.4" = self.by-version."toobusy"."0.2.4"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; }; peerDependencies = [ ]; @@ -18956,8 +19453,8 @@ src = [ (fetchgit { url = "https://github.com/node-xmpp/node-xmpp-server.git"; - rev = "535abf75c95c3e500ebb14a863b81bfa4da529db"; - sha256 = "5abac2a86079c6f4ba1371a6a6455f6ae022e19965151dc0c309c875f2629eb9"; + rev = "e61c1f97064e32dc9d5ac857a3915710ada88e84"; + sha256 = "6683bd693d37e0b435373a99f3f7f44e64be00d36eb736d30e66e9f8af874e2c"; }) ]; buildInputs = @@ -19060,29 +19557,29 @@ passthru.names = [ "nodemailer" ]; }; by-spec."nodemon"."*" = - self.by-version."nodemon"."1.2.1"; - by-version."nodemon"."1.2.1" = lib.makeOverridable self.buildNodePackage { - name = "nodemon-1.2.1"; + self.by-version."nodemon"."1.3.0-6"; + by-version."nodemon"."1.3.0-6" = lib.makeOverridable self.buildNodePackage { + name = "nodemon-1.3.0-6"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/nodemon/-/nodemon-1.2.1.tgz"; - name = "nodemon-1.2.1.tgz"; - sha1 = "02a288045652e92350e7d752a8054472ed2c4824"; + url = "http://registry.npmjs.org/nodemon/-/nodemon-1.3.0-6.tgz"; + name = "nodemon-1.3.0-6.tgz"; + sha1 = "8b2c8a4397da6138428cb6a6dcdb4288a89d98c8"; }) ]; buildInputs = (self.nativeDeps."nodemon" or []); deps = { - "update-notifier-0.1.10" = self.by-version."update-notifier"."0.1.10"; "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0"; "ps-tree-0.0.3" = self.by-version."ps-tree"."0.0.3"; + "update-notifier-0.1.10" = self.by-version."update-notifier"."0.1.10"; }; peerDependencies = [ ]; passthru.names = [ "nodemon" ]; }; - "nodemon" = self.by-version."nodemon"."1.2.1"; + "nodemon" = self.by-version."nodemon"."1.3.0-6"; by-spec."nomnom"."1.6.x" = self.by-version."nomnom"."1.6.2"; by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage { @@ -19214,8 +19711,6 @@ ]; passthru.names = [ "nopt" ]; }; - by-spec."nopt"."~2.1.2" = - self.by-version."nopt"."2.1.2"; by-spec."nopt"."~2.2.0" = self.by-version."nopt"."2.2.1"; by-spec."nopt"."~3.0.0" = @@ -19262,7 +19757,7 @@ deps = { "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0"; "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; }; peerDependencies = [ ]; @@ -19273,15 +19768,15 @@ by-spec."normalize-package-data"."~1.0.3" = self.by-version."normalize-package-data"."1.0.3"; by-spec."npm"."*" = - self.by-version."npm"."2.1.11"; - by-version."npm"."2.1.11" = lib.makeOverridable self.buildNodePackage { - name = "npm-2.1.11"; + self.by-version."npm"."2.1.15"; + by-version."npm"."2.1.15" = lib.makeOverridable self.buildNodePackage { + name = "npm-2.1.15"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-2.1.11.tgz"; - name = "npm-2.1.11.tgz"; - sha1 = "1eed4c04e4c8c745bc721baba1b4fe42f2af140c"; + url = "http://registry.npmjs.org/npm/-/npm-2.1.15.tgz"; + name = "npm-2.1.15.tgz"; + sha1 = "7a4e3ce676ee8879a4e6935ae104877b5f99b8d5"; }) ]; buildInputs = @@ -19299,25 +19794,25 @@ "chmodr-0.1.0" = self.by-version."chmodr"."0.1.0"; "chownr-0.0.1" = self.by-version."chownr"."0.0.1"; "cmd-shim-2.0.1" = self.by-version."cmd-shim"."2.0.1"; - "columnify-1.2.1" = self.by-version."columnify"."1.2.1"; + "columnify-1.3.2" = self.by-version."columnify"."1.3.2"; "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8"; "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1"; "editor-0.1.0" = self.by-version."editor"."0.1.0"; - "fs-vacuum-1.2.2" = self.by-version."fs-vacuum"."1.2.2"; + "fs-vacuum-1.2.5" = self.by-version."fs-vacuum"."1.2.5"; "fs-write-stream-atomic-1.0.2" = self.by-version."fs-write-stream-atomic"."1.0.2"; "fstream-1.0.3" = self.by-version."fstream"."1.0.3"; "fstream-npm-1.0.1" = self.by-version."fstream-npm"."1.0.1"; "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0"; "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2"; - "glob-4.2.2" = self.by-version."glob"."4.2.2"; + "glob-4.3.2" = self.by-version."glob"."4.3.2"; "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "inflight-1.0.4" = self.by-version."inflight"."1.0.4"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; "ini-1.3.2" = self.by-version."ini"."1.3.2"; - "init-package-json-1.1.2" = self.by-version."init-package-json"."1.1.2"; + "init-package-json-1.1.3" = self.by-version."init-package-json"."1.1.3"; "lockfile-1.0.0" = self.by-version."lockfile"."1.0.0"; "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; - "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; + "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "node-gyp-1.0.2" = self.by-version."node-gyp"."1.0.2"; "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; @@ -19325,7 +19820,7 @@ "npm-cache-filename-1.0.1" = self.by-version."npm-cache-filename"."1.0.1"; "npm-install-checks-1.0.4" = self.by-version."npm-install-checks"."1.0.4"; "npm-package-arg-2.1.3" = self.by-version."npm-package-arg"."2.1.3"; - "npm-registry-client-4.0.4" = self.by-version."npm-registry-client"."4.0.4"; + "npm-registry-client-4.0.5" = self.by-version."npm-registry-client"."4.0.5"; "npm-user-validate-0.1.1" = self.by-version."npm-user-validate"."0.1.1"; "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; @@ -19337,17 +19832,17 @@ "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; "realize-package-specifier-1.3.0" = self.by-version."realize-package-specifier"."1.3.0"; - "request-2.48.0" = self.by-version."request"."2.48.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "retry-0.6.1" = self.by-version."retry"."0.6.1"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; "sha-1.3.0" = self.by-version."sha"."1.3.0"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; "sorted-object-1.0.0" = self.by-version."sorted-object"."1.0.0"; "tar-1.0.3" = self.by-version."tar"."1.0.3"; "text-table-0.2.0" = self.by-version."text-table"."0.2.0"; "uid-number-0.0.6" = self.by-version."uid-number"."0.0.6"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1"; "write-file-atomic-1.1.0" = self.by-version."write-file-atomic"."1.1.0"; }; @@ -19355,7 +19850,7 @@ ]; passthru.names = [ "npm" ]; }; - "npm" = self.by-version."npm"."2.1.11"; + "npm" = self.by-version."npm"."2.1.15"; by-spec."npm"."1.3.4" = self.by-version."npm"."1.3.4"; by-version."npm"."1.3.4" = lib.makeOverridable self.buildNodePackage { @@ -19380,7 +19875,7 @@ "nopt-2.1.2" = self.by-version."nopt"."2.1.2"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; "request-2.21.0" = self.by-version."request"."2.21.0"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; "tar-0.1.20" = self.by-version."tar"."0.1.20"; "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7"; @@ -19417,73 +19912,8 @@ ]; passthru.names = [ "npm" ]; }; - by-spec."npm"."1.3.x" = - self.by-version."npm"."1.3.26"; - by-version."npm"."1.3.26" = lib.makeOverridable self.buildNodePackage { - name = "npm-1.3.26"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-1.3.26.tgz"; - name = "npm-1.3.26.tgz"; - sha1 = "bc07bf7cb58710078141c885c2d492fd570f606d"; - }) - ]; - buildInputs = - (self.nativeDeps."npm" or []); - deps = { - "semver-2.2.1" = self.by-version."semver"."2.2.1"; - "ini-1.1.0" = self.by-version."ini"."1.1.0"; - "slide-1.1.6" = self.by-version."slide"."1.1.6"; - "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; - "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; - "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; - "nopt-2.1.2" = self.by-version."nopt"."2.1.2"; - "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "request-2.30.0" = self.by-version."request"."2.30.0"; - "which-1.0.7" = self.by-version."which"."1.0.7"; - "tar-0.1.20" = self.by-version."tar"."0.1.20"; - "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; - "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7"; - "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; - "read-1.0.5" = self.by-version."read"."1.0.5"; - "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; - "node-gyp-0.12.2" = self.by-version."node-gyp"."0.12.2"; - "fstream-npm-0.1.8" = self.by-version."fstream-npm"."0.1.8"; - "uid-number-0.0.6" = self.by-version."uid-number"."0.0.6"; - "archy-0.0.2" = self.by-version."archy"."0.0.2"; - "chownr-0.0.1" = self.by-version."chownr"."0.0.1"; - "npmlog-0.0.6" = self.by-version."npmlog"."0.0.6"; - "ansi-0.2.1" = self.by-version."ansi"."0.2.1"; - "npm-registry-client-0.3.6" = self.by-version."npm-registry-client"."0.3.6"; - "read-package-json-1.1.9" = self.by-version."read-package-json"."1.1.9"; - "read-installed-0.2.5" = self.by-version."read-installed"."0.2.5"; - "glob-3.2.11" = self.by-version."glob"."3.2.11"; - "init-package-json-0.0.14" = self.by-version."init-package-json"."0.0.14"; - "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; - "lockfile-0.4.3" = self.by-version."lockfile"."0.4.3"; - "retry-0.6.1" = self.by-version."retry"."0.6.1"; - "once-1.3.1" = self.by-version."once"."1.3.1"; - "npmconf-0.1.16" = self.by-version."npmconf"."0.1.16"; - "opener-1.3.0" = self.by-version."opener"."1.3.0"; - "chmodr-0.1.0" = self.by-version."chmodr"."0.1.0"; - "cmd-shim-1.1.2" = self.by-version."cmd-shim"."1.1.2"; - "sha-1.2.4" = self.by-version."sha"."1.2.4"; - "editor-0.0.5" = self.by-version."editor"."0.0.5"; - "child-process-close-0.1.1" = self.by-version."child-process-close"."0.1.1"; - "npm-user-validate-0.0.3" = self.by-version."npm-user-validate"."0.0.3"; - "github-url-from-git-1.1.1" = self.by-version."github-url-from-git"."1.1.1"; - "github-url-from-username-repo-0.0.2" = self.by-version."github-url-from-username-repo"."0.0.2"; - "text-table-0.2.0" = self.by-version."text-table"."0.2.0"; - "ansicolors-0.3.2" = self.by-version."ansicolors"."0.3.2"; - "ansistyles-0.1.3" = self.by-version."ansistyles"."0.1.3"; - "path-is-inside-1.0.1" = self.by-version."path-is-inside"."1.0.1"; - "columnify-0.1.2" = self.by-version."columnify"."0.1.2"; - }; - peerDependencies = [ - ]; - passthru.names = [ "npm" ]; - }; + by-spec."npm"."2.1.x" = + self.by-version."npm"."2.1.15"; by-spec."npm-cache-filename"."~1.0.1" = self.by-version."npm-cache-filename"."1.0.1"; by-version."npm-cache-filename"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -19505,31 +19935,31 @@ passthru.names = [ "npm-cache-filename" ]; }; by-spec."npm-check-updates"."*" = - self.by-version."npm-check-updates"."1.2.0"; - by-version."npm-check-updates"."1.2.0" = lib.makeOverridable self.buildNodePackage { - name = "npm-check-updates-1.2.0"; + self.by-version."npm-check-updates"."1.3.0"; + by-version."npm-check-updates"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "npm-check-updates-1.3.0"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm-check-updates/-/npm-check-updates-1.2.0.tgz"; - name = "npm-check-updates-1.2.0.tgz"; - sha1 = "9e055cdc4a6fad8043bb95adf23eb74f5718c3ec"; + url = "http://registry.npmjs.org/npm-check-updates/-/npm-check-updates-1.3.0.tgz"; + name = "npm-check-updates-1.3.0.tgz"; + sha1 = "5d42413cd754fc29d32029ad37eb975a2206f598"; }) ]; buildInputs = (self.nativeDeps."npm-check-updates" or []); deps = { - "npm-1.3.26" = self.by-version."npm"."1.3.26"; - "commander-2.0.0" = self.by-version."commander"."2.0.0"; - "async-0.2.10" = self.by-version."async"."0.2.10"; - "read-package-json-1.1.9" = self.by-version."read-package-json"."1.1.9"; - "semver-2.2.1" = self.by-version."semver"."2.2.1"; + "npm-2.1.15" = self.by-version."npm"."2.1.15"; + "commander-2.5.1" = self.by-version."commander"."2.5.1"; + "async-0.9.0" = self.by-version."async"."0.9.0"; + "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; }; peerDependencies = [ ]; passthru.names = [ "npm-check-updates" ]; }; - "npm-check-updates" = self.by-version."npm-check-updates"."1.2.0"; + "npm-check-updates" = self.by-version."npm-check-updates"."1.3.0"; by-spec."npm-install-checks"."~1.0.2" = self.by-version."npm-install-checks"."1.0.4"; by-version."npm-install-checks"."1.0.4" = lib.makeOverridable self.buildNodePackage { @@ -19546,7 +19976,7 @@ (self.nativeDeps."npm-install-checks" or []); deps = { "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; }; peerDependencies = [ ]; @@ -19567,7 +19997,7 @@ buildInputs = (self.nativeDeps."npm-package-arg" or []); deps = { - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; }; peerDependencies = [ ]; @@ -19590,7 +20020,7 @@ buildInputs = (self.nativeDeps."npm-registry-client" or []); deps = { - "request-2.49.0" = self.by-version."request"."2.49.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; "semver-2.0.11" = self.by-version."semver"."2.0.11"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; @@ -19620,7 +20050,7 @@ buildInputs = (self.nativeDeps."npm-registry-client" or []); deps = { - "request-2.49.0" = self.by-version."request"."2.49.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; "semver-2.3.2" = self.by-version."semver"."2.3.2"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; @@ -19635,45 +20065,16 @@ ]; passthru.names = [ "npm-registry-client" ]; }; - by-spec."npm-registry-client"."~0.3.5" = - self.by-version."npm-registry-client"."0.3.6"; - by-version."npm-registry-client"."0.3.6" = lib.makeOverridable self.buildNodePackage { - name = "npm-registry-client-0.3.6"; - bin = false; - 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 = { - "request-2.49.0" = self.by-version."request"."2.49.0"; - "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; - "semver-2.3.2" = self.by-version."semver"."2.3.2"; - "slide-1.1.6" = self.by-version."slide"."1.1.6"; - "chownr-0.0.1" = self.by-version."chownr"."0.0.1"; - "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; - "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "retry-0.6.0" = self.by-version."retry"."0.6.0"; - "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; - }; - peerDependencies = [ - ]; - passthru.names = [ "npm-registry-client" ]; - }; by-spec."npm-registry-client"."~4.0.4" = - self.by-version."npm-registry-client"."4.0.4"; - by-version."npm-registry-client"."4.0.4" = lib.makeOverridable self.buildNodePackage { - name = "npm-registry-client-4.0.4"; + self.by-version."npm-registry-client"."4.0.5"; + by-version."npm-registry-client"."4.0.5" = lib.makeOverridable self.buildNodePackage { + name = "npm-registry-client-4.0.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-4.0.4.tgz"; - name = "npm-registry-client-4.0.4.tgz"; - sha1 = "6935cde6460a3bf1cb6019d7523196e0fb96fb62"; + url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-4.0.5.tgz"; + name = "npm-registry-client-4.0.5.tgz"; + sha1 = "27d37ca0c7bbd5df14f4ae35223a4d588dd4fea6"; }) ]; buildInputs = @@ -19685,10 +20086,10 @@ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3"; "once-1.3.1" = self.by-version."once"."1.3.1"; - "request-2.49.0" = self.by-version."request"."2.49.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "retry-0.6.1" = self.by-version."retry"."0.6.1"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; }; @@ -19696,6 +20097,8 @@ ]; passthru.names = [ "npm-registry-client" ]; }; + by-spec."npm-registry-client"."~4.0.5" = + self.by-version."npm-registry-client"."4.0.5"; 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 { @@ -19843,7 +20246,7 @@ "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5"; }; peerDependencies = [ @@ -19872,7 +20275,7 @@ "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5"; }; peerDependencies = [ @@ -19881,8 +20284,6 @@ }; by-spec."npmconf"."~0.1.1" = self.by-version."npmconf"."0.1.16"; - by-spec."npmconf"."~0.1.12" = - self.by-version."npmconf"."0.1.16"; by-spec."npmconf"."~0.1.2" = self.by-version."npmconf"."0.1.16"; by-spec."npmconf"."~2.1.1" = @@ -19931,41 +20332,20 @@ ]; passthru.names = [ "npmlog" ]; }; - by-spec."npmlog"."0.0.6" = - self.by-version."npmlog"."0.0.6"; - by-version."npmlog"."0.0.6" = lib.makeOverridable self.buildNodePackage { - name = "npmlog-0.0.6"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.6.tgz"; - name = "npmlog-0.0.6.tgz"; - sha1 = "685043fe71aa1665d6e3b2acef180640caf40873"; - }) - ]; - buildInputs = - (self.nativeDeps."npmlog" or []); - deps = { - "ansi-0.2.1" = self.by-version."ansi"."0.2.1"; - }; - peerDependencies = [ - ]; - passthru.names = [ "npmlog" ]; - }; by-spec."npmlog"."0.1" = self.by-version."npmlog"."0.1.1"; by-spec."npmlog"."~0.1.1" = self.by-version."npmlog"."0.1.1"; by-spec."nssocket"."~0.5.1" = - self.by-version."nssocket"."0.5.2"; - by-version."nssocket"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "nssocket-0.5.2"; + self.by-version."nssocket"."0.5.3"; + by-version."nssocket"."0.5.3" = lib.makeOverridable self.buildNodePackage { + name = "nssocket-0.5.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/nssocket/-/nssocket-0.5.2.tgz"; - name = "nssocket-0.5.2.tgz"; - sha1 = "7ea1d0c3106620f722cdff4ddfd5aac5b2553536"; + url = "http://registry.npmjs.org/nssocket/-/nssocket-0.5.3.tgz"; + name = "nssocket-0.5.3.tgz"; + sha1 = "883ca2ec605f5ed64a4d5190b2625401928f8f8d"; }) ]; buildInputs = @@ -19999,15 +20379,15 @@ passthru.names = [ "numeral" ]; }; by-spec."oauth"."https://github.com/ciaranj/node-oauth/tarball/master" = - self.by-version."oauth"."0.9.11"; - by-version."oauth"."0.9.11" = lib.makeOverridable self.buildNodePackage { - name = "oauth-0.9.11"; + self.by-version."oauth"."0.9.12"; + by-version."oauth"."0.9.12" = lib.makeOverridable self.buildNodePackage { + name = "oauth-0.9.12"; bin = false; src = [ (fetchurl { url = "https://github.com/ciaranj/node-oauth/tarball/master"; - name = "oauth-0.9.11.tgz"; - sha256 = "783dead39b8df22dfff8961fcfb3e65622375d4308c12c1fbce2ae2e4da20184"; + name = "oauth-0.9.12.tgz"; + sha256 = "e06c3c3537e9c802c8ad00640b9f91bf2857cf8cc91209e355b5646f4da8b3e7"; }) ]; buildInputs = @@ -20317,6 +20697,26 @@ self.by-version."once"."1.3.1"; by-spec."once"."~1.3.1" = self.by-version."once"."1.3.1"; + by-spec."onetime"."^1.0.0" = + self.by-version."onetime"."1.0.0"; + by-version."onetime"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "onetime-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/onetime/-/onetime-1.0.0.tgz"; + name = "onetime-1.0.0.tgz"; + sha1 = "3a08a8e39d7816df52d34886374fb8ed8b651f62"; + }) + ]; + buildInputs = + (self.nativeDeps."onetime" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "onetime" ]; + }; by-spec."open"."0.0.2" = self.by-version."open"."0.0.2"; by-version."open"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -20357,16 +20757,16 @@ ]; passthru.names = [ "open" ]; }; - by-spec."opener"."~1.3.0" = - self.by-version."opener"."1.3.0"; - by-version."opener"."1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "opener-1.3.0"; + by-spec."opener"."^1.3.0" = + self.by-version."opener"."1.4.0"; + by-version."opener"."1.4.0" = lib.makeOverridable self.buildNodePackage { + name = "opener-1.4.0"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/opener/-/opener-1.3.0.tgz"; - name = "opener-1.3.0.tgz"; - sha1 = "130ba662213fa842edb4cd0361d31a15301a43e2"; + url = "http://registry.npmjs.org/opener/-/opener-1.4.0.tgz"; + name = "opener-1.4.0.tgz"; + sha1 = "d11f86eeeb076883735c9d509f538fe82d10b941"; }) ]; buildInputs = @@ -20377,16 +20777,16 @@ ]; passthru.names = [ "opener" ]; }; - by-spec."opener"."~1.4.0" = - self.by-version."opener"."1.4.0"; - by-version."opener"."1.4.0" = lib.makeOverridable self.buildNodePackage { - name = "opener-1.4.0"; + by-spec."opener"."~1.3.0" = + self.by-version."opener"."1.3.0"; + by-version."opener"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "opener-1.3.0"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/opener/-/opener-1.4.0.tgz"; - name = "opener-1.4.0.tgz"; - sha1 = "d11f86eeeb076883735c9d509f538fe82d10b941"; + url = "http://registry.npmjs.org/opener/-/opener-1.3.0.tgz"; + name = "opener-1.3.0.tgz"; + sha1 = "130ba662213fa842edb4cd0361d31a15301a43e2"; }) ]; buildInputs = @@ -20397,6 +20797,8 @@ ]; passthru.names = [ "opener" ]; }; + by-spec."opener"."~1.4.0" = + self.by-version."opener"."1.4.0"; by-spec."openid".">=0.2.0" = self.by-version."openid"."0.5.9"; by-version."openid"."0.5.9" = lib.makeOverridable self.buildNodePackage { @@ -20534,6 +20936,32 @@ self.by-version."optimist"."0.6.1"; by-spec."optimist"."~0.6.1" = self.by-version."optimist"."0.6.1"; + by-spec."optionator"."^0.4.0" = + self.by-version."optionator"."0.4.0"; + by-version."optionator"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "optionator-0.4.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/optionator/-/optionator-0.4.0.tgz"; + name = "optionator-0.4.0.tgz"; + sha1 = "e79c7926ff7d550f92c714dfc3da21d7877ebea6"; + }) + ]; + buildInputs = + (self.nativeDeps."optionator" or []); + deps = { + "prelude-ls-1.1.1" = self.by-version."prelude-ls"."1.1.1"; + "deep-is-0.1.3" = self.by-version."deep-is"."0.1.3"; + "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2"; + "type-check-0.3.1" = self.by-version."type-check"."0.3.1"; + "levn-0.2.5" = self.by-version."levn"."0.2.5"; + "fast-levenshtein-1.0.6" = self.by-version."fast-levenshtein"."1.0.6"; + }; + peerDependencies = [ + ]; + passthru.names = [ "optionator" ]; + }; by-spec."options".">=0.0.5" = self.by-version."options"."0.0.6"; by-version."options"."0.0.6" = lib.makeOverridable self.buildNodePackage { @@ -20795,6 +21223,28 @@ ]; passthru.names = [ "package-json" ]; }; + by-spec."package-json"."^1.0.0" = + self.by-version."package-json"."1.0.1"; + by-version."package-json"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "package-json-1.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/package-json/-/package-json-1.0.1.tgz"; + name = "package-json-1.0.1.tgz"; + sha1 = "89cc831317c4d17922413d5318b23c904e5cf43e"; + }) + ]; + buildInputs = + (self.nativeDeps."package-json" or []); + deps = { + "got-1.2.2" = self.by-version."got"."1.2.2"; + "registry-url-2.0.0" = self.by-version."registry-url"."2.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "package-json" ]; + }; by-spec."pako"."~0.2.0" = self.by-version."pako"."0.2.5"; by-version."pako"."0.2.5" = lib.makeOverridable self.buildNodePackage { @@ -20877,6 +21327,29 @@ ]; passthru.names = [ "parents" ]; }; + by-spec."parse-asn1"."^1.2.0" = + self.by-version."parse-asn1"."1.2.0"; + by-version."parse-asn1"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "parse-asn1-1.2.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/parse-asn1/-/parse-asn1-1.2.0.tgz"; + name = "parse-asn1-1.2.0.tgz"; + sha1 = "d6a8926be45c4ff032842bd86b36b7b574a810ae"; + }) + ]; + buildInputs = + (self.nativeDeps."parse-asn1" or []); + deps = { + "asn1.js-0.6.5" = self.by-version."asn1.js"."0.6.5"; + "asn1.js-rfc3280-0.5.1" = self.by-version."asn1.js-rfc3280"."0.5.1"; + "pemstrip-0.0.1" = self.by-version."pemstrip"."0.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "parse-asn1" ]; + }; by-spec."parse-torrent"."^1.4.0" = self.by-version."parse-torrent"."1.7.0"; by-version."parse-torrent"."1.7.0" = lib.makeOverridable self.buildNodePackage { @@ -21094,7 +21567,7 @@ ]; passthru.names = [ "path-browserify" ]; }; - by-spec."path-is-inside"."~1.0.0" = + by-spec."path-is-inside"."^1.0.1" = self.by-version."path-is-inside"."1.0.1"; by-version."path-is-inside"."1.0.1" = lib.makeOverridable self.buildNodePackage { name = "path-is-inside-1.0.1"; @@ -21114,6 +21587,8 @@ ]; passthru.names = [ "path-is-inside" ]; }; + by-spec."path-is-inside"."~1.0.0" = + self.by-version."path-is-inside"."1.0.1"; by-spec."path-platform"."^0.0.1" = self.by-version."path-platform"."0.0.1"; by-version."path-platform"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -21134,26 +21609,6 @@ ]; passthru.names = [ "path-platform" ]; }; - by-spec."path-to-regexp"."0.1.2" = - self.by-version."path-to-regexp"."0.1.2"; - by-version."path-to-regexp"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "path-to-regexp-0.1.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.2.tgz"; - name = "path-to-regexp-0.1.2.tgz"; - sha1 = "9b2b151f9cc3018c9eea50ca95729e05781712b4"; - }) - ]; - buildInputs = - (self.nativeDeps."path-to-regexp" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "path-to-regexp" ]; - }; by-spec."path-to-regexp"."0.1.3" = self.by-version."path-to-regexp"."0.1.3"; by-version."path-to-regexp"."0.1.3" = lib.makeOverridable self.buildNodePackage { @@ -21288,7 +21743,7 @@ "pump-0.3.5" = self.by-version."pump"."0.3.5"; "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; "rc-0.4.0" = self.by-version."rc"."0.4.0"; - "read-torrent-1.1.0" = self.by-version."read-torrent"."1.1.0"; + "read-torrent-1.2.0" = self.by-version."read-torrent"."1.2.0"; "torrent-stream-0.16.2" = self.by-version."torrent-stream"."0.16.2"; "windows-no-runnable-0.0.6" = self.by-version."windows-no-runnable"."0.0.6"; "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; @@ -21393,7 +21848,7 @@ "request-2.42.0" = self.by-version."request"."2.42.0"; "request-progress-0.3.1" = self.by-version."request-progress"."0.3.1"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; }; peerDependencies = [ ]; @@ -21618,6 +22073,26 @@ ]; passthru.names = [ "posix-getopt" ]; }; + by-spec."prelude-ls"."~1.1.0" = + self.by-version."prelude-ls"."1.1.1"; + by-version."prelude-ls"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "prelude-ls-1.1.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.1.tgz"; + name = "prelude-ls-1.1.1.tgz"; + sha1 = "c0b86c1ffd151ad3cc75e7e3fe38d7a1bf33728a"; + }) + ]; + buildInputs = + (self.nativeDeps."prelude-ls" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "prelude-ls" ]; + }; by-spec."pretty-bytes"."^0.1.0" = self.by-version."pretty-bytes"."0.1.2"; by-version."pretty-bytes"."0.1.2" = lib.makeOverridable self.buildNodePackage { @@ -21639,15 +22114,15 @@ passthru.names = [ "pretty-bytes" ]; }; by-spec."pretty-bytes"."^1.0.0" = - self.by-version."pretty-bytes"."1.0.1"; - by-version."pretty-bytes"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "pretty-bytes-1.0.1"; + self.by-version."pretty-bytes"."1.0.2"; + by-version."pretty-bytes"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "pretty-bytes-1.0.2"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.1.tgz"; - name = "pretty-bytes-1.0.1.tgz"; - sha1 = "afd0b459da61834ac36617b05f9daa0beb043e3e"; + url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.2.tgz"; + name = "pretty-bytes-1.0.2.tgz"; + sha1 = "b38f90c0b93d9942a4c4bec6cb5f367d51d80120"; }) ]; buildInputs = @@ -21955,6 +22430,28 @@ }; by-spec."ps-tree"."~0.0.3" = self.by-version."ps-tree"."0.0.3"; + by-spec."public-encrypt"."1.0.1" = + self.by-version."public-encrypt"."1.0.1"; + by-version."public-encrypt"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "public-encrypt-1.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/public-encrypt/-/public-encrypt-1.0.1.tgz"; + name = "public-encrypt-1.0.1.tgz"; + sha1 = "f4d881f0068cdd24017ef4baa4f49b9d8d055c46"; + }) + ]; + buildInputs = + (self.nativeDeps."public-encrypt" or []); + deps = { + "bn.js-0.16.0" = self.by-version."bn.js"."0.16.0"; + "parse-asn1-1.2.0" = self.by-version."parse-asn1"."1.2.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "public-encrypt" ]; + }; by-spec."pump"."^0.3.1" = self.by-version."pump"."0.3.5"; by-version."pump"."0.3.5" = lib.makeOverridable self.buildNodePackage { @@ -22606,7 +23103,7 @@ deps = { "cookie-0.1.0" = self.by-version."cookie"."0.1.0"; "lsmod-0.0.3" = self.by-version."lsmod"."0.0.3"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "stack-trace-0.0.7" = self.by-version."stack-trace"."0.0.7"; }; peerDependencies = [ @@ -22787,30 +23284,7 @@ ]; passthru.names = [ "rc" ]; }; - by-spec."rc"."~0.3.0" = - self.by-version."rc"."0.3.5"; - by-version."rc"."0.3.5" = lib.makeOverridable self.buildNodePackage { - name = "rc-0.3.5"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/rc/-/rc-0.3.5.tgz"; - name = "rc-0.3.5.tgz"; - sha1 = "fce2220593be57aa1296685a7e37ed003dfcc728"; - }) - ]; - buildInputs = - (self.nativeDeps."rc" or []); - deps = { - "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; - "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11"; - "ini-1.1.0" = self.by-version."ini"."1.1.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "rc" ]; - }; - by-spec."rc"."~0.5.4" = + by-spec."rc"."^0.5.1" = self.by-version."rc"."0.5.4"; by-version."rc"."0.5.4" = lib.makeOverridable self.buildNodePackage { name = "rc-0.5.4"; @@ -22834,16 +23308,22 @@ ]; passthru.names = [ "rc" ]; }; + by-spec."rc"."~0.5.0" = + self.by-version."rc"."0.5.4"; + by-spec."rc"."~0.5.1" = + self.by-version."rc"."0.5.4"; + by-spec."rc"."~0.5.4" = + self.by-version."rc"."0.5.4"; by-spec."react"."*" = - self.by-version."react"."0.12.1"; - by-version."react"."0.12.1" = lib.makeOverridable self.buildNodePackage { - name = "react-0.12.1"; + self.by-version."react"."0.12.2"; + by-version."react"."0.12.2" = lib.makeOverridable self.buildNodePackage { + name = "react-0.12.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/react/-/react-0.12.1.tgz"; - name = "react-0.12.1.tgz"; - sha1 = "b73836f4f1888ce79c9372208398a3fb5483bc35"; + url = "http://registry.npmjs.org/react/-/react-0.12.2.tgz"; + name = "react-0.12.2.tgz"; + sha1 = "1c4f0b08818146eeab4f0ab39257e0aa52027e00"; }) ]; buildInputs = @@ -22855,7 +23335,7 @@ ]; passthru.names = [ "react" ]; }; - "react" = self.by-version."react"."0.12.1"; + "react" = self.by-version."react"."0.12.2"; by-spec."read"."1" = self.by-version."read"."1.0.5"; by-version."read"."1.0.5" = lib.makeOverridable self.buildNodePackage { @@ -22925,7 +23405,7 @@ "debuglog-1.0.1" = self.by-version."debuglog"."1.0.1"; "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; "readdir-scoped-modules-1.0.1" = self.by-version."readdir-scoped-modules"."1.0.1"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; "util-extend-1.0.1" = self.by-version."util-extend"."1.0.1"; "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; @@ -22951,7 +23431,7 @@ deps = { "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0"; "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2"; - "glob-4.2.2" = self.by-version."glob"."4.2.2"; + "glob-4.3.2" = self.by-version."glob"."4.3.2"; "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3"; "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; @@ -22960,7 +23440,9 @@ ]; passthru.names = [ "read-package-json" ]; }; - by-spec."read-package-json"."1.1.x" = + by-spec."read-package-json"."1.2.x" = + self.by-version."read-package-json"."1.2.7"; + by-spec."read-package-json"."~1.1.0" = self.by-version."read-package-json"."1.1.9"; by-version."read-package-json"."1.1.9" = lib.makeOverridable self.buildNodePackage { name = "read-package-json-1.1.9"; @@ -22984,30 +23466,27 @@ ]; passthru.names = [ "read-package-json" ]; }; - by-spec."read-package-json"."~1.1.0" = - self.by-version."read-package-json"."1.1.9"; - by-spec."read-package-json"."~1.1.6" = - self.by-version."read-package-json"."1.1.9"; by-spec."read-package-json"."~1.2.7" = self.by-version."read-package-json"."1.2.7"; by-spec."read-torrent"."^1.1.0" = - self.by-version."read-torrent"."1.1.0"; - by-version."read-torrent"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "read-torrent-1.1.0"; + self.by-version."read-torrent"."1.2.0"; + by-version."read-torrent"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "read-torrent-1.2.0"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/read-torrent/-/read-torrent-1.1.0.tgz"; - name = "read-torrent-1.1.0.tgz"; - sha1 = "a34506d88b50682e01cb638576b4fccebfe706ed"; + url = "http://registry.npmjs.org/read-torrent/-/read-torrent-1.2.0.tgz"; + name = "read-torrent-1.2.0.tgz"; + sha1 = "2b5fa465ab1e3a9a2e478403b425910ae66c58a9"; }) ]; buildInputs = (self.nativeDeps."read-torrent" or []); deps = { - "request-2.16.6" = self.by-version."request"."2.16.6"; - "parse-torrent-1.0.0" = self.by-version."parse-torrent"."1.0.0"; "magnet-uri-2.0.1" = self.by-version."magnet-uri"."2.0.1"; + "parse-torrent-1.0.0" = self.by-version."parse-torrent"."1.0.0"; + "request-2.16.6" = self.by-version."request"."2.16.6"; + "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; }; peerDependencies = [ ]; @@ -23060,16 +23539,16 @@ ]; passthru.names = [ "readable-stream" ]; }; - by-spec."readable-stream"."1.0" = - self.by-version."readable-stream"."1.0.33"; - by-version."readable-stream"."1.0.33" = lib.makeOverridable self.buildNodePackage { - name = "readable-stream-1.0.33"; + by-spec."readable-stream"."1.0.27-1" = + self.by-version."readable-stream"."1.0.27-1"; + by-version."readable-stream"."1.0.27-1" = lib.makeOverridable self.buildNodePackage { + name = "readable-stream-1.0.27-1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz"; - name = "readable-stream-1.0.33.tgz"; - sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c"; + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz"; + name = "readable-stream-1.0.27-1.tgz"; + sha1 = "6b67983c20357cefd07f0165001a16d710d91078"; }) ]; buildInputs = @@ -23084,16 +23563,18 @@ ]; passthru.names = [ "readable-stream" ]; }; - by-spec."readable-stream"."1.0.27-1" = - self.by-version."readable-stream"."1.0.27-1"; - by-version."readable-stream"."1.0.27-1" = lib.makeOverridable self.buildNodePackage { - name = "readable-stream-1.0.27-1"; + by-spec."readable-stream"."1.1" = + self.by-version."readable-stream"."1.1.13"; + by-spec."readable-stream".">=1.0.33-1 <1.1.0-0" = + self.by-version."readable-stream"."1.0.33"; + by-version."readable-stream"."1.0.33" = lib.makeOverridable self.buildNodePackage { + name = "readable-stream-1.0.33"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz"; - name = "readable-stream-1.0.27-1.tgz"; - sha1 = "6b67983c20357cefd07f0165001a16d710d91078"; + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz"; + name = "readable-stream-1.0.33.tgz"; + sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c"; }) ]; buildInputs = @@ -23108,10 +23589,6 @@ ]; passthru.names = [ "readable-stream" ]; }; - by-spec."readable-stream"."1.1" = - self.by-version."readable-stream"."1.1.13"; - by-spec."readable-stream".">=1.0.33-1 <1.1.0-0" = - self.by-version."readable-stream"."1.0.33"; by-spec."readable-stream".">=1.1.13-1 <1.2.0-0" = self.by-version."readable-stream"."1.1.13"; by-spec."readable-stream"."^1.0.2" = @@ -23187,16 +23664,16 @@ ]; passthru.names = [ "readdir-scoped-modules" ]; }; - by-spec."readdirp"."^1.1.0" = - self.by-version."readdirp"."1.1.0"; - by-version."readdirp"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "readdirp-1.1.0"; + by-spec."readdirp"."^1.2.0" = + self.by-version."readdirp"."1.3.0"; + by-version."readdirp"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "readdirp-1.3.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/readdirp/-/readdirp-1.1.0.tgz"; - name = "readdirp-1.1.0.tgz"; - sha1 = "6506f9d5d8bb2edc19c855a60bb92feca5fae39c"; + url = "http://registry.npmjs.org/readdirp/-/readdirp-1.3.0.tgz"; + name = "readdirp-1.3.0.tgz"; + sha1 = "eaf1a9b463be9a8190fc9ae163aa1ac934aa340b"; }) ]; buildInputs = @@ -23225,14 +23702,14 @@ buildInputs = (self.nativeDeps."readdirp" or []); deps = { - "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; + "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1"; }; peerDependencies = [ ]; passthru.names = [ "readdirp" ]; }; - by-spec."readdirp"."~1.1.0" = - self.by-version."readdirp"."1.1.0"; + by-spec."readdirp"."~1.3.0" = + self.by-version."readdirp"."1.3.0"; by-spec."readline2"."~0.1.0" = self.by-version."readline2"."0.1.0"; by-version."readline2"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -23487,6 +23964,27 @@ ]; passthru.names = [ "registry-url" ]; }; + by-spec."registry-url"."^2.0.0" = + self.by-version."registry-url"."2.0.0"; + by-version."registry-url"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "registry-url-2.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/registry-url/-/registry-url-2.0.0.tgz"; + name = "registry-url-2.0.0.tgz"; + sha1 = "f42feb744865eef37a33d38edec4cff9ea92f643"; + }) + ]; + buildInputs = + (self.nativeDeps."registry-url" or []); + deps = { + "rc-0.5.4" = self.by-version."rc"."0.5.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "registry-url" ]; + }; by-spec."repeating"."^1.1.0" = self.by-version."repeating"."1.1.0"; by-version."repeating"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -23533,15 +24031,15 @@ passthru.names = [ "replace" ]; }; by-spec."request"."2" = - self.by-version."request"."2.49.0"; - by-version."request"."2.49.0" = lib.makeOverridable self.buildNodePackage { - name = "request-2.49.0"; + self.by-version."request"."2.51.0"; + by-version."request"."2.51.0" = lib.makeOverridable self.buildNodePackage { + name = "request-2.51.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.49.0.tgz"; - name = "request-2.49.0.tgz"; - sha1 = "0d4f6348dc3348059b553e4db60fd2478de662a7"; + url = "http://registry.npmjs.org/request/-/request-2.51.0.tgz"; + name = "request-2.51.0.tgz"; + sha1 = "35d00bbecc012e55f907b1bd9e0dbd577bfef26e"; }) ]; buildInputs = @@ -23550,10 +24048,10 @@ "bl-0.9.3" = self.by-version."bl"."0.9.3"; "caseless-0.8.0" = self.by-version."caseless"."0.8.0"; "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; - "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; + "form-data-0.2.0" = self.by-version."form-data"."0.2.0"; "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "qs-2.3.3" = self.by-version."qs"."2.3.3"; "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; @@ -23569,9 +24067,9 @@ passthru.names = [ "request" ]; }; by-spec."request"."2 >=2.20.0" = - self.by-version."request"."2.49.0"; + self.by-version."request"."2.51.0"; by-spec."request"."2 >=2.25.0" = - self.by-version."request"."2.49.0"; + self.by-version."request"."2.51.0"; by-spec."request"."2.16.x" = self.by-version."request"."2.16.6"; by-version."request"."2.16.6" = lib.makeOverridable self.buildNodePackage { @@ -23590,7 +24088,7 @@ "form-data-0.0.10" = self.by-version."form-data"."0.0.10"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; "hawk-0.10.2" = self.by-version."hawk"."0.10.2"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "cookie-jar-0.2.0" = self.by-version."cookie-jar"."0.2.0"; "aws-sign-0.2.0" = self.by-version."aws-sign"."0.2.0"; "oauth-sign-0.2.0" = self.by-version."oauth-sign"."0.2.0"; @@ -23622,7 +24120,7 @@ "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; @@ -23657,7 +24155,7 @@ "qs-1.2.2" = self.by-version."qs"."1.2.2"; "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; @@ -23692,7 +24190,7 @@ "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "qs-2.3.3" = self.by-version."qs"."2.3.3"; "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; @@ -23727,18 +24225,20 @@ ]; passthru.names = [ "request" ]; }; + by-spec."request"."2.x" = + self.by-version."request"."2.51.0"; by-spec."request".">= 2.9.153" = - self.by-version."request"."2.49.0"; + self.by-version."request"."2.51.0"; by-spec."request"."^2.36.0" = - self.by-version."request"."2.49.0"; + self.by-version."request"."2.51.0"; by-spec."request"."^2.40.0" = - self.by-version."request"."2.49.0"; + self.by-version."request"."2.51.0"; by-spec."request"."^2.47.0" = - self.by-version."request"."2.49.0"; + self.by-version."request"."2.51.0"; by-spec."request"."^2.48.0" = - self.by-version."request"."2.49.0"; + self.by-version."request"."2.51.0"; by-spec."request"."~2" = - self.by-version."request"."2.49.0"; + self.by-version."request"."2.51.0"; by-spec."request"."~2.16.2" = self.by-version."request"."2.16.6"; by-spec."request"."~2.21.0" = @@ -23765,7 +24265,7 @@ "aws-sign-0.3.0" = self.by-version."aws-sign"."0.3.0"; "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0"; "cookie-jar-0.3.0" = self.by-version."cookie-jar"."0.3.0"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; "form-data-0.0.8" = self.by-version."form-data"."0.0.8"; }; @@ -23797,7 +24297,7 @@ "aws-sign-0.3.0" = self.by-version."aws-sign"."0.3.0"; "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0"; "cookie-jar-0.3.0" = self.by-version."cookie-jar"."0.3.0"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; }; @@ -23805,38 +24305,6 @@ ]; passthru.names = [ "request" ]; }; - by-spec."request"."~2.30.0" = - self.by-version."request"."2.30.0"; - by-version."request"."2.30.0" = lib.makeOverridable self.buildNodePackage { - name = "request-2.30.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.30.0.tgz"; - name = "request-2.30.0.tgz"; - sha1 = "8e0d36f0806e8911524b072b64c5ee535a09d861"; - }) - ]; - buildInputs = - (self.nativeDeps."request" or []); - deps = { - "qs-0.6.6" = self.by-version."qs"."0.6.6"; - "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; - "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "tough-cookie-0.9.15" = self.by-version."tough-cookie"."0.9.15"; - "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; - "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0"; - "http-signature-0.10.0" = self.by-version."http-signature"."0.10.0"; - "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0"; - "hawk-1.0.0" = self.by-version."hawk"."1.0.0"; - "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "request" ]; - }; by-spec."request"."~2.40.0" = self.by-version."request"."2.40.0"; by-spec."request"."~2.42.0" = @@ -23862,7 +24330,7 @@ "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "qs-1.2.2" = self.by-version."qs"."1.2.2"; "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; @@ -23897,7 +24365,7 @@ "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "qs-2.3.3" = self.by-version."qs"."2.3.3"; "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; @@ -23912,6 +24380,8 @@ ]; passthru.names = [ "request" ]; }; + by-spec."request"."~2.51.0" = + self.by-version."request"."2.51.0"; by-spec."request-progress"."0.3.0" = self.by-version."request-progress"."0.3.0"; by-version."request-progress"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -24017,7 +24487,7 @@ ]; passthru.names = [ "resolve" ]; }; - by-spec."resolve"."0.7.4" = + by-spec."resolve"."0.7.x" = self.by-version."resolve"."0.7.4"; by-version."resolve"."0.7.4" = lib.makeOverridable self.buildNodePackage { name = "resolve-0.7.4"; @@ -24037,8 +24507,26 @@ ]; passthru.names = [ "resolve" ]; }; - by-spec."resolve"."0.7.x" = - self.by-version."resolve"."0.7.4"; + by-spec."resolve"."1.0.0" = + self.by-version."resolve"."1.0.0"; + by-version."resolve"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "resolve-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/resolve/-/resolve-1.0.0.tgz"; + name = "resolve-1.0.0.tgz"; + sha1 = "2a6e3b314dcd57c6519e8e2282af8687e8de61c6"; + }) + ]; + buildInputs = + (self.nativeDeps."resolve" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "resolve" ]; + }; by-spec."resolve"."~0.3.0" = self.by-version."resolve"."0.3.1"; by-version."resolve"."0.3.1" = lib.makeOverridable self.buildNodePackage { @@ -24071,24 +24559,6 @@ self.by-version."resolve"."0.7.4"; by-spec."resolve"."~1.0.0" = self.by-version."resolve"."1.0.0"; - by-version."resolve"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "resolve-1.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/resolve/-/resolve-1.0.0.tgz"; - name = "resolve-1.0.0.tgz"; - sha1 = "2a6e3b314dcd57c6519e8e2282af8687e8de61c6"; - }) - ]; - buildInputs = - (self.nativeDeps."resolve" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "resolve" ]; - }; by-spec."response-time"."1.0.0" = self.by-version."response-time"."1.0.0"; by-version."response-time"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -24204,7 +24674,7 @@ buildInputs = (self.nativeDeps."rethinkdb" or []); deps = { - "bluebird-2.3.11" = self.by-version."bluebird"."2.3.11"; + "bluebird-2.4.0" = self.by-version."bluebird"."2.4.0"; }; peerDependencies = [ ]; @@ -24438,6 +24908,26 @@ ]; passthru.names = [ "ruglify" ]; }; + by-spec."run-applescript"."^1.0.0" = + self.by-version."run-applescript"."1.0.1"; + by-version."run-applescript"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "run-applescript-1.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/run-applescript/-/run-applescript-1.0.1.tgz"; + name = "run-applescript-1.0.1.tgz"; + sha1 = "9f0be74a910dcea702caba65f747563706e86fe2"; + }) + ]; + buildInputs = + (self.nativeDeps."run-applescript" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "run-applescript" ]; + }; by-spec."run-parallel"."^1.0.0" = self.by-version."run-parallel"."1.0.0"; by-version."run-parallel"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -24458,6 +24948,26 @@ ]; passthru.names = [ "run-parallel" ]; }; + by-spec."run-series"."^1.0.2" = + self.by-version."run-series"."1.0.2"; + by-version."run-series"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "run-series-1.0.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/run-series/-/run-series-1.0.2.tgz"; + name = "run-series-1.0.2.tgz"; + sha1 = "63d0d361b9aa2509c85bd790810a8bd9d302bc8e"; + }) + ]; + buildInputs = + (self.nativeDeps."run-series" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "run-series" ]; + }; by-spec."rusha-browserify"."^0.7.3" = self.by-version."rusha-browserify"."0.7.3"; by-version."rusha-browserify"."0.7.3" = lib.makeOverridable self.buildNodePackage { @@ -24479,15 +24989,15 @@ passthru.names = [ "rusha-browserify" ]; }; by-spec."rx"."^2.2.27" = - self.by-version."rx"."2.3.18"; - by-version."rx"."2.3.18" = lib.makeOverridable self.buildNodePackage { - name = "rx-2.3.18"; + self.by-version."rx"."2.3.22"; + by-version."rx"."2.3.22" = lib.makeOverridable self.buildNodePackage { + name = "rx-2.3.22"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/rx/-/rx-2.3.18.tgz"; - name = "rx-2.3.18.tgz"; - sha1 = "4ae726e3d770db47f070b532f9840c717b2385ba"; + url = "http://registry.npmjs.org/rx/-/rx-2.3.22.tgz"; + name = "rx-2.3.22.tgz"; + sha1 = "031fba769eaba0b74dbad2f0e7aeaed9b1b8199d"; }) ]; buildInputs = @@ -24528,15 +25038,15 @@ }; "s3http" = self.by-version."s3http"."0.0.5"; by-spec."samsam"."~1.1" = - self.by-version."samsam"."1.1.1"; - by-version."samsam"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "samsam-1.1.1"; + self.by-version."samsam"."1.1.2"; + by-version."samsam"."1.1.2" = lib.makeOverridable self.buildNodePackage { + name = "samsam-1.1.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/samsam/-/samsam-1.1.1.tgz"; - name = "samsam-1.1.1.tgz"; - sha1 = "48d64ee2a7aecaaeccebe2f0a68a49687d3a49b1"; + url = "http://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz"; + name = "samsam-1.1.2.tgz"; + sha1 = "bec11fdc83a9fda063401210e40176c3024d1567"; }) ]; buildInputs = @@ -24740,15 +25250,15 @@ }; "selenium-webdriver" = self.by-version."selenium-webdriver"."2.44.0"; by-spec."semver"."*" = - self.by-version."semver"."4.1.0"; - by-version."semver"."4.1.0" = lib.makeOverridable self.buildNodePackage { - name = "semver-4.1.0"; + self.by-version."semver"."4.1.1"; + by-version."semver"."4.1.1" = lib.makeOverridable self.buildNodePackage { + name = "semver-4.1.1"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-4.1.0.tgz"; - name = "semver-4.1.0.tgz"; - sha1 = "bc80a9ff68532814362cc3cfda3c7b75ed9c321c"; + url = "http://registry.npmjs.org/semver/-/semver-4.1.1.tgz"; + name = "semver-4.1.1.tgz"; + sha1 = "8d63e2e90df847e626d48ae068cd65786b0ed3d3"; }) ]; buildInputs = @@ -24759,7 +25269,7 @@ ]; passthru.names = [ "semver" ]; }; - "semver" = self.by-version."semver"."4.1.0"; + "semver" = self.by-version."semver"."4.1.1"; by-spec."semver"."1.1.0" = self.by-version."semver"."1.1.0"; by-version."semver"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -24821,9 +25331,9 @@ passthru.names = [ "semver" ]; }; by-spec."semver"."2 >=2.2.1 || 3.x || 4" = - self.by-version."semver"."4.1.0"; + self.by-version."semver"."4.1.1"; by-spec."semver"."2 || 3 || 4" = - self.by-version."semver"."4.1.0"; + self.by-version."semver"."4.1.1"; by-spec."semver"."2.0.11" = self.by-version."semver"."2.0.11"; by-version."semver"."2.0.11" = lib.makeOverridable self.buildNodePackage { @@ -24844,32 +25354,14 @@ ]; passthru.names = [ "semver" ]; }; - by-spec."semver"."2.2.x" = - self.by-version."semver"."2.2.1"; - by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "semver-2.2.1"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz"; - name = "semver-2.2.1.tgz"; - sha1 = "7941182b3ffcc580bff1c17942acdf7951c0d213"; - }) - ]; - buildInputs = - (self.nativeDeps."semver" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "semver" ]; - }; by-spec."semver"."2.x" = self.by-version."semver"."2.3.2"; by-spec."semver"."2.x || 3.x || 4" = - self.by-version."semver"."4.1.0"; + self.by-version."semver"."4.1.1"; by-spec."semver"."4" = - self.by-version."semver"."4.1.0"; + self.by-version."semver"."4.1.1"; + by-spec."semver"."4.1.x" = + self.by-version."semver"."4.1.1"; by-spec."semver".">=2.0.10 <3.0.0" = self.by-version."semver"."2.3.2"; by-spec."semver".">=2.2.1 <3" = @@ -24879,9 +25371,31 @@ by-spec."semver"."^2.3.0" = self.by-version."semver"."2.3.2"; by-spec."semver"."^2.3.0 || 3.x || 4" = - self.by-version."semver"."4.1.0"; + self.by-version."semver"."4.1.1"; + by-spec."semver"."^3.0.1" = + self.by-version."semver"."3.0.1"; + by-version."semver"."3.0.1" = lib.makeOverridable self.buildNodePackage { + name = "semver-3.0.1"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/semver/-/semver-3.0.1.tgz"; + name = "semver-3.0.1.tgz"; + sha1 = "720ac012515a252f91fb0dd2e99a56a70d6cf078"; + }) + ]; + buildInputs = + (self.nativeDeps."semver" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "semver" ]; + }; + by-spec."semver"."^4.0.0" = + self.by-version."semver"."4.1.1"; by-spec."semver"."^4.1.0" = - self.by-version."semver"."4.1.0"; + self.by-version."semver"."4.1.1"; by-spec."semver"."~1.1.4" = self.by-version."semver"."1.1.4"; by-spec."semver"."~2.0.5" = @@ -24912,10 +25426,30 @@ self.by-version."semver"."2.1.0"; by-spec."semver"."~2.2.1" = self.by-version."semver"."2.2.1"; + by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage { + name = "semver-2.2.1"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz"; + name = "semver-2.2.1.tgz"; + sha1 = "7941182b3ffcc580bff1c17942acdf7951c0d213"; + }) + ]; + buildInputs = + (self.nativeDeps."semver" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "semver" ]; + }; by-spec."semver"."~2.3.0" = self.by-version."semver"."2.3.2"; by-spec."semver"."~4.1.0" = - self.by-version."semver"."4.1.0"; + self.by-version."semver"."4.1.1"; + by-spec."semver"."~4.1.1" = + self.by-version."semver"."4.1.1"; by-spec."semver-diff"."^0.1.0" = self.by-version."semver-diff"."0.1.0"; by-version."semver-diff"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -24937,6 +25471,27 @@ ]; passthru.names = [ "semver-diff" ]; }; + by-spec."semver-diff"."^2.0.0" = + self.by-version."semver-diff"."2.0.0"; + by-version."semver-diff"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "semver-diff-2.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/semver-diff/-/semver-diff-2.0.0.tgz"; + name = "semver-diff-2.0.0.tgz"; + sha1 = "d43024f91aa7843937dc1379002766809f7480d2"; + }) + ]; + buildInputs = + (self.nativeDeps."semver-diff" or []); + deps = { + "semver-4.1.1" = self.by-version."semver"."4.1.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "semver-diff" ]; + }; by-spec."send"."*" = self.by-version."send"."0.10.1"; by-version."send"."0.10.1" = lib.makeOverridable self.buildNodePackage { @@ -25041,30 +25596,6 @@ }; by-spec."send"."0.10.1" = self.by-version."send"."0.10.1"; - by-spec."send"."0.2.0" = - self.by-version."send"."0.2.0"; - by-version."send"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "send-0.2.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/send/-/send-0.2.0.tgz"; - name = "send-0.2.0.tgz"; - sha1 = "067abf45cff8bffb29cbdb7439725b32388a2c58"; - }) - ]; - buildInputs = - (self.nativeDeps."send" or []); - deps = { - "debug-2.1.0" = self.by-version."debug"."2.1.0"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; - }; - peerDependencies = [ - ]; - passthru.names = [ "send" ]; - }; by-spec."send"."0.3.0" = self.by-version."send"."0.3.0"; by-version."send"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -25162,6 +25693,30 @@ ]; passthru.names = [ "sequencify" ]; }; + by-spec."serve-favicon"."^2.1.1" = + self.by-version."serve-favicon"."2.2.0"; + by-version."serve-favicon"."2.2.0" = lib.makeOverridable self.buildNodePackage { + name = "serve-favicon-2.2.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/serve-favicon/-/serve-favicon-2.2.0.tgz"; + name = "serve-favicon-2.2.0.tgz"; + sha1 = "a0c25ee8a652e1a638a67db46269cd52a8705858"; + }) + ]; + buildInputs = + (self.nativeDeps."serve-favicon" or []); + deps = { + "etag-1.5.1" = self.by-version."etag"."1.5.1"; + "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "ms-0.7.0" = self.by-version."ms"."0.7.0"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "serve-favicon" ]; + }; by-spec."serve-favicon"."~2.1.5" = self.by-version."serve-favicon"."2.1.7"; by-version."serve-favicon"."2.1.7" = lib.makeOverridable self.buildNodePackage { @@ -25224,7 +25779,7 @@ buildInputs = (self.nativeDeps."serve-index" or []); deps = { - "accepts-1.1.3" = self.by-version."accepts"."1.1.3"; + "accepts-1.1.4" = self.by-version."accepts"."1.1.4"; "batch-0.5.1" = self.by-version."batch"."0.5.1"; "debug-2.0.0" = self.by-version."debug"."2.0.0"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; @@ -25233,53 +25788,32 @@ ]; passthru.names = [ "serve-index" ]; }; - by-spec."serve-index"."~1.5.1" = - self.by-version."serve-index"."1.5.1"; - by-version."serve-index"."1.5.1" = lib.makeOverridable self.buildNodePackage { - name = "serve-index-1.5.1"; + by-spec."serve-index"."~1.5.3" = + self.by-version."serve-index"."1.5.3"; + by-version."serve-index"."1.5.3" = lib.makeOverridable self.buildNodePackage { + name = "serve-index-1.5.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/serve-index/-/serve-index-1.5.1.tgz"; - name = "serve-index-1.5.1.tgz"; - sha1 = "11e2cec8b7cdc801a8a766ebf36c1372c956e84a"; + url = "http://registry.npmjs.org/serve-index/-/serve-index-1.5.3.tgz"; + name = "serve-index-1.5.3.tgz"; + sha1 = "412cbc82bf6e2b97ba3247166cd1f425404e75e7"; }) ]; buildInputs = (self.nativeDeps."serve-index" or []); deps = { - "accepts-1.1.3" = self.by-version."accepts"."1.1.3"; + "accepts-1.1.4" = self.by-version."accepts"."1.1.4"; "batch-0.5.1" = self.by-version."batch"."0.5.1"; "debug-2.1.0" = self.by-version."debug"."2.1.0"; - "http-errors-1.2.7" = self.by-version."http-errors"."1.2.7"; - "mime-types-2.0.3" = self.by-version."mime-types"."2.0.3"; + "http-errors-1.2.8" = self.by-version."http-errors"."1.2.8"; + "mime-types-2.0.4" = self.by-version."mime-types"."2.0.4"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; }; peerDependencies = [ ]; passthru.names = [ "serve-index" ]; }; - by-spec."serve-static"."1.0.1" = - self.by-version."serve-static"."1.0.1"; - by-version."serve-static"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "serve-static-1.0.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/serve-static/-/serve-static-1.0.1.tgz"; - name = "serve-static-1.0.1.tgz"; - sha1 = "10dcbfd44b3e0291a131fc9ab4ab25a9f5a78a42"; - }) - ]; - buildInputs = - (self.nativeDeps."serve-static" or []); - deps = { - "send-0.1.4" = self.by-version."send"."0.1.4"; - }; - peerDependencies = [ - ]; - passthru.names = [ "serve-static" ]; - }; by-spec."serve-static"."1.1.0" = self.by-version."serve-static"."1.1.0"; by-version."serve-static"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -25370,44 +25904,42 @@ ]; passthru.names = [ "setimmediate" ]; }; - by-spec."sha"."~1.0.1" = - self.by-version."sha"."1.0.1"; - by-version."sha"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "sha-1.0.1"; + by-spec."setimmediate"."^1.0.2" = + self.by-version."setimmediate"."1.0.2"; + by-version."setimmediate"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "setimmediate-1.0.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/sha/-/sha-1.0.1.tgz"; - name = "sha-1.0.1.tgz"; - sha1 = "9b87a92113103e7406f7e7ef00006f3fa1975122"; + url = "http://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz"; + name = "setimmediate-1.0.2.tgz"; + sha1 = "d8221c4fdfeb2561556c5184fa05fb7ce0af73bd"; }) ]; buildInputs = - (self.nativeDeps."sha" or []); + (self.nativeDeps."setimmediate" or []); deps = { - "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3"; }; peerDependencies = [ ]; - passthru.names = [ "sha" ]; + passthru.names = [ "setimmediate" ]; }; - by-spec."sha"."~1.2.1" = - self.by-version."sha"."1.2.4"; - by-version."sha"."1.2.4" = lib.makeOverridable self.buildNodePackage { - name = "sha-1.2.4"; + by-spec."sha"."~1.0.1" = + self.by-version."sha"."1.0.1"; + by-version."sha"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "sha-1.0.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/sha/-/sha-1.2.4.tgz"; - name = "sha-1.2.4.tgz"; - sha1 = "1f9a377f27b6fdee409b9b858e43da702be48a4d"; + url = "http://registry.npmjs.org/sha/-/sha-1.0.1.tgz"; + name = "sha-1.0.1.tgz"; + sha1 = "9b87a92113103e7406f7e7ef00006f3fa1975122"; }) ]; buildInputs = (self.nativeDeps."sha" or []); deps = { - "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; - "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; + "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3"; }; peerDependencies = [ ]; @@ -25566,80 +26098,80 @@ by-spec."shelljs"."0.3.x" = self.by-version."shelljs"."0.3.0"; by-spec."should"."*" = - self.by-version."should"."4.3.0"; - by-version."should"."4.3.0" = lib.makeOverridable self.buildNodePackage { - name = "should-4.3.0"; + self.by-version."should"."4.4.1"; + by-version."should"."4.4.1" = lib.makeOverridable self.buildNodePackage { + name = "should-4.4.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/should/-/should-4.3.0.tgz"; - name = "should-4.3.0.tgz"; - sha1 = "6fd50fadf9b54134a352f2fd74657b1e97231ad6"; + url = "http://registry.npmjs.org/should/-/should-4.4.1.tgz"; + name = "should-4.4.1.tgz"; + sha1 = "15063e66f23797046bd5e478bade00adb4b6b37b"; }) ]; buildInputs = (self.nativeDeps."should" or []); deps = { - "should-equal-0.1.0" = self.by-version."should-equal"."0.1.0"; - "should-format-0.0.2" = self.by-version."should-format"."0.0.2"; + "should-equal-0.2.3" = self.by-version."should-equal"."0.2.3"; + "should-format-0.0.5" = self.by-version."should-format"."0.0.5"; }; peerDependencies = [ ]; passthru.names = [ "should" ]; }; - "should" = self.by-version."should"."4.3.0"; - by-spec."should-equal"."0.1.0" = - self.by-version."should-equal"."0.1.0"; - by-version."should-equal"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "should-equal-0.1.0"; + "should" = self.by-version."should"."4.4.1"; + by-spec."should-equal"."0.2.3" = + self.by-version."should-equal"."0.2.3"; + by-version."should-equal"."0.2.3" = lib.makeOverridable self.buildNodePackage { + name = "should-equal-0.2.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/should-equal/-/should-equal-0.1.0.tgz"; - name = "should-equal-0.1.0.tgz"; - sha1 = "6db4a398a0d5a1a5806350b1de8cb4e964071dab"; + url = "http://registry.npmjs.org/should-equal/-/should-equal-0.2.3.tgz"; + name = "should-equal-0.2.3.tgz"; + sha1 = "d14c3336ebeeb6ff3c13a5a646fa1f2c39957ed9"; }) ]; buildInputs = (self.nativeDeps."should-equal" or []); deps = { - "should-type-0.0.1" = self.by-version."should-type"."0.0.1"; + "should-type-0.0.3" = self.by-version."should-type"."0.0.3"; }; peerDependencies = [ ]; passthru.names = [ "should-equal" ]; }; - by-spec."should-format"."0.0.2" = - self.by-version."should-format"."0.0.2"; - by-version."should-format"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "should-format-0.0.2"; + by-spec."should-format"."0.0.5" = + self.by-version."should-format"."0.0.5"; + by-version."should-format"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "should-format-0.0.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/should-format/-/should-format-0.0.2.tgz"; - name = "should-format-0.0.2.tgz"; - sha1 = "5c058691a1d6177f8b8fa8b8bba0b38cc05d346f"; + url = "http://registry.npmjs.org/should-format/-/should-format-0.0.5.tgz"; + name = "should-format-0.0.5.tgz"; + sha1 = "77f4f9546495632310aae14adfec82416e18d0d9"; }) ]; buildInputs = (self.nativeDeps."should-format" or []); deps = { - "should-type-0.0.1" = self.by-version."should-type"."0.0.1"; + "should-type-0.0.3" = self.by-version."should-type"."0.0.3"; }; peerDependencies = [ ]; passthru.names = [ "should-format" ]; }; - by-spec."should-type"."0.0.1" = - self.by-version."should-type"."0.0.1"; - by-version."should-type"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "should-type-0.0.1"; + by-spec."should-type"."0.0.3" = + self.by-version."should-type"."0.0.3"; + by-version."should-type"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "should-type-0.0.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/should-type/-/should-type-0.0.1.tgz"; - name = "should-type-0.0.1.tgz"; - sha1 = "ec62a4eae75cabfab3734cd9925da49773cb9be8"; + url = "http://registry.npmjs.org/should-type/-/should-type-0.0.3.tgz"; + name = "should-type-0.0.3.tgz"; + sha1 = "de19d7ea791ce02a191cffcc168bf3691c9e7680"; }) ]; buildInputs = @@ -25737,15 +26269,15 @@ passthru.names = [ "simplesmtp" ]; }; by-spec."sinon"."*" = - self.by-version."sinon"."1.12.1"; - by-version."sinon"."1.12.1" = lib.makeOverridable self.buildNodePackage { - name = "sinon-1.12.1"; + self.by-version."sinon"."1.12.2"; + by-version."sinon"."1.12.2" = lib.makeOverridable self.buildNodePackage { + name = "sinon-1.12.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/sinon/-/sinon-1.12.1.tgz"; - name = "sinon-1.12.1.tgz"; - sha1 = "c51a7d083e9992854bb99519faf5c25c9a04009a"; + url = "http://registry.npmjs.org/sinon/-/sinon-1.12.2.tgz"; + name = "sinon-1.12.2.tgz"; + sha1 = "dd893d1f93bfa652ae7c2a08c6eaa42898452c94"; }) ]; buildInputs = @@ -25759,7 +26291,7 @@ ]; passthru.names = [ "sinon" ]; }; - "sinon" = self.by-version."sinon"."1.12.1"; + "sinon" = self.by-version."sinon"."1.12.2"; by-spec."slasp"."*" = self.by-version."slasp"."0.0.4"; by-version."slasp"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -25869,35 +26401,33 @@ self.by-version."slide"."1.1.6"; by-spec."slide"."~1.1.4" = self.by-version."slide"."1.1.6"; - by-spec."slide"."~1.1.5" = - self.by-version."slide"."1.1.6"; by-spec."slide"."~1.1.6" = self.by-version."slide"."1.1.6"; by-spec."sloc"."*" = - self.by-version."sloc"."0.1.7"; - by-version."sloc"."0.1.7" = lib.makeOverridable self.buildNodePackage { - name = "sloc-0.1.7"; + self.by-version."sloc"."0.1.9"; + by-version."sloc"."0.1.9" = lib.makeOverridable self.buildNodePackage { + name = "sloc-0.1.9"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/sloc/-/sloc-0.1.7.tgz"; - name = "sloc-0.1.7.tgz"; - sha1 = "57dee8c946d54cea5188b70cd6549a22e0615679"; + url = "http://registry.npmjs.org/sloc/-/sloc-0.1.9.tgz"; + name = "sloc-0.1.9.tgz"; + sha1 = "af12b4f713d079c65056435fe67ff11580770873"; }) ]; buildInputs = (self.nativeDeps."sloc" or []); deps = { - "commander-2.3.0" = self.by-version."commander"."2.3.0"; + "commander-2.5.1" = self.by-version."commander"."2.5.1"; "async-0.9.0" = self.by-version."async"."0.9.0"; "cli-table-0.3.1" = self.by-version."cli-table"."0.3.1"; - "readdirp-1.1.0" = self.by-version."readdirp"."1.1.0"; + "readdirp-1.3.0" = self.by-version."readdirp"."1.3.0"; }; peerDependencies = [ ]; passthru.names = [ "sloc" ]; }; - "sloc" = self.by-version."sloc"."0.1.7"; + "sloc" = self.by-version."sloc"."0.1.9"; by-spec."smartdc"."*" = self.by-version."smartdc"."7.3.0"; by-version."smartdc"."7.3.0" = lib.makeOverridable self.buildNodePackage { @@ -26112,7 +26642,7 @@ (self.nativeDeps."sockjs" or []); deps = { "faye-websocket-0.8.1" = self.by-version."faye-websocket"."0.8.1"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; }; peerDependencies = [ ]; @@ -26140,15 +26670,15 @@ passthru.names = [ "sorted-object" ]; }; by-spec."source-map"."*" = - self.by-version."source-map"."0.1.40"; - by-version."source-map"."0.1.40" = lib.makeOverridable self.buildNodePackage { - name = "source-map-0.1.40"; + self.by-version."source-map"."0.1.41"; + by-version."source-map"."0.1.41" = lib.makeOverridable self.buildNodePackage { + name = "source-map-0.1.41"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/source-map/-/source-map-0.1.40.tgz"; - name = "source-map-0.1.40.tgz"; - sha1 = "7e0ee49ec0452aa9ac2b93ad5ae54ef33e82b37f"; + url = "http://registry.npmjs.org/source-map/-/source-map-0.1.41.tgz"; + name = "source-map-0.1.41.tgz"; + sha1 = "d6cc9c8a9bb5d995dc69b38457bd4b1747327f5a"; }) ]; buildInputs = @@ -26160,7 +26690,7 @@ ]; passthru.names = [ "source-map" ]; }; - "source-map" = self.by-version."source-map"."0.1.40"; + "source-map" = self.by-version."source-map"."0.1.41"; by-spec."source-map"."0.1.31" = self.by-version."source-map"."0.1.31"; by-version."source-map"."0.1.31" = lib.makeOverridable self.buildNodePackage { @@ -26204,21 +26734,21 @@ passthru.names = [ "source-map" ]; }; by-spec."source-map"."0.1.x" = - self.by-version."source-map"."0.1.40"; + self.by-version."source-map"."0.1.41"; by-spec."source-map".">= 0.1.2" = - self.by-version."source-map"."0.1.40"; + self.by-version."source-map"."0.1.41"; by-spec."source-map"."^0.1.x" = - self.by-version."source-map"."0.1.40"; + self.by-version."source-map"."0.1.41"; by-spec."source-map"."~0.1.30" = - self.by-version."source-map"."0.1.40"; + self.by-version."source-map"."0.1.41"; by-spec."source-map"."~0.1.31" = - self.by-version."source-map"."0.1.40"; + self.by-version."source-map"."0.1.41"; by-spec."source-map"."~0.1.33" = - self.by-version."source-map"."0.1.40"; - by-spec."source-map"."~0.1.37" = - self.by-version."source-map"."0.1.40"; + self.by-version."source-map"."0.1.41"; + by-spec."source-map"."~0.1.40" = + self.by-version."source-map"."0.1.41"; by-spec."source-map"."~0.1.7" = - self.by-version."source-map"."0.1.40"; + self.by-version."source-map"."0.1.41"; by-spec."spdy"."1.7.1" = self.by-version."spdy"."1.7.1"; by-version."spdy"."1.7.1" = lib.makeOverridable self.buildNodePackage { @@ -26260,15 +26790,15 @@ passthru.names = [ "speedometer" ]; }; by-spec."sprintf"."~0.1.2" = - self.by-version."sprintf"."0.1.4"; - by-version."sprintf"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "sprintf-0.1.4"; + self.by-version."sprintf"."0.1.5"; + by-version."sprintf"."0.1.5" = lib.makeOverridable self.buildNodePackage { + name = "sprintf-0.1.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/sprintf/-/sprintf-0.1.4.tgz"; - name = "sprintf-0.1.4.tgz"; - sha1 = "6f870a8f4aae1c7fe53eee02b6ca31aa2d78863b"; + url = "http://registry.npmjs.org/sprintf/-/sprintf-0.1.5.tgz"; + name = "sprintf-0.1.5.tgz"; + sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf"; }) ]; buildInputs = @@ -26280,9 +26810,9 @@ passthru.names = [ "sprintf" ]; }; by-spec."sprintf"."~0.1.3" = - self.by-version."sprintf"."0.1.4"; + self.by-version."sprintf"."0.1.5"; by-spec."sprintf"."~0.1.4" = - self.by-version."sprintf"."0.1.4"; + self.by-version."sprintf"."0.1.5"; by-spec."ssh-agent"."0.2.1" = self.by-version."ssh-agent"."0.2.1"; by-version."ssh-agent"."0.2.1" = lib.makeOverridable self.buildNodePackage { @@ -26709,16 +27239,37 @@ ]; passthru.names = [ "string-length" ]; }; + by-spec."string-length"."^1.0.0" = + self.by-version."string-length"."1.0.0"; + by-version."string-length"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "string-length-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/string-length/-/string-length-1.0.0.tgz"; + name = "string-length-1.0.0.tgz"; + sha1 = "5f0564b174feb299595a763da71513266370d3a9"; + }) + ]; + buildInputs = + (self.nativeDeps."string-length" or []); + deps = { + "strip-ansi-2.0.0" = self.by-version."strip-ansi"."2.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "string-length" ]; + }; by-spec."string2compact"."^1.1.1" = - self.by-version."string2compact"."1.2.0"; - by-version."string2compact"."1.2.0" = lib.makeOverridable self.buildNodePackage { - name = "string2compact-1.2.0"; + self.by-version."string2compact"."1.2.1"; + by-version."string2compact"."1.2.1" = lib.makeOverridable self.buildNodePackage { + name = "string2compact-1.2.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/string2compact/-/string2compact-1.2.0.tgz"; - name = "string2compact-1.2.0.tgz"; - sha1 = "ecf1fcd84c9f8fc0562f818b06422f60f588b01e"; + url = "http://registry.npmjs.org/string2compact/-/string2compact-1.2.1.tgz"; + name = "string2compact-1.2.1.tgz"; + sha1 = "a560cd737415e380f2518b83c38bb97093e981af"; }) ]; buildInputs = @@ -26855,22 +27406,22 @@ ]; passthru.names = [ "strip-ansi" ]; }; - by-spec."strip-ansi"."^1.0.0" = - self.by-version."strip-ansi"."1.0.0"; - by-version."strip-ansi"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "strip-ansi-1.0.0"; + by-spec."strip-ansi"."^2.0.0" = + self.by-version."strip-ansi"."2.0.0"; + by-version."strip-ansi"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "strip-ansi-2.0.0"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-1.0.0.tgz"; - name = "strip-ansi-1.0.0.tgz"; - sha1 = "6c021321d6ece161a3c608fbab268c7328901c73"; + url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.0.tgz"; + name = "strip-ansi-2.0.0.tgz"; + sha1 = "fa8d69432e97674746f55f51d076ae78b18df13f"; }) ]; buildInputs = (self.nativeDeps."strip-ansi" or []); deps = { - "ansi-regex-0.2.1" = self.by-version."ansi-regex"."0.2.1"; + "ansi-regex-1.1.0" = self.by-version."ansi-regex"."1.1.0"; }; peerDependencies = [ ]; @@ -26999,7 +27550,7 @@ "debug-2.1.0" = self.by-version."debug"."2.1.0"; "sax-0.5.8" = self.by-version."sax"."0.5.8"; "glob-3.2.11" = self.by-version."glob"."3.2.11"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; @@ -27421,8 +27972,8 @@ self.by-version."tar"."1.0.3"; by-spec."tar"."~0.1.17" = self.by-version."tar"."0.1.20"; - by-spec."tar"."~0.1.19" = - self.by-version."tar"."0.1.20"; + by-spec."tar"."~1.0.1" = + self.by-version."tar"."1.0.3"; by-spec."tar"."~1.0.3" = self.by-version."tar"."1.0.3"; by-spec."tar-fs"."0.5.2" = @@ -27448,6 +27999,35 @@ ]; passthru.names = [ "tar-fs" ]; }; + by-spec."tar-pack"."~2.0.0" = + self.by-version."tar-pack"."2.0.0"; + by-version."tar-pack"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "tar-pack-2.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tar-pack/-/tar-pack-2.0.0.tgz"; + name = "tar-pack-2.0.0.tgz"; + sha1 = "c2c401c02dd366138645e917b3a6baa256a9dcab"; + }) + ]; + buildInputs = + (self.nativeDeps."tar-pack" or []); + deps = { + "uid-number-0.0.3" = self.by-version."uid-number"."0.0.3"; + "once-1.1.1" = self.by-version."once"."1.1.1"; + "debug-0.7.4" = self.by-version."debug"."0.7.4"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; + "tar-0.1.20" = self.by-version."tar"."0.1.20"; + "fstream-ignore-0.0.7" = self.by-version."fstream-ignore"."0.0.7"; + "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; + "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "tar-pack" ]; + }; by-spec."tar-stream"."^0.4.6" = self.by-version."tar-stream"."0.4.7"; by-version."tar-stream"."0.4.7" = lib.makeOverridable self.buildNodePackage { @@ -27564,6 +28144,48 @@ ]; passthru.names = [ "text-table" ]; }; + by-spec."thenify"."2" = + self.by-version."thenify"."2.0.0"; + by-version."thenify"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "thenify-2.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/thenify/-/thenify-2.0.0.tgz"; + name = "thenify-2.0.0.tgz"; + sha1 = "a1c6a07b4274787c412289d4f8679b545205f186"; + }) + ]; + buildInputs = + (self.nativeDeps."thenify" or []); + deps = { + "native-or-bluebird-1.1.2" = self.by-version."native-or-bluebird"."1.1.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "thenify" ]; + }; + by-spec."thenify-all"."1" = + self.by-version."thenify-all"."1.0.0"; + by-version."thenify-all"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "thenify-all-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/thenify-all/-/thenify-all-1.0.0.tgz"; + name = "thenify-all-1.0.0.tgz"; + sha1 = "3663df4aed595ff671467c0683cd74350b87e1cf"; + }) + ]; + buildInputs = + (self.nativeDeps."thenify-all" or []); + deps = { + "thenify-2.0.0" = self.by-version."thenify"."2.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "thenify-all" ]; + }; by-spec."thirty-two"."~0.0.1" = self.by-version."thirty-two"."0.0.2"; by-version."thirty-two"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -27954,7 +28576,7 @@ "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; "request-2.27.0" = self.by-version."request"."2.27.0"; "semver-2.2.1" = self.by-version."semver"."2.2.1"; - "sprintf-0.1.4" = self.by-version."sprintf"."0.1.4"; + "sprintf-0.1.5" = self.by-version."sprintf"."0.1.5"; "temp-0.6.0" = self.by-version."temp"."0.6.0"; "winston-0.6.2" = self.by-version."winston"."0.6.2"; "wrench-1.5.8" = self.by-version."wrench"."1.5.8"; @@ -28071,9 +28693,9 @@ deps = { "bitfield-0.1.0" = self.by-version."bitfield"."0.1.0"; "bittorrent-dht-2.6.4" = self.by-version."bittorrent-dht"."2.6.4"; - "bittorrent-tracker-2.9.1" = self.by-version."bittorrent-tracker"."2.9.1"; + "bittorrent-tracker-2.10.0" = self.by-version."bittorrent-tracker"."2.10.0"; "bncode-0.5.3" = self.by-version."bncode"."0.5.3"; - "compact2string-1.3.0" = self.by-version."compact2string"."1.3.0"; + "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0"; "end-of-stream-0.1.5" = self.by-version."end-of-stream"."0.1.5"; "hat-0.0.3" = self.by-version."hat"."0.0.3"; "ip-0.3.2" = self.by-version."ip"."0.3.2"; @@ -28107,9 +28729,9 @@ deps = { "bitfield-0.1.0" = self.by-version."bitfield"."0.1.0"; "bittorrent-dht-1.5.0" = self.by-version."bittorrent-dht"."1.5.0"; - "bittorrent-tracker-2.9.1" = self.by-version."bittorrent-tracker"."2.9.1"; + "bittorrent-tracker-2.10.0" = self.by-version."bittorrent-tracker"."2.10.0"; "bncode-0.5.3" = self.by-version."bncode"."0.5.3"; - "compact2string-1.3.0" = self.by-version."compact2string"."1.3.0"; + "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0"; "end-of-stream-0.1.5" = self.by-version."end-of-stream"."0.1.5"; "hat-0.0.3" = self.by-version."hat"."0.0.3"; "ip-0.3.2" = self.by-version."ip"."0.3.2"; @@ -28169,27 +28791,6 @@ }; by-spec."tough-cookie"."^0.12.1" = self.by-version."tough-cookie"."0.12.1"; - by-spec."tough-cookie"."~0.9.15" = - self.by-version."tough-cookie"."0.9.15"; - by-version."tough-cookie"."0.9.15" = lib.makeOverridable self.buildNodePackage { - name = "tough-cookie-0.9.15"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.9.15.tgz"; - name = "tough-cookie-0.9.15.tgz"; - sha1 = "75617ac347e3659052b0350131885829677399f6"; - }) - ]; - buildInputs = - (self.nativeDeps."tough-cookie" or []); - deps = { - "punycode-1.3.2" = self.by-version."punycode"."1.3.2"; - }; - peerDependencies = [ - ]; - passthru.names = [ "tough-cookie" ]; - }; by-spec."traceur"."0.0.55" = self.by-version."traceur"."0.0.55"; by-version."traceur"."0.0.55" = lib.makeOverridable self.buildNodePackage { @@ -28205,8 +28806,8 @@ buildInputs = (self.nativeDeps."traceur" or []); deps = { - "commander-2.5.0" = self.by-version."commander"."2.5.0"; - "glob-4.2.2" = self.by-version."glob"."4.2.2"; + "commander-2.5.1" = self.by-version."commander"."2.5.1"; + "glob-4.3.2" = self.by-version."glob"."4.3.2"; "semver-2.3.2" = self.by-version."semver"."2.3.2"; }; peerDependencies = [ @@ -28236,6 +28837,32 @@ ]; passthru.names = [ "transformers" ]; }; + by-spec."trash"."*" = + self.by-version."trash"."1.2.0"; + by-version."trash"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "trash-1.2.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/trash/-/trash-1.2.0.tgz"; + name = "trash-1.2.0.tgz"; + sha1 = "125a91e6a5c1608a1bc3d9f74b6310554c376619"; + }) + ]; + buildInputs = + (self.nativeDeps."trash" or []); + deps = { + "escape-string-applescript-1.0.0" = self.by-version."escape-string-applescript"."1.0.0"; + "meow-1.0.0" = self.by-version."meow"."1.0.0"; + "run-applescript-1.0.1" = self.by-version."run-applescript"."1.0.1"; + "update-notifier-0.2.2" = self.by-version."update-notifier"."0.2.2"; + "xdg-trash-1.0.5" = self.by-version."xdg-trash"."1.0.5"; + }; + peerDependencies = [ + ]; + passthru.names = [ "trash" ]; + }; + "trash" = self.by-version."trash"."1.2.0"; by-spec."traverse".">=0.3.0 <0.4" = self.by-version."traverse"."0.3.9"; by-version."traverse"."0.3.9" = lib.makeOverridable self.buildNodePackage { @@ -28356,73 +28983,75 @@ ]; passthru.names = [ "tunnel-agent" ]; }; - by-spec."type-detect"."0.1.1" = - self.by-version."type-detect"."0.1.1"; - by-version."type-detect"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "type-detect-0.1.1"; + by-spec."type-check"."~0.3.1" = + self.by-version."type-check"."0.3.1"; + by-version."type-check"."0.3.1" = lib.makeOverridable self.buildNodePackage { + name = "type-check-0.3.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz"; - name = "type-detect-0.1.1.tgz"; - sha1 = "0ba5ec2a885640e470ea4e8505971900dac58822"; + url = "http://registry.npmjs.org/type-check/-/type-check-0.3.1.tgz"; + name = "type-check-0.3.1.tgz"; + sha1 = "9233923c4da174d0ac5480ecfd6ef84c349eb58d"; }) ]; buildInputs = - (self.nativeDeps."type-detect" or []); + (self.nativeDeps."type-check" or []); deps = { + "prelude-ls-1.1.1" = self.by-version."prelude-ls"."1.1.1"; }; peerDependencies = [ ]; - passthru.names = [ "type-detect" ]; + passthru.names = [ "type-check" ]; }; - 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 = "type-is-1.0.0"; + by-spec."type-detect"."0.1.1" = + self.by-version."type-detect"."0.1.1"; + by-version."type-detect"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "type-detect-0.1.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/type-is/-/type-is-1.0.0.tgz"; - name = "type-is-1.0.0.tgz"; - sha1 = "4ff424e97349a1ee1910b4bfc488595ecdc443fc"; + url = "http://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz"; + name = "type-detect-0.1.1.tgz"; + sha1 = "0ba5ec2a885640e470ea4e8505971900dac58822"; }) ]; buildInputs = - (self.nativeDeps."type-is" or []); + (self.nativeDeps."type-detect" or []); deps = { - "mime-1.2.11" = self.by-version."mime"."1.2.11"; }; peerDependencies = [ ]; - passthru.names = [ "type-is" ]; + passthru.names = [ "type-detect" ]; }; by-spec."type-is"."~1.5.1" = - self.by-version."type-is"."1.5.3"; - by-version."type-is"."1.5.3" = lib.makeOverridable self.buildNodePackage { - name = "type-is-1.5.3"; + self.by-version."type-is"."1.5.4"; + by-version."type-is"."1.5.4" = lib.makeOverridable self.buildNodePackage { + name = "type-is-1.5.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/type-is/-/type-is-1.5.3.tgz"; - name = "type-is-1.5.3.tgz"; - sha1 = "b7fb92d0abc628393f10dd260932cca65fe9ff68"; + url = "http://registry.npmjs.org/type-is/-/type-is-1.5.4.tgz"; + name = "type-is-1.5.4.tgz"; + sha1 = "f2afe8635dcf2d159096202be6e120423fa19837"; }) ]; buildInputs = (self.nativeDeps."type-is" or []); deps = { "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; - "mime-types-2.0.3" = self.by-version."mime-types"."2.0.3"; + "mime-types-2.0.4" = self.by-version."mime-types"."2.0.4"; }; peerDependencies = [ ]; passthru.names = [ "type-is" ]; }; by-spec."type-is"."~1.5.2" = - self.by-version."type-is"."1.5.3"; + self.by-version."type-is"."1.5.4"; by-spec."type-is"."~1.5.3" = - self.by-version."type-is"."1.5.3"; + self.by-version."type-is"."1.5.4"; + by-spec."type-is"."~1.5.4" = + self.by-version."type-is"."1.5.4"; by-spec."typechecker"."~2.0.1" = self.by-version."typechecker"."2.0.8"; by-version."typechecker"."2.0.8" = lib.makeOverridable self.buildNodePackage { @@ -28485,15 +29114,15 @@ }; "typescript" = self.by-version."typescript"."1.3.0"; by-spec."uglify-js"."*" = - self.by-version."uglify-js"."2.4.15"; - by-version."uglify-js"."2.4.15" = lib.makeOverridable self.buildNodePackage { - name = "uglify-js-2.4.15"; + self.by-version."uglify-js"."2.4.16"; + by-version."uglify-js"."2.4.16" = lib.makeOverridable self.buildNodePackage { + name = "uglify-js-2.4.16"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.15.tgz"; - name = "uglify-js-2.4.15.tgz"; - sha1 = "12bc6d84345fbc306e13f7075d6437a8bf64d7e3"; + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.16.tgz"; + name = "uglify-js-2.4.16.tgz"; + sha1 = "84143487eb480efd7d0789c7ecfbd48a695839f9"; }) ]; buildInputs = @@ -28508,7 +29137,7 @@ ]; passthru.names = [ "uglify-js" ]; }; - "uglify-js" = self.by-version."uglify-js"."2.4.15"; + "uglify-js" = self.by-version."uglify-js"."2.4.16"; 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 { @@ -28545,7 +29174,7 @@ (self.nativeDeps."uglify-js" or []); deps = { "async-0.2.10" = self.by-version."async"."0.2.10"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; "optimist-0.3.7" = self.by-version."optimist"."0.3.7"; "uglify-to-browserify-1.0.2" = self.by-version."uglify-to-browserify"."1.0.2"; }; @@ -28555,8 +29184,30 @@ }; by-spec."uglify-js"."2.4.15" = self.by-version."uglify-js"."2.4.15"; + by-version."uglify-js"."2.4.15" = lib.makeOverridable self.buildNodePackage { + name = "uglify-js-2.4.15"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.15.tgz"; + name = "uglify-js-2.4.15.tgz"; + sha1 = "12bc6d84345fbc306e13f7075d6437a8bf64d7e3"; + }) + ]; + buildInputs = + (self.nativeDeps."uglify-js" or []); + deps = { + "async-0.2.10" = self.by-version."async"."0.2.10"; + "source-map-0.1.34" = self.by-version."source-map"."0.1.34"; + "optimist-0.3.7" = self.by-version."optimist"."0.3.7"; + "uglify-to-browserify-1.0.2" = 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.15"; + self.by-version."uglify-js"."2.4.16"; 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 { @@ -28572,7 +29223,7 @@ buildInputs = (self.nativeDeps."uglify-js" or []); deps = { - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; "optimist-0.3.7" = self.by-version."optimist"."0.3.7"; }; peerDependencies = [ @@ -28597,7 +29248,7 @@ (self.nativeDeps."uglify-js" or []); deps = { "async-0.2.10" = self.by-version."async"."0.2.10"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; "optimist-0.3.7" = self.by-version."optimist"."0.3.7"; }; peerDependencies = [ @@ -28607,7 +29258,7 @@ by-spec."uglify-js"."~2.3.6" = self.by-version."uglify-js"."2.3.6"; by-spec."uglify-js"."~2.4.0" = - self.by-version."uglify-js"."2.4.15"; + self.by-version."uglify-js"."2.4.16"; 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 { @@ -28648,6 +29299,26 @@ ]; passthru.names = [ "uid-number" ]; }; + by-spec."uid-number"."0.0.3" = + self.by-version."uid-number"."0.0.3"; + by-version."uid-number"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "uid-number-0.0.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz"; + name = "uid-number-0.0.3.tgz"; + sha1 = "cefb0fa138d8d8098da71a40a0d04a8327d6e1cc"; + }) + ]; + buildInputs = + (self.nativeDeps."uid-number" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "uid-number" ]; + }; by-spec."uid-number"."0.0.5" = self.by-version."uid-number"."0.0.5"; by-version."uid-number"."0.0.5" = lib.makeOverridable self.buildNodePackage { @@ -28685,7 +29356,7 @@ buildInputs = (self.nativeDeps."uid-safe" or []); deps = { - "mz-1.1.0" = self.by-version."mz"."1.1.0"; + "mz-1.2.0" = self.by-version."mz"."1.2.0"; "base64-url-1.0.0" = self.by-version."base64-url"."1.0.0"; }; peerDependencies = [ @@ -28734,7 +29405,7 @@ "rfile-1.0.0" = self.by-version."rfile"."1.0.0"; "ruglify-1.0.0" = self.by-version."ruglify"."1.0.0"; "through-2.3.6" = self.by-version."through"."2.3.6"; - "uglify-js-2.4.15" = self.by-version."uglify-js"."2.4.15"; + "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16"; }; peerDependencies = [ ]; @@ -28758,7 +29429,7 @@ "rfile-1.0.0" = self.by-version."rfile"."1.0.0"; "ruglify-1.0.0" = self.by-version."ruglify"."1.0.0"; "through-2.3.6" = self.by-version."through"."2.3.6"; - "uglify-js-2.4.15" = self.by-version."uglify-js"."2.4.15"; + "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16"; }; peerDependencies = [ ]; @@ -28835,6 +29506,8 @@ self.by-version."underscore"."1.7.0"; by-spec."underscore".">=1.5.0" = self.by-version."underscore"."1.7.0"; + by-spec."underscore"."^1.6.0" = + self.by-version."underscore"."1.7.0"; by-spec."underscore"."~1.4.3" = self.by-version."underscore"."1.4.4"; by-version."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage { @@ -28877,6 +29550,8 @@ ]; passthru.names = [ "underscore" ]; }; + by-spec."underscore"."~1.7.0" = + self.by-version."underscore"."1.7.0"; by-spec."underscore.string"."~2.2.1" = self.by-version."underscore.string"."2.2.1"; by-version."underscore.string"."2.2.1" = lib.makeOverridable self.buildNodePackage { @@ -28919,6 +29594,26 @@ }; by-spec."underscore.string"."~2.3.3" = self.by-version."underscore.string"."2.3.3"; + by-spec."underscore.string"."~2.4.0" = + self.by-version."underscore.string"."2.4.0"; + by-version."underscore.string"."2.4.0" = lib.makeOverridable self.buildNodePackage { + name = "underscore.string-2.4.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz"; + name = "underscore.string-2.4.0.tgz"; + sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; + }) + ]; + buildInputs = + (self.nativeDeps."underscore.string" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "underscore.string" ]; + }; by-spec."unfunk-diff"."~0.0.1" = self.by-version."unfunk-diff"."0.0.2"; by-version."unfunk-diff"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -28957,7 +29652,7 @@ buildInputs = (self.nativeDeps."ungit" or []); deps = { - "express-4.10.4" = self.by-version."express"."4.10.4"; + "express-4.10.6" = self.by-version."express"."4.10.6"; "superagent-0.21.0" = self.by-version."superagent"."0.21.0"; "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "temp-0.8.1" = self.by-version."temp"."0.8.1"; @@ -28969,7 +29664,7 @@ "winston-0.8.3" = self.by-version."winston"."0.8.3"; "passport-0.2.1" = self.by-version."passport"."0.2.1"; "passport-local-1.0.0" = self.by-version."passport-local"."1.0.0"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; "forever-monitor-1.1.0" = self.by-version."forever-monitor"."1.1.0"; "open-0.0.5" = self.by-version."open"."0.0.5"; "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; @@ -28983,12 +29678,12 @@ "deep-extend-0.3.2" = self.by-version."deep-extend"."0.3.2"; "raven-0.7.2" = self.by-version."raven"."0.7.2"; "knockout-3.2.0" = self.by-version."knockout"."3.2.0"; - "npm-registry-client-4.0.4" = self.by-version."npm-registry-client"."4.0.4"; + "npm-registry-client-4.0.5" = self.by-version."npm-registry-client"."4.0.5"; "npmconf-2.1.1" = self.by-version."npmconf"."2.1.1"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "body-parser-1.9.3" = self.by-version."body-parser"."1.9.3"; "cookie-parser-1.3.3" = self.by-version."cookie-parser"."1.3.3"; - "express-session-1.9.2" = self.by-version."express-session"."1.9.2"; + "express-session-1.9.3" = self.by-version."express-session"."1.9.3"; "serve-static-1.7.1" = self.by-version."serve-static"."1.7.1"; }; peerDependencies = [ @@ -29061,6 +29756,34 @@ ]; passthru.names = [ "update-notifier" ]; }; + by-spec."update-notifier"."^0.2.0" = + self.by-version."update-notifier"."0.2.2"; + by-version."update-notifier"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "update-notifier-0.2.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.2.2.tgz"; + name = "update-notifier-0.2.2.tgz"; + sha1 = "e69b3a784b4e686a2acd98f5e66944591996e187"; + }) + ]; + buildInputs = + (self.nativeDeps."update-notifier" or []); + deps = { + "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; + "configstore-0.3.1" = self.by-version."configstore"."0.3.1"; + "is-npm-1.0.0" = self.by-version."is-npm"."1.0.0"; + "latest-version-1.0.0" = self.by-version."latest-version"."1.0.0"; + "semver-diff-2.0.0" = self.by-version."semver-diff"."2.0.0"; + "string-length-1.0.0" = self.by-version."string-length"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "update-notifier" ]; + }; + by-spec."update-notifier"."^0.2.1" = + self.by-version."update-notifier"."0.2.2"; by-spec."update-notifier"."~0.1.8" = self.by-version."update-notifier"."0.1.10"; by-version."update-notifier"."0.1.10" = lib.makeOverridable self.buildNodePackage { @@ -29078,7 +29801,7 @@ deps = { "chalk-0.4.0" = self.by-version."chalk"."0.4.0"; "configstore-0.3.1" = self.by-version."configstore"."0.3.1"; - "request-2.49.0" = self.by-version."request"."2.49.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "semver-2.3.2" = self.by-version."semver"."2.3.2"; }; peerDependencies = [ @@ -29351,6 +30074,26 @@ ]; passthru.names = [ "utils-merge" ]; }; + by-spec."uuid"."^2.0.1" = + self.by-version."uuid"."2.0.1"; + by-version."uuid"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "uuid-2.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz"; + name = "uuid-2.0.1.tgz"; + sha1 = "c2a30dedb3e535d72ccf82e343941a50ba8533ac"; + }) + ]; + buildInputs = + (self.nativeDeps."uuid" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "uuid" ]; + }; by-spec."uuid"."~1.4.1" = self.by-version."uuid"."1.4.2"; by-version."uuid"."1.4.2" = lib.makeOverridable self.buildNodePackage { @@ -29373,34 +30116,60 @@ }; by-spec."uuid"."~2.0.1" = self.by-version."uuid"."2.0.1"; - by-version."uuid"."2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "uuid-2.0.1"; + by-spec."v8-debug"."~0.3.0" = + self.by-version."v8-debug"."0.3.1"; + by-version."v8-debug"."0.3.1" = lib.makeOverridable self.buildNodePackage { + name = "v8-debug-0.3.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz"; - name = "uuid-2.0.1.tgz"; - sha1 = "c2a30dedb3e535d72ccf82e343941a50ba8533ac"; + url = "http://registry.npmjs.org/v8-debug/-/v8-debug-0.3.1.tgz"; + name = "v8-debug-0.3.1.tgz"; + sha1 = "a2a552db05515246e480a97184a9eaa0cfc20e6b"; }) ]; buildInputs = - (self.nativeDeps."uuid" or []); + (self.nativeDeps."v8-debug" or []); deps = { + "node-pre-gyp-0.5.31" = self.by-version."node-pre-gyp"."0.5.31"; + "nan-1.2.0" = self.by-version."nan"."1.2.0"; }; peerDependencies = [ ]; - passthru.names = [ "uuid" ]; + passthru.names = [ "v8-debug" ]; + }; + by-spec."v8-profiler"."~5.2.0" = + self.by-version."v8-profiler"."5.2.1"; + by-version."v8-profiler"."5.2.1" = lib.makeOverridable self.buildNodePackage { + name = "v8-profiler-5.2.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/v8-profiler/-/v8-profiler-5.2.1.tgz"; + name = "v8-profiler-5.2.1.tgz"; + sha1 = "674acc65ebac9c914d578180c8713791386c23e7"; + }) + ]; + buildInputs = + (self.nativeDeps."v8-profiler" or []); + deps = { + "node-pre-gyp-0.5.31" = self.by-version."node-pre-gyp"."0.5.31"; + "nan-1.2.0" = self.by-version."nan"."1.2.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "v8-profiler" ]; }; by-spec."v8flags"."^1.0.1" = - self.by-version."v8flags"."1.0.5"; - by-version."v8flags"."1.0.5" = lib.makeOverridable self.buildNodePackage { - name = "v8flags-1.0.5"; + self.by-version."v8flags"."1.0.6"; + by-version."v8flags"."1.0.6" = lib.makeOverridable self.buildNodePackage { + name = "v8flags-1.0.6"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/v8flags/-/v8flags-1.0.5.tgz"; - name = "v8flags-1.0.5.tgz"; - sha1 = "d352362031d3286bcd906da45fe27a3b760e38e5"; + url = "http://registry.npmjs.org/v8flags/-/v8flags-1.0.6.tgz"; + name = "v8flags-1.0.6.tgz"; + sha1 = "dc6b3d3347fabd196fad52b996059168918241b1"; }) ]; buildInputs = @@ -29661,21 +30430,21 @@ passthru.names = [ "vinyl" ]; }; by-spec."vinyl"."^0.4.0" = - self.by-version."vinyl"."0.4.5"; - by-version."vinyl"."0.4.5" = lib.makeOverridable self.buildNodePackage { - name = "vinyl-0.4.5"; + self.by-version."vinyl"."0.4.6"; + by-version."vinyl"."0.4.6" = lib.makeOverridable self.buildNodePackage { + name = "vinyl-0.4.6"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/vinyl/-/vinyl-0.4.5.tgz"; - name = "vinyl-0.4.5.tgz"; - sha1 = "b1015e63bbd350d5f90e6c26b3a2e628294da8e0"; + url = "http://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz"; + name = "vinyl-0.4.6.tgz"; + sha1 = "2f356c87a550a255461f36bbeb2a5ba8bf784847"; }) ]; buildInputs = (self.nativeDeps."vinyl" or []); deps = { - "clone-0.1.18" = self.by-version."clone"."0.1.18"; + "clone-0.2.0" = self.by-version."clone"."0.2.0"; "clone-stats-0.0.1" = self.by-version."clone-stats"."0.0.1"; }; peerDependencies = [ @@ -29698,13 +30467,13 @@ (self.nativeDeps."vinyl-fs" or []); deps = { "defaults-1.0.0" = self.by-version."defaults"."1.0.0"; - "glob-stream-3.1.17" = self.by-version."glob-stream"."3.1.17"; + "glob-stream-3.1.18" = self.by-version."glob-stream"."3.1.18"; "glob-watcher-0.0.6" = self.by-version."glob-watcher"."0.0.6"; "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "strip-bom-1.0.0" = self.by-version."strip-bom"."1.0.0"; "through2-0.6.3" = self.by-version."through2"."0.6.3"; - "vinyl-0.4.5" = self.by-version."vinyl"."0.4.5"; + "vinyl-0.4.6" = self.by-version."vinyl"."0.4.6"; }; peerDependencies = [ ]; @@ -29754,23 +30523,23 @@ passthru.names = [ "void-elements" ]; }; by-spec."vows".">=0.5.13" = - self.by-version."vows"."0.8.1"; - by-version."vows"."0.8.1" = lib.makeOverridable self.buildNodePackage { - name = "vows-0.8.1"; + self.by-version."vows"."0.9.0-rc1"; + by-version."vows"."0.9.0-rc1" = lib.makeOverridable self.buildNodePackage { + name = "vows-0.9.0-rc1"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/vows/-/vows-0.8.1.tgz"; - name = "vows-0.8.1.tgz"; - sha1 = "e09e988ce594ca05a08d72abcca34e88db559131"; + url = "http://registry.npmjs.org/vows/-/vows-0.9.0-rc1.tgz"; + name = "vows-0.9.0-rc1.tgz"; + sha1 = "601cb87d69556bf9c7ce8cad36cbc2c98781921f"; }) ]; buildInputs = (self.nativeDeps."vows" or []); deps = { "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; - "diff-1.0.8" = self.by-version."diff"."1.0.8"; - "glob-4.0.6" = self.by-version."glob"."4.0.6"; + "diff-1.2.0" = self.by-version."diff"."1.2.0"; + "glob-4.3.2" = self.by-version."glob"."4.3.2"; }; peerDependencies = [ ]; @@ -29957,27 +30726,50 @@ }; "webdrvr" = self.by-version."webdrvr"."2.43.0-0"; by-spec."websocket-driver".">=0.3.6" = - self.by-version."websocket-driver"."0.4.0"; - by-version."websocket-driver"."0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "websocket-driver-0.4.0"; + self.by-version."websocket-driver"."0.5.1"; + by-version."websocket-driver"."0.5.1" = lib.makeOverridable self.buildNodePackage { + name = "websocket-driver-0.5.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.4.0.tgz"; - name = "websocket-driver-0.4.0.tgz"; - sha1 = "71fa992e5d41c2cc5e290420687d0601efd06b7a"; + url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.5.1.tgz"; + name = "websocket-driver-0.5.1.tgz"; + sha1 = "dd954c0a42a9962a31296f84cc465ca4b74c2611"; }) ]; buildInputs = (self.nativeDeps."websocket-driver" or []); deps = { + "websocket-extensions-0.1.0" = self.by-version."websocket-extensions"."0.1.0"; }; peerDependencies = [ ]; passthru.names = [ "websocket-driver" ]; }; by-spec."websocket-driver".">=0.4.0" = - self.by-version."websocket-driver"."0.4.0"; + self.by-version."websocket-driver"."0.5.1"; + by-spec."websocket-driver".">=0.5.1" = + self.by-version."websocket-driver"."0.5.1"; + by-spec."websocket-extensions".">=0.1.0" = + self.by-version."websocket-extensions"."0.1.0"; + by-version."websocket-extensions"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "websocket-extensions-0.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.0.tgz"; + name = "websocket-extensions-0.1.0.tgz"; + sha1 = "43567457158085e83ce7050f17ac6d988936320a"; + }) + ]; + buildInputs = + (self.nativeDeps."websocket-extensions" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "websocket-extensions" ]; + }; by-spec."when"."~3.4.6" = self.by-version."when"."3.4.6"; by-version."when"."3.4.6" = lib.makeOverridable self.buildNodePackage { @@ -29999,15 +30791,15 @@ passthru.names = [ "when" ]; }; by-spec."which"."1" = - self.by-version."which"."1.0.7"; - by-version."which"."1.0.7" = lib.makeOverridable self.buildNodePackage { - name = "which-1.0.7"; + self.by-version."which"."1.0.8"; + by-version."which"."1.0.8" = lib.makeOverridable self.buildNodePackage { + name = "which-1.0.8"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/which/-/which-1.0.7.tgz"; - name = "which-1.0.7.tgz"; - sha1 = "853133f40e5bd2783e51a06774959455cc8ee865"; + url = "http://registry.npmjs.org/which/-/which-1.0.8.tgz"; + name = "which-1.0.8.tgz"; + sha1 = "c2ff319534ac4a1fa45df2221b56c36279903ded"; }) ]; buildInputs = @@ -30019,11 +30811,13 @@ passthru.names = [ "which" ]; }; by-spec."which"."1.0.x" = - self.by-version."which"."1.0.7"; + self.by-version."which"."1.0.8"; + by-spec."which"."^1.0.5" = + self.by-version."which"."1.0.8"; by-spec."which"."~1.0.5" = - self.by-version."which"."1.0.7"; - by-spec."which"."~1.0.7" = - self.by-version."which"."1.0.7"; + self.by-version."which"."1.0.8"; + by-spec."which"."~1.0.8" = + self.by-version."which"."1.0.8"; by-spec."windows-no-runnable"."~0.0.6" = self.by-version."windows-no-runnable"."0.0.6"; by-version."windows-no-runnable"."0.0.6" = lib.makeOverridable self.buildNodePackage { @@ -30085,7 +30879,7 @@ "colors-0.6.2" = self.by-version."colors"."0.6.2"; "cycle-1.0.3" = self.by-version."cycle"."1.0.3"; "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; - "isstream-0.1.0" = self.by-version."isstream"."0.1.0"; + "isstream-0.1.1" = self.by-version."isstream"."0.1.1"; "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0"; "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9"; }; @@ -30428,6 +31222,95 @@ ]; passthru.names = [ "xcode" ]; }; + by-spec."xdg-basedir"."^1.0.0" = + self.by-version."xdg-basedir"."1.0.0"; + by-version."xdg-basedir"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "xdg-basedir-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/xdg-basedir/-/xdg-basedir-1.0.0.tgz"; + name = "xdg-basedir-1.0.0.tgz"; + sha1 = "95ea42a738d98a9470fd5a21d08556dbd61dc74a"; + }) + ]; + buildInputs = + (self.nativeDeps."xdg-basedir" or []); + deps = { + "user-home-1.1.0" = self.by-version."user-home"."1.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "xdg-basedir" ]; + }; + by-spec."xdg-empty-trash"."^1.0.0" = + self.by-version."xdg-empty-trash"."1.0.0"; + by-version."xdg-empty-trash"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "xdg-empty-trash-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/xdg-empty-trash/-/xdg-empty-trash-1.0.0.tgz"; + name = "xdg-empty-trash-1.0.0.tgz"; + sha1 = "007ec95403863f705ec09335b8c9166858021959"; + }) + ]; + buildInputs = + (self.nativeDeps."xdg-empty-trash" or []); + deps = { + "each-async-1.1.0" = self.by-version."each-async"."1.1.0"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + }; + peerDependencies = [ + ]; + passthru.names = [ "xdg-empty-trash" ]; + }; + by-spec."xdg-trash"."^1.0.0" = + self.by-version."xdg-trash"."1.0.5"; + by-version."xdg-trash"."1.0.5" = lib.makeOverridable self.buildNodePackage { + name = "xdg-trash-1.0.5"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/xdg-trash/-/xdg-trash-1.0.5.tgz"; + name = "xdg-trash-1.0.5.tgz"; + sha1 = "5473316b2a1ec2e9329fbeb4d767ffe939cc1c82"; + }) + ]; + buildInputs = + (self.nativeDeps."xdg-trash" or []); + deps = { + "each-async-1.1.0" = self.by-version."each-async"."1.1.0"; + "fs-extra-0.12.0" = self.by-version."fs-extra"."0.12.0"; + "uuid-2.0.1" = self.by-version."uuid"."2.0.1"; + "xdg-trashdir-1.0.3" = self.by-version."xdg-trashdir"."1.0.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "xdg-trash" ]; + }; + by-spec."xdg-trashdir"."^1.0.0" = + self.by-version."xdg-trashdir"."1.0.3"; + by-version."xdg-trashdir"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "xdg-trashdir-1.0.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/xdg-trashdir/-/xdg-trashdir-1.0.3.tgz"; + name = "xdg-trashdir-1.0.3.tgz"; + sha1 = "8df4be55629617be0c5ece0b76ab6cac658d52c7"; + }) + ]; + buildInputs = + (self.nativeDeps."xdg-trashdir" or []); + deps = { + "mount-point-1.0.3" = self.by-version."mount-point"."1.0.3"; + "xdg-basedir-1.0.0" = self.by-version."xdg-basedir"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "xdg-trashdir" ]; + }; by-spec."xml2js"."0.2.4" = self.by-version."xml2js"."0.2.4"; by-version."xml2js"."0.2.4" = lib.makeOverridable self.buildNodePackage { @@ -30707,22 +31590,21 @@ }; by-spec."xtend"."~3.0.0" = self.by-version."xtend"."3.0.0"; - by-spec."yargs"."~1.2.1" = - self.by-version."yargs"."1.2.6"; - by-version."yargs"."1.2.6" = lib.makeOverridable self.buildNodePackage { - name = "yargs-1.2.6"; + by-spec."yargs"."^1.2.1" = + self.by-version."yargs"."1.3.3"; + by-version."yargs"."1.3.3" = lib.makeOverridable self.buildNodePackage { + name = "yargs-1.3.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/yargs/-/yargs-1.2.6.tgz"; - name = "yargs-1.2.6.tgz"; - sha1 = "9c7b4a82fd5d595b2bf17ab6dcc43135432fe34b"; + url = "http://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz"; + name = "yargs-1.3.3.tgz"; + sha1 = "054de8b61f22eefdb7207059eaef9d6b83fb931a"; }) ]; buildInputs = (self.nativeDeps."yargs" or []); deps = { - "minimist-0.1.0" = self.by-version."minimist"."0.1.0"; }; peerDependencies = [ ]; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 5f6761bde054..f63c614424f2 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -146,4 +146,6 @@ , "sloc" , "peerflix" , "peerflix-server" +, "trash" +, "empty-trash" ] diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e1dd33e92815..062f5af4e311 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -178,13 +178,13 @@ let self = _self // overrides; _self = with self; { }; AppCmd = buildPerlPackage { - name = "App-Cmd-0.320"; + name = "App-Cmd-0.326"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/App-Cmd-0.320.tar.gz; - sha256 = "ca6174f634bbe5b73c5f5ad6e0f3b3385568934282f4e848da8e78025b2b185e"; + url = mirror://cpan/authors/id/R/RJ/RJBS/App-Cmd-0.326.tar.gz; + sha256 = "1z6vp1am170fczc0srj63rdvrdbrjk3acmj6ka5v5n6qim4xsv9b"; }; buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ CaptureTiny ClassLoad DataOptList GetoptLongDescriptive IOTieCombine StringRewritePrefix SubExporter SubInstall ]; + propagatedBuildInputs = [ CaptureTiny ClassLoad DataOptList GetoptLongDescriptive IOTieCombine StringRewritePrefix SubExporter ModulePluggable SubInstall ]; meta = { homepage = https://github.com/rjbs/app-cmd; description = "Write command line apps with less suffering"; @@ -1128,10 +1128,10 @@ let self = _self // overrides; _self = with self; { }; CGIFormBuilder = buildPerlPackage rec { - name = "CGI-FormBuilder-3.0501"; + name = "CGI-FormBuilder-3.09"; src = fetchurl { url = "mirror://cpan/authors/id/N/NW/NWIGER/${name}.tgz"; - sha256 = "031sgxifl2dq8d4s4d9vnixvqdd3p952k0jrkyqp823k74glps25"; + sha256 = "0qx8kxj0iy55ss9kraqr8q2m4igi2ylajff7d6qvphqpfx90fjb5"; }; }; @@ -1645,11 +1645,11 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CGICookieXS ]; }; - Coro = buildPerlPackage { - name = "Coro-6.37"; + Coro = buildPerlPackage rec { + name = "Coro-6.41"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.37.tar.gz; - sha256 = "08qkwv7rpyb7zcp128crjakflc027sjkx9d2s1gzc21grsq9a456"; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; + sha256 = "1r1gam4yyl6w88ga8rkbvj33v1r5ald3ryqlpg13c7y1i79yizxa"; }; propagatedBuildInputs = [ AnyEvent Guard CommonSense ]; meta = { @@ -3343,10 +3343,10 @@ let self = _self // overrides; _self = with self; { }; ExceptionBase = buildPerlPackage { - name = "Exception-Base-0.2401"; + name = "Exception-Base-0.25"; src = fetchurl { - url = mirror://cpan/authors/id/D/DE/DEXTER/Exception-Base-0.2401.tar.gz; - sha256 = "0z4pckv3iwzz5s4xrv96kg9620s96kim57nfrxbqhh6pyd5jfazv"; + url = mirror://cpan/authors/id/D/DE/DEXTER/Exception-Base-0.25.tar.gz; + sha256 = "1s2is862xba2yy633wn2nklrya36yrlwxlbpqjrv8m31xj2c8khw"; }; buildInputs = [ TestUnitLite ]; meta = { @@ -3942,12 +3942,8 @@ let self = _self // overrides; _self = with self; { # Patch has been sent upstream. patches = [ ../development/perl-modules/gd-options-passthrough-and-fontconfig.patch ]; - # Remove a failing test. The test does a binary comparison of a generated - # file with a file packaged with the source, and these are different - # ( although the images look the same to my eye ); this is - # possibly because the source packaged image was generated with a - # different version of some library ( libpng maybe? ). - postPatch = "sed -ie 's/if (GD::Image->can(.newFromJpeg.)) {/if ( 0 ) {/' t/GD.t"; + # tests fail + doCheck = false; makeMakerFlags = "--lib_png_path=${pkgs.libpng} --lib_jpeg_path=${pkgs.libjpeg} --lib_zlib_path=${pkgs.zlib} --lib_ft_path=${pkgs.freetype} --lib_fontconfig_path=${pkgs.fontconfig} --lib_xpm_path=${pkgs.xlibs.libXpm}"; }; @@ -4209,11 +4205,13 @@ let self = _self // overrides; _self = with self; { }; HTMLFormHandler = buildPerlPackage { - name = "HTML-FormHandler-0.40056"; + name = "HTML-FormHandler-0.40057"; src = fetchurl { - url = mirror://cpan/authors/id/G/GS/GSHANK/HTML-FormHandler-0.40056.tar.gz; - sha256 = "012wijl69qjazghq2ywikk0jdxjbd9rfsxmwwq7lbpfjy2fiymqx"; + url = mirror://cpan/authors/id/G/GS/GSHANK/HTML-FormHandler-0.40057.tar.gz; + sha256 = "1hn9shhbsi4pdp396ia2hky3i0imnxgwvhy57gp0jjhy5qyvafvm"; }; + # a single test is failing on perl 5.20 + doCheck = false; buildInputs = [ FileShareDirInstall PadWalker TestDifferences TestException TestMemoryCycle ]; propagatedBuildInputs = [ ClassLoad DataClone DateTime DateTimeFormatStrptime EmailValid FileShareDir HTMLTree JSON ListAllUtils Moose MooseXGetopt MooseXTypes MooseXTypesCommon MooseXTypesLoadableClass SubExporter SubName TryTiny aliased namespaceautoclean ]; meta = { @@ -4498,6 +4496,20 @@ let self = _self // overrides; _self = with self; { }; }; + ImageSize = buildPerlPackage rec { + name = "Image-Size-3.232"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RJ/RJRAY/${name}.tar.gz"; + sha256 = "1mx065134gy75pgdldh65118bpcs6yfbqmr7bf9clwq44zslxhxc"; + }; + buildInputs = [ TestMore ]; + propagatedBuildInputs = [ ModuleRuntime ]; + meta = { + description = "Read the dimensions of an image in several popular formats"; + license = with stdenv.lib.licenses; [ artistic1 lgpl21Plus ]; + }; + }; + ImportInto = buildPerlPackage { name = "Import-Into-1.002004"; src = fetchurl { @@ -5920,13 +5932,13 @@ let self = _self // overrides; _self = with self; { }; MooseXAppCmd = buildPerlPackage { - name = "MooseX-App-Cmd-0.10"; + name = "MooseX-App-Cmd-0.27"; src = fetchurl { - url = mirror://cpan/authors/id/M/MJ/MJGARDNER/MooseX-App-Cmd-0.10.tar.gz; - sha256 = "6d2d8fdc4f3f7fa76dc82c10d71b099f1572c054a72f373e5a9fa6237e48634a"; + url = mirror://cpan/authors/id/M/MJ/MJGARDNER/MooseX-App-Cmd-0.27.tar.gz; + sha256 = "18wf8xmp0b8g76rlkmzw9m026w0l5k972w3z9xcskwqmg9p0wg3k"; }; - buildInputs = [ MooseXConfigFromFile TestOutput YAML ]; - propagatedBuildInputs = [ AppCmd GetoptLongDescriptive Moose MooseXConfigFromFile MooseXGetopt MooseXHasOptions MooseXMarkAsMethods Testuseok ]; + buildInputs = [ MooseXConfigFromFile TestOutput YAML MouseXGetOpt ]; + propagatedBuildInputs = [ AppCmd GetoptLongDescriptive Moose AnyMoose MooseXConfigFromFile MooseXGetopt MooseXHasOptions MooseXMarkAsMethods Testuseok ]; meta = { homepage = http://metacpan.org/release/MooseX-App-Cmd; description = "Mashes up MooseX::Getopt and App::Cmd"; @@ -5936,6 +5948,91 @@ let self = _self // overrides; _self = with self; { }; }; + MouseXSimpleConfig = buildPerlPackage { + name = "MouseX-SimpleConfig-0.11"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MJ/MJGARDNER/MouseX-SimpleConfig-0.11.tar.gz; + sha256 = "257f384091d33d340373a6153947039c698dc449d1ef989335644fc3d2da0069"; + }; + buildInputs = [ Mouse PathClass ]; + propagatedBuildInputs = [ ConfigAny Mouse MouseXConfigFromFile ]; + meta = { + description = "A Mouse role for setting attributes from a simple configfile"; + license = "perl"; + }; + }; + + + TestUseAllModules = buildPerlPackage { + name = "Test-UseAllModules-0.17"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Test-UseAllModules-0.17.tar.gz; + sha256 = "a71f2fe8b96ab8bfc2760aa1d3135ea049a5b20dcb105457b769a1195c7a2509"; + }; + meta = { + description = "Do use_ok() for all the MANIFESTed modules"; + license = "perl"; + }; + }; + + MouseXTypesPathClass = buildPerlPackage { + name = "MouseX-Types-Path-Class-0.07"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MASAKI/MouseX-Types-Path-Class-0.07.tar.gz; + sha256 = "228d4b4f3f0ed9547278691d0b7c5fe53d90874a69df709a49703c6af87c09de"; + }; + buildInputs = [ TestUseAllModules ]; + propagatedBuildInputs = [ Mouse MouseXTypes PathClass ]; + meta = { + description = "A Path::Class type library for Mouse"; + license = "perl"; + }; + }; + + MouseXTypes = buildPerlPackage { + name = "MouseX-Types-0.06"; + src = fetchurl { + url = mirror://cpan/authors/id/G/GF/GFUJI/MouseX-Types-0.06.tar.gz; + sha256 = "77288441fdadd15beeec9a0813ece8aec1542f1d8ceaaec14755b3f316fbcf8b"; + }; + buildInputs = [ TestException ]; + propagatedBuildInputs = [ AnyMoose Mouse ]; + meta = { + description = "Organize your Mouse types in libraries"; + license = "perl"; + }; + }; + + MouseXConfigFromFile = buildPerlPackage { + name = "MouseX-ConfigFromFile-0.05"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MASAKI/MouseX-ConfigFromFile-0.05.tar.gz; + sha256 = "921b31cb13fc1f982a602f8e23815b7add23a224257e43790e287504ce879534"; + }; + buildInputs = [ TestUseAllModules ]; + propagatedBuildInputs = [ Mouse MouseXTypesPathClass ]; + meta = { + description = "An abstract Mouse role for setting attributes from a configfile"; + license = "perl"; + }; + }; + + MouseXGetOpt = buildPerlModule { + name = "mousex-getopt-0.35"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TO/TOKUHIROM/mousex-getopt-0.35.tar.gz; + sha256 = "5abe243a1ab05d64562358604de1d31d36994414c5c5eaeac688897129d2f9ae"; + }; + buildInputs = [ Mouse MouseXConfigFromFile MouseXSimpleConfig TestException TestWarn ]; + propagatedBuildInputs = [ GetoptLongDescriptive Mouse ]; + meta = { + homepage = https://github.com/gfx/mousex-getopt; + description = "A Mouse role for processing command line options"; + license = "perl"; + }; + }; + + MooseXAttributeChained = buildPerlModule rec { name = "MooseX-Attribute-Chained-1.0.1"; src = fetchurl { @@ -5951,6 +6048,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-AttributeHelpers-0.23.tar.gz; sha256 = "3f63f60d94d840a309d9137f78605e15f07c977fd15a4f4b55bd47b65ed52be1"; }; + patches = [ ../development/perl-modules/MooseXAttributeHelpers-perl-5.20.patch ]; buildInputs = [ Moose TestException ]; propagatedBuildInputs = [ Moose ]; meta = { @@ -7924,18 +8022,36 @@ let self = _self // overrides; _self = with self; { }; SQLTranslator = buildPerlPackage rec { - name = "SQL-Translator-0.11006"; + name = "SQL-Translator-0.11020"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz"; - sha256 = "0ifnzap3pgkxvkv2gxpmv02637pfraza5m4zk99braw319ra4mla"; + url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz"; + sha256 = "18mqnppwk1076sxcink5ajk75ysway0bd049hwxvk8md39x0y7ar"; }; propagatedBuildInputs = [ ClassBase ClassDataInheritable ClassMakeMethods DigestSHA1 CarpClan IOStringy ParseRecDescent ClassAccessor DBI FileShareDir XMLWriter YAML TestDifferences TemplateToolkit GraphViz XMLLibXML TestPod TextRecordParser HTMLParser - SpreadsheetParseExcel Graph GD + SpreadsheetParseExcel Graph GD Moo TryTiny PackageVariant ]; + meta = { + platforms = stdenv.lib.platforms.linux; + }; }; + + PackageVariant = buildPerlPackage { + name = "Package-Variant-1.002002"; + src = fetchurl { + url = mirror://cpan/authors/id/H/HA/HAARG/Package-Variant-1.002002.tar.gz; + sha256 = "826780f19522f42c6b3d9f717ab6b5400f198cec08f4aa15b71aef9aa17e9b13"; + }; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ ImportInto ModuleRuntime strictures ]; + meta = { + description = "Parameterizable packages"; + license = "perl"; + }; + }; + Starman = buildPerlModule { name = "Starman-0.4010"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 12f7d8f2fed1..3ec3b6430dda 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -144,6 +144,7 @@ let pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { pythonDBus = self.dbus; + pythonPackages = self; }; pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix { @@ -428,13 +429,13 @@ let apscheduler = buildPythonPackage rec { - name = "APScheduler-2.1.2"; + name = "APScheduler-3.0.1"; - propagatedBuildInputs = with self; [ futures tzlocal six pytest mock]; + propagatedBuildInputs = with self; [ futures tzlocal six pytest mock sqlalchemy9 ]; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/A/APScheduler/APScheduler-2.1.2.tar.gz"; - md5 = "6862959d460c16ef325d63e1fc3a6684"; + url = "https://pypi.python.org/packages/source/A/APScheduler/${name}.tar.gz"; + sha256 = "1dcyk58svhhd7flpq0fbyzcp0z3a1as4ddmdv1rxqvqng0sxhwaf"; }; meta = with pkgs.stdenv.lib; { @@ -522,11 +523,11 @@ let }); astroid = buildPythonPackage (rec { - name = "astroid-1.2.1"; - propagatedBuildInputs = with self; [ logilab_common ]; + name = "astroid-1.3.2"; + propagatedBuildInputs = with self; [ logilab_common six ]; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/a/astroid/${name}.zip"; - md5 = "337017c82a28c97741797493fb2c980f"; + url = "https://pypi.python.org/packages/source/a/astroid/${name}.tar.gz"; + md5 = "2ab96129a977b6eba27765a15d1a9bf2"; }; }); @@ -2033,6 +2034,29 @@ let }; }); + # flexget requires 2.1 + dateutil_2_1 = buildPythonPackage (rec { + name = "dateutil-2.1"; + + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/p/python-dateutil/python-${name}.tar.gz"; + sha256 = "1vlx0lpsxjxz64pz87csx800cwfqznjyr2y7nk3vhmzhkwzyqi2c"; + }; + + propagatedBuildInputs = with self; [ self.six ]; + + preBuild = '' + export LOCALE_ARCHIVE=${localePath} + export LC_ALL="en_US.UTF-8" + ''; + + meta = { + description = "Powerful extensions to the standard datetime module"; + homepage = http://pypi.python.org/pypi/python-dateutil; + license = "BSD-style"; + }; + }); + decorator = buildPythonPackage rec { name = "decorator-3.4.0"; @@ -2197,6 +2221,21 @@ let }; }; + dockerpty = buildPythonPackage rec { + name = "dockerpty-0.3.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/dockerpty/${name}.tar.gz"; + md5 = "1f97b24d2f4b2c345f176f91655002dd"; + }; + + meta = { + description = "Functionality needed to operate the pseudo-tty (PTY) allocated to a docker container"; + homepage = https://github.com/d11wtq/dockerpty; + license = licenses.asl20; + }; + }; + docker_registry_core = buildPythonPackage rec { name = "docker-registry-core-2.0.3"; disabled = isPy3k; @@ -2253,6 +2292,20 @@ let }; }; + docopt = buildPythonPackage rec { + name = "docopt-0.6.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/docopt/${name}.tar.gz"; + md5 = "4bc74561b37fad5d3e7d037f82a4c3b1"; + }; + + meta = { + description = "Pythonic argument parser, that will make you smile"; + homepage = http://docopt.org/; + license = licenses.mit; + }; + }; dogpile_cache = buildPythonPackage rec { name = "dogpile.cache-0.5.4"; @@ -2355,12 +2408,12 @@ let dropbox = buildPythonPackage rec { - name = "dropbox-2.0.0"; - doCheck = !isPy3k; # failures with hash randomization + name = "dropbox-2.2.0"; + doCheck = false; # python 2.7.9 does verify ssl certificates src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/dropbox/${name}.zip"; - sha256 = "1bi2z1lql6ryylfflmizhqn98ab55777vn7n5krhqz40pdcjilkx"; + sha256 = "069jrwb67brqh0sics8fgqdf2mv5y5jl9k5729x8vf80pq2c9p36"; }; propagatedBuildInputs = with self; [ urllib3 mock setuptools ]; @@ -2732,6 +2785,42 @@ let }; }; + jsonpatch = buildPythonPackage rec { + name = "jsonpatch-1.8"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/j/jsonpatch/jsonpatch-1.8.tar.gz"; + sha256 = "0xhp6prvk219vnzixbj231wymd458nqbnmsf5fn4252092prvig5"; + }; + + propagatedBuildInputs = with self; [ six jsonpointer ]; + + meta = { + description = "Apply JSON-Patches (RFC 6902)"; + homepage = "https://github.com/stefankoegl/python-json-patch"; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.all; + }; + }; + + jsonpointer = buildPythonPackage rec { + name = "jsonpointer-1.4"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/j/jsonpointer/jsonpointer-1.4.tar.gz"; + sha256 = "1d0555smqwdbi0nm48hyqzywb9m2jlz5izgv56ll3zk7viz3b7fb"; + }; + + #propagatedBuildInputs = with self; [ six jsonpointer ]; + + meta = { + description = "Identify specific nodes in a JSON document (RFC 6901)"; + homepage = "https://github.com/stefankoegl/python-json-pointer"; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.all; + }; + }; + jsonwatch = buildPythonPackage rec { name = "jsonwatch-0.2.0"; @@ -2852,7 +2941,7 @@ let md5 = "9c4c5a59b878aed78e96a6ae58c6c185"; }; - propagatedBuildInputs = [ pkgs.pyqt4 pkgs.sip pkgs.pkgconfig pkgs.popplerQt4 ]; + propagatedBuildInputs = [ pkgs.pyqt4 pkgs.pkgconfig pkgs.popplerQt4 ]; preBuild = "${python}/bin/${python.executable} setup.py build_ext" + " --include-dirs=${pkgs.popplerQt4}/include/poppler/"; @@ -3475,11 +3564,11 @@ let }; deluge = buildPythonPackage rec { - name = "deluge-1.3.10"; + name = "deluge-1.3.11"; src = pkgs.fetchurl { url = "http://download.deluge-torrent.org/source/${name}.tar.bz2"; - sha256 = "1x8ylcw88a6x3zyvyxmzjsbcy9dr2s5dxam2aw6harb4n1l2v9kd"; + sha256 = "16681sg7yi03jqyifhalnw4vavb8sj94cisldal7nviai8dz9qc3"; }; propagatedBuildInputs = with self; [ @@ -3916,6 +4005,45 @@ let }; }); + fig = buildPythonPackage rec { + name = "fig-1.0.1"; + disabled = isPy3k || isPyPy; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/f/fig/${name}.tar.gz"; + md5 = "e1c82296fe2362fae21b3cb0dfee8cb2"; + }; + + propagatedBuildInputs = with self; [ + six requests2 pyyaml texttable docopt + (dockerpty.override { + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/dockerpty/dockerpty-0.3.2.tar.gz"; + md5 = "1f97b24d2f4b2c345f176f91655002dd"; + }; + }) + (docker.override { + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/docker-py/docker-py-0.5.3.tar.gz"; + md5 = "809b7b8c144f5e37787e72b030ee353f"; + }; + }) + (websocket_client.override { + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/w/websocket-client/websocket-client-0.11.0.tar.gz"; + md5 = "fcffbb5ac10941d9ace416d14d1e3ec8"; + }; + }) + ]; + + doCheck = false; + + meta = { + homepage = http://www.fig.sh/; + description = "Fast, isolated development environments using Docker"; + license = stdenv.lib.licenses.asl20; + }; + }; flake8 = buildPythonPackage (rec { name = "flake8-2.1.0"; @@ -3975,21 +4103,22 @@ let }; flexget = buildPythonPackage rec { - version = "1.2.201"; + version = "1.2.234"; name = "FlexGet-${version}"; disabled = isPy3k; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/F/FlexGet/${name}.tar.gz"; - md5 = "e940845fc38ee602109a876455a02084"; + md5 = "0897b6db25e8a28e809d131a8ad017e4"; }; + doCheck = false; + buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ paver feedparser sqlalchemy pyyaml rpyc + propagatedBuildInputs = with self; [ paver feedparser sqlalchemy9 pyyaml rpyc beautifulsoup4 html5lib pyrss2gen pynzb progressbar jinja2 flask - cherrypy requests dateutil_1_5 jsonschema python_tvrage tmdb3 - guessit pathpy - ] + cherrypy requests dateutil_2_1 jsonschema python_tvrage tmdb3 + guessit pathpy apscheduler ] # enable deluge and transmission plugin support, if they're installed ++ stdenv.lib.optional (pkgs.config.pythonPackages.deluge or false) pythonpackages.deluge @@ -4462,17 +4591,17 @@ let }; guessit = buildPythonPackage rec { - version = "0.9.3"; + version = "0.9.4"; name = "guessit-${version}"; disabled = isPy3k; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/g/guessit/${name}.tar.gz"; - sha256 = "16kbxdz5zm3mfn739ynis04zw76x2gn1lz5d7vcwh8hzaj16yyk6"; + sha256 = "068d3dmyk4v04p2zna0340lsdnpkm10gyza62apd9akgjh9rfs48"; }; propagatedBuildInputs = with self; [ - dateutil_1_5 requests stevedore babelfish pyyaml + dateutil_2_1 requests stevedore babelfish pyyaml ]; # A unicode test fails @@ -5612,6 +5741,23 @@ let }; }; + mutag = buildPythonPackage rec { + disabled = ! isPy3k; + name = "mutag-0.0.1-b1b3ff2ad8"; + src = pkgs.fetchgit { + url = "https://github.com/aroig/mutag.git"; + sha256 = "1x9wl789ib62zmrbjy96jhcbjnym6fb1jvdjiw4smapifm2hnyr7"; + rev = "efc9bc7e1ea345e7bd0568848598de"; + }; + + propagatedBuildInputs = with self; [ pyparsing ]; + + meta = { + homepage = https://github.com/aroig/mutag; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.DamienCassou ]; + }; + }; mutagen = buildPythonPackage (rec { name = "mutagen-1.23"; @@ -6095,6 +6241,22 @@ let }; }; + oauth = buildPythonPackage (rec { + name = "oauth-1.0.1"; + + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/o/oauth/oauth-1.0.1.tar.gz"; + sha256 = "0pdgi35hczsslil4890xqawnbpdazkgf2v1443847h5hy2gq2sg7"; + }; + + meta = { + homepage = "http://code.google.com/p/oauth"; + description = "Library for OAuth version 1.0a."; + license = licenses.mit; + platforms = stdenv.lib.platforms.all; + }; + }); + oauth2 = buildPythonPackage (rec { name = "oauth2-1.5.211"; disabled = isPy3k; @@ -6311,6 +6473,9 @@ let # https://github.com/paramiko/paramiko/issues/449 doCheck = !(isPyPy || isPy33); checkPhase = '' + # test_util needs to resolve an hostname, thus failing when the fw blocks it + sed '/UtilTest/d' -i test.py + ${python}/bin/${python.executable} test.py --no-sftp --no-big-file ''; @@ -6860,6 +7025,27 @@ let }; }; + pycosat = pythonPackages.buildPythonPackage rec { + name = "pycosat-0.6.0"; + + propagatedBuildInputs = with pythonPackages; [ ]; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pycosat/${name}.tar.gz"; + sha256 = "02sdn2998jlrm35smn1530hix3kzwyc1jv49cjdcnvfvrqqi3rww"; + }; + + meta = with stdenv.lib; { + description = ''PicoSAT is a popular SAT solver written by Armin + Biere in pure C. This package provides efficient Python bindings + to picosat on the C level, i.e. when importing pycosat, the + picosat solver becomes part of the Python process itself. For + ease of deployment, the picosat source (namely picosat.c and + picosat.h) is included in this project.''; + homepage = https://github.com/ContinuumIO/pycosat; + license = licenses.mit; + }; + }; pygit2 = buildPythonPackage rec { name = "pygit2-0.21.2"; @@ -7394,8 +7580,11 @@ let pyptlib = buildPythonPackage (rec { name = "pyptlib-${version}"; + disabled = isPyPy || isPy3k; version = "0.0.6"; + doCheck = false; # No such file or directory errors on 32bit + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pyptlib/pyptlib-${version}.tar.gz"; sha256 = "01y6vbwncqb0hxlnin6whd9wrrm5my4qzjhk76fnix78v7ip515r"; @@ -8651,8 +8840,6 @@ let scikitlearn = buildPythonPackage { name = "scikit-learn-0.15.2"; - disabled = isPy3k; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/scikit-learn/scikit-learn-0.15.2.tar.gz"; md5 = "d9822ad0238e17b382a3c756ea94fe0d"; @@ -8714,15 +8901,14 @@ let sha256 = "13aqm0dwy17ghimy7m2mxjwlyc1k7zk5icxzrs1sa896056f1dyy"; }; - preInstall = '' + patchPhase = '' cp "${x_ignore_nofocus}/cpp/linux-specific/"* . - sed -i 's|dlopen(library,|dlopen("libX11.so.6",|' x_ignore_nofocus.c + substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${pkgs.xlibs.libX11}/lib/libX11.so.6" gcc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o gcc -shared \ -Wl,${if stdenv.isDarwin then "-install_name" else "-soname"},x_ignore_nofocus.so \ -o x_ignore_nofocus.so \ - x_ignore_nofocus.o \ - ${if stdenv.isDarwin then "-lx11" else ""} + x_ignore_nofocus.o cp -v x_ignore_nofocus.so py/selenium/webdriver/firefox/${if pkgs.stdenv.is64bit then "amd64" else "x86"}/ ''; }; @@ -9720,6 +9906,21 @@ let }; }; + texttable = self.buildPythonPackage rec { + name = "texttable-0.8.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/t/texttable/${name}.tar.gz"; + md5 = "4fe37704f16ecf424b91e122defedd7e"; + }; + + meta = with stdenv.lib; { + description = "A module to generate a formatted text table, using ASCII characters"; + homepage = http://foutaise.org/code/; + license = licenses.lgpl2; + }; + }; + tmdb3 = buildPythonPackage rec { name = "tmdb3-${version}"; version = "0.6.17"; @@ -11967,12 +12168,12 @@ let }; }; - pythonefl_1_11 = buildPythonPackage rec { + pythonefl_1_12 = buildPythonPackage rec { name = "python-efl-${version}"; - version = "1.11.0"; + version = "1.12.0"; src = pkgs.fetchurl { - url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz"; - sha256 = "1d4hj39alg6j7ah1bc8wvlka9d13i8iy3fxxraik2f60w6811i48"; + url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.gz"; + sha256 = "0rxv5nrqg5c2l93ns2k6gjil1y7qq6amfh5slkarm3kv8fzk17xv"; }; preConfigure = '' export NIX_CFLAGS_COMPILE="-I${pkgs.e19.efl}/include/eo-1 -I${pkgs.e19.efl}/include/eina-1 -I${pkgs.e19.efl}/include/eina-1/eina -I${pkgs.e19.efl}/include/evas-1 -I${self.dbus}/include/dbus-1.0 -I${pkgs.e19.efl}/include/efl-1 -I${pkgs.e19.efl}/include/eet-1 -I${pkgs.e19.efl}/include/ecore-1 -I${pkgs.e19.efl}/include/ecore-evas-1 -I${pkgs.e19.efl}/include/ecore-file-1 -I${pkgs.e19.efl}/include/ecore-input-1 -I${pkgs.e19.efl}/include/ecore-imf-1 -I${pkgs.e19.efl}/include/ecore-con-1 -I${pkgs.e19.efl}/include/edje-1 -I${pkgs.e19.efl}/include/eldbus-1 -I${pkgs.e19.efl}/include/efreet-1 -I${pkgs.e19.efl}/include/ethumb-client-1 -I${pkgs.e19.efl}/include/ethumb-1 -I${pkgs.e19.efl}/include/ecore-x-1 $NIX_CFLAGS_COMPILE" @@ -12082,7 +12283,7 @@ let }; propagatedBuildInputs = with self; [ boto-230 crcmod httplib2 gcs-oauth2-boto-plugin google_api_python_client gflags - retry_decorator pkgs.pyopenssl socksipy-branch ]; + retry_decorator pkgs.pyopenssl socksipy-branch crcmod ]; }; pypi2nix = self.buildPythonPackage rec { |