diff options
208 files changed, 3525 insertions, 3226 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix index 0086bd63ebd..2262ae9ebbc 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -79,6 +79,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = ''Beerware License''; }; + bsd0 = spdx { + spdxId = "0BSD"; + fullName = "BSD Zero Clause License"; + }; + bsd2 = spdx { spdxId = "BSD-2-Clause"; fullName = ''BSD 2-clause "Simplified" License''; @@ -482,6 +487,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "PostgreSQL License"; }; + postman = { + fullName = "Postman EULA"; + url = https://www.getpostman.com/licenses/postman_base_app; + free = false; + }; + psfl = spdx { spdxId = "Python-2.0"; fullName = "Python Software Foundation License version 2"; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index b73a2854c78..afbe5a95508 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -47,6 +47,7 @@ andir = "Andreas Rammhold <andreas@rammhold.de>"; andres = "Andres Loeh <ksnixos@andres-loeh.de>"; andrestylianos = "Andre S. Ramos <andre.stylianos@gmail.com>"; + andrew-d = "Andrew Dunham <andrew@du.nham.ca>"; andrewrk = "Andrew Kelley <superjoe30@gmail.com>"; andsild = "Anders Sildnes <andsild@gmail.com>"; aneeshusa = "Aneesh Agrawal <aneeshusa@gmail.com>"; @@ -492,6 +493,7 @@ nicknovitski = "Nick Novitski <nixpkgs@nicknovitski.com>"; nico202 = "Nicolò Balzarotti <anothersms@gmail.com>"; NikolaMandic = "Ratko Mladic <nikola@mandic.email>"; + nipav = "Niko Pavlinek <niko.pavlinek@gmail.com>"; nixy = "Andrew R. M. <nixy@nixy.moe>"; nmattia = "Nicolas Mattia <nicolas@nmattia.com>"; nocoolnametom = "Tom Doggett <nocoolnametom@gmail.com>"; @@ -552,7 +554,7 @@ pradeepchhetri = "Pradeep Chhetri <pradeep.chhetri89@gmail.com>"; prikhi = "Pavan Rikhi <pavan.rikhi@gmail.com>"; primeos = "Michael Weiss <dev.primeos@gmail.com>"; - profpatsch = "Profpatsch <mail@profpatsch.de>"; + Profpatsch = "Profpatsch <mail@profpatsch.de>"; proglodyte = "Proglodyte <proglodyte23@gmail.com>"; pshendry = "Paul Hendry <paul@pshendry.com>"; psibi = "Sibi <sibi@psibi.in>"; @@ -715,6 +717,7 @@ utdemir = "Utku Demir <me@utdemir.com>"; #urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>"; inactive since 2012 uwap = "uwap <me@uwap.name>"; + va1entin = "Valentin Heidelberger <github@valentinsblog.com>"; vaibhavsagar = "Vaibhav Sagar <vaibhavsagar@gmail.com>"; valeriangalliat = "Valérian Galliat <val@codejam.info>"; vandenoever = "Jos van den Oever <jos@vandenoever.info>"; @@ -762,6 +765,7 @@ y0no = "Yoann Ono <y0no@y0no.fr>"; yarr = "Dmitry V. <savraz@gmail.com>"; yegortimoshenko = "Yegor Timoshenko <yegortimoshenko@gmail.com>"; + yesbox = "Jesper Geertsen Jonsson <jesper.geertsen.jonsson@gmail.com>"; ylwghst = "Burim Augustin Berisa <ylwghst@onionmail.info>"; yochai = "Yochai <yochai@titat.info>"; yorickvp = "Yorick van Pelt <yorickvanpelt@gmail.com>"; diff --git a/lib/options.nix b/lib/options.nix index e10c86dd506..9446eca3677 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -85,6 +85,7 @@ rec { concatMap (opt: let docOption = rec { + loc = opt.loc; name = showOption opt.loc; description = opt.description or (throw "Option `${name}' has no description."); declarations = filter (x: x != unknownModule) opt.declarations; diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 66fa4f0ba43..bbe82066aa0 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -63,18 +63,17 @@ let stripAnyPrefixes = lib.flip (lib.fold lib.removePrefix) prefixesToStrip; # Custom "less" that pushes up all the things ending in ".enable*" - # and ".package" - optionListLess = a: b: + # and ".package*" + optionLess = a: b: let - splt = lib.splitString "."; ise = lib.hasPrefix "enable"; isp = lib.hasPrefix "package"; cmp = lib.splitByAndCompare ise lib.compare (lib.splitByAndCompare isp lib.compare lib.compare); - in lib.compareLists cmp (splt a) (splt b) < 0; + in lib.compareLists cmp a.loc b.loc < 0; # Customly sort option list for the man page. - optionsList = lib.sort (a: b: optionListLess a.name b.name) optionsListDesc; + optionsList = lib.sort optionLess optionsListDesc; # Convert the list of options into an XML file. optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList); diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 9121c21a869..f2a1bde19c7 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -38,6 +38,10 @@ has the following highlights: </para> </itemizedlist> </para> </listitem> + + <listitem> + <para>PHP now defaults to PHP 7.2</para> + </listitem> </itemizedlist> </section> @@ -207,6 +211,12 @@ following incompatible changes:</para> </listitem> </itemizedlist> </listitem> + <listitem> + <para> + The <literal>jid</literal> package has been removed, due to maintenance + overhead of a go package having non-versioned dependencies. + </para> + </listitem> </itemizedlist> </section> diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index cf213d906f5..ddab23cce39 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -29,7 +29,7 @@ rec { cp ${./test-driver/Logger.pm} $libDir/Logger.pm wrapProgram $out/bin/nixos-test-driver \ - --prefix PATH : "${lib.makeBinPath [ qemu vde2 netpbm coreutils ]}" \ + --prefix PATH : "${lib.makeBinPath [ qemu_test vde2 netpbm coreutils ]}" \ --prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl" ''; }; diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixos/modules/services/monitoring/prometheus/alertmanager.nix index cf761edad92..8a47c9f1e7d 100644 --- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix +++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix @@ -111,11 +111,11 @@ in { after = [ "network.target" ]; script = '' ${pkgs.prometheus-alertmanager.bin}/bin/alertmanager \ - -config.file ${alertmanagerYml} \ - -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ - -log.level ${cfg.logLevel} \ - ${optionalString (cfg.webExternalUrl != null) ''-web.external-url ${cfg.webExternalUrl} \''} - ${optionalString (cfg.logFormat != null) "-log.format ${cfg.logFormat}"} + --config.file ${alertmanagerYml} \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --log.level ${cfg.logLevel} \ + ${optionalString (cfg.webExternalUrl != null) ''--web.external-url ${cfg.webExternalUrl} \''} + ${optionalString (cfg.logFormat != null) "--log.format ${cfg.logFormat}"} ''; serviceConfig = { diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix index 1a7a1e24b70..c25bd0fdc54 100644 --- a/nixos/modules/services/networking/bird.nix +++ b/nixos/modules/services/networking/bird.nix @@ -7,21 +7,27 @@ let let cfg = config.services.${variant}; pkg = pkgs.${variant}; + birdBin = if variant == "bird6" then "bird6" else "bird"; birdc = if variant == "bird6" then "birdc6" else "birdc"; + descr = + { bird = "1.9.x with IPv4 suport"; + bird6 = "1.9.x with IPv6 suport"; + bird2 = "2.x"; + }.${variant}; configFile = pkgs.stdenv.mkDerivation { name = "${variant}.conf"; text = cfg.config; preferLocalBuild = true; buildCommand = '' echo -n "$text" > $out - ${pkg}/bin/${variant} -d -p -c $out + ${pkg}/bin/${birdBin} -d -p -c $out ''; }; in { ###### interface options = { services.${variant} = { - enable = mkEnableOption "BIRD Internet Routing Daemon"; + enable = mkEnableOption "BIRD Internet Routing Daemon (${descr})"; config = mkOption { type = types.lines; description = '' @@ -36,12 +42,12 @@ let config = mkIf cfg.enable { environment.systemPackages = [ pkg ]; systemd.services.${variant} = { - description = "BIRD Internet Routing Daemon"; + description = "BIRD Internet Routing Daemon (${descr})"; wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "forking"; Restart = "on-failure"; - ExecStart = "${pkg}/bin/${variant} -c ${configFile} -u ${variant} -g ${variant}"; + ExecStart = "${pkg}/bin/${birdBin} -c ${configFile} -u ${variant} -g ${variant}"; ExecReload = "${pkg}/bin/${birdc} configure"; ExecStop = "${pkg}/bin/${birdc} down"; CapabilityBoundingSet = [ "CAP_CHOWN" "CAP_FOWNER" "CAP_DAC_OVERRIDE" "CAP_SETUID" "CAP_SETGID" @@ -56,14 +62,15 @@ let users = { extraUsers.${variant} = { description = "BIRD Internet Routing Daemon user"; - group = "${variant}"; + group = variant; }; extraGroups.${variant} = {}; }; }; }; - inherit (config.services) bird bird6; -in { - imports = [(generic "bird") (generic "bird6")]; +in + +{ + imports = map generic [ "bird" "bird6" "bird2" ]; } diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix index d0c19c4ecb7..aac02b811d7 100644 --- a/nixos/modules/services/networking/kresd.nix +++ b/nixos/modules/services/networking/kresd.nix @@ -46,6 +46,15 @@ in What addresses the server should listen on. (UDP+TCP 53) ''; }; + listenTLS = mkOption { + type = with types; listOf str; + default = []; + example = [ "198.51.100.1:853" "[2001:db8::1]:853" "853" ]; + description = '' + Addresses on which kresd should provide DNS over TLS (see RFC 7858). + For detailed syntax see ListenStream in man systemd.socket. + ''; + }; # TODO: perhaps options for more common stuff like cache size or forwarding }; @@ -75,6 +84,18 @@ in socketConfig.FreeBind = true; }; + systemd.sockets.kresd-tls = mkIf (cfg.listenTLS != []) rec { + wantedBy = [ "sockets.target" ]; + before = wantedBy; + partOf = [ "kresd.socket" ]; + listenStreams = cfg.listenTLS; + socketConfig = { + FileDescriptorName = "tls"; + FreeBind = true; + Service = "kresd.service"; + }; + }; + systemd.sockets.kresd-control = rec { wantedBy = [ "sockets.target" ]; before = wantedBy; @@ -97,6 +118,8 @@ in Type = "notify"; WorkingDirectory = cfg.cacheDir; Restart = "on-failure"; + Sockets = [ "kresd.socket" "kresd-control.socket" ] + ++ optional (cfg.listenTLS != []) "kresd-tls.socket"; }; # Trust anchor goes from dns-root-data by default. diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 460c9da7ac3..877bd26a5c1 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -16,13 +16,13 @@ with stdenv.lib.strings; let - version = "2.5.10"; + version = "2.5.21"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; - rev = "v${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "0sjhy7axa2dj1977iz6zmqvz9qzalcfnrx2fqx3xmk9hly847d6z"; + rev = "${version}"; + sha256 = "1kfrcfhpzkpjxsrvgwmc2valgwfb4b7gfwwnlnjq6f6dp56yflpz"; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index fd3d0b35729..144e1fa566c 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, poppler_qt4, qmake4Hook }: +{ stdenv, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler_qt5 }: stdenv.mkDerivation rec { version = "2.1.3"; @@ -9,13 +9,19 @@ stdenv.mkDerivation rec { sha256 = "0cr468fi0d512jjj23r5flfzx957vibc9c25gwwhi0d773h2w566"; }; - patches = [ ./fix_path_poppler_qt4.patch ]; + patches = [ + (fetchpatch { + url = https://raw.githubusercontent.com/gentoo/gentoo/9b971631588ff46e7c2d501bc35cd0d9ce2d98e2/app-text/diffpdf/files/diffpdf-2.1.3-qt5.patch; + sha256 = "0sax8gcqcmzf74hmdr3rarqs4nsxmml9qmh6pqyjmgl3lypxhafg"; + }) + ./fix_path_poppler_qt5.patch + ]; - buildInputs = [ qt4 poppler_qt4 ]; - nativeBuildInputs = [ qmake4Hook ]; + nativeBuildInputs = [ qmake qttools ]; + buildInputs = [ qtbase poppler_qt5 ]; preConfigure = '' - substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT4@@ ${poppler_qt4.dev} + substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${poppler_qt5.dev} lrelease diffpdf.pro ''; diff --git a/pkgs/applications/misc/diffpdf/fix_path_poppler_qt4.patch b/pkgs/applications/misc/diffpdf/fix_path_poppler_qt5.patch index e72cad8b7a2..9535ea2c6b0 100644 --- a/pkgs/applications/misc/diffpdf/fix_path_poppler_qt4.patch +++ b/pkgs/applications/misc/diffpdf/fix_path_poppler_qt5.patch @@ -2,15 +2,15 @@ diff -uNr diffpdf-2.1.3/diffpdf.pro diffpdf-2.1.3-new/diffpdf.pro --- diffpdf-2.1.3/diffpdf.pro 2013-10-15 09:01:22.000000000 +0200 +++ diffpdf-2.1.3-new/diffpdf.pro 2015-07-07 23:13:36.445572148 +0200 @@ -47,9 +47,9 @@ - INCLUDEPATH += /c/poppler_lib/include/poppler/qt4 + INCLUDEPATH += /c/poppler_lib/include/poppler/qt5 LIBS += -Wl,-rpath -Wl,/c/poppler_lib/bin -Wl,-L/c/poppler_lib/bin } else { -- exists(/usr/include/poppler/qt4) { +- exists(/usr/include/poppler/qt5) { - INCLUDEPATH += /usr/include/poppler/cpp -- INCLUDEPATH += /usr/include/poppler/qt4 -+ exists(@@NIX_POPPLER_QT4@@/include/poppler/qt4) { -+ INCLUDEPATH += @@NIX_POPPLER_QT4@@/include/poppler/cpp -+ INCLUDEPATH += @@NIX_POPPLER_QT4@@/include/poppler/qt4 +- INCLUDEPATH += /usr/include/poppler/qt5 ++ exists(@@NIX_POPPLER_QT5@@/include/poppler/qt5) { ++ INCLUDEPATH += @@NIX_POPPLER_QT5@@/include/poppler/cpp ++ INCLUDEPATH += @@NIX_POPPLER_QT5@@/include/poppler/qt5 } else { INCLUDEPATH += /usr/local/include/poppler/cpp - INCLUDEPATH += /usr/local/include/poppler/qt4 + INCLUDEPATH += /usr/local/include/poppler/qt5 diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix index 3729978dddb..36527cdbe7c 100644 --- a/pkgs/applications/misc/lilyterm/default.nix +++ b/pkgs/applications/misc/lilyterm/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; homepage = http://lilyterm.luna.com.tw/; license = licenses.gpl3; - maintainers = with maintainers; [ AndersonTorres profpatsch ]; + maintainers = with maintainers; [ AndersonTorres Profpatsch ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index bc909742c6d..763435da564 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -1,8 +1,9 @@ -{ mkDerivation, stdenv, lib, fetchFromGitHub, procps ? null +{ mkDerivation, stdenv, lib, fetchFromGitHub, fetchpatch, procps ? null , qtbase, qtwebengine, qtwebkit , cmake , syncthing, syncthing-inotify ? null -, preferQWebView ? false }: +, preferQWebView ? false +, preferNative ? true }: mkDerivation rec { version = "0.5.8"; @@ -16,11 +17,18 @@ mkDerivation rec { }; buildInputs = [ qtbase qtwebengine ] ++ lib.optional preferQWebView qtwebkit; + nativeBuildInputs = [ cmake ]; - cmakeFlags = lib.optional preferQWebView "-DQST_BUILD_WEBKIT=1"; + cmakeFlags = [ ] + ++ lib.optional preferQWebView "-DQST_BUILD_WEBKIT=1" + ++ lib.optional preferNative "-DQST_BUILD_NATIVEBROWSER=1"; - patches = [ ./qsyncthingtray-0.5.8-qt-5.6.3.patch ]; + patches = [ (fetchpatch { + name = "support_native_browser.patch"; + url = "https://patch-diff.githubusercontent.com/raw/sieren/QSyncthingTray/pull/225.patch"; + sha256 = "0w665xdlsbjxs977pdpzaclxpswf7xys1q3rxriz181lhk2y66yy"; + }) ] ++ lib.optional (!preferQWebView && !preferNative) ./qsyncthingtray-0.5.8-qt-5.6.3.patch; postPatch = '' ${lib.optionalString stdenv.isLinux '' @@ -60,6 +68,8 @@ mkDerivation rec { maintainers = with maintainers; [ zraexy peterhoeg ]; platforms = platforms.all; # 0.5.7 segfaults when opening the main panel with qt 5.7 and fails to compile with qt 5.8 - broken = builtins.compareVersions qtbase.version "5.7.0" >= 0; + # but qt > 5.6 works when only using the native browser + # https://github.com/sieren/QSyncthingTray/issues/223 + broken = (builtins.compareVersions qtbase.version "5.7.0" >= 0 && !preferNative); }; } diff --git a/pkgs/applications/misc/yokadi/default.nix b/pkgs/applications/misc/yokadi/default.nix new file mode 100644 index 00000000000..dec861009eb --- /dev/null +++ b/pkgs/applications/misc/yokadi/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, buildPythonApplication, dateutil, + sqlalchemy, setproctitle, icalendar, pycrypto }: + +buildPythonApplication rec { + pname = "yokadi"; + version = "1.1.1"; + + src = fetchurl { + url = "https://yokadi.github.io/download/${pname}-${version}.tar.bz2"; + sha256 = "af201da66fd3a8435b2ccd932082ab9ff13f5f2e3d6cd3624f1ab81c577aaf17"; + }; + + propagatedBuildInputs = [ + dateutil + sqlalchemy + setproctitle + icalendar + pycrypto + ]; + + # Yokadi doesn't have any tests + doCheck = false; + + meta = with stdenv.lib; { + description = "A command line oriented, sqlite powered, todo-list"; + homepage = https://yokadi.github.io/index.html; + license = licenses.gpl3Plus; + maintainers = [ maintainers.nipav ]; + }; +} diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 91b86a18375..69e935d7876 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -59,7 +59,7 @@ , enableOfficialBranding ? true }: -assert stdenv.cc ? libc && stdenv.cc.libc != null; +assert stdenv.cc.libc or null != null; let flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")]; @@ -100,29 +100,25 @@ stdenv.mkDerivation (rec { rm -f configure rm -f js/src/configure rm -f .mozconfig* + '' + (if lib.versionAtLeast version "58" + # this will run autoconf213 + then '' + configureScript="$(realpath ./mach) configure" + '' else '' + make -f client.mk configure-files + configureScript="$(realpath ./configure)" + '') + '' + cxxLib=$( echo -n ${gcc}/include/c++/* ) + archLib=$cxxLib/$( ${gcc}/bin/gcc -dumpmachine ) - '' + lib.optionalString (stdenv.lib.versionAtLeast version "58.0.0") '' - cat >.mozconfig <<END_MOZCONFIG - ${lib.concatStringsSep "\n" (map (flag: "ac_add_options ${flag}") configureFlags)} - ${lib.optionalString googleAPISupport "ac_add_options --with-google-api-keyfile=$TMPDIR/ga"} - END_MOZCONFIG + test -f layout/style/ServoBindings.toml && sed -i -e '/"-DMOZ_STYLO"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml '' + lib.optionalString googleAPISupport '' # Google API key used by Chromium and Firefox. # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, # please get your own set of keys. echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" > $TMPDIR/ga configureFlagsArray+=("--with-google-api-keyfile=$TMPDIR/ga") - '' + '' - # this will run autoconf213 - ${if (stdenv.lib.versionAtLeast version "58.0.0") then "./mach configure" else "make -f client.mk configure-files"} - - configureScript="$(realpath ./configure)" - - cxxLib=$( echo -n ${gcc}/include/c++/* ) - archLib=$cxxLib/$( ${gcc}/bin/gcc -dumpmachine ) - - test -f layout/style/ServoBindings.toml && sed -i -e '/"-DMOZ_STYLO"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml - + '' + lib.optionalString (lib.versionOlder version "58") '' cd obj-* ''; @@ -150,12 +146,12 @@ stdenv.mkDerivation (rec { "--disable-gconf" "--enable-default-toolkit=cairo-gtk${if gtk3Support then "3" else "2"}" ] - ++ lib.optionals (stdenv.lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [ + ++ lib.optionals (lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [ # on i686-linux: --with-libclang-path is not available in this configuration "--with-libclang-path=${llvmPackages.libclang}/lib" "--with-clang-path=${llvmPackages.clang}/bin/clang" ] - ++ lib.optionals (stdenv.lib.versionAtLeast version "57") [ + ++ lib.optionals (lib.versionAtLeast version "57") [ "--enable-webrender=build" ] @@ -196,6 +192,16 @@ stdenv.mkDerivation (rec { ++ lib.optional enableOfficialBranding "--enable-official-branding" ++ extraConfigureFlags; + # Before 58 we have to run `make -f client.mk configure-files` at + # the top level, and then run `./configure` in the obj-* dir (see + # above), but in 58 we have to instead run `./mach configure` at the + # top level and then run `make` in obj-*. (We can also run the + # `make` at the top level in 58, but then we would have to `cd` to + # `make install` anyway. This is ugly, but simple.) + postConfigure = lib.optionalString (lib.versionAtLeast version "58") '' + cd obj-* + ''; + preBuild = lib.optionalString (enableOfficialBranding && isTorBrowserLike) '' buildFlagsArray=("MOZ_APP_DISPLAYNAME=Tor Browser") ''; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 61954492580..4cb997031cf 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -99,44 +99,42 @@ rec { in rec { - tor-browser-6-5 = common (rec { + tor-browser-7-0 = common (rec { pname = "tor-browser"; - version = "6.5.2"; + version = "7.0.1"; isTorBrowserLike = true; - extraConfigureFlags = [ "--disable-loop" ]; # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { owner = "SLNOS"; - repo = "tor-browser"; - # branch "tor-browser-45.8.0esr-6.5-2-slnos" - rev = "e4140ea01b9906934f0347e95f860cec207ea824"; - sha256 = "0a1qk3a9a3xxrl56bp4zbknbchv5x17k1w5kgcf4j3vklcv6av60"; + repo = "tor-browser"; + # branch "tor-browser-52.5.0esr-7.0-1-slnos"; + rev = "830ff8d622ef20345d83f386174f790b0fc2440d"; + sha256 = "169mjkr0bp80yv9nzza7kay7y2k03lpnx71h4ybcv9ygxgzdgax5"; }; - } // commonAttrs) { - stdenv = overrideCC stdenv gcc5; - ffmpegSupport = false; - gssSupport = false; - }; - tor-browser-7-0 = common (rec { + patches = + [ ./env_var_for_system_dir.patch ]; + } // commonAttrs) {}; + + tor-browser-7-5 = common (rec { pname = "tor-browser"; - version = "7.0.1"; + version = "7.5.2"; isTorBrowserLike = true; # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { owner = "SLNOS"; repo = "tor-browser"; - # branch "tor-browser-52.5.0esr-7.0-1-slnos"; - rev = "830ff8d622ef20345d83f386174f790b0fc2440d"; - sha256 = "169mjkr0bp80yv9nzza7kay7y2k03lpnx71h4ybcv9ygxgzdgax5"; + # branch "tor-browser-52.6.2esr-7.5-2-slnos"; + rev = "cf1a504aaa26af962ae909a3811c0038db2d2eec"; + sha256 = "0llbk7skh1n7yj137gv7rnxfasxsnvfjp4ss7h1fbdnw19yba115"; }; patches = [ ./env_var_for_system_dir.patch ]; } // commonAttrs) {}; - tor-browser = tor-browser-7-0; + tor-browser = tor-browser-7-5; }) diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix index 93ff39bde64..62fe4e2e662 100644 --- a/pkgs/applications/networking/droopy/default.nix +++ b/pkgs/applications/networking/droopy/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Mini Web server that let others upload files to your computer"; homepage = http://stackp.online.fr/droopy; license = licenses.bsd3; - maintainers = [ maintainers.profpatsch ]; + maintainers = [ maintainers.Profpatsch ]; }; } diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix index 99517b478c3..017f9c0c95a 100644 --- a/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -24,6 +24,6 @@ buildPythonApplication rec { description = "A tool that converts RSS/Atom newsfeeds to email."; homepage = https://pypi.python.org/pypi/rss2email; license = licenses.gpl2; - maintainers = with maintainers; [ jb55 profpatsch ]; + maintainers = with maintainers; [ jb55 Profpatsch ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 55187f33598..e0aecd2c810 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -1,29 +1,33 @@ { stdenv, fetchurl, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp , zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, libsoup, udev -, ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip +, ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip, bzrtp , mediastreamer-openh264, bctoolbox, makeWrapper, fetchFromGitHub, cmake , libmatroska, bcunit, doxygen, gdk_pixbuf, glib, cairo, pango, polarssl +, python, graphviz, belcard }: stdenv.mkDerivation rec { baseName = "linphone"; - version = "3.10.2"; + version = "3.12.0"; name = "${baseName}-${version}"; src = fetchFromGitHub { owner = "BelledonneCommunications"; repo = "${baseName}"; rev = "${version}"; - sha256 = "053gad4amdbq5za8f2n9j5q59nkky0w098zbsa3dvpcqvv7ar16p"; + sha256 = "0az2ywrpx11sqfb4s4r2v726avcjf4k15bvrqj7xvhz7hdndmh0j"; }; buildInputs = [ readline openldap cyrus_sasl libupnp zlib libxml2 gtk2 libnotify speex ffmpeg libX11 polarssl libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip - bctoolbox libmatroska bcunit gdk_pixbuf glib cairo pango + bctoolbox libmatroska bcunit gdk_pixbuf glib cairo pango bzrtp belcard ]; - nativeBuildInputs = [ intltool pkgconfig makeWrapper cmake doxygen ]; + nativeBuildInputs = [ + intltool pkgconfig makeWrapper cmake doxygen graphviz + (python.withPackages (ps: [ ps.pystache ps.six ])) + ]; NIX_CFLAGS_COMPILE = " -Wno-error -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include -I${gtk2.dev}/include/gtk-2.0/ diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 92960e38123..ea887454815 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "0.13.3"; + version = "0.13.5"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "0acim3kad6lv5ni4blg75phb3njyk9s5h6x7fsn151h1pvsc5mmw"; + sha256 = "1ap62ksi3dg7qijxxysjpnlmngzgh2jdldvb8s1jx14avanccch6"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index b7dfdb3e341..ea2030e964b 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { name = "teamspeak-client-${version}"; - version = "3.1.7"; + version = "3.1.8"; src = fetchurl { urls = [ @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run" ]; sha256 = if stdenv.is64bit - then "1ww20805b7iphkh1ra3py6f7l7s321cg70sfl9iw69n05l3313fn" - else "0yvhmbhliraakn9k4bij6rnai7hn50g4z6mfjsyliizf6437x4nr"; + then "0yav71sfklqg2k3ayd0bllsixd486l0587s5ygjlc9gnchw3zg6z" + else "1agf6jf5hkyxazxqcnvcjfb263p5532ahi7h4rkifnnvqay36v5i"; }; # grab the plugin sdk for the desktop icon @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { free = false; }; maintainers = [ stdenv.lib.maintainers.lhvwb ]; - platforms = stdenv.lib.platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix index 29026ccdc5a..77a8d57f8b6 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { description = "Telegram client forked from sigram"; homepage = http://aseman.co/en/products/cutegram/; license = licenses.gpl3; - maintainers = with maintainers; [ profpatsch AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; }; } -#TODO: appindicator, for system tray plugin (by @profpatsch) +#TODO: appindicator, for system tray plugin diff --git a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix index ec2e65dc499..49368da708e 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "A fork of libqtelegram by Aseman, using qmake"; homepage = src.meta.homepage; license = licenses.gpl3; - maintainers = [ maintainers.profpatsch ]; + maintainers = [ maintainers.Profpatsch ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix index c8d24c9b28c..0efa7bee1d0 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Telegram API tools for QtQml and Qml"; homepage = src.meta.homepage; license = licenses.gpl3; - maintainers = [ maintainers.profpatsch ]; + maintainers = [ maintainers.Profpatsch ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/0001-notmuch-0.25-compatibility-fix.patch b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/0001-notmuch-0.25-compatibility-fix.patch deleted file mode 100644 index be094c9a397..00000000000 --- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/0001-notmuch-0.25-compatibility-fix.patch +++ /dev/null @@ -1,44 +0,0 @@ -From a736c0dfd22cd4ab0da86c30a664c91843df1b98 Mon Sep 17 00:00:00 2001 -From: Adam Ruzicka <a.ruzicka@outlook.com> -Date: Sat, 29 Jul 2017 12:16:29 +0200 -Subject: [PATCH] notmuch-0.25 compatibility fix - ---- - notmuch-addrlookup.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/notmuch-addrlookup.c b/notmuch-addrlookup.c -index c5cf5b4..a95ded0 100644 ---- a/notmuch-addrlookup.c -+++ b/notmuch-addrlookup.c -@@ -171,6 +171,13 @@ create_queries (notmuch_database_t *db, - count += tmp; - if (notmuch_query_count_messages_st (queries[1], &tmp) == NOTMUCH_STATUS_SUCCESS) - count += tmp; -+#elif LIBNOTMUCH_MAJOR_VERSION >= 5 -+ unsigned int count = 0; -+ unsigned int tmp; -+ if (notmuch_query_count_messages (queries[0], &tmp) == NOTMUCH_STATUS_SUCCESS) -+ count += tmp; -+ if (notmuch_query_count_messages (queries[1], &tmp) == NOTMUCH_STATUS_SUCCESS) -+ count += tmp; - #else - unsigned int count = notmuch_query_count_messages (queries[0]) - + notmuch_query_count_messages (queries[1]); -@@ -233,6 +240,13 @@ run_queries (notmuch_database_t *db, - #if LIBNOTMUCH_MAJOR_VERSION >= 4 && LIBNOTMUCH_MINOR_VERSION >= 3 - if (notmuch_query_search_messages_st (queries[i], &messages) != NOTMUCH_STATUS_SUCCESS) - continue; -+#elif LIBNOTMUCH_MAJOR_VERSION >= 5 -+ unsigned int count = 0; -+ unsigned int tmp; -+ if (notmuch_query_count_messages (queries[0], &tmp) == NOTMUCH_STATUS_SUCCESS) -+ count += tmp; -+ if (notmuch_query_count_messages (queries[1], &tmp) == NOTMUCH_STATUS_SUCCESS) -+ count += tmp; - #else - if (!(messages = notmuch_query_search_messages (queries[i]))) - continue; --- -2.13.3 - diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix index f5d48d03c96..c2cce227576 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix @@ -1,32 +1,28 @@ { stdenv, fetchFromGitHub, pkgconfig, glib, notmuch }: +let + version = "9"; +in stdenv.mkDerivation rec { name = "notmuch-addrlookup-${version}"; - version = "7"; src = fetchFromGitHub { owner = "aperezdc"; repo = "notmuch-addrlookup-c"; rev ="v${version}"; - sha256 = "0mz0llf1ggl1k46brgrqj3i8qlg1ycmkc5a3a0kg8fg4s1c1m6xk"; + sha256 = "1j3zdx161i1x4w0nic14ix5i8hd501rb31daf8api0k8855sx4rc"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib notmuch ]; - # Required until notmuch-addrlookup can be compiled against notmuch >= 0.25 - patches = [ ./0001-notmuch-0.25-compatibility-fix.patch ]; - - installPhase = '' - mkdir -p "$out/bin" - cp notmuch-addrlookup "$out/bin" - ''; + installPhase = "install -D notmuch-addrlookup $out/bin/notmuch-addrlookup"; meta = with stdenv.lib; { description = "Address lookup tool for Notmuch in C"; homepage = https://github.com/aperezdc/notmuch-addrlookup-c; maintainers = with maintainers; [ mog garbas ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mit; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index 6fb9f5e36f1..d8104995152 100644 --- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -41,6 +41,6 @@ buildRustPackage rec { inherit (src.meta) homepage; description = "Decentralized Issue Tracking for git"; license = licenses.gpl2; - maintainers = with maintainers; [ profpatsch matthiasbeyer ]; + maintainers = with maintainers; [ Profpatsch matthiasbeyer ]; }; } diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index d39c8140010..a34afbab55e 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { name = "smartgithg-${version}"; - version = "17_1_1"; + version = "17_1_4"; src = fetchurl { - url = "http://www.syntevo.com/static/smart/download/smartgit/smartgit-linux-${version}.tar.gz"; - sha256 = "1zc1cs9gxv9498jp1nhi9z70dv9dzv0yh5f3bd89wi5zvcwly3d0"; + url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${version}.tar.gz"; + sha256 = "1x8s1mdxg7m3fy3izgnb1smrn4ng3q31x0sqnjlchkb5vx7gp5rh"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix index d8f18f97ad9..cf77e3dfe66 100644 --- a/pkgs/applications/video/mpv/scripts/convert.nix +++ b/pkgs/applications/video/mpv/scripts/convert.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { description = "Convert parts of a video while you are watching it in mpv"; homepage = https://gist.github.com/Zehkul/25ea7ae77b30af959be0; - maintainers = [ lib.maintainers.profpatsch ]; + maintainers = [ lib.maintainers.Profpatsch ]; longDescription = '' When this script is loaded into mpv, you can hit Alt+W to mark the beginning and Alt+W again to mark the end of the clip. Then a settings window opens. diff --git a/pkgs/build-support/emacs/buffer.nix b/pkgs/build-support/emacs/buffer.nix index 75e660d0214..550163ddd69 100644 --- a/pkgs/build-support/emacs/buffer.nix +++ b/pkgs/build-support/emacs/buffer.nix @@ -4,7 +4,8 @@ { lib, writeText, inherit-local }: rec { - withPackages = pkgs: let + withPackages = pkgs': let + pkgs = builtins.filter (x: x != null) pkgs'; extras = map (x: x.emacsBufferSetup pkgs) (builtins.filter (builtins.hasAttr "emacsBufferSetup") pkgs); in writeText "dir-locals.el" '' (require 'inherit-local "${inherit-local}/share/emacs/site-lisp/elpa/inherit-local-${inherit-local.version}/inherit-local.elc") diff --git a/pkgs/build-support/setup-hooks/gog-unpack.sh b/pkgs/build-support/setup-hooks/gog-unpack.sh new file mode 100644 index 00000000000..559b543fadf --- /dev/null +++ b/pkgs/build-support/setup-hooks/gog-unpack.sh @@ -0,0 +1,11 @@ +unpackPhase="unpackGog" + +unpackGog() { + runHook preUnpackGog + + innoextract --silent --extract --exclude-temp "${src}" + + find . -depth -print -execdir rename -f 'y/A-Z/a-z/' '{}' \; + + runHook postUnpackGog +} diff --git a/pkgs/data/documentation/bgnet/default.nix b/pkgs/data/documentation/bgnet/default.nix index e205129db19..51ebe704bea 100644 --- a/pkgs/data/documentation/bgnet/default.nix +++ b/pkgs/data/documentation/bgnet/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = https://beej.us/guide/bgnet/; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ profpatsch ]; + maintainers = with lib.maintainers; [ Profpatsch ]; }; } diff --git a/pkgs/data/documentation/mustache-spec/default.nix b/pkgs/data/documentation/mustache-spec/default.nix index 5659cac6703..08690b7cecf 100644 --- a/pkgs/data/documentation/mustache-spec/default.nix +++ b/pkgs/data/documentation/mustache-spec/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = http://mustache.github.io/; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ profpatsch ]; + maintainers = with lib.maintainers; [ Profpatsch ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/data/fonts/fira-code/symbols.nix b/pkgs/data/fonts/fira-code/symbols.nix index c19fbccb142..624616bdd58 100644 --- a/pkgs/data/fonts/fira-code/symbols.nix +++ b/pkgs/data/fonts/fira-code/symbols.nix @@ -20,7 +20,7 @@ fetchzip { See https://github.com/tonsky/FiraCode/issues/211. ''; license = licenses.ofl; - maintainers = [ maintainers.profpatsch ]; + maintainers = [ maintainers.Profpatsch ]; homepage = "https://github.com/tonsky/FiraCode/issues/211#issuecomment-239058632"; }; } diff --git a/pkgs/data/fonts/hasklig/default.nix b/pkgs/data/fonts/hasklig/default.nix index 96af2e573a2..de7dd5834e4 100644 --- a/pkgs/data/fonts/hasklig/default.nix +++ b/pkgs/data/fonts/hasklig/default.nix @@ -20,6 +20,6 @@ in fetchzip { description = "A font with ligatures for Haskell code based off Source Code Pro"; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ davidrusu profpatsch ]; + maintainers = with maintainers; [ davidrusu Profpatsch ]; }; } diff --git a/pkgs/data/fonts/league-of-moveable-type/default.nix b/pkgs/data/fonts/league-of-moveable-type/default.nix index b7985578998..5657b8380a9 100644 --- a/pkgs/data/fonts/league-of-moveable-type/default.nix +++ b/pkgs/data/fonts/league-of-moveable-type/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.ofl; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ bergey profpatsch ]; + maintainers = with stdenv.lib.maintainers; [ bergey Profpatsch ]; }; } diff --git a/pkgs/data/fonts/raleway/default.nix b/pkgs/data/fonts/raleway/default.nix index 2ba9069d48b..009295c5869 100644 --- a/pkgs/data/fonts/raleway/default.nix +++ b/pkgs/data/fonts/raleway/default.nix @@ -35,6 +35,6 @@ in fetchzip { homepage = https://github.com/impallari/Raleway; license = stdenv.lib.licenses.ofl; - maintainers = with stdenv.lib.maintainers; [ profpatsch ]; + maintainers = with stdenv.lib.maintainers; [ Profpatsch ]; }; } diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix index e91a3ab25ee..e9f6240cbdf 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui , libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification , makeWrapper, xfce4mixer, hicolor_icon_theme -, withGtk3 ? false, gtk3, gettext +, withGtk3 ? false, gtk3, gettext, glib_networking }: let inherit (stdenv.lib) optional; @@ -40,7 +40,8 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/xfce4-panel" \ - --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ + --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" ''; enableParallelBuilding = true; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix index 419efbcbf95..0af0e62244f 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; p_name = "xfce4-weather-plugin"; ver_maj = "0.8"; - ver_min = "7"; + ver_min = "10"; src = fetchurl { url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1c35iqqiphazkfdabbjdynk0qkc3r8vxhmk2jc6dkiv8d08727h7"; + sha256 = "1f7ac2zr5s5w6krdpgsq252wxhhmcblia3j783132ilh8k246vgf"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/arduino/platformio/chrootenv.nix index a3720619241..69182c3aa0d 100644 --- a/pkgs/development/arduino/platformio/chrootenv.nix +++ b/pkgs/development/arduino/platformio/chrootenv.nix @@ -1,18 +1,7 @@ -{ lib, buildFHSUserEnv, platformio, stdenv }: - -buildFHSUserEnv { - name = "platformio"; - - targetPkgs = pkgs: (with pkgs; - [ - python27Packages.python - python27Packages.setuptools - python27Packages.pip - python27Packages.bottle - python27Packages.platformio - zlib - ]); - multiPkgs = pkgs: (with pkgs; +{ stdenv, lib, buildFHSUserEnv +}: +let + pio-pkgs = pkgs: (with pkgs; [ python27Packages.python python27Packages.setuptools @@ -21,6 +10,12 @@ buildFHSUserEnv { python27Packages.platformio zlib ]); +in +buildFHSUserEnv { + name = "platformio"; + + targetPkgs = pio-pkgs; + multiPkgs = pio-pkgs; meta = with stdenv.lib; { description = "An open source ecosystem for IoT development"; diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix index 5e298dbf2ce..451722aea06 100644 --- a/pkgs/development/compilers/purescript/psc-package/default.nix +++ b/pkgs/development/compilers/purescript/psc-package/default.nix @@ -22,5 +22,5 @@ mkDerivation rec { description = "An experimental package manager for PureScript"; license = licenses.bsd3; - maintainers = with lib.maintainers; [ profpatsch ]; + maintainers = with lib.maintainers; [ Profpatsch ]; } diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 9d6f641bc46..efed388ce4c 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation { # Disable fragile tests. rm -vr src/test/run-make/linker-output-non-utf8 || true - rm -vr src/test/run-make/issue-26092.rs || true + rm -vr src/test/run-make/issue-26092 || true # Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835 rm -vr src/test/run-pass/issue-36023.rs || true diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c242f65b2b1..3b36c6d6318 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -950,7 +950,7 @@ self: super: { ChasingBottoms = dontCheck super.ChasingBottoms; # Add support for https://github.com/haskell-hvr/multi-ghc-travis. - multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis { ShellCheck = self.ShellCheck_0_4_6; }; + multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis {}; # https://github.com/yesodweb/Shelly.hs/issues/162 shelly = dontCheck super.shelly; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index ab487eb6edf..488d3206c78 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -61,7 +61,7 @@ self: super: { ## callStackDoc, called at compiler/utils/Outputable.hs:1150:37 in ghc:Outputable ## pprPanic, called at utils/haddock/haddock-api/src/Haddock/Interface/Create.hs:1013:16 in main:Haddock.Interface.Create ## Please report this as a GHC bug: http://www.haskell.org/ghc/reportabug - hspec = dontHaddock (dontCheck super.hspec_2_4_7); # test suite causes an infinite loop + hspec = dontHaddock (dontCheck super.hspec_2_4_8); # test suite causes an infinite loop ## Setup: Encountered missing dependencies: ## QuickCheck >=2.3 && <2.10 @@ -88,7 +88,7 @@ self: super: { ## from the context: a constraints = super.constraints_0_10; - hspec-core = overrideCabal super.hspec-core_2_4_7 (drv: { + hspec-core = overrideCabal super.hspec-core_2_4_8 (drv: { ## Needs bump to a versioned attribute ## ## • No instance for (Semigroup Summary) @@ -102,7 +102,7 @@ self: super: { ## breaks hspec: ## Setup: Encountered missing dependencies: ## hspec-discover ==2.4.7 - hspec-discover = super.hspec-discover_2_4_7; + hspec-discover = super.hspec-discover_2_4_8; ## Needs bump to a versioned attribute ## diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 4ab9669094a..02286e7762a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -38,7 +38,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 10.4 + # LTS Haskell 10.5 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -64,7 +64,7 @@ default-package-overrides: - adler32 ==0.1.1.0 - aern2-mp ==0.1.2.0 - aern2-real ==0.1.1.0 - - aeson ==1.2.3.0 + - aeson ==1.2.4.0 - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.1.0.5 - aeson-compat ==0.3.7.1 @@ -256,8 +256,9 @@ default-package-overrides: - bencode ==0.6.0.0 - bento ==0.1.0 - between ==0.11.0.0 + - bhoogle ==0.1.2.5 - bibtex ==0.1.0.6 - - bifunctors ==5.5 + - bifunctors ==5.5.2 - bimap ==0.3.3 - bimap-server ==0.1.0.1 - binary-bits ==0.5 @@ -305,7 +306,7 @@ default-package-overrides: - blaze-markup ==0.8.2.0 - blaze-svg ==0.3.6.1 - blaze-textual ==0.2.1.0 - - bloodhound ==0.15.0.1 + - bloodhound ==0.15.0.2 - bloomfilter ==2.0.1.0 - blosum ==0.1.1.4 - bmp ==1.2.6.3 @@ -348,10 +349,10 @@ default-package-overrides: - bzlib-conduit ==0.2.1.5 - c2hs ==0.28.3 - Cabal ==2.0.1.1 - - cabal-doctest ==1.0.5 + - cabal-doctest ==1.0.6 - cabal-file-th ==0.2.4 - cabal-rpm ==0.12 - - cabal-toolkit ==0.0.4 + - cabal-toolkit ==0.0.5 - cache ==0.1.0.1 - cairo ==0.13.4.2 - calendar-recycling ==0.0 @@ -428,7 +429,7 @@ default-package-overrides: - combinatorial ==0.0 - comfort-graph ==0.0.2.1 - commutative ==0.0.1.4 - - comonad ==5.0.2 + - comonad ==5.0.3 - comonads-fd ==4.0 - comonad-transformers ==4.0 - compact ==0.1.0.1 @@ -439,19 +440,19 @@ default-package-overrides: - composable-associations-aeson ==0.1.0.0 - composition ==1.0.2.1 - composition-extra ==2.0.0 - - concise ==0.1.0.0 + - concise ==0.1.0.1 - concurrency ==1.2.3.0 - concurrent-extra ==0.7.0.11 - - concurrent-output ==1.10.2 + - concurrent-output ==1.10.3 - concurrent-split ==0.0.1 - concurrent-supply ==0.1.8 - cond ==0.4.1.1 - conduit ==1.2.13 - conduit-algorithms ==0.0.7.1 - conduit-combinators ==1.1.2 - - conduit-connection ==0.1.0.3 + - conduit-connection ==0.1.0.4 - conduit-extra ==1.2.3.2 - - conduit-iconv ==0.1.1.2 + - conduit-iconv ==0.1.1.3 - conduit-parse ==0.1.2.2 - conduit-throttle ==0.3.1.0 - ConfigFile ==1.1.4 @@ -508,7 +509,7 @@ default-package-overrides: - crypt-sha512 ==0 - csp ==1.3.1 - css-syntax ==0.0.5 - - css-text ==0.1.2.2 + - css-text ==0.1.3.0 - csv ==0.1.2 - csv-conduit ==0.6.7 - ctrie ==0.2 @@ -560,7 +561,7 @@ default-package-overrides: - data-textual ==0.3.0.2 - data-tree-print ==0.1.0.0 - dataurl ==0.1.0.0 - - DAV ==1.3.1 + - DAV ==1.3.2 - dawg-ord ==0.5.1.0 - dbcleaner ==0.1.3 - dbus ==0.10.15 @@ -581,7 +582,7 @@ default-package-overrides: - dhall-bash ==1.0.6 - dhall-json ==1.0.9 - dhall-nix ==1.0.9 - - dhall-text ==1.0.4 + - dhall-text ==1.0.5 - diagrams ==1.4 - diagrams-builder ==0.8.0.2 - diagrams-cairo ==1.4 @@ -607,7 +608,7 @@ default-package-overrides: - disk-free-space ==0.1.0.1 - disposable ==0.2.0.4 - distance ==0.1.0.0 - - distributed-closure ==0.3.4.0 + - distributed-closure ==0.3.5 - distributed-process ==0.7.3 - distributed-process-simplelocalnet ==0.2.4 - distributed-process-tests ==0.4.11 @@ -709,7 +710,7 @@ default-package-overrides: - eventstore ==0.15.0.2 - every ==0.0.1 - exact-combinatorics ==0.2.0.8 - - exact-pi ==0.4.1.2 + - exact-pi ==0.4.1.3 - exceptional ==0.3.0.0 - exception-mtl ==0.4.0.1 - exceptions ==0.8.3 @@ -731,7 +732,7 @@ default-package-overrides: - fasta ==0.10.4.2 - fast-builder ==0.0.1.0 - fast-digits ==0.2.1.0 - - fast-logger ==2.4.10 + - fast-logger ==2.4.11 - fast-math ==1.0.2 - fb ==1.1.1 - fclabels ==2.0.3.2 @@ -773,7 +774,7 @@ default-package-overrides: - focus ==0.1.5.2 - fold-debounce ==0.2.0.6 - fold-debounce-conduit ==0.1.0.5 - - foldl ==1.3.5 + - foldl ==1.3.7 - folds ==0.7.4 - follow-file ==0.0.2 - FontyFruity ==0.5.3.3 @@ -788,7 +789,7 @@ default-package-overrides: - Frames ==0.3.0.2 - free ==4.12.4 - freenect ==1.2.1 - - freer-simple ==1.0.0.0 + - freer-simple ==1.0.1.1 - freetype2 ==0.1.2 - free-vl ==0.1.4 - friday ==0.2.3.1 @@ -802,7 +803,7 @@ default-package-overrides: - funcmp ==1.8 - functor-classes-compat ==1 - fuzzcheck ==0.1.1 - - fuzzyset ==0.1.0.4 + - fuzzyset ==0.1.0.6 - gauge ==0.1.3 - gd ==3000.7.3 - gdax ==0.6.0.0 @@ -818,7 +819,7 @@ default-package-overrides: - generics-sop ==0.3.2.0 - generics-sop-lens ==0.1.2.1 - generic-xmlpickler ==0.1.0.5 - - geniplate-mirror ==0.7.5 + - geniplate-mirror ==0.7.6 - genvalidity ==0.4.0.4 - genvalidity-aeson ==0.1.0.0 - genvalidity-bytestring ==0.1.0.0 @@ -840,15 +841,15 @@ default-package-overrides: - ghc-compact ==0.1.0.0 - ghc-core ==0.5.6 - ghc-events ==0.7.0 - - ghc-exactprint ==0.5.5.0 - - ghcid ==0.6.9 + - ghc-exactprint ==0.5.6.0 + - ghcid ==0.6.10 - ghcjs-base-stub ==0.1.0.4 - ghcjs-codemirror ==0.0.0.1 - ghcjs-dom ==0.9.2.0 - ghcjs-dom-jsaddle ==0.9.2.0 - ghcjs-perch ==0.3.3.2 - ghc-paths ==0.1.0.9 - - ghc-prof ==1.4.0.4 + - ghc-prof ==1.4.1 - ghc-syb-utils ==0.2.3.3 - ghc-tcplugins-extra ==0.2.2 - ghc-typelits-extra ==0.2.4 @@ -864,7 +865,7 @@ default-package-overrides: - giphy-api ==0.5.2.0 - git ==0.2.1 - github ==0.18 - - github-release ==1.1.2 + - github-release ==1.1.3 - github-types ==0.2.1 - github-webhook-handler ==0.0.8 - github-webhook-handler-snap ==0.0.7 @@ -1027,12 +1028,12 @@ default-package-overrides: - hamlet ==1.2.0 - HandsomeSoup ==0.4.2 - handwriting ==0.1.0.3 - - hapistrano ==0.3.5.1 + - hapistrano ==0.3.5.2 - happstack-hsp ==7.3.7.3 - happstack-jmacro ==7.0.12 - happstack-server ==7.5.0.1 - - happstack-server-tls ==7.1.6.4 - - happy ==1.19.8 + - happstack-server-tls ==7.1.6.5 + - happy ==1.19.9 - harp ==0.4.3 - hasbolt ==0.1.3.0 - hashable ==1.2.6.1 @@ -1094,7 +1095,7 @@ default-package-overrides: - heaps ==0.3.6 - heatshrink ==0.1.0.0 - hebrew-time ==0.1.1 - - hedgehog ==0.5.1 + - hedgehog ==0.5.2 - hedgehog-quickcheck ==0.1 - hedis ==0.9.12 - here ==1.2.12 @@ -1144,13 +1145,13 @@ default-package-overrides: - hosc ==0.16 - hostname ==1.0 - hostname-validate ==1.0.0 - - hourglass ==0.2.10 + - hourglass ==0.2.11 - hourglass-orphans ==0.1.0.0 - hp2pretty ==0.8.0.2 - hpack ==0.21.2 - hpc-coveralls ==1.0.10 - HPDF ==1.4.10 - - hpio ==0.9.0.3 + - hpio ==0.9.0.5 - hpp ==0.5.1 - hpqtypes ==1.5.1.1 - hprotoc ==2.4.6 @@ -1162,12 +1163,12 @@ default-package-overrides: - hsb2hs ==0.3.1 - hs-bibutils ==6.2.0.1 - hscolour ==1.24.2 - - hsdns ==1.7 + - hsdns ==1.7.1 - hsebaysdk ==0.4.0.0 - hse-cpp ==0.2 - hsemail ==2 - - HSet ==0.0.1 - hset ==2.2.0 + - HSet ==0.0.1 - hsexif ==0.6.1.5 - hs-GeoIP ==0.3 - hsignal ==0.2.7.5 @@ -1203,7 +1204,7 @@ default-package-overrides: - hstatsd ==0.1 - HStringTemplate ==0.8.6 - HSvm ==0.1.0.3.22 - - hsx2hs ==0.14.1.1 + - hsx2hs ==0.14.1.2 - hsx-jmacro ==7.3.8 - hsyslog ==5.0.1 - hsyslog-udp ==0.2.0 @@ -1216,15 +1217,15 @@ default-package-overrides: - htoml ==1.0.0.3 - HTTP ==4000.3.9 - http2 ==1.6.3 - - http-api-data ==0.3.7.1 - - http-client ==0.5.9 + - http-api-data ==0.3.7.2 + - http-client ==0.5.10 - http-client-openssl ==0.2.1.1 - - http-client-tls ==0.3.5.1 + - http-client-tls ==0.3.5.3 - http-common ==0.8.2.0 - http-conduit ==2.2.4 - http-date ==0.0.6.1 - http-link-header ==1.0.3 - - http-media ==0.7.1.1 + - http-media ==0.7.1.2 - http-reverse-proxy ==0.4.5 - http-streams ==0.8.5.5 - http-types ==0.9.1 @@ -1274,7 +1275,7 @@ default-package-overrides: - IfElse ==0.85 - iff ==0.0.6 - ignore ==0.1.1.0 - - ihs ==0.1.0.1 + - ihs ==0.1.0.2 - ilist ==0.3.1.0 - imagesize-conduit ==1.1 - Imlib ==0.1.2 @@ -1286,7 +1287,7 @@ default-package-overrides: - indentation-parsec ==0.0.0.1 - indents ==0.4.0.1 - inflections ==0.4.0.1 - - influxdb ==1.2.2.2 + - influxdb ==1.2.2.3 - ini ==0.3.5 - inline-c ==0.6.0.5 - inline-c-cpp ==0.2.1.0 @@ -1300,8 +1301,8 @@ default-package-overrides: - intern ==0.9.1.4 - interpolate ==0.1.1 - interpolatedstring-perl6 ==1.0.0 - - interpolation ==0.1.0.2 - Interpolation ==0.3.0 + - interpolation ==0.1.0.2 - IntervalMap ==0.5.3.1 - intervals ==0.8.1 - intro ==0.3.1.0 @@ -1322,8 +1323,8 @@ default-package-overrides: - IPv6DB ==0.2.4 - ipython-kernel ==0.9.0.1 - irc ==0.6.1.0 - - irc-client ==1.0.1.0 - - irc-conduit ==0.2.2.4 + - irc-client ==1.0.1.1 + - irc-conduit ==0.2.2.5 - irc-ctcp ==0.1.3.0 - irc-dcc ==2.0.1 - islink ==0.1.0.0 @@ -1354,7 +1355,7 @@ default-package-overrides: - json-rpc-generic ==0.2.1.3 - json-schema ==0.7.4.1 - json-stream ==0.4.1.5 - - JuicyPixels ==3.2.9.3 + - JuicyPixels ==3.2.9.4 - JuicyPixels-extra ==0.2.2 - JuicyPixels-scale-dct ==0.1.1.2 - justified-containers ==0.2.0.1 @@ -1364,7 +1365,7 @@ default-package-overrides: - kanji ==3.0.2 - kansas-comet ==0.4 - katip ==0.5.2.0 - - katip-elasticsearch ==0.4.0.3 + - katip-elasticsearch ==0.4.0.4 - katydid ==0.1.1.0 - kawhi ==0.3.0 - kdt ==0.2.4 @@ -1386,7 +1387,7 @@ default-package-overrides: - language-haskell-extract ==0.2.4 - language-java ==0.2.8 - language-javascript ==0.6.0.10 - - language-puppet ==1.3.13 + - language-puppet ==1.3.14 - lapack-carray ==0.0 - lapack-ffi ==0.0 - lapack-ffi-tools ==0.0.0.1 @@ -1396,7 +1397,7 @@ default-package-overrides: - lattices ==1.7 - lazyio ==0.1.0.4 - lazysmallcheck ==0.6 - - lca ==0.3 + - lca ==0.3.1 - leancheck ==0.7.0 - leapseconds-announced ==2017.1.0.1 - lens ==4.15.4 @@ -1448,10 +1449,10 @@ default-package-overrides: - log-elasticsearch ==0.9.1.0 - logfloat ==0.13.3.3 - logger-thread ==0.1.0.2 - - logging-effect ==1.2.1 - - logging-effect-extra ==1.2.1 - - logging-effect-extra-file ==1.1.1 - - logging-effect-extra-handler ==1.1.1 + - logging-effect ==1.2.3 + - logging-effect-extra ==1.2.2 + - logging-effect-extra-file ==1.1.2 + - logging-effect-extra-handler ==1.1.2 - logging-facade ==0.3.0 - logging-facade-syslog ==1 - logict ==0.6.0.2 @@ -1498,7 +1499,7 @@ default-package-overrides: - megaparsec ==6.3.0 - mega-sdist ==0.3.0.6 - memory ==0.14.11 - - MemoTrie ==0.6.8 + - MemoTrie ==0.6.9 - mercury-api ==0.1.0.1 - mersenne-random-pure64 ==0.2.2.0 - messagepack ==0.5.4 @@ -1520,7 +1521,7 @@ default-package-overrides: - midi ==0.2.2.1 - midi-music-box ==0.0.0.4 - mighty-metropolis ==1.2.0 - - milena ==0.5.2.0 + - milena ==0.5.2.1 - mime-mail ==0.4.14 - mime-mail-ses ==0.4.0.0 - mime-types ==0.1.0.7 @@ -1556,7 +1557,7 @@ default-package-overrides: - monadloc ==0.7.1 - monad-logger ==0.3.28.1 - monad-logger-json ==0.1.0.0 - - monad-logger-prefix ==0.1.6 + - monad-logger-prefix ==0.1.7 - monad-logger-syslog ==0.1.4.0 - monad-loops ==0.4.3 - monad-memo ==0.4.1 @@ -1578,7 +1579,7 @@ default-package-overrides: - monad-time ==0.2 - monad-unlift ==0.2.0 - monad-unlift-ref ==0.2.1 - - mongoDB ==2.3.0.1 + - mongoDB ==2.3.0.2 - monoidal-containers ==0.3.0.2 - monoid-extras ==0.4.2 - monoid-subclasses ==0.4.4 @@ -1599,7 +1600,7 @@ default-package-overrides: - murmur-hash ==0.1.0.9 - MusicBrainz ==0.3.1 - mustache ==2.3.0 - - mutable-containers ==0.3.3 + - mutable-containers ==0.3.4 - mwc-probability ==1.3.0 - mwc-random ==0.13.6.0 - mwc-random-accelerate ==0.1.0.0 @@ -1614,7 +1615,7 @@ default-package-overrides: - nano-erl ==0.1.0.1 - nanospec ==0.2.2 - naqsha ==0.2.0.1 - - nats ==1.1.1 + - nats ==1.1.2 - natural-sort ==0.1.2 - natural-transformation ==0.4 - ndjson-conduit ==0.1.0.5 @@ -1630,7 +1631,7 @@ default-package-overrides: - network-anonymous-i2p ==0.10.0 - network-anonymous-tor ==0.11.0 - network-attoparsec ==0.12.2 - - network-carbon ==1.0.10 + - network-carbon ==1.0.11 - network-conduit-tls ==1.2.2 - network-house ==0.1.0.2 - network-info ==0.2.0.9 @@ -1684,7 +1685,7 @@ default-package-overrides: - once ==0.2 - one-liner ==0.9.2 - OneTuple ==0.2.1 - - online ==0.2.0 + - online ==0.2.1.0 - Only ==0.1 - oo-prototypes ==0.1.0.0 - opaleye ==0.6.0.0 @@ -1721,7 +1722,7 @@ default-package-overrides: - parallel ==3.2.1.1 - parallel-io ==0.3.3 - parseargs ==0.2.0.8 - - parsec ==3.1.11 + - parsec ==3.1.13.0 - parsec-numeric ==0.1.0.0 - ParsecTools ==0.0.2.0 - parser-combinators ==0.4.0 @@ -1760,7 +1761,7 @@ default-package-overrides: - persistent-postgresql ==2.6.3 - persistent-refs ==0.4 - persistent-sqlite ==2.6.4 - - persistent-template ==2.5.3 + - persistent-template ==2.5.3.1 - pgp-wordlist ==0.1.0.2 - pg-transact ==0.1.0.1 - phantom-state ==0.2.1.2 @@ -1775,7 +1776,7 @@ default-package-overrides: - pipes-attoparsec ==0.5.1.5 - pipes-bytestring ==2.1.6 - pipes-category ==0.3.0.0 - - pipes-concurrency ==2.0.8 + - pipes-concurrency ==2.0.9 - pipes-csv ==1.4.3 - pipes-extras ==1.0.12 - pipes-fastx ==0.3.0.0 @@ -1842,7 +1843,7 @@ default-package-overrides: - primitive ==0.6.3.0 - printcess ==0.1.0.3 - probability ==0.2.5.1 - - process-extras ==0.7.3 + - process-extras ==0.7.4 - product-isomorphic ==0.0.3.1 - product-profunctors ==0.8.0.3 - profiterole ==0.1 @@ -1876,7 +1877,7 @@ default-package-overrides: - pure-io ==0.2.1 - pureMD5 ==2.1.3 - purescript-bridge ==0.11.1.2 - - pusher-http-haskell ==1.5.1.0 + - pusher-http-haskell ==1.5.1.2 - pwstore-fast ==2.4.4 - qchas ==1.0.1.0 - qm-interpolated-string ==0.2.1.0 @@ -1885,7 +1886,7 @@ default-package-overrides: - QuickCheck ==2.10.1 - quickcheck-arbitrary-adt ==0.2.0.0 - quickcheck-assertions ==0.3.0 - - quickcheck-classes ==0.3.1 + - quickcheck-classes ==0.3.2 - quickcheck-combinators ==0.0.2 - quickcheck-instances ==0.3.16.1 - quickcheck-io ==0.2.0 @@ -1979,7 +1980,7 @@ default-package-overrides: - rest-wai ==0.2.0.1 - result ==0.2.6.0 - rethinkdb-client-driver ==0.0.25 - - retry ==0.7.5.1 + - retry ==0.7.6.0 - rev-state ==0.1.2 - rfc5051 ==0.1.0.3 - riak ==1.1.2.3 @@ -2007,8 +2008,8 @@ default-package-overrides: - say ==0.1.0.0 - sbp ==2.3.6 - sbv ==7.4 - - SCalendar ==1.1.0 - scalendar ==1.2.0 + - SCalendar ==1.1.0 - scalpel ==0.5.1 - scalpel-core ==0.5.1 - scanner ==0.2 @@ -2029,11 +2030,11 @@ default-package-overrides: - selda-sqlite ==0.1.6.0 - semigroupoid-extras ==5 - semigroupoids ==5.2.1 - - semigroups ==0.18.3 + - semigroups ==0.18.4 - semiring-simple ==1.0.0.1 - semver ==0.3.3.1 - sendfile ==0.7.9 - - sensu-run ==0.4.0.3 + - sensu-run ==0.4.0.4 - seqalign ==0.2.0.4 - seqloc ==0.6.1.1 - serf ==0.1.1.0 @@ -2079,7 +2080,7 @@ default-package-overrides: - SHA ==1.6.4.2 - shake ==0.16 - shake-language-c ==0.11.0 - - shakespeare ==2.0.14.1 + - shakespeare ==2.0.15 - shell-conduit ==4.6.1 - shell-escape ==0.2.0 - shelly ==1.7.0.1 @@ -2092,7 +2093,7 @@ default-package-overrides: - simple ==0.11.2 - simple-log ==0.9.3 - simple-reflect ==0.3.2 - - simple-sendfile ==0.2.26 + - simple-sendfile ==0.2.27 - simple-session ==0.10.1.1 - simple-templates ==0.8.0.1 - singleton-bool ==0.1.2.0 @@ -2156,7 +2157,7 @@ default-package-overrides: - StateVar ==1.1.0.4 - stateWriter ==0.2.10 - statistics ==0.14.0.2 - - stm ==2.4.4.1 + - stm ==2.4.5.0 - stm-chans ==3.0.0.4 - stm-conduit ==3.0.0 - stm-containers ==0.2.16 @@ -2179,7 +2180,7 @@ default-package-overrides: - Stream ==0.4.7.2 - streaming ==0.2.0.0 - streaming-bytestring ==0.1.5 - - streaming-commons ==0.1.18 + - streaming-commons ==0.1.19 - streamly ==0.1.0 - streamproc ==1.6.2 - streams ==3.3 @@ -2211,7 +2212,7 @@ default-package-overrides: - svg-tree ==0.6.2.1 - swagger ==0.3.0 - swagger2 ==2.2 - - swagger-petstore ==0.0.1.7 + - swagger-petstore ==0.0.1.8 - swish ==0.9.1.10 - syb ==0.7 - syb-with-class ==0.6.1.8 @@ -2233,7 +2234,7 @@ default-package-overrides: - tar-conduit ==0.1.1 - tardis ==0.4.1.0 - tasty ==0.11.3 - - tasty-ant-xml ==1.1.2 + - tasty-ant-xml ==1.1.3 - tasty-auto ==0.2.0.0 - tasty-dejafu ==0.7.1.1 - tasty-discover ==4.1.3 @@ -2247,7 +2248,7 @@ default-package-overrides: - tasty-kat ==0.0.3 - tasty-program ==1.0.5 - tasty-quickcheck ==0.9.1 - - tasty-rerun ==1.1.9 + - tasty-rerun ==1.1.10 - tasty-silver ==3.1.11 - tasty-smallcheck ==0.8.1 - tasty-stats ==0.2.0.3 @@ -2282,7 +2283,7 @@ default-package-overrides: - text-generic-pretty ==1.2.1 - text-icu ==0.7.0.1 - text-latin1 ==0.3 - - text-ldap ==0.1.1.10 + - text-ldap ==0.1.1.11 - textlocal ==0.1.0.5 - text-manipulate ==0.2.0.1 - text-metrics ==0.3.0 @@ -2301,7 +2302,7 @@ default-package-overrides: - these ==0.7.4 - th-expand-syns ==0.4.4.0 - th-extras ==0.0.0.4 - - th-lift ==0.7.7 + - th-lift ==0.7.8 - th-lift-instances ==0.1.11 - th-orphans ==0.13.5 - thread-hierarchy ==0.3.0.0 @@ -2385,7 +2386,7 @@ default-package-overrides: - type-level-kv-list ==1.1.0 - type-level-numbers ==0.1.1.1 - typelits-witnesses ==0.2.3.0 - - type-of-html ==1.3.2.1 + - type-of-html ==1.3.3.0 - type-operators ==0.1.0.4 - type-spec ==0.3.0.1 - typography-geometry ==1.0.0.1 @@ -2409,8 +2410,8 @@ default-package-overrides: - union-find ==0.2 - uniplate ==1.6.12 - uniq-deep ==1.1.0.0 - - unique ==0 - Unique ==0.4.7.2 + - unique ==0 - unit-constraint ==0.0.0 - units-parser ==0.1.1.2 - universe ==1.0 @@ -2465,7 +2466,7 @@ default-package-overrides: - vcswrapper ==0.1.6 - vector ==0.12.0.1 - vector-algorithms ==0.7.0.1 - - vector-binary-instances ==0.2.3.5 + - vector-binary-instances ==0.2.4 - vector-buffer ==0.4.1 - vector-builder ==0.3.4.1 - vector-fftw ==0.1.3.8 @@ -2504,7 +2505,7 @@ default-package-overrides: - wai-middleware-crowd ==0.1.4.2 - wai-middleware-metrics ==0.2.4 - wai-middleware-prometheus ==0.3.0 - - wai-middleware-rollbar ==0.8.2 + - wai-middleware-rollbar ==0.8.3 - wai-middleware-static ==0.8.1 - wai-middleware-throttle ==0.2.2.0 - wai-predicates ==0.10.0 @@ -2523,12 +2524,12 @@ default-package-overrides: - webdriver-angular ==0.1.11 - webpage ==0.0.5 - web-plugins ==0.2.9 - - web-routes ==0.27.13 + - web-routes ==0.27.14 - web-routes-boomerang ==0.28.4.2 - web-routes-happstack ==0.23.11 - web-routes-hsp ==0.24.6.1 - web-routes-th ==0.22.6.2 - - web-routes-wai ==0.24.3 + - web-routes-wai ==0.24.3.1 - webrtc-vad ==0.1.0.3 - websockets ==0.12.3.1 - websockets-rpc ==0.6.0 @@ -2542,7 +2543,7 @@ default-package-overrides: - Win32 ==2.5.4.1 - Win32-notify ==0.3.0.3 - wire-streams ==0.1.1.0 - - withdependencies ==0.2.4.1 + - withdependencies ==0.2.4.2 - witherable ==0.2 - with-location ==0.1.0 - witness ==0.4 @@ -2580,7 +2581,7 @@ default-package-overrides: - xeno ==0.3.2 - xenstore ==0.1.1 - xhtml ==3000.2.2 - - xls ==0.1.0 + - xls ==0.1.1 - xlsx ==0.6.0 - xlsx-tabular ==0.2.2 - xml ==1.3.14 @@ -2705,7 +2706,6 @@ extra-packages: - QuickCheck < 2 # required by test-framework-quickcheck and its users - seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x - seqid-streams < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x - - ShellCheck == 0.4.6 # required by multi-ghc-travis - split < 0.2 # newer versions don't work with GHC 6.12.3 - tar < 0.4.2.0 # later versions don't work with GHC < 7.6.x - transformers == 0.4.3.* # the latest version isn't supported by mtl yet diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f330561b145..773664efb42 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -543,8 +543,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ANum"; - version = "0.2.0.1"; - sha256 = "01ixrqas444vd0dynx6lkfgvjrd3fnj1lwdz7pcwaiclww5nyxba"; + version = "0.2.0.2"; + sha256 = "06mvkp9b0hxlp1w2yp7bb6340l88mzs15azx7nma401icqdhvbpn"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "https://github.com/DanBurton/ANum#readme"; @@ -3534,36 +3534,6 @@ self: { }: mkDerivation { pname = "DAV"; - version = "1.3.1"; - sha256 = "02f03grgwsazvlkyn743k6hjck9s7brbcgbzvyxv9gwbiyjzm02w"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring case-insensitive containers data-default exceptions - http-client http-client-tls http-types lens mtl transformers - transformers-base transformers-compat utf8-string xml-conduit - xml-hamlet - ]; - executableHaskellDepends = [ - base bytestring case-insensitive containers data-default exceptions - haskeline http-client http-client-tls http-types lens mtl network - network-uri optparse-applicative transformers transformers-base - transformers-compat utf8-string xml-conduit xml-hamlet - ]; - homepage = "http://floss.scru.org/hDAV"; - description = "RFC 4918 WebDAV support"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "DAV_1_3_2" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , data-default, exceptions, haskeline, http-client, http-client-tls - , http-types, lens, mtl, network, network-uri, optparse-applicative - , transformers, transformers-base, transformers-compat, utf8-string - , xml-conduit, xml-hamlet - }: - mkDerivation { - pname = "DAV"; version = "1.3.2"; sha256 = "0sai0b7bxwif5czmmdik5dx318drx18inid87wfrxckrflsi8cv1"; isLibrary = true; @@ -3583,7 +3553,6 @@ self: { homepage = "http://floss.scru.org/hDAV"; description = "RFC 4918 WebDAV support"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "DBlimited" = callPackage @@ -10411,6 +10380,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "IPv6DB_0_2_5" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger + , hedis, hspec, http-client, http-types, IPv6Addr, mtl + , optparse-applicative, text, unordered-containers, vector, wai + , wai-logger, warp + }: + mkDerivation { + pname = "IPv6DB"; + version = "0.2.5"; + sha256 = "0n8998fkdp6p1gr5j7kg0xfkh88cxmqiwxzh75q0xmkasphx4yfq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring hedis http-types IPv6Addr mtl text + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring fast-logger hedis http-types IPv6Addr mtl + optparse-applicative text unordered-containers vector wai + wai-logger warp + ]; + testHaskellDepends = [ + aeson base hspec http-client http-types vector + ]; + homepage = "http://ipv6db.cybervisible.com"; + description = "A RESTful Web Service for IPv6-related data"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "IcoGrid" = callPackage ({ mkDerivation, array, base, GlomeVec }: mkDerivation { @@ -10808,23 +10807,6 @@ self: { }: mkDerivation { pname = "JuicyPixels"; - version = "3.2.9.3"; - sha256 = "14s57fgf6kd5n5al2kcvk1aaxbq1ph0r5h8blflrjkx83yl6r8yn"; - libraryHaskellDepends = [ - base binary bytestring containers deepseq mtl primitive - transformers vector zlib - ]; - homepage = "https://github.com/Twinside/Juicy.Pixels"; - description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "JuicyPixels_3_2_9_4" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl - , primitive, transformers, vector, zlib - }: - mkDerivation { - pname = "JuicyPixels"; version = "3.2.9.4"; sha256 = "1mlj3zcr3c49mjv0sddsfdzvzv3m0cbv56fbrkarygs5dxyh8dgz"; libraryHaskellDepends = [ @@ -10834,7 +10816,6 @@ self: { homepage = "https://github.com/Twinside/Juicy.Pixels"; description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "JuicyPixels-canvas" = callPackage @@ -12299,21 +12280,6 @@ self: { ({ mkDerivation, base, newtype-generics }: mkDerivation { pname = "MemoTrie"; - version = "0.6.8"; - sha256 = "194x8a1x8ch5xwpxaagrmpsjca92x1zjiq6dlqdgckyr49blknaz"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base newtype-generics ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/conal/MemoTrie"; - description = "Trie-based memo functions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "MemoTrie_0_6_9" = callPackage - ({ mkDerivation, base, newtype-generics }: - mkDerivation { - pname = "MemoTrie"; version = "0.6.9"; sha256 = "157p0pi6rrq74a35mq6zkkycv4ah7xhkbrcmnkb9xf7pznw4aq0x"; isLibrary = true; @@ -12323,7 +12289,6 @@ self: { homepage = "https://github.com/conal/MemoTrie"; description = "Trie-based memo functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MetaHDBC" = callPackage @@ -21825,39 +21790,6 @@ self: { }: mkDerivation { pname = "aeson"; - version = "1.2.3.0"; - sha256 = "1gwwqpbj6j93nlm6rvhdmvs0sq8rn17cwpyw7wdphanwjn9cdkda"; - libraryHaskellDepends = [ - attoparsec base base-compat bytestring containers deepseq dlist - ghc-prim hashable scientific tagged template-haskell text - th-abstraction time time-locale-compat unordered-containers - uuid-types vector - ]; - testHaskellDepends = [ - attoparsec base base-compat base-orphans base16-bytestring - bytestring containers directory dlist filepath generic-deriving - ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck - quickcheck-instances scientific tagged template-haskell - test-framework test-framework-hunit test-framework-quickcheck2 text - time time-locale-compat unordered-containers uuid-types vector - ]; - homepage = "https://github.com/bos/aeson"; - description = "Fast JSON parsing and encoding"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson_1_2_4_0" = callPackage - ({ mkDerivation, attoparsec, base, base-compat, base-orphans - , base16-bytestring, bytestring, containers, deepseq, directory - , dlist, filepath, generic-deriving, ghc-prim, hashable - , hashable-time, HUnit, integer-logarithms, QuickCheck - , quickcheck-instances, scientific, tagged, template-haskell - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, th-abstraction, time, time-locale-compat - , unordered-containers, uuid-types, vector - }: - mkDerivation { - pname = "aeson"; version = "1.2.4.0"; sha256 = "16zwpd07cmhs58wwsqbhxy3b58gqw8w5nr7nf6lwi4nvznjdn09l"; libraryHaskellDepends = [ @@ -21877,7 +21809,6 @@ self: { homepage = "https://github.com/bos/aeson"; description = "Fast JSON parsing and encoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-applicative" = callPackage @@ -22338,8 +22269,8 @@ self: { }: mkDerivation { pname = "aeson-quick"; - version = "0.1.1.2"; - sha256 = "0b1pp0hl543pmjkhmcq112xxivd8njnfpgklayllyrxdrbrafrp6"; + version = "0.1.2.0"; + sha256 = "18a5gwfyx382dxlhr4gch8yd39kgiamp2fpxsvvgi7bfyc55pq1h"; libraryHaskellDepends = [ aeson attoparsec base deepseq text unordered-containers vector ]; @@ -25031,6 +24962,27 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "amazonka-iam-policy" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring + , bytestring, doctest, hspec, profunctors, scientific, text, time + }: + mkDerivation { + pname = "amazonka-iam-policy"; + version = "0.0.1"; + sha256 = "1mjc5ym604n9bi9fl7b0581i5z7vy12ri99lz3imz1k3dhr6xwga"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring profunctors scientific text + time + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring doctest hspec + ]; + homepage = "https://github.com/brendanhay/amazonka-iam-policy"; + description = "Amazon IAM Policy Document DSL and Combinators"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "amazonka-importexport" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers @@ -29207,6 +29159,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "async-timer_0_1_4_1" = callPackage + ({ mkDerivation, base, containers, criterion, HUnit, lifted-async + , lifted-base, monad-control, safe-exceptions, test-framework + , test-framework-hunit, transformers-base + }: + mkDerivation { + pname = "async-timer"; + version = "0.1.4.1"; + sha256 = "1653hcx4a265drbgp0js9bhg3zfaspqxkx12f4v22vrfg64lvan2"; + libraryHaskellDepends = [ + base lifted-async lifted-base monad-control safe-exceptions + transformers-base + ]; + testHaskellDepends = [ + base containers criterion HUnit lifted-async test-framework + test-framework-hunit + ]; + homepage = "https://github.com/mtesseract/async-timer#readme"; + description = "Provides API for timer based execution of IO actions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "asynchronous-exceptions" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -29460,10 +29435,10 @@ self: { ({ mkDerivation, base, stm }: mkDerivation { pname = "atomic-modify"; - version = "0.1.0.0"; - sha256 = "138nm3mgrr8yk4dlk4zlrxzrqp250wxl0sj3qbb3n1vyx5mhw02y"; + version = "0.1.0.1"; + sha256 = "0kkfbm7jkarzj42ja7093i1j1h4klg362pfz1cvldvdhzjgs009r"; libraryHaskellDepends = [ base stm ]; - homepage = "https://github.com/chris-martin/haskell-libraries"; + homepage = "https://github.com/chris-martin/atomic-modify"; description = "A typeclass for mutable references that have an atomic modify operation"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -29615,21 +29590,23 @@ self: { "ats-pkg" = callPackage ({ mkDerivation, ansi-wl-pprint, ats-setup, base, binary - , bytestring, Cabal, cli-setup, composition-prelude, dependency - , dhall, directory, http-client, http-client-tls, lens - , optparse-applicative, parallel-io, process, shake, shake-ats - , shake-ext, tar, temporary, text, unix, zip-archive, zlib + , bytestring, bzlib, Cabal, cli-setup, composition-prelude + , containers, dependency, dhall, directory, file-embed, http-client + , http-client-tls, lens, lzma, optparse-applicative, parallel-io + , process, shake, shake-ats, shake-ext, tar, temporary, text, unix + , zip-archive, zlib }: mkDerivation { pname = "ats-pkg"; - version = "2.2.1.1"; - sha256 = "1gbin3wsnhk34pqr7qi0dld91n7m600bbn5pnbhg0z59d43wl5iq"; + version = "2.4.0.0"; + sha256 = "1dhspgnyds4r08jqnabaal12xv6vvrk7mkgwhiwl4z0mb6zi0kry"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; libraryHaskellDepends = [ - ansi-wl-pprint ats-setup base binary bytestring composition-prelude - dependency dhall directory http-client http-client-tls lens + ansi-wl-pprint ats-setup base binary bytestring bzlib + composition-prelude containers dependency dhall directory + file-embed http-client http-client-tls lens lzma optparse-applicative parallel-io process shake shake-ats shake-ext tar temporary text unix zip-archive zlib ]; @@ -29661,8 +29638,8 @@ self: { ({ mkDerivation, base, bytestring, composition-prelude, text }: mkDerivation { pname = "ats-storable"; - version = "0.2.0.1"; - sha256 = "0cybcdsq8gj2wzhfa5jbw5ihlbhrsgx9dyyi157yxj7dbbhz3abs"; + version = "0.2.1.0"; + sha256 = "1d374jkiifyn6hqr584waqhk4kirqibycs0fszf1v21dkk14jyvx"; libraryHaskellDepends = [ base bytestring composition-prelude text ]; @@ -30774,6 +30751,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aws_0_19" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , base64-bytestring, blaze-builder, byteable, bytestring + , case-insensitive, cereal, conduit, conduit-combinators + , conduit-extra, containers, cryptonite, data-default, directory + , errors, filepath, http-client, http-client-tls, http-conduit + , http-types, lifted-base, memory, monad-control, mtl, network + , old-locale, QuickCheck, quickcheck-instances, resourcet, safe + , scientific, tagged, tasty, tasty-hunit, tasty-quickcheck, text + , time, transformers, transformers-base, unordered-containers + , utf8-string, vector, xml-conduit + }: + mkDerivation { + pname = "aws"; + version = "0.19"; + sha256 = "0ykpnm2kyhjf1rf5ldhv0c7zy3zq7jgqmb6xwywk8b2s80ai4fxl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring base64-bytestring + blaze-builder byteable bytestring case-insensitive cereal conduit + conduit-extra containers cryptonite data-default directory filepath + http-conduit http-types lifted-base memory monad-control mtl + network old-locale resourcet safe scientific tagged text time + transformers unordered-containers utf8-string vector xml-conduit + ]; + testHaskellDepends = [ + aeson base bytestring conduit-combinators errors http-client + http-client-tls http-types lifted-base monad-control mtl QuickCheck + quickcheck-instances resourcet tagged tasty tasty-hunit + tasty-quickcheck text time transformers transformers-base + ]; + homepage = "http://github.com/aristidb/aws"; + description = "Amazon Web Services (AWS) for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aws-cloudfront-signer" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, base64-bytestring , bytestring, crypto-pubkey-types, RSA, time @@ -32245,6 +32260,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "base64-bytestring-type" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64-bytestring + , binary, bytestring, cereal, deepseq, hashable, QuickCheck, tasty + , tasty-quickcheck, text + }: + mkDerivation { + pname = "base64-bytestring-type"; + version = "1"; + sha256 = "0h74c0qhf4n0pamrl29ha5hgf940bay0dhl8rifaw4l03z8rn0bl"; + libraryHaskellDepends = [ + aeson base base-compat base64-bytestring binary bytestring cereal + deepseq hashable QuickCheck text + ]; + testHaskellDepends = [ + aeson base binary bytestring cereal tasty tasty-quickcheck + ]; + homepage = "https://github.com/futurice/haskell-base64-bytestring-type#readme"; + description = "A newtype around ByteString, for base64 encoding"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "base64-conduit" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, conduit , hspec, QuickCheck, transformers @@ -33389,28 +33425,6 @@ self: { "bifunctors" = callPackage ({ mkDerivation, base, base-orphans, comonad, containers, hspec - , QuickCheck, semigroups, tagged, template-haskell, th-abstraction - , transformers, transformers-compat - }: - mkDerivation { - pname = "bifunctors"; - version = "5.5"; - sha256 = "0a5y85p1dhcvkagpdci6ah5kczc2jpwsj7ywkd9cg0nqcyzq3icj"; - libraryHaskellDepends = [ - base base-orphans comonad containers semigroups tagged - template-haskell th-abstraction transformers transformers-compat - ]; - testHaskellDepends = [ - base hspec QuickCheck template-haskell transformers - transformers-compat - ]; - homepage = "http://github.com/ekmett/bifunctors/"; - description = "Bifunctors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bifunctors_5_5_2" = callPackage - ({ mkDerivation, base, base-orphans, comonad, containers, hspec , hspec-discover, QuickCheck, semigroups, tagged, template-haskell , th-abstraction, transformers, transformers-compat }: @@ -33430,7 +33444,6 @@ self: { homepage = "http://github.com/ekmett/bifunctors/"; description = "Bifunctors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bighugethesaurus" = callPackage @@ -36858,35 +36871,6 @@ self: { }: mkDerivation { pname = "bloodhound"; - version = "0.15.0.1"; - sha256 = "0g85fp2vppx6p1zbx506jnsfcik8q7nmc98fwrhcckgvkbdpi2v8"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring containers data-default-class - exceptions hashable http-client http-types mtl mtl-compat - network-uri scientific semigroups text time transformers - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers errors exceptions generics-sop - hspec http-client http-types mtl network-uri QuickCheck - quickcheck-properties semigroups temporary text time unix-compat - unordered-containers vector - ]; - homepage = "https://github.com/bitemyapp/bloodhound"; - description = "ElasticSearch client library for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bloodhound_0_15_0_2" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers - , data-default-class, errors, exceptions, generics-sop, hashable - , hspec, http-client, http-types, mtl, mtl-compat, network-uri - , QuickCheck, quickcheck-properties, scientific, semigroups - , temporary, text, time, transformers, unix-compat - , unordered-containers, vector - }: - mkDerivation { - pname = "bloodhound"; version = "0.15.0.2"; sha256 = "17xw085k72dmw1q4cbqjs07gvvwwfsijcs9lsb3smxxhri1s229i"; libraryHaskellDepends = [ @@ -36904,7 +36888,6 @@ self: { homepage = "https://github.com/bitemyapp/bloodhound"; description = "ElasticSearch client library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bloodhound-amazonka-auth" = callPackage @@ -38106,16 +38089,23 @@ self: { }) {}; "bricks" = callPackage - ({ mkDerivation, base, containers, doctest, hedgehog, parsec - , template-haskell, text + ({ mkDerivation, base, bricks-internal, bricks-internal-test + , bricks-parsec, bricks-rendering, bricks-syntax, containers + , doctest, hedgehog, mtl, parsec, template-haskell, text + , transformers }: mkDerivation { pname = "bricks"; - version = "0.0.0.2"; - sha256 = "1iyf9dkifl064x74vxnqdlv096qxiyhvqn91jmj090i4r6m4jlhw"; - libraryHaskellDepends = [ base containers parsec text ]; + version = "0.0.0.4"; + sha256 = "018cp48bm3hk20kfq544hm50s6bik37lv1hnsdpkg6ibgz6a9i4v"; + libraryHaskellDepends = [ + base bricks-internal bricks-parsec bricks-rendering bricks-syntax + containers mtl parsec text transformers + ]; testHaskellDepends = [ - base containers doctest hedgehog parsec template-haskell text + base bricks-internal bricks-internal-test bricks-parsec + bricks-rendering bricks-syntax containers doctest hedgehog mtl + parsec template-haskell text transformers ]; homepage = "https://github.com/chris-martin/bricks#readme"; description = "Bricks is a lazy functional language based on Nix"; @@ -38123,6 +38113,104 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bricks-internal" = callPackage + ({ mkDerivation, base, containers, doctest, either-list-functions + , text + }: + mkDerivation { + pname = "bricks-internal"; + version = "0.0.0.4"; + sha256 = "1c4nav1ak6nz06ps6pwsrd6ci8ly3xqi6yd8clsvrhqi1r4cwz80"; + libraryHaskellDepends = [ + base containers either-list-functions text + ]; + testHaskellDepends = [ + base containers doctest either-list-functions text + ]; + homepage = "https://github.com/chris-martin/bricks#readme"; + description = "..."; + license = stdenv.lib.licenses.asl20; + }) {}; + + "bricks-internal-test" = callPackage + ({ mkDerivation, base, bricks-internal, containers, hedgehog + , template-haskell, text + }: + mkDerivation { + pname = "bricks-internal-test"; + version = "0.0.0.4"; + sha256 = "1kvhvwi7qd1rxqn6zxz0vmzqnq2w5fzm1dld5yy08v6jr3f7ri8a"; + libraryHaskellDepends = [ + base bricks-internal containers hedgehog template-haskell text + ]; + homepage = "https://github.com/chris-martin/bricks#readme"; + description = "..."; + license = stdenv.lib.licenses.asl20; + }) {}; + + "bricks-parsec" = callPackage + ({ mkDerivation, base, bricks-internal, bricks-internal-test + , bricks-rendering, bricks-syntax, containers, doctest, hedgehog + , parsec, text + }: + mkDerivation { + pname = "bricks-parsec"; + version = "0.0.0.4"; + sha256 = "1rgcrdn4h4pmq9sa7fbzlmv93j6g80mhirnrx6f5iqgmshlg4cq0"; + libraryHaskellDepends = [ + base bricks-internal bricks-syntax containers parsec text + ]; + testHaskellDepends = [ + base bricks-internal bricks-internal-test bricks-rendering + bricks-syntax containers doctest hedgehog parsec text + ]; + homepage = "https://github.com/chris-martin/bricks#readme"; + description = "..."; + license = stdenv.lib.licenses.asl20; + }) {}; + + "bricks-rendering" = callPackage + ({ mkDerivation, base, bricks-internal, bricks-internal-test + , bricks-syntax, containers, doctest, hedgehog, template-haskell + , text + }: + mkDerivation { + pname = "bricks-rendering"; + version = "0.0.0.4"; + sha256 = "1ixg8qsima8hp547ms3jid4hcr0l605ha353r0bngwjxc5h3ixj4"; + libraryHaskellDepends = [ + base bricks-internal bricks-syntax containers text + ]; + testHaskellDepends = [ + base bricks-internal bricks-internal-test bricks-syntax containers + doctest hedgehog template-haskell text + ]; + homepage = "https://github.com/chris-martin/bricks#readme"; + description = "..."; + license = stdenv.lib.licenses.asl20; + }) {}; + + "bricks-syntax" = callPackage + ({ mkDerivation, base, bricks-internal, containers, doctest + , either-list-functions, exceptions, hint, text + }: + mkDerivation { + pname = "bricks-syntax"; + version = "0.0.0.4"; + sha256 = "0bg4vx32fh9fn5lvccayr9dfzynpql08x6ffi0xrw1rkpn2hz415"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bricks-internal containers either-list-functions text + ]; + testHaskellDepends = [ + base bricks-internal containers doctest either-list-functions + exceptions hint text + ]; + homepage = "https://github.com/chris-martin/bricks#readme"; + description = "..."; + license = stdenv.lib.licenses.asl20; + }) {}; + "brillig" = callPackage ({ mkDerivation, base, binary, cmdargs, containers, directory , filepath, ListZipper, text @@ -38897,6 +38985,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "butcher_1_3_0_0" = callPackage + ({ mkDerivation, base, bifunctors, containers, deque, extra, free + , microlens, microlens-th, mtl, multistate, pretty, transformers + , unsafe, void + }: + mkDerivation { + pname = "butcher"; + version = "1.3.0.0"; + sha256 = "0v85ganhfljxyqy9sfmhbqnfdazikmy8a3mpg1w1y827l4a3nkng"; + libraryHaskellDepends = [ + base bifunctors containers deque extra free microlens microlens-th + mtl multistate pretty transformers unsafe void + ]; + testHaskellDepends = [ + base containers deque extra free microlens microlens-th mtl + multistate pretty transformers unsafe + ]; + homepage = "https://github.com/lspitzner/butcher/"; + description = "Chops a command or program invocation into digestable pieces"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "butterflies" = callPackage ({ mkDerivation, base, bytestring, gl-capture, GLUT, OpenGLRaw , OpenGLRaw21, repa, repa-devil @@ -39168,6 +39279,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "bytestring-encodings" = callPackage + ({ mkDerivation, base, bytestring, gauge, ghc-prim, hedgehog, text + }: + mkDerivation { + pname = "bytestring-encodings"; + version = "0.1.0.0"; + sha256 = "070n1203shbfkimkrxr5xs5znpljbb61v7npwp9lgfpj4h8gyaq7"; + libraryHaskellDepends = [ base bytestring ghc-prim ]; + testHaskellDepends = [ base bytestring hedgehog ]; + benchmarkHaskellDepends = [ base bytestring gauge text ]; + description = "checks to see if a given bytestring adheres to a certain encoding"; + license = stdenv.lib.licenses.mit; + }) {}; + "bytestring-from" = callPackage ({ mkDerivation, attoparsec, base, bytestring, QuickCheck, tasty , tasty-quickcheck, text @@ -39585,8 +39710,8 @@ self: { }: mkDerivation { pname = "c-mosquitto"; - version = "0.1.2.0"; - sha256 = "1q2g7wv11d8p5ykbh0m7xd8jx4lvm73i503rz5pvsgmgm39fwy98"; + version = "0.1.3.0"; + sha256 = "0l7vyiynn7wzsf4yvm2f6wn9qmhvi3aj46vwxvgwk33bskhwkr64"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39971,25 +40096,12 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "cabal-doctest"; - version = "1.0.5"; - sha256 = "0x3m97q3xjmvf601vzkx4a8sl77x1y8jf0lwbq67181s37jp9asm"; - libraryHaskellDepends = [ base Cabal directory filepath ]; - homepage = "https://github.com/phadej/cabal-doctest"; - description = "A Setup.hs helper for doctests running"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cabal-doctest_1_0_6" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath }: - mkDerivation { - pname = "cabal-doctest"; version = "1.0.6"; sha256 = "0bgd4jdmzxq5y465r4sf4jv2ix73yvblnr4c9wyazazafddamjny"; libraryHaskellDepends = [ base Cabal directory filepath ]; homepage = "https://github.com/phadej/cabal-doctest"; description = "A Setup.hs helper for doctests running"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-file-th" = callPackage @@ -40549,22 +40661,6 @@ self: { }: mkDerivation { pname = "cabal-toolkit"; - version = "0.0.4"; - sha256 = "04afwsbbqsw9lj7flbnrfwy3qbv1c9nkwm65ylspy2nzf9v06ljj"; - libraryHaskellDepends = [ - base binary bytestring Cabal containers ghc template-haskell - ]; - homepage = "https://github.com/TerrorJack/cabal-toolkit#readme"; - description = "Helper functions for writing custom Setup.hs scripts."; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cabal-toolkit_0_0_5" = callPackage - ({ mkDerivation, base, binary, bytestring, Cabal, containers, ghc - , template-haskell - }: - mkDerivation { - pname = "cabal-toolkit"; version = "0.0.5"; sha256 = "1w3c75avp12ig1bmakgjsp10rb8bnnibxi1sbg96y6gx4g3krbcq"; libraryHaskellDepends = [ @@ -40573,7 +40669,6 @@ self: { homepage = "https://github.com/TerrorJack/cabal-toolkit#readme"; description = "Helper functions for writing custom Setup.hs scripts."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-uninstall" = callPackage @@ -42654,6 +42749,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cayley-client_0_4_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, binary, bytestring + , exceptions, hspec, http-client, http-conduit, lens, lens-aeson + , mtl, text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "cayley-client"; + version = "0.4.3"; + sha256 = "119jihcnrv197a8v6xciav7dlkq6lagwhp3bw2aviyz49bhsq1j6"; + libraryHaskellDepends = [ + aeson attoparsec base binary bytestring exceptions http-client + http-conduit lens lens-aeson mtl text transformers + unordered-containers vector + ]; + testHaskellDepends = [ aeson base hspec unordered-containers ]; + homepage = "https://github.com/MichelBoucey/cayley-client"; + description = "A Haskell client for the Cayley graph database"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cayley-dickson" = callPackage ({ mkDerivation, base, random }: mkDerivation { @@ -48062,28 +48178,6 @@ self: { }: mkDerivation { pname = "comonad"; - version = "5.0.2"; - sha256 = "115pai560rllsmym76bj787kwz5xx19y8bl6262005nddqwzxc0v"; - revision = "2"; - editedCabalFile = "1ngks9bym68rw0xdq43n14nay4kxdxv2n7alwfd9wcpismfz009g"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base containers contravariant distributive semigroups tagged - transformers transformers-compat - ]; - testHaskellDepends = [ base doctest ]; - homepage = "http://github.com/ekmett/comonad/"; - description = "Comonads"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "comonad_5_0_3" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, containers - , contravariant, distributive, doctest, semigroups, tagged - , transformers, transformers-compat - }: - mkDerivation { - pname = "comonad"; version = "5.0.3"; sha256 = "1xjdwm0xvkcqrpyivl6v569dj8xgivw103bzahy14la0cd6mix57"; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -48095,7 +48189,6 @@ self: { homepage = "http://github.com/ekmett/comonad/"; description = "Comonads"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "comonad-extras" = callPackage @@ -48890,24 +48983,6 @@ self: { }: mkDerivation { pname = "concise"; - version = "0.1.0.0"; - sha256 = "0ga10djxmc5n37cf5iazkwivfxipav0q2gb8mbkbg3wnn1qhqxmm"; - libraryHaskellDepends = [ base bytestring lens text ]; - testHaskellDepends = [ - base bytestring lens QuickCheck quickcheck-instances tasty - tasty-quickcheck text - ]; - homepage = "https://github.com/frasertweedal/hs-concise"; - description = "Utilities for Control.Lens.Cons"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "concise_0_1_0_1" = callPackage - ({ mkDerivation, base, bytestring, lens, QuickCheck - , quickcheck-instances, tasty, tasty-quickcheck, text - }: - mkDerivation { - pname = "concise"; version = "0.1.0.1"; sha256 = "09crgc6gjfidlad6263253xx1di6wfhc9awhira21s0z7rddy9sw"; libraryHaskellDepends = [ base bytestring lens text ]; @@ -48918,7 +48993,6 @@ self: { homepage = "https://github.com/frasertweedale/hs-concise"; description = "Utilities for Control.Lens.Cons"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concorde" = callPackage @@ -49244,22 +49318,6 @@ self: { }: mkDerivation { pname = "concurrent-output"; - version = "1.10.2"; - sha256 = "02kfg61f7lm8796n4pdi7yvscg8n869vhl9i6rd9rpyb4l9myzd1"; - libraryHaskellDepends = [ - ansi-terminal async base directory exceptions process stm - terminal-size text transformers unix - ]; - description = "Ungarble output from several threads or commands"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "concurrent-output_1_10_3" = callPackage - ({ mkDerivation, ansi-terminal, async, base, directory, exceptions - , process, stm, terminal-size, text, transformers, unix - }: - mkDerivation { - pname = "concurrent-output"; version = "1.10.3"; sha256 = "0sp5mc7pxw48k0hv17l553bcjr7s5dp9vznm2n6400nyhgmxdha8"; libraryHaskellDepends = [ @@ -49268,7 +49326,6 @@ self: { ]; description = "Ungarble output from several threads or commands"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrent-rpc" = callPackage @@ -49674,27 +49731,6 @@ self: { }: mkDerivation { pname = "conduit-connection"; - version = "0.1.0.3"; - sha256 = "16j3h318i7s3nr9cz6n1v27d7nkmz5s6dp4fbahziy1pgb4bk3kr"; - libraryHaskellDepends = [ - base bytestring conduit connection resourcet transformers - ]; - testHaskellDepends = [ - base bytestring conduit connection HUnit network resourcet - test-framework test-framework-hunit transformers - ]; - homepage = "https://github.com/sdroege/conduit-connection"; - description = "Conduit source and sink for Network.Connection."; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "conduit-connection_0_1_0_4" = callPackage - ({ mkDerivation, base, bytestring, conduit, connection, HUnit - , network, resourcet, test-framework, test-framework-hunit - , transformers - }: - mkDerivation { - pname = "conduit-connection"; version = "0.1.0.4"; sha256 = "1z11r3rf6hmz5b00w4xymp6x0s00acyvbyw6n99wd3b9ycbl2y2y"; libraryHaskellDepends = [ @@ -49707,7 +49743,6 @@ self: { homepage = "https://github.com/sdroege/conduit-connection"; description = "Conduit source and sink for Network.Connection."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-extra" = callPackage @@ -49813,27 +49848,6 @@ self: { }: mkDerivation { pname = "conduit-iconv"; - version = "0.1.1.2"; - sha256 = "02s5jyr6mii45q4nar5fzqr4hsf7b6rw9fyc6g1jrqjr76xk6vsw"; - libraryHaskellDepends = [ base bytestring conduit ]; - testHaskellDepends = [ - base bytestring conduit mtl QuickCheck test-framework - test-framework-quickcheck2 text - ]; - benchmarkHaskellDepends = [ - base bytestring conduit criterion mtl text - ]; - homepage = "https://github.com/sdroege/conduit-iconv"; - description = "Conduit for character encoding conversion"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "conduit-iconv_0_1_1_3" = callPackage - ({ mkDerivation, base, bytestring, conduit, criterion, mtl - , QuickCheck, test-framework, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "conduit-iconv"; version = "0.1.1.3"; sha256 = "1dmcsdx0nz0b9sans2fr8lmrii2n0fsjh41jhwlrlng4h93k0w8w"; libraryHaskellDepends = [ base bytestring conduit ]; @@ -49847,7 +49861,6 @@ self: { homepage = "https://github.com/sdroege/conduit-iconv"; description = "Conduit for character encoding conversion"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-merge" = callPackage @@ -52655,17 +52668,18 @@ self: { }) {}; "crdt" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, Diff, mtl - , network-info, QuickCheck, QuickCheck-GenT, quickcheck-instances - , safe, stm, tasty, tasty-discover, tasty-quickcheck, time, vector + ({ mkDerivation, base, binary, bytestring, containers, Diff + , hashable, mtl, network-info, QuickCheck, QuickCheck-GenT + , quickcheck-instances, safe, stm, tasty, tasty-discover + , tasty-quickcheck, time, vector }: mkDerivation { pname = "crdt"; - version = "7.0"; - sha256 = "17wpc1qn2kid2rw7icx1apaca6znzx1gy0h8j9qap3f2p852z1zk"; + version = "9.0"; + sha256 = "099rpmwwla68vyw366xmzpdyv39hxcpidpkg1l0lx2mjz2jxm6zc"; libraryHaskellDepends = [ - base binary bytestring containers Diff mtl network-info safe stm - time vector + base binary bytestring containers Diff hashable mtl network-info + safe stm time vector ]; testHaskellDepends = [ base containers mtl QuickCheck QuickCheck-GenT quickcheck-instances @@ -54122,19 +54136,6 @@ self: { ({ mkDerivation, attoparsec, base, hspec, QuickCheck, text }: mkDerivation { pname = "css-text"; - version = "0.1.2.2"; - sha256 = "11qrwrjqk2k4bm3bz1qcyscp146raz1hgpzynkd50yaq12n69xfz"; - libraryHaskellDepends = [ attoparsec base text ]; - testHaskellDepends = [ attoparsec base hspec QuickCheck text ]; - homepage = "http://www.yesodweb.com/"; - description = "CSS parser and renderer"; - license = stdenv.lib.licenses.mit; - }) {}; - - "css-text_0_1_3_0" = callPackage - ({ mkDerivation, attoparsec, base, hspec, QuickCheck, text }: - mkDerivation { - pname = "css-text"; version = "0.1.3.0"; sha256 = "0ynd9f4hn2sfwqzbsa0y7phmxq8za7jiblpjwx0ry8b372zhgxaz"; libraryHaskellDepends = [ attoparsec base text ]; @@ -54142,7 +54143,6 @@ self: { homepage = "https://github.com/yesodweb/css-text.git#readme"; description = "CSS parser and renderer"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csv" = callPackage @@ -56354,8 +56354,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "data-forest"; - version = "0.1.0.5"; - sha256 = "05hpi0xr4bp7jigb6qa48n02widxxcn9npjh1y876mkgsdpd4x01"; + version = "0.1.0.6"; + sha256 = "11iisc82cgma5pp6apnjg112dd4cvqxclwf09zh9rh50lzkml9dk"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/chris-martin/data-forest"; @@ -59092,19 +59092,20 @@ self: { }) {}; "dependency" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, binary, containers - , criterion, deepseq, hspec, microlens, recursion-schemes + ({ mkDerivation, ansi-wl-pprint, base, binary, composition-prelude + , containers, criterion, deepseq, hspec, microlens + , recursion-schemes }: mkDerivation { pname = "dependency"; - version = "0.1.0.1"; - sha256 = "0kl8dsflw1g8a5k0x6v0fjc94gxdz6cxn4kj5jydbv63b044m71a"; + version = "0.1.0.5"; + sha256 = "0b1v2vx4yyn90195f02i6dj4phzrb0a1wfb9mj1kq568pl02w3q3"; libraryHaskellDepends = [ - ansi-wl-pprint base binary containers deepseq microlens - recursion-schemes + ansi-wl-pprint base binary composition-prelude containers deepseq + microlens recursion-schemes ]; - testHaskellDepends = [ base hspec ]; - benchmarkHaskellDepends = [ base criterion ]; + testHaskellDepends = [ base containers hspec ]; + benchmarkHaskellDepends = [ base containers criterion ]; description = "Dependency resolution for package management"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -59913,19 +59914,6 @@ self: { ({ mkDerivation, base, dhall, optparse-generic, text }: mkDerivation { pname = "dhall-text"; - version = "1.0.4"; - sha256 = "1ba2sljiq016jhgx7ifh5vjrwxd1czv2gm56h2pig3p0x45ds2wm"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ base dhall optparse-generic text ]; - description = "Template text using Dhall"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dhall-text_1_0_5" = callPackage - ({ mkDerivation, base, dhall, optparse-generic, text }: - mkDerivation { - pname = "dhall-text"; version = "1.0.5"; sha256 = "195nfflpk787m8jjmspw2x4rb2s7vd0z5wz5s0bzfwdl6c7xgg27"; isLibrary = false; @@ -59933,7 +59921,6 @@ self: { executableHaskellDepends = [ base dhall optparse-generic text ]; description = "Template text using Dhall"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhcp-lease-parser" = callPackage @@ -61935,8 +61922,8 @@ self: { }: mkDerivation { pname = "distributed-closure"; - version = "0.3.4.0"; - sha256 = "1c7jf2czaaf24l22aw1j4yj9nksycvsvj708vzj9lb50zhdbpdgg"; + version = "0.3.5"; + sha256 = "0mm3w8l63n9lbifrj32kv5xbb79fiwd4swi2kv2lbnc67b6ig43h"; libraryHaskellDepends = [ base binary bytestring constraints syb template-haskell ]; @@ -63242,6 +63229,37 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "doctest_0_14_0" = callPackage + ({ mkDerivation, base, base-compat, code-page, deepseq, directory + , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process + , QuickCheck, setenv, silently, stringbuilder, syb, transformers + , with-location + }: + mkDerivation { + pname = "doctest"; + version = "0.14.0"; + sha256 = "18qia153653fib1jdrdyvxa3wjcfhdn371r97mwv03q915i4bm3g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-compat code-page deepseq directory filepath ghc ghc-paths + process syb transformers + ]; + executableHaskellDepends = [ + base base-compat code-page deepseq directory filepath ghc ghc-paths + process syb transformers + ]; + testHaskellDepends = [ + base base-compat code-page deepseq directory filepath ghc ghc-paths + hspec HUnit mockery process QuickCheck setenv silently + stringbuilder syb transformers with-location + ]; + homepage = "https://github.com/sol/doctest#readme"; + description = "Test interactive Haskell examples"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "doctest-discover" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, doctest , filepath @@ -66065,8 +66083,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "either-list-functions"; - version = "0.0.0.1"; - sha256 = "1k5zpyii5wkzr1xzfbkl015sj91pghl93ifjs6shgyysyh6b62z5"; + version = "0.0.0.2"; + sha256 = "0m7fkf8r1i0z3zrfmnqsdzk0fc9mhanqmx7x6rjiisjiaf91yr8d"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/chris-martin/either-list-functions#readme"; @@ -69520,18 +69538,6 @@ self: { }) {}; "exact-pi" = callPackage - ({ mkDerivation, base, numtype-dk }: - mkDerivation { - pname = "exact-pi"; - version = "0.4.1.2"; - sha256 = "1qs5zi9c87sypnxdwncdj7dnrylly7s2yvjhm7rx4fxsbxrfdfxj"; - libraryHaskellDepends = [ base numtype-dk ]; - homepage = "https://github.com/dmcclean/exact-pi/"; - description = "Exact rational multiples of pi (and integer powers of pi)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "exact-pi_0_4_1_3" = callPackage ({ mkDerivation, base, numtype-dk, semigroups }: mkDerivation { pname = "exact-pi"; @@ -69541,7 +69547,6 @@ self: { homepage = "https://github.com/dmcclean/exact-pi/"; description = "Exact rational multiples of pi (and integer powers of pi)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exact-real" = callPackage @@ -70266,19 +70271,17 @@ self: { }) {}; "expressions" = callPackage - ({ mkDerivation, attoparsec, base, containers, lattices, QuickCheck - , singletons, tasty, tasty-quickcheck, text, transformers + ({ mkDerivation, attoparsec, base, containers, lattices, singletons + , text, transformers }: mkDerivation { pname = "expressions"; - version = "0.1.4"; - sha256 = "1dxkg5yc2njq7dpv7vgkmrs73x5np5w1ahi79my6ysamnc2w8a04"; + version = "0.1.5"; + sha256 = "1iw6i922wjvs844gqqvmvhvfaq8c06lxlca806s6rbk0sxq40nmz"; libraryHaskellDepends = [ attoparsec base containers lattices singletons text transformers ]; - testHaskellDepends = [ - base QuickCheck singletons tasty tasty-quickcheck text - ]; + testHaskellDepends = [ base singletons text ]; description = "Expressions and Formulae a la carte"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -70289,8 +70292,8 @@ self: { }: mkDerivation { pname = "expressions-z3"; - version = "0.1.1"; - sha256 = "0hk8qhkvlh4v210k7d845krg31px72ma44fmwahbycn6pgy32659"; + version = "0.1.2"; + sha256 = "0q3fnljdsqh1937a8s9a62cmcg1nc787725jp0j32jlmbwwhkfyv"; libraryHaskellDepends = [ base containers expressions singletons transformers z3 ]; @@ -71000,24 +71003,6 @@ self: { }: mkDerivation { pname = "fast-logger"; - version = "2.4.10"; - sha256 = "13b7rrv8dw574k6lbl96nar67fx81058gvilsc42v0lgm38sbi6y"; - libraryHaskellDepends = [ - array auto-update base bytestring directory easy-file filepath text - unix unix-time - ]; - testHaskellDepends = [ base bytestring directory hspec ]; - homepage = "https://github.com/kazu-yamamoto/logger"; - description = "A fast logging system"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fast-logger_2_4_11" = callPackage - ({ mkDerivation, array, auto-update, base, bytestring, directory - , easy-file, filepath, hspec, text, unix, unix-time - }: - mkDerivation { - pname = "fast-logger"; version = "2.4.11"; sha256 = "1ad2vq4nifdxshqk9yrmghqizhkgybfz134kpr6padglb2mxxrdv"; libraryHaskellDepends = [ @@ -71028,7 +71013,6 @@ self: { homepage = "https://github.com/kazu-yamamoto/logger"; description = "A fast logging system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fast-math" = callPackage @@ -73035,6 +73019,8 @@ self: { pname = "finite-field"; version = "0.9.0"; sha256 = "026l5qrc7vsm2s19z10xx30lrsfkwwcymyznyy5hrcrwqj9wf643"; + revision = "1"; + editedCabalFile = "0npwa4gv94b87y4bam9valnjlsy3rbhk7n7hdc1mx1bwkn4acyds"; libraryHaskellDepends = [ base deepseq hashable singletons template-haskell ]; @@ -73641,8 +73627,8 @@ self: { }: mkDerivation { pname = "fizzbuzz-as-a-service"; - version = "0.1.0.1"; - sha256 = "1m2pyvhdj8phj2f1zka6v1p72hzhmaigw2v0n1zwkh3k4hkq90kg"; + version = "0.1.0.2"; + sha256 = "0bskyv1zyk469bikh4rh6ad1i8d5ym9s89a88aw34cpphy0vq1zk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -74644,26 +74630,6 @@ self: { }: mkDerivation { pname = "foldl"; - version = "1.3.5"; - sha256 = "10qsp7dj2xsq4q2xm6x6b12y5pq32qf7my41hnkmdwwbccvhdxb2"; - libraryHaskellDepends = [ - base bytestring comonad containers contravariant hashable - mwc-random primitive profunctors semigroups text transformers - unordered-containers vector vector-builder - ]; - benchmarkHaskellDepends = [ base criterion ]; - description = "Composable, streaming, and efficient left folds"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "foldl_1_3_7" = callPackage - ({ mkDerivation, base, bytestring, comonad, containers - , contravariant, criterion, hashable, mwc-random, primitive - , profunctors, semigroups, text, transformers, unordered-containers - , vector, vector-builder - }: - mkDerivation { - pname = "foldl"; version = "1.3.7"; sha256 = "113966zyk1jj8l1k1izfix8bc1hmpr9w1zahkz592f56wmvmy8kn"; libraryHaskellDepends = [ @@ -74674,7 +74640,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Composable, streaming, and efficient left folds"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "foldl-incremental" = callPackage @@ -76241,32 +76206,6 @@ self: { }: mkDerivation { pname = "freer-simple"; - version = "1.0.0.0"; - sha256 = "11nh0majlmn6aw5qzv5jfs6jx9vxk7jn72568frmryvymn2aqax8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base natural-transformation transformers-base - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base criterion extensible-effects free mtl - ]; - homepage = "https://github.com/lexi-lambda/freer-simple#readme"; - description = "Implementation of a friendly effect system for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "freer-simple_1_0_1_1" = callPackage - ({ mkDerivation, base, criterion, extensible-effects, free, mtl - , natural-transformation, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, transformers-base - }: - mkDerivation { - pname = "freer-simple"; version = "1.0.1.1"; sha256 = "1fdxj1iyh8jl2nghrm51r7gvlk1qwzrjjhj13f0akwrm2s0la1jb"; isLibrary = true; @@ -76284,7 +76223,6 @@ self: { homepage = "https://github.com/lexi-lambda/freer-simple#readme"; description = "Implementation of a friendly effect system for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "freesect" = callPackage @@ -77514,27 +77452,6 @@ self: { }: mkDerivation { pname = "fuzzyset"; - version = "0.1.0.4"; - sha256 = "1nk3qrjcg5q4mnv2lzbw08ikgibix0ns6910z9xixcfq5kgij6my"; - libraryHaskellDepends = [ - base base-unicode-symbols data-default lens text text-metrics - unordered-containers vector - ]; - testHaskellDepends = [ - base base-unicode-symbols hspec ieee754 lens text - unordered-containers - ]; - homepage = "https://github.com/laserpants/fuzzyset-haskell"; - description = "Fuzzy set for approximate string matching"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fuzzyset_0_1_0_6" = callPackage - ({ mkDerivation, base, base-unicode-symbols, data-default, hspec - , ieee754, lens, text, text-metrics, unordered-containers, vector - }: - mkDerivation { - pname = "fuzzyset"; version = "0.1.0.6"; sha256 = "18v1zsmdgy5if7l23vciip6dbbhbpgvn0dy0ray0pqwdcw9yh6kk"; libraryHaskellDepends = [ @@ -77548,7 +77465,6 @@ self: { homepage = "https://github.com/laserpants/fuzzyset-haskell"; description = "Fuzzy set for approximate string matching"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fuzzytime" = callPackage @@ -78451,6 +78367,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "general-games_1_1_1" = callPackage + ({ mkDerivation, base, hspec, HUnit, monad-loops, MonadRandom + , random, random-shuffle + }: + mkDerivation { + pname = "general-games"; + version = "1.1.1"; + sha256 = "1h2h6dbd12xzvgwm7a26scpjyfkcwkmpdkw98nkmb2vk8qsrx3lb"; + libraryHaskellDepends = [ + base monad-loops MonadRandom random random-shuffle + ]; + testHaskellDepends = [ base hspec HUnit MonadRandom ]; + homepage = "https://github.com/cgorski/general-games"; + description = "Library supporting simulation of a number of games"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "general-prelude" = callPackage ({ mkDerivation, base, lens, pointless-fun, strict, system-filepath }: @@ -79061,25 +78995,12 @@ self: { ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { pname = "geniplate-mirror"; - version = "0.7.5"; - sha256 = "17vjps2118s5z3k39ij00lkmkxv3mqf8h59wv6qdamlgmhyr36si"; - libraryHaskellDepends = [ base mtl template-haskell ]; - homepage = "https://github.com/danr/geniplate"; - description = "Use Template Haskell to generate Uniplate-like functions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "geniplate-mirror_0_7_6" = callPackage - ({ mkDerivation, base, mtl, template-haskell }: - mkDerivation { - pname = "geniplate-mirror"; version = "0.7.6"; sha256 = "1y0m0bw5zpm1y1y6d9qmxj3swl8j8hlw1shxbr5awycf6k884ssb"; libraryHaskellDepends = [ base mtl template-haskell ]; homepage = "https://github.com/danr/geniplate"; description = "Use Template Haskell to generate Uniplate-like functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geniserver" = callPackage @@ -79670,8 +79591,8 @@ self: { }: mkDerivation { pname = "geos"; - version = "0.1.0.1"; - sha256 = "1syxxd8qg2d3l045lw0i5mchvbx3k5vhad5bxlg9pyp8isvb7wvi"; + version = "0.1.1.1"; + sha256 = "0z4kqlgqg016233f8smj6jzjd6n7cgsvyff0npnghv1gdlr9pfwc"; libraryHaskellDepends = [ base bytestring mtl transformers vector ]; @@ -80081,30 +80002,6 @@ self: { }: mkDerivation { pname = "ghc-exactprint"; - version = "0.5.5.0"; - sha256 = "0k3y39k1cwb3bs85333gj7fi6l5p9nr950vgzbyswgj13qb4g7b1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers directory filepath free ghc ghc-boot - ghc-paths mtl syb - ]; - testHaskellDepends = [ - base bytestring containers Diff directory filemanip filepath ghc - ghc-boot ghc-paths HUnit mtl silently syb - ]; - description = "ExactPrint for GHC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "ghc-exactprint_0_5_6_0" = callPackage - ({ mkDerivation, base, bytestring, containers, Diff, directory - , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl - , silently, syb - }: - mkDerivation { - pname = "ghc-exactprint"; version = "0.5.6.0"; sha256 = "0fbq7p2kykqq2pzf0mld0brj3pdrgxb1zvpa05pqxsfs66czlbsg"; isLibrary = true; @@ -80466,29 +80363,6 @@ self: { }: mkDerivation { pname = "ghc-prof"; - version = "1.4.0.4"; - sha256 = "037g6ianbij9gx1324fbdmamqjkn6mmw9nvqh5bwpz33srf30lpn"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base containers scientific text time - ]; - executableHaskellDepends = [ base containers scientific text ]; - testHaskellDepends = [ - attoparsec base containers directory filepath process tasty - tasty-hunit temporary text - ]; - homepage = "https://github.com/maoe/ghc-prof"; - description = "Library for parsing GHC time and allocation profiling reports"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-prof_1_4_1" = callPackage - ({ mkDerivation, attoparsec, base, containers, directory, filepath - , process, scientific, tasty, tasty-hunit, temporary, text, time - }: - mkDerivation { - pname = "ghc-prof"; version = "1.4.1"; sha256 = "1jpf2pn37vgwqcnsm799g9s9d7qbxk9d305b6i2k12573cv1x8r4"; isLibrary = true; @@ -80504,7 +80378,6 @@ self: { homepage = "https://github.com/maoe/ghc-prof"; description = "Library for parsing GHC time and allocation profiling reports"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-prof-flamegraph" = callPackage @@ -80902,35 +80775,6 @@ self: { }: mkDerivation { pname = "ghcid"; - version = "0.6.9"; - sha256 = "0bkhbzjjp4n97dsf8q4ggphsfh0rxwgdn4kmg8l87zbrih41gdpc"; - revision = "1"; - editedCabalFile = "0salqw860vc070q04n2cqd5aca4gcysxlcys8znhx6cpgyz6bn91"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base cmdargs directory extra filepath process time - ]; - executableHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process terminal-size time unix - ]; - testHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process tasty tasty-hunit terminal-size time unix - ]; - homepage = "https://github.com/ndmitchell/ghcid#readme"; - description = "GHCi based bare bones IDE"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghcid_0_6_10" = callPackage - ({ mkDerivation, ansi-terminal, base, cmdargs, containers - , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit - , terminal-size, time, unix - }: - mkDerivation { - pname = "ghcid"; version = "0.6.10"; sha256 = "1qqd619pwdlcxvkgfawsqq19a5kl1584ra35ib8769874i6y9awj"; isLibrary = true; @@ -80949,7 +80793,6 @@ self: { homepage = "https://github.com/ndmitchell/ghcid#readme"; description = "GHCi based bare bones IDE"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-ajax" = callPackage @@ -82879,27 +82722,6 @@ self: { }: mkDerivation { pname = "github-release"; - version = "1.1.2"; - sha256 = "0czc53xwg21jvd7g4ggjva0nzc2rpyf36rc4876dss9lckcc2p93"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring http-client http-client-tls http-types - mime-types optparse-generic text unordered-containers uri-templater - ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/tfausak/github-release#readme"; - description = "Upload files to GitHub releases"; - license = stdenv.lib.licenses.mit; - }) {}; - - "github-release_1_1_3" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-client - , http-client-tls, http-types, mime-types, optparse-generic, text - , unordered-containers, uri-templater - }: - mkDerivation { - pname = "github-release"; version = "1.1.3"; sha256 = "040yd8npjv54xfh4fv4i1p9x6qsa5qj1m5wblr7xjf0w090sblf0"; isLibrary = true; @@ -82912,7 +82734,6 @@ self: { homepage = "https://github.com/tfausak/github-release#readme"; description = "Upload files to GitHub releases"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github-tools" = callPackage @@ -91317,6 +91138,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hakyll-dir-list" = callPackage + ({ mkDerivation, base, containers, filepath, hakyll }: + mkDerivation { + pname = "hakyll-dir-list"; + version = "0.1.1.0"; + sha256 = "0j5amghlsjdnvi4klag6ifwwzy05v17bsf7j6lzl32hcx66a62qb"; + libraryHaskellDepends = [ base containers filepath hakyll ]; + homepage = "http://github.com/freylax/hakyll-dir-list"; + description = "Allow Hakyll to create hierarchical menues from directories"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hakyll-elm" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, Elm, hakyll, mtl }: @@ -92056,33 +91889,6 @@ self: { }: mkDerivation { pname = "hapistrano"; - version = "0.3.5.1"; - sha256 = "1zpvwdq9dzfkq9jh1bpc5x8vh41508x0wph5a020q31rknc8llad"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base filepath formatting gitrev mtl path process time transformers - ]; - executableHaskellDepends = [ - aeson async base formatting gitrev optparse-applicative path - path-io stm yaml - ]; - testHaskellDepends = [ - base directory filepath hspec mtl path path-io process temporary - ]; - homepage = "https://github.com/stackbuilders/hapistrano"; - description = "A deployment library for Haskell applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hapistrano_0_3_5_2" = callPackage - ({ mkDerivation, aeson, async, base, directory, filepath - , formatting, gitrev, hspec, mtl, optparse-applicative, path - , path-io, process, stm, temporary, time, transformers, yaml - }: - mkDerivation { - pname = "hapistrano"; version = "0.3.5.2"; sha256 = "0qabrvx93l8wmir4a0rg2iddsal455fx34vvdxj1ngbya25fspw4"; isLibrary = true; @@ -92101,7 +91907,6 @@ self: { homepage = "https://github.com/stackbuilders/hapistrano"; description = "A deployment library for Haskell applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happindicator" = callPackage @@ -92669,25 +92474,6 @@ self: { }: mkDerivation { pname = "happstack-server-tls"; - version = "7.1.6.4"; - sha256 = "1wn0yv4x619sl70fy3ffby78lfjiq9d73d4rsp3mkgr6d3kn45wj"; - libraryHaskellDepends = [ - base bytestring extensible-exceptions happstack-server hslogger - HsOpenSSL network sendfile time unix - ]; - librarySystemDepends = [ openssl ]; - homepage = "http://www.happstack.com/"; - description = "extend happstack-server with https:// support (TLS/SSL)"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) openssl;}; - - "happstack-server-tls_7_1_6_5" = callPackage - ({ mkDerivation, base, bytestring, extensible-exceptions - , happstack-server, hslogger, HsOpenSSL, network, openssl, sendfile - , time, unix - }: - mkDerivation { - pname = "happstack-server-tls"; version = "7.1.6.5"; sha256 = "0hp13wxaghs6ldqpbpyf8agph7b1y488fc516z1n6bvbpzcbhbvq"; libraryHaskellDepends = [ @@ -92698,7 +92484,6 @@ self: { homepage = "http://www.happstack.com/"; description = "extend happstack-server with https:// support (TLS/SSL)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; "happstack-server-tls-cryptonite" = callPackage @@ -92831,24 +92616,6 @@ self: { }: mkDerivation { pname = "happy"; - version = "1.19.8"; - sha256 = "186ky3bly0i3cc56qk3r7j7pxh2108aackq4n2lli7jmbnb3kxsd"; - isLibrary = false; - isExecutable = true; - setupHaskellDepends = [ base Cabal directory filepath ]; - executableHaskellDepends = [ array base containers mtl ]; - testHaskellDepends = [ base process ]; - homepage = "https://www.haskell.org/happy/"; - description = "Happy is a parser generator for Haskell"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "happy_1_19_9" = callPackage - ({ mkDerivation, array, base, Cabal, containers, directory - , filepath, mtl, process - }: - mkDerivation { - pname = "happy"; version = "1.19.9"; sha256 = "138xpxdb7x62lpmgmb6b3v3vgdqqvqn4273jaap3mjmc2gla709y"; revision = "1"; @@ -92861,7 +92628,6 @@ self: { homepage = "https://www.haskell.org/happy/"; description = "Happy is a parser generator for Haskell"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happy-meta" = callPackage @@ -99046,32 +98812,6 @@ self: { ({ mkDerivation, ansi-terminal, async, base, bytestring , concurrent-output, containers, directory, exceptions , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive - , random, resourcet, stm, template-haskell, text, th-lift, time - , transformers, transformers-base, unix, wl-pprint-annotated - }: - mkDerivation { - pname = "hedgehog"; - version = "0.5.1"; - sha256 = "0fx3dq45azxrhihhq6hlb89zkj3y8fmnfdrsz1wbvih9a3dhiwx7"; - libraryHaskellDepends = [ - ansi-terminal async base bytestring concurrent-output containers - directory exceptions lifted-async mmorph monad-control mtl - pretty-show primitive random resourcet stm template-haskell text - th-lift time transformers transformers-base unix - wl-pprint-annotated - ]; - testHaskellDepends = [ - base containers pretty-show text transformers - ]; - homepage = "https://hedgehog.qa"; - description = "Hedgehog will eat all your bugs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hedgehog_0_5_2" = callPackage - ({ mkDerivation, ansi-terminal, async, base, bytestring - , concurrent-output, containers, directory, exceptions - , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive , random, resourcet, semigroups, stm, template-haskell, text , th-lift, time, transformers, transformers-base, unix , wl-pprint-annotated @@ -99093,7 +98833,6 @@ self: { homepage = "https://hedgehog.qa"; description = "Hedgehog will eat all your bugs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hedgehog-checkers" = callPackage @@ -103232,6 +102971,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) openblasCompat;}; + "hmatrix-backprop" = callPackage + ({ mkDerivation, ANum, backprop, base, finite-typelits + , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog + , hmatrix, hmatrix-vector-sized, microlens, microlens-platform + , vector, vector-sized + }: + mkDerivation { + pname = "hmatrix-backprop"; + version = "0.1.0.0"; + sha256 = "088spv7149788iwda2pyf6fc9i40vq4dfziqldgxjrnngxw9z8iv"; + libraryHaskellDepends = [ + ANum backprop base ghc-typelits-knownnat ghc-typelits-natnormalise + hmatrix hmatrix-vector-sized microlens vector vector-sized + ]; + testHaskellDepends = [ + backprop base finite-typelits hedgehog hmatrix hmatrix-vector-sized + microlens microlens-platform vector-sized + ]; + homepage = "https://github.com/mstksg/hmatrix-backprop#readme"; + description = "hmatrix operations lifted for backprop"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hmatrix-banded" = callPackage ({ mkDerivation, base, hmatrix, liblapack, transformers }: mkDerivation { @@ -103473,6 +103235,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hmatrix-vector-sized" = callPackage + ({ mkDerivation, base, ghc-typelits-knownnat, hedgehog, hmatrix + , vector, vector-sized + }: + mkDerivation { + pname = "hmatrix-vector-sized"; + version = "0.1.1.0"; + sha256 = "079vq2n3w3f32dnlyxa8kn6dif0dd6nr8n1g9lnfw0d339cxqklb"; + libraryHaskellDepends = [ base hmatrix vector vector-sized ]; + testHaskellDepends = [ + base ghc-typelits-knownnat hedgehog hmatrix vector vector-sized + ]; + homepage = "https://github.com/mstksg/hmatrix-vector-sized#readme"; + description = "Conversions between hmatrix and vector-sized types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hmeap" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-lexing , delimited-text, parsec @@ -104075,10 +103854,11 @@ self: { }: mkDerivation { pname = "hocker"; - version = "1.0.4"; - sha256 = "1lf8m6cd54vc436krl3j4kanmnd86r4ri45a1qp7y4qqlpplcnpf"; + version = "1.0.5"; + sha256 = "0xv22kiw44y72asrnk027h9gxpfhjzgdm8sbcy70s4ipn8n62hha"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-wl-pprint async base bytestring concurrentoutput containers cryptonite data-fix deepseq directory @@ -105410,26 +105190,6 @@ self: { }) {}; "hourglass" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq, mtl - , old-locale, tasty, tasty-hunit, tasty-quickcheck, time - }: - mkDerivation { - pname = "hourglass"; - version = "0.2.10"; - sha256 = "104d1yd84hclprg740nkz60vx589mnm094zriw6zczbgg8nkclym"; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ - base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq mtl old-locale time - ]; - homepage = "https://github.com/vincenthz/hs-hourglass"; - description = "simple performant time related library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hourglass_0_2_11" = callPackage ({ mkDerivation, base, bytestring, deepseq, gauge, mtl, old-locale , tasty, tasty-hunit, tasty-quickcheck, time }: @@ -105447,7 +105207,6 @@ self: { homepage = "https://github.com/vincenthz/hs-hourglass"; description = "simple performant time related library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hourglass-fuzzy-parsing" = callPackage @@ -105651,6 +105410,8 @@ self: { pname = "hpack"; version = "0.25.0"; sha256 = "0nz8hrfw59pcd685qqkhikwwzrg5aaiynlxlsga8gqfzx0gsjwip"; + revision = "1"; + editedCabalFile = "0z4bnrikf4mnf9slij1f58y2lkayag5ni1s027rimayjgpdigds1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105989,37 +105750,6 @@ self: { "hpio" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory - , doctest, exceptions, filepath, hlint, hspec, monad-control - , monad-logger, mtl, optparse-applicative, protolude, QuickCheck - , text, transformers, transformers-base, unix, unix-bytestring - }: - mkDerivation { - pname = "hpio"; - version = "0.9.0.3"; - sha256 = "0cz7dxxxxfr142gr3hrq1k1x8axdgvyw7bsjsd1v9spka2i03rcd"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers directory exceptions filepath - monad-control monad-logger mtl protolude QuickCheck text - transformers transformers-base unix unix-bytestring - ]; - executableHaskellDepends = [ - async base exceptions mtl optparse-applicative protolude text - transformers - ]; - testHaskellDepends = [ - base containers directory doctest exceptions filepath hlint hspec - protolude QuickCheck - ]; - homepage = "https://github.com/quixoftic/hpio#readme"; - description = "Monads for GPIO in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hpio_0_9_0_5" = callPackage - ({ mkDerivation, async, base, bytestring, containers, directory , doctest, exceptions, filepath, hspec, monad-control, monad-logger , mtl, optparse-applicative, protolude, QuickCheck, text , transformers, transformers-base, unix, unix-bytestring @@ -106210,6 +105940,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hprotoc_2_4_7" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , directory, filepath, haskell-src-exts, mtl, parsec + , protocol-buffers, protocol-buffers-descriptor, utf8-string + }: + mkDerivation { + pname = "hprotoc"; + version = "2.4.7"; + sha256 = "0rbifp2n2vb2bhk8wgdkmp0q2dqv7vlcwsqgpl8b7xhkfn706ps5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base binary bytestring containers directory filepath + haskell-src-exts mtl parsec protocol-buffers + protocol-buffers-descriptor utf8-string + ]; + libraryToolDepends = [ alex ]; + executableHaskellDepends = [ + array base binary bytestring containers directory filepath + haskell-src-exts mtl parsec protocol-buffers + protocol-buffers-descriptor utf8-string + ]; + executableToolDepends = [ alex ]; + homepage = "https://github.com/k-bx/protocol-buffers"; + description = "Parse Google Protocol Buffer specifications"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hprotoc-fork" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , directory, filepath, haskell-src-exts, mtl, parsec @@ -107181,22 +106940,23 @@ self: { "hs2ats" = callPackage ({ mkDerivation, ansi-wl-pprint, base, cases, composition-prelude - , criterion, deepseq, haskell-src-exts, hspec, hspec-dirstream - , language-ats, lens, optparse-generic, system-filepath, text + , cpphs, criterion, deepseq, haskell-src-exts, hspec + , hspec-dirstream, language-ats, lens, optparse-generic + , system-filepath, text }: mkDerivation { pname = "hs2ats"; - version = "0.2.1.3"; - sha256 = "1np1sd6s6dxq0kd87w5bf98xkffjaj354s9g7ah1fjmr36shvwib"; + version = "0.2.1.5"; + sha256 = "0jxyj9pggs4m2ypw12z5xjrc5r0cq5gxi3dllbmvvablxlwzfkv1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base cases composition-prelude deepseq + ansi-wl-pprint base cases composition-prelude cpphs deepseq haskell-src-exts language-ats lens optparse-generic text ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base hspec hspec-dirstream language-ats system-filepath + base hspec hspec-dirstream system-filepath ]; benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/vmchale/hs2ats#readme"; @@ -108128,23 +107888,6 @@ self: { ({ mkDerivation, adns, base, containers, network }: mkDerivation { pname = "hsdns"; - version = "1.7"; - sha256 = "1lsw422k64b8m7s98j1i6qxll1kyzpv3bb0a2wwf7lghw74hm5j8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base containers network ]; - librarySystemDepends = [ adns ]; - executableHaskellDepends = [ base network ]; - homepage = "http://github.com/peti/hsdns"; - description = "Asynchronous DNS Resolver"; - license = stdenv.lib.licenses.lgpl3; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {inherit (pkgs) adns;}; - - "hsdns_1_7_1" = callPackage - ({ mkDerivation, adns, base, containers, network }: - mkDerivation { - pname = "hsdns"; version = "1.7.1"; sha256 = "0i50p31zxsrkx9hv3mqcl2042lf922b1fsswmd99d66ybkl01kag"; isLibrary = true; @@ -108154,7 +107897,6 @@ self: { homepage = "http://github.com/peti/hsdns"; description = "Asynchronous DNS Resolver"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) adns;}; @@ -108771,6 +108513,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hsmodetweaks" = callPackage + ({ mkDerivation, base, containers, directory, hpack, protolude + , text + }: + mkDerivation { + pname = "hsmodetweaks"; + version = "0.1.0.1"; + sha256 = "1nwmfd6wvwis58z97amgzix42mcqj5nsj915593w2cw7j5sv5y17"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers directory hpack protolude text + ]; + homepage = "https://github.com/mwotton/scriptable/#hsmodetweaks"; + description = "Tool for generating .dir-locals.el for intero"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hsmtpclient" = callPackage ({ mkDerivation, array, base, directory, network, old-time }: mkDerivation { @@ -109075,15 +108835,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec_2_4_7" = callPackage + "hspec_2_4_8" = callPackage ({ mkDerivation, base, call-stack, directory, hspec-core , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck , stringbuilder, transformers }: mkDerivation { pname = "hspec"; - version = "2.4.7"; - sha256 = "1jvf7x43gkch4b8nxqdascqlh4rh2d1qvl44skwqkz0gw154ldan"; + version = "2.4.8"; + sha256 = "18pddkfz661b1nr1nziq8cnmlzxiqzzmrcrk3iwn476vi3bf1m4l"; libraryHaskellDepends = [ base call-stack hspec-core hspec-discover hspec-expectations HUnit QuickCheck transformers @@ -109174,25 +108934,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-core_2_4_7" = callPackage - ({ mkDerivation, ansi-terminal, array, async, base, call-stack - , deepseq, directory, filepath, hspec-expectations, hspec-meta - , HUnit, process, QuickCheck, quickcheck-io, random, setenv - , silently, temporary, tf-random, time, transformers + "hspec-core_2_4_8" = callPackage + ({ mkDerivation, ansi-terminal, array, base, call-stack, deepseq + , directory, filepath, hspec-expectations, hspec-meta, HUnit + , process, QuickCheck, quickcheck-io, random, setenv, silently, stm + , temporary, tf-random, time, transformers }: mkDerivation { pname = "hspec-core"; - version = "2.4.7"; - sha256 = "0syjbx3s62shwddp75qj0nfwmfjn0yflja4bh23x161xpx1g0igx"; + version = "2.4.8"; + sha256 = "02zr6n7mqdncvf1braf38zjdplaxrkg11x9k8717k4yg57585ji4"; libraryHaskellDepends = [ - ansi-terminal array async base call-stack deepseq directory - filepath hspec-expectations HUnit QuickCheck quickcheck-io random - setenv tf-random time transformers + ansi-terminal array base call-stack deepseq directory filepath + hspec-expectations HUnit QuickCheck quickcheck-io random setenv stm + tf-random time transformers ]; testHaskellDepends = [ - ansi-terminal array async base call-stack deepseq directory - filepath hspec-expectations hspec-meta HUnit process QuickCheck - quickcheck-io random setenv silently temporary tf-random time + ansi-terminal array base call-stack deepseq directory filepath + hspec-expectations hspec-meta HUnit process QuickCheck + quickcheck-io random setenv silently stm temporary tf-random time transformers ]; testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; @@ -109237,13 +108997,13 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-discover_2_4_7" = callPackage + "hspec-discover_2_4_8" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.4.7"; - sha256 = "1cgj6c6f5vpn36jg2j7v80nr87x1dsf7qyvxvjw8qimjdxrcx0ba"; + version = "2.4.8"; + sha256 = "0llwdfpjgfpi7dr8caw0fldb9maqznmqh4awkvx72bz538gqmlka"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -110607,25 +110367,6 @@ self: { }: mkDerivation { pname = "hsx2hs"; - version = "0.14.1.1"; - sha256 = "0hymdradb2vsx7gpdwrlmkv1qg4p2r5l6pfiqc4ijyn152jrgr7b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring haskell-src-exts haskell-src-meta mtl - template-haskell utf8-string - ]; - homepage = "https://github.com/seereason/hsx2hs"; - description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hsx2hs_0_14_1_2" = callPackage - ({ mkDerivation, base, bytestring, haskell-src-exts - , haskell-src-meta, mtl, template-haskell, utf8-string - }: - mkDerivation { - pname = "hsx2hs"; version = "0.14.1.2"; sha256 = "06j2nc2yg8a8pp3c2ayxrm76fj2w2w5d2ilq91hvwwb1ikrklg5b"; isLibrary = true; @@ -110637,7 +110378,6 @@ self: { homepage = "https://github.com/seereason/hsx2hs"; description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsyscall" = callPackage @@ -111275,34 +111015,6 @@ self: { "http-api-data" = callPackage ({ mkDerivation, attoparsec, attoparsec-iso8601, base, bytestring , Cabal, cabal-doctest, containers, directory, doctest, filepath - , hashable, hspec, http-types, HUnit, QuickCheck - , quickcheck-instances, text, time, time-locale-compat - , unordered-containers, uri-bytestring, uuid, uuid-types - }: - mkDerivation { - pname = "http-api-data"; - version = "0.3.7.1"; - sha256 = "1zbmf0kkfsw7pfznisi205gh7jd284gfarxsyiavd2iw26akwqwc"; - revision = "1"; - editedCabalFile = "0g57k71bssf81yba6xf9fcxlys8m5ax5kvrs4gvckahf5ihdxds6"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - attoparsec attoparsec-iso8601 base bytestring containers hashable - http-types text time time-locale-compat unordered-containers - uri-bytestring uuid-types - ]; - testHaskellDepends = [ - base bytestring directory doctest filepath hspec HUnit QuickCheck - quickcheck-instances text time unordered-containers uuid - ]; - homepage = "http://github.com/fizruk/http-api-data"; - description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http-api-data_0_3_7_2" = callPackage - ({ mkDerivation, attoparsec, attoparsec-iso8601, base, bytestring - , Cabal, cabal-doctest, containers, directory, doctest, filepath , hashable, hspec, hspec-discover, http-types, HUnit, QuickCheck , quickcheck-instances, text, time, time-locale-compat , unordered-containers, uri-bytestring, uuid, uuid-types @@ -111325,7 +111037,6 @@ self: { homepage = "http://github.com/fizruk/http-api-data"; description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-attoparsec" = callPackage @@ -111350,35 +111061,6 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.5.9"; - sha256 = "0bccpvinzc7z5v83grjzvd3g3kdz2q5h2206l7x9jh4bvz9prblf"; - libraryHaskellDepends = [ - array base base64-bytestring blaze-builder bytestring - case-insensitive containers cookie deepseq exceptions filepath - ghc-prim http-types mime-types network network-uri random stm - streaming-commons text time transformers - ]; - testHaskellDepends = [ - async base base64-bytestring blaze-builder bytestring - case-insensitive containers deepseq directory hspec http-types - monad-control network network-uri streaming-commons text time - transformers zlib - ]; - doCheck = false; - homepage = "https://github.com/snoyberg/http-client"; - description = "An HTTP client engine"; - license = stdenv.lib.licenses.mit; - }) {}; - - "http-client_0_5_10" = callPackage - ({ mkDerivation, array, async, base, base64-bytestring - , blaze-builder, bytestring, case-insensitive, containers, cookie - , deepseq, directory, exceptions, filepath, ghc-prim, hspec - , http-types, mime-types, monad-control, network, network-uri - , random, stm, streaming-commons, text, time, transformers, zlib - }: - mkDerivation { - pname = "http-client"; version = "0.5.10"; sha256 = "1hmshs97smigqy334rfkgv3vri5fas3cj8zz2gqlby9jsrp6kygm"; libraryHaskellDepends = [ @@ -111397,7 +111079,6 @@ self: { homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-client-auth" = callPackage @@ -111552,29 +111233,6 @@ self: { "http-client-tls" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, connection - , containers, criterion, cryptonite, data-default-class, exceptions - , hspec, http-client, http-types, memory, network, network-uri - , text, tls, transformers - }: - mkDerivation { - pname = "http-client-tls"; - version = "0.3.5.1"; - sha256 = "0n4mi8z77qaggfyq17z79cl304nf1f4h6gag60v4wjwghvmj7yn1"; - libraryHaskellDepends = [ - base bytestring case-insensitive connection containers cryptonite - data-default-class exceptions http-client http-types memory network - network-uri text tls transformers - ]; - testHaskellDepends = [ base hspec http-client http-types ]; - benchmarkHaskellDepends = [ base criterion http-client ]; - doCheck = false; - homepage = "https://github.com/snoyberg/http-client"; - description = "http-client backend using the connection package and tls library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "http-client-tls_0_3_5_3" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, connection , containers, cryptonite, data-default-class, exceptions, gauge , hspec, http-client, http-types, memory, network, network-uri , text, tls, transformers @@ -111596,7 +111254,6 @@ self: { homepage = "https://github.com/snoyberg/http-client"; description = "http-client backend using the connection package and tls library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-common" = callPackage @@ -111908,27 +111565,6 @@ self: { }: mkDerivation { pname = "http-media"; - version = "0.7.1.1"; - sha256 = "0k58368im14jwsd4wpyw9kl166zbi14ccl3adjigx8yf8k61n7zz"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers utf8-string - ]; - testHaskellDepends = [ - base bytestring case-insensitive containers QuickCheck - test-framework test-framework-quickcheck2 utf8-string - ]; - homepage = "https://github.com/zmthy/http-media"; - description = "Processing HTTP Content-Type and Accept headers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "http-media_0_7_1_2" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , QuickCheck, test-framework, test-framework-quickcheck2 - , utf8-string - }: - mkDerivation { - pname = "http-media"; version = "0.7.1.2"; sha256 = "01vvrd6yb2aykha7y1c13ylnkyws2wy68vqbdb7kmbzwbdxdb4zy"; libraryHaskellDepends = [ @@ -111941,7 +111577,6 @@ self: { homepage = "https://github.com/zmthy/http-media"; description = "Processing HTTP Content-Type and Accept headers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-monad" = callPackage @@ -112658,8 +112293,8 @@ self: { ({ mkDerivation, base, text }: mkDerivation { pname = "human-parse"; - version = "0.1.0.2"; - sha256 = "1p7r26b3845fbdp2lxv6pqbqrlfzna8qsh7k3b1rkj3qlbw64rym"; + version = "0.1.0.3"; + sha256 = "0lr2m5gci1k0x7w1i49cb6nhbnnkym4raaagn916ahf79y05jv7d"; libraryHaskellDepends = [ base text ]; homepage = "https://github.com/chris-martin/human"; description = "A lawless typeclass for parsing text entered by humans"; @@ -112685,8 +112320,8 @@ self: { ({ mkDerivation, base, text }: mkDerivation { pname = "human-text"; - version = "0.1.0.2"; - sha256 = "1jq9ksszwiy0bddw5c0zx037ig0gvsc5k030h6znkvmkpcvg096q"; + version = "0.1.0.3"; + sha256 = "0v6wrs9mcmiwk9ladjcibw1yqpbbl0y6v9i3ni39v0byby0a2zpa"; libraryHaskellDepends = [ base text ]; homepage = "https://github.com/chris-martin/human"; description = "A lawless typeclass for converting values to human-friendly text"; @@ -115916,20 +115551,6 @@ self: { ({ mkDerivation, base, process }: mkDerivation { pname = "ihs"; - version = "0.1.0.1"; - sha256 = "0q7wa5pgf4ga7pmjwjxacqmdbhqricsv9xkzfrcg314lag8wvdgb"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ base process ]; - homepage = "https://github.com/minad/ihs"; - description = "Interpolated Haskell"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "ihs_0_1_0_2" = callPackage - ({ mkDerivation, base, process }: - mkDerivation { - pname = "ihs"; version = "0.1.0.2"; sha256 = "0cprv8g7kz07s5954020ac9yfggf3d2wmwp4xa61q4sz5rs7wiwq"; isLibrary = false; @@ -115938,7 +115559,6 @@ self: { homepage = "https://github.com/minad/ihs"; description = "Interpolated Haskell"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihttp" = callPackage @@ -116927,6 +116547,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "indexed-list-literals" = callPackage + ({ mkDerivation, base, OneTuple }: + mkDerivation { + pname = "indexed-list-literals"; + version = "0.1.0.1"; + sha256 = "1l38x0s90gfsrfz43k9sx0xbv4pg93m2pfm6hy3rk52wdxrw0qad"; + libraryHaskellDepends = [ base OneTuple ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/davidm-d/indexed-list-literals"; + description = "Type safe indexed list literals"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "indextype" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { @@ -117132,37 +116765,6 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.2.2.2"; - sha256 = "18aijaz7lv64zqkpydmny8nga48fg5lsbmphlk7b92hcfbp8vw4f"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring clock containers foldl http-client - http-types lens network optional-args scientific text time - unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base bytestring containers foldl http-client lens mwc-random - network optional-args text time vector - ]; - testHaskellDepends = [ - base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck - tasty-th text vector - ]; - homepage = "https://github.com/maoe/influxdb-haskell"; - description = "Haskell client library for InfluxDB"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "influxdb_1_2_2_3" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, clock - , containers, foldl, http-client, http-types, HUnit, lens, mtl - , mwc-random, network, optional-args, scientific, tasty - , tasty-hunit, tasty-quickcheck, tasty-th, text, time - , unordered-containers, vector - }: - mkDerivation { - pname = "influxdb"; version = "1.2.2.3"; sha256 = "14454644vlkyd27ywhsvkczxdxdwqkl917zcb51ay68gdnrrwm1i"; isLibrary = true; @@ -117183,7 +116785,6 @@ self: { homepage = "https://github.com/maoe/influxdb-haskell"; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "informative" = callPackage @@ -117974,18 +117575,20 @@ self: { "intero" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, ghc, ghc-boot-th, ghc-paths, ghci, haskeline, hspec - , process, regex-compat, syb, temporary, time, transformers, unix + , network, process, random, regex-compat, syb, temporary, time + , transformers, unix }: mkDerivation { pname = "intero"; - version = "0.1.24"; - sha256 = "022ad802z5h55az357047sf6fngp08by7ms71r2kiqkzbccldqgv"; + version = "0.1.26"; + sha256 = "1f00ma72hmhb3cd9pfhkcks3878ni690bcqw53lrbp6f6b4r5p5v"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ array base bytestring containers directory filepath ghc ghc-boot-th - ghc-paths ghci haskeline process syb time transformers unix + ghc-paths ghci haskeline network process random syb time + transformers unix ]; testHaskellDepends = [ base directory filepath hspec process regex-compat temporary @@ -118959,17 +118562,17 @@ self: { "irc-client" = callPackage ({ mkDerivation, base, bytestring, conduit, connection, containers , contravariant, exceptions, irc-conduit, irc-ctcp, mtl - , network-conduit-tls, old-locale, profunctors, stm, stm-conduit + , network-conduit-tls, old-locale, profunctors, stm, stm-chans , text, time, tls, transformers, x509, x509-store, x509-validation }: mkDerivation { pname = "irc-client"; - version = "1.0.1.0"; - sha256 = "0c0vzmzpryjfv22kxinnqjf7rkj51dz7shi1gn8ivgcmnhf9hl57"; + version = "1.0.1.1"; + sha256 = "1d5xy2q5pkyn4i6d9myw27wr75xci05s446l23kdjli2ldh0g4nx"; libraryHaskellDepends = [ base bytestring conduit connection containers contravariant exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale - profunctors stm stm-conduit text time tls transformers x509 + profunctors stm stm-chans text time tls transformers x509 x509-store x509-validation ]; homepage = "https://github.com/barrucadu/irc-client"; @@ -119017,8 +118620,8 @@ self: { }: mkDerivation { pname = "irc-conduit"; - version = "0.2.2.4"; - sha256 = "118ksbf8kh0bmwk5m32qv609kggwssm3a56zc14f8bg67bkdkrc4"; + version = "0.2.2.5"; + sha256 = "1f9dvs4z15wym2a7dpm9h7m3ffpj8d089k6q28my6yx10mi93ksj"; libraryHaskellDepends = [ async base bytestring conduit conduit-extra connection irc irc-ctcp network-conduit-tls profunctors text time tls transformers @@ -119234,20 +118837,21 @@ self: { "iri" = callPackage ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring - , contravariant, ip, profunctors, ptr, punycode, QuickCheck - , quickcheck-instances, rerebase, semigroups, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text, text-builder, th-lift - , th-lift-instances, unordered-containers, vector, vector-builder + , contravariant, hashable, ip, profunctors, ptr, punycode + , QuickCheck, quickcheck-instances, rerebase, semigroups, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, text + , text-builder, th-lift, th-lift-instances, unordered-containers + , vector, vector-builder, vector-instances }: mkDerivation { pname = "iri"; - version = "0.3"; - sha256 = "008ydrls1gyh0jvcjc51zlgzbkq7ajd8pvyfc4zqgprv9naym9zm"; + version = "0.3.3"; + sha256 = "10apl3d1rxc36i50zvfigwqfdk79rg15ir0ga7x9bxa8kjy6szp1"; libraryHaskellDepends = [ - attoparsec base base-prelude bug bytestring contravariant ip - profunctors ptr punycode semigroups template-haskell text + attoparsec base base-prelude bug bytestring contravariant hashable + ip profunctors ptr punycode semigroups template-haskell text text-builder th-lift th-lift-instances unordered-containers vector - vector-builder + vector-builder vector-instances ]; testHaskellDepends = [ QuickCheck quickcheck-instances rerebase tasty tasty-hunit @@ -121354,6 +120958,8 @@ self: { pname = "json-autotype"; version = "1.0.18"; sha256 = "0h2aiq7k6s2qw81mrj77i86vfaci0387cwm6lbfzfag3r4993w7h"; + revision = "1"; + editedCabalFile = "0f67frvi5jsn47w02kqi834mkjy4kz451fic5m4i24lyykw19kvm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122345,6 +121951,24 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "justified-containers_0_3_0_0" = callPackage + ({ mkDerivation, base, containers, ghc-prim, hspec, QuickCheck + , roles, should-not-typecheck + }: + mkDerivation { + pname = "justified-containers"; + version = "0.3.0.0"; + sha256 = "11ryff281gbn46zz7vax97h0qn5xn1mk7gdjpb38xs9ns36c0c6q"; + libraryHaskellDepends = [ base containers roles ]; + testHaskellDepends = [ + base containers ghc-prim hspec QuickCheck should-not-typecheck + ]; + homepage = "https://github.com/matt-noonan/justified-containers"; + description = "Keyed container types with type-checked proofs of key presence"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jvm" = callPackage ({ mkDerivation, base, bytestring, choice, constraints, criterion , deepseq, distributed-closure, exceptions, hspec, jni, singletons @@ -122933,39 +122557,6 @@ self: { }: mkDerivation { pname = "katip-elasticsearch"; - version = "0.4.0.3"; - sha256 = "0aji0738dz7i0lry30y6rpfbhvcpc79mfqc77nlvaplb3plw0m51"; - libraryHaskellDepends = [ - aeson async base bloodhound bytestring enclosed-exceptions - exceptions http-client http-types katip retry scientific stm - stm-chans text time transformers unordered-containers uuid - ]; - testHaskellDepends = [ - aeson base bloodhound bytestring containers http-client http-types - katip lens lens-aeson quickcheck-instances scientific stm tagged - tasty tasty-hunit tasty-quickcheck text time transformers - unordered-containers vector - ]; - benchmarkHaskellDepends = [ - aeson base bloodhound criterion deepseq random text - unordered-containers uuid - ]; - homepage = "https://github.com/Soostone/katip"; - description = "ElasticSearch scribe for the Katip logging framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "katip-elasticsearch_0_4_0_4" = callPackage - ({ mkDerivation, aeson, async, base, bloodhound, bytestring - , containers, criterion, deepseq, enclosed-exceptions, exceptions - , http-client, http-types, katip, lens, lens-aeson - , quickcheck-instances, random, retry, scientific, stm, stm-chans - , tagged, tasty, tasty-hunit, tasty-quickcheck, text, time - , transformers, unordered-containers, uuid, vector - }: - mkDerivation { - pname = "katip-elasticsearch"; version = "0.4.0.4"; sha256 = "0zg0f5czqff9zd0rnkj68bmxmizrl01q4wbvz43hj5j8mj0jzybj"; libraryHaskellDepends = [ @@ -125427,8 +125018,8 @@ self: { }: mkDerivation { pname = "language-ats"; - version = "0.2.0.5"; - sha256 = "12dnyx6z644f1i5f3mybqisa3x8kfsvbqvd0ab0lyg4mv1b9c6lh"; + version = "0.3.0.1"; + sha256 = "0afp2r77h8z0fx5qxxadb4vxnrj76varfisr12p7r0nm4ljy6vmz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint array base composition-prelude deepseq @@ -126250,54 +125841,6 @@ self: { , lens-aeson, megaparsec, memory, mtl, neat-interpolation , operational, optparse-applicative, parallel-io, parsec , pcre-utils, process, protolude, random, regex-pcre-builtin - , scientific, semigroups, servant, servant-client, split, stm - , strict-base-types, temporary, text, time, transformers, unix - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "language-puppet"; - version = "1.3.13"; - sha256 = "1qngbjpyxd7m4jawc40095v84a8bgk4xk7an9lb1yzp739nvcln1"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring - case-insensitive containers cryptonite directory exceptions - filecache filepath formatting hashable hruby hslogger hspec - http-api-data http-client lens lens-aeson megaparsec memory mtl - operational parsec pcre-utils process protolude random - regex-pcre-builtin scientific semigroups servant servant-client - split stm strict-base-types text time transformers unix - unordered-containers vector yaml - ]; - executableHaskellDepends = [ - aeson ansi-wl-pprint base bytestring containers Glob hslogger - http-client lens megaparsec mtl optparse-applicative parallel-io - regex-pcre-builtin servant-client strict-base-types text - transformers unordered-containers vector yaml - ]; - testHaskellDepends = [ - ansi-wl-pprint base Glob hslogger hspec hspec-megaparsec HUnit lens - megaparsec mtl neat-interpolation protolude scientific - strict-base-types temporary text transformers unix - unordered-containers vector - ]; - homepage = "http://lpuppet.banquise.net/"; - description = "Tools to parse and evaluate the Puppet DSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-linux" ]; - }) {}; - - "language-puppet_1_3_14" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base - , base16-bytestring, bytestring, case-insensitive, containers - , cryptonite, directory, exceptions, filecache, filepath - , formatting, Glob, hashable, hruby, hslogger, hspec - , hspec-megaparsec, http-api-data, http-client, HUnit, lens - , lens-aeson, megaparsec, memory, mtl, neat-interpolation - , operational, optparse-applicative, parallel-io, parsec - , pcre-utils, process, protolude, random, regex-pcre-builtin , scientific, servant, servant-client, split, stm , strict-base-types, temporary, text, time, transformers, unix , unordered-containers, vector, yaml @@ -126334,7 +125877,7 @@ self: { homepage = "http://lpuppet.banquise.net/"; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "x86_64-linux" ]; }) {}; "language-python" = callPackage @@ -127145,19 +126688,6 @@ self: { }) {}; "lca" = callPackage - ({ mkDerivation, base, doctest }: - mkDerivation { - pname = "lca"; - version = "0.3"; - sha256 = "081fk0ci5vb84w4zwah6qwbr0i78v2pr6m6nn1y226vv5w3kakza"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; - homepage = "http://github.com/ekmett/lca/"; - description = "O(log n) persistent on-line lowest common ancestor calculation without preprocessing"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lca_0_3_1" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, doctest }: mkDerivation { pname = "lca"; @@ -127169,7 +126699,6 @@ self: { homepage = "http://github.com/ekmett/lca/"; description = "O(log n) persistent online lowest common ancestor search without preprocessing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lcs" = callPackage @@ -130654,15 +130183,15 @@ self: { }) {}; "list-t-libcurl" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, curlhs, either - , list-t, mtl-prelude, resource-pool, stm + ({ mkDerivation, base, base-prelude, bytestring, curlhs, list-t + , mtl-prelude, resource-pool, stm }: mkDerivation { pname = "list-t-libcurl"; - version = "0.3.1"; - sha256 = "0bfyz3k38ns8zak1lyyz4bkl6gd8yylwqpgwddxdpdbk9n4smj7h"; + version = "0.3.3"; + sha256 = "0sm1aflzh5ahnpyp0rbrx6c7pl53agd1170hffn3y9w45zp3dpq2"; libraryHaskellDepends = [ - base base-prelude bytestring curlhs either list-t mtl-prelude + base base-prelude bytestring curlhs list-t mtl-prelude resource-pool stm ]; homepage = "https://github.com/nikita-volkov/list-t-libcurl"; @@ -132051,29 +131580,6 @@ self: { }: mkDerivation { pname = "logging-effect"; - version = "1.2.1"; - sha256 = "1jjw2ach3mni7pnfcw29z2fw5vffhq8i8qh8sn4n4jcya2mfp7xd"; - libraryHaskellDepends = [ - async base exceptions free monad-control mtl semigroups stm - stm-delay text time transformers transformers-base wl-pprint-text - ]; - benchmarkHaskellDepends = [ - base bytestring criterion fast-logger lifted-async monad-logger - text time wl-pprint-text - ]; - homepage = "https://github.com/ocharles/logging-effect"; - description = "A mtl-style monad transformer for general purpose & compositional logging"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "logging-effect_1_2_3" = callPackage - ({ mkDerivation, async, base, bytestring, criterion, exceptions - , fast-logger, free, lifted-async, monad-control, monad-logger, mtl - , semigroups, stm, stm-delay, text, time, transformers - , transformers-base, wl-pprint-text - }: - mkDerivation { - pname = "logging-effect"; version = "1.2.3"; sha256 = "0822ifll474q3aqh5jjavhryrlz331p2zc5hh4zi47wviyfm8brk"; libraryHaskellDepends = [ @@ -132087,7 +131593,6 @@ self: { homepage = "https://github.com/ocharles/logging-effect"; description = "A mtl-style monad transformer for general purpose & compositional logging"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logging-effect-extra" = callPackage @@ -132096,26 +131601,6 @@ self: { }: mkDerivation { pname = "logging-effect-extra"; - version = "1.2.1"; - sha256 = "0sk4wagknvspn45lll1sy5jx3vz1ljsjj3yabyx7cnlyf5bl3k61"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base logging-effect logging-effect-extra-file - logging-effect-extra-handler wl-pprint-text - ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/jship/logging-effect-extra#readme"; - description = "Supplemental packages for `logging-effect`"; - license = stdenv.lib.licenses.mit; - }) {}; - - "logging-effect-extra_1_2_2" = callPackage - ({ mkDerivation, base, logging-effect, logging-effect-extra-file - , logging-effect-extra-handler, wl-pprint-text - }: - mkDerivation { - pname = "logging-effect-extra"; version = "1.2.2"; sha256 = "0jra1fxz3880ds8pip1mlibiss8ihd1a9dpi3mv1py7lnc6ikjzw"; isLibrary = true; @@ -132128,7 +131613,6 @@ self: { homepage = "https://github.com/jship/logging-effect-extra#readme"; description = "Supplemental packages for `logging-effect`"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logging-effect-extra-file" = callPackage @@ -132137,25 +131621,6 @@ self: { }: mkDerivation { pname = "logging-effect-extra-file"; - version = "1.1.1"; - sha256 = "198mil2v6z13gv7m37lqhqpdfsgk3l231rm9anq9pj7z2x4xqcpw"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base logging-effect template-haskell wl-pprint-text - ]; - executableHaskellDepends = [ base logging-effect wl-pprint-text ]; - homepage = "https://github.com/jship/logging-effect-extra#readme"; - description = "TH splices to augment log messages with file info"; - license = stdenv.lib.licenses.mit; - }) {}; - - "logging-effect-extra-file_1_1_2" = callPackage - ({ mkDerivation, base, logging-effect, template-haskell - , wl-pprint-text - }: - mkDerivation { - pname = "logging-effect-extra-file"; version = "1.1.2"; sha256 = "1dxi4rq734zmjf2ljlh771ivr45i2cwz94vym3gw38ji4s0k8cym"; isLibrary = true; @@ -132167,7 +131632,6 @@ self: { homepage = "https://github.com/jship/logging-effect-extra#readme"; description = "TH splices to augment log messages with file info"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logging-effect-extra-handler" = callPackage @@ -132176,25 +131640,6 @@ self: { }: mkDerivation { pname = "logging-effect-extra-handler"; - version = "1.1.1"; - sha256 = "1g73xyd1skh7paamnsia0x3cdayd34s12xvvxqaifm3wm19jy1rf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base exceptions logging-effect time wl-pprint-text - ]; - executableHaskellDepends = [ base logging-effect wl-pprint-text ]; - homepage = "https://github.com/jship/logging-effect-extra#readme"; - description = "Handy logging handler combinators"; - license = stdenv.lib.licenses.mit; - }) {}; - - "logging-effect-extra-handler_1_1_2" = callPackage - ({ mkDerivation, base, exceptions, logging-effect, time - , wl-pprint-text - }: - mkDerivation { - pname = "logging-effect-extra-handler"; version = "1.1.2"; sha256 = "1688vdlzyy8ikz2r96czyk0ganpv6h37x02sp930fmrj2qlwbvql"; isLibrary = true; @@ -132206,7 +131651,6 @@ self: { homepage = "https://github.com/jship/logging-effect-extra#readme"; description = "Handy logging handler combinators"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logging-facade" = callPackage @@ -133689,6 +133133,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lzma-conduit_1_2_1" = callPackage + ({ mkDerivation, base, base-compat, bytestring, conduit, HUnit + , lzma, QuickCheck, resourcet, test-framework, test-framework-hunit + , test-framework-quickcheck2, transformers + }: + mkDerivation { + pname = "lzma-conduit"; + version = "1.2.1"; + sha256 = "0hm72da7xk9l3zxjh274yg444vf405djxqbkf3q3p2qhicmxlmg9"; + libraryHaskellDepends = [ + base bytestring conduit lzma resourcet transformers + ]; + testHaskellDepends = [ + base base-compat bytestring conduit HUnit QuickCheck resourcet + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + homepage = "http://github.com/alphaHeavy/lzma-conduit"; + description = "Conduit interface for lzma/xz compression"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lzma-enumerator" = callPackage ({ mkDerivation, base, bindings-DSL, bytestring, enumerator, HUnit , lzma, mtl, QuickCheck, test-framework, test-framework-hunit @@ -133821,18 +133287,18 @@ self: { }) {}; "machinecell" = callPackage - ({ mkDerivation, base, free, hspec, mtl, profunctors, QuickCheck - , semigroups, transformers + ({ mkDerivation, base, doctest, free, hspec, mtl, profunctors + , QuickCheck, semigroups, transformers }: mkDerivation { pname = "machinecell"; - version = "3.3.2"; - sha256 = "0gjzn4i9iwclgpki599g52dvsipzc3iplpr8pz4d2s85nm54c9b6"; + version = "4.0.0"; + sha256 = "1wwrgd1ag104kdx97vii3rh9lj9lg1vg04rr98ldi2ikb90jbgwb"; libraryHaskellDepends = [ base free mtl profunctors semigroups transformers ]; testHaskellDepends = [ - base hspec mtl profunctors QuickCheck semigroups + base doctest hspec mtl profunctors QuickCheck semigroups ]; homepage = "http://github.com/as-capabl/machinecell"; description = "Arrow based stream transducers"; @@ -135125,6 +134591,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mapquest-api" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions, req, text }: + mkDerivation { + pname = "mapquest-api"; + version = "0.2.0.0"; + sha256 = "1x48lv6grbs34iv994yj2bhz3hi86lqa01vwx7bvxlbfn7jn3jqk"; + libraryHaskellDepends = [ + aeson base bytestring exceptions req text + ]; + homepage = "https://github.com/ocramz/mapquest-api"; + description = "Bindings to the MapQuest API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "marionetta" = callPackage ({ mkDerivation, base, containers, gloss, mtl, splines, vector , vector-space @@ -138259,30 +137739,6 @@ self: { }: mkDerivation { pname = "milena"; - version = "0.5.2.0"; - sha256 = "06gx1j9bxzxnagsymgr0nzhs1s6jsr14mhh2qx38h85n5g12zpvb"; - libraryHaskellDepends = [ - base bytestring cereal containers digest lens lifted-base - monad-control mtl murmur-hash network random resource-pool - semigroups transformers zlib - ]; - testHaskellDepends = [ - base bytestring lens mtl network QuickCheck semigroups tasty - tasty-hspec tasty-quickcheck - ]; - homepage = "https://github.com/adamflott/milena.git#readme"; - description = "A Kafka client for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "milena_0_5_2_1" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, digest, lens - , lifted-base, monad-control, mtl, murmur-hash, network, QuickCheck - , random, resource-pool, semigroups, tasty, tasty-hspec - , tasty-quickcheck, transformers, zlib - }: - mkDerivation { - pname = "milena"; version = "0.5.2.1"; sha256 = "1mylkqp8vha9gq7li5cir5h3i27zb573alxgxnvr1y938z2nimf2"; libraryHaskellDepends = [ @@ -138297,7 +137753,6 @@ self: { homepage = "https://github.com/adamflott/milena.git#readme"; description = "A Kafka client for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mime" = callPackage @@ -139065,7 +138520,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "mmark_0_0_5_4" = callPackage + "mmark_0_0_5_5" = callPackage ({ mkDerivation, aeson, base, case-insensitive, containers , criterion, data-default-class, deepseq, dlist, email-validate , foldl, hashable, hspec, hspec-megaparsec, html-entity-map, lucid @@ -139075,8 +138530,8 @@ self: { }: mkDerivation { pname = "mmark"; - version = "0.0.5.4"; - sha256 = "0qzw37cj7481vpix8wfgv3ljv10jinfymjpcbzxi4m67fxxjmsf7"; + version = "0.0.5.5"; + sha256 = "1j1ci1zwnp7q6bnk1cqz5g2zx4c02yr8s87v9wf8j898bky8cgwj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers data-default-class deepseq @@ -140130,26 +139585,6 @@ self: { }: mkDerivation { pname = "monad-logger-prefix"; - version = "0.1.6"; - sha256 = "14jdx72wx6yavjjaaxx5p270vy5cdshynfbp5ss4mdi3h84rfxpv"; - libraryHaskellDepends = [ - base exceptions monad-control monad-logger mtl resourcet text - transformers transformers-base - ]; - testHaskellDepends = [ base doctest Glob hspec QuickCheck ]; - benchmarkHaskellDepends = [ base criterion monad-logger ]; - homepage = "https://github.com/sellerlabs/monad-logger-prefix#readme"; - description = "Add prefixes to your monad-logger output"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "monad-logger-prefix_0_1_7" = callPackage - ({ mkDerivation, base, criterion, doctest, exceptions, Glob, hspec - , monad-control, monad-logger, mtl, QuickCheck, resourcet, text - , transformers, transformers-base - }: - mkDerivation { - pname = "monad-logger-prefix"; version = "0.1.7"; sha256 = "0k8npx31vqck3zz1kirv36ljp6i9sy7banj0xkcpw8z7siqx64vd"; libraryHaskellDepends = [ @@ -140161,7 +139596,6 @@ self: { homepage = "https://github.com/parsonsmatt/monad-logger-prefix#readme"; description = "Add prefixes to your monad-logger output"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-logger-syslog" = callPackage @@ -141128,8 +140562,8 @@ self: { }: mkDerivation { pname = "mongoDB"; - version = "2.3.0.1"; - sha256 = "1snr144yk05p5l9ck5gfs4zawg2l8fd8slmzxsrd29w2x6pk7iqv"; + version = "2.3.0.2"; + sha256 = "10gl9116hkjvm12ysgr1pi1vlk4d9jbkxgrcql6qhyvpsgv7s7bd"; libraryHaskellDepends = [ array base base16-bytestring base64-bytestring binary bson bytestring conduit conduit-extra containers cryptohash @@ -141149,7 +140583,7 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "mongoDB_2_3_0_2" = callPackage + "mongoDB_2_3_0_4" = callPackage ({ mkDerivation, array, base, base16-bytestring, base64-bytestring , binary, bson, bytestring, conduit, conduit-extra, containers , criterion, cryptohash, data-default-class, hashtables, hspec @@ -141159,8 +140593,8 @@ self: { }: mkDerivation { pname = "mongoDB"; - version = "2.3.0.2"; - sha256 = "10gl9116hkjvm12ysgr1pi1vlk4d9jbkxgrcql6qhyvpsgv7s7bd"; + version = "2.3.0.4"; + sha256 = "0qxwk154wd2ir3z7qjn8b7p6lx34ga5r7gcpmf4yp1z8vzsbxn57"; libraryHaskellDepends = [ array base base16-bytestring base64-bytestring binary bson bytestring conduit conduit-extra containers cryptohash @@ -141171,9 +140605,9 @@ self: { testHaskellDepends = [ base hspec mtl old-locale text time ]; benchmarkHaskellDepends = [ array base base16-bytestring base64-bytestring binary bson - bytestring containers criterion cryptohash hashtables lifted-base - monad-control mtl network nonce parsec random random-shuffle text - transformers-base + bytestring containers criterion cryptohash data-default-class + hashtables lifted-base monad-control mtl network nonce parsec + random random-shuffle text transformers-base ]; homepage = "https://github.com/mongodb-haskell/mongodb"; description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; @@ -142685,8 +142119,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "multi-instance"; - version = "0.0.0.1"; - sha256 = "09kqgh966z2n54mkrm1hbllfl8cws6s8caqlld1p8z502axmy5sk"; + version = "0.0.0.2"; + sha256 = "11r7wy143zy9drjrz7l57bdsbaj2fd3sjwbiz7pcmcdr1bxxga63"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/chris-martin/multi-instance#readme"; @@ -143579,26 +143013,6 @@ self: { }) {}; "mutable-containers" = callPackage - ({ mkDerivation, base, containers, criterion, ghc-prim, hspec - , mono-traversable, primitive, QuickCheck, vector - }: - mkDerivation { - pname = "mutable-containers"; - version = "0.3.3"; - sha256 = "1svwa54prfdmhdlmv118lnkwv3jx3rx7v5x30wbdsy39n75kjyks"; - libraryHaskellDepends = [ - base containers ghc-prim mono-traversable primitive vector - ]; - testHaskellDepends = [ - base containers hspec primitive QuickCheck vector - ]; - benchmarkHaskellDepends = [ base containers criterion ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "Abstactions and concrete implementations of mutable containers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mutable-containers_0_3_4" = callPackage ({ mkDerivation, base, containers, gauge, ghc-prim, hspec , mono-traversable, primitive, QuickCheck, vector }: @@ -143616,7 +143030,6 @@ self: { homepage = "https://github.com/snoyberg/mono-traversable#readme"; description = "Abstactions and concrete implementations of mutable containers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mutable-iter" = callPackage @@ -143660,10 +143073,10 @@ self: { ({ mkDerivation, base, safe-exceptions }: mkDerivation { pname = "mvar-lock"; - version = "0.1.0.0"; - sha256 = "1j38hjj7nqz9f8qs0a2kvgh9v80l7ip16fm9qjl675hj479z668p"; + version = "0.1.0.1"; + sha256 = "0kdf7811kxwfj032d8g18za0nn9jlssh7dpvvr8kzjk01b77804r"; libraryHaskellDepends = [ base safe-exceptions ]; - homepage = "https://github.com/chris-martin/haskell-libraries"; + homepage = "https://github.com/chris-martin/mvar-lock"; description = "A trivial lock based on MVar"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -143831,6 +143244,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mxnet-nn" = callPackage + ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring + , exceptions, ghc-prim, lens, mmorph, mtl, mxnet, resourcet + , streaming, streaming-bytestring, streaming-utils + , unordered-containers, vector + }: + mkDerivation { + pname = "mxnet-nn"; + version = "0.0.1.1"; + sha256 = "16clpl3sn4cf106hjigsyhgh15l9269yg838qarvbpigppkgb2sv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base lens mtl mxnet resourcet unordered-containers vector + ]; + executableHaskellDepends = [ + attoparsec attoparsec-binary base bytestring exceptions ghc-prim + mmorph mtl mxnet resourcet streaming streaming-bytestring + streaming-utils unordered-containers vector + ]; + homepage = "http://github.com/pierric/mxnet-nn"; + description = "Train a neural network with MXNet in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mxnet-nnvm" = callPackage ({ mkDerivation, base, c2hs, c2hs-extra, mxnet }: mkDerivation { @@ -144772,25 +144210,12 @@ self: { ({ mkDerivation }: mkDerivation { pname = "nats"; - version = "1.1.1"; - sha256 = "1kfl2yy97nb7q0j17v96rl73xvi3z4db9bk0xychc76dax41n78k"; - doHaddock = false; - homepage = "http://github.com/ekmett/nats/"; - description = "Natural numbers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "nats_1_1_2" = callPackage - ({ mkDerivation }: - mkDerivation { - pname = "nats"; version = "1.1.2"; sha256 = "1v40drmhixck3pz3mdfghamh73l4rp71mzcviipv1y8jhrfxilmr"; doHaddock = false; homepage = "http://github.com/ekmett/nats/"; description = "Natural numbers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nats-queue" = callPackage @@ -146057,20 +145482,6 @@ self: { ({ mkDerivation, base, bytestring, network, text, time, vector }: mkDerivation { pname = "network-carbon"; - version = "1.0.10"; - sha256 = "0fl6dxsarfrj0da3a1ajzisrnrgcjfwpag1997b0byvvkw47kspc"; - libraryHaskellDepends = [ - base bytestring network text time vector - ]; - homepage = "http://github.com/ocharles/network-carbon"; - description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "network-carbon_1_0_11" = callPackage - ({ mkDerivation, base, bytestring, network, text, time, vector }: - mkDerivation { - pname = "network-carbon"; version = "1.0.11"; sha256 = "1nkyj9114k2b6gwdd93yfrmf9zbziymbnbh3wxnz0vnk1hl2j5yq"; libraryHaskellDepends = [ @@ -146079,7 +145490,6 @@ self: { homepage = "http://github.com/ocharles/network-carbon"; description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-conduit" = callPackage @@ -146364,6 +145774,8 @@ self: { pname = "network-msgpack-rpc"; version = "0.0.4"; sha256 = "0b9llxfgl2lcjlcz9ai6k6yhrlip6shd0wd56mfgbvv3lbd5n62r"; + revision = "1"; + editedCabalFile = "0v08258721mv2bih7h03ss0jvjx2b87kclvjn15xrksf93nbrbq2"; libraryHaskellDepends = [ base binary binary-conduit bytestring conduit conduit-extra data-default-class data-default-instances-base data-msgpack @@ -147327,6 +146739,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "nirum" = callPackage + ({ mkDerivation, base, cmdargs, containers, directory, filepath + , hlint, hspec, hspec-core, hspec-meta, interpolatedstring-perl6 + , megaparsec, mtl, process, semigroups, semver, temporary, text + }: + mkDerivation { + pname = "nirum"; + version = "0.2.0"; + sha256 = "1bn9sifnp4m7jd4ps27j1rniwb9v7wrycdb8mabimn7n7ir7hjkw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base cmdargs containers directory filepath interpolatedstring-perl6 + megaparsec mtl semver text + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers directory filepath hlint hspec hspec-core + hspec-meta interpolatedstring-perl6 megaparsec mtl process + semigroups semver temporary text + ]; + homepage = "https://github.com/spoqa/nirum"; + description = "IDL compiler and RPC/distributed object framework for microservices"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "nist-beacon" = callPackage ({ mkDerivation, base, bytestring, http-conduit, xml }: mkDerivation { @@ -149073,21 +148511,21 @@ self: { }) {}; "o-clock" = callPackage - ({ mkDerivation, base, deepseq, gauge, ghc-prim, hedgehog - , markdown-unlit, tasty, tasty-hedgehog, tasty-hspec, tiempo - , time-units, transformers, type-spec + ({ mkDerivation, base, deepseq, doctest, gauge, ghc-prim, Glob + , hedgehog, markdown-unlit, tasty, tasty-hedgehog, tasty-hspec + , tiempo, time-units, transformers, type-spec }: mkDerivation { pname = "o-clock"; - version = "0.0.0"; - sha256 = "0nswlj9anwmhl6vgw5gpdd924niiw15plwb46wwmzrv7jsmbaiyj"; + version = "0.1.0"; + sha256 = "18rqy00hkqqqbhmsgkhza9blm2fl6kb29fs78ifkr2hqsya17fh6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ghc-prim transformers ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base hedgehog markdown-unlit tasty tasty-hedgehog tasty-hspec - type-spec + base doctest Glob hedgehog markdown-unlit tasty tasty-hedgehog + tasty-hspec type-spec ]; benchmarkHaskellDepends = [ base deepseq gauge tiempo time-units ]; homepage = "https://github.com/serokell/o-clock"; @@ -149951,23 +149389,6 @@ self: { }) {}; "online" = callPackage - ({ mkDerivation, base, foldl, numhask, protolude, tdigest, vector - , vector-algorithms - }: - mkDerivation { - pname = "online"; - version = "0.2.0"; - sha256 = "13vg34h09ds49r5j6dg8kqh90iqhbadr6jv57y0766h1pmr5i8kh"; - libraryHaskellDepends = [ - base foldl numhask protolude tdigest vector vector-algorithms - ]; - homepage = "https://github.com/tonyday567/online"; - description = "online statistics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "online_0_2_1_0" = callPackage ({ mkDerivation, base, doctest, foldl, formatting, numhask , optparse-generic, perf, protolude, scientific, tasty, tdigest , text, vector, vector-algorithms @@ -153829,25 +153250,6 @@ self: { }: mkDerivation { pname = "parsec"; - version = "3.1.11"; - sha256 = "0vk7q9j2128q191zf1sg0ylj9s9djwayqk9747k0a5fin4f2b1vg"; - revision = "1"; - editedCabalFile = "0prqjj2gxlwh2qhpcck5k6cgk4har9xqxc67yzjqd44mr2xgl7ir"; - libraryHaskellDepends = [ base bytestring mtl text ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit - ]; - homepage = "https://github.com/aslatter/parsec"; - description = "Monadic parser combinators"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "parsec_3_1_13_0" = callPackage - ({ mkDerivation, base, bytestring, HUnit, mtl, test-framework - , test-framework-hunit, text - }: - mkDerivation { - pname = "parsec"; version = "3.1.13.0"; sha256 = "1wc09pyn70p8z6llink10c8pqbh6ikyk554911yfwxv1g91swqbq"; libraryHaskellDepends = [ base bytestring mtl text ]; @@ -153857,7 +153259,6 @@ self: { homepage = "https://github.com/hvr/parsec"; description = "Monadic parser combinators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "parsec-extra" = callPackage @@ -154256,6 +153657,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "partial-handler_1_0_3" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "partial-handler"; + version = "1.0.3"; + sha256 = "0cf1748zyr07zv0ffi44rf5b9f7ygdybbdcl7m7c0zj14kq2miwl"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/nikita-volkov/partial-handler"; + description = "A composable exception handler"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "partial-isomorphisms" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -156578,30 +155992,6 @@ self: { }: mkDerivation { pname = "persistent-template"; - version = "2.5.3"; - sha256 = "1b8n99l2dh4ng1pf86541q5s2is30scnsx3p3vzh0kif9myrk5cy"; - libraryHaskellDepends = [ - aeson aeson-compat base bytestring containers ghc-prim - http-api-data monad-control monad-logger path-pieces persistent - tagged template-haskell text transformers unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring hspec persistent QuickCheck text transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Type-safe, non-relational, multi-backend persistence"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "persistent-template_2_5_3_1" = callPackage - ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers - , ghc-prim, hspec, http-api-data, monad-control, monad-logger - , path-pieces, persistent, QuickCheck, tagged, template-haskell - , text, transformers, unordered-containers - }: - mkDerivation { - pname = "persistent-template"; version = "2.5.3.1"; sha256 = "0449piw3n02q7dag7k1pakfmzmf3ms4wk1qmnagczpm1ckajinwd"; libraryHaskellDepends = [ @@ -156615,7 +156005,6 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, non-relational, multi-backend persistence"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -157158,20 +156547,22 @@ self: { "phoityne-vscode" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, cmdargs, conduit - , conduit-extra, ConfigFile, containers, directory, filepath - , fsnotify, hslogger, MissingH, mtl, parsec, process, resourcet - , safe, split, text, transformers + , conduit-extra, ConfigFile, containers, data-default, directory + , filepath, fsnotify, hslogger, lens, MissingH, mtl, parsec + , process, resourcet, safe, safe-exceptions, split, text + , transformers }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.20.0"; - sha256 = "1k9vh2xyk2nwck1g86lxvbrab7ap5p8p9vhh7pj98a56wkvxmv7y"; + version = "0.0.21.0"; + sha256 = "190gqa5zi99a9rrazbcg2xmzx5bl304vb95w8z4qilggngq1y7df"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base bytestring Cabal cmdargs conduit conduit-extra - ConfigFile containers directory filepath fsnotify hslogger MissingH - mtl parsec process resourcet safe split text transformers + ConfigFile containers data-default directory filepath fsnotify + hslogger lens MissingH mtl parsec process resourcet safe + safe-exceptions split text transformers ]; homepage = "https://github.com/phoityne/phoityne-vscode"; description = "Haskell Debug Adapter for Visual Studio Code"; @@ -158091,20 +157482,6 @@ self: { ({ mkDerivation, async, base, contravariant, pipes, stm, void }: mkDerivation { pname = "pipes-concurrency"; - version = "2.0.8"; - sha256 = "0ak6vnjl12q4615waifbpdxbm96yz5yzqzwjj1zwvvb2jfk5snwz"; - libraryHaskellDepends = [ - async base contravariant pipes stm void - ]; - testHaskellDepends = [ async base pipes stm ]; - description = "Concurrency for the pipes ecosystem"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes-concurrency_2_0_9" = callPackage - ({ mkDerivation, async, base, contravariant, pipes, stm, void }: - mkDerivation { - pname = "pipes-concurrency"; version = "2.0.9"; sha256 = "1br0cssp4rdfh6lhvjql9ppjvcn0v6kpg1h1f1hi8vqb0c87nvb4"; libraryHaskellDepends = [ @@ -158113,7 +157490,6 @@ self: { testHaskellDepends = [ async base pipes stm ]; description = "Concurrency for the pipes ecosystem"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-conduit" = callPackage @@ -161583,8 +160959,8 @@ self: { }: mkDerivation { pname = "potoki"; - version = "0.7"; - sha256 = "009f36bc3l7xilih5y7hzibvdyxa36s8y9r255y74jgkfy583w4c"; + version = "0.7.2"; + sha256 = "10yl08hcfgn0l15hr6n5ga91cla050lys7jyj4w0j3s3c9k2w3gd"; libraryHaskellDepends = [ attoparsec base base-prelude bytestring directory foldl hashable potoki-core profunctors text unagi-chan unordered-containers vector @@ -161828,6 +161204,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pqueue_1_4_1_1" = callPackage + ({ mkDerivation, base, deepseq, QuickCheck }: + mkDerivation { + pname = "pqueue"; + version = "1.4.1.1"; + sha256 = "1zvwm1zcqqq5n101s1brjhgbay8rf9fviq6gxbplf40i63m57p1x"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base deepseq QuickCheck ]; + description = "Reliable, persistent, fast priority queues"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pqueue-mtl" = callPackage ({ mkDerivation, base, containers, ghc-prim, MaybeT, mtl , stateful-mtl, uvector @@ -163107,10 +162496,8 @@ self: { }: mkDerivation { pname = "probable"; - version = "0.1.2"; - sha256 = "0lypxz3lz4gj5x98k7mwg3xagjld0qhzrxdk8l4gjxj77m00hkfz"; - revision = "1"; - editedCabalFile = "1iwv4ygfm53q3jyiiniqhsixps549h9c2apif10pjg5jib04yv85"; + version = "0.1.3"; + sha256 = "196m3v30818q034x7jdnqdwfqffx5pfj64yyw0q2blhwzkhc0f9n"; libraryHaskellDepends = [ base mtl mwc-random primitive statistics transformers vector ]; @@ -163197,24 +162584,6 @@ self: { }: mkDerivation { pname = "process-extras"; - version = "0.7.3"; - sha256 = "0hyrqz2dinvql6r9ldd2q35zkavjwqadw13zqzcwrdhq8myhawzb"; - libraryHaskellDepends = [ - base bytestring data-default deepseq generic-deriving ListLike mtl - process text - ]; - testHaskellDepends = [ base HUnit ]; - homepage = "https://github.com/seereason/process-extras"; - description = "Process extras"; - license = stdenv.lib.licenses.mit; - }) {}; - - "process-extras_0_7_4" = callPackage - ({ mkDerivation, base, bytestring, data-default, deepseq - , generic-deriving, HUnit, ListLike, mtl, process, text - }: - mkDerivation { - pname = "process-extras"; version = "0.7.4"; sha256 = "0klqgr37f1z2z6i0a9b0giapmq0p35l5k9kz1p7f0k1597w7agi9"; libraryHaskellDepends = [ @@ -163225,7 +162594,6 @@ self: { homepage = "https://github.com/seereason/process-extras"; description = "Process extras"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "process-iterio" = callPackage @@ -164438,6 +163806,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "protocol-buffers_2_4_7" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , directory, filepath, mtl, parsec, syb, utf8-string + }: + mkDerivation { + pname = "protocol-buffers"; + version = "2.4.7"; + sha256 = "1db2r961qmrcvcqs53imjw16cawn7hjcicxhygszk0mg538v7rh9"; + libraryHaskellDepends = [ + array base binary bytestring containers directory filepath mtl + parsec syb utf8-string + ]; + homepage = "https://github.com/k-bx/protocol-buffers"; + description = "Parse Google Protocol Buffer specifications"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protocol-buffers-descriptor" = callPackage ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { @@ -164453,6 +163839,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "protocol-buffers-descriptor_2_4_7" = callPackage + ({ mkDerivation, base, bytestring, containers, protocol-buffers }: + mkDerivation { + pname = "protocol-buffers-descriptor"; + version = "2.4.7"; + sha256 = "1k11bgwg2345y4a7ib6h3410y6088whlxc6s9iy0whpbkhwi7lq0"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers protocol-buffers + ]; + homepage = "https://github.com/k-bx/protocol-buffers"; + description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protocol-buffers-descriptor-fork" = callPackage ({ mkDerivation, base, bytestring, containers , protocol-buffers-fork @@ -164689,6 +164091,8 @@ self: { pname = "pseudo-boolean"; version = "0.1.6.0"; sha256 = "1v28vbhcrx0mvciazlanwyaxwav0gfjc7sxz7adgims7mj64g1ra"; + revision = "1"; + editedCabalFile = "11n7wcfpahbyg8lmq90vvq11fm2ls4761qf9q7pkbvd7vkm6by2n"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder containers deepseq dlist hashable megaparsec parsec void @@ -165540,8 +164944,8 @@ self: { }: mkDerivation { pname = "pushbullet-types"; - version = "0.4.0.0"; - sha256 = "0fds6lhkmyfs8hrnaq29fbglcmampa4n8j93x1jkynxbp1in66z6"; + version = "0.4.0.2"; + sha256 = "0r6cg0g98b7zzf4sjl4mrpnwmffhz2dnba9bgjw3943xf06afnn1"; libraryHaskellDepends = [ aeson base http-api-data microlens microlens-th scientific text time unordered-containers @@ -165577,32 +164981,6 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "1.5.1.0"; - sha256 = "1mnigsf10jxqsvjr1vbizxjrf97w3cx54xy850mj3b8i34929bmh"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite hashable - http-client http-types memory text time transformers - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite hspec - http-client http-types QuickCheck scientific text time transformers - unordered-containers vector - ]; - homepage = "https://github.com/pusher-community/pusher-http-haskell"; - description = "Haskell client library for the Pusher HTTP API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "pusher-http-haskell_1_5_1_2" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , cryptonite, hashable, hspec, http-client, http-types, memory - , QuickCheck, scientific, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "pusher-http-haskell"; version = "1.5.1.2"; sha256 = "1jrb0ni157a9wa5mbqz1dmd1i7nkjh1nhjyvx52mbk530hslcnnn"; libraryHaskellDepends = [ @@ -166747,23 +166125,6 @@ self: { }: mkDerivation { pname = "quickcheck-classes"; - version = "0.3.1"; - sha256 = "0xcjm55aprds4x1jlrj3izgwxpqv8z19sbiqfn8lvx6b8yc61f7f"; - libraryHaskellDepends = [ - aeson base prim-array primitive QuickCheck transformers - ]; - testHaskellDepends = [ aeson base primitive QuickCheck vector ]; - homepage = "https://github.com/andrewthad/quickcheck-classes#readme"; - description = "QuickCheck common typeclasses"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "quickcheck-classes_0_3_2" = callPackage - ({ mkDerivation, aeson, base, prim-array, primitive, QuickCheck - , transformers, vector - }: - mkDerivation { - pname = "quickcheck-classes"; version = "0.3.2"; sha256 = "10z65dxm0jply0zbx1kpxpiir3z85c9133hkiqnra6sqz13njdz4"; libraryHaskellDepends = [ @@ -166773,7 +166134,6 @@ self: { homepage = "https://github.com/andrewthad/quickcheck-classes#readme"; description = "QuickCheck common typeclasses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-combinators" = callPackage @@ -168404,8 +167764,8 @@ self: { ({ mkDerivation, async, base, containers, foreign-store, stm }: mkDerivation { pname = "rapid"; - version = "0.1.3"; - sha256 = "0n4py9ndri6xy3n2rkr78f0y146didxg3625nhm72jsqcd1qjfhn"; + version = "0.1.4"; + sha256 = "0f86j4r3sm74w49v9x9s58wahgcgick6z7awl6piq83iqaiy4sh7"; libraryHaskellDepends = [ async base containers foreign-store stm ]; @@ -173667,26 +173027,6 @@ self: { "retry" = callPackage ({ mkDerivation, base, data-default-class, exceptions, ghc-prim - , hspec, HUnit, mtl, QuickCheck, random, stm, time, transformers - }: - mkDerivation { - pname = "retry"; - version = "0.7.5.1"; - sha256 = "116fjfxdyqrk3079hqcil0dv7r2fw6x64pjwfxhckpxqavxza7sk"; - libraryHaskellDepends = [ - base data-default-class exceptions ghc-prim random transformers - ]; - testHaskellDepends = [ - base data-default-class exceptions ghc-prim hspec HUnit mtl - QuickCheck random stm time transformers - ]; - homepage = "http://github.com/Soostone/retry"; - description = "Retry combinators for monadic actions that may fail"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "retry_0_7_6_0" = callPackage - ({ mkDerivation, base, data-default-class, exceptions, ghc-prim , hedgehog, HUnit, mtl, random, stm, tasty, tasty-hedgehog , tasty-hunit, time, transformers }: @@ -173704,7 +173044,6 @@ self: { homepage = "http://github.com/Soostone/retry"; description = "Retry combinators for monadic actions that may fail"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "retryer" = callPackage @@ -173870,29 +173209,31 @@ self: { }) {}; "rfc" = callPackage - ({ mkDerivation, aeson, aeson-diff, async, base, bifunctors, binary - , blaze-html, classy-prelude, containers, data-default, exceptions - , hedis, http-api-data, http-client, http-client-tls, http-types - , lens, lifted-async, lifted-base, markdown, monad-control - , postgresql-simple, resource-pool, servant, servant-blaze - , servant-client, servant-docs, servant-server, servant-swagger - , simple-logger, string-conversions, swagger2, temporary, text - , time-units, unordered-containers, url, uuid-types, vector, wai - , wai-cors, wai-extra, wreq + ({ mkDerivation, aeson, aeson-diff, base, bifunctors, binary + , blaze-html, classy-prelude, containers, data-default + , freer-simple, hedis, http-api-data, http-client, http-client-tls + , http-types, lens, lifted-async, markdown, monad-control + , natural-transformation, postgresql-simple, resource-pool, servant + , servant-blaze, servant-client, servant-docs, servant-server + , servant-swagger, simple-logger, string-conversions, swagger2 + , temporary, text, time-units, unliftio, unliftio-core + , unordered-containers, url, uuid-types, vector, wai, wai-cors + , wai-extra, wreq }: mkDerivation { pname = "rfc"; - version = "0.0.0.20"; - sha256 = "0b54v1mw76w3ljs64jrvz5z24008z4dkmg31i1spfrakypx7fxn5"; + version = "0.0.0.21"; + sha256 = "1s3ni2gsvhxrxhmyahc22frrh4flzvwrnv33car14wv1jldbywfi"; libraryHaskellDepends = [ - aeson aeson-diff async base bifunctors binary blaze-html - classy-prelude containers data-default exceptions hedis - http-api-data http-client http-client-tls http-types lens - lifted-async lifted-base markdown monad-control postgresql-simple + aeson aeson-diff base bifunctors binary blaze-html classy-prelude + containers data-default freer-simple hedis http-api-data + http-client http-client-tls http-types lens lifted-async markdown + monad-control natural-transformation postgresql-simple resource-pool servant servant-blaze servant-client servant-docs servant-server servant-swagger simple-logger string-conversions - swagger2 temporary text time-units unordered-containers url - uuid-types vector wai wai-cors wai-extra wreq + swagger2 temporary text time-units unliftio unliftio-core + unordered-containers url uuid-types vector wai wai-cors wai-extra + wreq ]; homepage = "https://github.com/RobertFischer/rfc#README.md"; description = "Robert Fischer's Common library"; @@ -174931,6 +174272,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rope-utf16-splay" = callPackage + ({ mkDerivation, base, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "rope-utf16-splay"; + version = "0.2.0.0"; + sha256 = "078hkv21maydvks57pz6z3qyz0r4s1c6ypdmlr4xlmakyldrdlc3"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck text + ]; + homepage = "https://github.com/ollef/rope-utf16-splay"; + description = "Ropes optimised for updating using UTF-16 code units and row/column pairs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rosa" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, lens , namecoin-update, optparse-applicative, text, unordered-containers @@ -175284,6 +174642,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "row-types" = callPackage + ({ mkDerivation, base, criterion, deepseq, hashable, text + , unordered-containers + }: + mkDerivation { + pname = "row-types"; + version = "0.2.0.0"; + sha256 = "158k4q6b1ca7d8fkznl09mdd29z7w5clxh48i3b3m1bcmhjmcfmh"; + libraryHaskellDepends = [ + base deepseq hashable text unordered-containers + ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + description = "Open Records and Variants"; + license = stdenv.lib.licenses.mit; + }) {}; + "rowrecord" = callPackage ({ mkDerivation, base, containers, template-haskell }: mkDerivation { @@ -178016,8 +177390,8 @@ self: { }: mkDerivation { pname = "scotty-resource"; - version = "0.2.0.0"; - sha256 = "0210zl0ad80scjcl1dlz5z55g2rf0ybr7vj2qdl83niri8511794"; + version = "0.2.0.1"; + sha256 = "0y39sxvin9ljwk2jxnb18wr79d0ap9363vr2mh8xbc4llq0yjavj"; libraryHaskellDepends = [ base containers http-types scotty text transformers wai ]; @@ -179195,25 +178569,12 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "semigroups"; - version = "0.18.3"; - sha256 = "1jm9wnb5jmwdk4i9qbwfay69ydi76xi0qqi9zqp6wh3jd2c7qa9m"; - libraryHaskellDepends = [ base ]; - homepage = "http://github.com/ekmett/semigroups/"; - description = "Anything that associates"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "semigroups_0_18_4" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "semigroups"; version = "0.18.4"; sha256 = "09sxd17h1kcjsjaf1am2nwpb4vaq8d0q718fbkxwysws691317jq"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/ekmett/semigroups/"; description = "Anything that associates"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "semigroups-actions" = callPackage @@ -179425,27 +178786,6 @@ self: { }: mkDerivation { pname = "sensu-run"; - version = "0.4.0.3"; - sha256 = "05gl6dannlfx49f24lhspyygq8j37wmsyp8nrlcpcsqbrbd3k82g"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base bytestring filepath http-client http-types lens network - optparse-applicative process temporary text time unix unix-compat - vector wreq - ]; - homepage = "https://github.com/maoe/sensu-run#readme"; - description = "A tool to send command execution results to Sensu"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "sensu-run_0_4_0_4" = callPackage - ({ mkDerivation, aeson, base, bytestring, filepath, http-client - , http-types, lens, network, optparse-applicative, process - , temporary, text, time, unix, unix-compat, vector, wreq - }: - mkDerivation { - pname = "sensu-run"; version = "0.4.0.4"; sha256 = "1pgzfa6ns67fq5cx7qizwjfb2gw6awx012iwhskx8s4wg9snbq5y"; isLibrary = false; @@ -179458,7 +178798,6 @@ self: { homepage = "https://github.com/maoe/sensu-run#readme"; description = "A tool to send command execution results to Sensu"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sentence-jp" = callPackage @@ -181402,8 +180741,8 @@ self: { }: mkDerivation { pname = "servant-pushbullet-client"; - version = "0.4.0.0"; - sha256 = "0v2mkriwh7lara66w02kkzwlnr5y8ahb6djpsnhvch1asa5klsnk"; + version = "0.5.0.0"; + sha256 = "1pdqb2kff033zga35n9ycgnw3zb42b5hpap3f4fjkxfbxz5cq3zz"; libraryHaskellDepends = [ aeson base http-api-data http-client http-client-tls microlens microlens-th pushbullet-types scientific servant servant-client @@ -181555,6 +180894,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-ruby_0_6_0_0" = callPackage + ({ mkDerivation, base, casing, doctest, lens, QuickCheck + , servant-foreign, text + }: + mkDerivation { + pname = "servant-ruby"; + version = "0.6.0.0"; + sha256 = "0cm0s44x71vbfzl5ky7s1ml88gnympr4n0lfg6w0z17lr95myrm8"; + libraryHaskellDepends = [ base casing lens servant-foreign text ]; + testHaskellDepends = [ base doctest QuickCheck ]; + homepage = "https://github.com/joneshf/servant-ruby#readme"; + description = "Generate a Ruby client from a Servant API with Net::HTTP"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-scotty" = callPackage ({ mkDerivation, aeson, base, http-types, scotty, servant , servant-response, text, transformers @@ -181852,6 +181207,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-swagger-ui_0_2_5_3_9_1" = callPackage + ({ mkDerivation, aeson, base, base-compat, blaze-markup, bytestring + , directory, file-embed, filepath, http-media, lens, servant + , servant-blaze, servant-server, servant-swagger, swagger2 + , template-haskell, text, transformers, transformers-compat, wai + , wai-app-static, warp + }: + mkDerivation { + pname = "servant-swagger-ui"; + version = "0.2.5.3.9.1"; + sha256 = "1fbznhlzh9xnnhxsazan46w5x439a31lglb8mh7j945axyh7l09m"; + libraryHaskellDepends = [ + base blaze-markup bytestring directory file-embed filepath + http-media servant servant-blaze servant-server servant-swagger + swagger2 template-haskell text transformers transformers-compat + wai-app-static + ]; + testHaskellDepends = [ + aeson base base-compat lens servant servant-server servant-swagger + swagger2 text transformers transformers-compat wai warp + ]; + homepage = "https://github.com/phadej/servant-swagger-ui#readme"; + description = "Servant swagger ui"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-websockets" = callPackage ({ mkDerivation, aeson, async, base, bytestring, conduit , exceptions, resourcet, servant-server, text, wai, wai-websockets @@ -182927,17 +182309,51 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shake_0_16_1" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, directory + , extra, filepath, hashable, js-flot, js-jquery, primitive, process + , QuickCheck, random, time, transformers, unix + , unordered-containers, utf8-string + }: + mkDerivation { + pname = "shake"; + version = "0.16.1"; + sha256 = "14f9ai58i83wy5kr28gl1a3a1jbl89j6i25qi79nf3fbdca05s75"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base binary bytestring deepseq directory extra filepath hashable + js-flot js-jquery primitive process random time transformers unix + unordered-containers utf8-string + ]; + executableHaskellDepends = [ + base binary bytestring deepseq directory extra filepath hashable + js-flot js-jquery primitive process random time transformers unix + unordered-containers utf8-string + ]; + testHaskellDepends = [ + base binary bytestring deepseq directory extra filepath hashable + js-flot js-jquery primitive process QuickCheck random time + transformers unix unordered-containers utf8-string + ]; + homepage = "http://shakebuild.com"; + description = "Build system library, like Make, but more accurate dependencies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "shake-ats" = callPackage ({ mkDerivation, base, binary, dependency, directory, hs2ats - , language-ats, shake, shake-ext, text + , language-ats, microlens, shake, shake-ext, text }: mkDerivation { pname = "shake-ats"; - version = "1.3.0.7"; - sha256 = "1syvc551f6dj9xf0n8yhadvw0chnzbn7j62hi2nd3wxibi3w0hdv"; + version = "1.4.0.0"; + sha256 = "06x8aclhhsr6gg1qj9hbv8bk4f21i55akni7i3fl117qn2bq8wp6"; libraryHaskellDepends = [ - base binary dependency directory hs2ats language-ats shake - shake-ext text + base binary dependency directory hs2ats language-ats microlens + shake shake-ext text ]; homepage = "https://github.com/vmchale/shake-ats#readme"; description = "Utilities for building ATS projects with shake"; @@ -183133,32 +182549,6 @@ self: { }: mkDerivation { pname = "shakespeare"; - version = "2.0.14.1"; - sha256 = "02pahbvibll4jmbq6p5vxr2r4mmrfx3h0c8v6qbj4rlq96lc6a23"; - libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim parsec process scientific template-haskell text - time transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim hspec HUnit parsec process template-haskell - text time transformers - ]; - homepage = "http://www.yesodweb.com/book/shakespearean-templates"; - description = "A toolkit for making compile-time interpolated templates"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "shakespeare_2_0_15" = callPackage - ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec - , process, scientific, template-haskell, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "shakespeare"; version = "2.0.15"; sha256 = "1vk4b19zvwy4mpwaq9z3l3kfmz75gfyf7alhh0y112gspgpccm23"; libraryHaskellDepends = [ @@ -183174,7 +182564,6 @@ self: { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "A toolkit for making compile-time interpolated templates"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -184806,23 +184195,6 @@ self: { }: mkDerivation { pname = "simple-sendfile"; - version = "0.2.26"; - sha256 = "0z2r971bjy9wwv9rhnzh0ldd0z9zvqwyrq9yhz7m4lnf0k0wqq6z"; - libraryHaskellDepends = [ base bytestring network unix ]; - testHaskellDepends = [ - base bytestring conduit conduit-extra directory hspec HUnit network - process resourcet unix - ]; - description = "Cross platform library for the sendfile system call"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "simple-sendfile_0_2_27" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra - , directory, hspec, HUnit, network, process, resourcet, unix - }: - mkDerivation { - pname = "simple-sendfile"; version = "0.2.27"; sha256 = "1bwwqzcm56m2w4ymsa054sxmpbj76h9pvb0jf8zxp8lr41cp51gn"; libraryHaskellDepends = [ base bytestring network unix ]; @@ -184832,7 +184204,6 @@ self: { ]; description = "Cross platform library for the sendfile system call"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-server" = callPackage @@ -186762,8 +186133,8 @@ self: { pname = "snap"; version = "1.1.0.0"; sha256 = "166ilpc4dd4020mmqn2lrfs3j5dl4a2mvqag1sz4mx7jcndrjbc8"; - revision = "1"; - editedCabalFile = "1a51516zn0315f9y9wyzbj2fka2c7krrrd04nhzrqbfaa8smim71"; + revision = "2"; + editedCabalFile = "05k5fgb31xvz733j3d4hqbhzbjlglv1m4f020mdnm1q7qg4a81nq"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal clientsession configurator containers directory directory-tree dlist filepath hashable heist @@ -192323,26 +191694,12 @@ self: { ({ mkDerivation, array, base }: mkDerivation { pname = "stm"; - version = "2.4.4.1"; - sha256 = "111kpy1d6f5c0bggh6hyfm86q5p8bq1qbqf6dw2x4l4dxnar16cg"; - revision = "1"; - editedCabalFile = "0kzw4rw9fgmc4qyxmm1lwifdyrx5r1356150xm14vy4mp86diks9"; - libraryHaskellDepends = [ array base ]; - description = "Software Transactional Memory"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "stm_2_4_5_0" = callPackage - ({ mkDerivation, array, base }: - mkDerivation { - pname = "stm"; version = "2.4.5.0"; sha256 = "19sr11a0hqikhvf561b38phz6k3zg9s157a0f5ffvghk7wcdpmri"; libraryHaskellDepends = [ array base ]; homepage = "https://wiki.haskell.org/Software_transactional_memory"; description = "Software Transactional Memory"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stm-channelize" = callPackage @@ -192979,28 +192336,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_15_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hashable - , hspec, hspec-discover, lens, template-haskell, text + "stratosphere_0_15_2" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.15.1"; - sha256 = "13221ynzcaj6hilvbcllnjf1ixv6zmsp7jnhp1ishmj42z5qarbl"; + version = "0.15.2"; + sha256 = "00mna9w4021a1ydxyysx0wd333hby4sx3fpl1vygmcyjfibwiqmc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring hashable lens template-haskell - text unordered-containers + aeson aeson-pretty base bytestring containers hashable lens + template-haskell text unordered-containers ]; executableHaskellDepends = [ - aeson aeson-pretty base bytestring hashable lens template-haskell - text unordered-containers + aeson aeson-pretty base bytestring containers hashable lens + template-haskell text unordered-containers ]; testHaskellDepends = [ - aeson aeson-pretty base bytestring hashable hspec hspec-discover - lens template-haskell text unordered-containers + aeson aeson-pretty base bytestring containers hashable hspec + hspec-discover lens template-haskell text unordered-containers ]; homepage = "https://github.com/frontrowed/stratosphere#readme"; description = "EDSL for AWS CloudFormation"; @@ -193266,31 +192623,6 @@ self: { "streaming-commons" = callPackage ({ mkDerivation, array, async, base, blaze-builder, bytestring - , criterion, deepseq, directory, hspec, network, process - , QuickCheck, random, stm, text, transformers, unix, zlib - }: - mkDerivation { - pname = "streaming-commons"; - version = "0.1.18"; - sha256 = "1jw3y3clh2l0kmsrkhhn6n1b8i8gnwz5cwbczj1kq00sj3xjxbr7"; - libraryHaskellDepends = [ - array async base blaze-builder bytestring directory network process - random stm text transformers unix zlib - ]; - testHaskellDepends = [ - array async base blaze-builder bytestring deepseq hspec network - QuickCheck text unix zlib - ]; - benchmarkHaskellDepends = [ - base blaze-builder bytestring criterion deepseq text - ]; - homepage = "https://github.com/fpco/streaming-commons"; - description = "Common lower-level functions needed by various streaming data libraries"; - license = stdenv.lib.licenses.mit; - }) {}; - - "streaming-commons_0_1_19" = callPackage - ({ mkDerivation, array, async, base, blaze-builder, bytestring , deepseq, directory, gauge, hspec, network, process, QuickCheck , random, stm, text, transformers, unix, zlib }: @@ -193312,7 +192644,6 @@ self: { homepage = "https://github.com/fpco/streaming-commons"; description = "Common lower-level functions needed by various streaming data libraries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-concurrency" = callPackage @@ -193342,8 +192673,8 @@ self: { }: mkDerivation { pname = "streaming-conduit"; - version = "0.1.2.1"; - sha256 = "053p9xzd48y47mx22r4v468lbjrbi5gzqwzarfpzf0j5gis3bm38"; + version = "0.1.2.2"; + sha256 = "0g2x8a6gksc1na3qn1fnd9c7cckn4r54x11x4rxnmy2v04sv0h8z"; libraryHaskellDepends = [ base bytestring conduit streaming streaming-bytestring transformers ]; @@ -193662,14 +192993,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "strict-base-types_0_6_0" = callPackage + "strict-base-types_0_6_1" = callPackage ({ mkDerivation, aeson, base, bifunctors, binary, deepseq, ghc-prim , hashable, lens, QuickCheck, strict }: mkDerivation { pname = "strict-base-types"; - version = "0.6.0"; - sha256 = "01i8v4l47xp5f4i9czlwg1kk4lvnfmxhgqlcnacirrp0pfjmrq7p"; + version = "0.6.1"; + sha256 = "0yihvjijag9g55ihrgqj0vwn6ksvscj3r0n2zzxz2qbxrhx6m1pq"; libraryHaskellDepends = [ aeson base bifunctors binary deepseq ghc-prim hashable lens QuickCheck strict @@ -193988,6 +193319,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "string-transform_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-hunit + , tasty-smallcheck, text, utf8-string + }: + mkDerivation { + pname = "string-transform"; + version = "1.0.0"; + sha256 = "0556blv06jl973pnkcab36bsa3kjzjhzs396q31qmkqnqlpday4d"; + libraryHaskellDepends = [ base bytestring text utf8-string ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit tasty-smallcheck text utf8-string + ]; + homepage = "https://github.com/ncaq/string-transform#readme"; + description = "simple and easy haskell string transform wrapper"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "string-typelits" = callPackage ({ mkDerivation, base, template-haskell, type-combinators , type-combinators-quote @@ -195525,34 +194874,6 @@ self: { }: mkDerivation { pname = "swagger-petstore"; - version = "0.0.1.7"; - sha256 = "07p2hd35wg5g1r3lmhffvjch5vy6idmhdv21k1g8v3131apgjpxy"; - libraryHaskellDepends = [ - aeson base base64-bytestring bytestring case-insensitive containers - deepseq exceptions http-api-data http-client http-client-tls - http-media http-types iso8601-time katip microlens mtl network - random safe-exceptions text time transformers unordered-containers - vector - ]; - testHaskellDepends = [ - aeson base bytestring containers hspec iso8601-time mtl QuickCheck - semigroups text time transformers unordered-containers vector - ]; - homepage = "https://github.com/swagger-api/swagger-codegen#readme"; - description = "Auto-generated swagger-petstore API Client"; - license = stdenv.lib.licenses.mit; - }) {}; - - "swagger-petstore_0_0_1_8" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , case-insensitive, containers, deepseq, exceptions, hspec - , http-api-data, http-client, http-client-tls, http-media - , http-types, iso8601-time, katip, microlens, mtl, network - , QuickCheck, random, safe-exceptions, semigroups, text, time - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "swagger-petstore"; version = "0.0.1.8"; sha256 = "1rslv21lg7jfc6vb8yyb6kkg3cma2300h4hld3m8zwfxgzcq79h7"; libraryHaskellDepends = [ @@ -195569,7 +194890,6 @@ self: { homepage = "https://github.com/swagger-api/swagger-codegen#readme"; description = "Auto-generated swagger-petstore API Client"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "swagger-test" = callPackage @@ -195614,6 +194934,8 @@ self: { pname = "swagger2"; version = "2.2"; sha256 = "0byzfz52mbnxcmspmk4s43bhprfwrjnh2mkpyfrdir64axqx7yf6"; + revision = "1"; + editedCabalFile = "0dhs44zhb2yh4yxw88yvlijcd255ppm1ch7dz7pn7sdv1wr6kxq5"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base base-compat bytestring containers generics-sop hashable @@ -198188,24 +197510,6 @@ self: { }: mkDerivation { pname = "tasty-ant-xml"; - version = "1.1.2"; - sha256 = "10k8092iz8klx7wa3ajfny8zvrxv3clz330v3qz3k7dmbj596nhq"; - libraryHaskellDepends = [ - base containers directory filepath generic-deriving ghc-prim mtl - stm tagged tasty transformers xml - ]; - homepage = "http://github.com/ocharles/tasty-ant-xml"; - description = "Render tasty output to XML for Jenkins"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tasty-ant-xml_1_1_3" = callPackage - ({ mkDerivation, base, containers, directory, filepath - , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers - , xml - }: - mkDerivation { - pname = "tasty-ant-xml"; version = "1.1.3"; sha256 = "0nxrvxk83mv29yhywswg21q156zdzs02xrwqambnz78pldsrbk4n"; libraryHaskellDepends = [ @@ -198215,7 +197519,6 @@ self: { homepage = "http://github.com/ocharles/tasty-ant-xml"; description = "Render tasty output to XML for Jenkins"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-auto" = callPackage @@ -198382,6 +197685,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tasty-hedgehog_0_1_0_2" = callPackage + ({ mkDerivation, base, hedgehog, tagged, tasty + , tasty-expected-failure + }: + mkDerivation { + pname = "tasty-hedgehog"; + version = "0.1.0.2"; + sha256 = "0cjdi0kpwpb4m5ad1y47x52336xfza4m82h5zg76r75f7fvzzh8x"; + libraryHaskellDepends = [ base hedgehog tagged tasty ]; + testHaskellDepends = [ + base hedgehog tasty tasty-expected-failure + ]; + homepage = "https://github.com/qfpl/tasty-hedghog"; + description = "Integrates the hedgehog testing library with the tasty testing framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-hspec" = callPackage ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty , tasty-quickcheck, tasty-smallcheck @@ -198612,23 +197933,6 @@ self: { }: mkDerivation { pname = "tasty-rerun"; - version = "1.1.9"; - sha256 = "0piwv5nrqvwnzp76xpsjlncrl2cd9jsxxb1ghkaijn2fi2c63akd"; - libraryHaskellDepends = [ - base containers mtl optparse-applicative reducers split stm tagged - tasty transformers - ]; - homepage = "http://github.com/ocharles/tasty-rerun"; - description = "Run tests by filtering the test tree depending on the result of previous test runs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tasty-rerun_1_1_10" = callPackage - ({ mkDerivation, base, containers, mtl, optparse-applicative - , reducers, split, stm, tagged, tasty, transformers - }: - mkDerivation { - pname = "tasty-rerun"; version = "1.1.10"; sha256 = "1776fx700wlc9spn0dh3x4nh44x2yg33z9zyqzqlpwrhrkpaz91b"; libraryHaskellDepends = [ @@ -198638,7 +197942,6 @@ self: { homepage = "http://github.com/ocharles/tasty-rerun"; description = "Run tests by filtering the test tree depending on the result of previous test runs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-silver" = callPackage @@ -201024,29 +200327,6 @@ self: { }) {}; "text-ldap" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring - , containers, dlist, QuickCheck, quickcheck-simple, random - , transformers - }: - mkDerivation { - pname = "text-ldap"; - version = "0.1.1.10"; - sha256 = "13wjarsshp64cc632bqmckx664a57w7cnlm8gs7rfp1bcm7vdnjk"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base base64-bytestring bytestring containers dlist - transformers - ]; - executableHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ - base bytestring QuickCheck quickcheck-simple random - ]; - description = "Parser and Printer for LDAP text data stream"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "text-ldap_0_1_1_11" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, dlist , memory, QuickCheck, quickcheck-simple, random, transformers }: @@ -201065,7 +200345,6 @@ self: { ]; description = "Parser and Printer for LDAP text data stream"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-lens" = callPackage @@ -202035,19 +201314,6 @@ self: { ({ mkDerivation, base, ghc-prim, template-haskell }: mkDerivation { pname = "th-lift"; - version = "0.7.7"; - sha256 = "1dfb0z42vrmdx579lkam07ic03d3v5y19339a3ca0bwpprpzmihn"; - libraryHaskellDepends = [ base ghc-prim template-haskell ]; - testHaskellDepends = [ base ghc-prim template-haskell ]; - homepage = "http://github.com/mboes/th-lift"; - description = "Derive Template Haskell's Lift class for datatypes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-lift_0_7_8" = callPackage - ({ mkDerivation, base, ghc-prim, template-haskell }: - mkDerivation { - pname = "th-lift"; version = "0.7.8"; sha256 = "0ay10b78x3969rpqqrgzy8srkl6iby2cljbf3mm17na8x22k7y1c"; libraryHaskellDepends = [ base ghc-prim template-haskell ]; @@ -202055,7 +201321,6 @@ self: { homepage = "http://github.com/mboes/th-lift"; description = "Derive Template Haskell's Lift class for datatypes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-lift-instances" = callPackage @@ -208122,26 +207387,6 @@ self: { }: mkDerivation { pname = "type-of-html"; - version = "1.3.2.1"; - sha256 = "1c7yj9fh9dxkif2f116cjjgz2prdz1a3xaqni5m9gmvy2y5gvbdn"; - libraryHaskellDepends = [ - base bytestring double-conversion ghc-prim text - ]; - testHaskellDepends = [ base hspec QuickCheck ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring criterion QuickCheck text - ]; - homepage = "https://github.com/knupfer/type-of-html"; - description = "High performance type driven html generation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "type-of-html_1_3_3_0" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, criterion - , double-conversion, ghc-prim, hspec, QuickCheck, text - }: - mkDerivation { - pname = "type-of-html"; version = "1.3.3.0"; sha256 = "0q3r2imr63nv7l08w6q850xqak4gwzvk43qv1vq8x9qwdaf1nisv"; libraryHaskellDepends = [ @@ -208154,7 +207399,6 @@ self: { homepage = "https://github.com/knupfer/type-of-html"; description = "High performance type driven html generation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-operators" = callPackage @@ -212277,6 +211521,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity_0_4_0_4" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "validity"; + version = "0.4.0.4"; + sha256 = "1iva60sfaqnkwdk5b2w6skvsg6096x24bjyd5h057n9dlbimiblx"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity typeclass"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-aeson" = callPackage ({ mkDerivation, aeson, base, validity, validity-scientific , validity-text, validity-unordered-containers, validity-vector @@ -212354,6 +211611,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-text_0_2_0_1" = callPackage + ({ mkDerivation, base, bytestring, text, validity }: + mkDerivation { + pname = "validity-text"; + version = "0.2.0.1"; + sha256 = "1r96nn0y7hgm49y79kf3n86960z7gbz2mw4wcnsi9qlccnjq5qk4"; + libraryHaskellDepends = [ base bytestring text validity ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for text"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-time" = callPackage ({ mkDerivation, base, time, validity }: mkDerivation { @@ -212943,26 +212213,6 @@ self: { }: mkDerivation { pname = "vector-binary-instances"; - version = "0.2.3.5"; - sha256 = "0niad09lbxz3cj20qllyj92lwbc013ihw4lby8fv07x5xjx5a4p1"; - revision = "1"; - editedCabalFile = "0yk61mifvcc31vancsfsd0vskqh5k3a3znx1rbz8wzcs4ijjzh48"; - libraryHaskellDepends = [ base binary vector ]; - testHaskellDepends = [ base binary tasty tasty-quickcheck vector ]; - benchmarkHaskellDepends = [ - base binary bytestring criterion deepseq vector - ]; - homepage = "https://github.com/bos/vector-binary-instances"; - description = "Instances of Data.Binary and Data.Serialize for vector"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vector-binary-instances_0_2_4" = callPackage - ({ mkDerivation, base, binary, bytestring, criterion, deepseq - , tasty, tasty-quickcheck, vector - }: - mkDerivation { - pname = "vector-binary-instances"; version = "0.2.4"; sha256 = "1y236jb72iab9ska1mc48z6yb0xgwmj45laaqdyjxksd84z7hbrb"; libraryHaskellDepends = [ base binary vector ]; @@ -212973,7 +212223,6 @@ self: { homepage = "https://github.com/bos/vector-binary-instances"; description = "Instances of Data.Binary and Data.Serialize for vector"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-buffer" = callPackage @@ -215471,8 +214720,8 @@ self: { }: mkDerivation { pname = "wai-middleware-rollbar"; - version = "0.8.2"; - sha256 = "08bzikcfgrni328mmxwxsr4kbsc5bjjacbxm18hs74b8n4g5f1qd"; + version = "0.8.3"; + sha256 = "17ys7ddpfa0sbjh79k240zqk2v7nlh0v7hrgr7kanal3pk7mvwvm"; libraryHaskellDepends = [ aeson base bytestring case-insensitive hostname http-client http-conduit http-types network text time unordered-containers uuid @@ -215487,7 +214736,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "wai-middleware-rollbar_0_8_3" = callPackage + "wai-middleware-rollbar_0_8_4" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , containers, hostname, hspec, hspec-golden-aeson, http-client , http-conduit, http-types, lens, lens-aeson, network, QuickCheck @@ -215495,8 +214744,8 @@ self: { }: mkDerivation { pname = "wai-middleware-rollbar"; - version = "0.8.3"; - sha256 = "17ys7ddpfa0sbjh79k240zqk2v7nlh0v7hrgr7kanal3pk7mvwvm"; + version = "0.8.4"; + sha256 = "1yycbkcc7jq8mlv6jslnq2j0w8yhv4859fds34pg2k1fg7ccb1iw"; libraryHaskellDepends = [ aeson base bytestring case-insensitive hostname http-client http-conduit http-types network text time unordered-containers uuid @@ -216767,27 +216016,6 @@ self: { }: mkDerivation { pname = "web-routes"; - version = "0.27.13"; - sha256 = "10b0hs7mmvs9ay3ik93s8xd7zlx8pyz20626nrha4mwyixgkmc59"; - revision = "1"; - editedCabalFile = "1s8ax7r8l0484730p36c3gn3n28zhl2p1nwjnprsbhcxd83yq4dh"; - libraryHaskellDepends = [ - base blaze-builder bytestring exceptions ghc-prim http-types mtl - parsec split text utf8-string - ]; - testHaskellDepends = [ base hspec HUnit QuickCheck text ]; - homepage = "http://www.happstack.com/docs/crashcourse/index.html#web-routes"; - description = "portable, type-safe URL routing"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "web-routes_0_27_14" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, exceptions - , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck - , split, text, utf8-string - }: - mkDerivation { - pname = "web-routes"; version = "0.27.14"; sha256 = "1m5ywqy2c9v478ybyrzqc407zdqcg18p5587mrq34v7bnjk27rak"; revision = "1"; @@ -216800,7 +216028,6 @@ self: { homepage = "http://www.happstack.com/docs/crashcourse/index.html#web-routes"; description = "portable, type-safe URL routing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "web-routes-boomerang" = callPackage @@ -216915,21 +216142,6 @@ self: { }: mkDerivation { pname = "web-routes-wai"; - version = "0.24.3"; - sha256 = "070gldklv52gpvas676nw9igr4d3cd1f23prlmd2qjrjn3qvhdq7"; - libraryHaskellDepends = [ - base bytestring http-types text wai web-routes - ]; - description = "Library for maintaining correctness of URLs within an application"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "web-routes-wai_0_24_3_1" = callPackage - ({ mkDerivation, base, bytestring, http-types, text, wai - , web-routes - }: - mkDerivation { - pname = "web-routes-wai"; version = "0.24.3.1"; sha256 = "0j9h22nsj7zf5qpf4i07jdcih00r2fivdilvj8wsylk4d23x27wf"; libraryHaskellDepends = [ @@ -216937,7 +216149,6 @@ self: { ]; description = "Library for maintaining correctness of URLs within an application"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "web-routing" = callPackage @@ -218216,23 +217427,6 @@ self: { }: mkDerivation { pname = "withdependencies"; - version = "0.2.4.1"; - sha256 = "16mxhm0as0598z4w4rhfqxbnasjnzlzsb5nj12b7m8hdg5cg3x6a"; - libraryHaskellDepends = [ - base conduit containers mtl profunctors - ]; - testHaskellDepends = [ base conduit hspec HUnit mtl ]; - homepage = "https://github.com/bartavelle/withdependencies"; - description = "Run computations that depend on one or more elements in a stream"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "withdependencies_0_2_4_2" = callPackage - ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl - , profunctors - }: - mkDerivation { - pname = "withdependencies"; version = "0.2.4.2"; sha256 = "04pk5giqlnls1p62fz9p0sb1288c9qk3ivsq2kb5207cjifyslgz"; libraryHaskellDepends = [ @@ -218242,7 +217436,6 @@ self: { homepage = "https://github.com/bartavelle/withdependencies"; description = "Run computations that depend on one or more elements in a stream"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "witherable" = callPackage @@ -220431,28 +219624,6 @@ self: { }: mkDerivation { pname = "xls"; - version = "0.1.0"; - sha256 = "1w23dqrzc532vgzsmjkks1hm1r0i4jnj1bfxak9c71j9svna50n5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base conduit filepath resourcet transformers - ]; - executableHaskellDepends = [ - base conduit getopt-generics resourcet transformers - ]; - testHaskellDepends = [ base ]; - homepage = "http://github.com/harendra-kumar/xls"; - description = "Parse Microsoft Excel xls files (BIFF/Excel 97-2004)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "xls_0_1_1" = callPackage - ({ mkDerivation, base, conduit, filepath, getopt-generics - , resourcet, transformers - }: - mkDerivation { - pname = "xls"; version = "0.1.1"; sha256 = "0a09zw90xiaklr68w932md38s95jzwid914lw7frnf3qd8j12xq9"; isLibrary = true; @@ -220467,7 +219638,6 @@ self: { homepage = "http://github.com/harendra-kumar/xls"; description = "Parse Microsoft Excel xls files (BIFF/Excel 97-2004)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xlsior" = callPackage @@ -226604,6 +225774,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) unzip; inherit (pkgs) zip;}; + "zip-archive_0_3_2_3" = callPackage + ({ mkDerivation, array, base, binary, bytestring, Cabal, containers + , digest, directory, filepath, HUnit, mtl, old-time, pretty + , process, temporary, text, time, unix, unzip, zip, zlib + }: + mkDerivation { + pname = "zip-archive"; + version = "0.3.2.3"; + sha256 = "1b3zll9j3w57kxnng09c5xcj0d18ldj9i3f8qks4kyyrsgyviw9x"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + array base binary bytestring containers digest directory filepath + mtl old-time pretty text time unix zlib + ]; + libraryToolDepends = [ unzip ]; + executableHaskellDepends = [ base bytestring directory ]; + testHaskellDepends = [ + base bytestring directory filepath HUnit old-time process temporary + time unix + ]; + testToolDepends = [ unzip zip ]; + homepage = "http://github.com/jgm/zip-archive"; + description = "Library for creating and modifying zip archives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) unzip; inherit (pkgs) zip;}; + "zip-conduit" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra , criterion, digest, directory, filepath, hpc, HUnit, LibZip, mtl diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 0f866a96e71..2c628eff562 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -112,7 +112,7 @@ let sha256Arg = if isNull sha256 then "--sha256=" else ''--sha256="${sha256}"''; in pkgs.buildPackages.stdenv.mkDerivation { name = "cabal2nix-${name}"; - nativeBuildInputs = [ pkgs.buildPackages.haskellPackages.cabal2nix ]; + nativeBuildInputs = [ pkgs.buildPackages.cabal2nix ]; preferLocalBuild = true; phases = ["installPhase"]; LANG = "en_US.UTF-8"; diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix index 12d17b2e832..6a07a006c6b 100644 --- a/pkgs/development/interpreters/python/build-python-package.nix +++ b/pkgs/development/interpreters/python/build-python-package.nix @@ -6,7 +6,7 @@ , wrapPython , setuptools , unzip -, ensureNewerSourcesHook +, ensureNewerSourcesForZipFilesHook , toPythonModule , namePrefix , bootstrapped-pip @@ -19,7 +19,7 @@ let wheel-specific = import ./build-python-package-wheel.nix { }; common = import ./build-python-package-common.nix { inherit python bootstrapped-pip; }; mkPythonDerivation = import ./mk-python-derivation.nix { - inherit lib python wrapPython setuptools unzip ensureNewerSourcesHook toPythonModule namePrefix; + inherit lib python wrapPython setuptools unzip ensureNewerSourcesForZipFilesHook toPythonModule namePrefix; }; in diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index d9cff16f448..96a9cdf0c61 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -5,7 +5,7 @@ , wrapPython , setuptools , unzip -, ensureNewerSourcesHook +, ensureNewerSourcesForZipFilesHook # Whether the derivation provides a Python module or not. , toPythonModule , namePrefix @@ -69,7 +69,7 @@ toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [ name = namePrefix + name; - nativeBuildInputs = [ (ensureNewerSourcesHook { year = "1980"; }) ] + nativeBuildInputs = [ ensureNewerSourcesForZipFilesHook ] ++ nativeBuildInputs; buildInputs = [ wrapPython ] diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 69faf913abf..5439c7657e0 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "${baseName}-${version}"; baseName = "bctoolbox"; - version = "0.2.0"; + version = "0.6.0"; buildInputs = [cmake mbedtls bcunit srtp]; src = fetchFromGitHub { owner = "BelledonneCommunications"; repo = "${baseName}"; rev = "${version}"; - sha256 = "09mjqdfjxy4jy1z68b2i99hgkbnhhk7vnbfhj9sdpd1p3jk2ha33"; + sha256 = "1cxx243wyzkd4xnvpyqf97n0rjhfckpvw1vhwnbwshq3q6fra909"; }; meta = { diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix new file mode 100644 index 00000000000..8805dc74a26 --- /dev/null +++ b/pkgs/development/libraries/belcard/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox, belr }: + +stdenv.mkDerivation rec { + baseName = "belcard"; + version = "1.0.2"; + name = "${baseName}-${version}"; + + src = fetchFromGitHub { + owner = "BelledonneCommunications"; + repo = "${baseName}"; + rev = "${version}"; + sha256 = "1pwji83vpsdrfma24rnj3rz1x0a0g6zk3v4xjnip7zf2ys3zcnlk"; + }; + + buildInputs = [ bctoolbox belr ]; + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib;{ + description = "Belcard is a C++ library to manipulate VCard standard format"; + homepage = https://github.com/BelledonneCommunications/belcard; + license = licenses.lgpl21; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index b055b2358a5..003fce0ea8c 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { baseName = "belle-sip"; - version = "1.5.0"; + version = "1.6.3"; name = "${baseName}-${version}"; src = fetchFromGitHub { owner = "BelledonneCommunications"; repo = "${baseName}"; rev = "${version}"; - sha256 = "0hnm64hwgq003wicz6c485fryjfhi820fgin8ndknq60kvwxsrzn"; + sha256 = "0q70db1klvhca1af29bm9paka3gyii5hfbzrj4178gclsg7cj8fk"; }; nativeBuildInputs = [ jre cmake ]; diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix new file mode 100644 index 00000000000..214abb21f2c --- /dev/null +++ b/pkgs/development/libraries/belr/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox }: + +stdenv.mkDerivation rec { + baseName = "belr"; + version = "0.1.3"; + name = "${baseName}-${version}"; + + src = fetchFromGitHub { + owner = "BelledonneCommunications"; + repo = "${baseName}"; + rev = "${version}"; + sha256 = "0mf8lsyq1z3b5p47c00lnwc8n7v9nzs1fd2g9c9hnz6fjd2ka44w"; + }; + + buildInputs = [ bctoolbox ]; + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib;{ + description = "Belr is Belledonne Communications' language recognition library"; + homepage = https://github.com/BelledonneCommunications/belr; + license = licenses.lgpl21; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix new file mode 100644 index 00000000000..cdc660ca3f3 --- /dev/null +++ b/pkgs/development/libraries/bzrtp/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox, sqlite }: + +stdenv.mkDerivation rec { + baseName = "bzrtp"; + version = "1.0.6"; + name = "${baseName}-${version}"; + + src = fetchFromGitHub { + owner = "BelledonneCommunications"; + repo = "${baseName}"; + rev = "${version}"; + sha256 = "0438zzxp82bj5fmvqnwlljkgrz9ab5qm5lgpwwgmg1cp78bp2l45"; + }; + + buildInputs = [ bctoolbox sqlite ]; + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "BZRTP is an opensource implementation of ZRTP keys exchange protocol"; + homepage = https://github.com/BelledonneCommunications/bzrtp; + license = licenses.lgpl21; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix index 9aa1a905ec9..8b534edd249 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix @@ -24,4 +24,8 @@ runCommand "fc-cache" mkdir -p $out fc-cache -sv + + # This is not a cache dir in the normal sense -- it won't be automatically + # recreated. + rm "$out/CACHEDIR.TAG" '' diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 4e6fe783dc2..f33e52867c5 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,19 +1,26 @@ { stdenv, fetchurl, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: -stdenv.mkDerivation rec - { name = "grpc-1.8.3"; - src = fetchurl - { url = "https://github.com/grpc/grpc/archive/v1.8.3.tar.gz"; - sha256 = "14ichjllvhkbv8sjh9j5njnagpqw2sl12n41ga90jnj7qvfwwjy1"; - }; - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; - cmakeFlags = - [ "-DgRPC_ZLIB_PROVIDER=package" - "-DgRPC_CARES_PROVIDER=package" - "-DgRPC_SSL_PROVIDER=package" - "-DgRPC_PROTOBUF_PROVIDER=package" - "-DgRPC_GFLAGS_PROVIDER=package" - ]; - enableParallelBuilds = true; - } +stdenv.mkDerivation rec { + version = "1.9.1"; + name = "grpc-${version}"; + src = fetchurl { + url = "https://github.com/grpc/grpc/archive/v${version}.tar.gz"; + sha256 = "0h2w0dckxydngva9kl7dpilif8k9zi2ajnlanscr7s5kkza3dhps"; + }; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; + cmakeFlags = + [ "-DgRPC_ZLIB_PROVIDER=package" + "-DgRPC_CARES_PROVIDER=package" + "-DgRPC_SSL_PROVIDER=package" + "-DgRPC_PROTOBUF_PROVIDER=package" + "-DgRPC_GFLAGS_PROVIDER=package" + ]; + enableParallelBuilds = true; + + meta = with stdenv.lib; { + description = "The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)"; + license = licenses.asl20; + homepage = https://grpc.io/; + }; +} diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index c0745cb9e68..ad39a4fde31 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchurl, pkgconfig, expat, ncurses, pciutils, numactl -, cairo, libX11 -, x11Support ? (!stdenv.isCygwin) +, x11Support ? false, libX11 ? null, cairo ? null }: +assert x11Support -> libX11 != null && cairo != null; + with stdenv.lib; stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index 7a278b4904f..a83a3c672c0 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -1,17 +1,22 @@ -{ stdenv, fetchFromGitHub, python, llvm, clang }: +{ stdenv, fetchFromGitHub, python, llvmPackages }: + +let + llvm = llvmPackages.llvm; + clang = llvmPackages.clang; +in stdenv.mkDerivation { - name = "libclc-2017-02-25"; + name = "libclc-2017-11-29"; src = fetchFromGitHub { owner = "llvm-mirror"; repo = "libclc"; - rev = "17648cd846390e294feafef21c32c7106eac1e24"; - sha256 = "1c20jyh3sdwd9r37zs4vvppmsx8vhf2xbx0cxsrc27bhx5245p0s"; + rev = "d6384415ab854c68777dd77451aa2bc0d959da99"; + sha256 = "10fqrlnqlknh58x7pfsbg9r07fblfg2mgq2m4fr1jbb836ncn3wh"; }; nativeBuildInputs = [ python ]; - buildInputs = [ llvm ]; + buildInputs = [ llvm clang ]; postPatch = '' sed -i 's,llvm_clang =.*,llvm_clang = "${clang}/bin/clang",' configure.py diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 06cc53abb56..90f15436764 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -1,22 +1,29 @@ { stdenv, fetchurl, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm , libopus, ffmpeg, libX11, libXv, mesa, glew, libtheora, libvpx, SDL, libupnp , ortp, libv4l, libpcap, srtp, fetchFromGitHub, cmake, bctoolbox, doxygen -, python, libXext, libmatroska, openssl +, python, libXext, libmatroska, openssl, fetchpatch }: stdenv.mkDerivation rec { baseName = "mediastreamer2"; - version = "2.14.0"; + version = "2.16.1"; name = "${baseName}-${version}"; src = fetchFromGitHub { owner = "BelledonneCommunications"; repo = "${baseName}"; rev = "${version}"; - sha256 = "1b59rzsaw54mhy4pz9hndmim4rgidkn7s6c4iyl34mz58lwxpmqp"; + sha256 = "02745bzl2r1jqvdqzyv94fjd4w92zr976la4c4nfvsy52waqah7j"; }; - patches = [ ./plugins_dir.patch ]; + patches = [ + (fetchpatch { + name = "allow-build-without-git.patch"; + url = "https://github.com/BelledonneCommunications/mediastreamer2/commit/de3a24b795d7a78e78eab6b974e7ec5abf2259ac.patch"; + sha256 = "1zqkrab42n4dha0knfsyj4q0wc229ma125gk9grj67ps7r7ipscy"; + }) + ./plugins_dir.patch + ]; nativeBuildInputs = [ pkgconfig intltool cmake doxygen python ]; diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix index 6c3a77cfaf5..75dda07494d 100644 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -9,14 +9,16 @@ stdenv.mkDerivation rec { sha256 = "0f14gpa13sdm0kzqv5yycp4pschbmi6n5fj7wl4ilspzsrqcgqr2"; }; - buildInputs = [ ruby opencl-headers ]; + nativeBuildInputs = [ ruby ]; + + buildInputs = [ opencl-headers ]; postPatch = '' sed -i 's,"/etc/OpenCL/vendors","${mesa_noglu.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c ''; meta = with stdenv.lib; { - description = "OpenCL ICD Loader"; + description = "OpenCL ICD Loader for ${opencl-headers.name}"; homepage = https://forge.imag.fr/projects/ocl-icd/; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix index 717bb5ad0ee..9ce8bb618bf 100644 --- a/pkgs/development/libraries/opencl-headers/default.nix +++ b/pkgs/development/libraries/opencl-headers/default.nix @@ -1,22 +1,24 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub +, version # "12" for "1.2", "22" for "2.2" and so on +}: stdenv.mkDerivation rec { - name = "opencl-headers-2.1-2016-11-29"; + name = "opencl-headers-${version}-2017-07-18"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-Headers"; - rev = "abb29588550c77f8340a6c3683531407013bf26b"; - sha256 = "0zjznq65i4b2h4k36qfbbzq1acf2jdd9vygjv5az1yk7qgsp4jj7"; + rev = "f039db6764d52388658ef15c30b2237bbda49803"; + sha256 = "0z04i330zr8czak2624q71aajdcq7ly8mb5bgala5m235qjpsrh7"; }; installPhase = '' mkdir -p $out/include/CL - cp * $out/include/CL + cp opencl${version}/CL/* $out/include/CL ''; meta = with stdenv.lib; { - description = "Khronos OpenCL headers"; + description = "Khronos OpenCL headers version ${version}"; homepage = https://www.khronos.org/registry/cl/; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index f05811f3481..5dc5df8e95b 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { baseName = "ortp"; - version = "0.27.0"; + version = "1.0.2"; name = "${baseName}-${version}"; src = fetchFromGitHub { owner = "BelledonneCommunications"; repo = "${baseName}"; rev = "${version}"; - sha256 = "0gjaaph4pamay9gn1yn7ky5wyzhj93r53rwak7h8s48vf08fqyv7"; + sha256 = "12cwv593bsdnxs0zfcp07vwyk7ghlz2wv7vdbs1ksv293w3vj2rv"; }; buildInputs = [ bctoolbox ]; diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index e2c80e445e7..42c4b028aa8 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, libjpeg, zlib, perl }: -let version = "7.0.0"; +let version = "7.1.1"; in stdenv.mkDerivation rec { name = "qpdf-${version}"; src = fetchurl { url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz"; - sha256 = "0py6p27fx4qrwq9mvcybna42b0bdi359x38lzmggxl5a9khqvl7y"; + sha256 = "1ypjxm74dhn9c4mj027zzkh0z4kpw9xiqwh3pjmmghm502hby3ca"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix index b8ffc16f905..b02ac885237 100644 --- a/pkgs/development/libraries/udunits/default.nix +++ b/pkgs/development/libraries/udunits/default.nix @@ -3,10 +3,10 @@ }: stdenv.mkDerivation rec { - name = "udunits-2.2.24"; + name = "udunits-2.2.26"; src = fetchurl { url = "ftp://ftp.unidata.ucar.edu/pub/udunits/${name}.tar.gz"; - sha256 = "15bz2wv46wiwdzai8770gzy05prgj120x6j2hmihavv5y89cbfi0"; + sha256 = "0v9mqw4drnkzkm57331ail6yvs9485jmi37s40lhvmf7r5lli3rn"; }; nativeBuildInputs = [ bison flex file ]; diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix index 53207f85541..7c92e7224f9 100644 --- a/pkgs/development/libraries/unibilium/default.nix +++ b/pkgs/development/libraries/unibilium/default.nix @@ -1,21 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, libtool, pkgconfig }: +{ stdenv, lib, fetchFromGitHub, libtool, pkgconfig, perl }: stdenv.mkDerivation rec { name = "unibilium-${version}"; - version = "1.2.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "mauke"; repo = "unibilium"; rev = "v${version}"; - sha256 = "11mbfijdrvbmdlmxs8j4vij78ki0vna89yg3r9n9g1i6j45hiq2r"; + sha256 = "1wa9a32wzqnxqh1jh554afj13dzjr6mw2wzqzw8d08nza9pg2ra2"; }; makeFlags = [ "PREFIX=$(out)" ] ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig perl ]; buildInputs = [ libtool ]; meta = with lib; { diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index d0731fc574a..c63a9b3a054 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -24,8 +24,8 @@ let lispPackages = rec { quicklispdist = pkgs.fetchurl { # Will usually be replaced with a fresh version anyway, but needs to be # a valid distinfo.txt - url = "http://beta.quicklisp.org/dist/quicklisp/2017-07-25/distinfo.txt"; - sha256 = "165fd4a10zc3mxyy7wr4i2r3n6fzd1wd2hgzfyp32xlc41qj2ajf"; + url = "http://beta.quicklisp.org/dist/quicklisp/2018-01-31/distinfo.txt"; + sha256 = "0z28yz205cl8pa8lbflw9072mywg69jx0gf091rhx2wjjf9h14qy"; }; buildPhase = '' true; ''; postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix index 6a40dda0c1c..a5fddd417fa 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''_3bmd''; - version = ''20161204-git''; + version = ''20171019-git''; description = ''markdown processor in CL using esrap parser.''; deps = [ args."alexandria" args."esrap" args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz''; - sha256 = ''158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx''; + url = ''http://beta.quicklisp.org/archive/3bmd/2017-10-19/3bmd-20171019-git.tgz''; + sha256 = ''1lrh1ypn9wrjcayi9vc706knac1vsxlrzlsxq73apdc7jx4wzywz''; }; packageName = "3bmd"; @@ -18,12 +18,12 @@ rec { overrides = x: x; } /* (SYSTEM 3bmd DESCRIPTION markdown processor in CL using esrap parser. SHA256 - 158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx URL - http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz MD5 - b80864c74437e0cfb66663e9bbf08fed NAME 3bmd FILENAME _3bmd DEPS + 1lrh1ypn9wrjcayi9vc706knac1vsxlrzlsxq73apdc7jx4wzywz URL + http://beta.quicklisp.org/archive/3bmd/2017-10-19/3bmd-20171019-git.tgz MD5 + d691962a511f2edc15f4fc228ecdf546 NAME 3bmd FILENAME _3bmd DEPS ((NAME alexandria FILENAME alexandria) (NAME esrap FILENAME esrap) (NAME split-sequence FILENAME split-sequence)) - DEPENDENCIES (alexandria esrap split-sequence) VERSION 20161204-git + DEPENDENCIES (alexandria esrap split-sequence) VERSION 20171019-git SIBLINGS (3bmd-ext-code-blocks 3bmd-ext-definition-lists 3bmd-ext-tables 3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd-youtube) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix index 334ff7e82d6..9b9486e9758 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''alexandria''; - version = ''20170630-git''; + version = ''20170830-git''; description = ''Alexandria is a collection of portable public domain utilities.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/alexandria/2017-06-30/alexandria-20170630-git.tgz''; - sha256 = ''1ch7987ijs5gz5dk3i02bqgb2bn7s9p3sfsrwq4fp1sxykwr9fis''; + url = ''http://beta.quicklisp.org/archive/alexandria/2017-08-30/alexandria-20170830-git.tgz''; + sha256 = ''0vprl8kg5qahwp8zyc26bk0qpdynga9hbv5qnlvk3cclfpvm8kl9''; }; packageName = "alexandria"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM alexandria DESCRIPTION Alexandria is a collection of portable public domain utilities. SHA256 - 1ch7987ijs5gz5dk3i02bqgb2bn7s9p3sfsrwq4fp1sxykwr9fis URL - http://beta.quicklisp.org/archive/alexandria/2017-06-30/alexandria-20170630-git.tgz - MD5 ce5427881c909981192f870cb52ff59f NAME alexandria FILENAME alexandria - DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS (alexandria-tests) + 0vprl8kg5qahwp8zyc26bk0qpdynga9hbv5qnlvk3cclfpvm8kl9 URL + http://beta.quicklisp.org/archive/alexandria/2017-08-30/alexandria-20170830-git.tgz + MD5 13ea5af7055094a87dec1e45090f894a NAME alexandria FILENAME alexandria + DEPS NIL DEPENDENCIES NIL VERSION 20170830-git SIBLINGS (alexandria-tests) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix index f7adf3b3494..7c618a9fffb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''array-utils''; - version = ''20170630-git''; + version = ''20180131-git''; description = ''A few utilities for working with arrays.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/array-utils/2017-06-30/array-utils-20170630-git.tgz''; - sha256 = ''1nj42w2q11qdg65cviaj514pcql1gi729mcsj5g2vy17pr298zgb''; + url = ''http://beta.quicklisp.org/archive/array-utils/2018-01-31/array-utils-20180131-git.tgz''; + sha256 = ''01vjb146lb1dp77xcpinq4r1jv2fvl3gzj50x9i04b5mhfaqpkd0''; }; packageName = "array-utils"; @@ -18,8 +18,8 @@ rec { overrides = x: x; } /* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays. - SHA256 1nj42w2q11qdg65cviaj514pcql1gi729mcsj5g2vy17pr298zgb URL - http://beta.quicklisp.org/archive/array-utils/2017-06-30/array-utils-20170630-git.tgz - MD5 550b37bc0eccfafa889de00b59c422dc NAME array-utils FILENAME array-utils - DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS (array-utils-test) + SHA256 01vjb146lb1dp77xcpinq4r1jv2fvl3gzj50x9i04b5mhfaqpkd0 URL + http://beta.quicklisp.org/archive/array-utils/2018-01-31/array-utils-20180131-git.tgz + MD5 339670a03dd7d865cd045a6556d705c6 NAME array-utils FILENAME array-utils + DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS (array-utils-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix index e96c18a8120..4f438eb734a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''babel-streams''; - version = ''babel-20170630-git''; + version = ''babel-20171227-git''; description = ''Some useful streams based on Babel's encoding code''; deps = [ args."alexandria" args."babel" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz''; - sha256 = ''0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx''; + url = ''http://beta.quicklisp.org/archive/babel/2017-12-27/babel-20171227-git.tgz''; + sha256 = ''166y6j9ma1vxzy5bcwnbi37zwgn2zssx5x1q7zr63kyj2caiw2rf''; }; packageName = "babel-streams"; @@ -19,12 +19,12 @@ rec { } /* (SYSTEM babel-streams DESCRIPTION Some useful streams based on Babel's encoding code SHA256 - 0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx URL - http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz - MD5 aa7eff848b97bb7f7aa6bdb43a081964 NAME babel-streams FILENAME + 166y6j9ma1vxzy5bcwnbi37zwgn2zssx5x1q7zr63kyj2caiw2rf URL + http://beta.quicklisp.org/archive/babel/2017-12-27/babel-20171227-git.tgz + MD5 8ea39f73873847907a8bb67f99f16ecd NAME babel-streams FILENAME babel-streams DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME trivial-features FILENAME trivial-features) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (alexandria babel trivial-features trivial-gray-streams) - VERSION babel-20170630-git SIBLINGS (babel-tests babel) PARASITES NIL) */ + VERSION babel-20171227-git SIBLINGS (babel-tests babel) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix index d5b31daa33a..4cba3e86e06 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''babel''; - version = ''20170630-git''; + version = ''20171227-git''; description = ''Babel, a charset conversion library.''; deps = [ args."alexandria" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz''; - sha256 = ''0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx''; + url = ''http://beta.quicklisp.org/archive/babel/2017-12-27/babel-20171227-git.tgz''; + sha256 = ''166y6j9ma1vxzy5bcwnbi37zwgn2zssx5x1q7zr63kyj2caiw2rf''; }; packageName = "babel"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM babel DESCRIPTION Babel, a charset conversion library. SHA256 - 0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx URL - http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz - MD5 aa7eff848b97bb7f7aa6bdb43a081964 NAME babel FILENAME babel DEPS + 166y6j9ma1vxzy5bcwnbi37zwgn2zssx5x1q7zr63kyj2caiw2rf URL + http://beta.quicklisp.org/archive/babel/2017-12-27/babel-20171227-git.tgz + MD5 8ea39f73873847907a8bb67f99f16ecd NAME babel FILENAME babel DEPS ((NAME alexandria FILENAME alexandria) (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria trivial-features) VERSION 20170630-git SIBLINGS + DEPENDENCIES (alexandria trivial-features) VERSION 20171227-git SIBLINGS (babel-streams babel-tests) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix index 1c6dadb8fb4..e60f60a303b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''caveman''; - version = ''20170630-git''; + version = ''20171019-git''; description = ''Web Application Framework for Common Lisp''; - deps = [ args."anaphora" args."cl-emb" args."cl-ppcre" args."cl-project" args."cl-syntax" args."cl-syntax-annot" args."clack-v1-compat" args."do-urlencode" args."local-time" args."myway" ]; + deps = [ args."alexandria" args."anaphora" args."babel" args."babel-streams" args."bordeaux-threads" args."circular-streams" args."cl-annot" args."cl-ansi-text" args."cl-colors" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack-v1-compat" args."dexador" args."do-urlencode" args."http-body" args."lack" args."let-plus" args."local-time" args."map-set" args."marshal" args."myway" args."named-readtables" args."prove" args."quri" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-gray-streams" args."trivial-types" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/caveman/2017-06-30/caveman-20170630-git.tgz''; - sha256 = ''0wpjnskcvrgvqn9gbr43yqnpcxfmdggbiyaxz9rrhgcis2rwjkj2''; + url = ''http://beta.quicklisp.org/archive/caveman/2017-10-19/caveman-20171019-git.tgz''; + sha256 = ''0yjhjhjnq7l6z4fj9l470hgsa609adm216fss5xsf43pljv2h5ra''; }; packageName = "caveman"; @@ -18,20 +18,42 @@ rec { overrides = x: x; } /* (SYSTEM caveman DESCRIPTION Web Application Framework for Common Lisp SHA256 - 0wpjnskcvrgvqn9gbr43yqnpcxfmdggbiyaxz9rrhgcis2rwjkj2 URL - http://beta.quicklisp.org/archive/caveman/2017-06-30/caveman-20170630-git.tgz - MD5 774f85fa78792bde012bad78efff4b53 NAME caveman FILENAME caveman DEPS - ((NAME anaphora FILENAME anaphora) (NAME cl-emb FILENAME cl-emb) - (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-project FILENAME cl-project) - (NAME cl-syntax FILENAME cl-syntax) + 0yjhjhjnq7l6z4fj9l470hgsa609adm216fss5xsf43pljv2h5ra URL + http://beta.quicklisp.org/archive/caveman/2017-10-19/caveman-20171019-git.tgz + MD5 41318d26a0825e504042fa693959feaf NAME caveman FILENAME caveman DEPS + ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) + (NAME babel FILENAME babel) (NAME babel-streams FILENAME babel-streams) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME circular-streams FILENAME circular-streams) + (NAME cl-annot FILENAME cl-annot) + (NAME cl-ansi-text FILENAME cl-ansi-text) + (NAME cl-colors FILENAME cl-colors) (NAME cl-emb FILENAME cl-emb) + (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME cl-project FILENAME cl-project) (NAME cl-syntax FILENAME cl-syntax) (NAME cl-syntax-annot FILENAME cl-syntax-annot) + (NAME cl-utilities FILENAME cl-utilities) (NAME clack-v1-compat FILENAME clack-v1-compat) - (NAME do-urlencode FILENAME do-urlencode) - (NAME local-time FILENAME local-time) (NAME myway FILENAME myway)) + (NAME dexador FILENAME dexador) (NAME do-urlencode FILENAME do-urlencode) + (NAME http-body FILENAME http-body) (NAME lack FILENAME lack) + (NAME let-plus FILENAME let-plus) (NAME local-time FILENAME local-time) + (NAME map-set FILENAME map-set) (NAME marshal FILENAME marshal) + (NAME myway FILENAME myway) + (NAME named-readtables FILENAME named-readtables) + (NAME prove FILENAME prove) (NAME quri FILENAME quri) + (NAME split-sequence FILENAME split-sequence) + (NAME trivial-backtrace FILENAME trivial-backtrace) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams) + (NAME trivial-types FILENAME trivial-types) + (NAME usocket FILENAME usocket)) DEPENDENCIES - (anaphora cl-emb cl-ppcre cl-project cl-syntax cl-syntax-annot - clack-v1-compat do-urlencode local-time myway) - VERSION 20170630-git SIBLINGS + (alexandria anaphora babel babel-streams bordeaux-threads circular-streams + cl-annot cl-ansi-text cl-colors cl-emb cl-fad cl-ppcre cl-project + cl-syntax cl-syntax-annot cl-utilities clack-v1-compat dexador + do-urlencode http-body lack let-plus local-time map-set marshal myway + named-readtables prove quri split-sequence trivial-backtrace + trivial-features trivial-gray-streams trivial-types usocket) + VERSION 20171019-git SIBLINGS (caveman-middleware-dbimanager caveman-test caveman2-db caveman2-test caveman2) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix index 6a4fd0defb9..4a533220caf 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''chunga''; - version = ''1.1.6''; + version = ''20180131-git''; description = ''''; deps = [ args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/chunga/2014-12-17/chunga-1.1.6.tgz''; - sha256 = ''1ivdfi9hjkzp2anhpjm58gzrjpn6mdsp35km115c1j1c4yhs9lzg''; + url = ''http://beta.quicklisp.org/archive/chunga/2018-01-31/chunga-20180131-git.tgz''; + sha256 = ''0crlv6n6al7j9b40dpfjd13870ih5hzwra29xxfg3zg2zy2kdnrq''; }; packageName = "chunga"; @@ -18,8 +18,8 @@ rec { overrides = x: x; } /* (SYSTEM chunga DESCRIPTION NIL SHA256 - 1ivdfi9hjkzp2anhpjm58gzrjpn6mdsp35km115c1j1c4yhs9lzg URL - http://beta.quicklisp.org/archive/chunga/2014-12-17/chunga-1.1.6.tgz MD5 - 75f5c4f9dec3a8a181ed5ef7e5d700b5 NAME chunga FILENAME chunga DEPS + 0crlv6n6al7j9b40dpfjd13870ih5hzwra29xxfg3zg2zy2kdnrq URL + http://beta.quicklisp.org/archive/chunga/2018-01-31/chunga-20180131-git.tgz + MD5 044b684535b11b1eee1cf939bec6e14a NAME chunga FILENAME chunga DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES - (trivial-gray-streams) VERSION 1.1.6 SIBLINGS NIL PARASITES NIL) */ + (trivial-gray-streams) VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix index b25e131be55..8d2254e4bdc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix @@ -5,7 +5,7 @@ rec { description = ''Circularly readable streams for Common Lisp''; - deps = [ args."alexandria" args."fast-io" args."static-vectors" args."trivial-gray-streams" ]; + deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz''; @@ -23,8 +23,13 @@ rec { http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz MD5 2383f3b82fa3335d9106e1354a678db8 NAME circular-streams FILENAME circular-streams DEPS - ((NAME alexandria FILENAME alexandria) (NAME fast-io FILENAME fast-io) + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) + (NAME fast-io FILENAME fast-io) (NAME static-vectors FILENAME static-vectors) + (NAME trivial-features FILENAME trivial-features) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES (alexandria fast-io static-vectors trivial-gray-streams) + DEPENDENCIES + (alexandria babel cffi cffi-grovel fast-io static-vectors trivial-features + trivial-gray-streams) VERSION 20161204-git SIBLINGS (circular-streams-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix index 8a8a26a2e9b..0243709f3fe 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl+ssl''; - version = ''cl+ssl-20170725-git''; + version = ''cl+ssl-20171227-git''; parasites = [ "openssl-1.1.0" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl+ssl/2017-07-25/cl+ssl-20170725-git.tgz''; - sha256 = ''1p5886l5bwz4bj2xy8mpsjswg103b8saqdnw050a4wk9shpj1j69''; + url = ''http://beta.quicklisp.org/archive/cl+ssl/2017-12-27/cl+ssl-20171227-git.tgz''; + sha256 = ''1m6wcyccjyrz44mq0v1gvmpi44i9phknym5pimmicx3jvjyr37s4''; }; packageName = "cl+ssl"; @@ -20,9 +20,9 @@ rec { overrides = x: x; } /* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 - 1p5886l5bwz4bj2xy8mpsjswg103b8saqdnw050a4wk9shpj1j69 URL - http://beta.quicklisp.org/archive/cl+ssl/2017-07-25/cl+ssl-20170725-git.tgz - MD5 3458c83f442395e0492c7e9b9720a1f2 NAME cl+ssl FILENAME cl+ssl DEPS + 1m6wcyccjyrz44mq0v1gvmpi44i9phknym5pimmicx3jvjyr37s4 URL + http://beta.quicklisp.org/archive/cl+ssl/2017-12-27/cl+ssl-20171227-git.tgz + MD5 d00ce843db6038e6ff33d19668b5e038 NAME cl+ssl FILENAME cl+ssl DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME flexi-streams FILENAME flexi-streams) @@ -33,5 +33,5 @@ rec { DEPENDENCIES (alexandria babel bordeaux-threads cffi flexi-streams trivial-features trivial-garbage trivial-gray-streams uiop) - VERSION cl+ssl-20170725-git SIBLINGS (cl+ssl.test) PARASITES + VERSION cl+ssl-20171227-git SIBLINGS (cl+ssl.test) PARASITES (openssl-1.1.0)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix index 8a323e3dcc9..9291be14e33 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-async-repl''; - version = ''cl-async-20160825-git''; + version = ''cl-async-20171130-git''; description = ''REPL integration for CL-ASYNC.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz''; - sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa''; + url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz''; + sha256 = ''0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm''; }; packageName = "cl-async-repl"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256 - 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL - http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz - MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-repl FILENAME + 0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm URL + http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz + MD5 4e54a593f8c7f02a2c7f7e0e07247c05 NAME cl-async-repl FILENAME cl-async-repl DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -38,5 +38,5 @@ rec { (alexandria babel bordeaux-threads cffi cffi-grovel cl-async cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams vom) - VERSION cl-async-20160825-git SIBLINGS + VERSION cl-async-20171130-git SIBLINGS (cl-async-ssl cl-async-test cl-async) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix index 7c040c7a461..4417d25be9f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-async-ssl''; - version = ''cl-async-20160825-git''; + version = ''cl-async-20171130-git''; description = ''SSL Wrapper around cl-async socket implementation.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz''; - sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa''; + url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz''; + sha256 = ''0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm''; }; packageName = "cl-async-ssl"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM cl-async-ssl DESCRIPTION SSL Wrapper around cl-async socket implementation. SHA256 - 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL - http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz - MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-ssl FILENAME + 0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm URL + http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz + MD5 4e54a593f8c7f02a2c7f7e0e07247c05 NAME cl-async-ssl FILENAME cl-async-ssl DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -39,5 +39,5 @@ rec { (alexandria babel bordeaux-threads cffi cffi-grovel cl-async cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams vom) - VERSION cl-async-20160825-git SIBLINGS + VERSION cl-async-20171130-git SIBLINGS (cl-async-repl cl-async-test cl-async) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix index cc31b7a186f..6f62c9ff6b9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-async''; - version = ''20160825-git''; + version = ''20171130-git''; parasites = [ "cl-async-base" "cl-async-util" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz''; - sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa''; + url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz''; + sha256 = ''0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm''; }; packageName = "cl-async"; @@ -20,9 +20,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-async DESCRIPTION Asynchronous operations for Common Lisp. SHA256 - 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL - http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz - MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async FILENAME cl-async DEPS + 0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm URL + http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz + MD5 4e54a593f8c7f02a2c7f7e0e07247c05 NAME cl-async FILENAME cl-async DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -35,5 +35,5 @@ rec { DEPENDENCIES (alexandria babel bordeaux-threads cffi cffi-grovel cl-libuv cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams uiop vom) - VERSION 20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test) + VERSION 20171130-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test) PARASITES (cl-async-base cl-async-util)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix index 3e1ef10ef99..82571660280 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-csv''; - version = ''20170403-git''; + version = ''20180131-git''; - parasites = [ "cl-csv-test" ]; + parasites = [ "cl-csv/test" ]; description = ''Facilities for reading and writing CSV format files''; deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."lisp-unit2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-csv/2017-04-03/cl-csv-20170403-git.tgz''; - sha256 = ''1mz0hr0r7yxw1dzdbaqzxabmipp286zc6aglni9f46isjwmqpy6h''; + url = ''http://beta.quicklisp.org/archive/cl-csv/2018-01-31/cl-csv-20180131-git.tgz''; + sha256 = ''0i912ch1mvms5iynmxrlxclzc325n3zsn3y9qdszh5lhpmw043wh''; }; packageName = "cl-csv"; @@ -21,9 +21,9 @@ rec { } /* (SYSTEM cl-csv DESCRIPTION Facilities for reading and writing CSV format files SHA256 - 1mz0hr0r7yxw1dzdbaqzxabmipp286zc6aglni9f46isjwmqpy6h URL - http://beta.quicklisp.org/archive/cl-csv/2017-04-03/cl-csv-20170403-git.tgz - MD5 1e71a90c5057371fab044d440c39f0a3 NAME cl-csv FILENAME cl-csv DEPS + 0i912ch1mvms5iynmxrlxclzc325n3zsn3y9qdszh5lhpmw043wh URL + http://beta.quicklisp.org/archive/cl-csv/2018-01-31/cl-csv-20180131-git.tgz + MD5 0be8956ee31e03436f8a2190387bad46 NAME cl-csv FILENAME cl-csv DEPS ((NAME alexandria FILENAME alexandria) (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unicode FILENAME cl-unicode) @@ -32,5 +32,5 @@ rec { DEPENDENCIES (alexandria cl-interpol cl-ppcre cl-unicode flexi-streams iterate lisp-unit2) - VERSION 20170403-git SIBLINGS (cl-csv-clsql cl-csv-data-table) PARASITES - (cl-csv-test)) */ + VERSION 20180131-git SIBLINGS (cl-csv-clsql cl-csv-data-table) PARASITES + (cl-csv/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix index 4273869e62a..d485d276bab 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-dbi''; - version = ''20170725-git''; + version = ''20180131-git''; description = ''''; deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz''; - sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz''; + sha256 = ''0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn''; }; packageName = "cl-dbi"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-dbi DESCRIPTION NIL SHA256 - 1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL - http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz - MD5 a9fe67b7fea2640cea9708342a1347bd NAME cl-dbi FILENAME cl-dbi DEPS + 0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn URL + http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz + MD5 7dacf1c276fab38b952813795ff1f707 NAME cl-dbi FILENAME cl-dbi DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax) @@ -32,5 +32,5 @@ rec { DEPENDENCIES (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop dbi named-readtables split-sequence trivial-types) - VERSION 20170725-git SIBLINGS + VERSION 20180131-git SIBLINGS (dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix index 25ad098f267..0bc8488b2a8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-fad''; - version = ''0.7.4''; + version = ''20171227-git''; parasites = [ "cl-fad-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."bordeaux-threads" args."cl-ppcre" args."unit-test" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-fad/2016-08-25/cl-fad-0.7.4.tgz''; - sha256 = ''1avp5j66vrpv5symgw4n4szlc2cyqz4haa0cxzy1pl8p0a8k0v9x''; + url = ''http://beta.quicklisp.org/archive/cl-fad/2017-12-27/cl-fad-20171227-git.tgz''; + sha256 = ''0dl2c1klv55vk99j1b31f2s1rd1m9c94l1n0aly8spwxz3yd3za8''; }; packageName = "cl-fad"; @@ -20,11 +20,11 @@ rec { overrides = x: x; } /* (SYSTEM cl-fad DESCRIPTION Portable pathname library SHA256 - 1avp5j66vrpv5symgw4n4szlc2cyqz4haa0cxzy1pl8p0a8k0v9x URL - http://beta.quicklisp.org/archive/cl-fad/2016-08-25/cl-fad-0.7.4.tgz MD5 - 8ee53f2249eca9d7d54e268662b41845 NAME cl-fad FILENAME cl-fad DEPS + 0dl2c1klv55vk99j1b31f2s1rd1m9c94l1n0aly8spwxz3yd3za8 URL + http://beta.quicklisp.org/archive/cl-fad/2017-12-27/cl-fad-20171227-git.tgz + MD5 f6b34f61ebba1c68e8fe122bb7de3f77 NAME cl-fad FILENAME cl-fad DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-ppcre FILENAME cl-ppcre) (NAME unit-test FILENAME unit-test)) - DEPENDENCIES (alexandria bordeaux-threads cl-ppcre unit-test) VERSION 0.7.4 - SIBLINGS NIL PARASITES (cl-fad-test)) */ + DEPENDENCIES (alexandria bordeaux-threads cl-ppcre unit-test) VERSION + 20171227-git SIBLINGS NIL PARASITES (cl-fad-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix new file mode 100644 index 00000000000..61a35f2b58c --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix @@ -0,0 +1,25 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-html-parse''; + version = ''20161031-git''; + + description = ''HTML Parser''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-html-parse/2016-10-31/cl-html-parse-20161031-git.tgz''; + sha256 = ''0i0nl630p9l6rqylydhfqrlqhl5sfq94a9wglx0dajk8gkkqjbnb''; + }; + + packageName = "cl-html-parse"; + + asdFilesToKeep = ["cl-html-parse.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-html-parse DESCRIPTION HTML Parser SHA256 + 0i0nl630p9l6rqylydhfqrlqhl5sfq94a9wglx0dajk8gkkqjbnb URL + http://beta.quicklisp.org/archive/cl-html-parse/2016-10-31/cl-html-parse-20161031-git.tgz + MD5 7fe933c461eaf2dd442da189d6827a72 NAME cl-html-parse FILENAME + cl-html-parse DEPS NIL DEPENDENCIES NIL VERSION 20161031-git SIBLINGS NIL + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix index 97c948507c4..d4ce8531291 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-interpol''; - version = ''0.2.6''; + version = ''20171227-git''; parasites = [ "cl-interpol-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."cl-ppcre" args."cl-unicode" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-interpol/2016-09-29/cl-interpol-0.2.6.tgz''; - sha256 = ''172iy4bp4fxyfhz7n6jbqz4j8xqnzpvmh981bbi5waflg58x9h8b''; + url = ''http://beta.quicklisp.org/archive/cl-interpol/2017-12-27/cl-interpol-20171227-git.tgz''; + sha256 = ''1m4vxw8hskgqi0mnkm7qknwbnri2m69ab7qyd4kbpm2igsi02kzy''; }; packageName = "cl-interpol"; @@ -20,11 +20,11 @@ rec { overrides = x: x; } /* (SYSTEM cl-interpol DESCRIPTION NIL SHA256 - 172iy4bp4fxyfhz7n6jbqz4j8xqnzpvmh981bbi5waflg58x9h8b URL - http://beta.quicklisp.org/archive/cl-interpol/2016-09-29/cl-interpol-0.2.6.tgz - MD5 1adc92924670601ebb92546ef8bdc6a7 NAME cl-interpol FILENAME cl-interpol + 1m4vxw8hskgqi0mnkm7qknwbnri2m69ab7qyd4kbpm2igsi02kzy URL + http://beta.quicklisp.org/archive/cl-interpol/2017-12-27/cl-interpol-20171227-git.tgz + MD5 e9d2f0238bb8f7a0c5b1ef1e6ef390ae NAME cl-interpol FILENAME cl-interpol DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unicode FILENAME cl-unicode) (NAME flexi-streams FILENAME flexi-streams)) - DEPENDENCIES (cl-ppcre cl-unicode flexi-streams) VERSION 0.2.6 SIBLINGS NIL - PARASITES (cl-interpol-test)) */ + DEPENDENCIES (cl-ppcre cl-unicode flexi-streams) VERSION 20171227-git + SIBLINGS NIL PARASITES (cl-interpol-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix index fa4e18cdbfe..1590f2536e3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-mysql''; - version = ''20160628-git''; + version = ''20171019-git''; description = ''Common Lisp MySQL library bindings''; deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-mysql/2016-06-28/cl-mysql-20160628-git.tgz''; - sha256 = ''1zkijanw34nc91dn9jv30590ir6jw7bbcwjsqbvli69fh4b03319''; + url = ''http://beta.quicklisp.org/archive/cl-mysql/2017-10-19/cl-mysql-20171019-git.tgz''; + sha256 = ''1ga44gkwg6lm225gqpacpqpr6bpswszmw1ba9jhvjpjm09zinyc5''; }; packageName = "cl-mysql"; @@ -18,11 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM cl-mysql DESCRIPTION Common Lisp MySQL library bindings SHA256 - 1zkijanw34nc91dn9jv30590ir6jw7bbcwjsqbvli69fh4b03319 URL - http://beta.quicklisp.org/archive/cl-mysql/2016-06-28/cl-mysql-20160628-git.tgz - MD5 349615d041c2f2177b678088f9c22409 NAME cl-mysql FILENAME cl-mysql DEPS + 1ga44gkwg6lm225gqpacpqpr6bpswszmw1ba9jhvjpjm09zinyc5 URL + http://beta.quicklisp.org/archive/cl-mysql/2017-10-19/cl-mysql-20171019-git.tgz + MD5 e1021da4d35cbb584d4df4f0d7e2bbb9 NAME cl-mysql FILENAME cl-mysql DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria babel cffi trivial-features) VERSION 20160628-git + DEPENDENCIES (alexandria babel cffi trivial-features) VERSION 20171019-git SIBLINGS (cl-mysql-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix index 485a2c3de22..721dbf61aa9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-postgres''; - version = ''postmodern-20170403-git''; + version = ''postmodern-20180131-git''; - parasites = [ "cl-postgres-tests" ]; + parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ]; description = ''Low-level client library for PostgreSQL''; - deps = [ args."fiveam" args."md5" ]; + deps = [ args."fiveam" args."md5" args."simple-date_slash_postgres-glue" args."split-sequence" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz''; - sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p''; + url = ''http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz''; + sha256 = ''0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki''; }; packageName = "cl-postgres"; @@ -20,9 +20,14 @@ rec { overrides = x: x; } /* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL - SHA256 1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL - http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz - MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME cl-postgres FILENAME cl-postgres - DEPS ((NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5)) DEPENDENCIES - (fiveam md5) VERSION postmodern-20170403-git SIBLINGS - (postmodern s-sql simple-date) PARASITES (cl-postgres-tests)) */ + SHA256 0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki URL + http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz + MD5 a3b7bf25eb342cd49fe144fcd7ddcb16 NAME cl-postgres FILENAME cl-postgres + DEPS + ((NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5) + (NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue) + (NAME split-sequence FILENAME split-sequence) + (NAME usocket FILENAME usocket)) + DEPENDENCIES (fiveam md5 simple-date/postgres-glue split-sequence usocket) + VERSION postmodern-20180131-git SIBLINGS (postmodern s-sql simple-date) + PARASITES (cl-postgres/simple-date-tests cl-postgres/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix index 92ede6007ef..d2b3de9cae1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-ppcre-template''; - version = ''cl-unification-20170630-git''; + version = ''cl-unification-20171227-git''; description = ''A system used to conditionally load the CL-PPCRE Template. @@ -12,8 +12,8 @@ REGULAR-EXPRESSION-TEMPLATE.''; deps = [ args."cl-ppcre" args."cl-unification" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz''; - sha256 = ''063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz''; + url = ''http://beta.quicklisp.org/archive/cl-unification/2017-12-27/cl-unification-20171227-git.tgz''; + sha256 = ''0shwnvn5zf0iwgyqf3pa1b9cv2xghl7pss1ymrjgs95r6ijqxn2p''; }; packageName = "cl-ppcre-template"; @@ -27,12 +27,12 @@ REGULAR-EXPRESSION-TEMPLATE.''; This system is not required and it is handled only if CL-PPCRE is available. If it is, then the library provides the REGULAR-EXPRESSION-TEMPLATE. - SHA256 063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz URL - http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz - MD5 f6bf197ca8c79c935efe3a3c25953044 NAME cl-ppcre-template FILENAME + SHA256 0shwnvn5zf0iwgyqf3pa1b9cv2xghl7pss1ymrjgs95r6ijqxn2p URL + http://beta.quicklisp.org/archive/cl-unification/2017-12-27/cl-unification-20171227-git.tgz + MD5 45bfd18f8e15d16222e0f747992a6ce6 NAME cl-ppcre-template FILENAME cl-ppcre-template DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unification FILENAME cl-unification)) - DEPENDENCIES (cl-ppcre cl-unification) VERSION cl-unification-20170630-git + DEPENDENCIES (cl-ppcre cl-unification) VERSION cl-unification-20171227-git SIBLINGS (cl-unification-lib cl-unification-test cl-unification) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix index 5f2b2e37e30..7853d5a279a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-ppcre-unicode''; - version = ''cl-ppcre-2.0.11''; + version = ''cl-ppcre-20171227-git''; parasites = [ "cl-ppcre-unicode-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."cl-ppcre" args."cl-ppcre-test" args."cl-unicode" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz''; - sha256 = ''1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2''; + url = ''http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz''; + sha256 = ''0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4''; }; packageName = "cl-ppcre-unicode"; @@ -21,13 +21,13 @@ rec { } /* (SYSTEM cl-ppcre-unicode DESCRIPTION Perl-compatible regular expression library (Unicode) SHA256 - 1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2 URL - http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz - MD5 6d5250467c05eb661a76d395186a1da0 NAME cl-ppcre-unicode FILENAME + 0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4 URL + http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz + MD5 9d8ce62ef1a71a5e1e144a31be698d8c NAME cl-ppcre-unicode FILENAME cl-ppcre-unicode DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-ppcre-test FILENAME cl-ppcre-test) (NAME cl-unicode FILENAME cl-unicode) (NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (cl-ppcre cl-ppcre-test cl-unicode flexi-streams) VERSION - cl-ppcre-2.0.11 SIBLINGS (cl-ppcre) PARASITES (cl-ppcre-unicode-test)) */ + cl-ppcre-20171227-git SIBLINGS (cl-ppcre) PARASITES (cl-ppcre-unicode-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix index 74d74a9b114..cbdf3a47146 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-ppcre''; - version = ''2.0.11''; + version = ''20171227-git''; parasites = [ "cl-ppcre-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz''; - sha256 = ''1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2''; + url = ''http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz''; + sha256 = ''0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4''; }; packageName = "cl-ppcre"; @@ -20,8 +20,8 @@ rec { overrides = x: x; } /* (SYSTEM cl-ppcre DESCRIPTION Perl-compatible regular expression library - SHA256 1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2 URL - http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz - MD5 6d5250467c05eb661a76d395186a1da0 NAME cl-ppcre FILENAME cl-ppcre DEPS + SHA256 0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4 URL + http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz + MD5 9d8ce62ef1a71a5e1e144a31be698d8c NAME cl-ppcre FILENAME cl-ppcre DEPS ((NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (flexi-streams) - VERSION 2.0.11 SIBLINGS (cl-ppcre-unicode) PARASITES (cl-ppcre-test)) */ + VERSION 20171227-git SIBLINGS (cl-ppcre-unicode) PARASITES (cl-ppcre-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix index bfaaabfbc2d..658ffdb51b8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-project''; - version = ''20160531-git''; + version = ''20171019-git''; description = ''Generate a skeleton for modern project''; deps = [ args."alexandria" args."anaphora" args."bordeaux-threads" args."cl-ansi-text" args."cl-colors" args."cl-emb" args."cl-fad" args."cl-ppcre" args."let-plus" args."local-time" args."prove" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-project/2016-05-31/cl-project-20160531-git.tgz''; - sha256 = ''1xwjgs5pzkdnd9i5lcic9z41d1c4yf7pvarrvawfxcicg6rrfw81''; + url = ''http://beta.quicklisp.org/archive/cl-project/2017-10-19/cl-project-20171019-git.tgz''; + sha256 = ''1phgpik46dvqxnd49kccy4fh653659qd86hv7km50m07nzm8fn7q''; }; packageName = "cl-project"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-project DESCRIPTION Generate a skeleton for modern project SHA256 - 1xwjgs5pzkdnd9i5lcic9z41d1c4yf7pvarrvawfxcicg6rrfw81 URL - http://beta.quicklisp.org/archive/cl-project/2016-05-31/cl-project-20160531-git.tgz - MD5 63de5ce6f0f3e5f60094a86d32c2f1a9 NAME cl-project FILENAME cl-project + 1phgpik46dvqxnd49kccy4fh653659qd86hv7km50m07nzm8fn7q URL + http://beta.quicklisp.org/archive/cl-project/2017-10-19/cl-project-20171019-git.tgz + MD5 9dbfd7f9b0a83ca608031ebf32185a0f NAME cl-project FILENAME cl-project DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -32,4 +32,4 @@ rec { DEPENDENCIES (alexandria anaphora bordeaux-threads cl-ansi-text cl-colors cl-emb cl-fad cl-ppcre let-plus local-time prove uiop) - VERSION 20160531-git SIBLINGS (cl-project-test) PARASITES NIL) */ + VERSION 20171019-git SIBLINGS (cl-project-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix index 9cb69caaafd..572e3eb4cb3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-smtp''; - version = ''20160825-git''; + version = ''20180131-git''; description = ''Common Lisp smtp client.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl+ssl" args."cl-base64" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-smtp/2016-08-25/cl-smtp-20160825-git.tgz''; - sha256 = ''0svkvy6x458a7rgvp3wki0lmhdxpaa1j0brwsw2mlpl2jqkx5dxh''; + url = ''http://beta.quicklisp.org/archive/cl-smtp/2018-01-31/cl-smtp-20180131-git.tgz''; + sha256 = ''0sjjynnynxmfxdfpvzl3jj1jz0dhj0bx4bv63q1icm2p9xzfzb61''; }; packageName = "cl-smtp"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-smtp DESCRIPTION Common Lisp smtp client. SHA256 - 0svkvy6x458a7rgvp3wki0lmhdxpaa1j0brwsw2mlpl2jqkx5dxh URL - http://beta.quicklisp.org/archive/cl-smtp/2016-08-25/cl-smtp-20160825-git.tgz - MD5 e6bb60e66b0f7d9cc5e4f98aba56998a NAME cl-smtp FILENAME cl-smtp DEPS + 0sjjynnynxmfxdfpvzl3jj1jz0dhj0bx4bv63q1icm2p9xzfzb61 URL + http://beta.quicklisp.org/archive/cl-smtp/2018-01-31/cl-smtp-20180131-git.tgz + MD5 0ce08f067f145ab4c7528f806f0b51ff NAME cl-smtp FILENAME cl-smtp DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cl+ssl FILENAME cl+ssl) @@ -35,4 +35,4 @@ rec { (alexandria babel bordeaux-threads cffi cl+ssl cl-base64 flexi-streams split-sequence trivial-features trivial-garbage trivial-gray-streams usocket) - VERSION 20160825-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix index 7425b7ce0a8..968f2972abf 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-test-more''; - version = ''prove-20170403-git''; + version = ''prove-20171130-git''; description = ''''; deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-ppcre" args."let-plus" args."prove" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz''; - sha256 = ''091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl''; + url = ''http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz''; + sha256 = ''13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar''; }; packageName = "cl-test-more"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-test-more DESCRIPTION NIL SHA256 - 091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl URL - http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz - MD5 063b615692c8711d2392204ecf1b37b7 NAME cl-test-more FILENAME + 13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar URL + http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz + MD5 630df4367537f799570be40242f8ed52 NAME cl-test-more FILENAME cl-test-more DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME cl-ansi-text FILENAME cl-ansi-text) @@ -28,5 +28,5 @@ rec { (NAME let-plus FILENAME let-plus) (NAME prove FILENAME prove)) DEPENDENCIES (alexandria anaphora cl-ansi-text cl-colors cl-ppcre let-plus prove) - VERSION prove-20170403-git SIBLINGS (prove-asdf prove-test prove) PARASITES + VERSION prove-20171130-git SIBLINGS (prove-asdf prove-test prove) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix index e35645f6e98..25dfbbcae5f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-unicode''; - version = ''0.1.5''; + version = ''20180131-git''; parasites = [ "cl-unicode/base" "cl-unicode/build" "cl-unicode/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."cl-ppcre" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz''; - sha256 = ''1jd5qq5ji6l749c4x415z22y9r0k9z18pdi9p9fqvamzh854i46n''; + url = ''http://beta.quicklisp.org/archive/cl-unicode/2018-01-31/cl-unicode-20180131-git.tgz''; + sha256 = ''113hsx22pw4ydwzkyr9y7l8a8jq3nkhwazs03wj3mh2dczwv28xa''; }; packageName = "cl-unicode"; @@ -20,11 +20,11 @@ rec { overrides = x: x; } /* (SYSTEM cl-unicode DESCRIPTION Portable Unicode Library SHA256 - 1jd5qq5ji6l749c4x415z22y9r0k9z18pdi9p9fqvamzh854i46n URL - http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz - MD5 2fd456537bd670126da84466226bc5c5 NAME cl-unicode FILENAME cl-unicode + 113hsx22pw4ydwzkyr9y7l8a8jq3nkhwazs03wj3mh2dczwv28xa URL + http://beta.quicklisp.org/archive/cl-unicode/2018-01-31/cl-unicode-20180131-git.tgz + MD5 653ba12d595599b32aa2a8c7c8b65c28 NAME cl-unicode FILENAME cl-unicode DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME flexi-streams FILENAME flexi-streams)) - DEPENDENCIES (cl-ppcre flexi-streams) VERSION 0.1.5 SIBLINGS NIL PARASITES - (cl-unicode/base cl-unicode/build cl-unicode/test)) */ + DEPENDENCIES (cl-ppcre flexi-streams) VERSION 20180131-git SIBLINGS NIL + PARASITES (cl-unicode/base cl-unicode/build cl-unicode/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix index 39f3fccb7a7..6d284b7b012 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-unification''; - version = ''20170630-git''; + version = ''20171227-git''; description = ''The CL-UNIFICATION system. @@ -10,8 +10,8 @@ The system contains the definitions for the 'unification' machinery.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz''; - sha256 = ''063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz''; + url = ''http://beta.quicklisp.org/archive/cl-unification/2017-12-27/cl-unification-20171227-git.tgz''; + sha256 = ''0shwnvn5zf0iwgyqf3pa1b9cv2xghl7pss1ymrjgs95r6ijqxn2p''; }; packageName = "cl-unification"; @@ -22,8 +22,8 @@ The system contains the definitions for the 'unification' machinery.''; /* (SYSTEM cl-unification DESCRIPTION The CL-UNIFICATION system. The system contains the definitions for the 'unification' machinery. - SHA256 063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz URL - http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz - MD5 f6bf197ca8c79c935efe3a3c25953044 NAME cl-unification FILENAME - cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS + SHA256 0shwnvn5zf0iwgyqf3pa1b9cv2xghl7pss1ymrjgs95r6ijqxn2p URL + http://beta.quicklisp.org/archive/cl-unification/2017-12-27/cl-unification-20171227-git.tgz + MD5 45bfd18f8e15d16222e0f747992a6ce6 NAME cl-unification FILENAME + cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20171227-git SIBLINGS (cl-unification-lib cl-unification-test cl-ppcre-template) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix index 32304139c51..575e05aa074 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-who''; - version = ''1.1.4''; + version = ''20171130-git''; parasites = [ "cl-who-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-who/2014-12-17/cl-who-1.1.4.tgz''; - sha256 = ''0r9wc92njz1cc7nghgbhdmd7jy216ylhlabfj0vc45bmfa4w44rq''; + url = ''http://beta.quicklisp.org/archive/cl-who/2017-11-30/cl-who-20171130-git.tgz''; + sha256 = ''1941kwnvqnqr81vjkv8fcpc16abz7hrrmz18xwxxprsi6wifzjzw''; }; packageName = "cl-who"; @@ -20,8 +20,8 @@ rec { overrides = x: x; } /* (SYSTEM cl-who DESCRIPTION (X)HTML generation macros SHA256 - 0r9wc92njz1cc7nghgbhdmd7jy216ylhlabfj0vc45bmfa4w44rq URL - http://beta.quicklisp.org/archive/cl-who/2014-12-17/cl-who-1.1.4.tgz MD5 - a9e6f0b6a8aaa247dbf751de2cb550bf NAME cl-who FILENAME cl-who DEPS + 1941kwnvqnqr81vjkv8fcpc16abz7hrrmz18xwxxprsi6wifzjzw URL + http://beta.quicklisp.org/archive/cl-who/2017-11-30/cl-who-20171130-git.tgz + MD5 257a670166ff9d24d1570f44be0c7171 NAME cl-who FILENAME cl-who DEPS ((NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (flexi-streams) - VERSION 1.1.4 SIBLINGS NIL PARASITES (cl-who-test)) */ + VERSION 20171130-git SIBLINGS NIL PARASITES (cl-who-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix index 3c15d7cf753..3ecc0e10149 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''closer-mop''; - version = ''20170725-git''; + version = ''20180131-git''; description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/closer-mop/2017-07-25/closer-mop-20170725-git.tgz''; - sha256 = ''0qc4zh4zicv3zm4bw8c3s2r2bjbx2bp31j69lwiz1mdl9xg0nhsc''; + url = ''http://beta.quicklisp.org/archive/closer-mop/2018-01-31/closer-mop-20180131-git.tgz''; + sha256 = ''0lsfpxppbd8j4ayfrhd723ck367yb4amdywwaqj9yivh00zn4r6s''; }; packageName = "closer-mop"; @@ -19,7 +19,7 @@ rec { } /* (SYSTEM closer-mop DESCRIPTION Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations. - SHA256 0qc4zh4zicv3zm4bw8c3s2r2bjbx2bp31j69lwiz1mdl9xg0nhsc URL - http://beta.quicklisp.org/archive/closer-mop/2017-07-25/closer-mop-20170725-git.tgz - MD5 308f9e8e4ea4573c7b6820055b6f171d NAME closer-mop FILENAME closer-mop - DEPS NIL DEPENDENCIES NIL VERSION 20170725-git SIBLINGS NIL PARASITES NIL) */ + SHA256 0lsfpxppbd8j4ayfrhd723ck367yb4amdywwaqj9yivh00zn4r6s URL + http://beta.quicklisp.org/archive/closer-mop/2018-01-31/closer-mop-20180131-git.tgz + MD5 d572109e102869d89f206a46619c2ed0 NAME closer-mop FILENAME closer-mop + DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix new file mode 100644 index 00000000000..29c90369244 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''closure-html''; + version = ''20140826-git''; + + description = ''''; + + deps = [ args."alexandria" args."babel" args."closure-common" args."flexi-streams" args."trivial-features" args."trivial-gray-streams" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/closure-html/2014-08-26/closure-html-20140826-git.tgz''; + sha256 = ''1m07iv9r5ykj52fszwhwai5wv39mczk3m4zzh24gjhsprv35x8qb''; + }; + + packageName = "closure-html"; + + asdFilesToKeep = ["closure-html.asd"]; + overrides = x: x; +} +/* (SYSTEM closure-html DESCRIPTION NIL SHA256 + 1m07iv9r5ykj52fszwhwai5wv39mczk3m4zzh24gjhsprv35x8qb URL + http://beta.quicklisp.org/archive/closure-html/2014-08-26/closure-html-20140826-git.tgz + MD5 3f8d8a4fd54f915ca6cc5fdf29239d98 NAME closure-html FILENAME + closure-html DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME closure-common FILENAME closure-common) + (NAME flexi-streams FILENAME flexi-streams) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams)) + DEPENDENCIES + (alexandria babel closure-common flexi-streams trivial-features + trivial-gray-streams) + VERSION 20140826-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix index 11e723e0029..76f50463a6a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clss''; - version = ''20170630-git''; + version = ''20180131-git''; description = ''A DOM tree searching engine based on CSS selectors.''; - deps = [ args."array-utils" args."plump" ]; + deps = [ args."array-utils" args."documentation-utils" args."plump" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clss/2017-06-30/clss-20170630-git.tgz''; - sha256 = ''0kdkzx7z997lzbf331p4fkqhri0ind7agknl9y992x917m9y4rn0''; + url = ''http://beta.quicklisp.org/archive/clss/2018-01-31/clss-20180131-git.tgz''; + sha256 = ''0d4sblafhm5syjkv89h45i98dykpznb0ga3q9a2cxlvl98yklg8r''; }; packageName = "clss"; @@ -18,9 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors. - SHA256 0kdkzx7z997lzbf331p4fkqhri0ind7agknl9y992x917m9y4rn0 URL - http://beta.quicklisp.org/archive/clss/2017-06-30/clss-20170630-git.tgz MD5 - 61bbadf22391940813bfc66dfd59d304 NAME clss FILENAME clss DEPS - ((NAME array-utils FILENAME array-utils) (NAME plump FILENAME plump)) - DEPENDENCIES (array-utils plump) VERSION 20170630-git SIBLINGS NIL - PARASITES NIL) */ + SHA256 0d4sblafhm5syjkv89h45i98dykpznb0ga3q9a2cxlvl98yklg8r URL + http://beta.quicklisp.org/archive/clss/2018-01-31/clss-20180131-git.tgz MD5 + 138244b7871d8ea832832aa9cc5867e6 NAME clss FILENAME clss DEPS + ((NAME array-utils FILENAME array-utils) + (NAME documentation-utils FILENAME documentation-utils) + (NAME plump FILENAME plump) (NAME trivial-indent FILENAME trivial-indent)) + DEPENDENCIES (array-utils documentation-utils plump trivial-indent) VERSION + 20180131-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix index 2d802d3e488..2a7ec984e7f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix @@ -1,15 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''clx''; - version = ''20170630-git''; + version = ''20171227-git''; + + parasites = [ "clx/test" ]; description = ''An implementation of the X Window System protocol in Lisp.''; - deps = [ ]; + deps = [ args."fiasco" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clx/2017-06-30/clx-20170630-git.tgz''; - sha256 = ''0di8h3galjylgmy30qqwa4q8mb5505rcag0y4ia7mv7sls51jbp7''; + url = ''http://beta.quicklisp.org/archive/clx/2017-12-27/clx-20171227-git.tgz''; + sha256 = ''159kwwilyvaffjdz7sbwwd4cncfa8kxndc7n3adml9ivbvaz2wri''; }; packageName = "clx"; @@ -19,7 +21,8 @@ rec { } /* (SYSTEM clx DESCRIPTION An implementation of the X Window System protocol in Lisp. SHA256 - 0di8h3galjylgmy30qqwa4q8mb5505rcag0y4ia7mv7sls51jbp7 URL - http://beta.quicklisp.org/archive/clx/2017-06-30/clx-20170630-git.tgz MD5 - ccfec3f35979df3bead0b73adc1d798a NAME clx FILENAME clx DEPS NIL - DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL PARASITES NIL) */ + 159kwwilyvaffjdz7sbwwd4cncfa8kxndc7n3adml9ivbvaz2wri URL + http://beta.quicklisp.org/archive/clx/2017-12-27/clx-20171227-git.tgz MD5 + 40642f49e26b88859376efe2e5330a24 NAME clx FILENAME clx DEPS + ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20171227-git + SIBLINGS NIL PARASITES (clx/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix index 80a936560d1..52444db0e79 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-mysql''; - version = ''cl-dbi-20170725-git''; + version = ''cl-dbi-20180131-git''; description = ''Database driver for MySQL.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-mysql" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-features" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz''; - sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz''; + sha256 = ''0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn''; }; packageName = "dbd-mysql"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256 - 1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL - http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz - MD5 a9fe67b7fea2640cea9708342a1347bd NAME dbd-mysql FILENAME dbd-mysql DEPS + 0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn URL + http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz + MD5 7dacf1c276fab38b952813795ff1f707 NAME dbd-mysql FILENAME dbd-mysql DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cl-annot FILENAME cl-annot) @@ -35,5 +35,5 @@ rec { (alexandria babel bordeaux-threads cffi cl-annot cl-mysql cl-syntax cl-syntax-annot closer-mop dbi named-readtables split-sequence trivial-features trivial-types) - VERSION cl-dbi-20170725-git SIBLINGS + VERSION cl-dbi-20180131-git SIBLINGS (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix index 1f7a784a5e6..4dc4683ff9a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-postgres''; - version = ''cl-dbi-20170725-git''; + version = ''cl-dbi-20180131-git''; description = ''Database driver for PostgreSQL.''; - deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-postgres" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."md5" args."named-readtables" args."split-sequence" args."trivial-garbage" args."trivial-types" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-postgres" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."md5" args."named-readtables" args."split-sequence" args."trivial-garbage" args."trivial-types" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz''; - sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz''; + sha256 = ''0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn''; }; packageName = "dbd-postgres"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256 - 1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL - http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz - MD5 a9fe67b7fea2640cea9708342a1347bd NAME dbd-postgres FILENAME + 0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn URL + http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz + MD5 7dacf1c276fab38b952813795ff1f707 NAME dbd-postgres FILENAME dbd-postgres DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -31,10 +31,11 @@ rec { (NAME md5 FILENAME md5) (NAME named-readtables FILENAME named-readtables) (NAME split-sequence FILENAME split-sequence) (NAME trivial-garbage FILENAME trivial-garbage) - (NAME trivial-types FILENAME trivial-types)) + (NAME trivial-types FILENAME trivial-types) + (NAME usocket FILENAME usocket)) DEPENDENCIES (alexandria bordeaux-threads cl-annot cl-postgres cl-syntax cl-syntax-annot closer-mop dbi md5 named-readtables split-sequence trivial-garbage - trivial-types) - VERSION cl-dbi-20170725-git SIBLINGS + trivial-types usocket) + VERSION cl-dbi-20180131-git SIBLINGS (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix index 1300aa47634..cce90acfdf9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-sqlite3''; - version = ''cl-dbi-20170725-git''; + version = ''cl-dbi-20180131-git''; description = ''Database driver for SQLite3.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."iterate" args."named-readtables" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-types" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz''; - sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz''; + sha256 = ''0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn''; }; packageName = "dbd-sqlite3"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256 - 1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL - http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz - MD5 a9fe67b7fea2640cea9708342a1347bd NAME dbd-sqlite3 FILENAME dbd-sqlite3 + 0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn URL + http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz + MD5 7dacf1c276fab38b952813795ff1f707 NAME dbd-sqlite3 FILENAME dbd-sqlite3 DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -38,5 +38,5 @@ rec { (alexandria babel bordeaux-threads cffi cl-annot cl-syntax cl-syntax-annot closer-mop dbi iterate named-readtables split-sequence sqlite trivial-features trivial-types uiop) - VERSION cl-dbi-20170725-git SIBLINGS + VERSION cl-dbi-20180131-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix index 6e7611fd974..31a48ea807b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbi''; - version = ''cl-20170725-git''; + version = ''cl-20180131-git''; description = ''Database independent interface for Common Lisp''; deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."named-readtables" args."split-sequence" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz''; - sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz''; + sha256 = ''0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn''; }; packageName = "dbi"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbi DESCRIPTION Database independent interface for Common Lisp - SHA256 1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL - http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz - MD5 a9fe67b7fea2640cea9708342a1347bd NAME dbi FILENAME dbi DEPS + SHA256 0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn URL + http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz + MD5 7dacf1c276fab38b952813795ff1f707 NAME dbi FILENAME dbi DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax) @@ -32,5 +32,5 @@ rec { DEPENDENCIES (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop named-readtables split-sequence trivial-types) - VERSION cl-20170725-git SIBLINGS + VERSION cl-20180131-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbd-sqlite3 dbi-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix index 047cd3c0ffa..d6885fc58d8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dexador''; - version = ''20170725-git''; + version = ''20171130-git''; description = ''Yet another HTTP client for Common Lisp''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/dexador/2017-07-25/dexador-20170725-git.tgz''; - sha256 = ''1x5jw07ydvc7rdw4jyzf3zb2dg2mspbkp9ysjaqpxlvkpdmqdmyl''; + url = ''http://beta.quicklisp.org/archive/dexador/2017-11-30/dexador-20171130-git.tgz''; + sha256 = ''0qg8jxij1s5j7jm2hxick9bvgc5nvq7fjalaah0rarynq70z61bd''; }; packageName = "dexador"; @@ -18,16 +18,16 @@ rec { overrides = x: x; } /* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 - 1x5jw07ydvc7rdw4jyzf3zb2dg2mspbkp9ysjaqpxlvkpdmqdmyl URL - http://beta.quicklisp.org/archive/dexador/2017-07-25/dexador-20170725-git.tgz - MD5 1ab5cda1ba8d5c81859349e6a5b99b29 NAME dexador FILENAME dexador DEPS + 0qg8jxij1s5j7jm2hxick9bvgc5nvq7fjalaah0rarynq70z61bd URL + http://beta.quicklisp.org/archive/dexador/2017-11-30/dexador-20171130-git.tgz + MD5 e1b5154f2169708e2f351707a2bc135f NAME dexador FILENAME dexador DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz) - (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl+ssl) - (NAME cl-base64 FILENAME cl-base64) (NAME cl-cookie FILENAME cl-cookie) - (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-reexport FILENAME cl-reexport) + (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) + (NAME chipz FILENAME chipz) (NAME chunga FILENAME chunga) + (NAME cl+ssl FILENAME cl+ssl) (NAME cl-base64 FILENAME cl-base64) + (NAME cl-cookie FILENAME cl-cookie) (NAME cl-fad FILENAME cl-fad) + (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-reexport FILENAME cl-reexport) (NAME cl-utilities FILENAME cl-utilities) (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io) (NAME flexi-streams FILENAME flexi-streams) @@ -42,9 +42,9 @@ rec { (NAME trivial-mimes FILENAME trivial-mimes) (NAME usocket FILENAME usocket) (NAME xsubseq FILENAME xsubseq)) DEPENDENCIES - (alexandria babel bordeaux-threads cffi chipz chunga cl+ssl cl-base64 - cl-cookie cl-fad cl-ppcre cl-reexport cl-utilities fast-http fast-io - flexi-streams local-time proc-parse quri smart-buffer split-sequence - static-vectors trivial-features trivial-garbage trivial-gray-streams - trivial-mimes usocket xsubseq) - VERSION 20170725-git SIBLINGS (dexador-test) PARASITES NIL) */ + (alexandria babel bordeaux-threads cffi cffi-grovel chipz chunga cl+ssl + cl-base64 cl-cookie cl-fad cl-ppcre cl-reexport cl-utilities fast-http + fast-io flexi-streams local-time proc-parse quri smart-buffer + split-sequence static-vectors trivial-features trivial-garbage + trivial-gray-streams trivial-mimes usocket xsubseq) + VERSION 20171130-git SIBLINGS (dexador-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix index 08521a07d74..95d335493b7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''do-urlencode''; - version = ''20130720-git''; + version = ''20170830-git''; description = ''Percent Encoding (aka URL Encoding) library''; deps = [ args."alexandria" args."babel" args."babel-streams" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/do-urlencode/2013-07-20/do-urlencode-20130720-git.tgz''; - sha256 = ''19l4rwqc52w7nrpy994b3n2dcv8pjgc530yn2xmgqlqabpxpz3xa''; + url = ''http://beta.quicklisp.org/archive/do-urlencode/2017-08-30/do-urlencode-20170830-git.tgz''; + sha256 = ''1584prmmz601fp396qxrivylb7nrnclg9rnwrsnwiij79v6zz40n''; }; packageName = "do-urlencode"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM do-urlencode DESCRIPTION Percent Encoding (aka URL Encoding) library - SHA256 19l4rwqc52w7nrpy994b3n2dcv8pjgc530yn2xmgqlqabpxpz3xa URL - http://beta.quicklisp.org/archive/do-urlencode/2013-07-20/do-urlencode-20130720-git.tgz - MD5 c8085e138711c225042acf83b4bf0507 NAME do-urlencode FILENAME + SHA256 1584prmmz601fp396qxrivylb7nrnclg9rnwrsnwiij79v6zz40n URL + http://beta.quicklisp.org/archive/do-urlencode/2017-08-30/do-urlencode-20170830-git.tgz + MD5 071a18bb58ed5c7d5184b34e672b5d91 NAME do-urlencode FILENAME do-urlencode DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME babel-streams FILENAME babel-streams) @@ -28,4 +28,4 @@ rec { (NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (alexandria babel babel-streams trivial-features trivial-gray-streams) - VERSION 20130720-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20170830-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix index 52c95b260e6..0c3470d755c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''documentation-utils''; - version = ''20170630-git''; + version = ''20180131-git''; description = ''A few simple tools to help you with documenting your library.''; deps = [ args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/documentation-utils/2017-06-30/documentation-utils-20170630-git.tgz''; - sha256 = ''0iz3r5llv0rv8l37fdcjrx9zibbaqf9nd6xhy5n2hf024997bbks''; + url = ''http://beta.quicklisp.org/archive/documentation-utils/2018-01-31/documentation-utils-20180131-git.tgz''; + sha256 = ''0kyxjcl7dvylymzvmrn90kdwaxgrzyzpi1mqpirsr3yyb8h71avm''; }; packageName = "documentation-utils"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM documentation-utils DESCRIPTION A few simple tools to help you with documenting your library. SHA256 - 0iz3r5llv0rv8l37fdcjrx9zibbaqf9nd6xhy5n2hf024997bbks URL - http://beta.quicklisp.org/archive/documentation-utils/2017-06-30/documentation-utils-20170630-git.tgz - MD5 7c0541d4207ba221a251c8c3ec7a8cac NAME documentation-utils FILENAME + 0kyxjcl7dvylymzvmrn90kdwaxgrzyzpi1mqpirsr3yyb8h71avm URL + http://beta.quicklisp.org/archive/documentation-utils/2018-01-31/documentation-utils-20180131-git.tgz + MD5 375dbb8ce48543fce1526eeea8d2a976 NAME documentation-utils FILENAME documentation-utils DEPS ((NAME trivial-indent FILENAME trivial-indent)) - DEPENDENCIES (trivial-indent) VERSION 20170630-git SIBLINGS NIL PARASITES + DEPENDENCIES (trivial-indent) VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix index aac0560e677..44ce34a2cb3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''drakma''; - version = ''v2.0.3''; + version = ''v2.0.4''; description = ''Full-featured http/https client based on usocket''; - deps = [ args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-ppcre" args."flexi-streams" args."puri" args."usocket" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-ppcre" args."flexi-streams" args."puri" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/drakma/2017-06-30/drakma-v2.0.3.tgz''; - sha256 = ''1xbbwd2gg17pq03bblj6imh7lq39z2w3yix6fm25509gyhs76ymd''; + url = ''http://beta.quicklisp.org/archive/drakma/2017-08-30/drakma-v2.0.4.tgz''; + sha256 = ''0i0dmw1b245yc0f8f8ww8cnhsji7vsnr7868p62c953ccwlcj5ga''; }; packageName = "drakma"; @@ -18,14 +18,22 @@ rec { overrides = x: x; } /* (SYSTEM drakma DESCRIPTION Full-featured http/https client based on usocket - SHA256 1xbbwd2gg17pq03bblj6imh7lq39z2w3yix6fm25509gyhs76ymd URL - http://beta.quicklisp.org/archive/drakma/2017-06-30/drakma-v2.0.3.tgz MD5 - 3578c67b445cf982414ff78b2fb8d295 NAME drakma FILENAME drakma DEPS - ((NAME chipz FILENAME chipz) (NAME chunga FILENAME chunga) - (NAME cl+ssl FILENAME cl+ssl) (NAME cl-base64 FILENAME cl-base64) - (NAME cl-ppcre FILENAME cl-ppcre) + SHA256 0i0dmw1b245yc0f8f8ww8cnhsji7vsnr7868p62c953ccwlcj5ga URL + http://beta.quicklisp.org/archive/drakma/2017-08-30/drakma-v2.0.4.tgz MD5 + 1c668721156beadeca4f6536677e143e NAME drakma FILENAME drakma DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz) + (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl+ssl) + (NAME cl-base64 FILENAME cl-base64) (NAME cl-ppcre FILENAME cl-ppcre) (NAME flexi-streams FILENAME flexi-streams) (NAME puri FILENAME puri) + (NAME split-sequence FILENAME split-sequence) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-garbage FILENAME trivial-garbage) + (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME usocket FILENAME usocket)) DEPENDENCIES - (chipz chunga cl+ssl cl-base64 cl-ppcre flexi-streams puri usocket) VERSION - v2.0.3 SIBLINGS (drakma-test) PARASITES NIL) */ + (alexandria babel bordeaux-threads cffi chipz chunga cl+ssl cl-base64 + cl-ppcre flexi-streams puri split-sequence trivial-features + trivial-garbage trivial-gray-streams usocket) + VERSION v2.0.4 SIBLINGS (drakma-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix index 2ef373aed8a..b9f17a5d241 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''esrap''; - version = ''20170630-git''; + version = ''20180131-git''; parasites = [ "esrap/tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/esrap/2017-06-30/esrap-20170630-git.tgz''; - sha256 = ''172ph55kb3yr0gciybza1rbi6khlnz4vriijvcjkn6m79kdnk1xh''; + url = ''http://beta.quicklisp.org/archive/esrap/2018-01-31/esrap-20180131-git.tgz''; + sha256 = ''1kgr77w1ya125c04h6szxhzkxnq578rdf8f399wadqkav6x9dpkc''; }; packageName = "esrap"; @@ -21,9 +21,9 @@ rec { } /* (SYSTEM esrap DESCRIPTION A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256 - 172ph55kb3yr0gciybza1rbi6khlnz4vriijvcjkn6m79kdnk1xh URL - http://beta.quicklisp.org/archive/esrap/2017-06-30/esrap-20170630-git.tgz - MD5 bfabfebc5f5d49106df318ae2798ac45 NAME esrap FILENAME esrap DEPS + 1kgr77w1ya125c04h6szxhzkxnq578rdf8f399wadqkav6x9dpkc URL + http://beta.quicklisp.org/archive/esrap/2018-01-31/esrap-20180131-git.tgz + MD5 89b22e10575198b9f680e0c4e90bec2c NAME esrap FILENAME esrap DEPS ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam)) - DEPENDENCIES (alexandria fiveam) VERSION 20170630-git SIBLINGS NIL + DEPENDENCIES (alexandria fiveam) VERSION 20180131-git SIBLINGS NIL PARASITES (esrap/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix index e890f4e81ff..99792023bdd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''fast-http''; - version = ''20170630-git''; + version = ''20180131-git''; description = ''A fast HTTP protocol parser in Common Lisp''; - deps = [ args."alexandria" args."babel" args."cl-utilities" args."proc-parse" args."smart-buffer" args."xsubseq" ]; + deps = [ args."alexandria" args."babel" args."cl-utilities" args."flexi-streams" args."proc-parse" args."smart-buffer" args."trivial-features" args."trivial-gray-streams" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fast-http/2017-06-30/fast-http-20170630-git.tgz''; - sha256 = ''0fkqwbwqc9a783ynjbszimcrannpqq4ja6wcf8ybgizr4zvsgj29''; + url = ''http://beta.quicklisp.org/archive/fast-http/2018-01-31/fast-http-20180131-git.tgz''; + sha256 = ''057wg23a1pfdr3522nzjpclxdrmx3azbnw57nkvdjmfp6fyb3rpg''; }; packageName = "fast-http"; @@ -18,13 +18,18 @@ rec { overrides = x: x; } /* (SYSTEM fast-http DESCRIPTION A fast HTTP protocol parser in Common Lisp - SHA256 0fkqwbwqc9a783ynjbszimcrannpqq4ja6wcf8ybgizr4zvsgj29 URL - http://beta.quicklisp.org/archive/fast-http/2017-06-30/fast-http-20170630-git.tgz - MD5 d117d59c1f71965e0c32b19e6790cf9a NAME fast-http FILENAME fast-http DEPS + SHA256 057wg23a1pfdr3522nzjpclxdrmx3azbnw57nkvdjmfp6fyb3rpg URL + http://beta.quicklisp.org/archive/fast-http/2018-01-31/fast-http-20180131-git.tgz + MD5 0722e935fb644d57d44e8604e41e689e NAME fast-http FILENAME fast-http DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-utilities FILENAME cl-utilities) + (NAME flexi-streams FILENAME flexi-streams) (NAME proc-parse FILENAME proc-parse) - (NAME smart-buffer FILENAME smart-buffer) (NAME xsubseq FILENAME xsubseq)) + (NAME smart-buffer FILENAME smart-buffer) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams) + (NAME xsubseq FILENAME xsubseq)) DEPENDENCIES - (alexandria babel cl-utilities proc-parse smart-buffer xsubseq) VERSION - 20170630-git SIBLINGS (fast-http-test) PARASITES NIL) */ + (alexandria babel cl-utilities flexi-streams proc-parse smart-buffer + trivial-features trivial-gray-streams xsubseq) + VERSION 20180131-git SIBLINGS (fast-http-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix index 8b9d5e5408b..f78b7ae0cb6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''fast-io''; - version = ''20170630-git''; + version = ''20171023-git''; description = ''Alternative I/O mechanism to a stream or vector''; - deps = [ args."alexandria" args."static-vectors" args."trivial-gray-streams" ]; + deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fast-io/2017-06-30/fast-io-20170630-git.tgz''; - sha256 = ''0wg40jv6hn4ijks026d2aaz5pr3zfxxzaakyzzjka6981g9rgkrg''; + url = ''http://beta.quicklisp.org/archive/fast-io/2017-10-23/fast-io-20171023-git.tgz''; + sha256 = ''09w4awnvw772s24ivgzx2irhy701nrsxbim6ip5rc70rfzbff8sl''; }; packageName = "fast-io"; @@ -18,11 +18,15 @@ rec { overrides = x: x; } /* (SYSTEM fast-io DESCRIPTION Alternative I/O mechanism to a stream or vector - SHA256 0wg40jv6hn4ijks026d2aaz5pr3zfxxzaakyzzjka6981g9rgkrg URL - http://beta.quicklisp.org/archive/fast-io/2017-06-30/fast-io-20170630-git.tgz - MD5 34bfe5f306f2e0f6da128fe024ee242d NAME fast-io FILENAME fast-io DEPS - ((NAME alexandria FILENAME alexandria) + SHA256 09w4awnvw772s24ivgzx2irhy701nrsxbim6ip5rc70rfzbff8sl URL + http://beta.quicklisp.org/archive/fast-io/2017-10-23/fast-io-20171023-git.tgz + MD5 89105f8277f3bf3709fae1b789e3d5ad NAME fast-io FILENAME fast-io DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) (NAME static-vectors FILENAME static-vectors) + (NAME trivial-features FILENAME trivial-features) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES (alexandria static-vectors trivial-gray-streams) VERSION - 20170630-git SIBLINGS (fast-io-test) PARASITES NIL) */ + DEPENDENCIES + (alexandria babel cffi cffi-grovel static-vectors trivial-features + trivial-gray-streams) + VERSION 20171023-git SIBLINGS (fast-io-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix new file mode 100644 index 00000000000..245ee8b394a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix @@ -0,0 +1,28 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''fiasco''; + version = ''20171227-git''; + + parasites = [ "fiasco-self-tests" ]; + + description = ''A Common Lisp test framework that treasures your failures, logical continuation of Stefil.''; + + deps = [ args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/fiasco/2017-12-27/fiasco-20171227-git.tgz''; + sha256 = ''1kv88yp4vjglahvknaxcdsp2kiwbs1nm94f857mkr2pmy87qbqx2''; + }; + + packageName = "fiasco"; + + asdFilesToKeep = ["fiasco.asd"]; + overrides = x: x; +} +/* (SYSTEM fiasco DESCRIPTION + A Common Lisp test framework that treasures your failures, logical continuation of Stefil. + SHA256 1kv88yp4vjglahvknaxcdsp2kiwbs1nm94f857mkr2pmy87qbqx2 URL + http://beta.quicklisp.org/archive/fiasco/2017-12-27/fiasco-20171227-git.tgz + MD5 3cc915e91f18617eb3d436b6fea9dd49 NAME fiasco FILENAME fiasco DEPS + ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION + 20171227-git SIBLINGS NIL PARASITES (fiasco-self-tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix index 69aeecd8aa2..6e652e8b312 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''flexi-streams''; - version = ''1.0.15''; + version = ''20171227-git''; parasites = [ "flexi-streams-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/flexi-streams/2015-07-09/flexi-streams-1.0.15.tgz''; - sha256 = ''0zkx335winqs7xigbmxhhkhcsfa9hjhf1q6r4q710y29fbhpc37p''; + url = ''http://beta.quicklisp.org/archive/flexi-streams/2017-12-27/flexi-streams-20171227-git.tgz''; + sha256 = ''1hw3w8syz7pyggxz1fwskrvjjwz5518vz5clkkjxfshlzqhwxfyc''; }; packageName = "flexi-streams"; @@ -20,10 +20,10 @@ rec { overrides = x: x; } /* (SYSTEM flexi-streams DESCRIPTION Flexible bivalent streams for Common Lisp - SHA256 0zkx335winqs7xigbmxhhkhcsfa9hjhf1q6r4q710y29fbhpc37p URL - http://beta.quicklisp.org/archive/flexi-streams/2015-07-09/flexi-streams-1.0.15.tgz - MD5 02dbb5a0c5f982e0c7a88aad9a25004e NAME flexi-streams FILENAME + SHA256 1hw3w8syz7pyggxz1fwskrvjjwz5518vz5clkkjxfshlzqhwxfyc URL + http://beta.quicklisp.org/archive/flexi-streams/2017-12-27/flexi-streams-20171227-git.tgz + MD5 583aa697051062a0d6a6a73923f865d3 NAME flexi-streams FILENAME flexi-streams DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES - (trivial-gray-streams) VERSION 1.0.15 SIBLINGS NIL PARASITES + (trivial-gray-streams) VERSION 20171227-git SIBLINGS NIL PARASITES (flexi-streams-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix index 4847ee328d0..2aa5c074925 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''form-fiddle''; - version = ''20170630-git''; + version = ''20180131-git''; description = ''A collection of utilities to destructure lambda forms.''; - deps = [ args."documentation-utils" ]; + deps = [ args."documentation-utils" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/form-fiddle/2017-06-30/form-fiddle-20170630-git.tgz''; - sha256 = ''0w4isi9y2h6vswq418hj50223aac89iadl71y86wxdlznm3kdvjf''; + url = ''http://beta.quicklisp.org/archive/form-fiddle/2018-01-31/form-fiddle-20180131-git.tgz''; + sha256 = ''1i7rzn4ilr46wpkd2i10q875bxy8b54v7rvqzcq752hilx15hiff''; }; packageName = "form-fiddle"; @@ -19,8 +19,11 @@ rec { } /* (SYSTEM form-fiddle DESCRIPTION A collection of utilities to destructure lambda forms. SHA256 - 0w4isi9y2h6vswq418hj50223aac89iadl71y86wxdlznm3kdvjf URL - http://beta.quicklisp.org/archive/form-fiddle/2017-06-30/form-fiddle-20170630-git.tgz - MD5 9c8eb18dfedebcf43718cc259c910aa1 NAME form-fiddle FILENAME form-fiddle - DEPS ((NAME documentation-utils FILENAME documentation-utils)) DEPENDENCIES - (documentation-utils) VERSION 20170630-git SIBLINGS NIL PARASITES NIL) */ + 1i7rzn4ilr46wpkd2i10q875bxy8b54v7rvqzcq752hilx15hiff URL + http://beta.quicklisp.org/archive/form-fiddle/2018-01-31/form-fiddle-20180131-git.tgz + MD5 a0cc2ea1af29889e4991f7fefac366dd NAME form-fiddle FILENAME form-fiddle + DEPS + ((NAME documentation-utils FILENAME documentation-utils) + (NAME trivial-indent FILENAME trivial-indent)) + DEPENDENCIES (documentation-utils trivial-indent) VERSION 20180131-git + SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix index 7b0ea1ff2ad..d901df215a6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''fset''; - version = ''20150113-git''; + version = ''20171019-git''; description = ''A functional set-theoretic collections library. See: http://www.ergy.com/FSet.html @@ -10,8 +10,8 @@ See: http://www.ergy.com/FSet.html deps = [ args."misc-extensions" args."mt19937" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fset/2015-01-13/fset-20150113-git.tgz''; - sha256 = ''1k9c48jahw8i4zhx6dc96n0jzxjy2ascr2wng9hmm8vjhhqs5sl0''; + url = ''http://beta.quicklisp.org/archive/fset/2017-10-19/fset-20171019-git.tgz''; + sha256 = ''07qxbj40kmjknmvvb47prj81mpi6j39150iw57hlrzdhlndvilwg''; }; packageName = "fset"; @@ -22,10 +22,10 @@ See: http://www.ergy.com/FSet.html /* (SYSTEM fset DESCRIPTION A functional set-theoretic collections library. See: http://www.ergy.com/FSet.html - SHA256 1k9c48jahw8i4zhx6dc96n0jzxjy2ascr2wng9hmm8vjhhqs5sl0 URL - http://beta.quicklisp.org/archive/fset/2015-01-13/fset-20150113-git.tgz MD5 - 89f958cc900e712aed0750b336efbe15 NAME fset FILENAME fset DEPS + SHA256 07qxbj40kmjknmvvb47prj81mpi6j39150iw57hlrzdhlndvilwg URL + http://beta.quicklisp.org/archive/fset/2017-10-19/fset-20171019-git.tgz MD5 + dc8de5917c513302dd0e135e6c133978 NAME fset FILENAME fset DEPS ((NAME misc-extensions FILENAME misc-extensions) (NAME mt19937 FILENAME mt19937)) - DEPENDENCIES (misc-extensions mt19937) VERSION 20150113-git SIBLINGS NIL + DEPENDENCIES (misc-extensions mt19937) VERSION 20171019-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix index 04e53bd3fc1..604ccf0bdc7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix @@ -5,7 +5,7 @@ rec { description = ''HTTP POST data parser for Common Lisp''; - deps = [ args."alexandria" args."babel" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."jonathan" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."trivial-gray-streams" args."xsubseq" ]; + deps = [ args."alexandria" args."babel" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."jonathan" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."trivial-features" args."trivial-gray-streams" args."xsubseq" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz''; @@ -30,10 +30,11 @@ rec { (NAME jonathan FILENAME jonathan) (NAME proc-parse FILENAME proc-parse) (NAME quri FILENAME quri) (NAME smart-buffer FILENAME smart-buffer) (NAME split-sequence FILENAME split-sequence) + (NAME trivial-features FILENAME trivial-features) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME xsubseq FILENAME xsubseq)) DEPENDENCIES (alexandria babel cl-annot cl-ppcre cl-syntax cl-utilities fast-http fast-io flexi-streams jonathan proc-parse quri smart-buffer split-sequence - trivial-gray-streams xsubseq) + trivial-features trivial-gray-streams xsubseq) VERSION 20161204-git SIBLINGS (http-body-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix index 5ce8459d9e2..6a103b5ac1c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''hunchentoot''; - version = ''v1.2.37''; + version = ''v1.2.38''; parasites = [ "hunchentoot-dev" "hunchentoot-test" ]; @@ -13,8 +13,8 @@ rec { deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl+ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."cl-who" args."cxml-stp" args."drakma" args."flexi-streams" args."md5" args."rfc2388" args."split-sequence" args."swank" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" args."xpath" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/hunchentoot/2017-07-25/hunchentoot-v1.2.37.tgz''; - sha256 = ''1r0p8qasd2zy9a8l58jysz5bb1gj79cz2ikr93in0my8q44pg9lc''; + url = ''http://beta.quicklisp.org/archive/hunchentoot/2017-12-27/hunchentoot-v1.2.38.tgz''; + sha256 = ''1d3gnqbk2s3g9q51sx8mcsp2rmbvcfanbnljsf19npgfmz1ypsgd''; }; packageName = "hunchentoot"; @@ -27,9 +27,9 @@ rec { BORDEAUX-THREADS. It supports HTTP 1.1, serves static files, has a simple framework for user-defined handlers and can be extended through subclassing. - SHA256 1r0p8qasd2zy9a8l58jysz5bb1gj79cz2ikr93in0my8q44pg9lc URL - http://beta.quicklisp.org/archive/hunchentoot/2017-07-25/hunchentoot-v1.2.37.tgz - MD5 3fd6a6c4dd0d32db7b71828b52494325 NAME hunchentoot FILENAME hunchentoot + SHA256 1d3gnqbk2s3g9q51sx8mcsp2rmbvcfanbnljsf19npgfmz1ypsgd URL + http://beta.quicklisp.org/archive/hunchentoot/2017-12-27/hunchentoot-v1.2.38.tgz + MD5 878a7833eb34a53231011b78e998e2fa NAME hunchentoot FILENAME hunchentoot DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -50,4 +50,4 @@ rec { cl-ppcre cl-who cxml-stp drakma flexi-streams md5 rfc2388 split-sequence swank trivial-backtrace trivial-features trivial-garbage trivial-gray-streams usocket xpath) - VERSION v1.2.37 SIBLINGS NIL PARASITES (hunchentoot-dev hunchentoot-test)) */ + VERSION v1.2.38 SIBLINGS NIL PARASITES (hunchentoot-dev hunchentoot-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix index 3bb44ea2fc6..4211dfbc919 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''ieee-floats''; - version = ''20160318-git''; + version = ''20170830-git''; parasites = [ "ieee-floats-tests" ]; - description = ''''; + description = ''Convert floating point values to IEEE 754 binary representation''; - deps = [ args."eos" ]; + deps = [ args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/ieee-floats/2016-03-18/ieee-floats-20160318-git.tgz''; - sha256 = ''0vw4q6q5yygfxfwx5bki4kl9lqszmhnplcl55qh8raxmb03alyx4''; + url = ''http://beta.quicklisp.org/archive/ieee-floats/2017-08-30/ieee-floats-20170830-git.tgz''; + sha256 = ''15c4q4w3cda82vqlpvdfrnah6ms6vxbjf4a0chd10daw72rwayqk''; }; packageName = "ieee-floats"; @@ -19,9 +19,10 @@ rec { asdFilesToKeep = ["ieee-floats.asd"]; overrides = x: x; } -/* (SYSTEM ieee-floats DESCRIPTION NIL SHA256 - 0vw4q6q5yygfxfwx5bki4kl9lqszmhnplcl55qh8raxmb03alyx4 URL - http://beta.quicklisp.org/archive/ieee-floats/2016-03-18/ieee-floats-20160318-git.tgz - MD5 84d679a4dffddc3b0cff944adde623c5 NAME ieee-floats FILENAME ieee-floats - DEPS ((NAME eos FILENAME eos)) DEPENDENCIES (eos) VERSION 20160318-git - SIBLINGS NIL PARASITES (ieee-floats-tests)) */ +/* (SYSTEM ieee-floats DESCRIPTION + Convert floating point values to IEEE 754 binary representation SHA256 + 15c4q4w3cda82vqlpvdfrnah6ms6vxbjf4a0chd10daw72rwayqk URL + http://beta.quicklisp.org/archive/ieee-floats/2017-08-30/ieee-floats-20170830-git.tgz + MD5 3434b4d91224ca6a817ced9d83f14bb6 NAME ieee-floats FILENAME ieee-floats + DEPS ((NAME fiveam FILENAME fiveam)) DEPENDENCIES (fiveam) VERSION + 20170830-git SIBLINGS NIL PARASITES (ieee-floats-tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix index 89301f90866..578b251ecec 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''ironclad''; - version = ''v0.34''; + version = ''v0.37''; - parasites = [ "ironclad-tests" ]; + parasites = [ "ironclad/tests" ]; description = ''A cryptographic toolkit written in pure Common Lisp''; deps = [ args."nibbles" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/ironclad/2017-06-30/ironclad-v0.34.tgz''; - sha256 = ''08xlnzs7hzbr0sa4aff4xb0b60dxcpad7fb5xsnjn3qjs7yydxk0''; + url = ''http://beta.quicklisp.org/archive/ironclad/2017-11-30/ironclad-v0.37.tgz''; + sha256 = ''061ln65yj9psch84nmsjrrlq41bkfv6iyg8sd9kpdc75lfc0vpi2''; }; packageName = "ironclad"; @@ -21,8 +21,8 @@ rec { } /* (SYSTEM ironclad DESCRIPTION A cryptographic toolkit written in pure Common Lisp SHA256 - 08xlnzs7hzbr0sa4aff4xb0b60dxcpad7fb5xsnjn3qjs7yydxk0 URL - http://beta.quicklisp.org/archive/ironclad/2017-06-30/ironclad-v0.34.tgz - MD5 82db632975aa83b0dce3412c1aff4a80 NAME ironclad FILENAME ironclad DEPS - ((NAME nibbles FILENAME nibbles)) DEPENDENCIES (nibbles) VERSION v0.34 - SIBLINGS (ironclad-text) PARASITES (ironclad-tests)) */ + 061ln65yj9psch84nmsjrrlq41bkfv6iyg8sd9kpdc75lfc0vpi2 URL + http://beta.quicklisp.org/archive/ironclad/2017-11-30/ironclad-v0.37.tgz + MD5 9d8734764eead79f3a5d230b8e800d8f NAME ironclad FILENAME ironclad DEPS + ((NAME nibbles FILENAME nibbles)) DEPENDENCIES (nibbles) VERSION v0.37 + SIBLINGS (ironclad-text) PARASITES (ironclad/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix index 42980e0c913..645048c7190 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''iterate''; - version = ''20160825-darcs''; + version = ''20180131-darcs''; parasites = [ "iterate/tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iterate/2016-08-25/iterate-20160825-darcs.tgz''; - sha256 = ''0kvz16gnxnkdz0fy1x8y5yr28nfm7i2qpvix7mgwccdpjmsb4pgm''; + url = ''http://beta.quicklisp.org/archive/iterate/2018-01-31/iterate-20180131-darcs.tgz''; + sha256 = ''05jlwd59w13k4n9x7a0mszdv7i78cbmx93w2p1yzsi30593rh9hj''; }; packageName = "iterate"; @@ -21,8 +21,8 @@ rec { } /* (SYSTEM iterate DESCRIPTION Jonathan Amsterdam's iterator/gatherer/accumulator facility SHA256 - 0kvz16gnxnkdz0fy1x8y5yr28nfm7i2qpvix7mgwccdpjmsb4pgm URL - http://beta.quicklisp.org/archive/iterate/2016-08-25/iterate-20160825-darcs.tgz - MD5 e73ff4898ce4831ff2a28817f32de86e NAME iterate FILENAME iterate DEPS NIL - DEPENDENCIES NIL VERSION 20160825-darcs SIBLINGS NIL PARASITES + 05jlwd59w13k4n9x7a0mszdv7i78cbmx93w2p1yzsi30593rh9hj URL + http://beta.quicklisp.org/archive/iterate/2018-01-31/iterate-20180131-darcs.tgz + MD5 40a1776b445e42463c2c6f754468fb83 NAME iterate FILENAME iterate DEPS NIL + DEPENDENCIES NIL VERSION 20180131-darcs SIBLINGS NIL PARASITES (iterate/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix index 9f99f99d4ce..408ef5dfabc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack-component''; - version = ''lack-20170725-git''; + version = ''lack-20180131-git''; description = ''''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz''; - sha256 = ''1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp''; + url = ''http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz''; + sha256 = ''17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl''; }; packageName = "lack-component"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM lack-component DESCRIPTION NIL SHA256 - 1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp URL - http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz MD5 - ab71d36ac49e4759806e9a2ace50ae53 NAME lack-component FILENAME - lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20170725-git SIBLINGS + 17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl URL + http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz MD5 + e1807a22a021ca27d8d1add9219091eb NAME lack-component FILENAME + lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20180131-git SIBLINGS (lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix index 2bbe5dcd33b..a6816fa75c5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack-middleware-backtrace''; - version = ''lack-20170725-git''; + version = ''lack-20180131-git''; description = ''''; deps = [ args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz''; - sha256 = ''1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp''; + url = ''http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz''; + sha256 = ''17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl''; }; packageName = "lack-middleware-backtrace"; @@ -18,11 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256 - 1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp URL - http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz MD5 - ab71d36ac49e4759806e9a2ace50ae53 NAME lack-middleware-backtrace FILENAME + 17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl URL + http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz MD5 + e1807a22a021ca27d8d1add9219091eb NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES - (uiop) VERSION lack-20170725-git SIBLINGS + (uiop) VERSION lack-20180131-git SIBLINGS (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response lack-session-store-dbi diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix index 38f834cd52b..a056d9d0d14 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack-util''; - version = ''lack-20170725-git''; + version = ''lack-20180131-git''; description = ''''; deps = [ args."ironclad" args."nibbles" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz''; - sha256 = ''1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp''; + url = ''http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz''; + sha256 = ''17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl''; }; packageName = "lack-util"; @@ -18,11 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM lack-util DESCRIPTION NIL SHA256 - 1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp URL - http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz MD5 - ab71d36ac49e4759806e9a2ace50ae53 NAME lack-util FILENAME lack-util DEPS + 17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl URL + http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz MD5 + e1807a22a021ca27d8d1add9219091eb NAME lack-util FILENAME lack-util DEPS ((NAME ironclad FILENAME ironclad) (NAME nibbles FILENAME nibbles)) - DEPENDENCIES (ironclad nibbles) VERSION lack-20170725-git SIBLINGS + DEPENDENCIES (ironclad nibbles) VERSION lack-20180131-git SIBLINGS (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix index 0d65d48cf0a..1c3998a3025 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack''; - version = ''20170725-git''; + version = ''20180131-git''; description = ''A minimal Clack''; deps = [ args."ironclad" args."lack-component" args."lack-util" args."nibbles" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz''; - sha256 = ''1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp''; + url = ''http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz''; + sha256 = ''17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl''; }; packageName = "lack"; @@ -18,14 +18,14 @@ rec { overrides = x: x; } /* (SYSTEM lack DESCRIPTION A minimal Clack SHA256 - 1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp URL - http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz MD5 - ab71d36ac49e4759806e9a2ace50ae53 NAME lack FILENAME lack DEPS + 17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl URL + http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz MD5 + e1807a22a021ca27d8d1add9219091eb NAME lack FILENAME lack DEPS ((NAME ironclad FILENAME ironclad) (NAME lack-component FILENAME lack-component) (NAME lack-util FILENAME lack-util) (NAME nibbles FILENAME nibbles)) DEPENDENCIES (ironclad lack-component lack-util nibbles) VERSION - 20170725-git SIBLINGS + 20180131-git SIBLINGS (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix index a94c8439cf2..1f6a0709b0f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''let-plus''; - version = ''20170124-git''; + version = ''20171130-git''; - parasites = [ "let-plus-tests" ]; + parasites = [ "let-plus/tests" ]; description = ''Destructuring extension of LET*.''; deps = [ args."alexandria" args."anaphora" args."lift" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/let-plus/2017-01-24/let-plus-20170124-git.tgz''; - sha256 = ''1hfsw4g36vccz2lx6gk375arjj6y85yh9ch3pq7yiybjlxx68xi8''; + url = ''http://beta.quicklisp.org/archive/let-plus/2017-11-30/let-plus-20171130-git.tgz''; + sha256 = ''1v8rp3ab6kp6v5kl58gi700wjs4qgmkxxkmhx2a1i6b2z934xkx7''; }; packageName = "let-plus"; @@ -20,10 +20,10 @@ rec { overrides = x: x; } /* (SYSTEM let-plus DESCRIPTION Destructuring extension of LET*. SHA256 - 1hfsw4g36vccz2lx6gk375arjj6y85yh9ch3pq7yiybjlxx68xi8 URL - http://beta.quicklisp.org/archive/let-plus/2017-01-24/let-plus-20170124-git.tgz - MD5 1180608e4da53f3866a99d4cca72e3b1 NAME let-plus FILENAME let-plus DEPS + 1v8rp3ab6kp6v5kl58gi700wjs4qgmkxxkmhx2a1i6b2z934xkx7 URL + http://beta.quicklisp.org/archive/let-plus/2017-11-30/let-plus-20171130-git.tgz + MD5 cd92097d436a513e7d0eac535617ca08 NAME let-plus FILENAME let-plus DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME lift FILENAME lift)) - DEPENDENCIES (alexandria anaphora lift) VERSION 20170124-git SIBLINGS NIL - PARASITES (let-plus-tests)) */ + DEPENDENCIES (alexandria anaphora lift) VERSION 20171130-git SIBLINGS NIL + PARASITES (let-plus/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix index 50bc9946cca..7f88beb974b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lisp-namespace''; - version = ''20170630-git''; + version = ''20171130-git''; description = ''Provides LISP-N --- extensible namespaces in Common Lisp.''; deps = [ args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lisp-namespace/2017-06-30/lisp-namespace-20170630-git.tgz''; - sha256 = ''06mdrzjwmfynzljcs8ym8dscjlxpbbkmjfg912v68v7p2xzq6d0n''; + url = ''http://beta.quicklisp.org/archive/lisp-namespace/2017-11-30/lisp-namespace-20171130-git.tgz''; + sha256 = ''0vxk06c5434kcjv9p414yk23gs4rkibfq695is9y7wglck31fz2j''; }; packageName = "lisp-namespace"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM lisp-namespace DESCRIPTION Provides LISP-N --- extensible namespaces in Common Lisp. SHA256 - 06mdrzjwmfynzljcs8ym8dscjlxpbbkmjfg912v68v7p2xzq6d0n URL - http://beta.quicklisp.org/archive/lisp-namespace/2017-06-30/lisp-namespace-20170630-git.tgz - MD5 f3379a60f7cc896a7cff384ff25a1de5 NAME lisp-namespace FILENAME + 0vxk06c5434kcjv9p414yk23gs4rkibfq695is9y7wglck31fz2j URL + http://beta.quicklisp.org/archive/lisp-namespace/2017-11-30/lisp-namespace-20171130-git.tgz + MD5 d3052a13db167c6a53487f31753b7467 NAME lisp-namespace FILENAME lisp-namespace DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES - (alexandria) VERSION 20170630-git SIBLINGS (lisp-namespace.test) PARASITES + (alexandria) VERSION 20171130-git SIBLINGS (lisp-namespace.test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix index 47e57ba1285..62197234305 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''lisp-unit2''; - version = ''20160531-git''; + version = ''20180131-git''; parasites = [ "lisp-unit2-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."symbol-munger" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lisp-unit2/2016-05-31/lisp-unit2-20160531-git.tgz''; - sha256 = ''17frcygs515l611cwggm90xapl8xng9cylsrdh11ygmdxwwy59sv''; + url = ''http://beta.quicklisp.org/archive/lisp-unit2/2018-01-31/lisp-unit2-20180131-git.tgz''; + sha256 = ''04kwrg605mqzf3ghshgbygvvryk5kipl6gyc5kdaxafjxvhxaak7''; }; packageName = "lisp-unit2"; @@ -21,9 +21,9 @@ rec { } /* (SYSTEM lisp-unit2 DESCRIPTION Common Lisp library that supports unit testing. SHA256 - 17frcygs515l611cwggm90xapl8xng9cylsrdh11ygmdxwwy59sv URL - http://beta.quicklisp.org/archive/lisp-unit2/2016-05-31/lisp-unit2-20160531-git.tgz - MD5 913675bff1f86453887681e72ae5914d NAME lisp-unit2 FILENAME lisp-unit2 + 04kwrg605mqzf3ghshgbygvvryk5kipl6gyc5kdaxafjxvhxaak7 URL + http://beta.quicklisp.org/archive/lisp-unit2/2018-01-31/lisp-unit2-20180131-git.tgz + MD5 d061fa640837441a5d2eecbefd8b2e69 NAME lisp-unit2 FILENAME lisp-unit2 DEPS ((NAME alexandria FILENAME alexandria) (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) @@ -34,4 +34,4 @@ rec { DEPENDENCIES (alexandria cl-interpol cl-ppcre cl-unicode flexi-streams iterate symbol-munger) - VERSION 20160531-git SIBLINGS NIL PARASITES (lisp-unit2-test)) */ + VERSION 20180131-git SIBLINGS NIL PARASITES (lisp-unit2-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix index f5137a5e927..0b2556b2572 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix @@ -1,15 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''local-time''; - version = ''20170725-git''; + version = ''20180131-git''; + + parasites = [ "local-time/test" ]; description = ''A library for manipulating dates and times, based on a paper by Erik Naggum''; - deps = [ args."alexandria" args."bordeaux-threads" args."cl-fad" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."cl-fad" args."stefil" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/local-time/2017-07-25/local-time-20170725-git.tgz''; - sha256 = ''05axwla93m5jml9lw6ljwzjhcl8pshfzxyqkvyj1w5l9klh569p9''; + url = ''http://beta.quicklisp.org/archive/local-time/2018-01-31/local-time-20180131-git.tgz''; + sha256 = ''1i8km0ndqk1kx914n0chi4c3kkk6m0zk0kplh87fgzwn4lh79rpr''; }; packageName = "local-time"; @@ -19,12 +21,12 @@ rec { } /* (SYSTEM local-time DESCRIPTION A library for manipulating dates and times, based on a paper by Erik Naggum - SHA256 05axwla93m5jml9lw6ljwzjhcl8pshfzxyqkvyj1w5l9klh569p9 URL - http://beta.quicklisp.org/archive/local-time/2017-07-25/local-time-20170725-git.tgz - MD5 77a79ed1036bc3547f5174f2256c8e93 NAME local-time FILENAME local-time + SHA256 1i8km0ndqk1kx914n0chi4c3kkk6m0zk0kplh87fgzwn4lh79rpr URL + http://beta.quicklisp.org/archive/local-time/2018-01-31/local-time-20180131-git.tgz + MD5 61982a1f2b29793e00369d9c2b6d1b12 NAME local-time FILENAME local-time DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cl-fad FILENAME cl-fad)) - DEPENDENCIES (alexandria bordeaux-threads cl-fad) VERSION 20170725-git - SIBLINGS (cl-postgres+local-time local-time.test) PARASITES NIL) */ + (NAME cl-fad FILENAME cl-fad) (NAME stefil FILENAME stefil)) + DEPENDENCIES (alexandria bordeaux-threads cl-fad stefil) VERSION + 20180131-git SIBLINGS (cl-postgres+local-time) PARASITES (local-time/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix index b8592e12490..1ca094d139d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lquery''; - version = ''20170630-git''; + version = ''20180131-git''; description = ''A library to allow jQuery-like HTML/DOM manipulation.''; - deps = [ args."array-utils" args."clss" args."form-fiddle" args."plump" ]; + deps = [ args."array-utils" args."clss" args."documentation-utils" args."form-fiddle" args."plump" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lquery/2017-06-30/lquery-20170630-git.tgz''; - sha256 = ''19lpzjidg31lw61b78vdsqzrsdw2js4a9s7zzr5049jpzbspszjm''; + url = ''http://beta.quicklisp.org/archive/lquery/2018-01-31/lquery-20180131-git.tgz''; + sha256 = ''1v5mmdx7a1ngydkcs3c5anmqrl0jxc52b8jisc2f0b5k0j1kgmm9''; }; packageName = "lquery"; @@ -19,10 +19,13 @@ rec { } /* (SYSTEM lquery DESCRIPTION A library to allow jQuery-like HTML/DOM manipulation. SHA256 - 19lpzjidg31lw61b78vdsqzrsdw2js4a9s7zzr5049jpzbspszjm URL - http://beta.quicklisp.org/archive/lquery/2017-06-30/lquery-20170630-git.tgz - MD5 aeb03cb5174d682092683da488531a9c NAME lquery FILENAME lquery DEPS + 1v5mmdx7a1ngydkcs3c5anmqrl0jxc52b8jisc2f0b5k0j1kgmm9 URL + http://beta.quicklisp.org/archive/lquery/2018-01-31/lquery-20180131-git.tgz + MD5 07e92aad32c4d12c4699956b57dbc9b8 NAME lquery FILENAME lquery DEPS ((NAME array-utils FILENAME array-utils) (NAME clss FILENAME clss) - (NAME form-fiddle FILENAME form-fiddle) (NAME plump FILENAME plump)) - DEPENDENCIES (array-utils clss form-fiddle plump) VERSION 20170630-git - SIBLINGS (lquery-test) PARASITES NIL) */ + (NAME documentation-utils FILENAME documentation-utils) + (NAME form-fiddle FILENAME form-fiddle) (NAME plump FILENAME plump) + (NAME trivial-indent FILENAME trivial-indent)) + DEPENDENCIES + (array-utils clss documentation-utils form-fiddle plump trivial-indent) + VERSION 20180131-git SIBLINGS (lquery-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix index b45b0a5da70..4d17bd6341f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''marshal''; - version = ''cl-20170124-git''; + version = ''cl-20170830-git''; description = ''marshal: Simple (de)serialization of Lisp datastructures.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-marshal/2017-01-24/cl-marshal-20170124-git.tgz''; - sha256 = ''0z43m3jspl4c4fcbbxm58hxd9k69308pyijgj7grmq6mirkq664d''; + url = ''http://beta.quicklisp.org/archive/cl-marshal/2017-08-30/cl-marshal-20170830-git.tgz''; + sha256 = ''1yirhxyizfxsvsrmbh2dipzzlq09afahzmi2zlsbbv6cvijxnisp''; }; packageName = "marshal"; @@ -19,7 +19,8 @@ rec { } /* (SYSTEM marshal DESCRIPTION marshal: Simple (de)serialization of Lisp datastructures. SHA256 - 0z43m3jspl4c4fcbbxm58hxd9k69308pyijgj7grmq6mirkq664d URL - http://beta.quicklisp.org/archive/cl-marshal/2017-01-24/cl-marshal-20170124-git.tgz - MD5 ebde1b0f1c1abeb409380884cc665351 NAME marshal FILENAME marshal DEPS NIL - DEPENDENCIES NIL VERSION cl-20170124-git SIBLINGS NIL PARASITES NIL) */ + 1yirhxyizfxsvsrmbh2dipzzlq09afahzmi2zlsbbv6cvijxnisp URL + http://beta.quicklisp.org/archive/cl-marshal/2017-08-30/cl-marshal-20170830-git.tgz + MD5 54bce031cdb215cd7624fdf3265b9bec NAME marshal FILENAME marshal DEPS NIL + DEPENDENCIES NIL VERSION cl-20170830-git SIBLINGS (marshal-tests) PARASITES + NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix index ac12468c880..d72e0839d1e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''metabang-bind''; - version = ''20170124-git''; + version = ''20171130-git''; description = ''Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/metabang-bind/2017-01-24/metabang-bind-20170124-git.tgz''; - sha256 = ''1xyiyrc9c02ylg6b749h2ihn6922kb179x7k338dmglf4mpyqxwc''; + url = ''http://beta.quicklisp.org/archive/metabang-bind/2017-11-30/metabang-bind-20171130-git.tgz''; + sha256 = ''0mjcg4281qljjwzq80r9j7nhvccf5k1069kzk2vljvvm2ai21j1a''; }; packageName = "metabang-bind"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM metabang-bind DESCRIPTION Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more. - SHA256 1xyiyrc9c02ylg6b749h2ihn6922kb179x7k338dmglf4mpyqxwc URL - http://beta.quicklisp.org/archive/metabang-bind/2017-01-24/metabang-bind-20170124-git.tgz - MD5 20c6a434308598ad7fa224d99f3bcbf6 NAME metabang-bind FILENAME - metabang-bind DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS + SHA256 0mjcg4281qljjwzq80r9j7nhvccf5k1069kzk2vljvvm2ai21j1a URL + http://beta.quicklisp.org/archive/metabang-bind/2017-11-30/metabang-bind-20171130-git.tgz + MD5 dfd06d3929c2f48ccbe1d00cdf9995a7 NAME metabang-bind FILENAME + metabang-bind DEPS NIL DEPENDENCIES NIL VERSION 20171130-git SIBLINGS (metabang-bind-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix index a239fe7e32b..82d06b1c93b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix @@ -1,7 +1,9 @@ args @ { fetchurl, ... }: rec { baseName = ''named-readtables''; - version = ''20170124-git''; + version = ''20180131-git''; + + parasites = [ "named-readtables/test" ]; description = ''Library that creates a namespace for named readtable akin to the namespace of packages.''; @@ -9,8 +11,8 @@ rec { deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/named-readtables/2017-01-24/named-readtables-20170124-git.tgz''; - sha256 = ''1j0drddahdjab40dd9v9qy92xbvzwgbk6y3hv990sdp9f8ac1q45''; + url = ''http://beta.quicklisp.org/archive/named-readtables/2018-01-31/named-readtables-20180131-git.tgz''; + sha256 = ''1fhygm2q75m6my6appxmx097l7zlr3qxbgzbpa2mf9pr1qzwrgg5''; }; packageName = "named-readtables"; @@ -21,8 +23,8 @@ rec { /* (SYSTEM named-readtables DESCRIPTION Library that creates a namespace for named readtable akin to the namespace of packages. - SHA256 1j0drddahdjab40dd9v9qy92xbvzwgbk6y3hv990sdp9f8ac1q45 URL - http://beta.quicklisp.org/archive/named-readtables/2017-01-24/named-readtables-20170124-git.tgz - MD5 1237a07f90e29939e48b595eaad2bd82 NAME named-readtables FILENAME - named-readtables DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS - NIL PARASITES NIL) */ + SHA256 1fhygm2q75m6my6appxmx097l7zlr3qxbgzbpa2mf9pr1qzwrgg5 URL + http://beta.quicklisp.org/archive/named-readtables/2018-01-31/named-readtables-20180131-git.tgz + MD5 46db18ba947dc0aba14c76471604448d NAME named-readtables FILENAME + named-readtables DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS + NIL PARASITES (named-readtables/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix index fbcfbe29164..9275e5583f5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''nibbles''; - version = ''20170403-git''; + version = ''20171130-git''; - parasites = [ "nibbles-tests" ]; + parasites = [ "nibbles/tests" ]; description = ''A library for accessing octet-addressed blocks of data in big- and little-endian orders''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/nibbles/2017-04-03/nibbles-20170403-git.tgz''; - sha256 = ''0bg7jwhqhm3qmpzk21gjv50sl0grdn68d770cqfs7in62ny35lk4''; + url = ''http://beta.quicklisp.org/archive/nibbles/2017-11-30/nibbles-20171130-git.tgz''; + sha256 = ''05ykyniak1m0whr7pnbhg53yblr5mny0crmh72bmgnvpmkm345zn''; }; packageName = "nibbles"; @@ -21,8 +21,8 @@ rec { } /* (SYSTEM nibbles DESCRIPTION A library for accessing octet-addressed blocks of data in big- and little-endian orders - SHA256 0bg7jwhqhm3qmpzk21gjv50sl0grdn68d770cqfs7in62ny35lk4 URL - http://beta.quicklisp.org/archive/nibbles/2017-04-03/nibbles-20170403-git.tgz - MD5 5683a0a5510860a036b2a272036cda87 NAME nibbles FILENAME nibbles DEPS NIL - DEPENDENCIES NIL VERSION 20170403-git SIBLINGS NIL PARASITES - (nibbles-tests)) */ + SHA256 05ykyniak1m0whr7pnbhg53yblr5mny0crmh72bmgnvpmkm345zn URL + http://beta.quicklisp.org/archive/nibbles/2017-11-30/nibbles-20171130-git.tgz + MD5 edce3702da9979fca3e40a4594fe36e6 NAME nibbles FILENAME nibbles DEPS NIL + DEPENDENCIES NIL VERSION 20171130-git SIBLINGS NIL PARASITES + (nibbles/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix index 07baf1539bc..da9fe306276 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix @@ -5,10 +5,10 @@ rec { description = ''Load data into PostgreSQL''; - deps = [ args."abnf" args."alexandria" args."anaphora" args."asdf-system-connections" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-containers" args."cl-csv" args."cl-fad" args."cl-interpol" args."cl-log" args."cl-markdown" args."cl-postgres" args."cl-ppcre" args."cl-unicode" args."cl-utilities" args."closer-mop" args."command-line-arguments" args."db3" args."drakma" args."dynamic-classes" args."esrap" args."flexi-streams" args."garbage-pools" args."ieee-floats" args."ironclad" args."iterate" args."ixf" args."list-of" args."local-time" args."lparallel" args."md5" args."metabang-bind" args."metatilities-base" args."mssql" args."nibbles" args."parse-number" args."postmodern" args."puri" args."py-configparser" args."qmynd" args."quri" args."s-sql" args."simple-date" args."split-sequence" args."sqlite" args."trivial-backtrace" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."uiop" args."usocket" args."uuid" ]; + deps = [ args."abnf" args."alexandria" args."anaphora" args."asdf-finalizers" args."asdf-system-connections" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-containers" args."cl-csv" args."cl-fad" args."cl-interpol" args."cl-log" args."cl-markdown" args."cl-postgres" args."cl-ppcre" args."cl-unicode" args."cl-utilities" args."closer-mop" args."command-line-arguments" args."db3" args."drakma" args."dynamic-classes" args."esrap" args."flexi-streams" args."garbage-pools" args."ieee-floats" args."ironclad" args."iterate" args."ixf" args."list-of" args."local-time" args."lparallel" args."md5" args."metabang-bind" args."metatilities-base" args."mssql" args."nibbles" args."parse-number" args."postmodern" args."puri" args."py-configparser" args."qmynd" args."quri" args."s-sql" args."salza2" args."simple-date" args."split-sequence" args."sqlite" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-utf-8" args."uiop" args."usocket" args."uuid" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/pgloader/2017-07-25/pgloader-v3.4.1.tgz''; + url = ''http://beta.quicklisp.org/archive/pgloader/2017-08-30/pgloader-v3.4.1.tgz''; sha256 = ''1z6p7dz1ir9cg4gl1vkvbc1f7pv1yfv1jgwjkw29v57fdg4faz9v''; }; @@ -19,10 +19,11 @@ rec { } /* (SYSTEM pgloader DESCRIPTION Load data into PostgreSQL SHA256 1z6p7dz1ir9cg4gl1vkvbc1f7pv1yfv1jgwjkw29v57fdg4faz9v URL - http://beta.quicklisp.org/archive/pgloader/2017-07-25/pgloader-v3.4.1.tgz + http://beta.quicklisp.org/archive/pgloader/2017-08-30/pgloader-v3.4.1.tgz MD5 6741f8e7d2d416942d5c4a1971576d33 NAME pgloader FILENAME pgloader DEPS ((NAME abnf FILENAME abnf) (NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) + (NAME asdf-finalizers FILENAME asdf-finalizers) (NAME asdf-system-connections FILENAME asdf-system-connections) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -52,22 +53,24 @@ rec { (NAME postmodern FILENAME postmodern) (NAME puri FILENAME puri) (NAME py-configparser FILENAME py-configparser) (NAME qmynd FILENAME qmynd) (NAME quri FILENAME quri) - (NAME s-sql FILENAME s-sql) (NAME simple-date FILENAME simple-date) + (NAME s-sql FILENAME s-sql) (NAME salza2 FILENAME salza2) + (NAME simple-date FILENAME simple-date) (NAME split-sequence FILENAME split-sequence) (NAME sqlite FILENAME sqlite) (NAME trivial-backtrace FILENAME trivial-backtrace) (NAME trivial-features FILENAME trivial-features) + (NAME trivial-garbage FILENAME trivial-garbage) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME trivial-utf-8 FILENAME trivial-utf-8) (NAME uiop FILENAME uiop) (NAME usocket FILENAME usocket) (NAME uuid FILENAME uuid)) DEPENDENCIES - (abnf alexandria anaphora asdf-system-connections babel bordeaux-threads - cffi chipz chunga cl+ssl cl-base64 cl-containers cl-csv cl-fad cl-interpol - cl-log cl-markdown cl-postgres cl-ppcre cl-unicode cl-utilities closer-mop - command-line-arguments db3 drakma dynamic-classes esrap flexi-streams - garbage-pools ieee-floats ironclad iterate ixf list-of local-time - lparallel md5 metabang-bind metatilities-base mssql nibbles parse-number - postmodern puri py-configparser qmynd quri s-sql simple-date - split-sequence sqlite trivial-backtrace trivial-features - trivial-gray-streams trivial-utf-8 uiop usocket uuid) + (abnf alexandria anaphora asdf-finalizers asdf-system-connections babel + bordeaux-threads cffi chipz chunga cl+ssl cl-base64 cl-containers cl-csv + cl-fad cl-interpol cl-log cl-markdown cl-postgres cl-ppcre cl-unicode + cl-utilities closer-mop command-line-arguments db3 drakma dynamic-classes + esrap flexi-streams garbage-pools ieee-floats ironclad iterate ixf list-of + local-time lparallel md5 metabang-bind metatilities-base mssql nibbles + parse-number postmodern puri py-configparser qmynd quri s-sql salza2 + simple-date split-sequence sqlite trivial-backtrace trivial-features + trivial-garbage trivial-gray-streams trivial-utf-8 uiop usocket uuid) VERSION v3.4.1 SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix index 763677c677c..02bb16e0b78 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''plump''; - version = ''20170725-git''; + version = ''20180131-git''; description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.''; - deps = [ args."array-utils" args."plump-dom" args."plump-lexer" args."plump-parser" args."trivial-indent" ]; + deps = [ args."array-utils" args."documentation-utils" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/plump/2017-07-25/plump-20170725-git.tgz''; - sha256 = ''118ashy1sqi666k18fqjkkzzqcak1f1aq93vm2hiadbdvrwn9s72''; + url = ''http://beta.quicklisp.org/archive/plump/2018-01-31/plump-20180131-git.tgz''; + sha256 = ''12kawjp88kh7cl2f3s2rg3fp3m09pr477nl9nxcfhmfkbrprslis''; }; packageName = "plump"; @@ -19,14 +19,11 @@ rec { } /* (SYSTEM plump DESCRIPTION An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256 - 118ashy1sqi666k18fqjkkzzqcak1f1aq93vm2hiadbdvrwn9s72 URL - http://beta.quicklisp.org/archive/plump/2017-07-25/plump-20170725-git.tgz - MD5 e5e92dd177711a14753ee86961710458 NAME plump FILENAME plump DEPS + 12kawjp88kh7cl2f3s2rg3fp3m09pr477nl9nxcfhmfkbrprslis URL + http://beta.quicklisp.org/archive/plump/2018-01-31/plump-20180131-git.tgz + MD5 b9e7e174b2322b6547bca7beddda6f3b NAME plump FILENAME plump DEPS ((NAME array-utils FILENAME array-utils) - (NAME plump-dom FILENAME plump-dom) - (NAME plump-lexer FILENAME plump-lexer) - (NAME plump-parser FILENAME plump-parser) + (NAME documentation-utils FILENAME documentation-utils) (NAME trivial-indent FILENAME trivial-indent)) - DEPENDENCIES - (array-utils plump-dom plump-lexer plump-parser trivial-indent) VERSION - 20170725-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */ + DEPENDENCIES (array-utils documentation-utils trivial-indent) VERSION + 20180131-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix index bbc0ad6b15b..441f7817109 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''postmodern''; - version = ''20170403-git''; + version = ''20180131-git''; - parasites = [ "postmodern-tests" ]; + parasites = [ "postmodern/tests" ]; description = ''PostgreSQL programming API''; - deps = [ args."alexandria" args."bordeaux-threads" args."cl-postgres" args."cl-postgres-tests" args."closer-mop" args."fiveam" args."md5" args."s-sql" args."simple-date" args."simple-date-postgres-glue" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."cl-postgres" args."cl-postgres_slash_tests" args."closer-mop" args."fiveam" args."md5" args."s-sql" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz''; - sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p''; + url = ''http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz''; + sha256 = ''0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki''; }; packageName = "postmodern"; @@ -20,20 +20,23 @@ rec { overrides = x: x; } /* (SYSTEM postmodern DESCRIPTION PostgreSQL programming API SHA256 - 1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL - http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz - MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME postmodern FILENAME postmodern + 0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki URL + http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz + MD5 a3b7bf25eb342cd49fe144fcd7ddcb16 NAME postmodern FILENAME postmodern DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-postgres FILENAME cl-postgres) - (NAME cl-postgres-tests FILENAME cl-postgres-tests) + (NAME cl-postgres/tests FILENAME cl-postgres_slash_tests) (NAME closer-mop FILENAME closer-mop) (NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5) (NAME s-sql FILENAME s-sql) (NAME simple-date FILENAME simple-date) - (NAME simple-date-postgres-glue FILENAME simple-date-postgres-glue)) + (NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue) + (NAME split-sequence FILENAME split-sequence) + (NAME usocket FILENAME usocket)) DEPENDENCIES - (alexandria bordeaux-threads cl-postgres cl-postgres-tests closer-mop - fiveam md5 s-sql simple-date simple-date-postgres-glue) - VERSION 20170403-git SIBLINGS (cl-postgres s-sql simple-date) PARASITES - (postmodern-tests)) */ + (alexandria bordeaux-threads cl-postgres cl-postgres/tests closer-mop + fiveam md5 s-sql simple-date simple-date/postgres-glue split-sequence + usocket) + VERSION 20180131-git SIBLINGS (cl-postgres s-sql simple-date) PARASITES + (postmodern/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix index 7815efa4ecd..a1542dc13cf 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''prove''; - version = ''20170403-git''; + version = ''20171130-git''; description = ''''; deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-ppcre" args."let-plus" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz''; - sha256 = ''091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl''; + url = ''http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz''; + sha256 = ''13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar''; }; packageName = "prove"; @@ -18,13 +18,13 @@ rec { overrides = x: x; } /* (SYSTEM prove DESCRIPTION NIL SHA256 - 091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl URL - http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz - MD5 063b615692c8711d2392204ecf1b37b7 NAME prove FILENAME prove DEPS + 13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar URL + http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz + MD5 630df4367537f799570be40242f8ed52 NAME prove FILENAME prove DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME cl-ansi-text FILENAME cl-ansi-text) (NAME cl-colors FILENAME cl-colors) (NAME cl-ppcre FILENAME cl-ppcre) (NAME let-plus FILENAME let-plus) (NAME uiop FILENAME uiop)) DEPENDENCIES (alexandria anaphora cl-ansi-text cl-colors cl-ppcre let-plus uiop) VERSION - 20170403-git SIBLINGS (cl-test-more prove-asdf prove-test) PARASITES NIL) */ + 20171130-git SIBLINGS (cl-test-more prove-asdf prove-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix index 3b3d90d1a1e..0eb4c0f5b9e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''py-configparser''; - version = ''20170725-svn''; + version = ''20170830-svn''; description = ''Common Lisp implementation of the Python ConfigParser module''; deps = [ args."parse-number" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/py-configparser/2017-07-25/py-configparser-20170725-svn.tgz''; - sha256 = ''08wfjlyhjqn54p3k0kv7ijsf72rsn4abdjnhd2bfkapr2a4jz6zr''; + url = ''http://beta.quicklisp.org/archive/py-configparser/2017-08-30/py-configparser-20170830-svn.tgz''; + sha256 = ''0lf062m6nrq61cxafi7jyfh3ianml1qqqzdfd5pm1wzakl2jqp9j''; }; packageName = "py-configparser"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM py-configparser DESCRIPTION Common Lisp implementation of the Python ConfigParser module SHA256 - 08wfjlyhjqn54p3k0kv7ijsf72rsn4abdjnhd2bfkapr2a4jz6zr URL - http://beta.quicklisp.org/archive/py-configparser/2017-07-25/py-configparser-20170725-svn.tgz - MD5 3486092bb1d56be05dab16036f288a74 NAME py-configparser FILENAME + 0lf062m6nrq61cxafi7jyfh3ianml1qqqzdfd5pm1wzakl2jqp9j URL + http://beta.quicklisp.org/archive/py-configparser/2017-08-30/py-configparser-20170830-svn.tgz + MD5 b6a9fc2a9c70760d6683cafe656f9e90 NAME py-configparser FILENAME py-configparser DEPS ((NAME parse-number FILENAME parse-number)) - DEPENDENCIES (parse-number) VERSION 20170725-svn SIBLINGS NIL PARASITES NIL) */ + DEPENDENCIES (parse-number) VERSION 20170830-svn SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix index d6d853413c2..356c7ff6864 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''qmynd''; - version = ''20170630-git''; + version = ''20180131-git''; description = ''MySQL Native Driver''; - deps = [ args."babel" args."flexi-streams" args."ironclad" args."list-of" args."trivial-gray-streams" args."usocket" ]; + deps = [ args."alexandria" args."asdf-finalizers" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."cl+ssl" args."flexi-streams" args."ironclad" args."list-of" args."nibbles" args."salza2" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/qmynd/2017-06-30/qmynd-20170630-git.tgz''; - sha256 = ''01rg2rm4n19f5g39z2gdjcfy68z7ir51r44524vzzs0x9na9y6bi''; + url = ''http://beta.quicklisp.org/archive/qmynd/2018-01-31/qmynd-20180131-git.tgz''; + sha256 = ''1ripapyrpzp36wsb2xf8w63nf0cjc13xh6xx296p8wgi01jwm61c''; }; packageName = "qmynd"; @@ -18,13 +18,24 @@ rec { overrides = x: x; } /* (SYSTEM qmynd DESCRIPTION MySQL Native Driver SHA256 - 01rg2rm4n19f5g39z2gdjcfy68z7ir51r44524vzzs0x9na9y6bi URL - http://beta.quicklisp.org/archive/qmynd/2017-06-30/qmynd-20170630-git.tgz - MD5 64776472d1e0c4c0e41a1b4a2a24167e NAME qmynd FILENAME qmynd DEPS - ((NAME babel FILENAME babel) (NAME flexi-streams FILENAME flexi-streams) + 1ripapyrpzp36wsb2xf8w63nf0cjc13xh6xx296p8wgi01jwm61c URL + http://beta.quicklisp.org/archive/qmynd/2018-01-31/qmynd-20180131-git.tgz + MD5 60177d28b1945234fd72760007194b3e NAME qmynd FILENAME qmynd DEPS + ((NAME alexandria FILENAME alexandria) + (NAME asdf-finalizers FILENAME asdf-finalizers) + (NAME babel FILENAME babel) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz) + (NAME cl+ssl FILENAME cl+ssl) (NAME flexi-streams FILENAME flexi-streams) (NAME ironclad FILENAME ironclad) (NAME list-of FILENAME list-of) + (NAME nibbles FILENAME nibbles) (NAME salza2 FILENAME salza2) + (NAME split-sequence FILENAME split-sequence) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-garbage FILENAME trivial-garbage) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME usocket FILENAME usocket)) DEPENDENCIES - (babel flexi-streams ironclad list-of trivial-gray-streams usocket) VERSION - 20170630-git SIBLINGS (qmynd-test) PARASITES NIL) */ + (alexandria asdf-finalizers babel bordeaux-threads cffi chipz cl+ssl + flexi-streams ironclad list-of nibbles salza2 split-sequence + trivial-features trivial-garbage trivial-gray-streams usocket) + VERSION 20180131-git SIBLINGS (qmynd-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix index f75e890760e..83d835fe2dd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''s-sql''; - version = ''postmodern-20170403-git''; + version = ''postmodern-20180131-git''; description = ''''; - deps = [ args."cl-postgres" args."md5" ]; + deps = [ args."cl-postgres" args."md5" args."split-sequence" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz''; - sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p''; + url = ''http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz''; + sha256 = ''0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki''; }; packageName = "s-sql"; @@ -18,9 +18,12 @@ rec { overrides = x: x; } /* (SYSTEM s-sql DESCRIPTION NIL SHA256 - 1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL - http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz - MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME s-sql FILENAME s-sql DEPS - ((NAME cl-postgres FILENAME cl-postgres) (NAME md5 FILENAME md5)) - DEPENDENCIES (cl-postgres md5) VERSION postmodern-20170403-git SIBLINGS - (cl-postgres postmodern simple-date) PARASITES NIL) */ + 0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki URL + http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz + MD5 a3b7bf25eb342cd49fe144fcd7ddcb16 NAME s-sql FILENAME s-sql DEPS + ((NAME cl-postgres FILENAME cl-postgres) (NAME md5 FILENAME md5) + (NAME split-sequence FILENAME split-sequence) + (NAME usocket FILENAME usocket)) + DEPENDENCIES (cl-postgres md5 split-sequence usocket) VERSION + postmodern-20180131-git SIBLINGS (cl-postgres postmodern simple-date) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix index 31e70992a4c..d718b129310 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''simple-date''; - version = ''postmodern-20170403-git''; + version = ''postmodern-20180131-git''; - parasites = [ "simple-date-postgres-glue" "simple-date-tests" ]; + parasites = [ "simple-date/postgres-glue" "simple-date/tests" ]; description = ''''; - deps = [ args."cl-postgres" args."fiveam" args."md5" ]; + deps = [ args."cl-postgres" args."fiveam" args."md5" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz''; - sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p''; + url = ''http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz''; + sha256 = ''0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki''; }; packageName = "simple-date"; @@ -20,12 +20,12 @@ rec { overrides = x: x; } /* (SYSTEM simple-date DESCRIPTION NIL SHA256 - 1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL - http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz - MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME simple-date FILENAME simple-date + 0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki URL + http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz + MD5 a3b7bf25eb342cd49fe144fcd7ddcb16 NAME simple-date FILENAME simple-date DEPS ((NAME cl-postgres FILENAME cl-postgres) (NAME fiveam FILENAME fiveam) - (NAME md5 FILENAME md5)) - DEPENDENCIES (cl-postgres fiveam md5) VERSION postmodern-20170403-git - SIBLINGS (cl-postgres postmodern s-sql) PARASITES - (simple-date-postgres-glue simple-date-tests)) */ + (NAME md5 FILENAME md5) (NAME usocket FILENAME usocket)) + DEPENDENCIES (cl-postgres fiveam md5 usocket) VERSION + postmodern-20180131-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES + (simple-date/postgres-glue simple-date/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix index e18c0c325f1..b07feca16b0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''static-vectors''; - version = ''v1.8.2''; + version = ''v1.8.3''; parasites = [ "static-vectors/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."fiveam" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/static-vectors/2017-01-24/static-vectors-v1.8.2.tgz''; - sha256 = ''0p35f0wrnv46bmmxlviwpsbxnlnkmxwd3xp858lhf0dy52cyra1g''; + url = ''http://beta.quicklisp.org/archive/static-vectors/2017-10-19/static-vectors-v1.8.3.tgz''; + sha256 = ''084690v6xldb9xysgc4hg284j0j9ppxldz4gxwmfin1dzxq0g6xk''; }; packageName = "static-vectors"; @@ -21,13 +21,13 @@ rec { } /* (SYSTEM static-vectors DESCRIPTION Create vectors allocated in static memory. SHA256 - 0p35f0wrnv46bmmxlviwpsbxnlnkmxwd3xp858lhf0dy52cyra1g URL - http://beta.quicklisp.org/archive/static-vectors/2017-01-24/static-vectors-v1.8.2.tgz - MD5 fd3ebe4e79a71c49e32ac87d6a1bcaf4 NAME static-vectors FILENAME + 084690v6xldb9xysgc4hg284j0j9ppxldz4gxwmfin1dzxq0g6xk URL + http://beta.quicklisp.org/archive/static-vectors/2017-10-19/static-vectors-v1.8.3.tgz + MD5 cbad9e34904eedde61cd4cddcca6de29 NAME static-vectors FILENAME static-vectors DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) (NAME fiveam FILENAME fiveam) (NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (alexandria babel cffi cffi-grovel fiveam trivial-features) - VERSION v1.8.2 SIBLINGS NIL PARASITES (static-vectors/test)) */ + VERSION v1.8.3 SIBLINGS NIL PARASITES (static-vectors/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix new file mode 100644 index 00000000000..0dca605c1fd --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix @@ -0,0 +1,29 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''stefil''; + version = ''20101107-darcs''; + + parasites = [ "stefil-test" ]; + + description = ''Stefil - Simple Test Framework In Lisp''; + + deps = [ args."alexandria" args."iterate" args."metabang-bind" args."swank" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/stefil/2010-11-07/stefil-20101107-darcs.tgz''; + sha256 = ''0d81js0p02plv7wy1640xmghb4s06gay76pqw2k3dnamkglcglz3''; + }; + + packageName = "stefil"; + + asdFilesToKeep = ["stefil.asd"]; + overrides = x: x; +} +/* (SYSTEM stefil DESCRIPTION Stefil - Simple Test Framework In Lisp SHA256 + 0d81js0p02plv7wy1640xmghb4s06gay76pqw2k3dnamkglcglz3 URL + http://beta.quicklisp.org/archive/stefil/2010-11-07/stefil-20101107-darcs.tgz + MD5 8c56bc03e7679e4d42bb3bb3b101de80 NAME stefil FILENAME stefil DEPS + ((NAME alexandria FILENAME alexandria) (NAME iterate FILENAME iterate) + (NAME metabang-bind FILENAME metabang-bind) (NAME swank FILENAME swank)) + DEPENDENCIES (alexandria iterate metabang-bind swank) VERSION + 20101107-darcs SIBLINGS NIL PARASITES (stefil-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix index c7f845a4cf4..5191e2f336d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''stumpwm''; - version = ''20170725-git''; + version = ''20180131-git''; description = ''A tiling, keyboard driven window manager''; deps = [ args."alexandria" args."cl-ppcre" args."clx" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/stumpwm/2017-07-25/stumpwm-20170725-git.tgz''; - sha256 = ''1hb01zlm4rk2n9b8lfpiary94pmg6qkw84zg54ws1if7z1yd2ss5''; + url = ''http://beta.quicklisp.org/archive/stumpwm/2018-01-31/stumpwm-20180131-git.tgz''; + sha256 = ''1mlwgs0b8hd64wqk9qcv2x08zzfvbnn81fsdza7v5rcb8mx5abg0''; }; packageName = "stumpwm"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 - 1hb01zlm4rk2n9b8lfpiary94pmg6qkw84zg54ws1if7z1yd2ss5 URL - http://beta.quicklisp.org/archive/stumpwm/2017-07-25/stumpwm-20170725-git.tgz - MD5 a7fb260c6572273c05b828299c0610ce NAME stumpwm FILENAME stumpwm DEPS + 1mlwgs0b8hd64wqk9qcv2x08zzfvbnn81fsdza7v5rcb8mx5abg0 URL + http://beta.quicklisp.org/archive/stumpwm/2018-01-31/stumpwm-20180131-git.tgz + MD5 252427acf3f2dbc2a5522598c4e37be1 NAME stumpwm FILENAME stumpwm DEPS ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre) (NAME clx FILENAME clx)) - DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20170725-git SIBLINGS NIL + DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix index 21fcaddf535..1359e13b949 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''swank''; - version = ''slime-v2.19''; + version = ''slime-v2.20''; description = ''''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/slime/2017-02-27/slime-v2.19.tgz''; - sha256 = ''1w3xq4kiy06wbmk2sf30saqgy1qa9v2llbi6bqy7hrm956yh6dza''; + url = ''http://beta.quicklisp.org/archive/slime/2017-08-30/slime-v2.20.tgz''; + sha256 = ''0rl2ymqxcfkbvwkd8zfhyaaz8v2a927gmv9c43ganxnq6y473c26''; }; packageName = "swank"; @@ -18,7 +18,7 @@ rec { overrides = x: x; } /* (SYSTEM swank DESCRIPTION NIL SHA256 - 1w3xq4kiy06wbmk2sf30saqgy1qa9v2llbi6bqy7hrm956yh6dza URL - http://beta.quicklisp.org/archive/slime/2017-02-27/slime-v2.19.tgz MD5 - 7e1540ebb970db0f77b6e6cabb36ba41 NAME swank FILENAME swank DEPS NIL - DEPENDENCIES NIL VERSION slime-v2.19 SIBLINGS NIL PARASITES NIL) */ + 0rl2ymqxcfkbvwkd8zfhyaaz8v2a927gmv9c43ganxnq6y473c26 URL + http://beta.quicklisp.org/archive/slime/2017-08-30/slime-v2.20.tgz MD5 + 115188047b753ce1864586e114ecb46c NAME swank FILENAME swank DEPS NIL + DEPENDENCIES NIL VERSION slime-v2.20 SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix index c0964c9731d..4f4e1f81223 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-indent''; - version = ''20170630-git''; + version = ''20180131-git''; description = ''A very simple library to allow indentation hints for SWANK.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-indent/2017-06-30/trivial-indent-20170630-git.tgz''; - sha256 = ''18zag7n2yfjx3x6nm8132cq8lz321i3f3zslb90j198wvpwyrnq7''; + url = ''http://beta.quicklisp.org/archive/trivial-indent/2018-01-31/trivial-indent-20180131-git.tgz''; + sha256 = ''1y6m9nrhj923zj95824w7vsciqhv9cq7sq5x519x2ik0jfcaqp8w''; }; packageName = "trivial-indent"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM trivial-indent DESCRIPTION A very simple library to allow indentation hints for SWANK. SHA256 - 18zag7n2yfjx3x6nm8132cq8lz321i3f3zslb90j198wvpwyrnq7 URL - http://beta.quicklisp.org/archive/trivial-indent/2017-06-30/trivial-indent-20170630-git.tgz - MD5 9f11cc1014be3e3ae588a3cd07315be6 NAME trivial-indent FILENAME - trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL + 1y6m9nrhj923zj95824w7vsciqhv9cq7sq5x519x2ik0jfcaqp8w URL + http://beta.quicklisp.org/archive/trivial-indent/2018-01-31/trivial-indent-20180131-git.tgz + MD5 a915258466d07465da1f71476bf59d12 NAME trivial-indent FILENAME + trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix index 080f854db43..56bbb583837 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-mimes''; - version = ''20170630-git''; + version = ''20180131-git''; description = ''Tiny library to detect mime types in files.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-mimes/2017-06-30/trivial-mimes-20170630-git.tgz''; - sha256 = ''0rm667w7nfkcrfjqbb7blbdcrjxbr397a6nqmy35qq82fqjr4rvx''; + url = ''http://beta.quicklisp.org/archive/trivial-mimes/2018-01-31/trivial-mimes-20180131-git.tgz''; + sha256 = ''0wmnfiphrzr5br4mzds7lny36rqrdxv707r4frzygx7j0llrvs1b''; }; packageName = "trivial-mimes"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM trivial-mimes DESCRIPTION Tiny library to detect mime types in files. SHA256 - 0rm667w7nfkcrfjqbb7blbdcrjxbr397a6nqmy35qq82fqjr4rvx URL - http://beta.quicklisp.org/archive/trivial-mimes/2017-06-30/trivial-mimes-20170630-git.tgz - MD5 5aecea17e102bd2dab7e71fecd1f8e44 NAME trivial-mimes FILENAME - trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL + 0wmnfiphrzr5br4mzds7lny36rqrdxv707r4frzygx7j0llrvs1b URL + http://beta.quicklisp.org/archive/trivial-mimes/2018-01-31/trivial-mimes-20180131-git.tgz + MD5 9c91e72a8ee2455f9c5cbba1f7d2fcef NAME trivial-mimes FILENAME + trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix index 998681d02ab..39c2060af02 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''uiop''; - version = ''3.2.1''; + version = ''3.3.1''; description = ''''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/uiop/2017-06-30/uiop-3.2.1.tgz''; - sha256 = ''1zl661dkbg5clyl5fjj9466krk59xfdmmfzci5mj7n137m0zmf5v''; + url = ''http://beta.quicklisp.org/archive/uiop/2017-12-27/uiop-3.3.1.tgz''; + sha256 = ''0w9va40dr6l7fss9f7qlv7mp9f86sdjv5g2lz621a6wzi4911ghc''; }; packageName = "uiop"; @@ -18,7 +18,7 @@ rec { overrides = x: x; } /* (SYSTEM uiop DESCRIPTION NIL SHA256 - 1zl661dkbg5clyl5fjj9466krk59xfdmmfzci5mj7n137m0zmf5v URL - http://beta.quicklisp.org/archive/uiop/2017-06-30/uiop-3.2.1.tgz MD5 - 3e9ef02ecf9005240b66552d85719700 NAME uiop FILENAME uiop DEPS NIL - DEPENDENCIES NIL VERSION 3.2.1 SIBLINGS (asdf-driver) PARASITES NIL) */ + 0w9va40dr6l7fss9f7qlv7mp9f86sdjv5g2lz621a6wzi4911ghc URL + http://beta.quicklisp.org/archive/uiop/2017-12-27/uiop-3.3.1.tgz MD5 + 7a90377c4fc96676d5fa5197d9e9ec11 NAME uiop FILENAME uiop DEPS NIL + DEPENDENCIES NIL VERSION 3.3.1 SIBLINGS (asdf-driver) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix index 7e7e9b6acad..fb483662df5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''woo''; - version = ''20170725-git''; + version = ''20170830-git''; description = ''An asynchronous HTTP server written in Common Lisp''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-utilities" args."clack-socket" args."fast-http" args."fast-io" args."flexi-streams" args."lev" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."swap-bytes" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."uiop" args."vom" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/woo/2017-07-25/woo-20170725-git.tgz''; - sha256 = ''11cnqd058mjhkgxppsivbmd687429r4b62v7z5iav0wpha78qfgg''; + url = ''http://beta.quicklisp.org/archive/woo/2017-08-30/woo-20170830-git.tgz''; + sha256 = ''130hgfp08gchn0fkfablpf18hsdi1k4hrc3iny5c8m1phjlknchv''; }; packageName = "woo"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM woo DESCRIPTION An asynchronous HTTP server written in Common Lisp - SHA256 11cnqd058mjhkgxppsivbmd687429r4b62v7z5iav0wpha78qfgg URL - http://beta.quicklisp.org/archive/woo/2017-07-25/woo-20170725-git.tgz MD5 - bd901d8dfa7df3d19c6da73ea101f65b NAME woo FILENAME woo DEPS + SHA256 130hgfp08gchn0fkfablpf18hsdi1k4hrc3iny5c8m1phjlknchv URL + http://beta.quicklisp.org/archive/woo/2017-08-30/woo-20170830-git.tgz MD5 + 3f506a771b3d8f2c7fc97b049dcfdedf NAME woo FILENAME woo DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -42,4 +42,4 @@ rec { clack-socket fast-http fast-io flexi-streams lev proc-parse quri smart-buffer split-sequence static-vectors swap-bytes trivial-features trivial-gray-streams trivial-utf-8 uiop vom xsubseq) - VERSION 20170725-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */ + VERSION 20170830-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix index 91598bf6662..b9ab71744c3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''xsubseq''; - version = ''20150113-git''; + version = ''20170830-git''; description = ''Efficient way to manage "subseq"s in Common Lisp''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/xsubseq/2015-01-13/xsubseq-20150113-git.tgz''; - sha256 = ''0ykjhi7pkqcwm00yzhqvngnx07hsvwbj0c72b08rj4dkngg8is5q''; + url = ''http://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz''; + sha256 = ''1am63wkha97hyvkqf4ydx3q07mqpa0chkx65znr7kmqi83a8waml''; }; packageName = "xsubseq"; @@ -18,7 +18,7 @@ rec { overrides = x: x; } /* (SYSTEM xsubseq DESCRIPTION Efficient way to manage "subseq"s in Common Lisp - SHA256 0ykjhi7pkqcwm00yzhqvngnx07hsvwbj0c72b08rj4dkngg8is5q URL - http://beta.quicklisp.org/archive/xsubseq/2015-01-13/xsubseq-20150113-git.tgz - MD5 56f7a4ac1f05f10e7226e0e5b7b0bfa7 NAME xsubseq FILENAME xsubseq DEPS NIL - DEPENDENCIES NIL VERSION 20150113-git SIBLINGS (xsubseq-test) PARASITES NIL) */ + SHA256 1am63wkha97hyvkqf4ydx3q07mqpa0chkx65znr7kmqi83a8waml URL + http://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz + MD5 960bb8f329649b6e4b820e065e6b38e8 NAME xsubseq FILENAME xsubseq DEPS NIL + DEPENDENCIES NIL VERSION 20170830-git SIBLINGS (xsubseq-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 4de4947c073..9a7fb3e5d1b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -139,4 +139,19 @@ $out/lib/common-lisp/query-fs" "cl-unification-lib.asd" ]; }; + simple-date = x: { + deps = with quicklisp-to-nix-packages; [ + fiveam md5 usocket + ]; + parasites = [ + "simple-date/tests" + ]; + }; + cl-postgres = x: { + deps = pkgs.lib.filter (x: x.outPath != quicklisp-to-nix-packages.simple-date.outPath) x.deps; + parasites = (x.parasites or []) ++ [ + "simple-date" "simple-date/postgres-glue" + ]; + asdFilesToKeep = x.asdFilesToKeep ++ ["simple-date.asd"]; + }; } diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 49aa941094b..ebf09c43a0e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -25,11 +25,13 @@ cl-dbi cl-emb cl-fuse cl-fuse-meta-fs +cl-html-parse cl-json cl-l10n cl-libuv cl-mysql closer-mop +closure-html cl-ppcre cl-ppcre-template cl-ppcre-unicode diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 86817e14f55..e931c12f1e7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -16,18 +16,7 @@ let quicklisp-to-nix-packages = rec { })); - "simple-date-postgres-glue" = quicklisp-to-nix-packages."simple-date"; - - - "cl-postgres-tests" = quicklisp-to-nix-packages."cl-postgres"; - - - "asdf-finalizers" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."asdf-finalizers" or (x: {})) - (import ./quicklisp-to-nix-output/asdf-finalizers.nix { - inherit fetchurl; - })); + "cl-postgres_slash_tests" = quicklisp-to-nix-packages."cl-postgres"; "lisp-unit2" = buildLispPackage @@ -73,6 +62,9 @@ let quicklisp-to-nix-packages = rec { })); + "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date"; + + "unit-test" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."unit-test" or (x: {})) @@ -81,26 +73,6 @@ let quicklisp-to-nix-packages = rec { })); - "map-set" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."map-set" or (x: {})) - (import ./quicklisp-to-nix-output/map-set.nix { - inherit fetchurl; - })); - - - "babel-streams" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."babel-streams" or (x: {})) - (import ./quicklisp-to-nix-output/babel-streams.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "babel" = quicklisp-to-nix-packages."babel"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - })); - - "rt" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."rt" or (x: {})) @@ -117,35 +89,6 @@ let quicklisp-to-nix-packages = rec { })); - "plump-parser" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."plump-parser" or (x: {})) - (import ./quicklisp-to-nix-output/plump-parser.nix { - inherit fetchurl; - "array-utils" = quicklisp-to-nix-packages."array-utils"; - "plump-dom" = quicklisp-to-nix-packages."plump-dom"; - "plump-lexer" = quicklisp-to-nix-packages."plump-lexer"; - "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; - })); - - - "plump-lexer" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."plump-lexer" or (x: {})) - (import ./quicklisp-to-nix-output/plump-lexer.nix { - inherit fetchurl; - })); - - - "plump-dom" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."plump-dom" or (x: {})) - (import ./quicklisp-to-nix-output/plump-dom.nix { - inherit fetchurl; - "array-utils" = quicklisp-to-nix-packages."array-utils"; - })); - - "uuid" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."uuid" or (x: {})) @@ -165,6 +108,7 @@ let quicklisp-to-nix-packages = rec { "cl-postgres" = quicklisp-to-nix-packages."cl-postgres"; "fiveam" = quicklisp-to-nix-packages."fiveam"; "md5" = quicklisp-to-nix-packages."md5"; + "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -175,6 +119,8 @@ let quicklisp-to-nix-packages = rec { inherit fetchurl; "cl-postgres" = quicklisp-to-nix-packages."cl-postgres"; "md5" = quicklisp-to-nix-packages."md5"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -183,10 +129,21 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."qmynd" or (x: {})) (import ./quicklisp-to-nix-output/qmynd.nix { inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "asdf-finalizers" = quicklisp-to-nix-packages."asdf-finalizers"; "babel" = quicklisp-to-nix-packages."babel"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "chipz" = quicklisp-to-nix-packages."chipz"; + "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "ironclad" = quicklisp-to-nix-packages."ironclad"; "list-of" = quicklisp-to-nix-packages."list-of"; + "nibbles" = quicklisp-to-nix-packages."nibbles"; + "salza2" = quicklisp-to-nix-packages."salza2"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -209,13 +166,15 @@ let quicklisp-to-nix-packages = rec { "alexandria" = quicklisp-to-nix-packages."alexandria"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cl-postgres" = quicklisp-to-nix-packages."cl-postgres"; - "cl-postgres-tests" = quicklisp-to-nix-packages."cl-postgres-tests"; + "cl-postgres_slash_tests" = quicklisp-to-nix-packages."cl-postgres_slash_tests"; "closer-mop" = quicklisp-to-nix-packages."closer-mop"; "fiveam" = quicklisp-to-nix-packages."fiveam"; "md5" = quicklisp-to-nix-packages."md5"; "s-sql" = quicklisp-to-nix-packages."s-sql"; "simple-date" = quicklisp-to-nix-packages."simple-date"; - "simple-date-postgres-glue" = quicklisp-to-nix-packages."simple-date-postgres-glue"; + "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date_slash_postgres-glue"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -358,6 +317,14 @@ let quicklisp-to-nix-packages = rec { })); + "asdf-finalizers" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."asdf-finalizers" or (x: {})) + (import ./quicklisp-to-nix-output/asdf-finalizers.nix { + inherit fetchurl; + })); + + "abnf" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."abnf" or (x: {})) @@ -369,6 +336,18 @@ let quicklisp-to-nix-packages = rec { })); + "stefil" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."stefil" or (x: {})) + (import ./quicklisp-to-nix-output/stefil.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "metabang-bind" = quicklisp-to-nix-packages."metabang-bind"; + "swank" = quicklisp-to-nix-packages."swank"; + })); + + "lack-component" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."lack-component" or (x: {})) @@ -424,14 +403,6 @@ let quicklisp-to-nix-packages = rec { })); - "eos" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."eos" or (x: {})) - (import ./quicklisp-to-nix-output/eos.nix { - inherit fetchurl; - })); - - "xpath" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."xpath" or (x: {})) @@ -547,6 +518,9 @@ let quicklisp-to-nix-packages = rec { inherit fetchurl; "fiveam" = quicklisp-to-nix-packages."fiveam"; "md5" = quicklisp-to-nix-packages."md5"; + "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date_slash_postgres-glue"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -577,6 +551,15 @@ let quicklisp-to-nix-packages = rec { })); + "fiasco" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."fiasco" or (x: {})) + (import ./quicklisp-to-nix-output/fiasco.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + "cl-paths" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-paths" or (x: {})) @@ -716,14 +699,6 @@ let quicklisp-to-nix-packages = rec { })); - "named-readtables" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."named-readtables" or (x: {})) - (import ./quicklisp-to-nix-output/named-readtables.nix { - inherit fetchurl; - })); - - "dbi" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."dbi" or (x: {})) @@ -741,27 +716,6 @@ let quicklisp-to-nix-packages = rec { })); - "cl-annot" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-annot" or (x: {})) - (import ./quicklisp-to-nix-output/cl-annot.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - })); - - - "cl-fad" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-fad" or (x: {})) - (import ./quicklisp-to-nix-output/cl-fad.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "unit-test" = quicklisp-to-nix-packages."unit-test"; - })); - - "lift" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."lift" or (x: {})) @@ -824,14 +778,6 @@ let quicklisp-to-nix-packages = rec { })); - "trivial-gray-streams" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."trivial-gray-streams" or (x: {})) - (import ./quicklisp-to-nix-output/trivial-gray-streams.nix { - inherit fetchurl; - })); - - "cffi-toolchain" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cffi-toolchain" or (x: {})) @@ -852,6 +798,22 @@ let quicklisp-to-nix-packages = rec { })); + "trivial-gray-streams" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-gray-streams" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-gray-streams.nix { + inherit fetchurl; + })); + + + "named-readtables" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."named-readtables" or (x: {})) + (import ./quicklisp-to-nix-output/named-readtables.nix { + inherit fetchurl; + })); + + "myway" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."myway" or (x: {})) @@ -868,6 +830,14 @@ let quicklisp-to-nix-packages = rec { })); + "map-set" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."map-set" or (x: {})) + (import ./quicklisp-to-nix-output/map-set.nix { + inherit fetchurl; + })); + + "do-urlencode" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."do-urlencode" or (x: {})) @@ -911,6 +881,39 @@ let quicklisp-to-nix-packages = rec { })); + "cl-fad" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-fad" or (x: {})) + (import ./quicklisp-to-nix-output/cl-fad.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "unit-test" = quicklisp-to-nix-packages."unit-test"; + })); + + + "cl-annot" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-annot" or (x: {})) + (import ./quicklisp-to-nix-output/cl-annot.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "babel-streams" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."babel-streams" or (x: {})) + (import ./quicklisp-to-nix-output/babel-streams.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + "anaphora" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."anaphora" or (x: {})) @@ -1213,9 +1216,7 @@ let quicklisp-to-nix-packages = rec { (import ./quicklisp-to-nix-output/plump.nix { inherit fetchurl; "array-utils" = quicklisp-to-nix-packages."array-utils"; - "plump-dom" = quicklisp-to-nix-packages."plump-dom"; - "plump-lexer" = quicklisp-to-nix-packages."plump-lexer"; - "plump-parser" = quicklisp-to-nix-packages."plump-parser"; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; })); @@ -1228,6 +1229,7 @@ let quicklisp-to-nix-packages = rec { "abnf" = quicklisp-to-nix-packages."abnf"; "alexandria" = quicklisp-to-nix-packages."alexandria"; "anaphora" = quicklisp-to-nix-packages."anaphora"; + "asdf-finalizers" = quicklisp-to-nix-packages."asdf-finalizers"; "asdf-system-connections" = quicklisp-to-nix-packages."asdf-system-connections"; "babel" = quicklisp-to-nix-packages."babel"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; @@ -1273,11 +1275,13 @@ let quicklisp-to-nix-packages = rec { "qmynd" = quicklisp-to-nix-packages."qmynd"; "quri" = quicklisp-to-nix-packages."quri"; "s-sql" = quicklisp-to-nix-packages."s-sql"; + "salza2" = quicklisp-to-nix-packages."salza2"; "simple-date" = quicklisp-to-nix-packages."simple-date"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; "sqlite" = quicklisp-to-nix-packages."sqlite"; "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8"; "uiop" = quicklisp-to-nix-packages."uiop"; @@ -1358,8 +1362,10 @@ let quicklisp-to-nix-packages = rec { inherit fetchurl; "array-utils" = quicklisp-to-nix-packages."array-utils"; "clss" = quicklisp-to-nix-packages."clss"; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; "form-fiddle" = quicklisp-to-nix-packages."form-fiddle"; "plump" = quicklisp-to-nix-packages."plump"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; })); @@ -1371,6 +1377,7 @@ let quicklisp-to-nix-packages = rec { "alexandria" = quicklisp-to-nix-packages."alexandria"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cl-fad" = quicklisp-to-nix-packages."cl-fad"; + "stefil" = quicklisp-to-nix-packages."stefil"; })); @@ -1460,7 +1467,7 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."ieee-floats" or (x: {})) (import ./quicklisp-to-nix-output/ieee-floats.nix { inherit fetchurl; - "eos" = quicklisp-to-nix-packages."eos"; + "fiveam" = quicklisp-to-nix-packages."fiveam"; })); @@ -1532,6 +1539,7 @@ let quicklisp-to-nix-packages = rec { "quri" = quicklisp-to-nix-packages."quri"; "smart-buffer" = quicklisp-to-nix-packages."smart-buffer"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; "xsubseq" = quicklisp-to-nix-packages."xsubseq"; })); @@ -1553,6 +1561,7 @@ let quicklisp-to-nix-packages = rec { (import ./quicklisp-to-nix-output/form-fiddle.nix { inherit fetchurl; "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; })); @@ -1582,7 +1591,11 @@ let quicklisp-to-nix-packages = rec { (import ./quicklisp-to-nix-output/fast-io.nix { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; "static-vectors" = quicklisp-to-nix-packages."static-vectors"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; })); @@ -1595,8 +1608,11 @@ let quicklisp-to-nix-packages = rec { "alexandria" = quicklisp-to-nix-packages."alexandria"; "babel" = quicklisp-to-nix-packages."babel"; "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "proc-parse" = quicklisp-to-nix-packages."proc-parse"; "smart-buffer" = quicklisp-to-nix-packages."smart-buffer"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; "xsubseq" = quicklisp-to-nix-packages."xsubseq"; })); @@ -1638,6 +1654,10 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."drakma" or (x: {})) (import ./quicklisp-to-nix-output/drakma.nix { inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cffi" = quicklisp-to-nix-packages."cffi"; "chipz" = quicklisp-to-nix-packages."chipz"; "chunga" = quicklisp-to-nix-packages."chunga"; "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; @@ -1645,6 +1665,10 @@ let quicklisp-to-nix-packages = rec { "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "puri" = quicklisp-to-nix-packages."puri"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -1667,6 +1691,7 @@ let quicklisp-to-nix-packages = rec { "babel" = quicklisp-to-nix-packages."babel"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; + "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; "chipz" = quicklisp-to-nix-packages."chipz"; "chunga" = quicklisp-to-nix-packages."chunga"; "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; @@ -1736,6 +1761,7 @@ let quicklisp-to-nix-packages = rec { "split-sequence" = quicklisp-to-nix-packages."split-sequence"; "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; "trivial-types" = quicklisp-to-nix-packages."trivial-types"; + "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -1814,6 +1840,7 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."clx" or (x: {})) (import ./quicklisp-to-nix-output/clx.nix { inherit fetchurl; + "fiasco" = quicklisp-to-nix-packages."fiasco"; })); @@ -1937,7 +1964,9 @@ let quicklisp-to-nix-packages = rec { (import ./quicklisp-to-nix-output/clss.nix { inherit fetchurl; "array-utils" = quicklisp-to-nix-packages."array-utils"; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; "plump" = quicklisp-to-nix-packages."plump"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; })); @@ -2056,6 +2085,20 @@ let quicklisp-to-nix-packages = rec { })); + "closure-html" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."closure-html" or (x: {})) + (import ./quicklisp-to-nix-output/closure-html.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "closure-common" = quicklisp-to-nix-packages."closure-common"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + "closer-mop" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."closer-mop" or (x: {})) @@ -2128,6 +2171,14 @@ let quicklisp-to-nix-packages = rec { })); + "cl-html-parse" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-html-parse" or (x: {})) + (import ./quicklisp-to-nix-output/cl-html-parse.nix { + inherit fetchurl; + })); + + "cl-fuse-meta-fs" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-fuse-meta-fs" or (x: {})) @@ -2378,8 +2429,12 @@ let quicklisp-to-nix-packages = rec { (import ./quicklisp-to-nix-output/circular-streams.nix { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; "fast-io" = quicklisp-to-nix-packages."fast-io"; "static-vectors" = quicklisp-to-nix-packages."static-vectors"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; })); @@ -2424,16 +2479,41 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."caveman" or (x: {})) (import ./quicklisp-to-nix-output/caveman.nix { inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; "anaphora" = quicklisp-to-nix-packages."anaphora"; + "babel" = quicklisp-to-nix-packages."babel"; + "babel-streams" = quicklisp-to-nix-packages."babel-streams"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "circular-streams" = quicklisp-to-nix-packages."circular-streams"; + "cl-annot" = quicklisp-to-nix-packages."cl-annot"; + "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text"; + "cl-colors" = quicklisp-to-nix-packages."cl-colors"; "cl-emb" = quicklisp-to-nix-packages."cl-emb"; + "cl-fad" = quicklisp-to-nix-packages."cl-fad"; "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; "cl-project" = quicklisp-to-nix-packages."cl-project"; "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; + "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; "clack-v1-compat" = quicklisp-to-nix-packages."clack-v1-compat"; + "dexador" = quicklisp-to-nix-packages."dexador"; "do-urlencode" = quicklisp-to-nix-packages."do-urlencode"; + "http-body" = quicklisp-to-nix-packages."http-body"; + "lack" = quicklisp-to-nix-packages."lack"; + "let-plus" = quicklisp-to-nix-packages."let-plus"; "local-time" = quicklisp-to-nix-packages."local-time"; + "map-set" = quicklisp-to-nix-packages."map-set"; + "marshal" = quicklisp-to-nix-packages."marshal"; "myway" = quicklisp-to-nix-packages."myway"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "prove" = quicklisp-to-nix-packages."prove"; + "quri" = quicklisp-to-nix-packages."quri"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "trivial-types" = quicklisp-to-nix-packages."trivial-types"; + "usocket" = quicklisp-to-nix-packages."usocket"; })); diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp index 2623990856e..63d6f330519 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp +++ b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp @@ -98,7 +98,10 @@ will use it instead of re-computing the system data.") "Return the path to the file that (if it exists) contains pre-computed system data." (when *system-data-memoization-path* - (merge-pathnames (make-pathname :name system :type "txt") *system-data-memoization-path*))) + (merge-pathnames + (make-pathname + :name (escape-filename (string system)) + :type "txt") *system-data-memoization-path*))) (defun memoized-system-data (system) "Attempts to locate memoized system data in the path specified by diff --git a/pkgs/development/lisp-modules/shell.nix b/pkgs/development/lisp-modules/shell.nix index d3cb7b36aee..9eba1e15b79 100644 --- a/pkgs/development/lisp-modules/shell.nix +++ b/pkgs/development/lisp-modules/shell.nix @@ -10,6 +10,6 @@ self = rec { lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info ]; CPATH = "${libfixposix}/include"; - LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mysql.connector-c}/lib:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib"; + LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mysql.connector-c}/lib:${mysql.connector-c}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib"; }; in stdenv.mkDerivation self diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/pkgs/development/mobile/adbfs-rootless/default.nix index 091d1adfefb..18ad3048d83 100644 --- a/pkgs/development/mobile/adbfs-rootless/default.nix +++ b/pkgs/development/mobile/adbfs-rootless/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "Mount Android phones on Linux with adb, no root required"; inherit (src.meta) homepage; license = licenses.bsd3; - maintainers = with maintainers; [ profpatsch ]; + maintainers = with maintainers; [ Profpatsch ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index 8f8d91c64d2..99cc4c3eab8 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -6,7 +6,7 @@ , glibcLocales , pytest , pytestcov -, pytest-mock +, mock , pygments , pillow , dateutil @@ -28,7 +28,6 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "Nikola"; version = "7.8.11"; @@ -37,7 +36,7 @@ buildPythonPackage rec { # other hand doesn't support Python 3.3). So, just disable Python 2. disabled = !isPy3k; - buildInputs = [ pytest pytestcov pytest-mock glibcLocales ]; + checkInputs = [ pytest pytestcov mock glibcLocales ]; propagatedBuildInputs = [ pygments pillow dateutil docutils Mako unidecode lxml Yapsy PyRSS2Gen diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix new file mode 100644 index 00000000000..b865b565496 --- /dev/null +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi }: + +# This package provides a binary "apython" which sometimes invokes +# [sys.executable, '-m', 'aioconsole'] as a subprocess. If apython is +# run directly out of this derivation, it won't work, because +# sys.executable will point to a Python binary that is not wrapped to +# be able to find aioconsole. +# However, apython will work fine when using python##.withPackages, +# because with python##.withPackages the sys.executable is already +# wrapped to be able to find aioconsole and any other packages. +buildPythonPackage rec { + pname = "aioconsole"; + version = "0.1.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "17bnfcp0gacnmpdam6byb7rwhqibw57f736bbgk45w4cy2lglj3y"; + }; + + # hardcodes a test dependency on an old version of pytest-asyncio + doCheck = false; + + meta = { + description = "Asynchronous console and interfaces for asyncio"; + homepage = https://github.com/vxgmichel/aioconsole; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.catern ]; + }; +} diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix new file mode 100644 index 00000000000..44613dd4e5b --- /dev/null +++ b/pkgs/development/python-modules/celery/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi, iana-etc, libredirect, + pytest, case, kombu, billiard, pytz, anyjson, amqp, eventlet +}: +buildPythonPackage rec { + pname = "celery"; + version = "4.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0dcb0s6kdcd3vc9pwvazngppkdbhwpmpjmghq6rifsld34q3gzvp"; + }; + + # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox + preCheck = '' + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols \ + LD_PRELOAD=${libredirect}/lib/libredirect.so + ''; + postCheck = '' + unset NIX_REDIRECTS LD_PRELOAD + ''; + + buildInputs = [ pytest case ]; + propagatedBuildInputs = [ kombu billiard pytz anyjson amqp eventlet ]; + + meta = with stdenv.lib; { + homepage = https://github.com/celery/celery/; + description = "Distributed task queue"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch b/pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch deleted file mode 100644 index 27caa80dd4c..00000000000 --- a/pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Fix endless loop in logger_isa (Python 3.6) -Author: George Psarakis <giwrgos.psarakis@gmail.com> -Origin: upstream, https://github.com/celery/celery/commit/9c950b47eca2b4e93fd2fe52cf80f158e6cf97ad -Forwarded: not-needed -Reviewed-By: Nishanth Aravamudan <nish.aravamudan@canonical.com> -Last-Update: 2017-06-12 - ---- celery-4.0.2.orig/celery/utils/log.py -+++ celery-4.0.2/celery/utils/log.py -@@ -82,7 +82,7 @@ def logger_isa(l, p, max=1000): - else: - if this in seen: - raise RuntimeError( -- 'Logger {0!r} parents recursive'.format(l), -+ 'Logger {0!r} parents recursive'.format(l.name), - ) - seen.add(this) - this = this.parent diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix new file mode 100644 index 00000000000..492c4da6fcc --- /dev/null +++ b/pkgs/development/python-modules/i3ipc/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, enum-compat +, xorgserver, pytest, i3, python +}: + +buildPythonPackage rec { + pname = "i3ipc"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "acrisci"; + repo = "i3ipc-python"; + rev = "v${version}"; + sha256 = "15drq16ncmjrgsri6gjzp0qm8abycm92nicm78q3k7vy7rqpvfnh"; + }; + + propagatedBuildInputs = [ enum-compat ]; + + checkInputs = [ xorgserver pytest i3 ]; + + checkPhase = ''${python.interpreter} run-tests.py''; + + meta = with stdenv.lib; { + description = "An improved Python library to control i3wm"; + homepage = https://github.com/acrisci/i3ipc-python; + license = licenses.bsd3; + maintainers = with maintainers; [ vanzef ]; + }; +} diff --git a/pkgs/development/python-modules/platformio/default.nix b/pkgs/development/python-modules/platformio/default.nix index 6ac9b7eacfc..01d47b45860 100644 --- a/pkgs/development/python-modules/platformio/default.nix +++ b/pkgs/development/python-modules/platformio/default.nix @@ -3,6 +3,7 @@ , lockfile, pyserial, requests , semantic-version , isPy3k, isPyPy +, git }: buildPythonPackage rec { disabled = isPy3k || isPyPy; @@ -17,7 +18,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - bottle click_5 colorama lockfile + bottle click_5 colorama git lockfile pyserial requests semantic-version ]; diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix new file mode 100644 index 00000000000..c23a90c095b --- /dev/null +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -0,0 +1,33 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, coverage, libsodium, cffi, six, hypothesis}: + +buildPythonPackage rec { + pname = "pynacl"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "pyca"; + repo = pname; + rev = version; + sha256 = "0z9i1z4hjzmp23igyhvg131gikbrr947506lwfb3fayf0agwfv8f"; + }; + + #remove deadline from tests, see https://github.com/pyca/pynacl/issues/370 + preCheck = '' + sed -i 's/deadline=1500, //' tests/test_pwhash.py + sed -i 's/deadline=1500, //' tests/test_aead.py + ''; + + checkInputs = [ pytest coverage hypothesis ]; + propagatedBuildInputs = [ libsodium cffi six ]; + + checkPhase = '' + coverage run --source nacl --branch -m pytest + ''; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ va1entin ]; + description = "Python binding to the Networking and Cryptography (NaCl) library"; + homepage = https://github.com/pyca/pynacl/; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix new file mode 100644 index 00000000000..7cb5224c60b --- /dev/null +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k, pytest, mock, setuptools_scm }: + +buildPythonPackage rec { + pname = "pytest-mock"; + version = "1.6.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "920d1167af5c2c2ad3fa0717d0c6c52e97e97810160c15721ac895cac53abb1c"; + }; + + propagatedBuildInputs = [ pytest ] ++ lib.optional (!isPy3k) mock; + nativeBuildInputs = [ setuptools_scm ]; + + checkPhase = '' + py.test + ''; + + meta = with lib; { + description = "Thin-wrapper around the mock package for easier use with py.test."; + homepage = https://github.com/pytest-dev/pytest-mock; + license = licenses.mit; + maintainers = with maintainers; [ nand0p ]; + }; +} diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix new file mode 100644 index 00000000000..b71e4d3a4ff --- /dev/null +++ b/pkgs/development/python-modules/weboob/default.nix @@ -0,0 +1,38 @@ +{ buildPythonPackage, fetchurl, stdenv, isPy27 +, nose, pillow, prettytable, pyyaml, dateutil, gdata +, requests, mechanize, feedparser, lxml, gnupg, pyqt5 +, libyaml, simplejson, cssselect, futures, pdfminer +, termcolor, google_api_python_client, html2text +, unidecode +}: + +buildPythonPackage rec { + pname = "weboob"; + version = "1.3"; + disabled = ! isPy27; + + src = fetchurl { + url = "https://symlink.me/attachments/download/356/${pname}-${version}.tar.gz"; + sha256 = "0m5yh49lplvb57dfilczh65ky35fshp3g7ni31pwfxwqi1f7i4f9"; + }; + + setupPyBuildFlags = ["--qt" "--xdg"]; + + checkInputs = [ nose ]; + + propagatedBuildInputs = [ pillow prettytable pyyaml dateutil + gdata requests mechanize feedparser lxml gnupg pyqt5 libyaml + simplejson cssselect futures pdfminer termcolor google_api_python_client + html2text unidecode ]; + + checkPhase = '' + nosetests + ''; + + meta = { + homepage = http://weboob.org; + description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser"; + license = stdenv.lib.licenses.agpl3; + }; +} + diff --git a/pkgs/development/python-modules/yolk/default.nix b/pkgs/development/python-modules/yolk/default.nix index 5e8c412ce52..958fcd72f84 100644 --- a/pkgs/development/python-modules/yolk/default.nix +++ b/pkgs/development/python-modules/yolk/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { meta = { description = "Command-line tool for querying PyPI and Python packages installed on your system"; homepage = https://github.com/cakebread/yolk; - maintainer = with maintainers; [ profpatsch ]; + maintainer = with maintainers; []; license = licenses.bsd3; }; } diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index 2744dac2500..5b455f267d8 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "icmake-${version}"; - version = "9.02.04"; + version = "9.02.06"; src = fetchFromGitHub { - sha256 = "0dkqdm7nc3l9kgwkkf545hfbxj7ibkxl7n49wz9m1rcq9pvpmrw3"; + sha256 = "1hs7fhqpkhlrjvjhfarf5bmxl8dw3r0immzdib27gwh3sfzgpx0b"; rev = version; repo = "icmake"; owner = "fbb-git"; diff --git a/pkgs/development/tools/compile-daemon/default.nix b/pkgs/development/tools/compile-daemon/default.nix index bad35e2422b..db7df2af700 100644 --- a/pkgs/development/tools/compile-daemon/default.nix +++ b/pkgs/development/tools/compile-daemon/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Very simple compile daemon for Go"; license = licenses.bsd2; - maintainers = with maintainers; [ profpatsch ]; + maintainers = with maintainers; [ ]; inherit (src.meta) homepage; }; } diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 11932965af4..a7b9976be43 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { description = "Version Control for your database"; homepage = http://www.liquibase.org/; license = licenses.asl20; - maintainers = with maintainers; [ nequissimus profpatsch ]; + maintainers = with maintainers; [ nequissimus ]; platforms = with platforms; unix; }; } diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix index c21d5595708..ae78774f8f3 100644 --- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -8,8 +8,8 @@ mkDerivation { src = fetchFromGitHub { owner = "hvr"; repo = "multi-ghc-travis"; - rev = "0d1b4089f6829659149747c9551712d24fd0b124"; - sha256 = "00dbg8hbncv74c2baskyhg4h0yv8wrz0fnkvw2bzcn0cjrz7xqwr"; + rev = "612a29439ba61b01efb98ea6d36b7ffd987dc5a0"; + sha256 = "0q416rzzwipbnvslhwmm43w38dwma3lks12fghb0svcwj5lzgxsf"; }; isLibrary = true; isExecutable = true; diff --git a/pkgs/development/tools/jid/default.nix b/pkgs/development/tools/jid/default.nix deleted file mode 100644 index 9c52ac61551..00000000000 --- a/pkgs/development/tools/jid/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -# This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }: - -buildGoPackage rec { - name = "jid-${version}"; - version = "0.7.1"; - rev = "${version}"; - - goPackagePath = "github.com/simeji/jid"; - - src = fetchFromGitHub { - owner = "simeji"; - repo = "jid"; - inherit rev; - sha256 = "08snlqqch91w88zysfcavmqsafq93zzpkdjqkq1y7hx516fdaz1w"; - }; - - goDeps = ./deps.nix; - - meta = with stdenv.lib; { - description = "Incremental JSON digger"; - license = licenses.mit; - maintainers = [ maintainers.profpatsch ]; - }; -} diff --git a/pkgs/development/tools/jid/deps.nix b/pkgs/development/tools/jid/deps.nix deleted file mode 100644 index c3ec502b2a9..00000000000 --- a/pkgs/development/tools/jid/deps.nix +++ /dev/null @@ -1,75 +0,0 @@ -# This file was generated by go2nix. -[ - { - goPackagePath = "github.com/bitly/go-simplejson"; - fetch = { - type = "git"; - url = "https://github.com/bitly/go-simplejson"; - rev = "aabad6e819789e569bd6aabf444c935aa9ba1e44"; - sha256 = "0n9f9dz1jn1jx86d48569nznpjn9fmq3knn7r65xpy7jhih284jj"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "e8e01ee22a7d4a91b49646e39245fe08e69c7878"; - sha256 = "1660g29qhshk6zxhpnc0f52m69jdqqdw2ccbkqw9y4kilnripfvl"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "d228849504861217f796da67fae4f6e347643f15"; - sha256 = "0ch5sfcpmqczsh8kjbwpzdw31lacbkfyzvpzh4disnhhydbxjq0d"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "30a891c33c7cde7b02a981314b4228ec99380cca"; - sha256 = "03gsxn89pgkj4jkxm9avnj4f0ckvcskc6fj2lcd98l3akrz50ndg"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "737072b4e32b7a5018b4a7125da8d12de90e8045"; - sha256 = "09ni8bmj6p2b774bdh6mfcxl03bh5sqk860z03xpb6hv6yfxqkjm"; - }; - } - { - goPackagePath = "github.com/nsf/termbox-go"; - fetch = { - type = "git"; - url = "https://github.com/nsf/termbox-go"; - rev = "abe82ce5fb7a42fbd6784a5ceb71aff977e09ed8"; - sha256 = "156i8apkga8b3272kjhapyqwspgcfkrr9kpqwc5lii43k4swghpv"; - }; - } - { - goPackagePath = "github.com/nwidger/jsoncolor"; - fetch = { - type = "git"; - url = "https://github.com/nwidger/jsoncolor"; - rev = "0192e84d44af834c3a90c8a17bf670483b91ad5a"; - sha256 = "17mndgd1d233c22bd19xv4v2l2i5k8kz7y6n4n54a9i7fi9d10al"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "248dadf4e9068a0b3e79f02ed0a610d935de5302"; - sha256 = "03l80r0i9bxl0vz363w62k4a8apzglgbrz6viwym3044sxkl1qks"; - }; - } -] diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index cdddad5155f..2b26383ed31 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { name = "fswatch-${version}"; - version = "1.9.3"; + version = "1.11.2"; src = fetchFromGitHub { owner = "emcrisostomo"; repo = "fswatch"; rev = version; - sha256 = "1g329aapdvbzhr39wyh295shpfq5f0nlzsqkjnr8l6zzak7f4yrg"; + sha256 = "05vgpd1fx9fy3vnnmq5gz236avgva82axix127xy98gaxrac52vq"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index 3688ee0b7ef..98952801c17 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "6.12.2"; - sha256 = "1z6sn4b973sxw0h9hd38rjq6cqdkzl5gsd48f793abvarwgpqrrk"; + version = "6.12.3"; + sha256 = "1p6w7ngp95lc3ksyklp1mwyq1f02vz62r1h60g1ri00pl8pnfn0s"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; } diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix new file mode 100644 index 00000000000..605e5de0311 --- /dev/null +++ b/pkgs/development/web/postman/default.nix @@ -0,0 +1,89 @@ +{ stdenv, lib, gnome2, fetchurl, pkgs, xlibs, udev, makeWrapper, makeDesktopItem }: + +stdenv.mkDerivation rec { + name = "postman-${version}"; + version = "5.5.2"; + + src = fetchurl { + url = "https://dl.pstmn.io/download/version/${version}/linux64"; + sha1 = "68886197A8375E860AB880547838FEFC9E12FC64"; + name = "${name}.tar.gz"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontPatchELF = true; + + buildPhase = ":"; # nothing to build + + desktopItem = makeDesktopItem { + name = "postman"; + exec = "postman"; + icon = "$out/share/postman/resources/app/assets/icon.png"; + comment = "API Development Environment"; + desktopName = "Postman"; + genericName = "Postman"; + categories = "Application;Development;"; + }; + + installPhase = '' + mkdir -p $out/share/postman + mkdir -p $out/share/applications + cp -R * $out/share/postman + mkdir -p $out/bin + ln -s $out/share/postman/Postman $out/bin/postman + ln -s ${desktopItem}/share/applications/* $out/share/applications/ + ''; + + preFixup = let + libPath = lib.makeLibraryPath [ + stdenv.cc.cc.lib + gnome2.pango + gnome2.GConf + pkgs.atk + pkgs.alsaLib + pkgs.cairo + pkgs.cups + pkgs.dbus_daemon.lib + pkgs.expat + pkgs.gdk_pixbuf + pkgs.glib + pkgs.gtk2-x11 + pkgs.freetype + pkgs.fontconfig + pkgs.nss + pkgs.nspr + pkgs.udev.lib + xlibs.libX11 + xlibs.libxcb + xlibs.libXi + xlibs.libXcursor + xlibs.libXdamage + xlibs.libXrandr + xlibs.libXcomposite + xlibs.libXext + xlibs.libXfixes + xlibs.libXrender + xlibs.libX11 + xlibs.libXtst + xlibs.libXScrnSaver + ]; + in '' + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}:$out/share/postman" \ + $out/share/postman/Postman + patchelf --set-rpath "${libPath}" $out/share/postman/libnode.so + patchelf --set-rpath "${libPath}" $out/share/postman/libffmpeg.so + + wrapProgram $out/share/postman/Postman --prefix LD_LIBRARY_PATH : ${libPath} + ''; + + meta = with stdenv.lib; { + homepage = https://www.getpostman.com; + description = "API Development Environment"; + license = stdenv.lib.licenses.postman; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ xurei ]; + }; +} diff --git a/pkgs/games/dxx-rebirth/assets.nix b/pkgs/games/dxx-rebirth/assets.nix new file mode 100644 index 00000000000..1fd64f5b00d --- /dev/null +++ b/pkgs/games/dxx-rebirth/assets.nix @@ -0,0 +1,55 @@ +{ stdenv, requireFile, gogUnpackHook }: + +let + generic = ver: source: let + pname = "descent${toString ver}"; + in stdenv.mkDerivation rec { + name = "${pname}-assets-${version}"; + version = "2.0.0.7"; + + src = requireFile rec { + name = "setup_descent12_${version}.exe"; + sha256 = "1r1drbfda6czg21f9qqiiwgnkpszxgmcn5bafp5ljddh34swkn3f"; + message = '' + While the Descent ${toString ver} game engine is free, the game assets are not. + + Please purchase the game on gog.com and download the Windows installer. + + Once you have downloaded the file, please use the following command and re-run the + installation: + + nix-prefetch-url file://\$PWD/${name} + ''; + }; + + nativeBuildInputs = [ gogUnpackHook ]; + + dontBuild = true; + dontFixup = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/{games/${pname},doc/${pname}/examples} + pushd "app/${source}" + mv dosbox*.conf $out/share/doc/${pname}/examples + mv *.txt *.pdf $out/share/doc/${pname} + cp -r * $out/share/games/descent${toString ver} + popd + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Descent ${toString ver} assets from GOG"; + homepage = http://www.dxx-rebirth.com/; + license = licenses.unfree; + maintainers = with maintainers; [ peterhoeg ]; + hydraPlatforms = []; + }; + }; + +in { + descent1-assets = generic 1 "descent"; + descent2-assets = generic 2 "descent 2"; +} diff --git a/pkgs/games/dxx-rebirth/full.nix b/pkgs/games/dxx-rebirth/full.nix new file mode 100644 index 00000000000..baf8b80add1 --- /dev/null +++ b/pkgs/games/dxx-rebirth/full.nix @@ -0,0 +1,30 @@ +{ stdenv, makeWrapper +, dxx-rebirth, descent1-assets, descent2-assets }: + +let + generic = ver: assets: stdenv.mkDerivation rec { + name = "d${toString ver}x-rebirth-full-${assets.version}"; + + nativeBuildInputs = [ makeWrapper ]; + + buildCommand = '' + mkdir -p $out/bin + + makeWrapper ${dxx-rebirth}/bin/d${toString ver}x-rebirth $out/bin/descent${toString ver} \ + --add-flags "-hogdir ${assets}/share/games/descent${toString ver}" + ''; + + meta = with stdenv.lib; { + description = "Descent ${toString ver} using the DXX-Rebirth project engine and game assets from GOG"; + homepage = http://www.dxx-rebirth.com/; + license = with licenses; [ free unfree ]; + maintainers = with maintainers; [ peterhoeg ]; + platforms = with platforms; linux; + hydraPlatforms = []; + }; + }; + +in { + d1x-rebirth-full = generic 1 descent1-assets; + d2x-rebirth-full = generic 2 descent2-assets; +} diff --git a/pkgs/games/garden-of-coloured-lights/default.nix b/pkgs/games/garden-of-coloured-lights/default.nix index b8550b3712e..066cadb13b1 100644 --- a/pkgs/games/garden-of-coloured-lights/default.nix +++ b/pkgs/games/garden-of-coloured-lights/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Old-school vertical shoot-em-up / bullet hell"; homepage = http://garden.sourceforge.net/drupal/; - maintainers = with maintainers; [ profpatsch ]; + maintainers = with maintainers; [ Profpatsch ]; license = licenses.gpl3; }; diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index ce68f190992..67991987c31 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -42,6 +42,6 @@ in stdenv.mkDerivation rec { homepage = http://ultrastardx.sourceforge.net/; description = "Free and open source karaoke game"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ profpatsch ]; + maintainers = with maintainers; [ Profpatsch ]; }; } diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index da94a31dff5..00f0995e32a 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -3127,6 +3127,18 @@ rec { }; + vim-pencil = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-pencil-2017-06-14"; + src = fetchgit { + url = "git://github.com/reedes/vim-pencil"; + rev = "2dcd974b7255e4af83cf79a208f04a3489065e22"; + sha256 = "0swc6sszj1f4h5hgi7z7j1xw54d69mg7f18rk2kf5y453qwg4jc0"; + }; + dependencies = []; + + }; + + vim-ruby = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-ruby-2017-06-22"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index b48728e29ce..04ccbb2a99d 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -258,6 +258,7 @@ "vim-latex-live-preview" "vim-logreview" "vim-multiple-cursors" +"vim-pencil" "vim-ruby" "vim-scouter" "vim-signature" diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index ebd889d1a99..0bed93d76ed 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -4,10 +4,15 @@ , utillinux , writeTextFile, ubootTools , callPackage +, overrideCC, gcc7 }: { stdenv, buildPackages, perl, buildLinux +, # Allow really overriding even our gcc7 default. + # We want gcc >= 7.3 to enable the "retpoline" mitigation of security problems. + stdenvNoOverride ? overrideCC stdenv gcc7 + , # The kernel source tarball. src @@ -32,12 +37,14 @@ # optionally be compressed with gzip or bzip2. kernelPatches ? [] , ignoreConfigErrors ? hostPlatform.platform.name != "pc" || - hostPlatform != stdenv.buildPlatform + hostPlatform != stdenvNoOverride.buildPlatform , extraMeta ? {} , hostPlatform , ... } @ args: +let stdenv = stdenvNoOverride; in # finish the rename + assert stdenv.isLinux; let diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix index 58f59ff0834..83fbfa81bf3 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.15.2"; + version = "4.15.3"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "16h346abbdi6k3handw8nblscyf966gx1q9xig4gbij73b10nspb"; + sha256 = "055p02in09rj95z9hc1kjh4r12ydwdcl3ds2cp4dckhlnyhnxf4g"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix index 27ba9693350..304c085f4aa 100644 --- a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix +++ b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.15.2"; + version = "4.15.3"; revision = "a"; - sha256 = "1rmia5k07pfx47qkc8nx3xiap6mxbwlry3jxrx4kwf3hh5cnqnsv"; + sha256 = "1fxdllg60hwlbmjijcj7w6c3xz0rf9268f12qy45diahmydyccgc"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 9a9c0e7c1ac..3dae37136a2 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -82,7 +82,8 @@ let (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL")); in (optionalAttrs isModular { outputs = [ "out" "dev" ]; }) // { passthru = { - inherit version modDirVersion config kernelPatches configfile moduleBuildDependencies; + inherit version modDirVersion config kernelPatches configfile + moduleBuildDependencies stdenv; }; inherit src; @@ -265,8 +266,10 @@ stdenv.mkDerivation ((drvAttrs config hostPlatform.platform kernelPatches config hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ]; + # Absolute paths for compilers avoid any PATH-clobbering issues. makeFlags = commonMakeFlags ++ [ - "HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc" + "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" + "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" "ARCH=${stdenv.hostPlatform.platform.kernelArch}" ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 0e77aa1d8ee..ba29bfa433a 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -1,29 +1,54 @@ -{ stdenv, fetchurl, flex, bison, readline -, enableIPv6 ? false }: +{ lib, stdenv, fetchurl, flex, bison, readline }: -stdenv.mkDerivation rec { - name = "bird-1.6.3"; +with lib; - src = fetchurl { - url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz"; - sha256 = "0z3yrxqb0p7f8b7r2gk4mvrwfzk45zx7yr9aifbvba1vgksiri9r"; - }; +let + + generic = { version, sha256, enableIPv6 ? false }: + stdenv.mkDerivation rec { + name = "bird-${version}"; + + src = fetchurl { + inherit sha256; + url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz"; + }; + + nativeBuildInputs = [ flex bison ]; + buildInputs = [ readline ]; + + patches = [ + (./. + (builtins.toPath "/dont-create-sysconfdir-${builtins.substring 0 1 version}.patch")) + ]; - buildInputs = [ flex bison readline ]; + configureFlags = [ + "--localstatedir=/var" + ] ++ optional enableIPv6 "--enable-ipv6"; - patches = [ - ./dont-create-sysconfdir.patch - ]; + meta = { + description = "BIRD Internet Routing Daemon"; + homepage = http://bird.network.cz; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ viric fpletz ]; + platforms = platforms.linux; + }; + }; - configureFlags = [ - "--localstatedir /var" - ] ++ stdenv.lib.optional enableIPv6 "--enable-ipv6"; +in + +{ + bird = generic { + version = "1.6.3"; + sha256 = "0z3yrxqb0p7f8b7r2gk4mvrwfzk45zx7yr9aifbvba1vgksiri9r"; + }; + + bird6 = generic { + version = "1.6.3"; + sha256 = "0z3yrxqb0p7f8b7r2gk4mvrwfzk45zx7yr9aifbvba1vgksiri9r"; + enableIPv6 = true; + }; - meta = { - description = "BIRD Internet Routing Daemon"; - homepage = http://bird.network.cz; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ viric fpletz ]; - platforms = stdenv.lib.platforms.linux; + bird2 = generic { + version = "2.0.1"; + sha256 = "0qyh2cxj7hfz90x3fnczjdm3i9g7vr0nc4l4wjkj9qm0646vc52n"; }; } diff --git a/pkgs/servers/bird/dont-create-sysconfdir.patch b/pkgs/servers/bird/dont-create-sysconfdir-1.patch index 0a11c8a2a8d..0a11c8a2a8d 100644 --- a/pkgs/servers/bird/dont-create-sysconfdir.patch +++ b/pkgs/servers/bird/dont-create-sysconfdir-1.patch diff --git a/pkgs/servers/bird/dont-create-sysconfdir-2.patch b/pkgs/servers/bird/dont-create-sysconfdir-2.patch new file mode 100644 index 00000000000..fd86da8a129 --- /dev/null +++ b/pkgs/servers/bird/dont-create-sysconfdir-2.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.in b/Makefile.in +index fdd5e6c..45f81a1 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -165,7 +165,7 @@ tags: + # Install + + install: all +- $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@ ++ $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) + $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird + $(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl + if test -n "@CLIENT@" ; then \ diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 478fcb9aad7..a47d3106443 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { name = "knot-dns-${version}"; - version = "2.6.4"; + version = "2.6.5"; src = fetchurl { url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "1d0d37b5047ecd554d927519d5565c29c1ba9b501c100eb5f3a5af184d75386a"; + sha256 = "33cd676706e2baeb37cf3879ccbc91a1e1cd1ee5d7a082adff4d1e753ce49d46"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 4903c4db092..fb53cda9627 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.63"; + version = "0.63.1"; components = { "nuimo_controller" = ps: with ps; [ ]; "bbb_gpio" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index cafb84e333a..4456404442a 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -44,7 +44,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.63"; + hassVersion = "0.63.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -57,12 +57,12 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "0gfdhjydl619jpnflnig5hzglib9385hdk5vw5pris0ksqk27mfk"; + sha256 = "08dy1pcfhs123jq15yy2y29w2kfish5hnbixmzzbjmiz09zs3bh6"; }; propagatedBuildInputs = [ # From setup.py - requests pyyaml pytz pip jinja2 voluptuous typing aiohttp yarl async-timeout chardet astral certifi + requests pyyaml pytz pip jinja2 voluptuous typing aiohttp yarl async-timeout chardet astral certifi attrs # From http, frontend and recorder components sqlalchemy aiohttp-cors hass-frontend user-agents ] ++ componentBuildInputs ++ extraBuildInputs; diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index 28eeeb11259..ac60827aeb7 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -42,6 +42,6 @@ buildPythonApplication rec { homepage = https://github.com/asciimoo/searx; description = "A privacy-respecting, hackable metasearch engine"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ matejc fpletz profpatsch ]; + maintainers = with maintainers; [ matejc fpletz ]; }; } diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix new file mode 100644 index 00000000000..fe165b1e66e --- /dev/null +++ b/pkgs/tools/admin/lego/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "lego-unstable-${version}"; + version = "2018-02-02"; + rev = "06a8e7c475c03ef8d4773284ac63357d2810601b"; + + src = fetchFromGitHub { + inherit rev; + owner = "xenolf"; + repo = "lego"; + sha256 = "11a9gcgi3317z4lb1apkf6dnbjhf7xni0670nric3fbf5diqfwh2"; + }; + + goPackagePath = "github.com/xenolf/lego"; + goDeps = ./deps.nix; + + meta = with lib; { + description = "Let's Encrypt client and ACME library written in Go"; + license = licenses.mit; + homepage = https://github.com/xenolf/lego; + maintainers = with maintainers; [ andrew-d ]; + }; +} diff --git a/pkgs/tools/admin/lego/deps.nix b/pkgs/tools/admin/lego/deps.nix new file mode 100644 index 00000000000..6d842c5f3f5 --- /dev/null +++ b/pkgs/tools/admin/lego/deps.nix @@ -0,0 +1,219 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "fd7767e8876b52efa597af4d0ec944e9b2574120"; + sha256 = "1m7yd2vwbgypi9izgyif4k8rifgfmgsh747s1z467qlr5k17cjy5"; + }; + } + { + goPackagePath = "github.com/Azure/azure-sdk-for-go"; + fetch = { + type = "git"; + url = "https://github.com/Azure/azure-sdk-for-go"; + rev = "f111fc2fa3861c5fdced76cae4c9c71821969577"; + sha256 = "1xfm3phjwb222nkhzi16qslj0r374rgvjw99c9wrzzlzkq2qkb38"; + }; + } + { + goPackagePath = "github.com/Azure/go-autorest"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "5a06e9ddbe3c22262059b8e061777b9934f982bd"; + sha256 = "0dy80x5gxsq6vf8lpihpgv8cb8mnsk76q4ywxx3cxzfglqdjlwz6"; + }; + } + { + goPackagePath = "github.com/JamesClonk/vultr"; + fetch = { + type = "git"; + url = "https://github.com/JamesClonk/vultr"; + rev = "fa1c0367800db75e4d10d0ec90c49a8731670224"; + sha256 = "1bx2x17aa6wfn4qy9lxk8sh7shs3x5ppz2z49s0xm8qq0rs1qi92"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "fb9d53b0db7e801eb0d4fa021f5860794d845da3"; + sha256 = "0md4bvrr4y5604l3bif7xx1bvhn6cc81v578s6w15mp63k9yjlpn"; + }; + } + { + goPackagePath = "github.com/decker502/dnspod-go"; + fetch = { + type = "git"; + url = "https://github.com/decker502/dnspod-go"; + rev = "f33a2c6040fc2550a631de7b3a53bddccdcd73fb"; + sha256 = "0c5v7y465k8mi5vxhln53pjn3z4h022sh14mngnx71h6szakzykg"; + }; + } + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "dbeaa9332f19a944acb5736b4456cfcc02140e29"; + sha256 = "0zk6l6kzsjdijfn7c4h0aywdjx5j2hjwi67vy1k6wr46hc8ks2hs"; + }; + } + { + goPackagePath = "github.com/dnsimple/dnsimple-go"; + fetch = { + type = "git"; + url = "https://github.com/dnsimple/dnsimple-go"; + rev = "e43ab24dc4818cd584429752f69885fbc8a74baa"; + sha256 = "0cq1xjv27nssarmflnh0w4i0l8v74129va4inhi5m2wxrz2247z7"; + }; + } + { + goPackagePath = "github.com/edeckers/auroradnsclient"; + fetch = { + type = "git"; + url = "https://github.com/edeckers/auroradnsclient"; + rev = "1563e622aaca0a8bb895a448f31d4a430ab97586"; + sha256 = "0d1izyqnlqasp56mldrpfnyhzmih2k955jn78ibzhay22dmn8ndr"; + }; + } + { + goPackagePath = "github.com/exoscale/egoscale"; + fetch = { + type = "git"; + url = "https://github.com/exoscale/egoscale"; + rev = "7c8b1e7975be2af74d6e462dbea467e9061f9619"; + sha256 = "00bqam37lkwls4rr209pcrld1rb025nm935h004lgfd8i2xjv5g4"; + }; + } + { + goPackagePath = "github.com/google/go-querystring"; + fetch = { + type = "git"; + url = "https://github.com/google/go-querystring"; + rev = "53e6ce116135b80d037921a7fdd5138cf32d7a8a"; + sha256 = "0lkbm067nhmxk66pyjx59d77dbjjzwyi43gdvzyx2f8m1942rq7f"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "5364553f1ee9cddc7ac8b62dce148309c386695b"; + sha256 = "1r56ws5ayza5xk6xlkjvv7wcj6misbm5cyixvyf3pnz8wgja31wp"; + }; + } + { + goPackagePath = "github.com/ovh/go-ovh"; + fetch = { + type = "git"; + url = "https://github.com/ovh/go-ovh"; + rev = "df6beeb652924ef66aa95690b392f62864ad8842"; + sha256 = "1nxgsrbqhznqivjxh67pn8laf4pysja5xyc40bdjvprl9nc40z6q"; + }; + } + { + goPackagePath = "github.com/rainycape/memcache"; + fetch = { + type = "git"; + url = "https://github.com/rainycape/memcache"; + rev = "1031fa0ce2f20c1c0e1e1b51951d8ea02c84fa05"; + sha256 = "02cbhy192vi0d1kwh57mdrg1mkr027ndkvd1y0cx0kn0h6pszggn"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "be8372ae8ec5c6daaed3cc28ebf73c54b737c240"; + sha256 = "1ljfacbhd180yr0lc9myvxxdka0iji2ihsx0fcczja4ik5f2mb5p"; + }; + } + { + goPackagePath = "github.com/timewasted/linode"; + fetch = { + type = "git"; + url = "https://github.com/timewasted/linode"; + rev = "37e84520dcf74488f67654f9c775b9752c232dc1"; + sha256 = "08gpys1c5xkh7f92fq31wb24vjksfnpbhfwini73dlvyi2w25a3c"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "a1c7408de3f632d86eee604a3bb755f1ffb68226"; + sha256 = "1fq0amfgpccf35nll7xw0k6smwrb7h0wy62n70kfd9kvh64n8hbn"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "5119cf507ed5294cc409c092980c7497ee5d6fd2"; + sha256 = "0r8ffhagvzpjrkm25rrlby4h6bsqqlq6kcm01g54iqm7b2yrjy1p"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "f5dfe339be1d06f81b22525fe34671ee7d2c8904"; + sha256 = "01y9j7pjnnld4ipmzjvs0hls0hh698f2sga8cxaw5y6r5j7igaah"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "543e37812f10c46c622c9575afd7ad22f22a12ba"; + sha256 = "0kc816fq1zj5wdw4mfa7w2q26rnh273157w8n0d30xpzl8ba2isr"; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/google-api-go-client"; + rev = "068431dcab1a5817548dd244d9795788a98329f4"; + sha256 = "1yn5qfmmmqbm6k5h8qj5n6ra3xv9aispvjv9kqarxwvv7q5xql83"; + }; + } + { + goPackagePath = "gopkg.in/ini.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/ini.v1"; + rev = "32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a"; + sha256 = "0mhgxw5q6b0pryhikx3k4wby7g32rwjjljzihi47lwn34kw5y1qn"; + }; + } + { + goPackagePath = "gopkg.in/ns1/ns1-go.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/ns1/ns1-go.v2"; + rev = "1f132c4ac59d2c7022353a8824002a15deb66f1e"; + sha256 = "0fx646hzhi6w58hiwc76hfjxn0dj9vxbrdqkb64lqxymzxzsrfnb"; + }; + } + { + goPackagePath = "gopkg.in/square/go-jose.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/square/go-jose.v1"; + rev = "aa2e30fdd1fe9dd3394119af66451ae790d50e0d"; + sha256 = "0drajyadd6c4m5qv0jxcv748qczg8sgxz28nva1jn39f234m02is"; + }; + } +] diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 899845a044c..b8f3318057b 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -224,7 +224,7 @@ in pythonPackages.buildPythonApplication rec { description = "Music tagger and library organizer"; homepage = http://beets.radbox.org; license = licenses.mit; - maintainers = with maintainers; [ aszlig domenkozar pjones profpatsch ]; + maintainers = with maintainers; [ aszlig domenkozar pjones ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/file-rename/default.nix b/pkgs/tools/filesystems/file-rename/default.nix new file mode 100644 index 00000000000..1818a517fd2 --- /dev/null +++ b/pkgs/tools/filesystems/file-rename/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, perlPackages, makeWrapper }: + +perlPackages.buildPerlPackage rec { + name = "File-Rename-0.20"; + + src = fetchurl { + url = "mirror://cpan/authors/id/R/RM/RMBARKER/${name}.tar.gz"; + sha256 = "1cf6xx2hiy1xalp35fh8g73j67r0w0g66jpcbc6971x9jbm7bvjy"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/rename \ + --prefix PERL5LIB : $out/lib/perl5/site_perl + ''; + + meta = with stdenv.lib; { + description = "Perl extension for renaming multiple files"; + homepage = http://search.cpan.org/~rmbarker; + license = licenses.artistic1; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix new file mode 100644 index 00000000000..1a2b5b19e37 --- /dev/null +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + version = "1.0.0"; + name = "oxipng-${version}"; + + src = fetchFromGitHub { + owner = "shssoichiro"; + repo = "oxipng"; + rev = "v${version}"; + sha256 = "1w3y9qy72sfz6zv1iizp843fd39rf1qfh7b9mllbn5w8w4hd658w"; + }; + + cargoSha256 = "0mj45svb0nly3cl5d1fmm7nh2zswxpgb56g9xnb4cks5186sn5fi"; + + meta = with stdenv.lib; { + homepage = https://github.com/shssoichiro/oxipng; + description = "A lossless PNG compression optimizer"; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 4fb16b49717..c50d7ec8fad 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, +{ stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, expat, fftw, orc, lcms, imagemagick, openexr, libtiff, libjpeg, libgsf, libexif, python27, libpng, matio ? null, cfitsio ? null, libwebp ? null }: stdenv.mkDerivation rec { - name = "vips-8.3.1"; + name = "vips-${version}"; + version = "8.6.2"; src = fetchurl { - url = "http://www.vips.ecs.soton.ac.uk/supported/current/${name}.tar.gz"; - sha256 = "01hh1baar2r474kny24fcq6ddshcvq104207mqxnkis0as6pzjq9"; + url = "https://github.com/jcupitt/libvips/releases/download/v${version}/${name}.tar.gz"; + sha256 = "18hjwk000w49yjjb41qrk4s39mr1xccisrvwy2x063vyjbdbr1ll"; }; buildInputs = [ pkgconfig glib libxml2 fftw orc lcms imagemagick openexr libtiff libjpeg libgsf libexif python27 libpng + expat ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/geteltorito/default.nix b/pkgs/tools/misc/geteltorito/default.nix index 7336665594a..b95c7179141 100644 --- a/pkgs/tools/misc/geteltorito/default.nix +++ b/pkgs/tools/misc/geteltorito/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extract the initial/default boot image from a CD image if existent"; homepage = https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito/; - maintainers = [ maintainers.profpatsch ]; + maintainers = [ maintainers.Profpatsch ]; license = licenses.gpl2; }; diff --git a/pkgs/tools/misc/massren/default.nix b/pkgs/tools/misc/massren/default.nix new file mode 100644 index 00000000000..085e6f41a09 --- /dev/null +++ b/pkgs/tools/misc/massren/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "massren-${version}"; + version = "1.5.4"; + + src = fetchFromGitHub { + owner = "laurent22"; + repo = "massren"; + rev = "v${version}"; + sha256 = "1bn6qy30kpxi3rkr3bplsc80xnhj0hgfl0qaczbg3zmykfmsl3bl"; + }; + + goPackagePath = "github.com/laurent22/massren"; + + meta = with lib; { + description = "Easily rename multiple files using your text editor"; + license = licenses.mit; + homepage = https://github.com/laurent22/massren; + maintainers = with maintainers; [ andrew-d ]; + }; +} diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix index 0e1d3b8f49f..6f56267ebf7 100644 --- a/pkgs/tools/misc/mktorrent/default.nix +++ b/pkgs/tools/misc/mktorrent/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = http://mktorrent.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; description = "Command line utility to create BitTorrent metainfo files"; - maintainers = with stdenv.lib.maintainers; [viric profpatsch]; + maintainers = with stdenv.lib.maintainers; [viric Profpatsch]; }; } diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix index 30473059d6d..435a5850920 100644 --- a/pkgs/tools/misc/ultrastar-creator/default.nix +++ b/pkgs/tools/misc/ultrastar-creator/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { description = "Ultrastar karaoke song creation tool"; homepage = https://github.com/UltraStar-Deluxe/UltraStar-Creator; license = licenses.gpl2; - maintainers = with maintainers; [ profpatsch ]; + maintainers = with maintainers; [ Profpatsch ]; }; } diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix index af443661b6c..d9739f7846b 100644 --- a/pkgs/tools/misc/ultrastar-manager/default.nix +++ b/pkgs/tools/misc/ultrastar-manager/default.nix @@ -115,6 +115,6 @@ in stdenv.mkDerivation { description = "Ultrastar karaoke song manager"; homepage = https://github.com/UltraStar-Deluxe/UltraStar-Manager; license = licenses.gpl2; - maintainers = with maintainers; [ profpatsch ]; + maintainers = with maintainers; [ Profpatsch ]; }; } diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix new file mode 100644 index 00000000000..2e4133124c1 --- /dev/null +++ b/pkgs/tools/system/bfs/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, bash }: + +stdenv.mkDerivation rec { + name = "bfs-${version}"; + version = "1.2.1"; + + src = fetchFromGitHub { + repo = "bfs"; + owner = "tavianator"; + rev = version; + sha256 = "1dgc31l5d20i0v78c51xga4lr78b5x8dz6yzsvbhlgs0abi0nynx"; + }; + + # Disable fstype test, tries to read /etc/mtab + patches = [ ./tests.patch ]; + postPatch = '' + # Patch tests (both shebangs and usage in scripts) + for f in $(find -type f -name '*.sh'); do + substituteInPlace $f --replace "/bin/bash" "${bash}/bin/bash" + done + ''; + doCheck = true; + + makeFlags = [ "PREFIX=$(out)" ]; + buildFlags = [ "release" ]; # "release" enables compiler optimizations + + meta = with stdenv.lib; { + description = "A breadth-first version of the UNIX find command"; + longDescription = '' + bfs is a variant of the UNIX find command that operates breadth-first rather than + depth-first. It is otherwise intended to be compatible with many versions of find. + ''; + homepage = https://github.com/tavianator/bfs; + license = licenses.bsd0; + platforms = platforms.linux; + maintainers = with maintainers; [ yesbox ]; + }; +} diff --git a/pkgs/tools/system/bfs/tests.patch b/pkgs/tools/system/bfs/tests.patch new file mode 100644 index 00000000000..a30291d7095 --- /dev/null +++ b/pkgs/tools/system/bfs/tests.patch @@ -0,0 +1,10 @@ +--- a/tests.sh ++++ b/tests.sh +@@ -369,7 +369,6 @@ + test_printf_nul + test_quit_after_print + test_quit_before_print +- test_fstype + test_not + test_and + test_or diff --git a/pkgs/tools/system/supervise/default.nix b/pkgs/tools/system/supervise/default.nix index c264b73b502..ef0b1b3b2ac 100644 --- a/pkgs/tools/system/supervise/default.nix +++ b/pkgs/tools/system/supervise/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "supervise-${version}"; - version = "1.2.0"; + version = "1.3.0"; src = fetchzip { url = "https://github.com/catern/supervise/releases/download/v${version}/supervise-${version}.tar.gz"; - sha256 = "07v3197nf3jbx2w6jxzyk9b8p5qjj9irpr4jvv5lkfbi7s6rav3k"; + sha256 = "1y3jaqzprlkba2165nlcr250jc3mpxawd5sfjryb3db1nw66al04"; }; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 997e4ee9464..7a9fb7bc1fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -92,10 +92,19 @@ with pkgs; } ''); + # Zip file format only allows times after year 1980, which makes e.g. Python wheel building fail with: + # ValueError: ZIP does not support timestamps before 1980 + ensureNewerSourcesForZipFilesHook = ensureNewerSourcesHook { year = "1980"; }; + updateAutotoolsGnuConfigScriptsHook = makeSetupHook { substitutions = { gnu_config = gnu-config;}; } ../build-support/setup-hooks/update-autotools-gnu-config-scripts.sh; + gogUnpackHook = makeSetupHook { + name = "gog-unpack-hook"; + deps = [ innoextract file-rename ]; } + ../build-support/setup-hooks/gog-unpack.sh; + buildEnv = callPackage ../build-support/buildenv { }; # not actually a package buildFHSUserEnv = callPackage ../build-support/build-fhs-userenv { }; @@ -1245,6 +1254,8 @@ with pkgs; masscan = callPackage ../tools/security/masscan { }; + massren = callPackage ../tools/misc/massren { }; + meritous = callPackage ../games/meritous { }; meson = callPackage ../development/tools/build-managers/meson { }; @@ -1396,6 +1407,8 @@ with pkgs; bfg-repo-cleaner = gitAndTools.bfg-repo-cleaner; + bfs = callPackage ../tools/system/bfs { }; + bgs = callPackage ../tools/X11/bgs { }; biber = callPackage ../tools/typesetting/biber { @@ -2955,8 +2968,6 @@ with pkgs; jhead = callPackage ../tools/graphics/jhead { }; - jid = callPackage ../development/tools/jid { }; - jing = self.jing-trang; jing-trang = callPackage ../tools/text/xml/jing-trang { }; @@ -3064,6 +3075,8 @@ with pkgs; lbreakout2 = callPackage ../games/lbreakout2 { }; + lego = callPackage ../tools/admin/lego { }; + leocad = callPackage ../applications/graphics/leocad { }; less = callPackage ../tools/misc/less { }; @@ -3234,6 +3247,8 @@ with pkgs; npm2nix = nodePackages.npm2nix; + file-rename = callPackage ../tools/filesystems/file-rename { }; + kea = callPackage ../tools/networking/kea { boost = boost165; }; @@ -3968,6 +3983,8 @@ with pkgs; owncloud-client = libsForQt5.callPackage ../applications/networking/owncloud-client { }; + oxipng = callPackage ../tools/graphics/oxipng { }; + p2pvc = callPackage ../applications/video/p2pvc {}; p7zip = callPackage ../tools/archivers/p7zip { }; @@ -6887,8 +6904,8 @@ with pkgs; pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; - php = php71; - phpPackages = php71Packages; + php = php72; + phpPackages = php72Packages; php56Packages = recurseIntoAttrs (callPackage ./php-packages.nix { php = php56; @@ -6913,13 +6930,17 @@ with pkgs; php71 php72; - php-embed = php71-embed; + php-embed = php72-embed; php71-embed = php71.override { config.php.embed = true; config.php.apxs2 = false; }; + php72-embed = php72.override { + config.php.embed = true; + config.php.apxs2 = false; + }; picoc = callPackage ../development/interpreters/picoc {}; @@ -7833,6 +7854,8 @@ with pkgs; postiats-utilities = callPackage ../development/tools/postiats-utilities {}; + postman = callPackage ../development/web/postman {}; + pprof = callPackage ../development/tools/profiling/pprof { }; pyprof2calltree = pythonPackages.callPackage ../development/tools/profiling/pyprof2calltree { }; @@ -8187,6 +8210,10 @@ with pkgs; beecrypt = callPackage ../development/libraries/beecrypt { }; + belcard = callPackage ../development/libraries/belcard { }; + + belr = callPackage ../development/libraries/belr { }; + beignet = callPackage ../development/libraries/beignet { inherit (llvmPackages_39) llvm clang-unwrapped; }; @@ -8226,6 +8253,8 @@ with pkgs; bwidget = callPackage ../development/libraries/bwidget { }; + bzrtp = callPackage ../development/libraries/bzrtp { }; + c-ares = callPackage ../development/libraries/c-ares { fetchurl = fetchurlBoot; }; @@ -9336,9 +9365,7 @@ with pkgs; libchop = callPackage ../development/libraries/libchop { }; - libclc = callPackage ../development/libraries/libclc { - inherit (llvmPackages_4) clang llvm; - }; + libclc = callPackage ../development/libraries/libclc { }; libcli = callPackage ../development/libraries/libcli { }; @@ -10412,7 +10439,10 @@ with pkgs; nvidia-video-sdk = callPackage ../development/libraries/nvidia-video-sdk { }; - ocl-icd = callPackage ../development/libraries/ocl-icd { }; + ocl-icd-oclhGen = oclh: callPackage ../development/libraries/ocl-icd { opencl-headers = oclh; }; + ocl-icd-oclh_1_2 = ocl-icd-oclhGen opencl-headers_1_2; + ocl-icd-oclh_2_2 = ocl-icd-oclhGen opencl-headers_2_2; + ocl-icd = ocl-icd-oclh_2_2; ode = callPackage ../development/libraries/ode { }; @@ -10439,7 +10469,10 @@ with pkgs; opencascade_oce = opencascade; - opencl-headers = callPackage ../development/libraries/opencl-headers { }; + opencl-headersGen = v: callPackage ../development/libraries/opencl-headers { version = v; }; + opencl-headers_1_2 = opencl-headersGen "12"; + opencl-headers_2_2 = opencl-headersGen "22"; + opencl-headers = opencl-headers_2_2; opencl-clhpp = callPackage ../development/libraries/opencl-clhpp { }; @@ -11908,8 +11941,8 @@ with pkgs; bind = callPackage ../servers/dns/bind { }; dnsutils = bind.dnsutils; - bird = callPackage ../servers/bird { }; - bird6 = bird.override { enableIPv6 = true; }; + inherit (callPackages ../servers/bird { }) + bird bird6 bird2; bosun = callPackage ../servers/monitoring/bosun { }; scollector = bosun; @@ -13047,6 +13080,7 @@ with pkgs; callPackage = newScope self; inherit kernel; + inherit (kernel) stdenv; # in particular, use the same compiler by default acpi_call = callPackage ../os-specific/linux/acpi-call {}; @@ -16491,7 +16525,7 @@ with pkgs; mupdf = callPackage ../applications/misc/mupdf { }; - diffpdf = callPackage ../applications/misc/diffpdf { }; + diffpdf = libsForQt5.callPackage ../applications/misc/diffpdf { }; diff-pdf = callPackage ../applications/misc/diff-pdf { wxGTK = wxGTK31; }; @@ -16854,8 +16888,7 @@ with pkgs; qt = qt4; }; - # 0.5.7 segfaults when opening the main panel with qt 5.7 and fails to compile with qt 5.8 - qsyncthingtray = libsForQt56.callPackage ../applications/misc/qsyncthingtray { }; + qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { }; qstopmotion = callPackage ../applications/video/qstopmotion { }; @@ -18170,6 +18203,8 @@ with pkgs; inherit (gnome3) yelp; + yokadi = python3Packages.callPackage ../applications/misc/yokadi {}; + yoshimi = callPackage ../applications/audio/yoshimi { }; inherit (pythonPackages) youtube-dl; @@ -18361,10 +18396,18 @@ with pkgs; physfs = physfs_2; }; + # these are here for compatibility d1x_rebirth = dxx-rebirth; - d2x_rebirth = dxx-rebirth; + inherit (callPackages ../games/dxx-rebirth/assets.nix { }) + descent1-assets + descent2-assets; + + inherit (callPackages ../games/dxx-rebirth/full.nix { }) + d1x-rebirth-full + d2x-rebirth-full; + easyrpg-player = callPackage ../games/easyrpg-player { }; eboard = callPackage ../games/eboard { }; @@ -19784,7 +19827,7 @@ with pkgs; faust1 = callPackage ../applications/audio/faust/faust1.nix { }; faust2 = callPackage ../applications/audio/faust/faust2.nix { - llvm = llvm_4; + llvm = llvm_5; }; faust2alqt = callPackage ../applications/audio/faust/faust2alqt.nix { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e078cb09b29..cbb730363ff 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2544,10 +2544,10 @@ let self = _self // overrides; _self = with self; { }; CpanelJSONXS = buildPerlPackage rec { - name = "Cpanel-JSON-XS-4.00"; + name = "Cpanel-JSON-XS-4.01"; src = fetchurl { url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; - sha256 = "4dedf770cab3009b08bca108266b941097ae1c55c674c500e3145e2f23a628ac"; + sha256 = "c8cfd32a8a9508ab7f280452428582c3e46d0bed4ea863c3ec27c34f6920de60"; }; meta = { description = "CPanel fork of JSON::XS, fast and correct serializing"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0f761453335..a35dc124dd2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -243,6 +243,8 @@ in { habanero = callPackage ../development/python-modules/habanero { }; + i3ipc = callPackage ../development/python-modules/i3ipc { }; + intelhex = callPackage ../development/python-modules/intelhex { }; lmtpd = callPackage ../development/python-modules/lmtpd { }; @@ -416,6 +418,8 @@ in { adal = callPackage ../development/python-modules/adal { }; + aioconsole = callPackage ../development/python-modules/aioconsole { }; + aiodns = callPackage ../development/python-modules/aiodns { }; aiofiles = callPackage ../development/python-modules/aiofiles { }; @@ -487,7 +491,7 @@ in { homepage = https://github.com/pazz/alot; description = "Terminal MUA using notmuch mail"; platforms = platforms.linux; - maintainers = with maintainers; [ garbas profpatsch ]; + maintainers = with maintainers; [ garbas ]; }; }; @@ -2231,39 +2235,7 @@ in { ''; }; - celery = buildPythonPackage rec { - name = "celery-${version}"; - version = "4.0.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/celery/${name}.tar.gz"; - sha256 = "0kgmbs3fl9879n48p4m79nxy9by2yhvxq1jdvlnqzzvkdb2sdmg3"; - }; - - # Fixes testsuite for python-3.6 - # From ubuntu packaging: https://launchpad.net/ubuntu/+archive/primary/+files/celery_4.0.2-0ubuntu1.debian.tar.xz - # (linked from https://launchpad.net/ubuntu/+source/celery) - # https://github.com/celery/celery/pull/3736#issuecomment-274155454 from upstream - patches = [ ../development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch ]; - - # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox - preCheck = '' - export NIX_REDIRECTS=/etc/protocols=${pkgs.iana-etc}/etc/protocols \ - LD_PRELOAD=${pkgs.libredirect}/lib/libredirect.so - ''; - postCheck = '' - unset NIX_REDIRECTS LD_PRELOAD - ''; - - buildInputs = with self; [ pytest case ]; - propagatedBuildInputs = with self; [ kombu billiard pytz anyjson amqp eventlet ]; - - meta = { - homepage = https://github.com/celery/celery/; - description = "Distributed task queue"; - license = licenses.bsd3; - }; - }; + celery = callPackage ../development/python-modules/celery { pytest = self.pytest_32; }; cerberus = buildPythonPackage rec { name = "Cerberus-${version}"; @@ -3168,6 +3140,15 @@ in { }; }; + # Needed for celery + pytest_32 = self.pytest_34.overrideAttrs( oldAttrs: rec { + version = "3.2.5"; + src = oldAttrs.src.override { + inherit version; + sha256 = "6d5bd4f7113b444c55a3bbb5c738a3dd80d43563d063fc42dcb0aaefbdd78b81"; + }; + }); + pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; pytest-asyncio = callPackage ../development/python-modules/pytest-asyncio { }; @@ -3280,27 +3261,7 @@ in { }; }; - pytest-mock = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "pytest-mock"; - version = "1.6.0"; - - buildInputs = with self; [ pytest setuptools_scm ]; - propagatedBuildInputs = with self; [ mock ]; - - meta = { - description = "Thin-wrapper around the mock package for easier use with py.test."; - homepage = "https://github.com/pytest-dev/pytest-mock"; - license = licenses.mit; - maintainers = with maintainers; [ nand0p ]; - platforms = platforms.all; - }; - - src = fetchPypi { - inherit pname version; - sha256 = "07qccww4bq9jxlc0fbhlspr13kcsixchsnl8vk4wdiyvsjy7r8c3"; - }; - }; + pytest-mock = callPackage ../development/python-modules/pytest-mock { }; pytest-timeout = callPackage ../development/python-modules/pytest-timeout { }; @@ -17856,7 +17817,7 @@ in { meta = { description = "Tree widgets for urwid"; license = licenses.gpl3; - maintainers = with maintainers; [ profpatsch ]; + maintainers = with maintainers; [ ]; }; }; @@ -19983,23 +19944,7 @@ EOF propagatedBuildInputs = with self; [ pynacl six ]; }; - pynacl = buildPythonPackage rec { - name = "pynacl-${version}"; - version = "0.3.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/P/PyNaCl/PyNaCl-0.3.0.tar.gz"; - sha256 = "1hknxlp3a3f8njn19w92p8nhzl9jkfwzhv5fmxhmyq2m8hqrfj8j"; - }; - - buildInputs = with self; [ pytest coverage ]; - propagatedBuildInputs = with self; [pkgs.libsodium six cffi pycparser]; - - checkPhase = '' - coverage run --source nacl --branch -m pytest - ''; - - }; + pynacl = callPackage ../development/python-modules/pynacl { }; service-identity = callPackage ../development/python-modules/service_identity { }; @@ -20120,26 +20065,7 @@ EOF }; }; - weboob = buildPythonPackage rec { - name = "weboob-1.1"; - disabled = ! isPy27; - - src = pkgs.fetchurl { - url = "https://symlink.me/attachments/download/324/${name}.tar.gz"; - sha256 = "0736c5wsck2abxlwvx8i4496kafk9xchkkzhg4dcfbj0isldih6b"; - }; - - setupPyBuildFlags = ["--qt" "--xdg"]; - - propagatedBuildInputs = with self; [ pillow prettytable pyyaml dateutil gdata requests mechanize feedparser lxml pkgs.gnupg pyqt4 pkgs.libyaml simplejson cssselect futures pdfminer termcolor ]; - - meta = { - homepage = http://weboob.org; - description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser"; - license = licenses.agpl3; - maintainers = with maintainers; [ ]; - }; - }; + weboob = callPackage ../development/python-modules/weboob { }; datadiff = buildPythonPackage rec { name = "datadiff-1.1.6"; |