From a7ed44ccadfcf1bd54d0197fbc87b6c1b0bcef7b Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 10 Feb 2018 10:28:30 +0100 Subject: [PATCH 001/695] lib: make use of visible variable in doRename The `visible` variable was not hooked up previously. It is used to determine whether the renamed option should be shown in the documentation. --- lib/modules.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/modules.nix b/lib/modules.nix index 654c4c588de..019f11d11bc 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -664,6 +664,7 @@ rec { in { config, options, ... }: { options = setAttrByPath from (mkOption { + inherit visible; description = "Alias of ."; apply = x: use (toOf config); }); From add9f5cf4a7affb20de29cfc74d0c91621f35bd4 Mon Sep 17 00:00:00 2001 From: koral Date: Thu, 5 Apr 2018 23:16:49 +0200 Subject: [PATCH 002/695] gmrender-resurrect: init --- .../networking/gmrender-resurrect/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/tools/networking/gmrender-resurrect/default.nix diff --git a/pkgs/tools/networking/gmrender-resurrect/default.nix b/pkgs/tools/networking/gmrender-resurrect/default.nix new file mode 100644 index 00000000000..6926f1522c7 --- /dev/null +++ b/pkgs/tools/networking/gmrender-resurrect/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, makeWrapper +, gstreamer, gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav, libupnp }: + +let version = "4f221e6b85abf85957b547436e982d7a501a1718"; in + +stdenv.mkDerivation { + name = "gmrender-resurrect-${version}"; + + src = fetchFromGitHub { + owner = "hzeller"; + repo = "gmrender-resurrect"; + rev = "${version}"; + sha256 = "1dmdhyz27bh74qmvncfd3kw7zqwnd05bhxcfjjav98z5qrxdygj4"; + }; + + preConfigurePhases = "autoconfPhase"; + + autoconfPhase = "./autogen.sh"; + + buildInputs = [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav libupnp ]; + nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ]; + + postInstall = '' + for prog in "$out/bin/"*; do + wrapProgram "$prog" --suffix GST_PLUGIN_SYSTEM_PATH : "${gst-plugins-base}/lib/gstreamer-1.0:${gst-plugins-good}/lib/gstreamer-1.0:${gst-plugins-bad}/lib/gstreamer-1.0:${gst-plugins-ugly}/lib/gstreamer-1.0:${gst-libav}/lib/gstreamer-1.0" + done + ''; + + meta = with stdenv.lib; { + description = "Resource efficient UPnP/DLNA renderer, optimal for Raspberry Pi, CuBox or a general MediaServer"; + homepage = https://github.com/hzeller/gmrender-resurrect; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.koral ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 96d3ecee2c7..f18882203bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2513,6 +2513,10 @@ with pkgs; glxinfo = callPackage ../tools/graphics/glxinfo { }; + gmrender-resurrect = callPackage ../tools/networking/gmrender-resurrect { + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav; + }; + gmvault = callPackage ../tools/networking/gmvault { }; gnash = callPackage ../misc/gnash { }; From f3657a05d82082e4bf1610c69216f71bbe731253 Mon Sep 17 00:00:00 2001 From: obadz Date: Sun, 8 Apr 2018 00:18:56 +0100 Subject: [PATCH 003/695] minidlna nixos module: add loglevel config --- .../modules/services/networking/minidlna.nix | 43 +++++++++++++------ 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix index 61d063dbfe0..6401631bf62 100644 --- a/nixos/modules/services/networking/minidlna.nix +++ b/nixos/modules/services/networking/minidlna.nix @@ -1,23 +1,16 @@ # Module for MiniDLNA, a simple DLNA server. - { config, lib, pkgs, ... }: with lib; let - cfg = config.services.minidlna; - port = 8200; - in { - ###### interface - options = { - services.minidlna.enable = mkOption { type = types.bool; default = false; @@ -43,24 +36,48 @@ in ''; }; + services.minidlna.loglevel = mkOption { + type = types.str; + default = "warn"; + example = "general,artwork,database,inotify,scanner,metadata,http,ssdp,tivo=warn"; + description = + '' + Defines the type of messages that should be logged, and down to + which level of importance they should be considered. + + The possible types are “artwork”, “database”, “general”, “http”, + “inotify”, “metadata”, “scanner”, “ssdp” and “tivo”. + + The levels are “off”, “fatal”, “error”, “warn”, “info” and + “debug”, listed here in order of decreasing importance. “off” + turns off logging messages entirely, “fatal” logs the most + critical messages only, and so on down to “debug” that logs every + single messages. + + The types are comma-separated, followed by an equal sign (‘=’), + followed by a level that applies to the preceding types. This can + be repeated, separating each of these constructs with a comma. + + Defaults to “general,artwork,database,inotify,scanner,metadata, + http,ssdp,tivo=warn” which logs every type of message at the + “warn” level. + ''; + }; + services.minidlna.config = mkOption { type = types.lines; description = "The contents of MiniDLNA's configuration file."; }; - }; - ###### implementation - config = mkIf cfg.enable { - services.minidlna.config = '' port=${toString port} friendly_name=${config.networking.hostName} MiniDLNA db_dir=/var/cache/minidlna - log_level=warn + log_level=${cfg.loglevel} inotify=yes ${concatMapStrings (dir: '' media_dir=${dir} @@ -98,7 +115,5 @@ in " -f ${pkgs.writeText "minidlna.conf" cfg.config}"; }; }; - }; - } From 759e66f63df4532e96ad1f0dd56b34364dd9da80 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Mon, 9 Apr 2018 11:39:30 -0700 Subject: [PATCH 004/695] btrbk: fix SSH filter script --- pkgs/tools/backup/btrbk/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index ace54318665..dd10eeb8e5a 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages -, asciidoc-full, makeWrapper }: +, utillinux, asciidoc-full, makeWrapper }: stdenv.mkDerivation rec { name = "btrbk-${version}"; @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { --replace "/bin/date" "${coreutils}/bin/date" \ --replace "/bin/echo" "${coreutils}/bin/echo" \ --replace '$btrbk' 'btrbk' + + # Fix SSH filter script + sed -i '/^export PATH/d' ssh_filter_btrbk.sh + substituteInPlace ssh_filter_btrbk.sh --replace logger ${utillinux}/bin/logger ''; preFixup = '' From d031891c6bf151ef31517c1bc633ff21ecee864a Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Mon, 9 Apr 2018 13:57:42 -0700 Subject: [PATCH 005/695] btrbk: clean up build inputs --- pkgs/tools/backup/btrbk/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index dd10eeb8e5a..958afa3f6a9 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages -, utillinux, asciidoc-full, makeWrapper }: +, utillinux, asciidoc, makeWrapper }: stdenv.mkDerivation rec { name = "btrbk-${version}"; @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { sha256 = "04ahfm52vcf1w0c2km0wdgj2jpffp45bpawczmygcg8fdcm021lp"; }; - buildInputs = with perlPackages; [ asciidoc-full makeWrapper perl DateCalc ]; + nativeBuildInputs = [ asciidoc makeWrapper ]; + + buildInputs = with perlPackages; [ perl DateCalc ]; preInstall = '' for f in $(find . -name Makefile); do diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c493337c16..1ff50d20958 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -886,7 +886,9 @@ with pkgs; btrfs-dedupe = callPackage ../tools/filesystems/btrfs-dedupe/default.nix {}; - btrbk = callPackage ../tools/backup/btrbk { }; + btrbk = callPackage ../tools/backup/btrbk { + asciidoc = asciidoc-full; + }; buildtorrent = callPackage ../tools/misc/buildtorrent { }; From b81aa02800795724fe0a01e7544c49b04a40994a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 17 Apr 2018 12:40:05 +0300 Subject: [PATCH 006/695] firewall service: run stop commands in reload Do cleanup of user-created additional rules. Of course it'd be much better to just use iptables-{save,restore} for declarative management, but as it's still not there... --- nixos/modules/services/networking/firewall.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 20c0b0acf16..c4bd0e7f9ee 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -242,6 +242,9 @@ let # Don't allow traffic to leak out until the script has completed ip46tables -A INPUT -j nixos-drop + + ${cfg.extraStopCommands} + if ${startScript}; then ip46tables -D INPUT -j nixos-drop 2>/dev/null || true else From 85854ab2435629c6cb127773f422e2309bf0eade Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 18 Apr 2018 08:21:43 +0200 Subject: [PATCH 007/695] vamp-sdk: 2.5 -> 2.7.1 --- pkgs/development/libraries/audio/vamp/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/audio/vamp/default.nix b/pkgs/development/libraries/audio/vamp/default.nix index 8098ac9f3ef..f8b1006d2eb 100644 --- a/pkgs/development/libraries/audio/vamp/default.nix +++ b/pkgs/development/libraries/audio/vamp/default.nix @@ -1,16 +1,19 @@ # set VAMP_PATH ? # plugins availible on sourceforge and http://www.vamp-plugins.org/download.html (various licenses) -{ stdenv, fetchurl, pkgconfig, libsndfile }: +{ stdenv, fetchFromGitHub, pkgconfig, libsndfile }: rec { vampSDK = stdenv.mkDerivation { - name = "vamp-sdk-2.5"; + name = "vamp-sdk-2.7.1"; + # version = "2.7.1"; - src = fetchurl { - url = http://code.soundsoftware.ac.uk/attachments/download/690/vamp-plugin-sdk-2.5.tar.gz; - sha256 = "178kfgq08cmgdzv7g8dwyjp4adwx8q04riimncq4nqkm8ng9ywbv"; + src = fetchFromGitHub { + owner = "c4dm"; + repo = "vamp-plugin-sdk"; + rev = "vamp-plugin-sdk-v2.7.1"; + sha256 = "1ifd6l6b89pg83ss4gld5i72fr0cczjnl2by44z5jnndsg3sklw4"; }; nativeBuildInputs = [ pkgconfig ]; From dc524390689f62aefcbaf961df9afd3331ca99f2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Apr 2018 23:28:46 -0700 Subject: [PATCH 008/695] rocksndiamonds: 4.0.1.4 -> 4.1.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/rocksndiamonds/versions. These checks were done: - built on NixOS - ran ‘/nix/store/v9jwi4ziz6yaxhvlrfz6zlx07bdrmsmw-rocksndiamonds-4.1.0.0/bin/rocksndiamonds -h’ got 0 exit code - ran ‘/nix/store/v9jwi4ziz6yaxhvlrfz6zlx07bdrmsmw-rocksndiamonds-4.1.0.0/bin/rocksndiamonds --help’ got 0 exit code - found 4.1.0.0 with grep in /nix/store/v9jwi4ziz6yaxhvlrfz6zlx07bdrmsmw-rocksndiamonds-4.1.0.0 - directory tree listing: https://gist.github.com/9ff0ad9227dc9e0063f83d558a704fb7 --- pkgs/games/rocksndiamonds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/games/rocksndiamonds/default.nix index b84e7dd3af6..09478001fb7 100644 --- a/pkgs/games/rocksndiamonds/default.nix +++ b/pkgs/games/rocksndiamonds/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${project}-${version}"; project = "rocksndiamonds"; - version = "4.0.1.4"; + version = "4.1.0.0"; src = fetchurl { url = "https://www.artsoft.org/RELEASES/unix/${project}/${name}.tar.gz"; - sha256 = "0rvi4crfh4rfczpsflzcfj6nqrg49mhm163k6ms9gxz97xj2jp3g"; + sha256 = "0bmszf2hqyh76p3lzmhljcjwlx7jzpirwx9zyzgfvwqcapf5i6af"; }; desktopItem = makeDesktopItem { From 6392fb3d6ca585c4b4da6a42a93466ca9d19c1e3 Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Sun, 15 Apr 2018 10:49:10 +0200 Subject: [PATCH 009/695] pysensors: init at 2017-07-13 --- .../python-modules/pysensors/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/pysensors/default.nix diff --git a/pkgs/development/python-modules/pysensors/default.nix b/pkgs/development/python-modules/pysensors/default.nix new file mode 100644 index 00000000000..c891140827e --- /dev/null +++ b/pkgs/development/python-modules/pysensors/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildPythonPackage, python, fetchFromGitHub, lm_sensors }: +buildPythonPackage rec { + version = "2017-07-13"; + pname = "pysensors"; + + # note that https://pypi.org/project/PySensors/ is a different project + src = fetchFromGitHub { + owner = "bastienleonard"; + repo = "pysensors"; + rev = "ef46fc8eb181ecb8ad09b3d80bc002d23d9e26b3"; + sha256 = "1xvbxnkz55fk5fpr514263c7s7s9r8hgrw4ybfaj5a0mligmmrfm"; + }; + + buildInputs = [ lm_sensors ]; + + # Tests are disable because they fail on `aarch64-linux`, probably + # due to sandboxing + doCheck = false; + + checkPhase = '' + cd tests + ${python.interpreter} -m unittest discover + ''; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ guibou ]; + description = "Easy hardware health monitoring in Python for Linux systems"; + homepage = http://pysensors.readthedocs.org; + license = licenses.bsd2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e572eaefb2e..d6a8fb0ffaa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18271,6 +18271,8 @@ EOF pyspark = callPackage ../development/python-modules/pyspark { }; + pysensors = callPackage ../development/python-modules/pysensors { }; + sseclient = callPackage ../development/python-modules/sseclient { }; textacy = callPackage ../development/python-modules/textacy { }; From 0fad5f7a8445d2848878789f2d1b9b01fc13c18f Mon Sep 17 00:00:00 2001 From: Marcin Falkiewicz Date: Mon, 23 Apr 2018 16:02:12 +0200 Subject: [PATCH 010/695] wine: add Vulkan support --- pkgs/misc/emulators/wine/base.nix | 1 + pkgs/misc/emulators/wine/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index db58c398526..864b8fac96f 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optional pulseaudioSupport pkgs.libpulseaudio ++ lib.optional xineramaSupport pkgs.xorg.libXinerama ++ lib.optional udevSupport pkgs.udev + ++ lib.optional vulkanSupport pkgs.vulkan-loader ++ lib.optionals gstreamerSupport (with pkgs.gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]) ++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ] ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 91fb0da82d8..ca67ca836ba 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -40,7 +40,9 @@ pulseaudioSupport ? false, udevSupport ? false, xineramaSupport ? false, - xmlSupport ? false }: + xmlSupport ? false, + vulkanSupport ? false, +}: let wine-build = build: release: lib.getAttr build (callPackage ./packages.nix { @@ -51,7 +53,7 @@ let wine-build = build: release: netapiSupport cursesSupport vaSupport pcapSupport v4lSupport saneSupport gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport - openglSupport gstreamerSupport udevSupport; + openglSupport gstreamerSupport udevSupport vulkanSupport; }; }); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a088d6644b..46bdee7b7ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21074,6 +21074,7 @@ with pkgs; fontconfigSupport = true; alsaSupport = true; openglSupport = true; + vulkanSupport = stdenv.isLinux; tlsSupport = true; cupsSupport = true; dbusSupport = true; From 81c1b9c9fc55d86ee3a7178c30e9744a15bd6da5 Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Tue, 24 Apr 2018 21:05:03 +0200 Subject: [PATCH 011/695] googleearth: remove it's broken, and even after adjusting the derivation to the currently available downloads it does not run well for me and it is rather annoying to adjust the derivation to the moving google-earth-stable_current source download link --- .../applications/misc/googleearth/default.nix | 79 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 81 deletions(-) delete mode 100644 pkgs/applications/misc/googleearth/default.nix diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix deleted file mode 100644 index f8ba66c4197..00000000000 --- a/pkgs/applications/misc/googleearth/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ stdenv, fetchurl, glibc, libGLU_combined, freetype, glib, libSM, libICE, libXi, libXv -, libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, qt4 -, zlib, fontconfig, dpkg }: - -let - arch = - if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.system == "i686-linux" then "i386" - else throw "Unsupported system ${stdenv.system}"; - sha256 = - if arch == "amd64" - then "0dwnppn5snl5bwkdrgj4cyylnhngi0g66fn2k41j3dvis83x24k6" - else "0gndbxrj3kgc2dhjqwjifr3cl85hgpm695z0wi01wvwzhrjqs0l2"; - fullPath = stdenv.lib.makeLibraryPath [ - glibc - glib - stdenv.cc.cc - libSM - libICE - libXi - libXv - libGLU_combined - libXrender - libXrandr - libXfixes - libXcursor - libXinerama - freetype - libXext - libX11 - qt4 - zlib - fontconfig - ]; -in -stdenv.mkDerivation rec { - version = "7.1.4.1529"; - name = "googleearth-${version}"; - - src = fetchurl { - url = "https://dl.google.com/earth/client/current/google-earth-stable_current_${arch}.deb"; - inherit sha256; - }; - - phases = "unpackPhase installPhase"; - - buildInputs = [ dpkg ]; - - unpackPhase = '' - dpkg-deb -x ${src} ./ - ''; - - installPhase ='' - mkdir $out - mv usr/* $out/ - rmdir usr - mv * $out/ - rm $out/bin/google-earth $out/opt/google/earth/free/google-earth - ln -s $out/opt/google/earth/free/googleearth $out/bin/google-earth - - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${fullPath}:\$ORIGIN" \ - $out/opt/google/earth/free/googleearth-bin - - for a in $out/opt/google/earth/free/*.so* ; do - patchelf --set-rpath "${fullPath}:\$ORIGIN" $a - done - ''; - - dontPatchELF = true; - - meta = { - description = "A world sphere viewer"; - homepage = http://earth.google.com; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a4ebec0480..90df35e128a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16071,8 +16071,6 @@ with pkgs; google-chrome-dev = google-chrome.override { chromium = chromiumDev; channel = "dev"; }; - googleearth = callPackage_i686 ../applications/misc/googleearth { }; - google-play-music-desktop-player = callPackage ../applications/audio/google-play-music-desktop-player { inherit (gnome2) GConf; }; From e199143f11db153c1b844320295f9a1e1be4ac83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Wed, 25 Apr 2018 00:37:25 +0200 Subject: [PATCH 012/695] matterbridge module: add configPath option as a workaround, waiting for nix encryption --- .../services/networking/matterbridge.nix | 82 ++++++++++++------- 1 file changed, 52 insertions(+), 30 deletions(-) diff --git a/nixos/modules/services/networking/matterbridge.nix b/nixos/modules/services/networking/matterbridge.nix index 5526e2ba23a..e2f47840595 100644 --- a/nixos/modules/services/networking/matterbridge.nix +++ b/nixos/modules/services/networking/matterbridge.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ options, config, pkgs, lib, ... }: with lib; @@ -6,7 +6,11 @@ let cfg = config.services.matterbridge; - matterbridgeConfToml = pkgs.writeText "matterbridge.toml" (cfg.configFile); + matterbridgeConfToml = + if cfg.configPath == null then + pkgs.writeText "matterbridge.toml" (cfg.configFile) + else + cfg.configPath; in @@ -15,17 +19,32 @@ in services.matterbridge = { enable = mkEnableOption "Matterbridge chat platform bridge"; + configPath = mkOption { + type = with types; nullOr str; + default = null; + example = "/etc/nixos/matterbridge.toml"; + description = '' + The path to the matterbridge configuration file. + ''; + }; + configFile = mkOption { type = types.str; example = '' - #WARNING: as this file contains credentials, be sure to set correct file permissions [irc] + # WARNING: as this file contains credentials, do not use this option! + # It is kept only for backwards compatibility, and would cause your + # credentials to be in the nix-store, thus with the world-readable + # permission bits. + # Use services.matterbridge.configPath instead. + + [irc] [irc.freenode] Server="irc.freenode.net:6667" Nick="matterbot" [mattermost] [mattermost.work] - #do not prefix it wit http:// or https:// + # Do not prefix it with http:// or https:// Server="yourmattermostserver.domain" Team="yourteam" Login="yourlogin" @@ -44,6 +63,10 @@ in channel="off-topic" ''; description = '' + WARNING: THIS IS INSECURE, as your password will end up in + /nix/store, thus publicly readable. Use + services.matterbridge.configPath instead. + The matterbridge configuration file in the TOML file format. ''; }; @@ -65,32 +88,31 @@ in }; }; - config = mkMerge [ - (mkIf cfg.enable { + config = mkIf cfg.enable { + warnings = optional options.services.matterbridge.configFile.isDefined + "The option services.matterbridge.configFile is insecure and should be replaced with services.matterbridge.configPath"; - users.extraUsers = mkIf (cfg.user == "matterbridge") [ - { name = "matterbridge"; - group = "matterbridge"; - } ]; - - users.extraGroups = mkIf (cfg.group == "matterbridge") [ - { name = "matterbridge"; - } ]; - - systemd.services.matterbridge = { - description = "Matterbridge chat platform bridge"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - serviceConfig = { - User = cfg.user; - Group = cfg.group; - ExecStart = "${pkgs.matterbridge.bin}/bin/matterbridge -conf ${matterbridgeConfToml}"; - Restart = "always"; - RestartSec = "10"; - }; + users.extraUsers = optional (cfg.user == "matterbridge") + { name = "matterbridge"; + group = "matterbridge"; }; - }) - ]; -} + users.extraGroups = optional (cfg.group == "matterbridge") + { name = "matterbridge"; + }; + + systemd.services.matterbridge = { + description = "Matterbridge chat platform bridge"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + User = cfg.user; + Group = cfg.group; + ExecStart = "${pkgs.matterbridge.bin}/bin/matterbridge -conf ${matterbridgeConfToml}"; + Restart = "always"; + RestartSec = "10"; + }; + }; + }; +} From 184cb1e8c6ac5b226d29f14c5452e9dbafc2792f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 25 Apr 2018 10:01:40 -0700 Subject: [PATCH 013/695] soapysdr+plugins: init at 0.6.1 --- .../applications/misc/soapyairspy/default.nix | 30 +++++++++++ .../misc/soapybladerf/default.nix | 31 ++++++++++++ .../applications/misc/soapyhackrf/default.nix | 30 +++++++++++ .../applications/misc/soapyremote/default.nix | 28 +++++++++++ pkgs/applications/misc/soapysdr/default.nix | 50 +++++++++++++++++++ pkgs/applications/misc/soapyuhd/default.nix | 34 +++++++++++++ pkgs/top-level/all-packages.nix | 23 +++++++++ 7 files changed, 226 insertions(+) create mode 100644 pkgs/applications/misc/soapyairspy/default.nix create mode 100644 pkgs/applications/misc/soapybladerf/default.nix create mode 100644 pkgs/applications/misc/soapyhackrf/default.nix create mode 100644 pkgs/applications/misc/soapyremote/default.nix create mode 100644 pkgs/applications/misc/soapysdr/default.nix create mode 100644 pkgs/applications/misc/soapyuhd/default.nix diff --git a/pkgs/applications/misc/soapyairspy/default.nix b/pkgs/applications/misc/soapyairspy/default.nix new file mode 100644 index 00000000000..af72c784135 --- /dev/null +++ b/pkgs/applications/misc/soapyairspy/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake +, airspy, soapysdr +} : + +let + version = "0.1.1"; + +in stdenv.mkDerivation { + name = "soapyairspy-${version}"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyAirspy"; + rev = "soapy-airspy-${version}"; + sha256 = "072vc9619s9f22k7639krr1p2418cmhgm44yhzy7x9dzapc43wvk"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ airspy soapysdr ]; + + cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/pothosware/SoapyAirspy; + description = "SoapySDR plugin for Airspy devices"; + license = licenses.mit; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/soapybladerf/default.nix b/pkgs/applications/misc/soapybladerf/default.nix new file mode 100644 index 00000000000..4e1adc32946 --- /dev/null +++ b/pkgs/applications/misc/soapybladerf/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, libbladeRF, soapysdr +} : + +let + version = "0.3.5"; + +in stdenv.mkDerivation { + name = "soapybladerf-${version}"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyBladeRF"; + rev = "soapy-bladerf-${version}"; + sha256 = "1n7vy6y8k1smq3l729npxbhxbnrc79gz06dxkibsihz4k8sddkrg"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ libbladeRF soapysdr ]; + + cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; + + + meta = with stdenv.lib; { + homepage = https://github.com/pothosware/SoapyBladeRF; + description = "SoapySDR plugin for BladeRF devices"; + license = licenses.lgpl21; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/soapyhackrf/default.nix b/pkgs/applications/misc/soapyhackrf/default.nix new file mode 100644 index 00000000000..f5543af9c60 --- /dev/null +++ b/pkgs/applications/misc/soapyhackrf/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, hackrf, soapysdr +} : + +let + version = "0.3.2"; + +in stdenv.mkDerivation { + name = "soapyhackrf-${version}"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyHackRF"; + rev = "soapy-hackrf-${version}"; + sha256 = "1sgx2nk8yrzfwisjfs9mw0xwc47bckzi17p42s2pbv7zcxzpb66p"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ hackrf soapysdr ]; + + cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/pothosware/SoapyHackRF; + description = "SoapySDR plugin for HackRF devices"; + license = licenses.mit; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/soapyremote/default.nix b/pkgs/applications/misc/soapyremote/default.nix new file mode 100644 index 00000000000..d10b09f99a8 --- /dev/null +++ b/pkgs/applications/misc/soapyremote/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, cmake, soapysdr }: + +let + version = "0.4.3"; + +in stdenv.mkDerivation { + name = "soapyremote-${version}"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyRemote"; + rev = "d07f43863b1ef79252f8029cfb5947220f21311d"; + sha256 = "0i101dfqq0aawybv0qyjgsnhk39dc4q6z6ys2gsvwjhpf3d48aw0"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ soapysdr ]; + + cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/pothosware/SoapyRemote; + description = "SoapySDR plugin for remote access to SDRs"; + license = licenses.boost; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/soapysdr/default.nix b/pkgs/applications/misc/soapysdr/default.nix new file mode 100644 index 00000000000..6230f2f6f6a --- /dev/null +++ b/pkgs/applications/misc/soapysdr/default.nix @@ -0,0 +1,50 @@ +{ stdenv, lib, lndir, makeWrapper +, fetchFromGitHub, cmake +, libusb, pkgconfig +, python, swig2, numpy, ncurses +, extraPackages ? [] +} : + +let + version = "0.6.1"; + +in stdenv.mkDerivation { + name = "soapysdr-${version}"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapySDR"; + rev = "soapy-sdr-${version}"; + sha256 = "1azbb2j6dv0b2dd5ks6yqd31j17sdhi9p82czwc8zy2isymax0l9"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ libusb ncurses numpy swig2 python ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DUSE_PYTHON_CONFIG=ON" + ]; + + postFixup = lib.optionalString (lib.length extraPackages != 0) '' + # Join all plugins via symlinking + for i in ${toString extraPackages}; do + ${lndir}/bin/lndir -silent $i $out + done + + # Needed for at least the remote plugin server + for file in out/bin/*; do + ${makeWrapper}/bin/wrapProgram "$file" \ + --prefix SOAPY_SDR_PLUGIN_PATH : ${lib.makeSearchPath "lib/SoapySDR/modules0.6" extraPackages} + done + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/pothosware/SoapySDR; + description = "Vendor and platform neutral SDR support library"; + license = licenses.boost; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/applications/misc/soapyuhd/default.nix b/pkgs/applications/misc/soapyuhd/default.nix new file mode 100644 index 00000000000..4f2a79c97fe --- /dev/null +++ b/pkgs/applications/misc/soapyuhd/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, uhd, boost, soapysdr +} : + +let + version = "0.3.4"; + +in stdenv.mkDerivation { + name = "soapyuhd-${version}"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyUHD"; + rev = "soapy-uhd-${version}"; + sha256 = "1da7cjcvfdqhgznm7x14s1h7lwz5lan1b48akw445ah1vxwvh4hl"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ uhd boost soapysdr ]; + + cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; + + postPatch = '' + sed -i "s:DESTINATION .*uhd/modules:DESTINATION $out/lib/uhd/modules:" CMakeLists.txt + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/pothosware/SoapyAirspy; + description = "SoapySDR plugin for UHD devices"; + license = licenses.gpl3; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5e8b16e017..b9399883823 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11464,6 +11464,29 @@ with pkgs; snappy = callPackage ../development/libraries/snappy { }; + soapyairspy = callPackage ../applications/misc/soapyairspy { }; + + soapybladerf = callPackage ../applications/misc/soapybladerf { }; + + soapyhackrf = callPackage ../applications/misc/soapyhackrf { }; + + soapysdr = callPackage ../applications/misc/soapysdr { inherit (python3Packages) python numpy; }; + + soapyremote = callPackage ../applications/misc/soapyremote { }; + + soapysdr-with-plugins = callPackage ../applications/misc/soapysdr { + inherit (python3Packages) python numpy; + extraPackages = [ + soapyairspy + soapybladerf + soapyhackrf + soapyremote + soapyuhd + ]; + }; + + soapyuhd = callPackage ../applications/misc/soapyuhd { }; + socket_wrapper = callPackage ../development/libraries/socket_wrapper { }; sofia_sip = callPackage ../development/libraries/sofia-sip { }; From e0d33717282a3fba85840c01ae8ac485832fed93 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 25 Apr 2018 11:54:41 -0700 Subject: [PATCH 014/695] limesuite: init at 18.04.1 --- pkgs/applications/misc/limesuite/default.nix | 55 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 2 files changed, 58 insertions(+) create mode 100644 pkgs/applications/misc/limesuite/default.nix diff --git a/pkgs/applications/misc/limesuite/default.nix b/pkgs/applications/misc/limesuite/default.nix new file mode 100644 index 00000000000..e166c7a6b51 --- /dev/null +++ b/pkgs/applications/misc/limesuite/default.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchFromGitHub, cmake +, sqlite, wxGTK30, libusb1, soapysdr +, mesa_glu, libX11, gnuplot, fltk +} : + +let + version = "18.04.1"; + +in stdenv.mkDerivation { + name = "limesuite-${version}"; + + src = fetchFromGitHub { + owner = "myriadrf"; + repo = "LimeSuite"; + rev = "v${version}"; + sha256 = "1aaqnwif1j045hvj011k5dyqxgxx72h33r4al74h5f8al81zvzj9"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + libusb1 + sqlite + wxGTK30 + fltk + gnuplot + libusb1 + soapysdr + mesa_glu + libX11 + ]; + + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; + + postInstall = '' + mkdir -p $out/lib/udev/rules.d + cp ../udev-rules/64-limesuite.rules $out/lib/udev/rules.d + + mkdir -p $out/share/limesuite + cp bin/Release/lms7suite_mcu/* $out/share/limesuite + + cp bin/dualRXTX $out/bin + cp bin/basicRX $out/bin + cp bin/singleRX $out/bin + ''; + + meta = with stdenv.lib; { + description = "Driver and GUI for LMS7002M-based SDR platforms"; + homepage = https://github.com/myriadrf/LimeSuite; + license = licenses.apache2; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9399883823..1b6135c4dbc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3513,6 +3513,8 @@ with pkgs; libwebsockets = callPackage ../development/libraries/libwebsockets { }; + limesuite = callPackage ../applications/misc/limesuite { }; + limesurvey = callPackage ../servers/limesurvey { }; linuxquota = callPackage ../tools/misc/linuxquota { }; @@ -11477,6 +11479,7 @@ with pkgs; soapysdr-with-plugins = callPackage ../applications/misc/soapysdr { inherit (python3Packages) python numpy; extraPackages = [ + limesuite soapyairspy soapybladerf soapyhackrf From 7ba275410139c664354557f152ff8739631f498e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 25 Apr 2018 11:58:50 -0700 Subject: [PATCH 015/695] welle-io: add soapysdr support --- pkgs/applications/misc/welle-io/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/welle-io/default.nix b/pkgs/applications/misc/welle-io/default.nix index d705de1a8cd..b3a9a3f3b86 100644 --- a/pkgs/applications/misc/welle-io/default.nix +++ b/pkgs/applications/misc/welle-io/default.nix @@ -1,6 +1,6 @@ { stdenv, buildEnv, fetchFromGitHub, cmake, pkgconfig , qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2 -, faad2, rtl-sdr, libusb, fftwSinglePrec }: +, faad2, rtl-sdr, soapysdr-with-plugins, libusb, fftwSinglePrec }: let version = "1.0-rc2"; @@ -28,10 +28,11 @@ in stdenv.mkDerivation { qtquickcontrols qtquickcontrols2 rtl-sdr + soapysdr-with-plugins ]; cmakeFlags = [ - "-DRTLSDR=true" + "-DRTLSDR=true" "-DSOAPYSDR=true" ]; enableParallelBuilding = true; From 683b91ea1083b39958939f487f31e4aaabfa4996 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 25 Apr 2018 12:59:23 -0700 Subject: [PATCH 016/695] limesuite: fix license --- pkgs/applications/misc/limesuite/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/limesuite/default.nix b/pkgs/applications/misc/limesuite/default.nix index e166c7a6b51..fb1ef8fb669 100644 --- a/pkgs/applications/misc/limesuite/default.nix +++ b/pkgs/applications/misc/limesuite/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Driver and GUI for LMS7002M-based SDR platforms"; homepage = https://github.com/myriadrf/LimeSuite; - license = licenses.apache2; + license = licenses.asl20; maintainers = with maintainers; [ markuskowa ]; platforms = platforms.linux; }; From 42297b0e1ce0198fa87b3b1d31c2057707ad4611 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 25 Apr 2018 14:44:03 -0700 Subject: [PATCH 017/695] limesuite: removed unnecessary cmakeFlag --- pkgs/applications/misc/limesuite/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/misc/limesuite/default.nix b/pkgs/applications/misc/limesuite/default.nix index fb1ef8fb669..4599fab0c6d 100644 --- a/pkgs/applications/misc/limesuite/default.nix +++ b/pkgs/applications/misc/limesuite/default.nix @@ -30,8 +30,6 @@ in stdenv.mkDerivation { libX11 ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - postInstall = '' mkdir -p $out/lib/udev/rules.d cp ../udev-rules/64-limesuite.rules $out/lib/udev/rules.d From 4de774a63bef6d97246641212d8c38cc34ff6665 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 26 Apr 2018 06:09:05 +0200 Subject: [PATCH 018/695] nixos/dhparams: Add a VM test We're going to make changes to the dhparams module so we really want to make sure we don't break it, so having a NixOS VM test is to make sure we don't blow things up and can iterate on it. Signed-off-by: aszlig Cc: @Ekleog --- nixos/release.nix | 1 + nixos/tests/dhparams.nix | 105 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+) create mode 100644 nixos/tests/dhparams.nix diff --git a/nixos/release.nix b/nixos/release.nix index 2f779280e6b..9d8a62f9995 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -269,6 +269,7 @@ in rec { tests.containers-macvlans = callTest tests/containers-macvlans.nix {}; tests.couchdb = callTest tests/couchdb.nix {}; tests.deluge = callTest tests/deluge.nix {}; + tests.dhparams = callTest tests/dhparams.nix {}; tests.docker = callTestOnMatchingSystems ["x86_64-linux"] tests/docker.nix {}; tests.docker-tools = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools.nix {}; tests.docker-tools-overlay = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools-overlay.nix {}; diff --git a/nixos/tests/dhparams.nix b/nixos/tests/dhparams.nix new file mode 100644 index 00000000000..36079b99097 --- /dev/null +++ b/nixos/tests/dhparams.nix @@ -0,0 +1,105 @@ +let + common = { pkgs, ... }: { + security.dhparams.enable = true; + environment.systemPackages = [ pkgs.openssl ]; + }; + +in import ./make-test.nix { + name = "dhparams"; + + nodes.generation1 = { pkgs, config, ... }: { + imports = [ common ]; + security.dhparams.params.foo = 16; + security.dhparams.params.bar = 17; + + systemd.services.foo = { + description = "Check systemd Ordering"; + wantedBy = [ "multi-user.target" ]; + unitConfig = { + # This is to make sure that the dhparams generation of foo occurs + # before this service so we need this service to start as early as + # possible to provoke a race condition. + DefaultDependencies = false; + + # We check later whether the service has been started or not. + ConditionPathExists = "${config.security.dhparams.path}/foo.pem"; + }; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + # The reason we only provide an ExecStop here is to ensure that we don't + # accidentally trigger an error because a file system is not yet ready + # during very early startup (we might not even have the Nix store + # available, for example if future changes in NixOS use systemd mount + # units to do early file system initialisation). + serviceConfig.ExecStop = "${pkgs.coreutils}/bin/true"; + }; + }; + + nodes.generation2 = { + imports = [ common ]; + security.dhparams.params.foo = 18; + }; + + nodes.generation3 = common; + + testScript = { nodes, ... }: let + getParamPath = gen: name: let + node = "generation${toString gen}"; + inherit (nodes.${node}.config.security.dhparams) path; + in "${path}/${name}.pem"; + + assertParamBits = gen: name: bits: let + path = getParamPath gen name; + in '' + $machine->nest('check bit size of ${path}', sub { + my $out = $machine->succeed('openssl dhparam -in ${path} -text'); + $out =~ /^\s*DH Parameters:\s+\((\d+)\s+bit\)\s*$/m; + die "bit size should be ${toString bits} but it is $1 instead." + if $1 != ${toString bits}; + }); + ''; + + switchToGeneration = gen: let + node = "generation${toString gen}"; + inherit (nodes.${node}.config.system.build) toplevel; + switchCmd = "${toplevel}/bin/switch-to-configuration test"; + in '' + $machine->nest('switch to generation ${toString gen}', sub { + $machine->succeed('${switchCmd}'); + $main::machine = ''$${node}; + }); + ''; + + in '' + my $machine = $generation1; + + $machine->waitForUnit('multi-user.target'); + + subtest "verify startup order", sub { + $machine->succeed('systemctl is-active foo.service'); + }; + + subtest "check bit sizes of dhparam files", sub { + ${assertParamBits 1 "foo" 16} + ${assertParamBits 1 "bar" 17} + }; + + ${switchToGeneration 2} + + subtest "check whether bit size has changed", sub { + ${assertParamBits 2 "foo" 18} + }; + + subtest "ensure that dhparams file for 'bar' was deleted", sub { + $machine->fail('test -e ${getParamPath 1 "bar"}'); + }; + + ${switchToGeneration 3} + + subtest "ensure that 'security.dhparams.path' has been deleted", sub { + $machine->fail( + 'test -e ${nodes.generation3.config.security.dhparams.path}' + ); + }; + ''; +} From 761266bd18cf1117a11d2fd6168259f7fe867122 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 26 Apr 2018 06:19:48 +0200 Subject: [PATCH 019/695] nixos/dhparams: Turn params into a submodule We're going to implement an option which allows us to turn off stateful handling of Diffie-Hellman parameter files by putting them into the Nix store. However, modules now might need a way to reference these files, so we add a now path option to every param specified, which carries a read-only value of the path where to find the corresponding DH params file. I've also improved the description of security.dhparams.params a bit so that it uses and . The NixOS VM test also reflects this change and checks whether the old way to specify the bit size still works. Signed-off-by: aszlig Cc: @Ekleog --- nixos/modules/security/dhparams.nix | 64 +++++++++++++++++++++-------- nixos/tests/dhparams.nix | 16 +++++--- 2 files changed, 57 insertions(+), 23 deletions(-) diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix index 55c75713101..7c9fe986e57 100644 --- a/nixos/modules/security/dhparams.nix +++ b/nixos/modules/security/dhparams.nix @@ -1,10 +1,38 @@ { config, lib, pkgs, ... }: with lib; + let cfg = config.security.dhparams; -in -{ + + paramsSubmodule = { name, config, ... }: { + options.bits = mkOption { + type = types.addCheck types.int (b: b >= 16) // { + name = "bits"; + description = "integer of at least 16 bits"; + }; + default = 4096; + description = '' + The bit size for the prime that is used during a Diffie-Hellman + key exchange. + ''; + }; + + options.path = mkOption { + type = types.path; + readOnly = true; + description = '' + The resulting path of the generated Diffie-Hellman parameters + file for other services to reference. This could be either a + store path or a file inside the directory specified by + . + ''; + }; + + config.path = "${cfg.path}/${name}.pem"; + }; + +in { options = { security.dhparams = { params = mkOption { @@ -14,21 +42,23 @@ in The value is the size (in bits) of the DH params to generate. The generated DH params path can be found in - security.dhparams.path/name.pem. + config.security.dhparams.params.name.path. - Note: The name of the DH params is taken as being the name of the - service it serves: the params will be generated before the said - service is started. + The name of the DH params is taken as being the name of + the service it serves and the params will be generated before the + said service is started. - Warning: If you are removing all dhparams from this list, you have - to leave security.dhparams.enable for at least one activation in - order to have them be cleaned up. This also means if you rollback to - a version without any dhparams the existing ones won't be cleaned - up. + If you are removing all dhparams from this list, you + have to leave for at + least one activation in order to have them be cleaned up. This also + means if you rollback to a version without any dhparams the + existing ones won't be cleaned up. ''; - type = with types; attrsOf int; + type = with types; let + coerce = bits: { inherit bits; }; + in attrsOf (coercedTo types.int coerce (submodule paramsSubmodule)); default = {}; - example = { nginx = 3072; }; + example = literalExample "{ nginx.bits = 3072; }"; }; path = mkOption { @@ -71,10 +101,10 @@ in if [ ! -f "$file" ]; then continue fi - '' + concatStrings (mapAttrsToList (name: value: + '' + concatStrings (mapAttrsToList (name: { bits, ... }: '' if [ "$file" == "${cfg.path}/${name}.pem" ] && \ - ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text | head -n 1 | grep "(${toString value} bit)" > /dev/null; then + ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text | head -n 1 | grep "(${toString bits} bit)" > /dev/null; then continue fi '' @@ -89,7 +119,7 @@ in ''; }; } // - mapAttrs' (name: value: nameValuePair "dhparams-gen-${name}" { + mapAttrs' (name: { bits, ... }: nameValuePair "dhparams-gen-${name}" { description = "Generate Diffie-Hellman parameters for ${name} if they don't exist yet"; after = [ "dhparams-init.service" ]; before = [ "${name}.service" ]; @@ -99,7 +129,7 @@ in '' mkdir -p ${cfg.path} if [ ! -f ${cfg.path}/${name}.pem ]; then - ${pkgs.openssl}/bin/openssl dhparam -out ${cfg.path}/${name}.pem ${toString value} + ${pkgs.openssl}/bin/openssl dhparam -out ${cfg.path}/${name}.pem ${toString bits} fi ''; }) cfg.params; diff --git a/nixos/tests/dhparams.nix b/nixos/tests/dhparams.nix index 36079b99097..ead5f2efce7 100644 --- a/nixos/tests/dhparams.nix +++ b/nixos/tests/dhparams.nix @@ -9,8 +9,13 @@ in import ./make-test.nix { nodes.generation1 = { pkgs, config, ... }: { imports = [ common ]; - security.dhparams.params.foo = 16; - security.dhparams.params.bar = 17; + security.dhparams.params = { + # Use low values here because we don't want the test to run for ages. + foo.bits = 16; + # Also use the old format to make sure the type is coerced in the right + # way. + bar = 17; + }; systemd.services.foo = { description = "Check systemd Ordering"; @@ -22,7 +27,7 @@ in import ./make-test.nix { DefaultDependencies = false; # We check later whether the service has been started or not. - ConditionPathExists = "${config.security.dhparams.path}/foo.pem"; + ConditionPathExists = config.security.dhparams.params.foo.path; }; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; @@ -37,7 +42,7 @@ in import ./make-test.nix { nodes.generation2 = { imports = [ common ]; - security.dhparams.params.foo = 18; + security.dhparams.params.foo.bits = 18; }; nodes.generation3 = common; @@ -45,8 +50,7 @@ in import ./make-test.nix { testScript = { nodes, ... }: let getParamPath = gen: name: let node = "generation${toString gen}"; - inherit (nodes.${node}.config.security.dhparams) path; - in "${path}/${name}.pem"; + in nodes.${node}.config.security.dhparams.params.${name}.path; assertParamBits = gen: name: bits: let path = getParamPath gen name; From 3e11ff6e0d9fb21a962408407f24b465b30fe96f Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 26 Apr 2018 06:38:02 +0200 Subject: [PATCH 020/695] nixos/dhparams: Introduce a 'stateful' option This option allows us to turn off stateful generation of Diffie-Hellman parameters, which in some way is still stateful as the generated DH params file is non-deterministic. However what we can avoid with this is to have an increased surface for failures during system startup, because generation of the parameters is done during build-time. Another advantage of this is that we no longer need to take care of cleaning up the files that are no longer used and in my humble opinion I would have preferred that #11505 (which puts the dhparams in the Nix store) would have been merged instead of #22634 (which we have now). Luckily we can still change that and this change gives the user the option to put the dhparams into the Nix store. Beside of the more obvious advantages pointed out here, this also effects test runtime if more services are starting to use this (for example see #39507 and #39288), because generating DH params could take a long time depending on the bit size which adds up to test runtime. If we generate the DH params in a separate derivation, subsequent test runs won't need to wait for DH params generation during bootup. Of course, tests could still mock this by force-disabling the service and adding a service or activation script that places pre-generated DH params in /var/lib/dhparams but this would make tests less readable and the workaround would have to be made for each test affected. Note that the 'stateful' option is still true by default so that we are backwards-compatible with existing systems. Signed-off-by: aszlig Cc: @Ekleog, @abbradar, @fpletz --- nixos/modules/security/dhparams.nix | 39 +++++++++++++++++++++++------ nixos/tests/dhparams.nix | 21 ++++++++++++++++ 2 files changed, 52 insertions(+), 8 deletions(-) diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix index 7c9fe986e57..64b296eea5b 100644 --- a/nixos/modules/security/dhparams.nix +++ b/nixos/modules/security/dhparams.nix @@ -29,7 +29,11 @@ let ''; }; - config.path = "${cfg.path}/${name}.pem"; + config.path = let + generated = pkgs.runCommand "dhparams-${name}.pem" { + nativeBuildInputs = [ pkgs.openssl ]; + } "openssl dhparam -out \"$out\" ${toString config.bits}"; + in if cfg.stateful then "${cfg.path}/${name}.pem" else generated; }; in { @@ -52,7 +56,9 @@ in { have to leave for at least one activation in order to have them be cleaned up. This also means if you rollback to a version without any dhparams the - existing ones won't be cleaned up. + existing ones won't be cleaned up. Of course this only applies if + is + true. ''; type = with types; let coerce = bits: { inherit bits; }; @@ -61,12 +67,29 @@ in { example = literalExample "{ nginx.bits = 3072; }"; }; + stateful = mkOption { + type = types.bool; + default = true; + description = '' + Whether generation of Diffie-Hellman parameters should be stateful or + not. If this is enabled, PEM-encoded files for Diffie-Hellman + parameters are placed in the directory specified by + . Otherwise the files are + created within the Nix store. + + If this is false the resulting store + path will be non-deterministic and will be rebuilt every time the + openssl package changes. + ''; + }; + path = mkOption { - description = - '' - Path to the directory in which Diffie-Hellman parameters will be - stored. - ''; + description = '' + Path to the directory in which Diffie-Hellman parameters will be + stored. This only is relevant if + is + true. + ''; type = types.str; default = "/var/lib/dhparams"; }; @@ -82,7 +105,7 @@ in { }; }; - config = mkIf cfg.enable { + config = mkIf (cfg.enable && cfg.stateful) { systemd.services = { dhparams-init = { description = "Cleanup old Diffie-Hellman parameters"; diff --git a/nixos/tests/dhparams.nix b/nixos/tests/dhparams.nix index ead5f2efce7..da75391e4ce 100644 --- a/nixos/tests/dhparams.nix +++ b/nixos/tests/dhparams.nix @@ -47,6 +47,13 @@ in import ./make-test.nix { nodes.generation3 = common; + nodes.generation4 = { + imports = [ common ]; + security.dhparams.stateful = false; + security.dhparams.params.foo2.bits = 18; + security.dhparams.params.bar2.bits = 19; + }; + testScript = { nodes, ... }: let getParamPath = gen: name: let node = "generation${toString gen}"; @@ -105,5 +112,19 @@ in import ./make-test.nix { 'test -e ${nodes.generation3.config.security.dhparams.path}' ); }; + + ${switchToGeneration 4} + + subtest "check bit sizes dhparam files", sub { + ${assertParamBits 4 "foo2" 18} + ${assertParamBits 4 "bar2" 19} + }; + + subtest "check whether dhparam files are in the Nix store", sub { + $machine->succeed( + 'expr match ${getParamPath 4 "foo2"} ${builtins.storeDir}', + 'expr match ${getParamPath 4 "bar2"} ${builtins.storeDir}', + ); + }; ''; } From ce8777386786f5a38fb0bc8728515a66c82c3d04 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 26 Apr 2018 07:11:54 +0200 Subject: [PATCH 021/695] nixos/dhparams: Clean up module expression First of all let's start with a clean up the multiline string indentation for descriptions, because having two indentation levels after description is a waste of screen estate. A quick survey in the form of the following also reveals that the majority of multiline strings in nixpkgs is starting the two beginning quotes in the same line: $ find -name '*.nix' -exec sed -n -e '/=$/ { n; /'\'\''/p }' {} + | wc -l 817 $ find -name '*.nix' -exec grep "= *'' *\$" {} + | wc -l 14818 The next point is to get the type, default and example attributes on top of the description because that's the way it's rendered in the manual. Most services have their enable option close to the beginning of the file, so let's move it to the top. Also, I found the script attribute for dhparams-init.service a bit hard to read as it was using string concatenation to split a "for" loop. Now for the more substantial clean ups rather than just code style: * Remove the "with lib;" at the beginning of the module, because it makes it easier to do a quick check with "nix-instantiate --parse". * Use ConditionPathExists instead of test -e for checking whether we need to generate the dhparams file. This avoids spawning a shell if the file exists already and it's probably more common that it will exist, except for the initial creation of course. * When cleaning up old dhparams file, use RemainAfterExit so that the unit won't be triggered again whenever we stop and start a service depending on it. * Capitalize systemd unit descriptions to be more in par with most other unit descriptions (also see 0c5e837b66f58265ce2b66a33d0f47a3). * Use "=" instead of "==" for conditionals using []. It's just a very small nitpick though and it will only fail for POSIX shells. Bash on the other side accepts it anyway. Signed-off-by: aszlig Cc: @Ekleog --- nixos/modules/security/dhparams.nix | 154 ++++++++++++++-------------- 1 file changed, 75 insertions(+), 79 deletions(-) diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix index 64b296eea5b..481d4c5db51 100644 --- a/nixos/modules/security/dhparams.nix +++ b/nixos/modules/security/dhparams.nix @@ -1,8 +1,7 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) mkOption types; cfg = config.security.dhparams; paramsSubmodule = { name, config, ... }: { @@ -39,32 +38,39 @@ let in { options = { security.dhparams = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to generate new DH params and clean up old DH params. + ''; + }; + params = mkOption { - description = - '' - Diffie-Hellman parameters to generate. - - The value is the size (in bits) of the DH params to generate. The - generated DH params path can be found in - config.security.dhparams.params.name.path. - - The name of the DH params is taken as being the name of - the service it serves and the params will be generated before the - said service is started. - - If you are removing all dhparams from this list, you - have to leave for at - least one activation in order to have them be cleaned up. This also - means if you rollback to a version without any dhparams the - existing ones won't be cleaned up. Of course this only applies if - is - true. - ''; type = with types; let coerce = bits: { inherit bits; }; - in attrsOf (coercedTo types.int coerce (submodule paramsSubmodule)); + in attrsOf (coercedTo int coerce (submodule paramsSubmodule)); default = {}; - example = literalExample "{ nginx.bits = 3072; }"; + example = lib.literalExample "{ nginx.bits = 3072; }"; + description = '' + Diffie-Hellman parameters to generate. + + The value is the size (in bits) of the DH params to generate. The + generated DH params path can be found in + config.security.dhparams.params.name.path. + + The name of the DH params is taken as being the name of + the service it serves and the params will be generated before the + said service is started. + + If you are removing all dhparams from this list, you + have to leave for at + least one activation in order to have them be cleaned up. This also + means if you rollback to a version without any dhparams the + existing ones won't be cleaned up. Of course this only applies if + is + true. + ''; }; stateful = mkOption { @@ -84,77 +90,67 @@ in { }; path = mkOption { + type = types.str; + default = "/var/lib/dhparams"; description = '' Path to the directory in which Diffie-Hellman parameters will be stored. This only is relevant if is true. ''; - type = types.str; - default = "/var/lib/dhparams"; - }; - - enable = mkOption { - description = - '' - Whether to generate new DH params and clean up old DH params. - ''; - default = false; - type = types.bool; }; }; }; - config = mkIf (cfg.enable && cfg.stateful) { + config = lib.mkIf (cfg.enable && cfg.stateful) { systemd.services = { dhparams-init = { - description = "Cleanup old Diffie-Hellman parameters"; - wantedBy = [ "multi-user.target" ]; # Clean up even when no DH params is set - serviceConfig.Type = "oneshot"; - script = - # Create directory - '' - if [ ! -d ${cfg.path} ]; then - mkdir -p ${cfg.path} - fi - '' + - # Remove old dhparams - '' - for file in ${cfg.path}/*; do - if [ ! -f "$file" ]; then - continue - fi - '' + concatStrings (mapAttrsToList (name: { bits, ... }: - '' - if [ "$file" == "${cfg.path}/${name}.pem" ] && \ - ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text | head -n 1 | grep "(${toString bits} bit)" > /dev/null; then - continue - fi - '' - ) cfg.params) + - '' - rm $file - done + description = "Clean Up Old Diffie-Hellman Parameters"; - # TODO: Ideally this would be removing the *former* cfg.path, though this - # does not seem really important as changes to it are quite unlikely - rmdir --ignore-fail-on-non-empty ${cfg.path} - ''; - }; - } // - mapAttrs' (name: { bits, ... }: nameValuePair "dhparams-gen-${name}" { - description = "Generate Diffie-Hellman parameters for ${name} if they don't exist yet"; - after = [ "dhparams-init.service" ]; - before = [ "${name}.service" ]; + # Clean up even when no DH params is set wantedBy = [ "multi-user.target" ]; + + serviceConfig.RemainAfterExit = true; serviceConfig.Type = "oneshot"; - script = - '' + + script = '' + if [ ! -d ${cfg.path} ]; then mkdir -p ${cfg.path} - if [ ! -f ${cfg.path}/${name}.pem ]; then - ${pkgs.openssl}/bin/openssl dhparam -out ${cfg.path}/${name}.pem ${toString bits} + fi + + # Remove old dhparams + for file in ${cfg.path}/*; do + if [ ! -f "$file" ]; then + continue fi - ''; - }) cfg.params; + ${lib.concatStrings (lib.mapAttrsToList (name: { bits, path, ... }: '' + if [ "$file" = ${lib.escapeShellArg path} ] && \ + ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text \ + | head -n 1 | grep "(${toString bits} bit)" > /dev/null; then + continue + fi + '') cfg.params)} + rm $file + done + + # TODO: Ideally this would be removing the *former* cfg.path, though + # this does not seem really important as changes to it are quite + # unlikely + rmdir --ignore-fail-on-non-empty ${cfg.path} + ''; + }; + } // lib.mapAttrs' (name: { bits, path, ... }: lib.nameValuePair "dhparams-gen-${name}" { + description = "Generate Diffie-Hellman Parameters for ${name}"; + after = [ "dhparams-init.service" ]; + before = [ "${name}.service" ]; + wantedBy = [ "multi-user.target" ]; + unitConfig.ConditionPathExists = "!${path}"; + serviceConfig.Type = "oneshot"; + script = '' + mkdir -p ${lib.escapeShellArg cfg.path} + ${pkgs.openssl}/bin/openssl dhparam -out ${lib.escapeShellArg path} \ + ${toString bits} + ''; + }) cfg.params; }; } From c35dc53e5652e85a7692ef1f0176f80c7ebc406a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 26 Apr 2018 01:17:40 -0700 Subject: [PATCH 022/695] welle-io: remove aarch64 from platform flags --- pkgs/applications/misc/welle-io/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/misc/welle-io/default.nix b/pkgs/applications/misc/welle-io/default.nix index b3a9a3f3b86..143ec518ac5 100644 --- a/pkgs/applications/misc/welle-io/default.nix +++ b/pkgs/applications/misc/welle-io/default.nix @@ -42,7 +42,6 @@ in stdenv.mkDerivation { homepage = http://www.welle.io/; maintainers = with maintainers; [ ck3d ]; license = licenses.gpl2; - platforms = with platforms; linux ++ darwin; + platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin; }; - } From a050133e9f75010fc2fba37c4acfe98c264f6e4c Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 26 Apr 2018 19:39:03 +0900 Subject: [PATCH 023/695] linux-mptcp: enable advanced schedulers --- pkgs/os-specific/linux/kernel/linux-mptcp.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index c4bade2abed..d486bd1d6d2 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -33,8 +33,7 @@ buildLinux (rec { DEFAULT_MPTCP_PM default # MPTCP scheduler selection. - # Disabled as the only non-default is the useless round-robin. - MPTCP_SCHED_ADVANCED n + MPTCP_SCHED_ADVANCED y DEFAULT_MPTCP_SCHED default # Smarter TCP congestion controllers From 882ed257d639dbea50dfaf8221808a9ddb6ffb71 Mon Sep 17 00:00:00 2001 From: Bernard Fortz Date: Thu, 26 Apr 2018 19:08:50 +0200 Subject: [PATCH 024/695] owncloud-client: 2.3.4 -> 2.4.1 --- .../networking/owncloud-client/default.nix | 6 +++--- .../networking/owncloud-client/find-sql.patch | 12 ++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/networking/owncloud-client/find-sql.patch diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 94e3b7d0ba6..17c5cc86fa6 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "owncloud-client-${version}"; - version = "2.3.4"; + version = "2.4.1"; src = fetchurl { url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz"; - sha256 = "1fpi1mlp2b8sx2993b4mava5c6qw794dmlayih430299z1l9wh49"; + sha256 = "4462ae581c281123dc62f3604f1aa54c8f4a60cd8157b982e2d76faac0f7aa23"; }; - patches = [ ../nextcloud-client/find-sql.patch ]; + patches = [ ./find-sql.patch ]; nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ qtbase qtwebkit qtkeychain sqlite ]; diff --git a/pkgs/applications/networking/owncloud-client/find-sql.patch b/pkgs/applications/networking/owncloud-client/find-sql.patch new file mode 100644 index 00000000000..44dea6414e9 --- /dev/null +++ b/pkgs/applications/networking/owncloud-client/find-sql.patch @@ -0,0 +1,12 @@ +*** a/cmake/modules/QtVersionAbstraction.cmake +--- b/cmake/modules/QtVersionAbstraction.cmake +*************** +*** 8,13 **** +--- 8,14 ---- + find_package(Qt5Core REQUIRED) + find_package(Qt5Network REQUIRED) + find_package(Qt5Xml REQUIRED) ++ find_package(Qt5Sql REQUIRED) + find_package(Qt5Concurrent REQUIRED) + if(UNIT_TESTING) + find_package(Qt5Test REQUIRED) From ca0604190e4428e1cdf9bb369fbbf73e1679e007 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 18 Apr 2018 11:29:54 +0900 Subject: [PATCH 025/695] qemu-guest-agent: init module Allow out of band communication between qemu VMs and the host. Useful to retrieve IPs of VMs from the host (for instance when libvirt can't analyze DHCP requests because VMs are configured with static addresses or when there is connectivity default). --- nixos/modules/module-list.nix | 1 + .../virtualisation/qemu-guest-agent.nix | 36 +++++++++++++++++++ nixos/modules/virtualisation/qemu-vm.nix | 11 ++++++ 3 files changed, 48 insertions(+) create mode 100644 nixos/modules/virtualisation/qemu-guest-agent.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 8ef76b9d81e..8a81a5fff8d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -777,6 +777,7 @@ ./virtualisation/hyperv-guest.nix ./virtualisation/openvswitch.nix ./virtualisation/parallels-guest.nix + ./virtualisation/qemu-guest-agent.nix ./virtualisation/rkt.nix ./virtualisation/virtualbox-guest.nix ./virtualisation/virtualbox-host.nix diff --git a/nixos/modules/virtualisation/qemu-guest-agent.nix b/nixos/modules/virtualisation/qemu-guest-agent.nix new file mode 100644 index 00000000000..e0d2b3dc509 --- /dev/null +++ b/nixos/modules/virtualisation/qemu-guest-agent.nix @@ -0,0 +1,36 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.qemuGuest; +in { + + options.services.qemuGuest = { + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable the qemu guest agent."; + }; + }; + + config = mkIf cfg.enable ( + mkMerge [ + { + + services.udev.extraRules = '' + SUBSYSTEM=="virtio-ports", ATTR{name}=="org.qemu.guest_agent.0", TAG+="systemd" ENV{SYSTEMD_WANTS}="qemu-guest-agent.service" + ''; + + systemd.services.qemu-guest-agent = { + description = "Run the QEMU Guest Agent"; + serviceConfig = { + ExecStart = "${pkgs.kvm.ga}/bin/qemu-ga"; + Restart = "always"; + RestartSec = 0; + }; + }; + } + ] + ); +} diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 2b78276fcde..57e25d808dc 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -343,6 +343,15 @@ in (virtio or scsi). ''; }; + + guestAgent.enable = + mkOption { + default = true; + type = types.bool; + description = '' + Enable the Qemu guest agent. + ''; + }; }; virtualisation.useBootLoader = @@ -494,6 +503,8 @@ in # Don't run ntpd in the guest. It should get the correct time from KVM. services.timesyncd.enable = false; + services.qemuGuest.enable = cfg.qemu.guestAgent.enable; + system.build.vm = pkgs.runCommand "nixos-vm" { preferLocalBuild = true; } '' mkdir -p $out/bin From 837e8c342c2eb3e83873134374854280c873932d Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 27 Apr 2018 18:52:46 -0400 Subject: [PATCH 026/695] conglomerate: init at 2017-09-10 --- .../science/biology/conglomerate/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/science/biology/conglomerate/default.nix diff --git a/pkgs/applications/science/biology/conglomerate/default.nix b/pkgs/applications/science/biology/conglomerate/default.nix new file mode 100644 index 00000000000..8e24eacca2b --- /dev/null +++ b/pkgs/applications/science/biology/conglomerate/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, cmake, coreutils, perl, bicpl, libminc, zlib, minc_tools, + makeWrapper, GetoptTabular, MNI-Perllib }: + +stdenv.mkDerivation rec { + pname = "conglomerate"; + name = "${pname}-2017-09-10"; + + src = fetchFromGitHub { + owner = "BIC-MNI"; + repo = pname; + rev = "7343238bc6215942c7ecc885a224f24433a291b0"; + sha256 = "1mlqgmy3jc13bv7d01rjwldxq0p4ayqic85xcl222hhifi3w2prr"; + }; + + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ libminc zlib bicpl ]; + propagatedBuildInputs = [ coreutils minc_tools perl GetoptTabular MNI-Perllib ]; + + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DBICPL_DIR=${bicpl}/lib/" ]; + + checkPhase = "ctest --output-on-failure"; # still some weird test failures though + + postFixup = '' + for p in $out/bin/*; do + wrapProgram $p --prefix PERL5LIB : $PERL5LIB --set PATH "${stdenv.lib.makeBinPath [ coreutils minc_tools ]}"; + done + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/BIC-MNI/conglomerate; + description = "More command-line utilities for working with MINC files"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + license = licenses.free; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10053f926da..d98e2aec1d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19740,6 +19740,10 @@ with pkgs; bcftools = callPackage ../applications/science/biology/bcftools { }; + conglomerate = callPackage ../applications/science/biology/conglomerate { + inherit (perlPackages) GetoptTabular MNI-Perllib; + }; + dcm2niix = callPackage ../applications/science/biology/dcm2niix { }; diamond = callPackage ../applications/science/biology/diamond { }; From 6134887bef5357ccda4d81aef78182217df4c3ed Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 27 Apr 2018 15:52:00 +0200 Subject: [PATCH 027/695] mpir: Build with C++ support This is needed by Alkimia which I'm going to package soon as part of KMyMoney. I enabled this by default, because it doesn't increase the closure size a whole lot (only around 150 KiB): $ nix-store -q --size /nix/store/...old...-mpir-3.0.0 1223248 $ nix-store -q --size /nix/store/...new...-mpir-3.0.0 1377136 Introducing an option for enabling/disabling this is not worth it, because it doesn't conflict with anything and the size increase is the only drawback and we can still make it configurable if we want someday. Signed-off-by: aszlig Cc: @7c6f434c --- pkgs/development/libraries/mpir/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix index cbcf83f1d32..b9b25e7f43b 100644 --- a/pkgs/development/libraries/mpir/default.nix +++ b/pkgs/development/libraries/mpir/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1fvmhrqdjs925hzr2i8bszm50h00gwsh17p2kn2pi51zrxck9xjj"; }; + configureFlags = [ "--enable-cxx" ]; + meta = { inherit version; description = ''A highly optimised library for bignum arithmetic forked from GMP''; From 5370b8267c94bf5762683746f537c002f0ea3ac6 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 28 Apr 2018 01:21:25 +0200 Subject: [PATCH 028/695] kdewebkit: Add package expression This is one of the requirements of KMyMoney and packaging is quite straightforward with no unexpected traps. Signed-off-by: aszlig Cc: @ttuegel --- pkgs/development/libraries/kde-frameworks/default.nix | 1 + .../libraries/kde-frameworks/kdewebkit.nix | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 pkgs/development/libraries/kde-frameworks/kdewebkit.nix diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index f54139836b1..d780fc30a4c 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -155,6 +155,7 @@ let kded = callPackage ./kded.nix {}; kdesignerplugin = callPackage ./kdesignerplugin.nix {}; kdesu = callPackage ./kdesu.nix {}; + kdewebkit = callPackage ./kdewebkit.nix {}; kemoticons = callPackage ./kemoticons.nix {}; kglobalaccel = callPackage ./kglobalaccel.nix {}; kiconthemes = callPackage ./kiconthemes {}; diff --git a/pkgs/development/libraries/kde-frameworks/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks/kdewebkit.nix new file mode 100644 index 00000000000..b7dcfb7fe64 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kdewebkit.nix @@ -0,0 +1,11 @@ +{ mkDerivation, extra-cmake-modules +, kconfig, kcoreaddons, kio, kparts, qtwebkit +}: + +mkDerivation { + name = "kdewebkit"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kconfig kcoreaddons kio kparts ]; + propagatedBuildInputs = [ qtwebkit ]; + outputs = [ "out" "dev" ]; +} From d2b8d8bddc40734b14e9b04039a1ae5415a60b4d Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 28 Apr 2018 01:32:32 +0200 Subject: [PATCH 029/695] alkimia: init at 7.0.1 This is used by KMyMoney and also the reason why I needed to add C++ support to MPIR in the parent commit. The reason why I didn't add myself as a maintainer is because I'm not personally using KMyMoney and thus Alkimia. Signed-off-by: aszlig --- .../development/libraries/alkimia/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/alkimia/default.nix diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix new file mode 100644 index 00000000000..495c5118e74 --- /dev/null +++ b/pkgs/development/libraries/alkimia/default.nix @@ -0,0 +1,24 @@ +{ mkDerivation, fetchurl, lib +, extra-cmake-modules, doxygen, graphviz, qtbase, mpir +}: + +mkDerivation rec { + name = "alkimia-${version}"; + version = "7.0.1"; + + src = fetchurl { + url = "mirror://kde/stable/alkimia/${version}/src/${name}.tar.xz"; + sha256 = "1fri76465058fgsyrmdrc3hj1javz4g10mfzqp5rsj7qncjr1i22"; + }; + + nativeBuildInputs = [ extra-cmake-modules doxygen graphviz ]; + + buildInputs = [ qtbase ]; + propagatedBuildInputs = [ mpir ]; + + meta = { + description = "Library used by KDE finance applications"; + license = lib.licenses.lgpl21Plus; + platforms = qtbase.meta.platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3795cce452a..213bdcc784e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11181,6 +11181,8 @@ with pkgs; accounts-qt = callPackage ../development/libraries/accounts-qt { }; + alkimia = callPackage ../development/libraries/alkimia { }; + fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; qgpgme = callPackage ../development/libraries/gpgme { }; From 93042b7376139fca94e1223a7a5803399806ef61 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 28 Apr 2018 02:21:22 +0200 Subject: [PATCH 030/695] kmymoney: init at 5.0.1 I tried to use -DENABLE_SQLCIPHER and also passed the right directories to the Qt 5 source of the QSQLiteDriver but CMake then failed to run qt4_automoc, by which I'd imply that SQLCipher is not maintained anymore (after all KMyMoney using qgpgme as well, which doesn't require sources). Another odd thing is that CMake reports that the weboob plugin is disabled, but after inspecting it turns out that the reporting is just wrong. This is already fixed upstream but not yet released in KDE/kmymoney@8b086cf921879770971e9331f005339bfacdc84c. In addition of running the upstream test suite I have manually tested a few things in a VM by using the following Nix expression: (import { configuration = { pkgs, ... }: { environment.systemPackages = with pkgs; [ kmymoney aqbanking gwenhywfar libchipcard python2Packages.weboob kgpg ]; users.users.test.isNormalUser = true; virtualisation.diskSize = 4096; virtualisation.memorySize = 2048; services.xserver = { enable = true; inherit ((import {}).config.services.xserver) layout; displayManager.sddm.enable = true; displayManager.sddm.autoLogin.enable = true; displayManager.sddm.autoLogin.user = "test"; desktopManager.default = "plasma5"; desktopManager.plasma5.enable = true; }; }; }).vm The things I have tested in particular are: * Basic startup * Completing the wizard * Add some test transactions * GPG encryption * Generation of charts and reports * Rough check whether OFX integration lists supported financial institutions. * Small check of AqBanking implementation, whether accounts and users can be configured, but didn't test actual connectivity with a financial institution. * Check of Weboob integration with a test PayPal backend, however also just with a dummy account and without actually connecting to PayPal. One of the upstream tests "reports-chart-test" seems to fail even though generating charts and reports are working when testing manually. It also seems that this is the case on other distributions, for example Gentoo has disabled that test as well: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5169cec68fa6fd67841 Note that I didn't add myself as a maintainer because I'm not personally using KMyMoney but just packaged it for someone else. I hope this is useful for other people, so that maybe someday[TM] there will be a proper maintainer. Signed-off-by: aszlig Cc: @ttuegel --- pkgs/applications/office/kmymoney/default.nix | 70 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++ 2 files changed, 75 insertions(+) create mode 100644 pkgs/applications/office/kmymoney/default.nix diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix new file mode 100644 index 00000000000..212aaa5fa2c --- /dev/null +++ b/pkgs/applications/office/kmymoney/default.nix @@ -0,0 +1,70 @@ +{ stdenv, lib, fetchurl, doxygen, extra-cmake-modules, graphviz, kdoctools + +, akonadi, alkimia, aqbanking, gmp, gwenhywfar, kactivities, karchive +, kcmutils, kcontacts, kdewebkit, kdiagram, kholidays, kidentitymanagement +, kitemmodels, libical, libofx, qgpgme + +# Needed for running tests: +, qtbase, xvfb_run + +# For weboob, which only supports Python 2.x: +, python2Packages +}: + +stdenv.mkDerivation rec { + name = "kmymoney-${version}"; + version = "5.0.1"; + + src = fetchurl { + url = "mirror://kde/stable/kmymoney/${version}/src/${name}.tar.xz"; + sha256 = "1c9apnvc07y17pzy4vygry1dai5ass2z7j354lrcppa85b18yvnx"; + }; + + # Hidden dependency that wasn't included in CMakeLists.txt: + NIX_CFLAGS_COMPILE = "-I${kitemmodels.dev}/include/KF5"; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + doxygen extra-cmake-modules graphviz kdoctools python2Packages.wrapPython + ]; + + buildInputs = [ + akonadi alkimia aqbanking gmp gwenhywfar kactivities karchive kcmutils + kcontacts kdewebkit kdiagram kholidays kidentitymanagement kitemmodels + libical libofx qgpgme + + # Put it into buildInputs so that CMake can find it, even though we patch + # it into the interface later. + python2Packages.weboob + ]; + + weboobPythonPath = [ python2Packages.weboob ]; + + postInstall = '' + buildPythonPath "$weboobPythonPath" + patchPythonScript "$out/share/kmymoney/weboob/kmymoneyweboob.py" + + # Within the embedded Python interpreter, sys.argv is unavailable, so let's + # assign it to a dummy value so that the assignment of sys.argv[0] injected + # by patchPythonScript doesn't fail: + sed -i -e '1i import sys; sys.argv = [""]' \ + "$out/share/kmymoney/weboob/kmymoneyweboob.py" + ''; + + doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; + installCheckPhase = let + pluginPath = "${qtbase.bin}/${qtbase.qtPluginPrefix}"; + in lib.optionalString doInstallCheck '' + QT_PLUGIN_PATH=${lib.escapeShellArg pluginPath} CTEST_OUTPUT_ON_FAILURE=1 \ + ${xvfb_run}/bin/xvfb-run -s '-screen 0 1024x768x24' make test \ + ARGS="-E '(reports-chart-test)'" # Test fails, so exclude it for now. + ''; + + meta = { + description = "Personal finance manager for KDE"; + homepage = https://kmymoney.org/; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 213bdcc784e..329c6fb8105 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16476,6 +16476,11 @@ with pkgs; kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { }; + kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { + inherit (kdeApplications) kidentitymanagement; + inherit (kdeFrameworks) kdewebkit; + }; + kodestudio = callPackage ../applications/editors/kodestudio { }; konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { }; From 9e883426417b5f249a45a3cdb9fdbbd6625f8e08 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 28 Apr 2018 13:53:07 +0200 Subject: [PATCH 031/695] alkimia: Add meta.longDescription @7c6f434c wrote in [1]: Maybe copy-paste the upstream "Alkimia is the infrastructure for common storage and business logic that will be used by all financial applications in KDE. The target is to share financial related information over application bounderies." as longDescription for Alkimia? The current description makes me want to look up the homepage to find out what it actually is (then I do, and despair). [1]: https://github.com/NixOS/nixpkgs/pull/39647#issuecomment-385169261 Signed-off-by: aszlig --- pkgs/development/libraries/alkimia/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix index 495c5118e74..6f4fd09015e 100644 --- a/pkgs/development/libraries/alkimia/default.nix +++ b/pkgs/development/libraries/alkimia/default.nix @@ -18,6 +18,13 @@ mkDerivation rec { meta = { description = "Library used by KDE finance applications"; + longDescription = '' + Alkimia is the infrastructure for common storage and business + logic that will be used by all financial applications in KDE. + + The target is to share financial related information over + application bounderies. + ''; license = lib.licenses.lgpl21Plus; platforms = qtbase.meta.platforms; }; From eaf0592498070e3184316c9c63c3dd1c5264cd95 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 2 Feb 2018 07:51:23 +0000 Subject: [PATCH 032/695] ocamlPackages.ocsigen_server: 2.8 -> 2.9 --- .../ocaml-modules/ocsigen-server/default.nix | 33 ++++++++++++++----- pkgs/top-level/ocaml-packages.nix | 2 +- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 081f9edbecf..efbb1230497 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, ocaml, findlib, which, react, ssl, -lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib, +{ stdenv, fetchurl, ocaml, findlib, which, react, ssl +, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib, libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4 -, camlzip, pgocaml +, camlzip, pgocaml, lwt2, lwt_react, lwt_ssl }: let mkpath = p: n: @@ -9,17 +9,32 @@ let mkpath = p: n: "${p}/lib/ocaml/${v}/site-lib/${n}"; in +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.03" then { + version = "2.9"; + sha256 = "0na3qa4h89f2wv31li63nfpg4151d0g8fply0bq59j3bhpyc85nd"; + buildInputs = [ lwt_react lwt_ssl ]; + ldpath = ""; + } else { + version = "2.8"; + sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy"; + buildInputs = [ lwt2 ]; + ldpath = "${mkpath lwt2 "lwt"}"; + } +; in + stdenv.mkDerivation { - name = "ocsigenserver-2.8"; + name = "ocsigenserver-${param.version}"; src = fetchurl { - url = https://github.com/ocsigen/ocsigenserver/archive/2.8.tar.gz; - sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy"; + url = "https://github.com/ocsigen/ocsigenserver/archive/${param.version}.tar.gz"; + inherit (param) sha256; }; - buildInputs = [ocaml which findlib react ssl lwt + buildInputs = [ocaml which findlib react ssl ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl - ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ]; + ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ] + ++ (param.buildInputs or []); configureFlags = "--root $(out) --prefix /"; @@ -31,7 +46,7 @@ stdenv.mkDerivation { '' rm -rf $out/var/run wrapProgram $out/bin/ocsigenserver \ - --prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${mkpath lwt "lwt"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}" + --prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${param.ldpath}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}" ''; dontPatchShebangs = true; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 741a58ce588..22efb8a8a35 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -504,7 +504,7 @@ let ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { }; - ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { lwt = lwt2; }; + ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { }; ocsigen-start = callPackage ../development/ocaml-modules/ocsigen-start { }; From 8994fff8bb06b86c42aff28b8ef6f9cc77cb81af Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 31 Mar 2018 05:41:24 +0000 Subject: [PATCH 033/695] ocamlPackages.eliom: 6.2.0 -> 6.3.0 --- .../ocaml-modules/eliom/default.nix | 40 ++++++++++++------- pkgs/top-level/ocaml-packages.nix | 5 +-- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 42afec7e439..da9383c4e95 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,35 +1,47 @@ -{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, - js_of_ocaml, react, lwt, calendar, cryptokit, tyxml, - ipaddr, ocamlnet, ssl, ocaml_pcre, ocaml_optcomp, - reactivedata, opam, ppx_tools, ppx_deriving, findlib -, ocamlbuild +{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, camlp4, + js_of_ocaml, lwt_react, cryptokit, + ipaddr, ocamlnet, lwt_ssl, ocaml_pcre, + opam, ppx_tools, ppx_deriving, findlib +, js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json +, js_of_ocaml-lwt +, js_of_ocaml-tyxml }: -assert stdenv.lib.versionAtLeast ocaml.version "4.02"; +assert stdenv.lib.versionAtLeast ocaml.version "4.03"; stdenv.mkDerivation rec { pname = "eliom"; - version = "6.2.0"; + version = "6.3.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz"; - sha256 = "01c4l982ld6d1ndhb6f15ldb2li7mv0bs279d5gs99mpiwsapadx"; + sha256 = "137hgdzv9fwkzf6xdksqy437lrf8xvrycf5jwc3z4cmpsigs6x7v"; }; patches = [ ./camlp4.patch ]; - buildInputs = [ ocaml which findlib ocamlbuild ocaml_optcomp opam ppx_tools ]; + buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opam ppx_tools + ocsigen_deriving + ]; - propagatedBuildInputs = [ lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving - ocsigen_deriving js_of_ocaml - calendar cryptokit ocamlnet react ssl ocaml_pcre ]; + propagatedBuildInputs = [ + camlp4 + cryptokit + ipaddr + js_of_ocaml-lwt + js_of_ocaml-ppx + js_of_ocaml-tyxml + lwt_react + lwt_ssl + ocamlnet ocaml_pcre + ocsigen_server + ppx_deriving + ]; installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; - createFindlibDestdir = true; - setupHook = [ ./setup-hook.sh ]; meta = { diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 22efb8a8a35..92f772bb25e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -217,10 +217,7 @@ let easy-format = callPackage ../development/ocaml-modules/easy-format { }; - eliom = callPackage ../development/ocaml-modules/eliom { - lwt = lwt2; - js_of_ocaml = js_of_ocaml_2; - }; + eliom = callPackage ../development/ocaml-modules/eliom { }; enumerate = callPackage ../development/ocaml-modules/enumerate { }; From 9a170f5bdfbf87d6e31ab070528d78b4ea7d405b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 1 Apr 2018 06:54:23 +0000 Subject: [PATCH 034/695] ocamlPackages.ocsigen-toolkit: 1.0.0 -> 1.1.0 --- .../ocaml-modules/ocsigen-toolkit/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix index 00416c92bb9..556c343241c 100644 --- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, buildOcaml, ocaml, eliom, opam }: +{ stdenv, fetchurl, buildOcaml, ocaml, opam +, calendar, eliom, js_of_ocaml-ppx_deriving_json +}: buildOcaml rec { name = "ocsigen-toolkit"; - version = "1.0.0"; + version = "1.1.0"; - propagatedBuildInputs = [ eliom ]; + propagatedBuildInputs = [ calendar eliom js_of_ocaml-ppx_deriving_json ]; buildInputs = [ opam ]; - createFindlibDestdir = true; - installPhase = '' export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH @@ -18,7 +18,7 @@ buildOcaml rec ''; src = fetchurl { - sha256 = "0wm4fnss7vlkd03ybgfrk63kpip6m6p6kdqjn3f64n11256mwzj2"; + sha256 = "1i5806gaqqllgsgjz3lf9fwlffqg3vfl49msmhy7xvq2sncbxp8a"; url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz"; }; From 7d7afdde4a9b5e9853ac4e0ff8477debdfc302b4 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 1 Apr 2018 07:00:07 +0000 Subject: [PATCH 035/695] ocamlPackages.ocsigen-start: 1.0.0 -> 1.1.0 --- .../ocaml-modules/ocsigen-start/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix index 13794602af4..ba7e3e93c98 100644 --- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ojquery, magick, ocsigen_deriving, ocsigen_server }: +{ stdenv, fetchurl, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server +, js_of_ocaml-camlp4 +}: buildOcaml rec { name = "ocsigen-start"; - version = "1.0.0"; + version = "1.1.0"; - buildInputs = [ eliom ]; - propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ojquery ocsigen_deriving ocsigen_server magick ]; + buildInputs = [ eliom js_of_ocaml-camlp4 ]; + propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server ]; patches = [ ./templates-dir.patch ]; @@ -16,7 +18,7 @@ buildOcaml rec src = fetchurl { url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz"; - sha256 = "0npc2iq39ixci6ly0fssklv07zqi5cfa1adad4hm8dbzjawkqqll"; + sha256 = "09cw6qzcld0m1qm66mbjg9gw8l6dynpw3fzhm3kfx5ldh0afgvjq"; }; createFindlibDestdir = true; From cd0aee5cbceba576b61d932601702b8740ed3b8c Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 28 Apr 2018 23:07:10 -0400 Subject: [PATCH 036/695] buildbot: 1.1.0 -> 1.1.1 --- .../tools/build-managers/buildbot/default.nix | 4 ++-- .../tools/build-managers/buildbot/plugins.nix | 10 +++++----- .../tools/build-managers/buildbot/worker.nix | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index 98adaf1c1aa..bc2cd978f67 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -14,11 +14,11 @@ let package = pythonPackages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "buildbot"; - version = "1.1.0"; + version = "1.1.1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1rhmlcvw0dsr4f37sb3xmb9xcn76lsrsw2g1z611g339nmxzi0sc"; + sha256 = "1vcmanx3ma3cfyiddjcmsnx6qmxd3m5blqax04rcsiq2zq4dmzir"; }; buildInputs = with pythonPackages; [ diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix index 35c8ed8c71c..c8a12c19264 100644 --- a/pkgs/development/tools/build-managers/buildbot/plugins.nix +++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix @@ -11,7 +11,7 @@ src = pythonPackages.fetchPypi { inherit pname version format; - sha256 = "0nmrq50c5ib185rpb8ai1mm7gjq2mjvxik1kqrjfa62i1ia9ikyj"; + sha256 = "01v9w8iy9q6fwrmz6db7fanjixax7whn74k67bj0czrbjjkpfzvb"; }; meta = with stdenv.lib; { @@ -29,7 +29,7 @@ src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1laz7l7cbbz0czb6skxw314bd2qk2f63qw3n2rs7m7v11gd9cdll"; + sha256 = "1cwxkzpgwzk9b361rj980bbnmhzzsr46pgf94zqpg3na8xm6hpwj"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -49,7 +49,7 @@ src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0mmri8c4n1zwxc1dx2a11yllrmnwqqxjvvil9224lbs98mpchppi"; + sha256 = "0ival58f50128315d0nck63pzya2zm7q6hvgmxfbjl0my8il9p2l"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -69,7 +69,7 @@ src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0nwlw2m3qfifia6gy3d4lrnycra50k98ax071p2zjqknanh563vr"; + sha256 = "0jiwfb699nqbmpcm88y187ig4ha6p7d4v98mjwa9blhm54dk8kh1"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -89,7 +89,7 @@ src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1zml9bd910zwcby4vr3lmzap2grinha2w5zgb2cmixmz7hfrqswp"; + sha256 = "00mfn24gbwr2p3n7nsijzv949l7hiksiafhma18nnh40r8f4l5f2"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index 59d3c93bb87..b1cfb6aeaf2 100644 --- a/pkgs/development/tools/build-managers/buildbot/worker.nix +++ b/pkgs/development/tools/build-managers/buildbot/worker.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot-worker"; - version = "1.1.0"; + version = "1.1.1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0hpiawf0dq8phsvihlcx9bpl70n7s3rhcgbgma36bark6sgr4y8y"; + sha256 = "02xfzlcy3cnvc3cmpl9gs6209a3qm71yz5pahbws9jcyhv6fbrrm"; }; buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; From 7d68eadf373f9962b0e6c9f9299563c543245396 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 29 Apr 2018 13:30:09 -0400 Subject: [PATCH 037/695] nixos/acme: Fix broken post-stop script Previously the script would contain an empty `if` block (which is invalid syntax) if both `data.activationDelay == null` and `data.postRun == ""`. Fix this by adding a no-op `true`. --- nixos/modules/security/acme.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index e430c2ddb90..9e5d636241e 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -257,7 +257,7 @@ in if [ -e /tmp/lastExitCode ] && [ "$(cat /tmp/lastExitCode)" = "0" ]; then ${if data.activationDelay != null then '' - + ${data.preDelay} if [ -d '${lpath}' ]; then @@ -266,6 +266,10 @@ in systemctl --wait start acme-setlive-${cert}.service fi '' else data.postRun} + + # noop ensuring that the "if" block is non-empty even if + # activationDelay == null and postRun == "" + true fi ''; @@ -294,7 +298,7 @@ in chown '${data.user}:${data.group}' '${cpath}' fi ''; - script = + script = '' workdir="$(mktemp -d)" From 42d11feae80f86b450ce64eef75a6f21dc807aab Mon Sep 17 00:00:00 2001 From: Andrey Pavlov Date: Wed, 7 Mar 2018 17:19:37 +0300 Subject: [PATCH 038/695] pythonPackages.isort: 4.2.5 -> 4.3.4 --- .../python-modules/isort/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------ 2 files changed, 29 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/isort/default.nix diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix new file mode 100644 index 00000000000..5a7e50d4332 --- /dev/null +++ b/pkgs/development/python-modules/isort/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27, futures, mock, pytest }: + +buildPythonPackage rec { + pname = "isort"; + version = "4.3.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1y0yfv56cqyh9wyg7kxxv9y5wmfgcq18n7a49mp7xmzka2bhxi5r"; + }; + + propagatedBuildInputs = lib.optional isPy27 futures; + + checkInputs = [ mock pytest ]; + + checkPhase = '' + py.test test_isort.py -k "not test_long_line_comments \ + and not test_import_case_produces_inconsistent_results_issue_472 \ + and not test_no_extra_lines_issue_557" + ''; + + meta = with lib; { + description = "A Python utility / library to sort Python imports"; + homepage = https://github.com/timothycrosley/isort; + license = licenses.mit; + maintainers = with maintainers; [ couchemar nand0p ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f24d6ff955b..997da36a1eb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6802,24 +6802,7 @@ in { iso8601 = callPackage ../development/python-modules/iso8601 { }; - isort = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "isort"; - version = "4.2.5"; - src = pkgs.fetchurl { - url = "mirror://pypi/i/${pname}/${name}.tar.gz"; - sha256 = "0p7a6xaq7zxxq5vr5gizshnsbk2afm70apg97xwfdxiwyi201cjn"; - }; - buildInputs = with self; [ mock pytest ]; - # No tests distributed - doCheck = false; - meta = { - description = "A Python utility / library to sort Python imports"; - homepage = https://github.com/timothycrosley/isort; - license = licenses.mit; - maintainers = with maintainers; [ couchemar nand0p ]; - }; - }; + isort = callPackage ../development/python-modules/isort {}; jabberbot = callPackage ../development/python-modules/jabberbot {}; From caed1877ebf7a84f16ac1eb6af641af155e47b5b Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 11 Apr 2018 20:51:39 +0200 Subject: [PATCH 039/695] cryptsetup-generator: add postFixup This makes cryptsetup-generator link correctly to the shared systemd library. --- .../linux/systemd/cryptsetup-generator.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix index f69269347e3..5c6efb44013 100644 --- a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix +++ b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix @@ -13,6 +13,17 @@ stdenv.lib.overrideDerivation systemd (p: { ninja systemd-cryptsetup systemd-cryptsetup-generator ''; + # As ninja install is not used here, the rpath needs to be manually fixed. + # Otherwise the resulting binary doesn't properly link against systemd-shared.so + postFixup = '' + sharedLib=libsystemd-shared-${p.version}.so + for prog in `find $out -type f -executable`; do + (patchelf --print-needed $prog | grep $sharedLib > /dev/null) && ( + patchelf --set-rpath `patchelf --print-rpath $prog`:"$out/lib/systemd" $prog + ) || true + done + ''; + installPhase = '' mkdir -p $out/lib/systemd/ cp systemd-cryptsetup $out/lib/systemd/systemd-cryptsetup From 87b51a1e670e1f973c48d1f8d896b2098e8769ca Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Sun, 29 Apr 2018 22:22:19 +0200 Subject: [PATCH 040/695] wine-{Unstable,Staging}: 3.5 -> 3.7 --- pkgs/misc/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index f86e34a5d54..817241fbe0f 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -39,16 +39,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "3.5"; + version = "3.7"; url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz"; - sha256 = "0hr1syfhnpvcm84gmms1i26k68hakcgw4m6dvckmbbvw7ca0c8pl"; + sha256 = "1drbzk3y0m14lkq3vzwwkvain5shykgcbmyzh6gcb5r4sxh3givn"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-compholio/wine-staging/releases inherit (unstable) version; - sha256 = "0kcwg7w79zbsg29b9ma9mapzhj9dg7z0vccy4a35fx04044xj0zn"; + sha256 = "0kam73jqhah7bzji5csxxhhfdp6byhzpcph6xnzjqz2aic5xk7xi"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; From b3d5ca8359d3fac0f21ccece79c202557a9433b5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 30 Apr 2018 05:53:38 +0200 Subject: [PATCH 041/695] nixos/dhparams: Set default bit size to 2048 @Ekleog writes in https://github.com/NixOS/nixpkgs/pull/39526: > I think a default of 4096 is maybe too much? See certbot/certbot#4973; > Let's Encrypt supposedly know what they are doing and use a > pre-generated 2048-bit DH params (and using the same DH params as > others is quite bad, even compared to lower bit size, if I correctly > remember the attacks available -- because it increases by as much the > value of breaking the group). > Basically I don't have anything personal against 4096, but fear it may > re-start the arms race: people like having "more security" than their > distributions, and having NixOS already having more security than is > actually useful (I personally don't know whether a real-size quantum > computer will come before or after our being able to break 2048-bit > keys, let alone 3072-bit ones -- see wikipedia for some numbers). > So basically, I'd have set it to 3072 in order to both decrease build > time and avoid having people setting it to 8192 and complaining about > how slow things are, but that's just my opinion. :) While he suggests is 3072 I'm using 2048 now, because it's the default of "openssl dhparam". If users want to have a higher value, they can still change it. Signed-off-by: aszlig --- nixos/modules/security/dhparams.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix index 481d4c5db51..beac125fc6e 100644 --- a/nixos/modules/security/dhparams.nix +++ b/nixos/modules/security/dhparams.nix @@ -10,7 +10,7 @@ let name = "bits"; description = "integer of at least 16 bits"; }; - default = 4096; + default = 2048; description = '' The bit size for the prime that is used during a Diffie-Hellman key exchange. From 480da10f30b5855aee3433365c5b3065437c9074 Mon Sep 17 00:00:00 2001 From: Stefan Wiehler Date: Mon, 24 Oct 2016 23:54:18 +0200 Subject: [PATCH 042/695] open-ecard: init at 1.2.4 --- pkgs/tools/security/open-ecard/default.nix | 64 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 66 insertions(+) create mode 100644 pkgs/tools/security/open-ecard/default.nix diff --git a/pkgs/tools/security/open-ecard/default.nix b/pkgs/tools/security/open-ecard/default.nix new file mode 100644 index 00000000000..a0af51186ed --- /dev/null +++ b/pkgs/tools/security/open-ecard/default.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchurl, jre, pcsclite, makeDesktopItem, makeWrapper }: + +let + version = "1.2.4"; + + srcs = { + richclient = fetchurl { + url = "https://jnlp.openecard.org/richclient-${version}-20171212-0958.jar"; + sha256 = "1ckhyhszp4zhfb5mn67lz603b55z814jh0sz0q5hriqzx017j7nr"; + }; + cifs = fetchurl { + url = "https://jnlp.openecard.org/cifs-${version}-20171212-0958.jar"; + sha256 = "0rc862lx3y6sw87r1v5xjmqqpysyr1x6yqhycqmcdrwz0j3wykrr"; + }; + logo = fetchurl { + url = https://raw.githubusercontent.com/ecsec/open-ecard/1.2.3/gui/graphics/src/main/ext/oec_logo_bg-transparent.svg; + sha256 = "0rpmyv10vjx2yfpm03mqliygcww8af2wnrnrppmsazdplksaxkhs"; + }; + }; +in stdenv.mkDerivation rec { + appName = "open-ecard"; + name = "${appName}-${version}"; + + src = srcs.richclient; + + phases = "installPhase"; + + buildInputs = [ makeWrapper ]; + + desktopItem = makeDesktopItem { + name = appName; + desktopName = "Open eCard App"; + genericName = "eCard App"; + comment = "Client side implementation of the eCard-API-Framework"; + icon = "oec_logo_bg-transparent.svg"; + exec = appName; + categories = "Utility;Security;"; + }; + + installPhase = '' + mkdir -p $out/share/java + cp ${srcs.richclient} $out/share/java/richclient-${version}.jar + cp ${srcs.cifs} $out/share/java/cifs-${version}.jar + + mkdir -p $out/share/applications $out/share/pixmaps + cp $desktopItem/share/applications/* $out/share/applications + cp ${srcs.logo} $out/share/pixmaps/oec_logo_bg-transparent.svg + + mkdir -p $out/bin + makeWrapper ${jre}/bin/java $out/bin/${appName} \ + --add-flags "-cp $out/share/java/cifs-${version}.jar" \ + --add-flags "-jar $out/share/java/richclient-${version}.jar" \ + --suffix LD_LIBRARY_PATH ':' ${pcsclite}/lib + ''; + + meta = with stdenv.lib; { + description = "Client side implementation of the eCard-API-Framework (BSI + TR-03112) and related international standards, such as ISO/IEC 24727"; + homepage = https://www.openecard.org/; + license = licenses.gpl3; + maintainers = with maintainers; [ sephalon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 719a5c66db7..3317e254834 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4076,6 +4076,8 @@ with pkgs; opendylan_bin = callPackage ../development/compilers/opendylan/bin.nix { }; + open-ecard = callPackage ../tools/security/open-ecard { }; + openjade = callPackage ../tools/text/sgml/openjade { }; openmvg = callPackage ../applications/science/misc/openmvg { }; From 3520fef779dbdfc145214294673c47aeac4ddeab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 08:43:52 -0700 Subject: [PATCH 043/695] x42-plugins: 20170428 -> 20180320 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/x42-plugins/versions. These checks were done: - built on NixOS - ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-fat1 -h’ got 0 exit code - ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-fat1 --help’ got 0 exit code - ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-fil4 -h’ got 0 exit code - ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-fil4 --help’ got 0 exit code - ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-meter -h’ got 0 exit code - ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-meter --help’ got 0 exit code - ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-mixtri -h’ got 0 exit code - ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-mixtri --help’ got 0 exit code - ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-scope -h’ got 0 exit code - ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-scope --help’ got 0 exit code - ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-stepseq -h’ got 0 exit code - ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-stepseq --help’ got 0 exit code - ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-tuna -h’ got 0 exit code - ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-tuna --help’ got 0 exit code - directory tree listing: https://gist.github.com/b5bff61b6a034a2f1ebe040e1e3155d0 --- pkgs/applications/audio/x42-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 4c4f958ec49..6bf45f451a5 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20170428"; + version = "20180320"; name = "x42-plugins-${version}"; src = fetchurl { url = "http://gareus.org/misc/x42-plugins/${name}.tar.xz"; - sha256 = "0yi82rak2277x4nzzr5zwbsnha5pi61w975c8src2iwar2b6m0xg"; + sha256 = "167ly9nxqq3g0j35i9jv9rvd8qp4i9ncfcjxmg972cp6q8ak8mdl"; }; nativeBuildInputs = [ pkgconfig ]; From ecc7f83e75b48ee04c4c7cac1386e370921060f4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 11:07:54 -0700 Subject: [PATCH 044/695] spidermonkey_52: 52.6.0 -> 52.7.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/spidermonkey/versions. These checks were done: - built on NixOS - ran ‘/nix/store/47rbdzbgccrrdc63fnsnwklria9clmms-spidermonkey-52.7.4/bin/js52 -h’ got 0 exit code - ran ‘/nix/store/47rbdzbgccrrdc63fnsnwklria9clmms-spidermonkey-52.7.4/bin/js52 --help’ got 0 exit code - ran ‘/nix/store/47rbdzbgccrrdc63fnsnwklria9clmms-spidermonkey-52.7.4/bin/js52 -v’ and found version 52.7.4 - ran ‘/nix/store/47rbdzbgccrrdc63fnsnwklria9clmms-spidermonkey-52.7.4/bin/js52 --version’ and found version 52.7.4 - ran ‘/nix/store/47rbdzbgccrrdc63fnsnwklria9clmms-spidermonkey-52.7.4/bin/js52-config --version’ and found version 52.7.4 - found 52.7.4 with grep in /nix/store/47rbdzbgccrrdc63fnsnwklria9clmms-spidermonkey-52.7.4 - directory tree listing: https://gist.github.com/7e5182415a0a1bce8071576312c08a3a --- pkgs/development/interpreters/spidermonkey/52.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix index 4992ea04f11..35dcff95029 100644 --- a/pkgs/development/interpreters/spidermonkey/52.nix +++ b/pkgs/development/interpreters/spidermonkey/52.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }: let - version = "52.6.0"; + version = "52.7.4"; in stdenv.mkDerivation rec { name = "spidermonkey-${version}"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha256 = "0hhyd4ni4jja7jd687dm0csi1jcjxahf918zbjzr8njz655djz2q"; + sha256 = "0dn3hbc95qhvcgzbibhy17xwn5m0340f64bq5byvx22c2rf40xwz"; }; buildInputs = [ readline icu zlib nspr ]; From 4e5cecabcfcb2fcb70c8f992e7686fb2ced65a45 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 11:41:45 -0700 Subject: [PATCH 045/695] pqiv: 2.10.3 -> 2.10.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pqiv/versions. These checks were done: - built on NixOS - ran ‘/nix/store/80y2wx9ga0c647w0m0nhkx2hgfhnwpv5-pqiv-2.10.4/bin/pqiv -h’ got 0 exit code - ran ‘/nix/store/80y2wx9ga0c647w0m0nhkx2hgfhnwpv5-pqiv-2.10.4/bin/pqiv --help’ got 0 exit code - ran ‘/nix/store/80y2wx9ga0c647w0m0nhkx2hgfhnwpv5-pqiv-2.10.4/bin/pqiv help’ got 0 exit code - found 2.10.4 with grep in /nix/store/80y2wx9ga0c647w0m0nhkx2hgfhnwpv5-pqiv-2.10.4 - directory tree listing: https://gist.github.com/4743505ebdeb4ef63b3c2637f5d6879d --- pkgs/applications/graphics/pqiv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index 757ce52e9c4..e4f565b3b05 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (rec { name = "pqiv-${version}"; - version = "2.10.3"; + version = "2.10.4"; src = fetchFromGitHub { owner = "phillipberndt"; repo = "pqiv"; rev = version; - sha256 = "16nhnv0dcp242jf1099pjr5dwnc65i40cnb3dvx1avdhidcmsx01"; + sha256 = "04fawc3sd625y1bbgfgwmak56pq28sm58dwn5db4h183iy3awdl9"; }; nativeBuildInputs = [ pkgconfig ]; From 4ea3841d7f9fbed0aaee83bde0227b09384e50fe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 11:43:21 -0700 Subject: [PATCH 046/695] picard-tools: 2.18.2 -> 2.18.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/picard-tools/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 2.18.3 with grep in /nix/store/q67hqz7716nf3c4f8rjmlpf2dqbb06rz-picard-tools-2.18.3 - directory tree listing: https://gist.github.com/6b71ce718f18ef6a48c05457cd0e583b --- pkgs/applications/science/biology/picard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 7af1669dc45..ed90ed5aa04 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "picard-tools-${version}"; - version = "2.18.2"; + version = "2.18.3"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0w3b2jz4n9irslsg85r4x9dc3y4ziykn8fs4iqqiq4sfdcz259fz"; + sha256 = "0w4v30vnyr549hd9lhj1sm69whssabqvhfrbavxfjbl2k9fw83qf"; }; buildInputs = [ jre makeWrapper ]; From decaeb1bfa9c21c1317973fcdd24b50f2eb223b2 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 30 Apr 2018 13:59:11 -0500 Subject: [PATCH 047/695] nano: 2.9.4 -> 2.9.6 --- pkgs/applications/editors/nano/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 9ff1c44dceb..f5598b3365b 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { name = "nano-${version}"; - version = "2.9.4"; + version = "2.9.6"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.xz"; - sha256 = "0nm3zy4azr5rkxjq7jfybbj3cnddmvxc49rxyqm9cp2zfdp75y9c"; + sha256 = "1inl8ljkc711969ncwy7irf0464psasikg1g42l0g4sfpdz50wx3"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; From 3e37981ae3601aa29e72d307c6d51d550af207d2 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Mon, 30 Apr 2018 22:22:18 +0200 Subject: [PATCH 048/695] i3lock-color: 2.10.1-1-c -> 2.11-c --- pkgs/applications/window-managers/i3/lock-color.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index edaa88bde23..66a6af2fbb0 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "2.10.1-1-c"; + version = "2.11-c"; name = "i3lock-color-${version}"; src = fetchFromGitHub { owner = "PandorasFox"; repo = "i3lock-color"; - rev = "01476c56333cccae80cdd3f125b0b9f3a0fe2cb3"; - sha256 = "06ca8496fkdkvh4ycg0b7kd3r1bjdqdwfimb51v4nj1lm87pdkdf"; + rev = version; + sha256 = "1myq9fazkwd776agrnj27bm5nwskvss9v9a5qb77n037dv8d0rdw"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 4f715a5690d28cf74068de823cbb793194a0b2ac Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 13:48:48 -0700 Subject: [PATCH 049/695] palemoon: 27.8.3 -> 27.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/palemoon/versions. These checks were done: - built on NixOS - ran ‘/nix/store/0qfxznyni5ivyrj3hs0w6dhlk3z4kfaq-palemoon-27.9.0/bin/palemoon -h’ got 0 exit code - ran ‘/nix/store/0qfxznyni5ivyrj3hs0w6dhlk3z4kfaq-palemoon-27.9.0/bin/palemoon --help’ got 0 exit code - ran ‘/nix/store/0qfxznyni5ivyrj3hs0w6dhlk3z4kfaq-palemoon-27.9.0/bin/palemoon -V’ and found version 27.9.0 - ran ‘/nix/store/0qfxznyni5ivyrj3hs0w6dhlk3z4kfaq-palemoon-27.9.0/bin/palemoon -v’ and found version 27.9.0 - ran ‘/nix/store/0qfxznyni5ivyrj3hs0w6dhlk3z4kfaq-palemoon-27.9.0/bin/palemoon --version’ and found version 27.9.0 - found 27.9.0 with grep in /nix/store/0qfxznyni5ivyrj3hs0w6dhlk3z4kfaq-palemoon-27.9.0 - directory tree listing: https://gist.github.com/d3039819d96bec3615450de44abbffc4 --- pkgs/applications/networking/browsers/palemoon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 0c0ef501e99..aa77f084734 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { name = "palemoon-${version}"; - version = "27.8.3"; + version = "27.9.0"; src = fetchFromGitHub { name = "palemoon-src"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = version + "_Release"; - sha256 = "1v3wliq8k5yq17ms214fhwka8x4l3sq8kja59dx4pbvczzb1zyzh"; + sha256 = "181g1hy4k9xr6nlrw8jamp541gr5znny4mmpwwaa1lzq5v1w1sw6"; }; desktopItem = makeDesktopItem { From 49e4a597cb2eed29cf8abe6852dc142119cb5d7b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 14:17:03 -0700 Subject: [PATCH 050/695] mopidy-iris: 3.17.1 -> 3.17.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/Mopidy-Iris/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 3.17.5 with grep in /nix/store/ih97pncwmlk71wa9cv49aa9hx7mxc156-Mopidy-Iris-3.17.5 - directory tree listing: https://gist.github.com/0f0187f3e9d60193ebddabe0b082e78f --- pkgs/applications/audio/mopidy/iris.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index f3a9b73aabe..cfd2a4173da 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.17.1"; + version = "3.17.5"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "02k1br077v9c5x6nn0391vh28pvn1zjbkjv8h508vy7k6ch2xjyq"; + sha256 = "011bccvjy1rdrc43576hgfb7md404ziqmkam6na2z6v9km1b9gwr"; }; propagatedBuildInputs = [ From 2034ef073fe0490a7dbabbde81a4c39f91850064 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 15:00:53 -0700 Subject: [PATCH 051/695] jackett: 0.8.886 -> 0.8.929 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jackett/versions. These checks were done: - built on NixOS - ran ‘/nix/store/5zfami4c97mdgiw2kga88hbr050gz9nl-jackett-0.8.929/bin/Jackett -h’ got 0 exit code - ran ‘/nix/store/5zfami4c97mdgiw2kga88hbr050gz9nl-jackett-0.8.929/bin/Jackett help’ got 0 exit code - found 0.8.929 with grep in /nix/store/5zfami4c97mdgiw2kga88hbr050gz9nl-jackett-0.8.929 - directory tree listing: https://gist.github.com/abeee550859eff26afc80fcec3b0ec15 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index f2d38111d5d..8324af8b3d0 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.8.886"; + version = "0.8.929"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "18agnavhch29pi1w6vp374cs6bz2j7bf55mh4ym0cs038h5xkdvv"; + sha256 = "1dq69734f6x8iw1jpvln5lq7bykpwky6iiwz8iwwamwg8143f20p"; }; buildInputs = [ makeWrapper ]; From bf49200102a19a34bc619bfa7643cf9037dea4e2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 15:37:14 -0700 Subject: [PATCH 052/695] kotlin: 1.2.40 -> 1.2.41 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/kotlin/versions. These checks were done: - built on NixOS - ran ‘/nix/store/5byxycv5j3gvwvr87qpv08a7347fxv9q-kotlin-1.2.41/bin/kotlin -h’ got 0 exit code - ran ‘/nix/store/5byxycv5j3gvwvr87qpv08a7347fxv9q-kotlin-1.2.41/bin/.kotlin-wrapped -h’ got 0 exit code - found 1.2.41 with grep in /nix/store/5byxycv5j3gvwvr87qpv08a7347fxv9q-kotlin-1.2.41 - directory tree listing: https://gist.github.com/927e0c1e045ca7c165603ae8b1961beb --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index d5ce240b4a5..e589611505f 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.2.40"; + version = "1.2.41"; in stdenv.mkDerivation rec { inherit version; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "0n4na0ddnjgc573szk5bpd34v5gib71pah62xq7vwdf34q8mg61l"; + sha256 = "0p16xl2qhm7913abd06vvmsx956ny51jjfr6knkmrnk8y9r2g1xg"; }; propagatedBuildInputs = [ jre ] ; From d86866cd678178ead6039ee7a131f2a6c49402bd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 16:09:11 -0700 Subject: [PATCH 053/695] gitAndTools.gitRemoteGcrypt: 1.0.3 -> 1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/git-remote-gcrypt/versions. These checks were done: - built on NixOS - ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/git-remote-gcrypt -h’ got 0 exit code - ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/git-remote-gcrypt --help’ got 0 exit code - ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/git-remote-gcrypt help’ got 0 exit code - ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/.git-remote-gcrypt-wrapped -h’ got 0 exit code - ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/.git-remote-gcrypt-wrapped --help’ got 0 exit code - ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/.git-remote-gcrypt-wrapped help’ got 0 exit code - found 1.1 with grep in /nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1 - directory tree listing: https://gist.github.com/f375e7b41aa0075f2c539d2c32748c12 --- .../git-and-tools/git-remote-gcrypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix index 5e41db0e03f..adfdb9a541c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "git-remote-gcrypt-${version}"; - version = "1.0.3"; + version = "1.1"; rev = version; src = fetchFromGitHub { inherit rev; owner = "spwhitton"; repo = "git-remote-gcrypt"; - sha256 = "1vay3204729c7wajgn3nxf0s0hzwpdrw14pl6kd8w2ss25gvw2k1"; + sha256 = "0mhz5mqnr35rk7j4wyhp7hzmqgv8r554n9qlm4iw565bz7acvq24"; }; outputs = [ "out" "man" ]; From 1e295ccaf75cceff8b4949cf785a9b8e253f452f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 16:16:51 -0700 Subject: [PATCH 054/695] graphicsmagick: 1.3.28 -> 1.3.29 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/graphicsmagick/versions. These checks were done: - built on NixOS - ran ‘/nix/store/j8gk0alkmajz7wsv7wn368blshmk89mk-graphicsmagick-1.3.29/bin/gm help’ got 0 exit code - ran ‘/nix/store/j8gk0alkmajz7wsv7wn368blshmk89mk-graphicsmagick-1.3.29/bin/GraphicsMagick++-config --version’ and found version 1.3.29 - ran ‘/nix/store/j8gk0alkmajz7wsv7wn368blshmk89mk-graphicsmagick-1.3.29/bin/GraphicsMagick-config --version’ and found version 1.3.29 - ran ‘/nix/store/j8gk0alkmajz7wsv7wn368blshmk89mk-graphicsmagick-1.3.29/bin/GraphicsMagickWand-config --version’ and found version 1.3.29 - found 1.3.29 with grep in /nix/store/j8gk0alkmajz7wsv7wn368blshmk89mk-graphicsmagick-1.3.29 - directory tree listing: https://gist.github.com/014b06393c82c79d1f5dfeea620b71f3 --- pkgs/applications/graphics/graphicsmagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index f086a8f5ba6..4258d91b42a 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -2,14 +2,14 @@ , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 , libwebp, quantumdepth ? 8, fixDarwinDylibNames }: -let version = "1.3.28"; in +let version = "1.3.29"; in stdenv.mkDerivation { name = "graphicsmagick-${version}"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "0jlrrimrajcmwp7llivyj14qnzb1mpqd8vw95dl6zbx5m2lnhall"; + sha256 = "1m0cc6kpky06lpcipj7rfwc2jbw2igr0jk97zqmw3j1ld5mg93g1"; }; patches = [ From 369a7e598539887cd5065b39ed38434620dab0a9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 16:58:59 -0700 Subject: [PATCH 055/695] folly: 2018.04.16.00 -> 2018.04.23.00 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/folly/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 2018.04.23.00 with grep in /nix/store/gdpqjqzr8vyisbqsklghaj7lzbbld8a7-folly-2018.04.23.00 - directory tree listing: https://gist.github.com/07bd48be1a92119ed9366c9d83b6a9d1 --- pkgs/development/libraries/folly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index d3ba4b88909..17c6f75a59d 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2018.04.16.00"; + version = "2018.04.23.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "10wivnszpqcbg2hbvfal94lcjw20pjz0d8p0m4qa7i4v4z90q37p"; + sha256 = "0wfp4pxi71bi3bz3h5jxsvdd5wa8q6wqdgsx0jvyvaiiy7v884sv"; }; nativeBuildInputs = [ autoreconfHook python pkgconfig ]; From 71594fa9a28a6bf128d5b4041fd6d805aa8d9a32 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 17:41:01 -0700 Subject: [PATCH 056/695] acpica-tools: 20180313 -> 20180427 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/acpica-tools/versions. These checks were done: - built on NixOS - ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpibin help’ got 0 exit code - ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpidump -h’ got 0 exit code - ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpidump --help’ got 0 exit code - ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpiexec -h’ got 0 exit code - ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpiexec --help’ got 0 exit code - ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpihelp help’ got 0 exit code - ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpinames -h’ got 0 exit code - ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpinames --help’ got 0 exit code - ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpixtract -h’ got 0 exit code - ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpixtract --help’ got 0 exit code - directory tree listing: https://gist.github.com/3a2dd151709bad304f81a4c4c7d3715e --- pkgs/tools/system/acpica-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix index a8fb57b2fba..f26142260fe 100644 --- a/pkgs/tools/system/acpica-tools/default.nix +++ b/pkgs/tools/system/acpica-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "acpica-tools-${version}"; - version = "20180313"; + version = "20180427"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "05ab2xfv9wqwbzjaa9xqgrvvan87rxv29hw48h1gcckpc5smp2wm"; + sha256 = "05hczn82dpn7irh8zy9m17hm8r3ngwrbmk69zsldr4k1w3cv40df"; }; NIX_CFLAGS_COMPILE = "-O3"; From f66a510db8ce6f4012db368052a4154bf42b9b22 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 17:48:52 -0700 Subject: [PATCH 057/695] cni-plugins: 0.7.0 -> 0.7.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cni-plugins/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 0.7.1 with grep in /nix/store/ddh9jrgh4df6s6kj6ywc6clnprfggp75-cni-plugins-0.7.1 - directory tree listing: https://gist.github.com/2260aa864704a4bc411b23f3147315e9 --- pkgs/applications/networking/cluster/cni/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index 9f6b6fcb7e1..8a006edda6a 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cni-plugins-${version}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "0m885v76azs7lrk6m6n53rwh0xadwvdcr90h0l3bxpdv87sj2mnf"; + sha256 = "1sywllwnr6lc812sgkqjdd3y10r82shl88dlnwgnbgzs738q2vp2"; }; buildInputs = [ go ]; From 24761ef5d4a48be1ddd409db7604b8718fc9de56 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 23:08:21 -0700 Subject: [PATCH 058/695] atlas: 3.10.2 -> 3.10.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/atlas/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 3.10.3 with grep in /nix/store/bgqampvgm3zdncg3206n7qnvyvl0jipj-atlas-3.10.3 - directory tree listing: https://gist.github.com/a7dd287df10b13796423e3c2df0850eb --- pkgs/development/libraries/science/math/atlas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index 8cca5565bf6..8b740bdb6f6 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -47,7 +47,7 @@ let inherit (stdenv.lib) optional optionalString; # Don't upgrade until https://github.com/math-atlas/math-atlas/issues/44 # is resolved. - version = "3.10.2"; + version = "3.10.3"; in stdenv.mkDerivation { @@ -55,7 +55,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/math-atlas/atlas${version}.tar.bz2"; - sha256 = "0bqh4bdnjdyww4mcpg6kn0x7338mfqbdgysn97dzrwwb26di7ars"; + sha256 = "1dyjlq3fiparvm8ypwk6rsmjzmnwk81l88gkishphpvc79ryp216"; }; buildInputs = [ gfortran ]; From d13572817e30bddff97979c93aebc27a7cacb2ac Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 23:32:00 -0700 Subject: [PATCH 059/695] adapta-gtk-theme: 3.93.0.258 -> 3.93.1.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/adapta-gtk-theme/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - directory tree listing: https://gist.github.com/5796929fde76fddc1465d9cfbc2ace7b --- pkgs/misc/themes/adapta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index c0c67eeb6ab..f524c7d9579 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "adapta-gtk-theme-${version}"; - version = "3.93.0.258"; + version = "3.93.1.1"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-gtk-theme"; rev = version; - sha256 = "114rryaqr97f7qlwxn3fdspzigxx1jgpsbhypdn265511rsh30hx"; + sha256 = "00k67qpq62swz7p6dk4g8ak31h97lxyddpyr6xii1jpbygwkk9zc"; }; preferLocalBuild = true; From 4c66aa8938ca286cc9e801284d6f531e548f0eaa Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 1 May 2018 21:57:17 +0800 Subject: [PATCH 060/695] bluez: add tools to output that we were building anyway --- pkgs/os-specific/linux/bluez/default.nix | 35 ++++++++++++++++-------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index d4595d73d94..bd890068f6d 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -12,24 +12,28 @@ stdenv.mkDerivation rec { sha256 = "15ffsaz7l3fgdg03l7g1xx9jw7xgs6pc548zxqsxawsca5x1sc1k"; }; - pythonPath = with pythonPackages; - [ dbus-python pygobject2 pygobject3 recursivePthLoader ]; + pythonPath = with pythonPackages; [ + dbus-python pygobject2 pygobject3 recursivePthLoader + ]; buildInputs = [ - pkgconfig dbus glib alsaLib pythonPackages.python pythonPackages.wrapPython + dbus glib alsaLib pythonPackages.python pythonPackages.wrapPython readline udev libical ]; + nativeBuildInputs = [ pkgconfig ]; + outputs = [ "out" "dev" "test" ]; patches = [ ./bluez-5.37-obexd_without_systemd-1.patch ]; - preConfigure = '' - substituteInPlace tools/hid2hci.rules --replace /sbin/udevadm ${systemd}/bin/udevadm - substituteInPlace tools/hid2hci.rules --replace "hid2hci " "$out/lib/udev/hid2hci " - ''; + postConfigure = '' + substituteInPlace tools/hid2hci.rules \ + --replace /sbin/udevadm ${systemd}/bin/udevadm \ + --replace "hid2hci " "$out/lib/udev/hid2hci " + ''; - configureFlags = [ + configureFlags = (with stdenv.lib; [ "--localstatedir=/var" "--enable-library" "--enable-cups" @@ -40,8 +44,8 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-systemduserunitdir=$(out)/etc/systemd/user" "--with-udevdir=$(out)/lib/udev" - ] ++ stdenv.lib.optional enableWiimote [ "--enable-wiimote" ] - ++ stdenv.lib.optional enableMidi [ "--enable-midi" ]; + ] ++ optional enableWiimote [ "--enable-wiimote" ] + ++ optional enableMidi [ "--enable-midi" ]); # Work around `make install' trying to create /var/lib/bluetooth. installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth"; @@ -73,14 +77,21 @@ stdenv.mkDerivation rec { # Add extra configuration mkdir $out/etc/bluetooth ln -s /etc/bluetooth/main.conf $out/etc/bluetooth/main.conf + + # Add missing tools, ref https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/bluez + for files in `find tools/ -type f -perm -755`; do + filename=$(basename $files) + install -Dm755 tools/$filename $out/bin/$filename + done ''; enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.bluez.org/; - repositories.git = https://git.kernel.org/pub/scm/bluetooth/bluez.git; description = "Bluetooth support for Linux"; + homepage = http://www.bluez.org/; + license = with licenses; [ gpl2 lgpl21 ]; platforms = platforms.linux; + repositories.git = https://git.kernel.org/pub/scm/bluetooth/bluez.git; }; } From cb9f4f1ae3c98b3628457877365b5751b3865c78 Mon Sep 17 00:00:00 2001 From: Issam Maghni Date: Sun, 29 Apr 2018 20:34:26 -0400 Subject: [PATCH 061/695] pythonPackages.neovim: 0.2.4 -> 0.2.6, gem-neovim & gem-msgpack --- .../editors/neovim/ruby_provider/Gemfile.lock | 4 ++-- pkgs/applications/editors/neovim/ruby_provider/gemset.nix | 8 ++++---- pkgs/development/python-modules/neovim/default.nix | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock index 87b011c4f8b..a95ced76371 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock +++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock @@ -1,9 +1,9 @@ GEM remote: https://rubygems.org/ specs: - msgpack (1.2.2) + msgpack (1.2.4) multi_json (1.13.1) - neovim (0.6.2) + neovim (0.7.0) msgpack (~> 1.0) multi_json (~> 1.0) diff --git a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix index aefecbf5ba8..af887161ea6 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix +++ b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix @@ -2,10 +2,10 @@ msgpack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1ai0sfdv9jnr333fsvkn7a8vqvn0iwiw83yj603a3i68ds1x6di1"; + sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.4"; }; multi_json = { source = { @@ -19,9 +19,9 @@ dependencies = ["msgpack" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "15r3j9bwlpm1ry7cp6059xb0irvsvvlmw53i28z6sf2khwfj5j53"; + sha256 = "0b487dzz41im8cwzvfjqgf8kkrp6mpkvcbzhazrmqqw8gxyvfbq4"; type = "gem"; }; - version = "0.6.2"; + version = "0.7.0"; }; } diff --git a/pkgs/development/python-modules/neovim/default.nix b/pkgs/development/python-modules/neovim/default.nix index 646a8e7bb11..6d96732cbb0 100644 --- a/pkgs/development/python-modules/neovim/default.nix +++ b/pkgs/development/python-modules/neovim/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "neovim"; - version = "0.2.4"; + version = "0.2.6"; src = fetchPypi { inherit pname version; - sha256 = "0accfgyvihs08bwapgakx6w93p4vbrq2448n2z6gw88m2hja9jm3"; + sha256 = "0xlj54w9bnmq4vidk6r08hwa6az7drahi08w1qf4j9q45rs8mrbc"; }; checkInputs = [ nose ]; From 6846c45eed8fa48e5df175a1253cdd167e446834 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Wed, 2 May 2018 17:29:18 +0300 Subject: [PATCH 062/695] cjdns: 20.1 -> 20.2 --- pkgs/tools/networking/cjdns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 817da08c05e..60fd42962fb 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }: -let version = "20.1"; in +let version = "20.2"; in stdenv.mkDerivation { name = "cjdns-"+version; @@ -8,7 +8,7 @@ stdenv.mkDerivation { owner = "cjdelisle"; repo = "cjdns"; rev = "cjdns-v${version}"; - sha256 = "033q8av46y0q8vxyqvb4yjh1lz6a17mmk8lhdpwdcqnsws8xjjsw"; + sha256 = "13zhcfwx8c3vdcf6ifivrgf8q7mgx00vnxcspdz88zk7dh65c6jn"; }; buildInputs = [ which python27 nodejs ] ++ From c7b21cd1911f880630102996b54956d19c974295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Wed, 2 May 2018 22:35:15 +0200 Subject: [PATCH 063/695] epeg: init at 0.9.1.042 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Niklas Hambüchen --- pkgs/applications/graphics/epeg/default.nix | 31 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/graphics/epeg/default.nix diff --git a/pkgs/applications/graphics/epeg/default.nix b/pkgs/applications/graphics/epeg/default.nix new file mode 100644 index 00000000000..02528a43e31 --- /dev/null +++ b/pkgs/applications/graphics/epeg/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool, autoconf, automake +, libjpeg, libexif +}: + +stdenv.mkDerivation rec { + name = "epeg-0.9.1.042"; # version taken from configure.ac + + src = fetchFromGitHub { + owner = "mattes"; + repo = "epeg"; + rev = "248ae9fc3f1d6d06e6062a1f7bf5df77d4f7de9b"; + sha256 = "14ad33w3pxrg2yfc2xzyvwyvjirwy2d00889dswisq8b84cmxfia"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ pkgconfig libtool autoconf automake ]; + + propagatedBuildInputs = [ libjpeg libexif ]; + + preConfigure = '' + ./autogen.sh + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/mattes/epeg; + description = "Insanely fast JPEG/ JPG thumbnail scaling"; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ nh2 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1c4e2e09a8..fcc6967b08f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15571,6 +15571,8 @@ with pkgs; epdfview = callPackage ../applications/misc/epdfview { }; + epeg = callPackage ../applications/graphics/epeg/default.nix { }; + inherit (gnome3) epiphany; epic5 = callPackage ../applications/networking/irc/epic5 { }; From 8b4d3ed1ef94ef08f654d50451e10fbc7a69b390 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 2 May 2018 16:12:39 -0700 Subject: [PATCH 064/695] groonga: 8.0.1 -> 8.0.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/groonga/versions. These checks were done: - built on NixOS - ran ‘/nix/store/av4a5br78r73h7r6mlbqg3zxi9lksskq-groonga-8.0.2/bin/groonga-suggest-create-dataset -h’ got 0 exit code - ran ‘/nix/store/av4a5br78r73h7r6mlbqg3zxi9lksskq-groonga-8.0.2/bin/groonga-suggest-create-dataset --help’ got 0 exit code - ran ‘/nix/store/av4a5br78r73h7r6mlbqg3zxi9lksskq-groonga-8.0.2/bin/groonga -h’ got 0 exit code - ran ‘/nix/store/av4a5br78r73h7r6mlbqg3zxi9lksskq-groonga-8.0.2/bin/groonga --help’ got 0 exit code - ran ‘/nix/store/av4a5br78r73h7r6mlbqg3zxi9lksskq-groonga-8.0.2/bin/groonga-httpd -h’ got 0 exit code - found 8.0.2 with grep in /nix/store/av4a5br78r73h7r6mlbqg3zxi9lksskq-groonga-8.0.2 - directory tree listing: https://gist.github.com/9a3a3eb436d26334ce117be25e74b45c --- pkgs/servers/search/groonga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 063ad8c3f57..a4b2418f58c 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "8.0.1"; + version = "8.0.2"; src = fetchurl { url = "http://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "074r71dcv1l8rm6an7b8iyfpcxbk00iysmzszssknqg8mrqvsphg"; + sha256 = "0bsf4dbgbddij49xg6d6kl9kb1m5ywdyc1w1xz2giisqk1hdwsz4"; }; buildInputs = with stdenv.lib; From 12b78da1967df6761aeceb346c94ca0931d11014 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 2 May 2018 21:09:14 -0300 Subject: [PATCH 065/695] terminology: 1.1.1 -> 1.2.0 - Update to version 1.2.0 - Switch build tools from autotools to meson --- pkgs/desktops/enlightenment/terminology.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix index 3a52707fcf4..1a15092c7e7 100644 --- a/pkgs/desktops/enlightenment/terminology.nix +++ b/pkgs/desktops/enlightenment/terminology.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, efl, pcre, makeWrapper }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, pcre, mesa_noglu, makeWrapper }: stdenv.mkDerivation rec { name = "terminology-${version}"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.xz"; - sha256 = "05ncxvzb9rzkyjvd95hzn8lswqdwr8cix6rd54nqn9559jibh4ns"; + sha256 = "0kw34l5lahn1qaks3ah6x8k41d6hfywpqfak2p7qq1z87zj506mx"; }; nativeBuildInputs = [ + meson + ninja (pkgconfig.override { vanilla = true; }) makeWrapper ]; @@ -17,11 +19,12 @@ stdenv.mkDerivation rec { buildInputs = [ efl pcre + mesa_noglu ]; meta = { - description = "The best terminal emulator written with the EFL"; - homepage = http://enlightenment.org/; + description = "Powerful terminal emulator based on EFL"; + homepage = https://www.enlightenment.org/about-terminology; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; From 89b1eaa92b836628e8c8b7c5c0c19c51e6e14abb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 2 May 2018 17:30:02 -0700 Subject: [PATCH 066/695] altcoins.bitcoin-abc: 0.17.0 -> 0.17.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/bitcoin-abc/versions. These checks were done: - built on NixOS - ran ‘/nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1/bin/bitcoind -h’ got 0 exit code - ran ‘/nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1/bin/bitcoind --help’ got 0 exit code - ran ‘/nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1/bin/bitcoin-cli -h’ got 0 exit code - ran ‘/nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1/bin/bitcoin-cli --help’ got 0 exit code - ran ‘/nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1/bin/bitcoin-tx -h’ got 0 exit code - ran ‘/nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1/bin/bitcoin-tx --help’ got 0 exit code - ran ‘/nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1/bin/test_bitcoin --help’ got 0 exit code - ran ‘/nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1/bin/bitcoin-qt -h’ got 0 exit code - ran ‘/nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1/bin/bitcoin-qt --help’ got 0 exit code - found 0.17.1 with grep in /nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1 - directory tree listing: https://gist.github.com/011ceeb08c6986692052c6b32e5f0577 --- pkgs/applications/altcoins/bitcoin-abc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix index 35488732117..bd365e16730 100644 --- a/pkgs/applications/altcoins/bitcoin-abc.nix +++ b/pkgs/applications/altcoins/bitcoin-abc.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "1s2y29h2q4fnbrfg2ig1cd3h7g3kdcdyrfq7znq1ndnh8xj1j489"; + sha256 = "1kq9n3s9vhkmfaizsyi2cb91ibi06gb6wx0hkcb9hg3nrrvcka3y"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; From d76ac2707bd0729d73909b7d4f0ef4f4687a7224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 2 May 2018 22:29:46 -0300 Subject: [PATCH 067/695] enlightenment: add dependency on mesa_noglu --- pkgs/desktops/enlightenment/enlightenment.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index 9b782b94f7f..b0fd5f3db2b 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl, xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib, - luajit, bzip2, libpthreadstubs, gdbm, libcap, libGLU, + luajit, bzip2, libpthreadstubs, gdbm, libcap, libGLU, mesa_noglu, xkeyboard_config, pcre }: @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { libpthreadstubs gdbm pcre + mesa_noglu ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; From ada2fc088cef052eb0071e0c226a7f0bb00bd0b5 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Wed, 2 May 2018 17:01:30 +0200 Subject: [PATCH 068/695] gcc49: backport retpoline support To mitigate Spectre Variant 2, GCC needs to have retpoline support (-mindirect-branch and -mfunction-return arguments on amd64 and i386). Patches were pulled from H.J. Lu's backport branch to 4.9 (hjl/indirect/gcc-4_9-branch), available at https://github.com/hjl-tools/gcc/tree/hjl/indirect/gcc-4_9-branch/master. Upstream GCC does not apply patches to anything older than the gcc-6-branch. H.J. Lu is the author of the upstream retpoline commits as well. Several Linux distributions already backported these patches to GCC 4 branches and some old kernels (3.13 for instance) have been recompiled with these GCC patches. These kernels only allow to load kernel modules that are compiled with the retpoline support. References: - Ubuntu bug: https://bugs.launchpad.net/ubuntu/+source/gcc-4.8/+bug/1749261 - Ubuntu package: https://launchpad.net/ubuntu/+source/gcc-4.8/4.8.4-2ubuntu1~14.04.4 Fixes #38394 --- pkgs/development/compilers/gcc/4.9/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index fb82eee4ab8..fc9e7281250 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPackages, fetchurl, noSysDirs +{ stdenv, targetPackages, fetchurl, noSysDirs, fetchpatch , langC ? true, langCC ? true, langFortran ? false , langObjC ? targetPlatform.isDarwin , langObjCpp ? targetPlatform.isDarwin @@ -65,7 +65,21 @@ let version = "4.9.4"; ++ optional noSysDirs ../no-sys-dirs.patch ++ optional langFortran ../gfortran-driving.patch ++ [ ../struct-ucontext.patch ../struct-sigaltstack-4.9.patch ] # glibc-2.26 - ; + # Retpoline patches pulled from the branch hjl/indirect/gcc-4_9-branch (by H.J. Lu, the author of GCC upstream retpoline commits) + ++ builtins.map ({commit, sha256}: fetchpatch {url = "https://github.com/hjl-tools/gcc/commit/${commit}.patch"; inherit sha256;}) + [{ commit = "e623d21608e96ecd6b65f0d06312117d20488a38"; sha256 = "1ix8i4d2r3ygbv7npmsdj790rhxqrnfwcqzv48b090r9c3ij8ay3"; } + { commit = "2015a09e332309f12de1dadfe179afa6a29368b8"; sha256 = "0xcfs0cbb63llj2gbcdrvxim79ax4k4aswn0a3yjavxsj71s1n91"; } + { commit = "6b11591f4494f705e8746e7d58b7f423191f4e92"; sha256 = "0aydyhsm2ig0khgbp27am7vq7liyqrq6kfhfi2ki0ij0ab1hfbga"; } + { commit = "203c7d9c3e9cb0f88816b481ef8e7e87b3ecc373"; sha256 = "0wqn16y7wy5kg8ngfcni5qdwfphl01axczibbk49bxclwnzvldqa"; } + { commit = "f039c6f284b2c9ce97c8353d6034978795c4872e"; sha256 = "13fkgdb17lpyxfksz1zanxhgpsm0jrss9w61nbl7an4im22hz7ci"; } + { commit = "ed42606bdab1c5d9e5ad828cd6fe1a0557f193b7"; sha256 = "0gdnn8v3p03imj3qga2mzdhpgbmjcklkxdl97jvz5xia2ikzknxm"; } + { commit = "5278e062ef292fd2fbf987d25389785f4c5c0f99"; sha256 = "0j81x758wf8v7j4rx5wc1cy7yhkvhlhv3wmnarwakxiwsspq0vrs"; } + { commit = "76f1ffbbb6cd9f6ecde6c82cd16e20a27242e890"; sha256 = "1py56y6gp7fjf4f8bbsfwh5bs1gnmlqda1ycsmnwlzfm0cshdp0c"; } + { commit = "4ca48b2b688b135c0390f54ea9077ef10aedd52c"; sha256 = "15r019pzr3k0lpgyvdc92c8fayw8b5lrzncna4bqmamcsdz7vsaw"; } + { commit = "98c7bf9ddc80db965d69d61521b1c7a1cec32d9a"; sha256 = "1d7pfdv1q23nf0wadw7jbp6d6r7pnzjpbyxgbdfv7j1vr9l1bp60"; } + { commit = "3dc76b53ad896494ca62550a7a752fecbca3f7a2"; sha256 = "0jvdzfpvfdmklfcjwqblwq1i22iqis7ljpvm7adra5d7zf2xk7xz"; } + { commit = "1e961ed49b18e176c7457f53df2433421387c23b"; sha256 = "04dnqqs4qsvz4g8cq6db5id41kzys7hzhcaycwmc9rpqygs2ajwz"; } + { commit = "e137c72d099f9b3b47f4cc718aa11eab14df1a9c"; sha256 = "1ms0dmz74yf6kwgjfs4d2fhj8y6mcp2n184r3jk44wx2xc24vgb2"; }]; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at From 554e296c9fb46de531affb1aea54e5d29830485b Mon Sep 17 00:00:00 2001 From: Assassinkin Date: Thu, 3 May 2018 14:00:17 +0100 Subject: [PATCH 069/695] Adding Zabbix agent 3.4 packages --- pkgs/servers/monitoring/zabbix/3.4.nix | 40 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/servers/monitoring/zabbix/3.4.nix diff --git a/pkgs/servers/monitoring/zabbix/3.4.nix b/pkgs/servers/monitoring/zabbix/3.4.nix new file mode 100644 index 00000000000..332e139f428 --- /dev/null +++ b/pkgs/servers/monitoring/zabbix/3.4.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, pcre, libevent, libiconv }: + + +let + + version = "3.4.8"; + branch = "3.4"; + + src = fetchurl { + url = "https://netix.dl.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz"; + sha256 = "cec14993d1ec2c9d8c51f6608c9408620f27174db92edc2347bafa7b841ccc07"; + }; + +in + +{ + agent = stdenv.mkDerivation { + name = "zabbix-agent-${version}"; + + inherit src; + + configureFlags = [ + "--enable-agent" + "--with-libpcre=${pcre.dev}" + "--with-iconv=${libiconv}" + ]; + buildInputs = [ pcre libiconv ]; + + meta = with stdenv.lib; { + inherit branch; + description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; + homepage = http://www.zabbix.com/; + license = licenses.gpl2; + maintainers = [ maintainers.eelco ]; + platforms = platforms.linux; + }; + }; + +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1c4e2e09a8..00c466d5add 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13002,6 +13002,7 @@ with pkgs; zabbix20 = callPackage ../servers/monitoring/zabbix/2.0.nix { }; zabbix22 = callPackage ../servers/monitoring/zabbix/2.2.nix { }; + zabbix34 = callPackage ../servers/monitoring/zabbix/3.4.nix { }; zipkin = callPackage ../servers/monitoring/zipkin { }; From b62788f744225e5ff498059e7c5b9048d31f966d Mon Sep 17 00:00:00 2001 From: Philipp Middendorf Date: Thu, 3 May 2018 13:40:48 +0200 Subject: [PATCH 070/695] ledger: enable python command MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ledger in nixpkgs currently uses python (it’s in buildInputs), but the ledger python command isn’t available until you turn it on via a cmake flag. --- pkgs/applications/office/ledger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index bb6e529f5d2..9675293cfe5 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr, libedit, python -, texinfo, gnused }: +, texinfo, gnused, usePython ? true }: stdenv.mkDerivation rec { name = "ledger-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; + cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" (stdenv.lib.optionalString usePython "-DUSE_PYTHON=true") ]; # Skip byte-compiling of emacs-lisp files because this is currently # broken in ledger... From 5b6129f69c689b219ce4b92bae54216b714de819 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Thu, 3 May 2018 15:09:43 +0200 Subject: [PATCH 071/695] gcc49: remove darwin support --- pkgs/development/compilers/gcc/4.9/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index fc9e7281250..f041252495a 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -496,8 +496,7 @@ stdenv.mkDerivation ({ platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.freebsd ++ - stdenv.lib.platforms.illumos ++ - stdenv.lib.platforms.darwin; + stdenv.lib.platforms.illumos; }; } From f99ded298f5b34437395cc739d52042b4dce3580 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Thu, 3 May 2018 16:02:32 +0200 Subject: [PATCH 072/695] Ruby: 2.3.6 -> 2.3.7, 2.4.3 -> 2.4.4, 2.5.0 -> 2.5.1 --- pkgs/development/interpreters/ruby/default.nix | 18 +++++++++--------- .../interpreters/ruby/patchsets.nix | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 4ebc488d998..b98e2c1a673 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -200,26 +200,26 @@ let in { ruby_2_3 = generic { - version = rubyVersion "2" "3" "6" ""; + version = rubyVersion "2" "3" "7" ""; sha256 = { - src = "07jpa7fw1gyf069m7alf2b0zm53qm08w2ns45mhzmvgrg4r528l3"; - git = "1bk59i0ygdc5z3zz3k6indfrxd2ix55np6rwvkcdpdw8svm749ds"; + src = "0zvx5kdp1frjs9n95n7ba7dy0alax33wi3nj8034m3ppvnf39k9m"; + git = "11wbzw2ywwfnvlkg3qjg0as2pzk5zyk63y2iis42d91lg1l2flrk"; }; }; ruby_2_4 = generic { - version = rubyVersion "2" "4" "3" ""; + version = rubyVersion "2" "4" "4" ""; sha256 = { - src = "161smb52q19r9lrzy22b3bhnkd0z8wjffm0qsfkml14j5ic7a0zx"; - git = "0x2lqbqm2rq9j5zh1p72dma56nqvdkfbgzb9wybm4y4hwhiw8c1m"; + src = "0nmfr2lijik6cykk0zbj11zcapcrvmdvq83k3r6q3k74g4d1qkr5"; + git = "103cs7hz1v0h84lbrippl87s4lawi20m406rs5dgxl2gr2wyjpy5"; }; }; ruby_2_5 = generic { - version = rubyVersion "2" "5" "0" ""; + version = rubyVersion "2" "5" "1" ""; sha256 = { - src = "1azj0d2lzziw6iml7bx3sxpxzcdmfwfq3yhm7djyp20q1xiz7rj6"; - git = "0d436nqmp3ykdkp4sck5bb8sf3qvx30x1p58xh8axv66mvsyc2jd"; + src = "1c99k0fjaq7k09104h1b1cqx6mrk2b14ic1jjnxc6yav68i1ij6s"; + git = "1j0fd16aq9x98n0kq9c3kfp2sh6xcsq8q4733p0wfqjh3vz50kyj"; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index fc79761252f..e53f231884d 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -6,17 +6,17 @@ rec { "${patchSet}/patches/ruby/2.2/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.2/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.3.6" = ops useRailsExpress [ + "2.3.7" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.4.3" = ops useRailsExpress [ + "2.4.4" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.5.0" = ops useRailsExpress [ + "2.5.1" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch" From 07ee2b907d8deabcf6d7fb4269ad0b681f9c0f06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 3 May 2018 15:22:01 +0100 Subject: [PATCH 073/695] john: build with recent gcc --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f13edf9eba4..77f55ad2cbc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3138,9 +3138,7 @@ with pkgs; go-jira = callPackage ../applications/misc/go-jira { }; - john = callPackage ../tools/security/john { - gcc = gcc49; # doesn't build with gcc5 - }; + john = callPackage ../tools/security/john { }; journalbeat = callPackage ../tools/system/journalbeat { }; From 54a13b07d5925c8e890e0d9aaa0842cd7ae0d8d6 Mon Sep 17 00:00:00 2001 From: edef Date: Sat, 12 Aug 2017 21:14:36 +0200 Subject: [PATCH 074/695] switch-to-configuration: use Net::DBus to retrieve the list of units This resolves the FIXME, and opens up the possibility of using more of the systemd DBus interface to make things more robust. --- .../activation/switch-to-configuration.pl | 19 +++++++++---------- nixos/modules/system/activation/top-level.nix | 3 ++- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 87a4ab2a586..2ce04ed5342 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -4,6 +4,7 @@ use strict; use warnings; use File::Basename; use File::Slurp; +use Net::DBus; use Sys::Syslog qw(:standard :macros); use Cwd 'abs_path'; @@ -67,17 +68,15 @@ EOF $SIG{PIPE} = "IGNORE"; sub getActiveUnits { - # FIXME: use D-Bus or whatever to query this, since parsing the - # output of list-units is likely to break. - # Use current version of systemctl binary before daemon is reexeced. - my $lines = `LANG= /run/current-system/sw/bin/systemctl list-units --full --no-legend`; + my $mgr = Net::DBus->system->get_service("org.freedesktop.systemd1")->get_object("/org/freedesktop/systemd1"); + my $units = $mgr->ListUnitsByPatterns([], []); my $res = {}; - foreach my $line (split '\n', $lines) { - chomp $line; - last if $line eq ""; - $line =~ /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s/ or next; - next if $1 eq "UNIT"; - $res->{$1} = { load => $2, state => $3, substate => $4 }; + for my $item (@$units) { + my ($id, $description, $load_state, $active_state, $sub_state, + $following, $unit_path, $job_id, $job_type, $job_path) = @$item; + next unless $following eq ''; + next if $job_id == 0 and $active_state eq 'inactive'; + $res->{$id} = { load => $load_state, state => $active_state, substate => $sub_state }; } return $res; } diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 091a2e412ee..e2d1dd49ef0 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -127,7 +127,8 @@ let configurationName = config.boot.loader.grub.configurationName; # Needed by switch-to-configuration. - perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl"; + + perl = "${pkgs.perl}/bin/perl " + (concatMapStringsSep " " (lib: "-I${lib}/${pkgs.perl.libPrefix}") (with pkgs.perlPackages; [ FileSlurp NetDBus XMLParser XMLTwig ])); } else throw "\nFailed assertions:\n${concatStringsSep "\n" (map (x: "- ${x}") failed)}"); # Replace runtime dependencies From bfb3232a13c2261a13eeb3bbfad0b3b3a6ed92c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 3 May 2018 15:19:54 -0300 Subject: [PATCH 075/695] theme-obsidian2: init at 2.5 --- pkgs/misc/themes/obsidian2/default.nix | 28 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/misc/themes/obsidian2/default.nix diff --git a/pkgs/misc/themes/obsidian2/default.nix b/pkgs/misc/themes/obsidian2/default.nix new file mode 100644 index 00000000000..41f29f34be8 --- /dev/null +++ b/pkgs/misc/themes/obsidian2/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + name = "theme-obsidian2-${version}"; + version = "2.5"; + + src = fetchFromGitHub { + owner = "madmaxms"; + repo = "theme-obsidian-2"; + rev = "v${version}"; + sha256 = "12jya1gzmhpfh602vbf51vi69fmis7sanvx278h3skm03a7civlv"; + }; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + installPhase = '' + mkdir -p $out/share/themes + cp -a Obsidian-2 $out/share/themes + ''; + + meta = with stdenv.lib; { + description = "Gnome theme, based upon Adwaita-Maia dark skin"; + homepage = https://github.com/madmaxms/theme-obsidian-2; + license = with licenses; [ gpl3 ]; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97e2ee5a3a6..93fae25f5f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19715,6 +19715,8 @@ with pkgs; numix-sx-gtk-theme = callPackage ../misc/themes/numix-sx { }; + theme-obsidian2 = callPackage ../misc/themes/obsidian2 { }; + onestepback = callPackage ../misc/themes/onestepback { }; theme-vertex = callPackage ../misc/themes/vertex { }; From 919d824efe142c6e23d7808621f571890b0d0503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 3 May 2018 15:45:57 -0300 Subject: [PATCH 076/695] iconpack-obsidian: init at 4.0.1 --- pkgs/data/icons/iconpack-obsidian/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/data/icons/iconpack-obsidian/default.nix diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/pkgs/data/icons/iconpack-obsidian/default.nix new file mode 100644 index 00000000000..efcaa1cbc53 --- /dev/null +++ b/pkgs/data/icons/iconpack-obsidian/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, gtk3 }: + +stdenv.mkDerivation rec { + name = "iconpack-obsidian-${version}"; + version = "4.0.1"; + + src = fetchFromGitHub { + owner = "madmaxms"; + repo = "iconpack-obsidian"; + rev = "v${version}"; + sha256 = "1mlaldqjc3am2d2m577fhsidlnfqlhmnf1l8hh50iqr94mc14fab"; + }; + + nativeBuildInputs = [ gtk3 ]; + + installPhase = '' + mkdir -p $out/share/icons + mv Obsidian* $out/share/icons + ''; + + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; + + meta = with stdenv.lib; { + description = "Gnome Icon Pack based upon Faenza"; + homepage = https://github.com/madmaxms/iconpack-obsidian; + license = licenses.lgpl3; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97e2ee5a3a6..ff4e788e515 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14396,6 +14396,8 @@ with pkgs; ibm-plex = callPackage ../data/fonts/ibm-plex { }; + iconpack-obsidian = callPackage ../data/icons/iconpack-obsidian { }; + inconsolata = callPackage ../data/fonts/inconsolata {}; inconsolata-lgc = callPackage ../data/fonts/inconsolata/lgc.nix {}; From adce6bf638bc6032f17e002334e444a3c8656ad2 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Thu, 3 May 2018 21:54:09 +0200 Subject: [PATCH 077/695] refind: fix runtime errors In newer versions, instead of using $PWD to locate its ressource files, Refind now refers to the dir containing $0. This causes runtime errors due to missing ressources. In lieu a wrapper binary, we now simply patch the variable 'RefindDir' which stores the path to the ressource dir. --- pkgs/tools/bootloaders/refind/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index f305cff0ea2..80add316094 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { install -D -m0644 gptsync/gptsync_${efiPlatform}.efi $out/share/refind/tools_${efiPlatform}/gptsync_${efiPlatform}.efi # helper scripts - install -D -m0755 refind-install $out/share/refind/refind-install + install -D -m0755 refind-install $out/bin/refind-install install -D -m0755 mkrlconf $out/bin/refind-mkrlconf install -D -m0755 mvrefind $out/bin/refind-mvrefind install -D -m0755 fonts/mkfont.sh $out/bin/refind-mkfont @@ -86,21 +86,13 @@ stdenv.mkDerivation rec { # keys install -D -m0644 keys/* $out/share/refind/keys/ - # The refind-install script assumes that all resource files are - # installed under the same directory as the script itself. To avoid - # having to patch around this assumption, generate a wrapper that - # cds into $out/share/refind and executes the real script from - # there. - cat >$out/bin/refind-install < Date: Fri, 4 May 2018 12:41:44 +0800 Subject: [PATCH 078/695] freetds: 1.00.80 -> 1.00.91 --- pkgs/development/libraries/freetds/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index b097e5cbb64..52d439918aa 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -4,19 +4,17 @@ assert odbcSupport -> unixODBC != null; +# Work is in progress to move to cmake so revisit that later + stdenv.mkDerivation rec { name = "freetds-${version}"; - version = "1.00.80"; + version = "1.00.91"; src = fetchurl { url = "http://www.freetds.org/files/stable/${name}.tar.bz2"; - sha256 = "17s15avxcyhfk0zsj8rggizhpd2j2sa41w5xlnshzd2r3piqyl6k"; + sha256 = "04c344xdvh2j36r01ph7yhy5rb1668il0z9vyphwdy6qqwywh622"; }; - configureFlags = [ - "--with-tdsver=7.3" - ]; - buildInputs = [ openssl ] ++ stdenv.lib.optional odbcSupport unixODBC; From d8ebe4f2cfce622066f174bc33a35910ea52093e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 3 May 2018 18:37:47 +0000 Subject: [PATCH 079/695] ocamlPackages.git: 1.11.4 -> 1.11.5 Also enable tests --- pkgs/development/ocaml-modules/git-http/default.nix | 9 +++++++-- pkgs/development/ocaml-modules/git/default.nix | 10 +++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/git-http/default.nix b/pkgs/development/ocaml-modules/git-http/default.nix index 5b93b960765..5e757b5b672 100644 --- a/pkgs/development/ocaml-modules/git-http/default.nix +++ b/pkgs/development/ocaml-modules/git-http/default.nix @@ -1,10 +1,12 @@ -{ stdenv, ocaml, findlib, jbuilder, git, cohttp-lwt }: +{ stdenv, ocaml, findlib, jbuilder, git, cohttp-lwt +, alcotest, mtime, nocrypto +}: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-git-http-${version}"; inherit (git) version src; - buildInputs = [ ocaml findlib jbuilder ]; + buildInputs = [ ocaml findlib jbuilder alcotest mtime nocrypto ]; propagatedBuildInputs = [ git cohttp-lwt ]; @@ -12,6 +14,9 @@ stdenv.mkDerivation rec { inherit (jbuilder) installPhase; + doCheck = true; + checkPhase = "jbuilder runtest -p git-http"; + meta = { description = "Client implementation of the “Smart” HTTP Git protocol in pure OCaml"; inherit (git.meta) homepage license maintainers platforms; diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index 9347c6ad00c..6f0f0d0b120 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -1,19 +1,20 @@ { stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, opam , astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, uri +, alcotest, mtime, nocrypto }: stdenv.mkDerivation rec { - version = "1.11.4"; + version = "1.11.5"; name = "ocaml${ocaml.version}-git-${version}"; src = fetchFromGitHub { owner = "mirage"; repo = "ocaml-git"; rev = version; - sha256 = "182b6shcfcq50r5snm01hwalnmck43x1xgdd4fvjb6q78pbwag2x"; + sha256 = "0r1bxpxjjnl9hh8xbabsxl7svzvd19hfy73a2y1m4kljmw64dpfh"; }; - buildInputs = [ ocaml findlib jbuilder ]; + buildInputs = [ ocaml findlib jbuilder alcotest mtime nocrypto ]; propagatedBuildInputs = [ astring decompress fmt hex logs mstruct ocaml_lwt ocamlgraph uri ]; @@ -21,6 +22,9 @@ stdenv.mkDerivation rec { inherit (jbuilder) installPhase; + doCheck = true; + checkPhase = "jbuilder runtest -p git"; + meta = { description = "Git format and protocol in pure OCaml"; license = stdenv.lib.licenses.isc; From cf50edf58385c4ca261b53ad09c9be2d94349427 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 3 May 2018 15:35:51 +0200 Subject: [PATCH 080/695] python3Packages.yowsup: 2.5.2 -> 2.5.7 The latest update of `yowsup` (https://github.com/tgalal/yowsup/releases/tag/v2.5.7) contains the following fixes: * Updated tokens * Fixed tgalal/yowsup#1842: Bug in protocol_groups RemoveGroupsNotificationProtocolEntity * Other minor bug fixes The `argparse-dependency.patch` required a rebase onto the latest version of `setup.py` and ensures that `argparse` won't be needed as extra dependency as our `python3` package ships `argparse` by default. A short note to Python 2 support: the actual issue related to Python 2.x support has been resolved (https://github.com/tgalal/yowsup/issues/2325#issuecomment-354533727), however this relies on `six==1.10` which isn't support by `nixpkgs` as `six` has been bumped to `1.11`. When trying to inject a patched version of our `six` package based on `six==1.10` you'll run into issues with duplicated libraries in your closure as further build dependencies (`pytest` in this case) use the latest `six` version. As Python 2.7 will die in 2020 (https://pythonclock.org/) and patching around in the dependencies of `pytest` to get `yowsup` running isn't worth the effort in my opinion I decided to keep the Python 2.x build disabled for now. --- .../python-modules/yowsup/argparse-dependency.patch | 6 +++--- pkgs/development/python-modules/yowsup/default.nix | 9 ++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/yowsup/argparse-dependency.patch b/pkgs/development/python-modules/yowsup/argparse-dependency.patch index 364f0054fe7..e2b9f0c9a74 100644 --- a/pkgs/development/python-modules/yowsup/argparse-dependency.patch +++ b/pkgs/development/python-modules/yowsup/argparse-dependency.patch @@ -1,13 +1,13 @@ diff --git a/setup.py b/setup.py -index 053ed07..60f0d9a 100755 +index 991e89c..7a96ccf 100755 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ import yowsup import platform import sys --deps = ['python-dateutil', 'argparse', 'python-axolotl>=0.1.39', 'six'] +-deps = ['python-dateutil', 'argparse', 'python-axolotl>=0.1.39', 'six==1.10'] +deps = ['python-dateutil', 'python-axolotl>=0.1.39', 'six'] if sys.version_info < (2,7): - deps += ['importlib'] + deps += ['importlib', "protobuf==3.4.0"] diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix index f7ee986aebb..5fa4af18c08 100644 --- a/pkgs/development/python-modules/yowsup/default.nix +++ b/pkgs/development/python-modules/yowsup/default.nix @@ -3,19 +3,18 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "yowsup"; - version = "2.5.2"; + version = "2.5.7"; - # python2 is currently incompatible with yowsup: - # https://github.com/tgalal/yowsup/issues/2325#issuecomment-343516519 + # The Python 2.x support of this package is incompatible with `six==1.11`: + # https://github.com/tgalal/yowsup/issues/2416#issuecomment-365113486 disabled = !isPy3k; src = fetchFromGitHub { owner = "tgalal"; repo = "yowsup"; rev = "v${version}"; - sha256 = "16l8jmr32wwvl11m0a4r4id3dkfqj2n7dn6gky1077xwmj2da4fl"; + sha256 = "1p0hdj5x38v2cxjnhdnqcnp5g7la57mbi365m0z83wa01x2n73w6"; }; checkInputs = [ pytest ]; From 1f1e16af732a579bf9967494473eaf7079aeaed5 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Fri, 4 May 2018 13:02:02 +0200 Subject: [PATCH 081/695] mathematica: add mesa, fix `libGL.so.1 not found` messages --- pkgs/applications/science/math/mathematica/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 9b9d5b250ef..97781a69ce6 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -19,6 +19,8 @@ , libxml2 , libuuid , lang ? "en" +, libGL +, libGLU }: let @@ -56,6 +58,8 @@ stdenv.mkDerivation rec { libxml2 libuuid zlib + libGL + libGLU ] ++ (with xorg; [ libX11 libXext From 20bb5fb0d94823eca8a4b68bc5ddfce459346d72 Mon Sep 17 00:00:00 2001 From: Yorick Date: Fri, 4 May 2018 13:12:09 +0200 Subject: [PATCH 082/695] impure.nix: stringify path from NIX_PATH If impure.nix gets the path from NIX_PATH, the type is `path`, and `path+"/."` is a no-op. Stringify it first so `isDir` will return false if it's not, in fact, a dir. This way, single files can be specified with nixpkgs-overlays in the NIX_PATH. --- pkgs/top-level/impure.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index a9f21e45aed..df462665dd1 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -41,7 +41,7 @@ in # fix-point made by Nixpkgs. overlays ? let isDir = path: pathExists (path + "/."); - pathOverlays = try ""; + pathOverlays = try (toString ) ""; homeOverlaysFile = homeDir + "/.config/nixpkgs/overlays.nix"; homeOverlaysDir = homeDir + "/.config/nixpkgs/overlays"; overlays = path: From 39c63320cbf4654eabdc7e15aebf1d3a74598dbd Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 4 May 2018 16:06:47 +0200 Subject: [PATCH 083/695] minitube: 2.4 -> 2.9 Version 2.9 is based on QT5 (with a much better interface) and requires additionally the dependencies `qtbase`, `qtdeclarative` and `qttools`. Furthermore the `QT_PLUGIN_PATH` had to be altered, however the `phonon-backend` contains versioned paths, so we provide the plugin path that matches the QT version used to build this package. See #33248 --- pkgs/applications/video/minitube/default.nix | 15 +++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index 8b94204cd62..3b8dce90243 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -1,21 +1,23 @@ -{ stdenv, fetchFromGitHub, makeWrapper, phonon, phonon-backend-vlc, qt4, qmake4Hook +{ stdenv, fetchFromGitHub, makeWrapper, phonon, phonon-backend-vlc, qtbase, qmake +, qtdeclarative, qttools + # "Free" key generated by nckx . I no longer have a Google # account. You'll need to generate (and please share :-) a new one if it breaks. , withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }: stdenv.mkDerivation rec { name = "minitube-${version}"; - version = "2.4"; + version = "2.9"; src = fetchFromGitHub { - sha256 = "0mm8v2vpspwxh2fqaykb381v6r9apywc1b0x8jkcbp7s43w10lp5"; + sha256 = "11zkmwqadlgrrghs3rxq0h0fllfnyd3g09d7gdd6vd9r1a1yz73f"; rev = version; repo = "minitube"; owner = "flaviotordini"; }; - buildInputs = [ phonon phonon-backend-vlc qt4 ]; - nativeBuildInputs = [ makeWrapper qmake4Hook ]; + buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qttools ]; + nativeBuildInputs = [ makeWrapper qmake ]; qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ]; @@ -23,7 +25,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/minitube \ - --prefix QT_PLUGIN_PATH : "${phonon-backend-vlc}/lib/kde4/plugins" + --prefix QT_PLUGIN_PATH : "${phonon-backend-vlc}/lib/qt-5.${stdenv.lib.versions.minor qtbase.version}/plugins" ''; meta = with stdenv.lib; { @@ -36,5 +38,6 @@ stdenv.mkDerivation rec { homepage = https://flavio.tordini.org/minitube; license = licenses.gpl3Plus; platforms = platforms.linux; + maintainers = with maintainers; [ ma27 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1c4e2e09a8..684fb560d9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16778,7 +16778,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) vmnet; }; - minitube = callPackage ../applications/video/minitube { }; + minitube = libsForQt5.callPackage ../applications/video/minitube { }; mimms = callPackage ../applications/audio/mimms {}; From 7f53ee8412b6f4777f827acf15db119e000d8f6f Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Thu, 3 May 2018 21:30:06 +0200 Subject: [PATCH 084/695] restic-rest-server module: init --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + .../services/backup/restic-rest-server.nix | 107 ++++++++++++++++++ 3 files changed, 110 insertions(+) create mode 100644 nixos/modules/services/backup/restic-rest-server.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 0ed820a32ac..805d83c7ce3 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -306,6 +306,7 @@ ceph = 288; duplicati = 289; monetdb = 290; + restic = 291; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -580,6 +581,7 @@ ceph = 288; duplicati = 289; monetdb = 290; + restic = 291; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 505c5497d36..26804d3682d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -167,6 +167,7 @@ ./services/backup/mysql-backup.nix ./services/backup/postgresql-backup.nix ./services/backup/restic.nix + ./services/backup/restic-rest-server.nix ./services/backup/rsnapshot.nix ./services/backup/tarsnap.nix ./services/backup/znapzend.nix diff --git a/nixos/modules/services/backup/restic-rest-server.nix b/nixos/modules/services/backup/restic-rest-server.nix new file mode 100644 index 00000000000..d4b47a09941 --- /dev/null +++ b/nixos/modules/services/backup/restic-rest-server.nix @@ -0,0 +1,107 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.restic.server; +in +{ + meta.maintainers = [ maintainers.bachp ]; + + options.services.restic.server = { + enable = mkEnableOption "Restic REST Server"; + + listenAddress = mkOption { + default = ":8000"; + example = "127.0.0.1:8080"; + type = types.str; + description = "Listen on a specific IP address and port."; + }; + + dataDir = mkOption { + default = "/var/lib/restic"; + type = types.path; + description = "The directory for storing the restic repository."; + }; + + appendOnly = mkOption { + default = false; + type = types.bool; + description = '' + Enable append only mode. + This mode allows creation of new backups but prevents deletion and modification of existing backups. + This can be useful when backing up systems that have a potential of being hacked. + ''; + }; + + privateRepos = mkOption { + default = false; + type = types.bool; + description = '' + Enable private repos. + Grants access only when a subdirectory with the same name as the user is specified in the repository URL. + ''; + }; + + prometheus = mkOption { + default = false; + type = types.bool; + description = "Enable Prometheus metrics at /metrics."; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options to pass to Restic REST server. + ''; + }; + + package = mkOption { + default = pkgs.restic-rest-server; + defaultText = "pkgs.restic-rest-server"; + type = types.package; + description = "Restic REST server package to use."; + }; + }; + + config = mkIf cfg.enable { + systemd.services.restic-rest-server = { + description = "Restic REST Server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = '' + ${cfg.package}/bin/rest-server \ + --listen ${cfg.listenAddress} \ + --path ${cfg.dataDir} \ + ${optionalString cfg.appendOnly "--append-only"} \ + ${optionalString cfg.privateRepos "--private-repos"} \ + ${optionalString cfg.prometheus "--prometheus"} \ + ${escapeShellArgs cfg.extraFlags} \ + ''; + Type = "simple"; + User = "restic"; + Group = "restic"; + + # Security hardening + ReadWritePaths = [ cfg.dataDir ]; + PrivateTmp = true; + ProtectSystem = "strict"; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; + PrivateDevices = true; + }; + }; + + users.extraUsers.restic = { + group = "restic"; + home = cfg.dataDir; + createHome = true; + uid = config.ids.uids.restic; + }; + + users.extraGroups.restic.gid = config.ids.uids.restic; + }; +} From 04d126a3f02e8f07bb18bc4300715aeddc0a0632 Mon Sep 17 00:00:00 2001 From: voobscout Date: Fri, 4 May 2018 18:21:43 +0200 Subject: [PATCH 085/695] ntfs-3g: fix debian url --- pkgs/tools/filesystems/ntfs-3g/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index 6acf5e221d4..4bcef5a83f0 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "https://sources.debian.net/data/main/n/ntfs-3g/1:2016.2.22AR.1-4/debian/patches/0003-CVE-2017-0358.patch"; + url = "https://sources.debian.org/data/main/n/ntfs-3g/1:2016.2.22AR.1+dfsg-1/debian/patches/0003-CVE-2017-0358.patch"; sha256 = "0hd05q9q06r18k8pmppvch1sslzqln5fvqj51d5r72g4mnpavpj3"; }) ]; From 7873fe26693e86e38195e07ee0fd31d1a7f44e6c Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Fri, 4 May 2018 11:37:58 -0500 Subject: [PATCH 086/695] dunst: remove fetchpatch Closes #39962 --- pkgs/applications/misc/dunst/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 9906b1fd858..5396299943c 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ stdenv, fetchFromGitHub , pkgconfig, which, perl, libXrandr , cairo, dbus, systemd, gdk_pixbuf, glib, libX11, libXScrnSaver , libXinerama, libnotify, libxdg_basedir, pango, xproto, librsvg From d2028096ae86debc762381ad2f539d822a734b9d Mon Sep 17 00:00:00 2001 From: Florian Engel Date: Fri, 4 May 2018 18:51:38 +0200 Subject: [PATCH 087/695] lolcat: 99.9.10 -> 99.9.11 --- pkgs/tools/misc/lolcat/Gemfile.lock | 2 +- pkgs/tools/misc/lolcat/gemset.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/lolcat/Gemfile.lock b/pkgs/tools/misc/lolcat/Gemfile.lock index 1ef7e552796..3c4646ddf48 100644 --- a/pkgs/tools/misc/lolcat/Gemfile.lock +++ b/pkgs/tools/misc/lolcat/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: http://rubygems.org/ specs: - lolcat (99.9.10) + lolcat (99.9.11) manpages (~> 0.6.1) paint (~> 2.0.0) trollop (~> 2.1.2) diff --git a/pkgs/tools/misc/lolcat/gemset.nix b/pkgs/tools/misc/lolcat/gemset.nix index 78677edcc34..86069f7ecc0 100644 --- a/pkgs/tools/misc/lolcat/gemset.nix +++ b/pkgs/tools/misc/lolcat/gemset.nix @@ -3,10 +3,10 @@ dependencies = ["manpages" "paint" "trollop"]; source = { remotes = ["http://rubygems.org"]; - sha256 = "0fidwmgywkklxf2a4f4dl82b8mx4w4n73vqm6jqgyqd3nfmgysnl"; + sha256 = "1z0j354sj2qm2srgz3i28s347fwylvv1j614806cr33zcd1j4mwp"; type = "gem"; }; - version = "99.9.10"; + version = "99.9.11"; }; manpages = { source = { From c68dc2212e22899de52d470198c74abd51935dab Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 4 May 2018 18:55:09 +0200 Subject: [PATCH 088/695] openscad: fix build by switching to git master and Qt5 --- .../graphics/openscad/default.nix | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 33fddf6c8d0..9ab5288700c 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,20 +1,30 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal -, mpfr, gmp, glib, pkgconfig, harfbuzz, qscintilla, gettext +{ stdenv, fetchurl, fetchFromGitHub, qt5, libsForQt5 +, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal +, mpfr, gmp, glib, pkgconfig, harfbuzz, gettext }: stdenv.mkDerivation rec { - version = "2015.03-3"; + version = "2018.04-git"; name = "openscad-${version}"; - src = fetchurl { - url = "http://files.openscad.org/${name}.src.tar.gz"; - sha256 = "0djsgi9yx1nxr2gh1kgsqw5vrbncp8v5li0p1pp02higqf1psajx"; +# src = fetchurl { +# url = "http://files.openscad.org/${name}.src.tar.gz"; +# sha256 = "0djsgi9yx1nxr2gh1kgsqw5vrbncp8v5li0p1pp02higqf1psajx"; +# }; + src = fetchFromGitHub { + owner = "openscad"; + repo = "openscad"; + rev = "179074dff8c23cbc0e651ce8463737df0006f4ca"; + sha256 = "1y63yqyd0v255liik4ff5ak6mj86d8d76w436x76hs5dk6jgpmfb"; }; buildInputs = [ - qt4 qmake4Hook bison flex eigen boost libGLU_combined glew opencsg cgal mpfr gmp glib - pkgconfig harfbuzz qscintilla gettext - ]; + bison flex eigen boost libGLU_combined glew opencsg cgal mpfr gmp glib + pkgconfig harfbuzz gettext + ] + ++ (with qt5; [qtbase qmake]) + ++ (with libsForQt5; [qscintilla]) + ; qmakeFlags = [ "VERSION=${version}" ]; From 0c2a7fa4dceb8d57780330c626d86a78978a11e3 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Wed, 18 Apr 2018 12:27:03 -0700 Subject: [PATCH 089/695] pass: refactor extension packaging --- pkgs/tools/security/pass/default.nix | 176 +++++++++--------- .../security/pass/extensions/default.nix | 12 ++ .../tools/security/pass/extensions/import.nix | 37 ++++ .../default.nix => pass/extensions/otp.nix} | 11 +- pkgs/tools/security/pass/extensions/tomb.nix | 32 ++++ .../tools/security/pass/extensions/update.nix | 25 +++ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 +- 8 files changed, 205 insertions(+), 92 deletions(-) create mode 100644 pkgs/tools/security/pass/extensions/default.nix create mode 100644 pkgs/tools/security/pass/extensions/import.nix rename pkgs/tools/security/{pass-otp/default.nix => pass/extensions/otp.nix} (82%) create mode 100644 pkgs/tools/security/pass/extensions/tomb.nix create mode 100644 pkgs/tools/security/pass/extensions/update.nix diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 4f9e6c06697..5ce0ce0dbc2 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -1,10 +1,12 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub +{ stdenv, lib, pkgs, fetchurl, fetchFromGitHub, buildEnv , coreutils, gnused, getopt, git, tree, gnupg, which, procps, qrencode , makeWrapper , xclip ? null, xdotool ? null, dmenu ? null , x11Support ? !stdenv.isDarwin -, tombPluginSupport ? false, tomb + +# For backwards-compatibility +, tombPluginSupport ? false }: with lib; @@ -14,98 +16,100 @@ assert x11Support -> xclip != null && dmenu != null; let - plugins = map (p: (fetchFromGitHub { - owner = "roddhjav"; - repo = "pass-${p.name}"; - inherit (p) rev sha256; - })) - ([ - { name = "import"; - rev = "491935bd275f29ceac2b876b3a288011d1ce31e7"; - sha256 = "02mbh05ab8h7kc30hz718d1d1vkjz43b96c7p0xnd92610d2q66q"; } - { name = "update"; - rev = "cf576c9036fd18efb9ed29e0e9f811207b556fde"; - sha256 = "1hhbrg6a2walrvla6q4cd3pgrqbcrf9brzjkb748735shxfn52hd"; } - ] ++ stdenv.lib.optional tombPluginSupport { - name = "tomb"; - rev = "3368134898a42c1b758fabac625ec240e125c6be"; - sha256 = "0qqmxfg4w3r088qhlkhs44036mya82vjflsjjhw2hk8y0wd2i6ds"; } - ); + passExtensions = import ./extensions { inherit pkgs; }; -in stdenv.mkDerivation rec { - version = "1.7.1"; - name = "password-store-${version}"; + env = extensions: + let + selected = extensions passExtensions + ++ stdenv.lib.optional tombPluginSupport passExtensions.tomb; + in buildEnv { + name = "pass-extensions-env"; + paths = selected; + buildInputs = concatMap (x: x.buildInputs) selected; + }; - src = fetchurl { - url = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz"; - sha256 = "0scqkpll2q8jhzcgcsh9kqz0gwdpvynivqjmmbzax2irjfaiklpn"; - }; + generic = extensionsEnv: extraPassthru: stdenv.mkDerivation rec { + version = "1.7.1"; + name = "password-store-${version}"; - patches = [ ./set-correct-program-name-for-sleep.patch - ] ++ stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch; + src = fetchurl { + url = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz"; + sha256 = "0scqkpll2q8jhzcgcsh9kqz0gwdpvynivqjmmbzax2irjfaiklpn"; + }; - nativeBuildInputs = [ makeWrapper ]; + patches = [ ./set-correct-program-name-for-sleep.patch + ] ++ stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch; - installFlags = [ "PREFIX=$(out)" "WITH_ALLCOMP=yes" ]; + nativeBuildInputs = [ makeWrapper ]; - postInstall = '' - # plugins - ${stdenv.lib.concatStringsSep "\n" (map (plugin: '' - pushd ${plugin} - PREFIX=$out make install - popd - '') plugins)} + buildInputs = [ extensionsEnv ]; - # Install Emacs Mode. NOTE: We can't install the necessary - # dependencies (s.el and f.el) here. The user has to do this - # himself. - mkdir -p "$out/share/emacs/site-lisp" - cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/" - '' + optionalString x11Support '' - cp "contrib/dmenu/passmenu" "$out/bin/" - ''; + installFlags = [ "PREFIX=$(out)" "WITH_ALLCOMP=yes" ]; - wrapperPath = with stdenv.lib; makeBinPath ([ - coreutils - getopt - git - gnupg - gnused - tree - which - qrencode - procps - ] ++ optional tombPluginSupport tomb - ++ ifEnable x11Support [ dmenu xclip xdotool ]); - - postFixup = '' - # Fix program name in --help - substituteInPlace $out/bin/pass \ - --replace 'PROGRAM="''${0##*/}"' "PROGRAM=pass" - - # Ensure all dependencies are in PATH - wrapProgram $out/bin/pass \ - --prefix PATH : "${wrapperPath}" - '' + stdenv.lib.optionalString x11Support '' - # We just wrap passmenu with the same PATH as pass. It doesn't - # need all the tools in there but it doesn't hurt either. - wrapProgram $out/bin/passmenu \ - --prefix PATH : "$out/bin:${wrapperPath}" - ''; - - meta = with stdenv.lib; { - description = "Stores, retrieves, generates, and synchronizes passwords securely"; - homepage = https://www.passwordstore.org/; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ lovek323 the-kenny fpletz ]; - platforms = platforms.unix; - - longDescription = '' - pass is a very simple password store that keeps passwords inside gpg2 - encrypted files inside a simple directory tree residing at - ~/.password-store. The pass utility provides a series of commands for - manipulating the password store, allowing the user to add, remove, edit, - synchronize, generate, and manipulate passwords. + postInstall = '' + # Install Emacs Mode. NOTE: We can't install the necessary + # dependencies (s.el and f.el) here. The user has to do this + # himself. + mkdir -p "$out/share/emacs/site-lisp" + cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/" + '' + optionalString x11Support '' + cp "contrib/dmenu/passmenu" "$out/bin/" ''; + + wrapperPath = with stdenv.lib; makeBinPath ([ + coreutils + getopt + git + gnupg + gnused + tree + which + qrencode + procps + ] ++ ifEnable x11Support [ dmenu xclip xdotool ]); + + postFixup = '' + # Link extensions env + rmdir $out/lib/password-store/extensions + ln -s ${extensionsEnv}/lib/password-store/extensions $out/lib/password-store/. + + # Fix program name in --help + substituteInPlace $out/bin/pass \ + --replace 'PROGRAM="''${0##*/}"' "PROGRAM=pass" + + # Ensure all dependencies are in PATH + wrapProgram $out/bin/pass \ + --prefix PATH : "${wrapperPath}" + '' + stdenv.lib.optionalString x11Support '' + # We just wrap passmenu with the same PATH as pass. It doesn't + # need all the tools in there but it doesn't hurt either. + wrapProgram $out/bin/passmenu \ + --prefix PATH : "$out/bin:${wrapperPath}" + ''; + + passthru = { + extensions = passExtensions; + } // extraPassthru; + + meta = with stdenv.lib; { + description = "Stores, retrieves, generates, and synchronizes passwords securely"; + homepage = https://www.passwordstore.org/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ]; + platforms = platforms.unix; + + longDescription = '' + pass is a very simple password store that keeps passwords inside gpg2 + encrypted files inside a simple directory tree residing at + ~/.password-store. The pass utility provides a series of commands for + manipulating the password store, allowing the user to add, remove, edit, + synchronize, generate, and manipulate passwords. + ''; + }; }; + +in + +generic (env (_: [])) { + withExtensions = extensions: generic (env extensions) {}; } diff --git a/pkgs/tools/security/pass/extensions/default.nix b/pkgs/tools/security/pass/extensions/default.nix new file mode 100644 index 00000000000..dfb853c0a0b --- /dev/null +++ b/pkgs/tools/security/pass/extensions/default.nix @@ -0,0 +1,12 @@ +{ pkgs, ... }: + +with pkgs; + +{ + pass-import = callPackage ./import.nix { + pythonPackages = python3Packages; + }; + pass-otp = callPackage ./otp.nix {}; + pass-tomb = callPackage ./tomb.nix {}; + pass-update = callPackage ./update.nix {}; +} diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix new file mode 100644 index 00000000000..8ba4abc5e3d --- /dev/null +++ b/pkgs/tools/security/pass/extensions/import.nix @@ -0,0 +1,37 @@ +{ stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper }: + +let + pythonEnv = pythonPackages.python.withPackages (p: [ p.defusedxml ]); + +in stdenv.mkDerivation rec { + name = "pass-import-${version}"; + version = "2.2"; + + src = fetchFromGitHub { + owner = "roddhjav"; + repo = "pass-import"; + rev = "v${version}"; + sha256 = "189wf2jz2j43k27930cnl53sm2drh1s0nq1nmh4is3rzn8cna6wq"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ pythonEnv ]; + + dontBuild = true; + + installFlags = [ "PREFIX=$(out)" ]; + + postFixup = '' + wrapProgram $out/lib/password-store/extensions/import.bash \ + --prefix PATH : "${pythonEnv}/bin" + ''; + + meta = with stdenv.lib; { + description = "Pass extension for importing data from existing password managers"; + homepage = https://github.com/roddhjav/pass-import; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/security/pass-otp/default.nix b/pkgs/tools/security/pass/extensions/otp.nix similarity index 82% rename from pkgs/tools/security/pass-otp/default.nix rename to pkgs/tools/security/pass/extensions/otp.nix index 7f0f44bdfa4..60198675b29 100644 --- a/pkgs/tools/security/pass-otp/default.nix +++ b/pkgs/tools/security/pass/extensions/otp.nix @@ -1,4 +1,5 @@ -{ stdenv, pass, fetchFromGitHub, oathToolkit }: +{ stdenv, fetchFromGitHub, oathToolkit }: + stdenv.mkDerivation rec { name = "pass-otp-${version}"; version = "1.1.0"; @@ -10,15 +11,15 @@ stdenv.mkDerivation rec { sha256 = "1cgj4zc8fq88n3h6c0vkv9i5al785mdprpgpbv5m22dz9p1wqvbb"; }; - buildInputs = [ pass oathToolkit ]; + buildInputs = [ oathToolkit ]; + + dontBuild = true; patchPhase = '' sed -i -e 's|OATH=\$(which oathtool)|OATH=${oathToolkit}/bin/oathtool|' otp.bash ''; - installPhase = '' - make PREFIX=$out install - ''; + installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "A pass extension for managing one-time-password (OTP) tokens"; diff --git a/pkgs/tools/security/pass/extensions/tomb.nix b/pkgs/tools/security/pass/extensions/tomb.nix new file mode 100644 index 00000000000..b9f458cd4e1 --- /dev/null +++ b/pkgs/tools/security/pass/extensions/tomb.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, tomb }: + +stdenv.mkDerivation rec { + name = "pass-tomb-${version}"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "roddhjav"; + repo = "pass-tomb"; + rev = "v${version}"; + sha256 = "0wxa673yyzasjlkpd5f3yl5zf7bhsw7h1jbhf6sdjz65bypr2596"; + }; + + buildInputs = [ tomb ]; + + dontBuild = true; + + installFlags = [ "PREFIX=$(out)" ]; + + postFixup = '' + substituteInPlace $out/lib/password-store/extensions/tomb.bash \ + --replace 'TOMB="''${PASSWORD_STORE_TOMB:-tomb}"' 'TOMB="''${PASSWORD_STORE_TOMB:-${tomb}/bin/tomb}"' + ''; + + meta = with stdenv.lib; { + description = "Pass extension that keeps the password store encrypted inside a tomb"; + homepage = https://github.com/roddhjav/pass-tomb; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/security/pass/extensions/update.nix b/pkgs/tools/security/pass/extensions/update.nix new file mode 100644 index 00000000000..dd145b06972 --- /dev/null +++ b/pkgs/tools/security/pass/extensions/update.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "pass-update-${version}"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "roddhjav"; + repo = "pass-update"; + rev = "v${version}"; + sha256 = "0a81q0jfni185zmbislzbcv0qr1rdp0cgr9wf9riygis2xv6rs6k"; + }; + + dontBuild = true; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "Pass extension that provides an easy flow for updating passwords"; + homepage = https://github.com/roddhjav/pass-update; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 334905b79f2..8b0812f8305 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -151,6 +151,7 @@ mapAliases (rec { openssh_with_kerberos = openssh; # added 2018-01-28 owncloudclient = owncloud-client; # added 2016-08 p11_kit = p11-kit; # added 2018-02-25 + pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04 pgp-tools = signing-party; # added 2017-03-26 pidgin-with-plugins = pidgin; # added 2016-06 pidginlatexSF = pidgin-latex; # added 2014-11-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a37de17c696..7631b357eaa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -656,7 +656,8 @@ with pkgs; lastpass-cli = callPackage ../tools/security/lastpass-cli { }; pass = callPackage ../tools/security/pass { }; - pass-otp = callPackage ../tools/security/pass-otp { }; + + passExtensions = recurseIntoAttrs pass.extensions; gopass = callPackage ../tools/security/gopass { }; From e9ac594ea1cc805aabcad5b24b25c0ca3d541624 Mon Sep 17 00:00:00 2001 From: Sander Hollaar Date: Fri, 4 May 2018 19:53:23 +0200 Subject: [PATCH 090/695] fix-way-cooler - remove 'mv' commands not needed anymore, and replace '_' with '-' to fix multiple way-cooler compile failures --- .../window-managers/way-cooler/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/window-managers/way-cooler/default.nix b/pkgs/applications/window-managers/way-cooler/default.nix index c8b67ec047a..442bf5e08df 100644 --- a/pkgs/applications/window-managers/way-cooler/default.nix +++ b/pkgs/applications/window-managers/way-cooler/default.nix @@ -20,24 +20,16 @@ let mkdir -p $out/etc cp -r config $out/etc/way-cooler ''; - postFixup = '' - cd $out/bin - mv way_cooler way-cooler - ''; }); wc-bg = ((callPackage ./wc-bg.nix {}).wc_bg {}).overrideAttrs (oldAttrs: rec { nativeBuildInputs = [ makeWrapper ]; postFixup = '' - makeWrapper $out/bin/wc_bg $out/bin/wc-bg \ + makeWrapper $out/bin/wc-bg $out/bin/wc-bg \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ wayland ]}" ''; }); wc-grab = ((callPackage ./wc-grab.nix {}).wc_grab {}).overrideAttrs (oldAttrs: rec { - postFixup = '' - cd $out/bin - mv wc_grab wc-grab - ''; }); wc-lock = (((callPackage ./wc-lock.nix {}).wc_lock {}).override { crateOverrides = defaultCrateOverrides // { @@ -47,7 +39,7 @@ let nativeBuildInputs = [ makeWrapper ]; postFixup = '' - makeWrapper $out/bin/wc_lock $out/bin/wc-lock \ + makeWrapper $out/bin/wc-lock $out/bin/wc-lock \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libxkbcommon wayland ]}" ''; }); From 814938a7ce2d9bd25c90065fdde6c98c1e389c5c Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 4 May 2018 19:56:38 +0200 Subject: [PATCH 091/695] ruby: fix darwin dependencies --- pkgs/development/interpreters/ruby/default.nix | 15 +++++++-------- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index b98e2c1a673..89d394c8756 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -1,8 +1,8 @@ { stdenv, buildPackages, lib , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub , zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, autoreconfHook, bison -, autoconf, darwin ? null -, buildEnv, bundler, bundix, Foundation +, autoconf, libiconv, libobjc, libunwind, Foundation +, buildEnv, bundler, bundix } @ args: let @@ -37,7 +37,7 @@ let isRuby25 = ver.majMin == "2.5"; baseruby = self.override { useRailsExpress = false; }; self = lib.makeOverridable ( - { stdenv, buildPackages, lib + { stdenv, buildPackages, lib , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub , useRailsExpress ? true , zlib, zlibSupport ? true @@ -48,8 +48,8 @@ let , libyaml, yamlSupport ? true , libffi, fiddleSupport ? true , autoreconfHook, bison, autoconf - , darwin ? null - , buildEnv, bundler, bundix, Foundation + , buildEnv, bundler, bundix + , libiconv, libobjc, libunwind, Foundation }: let rubySrc = if useRailsExpress then fetchFromGitHub { @@ -93,9 +93,8 @@ let # support is not enabled, so add readline to the build inputs if curses # support is disabled (if it's enabled, we already have it) and we're # running on darwin - ++ (op (!cursesSupport && stdenv.isDarwin) readline) - ++ (op (isRuby25 && stdenv.isDarwin) Foundation) - ++ (ops stdenv.isDarwin (with darwin; [ libiconv libobjc libunwind ])); + ++ op (!cursesSupport && stdenv.isDarwin) readline + ++ ops stdenv.isDarwin [ libiconv libobjc libunwind Foundation ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1c4e2e09a8..206873d8e29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7355,7 +7355,10 @@ with pkgs; bundlerEnv = callPackage ../development/ruby-modules/bundler-env { }; bundlerApp = callPackage ../development/ruby-modules/bundler-app { }; - inherit (callPackage ../development/interpreters/ruby { inherit (darwin.apple_sdk.frameworks) Foundation; }) + inherit (callPackage ../development/interpreters/ruby { + inherit (darwin) libiconv libobjc libunwind; + inherit (darwin.apple_sdk.frameworks) Foundation; + }) ruby_2_3 ruby_2_4 ruby_2_5; From 77a54ea59fede09c7acb413add8c4f1f75b1dd95 Mon Sep 17 00:00:00 2001 From: Brandon Elam Barker Date: Fri, 4 May 2018 18:05:08 +0000 Subject: [PATCH 092/695] adding untested git-secrets --- .../git-and-tools/git-secrets/default.nix | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/git-secrets/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix new file mode 100644 index 00000000000..ac4d2e474b2 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchFromGitHub, makeWrapper, git }: + +let + version = "1.2.1"; + repo = "git-secrets"; + +in stdenv.mkDerivation { + name = "${repo}-${version}"; + + src = fetchFromGitHub { + inherit repo; + owner = "awslabs"; + rev = "v${version}"; + sha256 = "14jsm4ks3k5d9iq3jr23829izw040pqpmv7dz8fhmvx6qz8fybzg"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + install -D git-secrets $out/bin/git-secrets + + wrapProgram $out/bin/git-secrets \ + --prefix PATH : "${lib.makeBinPath [ git ]}" + + mkdir $out/share + cp -r man $out/share + ''; + + meta = { + description = "Prevents you from committing passwords and other sensitive information to a git repository"; + homepage = https://github.com/awslabs/git-secretshttps://github.com/awslabs/git-secrets; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.all; + }; +} From 3837dddedb64ae9456e0b07ae2915c828e92eb7f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 4 May 2018 03:19:25 +0200 Subject: [PATCH 093/695] firefox: remove GStreamer Apparently, it has been dropped: https://bugzilla.mozilla.org/show_bug.cgi?id=1234092 --- .../networking/browsers/firefox/wrapper.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index ed6cf712ed9..b619941820e 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,7 +2,7 @@ ## various stuff that can be plugged in , flashplayer, hal-flash -, MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra-gtk2 +, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2 , jrePlugin, icedtea_web , trezor-bridge, bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ @@ -67,13 +67,12 @@ let ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator ++ extraNativeMessagingHosts ); - libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ]) + libs = lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport kerberos ++ lib.optionals (cfg.enableQuakeLive or false) (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib libudev ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (config.pulseaudio or true) libpulseaudio; - gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ]; gtk_modules = [ libcanberra-gtk2 ]; in stdenv.mkDerivation { @@ -99,7 +98,6 @@ let }; buildInputs = [makeWrapper] - ++ lib.optional (!ffmpegSupport) gst-plugins ++ lib.optional (browser ? gtk3) browser.gtk3; buildCommand = '' @@ -119,9 +117,7 @@ let --suffix PATH ':' "$out/bin" \ --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \ --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \ - ${lib.optionalString (!ffmpegSupport) - ''--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"'' - + lib.optionalString (browser ? gtk3) + ${lib.optionalString (browser ? gtk3) ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share' '' From db78fe50e6e6729b12f8c8b4414de1c71192c069 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 4 May 2018 03:51:07 +0200 Subject: [PATCH 094/695] opencv: use GStreamer 1.0 --- pkgs/development/libraries/opencv/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index cbac7210a10..d2d10682716 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -8,7 +8,7 @@ , enableEXR ? (!stdenv.isDarwin), openexr, ilmbase , enableJPEG2K ? true, jasper , enableFfmpeg ? false, ffmpeg -, enableGStreamer ? false, gst_all +, enableGStreamer ? false, gst_all_1 , enableEigen ? true, eigen , darwin }: @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ++ lib.optionals enableEXR [ openexr ilmbase ] ++ lib.optional enableJPEG2K jasper ++ lib.optional enableFfmpeg ffmpeg - ++ lib.optionals enableGStreamer (with gst_all; [ gstreamer gst-plugins-base ]) + ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optional enableEigen eigen ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa QTKit ]) ; @@ -69,6 +69,7 @@ stdenv.mkDerivation rec { (opencvFlag "JPEG" enableJPEG) (opencvFlag "PNG" enablePNG) (opencvFlag "OPENEXR" enableEXR) + (opencvFlag "GSTREAMER" enableGStreamer) ]; enableParallelBuilding = true; From 1c33dff43315303649f9189656a7b26f24f20218 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 4 May 2018 15:30:54 +0200 Subject: [PATCH 095/695] libcanberra: fix GStreamer support --- pkgs/development/libraries/libcanberra/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 54f2273c2fc..83f86c40c0d 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libtool, gtk ? null, libcap -, alsaLib, libpulseaudio, gstreamer, gst-plugins-base, libvorbis }: +, alsaLib, libpulseaudio, gst_all_1, libvorbis }: stdenv.mkDerivation rec { name = "libcanberra-0.30"; @@ -9,11 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0wps39h8rx2b00vyvkia5j40fkak3dpipp1kzilqla0cgvk73dn2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig libtool ]; buildInputs = [ - libtool alsaLib libpulseaudio libvorbis gtk libcap - /*gstreamer gst-plugins-base*/ # ToDo: gstreamer not found (why?), add (g)udev? - ]; + alsaLib libpulseaudio libvorbis gtk libcap + ] ++ (with gst_all_1; [ gstreamer gst-plugins-base ]); configureFlags = "--disable-oss"; From 91b092986b3ed2c0109d69331287937834496677 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 4 May 2018 19:11:45 +0000 Subject: [PATCH 096/695] poco: support MySQL --- pkgs/development/libraries/poco/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index d44bc78a533..4dffa7486a1 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { buildInputs = [ zlib pcre expat sqlite openssl unixODBC mysql.connector-c ]; + MYSQL_DIR = mysql.connector-c; + MYSQL_INCLUDE_DIR = "${MYSQL_DIR}/include/mysql"; + cmakeFlags = [ "-DPOCO_UNBUNDLED=ON" ]; From 8723594059695b1ed2f03ec997f8b9db18cd0b16 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Fri, 4 May 2018 14:41:13 -0500 Subject: [PATCH 097/695] rl-1809: add googleearth --- nixos/doc/manual/release-notes/rl-1809.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index ec7b2f107e8..7136f454050 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -101,6 +101,12 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' that can be mapped onto the YAML configuration defined in the docker/distribution docs. + + + googleearth has been removed from Nixpkgs. Google does not provide + a stable URL for Nixpkgs to use to package this proprietary software. + + From 62855fc04a46e80bb45347cc55f4b6422ebb1779 Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Thu, 3 May 2018 14:42:01 +0000 Subject: [PATCH 098/695] pythonPackages.supervise_api: 0.4.0 -> 0.5.3 Upstream added tests, so we run those too now. --- .../python-modules/supervise_api/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/supervise_api/default.nix b/pkgs/development/python-modules/supervise_api/default.nix index f73aba0a5f9..35600357d2c 100644 --- a/pkgs/development/python-modules/supervise_api/default.nix +++ b/pkgs/development/python-modules/supervise_api/default.nix @@ -4,17 +4,16 @@ , supervise , isPy3k , whichcraft +, utillinux }: buildPythonPackage rec { pname = "supervise_api"; - version = "0.4.0"; - - name = "${pname}-${version}"; + version = "0.5.3"; src = fetchPypi { inherit pname version; - sha256 = "029h1mlfhkm9lw043rawh24ld8md620y94k6c1l9hs5vvyq4fs84"; + sha256 = "0dakc1h2ih1bw67y137wp0vph8d3y2lx5d70b8dgggy1zbpqxl1m"; }; propagatedBuildInputs = [ @@ -22,9 +21,7 @@ buildPythonPackage rec { ] ++ lib.optionals ( !isPy3k ) [ whichcraft ]; - - # no tests - doCheck = false; + checkInputs = [ utillinux ]; meta = { description = "An API for running processes safely and securely"; From 397a618e34ea132df500b3d92f06775f3d0292b8 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Fri, 4 May 2018 15:10:30 -0500 Subject: [PATCH 099/695] kotlin: move LICENSE to separate place Fixes #39641 --- pkgs/development/compilers/kotlin/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index d5ce240b4a5..76244913315 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -22,6 +22,11 @@ in stdenv.mkDerivation rec { for p in $(ls $out/bin/) ; do wrapProgram $out/bin/$p --prefix PATH ":" ${jre}/bin ; done + + if [ -f $out/LICENSE ]; then + install -D $out/LICENSE $out/share/kotlin/LICENSE + rm $out/LICENSE + fi ''; meta = { From cf84d6c275b1cd65ba6a42dc7beaa74da7f47c3b Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Fri, 4 May 2018 15:11:09 -0500 Subject: [PATCH 100/695] openjdk: move license --- pkgs/development/compilers/openjdk/darwin/8.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/openjdk/darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix index cc7c5fd371d..7457ffceab1 100644 --- a/pkgs/development/compilers/openjdk/darwin/8.nix +++ b/pkgs/development/compilers/openjdk/darwin/8.nix @@ -26,6 +26,11 @@ let # jni.h expects jni_md.h to be in the header search path. ln -s $out/include/darwin/*_md.h $out/include/ + + if [ -f $out/LICENSE ]; then + install -D $out/LICENSE $out/share/zulu/LICENSE + rm $out/LICENSE + fi ''; preFixup = '' From b5e558b573f1989889e423df8b48e1084608022f Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Fri, 4 May 2018 15:11:45 -0500 Subject: [PATCH 101/695] openjdk: move license (again) --- pkgs/development/compilers/openjdk/darwin/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix index 6ecc785be3b..54239e58002 100644 --- a/pkgs/development/compilers/openjdk/darwin/default.nix +++ b/pkgs/development/compilers/openjdk/darwin/default.nix @@ -16,6 +16,11 @@ let # jni.h expects jni_md.h to be in the header search path. ln -s $out/include/darwin/*_md.h $out/include/ + + if [ -f $out/LICENSE ]; then + install -D $out/LICENSE $out/share/zulu/LICENSE + rm $out/LICENSE + fi ''; preFixup = '' From b4bfc02d352a737b08d11592efe0128bf1075a8d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 4 May 2018 15:11:12 +0200 Subject: [PATCH 102/695] simplescreenrecorder: port to qt5 See #33248 --- .../video/simplescreenrecorder/default.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 0ae9de04680..d1f6f8b6ad1 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext -, libXfixes, libGLU_combined, pkgconfig, libpulseaudio, qt4, cmake, ninja +{ stdenv, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext, qtx11extras +, libXfixes, libGLU_combined, pkgconfig, libpulseaudio, qtbase, cmake, ninja }: stdenv.mkDerivation rec { @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "02rl9yyx3hlz9fqvgzv7ipmvx2qahj7ws5wx2m7zs3lssq3qag3g"; }; + cmakeFlags = [ "-DWITH_QT5=TRUE" ]; + patches = [ ./fix-paths.patch ]; postPatch = '' @@ -24,14 +26,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ninja ]; buildInputs = [ alsaLib ffmpeg libjack2 libX11 libXext libXfixes libGLU_combined - libpulseaudio qt4 + libpulseaudio qtbase qtx11extras ]; meta = with stdenv.lib; { description = "A screen recorder for Linux"; homepage = http://www.maartenbaert.be/simplescreenrecorder; license = licenses.gpl3; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.goibhniu ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1c4e2e09a8..529298d1759 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4878,7 +4878,7 @@ with pkgs; simpleproxy = callPackage ../tools/networking/simpleproxy { }; - simplescreenrecorder = callPackage ../applications/video/simplescreenrecorder { }; + simplescreenrecorder = libsForQt5.callPackage ../applications/video/simplescreenrecorder { }; sipsak = callPackage ../tools/networking/sipsak { }; From 40226e647e5481f8276f2265207d262d4ab750ea Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 3 May 2018 11:25:19 +0200 Subject: [PATCH 103/695] shutter: wrap `XDG_DATA_DIRS` with `hicolor-icon-theme` When opening `shutter` it adds an indicator icon to the status bar. However this doesn't happen (and an ugly default icon will be used) if `shutter` can't find the `hicolor-icon-theme`. In such a case a warning like this can be found in `stderr`: ``` Gtk-WARNING **: Could not find the icon 'image-png'. The 'hicolor' theme was not found either, perhaps you need to install it. ``` As I don't think that we should force users to install this theme globally and several other packages including `tor-browser`, `gparted` or `clawsmail` add `hicolor-icon-theme` to their closure this seems to be a fair measure. --- pkgs/applications/graphics/shutter/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index 2cc127a3fc6..3bc814e1e75 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, fetchpatch, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg }: +{ stdenv, fetchurl, fetchpatch, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg +, hicolor-icon-theme +}: let perlModules = with perlPackages; @@ -29,6 +31,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/shutter \ --set PERL5LIB "${stdenv.lib.makePerlPath perlModules}" \ --prefix PATH : "${imagemagick.out}/bin" \ + --suffix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; From 401fa33429d0265f7f300a2d933dd446ea29646e Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 4 May 2018 23:59:46 +0300 Subject: [PATCH 104/695] Upgrade gitkraken to 3.6.0 --- pkgs/applications/version-management/gitkraken/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 1e29b458a31..cf68da44a5f 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "3.4.0"; + version = "3.6.0"; src = fetchurl { url = "https://release.gitkraken.com/linux/v${version}.deb"; - sha256 = "0jj3a02bz30xa7p4migyhvxd9s0cllymsp1rdh2pbh40p79g1fp1"; + sha256 = "0zrxw7rrlspm3ic847dy1ly4rlcdkizdr6m8nycmrxg4s98yxkb8"; }; libPath = makeLibraryPath [ @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { find $out/share/gitkraken -name "*.node" -exec patchelf --set-rpath "${libPath}:$out/share/gitkraken" {} \; - rm $out/bin/gitkraken + mkdir $out/bin ln -s $out/share/gitkraken/gitkraken $out/bin/gitkraken ''; From a0502800cf4927d16285eb1a731f82b859d340e9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 4 May 2018 23:07:40 +0200 Subject: [PATCH 105/695] yubikey-personalization-gui: port to qt5 Uses QT5's `qmake` hook (http://doc.qt.io/qt-5/qmake-manual.html) to build `yubikey-personalization-gui` with a non-90s interface. See #33248 --- pkgs/tools/misc/yubikey-personalization-gui/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix index e6a1c93d2bb..d507816dbd3 100644 --- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, yubikey-personalization, qt4, qmake4Hook, libyubikey }: +{ stdenv, fetchurl, pkgconfig, yubikey-personalization, qtbase, qmake, libyubikey }: stdenv.mkDerivation rec { name = "yubikey-personalization-gui-3.1.25"; @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1knyv5yss8lhzaff6jpfqv12fjf1b8b21mfxzx3qi0hw4nl8n2v8"; }; - nativeBuildInputs = [ pkgconfig qmake4Hook ]; - buildInputs = [ yubikey-personalization qt4 libyubikey ]; + nativeBuildInputs = [ pkgconfig qmake ]; + buildInputs = [ yubikey-personalization qtbase libyubikey ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52a3c0619fe..3dc6294d3e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11994,7 +11994,7 @@ with pkgs; libusb = libusb1; }; - yubikey-personalization-gui = callPackage ../tools/misc/yubikey-personalization-gui { }; + yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { }; zeitgeist = callPackage ../development/libraries/zeitgeist { }; From b41ede5e3a398683d5722b7c0503e019a365d222 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 4 May 2018 23:10:21 +0200 Subject: [PATCH 106/695] libgdiplus: remove conflicting libungif that causes segfaults when opening a GIF file --- pkgs/development/libraries/libgdiplus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index f84cc677d16..d3a21ee7fa2 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, cairo, Carbon, fontconfig -, libtiff, giflib, libungif, libjpeg, libpng, monoDLLFixer +, libtiff, giflib, libjpeg, libpng, monoDLLFixer , libXrender, libexif }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patchFlags = "-p0"; buildInputs = - [ pkgconfig glib cairo fontconfig libtiff giflib libungif + [ pkgconfig glib cairo fontconfig libtiff giflib libjpeg libpng libXrender libexif ] ++ stdenv.lib.optional stdenv.isDarwin Carbon; From 5deb50c038a40d9331be0359c84b0e3ade78db9d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 4 May 2018 23:22:09 +0200 Subject: [PATCH 107/695] firefox-bin: remove unneeded GStreamer dependency --- pkgs/applications/networking/browsers/firefox-bin/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 97ce7d06c41..6b2bb541a3a 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -12,8 +12,6 @@ , gdk_pixbuf , glib , glibc -, gst-plugins-base -, gstreamer , gtk2 , gtk3 , kerberos @@ -98,8 +96,6 @@ stdenv.mkDerivation { gdk_pixbuf glib glibc - gst-plugins-base - gstreamer gtk2 gtk3 kerberos From 0b2b174bbaf84e4065f05c8f4a9168ed1a62539a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 5 May 2018 00:00:59 +0200 Subject: [PATCH 108/695] qstopmotion: remove unnecessary gstreamer dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit According to 2.3.1 release notes: “All gstreamer grabber are removed from the application. The reason is the end of the support for gstreamer 0.10 in many distributions.” --- pkgs/applications/video/qstopmotion/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index 2454044bb48..a689697e0a0 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -1,6 +1,5 @@ -{ stdenv, fetchurl, qt5, gstreamer, gstreamermm, gst_plugins_bad -, gst_plugins_base, gst_plugins_good, ffmpeg, guvcview, automoc4 -, cmake, libxml2, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils +{ stdenv, fetchurl, qt5, ffmpeg, guvcview, automoc4 +, cmake, ninja, libxml2, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils , libv4l, pcre }: stdenv.mkDerivation rec { @@ -13,11 +12,9 @@ stdenv.mkDerivation rec { sha256 = "1vbiznwyc05jqg0dpmgxmvf7kdzmlck0i8v2c5d69kgrdnaypcrf"; }; - buildInputs = [ qt5.qtbase gstreamer gstreamermm gst_plugins_bad gst_plugins_good - gst_plugins_base ffmpeg guvcview v4l_utils libv4l pcre - ]; + buildInputs = [ qt5.qtbase ffmpeg guvcview v4l_utils libv4l pcre ]; - nativeBuildInputs = [ pkgconfig cmake gettext libgphoto2 gphoto2 libxml2 libv4l ]; + nativeBuildInputs = [ pkgconfig cmake ninja gettext libgphoto2 gphoto2 libxml2 libv4l ]; meta = with stdenv.lib; { homepage = http://www.qstopmotion.org; From ee270fe647e2dd5f21028dbf5a1f9213a627a149 Mon Sep 17 00:00:00 2001 From: Brandon Elam Barker Date: Fri, 4 May 2018 22:02:55 +0000 Subject: [PATCH 109/695] confirmed git-secrets is now working --- .../version-management/git-and-tools/default.nix | 2 ++ .../git-and-tools/git-secrets/default.nix | 13 +++++++++---- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 2bd8697c8ec..13b861d0a9e 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -89,6 +89,8 @@ rec { git-secret = callPackage ./git-secret { }; + git-secrets = callPackage ./git-secrets { }; + git-stree = callPackage ./git-stree { }; git2cl = callPackage ./git2cl { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix index ac4d2e474b2..14026df8185 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix @@ -10,20 +10,25 @@ in stdenv.mkDerivation { src = fetchFromGitHub { inherit repo; owner = "awslabs"; - rev = "v${version}"; + rev = "${version}"; sha256 = "14jsm4ks3k5d9iq3jr23829izw040pqpmv7dz8fhmvx6qz8fybzg"; }; - buildInputs = [ makeWrapper ]; + buildInputs = [ makeWrapper git]; + # buildPhase = '' + # make man # TODO: need rst2man.py + # ''; + installPhase = '' install -D git-secrets $out/bin/git-secrets wrapProgram $out/bin/git-secrets \ --prefix PATH : "${lib.makeBinPath [ git ]}" - mkdir $out/share - cp -r man $out/share + # TODO: see above note on rst2man.py + # mkdir $out/share + # cp -r man $out/share ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a37de17c696..9811f33c310 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15969,7 +15969,7 @@ with pkgs; gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {}); - inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar git-secret transcrypt git-crypt; + inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar git-secret git-secrets transcrypt git-crypt; gitMinimal = git.override { withManual = false; From f039bf9abc91ec812f66126dc54a05d8a84a95f2 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Sat, 5 May 2018 00:22:18 +0200 Subject: [PATCH 110/695] panamax: remove packages, module and test was broken and depends on (deprecated) fleet packages: panamax_api, panamax_ui --- nixos/modules/misc/ids.nix | 4 +- nixos/modules/module-list.nix | 1 - nixos/modules/services/cluster/panamax.nix | 156 ---- nixos/release.nix | 1 - nixos/tests/panamax.nix | 21 - .../networking/cluster/panamax/api/Gemfile | 23 - .../cluster/panamax/api/Gemfile.lock | 164 ---- .../cluster/panamax/api/default.nix | 74 -- .../networking/cluster/panamax/api/gemset.nix | 568 ------------- .../networking/cluster/panamax/ui/Gemfile | 31 - .../cluster/panamax/ui/Gemfile.lock | 226 ----- .../networking/cluster/panamax/ui/default.nix | 72 -- .../networking/cluster/panamax/ui/gemset.nix | 789 ------------------ pkgs/top-level/all-packages.nix | 3 - 14 files changed, 2 insertions(+), 2131 deletions(-) delete mode 100644 nixos/modules/services/cluster/panamax.nix delete mode 100644 nixos/tests/panamax.nix delete mode 100644 pkgs/applications/networking/cluster/panamax/api/Gemfile delete mode 100644 pkgs/applications/networking/cluster/panamax/api/Gemfile.lock delete mode 100644 pkgs/applications/networking/cluster/panamax/api/default.nix delete mode 100644 pkgs/applications/networking/cluster/panamax/api/gemset.nix delete mode 100644 pkgs/applications/networking/cluster/panamax/ui/Gemfile delete mode 100644 pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock delete mode 100644 pkgs/applications/networking/cluster/panamax/ui/default.nix delete mode 100644 pkgs/applications/networking/cluster/panamax/ui/gemset.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 0ed820a32ac..7a538210d10 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -190,7 +190,7 @@ cadvisor = 167; nylon = 168; apache-kafka = 169; - panamax = 170; + #panamax = 170; # unused exim = 172; #fleet = 173; # unused #input = 174; # unused @@ -473,7 +473,7 @@ #chronos = 164; # unused gitlab = 165; nylon = 168; - panamax = 170; + #panamax = 170; # unused exim = 172; fleet = 173; input = 174; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 505c5497d36..6f6a81bbda8 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -174,7 +174,6 @@ ./services/cluster/kubernetes/default.nix ./services/cluster/kubernetes/dns.nix ./services/cluster/kubernetes/dashboard.nix - ./services/cluster/panamax.nix ./services/computing/boinc/client.nix ./services/computing/torque/server.nix ./services/computing/torque/mom.nix diff --git a/nixos/modules/services/cluster/panamax.nix b/nixos/modules/services/cluster/panamax.nix deleted file mode 100644 index 4475e8d8c24..00000000000 --- a/nixos/modules/services/cluster/panamax.nix +++ /dev/null @@ -1,156 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.panamax; - - panamax_api = pkgs.panamax_api.override { dataDir = cfg.dataDir + "/api"; }; - panamax_ui = pkgs.panamax_ui.override { dataDir = cfg.dataDir + "/ui"; }; - -in { - - ##### Interface - options.services.panamax = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable Panamax service. - ''; - }; - - UIPort = mkOption { - type = types.int; - default = 8888; - description = '' - Panamax UI listening port. - ''; - }; - - APIPort = mkOption { - type = types.int; - default = 3000; - description = '' - Panamax UI listening port. - ''; - }; - - dataDir = mkOption { - type = types.str; - default = "/var/lib/panamax"; - description = '' - Data dir for Panamax. - ''; - }; - - fleetctlEndpoint = mkOption { - type = types.str; - default = "http://127.0.0.1:2379"; - description = '' - Panamax fleetctl endpoint. - ''; - }; - - journalEndpoint = mkOption { - type = types.str; - default = "http://127.0.0.1:19531"; - description = '' - Panamax journal endpoint. - ''; - }; - - secretKey = mkOption { - type = types.str; - default = "SomethingVeryLong."; - description = '' - Panamax secret key (do change this). - ''; - }; - - }; - - ##### Implementation - config = mkIf cfg.enable { - systemd.services.panamax-api = { - description = "Panamax API"; - - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "fleet.service" "etcd.service" "docker.service" ]; - - path = [ panamax_api ]; - environment = { - RAILS_ENV = "production"; - JOURNAL_ENDPOINT = cfg.journalEndpoint; - FLEETCTL_ENDPOINT = cfg.fleetctlEndpoint; - PANAMAX_DATABASE_PATH = "${cfg.dataDir}/api/db/mnt/db.sqlite3"; - }; - - preStart = '' - rm -rf ${cfg.dataDir}/state/tmp - mkdir -p ${cfg.dataDir}/api/{db/mnt,state/log,state/tmp} - ln -sf ${panamax_api}/share/panamax-api/_db/{schema.rb,seeds.rb,migrate} ${cfg.dataDir}/api/db/ - - if [ ! -f ${cfg.dataDir}/.created ]; then - bundle exec rake db:setup - bundle exec rake db:seed - bundle exec rake panamax:templates:load || true - touch ${cfg.dataDir}/.created - else - bundle exec rake db:migrate - fi - ''; - - serviceConfig = { - ExecStart = "${panamax_api}/bin/bundle exec rails server --binding 127.0.0.1 --port ${toString cfg.APIPort}"; - User = "panamax"; - Group = "panamax"; - }; - }; - - systemd.services.panamax-ui = { - description = "Panamax UI"; - - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "panamax_api.service" ]; - - path = [ panamax_ui ]; - environment = { - RAILS_ENV = "production"; - JOURNAL_ENDPOINT = cfg.journalEndpoint; - PMX_API_PORT_3000_TCP_ADDR = "localhost"; - PMX_API_PORT_3000_TCP_PORT = toString cfg.APIPort; - SECRET_KEY_BASE = cfg.secretKey; - }; - - preStart = '' - mkdir -p ${cfg.dataDir}/ui/state/{log,tmp} - chown -R panamax:panamax ${cfg.dataDir} - ''; - - serviceConfig = { - ExecStart = "${panamax_ui}/bin/bundle exec rails server --binding 127.0.0.1 --port ${toString cfg.UIPort}"; - User = "panamax"; - Group = "panamax"; - PermissionsStartOnly = true; - }; - }; - - users.extraUsers.panamax = - { uid = config.ids.uids.panamax; - description = "Panamax user"; - createHome = true; - home = cfg.dataDir; - extraGroups = [ "docker" ]; - }; - - services.journald.enableHttpGateway = mkDefault true; - services.fleet.enable = mkDefault true; - services.cadvisor.enable = mkDefault true; - services.cadvisor.port = mkDefault 3002; - virtualisation.docker.enable = mkDefault true; - - environment.systemPackages = [ panamax_api panamax_ui ]; - users.extraGroups.panamax.gid = config.ids.gids.panamax; - }; -} diff --git a/nixos/release.nix b/nixos/release.nix index 5b6640f1d3c..ebe23ebed02 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -360,7 +360,6 @@ in rec { tests.openldap = callTest tests/openldap.nix {}; tests.owncloud = callTest tests/owncloud.nix {}; tests.pam-oath-login = callTest tests/pam-oath-login.nix {}; - #tests.panamax = callTestOnMatchingSystems ["x86_64-linux"] tests/panamax.nix {}; tests.peerflix = callTest tests/peerflix.nix {}; tests.php-pcre = callTest tests/php-pcre.nix {}; tests.postgresql = callSubTests tests/postgresql.nix {}; diff --git a/nixos/tests/panamax.nix b/nixos/tests/panamax.nix deleted file mode 100644 index 088aa79f8c6..00000000000 --- a/nixos/tests/panamax.nix +++ /dev/null @@ -1,21 +0,0 @@ -import ./make-test.nix ({ pkgs, ...} : { - name = "panamax"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ offline ]; - }; - - machine = { config, pkgs, ... }: { - services.panamax.enable = true; - }; - - testScript = - '' - startAll; - $machine->waitForUnit("panamax-api.service"); - $machine->waitForUnit("panamax-ui.service"); - $machine->waitForOpenPort(3000); - $machine->waitForOpenPort(8888); - $machine->succeed("curl --fail http://localhost:8888/ > /dev/null"); - $machine->shutdown; - ''; -}) diff --git a/pkgs/applications/networking/cluster/panamax/api/Gemfile b/pkgs/applications/networking/cluster/panamax/api/Gemfile deleted file mode 100644 index 82085aa6db0..00000000000 --- a/pkgs/applications/networking/cluster/panamax/api/Gemfile +++ /dev/null @@ -1,23 +0,0 @@ -source 'https://rubygems.org' - -gem 'rails', '4.1.7' -gem 'puma', '2.8.2' -gem 'sqlite3', '1.3.9' -gem 'faraday_middleware', '0.9.0' -gem 'docker-api', '1.13.0', require: 'docker' -gem 'fleet-api', '0.6.0', require: 'fleet' -gem 'active_model_serializers', '0.9.0' -gem 'octokit', '3.2.0' -gem 'kmts', '2.0.1' - -group :test, :development do - gem 'rspec-rails' - gem 'its' -end - -group :test do - gem 'coveralls', '0.7.0' - gem 'shoulda-matchers', '2.6.1' - gem 'database_cleaner', '1.3.0' - gem 'webmock', '1.20.0' -end diff --git a/pkgs/applications/networking/cluster/panamax/api/Gemfile.lock b/pkgs/applications/networking/cluster/panamax/api/Gemfile.lock deleted file mode 100644 index 597c691700a..00000000000 --- a/pkgs/applications/networking/cluster/panamax/api/Gemfile.lock +++ /dev/null @@ -1,164 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - actionmailer (4.1.7) - actionpack (= 4.1.7) - actionview (= 4.1.7) - mail (~> 2.5, >= 2.5.4) - actionpack (4.1.7) - actionview (= 4.1.7) - activesupport (= 4.1.7) - rack (~> 1.5.2) - rack-test (~> 0.6.2) - actionview (4.1.7) - activesupport (= 4.1.7) - builder (~> 3.1) - erubis (~> 2.7.0) - active_model_serializers (0.9.0) - activemodel (>= 3.2) - activemodel (4.1.7) - activesupport (= 4.1.7) - builder (~> 3.1) - activerecord (4.1.7) - activemodel (= 4.1.7) - activesupport (= 4.1.7) - arel (~> 5.0.0) - activesupport (4.1.7) - i18n (~> 0.6, >= 0.6.9) - json (~> 1.7, >= 1.7.7) - minitest (~> 5.1) - thread_safe (~> 0.1) - tzinfo (~> 1.1) - addressable (2.3.6) - archive-tar-minitar (0.5.2) - arel (5.0.1.20140414130214) - builder (3.2.2) - coveralls (0.7.0) - multi_json (~> 1.3) - rest-client - simplecov (>= 0.7) - term-ansicolor - thor - crack (0.4.2) - safe_yaml (~> 1.0.0) - database_cleaner (1.3.0) - diff-lcs (1.2.5) - docile (1.1.5) - docker-api (1.13.0) - archive-tar-minitar - excon (>= 0.37.0) - json - erubis (2.7.0) - excon (0.37.0) - faraday (0.8.9) - multipart-post (~> 1.2.0) - faraday_middleware (0.9.0) - faraday (>= 0.7.4, < 0.9) - fleet-api (0.6.0) - faraday (= 0.8.9) - faraday_middleware (= 0.9.0) - hike (1.2.3) - i18n (0.7.0) - its (0.2.0) - rspec-core - json (1.8.1) - kmts (2.0.1) - mail (2.6.3) - mime-types (>= 1.16, < 3) - mime-types (2.4.3) - minitest (5.5.1) - multi_json (1.10.1) - multipart-post (1.2.0) - octokit (3.2.0) - sawyer (~> 0.5.3) - puma (2.8.2) - rack (>= 1.1, < 2.0) - rack (1.5.2) - rack-test (0.6.3) - rack (>= 1.0) - rails (4.1.7) - actionmailer (= 4.1.7) - actionpack (= 4.1.7) - actionview (= 4.1.7) - activemodel (= 4.1.7) - activerecord (= 4.1.7) - activesupport (= 4.1.7) - bundler (>= 1.3.0, < 2.0) - railties (= 4.1.7) - sprockets-rails (~> 2.0) - railties (4.1.7) - actionpack (= 4.1.7) - activesupport (= 4.1.7) - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rake (10.4.0) - rest-client (1.6.7) - mime-types (>= 1.16) - rspec-core (3.1.7) - rspec-support (~> 3.1.0) - rspec-expectations (3.1.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.1.0) - rspec-mocks (3.1.3) - rspec-support (~> 3.1.0) - rspec-rails (3.1.0) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.1.0) - rspec-expectations (~> 3.1.0) - rspec-mocks (~> 3.1.0) - rspec-support (~> 3.1.0) - rspec-support (3.1.2) - safe_yaml (1.0.4) - sawyer (0.5.4) - addressable (~> 2.3.5) - faraday (~> 0.8, < 0.10) - shoulda-matchers (2.6.1) - activesupport (>= 3.0.0) - simplecov (0.9.1) - docile (~> 1.1.0) - multi_json (~> 1.0) - simplecov-html (~> 0.8.0) - simplecov-html (0.8.0) - sprockets (2.12.3) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.4) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) - sqlite3 (1.3.9) - term-ansicolor (1.3.0) - tins (~> 1.0) - thor (0.19.1) - thread_safe (0.3.4) - tilt (1.4.1) - tins (1.3.0) - tzinfo (1.2.2) - thread_safe (~> 0.1) - webmock (1.20.0) - addressable (>= 2.3.6) - crack (>= 0.3.2) - -PLATFORMS - ruby - -DEPENDENCIES - active_model_serializers (= 0.9.0) - coveralls (= 0.7.0) - database_cleaner (= 1.3.0) - docker-api (= 1.13.0) - faraday_middleware (= 0.9.0) - fleet-api (= 0.6.0) - its - kmts (= 2.0.1) - octokit (= 3.2.0) - puma (= 2.8.2) - rails (= 4.1.7) - rspec-rails - shoulda-matchers (= 2.6.1) - sqlite3 (= 1.3.9) - webmock (= 1.20.0) diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix deleted file mode 100644 index 1c2e2ccac27..00000000000 --- a/pkgs/applications/networking/cluster/panamax/api/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ stdenv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler -, ruby, libxslt, libxml2, sqlite, openssl, docker -, dataDir ? "/var/lib/panamax-api" }@args: - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "panamax-api-${version}"; - version = "0.2.16"; - - env = bundlerEnv { - name = "panamax-api-gems-${version}"; - inherit ruby; - gemdir = ./.; - }; - - bundler = args.bundler.override { inherit ruby; }; - - database_yml = builtins.toFile "database.yml" '' - production: - adapter: sqlite3 - database: <%= ENV["PANAMAX_DATABASE_PATH"] || "${dataDir}/db/mnt/db.sqlite3" %> - timeout: 5000 - ''; - - src = fetchgit { - rev = "refs/tags/v${version}"; - url = "git://github.com/CenturyLinkLabs/panamax-api"; - sha256 = "0dqg0fbmy5cgjh0ql8yqlybhjyyrslgghjrc24wjhd1rghjn2qi6"; - }; - - buildInputs = [ makeWrapper sqlite openssl env.ruby bundler ]; - - setSourceRoot = '' - mkdir -p $out/share - cp -R panamax-api $out/share/panamax-api - export sourceRoot="$out/share/panamax-api" - ''; - - postPatch = '' - find . -type f -exec sed -e 's|/usr/bin/docker|${docker}/bin/docker|g' -i "{}" \; - ''; - - configurePhase = '' - export HOME=$PWD - export GEM_HOME=${env}/${env.ruby.gemPath} - export RAILS_ENV=production - - ln -sf ${database_yml} config/database.yml - ''; - - installPhase = '' - rm -rf log tmp - mv ./db ./_db - ln -sf ${dataDir}/{db,state/log,state/tmp} . - - mkdir -p $out/bin - makeWrapper bin/bundle "$out/bin/bundle" \ - --run "cd $out/share/panamax-api" \ - --prefix "PATH" : "$out/share/panamax-api/bin:${env.ruby}/bin:$PATH" \ - --prefix "HOME" : "$out/share/panamax-api" \ - --prefix "GEM_HOME" : "${env}/${env.ruby.gemPath}" \ - --prefix "GEM_PATH" : "$out/share/panamax-api:${bundler}/${env.ruby.gemPath}" - ''; - - meta = with stdenv.lib; { - broken = true; # needs ruby 2.1 - homepage = https://github.com/CenturyLinkLabs/panamax-api; - description = "The API behind The Panamax UI"; - license = licenses.asl20; - maintainers = with maintainers; [ matejc offline ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/cluster/panamax/api/gemset.nix b/pkgs/applications/networking/cluster/panamax/api/gemset.nix deleted file mode 100644 index 8182543a2bb..00000000000 --- a/pkgs/applications/networking/cluster/panamax/api/gemset.nix +++ /dev/null @@ -1,568 +0,0 @@ -{ - "actionmailer" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "0qjv5akjbpgd4cx518k522mssvc3y3nki65hi6fj5nbzi7a6rwq5"; - }; - dependencies = [ - "actionpack" - "actionview" - "mail" - ]; - }; - "actionpack" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "07y1ny00h69xklq260smyl5md052f617gqrzkyw5sxafs5z25zax"; - }; - dependencies = [ - "actionview" - "activesupport" - "rack" - "rack-test" - ]; - }; - "actionview" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "06sp37gfpn2jn7j6vlpp1y6vfi5kig60vyvixrjhyz0g4vgm13ax"; - }; - dependencies = [ - "activesupport" - "builder" - "erubis" - ]; - }; - "active_model_serializers" = { - version = "0.9.0"; - source = { - type = "gem"; - sha256 = "1ws3gx3wwlm17w7k0agwzmcmww6627lvqaqm828lzm3g1xqilkkl"; - }; - dependencies = [ - "activemodel" - ]; - }; - "activemodel" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "0rlqzz25l7vsphgkilg80kmk20d9h357awi27ax6zzb9klkqh0jr"; - }; - dependencies = [ - "activesupport" - "builder" - ]; - }; - "activerecord" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "0j4r0m32mjbwmz9gs8brln35jzr1cn7h585ggj0w0f1ai4hjsby5"; - }; - dependencies = [ - "activemodel" - "activesupport" - "arel" - ]; - }; - "activesupport" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "13i3mz66d5kp5y39gjwmcfqv0wb6mxm5k1nnz40wvd38dsf7n3bs"; - }; - dependencies = [ - "i18n" - "json" - "minitest" - "thread_safe" - "tzinfo" - ]; - }; - "addressable" = { - version = "2.3.6"; - source = { - type = "gem"; - sha256 = "137fj0whmn1kvaq8wjalp8x4qbblwzvg3g4bfx8d8lfi6f0w48p8"; - }; - }; - "archive-tar-minitar" = { - version = "0.5.2"; - source = { - type = "gem"; - sha256 = "1j666713r3cc3wb0042x0wcmq2v11vwwy5pcaayy5f0lnd26iqig"; - }; - }; - "arel" = { - version = "5.0.1.20140414130214"; - source = { - type = "gem"; - sha256 = "0dhnc20h1v8ml3nmkxq92rr7qxxpk6ixhwvwhgl2dbw9mmxz0hf9"; - }; - }; - "builder" = { - version = "3.2.2"; - source = { - type = "gem"; - sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2"; - }; - }; - "coveralls" = { - version = "0.7.0"; - source = { - type = "gem"; - sha256 = "0sz30d7b83qqsj3i0fr691w05d62wj7x3afh0ryjkqkis3fq94j4"; - }; - dependencies = [ - "multi_json" - "rest-client" - "simplecov" - "term-ansicolor" - "thor" - ]; - }; - "crack" = { - version = "0.4.2"; - source = { - type = "gem"; - sha256 = "1il94m92sz32nw5i6hdq14f1a2c3s9hza9zn6l95fvqhabq38k7a"; - }; - dependencies = [ - "safe_yaml" - ]; - }; - "database_cleaner" = { - version = "1.3.0"; - source = { - type = "gem"; - sha256 = "19w25yda684pg29bggq26wy4lpyjvzscwg2hx3hmmmpysiwfnxgn"; - }; - }; - "diff-lcs" = { - version = "1.2.5"; - source = { - type = "gem"; - sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1"; - }; - }; - "docile" = { - version = "1.1.5"; - source = { - type = "gem"; - sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx"; - }; - }; - "docker-api" = { - version = "1.13.0"; - source = { - type = "gem"; - sha256 = "1rara27gn7lxaf12dqkx8s1clssg10jndfcy4wz2fv6ms1i1lnp6"; - }; - dependencies = [ - "archive-tar-minitar" - "excon" - "json" - ]; - }; - "erubis" = { - version = "2.7.0"; - source = { - type = "gem"; - sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; - }; - }; - "excon" = { - version = "0.37.0"; - source = { - type = "gem"; - sha256 = "05x7asmsq5m419n1lhzk9bic02gwng4cqmrcqsfnd6kmkwm8csv2"; - }; - }; - "faraday" = { - version = "0.8.9"; - source = { - type = "gem"; - sha256 = "17d79fsgx0xwh0mfxyz5pbr435qlw79phlfvifc546w2axdkp718"; - }; - dependencies = [ - "multipart-post" - ]; - }; - "faraday_middleware" = { - version = "0.9.0"; - source = { - type = "gem"; - sha256 = "1kwvi2sdxd6j764a7q5iir73dw2v6816zx3l8cgfv0wr2m47icq2"; - }; - dependencies = [ - "faraday" - ]; - }; - "fleet-api" = { - version = "0.6.0"; - source = { - type = "gem"; - sha256 = "0136mzc0fxp6mzh38n6xbg87cw9g9vq1nrlr3ylazbflvmlxgan6"; - }; - dependencies = [ - "faraday" - "faraday_middleware" - ]; - }; - "hike" = { - version = "1.2.3"; - source = { - type = "gem"; - sha256 = "0i6c9hrszzg3gn2j41v3ijnwcm8cc2931fnjiv6mnpl4jcjjykhm"; - }; - }; - "i18n" = { - version = "0.7.0"; - source = { - type = "gem"; - sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758"; - }; - }; - "its" = { - version = "0.2.0"; - source = { - type = "gem"; - sha256 = "0rxwds9ipqp48mzqcaxzmfcqhawazg0zlhc1avv3i2cmm3np1z8g"; - }; - dependencies = [ - "rspec-core" - ]; - }; - "json" = { - version = "1.8.1"; - source = { - type = "gem"; - sha256 = "0002bsycvizvkmk1jyv8px1hskk6wrjfk4f7x5byi8gxm6zzn6wn"; - }; - }; - "kmts" = { - version = "2.0.1"; - source = { - type = "gem"; - sha256 = "1wk680q443lg35a25am6i8xawf16iqg5xnq1m8xd2gib4dsy1d8v"; - }; - }; - "mail" = { - version = "2.6.3"; - source = { - type = "gem"; - sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp"; - }; - dependencies = [ - "mime-types" - ]; - }; - "mime-types" = { - version = "2.4.3"; - source = { - type = "gem"; - sha256 = "16nissnb31wj7kpcaynx4gr67i7pbkzccfg8k7xmplbkla4rmwiq"; - }; - }; - "minitest" = { - version = "5.5.1"; - source = { - type = "gem"; - sha256 = "1h8jn0rgmwy37jnhfcg55iilw0n370vgp8xnh0g5laa8rhv32fyn"; - }; - }; - "multi_json" = { - version = "1.10.1"; - source = { - type = "gem"; - sha256 = "1ll21dz01jjiplr846n1c8yzb45kj5hcixgb72rz0zg8fyc9g61c"; - }; - }; - "multipart-post" = { - version = "1.2.0"; - source = { - type = "gem"; - sha256 = "12p7lnmc52di1r4h73h6xrpppplzyyhani9p7wm8l4kgf1hnmwnc"; - }; - }; - "octokit" = { - version = "3.2.0"; - source = { - type = "gem"; - sha256 = "07ll3x1hv72zssb4hkdw56xg3xk6x4fch4yf38zljvbh388r11ng"; - }; - dependencies = [ - "sawyer" - ]; - }; - "puma" = { - version = "2.8.2"; - source = { - type = "gem"; - sha256 = "1l57fmf8vyxfjv7ab5znq0k339cym5ghnm5xxfvd1simjp73db0k"; - }; - dependencies = [ - "rack" - ]; - }; - "rack" = { - version = "1.5.2"; - source = { - type = "gem"; - sha256 = "19szfw76cscrzjldvw30jp3461zl00w4xvw1x9lsmyp86h1g0jp6"; - }; - }; - "rack-test" = { - version = "0.6.3"; - source = { - type = "gem"; - sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z"; - }; - dependencies = [ - "rack" - ]; - }; - "rails" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "059mpljplmhfz8rr4hk40q67fllcpsy809m4mwwbkm8qwif2z5r0"; - }; - dependencies = [ - "actionmailer" - "actionpack" - "actionview" - "activemodel" - "activerecord" - "activesupport" - "railties" - "sprockets-rails" - ]; - }; - "railties" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "1n08h0rgj0aq5lvslnih6lvqz9wadpz6nnb25i4qhp37fhhyz9yz"; - }; - dependencies = [ - "actionpack" - "activesupport" - "rake" - "thor" - ]; - }; - "rake" = { - version = "10.4.0"; - source = { - type = "gem"; - sha256 = "0a10xzqc1lh6gjkajkslr0n40wjrniyiyzxkp9m5fc8wf7b74zw8"; - }; - }; - "rest-client" = { - version = "1.6.7"; - source = { - type = "gem"; - sha256 = "0nn7zalgidz2yj0iqh3xvzh626krm2al79dfiij19jdhp0rk8853"; - }; - dependencies = [ - "mime-types" - ]; - }; - "rspec-core" = { - version = "3.1.7"; - source = { - type = "gem"; - sha256 = "01bawvln663gffljwzpq3mrpa061cghjbvfbq15jvhmip3csxqc9"; - }; - dependencies = [ - "rspec-support" - ]; - }; - "rspec-expectations" = { - version = "3.1.2"; - source = { - type = "gem"; - sha256 = "0m8d36wng1lpbcs54zhg1rxh63rgj345k3p0h0c06lgknz339nzh"; - }; - dependencies = [ - "diff-lcs" - "rspec-support" - ]; - }; - "rspec-mocks" = { - version = "3.1.3"; - source = { - type = "gem"; - sha256 = "0gxk5w3klia4zsnp0svxck43xxwwfdqvhr3srv6p30f3m5q6rmzr"; - }; - dependencies = [ - "rspec-support" - ]; - }; - "rspec-rails" = { - version = "3.1.0"; - source = { - type = "gem"; - sha256 = "1b1in3n1dc1bpf9wb3p3b2ynq05iacmr48jxzc73lj4g44ksh3wq"; - }; - dependencies = [ - "actionpack" - "activesupport" - "railties" - "rspec-core" - "rspec-expectations" - "rspec-mocks" - "rspec-support" - ]; - }; - "rspec-support" = { - version = "3.1.2"; - source = { - type = "gem"; - sha256 = "14y6v9r9lrh91ry9r79h85v0f3y9ja25w42nv5z9n0bipfcwhprb"; - }; - }; - "safe_yaml" = { - version = "1.0.4"; - source = { - type = "gem"; - sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; - }; - }; - "sawyer" = { - version = "0.5.4"; - source = { - type = "gem"; - sha256 = "01kl4zpf0gaacnkra5nikrzfpwj8f10hsvgyzm7z2s1mz4iipx2v"; - }; - dependencies = [ - "addressable" - "faraday" - ]; - }; - "shoulda-matchers" = { - version = "2.6.1"; - source = { - type = "gem"; - sha256 = "1p3jhvd4dsj6d7nbmvnqhqhpmb8pnr05pi7jv9ajwqcys8140mc1"; - }; - dependencies = [ - "activesupport" - ]; - }; - "simplecov" = { - version = "0.9.1"; - source = { - type = "gem"; - sha256 = "06hylxlalaxxldpbaqa54gc52wxdff0fixdvjyzr6i4ygxwzr7yf"; - }; - dependencies = [ - "docile" - "multi_json" - "simplecov-html" - ]; - }; - "simplecov-html" = { - version = "0.8.0"; - source = { - type = "gem"; - sha256 = "0jhn3jql73x7hsr00wwv984iyrcg0xhf64s90zaqv2f26blkqfb9"; - }; - }; - "sprockets" = { - version = "2.12.3"; - source = { - type = "gem"; - sha256 = "1bn2drr8bc2af359dkfraq0nm0p1pib634kvhwn5lvj3r4vllnn2"; - }; - dependencies = [ - "hike" - "multi_json" - "rack" - "tilt" - ]; - }; - "sprockets-rails" = { - version = "2.2.4"; - source = { - type = "gem"; - sha256 = "172cdg38cqsfgvrncjzj0kziz7kv6b1lx8pccd0blyphs25qf4gc"; - }; - dependencies = [ - "actionpack" - "activesupport" - "sprockets" - ]; - }; - "sqlite3" = { - version = "1.3.9"; - source = { - type = "gem"; - sha256 = "07m6a6flmyyi0rkg0j7x1a9861zngwjnximfh95cli2zzd57914r"; - }; - }; - "term-ansicolor" = { - version = "1.3.0"; - source = { - type = "gem"; - sha256 = "1a2gw7gmpmx57sdpyhjwl0zn4bqp7jyjz7aslpvvphd075layp4b"; - }; - dependencies = [ - "tins" - ]; - }; - "thor" = { - version = "0.19.1"; - source = { - type = "gem"; - sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; - }; - }; - "thread_safe" = { - version = "0.3.4"; - source = { - type = "gem"; - sha256 = "1cil2zcdzqkyr8zrwhlg7gywryg36j4mxlxw0h0x0j0wjym5nc8n"; - }; - }; - "tilt" = { - version = "1.4.1"; - source = { - type = "gem"; - sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir"; - }; - }; - "tins" = { - version = "1.3.0"; - source = { - type = "gem"; - sha256 = "1yxa5kyp9mw4w866wlg7c32ingzqxnzh3ir9yf06pwpkmq3mrbdi"; - }; - }; - "tzinfo" = { - version = "1.2.2"; - source = { - type = "gem"; - sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx"; - }; - dependencies = [ - "thread_safe" - ]; - }; - "webmock" = { - version = "1.20.0"; - source = { - type = "gem"; - sha256 = "0bl5v0xzcj24lx7xpsnywv3liqnqb5lfxysmmfb2fgi0n8586i6m"; - }; - dependencies = [ - "addressable" - "crack" - ]; - }; -} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/panamax/ui/Gemfile b/pkgs/applications/networking/cluster/panamax/ui/Gemfile deleted file mode 100644 index 6f7dc59d04d..00000000000 --- a/pkgs/applications/networking/cluster/panamax/ui/Gemfile +++ /dev/null @@ -1,31 +0,0 @@ -source 'https://rubygems.org' - -gem 'rails', '4.1.7' -gem 'puma', '2.8.2' -gem 'sass', '3.3.9' -gem 'therubyracer', '0.12.1', platforms: :ruby -gem 'haml', '4.0.5' -gem 'uglifier', '2.5.1' -gem 'ctl_base_ui' -gem 'activeresource', '4.0.0' -gem 'kramdown', '1.4.0' -gem 'zeroclipboard-rails' - - -group :test, :development do - gem 'rspec-rails' - gem 'its' - gem 'capybara' - gem 'teaspoon' - gem 'phantomjs' - gem 'dotenv-rails', '0.11.1' - gem 'pry' - gem 'pry-byebug' - gem 'pry-stack_explorer' -end - -group :test do - gem 'webmock' - gem 'sinatra', '1.4.5' - gem 'coveralls', '0.7.0' -end diff --git a/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock b/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock deleted file mode 100644 index b273595bbb0..00000000000 --- a/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock +++ /dev/null @@ -1,226 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - actionmailer (4.1.7) - actionpack (= 4.1.7) - actionview (= 4.1.7) - mail (~> 2.5, >= 2.5.4) - actionpack (4.1.7) - actionview (= 4.1.7) - activesupport (= 4.1.7) - rack (~> 1.5.2) - rack-test (~> 0.6.2) - actionview (4.1.7) - activesupport (= 4.1.7) - builder (~> 3.1) - erubis (~> 2.7.0) - activemodel (4.1.7) - activesupport (= 4.1.7) - builder (~> 3.1) - activerecord (4.1.7) - activemodel (= 4.1.7) - activesupport (= 4.1.7) - arel (~> 5.0.0) - activeresource (4.0.0) - activemodel (~> 4.0) - activesupport (~> 4.0) - rails-observers (~> 0.1.1) - activesupport (4.1.7) - i18n (~> 0.6, >= 0.6.9) - json (~> 1.7, >= 1.7.7) - minitest (~> 5.1) - thread_safe (~> 0.1) - tzinfo (~> 1.1) - addressable (2.3.6) - arel (5.0.1.20140414130214) - binding_of_caller (0.7.2) - debug_inspector (>= 0.0.1) - builder (3.2.2) - byebug (3.5.1) - columnize (~> 0.8) - debugger-linecache (~> 1.2) - slop (~> 3.6) - capybara (2.4.4) - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - coderay (1.1.0) - columnize (0.8.9) - coveralls (0.7.0) - multi_json (~> 1.3) - rest-client - simplecov (>= 0.7) - term-ansicolor - thor - crack (0.4.2) - safe_yaml (~> 1.0.0) - ctl_base_ui (0.0.5) - haml (~> 4.0) - jquery-rails (~> 3.1) - jquery-ui-rails (~> 4.2) - rails (~> 4.1) - sass (~> 3.3) - debug_inspector (0.0.2) - debugger-linecache (1.2.0) - diff-lcs (1.2.5) - docile (1.1.5) - dotenv (0.11.1) - dotenv-deployment (~> 0.0.2) - dotenv-deployment (0.0.2) - dotenv-rails (0.11.1) - dotenv (= 0.11.1) - erubis (2.7.0) - execjs (2.2.2) - haml (4.0.5) - tilt - hike (1.2.3) - i18n (0.7.0) - its (0.2.0) - rspec-core - jquery-rails (3.1.2) - railties (>= 3.0, < 5.0) - thor (>= 0.14, < 2.0) - jquery-ui-rails (4.2.1) - railties (>= 3.2.16) - json (1.8.2) - kramdown (1.4.0) - libv8 (3.16.14.11) - mail (2.6.3) - mime-types (>= 1.16, < 3) - method_source (0.8.2) - mime-types (2.4.3) - mini_portile (0.6.1) - minitest (5.5.1) - multi_json (1.10.1) - netrc (0.8.0) - nokogiri (1.6.5) - mini_portile (~> 0.6.0) - phantomjs (1.9.7.1) - pry (0.10.1) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (2.0.0) - byebug (~> 3.4) - pry (~> 0.10) - pry-stack_explorer (0.4.9.1) - binding_of_caller (>= 0.7) - pry (>= 0.9.11) - puma (2.8.2) - rack (>= 1.1, < 2.0) - rack (1.5.2) - rack-protection (1.5.3) - rack - rack-test (0.6.3) - rack (>= 1.0) - rails (4.1.7) - actionmailer (= 4.1.7) - actionpack (= 4.1.7) - actionview (= 4.1.7) - activemodel (= 4.1.7) - activerecord (= 4.1.7) - activesupport (= 4.1.7) - bundler (>= 1.3.0, < 2.0) - railties (= 4.1.7) - sprockets-rails (~> 2.0) - rails-observers (0.1.2) - activemodel (~> 4.0) - railties (4.1.7) - actionpack (= 4.1.7) - activesupport (= 4.1.7) - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rake (10.4.0) - ref (1.0.5) - rest-client (1.7.2) - mime-types (>= 1.16, < 3.0) - netrc (~> 0.7) - rspec-core (3.1.7) - rspec-support (~> 3.1.0) - rspec-expectations (3.1.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.1.0) - rspec-mocks (3.1.3) - rspec-support (~> 3.1.0) - rspec-rails (3.1.0) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.1.0) - rspec-expectations (~> 3.1.0) - rspec-mocks (~> 3.1.0) - rspec-support (~> 3.1.0) - rspec-support (3.1.2) - safe_yaml (1.0.4) - sass (3.3.9) - simplecov (0.9.1) - docile (~> 1.1.0) - multi_json (~> 1.0) - simplecov-html (~> 0.8.0) - simplecov-html (0.8.0) - sinatra (1.4.5) - rack (~> 1.4) - rack-protection (~> 1.4) - tilt (~> 1.3, >= 1.3.4) - slop (3.6.0) - sprockets (2.12.3) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.4) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) - teaspoon (0.8.0) - railties (>= 3.2.5, < 5) - term-ansicolor (1.3.0) - tins (~> 1.0) - therubyracer (0.12.1) - libv8 (~> 3.16.14.0) - ref - thor (0.19.1) - thread_safe (0.3.4) - tilt (1.4.1) - tins (1.3.3) - tzinfo (1.2.2) - thread_safe (~> 0.1) - uglifier (2.5.1) - execjs (>= 0.3.0) - json (>= 1.8.0) - webmock (1.20.4) - addressable (>= 2.3.6) - crack (>= 0.3.2) - xpath (2.0.0) - nokogiri (~> 1.3) - zeroclipboard-rails (0.1.0) - railties (>= 3.1) - -PLATFORMS - ruby - -DEPENDENCIES - activeresource (= 4.0.0) - capybara - coveralls (= 0.7.0) - ctl_base_ui - dotenv-rails (= 0.11.1) - haml (= 4.0.5) - its - kramdown (= 1.4.0) - phantomjs - pry - pry-byebug - pry-stack_explorer - puma (= 2.8.2) - rails (= 4.1.7) - rspec-rails - sass (= 3.3.9) - sinatra (= 1.4.5) - teaspoon - therubyracer (= 0.12.1) - uglifier (= 2.5.1) - webmock - zeroclipboard-rails diff --git a/pkgs/applications/networking/cluster/panamax/ui/default.nix b/pkgs/applications/networking/cluster/panamax/ui/default.nix deleted file mode 100644 index 2f60942f014..00000000000 --- a/pkgs/applications/networking/cluster/panamax/ui/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ stdenv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler -, ruby, openssl, sqlite, dataDir ? "/var/lib/panamax-ui"}@args: - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "panamax-ui-${version}"; - version = "0.2.14"; - - env = bundlerEnv { - name = "panamax-ui-gems-${version}"; - inherit ruby; - gemdir = ./.; - }; - - bundler = args.bundler.override { inherit ruby; }; - - src = fetchgit { - rev = "refs/tags/v${version}"; - url = "git://github.com/CenturyLinkLabs/panamax-ui"; - sha256 = "01k0h0rjqp5arvwxm2xpfxjsag5qw0qqlg7hx4v8f6jsyc4wmjfl"; - }; - - buildInputs = [ makeWrapper env.ruby openssl sqlite bundler ]; - - setSourceRoot = '' - mkdir -p $out/share - cp -R panamax-ui $out/share/panamax-ui - export sourceRoot="$out/share/panamax-ui" - ''; - - postPatch = '' - find . -type f -iname "*.haml" -exec sed -e 's|CoreOS Journal|NixOS Journal|g' -i "{}" \; - find . -type f -iname "*.haml" -exec sed -e 's|CoreOS Local|NixOS Local|g' -i "{}" \; - find . -type f -iname "*.haml" -exec sed -e 's|CoreOS Host|NixOS Host|g' -i "{}" \; - sed -e 's|CoreOS Local|NixOS Local|g' -i "spec/features/manage_application_spec.rb" - # fix libv8 dependency - substituteInPlace Gemfile.lock --replace "3.16.14.7" "3.16.14.11" - ''; - - configurePhase = '' - export HOME=$PWD - export GEM_HOME=${env}/${env.ruby.gemPath} - ''; - - buildPhase = '' - rm -f ./bin/* - bundle exec rake rails:update:bin - ''; - - installPhase = '' - rm -rf log tmp db - ln -sf ${dataDir}/{db,state/log,state/tmp} . - - mkdir -p $out/bin - makeWrapper bin/bundle "$out/bin/bundle" \ - --run "cd $out/share/panamax-ui" \ - --prefix "PATH" : "$out/share/panamax-ui/bin:${env.ruby}/bin:$PATH" \ - --prefix "HOME" : "$out/share/panamax-ui" \ - --prefix "GEM_HOME" : "${env}/${env.ruby.gemPath}" \ - --prefix "GEM_PATH" : "$out/share/panamax-ui:${bundler}/${env.ruby.gemPath}" - ''; - - meta = with stdenv.lib; { - broken = true; # needs ruby 2.1 - homepage = https://github.com/CenturyLinkLabs/panamax-ui; - description = "The Web GUI for Panamax"; - license = licenses.asl20; - maintainers = with maintainers; [ matejc offline ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/cluster/panamax/ui/gemset.nix b/pkgs/applications/networking/cluster/panamax/ui/gemset.nix deleted file mode 100644 index b41b482edb7..00000000000 --- a/pkgs/applications/networking/cluster/panamax/ui/gemset.nix +++ /dev/null @@ -1,789 +0,0 @@ -{ - "actionmailer" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "0qjv5akjbpgd4cx518k522mssvc3y3nki65hi6fj5nbzi7a6rwq5"; - }; - dependencies = [ - "actionpack" - "actionview" - "mail" - ]; - }; - "actionpack" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "07y1ny00h69xklq260smyl5md052f617gqrzkyw5sxafs5z25zax"; - }; - dependencies = [ - "actionview" - "activesupport" - "rack" - "rack-test" - ]; - }; - "actionview" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "06sp37gfpn2jn7j6vlpp1y6vfi5kig60vyvixrjhyz0g4vgm13ax"; - }; - dependencies = [ - "activesupport" - "builder" - "erubis" - ]; - }; - "activemodel" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "0rlqzz25l7vsphgkilg80kmk20d9h357awi27ax6zzb9klkqh0jr"; - }; - dependencies = [ - "activesupport" - "builder" - ]; - }; - "activerecord" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "0j4r0m32mjbwmz9gs8brln35jzr1cn7h585ggj0w0f1ai4hjsby5"; - }; - dependencies = [ - "activemodel" - "activesupport" - "arel" - ]; - }; - "activeresource" = { - version = "4.0.0"; - source = { - type = "gem"; - sha256 = "0fc5igjijyjzsl9q5kybkdzhc92zv8wsv0ifb0y90i632jx6d4jq"; - }; - dependencies = [ - "activemodel" - "activesupport" - "rails-observers" - ]; - }; - "activesupport" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "13i3mz66d5kp5y39gjwmcfqv0wb6mxm5k1nnz40wvd38dsf7n3bs"; - }; - dependencies = [ - "i18n" - "json" - "minitest" - "thread_safe" - "tzinfo" - ]; - }; - "addressable" = { - version = "2.3.6"; - source = { - type = "gem"; - sha256 = "137fj0whmn1kvaq8wjalp8x4qbblwzvg3g4bfx8d8lfi6f0w48p8"; - }; - }; - "arel" = { - version = "5.0.1.20140414130214"; - source = { - type = "gem"; - sha256 = "0dhnc20h1v8ml3nmkxq92rr7qxxpk6ixhwvwhgl2dbw9mmxz0hf9"; - }; - }; - "binding_of_caller" = { - version = "0.7.2"; - source = { - type = "gem"; - sha256 = "15jg6dkaq2nzcd602d7ppqbdxw3aji961942w93crs6qw4n6h9yk"; - }; - dependencies = [ - "debug_inspector" - ]; - }; - "builder" = { - version = "3.2.2"; - source = { - type = "gem"; - sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2"; - }; - }; - "byebug" = { - version = "3.5.1"; - source = { - type = "gem"; - sha256 = "0ldc2r0b316rrn2fgdgiznskj9gb0q9n60243laq7nqw9na8wdan"; - }; - dependencies = [ - "columnize" - "debugger-linecache" - "slop" - ]; - }; - "capybara" = { - version = "2.4.4"; - source = { - type = "gem"; - sha256 = "114k4xi4nfbp3jfbxgwa3fksbwsyibx74gbdqpcgg3dxpmzkaa4f"; - }; - dependencies = [ - "mime-types" - "nokogiri" - "rack" - "rack-test" - "xpath" - ]; - }; - "coderay" = { - version = "1.1.0"; - source = { - type = "gem"; - sha256 = "059wkzlap2jlkhg460pkwc1ay4v4clsmg1bp4vfzjzkgwdckr52s"; - }; - }; - "columnize" = { - version = "0.8.9"; - source = { - type = "gem"; - sha256 = "1f3azq8pvdaaclljanwhab78hdw40k908ma2cwk59qzj4hvf7mip"; - }; - }; - "coveralls" = { - version = "0.7.0"; - source = { - type = "gem"; - sha256 = "0sz30d7b83qqsj3i0fr691w05d62wj7x3afh0ryjkqkis3fq94j4"; - }; - dependencies = [ - "multi_json" - "rest-client" - "simplecov" - "term-ansicolor" - "thor" - ]; - }; - "crack" = { - version = "0.4.2"; - source = { - type = "gem"; - sha256 = "1il94m92sz32nw5i6hdq14f1a2c3s9hza9zn6l95fvqhabq38k7a"; - }; - dependencies = [ - "safe_yaml" - ]; - }; - "ctl_base_ui" = { - version = "0.0.5"; - source = { - type = "gem"; - sha256 = "1pji85xmddgld5lqx52zxi5r2kx6rsjwkqlr26bp62xb29r10x57"; - }; - dependencies = [ - "haml" - "jquery-rails" - "jquery-ui-rails" - "rails" - "sass" - ]; - }; - "debug_inspector" = { - version = "0.0.2"; - source = { - type = "gem"; - sha256 = "109761g00dbrw5q0dfnbqg8blfm699z4jj70l4zrgf9mzn7ii50m"; - }; - }; - "debugger-linecache" = { - version = "1.2.0"; - source = { - type = "gem"; - sha256 = "0iwyx190fd5vfwj1gzr8pg3m374kqqix4g4fc4qw29sp54d3fpdz"; - }; - }; - "diff-lcs" = { - version = "1.2.5"; - source = { - type = "gem"; - sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1"; - }; - }; - "docile" = { - version = "1.1.5"; - source = { - type = "gem"; - sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx"; - }; - }; - "dotenv" = { - version = "0.11.1"; - source = { - type = "gem"; - sha256 = "09z0y0d6bks7i0sqvd8szfqj9i1kkj01anzly7shi83b3gxhrq9m"; - }; - dependencies = [ - "dotenv-deployment" - ]; - }; - "dotenv-deployment" = { - version = "0.0.2"; - source = { - type = "gem"; - sha256 = "1ad66jq9a09qq1js8wsyil97018s7y6x0vzji0dy34gh65sbjz8c"; - }; - }; - "dotenv-rails" = { - version = "0.11.1"; - source = { - type = "gem"; - sha256 = "0r6hif0i1lipbi7mkxx7wa5clsn65n6wyd9jry262cx396lsfrqy"; - }; - dependencies = [ - "dotenv" - ]; - }; - "erubis" = { - version = "2.7.0"; - source = { - type = "gem"; - sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; - }; - }; - "execjs" = { - version = "2.2.2"; - source = { - type = "gem"; - sha256 = "05m41mnxn4b2p133qzbz5cy9cc5rn57aa0pp2943hxmzbk379z1f"; - }; - }; - "haml" = { - version = "4.0.5"; - source = { - type = "gem"; - sha256 = "1xmzb0k5q271090crzmv7dbw8ss4289bzxklrc0fhw6pw3kcvc85"; - }; - dependencies = [ - "tilt" - ]; - }; - "hike" = { - version = "1.2.3"; - source = { - type = "gem"; - sha256 = "0i6c9hrszzg3gn2j41v3ijnwcm8cc2931fnjiv6mnpl4jcjjykhm"; - }; - }; - "i18n" = { - version = "0.7.0"; - source = { - type = "gem"; - sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758"; - }; - }; - "its" = { - version = "0.2.0"; - source = { - type = "gem"; - sha256 = "0rxwds9ipqp48mzqcaxzmfcqhawazg0zlhc1avv3i2cmm3np1z8g"; - }; - dependencies = [ - "rspec-core" - ]; - }; - "jquery-rails" = { - version = "3.1.2"; - source = { - type = "gem"; - sha256 = "0h5a565i3l2mbd221m6mz9d1nr53pz19i9qxv08qr1dv0yx2pr3y"; - }; - dependencies = [ - "railties" - "thor" - ]; - }; - "jquery-ui-rails" = { - version = "4.2.1"; - source = { - type = "gem"; - sha256 = "1garrnqwh35acj2pp4sp6fpm2g881h23y644lzbic2qmcrq9wd2v"; - }; - dependencies = [ - "railties" - ]; - }; - "json" = { - version = "1.8.2"; - source = { - type = "gem"; - sha256 = "0zzvv25vjikavd3b1bp6lvbgj23vv9jvmnl4vpim8pv30z8p6vr5"; - }; - }; - "kramdown" = { - version = "1.4.0"; - source = { - type = "gem"; - sha256 = "001vy0ymiwbvkdbb9wpqmswv6imliv7xim00gq6rlk0chnbiaq80"; - }; - }; - libv8 = { - version = "3.16.14.11"; - source = { - type = "gem"; - sha256 = "000vbiy78wk5r1f6p7qncab8ldg7qw5pjz7bchn3lw700gpaacxp"; - }; - }; - "mail" = { - version = "2.6.3"; - source = { - type = "gem"; - sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp"; - }; - dependencies = [ - "mime-types" - ]; - }; - "method_source" = { - version = "0.8.2"; - source = { - type = "gem"; - sha256 = "1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2"; - }; - }; - "mime-types" = { - version = "2.4.3"; - source = { - type = "gem"; - sha256 = "16nissnb31wj7kpcaynx4gr67i7pbkzccfg8k7xmplbkla4rmwiq"; - }; - }; - "mini_portile" = { - version = "0.6.1"; - source = { - type = "gem"; - sha256 = "07gah4k84sar9d850v9gip9b323pw74vwwndh3bbzxpw5iiwsd3l"; - }; - }; - "minitest" = { - version = "5.5.1"; - source = { - type = "gem"; - sha256 = "1h8jn0rgmwy37jnhfcg55iilw0n370vgp8xnh0g5laa8rhv32fyn"; - }; - }; - "multi_json" = { - version = "1.10.1"; - source = { - type = "gem"; - sha256 = "1ll21dz01jjiplr846n1c8yzb45kj5hcixgb72rz0zg8fyc9g61c"; - }; - }; - "netrc" = { - version = "0.8.0"; - source = { - type = "gem"; - sha256 = "1j4jbdvd19kq34xiqx1yqb4wmcywyrlaky8hrh09c1hz3c0v5dkb"; - }; - }; - "nokogiri" = { - version = "1.6.5"; - source = { - type = "gem"; - sha256 = "1xmxz6fa0m4p7c7ngpgz6gjgv65lzz63dsf0b6vh7gs2fkiw8j7l"; - }; - dependencies = [ - "mini_portile" - ]; - }; - "phantomjs" = { - version = "1.9.7.1"; - source = { - type = "gem"; - sha256 = "14as0yzwbzvshbp1f8igjxcdxc5vbjgh0jhdvy393il084inlrl7"; - }; - }; - "pry" = { - version = "0.10.1"; - source = { - type = "gem"; - sha256 = "1j0r5fm0wvdwzbh6d6apnp7c0n150hpm9zxpm5xvcgfqr36jaj8z"; - }; - dependencies = [ - "coderay" - "method_source" - "slop" - ]; - }; - "pry-byebug" = { - version = "2.0.0"; - source = { - type = "gem"; - sha256 = "17b6720ci9345wkzj369ydyj6hdlg2krd26zivpd4dvaijszzgzq"; - }; - dependencies = [ - "byebug" - "pry" - ]; - }; - "pry-stack_explorer" = { - version = "0.4.9.1"; - source = { - type = "gem"; - sha256 = "1828jqcfdr9nk86n15ky199vf33cfz51wkpv6kx230g0dsh9r85z"; - }; - dependencies = [ - "binding_of_caller" - "pry" - ]; - }; - "puma" = { - version = "2.8.2"; - source = { - type = "gem"; - sha256 = "1l57fmf8vyxfjv7ab5znq0k339cym5ghnm5xxfvd1simjp73db0k"; - }; - dependencies = [ - "rack" - ]; - }; - "rack" = { - version = "1.5.2"; - source = { - type = "gem"; - sha256 = "19szfw76cscrzjldvw30jp3461zl00w4xvw1x9lsmyp86h1g0jp6"; - }; - }; - "rack-protection" = { - version = "1.5.3"; - source = { - type = "gem"; - sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; - }; - dependencies = [ - "rack" - ]; - }; - "rack-test" = { - version = "0.6.3"; - source = { - type = "gem"; - sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z"; - }; - dependencies = [ - "rack" - ]; - }; - "rails" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "059mpljplmhfz8rr4hk40q67fllcpsy809m4mwwbkm8qwif2z5r0"; - }; - dependencies = [ - "actionmailer" - "actionpack" - "actionview" - "activemodel" - "activerecord" - "activesupport" - "railties" - "sprockets-rails" - ]; - }; - "rails-observers" = { - version = "0.1.2"; - source = { - type = "gem"; - sha256 = "1lsw19jzmvipvrfy2z04hi7r29dvkfc43h43vs67x6lsj9rxwwcy"; - }; - dependencies = [ - "activemodel" - ]; - }; - "railties" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "1n08h0rgj0aq5lvslnih6lvqz9wadpz6nnb25i4qhp37fhhyz9yz"; - }; - dependencies = [ - "actionpack" - "activesupport" - "rake" - "thor" - ]; - }; - "rake" = { - version = "10.4.0"; - source = { - type = "gem"; - sha256 = "0a10xzqc1lh6gjkajkslr0n40wjrniyiyzxkp9m5fc8wf7b74zw8"; - }; - }; - "ref" = { - version = "1.0.5"; - source = { - type = "gem"; - sha256 = "19qgpsfszwc2sfh6wixgky5agn831qq8ap854i1jqqhy1zsci3la"; - }; - }; - "rest-client" = { - version = "1.7.2"; - source = { - type = "gem"; - sha256 = "0h8c0prfi2v5p8iim3wm60xc4yripc13nqwq601bfl85k4gf25i0"; - }; - dependencies = [ - "mime-types" - "netrc" - ]; - }; - "rspec-core" = { - version = "3.1.7"; - source = { - type = "gem"; - sha256 = "01bawvln663gffljwzpq3mrpa061cghjbvfbq15jvhmip3csxqc9"; - }; - dependencies = [ - "rspec-support" - ]; - }; - "rspec-expectations" = { - version = "3.1.2"; - source = { - type = "gem"; - sha256 = "0m8d36wng1lpbcs54zhg1rxh63rgj345k3p0h0c06lgknz339nzh"; - }; - dependencies = [ - "diff-lcs" - "rspec-support" - ]; - }; - "rspec-mocks" = { - version = "3.1.3"; - source = { - type = "gem"; - sha256 = "0gxk5w3klia4zsnp0svxck43xxwwfdqvhr3srv6p30f3m5q6rmzr"; - }; - dependencies = [ - "rspec-support" - ]; - }; - "rspec-rails" = { - version = "3.1.0"; - source = { - type = "gem"; - sha256 = "1b1in3n1dc1bpf9wb3p3b2ynq05iacmr48jxzc73lj4g44ksh3wq"; - }; - dependencies = [ - "actionpack" - "activesupport" - "railties" - "rspec-core" - "rspec-expectations" - "rspec-mocks" - "rspec-support" - ]; - }; - "rspec-support" = { - version = "3.1.2"; - source = { - type = "gem"; - sha256 = "14y6v9r9lrh91ry9r79h85v0f3y9ja25w42nv5z9n0bipfcwhprb"; - }; - }; - "safe_yaml" = { - version = "1.0.4"; - source = { - type = "gem"; - sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; - }; - }; - "sass" = { - version = "3.3.9"; - source = { - type = "gem"; - sha256 = "0k19vj73283i907z4wfkc9qdska2b19z7ps6lcr5s4qzwis1zkmz"; - }; - }; - "simplecov" = { - version = "0.9.1"; - source = { - type = "gem"; - sha256 = "06hylxlalaxxldpbaqa54gc52wxdff0fixdvjyzr6i4ygxwzr7yf"; - }; - dependencies = [ - "docile" - "multi_json" - "simplecov-html" - ]; - }; - "simplecov-html" = { - version = "0.8.0"; - source = { - type = "gem"; - sha256 = "0jhn3jql73x7hsr00wwv984iyrcg0xhf64s90zaqv2f26blkqfb9"; - }; - }; - "sinatra" = { - version = "1.4.5"; - source = { - type = "gem"; - sha256 = "0qyna3wzlnvsz69d21lxcm3ixq7db08mi08l0a88011qi4qq701s"; - }; - dependencies = [ - "rack" - "rack-protection" - "tilt" - ]; - }; - "slop" = { - version = "3.6.0"; - source = { - type = "gem"; - sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n"; - }; - }; - "sprockets" = { - version = "2.12.3"; - source = { - type = "gem"; - sha256 = "1bn2drr8bc2af359dkfraq0nm0p1pib634kvhwn5lvj3r4vllnn2"; - }; - dependencies = [ - "hike" - "multi_json" - "rack" - "tilt" - ]; - }; - "sprockets-rails" = { - version = "2.2.4"; - source = { - type = "gem"; - sha256 = "172cdg38cqsfgvrncjzj0kziz7kv6b1lx8pccd0blyphs25qf4gc"; - }; - dependencies = [ - "actionpack" - "activesupport" - "sprockets" - ]; - }; - "teaspoon" = { - version = "0.8.0"; - source = { - type = "gem"; - sha256 = "1j3brbm9cv5km9d9wzb6q2b3cvc6m254z48h7h77z1w6c5wr0p3z"; - }; - dependencies = [ - "railties" - ]; - }; - "term-ansicolor" = { - version = "1.3.0"; - source = { - type = "gem"; - sha256 = "1a2gw7gmpmx57sdpyhjwl0zn4bqp7jyjz7aslpvvphd075layp4b"; - }; - dependencies = [ - "tins" - ]; - }; - "therubyracer" = { - version = "0.12.1"; - source = { - type = "gem"; - sha256 = "106fqimqyaalh7p6czbl5m2j69z8gv7cm10mjb8bbb2p2vlmqmi6"; - }; - dependencies = [ - "libv8" - "ref" - ]; - }; - "thor" = { - version = "0.19.1"; - source = { - type = "gem"; - sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; - }; - }; - "thread_safe" = { - version = "0.3.4"; - source = { - type = "gem"; - sha256 = "1cil2zcdzqkyr8zrwhlg7gywryg36j4mxlxw0h0x0j0wjym5nc8n"; - }; - }; - "tilt" = { - version = "1.4.1"; - source = { - type = "gem"; - sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir"; - }; - }; - "tins" = { - version = "1.3.3"; - source = { - type = "gem"; - sha256 = "14jnsg15wakdk1ljh2iv9yvzk8nb7gpzd2zw4yvjikmffqjyqvna"; - }; - }; - "tzinfo" = { - version = "1.2.2"; - source = { - type = "gem"; - sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx"; - }; - dependencies = [ - "thread_safe" - ]; - }; - "uglifier" = { - version = "2.5.1"; - source = { - type = "gem"; - sha256 = "1vihq309mzv9a2i0s8v4imrn1g2kj8z0vr88q3i5b657c4kxzfp0"; - }; - dependencies = [ - "execjs" - "json" - ]; - }; - "webmock" = { - version = "1.20.4"; - source = { - type = "gem"; - sha256 = "01cz13ybxbbvkpl21bcfv0p9ir8m2zcplx93ps01ma54p25z4mxr"; - }; - dependencies = [ - "addressable" - "crack" - ]; - }; - "xpath" = { - version = "2.0.0"; - source = { - type = "gem"; - sha256 = "04kcr127l34p7221z13blyl0dvh0bmxwx326j72idayri36a394w"; - }; - dependencies = [ - "nokogiri" - ]; - }; - "zeroclipboard-rails" = { - version = "0.1.0"; - source = { - type = "gem"; - sha256 = "00ixal0a0mxaqsyzp06c6zz4qdwqydy1qv4n7hbyqfhbmsdalcfc"; - }; - dependencies = [ - "railties" - ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a405901f74..f8d319d0237 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17008,9 +17008,6 @@ with pkgs; p4v = libsForQt5.callPackage ../applications/version-management/p4v { }; - panamax_api = callPackage ../applications/networking/cluster/panamax/api { }; - panamax_ui = callPackage ../applications/networking/cluster/panamax/ui { }; - partio = callPackage ../development/libraries/partio {}; pcmanfm = callPackage ../applications/misc/pcmanfm { }; From c3eefe801a55586445125d49f159c1c0c5e76f76 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Sat, 5 May 2018 00:09:43 +0200 Subject: [PATCH 111/695] fleet: remove package, module, test deprecated and unmaintained upstream --- nixos/modules/misc/ids.nix | 2 +- nixos/modules/module-list.nix | 1 - nixos/modules/services/cluster/fleet.nix | 150 ----------------------- nixos/release.nix | 1 - nixos/tests/fleet.nix | 76 ------------ pkgs/servers/fleet/default.nix | 37 ------ pkgs/top-level/all-packages.nix | 2 - 7 files changed, 1 insertion(+), 268 deletions(-) delete mode 100644 nixos/modules/services/cluster/fleet.nix delete mode 100644 nixos/tests/fleet.nix delete mode 100644 pkgs/servers/fleet/default.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 7a538210d10..7c0750c1a32 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -475,7 +475,7 @@ nylon = 168; #panamax = 170; # unused exim = 172; - fleet = 173; + #fleet = 173; # unused input = 174; sddm = 175; tss = 176; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6f6a81bbda8..33191de14c4 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -170,7 +170,6 @@ ./services/backup/rsnapshot.nix ./services/backup/tarsnap.nix ./services/backup/znapzend.nix - ./services/cluster/fleet.nix ./services/cluster/kubernetes/default.nix ./services/cluster/kubernetes/dns.nix ./services/cluster/kubernetes/dashboard.nix diff --git a/nixos/modules/services/cluster/fleet.nix b/nixos/modules/services/cluster/fleet.nix deleted file mode 100644 index ec03be39594..00000000000 --- a/nixos/modules/services/cluster/fleet.nix +++ /dev/null @@ -1,150 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.fleet; - -in { - - ##### Interface - options.services.fleet = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable fleet service. - ''; - }; - - listen = mkOption { - type = types.listOf types.str; - default = [ "/var/run/fleet.sock" ]; - example = [ "/var/run/fleet.sock" "127.0.0.1:49153" ]; - description = '' - Fleet listening addresses. - ''; - }; - - etcdServers = mkOption { - type = types.listOf types.str; - default = [ "http://127.0.0.1:2379" ]; - description = '' - Fleet list of etcd endpoints to use. - ''; - }; - - publicIp = mkOption { - type = types.nullOr types.str; - default = ""; - description = '' - Fleet IP address that should be published with the local Machine's - state and any socket information. If not set, fleetd will attempt - to detect the IP it should publish based on the machine's IP - routing information. - ''; - }; - - etcdCafile = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Fleet TLS ca file when SSL certificate authentication is enabled - in etcd endpoints. - ''; - }; - - etcdKeyfile = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Fleet TLS key file when SSL certificate authentication is enabled - in etcd endpoints. - ''; - }; - - etcdCertfile = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Fleet TLS cert file when SSL certificate authentication is enabled - in etcd endpoints. - ''; - }; - - metadata = mkOption { - type = types.attrsOf types.str; - default = {}; - apply = attrs: concatMapStringsSep "," (n: "${n}=${attrs."${n}"}") (attrNames attrs); - example = literalExample '' - { - region = "us-west"; - az = "us-west-1"; - } - ''; - description = '' - Key/value pairs that are published with the local to the fleet registry. - This data can be used directly by a client of fleet to make scheduling decisions. - ''; - }; - - extraConfig = mkOption { - type = types.attrsOf types.str; - apply = mapAttrs' (n: v: nameValuePair ("FLEET_" + n) v); - default = {}; - example = literalExample '' - { - VERBOSITY = 1; - ETCD_REQUEST_TIMEOUT = "2.0"; - AGENT_TTL = "40s"; - } - ''; - description = '' - Fleet extra config. See - - for configuration options. - ''; - }; - - }; - - ##### Implementation - config = mkIf cfg.enable { - systemd.services.fleet = { - description = "Fleet Init System Daemon"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "fleet.socket" "etcd.service" "docker.service" ]; - requires = [ "fleet.socket" ]; - environment = { - FLEET_ETCD_SERVERS = concatStringsSep "," cfg.etcdServers; - FLEET_PUBLIC_IP = cfg.publicIp; - FLEET_ETCD_CAFILE = cfg.etcdCafile; - FLEET_ETCD_KEYFILE = cfg.etcdKeyfile; - FLEET_ETCD_CERTFILE = cfg.etcdCertfile; - FLEET_METADATA = cfg.metadata; - } // cfg.extraConfig; - serviceConfig = { - ExecStart = "${pkgs.fleet}/bin/fleetd"; - Group = "fleet"; - }; - }; - - systemd.sockets.fleet = { - description = "Fleet Socket for the API"; - wantedBy = [ "sockets.target" ]; - listenStreams = cfg.listen; - socketConfig = { - ListenStream = "/var/run/fleet.sock"; - SocketMode = "0660"; - SocketUser = "root"; - SocketGroup = "fleet"; - }; - }; - - services.etcd.enable = mkDefault true; - virtualisation.docker.enable = mkDefault true; - - environment.systemPackages = [ pkgs.fleet ]; - users.extraGroups.fleet.gid = config.ids.gids.fleet; - }; -} diff --git a/nixos/release.nix b/nixos/release.nix index ebe23ebed02..55b4f19b868 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -284,7 +284,6 @@ in rec { tests.ferm = callTest tests/ferm.nix {}; tests.firefox = callTest tests/firefox.nix {}; tests.firewall = callTest tests/firewall.nix {}; - tests.fleet = callTestOnMatchingSystems ["x86_64-linux"] tests/fleet.nix {}; tests.fwupd = callTest tests/fwupd.nix {}; #tests.gitlab = callTest tests/gitlab.nix {}; tests.gitolite = callTest tests/gitolite.nix {}; diff --git a/nixos/tests/fleet.nix b/nixos/tests/fleet.nix deleted file mode 100644 index 67c95446526..00000000000 --- a/nixos/tests/fleet.nix +++ /dev/null @@ -1,76 +0,0 @@ -import ./make-test.nix ({ pkgs, ...} : rec { - name = "simple"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ offline ]; - }; - - nodes = { - node1 = - { config, pkgs, ... }: - { - services = { - etcd = { - enable = true; - listenPeerUrls = ["http://0.0.0.0:7001"]; - initialAdvertisePeerUrls = ["http://node1:7001"]; - initialCluster = ["node1=http://node1:7001" "node2=http://node2:7001"]; - }; - }; - - services.fleet = { - enable = true; - metadata.name = "node1"; - }; - - networking.firewall.allowedTCPPorts = [ 7001 ]; - }; - - node2 = - { config, pkgs, ... }: - { - services = { - etcd = { - enable = true; - listenPeerUrls = ["http://0.0.0.0:7001"]; - initialAdvertisePeerUrls = ["http://node2:7001"]; - initialCluster = ["node1=http://node1:7001" "node2=http://node2:7001"]; - }; - }; - - services.fleet = { - enable = true; - metadata.name = "node2"; - }; - - networking.firewall.allowedTCPPorts = [ 7001 ]; - }; - }; - - service = builtins.toFile "hello.service" '' - [Unit] - Description=Hello World - - [Service] - ExecStart=/bin/sh -c "while true; do echo \"Hello, world\"; /var/run/current-system/sw/bin/sleep 1; done" - - [X-Fleet] - MachineMetadata=name=node2 - ''; - - testScript = - '' - startAll; - $node1->waitForUnit("fleet.service"); - $node2->waitForUnit("fleet.service"); - - $node2->waitUntilSucceeds("fleetctl list-machines | grep node1"); - $node1->waitUntilSucceeds("fleetctl list-machines | grep node2"); - - $node1->succeed("cp ${service} hello.service && fleetctl submit hello.service"); - $node1->succeed("fleetctl list-unit-files | grep hello"); - $node1->succeed("fleetctl start hello.service"); - $node1->waitUntilSucceeds("fleetctl list-units | grep running"); - $node1->succeed("fleetctl stop hello.service"); - $node1->succeed("fleetctl destroy hello.service"); - ''; -}) diff --git a/pkgs/servers/fleet/default.nix b/pkgs/servers/fleet/default.nix deleted file mode 100644 index 98daab253b3..00000000000 --- a/pkgs/servers/fleet/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, lib, go, fetchFromGitHub }: - -stdenv.mkDerivation rec { - name = "fleet-${version}"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "coreos"; - repo = "fleet"; - rev = "v${version}"; - sha256 = "0j48ajz19aqfzv9iyznnn39aw51y1nqcl270grmvi5cbqycmrfm0"; - }; - - buildInputs = [ go ]; - - buildPhase = '' - patchShebangs build - ./build - ''; - - installPhase = '' - mkdir -p $out - mv bin $out - ''; - - meta = with stdenv.lib; { - description = "A distributed init system"; - homepage = https://coreos.com/using-coreos/clustering/; - license = licenses.asl20; - maintainers = with maintainers; [ - cstrahan - jgeerds - offline - ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8d319d0237..3d2e488f146 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12407,8 +12407,6 @@ with pkgs; firebird = callPackage ../servers/firebird { icu = null; stdenv = overrideCC stdenv gcc5; }; firebirdSuper = callPackage ../servers/firebird { icu = icu58; superServer = true; stdenv = overrideCC stdenv gcc5; }; - fleet = callPackage ../servers/fleet { }; - foswiki = callPackage ../servers/foswiki { }; frab = callPackage ../servers/web-apps/frab { }; From 841a5553cb411577b5421701b41530e0981d5d82 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 5 May 2018 00:29:01 +0200 Subject: [PATCH 112/695] baresip: switch to GStreamer 1.0 --- .../instant-messengers/baresip/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 538e9a3786b..eff33643ebc 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -1,6 +1,5 @@ -{stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig -, cairo, mpg123, gstreamer, gst-ffmpeg, gst-plugins-base, gst-plugins-bad -, gst-plugins-good, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg +{stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig, gst_all_1 +, cairo, mpg123, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg , gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx }: stdenv.mkDerivation rec { @@ -11,11 +10,10 @@ stdenv.mkDerivation rec { sha256 = "02bf4fwirf3b7h3cr1jqm0xsjzza4fi9kg88424js2l0xywwzpgf"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [zlib openssl libre librem - cairo mpg123 gstreamer gst-ffmpeg gst-plugins-base gst-plugins-bad gst-plugins-good + buildInputs = [zlib openssl libre librem cairo mpg123 alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid ccache libvpx - ]; + ] ++ (with gst_all_1; [ gstreamer gst-libav gst-plugins-base gst-plugins-bad gst-plugins-good ]); makeFlags = [ "LIBRE_MK=${libre}/share/re/re.mk" "LIBRE_INC=${libre}/include/re" @@ -26,7 +24,7 @@ stdenv.mkDerivation rec { "CCACHE_DISABLE=1" "USE_ALSA=1" "USE_AMR=1" "USE_CAIRO=1" "USE_CELT=1" - "USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1" "USE_GSM=1" "USE_GST=1" + "USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1" "USE_GSM=1" "USE_GST1=1" "USE_L16=1" "USE_MPG123=1" "USE_OSS=1" "USE_PLC=1" "USE_VPX=1" "USE_PORTAUDIO=1" "USE_SDL=1" "USE_SNDFILE=1" "USE_SPEEX=1" "USE_SPEEX_AEC=1" "USE_SPEEX_PP=1" "USE_SPEEX_RESAMP=1" "USE_SRTP=1" From 97ca2f5d58cd96e9d27975c78d3801ef168ac093 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 4 May 2018 22:34:27 +0000 Subject: [PATCH 113/695] vscode: 1.22.2 -> 1.23.0 --- pkgs/applications/editors/vscode/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 5c10f6fb3bb..41d4c114c75 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.22.2"; + version = "1.23.0"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "17iqqg6vdccbl1k4k2ks3kkgg7619j6qdvca4k27pjfqm17mvw5n"; - "x86_64-linux" = "1ng2jhhaghsf7a2dmrimazh817jh0ag88whija179ywgrg3i6xam"; - "x86_64-darwin" = "083hizigzxm45hcy6yqwznj9ibqdaxg2xv8rsyas4ig9x55irrcj"; + "i686-linux" = "1nyrcgnf18752n3i7xaq6gpb2k4wsfzk671kxg6za4ycrriw1f5l"; + "x86_64-linux" = "1mkxyavzav522sl3fjn2hdlbj0bkdl3hagqiw9i6h8wgkxcvsszy"; + "x86_64-darwin" = "123ggzssd5qd80jxar2pf5g2n2473pd2j8pfjyir1c7xkaqji2w6"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; From 3bd1fcc4ad8c3223636b66fd2e647b12bd46c8dd Mon Sep 17 00:00:00 2001 From: Wei Tang Date: Sat, 5 May 2018 09:16:19 +0800 Subject: [PATCH 114/695] parity-ui: init at 0.1.1 --- pkgs/applications/altcoins/default.nix | 1 + .../altcoins/parity-ui/default.nix | 50 +++++++++++++++++++ pkgs/applications/altcoins/parity-ui/env.nix | 19 +++++++ pkgs/top-level/all-packages.nix | 1 + 4 files changed, 71 insertions(+) create mode 100644 pkgs/applications/altcoins/parity-ui/default.nix create mode 100644 pkgs/applications/altcoins/parity-ui/env.nix diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index c58178e3edb..fa704b59659 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -86,4 +86,5 @@ rec { parity = callPackage ./parity { }; parity-beta = callPackage ./parity/beta.nix { }; + parity-ui = callPackage ./parity-ui { }; } diff --git a/pkgs/applications/altcoins/parity-ui/default.nix b/pkgs/applications/altcoins/parity-ui/default.nix new file mode 100644 index 00000000000..56a95b6d596 --- /dev/null +++ b/pkgs/applications/altcoins/parity-ui/default.nix @@ -0,0 +1,50 @@ +{ stdenv, pkgs, fetchurl, lib, makeWrapper, nodePackages }: + +let + +uiEnv = pkgs.callPackage ./env.nix { }; + +in stdenv.mkDerivation rec { + name = "parity-ui-${version}"; + version = "0.1.1"; + + src = fetchurl { + url = "https://github.com/parity-js/shell/releases/download/v${version}/parity-ui_${version}_amd64.deb"; + sha256 = "1jym6q63m5f4xm06dxiiabhbqnr0hysf2d3swysncs5hg6w00lh3"; + name = "${name}.deb"; + }; + + nativeBuildInputs = [ makeWrapper nodePackages.asar ]; + + buildCommand = '' + mkdir -p $out/usr/ + ar p $src data.tar.xz | tar -C $out -xJ . + substituteInPlace $out/usr/share/applications/parity-ui.desktop \ + --replace "/opt/Parity UI" $out/bin + mv $out/usr/* $out/ + mv "$out/opt/Parity UI" $out/share/parity-ui + rm -r $out/usr/ + rm -r $out/opt/ + + fixupPhase + + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${uiEnv.libPath}:$out/share/parity-ui" \ + $out/share/parity-ui/parity-ui + + find $out/share/parity-ui -name "*.node" -exec patchelf --set-rpath "${uiEnv.libPath}:$out/share/parity-ui" {} \; + + paxmark m $out/share/parity-ui/parity-ui + + mkdir -p $out/bin + ln -s $out/share/parity-ui/parity-ui $out/bin/parity-ui + ''; + + meta = with stdenv.lib; { + description = "UI for Parity. Fast, light, robust Ethereum implementation"; + homepage = http://parity.io; + license = licenses.gpl3; + maintainers = [ maintainers.sorpaas ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/altcoins/parity-ui/env.nix b/pkgs/applications/altcoins/parity-ui/env.nix new file mode 100644 index 00000000000..a273bf33d10 --- /dev/null +++ b/pkgs/applications/altcoins/parity-ui/env.nix @@ -0,0 +1,19 @@ +{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig +, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr +, nss, xorg, libcap, systemd, libnotify, libsecret, gnome3 }: + +let + packages = [ + stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 + fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr nss + xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst + xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr + xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify + xorg.libxcb libsecret gnome3.gconf + ]; + + libPathNative = lib.makeLibraryPath packages; + libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages; + libPath = "${libPathNative}:${libPath64}"; + +in { inherit packages libPath; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24b33231f77..189e00ae398 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14883,6 +14883,7 @@ with pkgs; parity = self.altcoins.parity; parity-beta = self.altcoins.parity-beta; + parity-ui = self.altcoins.parity-ui; stellar-core = self.altcoins.stellar-core; From 5146fad639a8a6f4b4136216aa37c62d31e20053 Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Thu, 3 May 2018 02:13:09 -0400 Subject: [PATCH 115/695] vscode-extension-ms-vscode-cpptools: 0.12.3 -> 0.16.1 --- .../vscode-extensions/cpptools/default.nix | 47 ++--- .../cpptools/missing_elf_deps.sh | 52 ++++++ .../package-activation-events-0-16-1.json | 22 +++ .../cpptools/update_helper.sh | 168 ++++++++++++++++++ .../vscode-cpptools-0-12-3-package-json.patch | 82 --------- 5 files changed, 260 insertions(+), 111 deletions(-) create mode 100755 pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh create mode 100644 pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json create mode 100755 pkgs/misc/vscode-extensions/cpptools/update_helper.sh delete mode 100644 pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index c537aa8a1f9..c29611c0c66 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchurl, vscode-utils, unzip, dos2unix, mono46, clang-tools, writeScript -, gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. +{ stdenv, lib, fetchurl, fetchzip, vscode-utils, jq, mono46, clang-tools, writeScript +, gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. }: assert gdbUseFixed -> null != gdb; @@ -33,13 +33,11 @@ let langComponentBinaries = stdenv.mkDerivation { name = "cpptools-language-component-binaries"; - src = fetchurl { - url = https://download.visualstudio.microsoft.com/download/pr/11151953/d3cc8b654bffb8a2f3896d101f3c3155/Bin_Linux.zip; - sha256 = "12qbxsrdc73cqjb84xdck1xafzhfkcyn6bqbpcy1bxxr3b7hxbii"; + src = fetchzip { + url = https://download.visualstudio.microsoft.com/download/pr/11991016/8a81aa8f89aac452956b0e4c68e6620b/Bin_Linux.zip; + sha256 = "0ma59fxfldbgh6ijlvfbs3hnl4g0cnw5gs6286zdrp065n763sv4"; }; - buildInputs = [ unzip ]; - patchPhase = '' elfInterpreter="${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2" patchelf --set-interpreter "$elfInterpreter" ./Microsoft.VSCode.CPP.Extension.linux @@ -53,13 +51,6 @@ let ''; }; - cpptoolsJsonFile = fetchurl { - url = https://download.visualstudio.microsoft.com/download/pr/11070848/7b97d6724d52cae8377c61bb4601c989/cpptools.json; - sha256 = "124f091aic92rzbg2vg831y22zr5wi056c1kh775djqs3qv31ja6"; - }; - - - openDebugAD7Script = writeScript "OpenDebugAD7" '' #!${stdenv.shell} BIN_DIR="$(cd "$(dirname "$0")" && pwd -P)" @@ -76,23 +67,24 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "0.12.3"; - sha256 = "1dcqy54n1w29xhbvxscd41hdrbdwar6g12zx02f6kh2f1kw34z5z"; + version = "0.16.1"; + sha256 = "0m4cam8sf3zwp8ss1dii908g7rc8b9l6pry0dglg0rmf45pkiaj3"; }; buildInputs = [ - dos2unix - ]; - - prePatch = '' - dos2unix package.json - ''; - - patches = [ - ./vscode-cpptools-0-12-3-package-json.patch + jq ]; postPatch = '' + mv ./package.json ./package_ori.json + + # 1. Add activation events so that the extension is functional. This listing is empty when unpacking the extension but is filled at runtime. + # 2. Patch `packages.json` so that nix's *gdb* is used as default value for `miDebuggerPath`. + cat ./package_ori.json | \ + jq --slurpfile actEvts ${./package-activation-events-0-16-1.json} '(.activationEvents) = $actEvts[0]' | \ + jq '(.contributes.debuggers[].configurationAttributes | .attach , .launch | .properties.miDebuggerPath | select(. != null) | select(.default == "/usr/bin/gdb") | .default) = "${gdbDefaultsTo}"' > \ + ./package.json + # Patch `packages.json` so that nix's *gdb* is used as default value for `miDebuggerPath`. substituteInPlace "./package.json" \ --replace "\"default\": \"/usr/bin/gdb\"" "\"default\": \"${gdbDefaultsTo}\"" @@ -103,9 +95,6 @@ vscode-utils.buildVscodeMarketplaceExtension { # Move unused files out of the way. mv ./debugAdapters/bin/OpenDebugAD7.exe.config ./debugAdapters/bin/OpenDebugAD7.exe.config.unused - # Bring the `cpptools.json` file at the root of the package, same as the extension would do. - cp -p "${cpptoolsJsonFile}" "./cpptools.json" - # Combining the language component binaries as part of our package. find "${langComponentBinaries}/bin" -mindepth 1 -maxdepth 1 | xargs cp -p -t "./bin" @@ -121,7 +110,7 @@ vscode-utils.buildVscodeMarketplaceExtension { meta = with stdenv.lib; { license = licenses.unfree; maintainers = [ maintainers.jraygauthier ]; - # A 32 bit linux would also be possible with some effort (specific download of binaries + + # A 32 bit linux would also be possible with some effort (specific download of binaries + # patching of the elf files with 32 bit interpreter). platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh b/pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh new file mode 100755 index 00000000000..f5eb08d78a5 --- /dev/null +++ b/pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env nix-shell +#! nix-shell -p coreutils -i bash + +scriptDir=$(cd "`dirname "$0"`"; pwd) +echo "scriptDir='$scriptDir'" + +function get_pkg_out() { + local pkg="$1" + local suffix="${2:-}" + local nixExp="with (import {}); ${pkg}" + echo "$(nix-build -E "$nixExp" --no-out-link)${suffix}" +} + +interpreter="$(get_pkg_out "stdenv.glibc" "/lib/ld-linux-x86-64.so.2")" +echo "interpreter='$interpreter'" + +# For clangformat dep on 'libtinfo.so.5'. +ncursesLibDir="$(get_pkg_out "ncurses5.out" "/lib")" +echo "ncursesLibDir='$ncursesLibDir'" + +# For clanformat dep on 'libstdc++.so.6'. +stdcppLibDir="$(get_pkg_out "stdenv.cc.cc.lib" "/lib")" +echo "stdcppLibDir='$stdcppLibDir'" + +# For clangformat dep on 'libz.so.1'. +zlibLibDir="$(get_pkg_out "zlib.out" "/lib")" +echo "zlibLibDir='$zlibLibDir'" + +function patchelf_mono() { + local exe="$1" + patchelf --set-interpreter "$interpreter" "$exe" +} + +function patchelf_clangformat() { + local exe="$1" + patchelf --set-interpreter "$interpreter" "$exe" + local rpath="$ncursesLibDir:$stdcppLibDir:$zlibLibDir" + patchelf --set-rpath "$rpath" "$exe" +} + +function print_nix_version_clangtools() { + nixClangToolsBin="$(get_pkg_out "clang-tools" "/bin")" + echo "nixClangToolsBin='$nixClangToolsBin'" + $nixClangToolsBin/clang-format --version +} + +function print_nix_version_mono() { + nixMonoBin="$(get_pkg_out "mono" "/bin")" + echo "nixMonoBin='$nixMonoBin'" + $nixMonoBin/mono --version +} + diff --git a/pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json b/pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json new file mode 100644 index 00000000000..3a12a8bc047 --- /dev/null +++ b/pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json @@ -0,0 +1,22 @@ +[ +"onLanguage:cpp", +"onLanguage:c", +"onCommand:extension.pickNativeProcess", +"onCommand:extension.pickRemoteNativeProcess", +"onCommand:C_Cpp.ConfigurationEdit", +"onCommand:C_Cpp.ConfigurationSelect", +"onCommand:C_Cpp.SwitchHeaderSource", +"onCommand:C_Cpp.Navigate", +"onCommand:C_Cpp.GoToDeclaration", +"onCommand:C_Cpp.PeekDeclaration", +"onCommand:C_Cpp.ToggleErrorSquiggles", +"onCommand:C_Cpp.ToggleIncludeFallback", +"onCommand:C_Cpp.ToggleDimInactiveRegions", +"onCommand:C_Cpp.ShowReleaseNotes", +"onCommand:C_Cpp.ResetDatabase", +"onCommand:C_Cpp.PauseParsing", +"onCommand:C_Cpp.ResumeParsing", +"onCommand:C_Cpp.ShowParsingCommands", +"onCommand:C_Cpp.TakeSurvey", +"onDebug" +] \ No newline at end of file diff --git a/pkgs/misc/vscode-extensions/cpptools/update_helper.sh b/pkgs/misc/vscode-extensions/cpptools/update_helper.sh new file mode 100755 index 00000000000..00ef7755324 --- /dev/null +++ b/pkgs/misc/vscode-extensions/cpptools/update_helper.sh @@ -0,0 +1,168 @@ +#!/usr/bin/env nix-shell +#! nix-shell -p coreutils -p jq -p unzip -i bash +set -euo pipefail + +# +# A little script to help maintaining this package. It will: +# +# - download the specified version of the extension to the store and print its url, packed store path and hash +# - unpack the extension, bring it to the store and print its store path and hash +# - fetch its runtimes dependencies from the 'package.json' file using the 'jq' utility, unpack those to the store +# and print its url store path and hash +# - patch elf of the binaries that got a nix replacement +# - bring the patched version to the store +# - run their '--version' and call 'ldd' +# - print the version of the runtime deps nix replacements. +# +# TODO: Print to a properly formated nix file all the required information to fetch everything (extension + runtime deps). +# TODO: Print x86 and maybe darwin runtime dependencies. +# + +scriptDir=$(cd "`dirname "$0"`"; pwd) +echo "scriptDir='$scriptDir'" + +extPublisher="vscode" +extName="cpptools" +defaultExtVersion="0.16.1" +extVersion="${1:-$defaultExtVersion}" + +echo +echo "------------- Downloading extension ---------------" + +extZipStoreName="${extPublisher}-${extName}.zip" +extUrl="https://ms-vscode.gallery.vsassets.io/_apis/public/gallery/publisher/ms-vscode/extension/cpptools/${extVersion}/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage" +echo "extUrl='$extUrl'" +storePathWithSha=$(nix-prefetch-url --name "$extZipStoreName" --print-path "$extUrl" 2> /dev/null) + +cpptoolsZipStorePath="$(echo "$storePathWithSha" | tail -n1)" +cpptoolsZipSha256="$(echo "$storePathWithSha" | head -n1)" +echo "cpptoolsZipStorePath='$cpptoolsZipStorePath'" +echo "cpptoolsZipSha256='$cpptoolsZipSha256'" + + +extStoreName="${extPublisher}-${extName}" + + +function rm_tmpdir() { + #echo "Removing \`tmpDir='$tmpDir'\`" + rm -rf -- "$tmpDir" + unset tmpDir + trap - INT TERM HUP EXIT +} +function make_trapped_tmpdir() { + tmpDir=$(mktemp -d) + trap rm_tmpdir INT TERM HUP EXIT +} + +echo +echo "------------- Unpacked extension ---------------" + +make_trapped_tmpdir +unzip -q -d "$tmpDir" "$cpptoolsZipStorePath" + +cpptoolsStorePath="$(nix add-to-store -n "$extStoreName" "$tmpDir")" +cpptoolsSha256="$(nix hash-path --base32 --type sha512 "$cpptoolsStorePath")" +echo "cpptoolsStorePath='$cpptoolsStorePath'" +echo "cpptoolsSha256='$cpptoolsSha256'" + +rm_tmpdir + +storePathWithSha=$(nix-prefetch-url --print-path "file://${cpptoolsStorePath}/extension/package.json" 2> /dev/null) + +extPackageJSONStorePath="$(echo "$storePathWithSha" | tail -n1)" +extPackageJSONSha256="$(echo "$storePathWithSha" | head -n1)" +echo "extPackageJSONStorePath='$extPackageJSONStorePath'" +echo "extPackageJSONSha256='$extPackageJSONSha256'" + +print_runtime_dep() { + + local outName="$1" + local extPackageJSONStorePath="$2" + local depDesc="$3" + + local urlRaw=$(cat "$extPackageJSONStorePath" | jq -r --arg desc "$depDesc" '.runtimeDependencies[] | select(.description == $desc) | .url') + local url=$(echo $urlRaw | xargs curl -Ls -o /dev/null -w %{url_effective}) + + local urlRawVarStr="${outName}_urlRaw='$urlRaw'" + local urlVarStr="${outName}_url='$url'" + echo "$urlRawVarStr" + echo "$urlVarStr" + + local storePathWithSha="$(nix-prefetch-url --unpack --print-path "$url" 2> /dev/null)" + + local storePath="$(echo "$storePathWithSha" | tail -n1)" + local sha256="$(echo "$storePathWithSha" | head -n1)" + + local sha256VarStr="${outName}_sha256='$sha256'" + local storePathVarStr="${outName}_storePath='$storePath'" + echo "$sha256VarStr" + echo "$storePathVarStr" + + eval "$urlRawVarStr" + eval "$urlVarStr" + eval "$sha256VarStr" + eval "$storePathVarStr" +} + +echo +echo "------------- Runtime dependencies ---------------" + +print_runtime_dep "langComponentBinaries" "$extPackageJSONStorePath" "C/C++ language components (Linux / x86_64)" +print_runtime_dep "monoRuntimeBinaries" "$extPackageJSONStorePath" "Mono Runtime (Linux / x86_64)" +print_runtime_dep "clanFormatBinaries" "$extPackageJSONStorePath" "ClangFormat (Linux / x86_64)" + + +echo +echo "------------- Runtime deps missing elf deps ---------------" + +source "$scriptDir/missing_elf_deps.sh" + +echo +echo "------------- Runtime dep mono ---------------" + +make_trapped_tmpdir +find "$monoRuntimeBinaries_storePath" -mindepth 1 -maxdepth 1 | xargs -d '\n' cp -rp -t "$tmpDir" +chmod -R a+rwx "$tmpDir" + +ls -la "$tmpDir/debugAdapters" + +patchelf_mono "$tmpDir/debugAdapters/mono.linux-x86_64" + +chmod a+x "$tmpDir/debugAdapters/mono.linux-x86_64" +ldd "$tmpDir/debugAdapters/mono.linux-x86_64" +"$tmpDir/debugAdapters/mono.linux-x86_64" --version + +monoRuntimeBinariesPatched_storePath="$(nix add-to-store -n "monoRuntimeBinariesPatched" "$tmpDir")" +echo "monoRuntimeBinariesPatched_storePath='$monoRuntimeBinariesPatched_storePath'" + +rm_tmpdir + + +echo +echo "------------- Runtime dep clang ---------------" +make_trapped_tmpdir +find "$clanFormatBinaries_storePath" -mindepth 1 -maxdepth 1 | xargs -d '\n' cp -rp -t "$tmpDir" +chmod -R a+rwx "$tmpDir" + +ls -la "$tmpDir/bin" + +patchelf_clangformat "$tmpDir/bin/clang-format" + +chmod a+x "$tmpDir/bin/clang-format" +ldd "$tmpDir/bin/clang-format" +"$tmpDir/bin/clang-format" --version + + +clanFormatBinariesPatched_storePath="$(nix add-to-store -n "clanFormatBinariesPatched" "$tmpDir")" +echo "clanFormatBinariesPatched_storePath='$clanFormatBinariesPatched_storePath'" + +rm_tmpdir + +echo +echo "------------- Nix mono ---------------" +print_nix_version_clangtools + +echo +echo "------------- Nix mono ---------------" +print_nix_version_mono + diff --git a/pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch b/pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch deleted file mode 100644 index 1873963f460..00000000000 --- a/pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/package.json b/package.json -index 518e839..1c17c35 100644 ---- a/package.json -+++ b/package.json -@@ -37,7 +37,26 @@ - "Linters" - ], - "activationEvents": [ -- "*" -+ "onLanguage:cpp", -+ "onLanguage:c", -+ "onCommand:extension.pickNativeProcess", -+ "onCommand:extension.pickRemoteNativeProcess", -+ "onCommand:extension.provideInitialConfigurations_cppvsdbg", -+ "onCommand:extension.provideInitialConfigurations_cppdbg", -+ "onCommand:C_Cpp.ConfigurationEdit", -+ "onCommand:C_Cpp.ConfigurationSelect", -+ "onCommand:C_Cpp.SwitchHeaderSource", -+ "onCommand:C_Cpp.UnloadLanguageServer", -+ "onCommand:C_Cpp.Navigate", -+ "onCommand:C_Cpp.GoToDeclaration", -+ "onCommand:C_Cpp.PeekDeclaration", -+ "onCommand:C_Cpp.ToggleErrorSquiggles", -+ "onCommand:C_Cpp.ToggleIncludeFallback", -+ "onCommand:C_Cpp.ShowReleaseNotes", -+ "onCommand:C_Cpp.ResetDatabase", -+ "workspaceContains:.vscode/c_cpp_properties.json", -+ "onDebug:cppdbg", -+ "onDebug:cppvsdbg" - ], - "main": "./out/src/main", - "contributes": { -@@ -281,8 +300,7 @@ - "cpp" - ] - }, -- "runtime": "node", -- "program": "./out/src/Debugger/Proxy/debugProxy.js", -+ "program": "./debugAdapters/OpenDebugAD7", - "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217", - "variables": { - "pickProcess": "extension.pickNativeProcess", -@@ -722,7 +740,29 @@ - } - } - } -- } -+ }, -+ "configurationSnippets": [ -+ { -+ "label": "C/C++: (gdb) Launch", -+ "description": "Launch with gdb.", -+ "bodyText": "{\n\t\"name\": \"(gdb) Launch\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"launch\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"args\": [],\n\t\"stopAtEntry\": false,\n\t\"cwd\": \"\\${workspaceRoot}\",\n\t\"environment\": [],\n\t\"externalConsole\": true,\n\t\"MIMode\": \"gdb\",\n\t\"setupCommands\": [\n\t {\n\t \"description\": \"Enable pretty-printing for gdb\",\n\t \"text\": \"-enable-pretty-printing\",\n\t \"ignoreFailures\": true\n\t }\n\t]\n}" -+ }, -+ { -+ "label": "C/C++: (gdb) Attach", -+ "description": "Attach with gdb.", -+ "bodyText": "{ \n\t\"name\": \"(gdb) Attach\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"attach\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"processId\": \"\\${command:pickProcess}\",\n\t\"MIMode\": \"gdb\"\n}" -+ }, -+ { -+ "label": "C/C++: (gdb) Pipe Launch", -+ "description": "Pipe Launch with gdb.", -+ "bodyText": "{\n\t\"name\": \"(gdb) Pipe Launch\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"launch\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"args\": [],\n\t\"stopAtEntry\": false,\n\t\"cwd\": \"\\${workspaceRoot}\",\n\t\"environment\": [],\n\t\"externalConsole\": true,\n\t\"pipeTransport\": {\n\t\t\"debuggerPath\": \"/usr/bin/gdb\",\n\t\t\"pipeProgram\": \"/usr/bin/ssh\",\n\t\t\"pipeArgs\": [],\n\t\t\"pipeCwd\": \"\"\n\t},\n\t\"MIMode\": \"gdb\",\n\t\"setupCommands\": [\n\t {\n\t \"description\": \"Enable pretty-printing for gdb\",\n\t \"text\": \"-enable-pretty-printing\",\n\t \"ignoreFailures\": true\n\t }\n\t]\n}" -+ }, -+ { -+ "label": "C/C++: (gdb) Pipe Attach", -+ "description": "Pipe Attach with gdb.", -+ "bodyText": "{\n\t\"name\": \"(gdb) Pipe Attach\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"attach\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"processId\": \"\\${command:pickRemoteProcess}\",\n\t\"pipeTransport\": {\n\t\t\"debuggerPath\": \"/usr/bin/gdb\",\n\t\t\"pipeProgram\": \"/usr/bin/ssh\",\n\t\t\"pipeArgs\": [],\n\t\t\"pipeCwd\": \"\"\n\t},\n\t\"MIMode\": \"gdb\"\n}" -+ } -+ ] - }, - { - "type": "cppvsdbg", -@@ -741,7 +781,7 @@ - "variables": { - "pickProcess": "extension.pickNativeProcess" - }, -- "initialConfigurations": "extension.provideInitialConfigurations_cppvsdbg", -+ "initialConfigurations": "", - "configurationAttributes": { - "launch": { - "required": [ From c580919791d5eacde29a457030f69f09187dc2a4 Mon Sep 17 00:00:00 2001 From: Richard DW Redcroft Date: Sat, 5 May 2018 06:29:03 +0100 Subject: [PATCH 116/695] houdini: 16.5.405 -> 16.5.439 * Update version 16.5.439 Update to version to 16.5.439 (current prod build) * Update runtime.nix forgot to update sha256 --- pkgs/applications/misc/houdini/runtime.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index 097386547f5..7477e5c0af2 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -29,11 +29,11 @@ let license_dir = "~/.config/houdini"; in stdenv.mkDerivation rec { - version = "16.5.405"; + version = "16.5.439"; name = "houdini-runtime-${version}"; src = requireFile rec { name = "houdini-${version}-linux_x86_64_gcc4.8.tar.gz"; - sha256 = "14i0kzv881jqd5z9jshri1fxxi3pkxdmi5l4p2b51c9i3apsxmw6"; + sha256 = "7e483072a0e6e751a93f2a2f968cccb2d95559c61106ffeb344c95975704321b"; message = '' This nix expression requires that ${name} is already part of the store. Download it from https://sidefx.com and add it to the nix store with: From 21b926003d50f2f2365f234b9a0bf911607287d2 Mon Sep 17 00:00:00 2001 From: bricewge Date: Sat, 5 May 2018 07:29:44 +0200 Subject: [PATCH 117/695] sshguard: service creates /var/lib/sshguard --- nixos/modules/services/security/sshguard.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/security/sshguard.nix b/nixos/modules/services/security/sshguard.nix index 7f09e8893c4..137c3d61018 100644 --- a/nixos/modules/services/security/sshguard.nix +++ b/nixos/modules/services/security/sshguard.nix @@ -133,6 +133,7 @@ in { ReadOnlyDirectories = "/"; ReadWriteDirectories = "/run/sshguard /var/lib/sshguard"; RuntimeDirectory = "sshguard"; + StateDirectory = "sshguard"; CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW"; }; }; From 9f1da665876cdd4f68750a2241d2bd5fc203f275 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sat, 5 May 2018 08:33:20 +0300 Subject: [PATCH 118/695] ndppd module: init (#35533) --- nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/ndppd.nix | 47 +++++++++++++++++++ .../applications/networking/ndppd/default.nix | 19 +++++++- 3 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 nixos/modules/services/networking/ndppd.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 26804d3682d..cb4c0917678 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -515,6 +515,7 @@ ./services/networking/murmur.nix ./services/networking/namecoind.nix ./services/networking/nat.nix + ./services/networking/ndppd.nix ./services/networking/networkmanager.nix ./services/networking/nftables.nix ./services/networking/ngircd.nix diff --git a/nixos/modules/services/networking/ndppd.nix b/nixos/modules/services/networking/ndppd.nix new file mode 100644 index 00000000000..1d6c48dd8d3 --- /dev/null +++ b/nixos/modules/services/networking/ndppd.nix @@ -0,0 +1,47 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.ndppd; + + configFile = pkgs.runCommand "ndppd.conf" {} '' + substitute ${pkgs.ndppd}/etc/ndppd.conf $out \ + --replace eth0 ${cfg.interface} \ + --replace 1111:: ${cfg.network} + ''; +in { + options = { + services.ndppd = { + enable = mkEnableOption "daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces"; + interface = mkOption { + type = types.string; + default = "eth0"; + example = "ens3"; + description = "Interface which is on link-level with router."; + }; + network = mkOption { + type = types.string; + default = "1111::"; + example = "2001:DB8::/32"; + description = "Network that we proxy."; + }; + configFile = mkOption { + type = types.nullOr types.path; + default = null; + description = "Path to configuration file."; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.packages = [ pkgs.ndppd ]; + environment.etc."ndppd.conf".source = if (cfg.configFile != null) then cfg.configFile else configFile; + systemd.services.ndppd = { + serviceConfig.RuntimeDirectory = [ "ndppd" ]; + wantedBy = [ "multi-user.target" ]; + }; + }; + + meta.maintainers = with maintainers; [ gnidorah ]; +} diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix index 5314d3668eb..a5eb9021048 100644 --- a/pkgs/applications/networking/ndppd/default.nix +++ b/pkgs/applications/networking/ndppd/default.nix @@ -1,6 +1,11 @@ -{ stdenv, fetchFromGitHub, gzip, ... }: +{ stdenv, fetchFromGitHub, fetchurl, gzip, ... }: -stdenv.mkDerivation rec { +let + serviceFile = fetchurl { + url = "https://raw.githubusercontent.com/DanielAdolfsson/ndppd/f37e8eb33dc68b3385ecba9b36a5efd92755580f/ndppd.service"; + sha256 = "1zf54pzjfj9j9gr48075njqrgad4myd3dqmhvzxmjy4gjy9ixmyh"; + }; +in stdenv.mkDerivation rec { name = "ndppd-${version}"; version = "0.2.5"; @@ -19,6 +24,16 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace /bin/gzip ${gzip}/bin/gzip ''; + postInstall = '' + mkdir -p $out/etc + cp ndppd.conf-dist $out/etc/ndppd.conf + + mkdir -p $out/lib/systemd/system + # service file needed for our module is not in release yet + substitute ${serviceFile} $out/lib/systemd/system/ndppd.service \ + --replace /usr/sbin/ndppd $out/sbin/ndppd + ''; + meta = { description = "A daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces"; homepage = https://github.com/DanielAdolfsson/ndppd; From 34a71a80b8fb74cb07b7239845a667172e0d374f Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 5 May 2018 01:29:39 -0500 Subject: [PATCH 119/695] foundationdb: rename jar file to match upstream And don't install the fdb_java.so file: it's already included inside of the jar itself. Signed-off-by: Austin Seipp --- pkgs/servers/foundationdb/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index b1745dd5371..5ebb510be46 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -56,14 +56,12 @@ let mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb cp -v ./lib/libfdb_c.so $lib/lib - cp -v ./lib/libfdb_java.so $lib/lib - cp -v ./lib/libFDBLibTLS.so $out/libexec/plugins/FDBLibTLS.so cp -v ./bindings/c/foundationdb/fdb_c.h $dev/include/foundationdb cp -v ./bindings/c/foundationdb/fdb_c_options.g.h $dev/include/foundationdb - cp -v ./bindings/java/foundationdb-client.jar $lib/share/java + cp -v ./bindings/java/foundationdb-client.jar $lib/share/java/fdb-java.jar for x in fdbbackup fdbcli fdbserver fdbmonitor; do cp -v "./bin/$x" $out/bin; From b79d1e803154cc29debedb7ed4c1aa3de05e2af5 Mon Sep 17 00:00:00 2001 From: Matthew O'Gorman Date: Sat, 5 May 2018 02:32:09 -0400 Subject: [PATCH 120/695] platformio: add git to chroot so it is usable by platformio command --- pkgs/development/arduino/platformio/chrootenv.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/arduino/platformio/chrootenv.nix index f46e705fb90..ae68e84ab1c 100644 --- a/pkgs/development/arduino/platformio/chrootenv.nix +++ b/pkgs/development/arduino/platformio/chrootenv.nix @@ -20,6 +20,7 @@ let }; in (with pkgs; [ zlib + git ]) ++ (with python.pkgs; [ python setuptools From d25607c79db9fca7f1c8696b792e376b42fb2ecb Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 5 May 2018 11:22:23 +0300 Subject: [PATCH 121/695] Fix pci_get_bus_and_slot removed in kernel 4.17 --- .../virtualization/virtualbox/default.nix | 4 +--- .../virtualization/virtualbox/kernpcidev.patch | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/virtualization/virtualbox/kernpcidev.patch diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index ca0520f32a8..d09a30f98a7 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -94,9 +94,7 @@ in stdenv.mkDerivation { patches = optional enableHardening ./hardened.patch - ++ [ ./qtx11extras.patch ]; - - + ++ [ ./qtx11extras.patch ./kernpcidev.patch ]; postPatch = '' sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ diff --git a/pkgs/applications/virtualization/virtualbox/kernpcidev.patch b/pkgs/applications/virtualization/virtualbox/kernpcidev.patch new file mode 100644 index 00000000000..5192227d7d0 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/kernpcidev.patch @@ -0,0 +1,18 @@ +diff --git a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c +index b8019f7..b7d2e39 100644 +--- a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c ++++ b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c +@@ -73,8 +73,11 @@ MODULE_LICENSE("GPL"); + MODULE_VERSION(VBOX_VERSION_STRING); + #endif + +- +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0) ++# define PCI_DEV_GET(v,d,p) pci_get_device(v,d,p) ++# define PCI_DEV_PUT(x) pci_dev_put(x) ++# define PCI_DEV_GET_SLOT(bus, devfn) pci_get_domain_bus_and_slot(0, bus, devfn) ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) + # define PCI_DEV_GET(v,d,p) pci_get_device(v,d,p) + # define PCI_DEV_PUT(x) pci_dev_put(x) + # define PCI_DEV_GET_SLOT(bus, devfn) pci_get_bus_and_slot(bus, devfn) From 43650115e34ea610e53f718d9e02de7222ac0ba2 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Sat, 5 May 2018 15:41:28 +0700 Subject: [PATCH 122/695] nixos/documentation: Correct use of lib.optional lib.optional returns a singleton or an empty list. Therefore the argument does not need to be wrapped in a list. An alternative patch could have used lib.optionals but seems like no more elements are going to be added to the optional list. --- nixos/modules/misc/documentation.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index 2e426c01708..b482a5a6752 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -75,20 +75,20 @@ let cfg = config.documentation; in (mkIf cfg.man.enable { environment.systemPackages = [ pkgs.man-db ]; environment.pathsToLink = [ "/share/man" ]; - environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable [ "devman" ]; + environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable "devman"; }) (mkIf cfg.info.enable { environment.systemPackages = [ pkgs.texinfoInteractive ]; environment.pathsToLink = [ "/share/info" ]; - environment.extraOutputsToInstall = [ "info" ] ++ optional cfg.dev.enable [ "devinfo" ]; + environment.extraOutputsToInstall = [ "info" ] ++ optional cfg.dev.enable "devinfo"; }) (mkIf cfg.doc.enable { # TODO(@oxij): put it here and remove from profiles? # environment.systemPackages = [ pkgs.w3m ]; # w3m-nox? environment.pathsToLink = [ "/share/doc" ]; - environment.extraOutputsToInstall = [ "doc" ] ++ optional cfg.dev.enable [ "devdoc" ]; + environment.extraOutputsToInstall = [ "doc" ] ++ optional cfg.dev.enable "devdoc"; }) ]); From 3cce9b107a7531c52e8b85bba33ec396d2fefda6 Mon Sep 17 00:00:00 2001 From: Tim Cuthbertson Date: Sat, 5 May 2018 19:53:40 +1000 Subject: [PATCH 123/695] nix-pin: 0.2.2 -> 0.3.0 --- pkgs/tools/package-management/nix-pin/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix index bb3a1faa0c3..6f109cd9f41 100644 --- a/pkgs/tools/package-management/nix-pin/default.nix +++ b/pkgs/tools/package-management/nix-pin/default.nix @@ -1,20 +1,22 @@ -{ pkgs, stdenv, fetchFromGitHub, mypy, python3 }: +{ lib, pkgs, stdenv, fetchFromGitHub, mypy, python3, nix, git, makeWrapper }: let self = stdenv.mkDerivation rec { name = "nix-pin-${version}"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "timbertson"; repo = "nix-pin"; - rev = "version-0.2.2"; - sha256 = "1kw43kzy4m6lnnif51r2a8i4vcgr7d4vqb1c75p7pk2b9y3jwxsz"; + rev = "version-0.3.0"; + sha256 = "1kq50v8m8y1wji63b7y3wh6nv3ahvdxvvbsb07day2zzf5ysy8kj"; }; - buildInputs = [ python3 mypy ]; + buildInputs = [ python3 mypy makeWrapper ]; buildPhase = '' mypy bin/* ''; installPhase = '' mkdir "$out" cp -r bin share "$out" + wrapProgram $out/bin/nix-pin \ + --prefix PATH : "${lib.makeBinPath [ nix git ]}" ''; passthru = let From edbf4b0eb2c3c8788451f50bbe4e9170267e50e2 Mon Sep 17 00:00:00 2001 From: jD91mZM2 Date: Sat, 5 May 2018 11:37:37 +0200 Subject: [PATCH 124/695] powerline-rs: init at 0.1.6 --- maintainers/maintainer-list.nix | 5 +++++ pkgs/tools/misc/powerline-rs/default.nix | 25 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 32 insertions(+) create mode 100644 pkgs/tools/misc/powerline-rs/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4b584e6a115..9369a76688c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1740,6 +1740,11 @@ github = "jdagilliland"; name = "Jason Gilliland"; }; + jD91mZM2 = { + email = "me@krake.one"; + github = "jD91mZM2"; + name = "jD91mZM2"; + }; jefdaj = { email = "jefdaj@gmail.com"; github = "jefdaj"; diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix new file mode 100644 index 00000000000..1a386a9f619 --- /dev/null +++ b/pkgs/tools/misc/powerline-rs/default.nix @@ -0,0 +1,25 @@ +{ lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, cmake, libgit2, openssl_1_1_0, libssh2, libzip }: +rustPlatform.buildRustPackage rec { + name = "powerline-rs-${version}"; + version = "0.1.6"; + + src = fetchFromGitHub { + owner = "jD91mZM2"; + repo = "powerline-rs"; + rev = version; + + sha256 = "11rhirnk8zh4vf00df9cgy9vw5h8n7kgnhjbjbnlpl9i6wal9nvl"; + }; + + cargoSha256 = "184s432a6damzvl0lv6jar1iml9dq60r190aqjy44lcg938981zc"; + + nativeBuildInputs = [ pkgconfig file perl cmake ]; + buildInputs = [ libgit2 ]; + propagatedBuildInputs = [ openssl_1_1_0 libssh2 libzip ]; + + meta = with lib; { + description = "powerline-shell rewritten in Rust, inspired by powerline-go"; + maintainers = with maintainers; [ jD91mZM2 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24b33231f77..ffed1c356f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14574,6 +14574,8 @@ with pkgs; powerline-go = callPackage ../tools/misc/powerline-go { }; + powerline-rs = callPackage ../tools/misc/powerline-rs { }; + profont = callPackage ../data/fonts/profont { }; proggyfonts = callPackage ../data/fonts/proggyfonts { }; From 9f31a4d622ad760fd33223297acec4ba8bb84347 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 7 Jan 2018 17:54:08 +0200 Subject: [PATCH 125/695] nano-wallet: init at 12.1 --- .../altcoins/nano-wallet/CMakeLists.txt.patch | 13 +++++ .../altcoins/nano-wallet/default.nix | 57 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 72 insertions(+) create mode 100644 pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch create mode 100644 pkgs/applications/altcoins/nano-wallet/default.nix diff --git a/pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch b/pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch new file mode 100644 index 00000000000..5bbec1d39be --- /dev/null +++ b/pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b43f02f6..4470abbf 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -119,7 +119,7 @@ endif (RAIBLOCKS_SECURE_RPC) + + include_directories (${CMAKE_SOURCE_DIR}) + +-set(Boost_USE_STATIC_LIBS ON) ++add_definitions(-DBOOST_LOG_DYN_LINK) + set(Boost_USE_MULTITHREADED ON) + + if (BOOST_CUSTOM) diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/altcoins/nano-wallet/default.nix new file mode 100644 index 00000000000..8c4722bd991 --- /dev/null +++ b/pkgs/applications/altcoins/nano-wallet/default.nix @@ -0,0 +1,57 @@ +{lib, pkgs, stdenv, fetchFromGitHub, cmake, pkgconfig, boost, libGL, qtbase}: + +stdenv.mkDerivation rec { + + name = "nano-wallet-${version}"; + version = "12.1"; + + src = fetchFromGitHub { + owner = "nanocurrency"; + repo = "raiblocks"; + rev = "V${version}"; + sha256 = "10ng7qn6y31s2bjahmpivw2plx90ljjjzb87j3l7zmppsjd2iq03"; + fetchSubmodules = true; + }; + + # Use a patch to force dynamic linking + patches = [ + ./CMakeLists.txt.patch + ]; + + cmakeFlags = let + options = { + BOOST_ROOT = "${boost}"; + Boost_USE_STATIC_LIBS = "OFF"; + RAIBLOCKS_GUI = "ON"; + RAIBLOCKS_TEST = "ON"; + Qt5_DIR = "${qtbase.dev}/lib/cmake/Qt5"; + Qt5Core_DIR = "${qtbase.dev}/lib/cmake/Qt5Core"; + Qt5Gui_INCLUDE_DIRS = "${qtbase.dev}/include/QtGui"; + Qt5Widgets_INCLUDE_DIRS = "${qtbase.dev}/include/QtWidgets"; + }; + optionToFlag = name: value: "-D${name}=${value}"; + in lib.mapAttrsToList optionToFlag options; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ boost libGL qtbase ]; + + buildPhase = '' + make nano_wallet + ''; + + checkPhase = '' + ./core_test + ''; + + meta = { + inherit version; + description = "Wallet for Nano cryptocurrency"; + homepage = https://nano.org/en/wallet/; + license = lib.licenses.bsd2; + # Fails on Darwin. See: + # https://github.com/NixOS/nixpkgs/pull/39295#issuecomment-386800962 + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jluttine ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 849a90cd6f9..0d4a7b893bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3846,6 +3846,8 @@ with pkgs; namazu = callPackage ../tools/text/namazu { }; + nano-wallet = libsForQt5.callPackage ../applications/altcoins/nano-wallet { }; + nasty = callPackage ../tools/security/nasty { }; nat-traverse = callPackage ../tools/networking/nat-traverse { }; From 4feaecc23de45b37a3ca1f4b886b951d0be6d8f1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 3 May 2018 13:56:23 +0200 Subject: [PATCH 126/695] evolution-data-server: fix SSL support on non-GNOME platforms --- .../core/evolution-data-server/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 01891ad8247..2e87c4a44a1 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -1,6 +1,6 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, python3, dconf, gobjectIntrospection +{ fetchurl, stdenv, pkgconfig, gnome3, python3, gobjectIntrospection , intltool, libsoup, libxml2, libsecret, icu, sqlite -, p11-kit, db, nspr, nss, libical, gperf, makeWrapper +, p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking , vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }: stdenv.mkDerivation rec { @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - cmake ninja pkgconfig intltool python3 gperf makeWrapper gobjectIntrospection vala + cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobjectIntrospection vala ]; buildInputs = with gnome3; [ glib libsoup libxml2 gtk gnome-online-accounts gcr p11-kit libgweather libgdata libaccounts-glib json-glib - icu sqlite kerberos openldap webkitgtk + icu sqlite kerberos openldap webkitgtk glib-networking ]; propagatedBuildInputs = [ libsecret nss nspr libical db ]; @@ -36,14 +36,6 @@ stdenv.mkDerivation rec { cmakeFlags="-DINCLUDE_INSTALL_DIR=$dev/include $cmakeFlags" ''; - preFixup = '' - for f in $(find $out/libexec/ -type f -executable); do - wrapProgram "$f" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" - done - ''; - passthru = { updateScript = gnome3.updateScript { packageName = "evolution-data-server"; From 8e18b7c409600faf9b60685944a00fb1bb4f1c3f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 5 May 2018 15:24:03 +0200 Subject: [PATCH 127/695] sublime: re-introduce accidentally removed attribute --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 849a90cd6f9..aa84c64e8dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17948,6 +17948,8 @@ with pkgs; inherit sbcl lispPackages; }; + sublime = callPackage ../applications/editors/sublime/2 { }; + sublime3Packages = recurseIntoAttrs (callPackage ../applications/editors/sublime/3/packages.nix { }); sublime3 = sublime3Packages.sublime3; From 558c8a280fe7cec13c728c44fdbc3c92861fa9db Mon Sep 17 00:00:00 2001 From: Bernard Fortz Date: Sat, 5 May 2018 15:26:44 +0200 Subject: [PATCH 128/695] eid-mw: 4.1.19 -> 4.3.7 Urgent version bump as tax season is coming and 4.1.19 is not compatible with firefox anymore. --- pkgs/tools/security/eid-mw/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index a11b70917c8..02e5e77c33e 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "eid-mw-${version}"; - version = "4.1.19"; + version = "4.3.7"; src = fetchFromGitHub { sha256 = "191c74kxfrfb894v8y4vi2iygyffjy9jjq5fj7cnnddgwai5n3c5"; @@ -58,5 +58,6 @@ stdenv.mkDerivation rec { and remove all ~/.pki and/or /etc/pki directories no longer needed. ''; platforms = platforms.linux; + maintainers = with maintainers; [ bfortz ]; }; } From c462aa070659925c449750a1921e00b9cae7fbf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= Date: Sat, 5 May 2018 16:46:27 +0200 Subject: [PATCH 129/695] maria-db: Fix mariadb_config include path. Fixes #39984. Co-authored-by: Ekaitz Zarraga --- pkgs/servers/sql/mariadb/default.nix | 2 +- pkgs/servers/sql/mariadb/include-dirs-path.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 pkgs/servers/sql/mariadb/include-dirs-path.patch diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index a9de5508371..170cc6c84a6 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -34,7 +34,7 @@ common = rec { # attributes common to both builds sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt ''; - patches = [ ./cmake-includedir.patch ] + patches = [ ./cmake-includedir.patch ./include-dirs-path.patch ] ++ stdenv.lib.optional stdenv.cc.isClang ./clang-isfinite.patch; cmakeFlags = [ diff --git a/pkgs/servers/sql/mariadb/include-dirs-path.patch b/pkgs/servers/sql/mariadb/include-dirs-path.patch new file mode 100644 index 00000000000..8d468cf546a --- /dev/null +++ b/pkgs/servers/sql/mariadb/include-dirs-path.patch @@ -0,0 +1,13 @@ +diff --git a/libmariadb/mariadb_config/mariadb_config.c.in b/libmariadb/mariadb_config/mariadb_config.c.in +index 45d2f4e..e5666db 100644 +--- a/libmariadb/mariadb_config/mariadb_config.c.in ++++ b/libmariadb/mariadb_config/mariadb_config.c.in +@@ -5,7 +5,7 @@ + + static char *mariadb_progname; + +-#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql" ++#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mysql" + #define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb @extra_dynamic_LDFLAGS@" + #define LIBS_SYS "@extra_dynamic_LDFLAGS@" + #define CFLAGS INCLUDE From 0c4f72c377ff0042aafe9d083692c8b15bdde70a Mon Sep 17 00:00:00 2001 From: Bernard Fortz Date: Sat, 5 May 2018 17:48:36 +0200 Subject: [PATCH 130/695] eid-mw: 4.1.19 -> 4.4.1 Urgent version bump as tax season is coming and 4.1.19 is not compatible with firefox anymore. eid-viewer was merged upstream with eid-mw, so it is included here now. --- pkgs/tools/security/eid-mw/default.nix | 17 ++++++--- pkgs/tools/security/eid-viewer/default.nix | 42 ---------------------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 13 insertions(+), 48 deletions(-) delete mode 100644 pkgs/tools/security/eid-viewer/default.nix diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 02e5e77c33e..39090a19582 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -1,20 +1,29 @@ { stdenv, fetchFromGitHub , autoreconfHook, pkgconfig -, gtk3, nssTools, pcsclite }: +, gtk3, nssTools, pcsclite +, libxml2, libproxy +, openssl, curl }: stdenv.mkDerivation rec { name = "eid-mw-${version}"; - version = "4.3.7"; + version = "4.4.1"; src = fetchFromGitHub { - sha256 = "191c74kxfrfb894v8y4vi2iygyffjy9jjq5fj7cnnddgwai5n3c5"; + sha256 = "0an7xgj5rzl75kq6qfrmm886v639hhlh7c9yfs8iihc47wghpma8"; rev = "v${version}"; repo = "eid-mw"; owner = "Fedict"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ gtk3 pcsclite ]; + buildInputs = [ gtk3 pcsclite libxml2 libproxy curl openssl ]; + preConfigure = '' + mkdir openssl + ln -s ${openssl.out}/lib openssl + ln -s ${openssl.bin}/bin openssl + ln -s ${openssl.dev}/include openssl + export SSL_PREFIX=$(realpath openssl) + ''; postPatch = '' sed 's@m4_esyscmd_s(.*,@[${version}],@' -i configure.ac diff --git a/pkgs/tools/security/eid-viewer/default.nix b/pkgs/tools/security/eid-viewer/default.nix deleted file mode 100644 index 10cc314fe1d..00000000000 --- a/pkgs/tools/security/eid-viewer/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, jre, pcsclite }: - -stdenv.mkDerivation rec { - name = "eid-viewer-${version}"; - version = "4.1.9"; - - src = fetchurl { - url = "https://downloads.services.belgium.be/eid/eid-viewer-${version}-v${version}.src.tar.gz"; - sha256 = "0bq9jl4kl97j0dfhz4crcb1wqhn420z5vpg510zadvrmqjhy1x4g"; - }; - - buildInputs = [ jre pcsclite ]; - nativeBuildInputs = [ makeWrapper ]; - - unpackPhase = "tar -xzf ${src} --strip-components=1"; - - preConfigure = '' - substituteInPlace eid-viewer.sh.in --replace "exec java" "exec ${jre}/bin/java" - ''; - - postInstall = '' - wrapProgram $out/bin/eid-viewer --suffix LD_LIBRARY_PATH : ${pcsclite}/lib - cat >> $out/share/applications/eid-viewer.desktop << EOF - # eid-viewer creates XML without a header, making it "plain text": - MimeType=application/xml;text/xml;text/plain - EOF - ''; - - doCheck = true; - - meta = with stdenv.lib; { - description = "Belgian electronic identity card (eID) viewer"; - homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/; - license = licenses.lgpl3; - longDescription = '' - A simple, graphical Java application to view, print and save data from - Belgian electronic identity cards. Independent of the eid-mw package, - which is required to actually use your eID for authentication or signing. - ''; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 849a90cd6f9..608f6097a2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2108,8 +2108,6 @@ with pkgs; eid-mw = callPackage ../tools/security/eid-mw { }; - eid-viewer = callPackage ../tools/security/eid-viewer { }; - mcrcon = callPackage ../tools/networking/mcrcon {}; tealdeer = callPackage ../tools/misc/tealdeer/default.nix { }; From bc828721ed4ac138d791de47469a40e39046fb4a Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 5 May 2018 19:02:50 +0300 Subject: [PATCH 131/695] nixos/lib/make-ext4-fs: Add a sanity check I ended up with a corrupted image with the debugfs contraption once, and given I couldn't reproduce the problem I suppose that happens if the filesystem of the builder runs out of space. At least in this instance fsck could detect it, so let's add it as a sanity check. --- nixos/lib/make-ext4-fs.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix index 986d80ff1b9..4095d9c6d00 100644 --- a/nixos/lib/make-ext4-fs.nix +++ b/nixos/lib/make-ext4-fs.nix @@ -14,7 +14,7 @@ in pkgs.stdenv.mkDerivation { name = "ext4-fs.img"; - nativeBuildInputs = with pkgs; [e2fsprogs libfaketime perl]; + nativeBuildInputs = with pkgs; [e2fsprogs.bin libfaketime perl]; buildCommand = '' @@ -83,5 +83,12 @@ pkgs.stdenv.mkDerivation { echo "--- Failed to create EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks) ---" return 1 fi + + # I have ended up with corrupted images sometimes, I suspect that happens when the build machine's disk gets full during the build. + if ! fsck.ext4 -n -f $out; then + echo "--- Fsck failed for EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks) ---" + cat errorlog + return 1 + fi ''; } From c6a82cc40c3092a056768415c25ba6d93cbfde27 Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Fri, 4 May 2018 20:56:43 -0400 Subject: [PATCH 132/695] liferea: 1.12.2 -> 1.12.3 New patch release. Changelog at https://github.com/lwindolf/liferea/releases/tag/v1.12.3. --- pkgs/applications/networking/newsreaders/liferea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 0b8a584fc6a..74d59c05ec9 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -6,13 +6,13 @@ let pname = "liferea"; - version = "1.12.2"; + version = "1.12.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "18mz1drp6axvjbr9jdw3i0ijl3l2m191198p4c93qnm7g96ldh15"; + sha256 = "0wm2c8qrgnadq63fivai53xm7vl05wgxc0nk39jcriscdikzqpcg"; }; nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ]; From 7ac652df4b151f62b9627522a11c3937fb137603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 3 May 2018 17:06:37 +0100 Subject: [PATCH 133/695] john: disable aarch64 --- pkgs/tools/security/john/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index 7552b21ed33..e55e97656f6 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; homepage = https://github.com/magnumripper/JohnTheRipper/; maintainers = with maintainers; [ offline ]; - platforms = platforms.unix; + platforms = [ "x86_64-linux" "x86_64-darwin"]; }; } From b53182b437eaed25c24ba29aaf14d492674e457d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Sat, 5 May 2018 20:37:37 +0200 Subject: [PATCH 134/695] plasma5: 5.12.4 -> 5.12.5 --- pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/desktops/plasma-5/srcs.nix | 352 ++++++++++++++++---------------- 2 files changed, 177 insertions(+), 177 deletions(-) diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 117401b0eab..c73598f03d0 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.12.4/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.12.5/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index df031ba0627..cc1fdb88920 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,355 +3,355 @@ { bluedevil = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/bluedevil-5.12.4.tar.xz"; - sha256 = "1gr7zrs2h3xk6rc16wqh2fx40q6q2vm5nwk2fy9r6z639wyxhk2x"; - name = "bluedevil-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/bluedevil-5.12.5.tar.xz"; + sha256 = "0rjxvvg64g4panri4f09fgm571igdijfh92jp616pcqw8v1xqp2a"; + name = "bluedevil-5.12.5.tar.xz"; }; }; breeze = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/breeze-5.12.4.tar.xz"; - sha256 = "12baji960mfkb9ynkhz6c2a76m8fwx4kvzwifwn40sxqv5m857w7"; - name = "breeze-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/breeze-5.12.5.tar.xz"; + sha256 = "1xxgyq3lhliv6p54akgpclficbcs2xdv15a92jkl8a2s9wbisk3n"; + name = "breeze-5.12.5.tar.xz"; }; }; breeze-grub = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/breeze-grub-5.12.4.tar.xz"; - sha256 = "0jnpwznhfml9mshx9zl9wsi8s6ygfplfw4bycq1r9gyxzlcm9zvs"; - name = "breeze-grub-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/breeze-grub-5.12.5.tar.xz"; + sha256 = "1w9f2xm4abqcqk2pdb7hi7d4hd1krkhrs9j3zlncxahfvf67ljad"; + name = "breeze-grub-5.12.5.tar.xz"; }; }; breeze-gtk = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/breeze-gtk-5.12.4.tar.xz"; - sha256 = "183pj18ldhql845xd2lvd4klp6m2xiiaszprw83n7048s9b0bk4c"; - name = "breeze-gtk-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/breeze-gtk-5.12.5.tar.xz"; + sha256 = "0040z43r69kk8l90mvkk8xxzhaw35xm7z2w097sp8xd053y3pdqd"; + name = "breeze-gtk-5.12.5.tar.xz"; }; }; breeze-plymouth = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/breeze-plymouth-5.12.4.tar.xz"; - sha256 = "1apv2jqcjmsfvj4xi736vqsly57wwzxv088hsqcryv3l4v4qkyfr"; - name = "breeze-plymouth-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/breeze-plymouth-5.12.5.tar.xz"; + sha256 = "15204zqk81rwmdq07jzaiv2aninbbgqmg76dhzcz43lckjfhczq9"; + name = "breeze-plymouth-5.12.5.tar.xz"; }; }; discover = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/discover-5.12.4.tar.xz"; - sha256 = "1gyddpafis1yfhh1dz0zvjca8pxnq5z0xvwfbmyh062xmhfy66wq"; - name = "discover-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/discover-5.12.5.tar.xz"; + sha256 = "02fjs016825l35gc173mblii2x9ys5cisqw8niyyvllsls4rp27m"; + name = "discover-5.12.5.tar.xz"; }; }; drkonqi = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/drkonqi-5.12.4.tar.xz"; - sha256 = "0ijrhd689w6pg4biikfv7w6h5hwfjmsp7wcbpd2dq0xwjp3vnyb6"; - name = "drkonqi-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/drkonqi-5.12.5.tar.xz"; + sha256 = "0av0rqgc5a9c8lvpdphp3ifw56qc10qkbjhajlslagxswys73cfq"; + name = "drkonqi-5.12.5.tar.xz"; }; }; kactivitymanagerd = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/kactivitymanagerd-5.12.4.tar.xz"; - sha256 = "1llni6dz8014r8gaihnaxg0nn6ihjvqy7bfyigfda6iz5gwfbpcg"; - name = "kactivitymanagerd-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/kactivitymanagerd-5.12.5.tar.xz"; + sha256 = "1mpldy47fklm9d91wjj734yw3j3pkfrj377b9c5d8l07agwnk2j1"; + name = "kactivitymanagerd-5.12.5.tar.xz"; }; }; kde-cli-tools = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/kde-cli-tools-5.12.4.tar.xz"; - sha256 = "0w6iz9rqi9b6vy18jxksah5lr44211dhfgaxccm0gmggqpiqm5wb"; - name = "kde-cli-tools-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/kde-cli-tools-5.12.5.tar.xz"; + sha256 = "0gs0d9p2x3q6pvjj6l7f9xq741rfqgzhbxwvz1s3cx385b85lplh"; + name = "kde-cli-tools-5.12.5.tar.xz"; }; }; kdecoration = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/kdecoration-5.12.4.tar.xz"; - sha256 = "0njs3b05hvm5s04cfn56dc98yc8sw52hwlclx0qf1hqcsjmm8bnj"; - name = "kdecoration-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/kdecoration-5.12.5.tar.xz"; + sha256 = "0qd5pqm3s1wcmy49mry2plzivg6dhmdp521yahx0mmlk2bssxc3d"; + name = "kdecoration-5.12.5.tar.xz"; }; }; kde-gtk-config = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/kde-gtk-config-5.12.4.tar.xz"; - sha256 = "00j2279z4b9qknip4rpaliwpwv25g3d6j9s0ajs151x94cl18wd6"; - name = "kde-gtk-config-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/kde-gtk-config-5.12.5.tar.xz"; + sha256 = "1p5vpk85v50dkm787ljf77xa7f25lamxf5jn2qc31r8dnlc25dnh"; + name = "kde-gtk-config-5.12.5.tar.xz"; }; }; kdeplasma-addons = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/kdeplasma-addons-5.12.4.tar.xz"; - sha256 = "0ggvxmsj4r25sjaap377i6ap2qkdhjqwslcjym9bcyys1lldbcg5"; - name = "kdeplasma-addons-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/kdeplasma-addons-5.12.5.tar.xz"; + sha256 = "1339sapqi0b6pzbsdyhpfssrvfg9sfc3amlfijxsn63swkjvbw2s"; + name = "kdeplasma-addons-5.12.5.tar.xz"; }; }; kgamma5 = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/kgamma5-5.12.4.tar.xz"; - sha256 = "1v19ay77vv8y37pxqainkrlh0lpajwxgx4xxra84gzd8g7l4zs0h"; - name = "kgamma5-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/kgamma5-5.12.5.tar.xz"; + sha256 = "0p4x8vzjngw7xxnnviiqw89lzs23nrq007211dprnfzgay9c571c"; + name = "kgamma5-5.12.5.tar.xz"; }; }; khotkeys = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/khotkeys-5.12.4.tar.xz"; - sha256 = "1lj8axpimh34vbpgwnfhkh3f7njmqy7jihqk51vkq7ngcy1bmd6f"; - name = "khotkeys-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/khotkeys-5.12.5.tar.xz"; + sha256 = "1yivh10g66h9dmnabnxx1i26rpg8wf9ibpmc7jcmh7j4h5q0lkzg"; + name = "khotkeys-5.12.5.tar.xz"; }; }; kinfocenter = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/kinfocenter-5.12.4.tar.xz"; - sha256 = "0dgybc8xa5lxgmw3nxfh5y085921qm5x6aw0233mwx3zj4v6nsj3"; - name = "kinfocenter-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/kinfocenter-5.12.5.tar.xz"; + sha256 = "1g42hk49fjg4rvgvy5phshk8mna3idh55gn4cy1w0q2rl8f0y6b5"; + name = "kinfocenter-5.12.5.tar.xz"; }; }; kmenuedit = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/kmenuedit-5.12.4.tar.xz"; - sha256 = "063509xbvpk2n86anpl2kcsb1v4zvx6ycwl1ppyjhgg4jim9p099"; - name = "kmenuedit-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/kmenuedit-5.12.5.tar.xz"; + sha256 = "0vbq2s1ibqna19njw421ai4qwq4apww74qcfgk7gwd6p75k37lkw"; + name = "kmenuedit-5.12.5.tar.xz"; }; }; kscreen = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/kscreen-5.12.4.tar.xz"; - sha256 = "1pix8gfvgig5phvcqjc7yqvn1pgmdn6l8g56n06pijicrpksq315"; - name = "kscreen-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/kscreen-5.12.5.tar.xz"; + sha256 = "1cscy7vimznwy29qr0x11wqxlxcwxvybdhw703mj44bq1szw8s0l"; + name = "kscreen-5.12.5.tar.xz"; }; }; kscreenlocker = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/kscreenlocker-5.12.4.tar.xz"; - sha256 = "187c6azmbcfs5w18f450f75hikpvh3lhz7qn8zb93kfm65yvjz1m"; - name = "kscreenlocker-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/kscreenlocker-5.12.5.tar.xz"; + sha256 = "08l8knfvhrd3h8z70xq1jiq02bg56jdddxx0ml6jbd8ja9r1svdq"; + name = "kscreenlocker-5.12.5.tar.xz"; }; }; ksshaskpass = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/ksshaskpass-5.12.4.tar.xz"; - sha256 = "0k405qp8ji84gd7h3lsyfhsya7z55kw2klj9a0ld9z5r7jpr95z5"; - name = "ksshaskpass-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/ksshaskpass-5.12.5.tar.xz"; + sha256 = "0vgqp09cfdlf22xxi0pdzdv0i4hrgvbfj3yrxrfqhfh9zlc3q6y4"; + name = "ksshaskpass-5.12.5.tar.xz"; }; }; ksysguard = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/ksysguard-5.12.4.tar.xz"; - sha256 = "0svk5ggdbjqq9lg4ggwijy7nbwmn3mdkmvm1jqbd174myyd6hmwk"; - name = "ksysguard-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/ksysguard-5.12.5.tar.xz"; + sha256 = "11wh4skx3vjjrdfaa85a8ijdvsw3fnk02s1n9g6yv0c8h74q2nqv"; + name = "ksysguard-5.12.5.tar.xz"; }; }; kwallet-pam = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/kwallet-pam-5.12.4.tar.xz"; - sha256 = "058xxqkyyiwn34iwbmapk6bk6fi3l1g4vwbf125vc9pcbx6nqn2q"; - name = "kwallet-pam-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/kwallet-pam-5.12.5.tar.xz"; + sha256 = "18pbsmc44pqbdylczqsx6cargzkkp4vcd44yk7mwjhniw8pi6x33"; + name = "kwallet-pam-5.12.5.tar.xz"; }; }; kwayland-integration = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/kwayland-integration-5.12.4.tar.xz"; - sha256 = "1lcz12iqisls2icv4jmgjndlamz2zlfyd9lbn6j2hizz7riybsla"; - name = "kwayland-integration-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/kwayland-integration-5.12.5.tar.xz"; + sha256 = "05qcsqyw2n1hpdsiqjvg98i77kwgcdpsr0096nqr62pzf36bsqz3"; + name = "kwayland-integration-5.12.5.tar.xz"; }; }; kwin = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/kwin-5.12.4.tar.xz"; - sha256 = "0br27craalz6vqcv2g7jkskk0ia91hrir1wf1phm2lrnn4yadgf8"; - name = "kwin-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/kwin-5.12.5.tar.xz"; + sha256 = "1mkmh90pl4pz1bb3n9zl6x6lxvr8xkj7r795qj70s9jxavl40fj3"; + name = "kwin-5.12.5.tar.xz"; }; }; kwrited = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/kwrited-5.12.4.tar.xz"; - sha256 = "0m2snmvyxfnmlhfpvghp3w6apmba7rna9xsp5szdzrxgrd92ibgy"; - name = "kwrited-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/kwrited-5.12.5.tar.xz"; + sha256 = "0vvlkr4w4vwgkl9sili63cwlp0lsxlnzwfwmhpa5nrwcjgbyfbmz"; + name = "kwrited-5.12.5.tar.xz"; }; }; libkscreen = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/libkscreen-5.12.4.tar.xz"; - sha256 = "1dq5mbz7vqz4dzgnpsxgmygnz00d7ziqs98qcdgfcbvkh0j4sqsr"; - name = "libkscreen-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/libkscreen-5.12.5.tar.xz"; + sha256 = "0hzdchkxlv5l3zx7lxzj0x44kn3086gxnhmas9w1n9b6qrf0sjb4"; + name = "libkscreen-5.12.5.tar.xz"; }; }; libksysguard = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/libksysguard-5.12.4.tar.xz"; - sha256 = "09mqfr4dxiq4xs4ihrxvsa9wf8azmilpnl5jbi06pfw5bd1q6fpd"; - name = "libksysguard-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/libksysguard-5.12.5.tar.xz"; + sha256 = "0dbf3xx52xqyzaxvybmjra0z1lc3qcbb0aqmsga8rjj77bmj3kx9"; + name = "libksysguard-5.12.5.tar.xz"; }; }; milou = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/milou-5.12.4.tar.xz"; - sha256 = "0v0m4a0idah99dvsmgng6kmlcqwpwh1rbd2j9ih7ka1xmlshdml7"; - name = "milou-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/milou-5.12.5.tar.xz"; + sha256 = "0v0zkwmh7rzqbgw1ypqz18bd3gn3x8iag0q9lrk6zzpd66j2r1fc"; + name = "milou-5.12.5.tar.xz"; }; }; oxygen = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/oxygen-5.12.4.tar.xz"; - sha256 = "1k9kls7xzwb49gwjlhyxhg2jn9zh034csbdlz0pnq9h1yzwph4wa"; - name = "oxygen-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/oxygen-5.12.5.tar.xz"; + sha256 = "0336bkvn8mqrbswnhg87ah7k3w7i99c8rfpfvhw5qq3mm6jvbi4l"; + name = "oxygen-5.12.5.tar.xz"; }; }; plasma-desktop = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/plasma-desktop-5.12.4.tar.xz"; - sha256 = "16g2vnbfd7nl61hfx7i6b3m0hms2aw4v85nbj8mf2i6csc1vzhmy"; - name = "plasma-desktop-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/plasma-desktop-5.12.5.tar.xz"; + sha256 = "0rm7j8n3yflzl6wpivmjsgrhc5arrnmzfg81arfs06gjdnvwnmd6"; + name = "plasma-desktop-5.12.5.tar.xz"; }; }; plasma-integration = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/plasma-integration-5.12.4.tar.xz"; - sha256 = "0qdyckmm52d0bf0062v103hy5szqqgfbh4z6h9bbjcz5l372aklb"; - name = "plasma-integration-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/plasma-integration-5.12.5.tar.xz"; + sha256 = "14iciz6zjxrvig58hpqa51cj5r949xq9xgqvs8glzldzg34928sm"; + name = "plasma-integration-5.12.5.tar.xz"; }; }; plasma-nm = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/plasma-nm-5.12.4.tar.xz"; - sha256 = "1mvj41hxd42wk8ja186vxv080igrdza6sqbgcajk48r2klybpfzj"; - name = "plasma-nm-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/plasma-nm-5.12.5.tar.xz"; + sha256 = "1awnd9gdciwrwyl2xs9h778fizhnbw8wm8ddbqr8050v7fkc7fs6"; + name = "plasma-nm-5.12.5.tar.xz"; }; }; plasma-pa = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/plasma-pa-5.12.4.tar.xz"; - sha256 = "1mngqa9957m45ij73xp3lzp19hmwwq9h40ig39mwh20gm5jrdw56"; - name = "plasma-pa-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/plasma-pa-5.12.5.tar.xz"; + sha256 = "13z9shlnprbjgqy1w8lf3brjcvmh76fpl0xv3q2r7kvcgm1ndjdd"; + name = "plasma-pa-5.12.5.tar.xz"; }; }; plasma-sdk = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/plasma-sdk-5.12.4.tar.xz"; - sha256 = "1mw477p1z396gsbdx3m9cp0b2ljhqjw39grklg7l4cgrhiwrnjk2"; - name = "plasma-sdk-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/plasma-sdk-5.12.5.tar.xz"; + sha256 = "0rrwis63khq1b6shxrp5cj6dgz9lhrccs7752f7j73pi5fpmbz0g"; + name = "plasma-sdk-5.12.5.tar.xz"; }; }; plasma-tests = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/plasma-tests-5.12.4.tar.xz"; - sha256 = "13gq7mfimh4xd4f2vqaqri3f1v8nh7yixqppjip8s9mq3amf6xd9"; - name = "plasma-tests-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/plasma-tests-5.12.5.tar.xz"; + sha256 = "1rq8li7y3qf1ipyhy869lw3znmssf5grbh522qla4sn08d1lhxij"; + name = "plasma-tests-5.12.5.tar.xz"; }; }; plasma-vault = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/plasma-vault-5.12.4.tar.xz"; - sha256 = "022vqjra25v9bw9j14j0a5jl9r08iqvzd5zn0dhz6l4bj0amcd8n"; - name = "plasma-vault-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/plasma-vault-5.12.5.tar.xz"; + sha256 = "0zrwsqcpkssrfhy2xgg4y2k2w6l7vyn7mqani9lw18i13vp2fh1d"; + name = "plasma-vault-5.12.5.tar.xz"; }; }; plasma-workspace = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/plasma-workspace-5.12.4.tar.xz"; - sha256 = "00n2i6hj0fqss69gmmdhf32sfybak3l1iw379ljc3l4k6b3kzmh7"; - name = "plasma-workspace-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/plasma-workspace-5.12.5.tar.xz"; + sha256 = "1vy5p22y6jckhm09171pjacdrndl7vak6grwvzg8bmhqk1ahzdwk"; + name = "plasma-workspace-5.12.5.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/plasma-workspace-wallpapers-5.12.4.tar.xz"; - sha256 = "1y2mqkql2nadq3npxjp5hr2vzq3i45b4xp7gzcjl9bb2wppmhv4j"; - name = "plasma-workspace-wallpapers-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/plasma-workspace-wallpapers-5.12.5.tar.xz"; + sha256 = "1p6kcakdw020pjwdfdhh1v8bha8r6j9934nid7vv7ldp388mq6a7"; + name = "plasma-workspace-wallpapers-5.12.5.tar.xz"; }; }; plymouth-kcm = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/plymouth-kcm-5.12.4.tar.xz"; - sha256 = "1aakf2qrbnnv2n2rp57jql6nvl9i5mxpy0f4f5bjlqjxhzjlwwkn"; - name = "plymouth-kcm-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/plymouth-kcm-5.12.5.tar.xz"; + sha256 = "1fv2b792d7bg5vdix823fks8capgbnda94fc8z91nsffa894p0i9"; + name = "plymouth-kcm-5.12.5.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.12.4"; + version = "1-5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/polkit-kde-agent-1-5.12.4.tar.xz"; - sha256 = "0wwk1cr4mh2csjv0xrahzwyxyg8znd839zz518hfxdcv9a1rba2q"; - name = "polkit-kde-agent-1-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/polkit-kde-agent-1-5.12.5.tar.xz"; + sha256 = "01plpzhj2fc2i3hjqb75skmyiy9dg3mw2h1sxsl7hxmbvm9fv9if"; + name = "polkit-kde-agent-1-5.12.5.tar.xz"; }; }; powerdevil = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/powerdevil-5.12.4.tar.xz"; - sha256 = "043k0zhab6nqa1kc09d9d8jg7j1sd7jy0zhrwb66lf29yc6iyahx"; - name = "powerdevil-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/powerdevil-5.12.5.tar.xz"; + sha256 = "07f3kqvfqgqpz50fk8dwyr5z1hylli0k4ndlcp5mkybiraz1rdjk"; + name = "powerdevil-5.12.5.tar.xz"; }; }; sddm-kcm = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/sddm-kcm-5.12.4.tar.xz"; - sha256 = "0bm8h5r4nin0hx1nfqya1lxcp93745shk6ifqrizgzw1ldqqyah7"; - name = "sddm-kcm-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/sddm-kcm-5.12.5.tar.xz"; + sha256 = "13qqyvq7rk7h65krjaqgil2rxjj7073arxp4bij5g534ckpwkz3h"; + name = "sddm-kcm-5.12.5.tar.xz"; }; }; systemsettings = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/systemsettings-5.12.4.tar.xz"; - sha256 = "0af2vqnlwxa7ldra78y0gwq1cra227q49ww7w1cnvgq0il7cav4a"; - name = "systemsettings-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/systemsettings-5.12.5.tar.xz"; + sha256 = "0ackzdyfmssq6lh9dranc8nv6bhk633zq1mixibqhswl3pz8n4h8"; + name = "systemsettings-5.12.5.tar.xz"; }; }; user-manager = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/user-manager-5.12.4.tar.xz"; - sha256 = "1y144lw1a4q4pp9hw31lr806fpm1p397ibpbagcdr3xaka2z36lm"; - name = "user-manager-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/user-manager-5.12.5.tar.xz"; + sha256 = "1566scbw6f02gskwdc2kk6xcbbf7hq6jkz3ka1avkwmyi3xhh010"; + name = "user-manager-5.12.5.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.12.4"; + version = "5.12.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.4/xdg-desktop-portal-kde-5.12.4.tar.xz"; - sha256 = "18b97mbyfqvf2ygwrggi5zvkv8a9givqjlyaqi184h8mgndn044c"; - name = "xdg-desktop-portal-kde-5.12.4.tar.xz"; + url = "${mirror}/stable/plasma/5.12.5/xdg-desktop-portal-kde-5.12.5.tar.xz"; + sha256 = "1rmjwjx7x481607vp0pjxsabbjhm7qfqa0ax4ciqqlv676hcr5cv"; + name = "xdg-desktop-portal-kde-5.12.5.tar.xz"; }; }; } From d84a06feca9b6d43df669610523665067a26d41d Mon Sep 17 00:00:00 2001 From: Bernard Fortz Date: Sat, 5 May 2018 21:00:06 +0200 Subject: [PATCH 135/695] eid-mw: 4.1.19 -> 4.4.1 Urgent version bump as tax season is coming and 4.1.19 is not compatible with firefox anymore. eid-viewer was merged upstream with eid-mw, so it is included here now. --- pkgs/tools/security/eid-mw/default.nix | 35 +++++++++++++++----------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 39090a19582..eb886148674 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -2,7 +2,8 @@ , autoreconfHook, pkgconfig , gtk3, nssTools, pcsclite , libxml2, libproxy -, openssl, curl }: +, openssl, curl +, makeWrapper }: stdenv.mkDerivation rec { name = "eid-mw-${version}"; @@ -15,7 +16,7 @@ stdenv.mkDerivation rec { owner = "Fedict"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; buildInputs = [ gtk3 pcsclite libxml2 libproxy curl openssl ]; preConfigure = '' mkdir openssl @@ -31,39 +32,45 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-dialogs=yes" ]; - enableParallelBuilding = true; - - doCheck = true; - postInstall = '' install -D ${./eid-nssdb.in} $out/bin/eid-nssdb substituteInPlace $out/bin/eid-nssdb \ --replace "modutil" "${nssTools}/bin/modutil" - # Only provides a useless "about-eid-mw.desktop" that segfaults anyway: - rm -r $out/share/applications $out/bin/about-eid-mw + rm $out/bin/about-eid-mw + wrapProgram $out/bin/eid-viewer --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/$name" ''; + enableParallelBuilding = true; + + doCheck = true; + meta = with stdenv.lib; { description = "Belgian electronic identity card (eID) middleware"; homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/; license = licenses.lgpl3; longDescription = '' Allows user authentication and digital signatures with Belgian ID cards. - Also requires a running pcscd service and compatible card reader. + Also requires a running pcscd service and compatible card reader. + eid-viewer is also installed. + + **TO FIX:** + The procedure below did not work for me, I had to install the .so directly in firefox as instructed at + https://eid.belgium.be/en/log-eid#7507 + and specify + /run/current-system/sw/lib/libbeidpkcs11.so + as the path to the module. + + This package only installs the libraries. To use eIDs in Firefox or + Chromium, the eID Belgium add-on must be installed. This package only installs the libraries. To use eIDs in NSS-compatible browsers like Chrom{e,ium} or Firefox, each user must first execute: - ~$ eid-nssdb add - (Running the script once as root with the --system option enables eID support for all users, but will *not* work when using Chrom{e,ium}!) - Before uninstalling this package, it is a very good idea to run - ~$ eid-nssdb [--system] remove - and remove all ~/.pki and/or /etc/pki directories no longer needed. ''; platforms = platforms.linux; From bf65cf4d28da2715a6f113aee8d714111848946f Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Sat, 5 May 2018 22:31:21 +0200 Subject: [PATCH 136/695] skhd: 0.0.12 -> 0.0.14 --- pkgs/os-specific/darwin/skhd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix index 24eb644e96f..3331084d807 100644 --- a/pkgs/os-specific/darwin/skhd/default.nix +++ b/pkgs/os-specific/darwin/skhd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "skhd-${version}"; - version = "0.0.12"; + version = "0.0.14"; src = fetchFromGitHub { owner = "koekeishiya"; repo = "skhd"; rev = "v${version}"; - sha256 = "09ihfd7cfqnfv095skn6rbrmjji61skwgg36b6s055fycrlbyp0h"; + sha256 = "0kkmlka1hxsjdkx0ywkm48p9v1jhld26lfplls20n0hj97i5iwlz"; }; buildInputs = [ Carbon ]; From 8143383aabbc1d8049c3c3984aa998c9a64b3f47 Mon Sep 17 00:00:00 2001 From: danbst Date: Sun, 6 May 2018 01:42:32 +0300 Subject: [PATCH 137/695] zoom-us: update 2.0.106600.0904 -> 2.0.123200.0405, cleanup Apart from version update: - remove some packages from `LD_LIBRARY_PATH`. I haven't found any references for them. Most of them were copypasted from AUR expression - found an implicit reference to `pidof`, in my case this caused warnings about mismatched Glibc version. I've found implicit reference to `sh` too, with Glibc warning too, but I don't know how to fix this, and looks like it's only a warning --- .../instant-messengers/zoom-us/default.nix | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 03b4b980929..db32dd0c23e 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, system, makeWrapper, makeDesktopItem, - alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2, - libxslt, libGLU_combined, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat, libv4l }: + alsaLib, dbus, glib, fontconfig, freetype, libpulseaudio, + utillinux, zlib, xorg, udev, sqlite, expat, libv4l, procps }: let - version = "2.0.106600.0904"; + version = "2.0.123200.0405"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "1dcr0rqgjingjqbqv37hqjhhwy8axnjyirrnmjk44b5xnh239w9s"; + sha256 = "1ifwa2xf5mw1ll2j1f39qd7mpyxpc6xj3650dmlnxf525dsm573z"; }; }; @@ -17,25 +17,20 @@ in stdenv.mkDerivation { src = srcs.${system}; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; libPath = stdenv.lib.makeLibraryPath [ alsaLib - dbus + expat glib - gstreamer - fontconfig freetype libpulseaudio - libxml2 - libxslt - nspr - nss + zlib + dbus + fontconfig sqlite utillinux - zlib udev - expat xorg.libX11 xorg.libSM @@ -79,6 +74,7 @@ in stdenv.mkDerivation { makeWrapper $packagePath/zoom $out/bin/zoom-us \ --prefix LD_LIBRARY_PATH : "$packagePath:$libPath" \ --prefix LD_PRELOAD : "${libv4l}/lib/v4l1compat.so" \ + --prefix PATH : "${procps}/bin" \ --set QT_PLUGIN_PATH "$packagePath/platforms" \ --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \ --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" From b21da3704499367621cc776bf49675687bb4c911 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Tue, 24 Apr 2018 15:28:31 +0200 Subject: [PATCH 138/695] nodePackages_8_x.three: Init at 0.92.0 --- .../node-packages/node-packages-v6.nix | 3639 ++++++++--------- .../node-packages/node-packages-v8.json | 1 + .../node-packages/node-packages-v8.nix | 400 +- 3 files changed, 1958 insertions(+), 2082 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index e5d9ff18eb0..e50628e014f 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -94,22 +94,31 @@ let sha512 = "2fv2qaz90rp6ib2s45ix0p3a4bd6yl6k94k1kkhw7w4s2aa5mqc6chppkf6pfvsz1l6phh7y0xswyfyzjgny7qzascch8c7ws20a0r4"; }; }; - "@types/node-8.10.4" = { + "@types/node-10.0.4" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.4"; + version = "10.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.4.tgz"; - sha512 = "345l7fbkr415rdf3p0akk11k8shxibfl77crpj3wd3a8d4lbsdpylfzm8ihkg6wnj88gjpcwy4nw6vb2x58kwx15fbl09bz96dlrahn"; + url = "https://registry.npmjs.org/@types/node/-/node-10.0.4.tgz"; + sha512 = "2zwjjfa4s706r0w45siwgzax5c8g5j3z79dkckwzgrzqxglj070ijv0m9g1ipc1y4kr7l0r9qia9yfxc9syw64hib8vh216cxk1las6"; }; }; - "@types/node-9.6.2" = { + "@types/node-8.10.12" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "9.6.2"; + version = "8.10.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-9.6.2.tgz"; - sha512 = "30kq6rikl2ya5krnyglrbi52xrm0f3q0nyzj99haady8c2s03l3rcp42cxkkd4v3mrvsw3jan0kz7vb4j148qg8wklh2igvsmii2sai"; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.12.tgz"; + sha512 = "199k4d6vmwxd4bkmxmpszdvz6nxby7px5w2cw0yrhrp5clmxvsfc1xnwirjlpidfc4a76i6pzprmdkrpli8i454s909bx6z7wd584b9"; + }; + }; + "@types/node-9.6.12" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "9.6.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-9.6.12.tgz"; + sha512 = "2515a59dsfswy2l4i7hid0krh69mzz42byi55a12a0cz21masdmd3j0zc8aq7qyh2sm6lmhzbxy1n8vhb563ybjhiygavn9d24k77yr"; }; }; "@types/request-2.47.0" = { @@ -481,6 +490,15 @@ let sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1"; }; }; + "adm-zip-0.4.9" = { + name = "adm-zip"; + packageName = "adm-zip"; + version = "0.4.9"; + src = fetchurl { + url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.9.tgz"; + sha512 = "03k8g7lxi05n57v16vv32x32lkikh9qvv4pmkycrw52j3r031fkvns49z8wvfbj3rjj6vh712ahyfz5k3m5b9v832n9dz18f8kxljbs"; + }; + }; "after-0.8.1" = { name = "after"; packageName = "after"; @@ -616,13 +634,13 @@ let sha1 = "617997fc5f60576894c435f940d819e135b80762"; }; }; - "ajv-keywords-3.1.0" = { + "ajv-keywords-3.2.0" = { name = "ajv-keywords"; packageName = "ajv-keywords"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.1.0.tgz"; - sha1 = "ac2b27939c543e95d2c06e7f7f5c27be4aa543be"; + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz"; + sha1 = "e86b819c602cf8821ad637413698f1dec021847a"; }; }; "ajv-merge-patch-3.0.0" = { @@ -1030,13 +1048,13 @@ let sha1 = "2b12247b933001971addcbfe4e67d20fd395bbf4"; }; }; - "args-3.0.8" = { + "args-4.0.0" = { name = "args"; packageName = "args"; - version = "3.0.8"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/args/-/args-3.0.8.tgz"; - sha512 = "26h2nssgwzgc9y1mywgjcx2rbbkxlpx23zj9gh81bayjr8522zi78rwrhpkkqwh7dwqx6mv8gphcx8zyv3vm8hxw5s89kjlzm66k7y9"; + url = "https://registry.npmjs.org/args/-/args-4.0.0.tgz"; + sha512 = "2xd628jhziygi9jr16ckq557189nw5lracgzcpv8ddvymc3mjxvqzffgp68wmgknw6ps7nliwwyismriv6z4snvn0xmm7kwbrafbgp1"; }; }; "arr-diff-2.0.0" = { @@ -1579,13 +1597,13 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "atob-2.1.0" = { + "atob-2.1.1" = { name = "atob"; packageName = "atob"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/atob/-/atob-2.1.0.tgz"; - sha512 = "0dyf7054n94f1pwp9chcy6vawgwd2wqp8jqrnvxl489jyxxbg46n2vkb5vfs5jqnkmh6kbyv4lpysrn13hzzh5q021frc6vrcgqms2a"; + url = "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz"; + sha1 = "ae2d5a729477f289d60dd7f96a6314a22dd6c22a"; }; }; "atomic-batcher-1.0.2" = { @@ -1615,13 +1633,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.223.1" = { + "aws-sdk-2.233.1" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.223.1"; + version = "2.233.1"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.223.1.tgz"; - sha1 = "b264bf6407d7c74152f08b4a8fda8aad3a84baa4"; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.233.1.tgz"; + sha1 = "b4f541069a9f2781e9f73e1336ce81a9fc08bcf1"; }; }; "aws-sign-0.2.0" = { @@ -2038,13 +2056,13 @@ let sha1 = "63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"; }; }; - "babel-core-6.26.0" = { + "babel-core-6.26.3" = { name = "babel-core"; packageName = "babel-core"; - version = "6.26.0"; + version = "6.26.3"; src = fetchurl { - url = "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz"; - sha1 = "af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"; + url = "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz"; + sha512 = "0617drz6fkpdpkl4snbfz7ivd296j19182m7x4klhqac60qr77wn8bkgpz696sscxykcv1n8cdv09pz7v9xq6s1k552fyp6w0p8ag7a"; }; }; "babel-generator-6.26.1" = { @@ -2236,13 +2254,13 @@ let sha1 = "f616eda9d3e4b66b8ca7fca79f695722c5f8e26f"; }; }; - "bail-1.0.2" = { + "bail-1.0.3" = { name = "bail"; packageName = "bail"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/bail/-/bail-1.0.2.tgz"; - sha1 = "f7d6c1731630a9f9f0d4d35ed1f962e2074a1764"; + url = "https://registry.npmjs.org/bail/-/bail-1.0.3.tgz"; + sha512 = "1v31szd5dwn62xh8a9cy95yby0ibq9j9barzs03hxjr4vcjnwz1mgjdb9p4rqgymjm3f5zrxgrnqkjd9h9viykd56zfchsm66g04zym"; }; }; "balanced-match-1.0.0" = { @@ -2326,6 +2344,15 @@ let sha512 = "3kqp8hzql2ccdqf7vqizav1lrwp5gynn081718g9slxcs428sv02n037xb9hfgrqybbk4qacnk5mcv63z8fm3l4h6fi06xm8nqj3h1j"; }; }; + "base64-js-1.3.0" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz"; + sha512 = "2bvd1ja1kbighx0vm4ia3gqv15m70pldsx2igl37ayq11715w3g0vfmfq1yb8w80hlzblvszig3fr4sdhn8rr800lsaz8dg47zsziki"; + }; + }; "base64-url-1.2.1" = { name = "base64-url"; packageName = "base64-url"; @@ -2524,13 +2551,13 @@ let sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; - "big-integer-1.6.27" = { + "big-integer-1.6.28" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.27"; + version = "1.6.28"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.27.tgz"; - sha512 = "2v5f59yjsa3hzwhk333s84nfl1x24w52h9hqpwbav0p5v5d5prkna0flw25ywccrrjziq3lylbl874qqikzljkyz2g6jjdqhlqhld9p"; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.28.tgz"; + sha512 = "3b56jaa0yvrl9p90c0phnhyh02sv9hxssl8y0nghv91ra8akrcdpxm55c1gf5w1is9991wm2g0wqcr4hm5ri9lmzwd8gc9d72pzg51q"; }; }; "big.js-3.2.0" = { @@ -2677,13 +2704,13 @@ let sha512 = "10md5792s6q3xwdrmwh1a8ax9w128g607b5qsbxzw8x0gl9184g754hprchl6mq8lmf4f8qylk2h8vavsnbn9yy9gzjnyh2kwrzmxky"; }; }; - "bittorrent-dht-8.2.0" = { + "bittorrent-dht-8.3.0" = { name = "bittorrent-dht"; packageName = "bittorrent-dht"; - version = "8.2.0"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-8.2.0.tgz"; - sha512 = "291qfv5f3w3d7zcq9xyjplpnaaahy7mzj664w5g9w1zgiwv3dikl38r8wx0rdb3afsv5ih0ghrzc2r1k19c52axsagnpsc10hihlkii"; + url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-8.3.0.tgz"; + sha512 = "2p2fxhvwin4xnjdmbhrlwivx4a8pjzfn6mc5qxnxzl1q40xxp56wd6xrcxfq9viqjkvpc7g0j3dvgmvcywhgw41nvjyxi8pgm5v43kp"; }; }; "bittorrent-peerid-1.2.0" = { @@ -2695,13 +2722,13 @@ let sha1 = "9f675612f0e6afc6ef3450dfba51ff7238abf371"; }; }; - "bittorrent-protocol-2.4.0" = { + "bittorrent-protocol-2.4.1" = { name = "bittorrent-protocol"; packageName = "bittorrent-protocol"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-2.4.0.tgz"; - sha512 = "3xggi5fxwkzkkgy3z7v5b9w7fk2bjan077b4s9rvqfp7cmnw6l96p36qlkqgp38rd57lzdlkay42dkqhcb8r7gzszp5598nviy0p4mb"; + url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-2.4.1.tgz"; + sha512 = "0vx3k29q25mp4ind4745868n0hc7xcggwbj0hyqp0hfblfxpdwddv1gwdh0x0m9skja637bxvn2i1ssvqrc80qyjfy4asw63rpvg99m"; }; }; "bittorrent-tracker-7.7.0" = { @@ -2713,13 +2740,13 @@ let sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c"; }; }; - "bittorrent-tracker-9.7.0" = { + "bittorrent-tracker-9.9.1" = { name = "bittorrent-tracker"; packageName = "bittorrent-tracker"; - version = "9.7.0"; + version = "9.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.7.0.tgz"; - sha512 = "06jp495xv047v5n3wclbga8laqmgjis5wjwhc7ggq2qx4xszp395mg2v0147p7v0ybpw5bpvdfhr1zp12barvn2lgj9f0c9iji4jr5r"; + url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.9.1.tgz"; + sha512 = "06yb4m1bbllq52hhm7cp5j35bd9my3rhlsgaycpv6g9iymxq0qr8bx9fmxr673i9m6nxvkbrjym7ykp9f8w674inpp3csplqf2apl1x"; }; }; "bl-0.8.2" = { @@ -3037,15 +3064,6 @@ let sha1 = "0c1817c48063a88d96cc3d516c55e57fff5d9ecb"; }; }; - "boxen-0.3.1" = { - name = "boxen"; - packageName = "boxen"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz"; - sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b"; - }; - }; "boxen-1.3.0" = { name = "boxen"; packageName = "boxen"; @@ -3190,15 +3208,6 @@ let sha1 = "089a3463af58d0e48d8cd4070b3f74654d5abca9"; }; }; - "browserify-14.5.0" = { - name = "browserify"; - packageName = "browserify"; - version = "14.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-14.5.0.tgz"; - sha512 = "3p941rcrmn44115ylbnq53sdsnfm08rlvckdbkrnxvl00ibis5sxyhgrx33vm8sfyb5vgbk8x4b0fv3vwirvd7frwbdmzigsjqcx9w0"; - }; - }; "browserify-aes-1.2.0" = { name = "browserify-aes"; packageName = "browserify-aes"; @@ -3217,22 +3226,22 @@ let sha1 = "96247e853f068fd6e0d45cc73f0bb2cd9778ef02"; }; }; - "browserify-cipher-1.0.0" = { + "browserify-cipher-1.0.1" = { name = "browserify-cipher"; packageName = "browserify-cipher"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz"; - sha1 = "9988244874bf5ed4e28da95666dcd66ac8fc363a"; + url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz"; + sha512 = "3bz6v63l37ndb18236yjdkbxjcvy4x16a8j7vsqxqprvnkcnkq1hg1ffd1c9zk9a3j555ppnpisfyh0x4adlb8lmpwbfa8i837n9y5h"; }; }; - "browserify-des-1.0.0" = { + "browserify-des-1.0.1" = { name = "browserify-des"; packageName = "browserify-des"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz"; - sha1 = "daa277717470922ed2fe18594118a175439721dd"; + url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.1.tgz"; + sha512 = "35rl28vzg80fa81b0a7rdaj71zf0ymxxhlmdpisps4dlgvkazbxz47q9fnl1n9wnbq7ilk6vnbxa399zcwdjdz3i0lii1mpnyhh4bfg"; }; }; "browserify-incremental-3.1.1" = { @@ -3892,6 +3901,15 @@ let sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; }; }; + "camelcase-5.0.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz"; + sha512 = "2q57983k3n95gzbhqhc0cv6krvq7nd37h837xg6favqywdda14ha7k2xbdaryni3xzzm55pvi0adrl1fbgxypaxz1kvrifnm5kb1akx"; + }; + }; "camelcase-keys-2.1.0" = { name = "camelcase-keys"; packageName = "camelcase-keys"; @@ -3973,13 +3991,13 @@ let sha512 = "2wa0gi2wljxw00rvqz454sgdr8yy90z8lhprxjc1prwi695lnzrh6sk0qqhp63h9gmbldyvvzfvm8k1jk0sbv6icdawcss441jky3qa"; }; }; - "ccount-1.0.2" = { + "ccount-1.0.3" = { name = "ccount"; packageName = "ccount"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/ccount/-/ccount-1.0.2.tgz"; - sha1 = "53b6a2f815bb77b9c2871f7b9a72c3a25f1d8e89"; + url = "https://registry.npmjs.org/ccount/-/ccount-1.0.3.tgz"; + sha512 = "2dqnm6wybhq4zcdf3x97zjibb5zvvcbq3p837sp61rk6wvbk3nqq4lpivvxgvgg4cgl346aqzkpwry1sl7l1yw7ab7d6wqi34h6vpr6"; }; }; "center-align-0.1.3" = { @@ -4072,31 +4090,49 @@ let sha512 = "06jlrzx0nb92910rcfhx55n28jgvhc0qda49scnfyifnmc31dyfqsl5qqiwhsxkrhrc6c07x69q037f1pwg06kkfd1qdzaxz7dj7kk4"; }; }; - "character-entities-1.2.1" = { + "chalk-2.4.0" = { + name = "chalk"; + packageName = "chalk"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz"; + sha512 = "0bnfi1y6b0wl6wn93ykm3awxyjnsknai0hrnvvkxfvjrcsld722r3ljdac9zifvvg8vqd4pxlrhrc4r58yp0xxfxj2bpx18zv8z1gss"; + }; + }; + "chalk-2.4.1" = { + name = "chalk"; + packageName = "chalk"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz"; + sha512 = "1yl5ffjp5w65b9ydnw4vp13n563121hs64xbnajif51grhpqmslaqllj24zm1pfaw9ywvdx69n8ppa3riwlps25k5934zgnbf3pmcrr"; + }; + }; + "character-entities-1.2.2" = { name = "character-entities"; packageName = "character-entities"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.1.tgz"; - sha1 = "f76871be5ef66ddb7f8f8e3478ecc374c27d6dca"; + url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.2.tgz"; + sha512 = "30y1wgwpay9yfcz4l3wj9yslp751hch7vhing2f748qn8clk0im3f32xn25k57s6q94mkq0gnk6ga8icz3yzhm752vjq1p7mxghgjmh"; }; }; - "character-entities-html4-1.1.1" = { + "character-entities-html4-1.1.2" = { name = "character-entities-html4"; packageName = "character-entities-html4"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.1.tgz"; - sha1 = "359a2a4a0f7e29d3dc2ac99bdbe21ee39438ea50"; + url = "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.2.tgz"; + sha512 = "0ikbsydxv9ap7im4i2l4nv5gqgilwwbbpxf8xgyknz3cv2jgp4285f0kdl0qcv1xbh9946a9wkcyd4b7mg5nzg0s5dyxnys571xg2mh"; }; }; - "character-entities-legacy-1.1.1" = { + "character-entities-legacy-1.1.2" = { name = "character-entities-legacy"; packageName = "character-entities-legacy"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.1.tgz"; - sha1 = "f40779df1a101872bb510a3d295e1fccf147202f"; + url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz"; + sha512 = "2ag1akl7wv9ysm4qkkrx8r59mj08xgnavah9hn79ggzknkb5hikn15fdgbcql4yln4a5kbi0b8xykwhy80vrarsbyfqapgdnmapdl7l"; }; }; "character-parser-1.2.1" = { @@ -4117,13 +4153,13 @@ let sha1 = "c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"; }; }; - "character-reference-invalid-1.1.1" = { + "character-reference-invalid-1.1.2" = { name = "character-reference-invalid"; packageName = "character-reference-invalid"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.1.tgz"; - sha1 = "942835f750e4ec61a308e60c2ef8cc1011202efc"; + url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz"; + sha512 = "1wm395ypw8d7xpq3jffx9m3j24simj28sf9symc9pa94s8l04maqagcy79j62yngip7rvcg4c7zvvxx7hygw9r0k44jaayzwmqz33zc"; }; }; "chardet-0.4.2" = { @@ -4234,13 +4270,13 @@ let sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181"; }; }; - "chrome-trace-event-0.1.2" = { + "chrome-trace-event-0.1.3" = { name = "chrome-trace-event"; packageName = "chrome-trace-event"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-0.1.2.tgz"; - sha1 = "90f36885d5345a50621332f0717b595883d5d982"; + url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-0.1.3.tgz"; + sha512 = "3y9nwc7vk3r253x4yrz1ibinpd6xcfy75skh9i5s5gkh3c93sddvlp7dkr5fjs6aarr9n8cy0ck8zwfw10h4fqnw6p6ibgbj74xsfdj"; }; }; "chromecast-player-0.2.3" = { @@ -4333,13 +4369,13 @@ let sha512 = "3hadrrn41znfv3gbqjxf0ckzjmns7w7zgsqw73sdz8nclaff9b0cg1mqhz3zxw3ndnmqqvrdcfykkfpv2v1pv4jdyzcccbn3hsbg4ji"; }; }; - "circular-json-0.5.1" = { + "circular-json-0.5.3" = { name = "circular-json"; packageName = "circular-json"; - version = "0.5.1"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/circular-json/-/circular-json-0.5.1.tgz"; - sha512 = "1myzlq58v42dc2b1i17rcmvj7529spwcqgzc7j2q663a7xkk4nhzqk6hpw20lvp99iaq0k0zg5p0jzf19n7p0vrg45hk160ai31qf2j"; + url = "https://registry.npmjs.org/circular-json/-/circular-json-0.5.3.tgz"; + sha512 = "0gpz4w5khkmnx6wpsh9ccxkwc2cp9i4s9dgf2fi9dgq78ik42cld3sgil5lc3rkjvdp5fgv33c1b8pjvx3dw7kk3q3888ly54x4np32"; }; }; "clarinet-0.11.0" = { @@ -4540,15 +4576,6 @@ let sha512 = "0j60cwp5vpc7v13m0d5rgh6h5jf6yxnywfb1wgbdn7lalklrr5ncvfkkqk6xj7b046bl2jabfqifk3yl6agd93ixfmywif2xfc4hqyr"; }; }; - "clite-0.3.0" = { - name = "clite"; - packageName = "clite"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clite/-/clite-0.3.0.tgz"; - sha1 = "e7fcbc8cc5bd3e7f8b84ed48db12e9474cc73441"; - }; - }; "cliui-2.1.0" = { name = "cliui"; packageName = "cliui"; @@ -4567,13 +4594,13 @@ let sha1 = "120601537a916d29940f934da3b48d585a39213d"; }; }; - "cliui-4.0.0" = { + "cliui-4.1.0" = { name = "cliui"; packageName = "cliui"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-4.0.0.tgz"; - sha512 = "0mh539939k4z2nhj5h1m8kdr3bfy2f1kmdkss02cdbyabmpdkc6m22llyykymriahf54gpx6qg9v3vrs51gqgrrfhpsgbdndgjdd3cx"; + url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz"; + sha512 = "26knyxdavl3y7kq82vfa094ym3n05vy2h2j5srb9fhhy8l43l0kwlasah5i78jks77zqgc373hbf96xcxv6am042gpbw35x452vwlg0"; }; }; "clivas-0.1.4" = { @@ -4846,13 +4873,13 @@ let sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be"; }; }; - "collapse-white-space-1.0.3" = { + "collapse-white-space-1.0.4" = { name = "collapse-white-space"; packageName = "collapse-white-space"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.3.tgz"; - sha1 = "4b906f670e5a963a87b76b0e1689643341b6023c"; + url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.4.tgz"; + sha512 = "0iifkywgm8zqn27w0maj5c1yarf294qm5qqcbsajafv8r5f9w02ss33qfngyp59mamv8h8yqx93xpsqnabzn0wnpssrx6qr0ns3bx31"; }; }; "collection-visit-1.0.0" = { @@ -4945,13 +4972,13 @@ let sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; }; }; - "colors-1.2.1" = { + "colors-1.2.4" = { name = "colors"; packageName = "colors"; - version = "1.2.1"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.2.1.tgz"; - sha512 = "0m8vssxhc3xlx639gz68425ll6mqh0rib6yr7s2v2vg1hwnqka02zijxmg16iyvzmd5sbsczjs2mqs0n428pc1cgkgj439fsa9b1kxk"; + url = "https://registry.npmjs.org/colors/-/colors-1.2.4.tgz"; + sha512 = "1ch53w9md043zff52vsmh89qirws3x7n4zw88xxw0h98fjg71dsll3gh1b598a48xq98d15qpjb07g9ddjsfknrba0byp56fl3a53z9"; }; }; "colour-0.7.1" = { @@ -5630,13 +5657,13 @@ let sha1 = "bd727a7faed77e71ff3985ac93351a912733ad0f"; }; }; - "conventional-changelog-1.1.23" = { + "conventional-changelog-1.1.24" = { name = "conventional-changelog"; packageName = "conventional-changelog"; - version = "1.1.23"; + version = "1.1.24"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.23.tgz"; - sha512 = "2775l94nr8rbnvhihkrwyszncc2g7z1kvbsqpbvni86h8072xvxngbba6yxzzw4dfs57ghklkh9l0ibjy17rl7ldrh6q9lpyd9xf8y8"; + url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.24.tgz"; + sha512 = "3ap10i691k1bd6kslyrxrlrcqzdgdv1mibnraknwvls1n1kcbw77w9d6sljjdan766bhx0md07gz6ihjwsk3s3vhiw7cqvqrd914ryr"; }; }; "conventional-changelog-angular-1.6.6" = { @@ -5657,13 +5684,13 @@ let sha512 = "3m1yhgjwbz0x993dfdw3g2n4svz4ym4k1snhg57iraw1418glgdwpz52j01300v8d1p6ldjjbrv7x3gqa08xcqq6inpkbhv2fmdk4zj"; }; }; - "conventional-changelog-cli-1.3.21" = { + "conventional-changelog-cli-1.3.22" = { name = "conventional-changelog-cli"; packageName = "conventional-changelog-cli"; - version = "1.3.21"; + version = "1.3.22"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.21.tgz"; - sha512 = "1n93839r75vwj9fl4i3x3l06zc84kin92cp8nrlxksga9lqdpxc8b8i72wvi9jvwk0z6i29wisxdpiw6y7rrmdl13ch9f3k7jb43m9b"; + url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.22.tgz"; + sha512 = "1kb6qrs4myjknqg4cpl530gxzbainsvhrzg6hm6xhdjhprby9flw28y92cbimq9cqpc6qq2bldzbnlxf1yzq5yhamwld3pijqhdsy56"; }; }; "conventional-changelog-codemirror-0.3.8" = { @@ -5675,22 +5702,22 @@ let sha512 = "24l71rg9rqfl9aa8fi3c1dc2iqxmdsh6ba8b9rwrrj7dg1gzfc5afw03rns5b1h6zld15942aqsjvwklwp6myzw3q1aakaps0m5jwfw"; }; }; - "conventional-changelog-core-2.0.10" = { + "conventional-changelog-core-2.0.11" = { name = "conventional-changelog-core"; packageName = "conventional-changelog-core"; - version = "2.0.10"; + version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-2.0.10.tgz"; - sha512 = "19pvarpv78qfmlnsz11c8anrwfg1v04qmwrsrcnai8p3xmbzdyvp1znz9j23l0i6l26yabkd4b631wybnkgxr4qgwzgb9hvf8fhvz8l"; + url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-2.0.11.tgz"; + sha512 = "13c6y0mi0wqrx2rklaiqn2dxy9bsn53fb0w1r7072y8fp2cbnwdvijn8b42qidrmzcbbpcgn4pcx05h9ghl3vak6izlcy3a37lw9x0y"; }; }; - "conventional-changelog-ember-0.3.11" = { + "conventional-changelog-ember-0.3.12" = { name = "conventional-changelog-ember"; packageName = "conventional-changelog-ember"; - version = "0.3.11"; + version = "0.3.12"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.3.11.tgz"; - sha512 = "1pm9wncjsfizvxzf84fp9ywdfm0znj0af0h2012ylazva8iis7zp4vph9ymrnd87kfmdv5gk2s0nsq8gqm6vxh87vbdykg640zczf0j"; + url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.3.12.tgz"; + sha512 = "2hi3q231r8izwb8863rcmm3craji5glcr8icm0ijxa8jdlanshghdb5pnqrqay09kjkaiff9qxpnggb4b1p8gazg2mb6vmkpc1p6qls"; }; }; "conventional-changelog-eslint-1.0.9" = { @@ -6143,13 +6170,13 @@ let sha1 = "e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4"; }; }; - "create-ecdh-4.0.0" = { + "create-ecdh-4.0.1" = { name = "create-ecdh"; packageName = "create-ecdh"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz"; - sha1 = "888c723596cdf7612f6498233eebd7a35301737d"; + url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.1.tgz"; + sha512 = "2whpg1253714sq60ayvsap6n3qdwa9l0zhdlxv2gz8frppds69w1q079pmf55qlygnc7ad499511xsbswy0a39asqcp9a0p1w5c56w9"; }; }; "create-error-class-3.0.2" = { @@ -6161,31 +6188,31 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; - "create-hash-1.1.3" = { + "create-hash-1.2.0" = { name = "create-hash"; packageName = "create-hash"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz"; - sha1 = "606042ac8b9262750f483caddab0f5819172d8fd"; + url = "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz"; + sha512 = "055xaldi3hy1bjxhvznh3470j1kq2xk827mxal79bgqik3lblax6s4inxqby27ymgcghl2hn7wnx9fnacmyq3q93hk6y327cc41nkfg"; }; }; - "create-hmac-1.1.6" = { + "create-hmac-1.1.7" = { name = "create-hmac"; packageName = "create-hmac"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz"; - sha1 = "acb9e221a4e17bdb076e90657c42b93e3726cf06"; + url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz"; + sha512 = "0p2jhk94k3as67lhrr1jyljkr0y65snxjzqnix0nifnfcanhilccrzkc47gwlg5wy0m8l1gv12lj78ivgmw5m1ww4f8iylr52bbv49h"; }; }; - "create-torrent-3.30.0" = { + "create-torrent-3.31.0" = { name = "create-torrent"; packageName = "create-torrent"; - version = "3.30.0"; + version = "3.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-torrent/-/create-torrent-3.30.0.tgz"; - sha512 = "15hphpabh12fwvjbaihwjr1sqzj6c4lzcms4jbyy0s2jk1rirrg3cb9743g2a8jw2ihz15yfw0dxqwnc6n5nixiazdg7hwaj8d5nfmi"; + url = "https://registry.npmjs.org/create-torrent/-/create-torrent-3.31.0.tgz"; + sha512 = "1na322prpyqfv81davvqya3rs9pv99rsh611kvqfaps96izmysyw7ppfm3n8qj94y4z6ib8mjs591f6vhdx501v0nqv27pn09qbsfnh"; }; }; "cron-1.3.0" = { @@ -6638,13 +6665,13 @@ let sha512 = "0yyadc98mdpvqdszc1v26zcgd6zqxink2wrhxw9ax60wk0sxqw6mm3m2jbqvibj54p1gjsmgsf1yhv20xsm77kkb7qwj79jlx8kvfad"; }; }; - "dat-doctor-1.3.1" = { + "dat-doctor-1.4.0" = { name = "dat-doctor"; packageName = "dat-doctor"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-1.3.1.tgz"; - sha512 = "19cfxdik2pv94dbfsz4nm6a0v6vfx5s1isaagmsjrb44czbcl55sjj9nf1302hqc8ckijsdmlsrna02hb0mjzzhsy0m6c8r3cv0wabk"; + url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-1.4.0.tgz"; + sha512 = "3ysgc2z0pjbka9617lqykw8c0bqbacgixd6j8nlcdi7sz7j94w2sl17mq3xaq7b6kr5wdngi64y584hj8baqgxw2aaavgvk96kff3fl"; }; }; "dat-encoding-4.0.2" = { @@ -6737,13 +6764,13 @@ let sha512 = "13cbr004milnmjisg774rqqw82vyjg1p1d6gvm3xji516rq7zzc1x7da397njig5s2rg2qmw1dixdn4cpkmvc8irq4y1dzb3h46sz2c"; }; }; - "dat-swarm-defaults-1.0.0" = { + "dat-swarm-defaults-1.0.1" = { name = "dat-swarm-defaults"; packageName = "dat-swarm-defaults"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/dat-swarm-defaults/-/dat-swarm-defaults-1.0.0.tgz"; - sha1 = "ba7d58c309cf60c3924afad869b75192b61fe354"; + url = "https://registry.npmjs.org/dat-swarm-defaults/-/dat-swarm-defaults-1.0.1.tgz"; + sha512 = "0kgq4nz4axx3kpfam6lxid88x5gx39gbk3kzcgmbhxld9vwl3469q58hkd2zjripg3955483j450yvszk1pwpn895adz62mn0xsarag"; }; }; "data-uri-to-buffer-1.2.0" = { @@ -6809,15 +6836,6 @@ let sha512 = "3fxpn11cnyqcz25h9krfrpnra9zi1zri0l4f42a89acybqgj6dyr6p0lskcjffahiwxxmmc0zvgalnlk2wa74b764cm7pd5si78884g"; }; }; - "datland-swarm-defaults-1.0.2" = { - name = "datland-swarm-defaults"; - packageName = "datland-swarm-defaults"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/datland-swarm-defaults/-/datland-swarm-defaults-1.0.2.tgz"; - sha1 = "277b895a39f1aa7f96a495a02fb3662a5ed9f2e0"; - }; - }; "debounce-1.1.0" = { name = "debounce"; packageName = "debounce"; @@ -6944,6 +6962,15 @@ let sha1 = "d171a87933252807eb3cb61dc1c1445d078df2d9"; }; }; + "decimal.js-10.0.0" = { + name = "decimal.js"; + packageName = "decimal.js"; + version = "10.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.0.0.tgz"; + sha512 = "1zfwp3adsdq838zcpkpm59x7kdqny1lcdk04r7fw28zy3va4jpjkrkpyyz7ifnzazpks9ky9mjb2xdrkx07nzrh909nzasps0aplcm1"; + }; + }; "decode-uri-component-0.2.0" = { name = "decode-uri-component"; packageName = "decode-uri-component"; @@ -7079,6 +7106,15 @@ let sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f"; }; }; + "deep-extend-0.5.1" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz"; + sha512 = "3bzqm7nqgh7m8xjhl0q8jc0ccm9riymsfmy0144x6n2qy9v1gin2ww8s9wjlayk0xyzq9cz9pyar02yiv30mhqsj7rmw35ywrsc3jrp"; + }; + }; "deep-is-0.1.3" = { name = "deep-is"; packageName = "deep-is"; @@ -7457,13 +7493,13 @@ let sha1 = "31bb815881c975634c7f3907a5e789341e1560bc"; }; }; - "diffie-hellman-5.0.2" = { + "diffie-hellman-5.0.3" = { name = "diffie-hellman"; packageName = "diffie-hellman"; - version = "5.0.2"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz"; - sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; + url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz"; + sha512 = "37186rz3862gn294acnwnm59jwm62x1rz9ca0y5anvmj0a7abs4rhw974qp1j684qpd4rxb8c2kagv21hapxfddr2q72zvyv7ya19lj"; }; }; "difflib-0.2.4" = { @@ -7538,6 +7574,15 @@ let sha1 = "f805211dcac74f6bb3a4d5d5541ad783b1b67d22"; }; }; + "dnd-page-scroll-0.0.4" = { + name = "dnd-page-scroll"; + packageName = "dnd-page-scroll"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/dnd-page-scroll/-/dnd-page-scroll-0.0.4.tgz"; + sha512 = "29fmw2g96bpgniybrcvpic1s5bwffgrckiasf479q7lrgca1b8726rr6kwymwsg7d702dgnvii6fjl48pvsfs4jp2svk5mjj15x9y3f"; + }; + }; "dns-discovery-5.6.1" = { name = "dns-discovery"; packageName = "dns-discovery"; @@ -7925,13 +7970,13 @@ let sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; }; }; - "duplexify-3.5.4" = { + "duplexify-3.6.0" = { name = "duplexify"; packageName = "duplexify"; - version = "3.5.4"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz"; - sha512 = "2qcky919ps17a9ndimxvcqc73wlrcjmq8ppddbnl45xs9yqp1dmzzfaspfn63xzp14rl3dlk4g6y2ia71s6r9nggd0mb891hcni4di7"; + url = "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz"; + sha512 = "12hhn0igd7y8nmni0qd63wpc9w1fl5rgdh4d1mq65n6r00l7byh7fs5v6m6pd8xzwmnxhrxqrc1y5yh6hswbh2i9ic9la21if5w7vbw"; }; }; "each-async-1.1.1" = { @@ -8087,13 +8132,13 @@ let sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df"; }; }; - "email-validator-1.1.1" = { + "email-validator-2.0.3" = { name = "email-validator"; packageName = "email-validator"; - version = "1.1.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/email-validator/-/email-validator-1.1.1.tgz"; - sha512 = "3ydmy134p48c4zswbvjllak53h545dmzsz77bwpfxjf7aw510yyg4w58pazc2yz9agm93rphfgglrlj9cfkfdygcg1rbv0vj4jhjixy"; + url = "https://registry.npmjs.org/email-validator/-/email-validator-2.0.3.tgz"; + sha1 = "33e50d66f526b97cd72c17205aefaec79c8a2a1e"; }; }; "emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" = { @@ -8934,13 +8979,13 @@ let sha1 = "1c86991d816ad1e504750e73874224ecf3bec508"; }; }; - "eventemitter3-3.0.1" = { + "eventemitter3-3.1.0" = { name = "eventemitter3"; packageName = "eventemitter3"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.0.1.tgz"; - sha512 = "0c5685grn5npm90n22lw5hjz93ga3ffc3j6jk5rs4sz0w7ymwj942v3w94ikkgxpvxj7mfawsdrczwad0b7srbkynbwac7xvsxqzq20"; + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz"; + sha512 = "1q3lcjzcm6cva1avw6qkzynnk6rlcp0pblgxxliwry2z52rz9fy82wh630clfv12i64ygywca69hfbj3ki71hy1in94nqxzka32zwla"; }; }; "events-1.1.1" = { @@ -9690,13 +9735,13 @@ let sha1 = "bd162262c0b6e94bfbcdcf19a3bbb3764f785695"; }; }; - "filesize-3.6.0" = { + "filesize-3.6.1" = { name = "filesize"; packageName = "filesize"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/filesize/-/filesize-3.6.0.tgz"; - sha512 = "1vldkz70kikg8b3ac8l686hm1aplkwqmllm9lg32cvy50hqzcqhari8pl2c41zsvl3bpzzfv7v8db0j91c0qd9vx8wz4w2nhsv9d4w3"; + url = "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz"; + sha512 = "1rfby2136b86m318244b42lrcx9hc28vz71cv9i84cd5z7dd3cwvj1gx8mykbjh937yyi1h4q5kk3vhjcldc8pkd2f7iapszgbd3a7c"; }; }; "filestream-4.1.3" = { @@ -9726,15 +9771,6 @@ let sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; }; }; - "filled-array-1.1.0" = { - name = "filled-array"; - packageName = "filled-array"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz"; - sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84"; - }; - }; "filter-obj-1.1.0" = { name = "filter-obj"; packageName = "filter-obj"; @@ -10365,6 +10401,15 @@ let sha512 = "13w7dc43h1mv5a43zps5rwsgvlgpd1pj8rwlhmp1fsbyddysv2zy6d8xyaf9hllnqx3ykw62yv1j5z1y79kvyi6hjgymn9cj2cwj61a"; }; }; + "fs-constants-1.0.0" = { + name = "fs-constants"; + packageName = "fs-constants"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz"; + sha512 = "2iv1j05gzx1sgpckd597sdd2f5x54rgcib3rpwgf31050wqxn5h27map6cn9wk4vix393s4ws2xv6kgps5zfby2iirb2zw8hk1818yb"; + }; + }; "fs-ext-0.6.0" = { name = "fs-ext"; packageName = "fs-ext"; @@ -10500,13 +10545,13 @@ let sha512 = "25k3z64r4fhzjs1crh981lkkvkrhn2xv67k7y00zpnpsl571y5apg0r0kanddirms8kxf2xgf4yx9n2hzs9ml3v3p9qcnqhkh9khzja"; }; }; - "fsevents-1.1.3" = { + "fsevents-1.2.3" = { name = "fsevents"; packageName = "fsevents"; - version = "1.1.3"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz"; - sha512 = "3jw51f4iayxvp9wfxczk1xgcvhsydhlgah64jmpl0mqiii2h8i5pp0lrqac5xn7296gxqrvy4lgm4k4hkifk8gipgqxd68x764gp2jq"; + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.3.tgz"; + sha512 = "3nsv4z5qk2hhcrp6bng9bzpj4nsk0b41i363phlqfp69dq1p2x6a1g3y86z2j7aj4mfj88y1i1agkb1y0pg5c388223h394jqxppvjz"; }; }; "fstream-0.1.31" = { @@ -10734,6 +10779,15 @@ let sha1 = "122e161591e21ff4c52530305693f20e6393a398"; }; }; + "get-stdin-6.0.0" = { + name = "get-stdin"; + packageName = "get-stdin"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz"; + sha512 = "3p9jcnfk7nqnw43xammn5v5z63nxrxgz675sn70q8sma9ick6wq2plbw8b9r5il5f8f9krdamp316rdxvwcm2j4jagvymrjmhfjv7lf"; + }; + }; "get-stream-2.3.1" = { name = "get-stream"; packageName = "get-stream"; @@ -11104,13 +11158,22 @@ let sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; }; }; - "globals-11.4.0" = { + "global-tunnel-ng-2.1.1" = { + name = "global-tunnel-ng"; + packageName = "global-tunnel-ng"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.1.1.tgz"; + sha1 = "dab824432260b6dcb70d173b78288e2fa6e0b880"; + }; + }; + "globals-11.5.0" = { name = "globals"; packageName = "globals"; - version = "11.4.0"; + version = "11.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-11.4.0.tgz"; - sha512 = "0fgjya5jfxjd8gzgpnpig973bbplfq2i5fkfpi5lxyjsi3988wq3by19ka2ql2j4a80l9bk5g5brq4vvd2hr61ak79pzwm5z24ycb0g"; + url = "https://registry.npmjs.org/globals/-/globals-11.5.0.tgz"; + sha512 = "0lyc1vv873r8cgcxlnj32p6nhdbdsjash1kv2cb1chvawmbr0m83kl565iwhvjd3dyz4ba3d3mr80wa21sqj8hv77knsxiw8bx9z345"; }; }; "globals-9.18.0" = { @@ -11176,15 +11239,6 @@ let sha1 = "e5d0ed4af55fc3eef4d56007769d98192bcb2eca"; }; }; - "got-5.7.1" = { - name = "got"; - packageName = "got"; - version = "5.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz"; - sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35"; - }; - }; "got-6.7.1" = { name = "got"; packageName = "got"; @@ -11203,13 +11257,13 @@ let sha512 = "0phvycaq4yl6jjpyc9vwmgghfy7a6nnpynscpgpbx74zjaa5dbpl1ag0jf7jvimfk0vf6xfjqgh67xdlvi0ycgvp1kasajapjiqr5b3"; }; }; - "got-8.3.0" = { + "got-8.3.1" = { name = "got"; packageName = "got"; - version = "8.3.0"; + version = "8.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-8.3.0.tgz"; - sha512 = "2yzcsaq1ajn6bxgq2c4cmzbvysgdd88zypwa96yw57x2rb9gkbww5djfr8m8b1j0bal94khxaz98qjqjf9777ilh3c0l6w25pyp44wh"; + url = "https://registry.npmjs.org/got/-/got-8.3.1.tgz"; + sha512 = "3by57aak00z7wr6h4sax941f2q8mmvcvy815wxm3lzzdkm8l6i6hxbapxxqzsl0mayv96mmlcqnzkx3axzzwk9yx4wr16yqp7wxf8mn"; }; }; "graceful-fs-1.2.3" = { @@ -11626,15 +11680,6 @@ let sha1 = "78c5926893c80215c2b568ae1fd3fcab7a2696b0"; }; }; - "hash-base-2.0.2" = { - name = "hash-base"; - packageName = "hash-base"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz"; - sha1 = "66ea1d856db4e8a5470cadf6fce23ae5244ef2e1"; - }; - }; "hash-base-3.0.4" = { name = "hash-base"; packageName = "hash-base"; @@ -12004,13 +12049,13 @@ let sha1 = "29691b6fc58f4f7e81a3605dca82682b068e4430"; }; }; - "http-parser-js-0.4.11" = { + "http-parser-js-0.4.12" = { name = "http-parser-js"; packageName = "http-parser-js"; - version = "0.4.11"; + version = "0.4.12"; src = fetchurl { - url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.11.tgz"; - sha512 = "1y4az74zgv7jy1cav126lbrbvfqv30p7v3ijmj91ychbg0337k71cwy2n5dvmdfvwhgv3vxxzw2ymxlbj6wh1wf6aycb313c0xpj920"; + url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.12.tgz"; + sha1 = "b9cfbf4a2cf26f0fc34b10ca1489a27771e3474f"; }; }; "http-proxy-1.0.2" = { @@ -12031,6 +12076,15 @@ let sha1 = "06dff292952bf64dbe8471fa9df73066d4f37742"; }; }; + "http-proxy-1.17.0" = { + name = "http-proxy"; + packageName = "http-proxy"; + version = "1.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz"; + sha512 = "3z80svhb9hi5fawc8za5qn75lybr53646gfsqm2hkqss4pr186pp7k6f5jnjgw7vrkgjy4yzvb34729q6kvrikn4xgq9gfdg7xsgajd"; + }; + }; "http-proxy-agent-1.0.0" = { name = "http-proxy-agent"; packageName = "http-proxy-agent"; @@ -12040,6 +12094,15 @@ let sha1 = "cc1ce38e453bf984a0f7702d2dd59c73d081284a"; }; }; + "http-proxy-agent-2.1.0" = { + name = "http-proxy-agent"; + packageName = "http-proxy-agent"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz"; + sha512 = "21cixh55jg0m41bhn1xh9pydf31jq4ip5j525hprkimg376jjxms69raxfbsryi0mzhmgw84g1nb3paqznb1l2ajy0zhnkvnl2dn0db"; + }; + }; "http-proxy-middleware-0.17.4" = { name = "http-proxy-middleware"; packageName = "http-proxy-middleware"; @@ -12175,13 +12238,13 @@ let sha512 = "3bml62y8rmpga8wbcxfqm6izvc9xxlblx0vc08r778qa42jgw6fjif4i7f9bj2y98bz4xyimg5vfgch92j6i2l7zcwiq5za8l34cziw"; }; }; - "hypercore-6.13.0" = { + "hypercore-6.14.0" = { name = "hypercore"; packageName = "hypercore"; - version = "6.13.0"; + version = "6.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.13.0.tgz"; - sha512 = "056r7rmx6zkfivza10a0fs5p2wlgxrb82gb1sz8hmjgczvc9gx652ybhbckmr0a0bjknc1yzd23zw6v3r2svasymvdfgcp9k98qf1hw"; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.14.0.tgz"; + sha512 = "3liw77yhvn3nlrczf9s30vvn4bxrn3glh65a2psy1va9pvcnjwx6wfh52v5l9qbd7zyp4q4nb7qrq0n3am7jwmz3dkb5fzvdnlwikkh"; }; }; "hypercore-protocol-6.6.4" = { @@ -12337,13 +12400,13 @@ let sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"; }; }; - "ignore-3.3.7" = { + "ignore-3.3.8" = { name = "ignore"; packageName = "ignore"; - version = "3.3.7"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz"; - sha512 = "0f6xhxww989yic6hwdm8mbylcyakfkrrn22a39wdcc9k842xxyyhzfxkmi79s9gjk3rp3h07n265lf4n51z8yafpdm78d617dxbfqb0"; + url = "https://registry.npmjs.org/ignore/-/ignore-3.3.8.tgz"; + sha512 = "1pcaabfvizn9sa1m16vdnp2rn54fhkmaw4ayj2vb1amgsjn9w7yw64ac4km7avly142z4gzsgyv8g3im9d1qirlpvg0r18h8k2pwj55"; }; }; "ignore-by-default-1.0.1" = { @@ -12598,15 +12661,6 @@ let sha1 = "dbd740cf6ca3b731296a63ce6f6d961851f336df"; }; }; - "inquirer-1.0.3" = { - name = "inquirer"; - packageName = "inquirer"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-1.0.3.tgz"; - sha1 = "ebe3a0948571bcc46ccccbe2f9bcec251e984bd0"; - }; - }; "inquirer-1.2.3" = { name = "inquirer"; packageName = "inquirer"; @@ -12832,22 +12886,22 @@ let sha512 = "1qllik6fjwfq17ic0fxwqyll8mrhmcm36xfsq45xc57mq9ah4i4nn4f8fvgb0gx4kpl3jlpkzndp0xlmmf2mh0xmggw6mhw74fng64v"; }; }; - "is-alphabetical-1.0.1" = { + "is-alphabetical-1.0.2" = { name = "is-alphabetical"; packageName = "is-alphabetical"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.1.tgz"; - sha1 = "c77079cc91d4efac775be1034bf2d243f95e6f08"; + url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.2.tgz"; + sha512 = "33gw3lnhmg5snnpbjafj2dnv8f55g5wqmssczl998knajppvmp85gwz712jbk0wcj14np1zmghm3j8lsh0xb6r20pf33k0y2vh4sk2p"; }; }; - "is-alphanumerical-1.0.1" = { + "is-alphanumerical-1.0.2" = { name = "is-alphanumerical"; packageName = "is-alphanumerical"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.1.tgz"; - sha1 = "dfb4aa4d1085e33bdb61c2dee9c80e9c6c19f53b"; + url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz"; + sha512 = "2r2l14mwrzcvxayr6ib04k4apkpgcs7m41pnw51999y0nld0a8fjhwhvlw2arkda8hf9anc9ld3bxlxgn9psif9ha488x0797zx89x7"; }; }; "is-arguments-1.0.2" = { @@ -12958,13 +13012,13 @@ let sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; }; }; - "is-decimal-1.0.1" = { + "is-decimal-1.0.2" = { name = "is-decimal"; packageName = "is-decimal"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.1.tgz"; - sha1 = "f5fb6a94996ad9e8e3761fbfbd091f1fca8c4e82"; + url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.2.tgz"; + sha512 = "1g028jya2ymjyzj2gwna1zpajbhhxh2xh2vsi8dp3zzn9a04sgs9vvbcb66gb439mzb95vfpyydhb2h09r7yzhkfbhijwl2cgpfa72d"; }; }; "is-descriptor-0.1.6" = { @@ -13129,13 +13183,13 @@ let sha1 = "9521c76845cc2610a85203ddf080a958c2ffabc0"; }; }; - "is-hexadecimal-1.0.1" = { + "is-hexadecimal-1.0.2" = { name = "is-hexadecimal"; packageName = "is-hexadecimal"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.1.tgz"; - sha1 = "6e084bbc92061fbb0971ec58b6ce6d404e24da69"; + url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz"; + sha512 = "3y2isd2s41r430x4v5hbln61sibalz4af6wp5alq3svvvsmnlg0bhyjjf8nzmcgvrc49hw8w3r32bisxc90r8ia6z65v98sgcdpzsvf"; }; }; "is-installed-globally-0.1.0" = { @@ -13795,6 +13849,24 @@ let sha1 = "4d50c318079122000fe5f16af1ff8e1917b77e06"; }; }; + "jquery-3.3.1" = { + name = "jquery"; + packageName = "jquery"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz"; + sha512 = "0d5v4s4626l13llvp6hq5wlghysf7lmfxpp0x0ymvcrvikz2xmyrag81wxndb9fy48mx61gcdlbmdwln78s43givdwpmrk9dir5vfai"; + }; + }; + "jquery-ui-1.12.1" = { + name = "jquery-ui"; + packageName = "jquery-ui"; + version = "1.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz"; + sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; + }; + }; "js-select-0.6.0" = { name = "js-select"; packageName = "js-select"; @@ -14362,6 +14434,15 @@ let sha512 = "0a7k7qcmcik3dwcjd6f0ngq3i3pdz1cc7xz9ck30gd65nd0ylmgx0kf6b686qd1kk32v3rcila2hdj12cnrjwrjqzs96vjqw5jhj04s"; }; }; + "k-rpc-5.0.0" = { + name = "k-rpc"; + packageName = "k-rpc"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/k-rpc/-/k-rpc-5.0.0.tgz"; + sha512 = "3frk0pf1y988y12m54vkfa2anc0mg6p4yiq5ca8pkvwb56g8n9n58j7f4gh3rnjgw8xb5ib8gc54nmgk8mlsbjm6azf8c2z0ynzc8dw"; + }; + }; "k-rpc-socket-1.8.0" = { name = "k-rpc-socket"; packageName = "k-rpc-socket"; @@ -14543,13 +14624,13 @@ let sha1 = "59c128e0dc5ce410201151194eeb9cbf858650f6"; }; }; - "knockout-3.5.0-beta" = { + "knockout-3.5.0-rc" = { name = "knockout"; packageName = "knockout"; - version = "3.5.0-beta"; + version = "3.5.0-rc"; src = fetchurl { - url = "https://registry.npmjs.org/knockout/-/knockout-3.5.0-beta.tgz"; - sha512 = "2qh1bqb9lj7l92pwcrwmpcanbyn65rmni3swyv6hrphn7xbaw8mkir3w67sf4ardk1iqvz9waalq2wf2rgpvvblhva2n2hssq6as6yr"; + url = "https://registry.npmjs.org/knockout/-/knockout-3.5.0-rc.tgz"; + sha512 = "2nys4zw0rwz0601pzq748gvs8x78n570f2j00ggwakyhbzpdgm90ivscnaym52hf226isgqfdjikxr0nig0hbb28d1xf3s1kpks24vr"; }; }; "kuduscript-1.0.16" = { @@ -14588,15 +14669,6 @@ let sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb"; }; }; - "latest-version-2.0.0" = { - name = "latest-version"; - packageName = "latest-version"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz"; - sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b"; - }; - }; "latest-version-3.1.0" = { name = "latest-version"; packageName = "latest-version"; @@ -14759,6 +14831,15 @@ let sha1 = "9144b6eebca5f1d0680169f1a6770dcea60b75c3"; }; }; + "leven-2.1.0" = { + name = "leven"; + packageName = "leven"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz"; + sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580"; + }; + }; "levn-0.3.0" = { name = "levn"; packageName = "levn"; @@ -14957,13 +15038,22 @@ let sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; }; }; - "lockfile-1.0.3" = { + "lockfile-1.0.4" = { name = "lockfile"; packageName = "lockfile"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.3.tgz"; - sha1 = "2638fc39a0331e9cac1a04b71799931c9c50df79"; + url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.4.tgz"; + sha512 = "1c3gz9fvn9lz8b2whpi7cifz94b28c4gglngjhlcsfgmgbv0093pdkb4865hv6f2dyypr32f7am9ajrhrbjzv3iw9hw2zni8k0d7xkj"; + }; + }; + "locks-0.2.2" = { + name = "locks"; + packageName = "locks"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/locks/-/locks-0.2.2.tgz"; + sha1 = "259933d1327cbaf0fd3662f8fffde36809d84ced"; }; }; "lodash-1.0.2" = { @@ -15029,6 +15119,15 @@ let sha1 = "bbccce6373a400fbfd0a8c67ca42f6d1ef416432"; }; }; + "lodash-4.17.10" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.10"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz"; + sha512 = "1ba5b80jjzwrh9fbdk5ywv8sic0dynij21wgrfxsfjzwvwd7x1n6azdhdc0vjdxqmcpm0mhshd1k7n2ascxpz00z3p8a3k97mwg1s2i"; + }; + }; "lodash-4.17.5" = { name = "lodash"; packageName = "lodash"; @@ -15254,15 +15353,6 @@ let sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c"; }; }; - "lodash.defaultsdeep-4.6.0" = { - name = "lodash.defaultsdeep"; - packageName = "lodash.defaultsdeep"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.0.tgz"; - sha1 = "bec1024f85b1bd96cbea405b23c14ad6443a6f81"; - }; - }; "lodash.escape-3.2.0" = { name = "lodash.escape"; packageName = "lodash.escape"; @@ -15506,6 +15596,15 @@ let sha1 = "936a4e309ef330a7645ed4145986c85ae5b20805"; }; }; + "lodash.set-4.3.2" = { + name = "lodash.set"; + packageName = "lodash.set"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz"; + sha1 = "d8757b1da807dde24816b0d6a84bea1a76230b23"; + }; + }; "lodash.some-4.6.0" = { name = "lodash.some"; packageName = "lodash.some"; @@ -15704,6 +15803,15 @@ let sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"; }; }; + "lossless-json-1.0.2" = { + name = "lossless-json"; + packageName = "lossless-json"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lossless-json/-/lossless-json-1.0.2.tgz"; + sha512 = "2aa3jc0qwf051bd2qwy43qzyfhh8cnqd419qg8cscni65ancjabyrradx3m06r6k84b8r4fc58khm4n6bhk8bpmf282qln79kzpfvfp"; + }; + }; "loud-rejection-1.6.0" = { name = "loud-rejection"; packageName = "loud-rejection"; @@ -15776,6 +15884,15 @@ let sha1 = "ec2bba603f4c5bb3e7a1bf62ce1c1dbc1d474e08"; }; }; + "lru-cache-2.2.4" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "2.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz"; + sha1 = "6c658619becf14031d0d0b594b16042ce4dc063d"; + }; + }; "lru-cache-2.5.2" = { name = "lru-cache"; packageName = "lru-cache"; @@ -16118,13 +16235,13 @@ let sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d"; }; }; - "mdn-data-1.1.0" = { + "mdn-data-1.1.2" = { name = "mdn-data"; packageName = "mdn-data"; - version = "1.1.0"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.0.tgz"; - sha512 = "3av1cblh8aix05jyfib9mhm57qx8fnkxgxs2g493mdm4815pisrn8rzgf9yxjiww6psa619aa8l62xigrbwfcag741bgls227f82blc"; + url = "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.2.tgz"; + sha512 = "3x1bk7zqpzy2m8cc3qv575crg71dgj4mb0vl7nq4g3y8bjl2hw0qv2c6ss1iss6gpdrslaif4yp7ggrf0ldiplmk2ld4p9yhmzsljhx"; }; }; "mdns-js-0.5.0" = { @@ -16172,13 +16289,13 @@ let sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; }; }; - "mediasource-2.1.3" = { + "mediasource-2.2.0" = { name = "mediasource"; packageName = "mediasource"; - version = "2.1.3"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mediasource/-/mediasource-2.1.3.tgz"; - sha1 = "27a9c1aac51bfb6eba96af2d13a84d0b2a8eac68"; + url = "https://registry.npmjs.org/mediasource/-/mediasource-2.2.0.tgz"; + sha512 = "2y4j45xwbrb5cd7b66ndvk5hqy18slbkcvji5krlcg07vpszsrvz732y2ih9li0wn9qh56rx5fz6qb3kdnx877b0snjxhgyj74jlicg"; }; }; "mediawiki-title-0.6.5" = { @@ -16271,13 +16388,13 @@ let sha1 = "72cb668b425228290abbfa856892587308a801fb"; }; }; - "meow-4.0.0" = { + "meow-4.0.1" = { name = "meow"; packageName = "meow"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-4.0.0.tgz"; - sha512 = "2rvzq4615rj5x6za96as8f2xx6zs8m8lzraql20fiv5kr03dm9cy3zqq93ccryl42j9mp2n846pmdpkkh79i15962pnxrppbmxf9vri"; + url = "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz"; + sha512 = "3y4j4aqwlphwsfw770c3x06m26vd7lx810g9q39qdg1gsl1hilx48qfig40d9h3i3nj4pc66w1qg6xsmd9g7fyg77darwsr7qf83i65"; }; }; "merge-1.2.0" = { @@ -16397,13 +16514,13 @@ let sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; }; }; - "micro-9.1.0" = { + "micro-9.1.4" = { name = "micro"; packageName = "micro"; - version = "9.1.0"; + version = "9.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/micro/-/micro-9.1.0.tgz"; - sha512 = "232sjz2wv3xlfz5wf20jihj8avic507avydzwcf4d8zgy07ha9x3pqc6xkw0y8bjk8f8w30fmih38gsdvz7ph92c4kj4cxxfinph2nh"; + url = "https://registry.npmjs.org/micro/-/micro-9.1.4.tgz"; + sha512 = "0zajgsz4m4z0cbibs2vz4brzp6ihq647id9zq67lrcy6nkc9fzjc8fx4g1bsf6nnbjha22fi5sz7lmfq46qixcz807v1p5pjd13kr6r"; }; }; "micro-compress-1.0.0" = { @@ -16505,13 +16622,13 @@ let sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7"; }; }; - "mime-2.2.2" = { + "mime-2.3.1" = { name = "mime"; packageName = "mime"; - version = "2.2.2"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-2.2.2.tgz"; - sha512 = "2ahs0dpq95sf8rrpc024h6jqrvknjnj5v046k755kz6br3pr371y9j9df0srgfszdqviaw4fc6vgngbyik866272hmckw1qif1w7cq3"; + url = "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz"; + sha512 = "1xa7b4k7mp4apq8mvj7912m38gzbcbbddaa92lmbb9cbs08z0b2a4x3kds1sr86br6x6r19kygscf20ky6g6wyx313x1jb8qnajai9q"; }; }; "mime-db-1.12.0" = { @@ -16595,13 +16712,13 @@ let sha1 = "d2d0f1887ca363d1acf0ea86d5c4df293b3fb675"; }; }; - "minimalistic-assert-1.0.0" = { + "minimalistic-assert-1.0.1" = { name = "minimalistic-assert"; packageName = "minimalistic-assert"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"; - sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3"; + url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; + sha512 = "3y39pa1xxg7j49vya7xca4p1mg89d0df56hj4yjhpyhmza3g5qvpgp11xs11wkd48zzy7ym970jfbn0ppimmczpijns249j7q05rljj"; }; }; "minimalistic-crypto-utils-1.0.1" = { @@ -16730,13 +16847,13 @@ let sha512 = "2agpbdf9h90nhafdam3jwrw8gcz3jw1i40cx6bhwaw8qaf2s863gi2b77l73dc3hmf5dx491hv5km1rqzabgsbpkjxrvdcwy6pr8gp1"; }; }; - "mirror-folder-2.1.1" = { + "mirror-folder-2.2.0" = { name = "mirror-folder"; packageName = "mirror-folder"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-2.1.1.tgz"; - sha1 = "1ad3b777b39e403cc27bf52086c23e41ef4c9604"; + url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-2.2.0.tgz"; + sha512 = "3js8pwgmj4lzzi6nzl0wp021rhsnz31jpkkzdf35xzwm1l65m6ygjf4hz77vvy3dk2h5jb2d32nvzy26n3d5hswg3nb8s0rylvv510r"; }; }; "mississippi-2.0.0" = { @@ -16865,6 +16982,15 @@ let sha512 = "2zf8ycbhqnh9hc6zd3h5s1ii6bjg41z721ffg760j8i045vjjzpzzg542c02ylkic68p0skw1ss97lwphblcw8rip3ik29x9pglhq19"; }; }; + "mold-source-map-0.4.0" = { + name = "mold-source-map"; + packageName = "mold-source-map"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mold-source-map/-/mold-source-map-0.4.0.tgz"; + sha1 = "cf67e0b31c47ab9badb5c9c25651862127bb8317"; + }; + }; "moment-2.1.0" = { name = "moment"; packageName = "moment"; @@ -16901,13 +17027,13 @@ let sha512 = "2zc9qgzsrnp9g4jm4qsb1g1h7w5zmnkz8690br52l83yr9kwhch0mh7r2vdhc706jkrqczia9wbrgkscz0x6k8cwmb3r5jifbpp47v2"; }; }; - "moment-2.22.0" = { + "moment-2.22.1" = { name = "moment"; packageName = "moment"; - version = "2.22.0"; + version = "2.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.22.0.tgz"; - sha512 = "1v5hxqrwy3yd5023aflf2r1nlkayx1sh9cjjyk3415lba199gkimbq72ba26j3rf2azc0zwhqcz86jh8garynvlh1zm6vr33w59fsyn"; + url = "https://registry.npmjs.org/moment/-/moment-2.22.1.tgz"; + sha512 = "1hzs2jf69lrw76a4diywsl4451qpm3iavk8f324hgb6x3njb64bd77375kwv4ydllzc5cy1v1mabgciln7yhfd9avn7nvcy6i2n84mj"; }; }; "moment-2.6.0" = { @@ -16928,13 +17054,13 @@ let sha1 = "359a19ec634cda3c706c8709adda54c0329aaec4"; }; }; - "moment-timezone-0.5.14" = { + "moment-timezone-0.5.16" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.14"; + version = "0.5.16"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.14.tgz"; - sha1 = "4eb38ff9538b80108ba467a458f3ed4268ccfcb1"; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.16.tgz"; + sha512 = "0vnhrg02rgwwa4zzdm7g9j3sd17j8vn30cjiflg86lac0k2fvfaixl7fwd1yx990yr6abq6zhk5gmaqx2vgz22a6akxld35dbvnbpg1"; }; }; "mongodb-1.2.14" = { @@ -16991,13 +17117,13 @@ let sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; }; }; - "mp4-box-encoding-1.1.3" = { + "mp4-box-encoding-1.1.4" = { name = "mp4-box-encoding"; packageName = "mp4-box-encoding"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/mp4-box-encoding/-/mp4-box-encoding-1.1.3.tgz"; - sha512 = "0ma1r4wxwlnxb4xjmq6gga6m4ilsarrcvgj4yrjhngbh5l6gng87i4nakbkm4iqxbnchw75ybivhlfhx8bn4qm525qxirs7gh77i8c9"; + url = "https://registry.npmjs.org/mp4-box-encoding/-/mp4-box-encoding-1.1.4.tgz"; + sha512 = "2i0lx4lji8zy0xwa6bzhqp1wdsigp38jlm3k7h7k6k013j8bp5z0nwyvwkr79ax2f1cw2gp7i2vwx99w5swmwy95l8a6188rvq0v857"; }; }; "mp4-stream-2.0.3" = { @@ -17441,15 +17567,6 @@ let sha512 = "349rr7x0djrlkav4gbhkg355852ingn965r0kkch8rr4cwp7qki9676zpq8cq988yszzd2hld6szsbbnd1v6rghzf11abn1nyzlj1vc"; }; }; - "nan-2.3.5" = { - name = "nan"; - packageName = "nan"; - version = "2.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz"; - sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08"; - }; - }; "nan-2.5.1" = { name = "nan"; packageName = "nan"; @@ -17607,6 +17724,15 @@ let sha1 = "17b09581988979fddafe0201e931ba933c96cbb4"; }; }; + "nconf-0.10.0" = { + name = "nconf"; + packageName = "nconf"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nconf/-/nconf-0.10.0.tgz"; + sha512 = "3sx74c63qv1f3qy4gg717mvjyxc0zf66w8n5d156zs30vq256h4akw8d723ggf1qprb0q5yda14zn67rx1jlcwlb2cb0gz918qrga3w"; + }; + }; "nconf-0.6.9" = { name = "nconf"; packageName = "nconf"; @@ -17625,15 +17751,6 @@ let sha1 = "ee4b561dd979a3c58db122e38f196d49d61aeb5b"; }; }; - "nconf-0.7.2" = { - name = "nconf"; - packageName = "nconf"; - version = "0.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/nconf/-/nconf-0.7.2.tgz"; - sha1 = "a05fdf22dc01c378dd5c4df27f2dc90b9aa8bb00"; - }; - }; "ncp-0.4.2" = { name = "ncp"; packageName = "ncp"; @@ -17697,13 +17814,13 @@ let sha1 = "02a71b008eaf7d55ae89fb9fd7685b7b88d7bc29"; }; }; - "needle-2.2.0" = { + "needle-2.2.1" = { name = "needle"; packageName = "needle"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.2.0.tgz"; - sha512 = "3ry4wyih9w3nc3d319bmfd9l4jj8fn00lqfs1d00sfy6azvy66yhm6jv411cn1c1zqc01hvj59dlavm82mzxw5mlar8ck9ylz5s0mkq"; + url = "https://registry.npmjs.org/needle/-/needle-2.2.1.tgz"; + sha512 = "3wnlvqmkxw69bl3clghqpsl1kxqm7hkq4v4ab0rm6dx7xqyg3bn8q38i6hmxm47ccfn6bxcvl53c4madxdgblnm06ika99x4g06rxmp"; }; }; "negotiator-0.3.0" = { @@ -17743,13 +17860,13 @@ let sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394"; }; }; - "neo-async-2.5.0" = { + "neo-async-2.5.1" = { name = "neo-async"; packageName = "neo-async"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/neo-async/-/neo-async-2.5.0.tgz"; - sha512 = "3mgwi8gsgy9lazh0qbpaz8f2l8gvvpn3jp0ghc6xnn0xq0ajdmzp7lfklby1n4s67fy1w5g5gzizyqzds8l3fqsj76cy0mq06rr56cw"; + url = "https://registry.npmjs.org/neo-async/-/neo-async-2.5.1.tgz"; + sha512 = "3256b78wjq1hf7ycvh6ll1wr0kxpqb01lgj1fdirkrx5lpzz12c4ygifw09c2bag30njm8sfjkwkg3gxpy32kl1w3n9x4cizdzgg8nw"; }; }; "nested-error-stacks-1.0.2" = { @@ -17860,13 +17977,13 @@ let sha512 = "34msnfifpdmxl414b8rch1p1six59jd9251b7wkb37n78fa84xfa5f5f5cxxp477wb846nfrsg6b1py3rahz4xdpk17lzzy9kvdjr5f"; }; }; - "node-abi-2.3.0" = { + "node-abi-2.4.1" = { name = "node-abi"; packageName = "node-abi"; - version = "2.3.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.3.0.tgz"; - sha512 = "2ijjyzh7bcyyhjaa5m0kdfg6hvxkq6czwxfg6y5d2nl6v7m9qab2ixwgvzbaaivn0r0ig48j4443905167vnpzgvlq5icfj9nyvl2fg"; + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.4.1.tgz"; + sha512 = "3mhfjq1a2ahvkjijw39q6wg6hdiqhz9nf02wjmn61sc0fc7fn0631wxafvny4gjnljin7yv808lhcswg0v1lrcg7k3bqhs7mb16qjd5"; }; }; "node-alias-1.0.4" = { @@ -17995,13 +18112,13 @@ let sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis"; }; }; - "node-red-node-email-0.1.27" = { + "node-red-node-email-0.1.29" = { name = "node-red-node-email"; packageName = "node-red-node-email"; - version = "0.1.27"; + version = "0.1.29"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.27.tgz"; - sha512 = "0r799aswbfv6f9rjdrh6bddfzwj1mpinlani8cwc7zbmipcf4dsyffmf3xghb3hpb15k26jvpb46f2ia8cff1vyn4i9h3jn5dnzflnc"; + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.29.tgz"; + sha512 = "0xrn1958dc81s10r3ynp4v7697py7bdhawvk71cgca1wi6ysj9w8r1dbfc29znpzz0kpmqy07v0y98nxasy6ing7hsc0kyd8rmrvnps"; }; }; "node-red-node-feedparser-0.1.12" = { @@ -18049,15 +18166,6 @@ let sha512 = "3a22r0jr4112h0vr1smzrsaygc607v13arhjbjwzmy1jvmcrdlq9ydnw96ailkrlnwl3k0l65hjcgnrgkdwyc2qhbfnq2bgk0xz7pkd"; }; }; - "node-status-codes-1.0.0" = { - name = "node-status-codes"; - packageName = "node-status-codes"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz"; - sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"; - }; - }; "node-swt-0.1.1" = { name = "node-swt"; packageName = "node-swt"; @@ -18094,13 +18202,13 @@ let sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907"; }; }; - "node-version-1.1.0" = { + "node-version-1.1.3" = { name = "node-version"; packageName = "node-version"; - version = "1.1.0"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-version/-/node-version-1.1.0.tgz"; - sha512 = "0kc13ygbwm9zdjqv43ccb3mvfhmkwack6ziqcadw58b0f8ssv8h2gdr0br8xaqxpxp0h6pz9vm28yns03nl1vbqbgdankcsb127cmdp"; + url = "https://registry.npmjs.org/node-version/-/node-version-1.1.3.tgz"; + sha512 = "0zdxwcfi3gca8d1jdg3m1gh6b3xxsc7sxpdrnvabc5j5fdgmhcdqaxv3q28rl95ibb7qjcvw7c7k5wzhrvhayb9vn6lr7snabkh8k5c"; }; }; "node-wsfederation-0.1.1" = { @@ -18355,13 +18463,13 @@ let sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e"; }; }; - "npm-6.0.0-next.0" = { + "npm-6.0.0" = { name = "npm"; packageName = "npm"; - version = "6.0.0-next.0"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.0.0-next.0.tgz"; - sha512 = "06yn34ji94fcadvnj3mafxlv8hnin0mgrdpdjplk33nkjc8niq5kr1kfwikqxj36kyzwdcz8a27599sakryvgvb14mqjabc525ik35x"; + url = "https://registry.npmjs.org/npm/-/npm-6.0.0.tgz"; + sha512 = "1s1pq7rdh5xxd4phq7bf1fikbfwc9iiglgayiy0bf14skvivj96j7f5mzyh3631gzhm7vmpak0k523axik5n4hza8gd8c90s203plqj"; }; }; "npm-bundled-1.0.3" = { @@ -18391,13 +18499,13 @@ let sha1 = "99b85aec29fcb388d2dd351f0013bf5268787e67"; }; }; - "npm-package-arg-6.0.0" = { + "npm-package-arg-6.1.0" = { name = "npm-package-arg"; packageName = "npm-package-arg"; - version = "6.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.0.0.tgz"; - sha512 = "15a1x3fjip5waxap8dbjkm88j0c2bcnay8pw14p74h1499wznynw2if91shrqlrbzwia09x4xiphp6wkxga5z8vf9k08bjarn1vn047"; + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz"; + sha512 = "14dqycy588sf0k73livvvpmp1dqmbhacc97pq3ksxk1wrm9j82r7hhlrxigj0nb58gz4cbvbh3isj1x3sjiqxs60dhv439xd4zy31nd"; }; }; "npm-packlist-1.1.10" = { @@ -18941,15 +19049,6 @@ let sha1 = "7abc22e644dff63b0a96d5ab7f2790c0f01abc95"; }; }; - "opn-5.2.0" = { - name = "opn"; - packageName = "opn"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/opn/-/opn-5.2.0.tgz"; - sha512 = "12iyalgghs3dj0pfb7rxa013x946169yfsjfd15fsfrx5kv80z2qh082x7v7d91hh7bf9vxcm4wqmyyj9ckk3gnvc7mw77j6fkwdpr5"; - }; - }; "opn-5.3.0" = { name = "opn"; packageName = "opn"; @@ -19292,6 +19391,15 @@ let sha512 = "30jd44ckpmfj9prfhzc8bjvn5b5adxk93g9saif813id8mrvl3g1asrhz9l0bc2rp0i779wnhg1rjw80h2y7zk8v02ghq4bdh4hn4a0"; }; }; + "pac-proxy-agent-2.0.2" = { + name = "pac-proxy-agent"; + packageName = "pac-proxy-agent"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-2.0.2.tgz"; + sha512 = "3222l2ayjn9gj3q7br4vxqz1a5bq5h53fcqvrns3zdlqfinarbi0kgkrlf7vyc7arr7ljks5988y4a6lyd663br23wvg391a4vl0cvh"; + }; + }; "pac-resolver-2.0.0" = { name = "pac-resolver"; packageName = "pac-resolver"; @@ -19301,6 +19409,15 @@ let sha1 = "99b88d2f193fbdeefc1c9a529c1f3260ab5277cd"; }; }; + "pac-resolver-3.0.0" = { + name = "pac-resolver"; + packageName = "pac-resolver"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pac-resolver/-/pac-resolver-3.0.0.tgz"; + sha512 = "1w6mzypllad7wy658kd56fqih6i8x0f841a2pnnn97dhkk810nw3r9f73kpxqa6llkrgy6p1ax4xy1rgbzvrf4zczblvf13pgqkgixm"; + }; + }; "package-json-1.2.0" = { name = "package-json"; packageName = "package-json"; @@ -19310,15 +19427,6 @@ let sha1 = "c8ecac094227cdf76a316874ed05e27cc939a0e0"; }; }; - "package-json-2.4.0" = { - name = "package-json"; - packageName = "package-json"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz"; - sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb"; - }; - }; "package-json-4.0.1" = { name = "package-json"; packageName = "package-json"; @@ -19400,22 +19508,22 @@ let sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751"; }; }; - "parse-asn1-5.1.0" = { + "parse-asn1-5.1.1" = { name = "parse-asn1"; packageName = "parse-asn1"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz"; - sha1 = "37c4f9b7ed3ab65c74817b5f2480937fbf97c712"; + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz"; + sha512 = "1vq07bq1c0b5v82mknyg2y4lrdy1qmqkzw432f406rx9v2hni3040z270kpsvi2vf4ikq6x0k9g8p16n7aafrwsrpwvx0wpa9z7pz18"; }; }; - "parse-entities-1.1.1" = { + "parse-entities-1.1.2" = { name = "parse-entities"; packageName = "parse-entities"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.1.tgz"; - sha1 = "8112d88471319f27abae4d64964b122fe4e1b890"; + url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.2.tgz"; + sha512 = "192kwdas18b36rdffjp98qvq4ssnmnndryvcz2lzz6g8dnn5pfglabpjcj4p9bngkyp5z0fwvpb0vj4i9zdskp8gzbig6zd1scnbpz4"; }; }; "parse-filepath-1.0.2" = { @@ -19499,13 +19607,22 @@ let sha1 = "a814bd8505e8b58e88eb8ff3e2daff5d19a711b7"; }; }; - "parse-torrent-5.8.3" = { + "parse-torrent-5.9.1" = { name = "parse-torrent"; packageName = "parse-torrent"; - version = "5.8.3"; + version = "5.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.3.tgz"; - sha1 = "f95ef23301239609de406794ad9f958a1bca1b6c"; + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.9.1.tgz"; + sha512 = "31lm2ifw06p00gc0qvxinqvy8afhq0lrg3fpf5rrhb6dqx3avd3ykps8sjv2nj91wf06k62yvn9cvf1f243yzl9xpzy9255556x8bnb"; + }; + }; + "parse-torrent-6.0.0" = { + name = "parse-torrent"; + packageName = "parse-torrent"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-6.0.0.tgz"; + sha512 = "1yr12djspi83lybgycwsaz5wbikbsazwhk2w4xf3niri1lx0p3965br1xbsjw1m0xrzc71q6mw5xz44w0hd3ic5wmb2v62abl7kld16"; }; }; "parse-torrent-file-2.1.4" = { @@ -19517,15 +19634,6 @@ let sha1 = "32d4b6afde631420e5f415919a222b774b575707"; }; }; - "parse-torrent-file-4.1.0" = { - name = "parse-torrent-file"; - packageName = "parse-torrent-file"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.1.0.tgz"; - sha512 = "2cxnv563f946k2ng808an4gcj7yi23drqv8agns3h69drrbv0rq47wdi0xjs0lsvi1i36i7l1wzaci4c4gzzfy8ghfmv4k06hpb5ph5"; - }; - }; "parse5-3.0.3" = { name = "parse5"; packageName = "parse5"; @@ -19940,13 +20048,13 @@ let sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; }; }; - "pbkdf2-3.0.14" = { + "pbkdf2-3.0.16" = { name = "pbkdf2"; packageName = "pbkdf2"; - version = "3.0.14"; + version = "3.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz"; - sha512 = "30bb7vx0m1k1m3d1i1khgvmgddx3ahqgprs421ssrh5plpx50k5bazsj67gdi7qiknircqy59yxbclq95s2rnmk8ysgkqdpsddijfw2"; + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz"; + sha512 = "1q07jjlhbbn9fd1aqyrqqxlv184k8ppbafavwvb19lvgbzvp8fnrx7qd9lkbfzb6g4592czp178wizmgvhrhandxngiljv1gczrg06b"; }; }; "peer-wire-protocol-0.7.1" = { @@ -20157,13 +20265,13 @@ let sha1 = "a32b907f28d17f61b74d45d46fd89dea3c4e88b5"; }; }; - "please-upgrade-node-3.0.1" = { + "please-upgrade-node-3.0.2" = { name = "please-upgrade-node"; packageName = "please-upgrade-node"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.0.1.tgz"; - sha1 = "0a681f2c18915e5433a5ca2cd94e0b8206a782db"; + url = "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.0.2.tgz"; + sha512 = "2x54acxamqkr98gwnwf5h8bajcrcsv8b4156laym47ibf2093kbnki8v4dlk7zs8q5dclqnhqdr6p183phna67v0wdwb4mywm4mzjbf"; }; }; "plist-1.2.0" = { @@ -20319,13 +20427,13 @@ let sha512 = "174sg3cs8v8bqg8rnk673qp365n46kls3f3a41pp0jx48qivkg06rck0j2bfyzm5hr1i6kjbcn82h1rkjgfi5jbd0amrd877m3wfpbz"; }; }; - "postcss-6.0.21" = { + "postcss-6.0.22" = { name = "postcss"; packageName = "postcss"; - version = "6.0.21"; + version = "6.0.22"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-6.0.21.tgz"; - sha512 = "1vvp2mzw4gq6zm875fi7hgyypy0a44mbdpv0i4aqxsq8xajdxfyaz4ap4idh29v74ag4z26wla48k315yyg3d0h83zxkn1kniywmxnb"; + url = "https://registry.npmjs.org/postcss/-/postcss-6.0.22.tgz"; + sha512 = "0fdfvn2pq9hvw40s9l174v5rv4d5x3i9xmd8p3mln6bhzrny3v1h0y1324ghq30jnbrvyfam0725r3hsmj28lhhmc32q08lpaa3v1sf"; }; }; "prebuild-install-2.1.2" = { @@ -20337,13 +20445,13 @@ let sha1 = "d9ae0ca85330e03962d93292f95a8b44c2ebf505"; }; }; - "prebuild-install-2.5.1" = { + "prebuild-install-2.5.3" = { name = "prebuild-install"; packageName = "prebuild-install"; - version = "2.5.1"; + version = "2.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.5.1.tgz"; - sha512 = "013s09xwdppxw3n9h0vz22br6q1dc5rkh8pk9nk3xl0pqsv495qj1y8k5srgmgm7692q1hlyj08nrfbr9nr232bsrkcvhbkm8pzsdfw"; + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.5.3.tgz"; + sha512 = "3z8bc2sx9ibs343jllm11azqkcc7vxpf0skfm68dqwz9l59z381vbqip00sgpzg9di2zagjm3wbx65s6g2kg5kj8b1vp0vnqglkgcpy"; }; }; "precond-0.2.3" = { @@ -20715,6 +20823,15 @@ let sha1 = "57eb5347aa805d74ec681cb25649dba39c933499"; }; }; + "proxy-agent-3.0.0" = { + name = "proxy-agent"; + packageName = "proxy-agent"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.0.0.tgz"; + sha512 = "1krp2s6sjv452zj0xhmknrm0769jx2v21bfas1aw2kvg2zhdxcq32w7i6kg87fd9ajyynss694bylaw8khkg8clsgxifz9wg6zgmac3"; + }; + }; "proxy-from-env-1.0.0" = { name = "proxy-from-env"; packageName = "proxy-from-env"; @@ -20787,13 +20904,13 @@ let sha512 = "3jqj1qpjdy5lizvm5mir14vqzzqgaim2yl0iwa164ps6mlp20liyaid1mhr62k23dg0zbkk11zcnzk56d0xvzy9ddbdfmjcnjy3k4mb"; }; }; - "public-encrypt-4.0.0" = { + "public-encrypt-4.0.2" = { name = "public-encrypt"; packageName = "public-encrypt"; - version = "4.0.0"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz"; - sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6"; + url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz"; + sha512 = "38qgcvnxnp4lva9c0x6xhq05hb811n8q5s8dxchm5mg04rv64693a1w2hrhy8lcgbvs36kv003ar1xsh312c866hzvwb0qwr897jhp2"; }; }; "pug-2.0.3" = { @@ -20994,13 +21111,13 @@ let sha512 = "31n24fqakqmhzk2ch644gziskmysmrgiwclsdsr0rwk9spgikqpwickbnayap0rynfjlq72s7iny2p35n3qszypr97ws5njkpx741ig"; }; }; - "pumpify-1.4.0" = { + "pumpify-1.5.0" = { name = "pumpify"; packageName = "pumpify"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/pumpify/-/pumpify-1.4.0.tgz"; - sha512 = "1h37biy199n445y10vpyiswwcxv8zigfqp0b1xwgbyjq51f2dhjn1pcggjc4j5ccbd64l1ivfi0bqinx4m5clcawvwggy7jv93qsjfs"; + url = "https://registry.npmjs.org/pumpify/-/pumpify-1.5.0.tgz"; + sha512 = "0kf28xyrgm26kblaainzcxi4dqyxv0q1a03b55a9sma3b37sf9nkk2ysk7df2r4864ic4yr4j47plap1l0lck1raxnwraz8a29b8s2i"; }; }; "punycode-1.3.2" = { @@ -21219,6 +21336,15 @@ let sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; }; }; + "qs-6.5.2" = { + name = "qs"; + packageName = "qs"; + version = "6.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; + sha512 = "0c46ws0x9g3mmkgfmvd78bzvnmv2b8ryg4ah6jvyyqgjv9v994z7xdyvsc4vg9sf98gg7phvy3q1ahgaj5fy3dwzf2rki6bixgl15ip"; + }; + }; "qtdatastream-0.7.1" = { name = "qtdatastream"; packageName = "qtdatastream"; @@ -21309,13 +21435,13 @@ let sha1 = "72f3d865b4b55a259879473e2fb2de3569c69ee2"; }; }; - "random-access-storage-1.1.1" = { + "random-access-storage-1.2.0" = { name = "random-access-storage"; packageName = "random-access-storage"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.1.1.tgz"; - sha512 = "1dswb4yr7m8350bx8z0z19iqgk2a43qbfc1qf8n3w483mqqg0f5gsykd5cg14yy8jik0n9ghy7j2f5kp1anzjna46ih9ncxpm0vq0k1"; + url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.2.0.tgz"; + sha512 = "3jz9jky55s8w0pd5q2v58fxdgca5ymbhlif0zn6jv55jr7bvp1xvn60bz4b2k6m399zzxzdk196385wl3gw6xasxzi3mq8xkp9al118"; }; }; "random-bytes-1.0.0" = { @@ -21453,13 +21579,13 @@ let sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89"; }; }; - "raw-socket-1.5.2" = { + "raw-socket-1.6.0" = { name = "raw-socket"; packageName = "raw-socket"; - version = "1.5.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.2.tgz"; - sha512 = "0afwhc6rx359xqdsjiyxdlj46kb8mq4lkwy9fhmgszkp8cai9pk8927vxvg4gpg522clwx3dv1xsbnx745pip7crbjdb7kn2i8p2iqy"; + url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.6.0.tgz"; + sha512 = "2268lfw8q4mz0v988by3y0hbad848sx7kmmqm3rk7nbj7xc3sy045adcdbnh3c8vrhk57ljk61wshphgr69y8pw3987f1if369ny7pr"; }; }; "rc-0.4.0" = { @@ -21471,13 +21597,13 @@ let sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3"; }; }; - "rc-1.2.6" = { + "rc-1.2.7" = { name = "rc"; packageName = "rc"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.6.tgz"; - sha1 = "eb18989c6d4f4f162c399f79ddd29f3835568092"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz"; + sha512 = "30b4pqzhk8f4ppzyk5diwxac7xpf4hd3rysyin012l59da9v5iaai4wd6yzlz3rjspfvvy191q6qcsw47mwlw9y07n35kzq23rw7lid"; }; }; "rc-config-loader-2.0.1" = { @@ -21705,13 +21831,13 @@ let sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; }; }; - "record-cache-1.0.1" = { + "record-cache-1.0.2" = { name = "record-cache"; packageName = "record-cache"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/record-cache/-/record-cache-1.0.1.tgz"; - sha512 = "3a25qmwmlljwlcc1zpn80lrq3hmwwaykiac95q2gcm1im4wchk9mdhbgak2lidqijaf6mil2rp5sbm0zfzvvh39nz1lmlz72sll39iy"; + url = "https://registry.npmjs.org/record-cache/-/record-cache-1.0.2.tgz"; + sha512 = "2iykkjgwmmcma3306cjzsq34dg6rxfvwr4r11fyq56dfsybp9qwnvhc4fbi3l854zfj71fbw887bgab78ykr6b3m9gdw2lpf5sa53c0"; }; }; "recursive-readdir-2.2.2" = { @@ -21957,13 +22083,13 @@ let sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; }; }; - "render-media-2.12.0" = { + "render-media-3.0.0" = { name = "render-media"; packageName = "render-media"; - version = "2.12.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/render-media/-/render-media-2.12.0.tgz"; - sha512 = "1y1njral1kn6s6g797ji5pl475zcmvcmrgdnv1vliq8q33vw3b4i4i5fsx9yj2ap7jdpb461507wpijixf56rc5q4r97542zvzxq0by"; + url = "https://registry.npmjs.org/render-media/-/render-media-3.0.0.tgz"; + sha512 = "27zqxwa89zq3m0h5qykra6yx9jbc5cljfpx80nrm3y3rhl7ngm17fyb42xhw2sa584x2ld6ll1lnyrhvs3cihfm1ivd9g1hlvjvjaai"; }; }; "render-readme-1.3.1" = { @@ -22200,13 +22326,13 @@ let sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; }; }; - "resolve-1.7.0" = { + "resolve-1.7.1" = { name = "resolve"; packageName = "resolve"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.7.0.tgz"; - sha512 = "2f21aw16zyl0cnz3cr5pvskv4f4lxhp2c14ak8p80kam37nayxdsi9j9n9bcdpilnqbw2pbipxc4nx4vqhyg3mnlhjn1mfip3jikn21"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz"; + sha512 = "1zhdyfbs9gfd5iswb8dbra3gljv9mglapgcirci1zsfs78rfn557rp6z81drxxsz0m4w4imm2n9qf7yrchkfjhxz9a0vwp9hwpg1fkk"; }; }; "resolve-dir-1.0.1" = { @@ -22407,13 +22533,13 @@ let sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn"; }; }; - "ripemd160-2.0.1" = { + "ripemd160-2.0.2" = { name = "ripemd160"; packageName = "ripemd160"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz"; - sha1 = "0f4584295c53a3628af7e6d79aca21ce57d1c6e7"; + url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz"; + sha512 = "0hbd4cqbkycj691cj7gm40x3x5w46xk56xkg6n11wskc3k4xbdz1xxxyy6r27rcwipkzp19y1fmpfmb4lgf10l8asn6prdn11m24bla"; }; }; "rndm-1.2.0" = { @@ -22488,22 +22614,22 @@ let sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; }; }; - "run-parallel-1.1.8" = { + "run-parallel-1.1.9" = { name = "run-parallel"; packageName = "run-parallel"; - version = "1.1.8"; + version = "1.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.8.tgz"; - sha512 = "1jzs29b3g9xx5408i8gzyflx0wajfa1ai9sgm63pbvkaas0351j9y92kxq06x8dhg7w829skizs88cdlf156zfm1yk5brbbb0spb6vv"; + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz"; + sha512 = "3sl2kbxcwy92faw7zm0z4vql32622mag0bh6dv4bjk7cvc8a9sarvdclr9508hknhl0b7v8kzqvg3klvvff7psmvkfg9hy32i4sfjhc"; }; }; - "run-parallel-limit-1.0.4" = { + "run-parallel-limit-1.0.5" = { name = "run-parallel-limit"; packageName = "run-parallel-limit"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.0.4.tgz"; - sha512 = "2y7d7x3kwlwgyqvhlklxl08rkc63c2ww0jf8pcwlnw4nl2k3wcbkid5fwg130cbkwzslv8c4xrrxccng4yqib8dbcgivyq0h855k4yf"; + url = "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.0.5.tgz"; + sha512 = "2b87xk6x0fxs3bls9zzprvxiy2ldgvjxckkfv3ccg23j6f8qv58379pmylkkiv61w6b8qcsmsciwch7lg41nxx0qk6bpgp076h3xiin"; }; }; "run-queue-1.0.3" = { @@ -22515,13 +22641,13 @@ let sha1 = "e848396f057d223f24386924618e25694161ec47"; }; }; - "run-series-1.1.6" = { + "run-series-1.1.8" = { name = "run-series"; packageName = "run-series"; - version = "1.1.6"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/run-series/-/run-series-1.1.6.tgz"; - sha512 = "2rpksrvsfrz5kv3cwr448d60521dlky61p5hp3ci7g8140yfm58g7xak4gkqysfc9cm6hknxyizfs832939fxg01qslxrzlx7l805a1"; + url = "https://registry.npmjs.org/run-series/-/run-series-1.1.8.tgz"; + sha512 = "1gg6q66zyhqr3ylp9zx79v9qyxns1j643p9gkk2kqkijihpvp27ilhzg0qb8kiqxcsw2m0y5rbmdkq6qdhnkar4l088p96i8dhfsv7q"; }; }; "rusha-0.8.13" = { @@ -22578,13 +22704,13 @@ let sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; }; }; - "rxjs-5.5.8" = { + "rxjs-5.5.10" = { name = "rxjs"; packageName = "rxjs"; - version = "5.5.8"; + version = "5.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.8.tgz"; - sha512 = "32whnkvnay58zbcwimj3lpagg52k7swjdcys6i14a0im2hj1svh602bpvpb3zrqv36k96a1gsjjzbjxvfy6aj89i838l06mxsiflgh7"; + url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.10.tgz"; + sha512 = "3lc28jznaclc3qcipvf29dnfa11m4xdzyr4gkas29pgp0s4c44f8cyzsxyfwkqzqa8k06q7j7hl5wwyy671d8gdkwl9j76lh2cf4629"; }; }; "safe-buffer-5.0.1" = { @@ -22605,6 +22731,15 @@ let sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; }; }; + "safe-buffer-5.1.2" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r"; + }; + }; "safe-json-parse-1.0.1" = { name = "safe-json-parse"; packageName = "safe-json-parse"; @@ -22641,6 +22776,15 @@ let sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1"; }; }; + "sander-0.5.1" = { + name = "sander"; + packageName = "sander"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sander/-/sander-0.5.1.tgz"; + sha1 = "741e245e231f07cafb6fdf0f133adfa216a502ad"; + }; + }; "sanitize-html-1.18.2" = { name = "sanitize-html"; packageName = "sanitize-html"; @@ -22722,6 +22866,15 @@ let sha1 = "a346bb1acd4207ae70bd7c0c7ca9e566b6baddb8"; }; }; + "secure-keys-1.0.0" = { + name = "secure-keys"; + packageName = "secure-keys"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/secure-keys/-/secure-keys-1.0.0.tgz"; + sha1 = "f0c82d98a3b139a8776a8808050b824431087fca"; + }; + }; "seek-bzip-1.0.5" = { name = "seek-bzip"; packageName = "seek-bzip"; @@ -22821,6 +22974,15 @@ let sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1"; }; }; + "semver-compare-1.0.0" = { + name = "semver-compare"; + packageName = "semver-compare"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz"; + sha1 = "0dee216a1c941ab37e9efb1788f6afc5ff5537fc"; + }; + }; "semver-diff-2.1.0" = { name = "semver-diff"; packageName = "semver-diff"; @@ -22965,13 +23127,13 @@ let sha1 = "90cff19d02e07027fd767f5ead3e7b95d1e7380c"; }; }; - "serialize-javascript-1.4.0" = { + "serialize-javascript-1.5.0" = { name = "serialize-javascript"; packageName = "serialize-javascript"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.4.0.tgz"; - sha1 = "7c958514db6ac2443a8abc062dc9f7886a7f6005"; + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.5.0.tgz"; + sha512 = "2hiydb59y0q07hp3qfs8g9qjhgmhmajps769wpw2f5ghxwy3ibr7y7lnx7q23snmc3asgzhik0444jvfs3d4gmy0qx9w0n0v3q1rbqr"; }; }; "serve-favicon-2.3.2" = { @@ -23316,13 +23478,22 @@ let sha1 = "e9755eda407e96da40c5e5158c9ea37b33becbeb"; }; }; - "simple-get-2.7.0" = { + "simple-get-2.8.1" = { name = "simple-get"; packageName = "simple-get"; - version = "2.7.0"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-2.7.0.tgz"; - sha512 = "2r1w3cxxmd92r19mjrlzwn6xypjd5vrx0gk21l2bmxcp1x54pavhmifbhq8llxfk6z2lmzly7g3l8rrdl19m65nzlcicwy7cfn3sha6"; + url = "https://registry.npmjs.org/simple-get/-/simple-get-2.8.1.tgz"; + sha512 = "13j7pz8kfspyi25dkkvb6wm5r95yf7adskwf7z46g02vv27clgq9lgpbxx2hy1s5qip45dim625sby77fm4c67h31a0769p5i2qf94m"; + }; + }; + "simple-get-3.0.2" = { + name = "simple-get"; + packageName = "simple-get"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-get/-/simple-get-3.0.2.tgz"; + sha512 = "021na7dsxyawdzbif9l56dzgvzdd5s4kwm09rb8hg3abvr94i05arvn0z6q5vmpi24bmnnp2i677rf7964fza0frx3zx406a82x6kbm"; }; }; "simple-git-1.92.0" = { @@ -23352,13 +23523,13 @@ let sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3"; }; }; - "simple-peer-9.0.0" = { + "simple-peer-9.1.1" = { name = "simple-peer"; packageName = "simple-peer"; - version = "9.0.0"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.0.0.tgz"; - sha512 = "1fwihnw60ayp1hyj2rp40cshqhi32rj1gjhr060awg35rk762z9a4d15zapvxi76bmdhgs3vs8lv7xmdqxbabg8d3z1xlkq5vnhq0d1"; + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.1.1.tgz"; + sha512 = "27d9j7ah5ync1cndpinw966zb81lc9z6pc38y8dkc1l5rxdkv3fmf5ilhf0jq94m3qvb2ipldjmvbs1sza5ccvazwlr4pjgfr07ym23"; }; }; "simple-plist-0.2.1" = { @@ -23658,121 +23829,121 @@ let sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; }; }; - "snyk-1.71.0" = { + "snyk-1.78.1" = { name = "snyk"; packageName = "snyk"; - version = "1.71.0"; + version = "1.78.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.71.0.tgz"; - sha1 = "842cfed35ffac591ac34824ce0f1467655c5f8f1"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.78.1.tgz"; + sha1 = "a9eefbc97c6f0179f3cc318a4232aacd57e347fe"; }; }; - "snyk-config-1.0.1" = { + "snyk-config-2.1.0" = { name = "snyk-config"; packageName = "snyk-config"; - version = "1.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-config/-/snyk-config-1.0.1.tgz"; - sha1 = "f27aec2498b24027ac719214026521591111508f"; + url = "https://registry.npmjs.org/snyk-config/-/snyk-config-2.1.0.tgz"; + sha512 = "0r81kdx8az7nfiv0r36ggarzdw5rzai06qivv1r48xdfax2gdz9axxjhnwyzhf3mpz6245fz2ilc8l349h85s01yh05rxjsjvbg6m8g"; }; }; - "snyk-go-plugin-1.4.6" = { + "snyk-go-plugin-1.5.0" = { name = "snyk-go-plugin"; packageName = "snyk-go-plugin"; - version = "1.4.6"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.4.6.tgz"; - sha512 = "3002f73liv15dpg1ls92j4m50374z69p9ic74zpqmr8mjlxcdv09gcxkdmg0bdkzlj3s02bpmdj7vrkw5jb2k2f6zbrr5g4d18pjy8n"; + url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.5.0.tgz"; + sha512 = "20i967dg1n1pir2j0ivpd72i5j3y9xa3826jvl8jspmg9wfnpfq6x0isp3irw42zrcvflshi0nhk3sckcj3lqgjaw82g14wda28g80z"; }; }; - "snyk-gradle-plugin-1.2.0" = { + "snyk-gradle-plugin-1.3.0" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.2.0.tgz"; - sha512 = "1b2bxvwl2v4prlj942i4jkz4mahgp39j7lvy91jzv00nsk59l76b1icn48zj4zk84s00jil3pnxnfzsclhcc612d70s4wwi3x2hrrqn"; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.3.0.tgz"; + sha512 = "22av46k72s8cgigsj0ppir7cd1150079mg1hhb8qgkg9a4asdw3wn48ahwra08rai0rd4z4jhwhmhpc7d63np4ivvjdqcy30qzmr9mc"; }; }; - "snyk-module-1.8.1" = { + "snyk-module-1.8.2" = { name = "snyk-module"; packageName = "snyk-module"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.8.1.tgz"; - sha1 = "31d5080fb1c0dfd6fa8567dd34a523fd02bf1fca"; + url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.8.2.tgz"; + sha512 = "03372r6cvic19gajy5sa3q11sjal4499svhv50bglywf9jfi2555lpnvsshh08kr6krwcmnm7vb3fm4va3pb616h5wy4ln2kxnmva2y"; }; }; - "snyk-mvn-plugin-1.1.1" = { + "snyk-mvn-plugin-1.2.0" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.1.1.tgz"; - sha512 = "3h9drys1g2wh3w072rn00zw57g5xy42ap38k05gvdryiphx8p9iksb4azg4dyf2vd616jzslqid45hjd6iphafdzpk4b90mws880hqa"; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.2.0.tgz"; + sha512 = "3pq0wqa8isczv7pcwfm9jfh5qkwjd482hw45m40c5vnnzbxxbji4m1zvxybpzb08azfp6rigblr0hkrhb8m59qf24hcy1scgn3ddr49"; }; }; - "snyk-nuget-plugin-1.3.9" = { + "snyk-nuget-plugin-1.4.0" = { name = "snyk-nuget-plugin"; packageName = "snyk-nuget-plugin"; - version = "1.3.9"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.3.9.tgz"; - sha512 = "017qpf5cy1f0x8apjc1a3qp3aa9w7v7zlyy8jb8r7q4ilsnpdzvywrxhd6s1yy3b9fiylmgmldgdcz77srqq9pm2njvdi80pyd00zqp"; + url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.4.0.tgz"; + sha512 = "1frla7fsnn7ijg088bjqqy7iq5q0if7sz337rb1g6h5kg760z7968yjgi3nprp218vbpqjrf75xpi6m8dj8k04gpfdkb2am9klnymh4"; }; }; - "snyk-php-plugin-1.3.2" = { + "snyk-php-plugin-1.5.0" = { name = "snyk-php-plugin"; packageName = "snyk-php-plugin"; - version = "1.3.2"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.3.2.tgz"; - sha512 = "2fihlcs2qxdbdfy1pjnf7110l6h4r16vkp0q51wqsfd8fw5s1qgb34plii6yhbfbs8a1il93i6hfn93yclbv50m2129wg7naf57jlqi"; + url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.5.0.tgz"; + sha512 = "10p6nq7sxfdfzaqh87s2hnw00vr904bklcscp26yvimdsa5p5n0x4m8ynbiiqa0b35rgp2lpq5qxmybgnshwv8b97fh89vq2i5lsbhx"; }; }; - "snyk-policy-1.10.2" = { + "snyk-policy-1.12.0" = { name = "snyk-policy"; packageName = "snyk-policy"; - version = "1.10.2"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.10.2.tgz"; - sha1 = "2a7bf0f07c7b811b9dda93cf9bbb10dc992dd7bc"; + url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.12.0.tgz"; + sha512 = "3pmnx9hjrlz0gpxy6b2gia65h1rpdalc1g68s759p0ik0xq5rgi8hm3cqnvicg24cgqm8qwdsf5v7bcfxcj3m6yi7rc2wgkf0vahj08"; }; }; - "snyk-python-plugin-1.5.7" = { + "snyk-python-plugin-1.6.0" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.5.7"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.5.7.tgz"; - sha512 = "3fqq6dbx31yysvd835ng60linxmbkzixiqqf28yxq9pdx3x8dq55syhv1g6as3s85wd04q5vc5qlfgdl91jlhwcgjvdwjjr2wwp84pq"; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.6.0.tgz"; + sha512 = "06n8zx8az0afp7b2gnav664hzmjxg5dp96a5vmy5a58dhr278x6fl7pgsd332ykxanphrm59dsm0hyka2s8wibam2v8wjbgm4xxrlzz"; }; }; - "snyk-resolve-1.0.0" = { + "snyk-resolve-1.0.1" = { name = "snyk-resolve"; packageName = "snyk-resolve"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.0.0.tgz"; - sha1 = "bbe9196d37f57c39251e6be75ccdd5b2097e99a2"; + url = "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.0.1.tgz"; + sha512 = "2kh7wgl3yjw4am7ay4ag5d6qynbj06jzqf6wph17lhwx9ichwl6adqaf8nbsksib1y65kmvmvqm90j5zqdxfx6qj97qs1kdp0nbxs7g"; }; }; - "snyk-resolve-deps-1.7.0" = { + "snyk-resolve-deps-3.1.0" = { name = "snyk-resolve-deps"; packageName = "snyk-resolve-deps"; - version = "1.7.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-1.7.0.tgz"; - sha1 = "13743a058437dff890baaf437c333c966a743cb6"; + url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-3.1.0.tgz"; + sha512 = "3qk3349lw5q1spqk4q1arw496hbp4d8qlj576whfl710kf7ajwpv4kcak5wprzhvwmqs656q7w71sc0jvz9afprh65rlklx3yaiwl31"; }; }; - "snyk-sbt-plugin-1.2.5" = { + "snyk-sbt-plugin-1.3.0" = { name = "snyk-sbt-plugin"; packageName = "snyk-sbt-plugin"; - version = "1.2.5"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.2.5.tgz"; - sha512 = "183dfn89vslcl63y76jxyndz67f5c8ii4wh0pvbxgzqb3161rz5j5p4k7dv69shiw55q1lyb1j70pjng6rafw5k0jnqc58x63bpqgz8"; + url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.3.0.tgz"; + sha512 = "03bdn4g3836nyv06flg4g6jnr9j297z8ay67jg0k7zfanwg7glaaqbkxzas1bl36jj1snyb8ifb8xvhshbxjbvl6xpngxxpbq3ly729"; }; }; "snyk-tree-1.0.0" = { @@ -23784,13 +23955,13 @@ let sha1 = "0fb73176dbf32e782f19100294160448f9111cc8"; }; }; - "snyk-try-require-1.2.0" = { + "snyk-try-require-1.3.0" = { name = "snyk-try-require"; packageName = "snyk-try-require"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.2.0.tgz"; - sha1 = "30fc2b11c07064591ee35780c826be91312f2144"; + url = "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.3.0.tgz"; + sha1 = "f35706acf91c8af788d58e1f1ad6bf0fcf6c5493"; }; }; "socket.io-0.9.14" = { @@ -23982,6 +24153,15 @@ let sha512 = "33yfj0m61wn7g9s59m7mxhm6w91nkdrd7hcnnbacrj58zqgykpyr7f6lsggvc9xzysrf951ncxh4malqi11yf8z6909fasllxi6cnxh"; }; }; + "socks-proxy-agent-3.0.1" = { + name = "socks-proxy-agent"; + packageName = "socks-proxy-agent"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.1.tgz"; + sha512 = "2a5lsw4fry6nqk3jdxvwqrnpasypvl8c4d0kg32912820lc72l7s9jzidfsrn2an9c66xqicspxb2vnir5cjspprs9qklxnd75060b7"; + }; + }; "sodium-javascript-0.5.5" = { name = "sodium-javascript"; packageName = "sodium-javascript"; @@ -23991,13 +24171,13 @@ let sha512 = "3451wvpagbw2ib50galmlfrb5za3zh0ml1irbm2ijd0lbjblg9va4fnag6sfs7msb1m0i5zicz93jwp90c22v0n40qzpczhicg85jah"; }; }; - "sodium-native-2.1.5" = { + "sodium-native-2.1.6" = { name = "sodium-native"; packageName = "sodium-native"; - version = "2.1.5"; + version = "2.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.5.tgz"; - sha512 = "3cwd4rvsggx0lzc7433v6321fjs65q9nqr3c9gcz7j51ca580aq6ciacmmq788yxb3ih78b1fkpkprm75d0hadj3ng2bznc6qsl1var"; + url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.6.tgz"; + sha512 = "3y0f008galwxign4qb49q2kfkhz68nfxazpcq5y63wahaqly89x640nnv8cv4rg9xn1vbp5wia76vkmh1ja13dp95vjzw2lv5q2zymx"; }; }; "sodium-universal-2.0.0" = { @@ -24009,6 +24189,15 @@ let sha512 = "2rd6r7v2i3z76rzvllqx9ywk5f64q23944njcf14vv7x3l0illqn41bgdiifik4kswgys99mxsrqinq8akf3n7b15r9871km74mbivj"; }; }; + "sorcery-0.10.0" = { + name = "sorcery"; + packageName = "sorcery"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sorcery/-/sorcery-0.10.0.tgz"; + sha1 = "8ae90ad7d7cb05fc59f1ab0c637845d5c15a52b7"; + }; + }; "sort-keys-1.1.2" = { name = "sort-keys"; packageName = "sort-keys"; @@ -24207,6 +24396,15 @@ let sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; }; }; + "sourcemap-codec-1.4.1" = { + name = "sourcemap-codec"; + packageName = "sourcemap-codec"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz"; + sha512 = "3645hn4agfzixljvwx4l0fwxqvcr6f0j7pvgcdcy34788n1qaabrs1nawn8c10qk8pw4b21mb0f0chgfhl10rzir7y5i2kf2cs5wzc5"; + }; + }; "sparkles-1.0.0" = { name = "sparkles"; packageName = "sparkles"; @@ -24450,13 +24648,13 @@ let sha512 = "00qc3iqsi21cc2az3nz36q88psab4ickpzranndk6vmrb6yhn5xsq3kgp21x3lp0406bdaalpb59xy7zzqnl40ans69v3z2l8z8h52x"; }; }; - "stable-0.1.6" = { + "stable-0.1.8" = { name = "stable"; packageName = "stable"; - version = "0.1.6"; + version = "0.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/stable/-/stable-0.1.6.tgz"; - sha1 = "910f5d2aed7b520c6e777499c1f32e139fdecb10"; + url = "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz"; + sha512 = "3mw0cg71gcp6hfg3x0snaxcva4yqnifs11vbs3ba4agmcz8njmz70ndk5d8z97441jdvjhvb8aq8r44ngd8z4iw5hpgfmff372nlbwf"; }; }; "stack-trace-0.0.10" = { @@ -24891,13 +25089,13 @@ let sha512 = "1r18lbap331hx5hfic2irpd3rai1ymp5s93p5xfzfr0khw9krkx51glwhmdjxbrk07kryqqdc2fly59avw3pq3q2apq7q487q55bh6r"; }; }; - "string2compact-1.2.2" = { + "string2compact-1.2.3" = { name = "string2compact"; packageName = "string2compact"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/string2compact/-/string2compact-1.2.2.tgz"; - sha1 = "420b3a9ee1c46854919b4a2aeac65c43fa50597b"; + url = "https://registry.npmjs.org/string2compact/-/string2compact-1.2.3.tgz"; + sha512 = "2v32r74gw45hwccyyv9br6r685nps3c7z95ik5c9sip5nva4flx1scz0mg3h47hw0xrnfj0wh89binqz26ld86zvqxhai2067g3bi7d"; }; }; "string_decoder-0.10.31" = { @@ -24927,13 +25125,13 @@ let sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z"; }; }; - "stringify-entities-1.3.1" = { + "stringify-entities-1.3.2" = { name = "stringify-entities"; packageName = "stringify-entities"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.1.tgz"; - sha1 = "b150ec2d72ac4c1b5f324b51fb6b28c9cdff058c"; + url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.2.tgz"; + sha512 = "3f4kckmssz5nm8qwm7plgq1vl73jwzc9k7cf80gwjqvzdysa558x5gfhjws59hhni39yncaly8dm0rwa590k1pblxvg602955041c4y"; }; }; "stringstream-0.0.5" = { @@ -25188,13 +25386,13 @@ let sha1 = "fb15027984751ee7152200e6cd21cd6e19a5de87"; }; }; - "superagent-3.8.2" = { + "superagent-3.8.3" = { name = "superagent"; packageName = "superagent"; - version = "3.8.2"; + version = "3.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/superagent/-/superagent-3.8.2.tgz"; - sha512 = "0sxwwjllf26hx079lw1w3c1zywq2af9ssi7f0n334xzz1mgnfx2lr5l532a988zyi3bigzmfidqgdrfmwv6ghgzs77qsw87yr0zhlc1"; + url = "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz"; + sha512 = "0a4ra91hgzbhnyccsx319r1xzaw4cb3k144g7xrp10y3wckzd98vxhf5vk34cfvvlrav8pyf2vqr11scimkiyivg2w84458q0n2vd0q"; }; }; "supports-color-0.2.0" = { @@ -25251,22 +25449,13 @@ let sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c"; }; }; - "supports-color-4.5.0" = { + "supports-color-5.4.0" = { name = "supports-color"; packageName = "supports-color"; - version = "4.5.0"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz"; - sha1 = "be7a0de484dec5c5cddf8b3d59125044912f635b"; - }; - }; - "supports-color-5.3.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz"; - sha512 = "0v9skvg8c5hgqfsm98p7d7hisk11syjdvl3nxid3ik572hbjwv4vyzws7q0n1yz8mvb1asbk00838fi09hyfskrng54icn8nbag98yi"; + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz"; + sha512 = "3ks7qkl6s064qcdc5qnpzcwzcrnlzccz9m3faw54fnmsm2k8fzb9saqr5nhx7w9lnd4nbp0zg047zz8mwsd4fxfnalpb7kra619fdnf"; }; }; "symbol-observable-1.0.1" = { @@ -25405,22 +25594,22 @@ let sha512 = "1ryql8hyrrhd0gdd71ishbj3cnr8ay0i0wpvy9mj3hjiy35cc1wa0h07wz8jwils98j00gr03ix3cf2j1xm43xjn9bsavwn1yr4a0x5"; }; }; - "tar-4.4.1" = { + "tar-4.4.2" = { name = "tar"; packageName = "tar"; - version = "4.4.1"; + version = "4.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz"; - sha512 = "33gymcvk33znj1lscj0kds60g5jzagw2dcx1fcbpxz85pi21kqlazvwz579p301x0vqvir1nslh901zq28sfx2zpsnd7qldvjpzbsrv"; + url = "https://registry.npmjs.org/tar/-/tar-4.4.2.tgz"; + sha512 = "25ypdsz6l4xmg1f89pjy8s773j3lzx855iiakbdknz115vxyg4p4z1j0i84iyjpzwgfjfs2l2njpd0y2hlr5sh4n01nh6124zs09y85"; }; }; - "tar-fs-1.16.0" = { + "tar-fs-1.16.2" = { name = "tar-fs"; packageName = "tar-fs"; - version = "1.16.0"; + version = "1.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.0.tgz"; - sha512 = "1i39d75rgrl2a3v3x65w7bz6az06sg7xdvp7j9zk5bqilj5znclmr7r5n9l6la6nkqikn4lkhnfrgp4hzbvp6ph77nn53g6zvmdpni3"; + url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.2.tgz"; + sha512 = "0ywy8jh175q90rbr38yxx8dzhiyj8ch0jjxxidvjwmkh4s6hi1cp56ibq3aydlqflybssn9cc2cjdq717yqcw70kjsr12f46dd2gn9d"; }; }; "tar-pack-3.4.1" = { @@ -25432,13 +25621,13 @@ let sha512 = "0mgk8jd55vr7i3i29r1skhxwwbqkqfz6mbr32r5nn8h6v5xns8d2rc7835y7wj0zmppckxai7nm8r4s65kkg6yhirnwx33yixn75x1w"; }; }; - "tar-stream-1.5.5" = { + "tar-stream-1.6.0" = { name = "tar-stream"; packageName = "tar-stream"; - version = "1.5.5"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz"; - sha512 = "219gn10gvilrq6h3yshbhn25fx46n0wlgg66h0v326jhzz8gmpxsinb8bnhx1py35z0cv2248v91k2vy6vmkajmvpmkfmizywn601wr"; + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.0.tgz"; + sha512 = "2kw4php0986jgdzqvrih64plc8md1f1v3wfc8mz3y0lz95dmmvba1lpjmwp1v4crgfky63r8an3syfavn3gb0d56xk7615zy40a47cn"; }; }; "temp-0.6.0" = { @@ -25486,6 +25675,15 @@ let sha1 = "5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"; }; }; + "tempfile-2.0.0" = { + name = "tempfile"; + packageName = "tempfile"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz"; + sha1 = "6b0446856a9b1114d1856ffcbe509cccb0977265"; + }; + }; "term-size-1.2.0" = { name = "term-size"; packageName = "term-size"; @@ -25603,6 +25801,15 @@ let sha1 = "9e785836daf46743145a5984b6268d828528ac6c"; }; }; + "through-2.2.7" = { + name = "through"; + packageName = "through"; + version = "2.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/through/-/through-2.2.7.tgz"; + sha1 = "6e8e21200191d4eb6a99f6f010df46aa1c6eb2bd"; + }; + }; "through-2.3.4" = { name = "through"; packageName = "through"; @@ -25720,15 +25927,6 @@ let sha1 = "f38b0ae81d3747d628001f41dafc652ace671c0a"; }; }; - "timed-out-3.1.3" = { - name = "timed-out"; - packageName = "timed-out"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz"; - sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217"; - }; - }; "timed-out-4.0.1" = { name = "timed-out"; packageName = "timed-out"; @@ -25747,13 +25945,13 @@ let sha1 = "c9c58b575be8407375cb5e2462dacee74359f41d"; }; }; - "timers-browserify-2.0.6" = { + "timers-browserify-2.0.10" = { name = "timers-browserify"; packageName = "timers-browserify"; - version = "2.0.6"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.6.tgz"; - sha512 = "0zvmxvcvmv91k667dy2hzd9a2knvhizxvbx73gcnbi5na3ypc3mldfljw062d7n6y2mf7n2gwwc5wr4wrdih927fxahg8s0hinyf38x"; + url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz"; + sha512 = "37aksk3ydmwy2n7ffsnbvyrwb5kmz5bhvi5fhyg593qs61x7vi9drblwnri5z4x9mzaz91xxqdgg15f0qmf8cd85wdfax2pbm4vbw32"; }; }; "timespan-2.3.0" = { @@ -25873,13 +26071,13 @@ let sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43"; }; }; - "to-buffer-1.1.0" = { + "to-buffer-1.1.1" = { name = "to-buffer"; packageName = "to-buffer"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.0.tgz"; - sha1 = "375bc03edae5c35a8fa0b3fe95a1f3985db1dcfa"; + url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz"; + sha512 = "1b8wsfz1rp8fsb2kz7isrsx292vl5w4cmx9qvivxqsj61avx9ph1azxa6zr3mc85cz8qddbkxm6ski8zvacmpadc22wp6pv5gk427wp"; }; }; "to-fast-properties-1.0.3" = { @@ -25972,13 +26170,13 @@ let sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29"; }; }; - "torrent-discovery-8.4.0" = { + "torrent-discovery-8.4.1" = { name = "torrent-discovery"; packageName = "torrent-discovery"; - version = "8.4.0"; + version = "8.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-8.4.0.tgz"; - sha512 = "39hhpi3mzygr52pgdah0fvll7mdgmchilxshqjykypiz9167p476sjph4w1qbv98254ij6kdwn9b0j4bwqkcbnr3mspmjh1sm5n8fak"; + url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-8.4.1.tgz"; + sha512 = "39wg1cq3w31h0yhwjl9aacpl9654psnwigdfbxli93xqvfm9w403gppc2r295ikc9rvglirzcyqiafpd6f8jpf65d6119xnwhgvyz1w"; }; }; "torrent-piece-1.1.1" = { @@ -26170,22 +26368,22 @@ let sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; }; }; - "trim-trailing-lines-1.1.0" = { + "trim-trailing-lines-1.1.1" = { name = "trim-trailing-lines"; packageName = "trim-trailing-lines"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.0.tgz"; - sha1 = "7aefbb7808df9d669f6da2e438cac8c46ada7684"; + url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz"; + sha512 = "2d7isckw2m4zqhp0qd4d8d272j8jp09qvqnp1fj3igzqkl7mx75l3fcnr8x1kh64xgf5afr9zyw6wk221mb7ajsk9xvfvfn2vsfyqkd"; }; }; - "trough-1.0.1" = { + "trough-1.0.2" = { name = "trough"; packageName = "trough"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/trough/-/trough-1.0.1.tgz"; - sha1 = "a9fd8b0394b0ae8fff82e0633a0a36ccad5b5f86"; + url = "https://registry.npmjs.org/trough/-/trough-1.0.2.tgz"; + sha512 = "2qhjpmwnyz01jcf1yqjq00my48a3imn5z2z0ha4alfcr3imfpvrcbnv893cw71s7rh9h5icjga9nk180qk07nfmpwmlis66kd8jhy8l"; }; }; "truncate-2.0.1" = { @@ -26251,6 +26449,15 @@ let sha1 = "f23bcd8b7a7b8a864261b2084f66f93193396334"; }; }; + "tunnel-0.0.4" = { + name = "tunnel"; + packageName = "tunnel"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel/-/tunnel-0.0.4.tgz"; + sha1 = "2d3785a158c174c9a16dc2c046ec5fc5f1742213"; + }; + }; "tunnel-0.0.5" = { name = "tunnel"; packageName = "tunnel"; @@ -26386,13 +26593,13 @@ let sha512 = "2gjv6xyp9rqfdfqadayc4b36b79sjdiwsxa38z43v01cdn3xbc06ax90mjv36hxj9j96nfbwr6w1wn7n0zq8f3y3fw4jfy0j1hw5557"; }; }; - "typescript-2.8.1" = { + "typescript-2.8.3" = { name = "typescript"; packageName = "typescript"; - version = "2.8.1"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.8.1.tgz"; - sha512 = "1v0ac83sjf21wg11fpllicxz8irx9yg341zmng7vz15524gbfphc9ch70n4x9r70gm0r4ak79xyaxw9zh6b2cwcs7mg447qvzlxz3q2"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.8.3.tgz"; + sha512 = "2vwhgmdrdw42wwaqbmrnz7zy197hrxl6smkmhrb3n93vsjmqg24a4r10czdralib6qpj82bx2gw97r3gxlspj7y54jswigs2vj3bf1b"; }; }; "typewise-1.0.3" = { @@ -26431,13 +26638,13 @@ let sha1 = "09ec54cd5b11dd5f1ef2fc0ab31d37002ca2b5ad"; }; }; - "ua-parser-js-0.7.17" = { + "ua-parser-js-0.7.18" = { name = "ua-parser-js"; packageName = "ua-parser-js"; - version = "0.7.17"; + version = "0.7.18"; src = fetchurl { - url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.17.tgz"; - sha512 = "39ac4xrr9v9ya7rbn5cz8dss5j3s36yhpj9qrhfxxqzgy1vljns0qfyv7d76lqgdgdbfbrd91kb5x7jlg0fw2r4f3kml0v8xmv545xr"; + url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.18.tgz"; + sha512 = "2fa0nkj7g5jpslp45h1icl5hsw01qmm64x4s6vlxw07v2b80b3myi38r8b2s06h0chbva92bi9dd7hync3lmkfpls9m3h27algg1p1f"; }; }; "uc.micro-1.0.5" = { @@ -26503,13 +26710,13 @@ let sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; - "uglify-js-3.3.20" = { + "uglify-js-3.3.23" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.3.20"; + version = "3.3.23"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.20.tgz"; - sha512 = "3x6k1plb2hrmm51fn2w7nmi9pixipwj224a4afly17p2mwk75qhycib3zlaj9m0bk43ydfh0h2gv01l1xfhabvjcv36pc7x4xcf94js"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.23.tgz"; + sha512 = "2zylyzplicczqknizbm1mp7grxz6bi6vg03rsld8l18b2rahl9y7b1rj2c3sp75afmmyqlgg57v8c0b1adyqm7arzw8kcc3n6l8mkra"; }; }; "uglify-js-3.3.6" = { @@ -26530,13 +26737,13 @@ let sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; }; }; - "uglifyjs-webpack-plugin-1.2.4" = { + "uglifyjs-webpack-plugin-1.2.5" = { name = "uglifyjs-webpack-plugin"; packageName = "uglifyjs-webpack-plugin"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.4.tgz"; - sha512 = "14jcr2nd1d4l940llkm93b2rm9886qi9vz16ab85nji84bmsr99rvzvv4vwzj3j0m2lpkkm2gskd4p29lv4vzjr76zp6vxwjn71nhng"; + url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.5.tgz"; + sha512 = "15z1mr0hms0qbrip49l6c03ljb7243ag7smh13l8xfd0lgmky3b5pa1c1q4r4cdfwvl4m3yr9adj9grdfqqpgr5vc012gj05kbhk144"; }; }; "uid-0.0.2" = { @@ -26665,15 +26872,6 @@ let sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"; }; }; - "undefsafe-0.0.3" = { - name = "undefsafe"; - packageName = "undefsafe"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/undefsafe/-/undefsafe-0.0.3.tgz"; - sha1 = "ecca3a03e56b9af17385baac812ac83b994a962f"; - }; - }; "undefsafe-2.0.2" = { name = "undefsafe"; packageName = "undefsafe"; @@ -26737,6 +26935,15 @@ let sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; }; }; + "underscore-1.9.0" = { + name = "underscore"; + packageName = "underscore"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.9.0.tgz"; + sha512 = "3w8byp6gw4jzam7sl3g72zy9k8qb67jc9h4fhlhd6xj3zn07rnnm812g9jc6ygfxqi4yv54l800ijnl9b8kizf8wc5582xi4h6pb1g0"; + }; + }; "underscore-contrib-0.3.0" = { name = "underscore-contrib"; packageName = "underscore-contrib"; @@ -26764,13 +26971,13 @@ let sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; - "unherit-1.1.0" = { + "unherit-1.1.1" = { name = "unherit"; packageName = "unherit"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/unherit/-/unherit-1.1.0.tgz"; - sha1 = "6b9aaedfbf73df1756ad9e316dd981885840cd7d"; + url = "https://registry.npmjs.org/unherit/-/unherit-1.1.1.tgz"; + sha512 = "3k40pnw86jz2238r4fv4sp5sdykrva5gl4azq3yxnhk1mw8biy17b5c71hrzq0sfd48dp0kpq3k04f0k11bxd623qrpw2kmmxbnwxpr"; }; }; "unicode-emoji-modifier-base-1.0.0" = { @@ -26854,31 +27061,31 @@ let sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a"; }; }; - "unist-util-is-2.1.1" = { + "unist-util-is-2.1.2" = { name = "unist-util-is"; packageName = "unist-util-is"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.1.tgz"; - sha1 = "0c312629e3f960c66e931e812d3d80e77010947b"; + url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.2.tgz"; + sha512 = "1bk26f0rhka8jhrbjg0jhfc4cqxz7g5k7z8qxqw0353mfx7nvaq9dqj73s9vr3a0jd1yx4lv64cm6ajji7p55xj3cka1bgxy4mw2ib2"; }; }; - "unist-util-remove-position-1.1.1" = { + "unist-util-remove-position-1.1.2" = { name = "unist-util-remove-position"; packageName = "unist-util-remove-position"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.1.tgz"; - sha1 = "5a85c1555fc1ba0c101b86707d15e50fa4c871bb"; + url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.2.tgz"; + sha512 = "3nrir95gy69ywsf99s11xmdk5dwjkaf1d7jriasr0nljg57cj4i5jxjh70f2hzazfwqfikb6blpn8dl3ck9sq3w578nbmga3cw0s6jz"; }; }; - "unist-util-visit-1.3.0" = { + "unist-util-visit-1.3.1" = { name = "unist-util-visit"; packageName = "unist-util-visit"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.3.0.tgz"; - sha512 = "24s5gpqr3vip7zfd3c81k1mhcj1qzlmjhxpn80n3ay8kkg3zycjdkvi6d78j1d3lva7qr1lqrf2mcz5k41as5vwh8w5xdn52drmhyzn"; + url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.3.1.tgz"; + sha512 = "1lbrqw43r1ckx1i8zqjpyfbvdh3dngb9c6qsk5hcflqkryxzc8icc5vn50xf6vxsgcj4bznzfj10c17rrfd2jlvldhlnlq98ks43xyi"; }; }; "universalify-0.1.1" = { @@ -27025,13 +27232,22 @@ let sha512 = "0xw24ba88hfvwwgniyn17n26av45g1pxqf095231065l4n9dp5w3hyc7azjd8sqyix7pnfx1pmr44fzmwwazkz0ly83cp214g4qk13p"; }; }; - "update-check-1.2.0" = { + "upath-1.0.5" = { + name = "upath"; + packageName = "upath"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/upath/-/upath-1.0.5.tgz"; + sha512 = "31m1lljcfngdnpyz67gpkwvb66gx6750si3jzmf1vg6kq420fq5lcd34cfgp6wz3manjpqbp9i98ax2yjl2xs7mq824chw38vvsgcm9"; + }; + }; + "update-check-1.3.2" = { name = "update-check"; packageName = "update-check"; - version = "1.2.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/update-check/-/update-check-1.2.0.tgz"; - sha512 = "1w28g23994qxxlkbmahrqsakjmr6hhknxyg6y109y5ghgph52w51wzyxz2y2z22417298cmyinbc8fjkv64840g61cqv0iziy7bsy14"; + url = "https://registry.npmjs.org/update-check/-/update-check-1.3.2.tgz"; + sha512 = "16lfi8gzdrmk0sq5fbqrq8vy3gmpssr05xac487hmsph1hk0i82n1bp8dklmvnkqk28w74bl8gphkanjn0v8f1walwcbbhpg3mss8fj"; }; }; "update-notifier-0.5.0" = { @@ -27043,15 +27259,6 @@ let sha1 = "07b5dc2066b3627ab3b4f530130f7eddda07a4cc"; }; }; - "update-notifier-0.6.3" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "0.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz"; - sha1 = "776dec8daa13e962a341e8a1d98354306b67ae08"; - }; - }; "update-notifier-2.3.0" = { name = "update-notifier"; packageName = "update-notifier"; @@ -27061,13 +27268,13 @@ let sha1 = "4e8827a6bb915140ab093559d7014e3ebb837451"; }; }; - "update-notifier-2.4.0" = { + "update-notifier-2.5.0" = { name = "update-notifier"; packageName = "update-notifier"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.4.0.tgz"; - sha1 = "f9b4c700fbfd4ec12c811587258777d563d8c866"; + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz"; + sha512 = "07vkna9y5i0ak6rwcbinrrgpabrcmav91ys805c42jskyc6kfla3wd12klsr858vzv5civi7arh5xz8bv7jdj81zgzyh6j70a31s0w3"; }; }; "update-section-0.3.3" = { @@ -27205,22 +27412,22 @@ let sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; }; }; - "useragent-2.3.0" = { + "useragent-2.2.1" = { name = "useragent"; packageName = "useragent"; - version = "2.3.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz"; - sha512 = "1vqmf9ng5navlr0kvklslvzbqym47sbqblc3i74ln0hswdyd0yx86fj3cnhb2pjjyy3cqs1mq9ywkz92j5x7km2iv1g2jkfkki0f2p0"; + url = "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz"; + sha1 = "cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"; }; }; - "ut_metadata-3.2.0" = { + "ut_metadata-3.2.1" = { name = "ut_metadata"; packageName = "ut_metadata"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.2.0.tgz"; - sha512 = "3c8a0bnic4symhd8m0gy22adlj8pkmiclsxbr6j979fwabrj0z74xp2bknfqp57vndr4f79d4mnhygrbvp69xdn911j0q6ljgd1bw8i"; + url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.2.1.tgz"; + sha512 = "0d0wdjn4cdn5jqsdma0624pvsxv2zakshxlcx2hm9vrxnr1pvm5al0lzwchkpri3nmsdimf3liv6rr7g5c9z79gphdijzrz19lg7ydn"; }; }; "ut_pex-1.2.0" = { @@ -27340,13 +27547,13 @@ let sha1 = "ae43eb7745f5fe63dcc2f277cb4164ad27087f30"; }; }; - "utp-native-1.7.0" = { + "utp-native-1.7.1" = { name = "utp-native"; packageName = "utp-native"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.0.tgz"; - sha512 = "1d0ccaz56506y44838shld6zkqx9rcx3cpw5qddbfbyjyjr73704gysrl3qwii6i80kx1i2ysnn8bdx6q0i4biwzjj36ksx2865i0yz"; + url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.1.tgz"; + sha512 = "2mflgna04nng4cj8z4pr53pw0fm3z447mvbnvcahlvq8wpg46znrvg4fkgh18k14bkiq3gic5d2h975bgy7h7l64cfjpc8r2km3naqm"; }; }; "uue-3.1.2" = { @@ -27610,13 +27817,13 @@ let sha1 = "c0fd6fa484f8debdb771f68c31ed75d88da97fe7"; }; }; - "vfile-location-2.0.2" = { + "vfile-location-2.0.3" = { name = "vfile-location"; packageName = "vfile-location"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.2.tgz"; - sha1 = "d3675c59c877498e492b4756ff65e4af1a752255"; + url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.3.tgz"; + sha512 = "3l6rl79knh2zld6jvcxwjk17697nijqykbma3wxj5gcdixc8i4vjj92ad5372yf00x9j7h760s53km1n4ljcxzwl20m1hszi6bpzknc"; }; }; "vhost-3.0.2" = { @@ -27718,6 +27925,15 @@ let sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"; }; }; + "vm-browserify-1.0.1" = { + name = "vm-browserify"; + packageName = "vm-browserify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.0.1.tgz"; + sha512 = "2cfjhw3c398d3nlbi0z1f6jlmjymyk13clnsnvwpa6cgcpbhh0zsghs7zi1fz6ydnbg6ignbbhvzrk44k0mcaps8iiv0q0c29rcpb0j"; + }; + }; "voc-1.1.0" = { name = "voc"; packageName = "voc"; @@ -27880,6 +28096,15 @@ let sha512 = "003dzsqf9q7awjnkv00gwrqw7s8n29y8nmfcmpsl845j2m7rgxxvvd3gld643c92jfwq9yw7ysbaavw9pq1yc5df8yfxmh1sjj64aa5"; }; }; + "watchpack-1.6.0" = { + name = "watchpack"; + packageName = "watchpack"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz"; + sha512 = "34gp4bbaidicl7azgivrrxb9kvdz501gg0xyf88lya75j9wmrbd1rs5rlk2h5g07q5rb453fkjkck54j2qzsdam1qk36bijf5xlg9wb"; + }; + }; "wcwidth-1.0.1" = { name = "wcwidth"; packageName = "wcwidth"; @@ -27943,13 +28168,13 @@ let sha512 = "1bq9cabpvsx4b0aajmbhsgkdzh816rrixhbnsmvcr0ypcndhn5zz9fggfc8i4l2s00b6jhif65phkc9l6zvika8ngb21rip9qx4pj4m"; }; }; - "webtorrent-0.98.24" = { + "webtorrent-0.99.4" = { name = "webtorrent"; packageName = "webtorrent"; - version = "0.98.24"; + version = "0.99.4"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.98.24.tgz"; - sha512 = "1jf65qy9fq5ngb1sv296r6wbahjwac8vkdddpfhwmyvmbxabfyn8vz09d5di8sy69d4w0kyi74kjx09v7rd954cg135kr9smyy615yk"; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.99.4.tgz"; + sha512 = "1d0rpdlr8flkbipr3qhr59qknfc3mlmz8ka9w6mnkbxhdflwky2l1f3z244xzgis509c8r1qyyjskv99ccrmc10rz93l52f4bb7m0kj"; }; }; "whatwg-fetch-2.0.4" = { @@ -28060,15 +28285,6 @@ let sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a"; }; }; - "widest-line-1.0.0" = { - name = "widest-line"; - packageName = "widest-line"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz"; - sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"; - }; - }; "widest-line-2.0.0" = { name = "widest-line"; packageName = "widest-line"; @@ -28123,15 +28339,6 @@ let sha1 = "f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"; }; }; - "window-size-0.2.0" = { - name = "window-size"; - packageName = "window-size"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz"; - sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075"; - }; - }; "windows-no-runnable-0.0.6" = { name = "windows-no-runnable"; packageName = "windows-no-runnable"; @@ -28222,13 +28429,13 @@ let sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e"; }; }; - "winston-2.4.1" = { + "winston-2.4.2" = { name = "winston"; packageName = "winston"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-2.4.1.tgz"; - sha512 = "2m8ya9y2s295czzzd8yffyny528vfnbjlzz4xpix3c5y51yfmczzbh3v1hkj0kmxwr25c7yp3xxz1vz4skbj93n4ir9gxbp6y9q7zwk"; + url = "https://registry.npmjs.org/winston/-/winston-2.4.2.tgz"; + sha512 = "1n2jk29vqjj4v60j3553gyy1lz5mnm90bf999p4nz6chnmh0izg8c9kf4chy1j68fx8d3mnr5ci5llqr4cjy0n775ydjj2zhrvw0bz1"; }; }; "with-4.0.3" = { @@ -28862,15 +29069,6 @@ let sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; }; }; - "yargs-3.15.0" = { - name = "yargs"; - packageName = "yargs"; - version = "3.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.15.0.tgz"; - sha1 = "3d9446ef21fb3791b3985690662e4b9683c7f181"; - }; - }; "yargs-3.32.0" = { name = "yargs"; packageName = "yargs"; @@ -28880,15 +29078,6 @@ let sha1 = "03088e9ebf9e756b69751611d2a5ef591482c995"; }; }; - "yargs-4.8.1" = { - name = "yargs"; - packageName = "yargs"; - version = "4.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz"; - sha1 = "c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0"; - }; - }; "yargs-6.6.0" = { name = "yargs"; packageName = "yargs"; @@ -28925,15 +29114,6 @@ let sha1 = "52acc23feecac34042078ee78c0c007f5085db4c"; }; }; - "yargs-parser-2.4.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz"; - sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4"; - }; - }; "yargs-parser-4.2.1" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -29111,10 +29291,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.12.0"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.12.0.tgz"; - sha512 = "1sk9p5lng0hwngvzbz28nwaamf73hyz4pa14fxzmwq11syjfiw8b3p95vig8sabn2zfwi8ddginhg5rvf10a5rgpq3cy608yy7qk21z"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.13.0.tgz"; + sha512 = "30a11iiiihsrqj8dc11n5m57im2300l46cygfh4r1q121m2l0vhzaqkg6p65kd7law25xkviw92zwmkd926n674hkv9gr6vsxrskimh"; }; dependencies = [ sources."JSV-4.0.2" @@ -29123,7 +29303,7 @@ in sources."array-unique-0.3.2" sources."async-2.6.0" sources."babel-code-frame-6.26.0" - (sources."babel-core-6.26.0" // { + (sources."babel-core-6.26.3" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -29145,7 +29325,7 @@ in sources."brace-expansion-1.1.11" sources."chalk-1.1.3" sources."chmodr-1.0.2" - sources."colors-1.2.1" + sources."colors-1.2.4" sources."commander-2.15.1" sources."concat-map-0.0.1" sources."convert-source-map-1.5.1" @@ -29187,7 +29367,7 @@ in sources."strip-ansi-0.1.1" ]; }) - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."loose-envify-1.3.1" sources."matcher-collection-1.0.5" sources."minimatch-3.0.4" @@ -29207,7 +29387,7 @@ in sources."private-0.1.8" sources."regenerator-runtime-0.11.1" sources."repeating-2.0.1" - sources."resolve-1.7.0" + sources."resolve-1.7.1" sources."sax-0.5.8" sources."slash-1.0.0" sources."source-map-0.6.1" @@ -29320,11 +29500,11 @@ in sources."performance-now-2.1.0" sources."punycode-1.4.1" sources."q-1.5.1" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."readable-stream-1.1.14" sources."request-2.85.0" sources."rimraf-2.6.2" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."sntp-2.1.0" sources."sshpk-1.14.1" sources."string_decoder-0.10.31" @@ -29363,7 +29543,7 @@ in dependencies = [ sources."@types/caseless-0.12.1" sources."@types/form-data-2.2.1" - sources."@types/node-8.10.4" + sources."@types/node-8.10.12" sources."@types/request-2.47.0" sources."@types/tough-cookie-2.3.2" sources."@types/uuid-3.4.3" @@ -29634,7 +29814,7 @@ in sources."streamline-0.4.11" ]; }) - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."map-stream-0.1.0" sources."md5.js-1.3.4" sources."mime-db-1.33.0" @@ -29642,7 +29822,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.22.0" + sources."moment-2.22.1" (sources."ms-rest-2.3.3" // { dependencies = [ sources."extend-3.0.1" @@ -29653,10 +29833,10 @@ in }) (sources."ms-rest-azure-2.5.5" // { dependencies = [ - sources."@types/node-9.6.2" + sources."@types/node-9.6.12" (sources."adal-node-0.1.28" // { dependencies = [ - sources."@types/node-8.10.4" + sources."@types/node-8.10.12" ]; }) sources."async-2.6.0" @@ -29695,7 +29875,7 @@ in }) sources."punycode-1.4.1" sources."q-0.9.7" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."read-1.0.7" (sources."readable-stream-1.0.34" // { dependencies = [ @@ -29728,7 +29908,7 @@ in }) sources."revalidator-0.1.8" sources."rimraf-2.6.2" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."sax-0.5.2" sources."sntp-2.1.0" sources."source-map-0.1.43" @@ -29933,10 +30113,10 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "16.1.1"; + version = "16.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-16.1.1.tgz"; - sha512 = "01ay1w7sndfvwjdc5n7sa9a4yzzrwdr8agj1655dz50f0g034scaqli9v1dngxasi8gk8gqvqcsqnmphvwkj1y6awlq1y5l6bbgc8c9"; + url = "https://registry.npmjs.org/browserify/-/browserify-16.2.0.tgz"; + sha512 = "02kwwi6cvxwcyhv9n13j05y67xdkb4b09p5z7n2sl97sif012i5cibmbz6wqqy89ybqh7s3sbdxqf7g6y2hbl61g81vhrbz9815v2ya"; }; dependencies = [ sources."JSONStream-1.3.2" @@ -29949,7 +30129,7 @@ in sources."assert-1.4.1" sources."astw-2.2.0" sources."balanced-match-1.0.0" - sources."base64-js-1.2.3" + sources."base64-js-1.3.0" sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" sources."brorand-1.1.0" @@ -29960,8 +30140,8 @@ in ]; }) sources."browserify-aes-1.2.0" - sources."browserify-cipher-1.0.0" - sources."browserify-des-1.0.0" + sources."browserify-cipher-1.0.1" + sources."browserify-des-1.0.1" sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" @@ -29978,20 +30158,16 @@ in sources."constants-browserify-1.0.0" sources."convert-source-map-1.1.3" sources."core-util-is-1.0.2" - sources."create-ecdh-4.0.0" - sources."create-hash-1.1.3" - sources."create-hmac-1.1.6" - (sources."crypto-browserify-3.12.0" // { - dependencies = [ - sources."hash-base-2.0.2" - ]; - }) + sources."create-ecdh-4.0.1" + sources."create-hash-1.2.0" + sources."create-hmac-1.1.7" + sources."crypto-browserify-3.12.0" sources."date-now-0.1.4" sources."defined-1.0.0" sources."deps-sort-2.0.0" sources."des.js-1.0.0" sources."detective-5.1.0" - sources."diffie-hellman-5.0.2" + sources."diffie-hellman-5.0.3" sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" sources."elliptic-6.4.0" @@ -30007,7 +30183,6 @@ in sources."htmlescape-1.1.1" sources."https-browserify-1.0.0" sources."ieee754-1.1.11" - sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."inline-source-map-0.6.2" @@ -30022,7 +30197,7 @@ in sources."lodash.memoize-3.0.4" sources."md5.js-1.3.4" sources."miller-rabin-4.0.1" - sources."minimalistic-assert-1.0.0" + sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -30037,15 +30212,15 @@ in sources."os-browserify-0.3.0" sources."pako-1.0.6" sources."parents-1.0.1" - sources."parse-asn1-5.1.0" + sources."parse-asn1-5.1.1" sources."path-browserify-0.0.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.5" sources."path-platform-0.11.15" - sources."pbkdf2-3.0.14" + sources."pbkdf2-3.0.16" sources."process-0.11.10" sources."process-nextick-args-2.0.0" - sources."public-encrypt-4.0.0" + sources."public-encrypt-4.0.2" sources."punycode-1.4.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" @@ -30055,12 +30230,11 @@ in (sources."readable-stream-2.3.6" // { dependencies = [ sources."isarray-1.0.0" - sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.7.0" - sources."ripemd160-2.0.1" - sources."safe-buffer-5.1.1" + sources."resolve-1.7.1" + sources."ripemd160-2.0.2" + sources."safe-buffer-5.1.2" sources."sha.js-2.4.11" sources."shasum-1.0.2" sources."shell-quote-1.6.1" @@ -30069,7 +30243,7 @@ in sources."stream-combiner2-1.1.1" sources."stream-http-2.8.1" sources."stream-splicer-2.0.0" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" (sources."subarg-1.0.0" // { dependencies = [ sources."minimist-1.2.0" @@ -30094,7 +30268,7 @@ in ]; }) sources."util-deprecate-1.0.2" - sources."vm-browserify-0.0.4" + sources."vm-browserify-1.0.1" sources."wrappy-1.0.2" sources."xtend-4.0.1" ]; @@ -30129,7 +30303,7 @@ in sources."async-0.2.10" sources."aws-sign-0.2.0" sources."balanced-match-1.0.0" - sources."base64-js-1.2.3" + sources."base64-js-1.3.0" sources."bencode-2.0.0" sources."bitfield-0.1.0" sources."bittorrent-dht-6.4.2" @@ -30273,8 +30447,8 @@ in sources."optjs-3.2.2" sources."pad-0.0.5" sources."parse-json-2.2.0" - sources."parse-torrent-5.8.3" - sources."parse-torrent-file-4.1.0" + sources."parse-torrent-5.9.1" + sources."parse-torrent-file-2.1.4" sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" sources."path-type-1.1.0" @@ -30289,13 +30463,12 @@ in sources."bencode-0.7.0" sources."debug-3.1.0" sources."end-of-stream-0.1.5" - sources."get-stdin-5.0.1" + sources."get-stdin-6.0.0" sources."isarray-1.0.0" sources."magnet-uri-4.2.3" sources."minimist-0.0.10" sources."object-assign-4.1.1" sources."once-1.2.0" - sources."parse-torrent-file-2.1.4" sources."readable-stream-2.3.6" sources."safe-buffer-5.0.1" sources."string_decoder-1.1.1" @@ -30326,7 +30499,7 @@ in sources."qs-0.5.6" sources."query-string-1.0.1" sources."random-access-file-2.0.1" - sources."random-access-storage-1.1.1" + sources."random-access-storage-1.2.0" sources."random-iterate-1.0.1" sources."randombytes-2.0.6" sources."range-parser-1.2.0" @@ -30336,7 +30509,6 @@ in sources."read-pkg-up-1.0.1" (sources."read-torrent-1.3.0" // { dependencies = [ - sources."bencode-0.7.0" sources."magnet-uri-2.0.1" sources."mime-1.2.11" (sources."parse-torrent-4.1.0" // { @@ -30344,7 +30516,6 @@ in sources."magnet-uri-4.2.3" ]; }) - sources."parse-torrent-file-2.1.4" sources."thirty-two-0.0.2" ]; }) @@ -30355,16 +30526,16 @@ in sources."request-2.16.6" sources."rimraf-2.6.2" sources."router-0.6.2" - sources."run-parallel-1.1.8" - sources."run-series-1.1.6" + sources."run-parallel-1.1.9" + sources."run-series-1.1.8" sources."rusha-0.8.13" sources."rx-2.5.3" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."sax-1.2.4" sources."semver-5.5.0" sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" - sources."simple-get-2.7.0" + sources."simple-get-2.8.1" sources."simple-peer-6.4.4" sources."simple-sha1-2.1.0" (sources."simple-websocket-4.3.1" // { @@ -30387,7 +30558,7 @@ in ]; }) sources."stream-transcoder-0.0.5" - sources."string2compact-1.2.2" + sources."string2compact-1.2.3" sources."string_decoder-0.10.31" sources."strip-ansi-2.0.1" sources."strip-bom-2.0.0" @@ -30494,14 +30665,14 @@ in sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."axios-0.17.1" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."cli-cursor-2.1.0" sources."cli-spinners-1.3.1" sources."cli-table2-0.2.0" sources."code-point-at-1.1.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."colors-1.2.1" + sources."colors-1.2.4" sources."commander-2.15.1" sources."debug-3.1.0" sources."escape-string-regexp-1.0.5" @@ -30521,7 +30692,7 @@ in sources."signal-exit-3.0.2" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" ]; buildInputs = globalBuildInputs; meta = { @@ -30555,7 +30726,7 @@ in sources."stack-trace-0.0.10" sources."statsd-parser-0.0.4" sources."strftime-0.10.0" - sources."winston-2.4.1" + sources."winston-2.4.2" ]; buildInputs = globalBuildInputs; meta = { @@ -30601,7 +30772,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.1" - sources."big-integer-1.6.27" + sources."big-integer-1.6.28" sources."block-stream-0.0.9" sources."bn.js-4.11.8" (sources."body-parser-1.18.2" // { @@ -30626,8 +30797,8 @@ in ]; }) sources."browserify-aes-1.2.0" - sources."browserify-cipher-1.0.0" - sources."browserify-des-1.0.0" + sources."browserify-cipher-1.0.1" + sources."browserify-des-1.0.1" sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-transform-tools-1.7.0" @@ -30684,9 +30855,8 @@ in (sources."cordova-lib-8.0.0" // { dependencies = [ sources."acorn-4.0.13" - sources."base64-js-1.2.3" + sources."base64-js-1.3.0" sources."glob-7.1.1" - sources."hash-base-2.0.2" sources."isarray-1.0.0" sources."minimist-1.2.0" sources."nopt-4.0.1" @@ -30698,7 +30868,9 @@ in sources."process-nextick-args-2.0.0" sources."q-1.0.1" sources."qs-6.3.2" + sources."safe-buffer-5.1.1" sources."shelljs-0.3.0" + sources."underscore-1.8.3" sources."uuid-3.2.1" sources."xmlbuilder-8.2.2" ]; @@ -30710,15 +30882,15 @@ in ]; }) sources."core-util-is-1.0.2" - sources."create-ecdh-4.0.0" - sources."create-hash-1.1.3" - sources."create-hmac-1.1.6" + sources."create-ecdh-4.0.1" + sources."create-hash-1.2.0" + sources."create-hmac-1.1.7" sources."cryptiles-2.0.5" sources."crypto-browserify-3.12.0" sources."dashdash-1.14.1" sources."date-now-0.1.4" sources."debug-2.6.9" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."defined-1.0.0" sources."delayed-stream-1.0.0" (sources."dep-graph-1.1.0" // { @@ -30737,11 +30909,11 @@ in sources."destroy-1.0.4" sources."detect-indent-5.0.0" sources."detective-4.7.1" - sources."diffie-hellman-5.0.2" + sources."diffie-hellman-5.0.3" sources."domain-browser-1.1.7" sources."dot-prop-3.0.0" sources."duplexer2-0.1.4" - sources."duplexify-3.5.4" + sources."duplexify-3.6.0" sources."ecc-jsbn-0.1.1" sources."editor-1.0.0" sources."ee-first-1.1.1" @@ -30862,7 +31034,7 @@ in sources."mime-1.4.1" sources."mime-db-1.33.0" sources."mime-types-2.1.18" - sources."minimalistic-assert-1.0.0" + sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -30874,7 +31046,7 @@ in sources."nested-error-stacks-1.0.2" sources."nopt-3.0.1" sources."normalize-package-data-2.4.0" - sources."npm-package-arg-6.0.0" + sources."npm-package-arg-6.1.0" sources."number-is-nan-1.0.1" sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" @@ -30894,14 +31066,14 @@ in sources."package-json-1.2.0" sources."pako-0.2.9" sources."parents-1.0.1" - sources."parse-asn1-5.1.0" + sources."parse-asn1-5.1.1" sources."parseurl-1.3.2" sources."path-browserify-0.0.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.5" sources."path-platform-0.11.15" sources."path-to-regexp-0.1.7" - sources."pbkdf2-3.0.14" + sources."pbkdf2-3.0.16" sources."pegjs-0.10.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" @@ -30912,7 +31084,7 @@ in sources."promzard-0.3.0" sources."properties-parser-0.3.1" sources."proxy-addr-2.0.3" - sources."public-encrypt-4.0.0" + sources."public-encrypt-4.0.2" sources."punycode-1.4.1" sources."q-1.5.1" sources."qs-6.5.1" @@ -30927,7 +31099,7 @@ in sources."http-errors-1.6.2" ]; }) - sources."rc-1.2.6" + sources."rc-1.2.7" sources."read-1.0.7" sources."read-all-stream-3.1.0" sources."read-only-stream-2.0.0" @@ -30942,13 +31114,13 @@ in sources."registry-url-3.1.0" sources."repeating-1.1.3" sources."request-2.79.0" - sources."resolve-1.7.0" + sources."resolve-1.7.1" sources."restore-cursor-1.0.1" sources."rimraf-2.6.2" - sources."ripemd160-2.0.1" + sources."ripemd160-2.0.2" sources."run-async-0.1.0" sources."rx-lite-3.1.2" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."sax-0.3.5" sources."semver-5.5.0" sources."semver-diff-2.1.0" @@ -31002,7 +31174,7 @@ in sources."type-is-1.6.16" sources."typedarray-0.0.6" sources."umd-3.0.3" - sources."underscore-1.8.3" + sources."underscore-1.9.0" sources."unorm-1.4.1" sources."unpipe-1.0.0" (sources."update-notifier-0.5.0" // { @@ -31110,7 +31282,7 @@ in sources."pseudomap-1.0.2" sources."readable-stream-1.1.14" sources."rimraf-2.6.2" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."semver-5.5.0" sources."string_decoder-0.10.31" sources."strip-ansi-3.0.1" @@ -31155,7 +31327,7 @@ in dependencies = [ sources."ansi-styles-3.2.1" sources."babel-runtime-6.26.0" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."core-js-2.5.5" @@ -31176,7 +31348,7 @@ in sources."shebang-regex-1.0.0" sources."source-map-0.5.7" sources."source-map-support-0.4.18" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" sources."universalify-0.1.1" sources."which-1.3.0" sources."yallist-2.1.2" @@ -31268,7 +31440,7 @@ in sources."bytes-3.0.0" sources."call-me-maybe-1.0.1" sources."caseless-0.12.0" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."circular-append-file-1.0.1" sources."cli-truncate-1.1.0" sources."cliclopts-1.1.1" @@ -31276,7 +31448,7 @@ in sources."codecs-1.2.1" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."colors-1.2.1" + sources."colors-1.2.4" sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" @@ -31292,7 +31464,7 @@ in sources."cycle-1.0.3" sources."dashdash-1.14.1" sources."dat-dns-1.3.2" - (sources."dat-doctor-1.3.1" // { + (sources."dat-doctor-1.4.0" // { dependencies = [ sources."debug-2.6.9" sources."dns-packet-1.3.1" @@ -31333,8 +31505,7 @@ in sources."dat-registry-4.0.0" sources."dat-secret-storage-4.0.1" sources."dat-storage-1.0.4" - sources."dat-swarm-defaults-1.0.0" - sources."datland-swarm-defaults-1.0.2" + sources."dat-swarm-defaults-1.0.1" sources."debug-3.1.0" sources."deep-equal-0.2.2" sources."delayed-stream-1.0.0" @@ -31359,7 +31530,7 @@ in sources."dns-socket-3.0.0" sources."dns-txt-2.0.2" sources."dom-walk-0.1.1" - sources."duplexify-3.5.4" + sources."duplexify-3.6.0" sources."ecc-jsbn-0.1.1" sources."end-of-stream-1.4.1" sources."escape-string-regexp-1.0.5" @@ -31394,7 +31565,7 @@ in sources."hoek-4.2.1" sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.13.0" // { + (sources."hypercore-6.14.0" // { dependencies = [ sources."varint-5.0.0" ]; @@ -31457,7 +31628,7 @@ in sources."min-document-2.19.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" - sources."mirror-folder-2.1.1" + sources."mirror-folder-2.2.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."multi-random-access-2.1.1" @@ -31503,10 +31674,10 @@ in sources."protocol-buffers-encodings-1.1.0" sources."pump-2.0.1" sources."punycode-1.4.1" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."random-access-file-2.0.1" sources."random-access-memory-2.4.0" - sources."random-access-storage-1.1.1" + sources."random-access-storage-1.2.0" (sources."randomatic-1.1.7" // { dependencies = [ (sources."is-number-3.0.0" // { @@ -31529,14 +31700,14 @@ in sources."revalidator-0.1.8" sources."rimraf-2.6.2" sources."rusha-0.8.13" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."signed-varint-2.0.1" sources."simple-sha1-2.1.0" sources."siphash24-1.1.0" sources."slice-ansi-1.0.0" sources."sntp-2.1.0" sources."sodium-javascript-0.5.5" - sources."sodium-native-2.1.5" + sources."sodium-native-2.1.6" sources."sodium-universal-2.0.0" sources."sorted-array-functions-1.1.0" sources."sorted-indexof-1.0.0" @@ -31558,7 +31729,7 @@ in sources."debug-2.6.9" ]; }) - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" (sources."throttle-1.0.3" // { dependencies = [ sources."debug-2.6.9" @@ -31566,7 +31737,7 @@ in }) sources."through2-2.0.3" sources."thunky-1.0.2" - sources."to-buffer-1.1.0" + sources."to-buffer-1.1.1" sources."toiletdb-1.4.1" sources."tough-cookie-2.3.4" sources."township-client-1.3.2" @@ -31582,7 +31753,7 @@ in sources."untildify-3.0.2" sources."util-deprecate-1.0.2" sources."utile-0.3.0" - sources."utp-native-1.7.0" + sources."utp-native-1.7.1" sources."uuid-3.2.1" sources."varint-3.0.1" sources."verror-1.10.0" @@ -31610,10 +31781,10 @@ in dhcp = nodeEnv.buildNodePackage { name = "dhcp"; packageName = "dhcp"; - version = "0.2.11"; + version = "0.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.11.tgz"; - sha512 = "287rcz01q13rn3b83ds5kh05l176wag4p9vxxzrx3q63nhjmy6pvkxf1c1d7k0bd8r8nhqdldn5f1p50r4a1y1ybgy9zz0gqfbwb0d7"; + url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.12.tgz"; + sha512 = "1ks1wdfgj703sxp1ys7hjfkw0sm6sm9z7iviqxicvmy9r3mj7irq3vjyk4nvxgyq29j3qz8bi8lvm38r4w8j1j2xbkx85fk0l3vpa7r"; }; dependencies = [ sources."minimist-1.2.0" @@ -31683,7 +31854,7 @@ in sources."fresh-0.2.4" sources."from-0.1.7" sources."hiredis-0.4.1" - sources."http-parser-js-0.4.11" + sources."http-parser-js-0.4.12" sources."inherits-2.0.3" sources."ini-1.3.5" sources."ipaddr.js-1.0.5" @@ -31783,6 +31954,9 @@ in sources."basic-auth-1.1.0" sources."bindings-1.2.1" sources."bl-0.8.2" + sources."buffer-alloc-1.1.0" + sources."buffer-alloc-unsafe-0.1.1" + sources."buffer-fill-0.1.1" sources."bytewise-1.1.0" sources."bytewise-core-1.2.3" sources."cookie-signature-1.1.0" @@ -31790,7 +31964,7 @@ in sources."cors-2.8.4" sources."deferred-leveldown-0.2.0" sources."docker-parse-image-3.0.1" - sources."duplexify-3.5.4" + sources."duplexify-3.6.0" sources."end-of-stream-1.4.1" (sources."errno-0.1.7" // { dependencies = [ @@ -31805,6 +31979,7 @@ in sources."string_decoder-1.1.1" ]; }) + sources."fs-constants-1.0.0" sources."inherits-2.0.3" sources."isarray-0.0.1" sources."json-stringify-safe-5.0.1" @@ -31871,7 +32046,7 @@ in sources."pull-stream-3.6.7" sources."pull-window-2.1.4" sources."pump-1.0.3" - (sources."pumpify-1.4.0" // { + (sources."pumpify-1.5.0" // { dependencies = [ sources."pump-2.0.1" ]; @@ -31879,7 +32054,7 @@ in sources."readable-stream-1.1.14" sources."relative-date-1.1.3" sources."root-2.0.0" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."semver-5.1.1" sources."sorted-union-stream-1.0.2" sources."split2-0.2.1" @@ -31887,7 +32062,7 @@ in sources."stream-shift-1.0.0" sources."stream-to-pull-stream-1.7.2" sources."string_decoder-0.10.31" - (sources."tar-stream-1.5.5" // { + (sources."tar-stream-1.6.0" // { dependencies = [ sources."bl-1.2.2" sources."isarray-1.0.0" @@ -31902,6 +32077,7 @@ in ]; }) sources."thunky-0.1.0" + sources."to-buffer-1.1.1" sources."typewise-1.0.3" sources."typewise-core-1.2.0" sources."typewiselite-1.0.0" @@ -31922,10 +32098,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "3.3.8"; + version = "3.3.12"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.8.tgz"; - sha512 = "3bahinp16ajfxy06ihrl022906h6zdxhsgmwh28k1p04blzqzgddbryx4l1a8ncg5fdjlj7ka9k3f6lam68fanjw4093hgyns7iclf4"; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.12.tgz"; + sha512 = "3jj2vxmyham5bhfxvbilsd60sgkdabzl0mbid2i4hfjjgqjs76f4av2qifnvphn4a0ds727wjcp4kjz2963pjqrq53ik0k87706arn1"; }; dependencies = [ sources."JSONStream-1.3.2" @@ -31934,10 +32110,10 @@ in sources."assert-plus-1.0.0" sources."async-2.6.0" sources."asynckit-0.4.0" - sources."aws-sdk-2.223.1" + sources."aws-sdk-2.233.1" sources."aws-sign2-0.7.0" sources."aws4-1.7.0" - sources."base64-js-1.2.3" + sources."base64-js-1.3.0" sources."bcrypt-pbkdf-1.0.1" sources."boom-4.3.1" sources."buffer-4.9.1" @@ -31951,6 +32127,7 @@ in ]; }) sources."dashdash-1.14.1" + sources."decimal.js-10.0.0" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.1" sources."events-1.1.1" @@ -31978,7 +32155,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" - sources."lodash-4.17.5" + sources."lodash-4.17.10" + sources."lossless-json-1.0.2" sources."mime-db-1.33.0" sources."mime-types-2.1.18" sources."minimist-0.0.10" @@ -31986,14 +32164,14 @@ in sources."optimist-0.6.1" sources."performance-now-2.1.0" sources."punycode-1.3.2" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."querystring-0.2.0" (sources."request-2.85.0" // { dependencies = [ sources."punycode-1.4.1" ]; }) - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."sax-1.2.1" sources."sntp-2.1.0" sources."sshpk-1.14.1" @@ -32187,7 +32365,7 @@ in sources."repeat-string-1.6.1" sources."request-2.79.0" sources."rimraf-2.6.2" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."set-immediate-shim-1.0.1" sources."sntp-1.0.9" sources."split-1.0.1" @@ -32242,7 +32420,7 @@ in sources."asap-2.0.6" sources."auto-bind-1.2.0" sources."babel-code-frame-6.26.0" - sources."babel-core-6.26.0" + sources."babel-core-6.26.3" sources."babel-generator-6.26.1" sources."babel-helper-builder-react-jsx-6.26.0" sources."babel-helpers-6.24.1" @@ -32314,10 +32492,10 @@ in (sources."ink-0.3.1" // { dependencies = [ sources."ansi-styles-3.2.1" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."core-js-1.2.7" sources."strip-ansi-4.0.0" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" ]; }) sources."ink-text-input-1.1.1" @@ -32340,7 +32518,7 @@ in sources."json5-0.5.1" sources."load-json-file-1.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."lodash.debounce-4.0.8" sources."lodash.flattendeep-4.4.0" sources."lodash.isequal-4.5.0" @@ -32403,7 +32581,7 @@ in sources."require-from-string-1.2.1" sources."resolve-from-3.0.0" sources."restore-cursor-2.0.0" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-5.5.0" sources."setimmediate-1.0.5" @@ -32428,7 +32606,7 @@ in sources."to-fast-properties-1.0.3" sources."trim-newlines-1.0.0" sources."trim-right-1.0.1" - sources."ua-parser-js-0.7.17" + sources."ua-parser-js-0.7.18" sources."unicode-emoji-modifier-base-1.0.0" sources."url-parse-lax-1.0.0" sources."url-to-options-1.0.1" @@ -32483,10 +32661,10 @@ in sources."buffer-from-1.0.0" sources."caller-path-0.1.0" sources."callsites-0.2.0" - (sources."chalk-2.3.2" // { + (sources."chalk-2.4.1" // { dependencies = [ sources."ansi-styles-3.2.1" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" ]; }) sources."chardet-0.4.2" @@ -32523,13 +32701,13 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" - sources."globals-11.4.0" + sources."globals-11.5.0" sources."globby-5.0.0" sources."graceful-fs-4.1.11" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."iconv-lite-0.4.21" - sources."ignore-3.3.7" + sources."ignore-3.3.8" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -32547,7 +32725,7 @@ in sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."lru-cache-4.1.2" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" @@ -32580,7 +32758,7 @@ in sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-5.5.0" sources."shebang-command-1.2.0" @@ -32679,9 +32857,9 @@ in dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - (sources."chalk-2.3.2" // { + (sources."chalk-2.4.1" // { dependencies = [ - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" ]; }) sources."strip-ansi-4.0.0" @@ -32706,13 +32884,13 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" - sources."globals-11.4.0" + sources."globals-11.5.0" sources."globby-5.0.0" sources."graceful-fs-4.1.11" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."iconv-lite-0.4.21" - sources."ignore-3.3.7" + sources."ignore-3.3.8" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -32730,7 +32908,7 @@ in sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."lru-cache-4.1.2" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" @@ -32759,14 +32937,14 @@ in sources."readable-stream-2.3.6" sources."regexpp-1.1.0" sources."require-uncached-1.0.3" - sources."resolve-1.7.0" + sources."resolve-1.7.1" sources."resolve-from-1.0.1" sources."restore-cursor-2.0.0" sources."rimraf-2.6.2" sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-5.5.0" sources."shebang-command-1.2.0" @@ -32808,10 +32986,10 @@ in emojione = nodeEnv.buildNodePackage { name = "emojione"; packageName = "emojione"; - version = "3.1.2"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/emojione/-/emojione-3.1.2.tgz"; - sha1 = "991e30c80db4b1cf15eacb257620a7edce9c6ef4"; + url = "https://registry.npmjs.org/emojione/-/emojione-3.1.4.tgz"; + sha1 = "828767fbbe2ffd4fa75ebeeba9873e83643d6664"; }; buildInputs = globalBuildInputs; meta = { @@ -32933,11 +33111,11 @@ in (sources."ora-1.4.0" // { dependencies = [ sources."ansi-styles-3.2.1" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."cli-cursor-2.1.0" sources."onetime-2.0.1" sources."restore-cursor-2.0.0" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" ]; }) sources."os-tmpdir-1.0.2" @@ -32958,7 +33136,7 @@ in sources."progress-1.1.8" sources."promise-phantom-3.1.6" sources."punycode-1.4.1" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" sources."readable-stream-2.3.6" @@ -32967,7 +33145,7 @@ in sources."request-2.85.0" sources."request-progress-2.0.1" sources."restore-cursor-1.0.1" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."semver-5.5.0" sources."signal-exit-3.0.2" sources."sntp-2.1.0" @@ -33094,7 +33272,7 @@ in ]; }) sources."fs.realpath-1.0.0" - sources."fsevents-1.1.3" + sources."fsevents-1.2.3" sources."glob-7.1.2" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" @@ -33144,7 +33322,7 @@ in sources."preserve-0.2.0" (sources."prettyjson-1.2.1" // { dependencies = [ - sources."colors-1.2.1" + sources."colors-1.2.4" sources."minimist-1.2.0" ]; }) @@ -33170,7 +33348,7 @@ in sources."resumer-0.0.0" sources."revalidator-0.1.8" sources."rimraf-2.6.2" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."set-immediate-shim-1.0.1" sources."shush-1.0.0" sources."stack-trace-0.0.10" @@ -33209,7 +33387,7 @@ in dependencies = [ sources."async-2.6.0" sources."debug-3.1.0" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."lodash.groupby-4.6.0" sources."microee-0.0.6" sources."minilog-3.1.0" @@ -33395,7 +33573,7 @@ in sources."array-uniq-1.0.3" sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" - sources."atob-2.1.0" + sources."atob-2.1.1" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -33618,11 +33796,11 @@ in sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" sources."replace-ext-0.0.1" - sources."resolve-1.7.0" + sources."resolve-1.7.1" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."semver-4.3.6" sources."sequencify-0.0.7" @@ -33735,7 +33913,7 @@ in sha1 = "e21764eafe6429ec8dc9377b55e1ca86799704d5"; }; dependencies = [ - sources."eventemitter3-3.0.1" + sources."eventemitter3-3.1.0" sources."http-proxy-1.0.2" sources."lru-cache-2.5.2" sources."minimist-0.0.8" @@ -33831,10 +34009,10 @@ in html-minifier = nodeEnv.buildNodePackage { name = "html-minifier"; packageName = "html-minifier"; - version = "3.5.14"; + version = "3.5.15"; src = fetchurl { - url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.14.tgz"; - sha512 = "0ai1rga42v2z8mbnn2kv238fzi9p2nxzj7l2b4csgcg4wddmh697h1s4kmwipqqfd6ppi6xd26m2ynipkjm63sj48kjb0sh73mz165i"; + url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.15.tgz"; + sha512 = "01ni8s31nr1rb70wqi980nyfwir4z2z5mjvs454rgylns4nfyqvci581b40s1b67hgd95anq46j4yf5r947y5wzvncr7dgsysnvi5ir"; }; dependencies = [ sources."camel-case-3.0.0" @@ -33846,7 +34024,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.5.7" - (sources."uglify-js-3.3.20" // { + (sources."uglify-js-3.3.23" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -33879,7 +34057,9 @@ in sources."is-extglob-2.1.1" sources."is-glob-3.1.0" sources."mime-1.4.1" + sources."qs-6.5.1" sources."raw-body-1.1.7" + sources."safe-buffer-5.1.1" sources."setprototypeof-1.0.3" sources."statuses-1.4.0" sources."string_decoder-0.10.31" @@ -33914,9 +34094,12 @@ in sources."kind-of-4.0.0" ]; }) + sources."buffer-alloc-1.1.0" + sources."buffer-alloc-unsafe-0.1.1" sources."buffer-crc32-0.2.13" + sources."buffer-fill-0.1.1" sources."bytes-3.0.0" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."chardet-0.4.2" sources."chokidar-1.7.0" sources."chownr-1.0.1" @@ -33953,7 +34136,7 @@ in sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" - sources."eventemitter3-1.2.0" + sources."eventemitter3-3.1.0" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" (sources."express-4.16.3" // { @@ -33969,24 +34152,30 @@ in sources."filename-regex-2.0.1" sources."fill-range-2.2.3" sources."finalhandler-1.1.1" + sources."follow-redirects-1.4.1" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."form-data-2.3.2" sources."formidable-1.2.1" sources."forwarded-0.1.2" sources."fresh-0.5.2" + sources."fs-constants-1.0.0" sources."fs-minipass-1.2.5" sources."fs.realpath-1.0.0" - sources."fsevents-1.1.3" + sources."fsevents-1.2.3" sources."glob-7.1.2" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."graceful-fs-4.1.11" sources."has-flag-3.0.0" sources."http-errors-1.6.3" - sources."http-parser-js-0.4.11" - sources."http-proxy-1.16.2" - sources."http-proxy-middleware-0.17.4" + sources."http-parser-js-0.4.12" + sources."http-proxy-1.17.0" + (sources."http-proxy-middleware-0.17.4" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."iconv-lite-0.4.19" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -34012,7 +34201,7 @@ in sources."lazystream-1.0.0" sources."leek-0.0.24" sources."livereload-js-2.3.0" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."lodash._baseassign-3.2.0" sources."lodash._basecopy-3.0.1" sources."lodash._bindcallback-3.0.1" @@ -34062,7 +34251,7 @@ in sources."process-nextick-args-2.0.0" sources."proxy-addr-2.0.3" sources."pseudomap-1.0.2" - sources."qs-6.5.1" + sources."qs-6.5.2" (sources."randomatic-1.1.7" // { dependencies = [ (sources."is-number-3.0.0" // { @@ -34092,7 +34281,7 @@ in sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safe-json-parse-1.0.1" sources."sax-1.1.4" sources."semver-5.5.0" @@ -34110,14 +34299,15 @@ in sources."string-width-2.1.1" sources."string_decoder-1.1.1" sources."strip-ansi-4.0.0" - sources."superagent-3.8.2" - sources."supports-color-5.3.0" - (sources."tar-4.4.1" // { + sources."superagent-3.8.3" + sources."supports-color-5.4.0" + (sources."tar-4.4.2" // { dependencies = [ sources."minimist-0.0.8" + sources."safe-buffer-5.1.2" ]; }) - sources."tar-stream-1.5.5" + sources."tar-stream-1.6.0" sources."through-2.3.8" (sources."tiny-lr-1.1.1" // { dependencies = [ @@ -34125,6 +34315,7 @@ in ]; }) sources."tmp-0.0.33" + sources."to-buffer-1.1.1" sources."tslib-1.9.0" sources."type-is-1.6.16" sources."ultron-1.1.1" @@ -34279,7 +34470,7 @@ in sources."bufrw-1.2.1" sources."chai-4.1.2" sources."chai-as-promised-7.1.1" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."check-error-1.0.2" sources."color-convert-1.9.1" sources."color-name-1.1.3" @@ -34302,7 +34493,7 @@ in sources."opentracing-0.13.0" ]; }) - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."long-2.4.0" sources."minimatch-3.0.4" sources."mz-2.7.0" @@ -34313,11 +34504,11 @@ in sources."opentracing-0.14.3" sources."path-is-absolute-1.0.1" sources."pathval-1.1.0" - sources."rxjs-5.5.8" + sources."rxjs-5.5.10" sources."semaphore-async-await-1.5.1" sources."string-similarity-1.2.0" sources."string-template-0.2.1" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" sources."symbol-observable-1.0.1" sources."thenify-3.3.0" sources."thenify-all-1.6.0" @@ -34605,7 +34796,7 @@ in sources."inherits-2.0.3" sources."isarray-1.0.0" sources."js-yaml-3.11.0" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."methods-1.1.2" sources."mime-1.6.0" sources."mime-db-1.33.0" @@ -34615,13 +34806,13 @@ in sources."path-loader-1.0.4" sources."process-nextick-args-2.0.0" sources."punycode-2.1.0" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."readable-stream-2.3.6" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."slash-1.0.0" sources."sprintf-js-1.0.3" sources."string_decoder-1.1.1" - sources."superagent-3.8.2" + sources."superagent-3.8.3" sources."uri-js-3.0.2" sources."util-deprecate-1.0.2" ]; @@ -34637,10 +34828,10 @@ in json-server = nodeEnv.buildNodePackage { name = "json-server"; packageName = "json-server"; - version = "0.12.1"; + version = "0.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/json-server/-/json-server-0.12.1.tgz"; - sha512 = "3isg3ph43vqfq6m6pg0d1iy7gj2gc6jgym0gp3ng7p9fv7bf1q43isf3wbc7bc9w5swsxqjc3v304ic8iinilwrkwxgks1alaxjs3si"; + url = "https://registry.npmjs.org/json-server/-/json-server-0.12.2.tgz"; + sha512 = "3dqw05mkw5k42zdpjhg3cjiq7bfh8x1zxllrwyz0jgwmd4p79079fhsiifazqa5is659lzdnmiyiabxy62jjjk55xa296rdhyajc2vm"; }; dependencies = [ sources."accepts-1.3.5" @@ -34667,10 +34858,10 @@ in sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" sources."caseless-0.12.0" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."ci-info-1.1.3" sources."cli-boxes-1.0.0" - sources."cliui-4.0.0" + sources."cliui-4.1.0" sources."co-4.6.0" sources."code-point-at-1.1.0" sources."color-convert-1.9.1" @@ -34697,7 +34888,7 @@ in sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decamelize-1.2.0" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" @@ -34775,7 +34966,7 @@ in sources."latest-version-3.1.0" sources."lcid-1.0.0" sources."locate-path-2.0.0" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."lodash-id-0.14.0" sources."lowdb-0.15.5" sources."lowercase-keys-1.0.1" @@ -34814,7 +35005,7 @@ in sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" sources."pify-3.0.0" - sources."please-upgrade-node-3.0.1" + sources."please-upgrade-node-3.0.2" sources."pluralize-7.0.0" sources."prepend-http-1.0.4" sources."proxy-addr-2.0.3" @@ -34828,7 +35019,7 @@ in sources."http-errors-1.6.2" ]; }) - sources."rc-1.2.6" + sources."rc-1.2.7" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."request-2.85.0" @@ -34836,6 +35027,7 @@ in sources."require-main-filename-1.0.1" sources."safe-buffer-5.1.1" sources."semver-5.5.0" + sources."semver-compare-1.0.0" sources."semver-diff-2.1.0" sources."send-0.16.2" sources."serve-static-1.13.2" @@ -34854,7 +35046,7 @@ in sources."strip-ansi-4.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" sources."term-size-1.2.0" sources."timed-out-4.0.1" sources."tough-cookie-2.3.4" @@ -34864,7 +35056,7 @@ in sources."unique-string-1.0.0" sources."unpipe-1.0.0" sources."unzip-response-2.0.1" - sources."update-notifier-2.4.0" + sources."update-notifier-2.5.0" sources."url-parse-lax-1.0.0" sources."utils-merge-1.0.1" sources."uuid-3.2.1" @@ -34925,16 +35117,13 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "2.0.0"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-2.0.0.tgz"; - sha512 = "0iyj9ic6sj94x4xdd6wy8zgabqbl2ydrsp8h76lwrcx27ns8pzd7bg8yibsjgddzkisb9p1gp6bn46b8g5m2lh3yj5vqx55q2ks7lib"; + url = "https://registry.npmjs.org/karma/-/karma-2.0.2.tgz"; + sha1 = "4d2db9402850a66551fa784b0164fb0824ed8c4b"; }; dependencies = [ - sources."JSONStream-1.3.2" sources."accepts-1.3.5" - sources."acorn-4.0.13" - sources."acorn-node-1.3.0" sources."addressparser-1.0.1" sources."after-0.8.2" sources."agent-base-2.1.1" @@ -34949,18 +35138,12 @@ in sources."anymatch-1.3.2" sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" - sources."array-filter-0.0.1" - sources."array-map-0.0.0" - sources."array-reduce-0.0.0" sources."array-slice-0.2.3" sources."array-unique-0.2.1" sources."arraybuffer.slice-0.0.7" sources."asn1-0.2.3" - sources."asn1.js-4.10.1" - sources."assert-1.4.1" sources."assert-plus-1.0.0" sources."ast-types-0.11.3" - sources."astw-2.2.0" sources."async-2.1.5" sources."async-each-1.0.1" sources."async-limiter-1.0.0" @@ -34976,7 +35159,6 @@ in sources."backo2-1.0.2" sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.5" - sources."base64-js-1.2.3" sources."base64id-1.0.0" sources."bcrypt-pbkdf-1.0.1" sources."better-assert-1.0.2" @@ -34985,7 +35167,6 @@ in sources."bl-1.1.2" sources."blob-0.0.4" sources."bluebird-3.5.1" - sources."bn.js-4.11.8" (sources."body-parser-1.18.2" // { dependencies = [ sources."setprototypeof-1.0.3" @@ -34998,102 +35179,51 @@ in sources."kind-of-4.0.0" ]; }) - sources."brorand-1.1.0" - sources."browser-pack-6.1.0" - (sources."browser-resolve-1.11.2" // { - dependencies = [ - sources."resolve-1.1.7" - ]; - }) - (sources."browserify-14.5.0" // { - dependencies = [ - sources."acorn-5.5.3" - sources."hash-base-2.0.2" - sources."isarray-2.0.4" - sources."process-nextick-args-2.0.0" - sources."source-map-0.5.7" - ]; - }) - sources."browserify-aes-1.2.0" - sources."browserify-cipher-1.0.0" - sources."browserify-des-1.0.0" - sources."browserify-rsa-4.0.1" - sources."browserify-sign-4.0.4" - sources."browserify-zlib-0.2.0" - sources."buffer-5.1.0" - sources."buffer-from-1.0.0" sources."buffer-more-ints-0.0.2" - sources."buffer-xor-1.0.3" sources."buildmail-4.0.1" - sources."builtin-status-codes-3.0.0" sources."bytes-3.0.0" - sources."cached-path-relative-1.0.1" sources."callsite-1.0.0" sources."caseless-0.12.0" sources."chalk-1.1.3" sources."chokidar-1.7.0" - sources."cipher-base-1.0.4" - sources."circular-json-0.5.1" + sources."circular-json-0.5.3" sources."co-4.6.0" - sources."colors-1.2.1" + sources."colors-1.2.4" sources."combine-lists-1.0.1" - sources."combine-source-map-0.8.0" sources."combined-stream-1.0.6" sources."commander-2.15.1" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" sources."concat-map-0.0.1" - (sources."concat-stream-1.5.2" // { - dependencies = [ - sources."readable-stream-2.0.6" - sources."string_decoder-0.10.31" - ]; - }) (sources."connect-3.6.6" // { dependencies = [ sources."statuses-1.3.1" ]; }) - sources."console-browserify-1.1.0" - sources."constants-browserify-1.0.0" sources."content-type-1.0.4" - sources."convert-source-map-1.1.3" sources."cookie-0.3.1" sources."core-js-2.5.5" sources."core-util-is-1.0.2" - sources."create-ecdh-4.0.0" - sources."create-hash-1.1.3" - sources."create-hmac-1.1.6" (sources."cryptiles-3.1.2" // { dependencies = [ sources."boom-5.2.0" ]; }) - sources."crypto-browserify-3.12.0" sources."custom-event-1.0.1" sources."dashdash-1.14.1" sources."data-uri-to-buffer-1.2.0" sources."date-format-1.2.0" - sources."date-now-0.1.4" sources."debug-2.6.9" sources."deep-is-0.1.3" - sources."defined-1.0.0" sources."degenerator-1.0.4" sources."delayed-stream-1.0.0" sources."depd-1.1.2" - sources."deps-sort-2.0.0" - sources."des.js-1.0.0" - sources."detective-4.7.1" sources."di-0.0.1" - sources."diffie-hellman-5.0.2" sources."dom-serialize-2.2.1" - sources."domain-browser-1.1.7" sources."double-ended-queue-2.1.0-0" - sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.1" sources."ee-first-1.1.1" - sources."elliptic-6.4.0" sources."encodeurl-1.0.2" (sources."engine.io-3.1.5" // { dependencies = [ @@ -35113,9 +35243,7 @@ in sources."esprima-3.1.3" sources."estraverse-4.2.0" sources."esutils-2.0.2" - sources."eventemitter3-1.2.0" - sources."events-1.1.1" - sources."evp_bytestokey-1.0.3" + sources."eventemitter3-3.1.0" (sources."expand-braces-0.1.2" // { dependencies = [ sources."braces-0.1.5" @@ -35136,19 +35264,18 @@ in sources."filename-regex-2.0.1" sources."fill-range-2.2.3" sources."finalhandler-1.1.0" - sources."follow-redirects-1.0.0" + sources."follow-redirects-1.4.1" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."forever-agent-0.6.1" sources."form-data-2.3.2" sources."fs.realpath-1.0.0" - sources."fsevents-1.1.3" + sources."fsevents-1.2.3" (sources."ftp-0.3.10" // { dependencies = [ sources."readable-stream-1.1.14" ]; }) - sources."function-bind-1.1.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."get-uri-2.0.1" @@ -35159,37 +35286,28 @@ in sources."graceful-fs-4.1.11" sources."har-schema-2.0.0" sources."har-validator-5.0.3" - sources."has-1.0.1" sources."has-ansi-2.0.0" sources."has-binary2-1.0.2" sources."has-cors-1.1.0" - sources."hash-base-3.0.4" - sources."hash.js-1.1.3" sources."hawk-6.0.2" sources."hipchat-notifier-1.1.0" - sources."hmac-drbg-1.0.1" sources."hoek-4.2.1" - sources."htmlescape-1.1.1" sources."http-errors-1.6.3" - sources."http-proxy-1.16.2" + (sources."http-proxy-1.17.0" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."http-proxy-agent-1.0.0" sources."http-signature-1.2.0" sources."httpntlm-1.6.1" sources."httpreq-0.4.24" - sources."https-browserify-1.0.0" sources."https-proxy-agent-1.0.0" sources."iconv-lite-0.4.19" - sources."ieee754-1.1.11" sources."indexof-0.0.1" sources."inflection-1.10.0" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."inline-source-map-0.6.2" - (sources."insert-module-globals-7.0.6" // { - dependencies = [ - sources."concat-stream-1.6.2" - ]; - }) sources."ip-1.0.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" @@ -35213,21 +35331,15 @@ in sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.3.1" - sources."json-stable-stringify-0.0.1" sources."json-stringify-safe-5.0.1" - sources."jsonify-0.0.0" - sources."jsonparse-1.3.1" sources."jsonpointer-4.0.1" sources."jsprim-1.4.1" sources."kind-of-3.2.2" - sources."labeled-stream-splicer-2.0.1" sources."levn-0.3.0" - sources."lexical-scope-1.2.0" sources."libbase64-0.1.0" sources."libmime-3.0.0" sources."libqp-1.1.0" - sources."lodash-4.17.5" - sources."lodash.memoize-3.0.4" + sources."lodash-4.17.10" (sources."log4js-2.5.3" // { dependencies = [ sources."assert-plus-0.2.0" @@ -35237,6 +35349,7 @@ in sources."co-3.0.6" sources."cryptiles-2.0.5" sources."debug-3.1.0" + sources."follow-redirects-1.0.0" sources."form-data-2.0.0" sources."har-validator-2.0.6" sources."hawk-3.1.3" @@ -35245,8 +35358,8 @@ in sources."iconv-lite-0.4.15" sources."ip-1.1.5" sources."isarray-0.0.1" - sources."minimist-0.0.8" sources."ms-0.7.1" + sources."process-nextick-args-1.0.7" sources."qs-6.2.3" sources."readable-stream-2.0.6" sources."request-2.75.0" @@ -35266,19 +35379,14 @@ in sources."semver-5.0.3" ]; }) - sources."md5.js-1.3.4" sources."media-typer-0.3.0" sources."micromatch-2.3.11" - sources."miller-rabin-4.0.1" sources."mime-1.6.0" sources."mime-db-1.33.0" sources."mime-types-2.1.18" - sources."minimalistic-assert-1.0.0" - sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" - sources."minimist-1.2.0" + sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."module-deps-4.1.1" sources."ms-2.0.0" sources."nan-2.10.0" sources."negotiator-0.6.1" @@ -35299,48 +35407,34 @@ in sources."once-1.4.0" (sources."optimist-0.6.1" // { dependencies = [ - sources."minimist-0.0.10" sources."wordwrap-0.0.3" ]; }) sources."optionator-0.8.2" - sources."os-browserify-0.3.0" sources."os-tmpdir-1.0.2" sources."pac-proxy-agent-1.1.0" sources."pac-resolver-2.0.0" - sources."pako-1.0.6" - sources."parents-1.0.1" - sources."parse-asn1-5.1.0" sources."parse-glob-3.0.4" sources."parseqs-0.0.5" sources."parseuri-0.0.5" sources."parseurl-1.3.2" - sources."path-browserify-0.0.0" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.5" - sources."path-platform-0.11.15" (sources."path-proxy-1.0.0" // { dependencies = [ sources."inflection-1.3.8" ]; }) - sources."pbkdf2-3.0.14" sources."performance-now-2.1.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."prelude-ls-1.1.2" sources."preserve-0.2.0" - sources."process-0.11.10" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."proxy-agent-2.0.0" - sources."pseudomap-1.0.2" - sources."public-encrypt-4.0.0" sources."punycode-1.4.1" sources."q-1.4.1" sources."qjobs-1.2.0" sources."qs-6.5.1" - sources."querystring-0.2.0" - sources."querystring-es3-0.2.1" (sources."randomatic-1.1.7" // { dependencies = [ (sources."is-number-3.0.0" // { @@ -35350,8 +35444,6 @@ in }) ]; }) - sources."randombytes-2.0.6" - sources."randomfill-1.0.4" sources."range-parser-1.2.0" (sources."raw-body-2.3.2" // { dependencies = [ @@ -35359,13 +35451,7 @@ in sources."http-errors-1.6.2" ]; }) - sources."read-only-stream-2.0.0" - (sources."readable-stream-2.3.6" // { - dependencies = [ - sources."isarray-1.0.0" - sources."string_decoder-1.1.1" - ]; - }) + sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."redis-2.8.0" sources."redis-commands-1.3.5" @@ -35377,16 +35463,11 @@ in sources."request-2.85.0" sources."requestretry-1.13.0" sources."requires-port-1.0.0" - sources."resolve-1.7.0" sources."rimraf-2.6.2" - sources."ripemd160-2.0.1" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."semver-5.5.0" sources."set-immediate-shim-1.0.1" sources."setprototypeof-1.1.0" - sources."sha.js-2.4.11" - sources."shasum-1.0.2" - sources."shell-quote-1.6.1" sources."slack-node-0.2.0" sources."smart-buffer-1.1.15" sources."smtp-connection-2.12.0" @@ -35408,50 +35489,27 @@ in sources."source-map-0.6.1" sources."sshpk-1.14.1" sources."statuses-1.5.0" - sources."stream-browserify-2.0.1" - sources."stream-combiner2-1.1.1" - sources."stream-http-2.8.1" - sources."stream-splicer-2.0.0" sources."streamroller-0.7.0" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" - sources."subarg-1.0.0" sources."supports-color-2.0.0" - sources."syntax-error-1.4.0" - sources."through-2.3.8" - sources."through2-2.0.3" sources."thunkify-2.1.2" - sources."timers-browserify-1.4.2" sources."timespan-2.3.0" sources."tmp-0.0.33" sources."to-array-0.1.4" - sources."to-arraybuffer-1.0.1" sources."tough-cookie-2.3.4" sources."tsscmp-1.0.5" - sources."tty-browserify-0.0.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."type-is-1.6.16" - sources."typedarray-0.0.6" sources."ultron-1.1.1" - sources."umd-3.0.3" sources."underscore-1.7.0" sources."unpipe-1.0.0" - (sources."url-0.11.0" // { + (sources."useragent-2.2.1" // { dependencies = [ - sources."punycode-1.3.2" - ]; - }) - (sources."useragent-2.3.0" // { - dependencies = [ - sources."lru-cache-4.1.2" - ]; - }) - (sources."util-0.10.3" // { - dependencies = [ - sources."inherits-2.0.1" + sources."lru-cache-2.2.4" ]; }) sources."util-deprecate-1.0.2" @@ -35459,7 +35517,6 @@ in sources."uuid-3.2.1" sources."uws-9.14.0" sources."verror-1.10.0" - sources."vm-browserify-0.0.4" sources."void-elements-2.0.1" sources."when-3.7.8" sources."wordwrap-1.0.0" @@ -35468,7 +35525,6 @@ in sources."xmlhttprequest-ssl-1.5.5" sources."xregexp-2.0.0" sources."xtend-4.0.1" - sources."yallist-2.1.2" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; @@ -35644,10 +35700,10 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "2.10.1"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-2.10.1.tgz"; - sha512 = "1y2pnipc1wsra1gdj77c4217xcycdwycda28drnh7sf43hcw4ang1x859i95m084v9ahcjysdb7ap2c3zk6ivm0q3way48k1xxnci57"; + url = "https://registry.npmjs.org/lerna/-/lerna-2.11.0.tgz"; + sha512 = "22hg2kpml4wkbgp15nzbhcs81kdaynq0prspzmbfrr5hpbga1cz8vl2adc4dry1lcxs36s2w5pbsvrdic4bw623vx8nngxn0z7kl0wj"; }; dependencies = [ sources."JSONStream-1.3.2" @@ -35674,7 +35730,7 @@ in sources."camelcase-keys-2.1.0" sources."capture-stack-trace-1.0.0" sources."center-align-0.1.3" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."chardet-0.4.2" sources."ci-info-1.1.3" sources."cli-cursor-2.1.0" @@ -35691,7 +35747,7 @@ in sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."console-control-strings-1.1.0" - (sources."conventional-changelog-1.1.23" // { + (sources."conventional-changelog-1.1.24" // { dependencies = [ sources."camelcase-4.1.0" sources."map-obj-1.0.1" @@ -35700,7 +35756,7 @@ in }) sources."conventional-changelog-angular-1.6.6" sources."conventional-changelog-atom-0.2.8" - (sources."conventional-changelog-cli-1.3.21" // { + (sources."conventional-changelog-cli-1.3.22" // { dependencies = [ sources."camelcase-2.1.1" sources."camelcase-keys-4.2.0" @@ -35724,12 +35780,12 @@ in ]; }) sources."conventional-changelog-codemirror-0.3.8" - (sources."conventional-changelog-core-2.0.10" // { + (sources."conventional-changelog-core-2.0.11" // { dependencies = [ - sources."meow-4.0.0" + sources."meow-4.0.1" ]; }) - sources."conventional-changelog-ember-0.3.11" + sources."conventional-changelog-ember-0.3.12" sources."conventional-changelog-eslint-1.0.9" sources."conventional-changelog-express-0.3.6" sources."conventional-changelog-jquery-0.1.0" @@ -35754,7 +35810,7 @@ in sources."decamelize-1.2.0" sources."decamelize-keys-1.1.0" sources."dedent-0.7.0" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."defaults-1.0.3" sources."delegates-1.0.0" sources."detect-indent-5.0.0" @@ -35843,7 +35899,7 @@ in ]; }) sources."locate-path-2.0.0" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."lodash._reinterpolate-3.0.0" sources."lodash.template-4.4.0" sources."lodash.templatesettings-4.1.0" @@ -35854,7 +35910,7 @@ in sources."make-dir-1.2.0" sources."map-obj-1.0.1" sources."mem-1.1.0" - (sources."meow-4.0.0" // { + (sources."meow-4.0.1" // { dependencies = [ sources."find-up-2.1.0" sources."load-json-file-4.0.0" @@ -35870,7 +35926,7 @@ in sources."minimist-options-3.0.2" sources."mkdirp-0.5.1" sources."modify-values-1.0.1" - sources."moment-2.22.0" + sources."moment-2.22.1" sources."mute-stream-0.0.7" sources."normalize-package-data-2.4.0" sources."npm-run-path-2.0.2" @@ -35911,7 +35967,7 @@ in sources."pseudomap-1.0.2" sources."q-1.5.1" sources."quick-lru-1.1.0" - sources."rc-1.2.6" + sources."rc-1.2.7" sources."read-cmd-shim-1.0.1" sources."read-pkg-3.0.0" sources."read-pkg-up-1.0.1" @@ -35929,7 +35985,7 @@ in sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-5.5.0" sources."set-blocking-2.0.0" @@ -35957,7 +36013,7 @@ in sources."minimist-0.1.0" ]; }) - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" sources."temp-dir-1.0.0" (sources."temp-write-3.4.0" // { dependencies = [ @@ -36031,74 +36087,71 @@ in less = nodeEnv.buildNodePackage { name = "less"; packageName = "less"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-3.0.1.tgz"; - sha512 = "25qmszxk5bzrjgyy1m0k87zc1c5h19ckvnlkhl9j3ncm3zfx7rzmydj6f4sw5c7ldc4npzs41fmgd1hw113kilrk8sggwzwvfw7hi59"; + url = "https://registry.npmjs.org/less/-/less-3.0.2.tgz"; + sha512 = "1hs3nj50rw6qlk3hjkd6ynhdv7mdlawwl4jzl3d43kbijkych51dm15ccb1ra7i9pmaq13nm24rkzf3bxv3fcpcrqq499cp0lbyg2cj"; }; dependencies = [ - sources."ajv-4.11.8" + sources."ajv-5.5.2" sources."asap-2.0.6" sources."asn1-0.2.3" - sources."assert-plus-0.2.0" + sources."assert-plus-1.0.0" sources."asynckit-0.4.0" - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."bcrypt-pbkdf-1.0.1" - sources."boom-2.10.1" + sources."boom-4.3.1" sources."caseless-0.12.0" sources."co-4.6.0" sources."combined-stream-1.0.6" sources."core-util-is-1.0.2" - sources."cryptiles-2.0.5" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.1" sources."errno-0.1.7" sources."extend-3.0.1" sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" + sources."form-data-2.3.2" sources."getpass-0.1.7" sources."graceful-fs-4.1.11" - sources."har-schema-1.0.5" - sources."har-validator-4.2.1" - sources."hawk-3.1.3" - sources."hoek-2.16.3" - sources."http-signature-1.1.1" + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."hoek-4.2.1" + sources."http-signature-1.2.0" sources."image-size-0.5.5" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" - sources."json-stable-stringify-1.0.1" + sources."json-schema-traverse-0.3.1" sources."json-stringify-safe-5.0.1" - sources."jsonify-0.0.0" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."jsprim-1.4.1" sources."mime-1.6.0" sources."mime-db-1.33.0" sources."mime-types-2.1.18" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" + sources."performance-now-2.1.0" sources."promise-7.3.1" sources."prr-1.0.1" sources."punycode-1.4.1" - sources."qs-6.4.0" - sources."request-2.81.0" - sources."safe-buffer-5.1.1" - sources."sntp-1.0.9" + sources."qs-6.5.2" + sources."request-2.85.0" + sources."safe-buffer-5.1.2" + sources."sntp-2.1.0" sources."source-map-0.5.7" - (sources."sshpk-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."sshpk-1.14.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" @@ -36164,7 +36217,7 @@ in sources."concat-map-0.0.1" sources."convert-source-map-1.5.1" sources."core-util-is-1.0.2" - sources."duplexify-3.5.4" + sources."duplexify-3.6.0" sources."end-of-stream-1.4.1" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" @@ -36242,7 +36295,7 @@ in sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."stream-shift-1.0.0" sources."string_decoder-1.1.1" sources."strip-bom-2.0.0" @@ -36363,6 +36416,7 @@ in sources."expand-range-1.8.2" (sources."express-4.16.3" // { dependencies = [ + sources."safe-buffer-5.1.1" sources."statuses-1.4.0" ]; }) @@ -36380,7 +36434,7 @@ in sources."form-data-2.3.2" sources."forwarded-0.1.2" sources."fresh-0.5.2" - sources."fsevents-1.1.3" + sources."fsevents-1.2.3" sources."getpass-0.1.7" sources."github-slugger-1.2.0" sources."glob-base-0.3.0" @@ -36480,7 +36534,7 @@ in sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" sources."request-2.85.0" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."send-0.16.2" sources."serve-static-1.13.2" sources."set-immediate-shim-1.0.1" @@ -36555,7 +36609,7 @@ in ]; }) sources."chokidar-1.7.0" - sources."colors-1.2.1" + sources."colors-1.2.4" sources."concat-map-0.0.1" sources."connect-3.5.1" sources."core-util-is-1.0.2" @@ -36580,13 +36634,13 @@ in sources."for-own-0.1.5" sources."fresh-0.5.2" sources."from-0.1.7" - sources."fsevents-1.1.3" + sources."fsevents-1.2.3" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."graceful-fs-4.1.11" sources."http-auth-3.1.3" sources."http-errors-1.6.3" - sources."http-parser-js-0.4.11" + sources."http-parser-js-0.4.12" sources."inherits-2.0.3" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" @@ -36612,6 +36666,7 @@ in dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" + sources."safe-buffer-5.1.1" ]; }) sources."ms-0.7.1" @@ -36646,7 +36701,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" (sources."send-0.16.2" // { dependencies = [ sources."debug-2.6.9" @@ -36724,10 +36779,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "5.0.5"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-5.0.5.tgz"; - sha512 = "20cyp9x4b3gfrd50w8dcfkm0dv2mc6z0ikvfpkc8dzca6hppslgn0yiw2qdzc4ggf234kzcdvs0hw7lnv7ywilaml4w39vr6r93ghyw"; + url = "https://registry.npmjs.org/mocha/-/mocha-5.1.1.tgz"; + sha512 = "23wcnn35p90xhsc5z94w45s30j756s97acm313h6lacnbliqlaka3drq2xbsi4br8gdkld3r4dc33vglq8kf5jb408c7b2agpyar8lh"; }; dependencies = [ sources."balanced-match-1.0.0" @@ -36790,7 +36845,7 @@ in sources."isarray-1.0.0" sources."js-yaml-3.11.0" sources."json-refs-2.1.7" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."methods-1.1.2" sources."mime-1.6.0" sources."mime-db-1.33.0" @@ -36800,13 +36855,13 @@ in sources."path-loader-1.0.4" sources."process-nextick-args-2.0.0" sources."punycode-2.1.0" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."readable-stream-2.3.6" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."slash-1.0.0" sources."sprintf-js-1.0.3" sources."string_decoder-1.1.1" - sources."superagent-3.8.2" + sources."superagent-3.8.3" sources."uri-js-3.0.2" sources."util-deprecate-1.0.2" ]; @@ -36928,7 +36983,7 @@ in sources."nijs-0.0.25" sources."nopt-3.0.6" sources."normalize-package-data-2.4.0" - sources."npm-package-arg-6.0.0" + sources."npm-package-arg-6.1.0" sources."npm-registry-client-8.5.1" (sources."npmconf-2.1.2" // { dependencies = [ @@ -36949,12 +37004,12 @@ in sources."process-nextick-args-2.0.0" sources."proto-list-1.2.4" sources."punycode-1.4.1" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."readable-stream-2.3.6" sources."request-2.85.0" sources."retry-0.10.1" sources."rimraf-2.2.8" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."semver-5.5.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" @@ -37085,11 +37140,11 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.0" sources."punycode-1.4.1" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."readable-stream-2.3.6" sources."request-2.85.0" sources."rimraf-2.6.2" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."semver-5.3.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" @@ -37168,7 +37223,7 @@ in sources."yargs-1.3.3" ]; }) - sources."big-integer-1.6.27" + sources."big-integer-1.6.28" sources."block-stream-0.0.9" (sources."body-parser-1.18.2" // { dependencies = [ @@ -37204,7 +37259,7 @@ in sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decamelize-1.2.0" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."default-browser-id-1.0.4" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -37327,7 +37382,7 @@ in sources."http-errors-1.6.2" ]; }) - sources."rc-1.2.6" + sources."rc-1.2.7" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" sources."readable-stream-2.3.6" @@ -37419,10 +37474,10 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.9.0.tgz"; - sha1 = "bdd4c3afac9b1b1ebff0a9ff3362859eb6781bb8"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz"; + sha512 = "10s7f95mxnxcwziwzx44l62zy3yjmhky942pw134dbd48wshl7abr1ja8qx1rfzz9vgygcx1vlz1jlldy61da33zq0bfi8bfji09f8v"; }; dependencies = [ sources."abbrev-1.1.1" @@ -37437,7 +37492,7 @@ in sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" sources."debug-2.6.9" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."delegates-1.0.0" sources."detect-libc-1.0.3" sources."fs-minipass-1.2.5" @@ -37458,7 +37513,7 @@ in sources."minizlib-1.1.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" - sources."needle-2.2.0" + sources."needle-2.2.1" sources."nopt-4.0.1" sources."npm-bundled-1.0.3" sources."npm-packlist-1.1.10" @@ -37471,14 +37526,14 @@ in sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" sources."process-nextick-args-2.0.0" - (sources."rc-1.2.6" // { + (sources."rc-1.2.7" // { dependencies = [ sources."minimist-1.2.0" ]; }) sources."readable-stream-2.3.6" sources."rimraf-2.6.2" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."semver-5.5.0" @@ -37488,7 +37543,7 @@ in sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."tar-4.4.1" + sources."tar-4.4.2" sources."util-deprecate-1.0.2" sources."wide-align-1.1.2" sources."wrappy-1.0.2" @@ -37506,10 +37561,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "1.17.3"; + version = "1.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.3.tgz"; - sha512 = "1i6m13ad9c1p8xilw0vjcgmj0nnk1y9b3lncx6kwljxw89hmk5z9vv8m452wfd5qg9bqf9r0b236d9vxbc3i2sx2flamfrr03xm42zh"; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.4.tgz"; + sha512 = "3bmxd7fd494gy4ddax3mihjz1iy484iakyssbhy87cc2kwbky9xkb8l47vphc3n858q9p9afxl57w0849i24amsdjhwbqh8vxhjy1v5"; }; dependencies = [ sources."abbrev-1.1.1" @@ -37530,7 +37585,7 @@ in sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" sources."async-each-1.0.1" - sources."atob-2.1.0" + sources."atob-2.1.1" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -37555,7 +37610,7 @@ in sources."cache-base-1.0.1" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" - sources."chalk-2.3.2" + sources."chalk-2.4.1" (sources."chokidar-2.0.3" // { dependencies = [ sources."debug-2.6.9" @@ -37602,7 +37657,7 @@ in sources."crypto-random-string-1.0.0" sources."debug-3.1.0" sources."decode-uri-component-0.2.0" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."define-property-2.0.2" sources."dot-prop-4.2.0" sources."duplexer-0.1.1" @@ -37627,7 +37682,7 @@ in sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."from-0.1.7" - sources."fsevents-1.1.3" + sources."fsevents-1.2.3" sources."get-stream-3.0.0" sources."get-value-2.0.6" (sources."glob-parent-3.1.0" // { @@ -37721,7 +37776,7 @@ in sources."ps-tree-1.1.0" sources."pseudomap-1.0.2" sources."pstree.remy-1.1.0" - sources."rc-1.2.6" + sources."rc-1.2.7" sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."regex-not-1.0.2" @@ -37732,7 +37787,7 @@ in sources."repeat-string-1.6.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."semver-5.5.0" sources."semver-diff-2.1.0" @@ -37771,7 +37826,7 @@ in sources."strip-ansi-4.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" sources."term-size-1.2.0" sources."through-2.3.8" sources."timed-out-4.0.1" @@ -37800,8 +37855,8 @@ in ]; }) sources."unzip-response-2.0.1" - sources."upath-1.0.4" - sources."update-notifier-2.4.0" + sources."upath-1.0.5" + sources."update-notifier-2.5.0" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" (sources."use-3.1.0" // { @@ -37902,7 +37957,7 @@ in sources."css-what-2.1.0" sources."dashdash-1.14.1" sources."debug-2.6.9" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -37912,7 +37967,7 @@ in sources."domelementtype-1.3.0" sources."domhandler-2.4.1" sources."domutils-1.5.1" - sources."duplexify-3.5.4" + sources."duplexify-3.6.0" sources."ecc-jsbn-0.1.1" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" @@ -38043,8 +38098,8 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mkdirp-0.5.1" - sources."moment-2.22.0" - sources."moment-timezone-0.5.14" + sources."moment-2.22.1" + sources."moment-timezone-0.5.16" (sources."mqtt-2.15.1" // { dependencies = [ sources."ws-3.3.3" @@ -38067,7 +38122,7 @@ in sources."needle-0.11.0" sources."negotiator-0.6.1" sources."node-pre-gyp-0.6.36" - (sources."node-red-node-email-0.1.27" // { + (sources."node-red-node-email-0.1.29" // { dependencies = [ sources."addressparser-1.0.1" sources."clone-1.0.4" @@ -38121,7 +38176,7 @@ in sources."proxy-addr-2.0.3" sources."pseudomap-1.0.2" sources."pump-2.0.1" - sources."pumpify-1.4.0" + sources."pumpify-1.5.0" sources."punycode-1.4.1" sources."qs-6.5.1" sources."random-bytes-1.0.0" @@ -38133,7 +38188,7 @@ in sources."setprototypeof-1.0.3" ]; }) - sources."rc-1.2.6" + sources."rc-1.2.7" sources."readable-stream-2.3.6" sources."reinterval-1.1.0" sources."remove-trailing-separator-1.1.0" @@ -38293,7 +38348,7 @@ in sources."natives-1.1.3" (sources."net-ping-1.1.7" // { dependencies = [ - sources."nan-2.3.5" + sources."nan-2.10.0" ]; }) sources."nodemailer-0.3.35" @@ -38308,7 +38363,7 @@ in sources."qs-0.5.1" sources."rai-0.1.12" sources."range-parser-0.0.4" - sources."raw-socket-1.5.2" + sources."raw-socket-1.6.0" sources."redis-0.7.3" sources."semver-1.1.0" sources."send-0.1.0" @@ -38344,10 +38399,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "5.8.0"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.8.0.tgz"; - sha512 = "32zs775qksijpj23rwly4h8gs435lbsgaxzw6dmyjjg3i8qd40bmmadv3ac9mdxd0cd2x0m3ncsqa0j5vkmkvh8dknn0j9d1k6ig30f"; + url = "https://registry.npmjs.org/npm/-/npm-6.0.0.tgz"; + sha512 = "1s1pq7rdh5xxd4phq7bf1fikbfwc9iiglgayiy0bf14skvivj96j7f5mzyh3631gzhm7vmpak0k523axik5n4hza8gd8c90s203plqj"; }; buildInputs = globalBuildInputs; meta = { @@ -38486,12 +38541,12 @@ in sources."process-nextick-args-2.0.0" sources."proto-list-1.2.4" sources."punycode-1.4.1" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."readable-stream-2.3.6" sources."request-2.85.0" sources."retry-0.6.0" sources."rimraf-2.6.2" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."semver-4.3.6" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" @@ -38538,153 +38593,74 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "2.14.1"; + version = "2.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.14.1.tgz"; - sha512 = "1ciz9n8wmwq3lpi3g6xmjr4plqf3ydpqznrcci5bbrq7d9clkmkcg3gzbaqwkgrjgmvahby0akylk66zq8n8zm5mqn0vj0jsrxhryf4"; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.14.2.tgz"; + sha512 = "20p92czrssb8mfn5lmaswrzv0wy5va0r7xlmh5f6sd7zj46iydqkhfmfy9lv3d6zf7x42zdbkdrj4mk420gzlmgb3wgd608cafcnalk"; }; dependencies = [ - sources."abbrev-1.1.1" - sources."align-text-0.1.4" sources."ansi-align-2.0.0" - sources."ansi-escapes-1.4.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" - sources."ansicolors-0.3.2" - sources."archy-1.0.0" sources."argparse-1.0.10" - sources."asap-2.0.6" - sources."async-1.5.2" - sources."balanced-match-1.0.0" - sources."base64-js-0.0.2" sources."bluebird-3.5.1" - sources."bops-0.1.1" - sources."boxen-0.3.1" - sources."brace-expansion-1.1.11" - sources."builtin-modules-1.1.1" - sources."camelcase-1.2.1" + sources."boxen-1.3.0" + sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" - sources."center-align-0.1.3" sources."chalk-1.1.3" sources."ci-info-1.1.3" sources."cint-8.2.1" sources."cli-boxes-1.0.0" - sources."cli-cursor-1.0.2" sources."cli-table-0.3.1" - sources."cli-width-2.2.0" - sources."clite-0.3.0" - sources."cliui-2.1.0" - sources."clone-deep-0.3.0" - sources."code-point-at-1.1.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."colors-1.0.3" sources."commander-2.15.1" - sources."concat-map-0.0.1" - (sources."configstore-1.4.0" // { - dependencies = [ - sources."uuid-2.0.3" - ]; - }) - sources."core-util-is-1.0.2" + sources."configstore-3.1.2" sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" sources."debug-2.6.9" - sources."decamelize-1.2.0" - sources."deep-extend-0.4.2" - sources."dot-prop-3.0.0" - sources."duplexer2-0.1.4" + sources."deep-extend-0.5.1" + sources."dot-prop-4.2.0" sources."duplexer3-0.1.4" - sources."duplexify-3.5.4" - sources."email-validator-1.1.1" - sources."end-of-stream-1.4.1" - sources."error-ex-1.3.1" - sources."es6-promise-3.3.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.0" sources."execa-0.7.0" - sources."exit-hook-1.1.1" sources."fast-diff-1.1.2" - sources."figures-1.7.0" - sources."filled-array-1.1.0" sources."find-up-1.1.2" - sources."for-in-1.0.2" - sources."for-own-1.0.0" - sources."get-caller-file-1.0.2" sources."get-stdin-5.0.1" sources."get-stream-3.0.0" sources."global-dirs-0.1.1" - sources."got-5.7.1" + sources."got-6.7.1" sources."graceful-fs-4.1.11" - sources."graphlib-2.1.5" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."hasbin-1.2.3" - sources."hosted-git-info-2.6.0" - sources."iconv-lite-0.4.21" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" - sources."infinity-agent-2.0.3" - sources."inherits-2.0.3" sources."ini-1.3.5" - sources."inquirer-1.0.3" - sources."invert-kv-1.0.0" - sources."is-arrayish-0.2.1" - sources."is-buffer-1.1.6" - sources."is-builtin-module-1.0.0" sources."is-ci-1.1.0" - sources."is-extendable-0.1.1" - sources."is-finite-1.0.2" - sources."is-fullwidth-code-point-1.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" sources."is-obj-1.0.1" sources."is-path-inside-1.0.1" - sources."is-plain-object-2.0.4" - sources."is-promise-2.1.0" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.1.0" sources."is-stream-1.1.0" - sources."is-utf8-0.2.1" - sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-3.0.1" sources."jju-1.3.0" sources."js-yaml-3.11.0" sources."json-parse-helpfulerror-1.0.3" sources."json5-0.5.1" - sources."kind-of-3.2.2" - sources."latest-version-2.0.0" - sources."lazy-cache-1.0.4" - sources."lcid-1.0.0" - sources."load-json-file-1.1.0" - sources."lodash-4.17.5" - sources."lodash.assign-4.2.0" - sources."lodash.clonedeep-4.5.0" - sources."lodash.defaults-4.2.0" - sources."lodash.defaultsdeep-4.6.0" - sources."lodash.mergewith-4.6.1" - sources."longest-1.0.1" + sources."latest-version-3.1.0" + sources."lodash-4.17.10" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.2" sources."make-dir-1.2.0" - sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mixin-object-2.0.1" - sources."mkdirp-0.5.1" + sources."minimist-1.2.0" sources."ms-2.0.0" - sources."mute-stream-0.0.6" - sources."nconf-0.7.2" - (sources."needle-2.2.0" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."nested-error-stacks-1.0.2" sources."node-alias-1.0.4" - sources."node-status-codes-1.0.0" - sources."normalize-package-data-2.4.0" sources."npm-3.10.10" sources."npm-run-path-2.0.2" (sources."npmi-2.0.1" // { @@ -38692,214 +38668,56 @@ in sources."semver-4.3.6" ]; }) - sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" sources."object-keys-1.0.11" - sources."once-1.4.0" - sources."onetime-1.1.0" - sources."open-0.0.5" - sources."os-homedir-1.0.2" - sources."os-locale-1.4.0" - sources."os-name-1.0.3" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" - sources."osx-release-1.1.0" sources."p-finally-1.0.0" - sources."package-json-2.4.0" - sources."parse-json-2.2.0" + sources."package-json-4.0.1" sources."path-exists-2.1.0" - sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" - sources."path-type-1.1.0" - sources."pify-2.3.0" + sources."pify-3.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."prepend-http-1.0.4" - sources."process-nextick-args-2.0.0" - sources."promise-7.3.1" - sources."proxy-from-env-1.0.0" sources."pseudomap-1.0.2" - sources."punycode-1.3.2" - sources."querystring-0.2.0" - sources."rc-1.2.6" + sources."rc-1.2.7" sources."rc-config-loader-2.0.1" - sources."read-all-stream-3.1.0" - sources."read-pkg-1.1.0" - sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.6" - sources."recursive-readdir-2.2.2" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" - sources."repeat-string-1.6.1" - sources."repeating-2.0.1" - sources."require-directory-2.1.1" sources."require-from-string-2.0.2" - sources."require-main-filename-1.0.1" - sources."restore-cursor-1.0.1" - sources."right-align-0.1.3" - sources."run-async-2.3.0" - sources."rx-4.1.0" - sources."safe-buffer-5.1.1" - sources."safer-buffer-2.1.2" - sources."sax-1.2.4" + sources."safe-buffer-5.1.2" sources."semver-5.5.0" sources."semver-diff-2.1.0" sources."semver-utils-1.1.2" - sources."set-blocking-2.0.0" - (sources."shallow-clone-0.1.2" // { - dependencies = [ - sources."kind-of-2.0.1" - ]; - }) sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" - sources."slide-1.1.6" - (sources."snyk-1.71.0" // { - dependencies = [ - sources."async-0.9.2" - sources."camelcase-3.0.0" - sources."cliui-3.2.0" - sources."debug-3.1.0" - sources."for-in-0.1.8" - sources."got-3.3.1" - sources."latest-version-1.0.1" - sources."lazy-cache-0.2.7" - sources."minimist-1.2.0" - sources."object-assign-3.0.0" - sources."package-json-1.2.0" - sources."repeating-1.1.3" - sources."timed-out-2.0.0" - sources."update-notifier-0.5.0" - sources."window-size-0.2.0" - sources."yargs-4.8.1" - ]; - }) - (sources."snyk-config-1.0.1" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."snyk-go-plugin-1.4.6" - sources."snyk-gradle-plugin-1.2.0" - (sources."snyk-module-1.8.1" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."snyk-mvn-plugin-1.1.1" - (sources."snyk-nuget-plugin-1.3.9" // { - dependencies = [ - sources."es6-promise-4.2.4" - ]; - }) - sources."snyk-php-plugin-1.3.2" - (sources."snyk-policy-1.10.2" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."snyk-python-plugin-1.5.7" - (sources."snyk-resolve-1.0.0" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - (sources."snyk-resolve-deps-1.7.0" // { - dependencies = [ - sources."configstore-2.1.0" - sources."debug-2.6.9" - sources."update-notifier-0.6.3" - sources."uuid-2.0.3" - ]; - }) - (sources."snyk-sbt-plugin-1.2.5" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."snyk-tree-1.0.0" - (sources."snyk-try-require-1.2.0" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) sources."spawn-please-0.3.0" - sources."spdx-correct-3.0.0" - sources."spdx-exceptions-2.1.0" - sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.0" sources."sprintf-js-1.0.3" - sources."stream-shift-1.0.0" - sources."string-length-1.0.1" - sources."string-width-1.0.2" - sources."string_decoder-1.1.1" + sources."string-width-2.1.1" sources."strip-ansi-3.0.1" - sources."strip-bom-2.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" - (sources."tempfile-1.1.1" // { - dependencies = [ - sources."uuid-2.0.3" - ]; - }) sources."term-size-1.2.0" - sources."then-fs-2.0.0" - sources."through-2.3.8" - sources."timed-out-3.1.3" - sources."to-utf8-0.0.1" - sources."toml-2.3.3" - sources."undefsafe-0.0.3" + sources."timed-out-4.0.1" sources."unique-string-1.0.0" - sources."unzip-response-1.0.2" - (sources."update-notifier-2.4.0" // { + sources."unzip-response-2.0.1" + (sources."update-notifier-2.5.0" // { dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - sources."boxen-1.3.0" - sources."camelcase-4.1.0" - sources."chalk-2.3.2" - sources."configstore-3.1.2" - sources."dot-prop-4.2.0" - sources."got-6.7.1" - sources."is-fullwidth-code-point-2.0.0" - sources."latest-version-3.1.0" - sources."package-json-4.0.1" - sources."pify-3.0.0" - sources."string-width-2.1.1" + sources."chalk-2.4.1" sources."strip-ansi-4.0.0" - sources."supports-color-5.3.0" - sources."timed-out-4.0.1" - sources."unzip-response-2.0.1" - sources."widest-line-2.0.0" - sources."write-file-atomic-2.3.0" - sources."xdg-basedir-3.0.0" + sources."supports-color-5.4.0" ]; }) - sources."url-0.11.0" sources."url-parse-lax-1.0.0" - sources."util-deprecate-1.0.2" - sources."uuid-3.2.1" - sources."validate-npm-package-license-3.0.3" sources."which-1.3.0" - sources."which-module-1.0.0" - sources."widest-line-1.0.0" - sources."win-release-1.1.1" - sources."window-size-0.1.4" - sources."wordwrap-0.0.2" - sources."wrap-ansi-2.1.0" - sources."wrappy-1.0.2" - sources."write-file-atomic-1.3.4" - sources."xdg-basedir-2.0.0" - sources."xml2js-0.4.19" - sources."xmlbuilder-9.0.7" - sources."y18n-3.2.1" + sources."widest-line-2.0.0" + sources."write-file-atomic-2.3.0" + sources."xdg-basedir-3.0.0" sources."yallist-2.1.2" - sources."yargs-3.15.0" - sources."yargs-parser-2.4.1" - sources."zip-1.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -38926,7 +38744,7 @@ in sources."boom-5.2.0" sources."builtin-modules-1.1.1" sources."camelcase-4.1.0" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."chardet-0.4.2" sources."cli-cursor-2.1.0" sources."cli-table2-0.2.0" @@ -38939,7 +38757,7 @@ in sources."code-point-at-1.1.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."colors-1.2.1" + sources."colors-1.2.4" sources."cross-spawn-5.1.0" sources."cvss-1.0.2" sources."debug-3.1.0" @@ -38964,7 +38782,7 @@ in dependencies = [ sources."ansi-regex-3.0.0" sources."is-fullwidth-code-point-2.0.0" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" ]; @@ -39024,7 +38842,7 @@ in sources."strip-ansi-3.0.1" sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" sources."through-2.3.8" sources."tmp-0.0.33" sources."validate-npm-package-license-3.0.3" @@ -39143,7 +38961,7 @@ in sources."cliui-2.1.0" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."colors-1.2.1" + sources."colors-1.2.4" sources."combined-stream-1.0.6" sources."compressible-2.0.13" sources."compression-1.7.2" @@ -39271,7 +39089,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.10" sources."mkdirp-0.5.1" - sources."moment-2.22.0" + sources."moment-2.22.1" sources."ms-2.0.0" sources."msgpack5-3.6.0" sources."mv-2.1.1" @@ -39400,10 +39218,10 @@ in peerflix = nodeEnv.buildNodePackage { name = "peerflix"; packageName = "peerflix"; - version = "0.37.0"; + version = "0.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/peerflix/-/peerflix-0.37.0.tgz"; - sha512 = "0i2j5pgw72bkg5s5crh3p534sz6m6yvbyg174kkgyj1l0sgaqmzj22xmh0dvxqk7r3rp79w2vs27gdqzb8azmlr6ag13m17h20cyhhf"; + url = "https://registry.npmjs.org/peerflix/-/peerflix-0.38.0.tgz"; + sha512 = "0jy97ypdv4a36cdcszfcj0qmv1z1k896h17xb7n2jzj26r4bz8kpj0dcnx255mj5bpxv3074gmabdk2da9jmp2awryyxj7f6l31p2bi"; }; dependencies = [ sources."addr-to-ip-port-1.4.3" @@ -39418,7 +39236,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bencode-2.0.0" - sources."big-integer-1.6.27" + sources."big-integer-1.6.28" sources."bitfield-0.1.0" sources."bittorrent-dht-6.4.2" sources."bittorrent-tracker-7.7.0" @@ -39456,7 +39274,7 @@ in sources."decamelize-1.2.0" sources."decompress-response-3.3.0" sources."deep-equal-1.0.1" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."dns-equal-1.0.0" sources."dns-packet-1.3.1" sources."dns-txt-2.0.2" @@ -39491,7 +39309,7 @@ in sources."ini-1.3.5" (sources."inquirer-1.2.3" // { dependencies = [ - sources."lodash-4.17.5" + sources."lodash-4.17.10" ]; }) sources."internal-ip-1.2.0" @@ -39548,12 +39366,12 @@ in sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" sources."parse-json-2.2.0" - (sources."parse-torrent-5.8.3" // { + (sources."parse-torrent-5.9.1" // { dependencies = [ - sources."get-stdin-5.0.1" + sources."get-stdin-6.0.0" ]; }) - sources."parse-torrent-file-4.1.0" + sources."parse-torrent-file-2.1.4" sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" sources."path-type-1.1.0" @@ -39570,11 +39388,11 @@ in sources."process-nextick-args-2.0.0" sources."pump-1.0.3" sources."random-access-file-2.0.1" - sources."random-access-storage-1.1.1" + sources."random-access-storage-1.2.0" sources."random-iterate-1.0.1" sources."randombytes-2.0.6" sources."range-parser-1.2.0" - sources."rc-1.2.6" + sources."rc-1.2.7" sources."re-emitter-1.1.3" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" @@ -39585,16 +39403,16 @@ in sources."reverse-http-1.3.0" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."run-parallel-1.1.8" - sources."run-series-1.1.6" + sources."run-parallel-1.1.9" + sources."run-series-1.1.8" sources."rusha-0.8.13" sources."rx-4.1.0" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."semver-5.5.0" sources."server-destroy-1.0.1" sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" - sources."simple-get-2.7.0" + sources."simple-get-2.8.1" sources."simple-peer-6.4.4" sources."simple-sha1-2.1.0" (sources."simple-websocket-4.3.1" // { @@ -39611,7 +39429,7 @@ in sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" - sources."string2compact-1.2.2" + sources."string2compact-1.2.3" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" @@ -39641,7 +39459,6 @@ in sources."minimist-0.0.8" sources."once-1.3.3" sources."parse-torrent-4.1.0" - sources."parse-torrent-file-2.1.4" sources."readable-stream-1.1.14" sources."safe-buffer-5.0.1" sources."string_decoder-0.10.31" @@ -39878,9 +39695,9 @@ in sources."process-nextick-args-2.0.0" sources."proxy-addr-1.0.10" sources."pump-1.0.3" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."random-access-file-2.0.1" - sources."random-access-storage-1.1.1" + sources."random-access-storage-1.2.0" sources."random-bytes-1.0.0" sources."random-iterate-1.0.1" sources."randombytes-2.0.6" @@ -39907,10 +39724,10 @@ in }) sources."rimraf-2.6.2" sources."rndm-1.2.0" - sources."run-parallel-1.1.8" - sources."run-series-1.1.6" + sources."run-parallel-1.1.9" + sources."run-series-1.1.8" sources."rusha-0.8.13" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" (sources."send-0.13.0" // { dependencies = [ sources."ms-0.7.1" @@ -39925,7 +39742,7 @@ in ]; }) sources."simple-concat-1.0.0" - sources."simple-get-2.7.0" + sources."simple-get-2.8.1" sources."simple-peer-6.4.4" sources."simple-sha1-2.1.0" (sources."simple-websocket-4.3.1" // { @@ -39955,7 +39772,7 @@ in sources."speedometer-0.1.4" sources."statuses-1.5.0" sources."stream-counter-0.2.0" - sources."string2compact-1.2.2" + sources."string2compact-1.2.3" sources."string_decoder-0.10.31" sources."thirty-two-0.0.2" sources."thunky-1.0.2" @@ -40079,7 +39896,7 @@ in }) sources."kew-0.7.0" sources."klaw-1.3.1" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."mime-db-1.33.0" sources."mime-types-2.1.18" sources."minimatch-3.0.4" @@ -40133,10 +39950,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "1.11.1"; + version = "1.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.11.1.tgz"; - sha512 = "33s27xnirdx15j0dkp0i79bawmn7pysqxjiksh1jd5gcl4fdzvhd1sr9n7lh4k1ik37g1lmi3gb33j3kz31psqlxxyz1l5djgmq7wjg"; + url = "https://registry.npmjs.org/prettier/-/prettier-1.12.1.tgz"; + sha1 = "c1ad20e803e7749faf905a409d2367e06bbe7325"; }; buildInputs = globalBuildInputs; meta = { @@ -40150,10 +39967,10 @@ in pulp = nodeEnv.buildNodePackage { name = "pulp"; packageName = "pulp"; - version = "12.0.1"; + version = "12.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/pulp/-/pulp-12.0.1.tgz"; - sha512 = "3n09lgnyd4p3h3jlhgcvbh6n6m9h89hwvbhli5ic32fkl5y4g7yi61m1vw483479jxkif2zyqs89l6j6hq4iy15jdknx1lcp9qbyvwy"; + url = "https://registry.npmjs.org/pulp/-/pulp-12.2.0.tgz"; + sha512 = "1kgjvji88fvdi6vazqq6gx32zqgkg9qp639952cz2v2g5izl7yblgawy1xra5dypv5c1a43wk4ch4iskr1kxxpfmn7pnql92q1nvxgg"; }; dependencies = [ sources."JSONStream-1.3.2" @@ -40188,7 +40005,7 @@ in sources."astw-2.2.0" sources."async-1.5.2" sources."async-each-1.0.1" - sources."atob-2.1.0" + sources."atob-2.1.1" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -40200,7 +40017,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."base64-js-1.2.3" + sources."base64-js-1.3.0" sources."binary-extensions-1.11.0" sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" @@ -40224,15 +40041,14 @@ in sources."readable-stream-2.0.6" ]; }) - sources."hash-base-2.0.2" sources."isarray-2.0.4" sources."process-nextick-args-2.0.0" ]; }) sources."browserify-aes-1.2.0" sources."browserify-cache-api-3.0.1" - sources."browserify-cipher-1.0.0" - sources."browserify-des-1.0.0" + sources."browserify-cipher-1.0.1" + sources."browserify-des-1.0.1" (sources."browserify-incremental-3.1.1" // { dependencies = [ sources."JSONStream-0.10.0" @@ -40243,6 +40059,7 @@ in sources."browserify-sign-4.0.4" sources."browserify-zlib-0.1.4" sources."buffer-4.9.1" + sources."buffer-crc32-0.2.13" sources."buffer-from-1.0.0" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" @@ -40263,7 +40080,7 @@ in ]; }) sources."collection-visit-1.0.0" - sources."colors-1.2.1" + sources."colors-1.2.4" sources."combine-source-map-0.8.0" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" @@ -40273,9 +40090,9 @@ in sources."convert-source-map-1.1.3" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" - sources."create-ecdh-4.0.0" - sources."create-hash-1.1.3" - sources."create-hmac-1.1.6" + sources."create-ecdh-4.0.1" + sources."create-hash-1.2.0" + sources."create-hmac-1.1.7" sources."crypto-browserify-3.12.0" sources."date-now-0.1.4" sources."debug-2.6.9" @@ -40285,10 +40102,11 @@ in sources."deps-sort-2.0.0" sources."des.js-1.0.0" sources."detective-4.7.1" - sources."diffie-hellman-5.0.2" + sources."diffie-hellman-5.0.3" sources."domain-browser-1.1.7" sources."duplexer2-0.1.4" sources."elliptic-6.4.0" + sources."es6-promise-3.3.1" sources."events-1.1.1" sources."evp_bytestokey-1.0.3" (sources."expand-brackets-2.1.4" // { @@ -40308,7 +40126,7 @@ in sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.1.3" + sources."fsevents-1.2.3" sources."function-bind-1.1.1" sources."get-value-2.0.6" sources."glob-7.1.2" @@ -40364,17 +40182,23 @@ in sources."micromatch-3.1.10" sources."miller-rabin-4.0.1" sources."mime-1.6.0" - sources."minimalistic-assert-1.0.0" + sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mixin-deep-1.3.1" + sources."mkdirp-0.5.1" sources."module-deps-4.1.1" + (sources."mold-source-map-0.4.0" // { + dependencies = [ + sources."through-2.2.7" + ]; + }) sources."ms-2.0.0" sources."mute-stream-0.0.7" sources."nan-2.10.0" sources."nanomatch-1.2.9" - sources."neo-async-2.5.0" + sources."neo-async-2.5.1" (sources."node-static-0.7.10" // { dependencies = [ sources."minimist-0.0.10" @@ -40391,18 +40215,18 @@ in sources."os-tmpdir-1.0.2" sources."pako-0.2.9" sources."parents-1.0.1" - sources."parse-asn1-5.1.0" + sources."parse-asn1-5.1.1" sources."pascalcase-0.1.1" sources."path-browserify-0.0.0" sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.5" sources."path-platform-0.11.15" - sources."pbkdf2-3.0.14" + sources."pbkdf2-3.0.16" sources."posix-character-classes-0.1.1" sources."process-0.11.10" sources."process-nextick-args-1.0.7" - sources."public-encrypt-4.0.0" + sources."public-encrypt-4.0.2" sources."punycode-1.4.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" @@ -40421,13 +40245,18 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" - sources."resolve-1.7.0" + sources."resolve-1.7.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" - sources."rimraf-2.2.8" - sources."ripemd160-2.0.1" - sources."safe-buffer-5.1.1" + sources."rimraf-2.6.2" + sources."ripemd160-2.0.2" + sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" + (sources."sander-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) sources."set-immediate-shim-1.0.1" sources."set-value-2.0.0" sources."sha.js-2.4.11" @@ -40446,9 +40275,11 @@ in }) sources."snapdragon-node-2.1.1" sources."snapdragon-util-3.0.1" + sources."sorcery-0.10.0" sources."source-map-0.5.7" sources."source-map-resolve-0.5.1" sources."source-map-url-0.4.0" + sources."sourcemap-codec-1.4.1" (sources."split-string-3.1.0" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -40464,7 +40295,11 @@ in sources."string_decoder-0.10.31" sources."subarg-1.0.0" sources."syntax-error-1.4.0" - sources."temp-0.8.3" + (sources."temp-0.8.3" // { + dependencies = [ + sources."rimraf-2.2.8" + ]; + }) sources."through-2.3.8" sources."through2-2.0.3" sources."timers-browserify-1.4.2" @@ -40490,7 +40325,7 @@ in }) ]; }) - sources."upath-1.0.4" + sources."upath-1.0.5" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -40509,7 +40344,7 @@ in }) sources."util-deprecate-1.0.2" sources."vm-browserify-0.0.4" - (sources."watchpack-1.5.0" // { + (sources."watchpack-1.6.0" // { dependencies = [ sources."define-property-1.0.0" sources."extend-shallow-2.0.1" @@ -40591,6 +40426,9 @@ in ]; }) sources."boom-2.10.1" + sources."buffer-alloc-1.1.0" + sources."buffer-alloc-unsafe-0.1.1" + sources."buffer-fill-0.1.1" sources."bufferutil-2.0.1" sources."bytes-3.0.0" sources."camelcase-1.2.1" @@ -40617,7 +40455,7 @@ in sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decamelize-1.2.0" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -40645,6 +40483,7 @@ in sources."form-data-2.1.4" sources."forwarded-0.1.2" sources."fresh-0.5.2" + sources."fs-constants-1.0.0" sources."function-bind-1.1.1" sources."gauge-2.7.4" sources."getpass-0.1.7" @@ -40695,7 +40534,7 @@ in }) sources."less-middleware-2.2.1" sources."libquassel-2.1.9" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."longest-1.0.1" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" @@ -40716,7 +40555,7 @@ in sources."tunnel-agent-0.4.3" ]; }) - sources."node-abi-2.3.0" + sources."node-abi-2.4.1" sources."node.extend-2.0.0" sources."noop-logger-0.1.1" sources."npmlog-4.1.2" @@ -40763,12 +40602,12 @@ in sources."http-errors-1.6.2" ]; }) - sources."rc-1.2.6" + sources."rc-1.2.7" sources."readable-stream-2.3.6" sources."regenerator-runtime-0.11.1" sources."repeat-string-1.6.1" sources."request-2.81.0" - sources."resolve-1.7.0" + sources."resolve-1.7.1" sources."right-align-0.1.3" sources."safe-buffer-5.1.1" sources."semver-5.5.0" @@ -40798,8 +40637,9 @@ in sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."tar-fs-1.16.0" - sources."tar-stream-1.5.5" + sources."tar-fs-1.16.2" + sources."tar-stream-1.6.0" + sources."to-buffer-1.1.1" sources."to-fast-properties-1.0.3" sources."token-stream-0.0.1" sources."tough-cookie-2.3.4" @@ -41055,7 +40895,7 @@ in sources."oauth-sign-0.8.2" (sources."openid-2.0.6" // { dependencies = [ - sources."qs-6.5.1" + sources."qs-6.5.2" sources."request-2.85.0" ]; }) @@ -41067,7 +40907,7 @@ in sources."raw-body-0.0.3" sources."readable-stream-1.1.14" sources."request-2.9.203" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."sax-1.2.4" sources."send-0.1.4" sources."sntp-2.1.0" @@ -41112,10 +40952,10 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "6.5.4"; + version = "6.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-6.5.4.tgz"; - sha512 = "3dhp8p2c9i86bwaxlxxlhml4p7ps2ph09pap35g5ivy0ndxv6av87axckmm4g7dwvz6c8y6mvc8c0v93m9hlk2rqm07y211621b1hhh"; + url = "https://registry.npmjs.org/serve/-/serve-6.5.6.tgz"; + sha512 = "1gfw9s3jh8ymzv26733pp33xkvhihlb25w8aznc3yqcx7wg82k7fzz6f3w3aw758dy7cshb89ijliaqcf1p4bgrchfqbxv1613wgmmd"; }; dependencies = [ sources."accepts-1.3.5" @@ -41126,24 +40966,23 @@ in sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."arch-2.1.0" - (sources."args-3.0.8" // { + (sources."args-4.0.0" // { dependencies = [ - sources."chalk-2.1.0" + sources."chalk-2.3.2" ]; }) sources."async-1.5.2" sources."basic-auth-2.0.0" sources."bluebird-3.5.1" - sources."boxen-1.3.0" - sources."bytes-3.0.0" - sources."camelcase-4.1.0" - sources."center-align-0.1.3" - (sources."chalk-2.3.2" // { + (sources."boxen-1.3.0" // { dependencies = [ - sources."has-flag-3.0.0" - sources."supports-color-5.3.0" + sources."camelcase-4.1.0" ]; }) + sources."bytes-3.0.0" + sources."camelcase-5.0.0" + sources."center-align-0.1.3" + sources."chalk-2.4.0" sources."cli-boxes-1.0.0" (sources."clipboardy-1.2.3" // { dependencies = [ @@ -41160,7 +40999,7 @@ in sources."dargs-5.1.0" sources."debug-2.6.9" sources."decamelize-1.2.0" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."depd-1.1.1" sources."destroy-1.0.4" sources."detect-port-1.2.2" @@ -41170,7 +41009,7 @@ in sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" sources."execa-0.7.0" - sources."filesize-3.6.0" + sources."filesize-3.6.1" sources."fresh-0.5.2" sources."fs-extra-5.0.0" sources."get-stream-3.0.0" @@ -41181,7 +41020,7 @@ in sources."wordwrap-0.0.2" ]; }) - sources."has-flag-2.0.0" + sources."has-flag-3.0.0" sources."http-errors-1.6.2" sources."iconv-lite-0.4.19" sources."inherits-2.0.3" @@ -41195,10 +41034,10 @@ in sources."jsonfile-4.0.0" sources."kind-of-3.2.2" sources."lazy-cache-1.0.4" - sources."lodash-4.17.5" + sources."leven-2.1.0" sources."longest-1.0.1" sources."lru-cache-4.1.2" - sources."micro-9.1.0" + sources."micro-9.1.4" sources."micro-compress-1.0.0" sources."mime-1.4.1" sources."mime-db-1.33.0" @@ -41207,23 +41046,22 @@ in sources."mri-1.1.0" sources."ms-2.0.0" sources."negotiator-0.6.1" - sources."node-version-1.1.0" + sources."node-version-1.1.3" sources."npm-run-path-2.0.2" sources."on-finished-2.3.0" sources."on-headers-1.0.1" sources."openssl-self-signed-certificate-1.1.6" - sources."opn-5.2.0" + sources."opn-5.3.0" sources."optimist-0.6.1" sources."p-finally-1.0.0" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."path-type-3.0.0" sources."pify-3.0.0" - sources."pkginfo-0.4.1" sources."pseudomap-1.0.2" sources."range-parser-1.2.0" sources."raw-body-2.3.2" - sources."rc-1.2.6" + sources."rc-1.2.7" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."repeat-string-1.6.1" @@ -41241,12 +41079,11 @@ in sources."signal-exit-3.0.2" sources."source-map-0.4.4" sources."statuses-1.5.0" - sources."string-similarity-1.2.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-4.5.0" + sources."supports-color-5.4.0" sources."term-size-1.2.0" (sources."uglify-js-2.8.29" // { dependencies = [ @@ -41256,7 +41093,7 @@ in sources."uglify-to-browserify-1.0.2" sources."universalify-0.1.1" sources."unpipe-1.0.0" - (sources."update-check-1.2.0" // { + (sources."update-check-1.3.2" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -41544,7 +41381,7 @@ in }) sources."bytes-1.0.0" sources."caseless-0.12.0" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."co-4.6.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" @@ -41660,7 +41497,7 @@ in sources."minimatch-1.0.0" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.22.0" + sources."moment-2.22.1" sources."ms-2.0.0" sources."mv-2.1.1" sources."nan-2.10.0" @@ -41676,7 +41513,7 @@ in sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" - sources."postcss-6.0.21" + sources."postcss-6.0.22" sources."process-nextick-args-2.0.0" sources."proxy-addr-1.1.5" sources."punycode-1.4.1" @@ -41697,7 +41534,7 @@ in }) (sources."request-2.85.0" // { dependencies = [ - sources."qs-6.5.1" + sources."qs-6.5.2" ]; }) sources."rimraf-2.4.5" @@ -41724,7 +41561,7 @@ in sources."statuses-1.3.1" sources."string_decoder-1.1.1" sources."stringstream-0.0.5" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" sources."through-2.3.8" sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" @@ -41775,12 +41612,12 @@ in sources."graceful-readlink-1.0.1" sources."inherits-2.0.3" sources."isarray-1.0.0" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."minimatch-3.0.4" sources."process-nextick-args-2.0.0" sources."readable-stream-2.3.6" sources."readdirp-2.1.0" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."set-immediate-shim-1.0.1" sources."string_decoder-1.1.1" sources."util-deprecate-1.0.2" @@ -41863,7 +41700,7 @@ in ]; }) sources."rimraf-2.4.5" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.1.0" sources."semver-4.3.6" (sources."smartdc-auth-2.3.1" // { @@ -41968,7 +41805,7 @@ in sources."object-component-0.0.3" sources."parseqs-0.0.5" sources."parseuri-0.0.5" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."socket.io-adapter-1.1.1" sources."socket.io-client-2.1.0" sources."socket.io-parser-3.2.0" @@ -42151,7 +41988,7 @@ in sources."is-regex-1.0.4" sources."is-symbol-1.0.1" sources."js-yaml-3.10.0" - sources."mdn-data-1.1.0" + sources."mdn-data-1.1.2" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."nth-check-1.0.1" @@ -42162,7 +41999,7 @@ in sources."sax-1.2.4" sources."source-map-0.5.7" sources."sprintf-js-1.0.3" - sources."stable-0.1.6" + sources."stable-0.1.8" sources."unquote-1.1.1" sources."util.promisify-1.0.0" ]; @@ -42206,7 +42043,7 @@ in sources."prr-1.0.1" sources."readable-stream-2.3.6" sources."resolve-from-2.0.0" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" sources."tapable-0.2.8" sources."util-deprecate-1.0.2" @@ -42305,7 +42142,7 @@ in sources."keypress-0.2.1" sources."kind-of-3.2.2" sources."lazy-cache-1.0.4" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."longest-1.0.1" sources."longjohn-0.2.11" sources."mime-db-1.33.0" @@ -42341,7 +42178,7 @@ in }) sources."right-align-0.1.3" sources."rimraf-2.2.8" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."semver-5.3.0" sources."sntp-1.0.9" sources."source-map-0.1.32" @@ -42388,10 +42225,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.8.1"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.8.1.tgz"; - sha512 = "1v0ac83sjf21wg11fpllicxz8irx9yg341zmng7vz15524gbfphc9ch70n4x9r70gm0r4ak79xyaxw9zh6b2cwcs7mg447qvzlxz3q2"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.8.3.tgz"; + sha512 = "2vwhgmdrdw42wwaqbmrnz7zy197hrxl6smkmhrb3n93vsjmqg24a4r10czdralib6qpj82bx2gw97r3gxlspj7y54jswigs2vj3bf1b"; }; buildInputs = globalBuildInputs; meta = { @@ -42451,7 +42288,7 @@ in sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" sources."debug-2.6.9" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."defaults-1.0.3" sources."delayed-stream-1.0.0" sources."detect-indent-5.0.0" @@ -42505,7 +42342,7 @@ in sources."jspm-config-0.3.4" sources."latest-version-3.1.0" sources."listify-1.0.0" - sources."lockfile-1.0.3" + sources."lockfile-1.0.4" sources."log-update-1.0.2" sources."loose-envify-1.3.1" sources."lowercase-keys-1.0.1" @@ -42541,7 +42378,7 @@ in sources."promise-finally-3.0.0" sources."pseudomap-1.0.2" sources."punycode-1.4.1" - (sources."rc-1.2.6" // { + (sources."rc-1.2.7" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -42551,7 +42388,7 @@ in sources."registry-url-3.1.0" sources."restore-cursor-1.0.1" sources."rimraf-2.6.2" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."semver-5.0.3" sources."semver-diff-2.1.0" sources."shebang-command-1.2.0" @@ -42574,7 +42411,7 @@ in sources."touch-1.0.0" sources."tough-cookie-2.3.4" sources."typedarray-0.0.6" - sources."typescript-2.8.1" + sources."typescript-2.8.3" (sources."typings-core-2.3.3" // { dependencies = [ sources."minimist-0.0.8" @@ -42583,12 +42420,12 @@ in sources."unc-path-regex-0.1.2" sources."unique-string-1.0.0" sources."unzip-response-2.0.1" - (sources."update-notifier-2.4.0" // { + (sources."update-notifier-2.5.0" // { dependencies = [ sources."ansi-styles-3.2.1" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."semver-5.5.0" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" ]; }) sources."url-parse-lax-1.0.0" @@ -42616,10 +42453,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.3.20"; + version = "3.3.23"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.20.tgz"; - sha512 = "3x6k1plb2hrmm51fn2w7nmi9pixipwj224a4afly17p2mwk75qhycib3zlaj9m0bk43ydfh0h2gv01l1xfhabvjcv36pc7x4xcf94js"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.23.tgz"; + sha512 = "2zylyzplicczqknizbm1mp7grxz6bi6vg03rsld8l18b2rahl9y7b1rj2c3sp75afmmyqlgg57v8c0b1adyqm7arzw8kcc3n6l8mkra"; }; dependencies = [ sources."commander-2.15.1" @@ -42637,10 +42474,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.4.18"; + version = "1.4.22"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.4.18.tgz"; - sha512 = "3mdb4qpdmm6n3c34z8pkrn3yx2nxyvqszw3rb24lcf8mbpbx2d534bpb3mcg2lg4lxsysijp652pkwbxd492sm7z9bz296r8cgppmqm"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.4.22.tgz"; + sha512 = "22lf4pk1mn1vn8rgakj6z2dllv4xr7nybymkgrpvkfkglrlh6s9ch5cbbqsdy7mgrhgkmqwrygyb5xypwil4rrfw4a2x1q15jpg229w"; }; dependencies = [ sources."abbrev-1.1.1" @@ -42654,7 +42491,7 @@ in sources."arraybuffer.slice-0.0.7" sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."async-2.6.0" + sources."async-0.9.2" sources."async-limiter-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" @@ -42683,7 +42520,7 @@ in sources."camelcase-4.1.0" sources."caseless-0.12.0" sources."charenc-0.0.2" - (sources."cliui-4.0.0" // { + (sources."cliui-4.1.0" // { dependencies = [ sources."ansi-regex-2.1.1" ]; @@ -42723,7 +42560,7 @@ in sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decamelize-1.2.0" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."delayed-stream-0.0.5" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -42734,6 +42571,7 @@ in sources."mkdirp-0.3.0" ]; }) + sources."dnd-page-scroll-0.0.4" sources."eachr-3.2.0" sources."ecc-jsbn-0.1.1" sources."editions-1.3.4" @@ -42786,7 +42624,7 @@ in sources."http-errors-1.6.3" sources."http-signature-1.2.0" sources."iconv-lite-0.4.19" - sources."ignore-3.3.7" + sources."ignore-3.3.8" sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -42802,6 +42640,8 @@ in sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isstream-0.1.2" + sources."jquery-3.3.1" + sources."jquery-ui-1.12.1" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.3.1" @@ -42810,17 +42650,17 @@ in sources."just-detect-adblock-1.0.0" (sources."keen.io-0.1.3" // { dependencies = [ - sources."async-0.9.2" sources."methods-1.0.1" sources."mime-1.2.11" sources."qs-1.2.0" sources."superagent-0.21.0" ]; }) - sources."knockout-3.5.0-beta" + sources."knockout-3.5.0-rc" sources."lcid-1.0.0" sources."locate-path-2.0.0" - sources."lodash-4.17.5" + sources."locks-0.2.2" + sources."lodash-4.17.10" sources."lru-cache-4.1.2" sources."md5-2.2.1" sources."media-typer-0.3.0" @@ -42839,14 +42679,14 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.22.0" + sources."moment-2.22.1" sources."ms-2.0.0" sources."negotiator-0.6.1" sources."node-cache-4.2.0" sources."nopt-1.0.10" sources."normalize-package-data-2.4.0" - sources."npm-6.0.0-next.0" - sources."npm-package-arg-6.0.0" + sources."npm-6.0.0" + sources."npm-package-arg-6.1.0" (sources."npm-registry-client-8.5.1" // { dependencies = [ sources."combined-stream-1.0.6" @@ -42908,7 +42748,7 @@ in sources."http-errors-1.6.2" ]; }) - (sources."rc-1.2.6" // { + (sources."rc-1.2.7" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -42958,7 +42798,7 @@ in sources."strip-ansi-3.0.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - (sources."superagent-3.8.2" // { + (sources."superagent-3.8.3" // { dependencies = [ sources."combined-stream-1.0.6" sources."component-emitter-1.2.1" @@ -43001,7 +42841,7 @@ in sources."which-1.3.0" sources."which-module-2.0.0" sources."wide-align-1.1.2" - (sources."winston-2.4.1" // { + (sources."winston-2.4.2" // { dependencies = [ sources."async-1.0.0" ]; @@ -43074,7 +42914,10 @@ in sources."boom-4.3.1" sources."brace-expansion-1.1.11" sources."buffer-3.6.0" + sources."buffer-alloc-1.1.0" + sources."buffer-alloc-unsafe-0.1.1" sources."buffer-crc32-0.2.13" + sources."buffer-fill-0.1.1" sources."builtins-1.0.3" sources."camelcase-1.2.1" sources."capture-stack-trace-1.0.0" @@ -43085,7 +42928,7 @@ in ]; }) sources."center-align-0.1.3" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."chardet-0.4.2" sources."cli-cursor-2.1.0" sources."cli-spinners-1.3.1" @@ -43154,6 +42997,7 @@ in sources."filenamify-2.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.2" + sources."fs-constants-1.0.0" sources."fs-extra-0.26.7" sources."fs.realpath-1.0.0" sources."get-proxy-2.1.0" @@ -43212,7 +43056,7 @@ in sources."kind-of-3.2.2" sources."klaw-1.3.1" sources."lazy-cache-1.0.4" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."log-symbols-2.2.0" sources."longest-1.0.1" sources."lowercase-keys-1.0.1" @@ -43257,7 +43101,7 @@ in sources."process-nextick-args-2.0.0" sources."proto-list-1.2.4" sources."punycode-1.4.1" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."read-metadata-1.0.0" sources."readable-stream-2.3.6" sources."recursive-readdir-2.2.2" @@ -43273,7 +43117,7 @@ in sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."seek-bzip-1.0.5" sources."semver-5.5.0" @@ -43289,14 +43133,15 @@ in sources."strip-ansi-4.0.0" sources."strip-dirs-2.1.0" sources."strip-outer-1.0.1" - sources."supports-color-5.3.0" - sources."tar-stream-1.5.5" + sources."supports-color-5.4.0" + sources."tar-stream-1.6.0" sources."through-2.3.8" sources."thunkify-2.1.2" sources."thunkify-wrap-1.0.4" sources."tildify-1.2.0" sources."timed-out-4.0.1" sources."tmp-0.0.33" + sources."to-buffer-1.1.1" sources."toml-2.3.3" sources."tough-cookie-2.3.4" sources."trim-repeated-1.0.0" @@ -43349,7 +43194,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."adm-zip-0.4.7" + sources."adm-zip-0.4.9" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."asn1-0.2.3" @@ -43422,7 +43267,7 @@ in }) sources."kew-0.1.7" sources."klaw-1.3.1" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."mime-db-1.33.0" sources."mime-types-2.1.18" sources."minimatch-3.0.4" @@ -43470,7 +43315,7 @@ in sources."tunnel-agent-0.4.3" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" - sources."underscore-1.8.3" + sources."underscore-1.9.0" sources."util-deprecate-1.0.2" sources."verror-1.10.0" sources."which-1.2.14" @@ -43490,16 +43335,16 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.5.0"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.5.0.tgz"; - sha512 = "3m4zqjmw0byxpxxx35zfrpng2sawkk71mna6b7b5vx1ba534kvsrs3i6332vz7m0dskp9k8ywqv545kg8x7xnv8xvl6x709yjrdjsp8"; + url = "https://registry.npmjs.org/webpack/-/webpack-4.7.0.tgz"; + sha512 = "3qmpyw1gbcmwgc42iss0vqam6vgi5kqvzv5s4xba1ww50824vq5yb3p7zbh0is33q76axrkhj4d7p1cigp5w0jnhhd2v3v6ky580wrr"; }; dependencies = [ sources."acorn-5.5.3" sources."acorn-dynamic-import-3.0.0" sources."ajv-6.4.0" - sources."ajv-keywords-3.1.0" + sources."ajv-keywords-3.2.0" sources."anymatch-2.0.0" sources."aproba-1.2.0" sources."arr-diff-4.0.0" @@ -43510,7 +43355,7 @@ in sources."assert-1.4.1" sources."assign-symbols-1.0.0" sources."async-each-1.0.1" - sources."atob-2.1.0" + sources."atob-2.1.1" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -43523,7 +43368,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."base64-js-1.2.3" + sources."base64-js-1.3.0" sources."big.js-3.2.0" sources."binary-extensions-1.11.0" sources."bluebird-3.5.1" @@ -43538,8 +43383,8 @@ in }) sources."brorand-1.1.0" sources."browserify-aes-1.2.0" - sources."browserify-cipher-1.0.0" - sources."browserify-des-1.0.0" + sources."browserify-cipher-1.0.1" + sources."browserify-des-1.0.1" sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" @@ -43551,7 +43396,7 @@ in sources."cache-base-1.0.1" sources."chokidar-2.0.3" sources."chownr-1.0.1" - sources."chrome-trace-event-0.1.2" + sources."chrome-trace-event-0.1.3" sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { dependencies = [ @@ -43569,9 +43414,9 @@ in sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" - sources."create-ecdh-4.0.0" - sources."create-hash-1.1.3" - sources."create-hmac-1.1.6" + sources."create-ecdh-4.0.1" + sources."create-hash-1.2.0" + sources."create-hmac-1.1.7" sources."crypto-browserify-3.12.0" sources."cyclist-0.2.2" sources."date-now-0.1.4" @@ -43579,9 +43424,9 @@ in sources."decode-uri-component-0.2.0" sources."define-property-2.0.2" sources."des.js-1.0.0" - sources."diffie-hellman-5.0.2" + sources."diffie-hellman-5.0.3" sources."domain-browser-1.2.0" - sources."duplexify-3.5.4" + sources."duplexify-3.6.0" sources."elliptic-6.4.0" sources."emojis-list-2.1.0" sources."end-of-stream-1.4.1" @@ -43617,7 +43462,7 @@ in sources."from2-2.3.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-1.1.3" + sources."fsevents-1.2.3" sources."get-value-2.0.6" sources."glob-7.1.2" (sources."glob-parent-3.1.0" // { @@ -43683,7 +43528,7 @@ in ]; }) sources."miller-rabin-4.0.1" - sources."minimalistic-assert-1.0.0" + sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -43694,10 +43539,9 @@ in sources."ms-2.0.0" sources."nan-2.10.0" sources."nanomatch-1.2.9" - sources."neo-async-2.5.0" + sources."neo-async-2.5.1" (sources."node-libs-browser-2.1.0" // { dependencies = [ - sources."hash-base-2.0.2" sources."inherits-2.0.1" sources."punycode-1.4.1" ]; @@ -43713,13 +43557,13 @@ in sources."p-try-1.0.0" sources."pako-1.0.6" sources."parallel-transform-1.1.0" - sources."parse-asn1-5.1.0" + sources."parse-asn1-5.1.1" sources."pascalcase-0.1.1" sources."path-browserify-0.0.0" sources."path-dirname-1.0.2" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" - sources."pbkdf2-3.0.14" + sources."pbkdf2-3.0.16" sources."pify-3.0.0" sources."pkg-dir-2.0.0" sources."posix-character-classes-0.1.1" @@ -43728,9 +43572,9 @@ in sources."promise-inflight-1.0.1" sources."prr-1.0.1" sources."pseudomap-1.0.2" - sources."public-encrypt-4.0.0" + sources."public-encrypt-4.0.2" sources."pump-2.0.1" - sources."pumpify-1.4.0" + sources."pumpify-1.5.0" sources."punycode-2.1.0" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" @@ -43745,12 +43589,12 @@ in sources."resolve-url-0.2.1" sources."ret-0.1.15" sources."rimraf-2.6.2" - sources."ripemd160-2.0.1" + sources."ripemd160-2.0.2" sources."run-queue-1.0.3" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."schema-utils-0.4.5" - sources."serialize-javascript-1.4.0" + sources."serialize-javascript-1.5.0" sources."set-immediate-shim-1.0.1" sources."set-value-2.0.0" sources."setimmediate-1.0.5" @@ -43814,7 +43658,7 @@ in sources."string_decoder-1.1.1" sources."tapable-1.0.0" sources."through2-2.0.3" - sources."timers-browserify-2.0.6" + sources."timers-browserify-2.0.10" sources."to-arraybuffer-1.0.1" sources."to-object-path-0.3.0" sources."to-regex-3.0.2" @@ -43822,7 +43666,7 @@ in sources."tty-browserify-0.0.0" sources."typedarray-0.0.6" sources."uglify-es-3.3.10" - (sources."uglifyjs-webpack-plugin-1.2.4" // { + (sources."uglifyjs-webpack-plugin-1.2.5" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -43843,7 +43687,7 @@ in }) ]; }) - sources."upath-1.0.4" + sources."upath-1.0.5" sources."uri-js-3.0.2" sources."urix-0.1.0" (sources."url-0.11.0" // { @@ -43859,7 +43703,7 @@ in sources."util-0.10.3" sources."util-deprecate-1.0.2" sources."vm-browserify-0.0.4" - sources."watchpack-1.5.0" + sources."watchpack-1.6.0" (sources."webpack-sources-1.1.0" // { dependencies = [ sources."source-map-0.6.1" @@ -43883,10 +43727,10 @@ in webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; - version = "1.11.0"; + version = "1.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-1.11.0.tgz"; - sha512 = "04agjsk7s1fdmiy195shkjqxswpkadyg08vgj4pqxpwy6d5d4kbngz3gmg9vvnm2z9hi2sdc6ryx0r59nws7xjkifi3grzfkxzz1c06"; + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-1.12.1.tgz"; + sha512 = "2hnm4r244as9zcld8hf884vwp4iwqvrnjc01c5037bpwa0zzc8y5zss9xc75ffbhw8dp54kbfzvlfwfn6q49hymbnsfj44ckqfalavr"; }; dependencies = [ sources."addr-to-ip-port-1.4.3" @@ -43906,10 +43750,10 @@ in sources."binary-search-1.3.3" sources."bindings-1.3.0" sources."bitfield-2.0.0" - sources."bittorrent-dht-8.2.0" + sources."bittorrent-dht-8.3.0" sources."bittorrent-peerid-1.2.0" - sources."bittorrent-protocol-2.4.0" - sources."bittorrent-tracker-9.7.0" + sources."bittorrent-protocol-2.4.1" + sources."bittorrent-tracker-9.9.1" sources."bl-1.2.2" sources."blob-to-buffer-1.2.7" sources."block-stream2-1.1.0" @@ -43922,13 +43766,21 @@ in sources."buffer-fill-0.1.1" sources."buffer-from-1.0.0" sources."buffer-indexof-1.1.1" - sources."bufferutil-3.0.4" + (sources."bufferutil-3.0.4" // { + dependencies = [ + sources."simple-get-2.8.1" + ]; + }) sources."bufferview-1.0.1" sources."bytebuffer-3.5.5" sources."castv2-0.1.9" sources."castv2-client-1.2.0" sources."chownr-1.0.1" - sources."chromecasts-1.9.1" + (sources."chromecasts-1.9.1" // { + dependencies = [ + sources."mime-1.6.0" + ]; + }) sources."chunk-store-stream-2.1.0" sources."clivas-0.2.0" sources."closest-to-2.0.0" @@ -43939,17 +43791,25 @@ in sources."concat-stream-1.6.2" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - sources."create-torrent-3.30.0" + sources."create-torrent-3.31.0" sources."debug-2.6.9" sources."decompress-response-3.3.0" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."defined-1.0.0" sources."delegates-1.0.0" sources."detect-libc-1.0.3" - sources."dlnacasts-0.1.0" + (sources."dlnacasts-0.1.0" // { + dependencies = [ + sources."mime-1.6.0" + ]; + }) sources."dns-packet-1.3.1" sources."dns-txt-2.0.2" - sources."ecstatic-3.2.0" + (sources."ecstatic-3.2.0" // { + dependencies = [ + sources."mime-1.6.0" + ]; + }) sources."elementtree-0.1.7" sources."end-of-stream-1.4.1" sources."executable-4.1.1" @@ -43957,10 +43817,11 @@ in sources."filestream-4.1.3" sources."flatten-1.0.2" sources."fs-chunk-store-1.7.0" + sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" sources."get-browser-rtc-1.0.2" - sources."get-stdin-5.0.1" + sources."get-stdin-6.0.0" sources."github-from-package-0.0.0" sources."glob-7.1.2" sources."has-unicode-2.0.1" @@ -43979,24 +43840,28 @@ in sources."isarray-1.0.0" sources."junk-2.1.0" sources."k-bucket-4.0.0" - sources."k-rpc-4.3.1" + sources."k-rpc-5.0.0" sources."k-rpc-socket-1.8.0" sources."last-one-wins-1.0.4" - sources."load-ip-set-1.3.1" + (sources."load-ip-set-1.3.1" // { + dependencies = [ + sources."simple-get-2.8.1" + ]; + }) sources."long-2.4.0" sources."lru-3.1.0" sources."magnet-uri-5.1.7" sources."mdns-js-0.5.0" sources."mdns-js-packet-0.2.0" - sources."mediasource-2.1.3" + sources."mediasource-2.2.0" sources."memory-chunk-store-1.3.0" - sources."mime-1.6.0" + sources."mime-2.3.1" sources."mimic-response-1.0.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mkdirp-0.5.1" - sources."moment-2.22.0" - sources."mp4-box-encoding-1.1.3" + sources."moment-2.22.1" + sources."mp4-box-encoding-1.1.4" sources."mp4-stream-2.0.3" sources."ms-2.0.0" (sources."multicast-dns-6.2.3" // { @@ -44009,7 +43874,7 @@ in sources."netmask-1.0.6" sources."network-address-1.1.2" sources."next-event-1.0.0" - sources."node-abi-2.3.0" + sources."node-abi-2.4.1" sources."node-ssdp-2.9.1" sources."nodebmc-0.0.7" sources."noop-logger-0.1.1" @@ -44021,45 +43886,48 @@ in sources."optjs-3.2.2" sources."os-homedir-1.0.2" sources."package-json-versionify-1.0.4" - sources."parse-torrent-5.8.3" - sources."parse-torrent-file-4.1.0" + (sources."parse-torrent-6.0.0" // { + dependencies = [ + sources."simple-get-3.0.2" + ]; + }) sources."path-is-absolute-1.0.1" sources."piece-length-1.0.0" sources."pify-2.3.0" sources."plist-with-patches-0.5.1" - sources."prebuild-install-2.5.1" + sources."prebuild-install-2.5.3" sources."prettier-bytes-1.0.4" sources."process-nextick-args-2.0.0" sources."protobufjs-3.8.2" sources."pump-3.0.0" sources."qap-3.3.1" sources."random-access-file-2.0.1" - sources."random-access-storage-1.1.1" + sources."random-access-storage-1.2.0" sources."random-iterate-1.0.1" sources."randombytes-2.0.6" sources."range-parser-1.2.0" sources."range-slice-stream-1.2.0" - sources."rc-1.2.6" + sources."rc-1.2.7" sources."readable-stream-2.3.6" - sources."record-cache-1.0.1" - (sources."render-media-2.12.0" // { + sources."record-cache-1.0.2" + (sources."render-media-3.0.0" // { dependencies = [ sources."pump-1.0.3" ]; }) sources."rimraf-2.6.2" - sources."run-parallel-1.1.8" - sources."run-parallel-limit-1.0.4" - sources."run-series-1.1.6" + sources."run-parallel-1.1.9" + sources."run-parallel-limit-1.0.5" + sources."run-series-1.1.8" sources."rusha-0.8.13" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."sax-1.1.4" sources."semver-5.5.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" - sources."simple-get-2.7.0" - sources."simple-peer-9.0.0" + sources."simple-get-2.8.1" + sources."simple-peer-9.1.1" sources."simple-sha1-2.1.0" (sources."simple-websocket-7.0.2" // { dependencies = [ @@ -44072,21 +43940,22 @@ in sources."stream-to-blob-url-2.1.0" sources."stream-with-known-length-to-buffer-1.0.1" sources."string-width-1.0.2" - sources."string2compact-1.2.2" + sources."string2compact-1.2.3" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - (sources."tar-fs-1.16.0" // { + (sources."tar-fs-1.16.2" // { dependencies = [ sources."pump-1.0.3" ]; }) - sources."tar-stream-1.5.5" + sources."tar-stream-1.6.0" sources."thirty-two-1.0.2" sources."through-2.3.8" sources."thunky-0.1.0" sources."to-arraybuffer-1.0.1" - (sources."torrent-discovery-8.4.0" // { + sources."to-buffer-1.1.1" + (sources."torrent-discovery-8.4.1" // { dependencies = [ sources."minimist-1.2.0" sources."pump-2.0.1" @@ -44102,16 +43971,16 @@ in sources."upnp-device-client-1.0.2" sources."upnp-mediarenderer-client-1.2.4" sources."url-join-2.0.5" - sources."ut_metadata-3.2.0" + sources."ut_metadata-3.2.1" sources."ut_pex-1.2.0" sources."util-deprecate-1.0.2" sources."videostream-2.4.2" sources."vlc-command-1.1.1" - (sources."webtorrent-0.98.24" // { + (sources."webtorrent-0.99.4" // { dependencies = [ sources."debug-3.1.0" - sources."mime-2.2.2" sources."minimist-0.0.8" + sources."simple-get-3.0.2" sources."thunky-1.0.2" ]; }) @@ -44146,7 +44015,7 @@ in dependencies = [ sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" - sources."@types/node-9.6.2" + sources."@types/node-10.0.4" sources."JSONSelect-0.2.1" sources."abbrev-1.1.1" sources."acorn-5.5.3" @@ -44165,32 +44034,26 @@ in sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."async-2.6.0" - sources."camelcase-1.2.1" + sources."camelcase-2.1.1" sources."cli-cursor-1.0.2" - sources."cliui-3.2.0" + sources."cliui-4.1.0" sources."debug-3.1.0" sources."decamelize-1.2.0" sources."domelementtype-1.1.3" - sources."es6-promise-3.3.1" + sources."es6-promise-4.2.4" sources."figures-1.7.0" - sources."find-up-2.1.0" sources."for-in-0.1.8" - sources."globals-11.4.0" - sources."got-3.3.1" + sources."globals-11.5.0" + sources."iconv-lite-0.4.19" sources."inquirer-0.12.0" sources."is-fullwidth-code-point-1.0.0" - sources."latest-version-1.0.1" - sources."lazy-cache-0.2.7" + sources."isarray-0.0.1" sources."mute-stream-0.0.5" - sources."object-assign-3.0.0" sources."onetime-1.1.0" - sources."package-json-1.2.0" - sources."parse-json-2.2.0" - sources."path-exists-3.0.0" + sources."pify-3.0.0" sources."pluralize-1.2.1" sources."progress-1.1.8" - sources."punycode-1.3.2" - sources."repeating-1.1.3" + sources."punycode-2.1.0" sources."restore-cursor-1.0.1" sources."run-async-0.1.0" sources."rx-lite-3.1.2" @@ -44198,33 +44061,26 @@ in sources."source-map-0.6.1" sources."source-map-support-0.5.4" sources."string-width-1.0.2" + sources."string_decoder-0.10.31" sources."strip-ansi-4.0.0" - sources."strip-bom-2.0.0" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" sources."table-3.8.3" - sources."timed-out-2.0.0" sources."traverse-0.6.6" sources."underscore-1.6.0" - sources."update-notifier-0.5.0" - sources."which-module-2.0.0" - sources."window-size-0.2.0" - sources."wordwrap-0.0.2" (sources."yargs-11.0.0" // { dependencies = [ sources."camelcase-4.1.0" - sources."cliui-4.0.0" sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" ]; }) - sources."yargs-parser-9.0.2" ]; }) - sources."adm-zip-0.4.7" + sources."adm-zip-0.4.9" + sources."agent-base-4.2.0" sources."ajv-6.3.0" sources."ajv-keywords-2.1.1" sources."ajv-merge-patch-3.0.0" - sources."align-text-0.1.4" sources."anchor-markdown-header-0.5.7" sources."ansi-align-2.0.0" sources."ansi-escapes-3.1.0" @@ -44267,14 +44123,15 @@ in sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" + sources."ast-types-0.11.3" sources."async-0.2.10" sources."async-each-1.0.1" sources."asynckit-0.4.0" - sources."atob-2.1.0" + sources."atob-2.1.1" sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."babel-code-frame-6.26.0" - sources."babel-core-6.26.0" + sources."babel-core-6.26.3" sources."babel-generator-6.26.1" sources."babel-helpers-6.24.1" sources."babel-messages-6.23.0" @@ -44294,7 +44151,7 @@ in sources."babel-traverse-6.26.0" sources."babel-types-6.26.0" sources."babylon-6.18.0" - sources."bail-1.0.2" + sources."bail-1.0.3" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -44316,11 +44173,14 @@ in sources."boom-4.3.1" sources."bops-0.1.1" sources."boundary-1.0.1" - sources."boxen-0.3.1" + sources."boxen-1.3.0" sources."brace-expansion-1.1.11" sources."braces-2.3.2" + sources."buffer-alloc-1.1.0" + sources."buffer-alloc-unsafe-0.1.1" sources."buffer-crc32-0.2.13" sources."buffer-equal-constant-time-1.0.1" + sources."buffer-fill-0.1.1" sources."buffer-from-1.0.0" sources."builtin-modules-1.1.1" (sources."bunyan-1.8.12" // { @@ -44329,19 +44189,19 @@ in sources."rimraf-2.4.5" ]; }) + sources."bytes-3.0.0" sources."cache-base-1.0.1" sources."caller-path-0.1.0" sources."callsites-0.2.0" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" sources."caseless-0.12.0" - sources."ccount-1.0.2" - sources."center-align-0.1.3" + sources."ccount-1.0.3" sources."chalk-2.3.2" - sources."character-entities-1.2.1" - sources."character-entities-html4-1.1.1" - sources."character-entities-legacy-1.1.1" - sources."character-reference-invalid-1.1.1" + sources."character-entities-1.2.2" + sources."character-entities-html4-1.1.2" + sources."character-entities-legacy-1.1.2" + sources."character-reference-invalid-1.1.2" sources."chardet-0.4.2" (sources."cheerio-1.0.0-rc.2" // { dependencies = [ @@ -44366,13 +44226,12 @@ in sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" - sources."clite-0.3.0" - sources."cliui-2.1.0" + sources."cliui-3.2.0" sources."clone-1.0.4" sources."clone-deep-0.3.0" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."collapse-white-space-1.0.3" + sources."collapse-white-space-1.0.4" sources."collection-visit-1.0.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" @@ -44385,11 +44244,7 @@ in sources."compress-commons-1.2.2" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" - (sources."configstore-1.4.0" // { - dependencies = [ - sources."uuid-2.0.3" - ]; - }) + sources."configstore-3.1.2" sources."convert-source-map-1.5.1" sources."copy-descriptor-0.1.1" sources."core-js-2.5.5" @@ -44409,19 +44264,26 @@ in sources."css-what-2.1.0" sources."d-1.0.0" sources."dashdash-1.14.1" + sources."data-uri-to-buffer-1.2.0" sources."debounce-1.1.0" sources."debug-2.6.9" - sources."decamelize-2.0.0" + (sources."decamelize-2.0.0" // { + dependencies = [ + sources."xregexp-4.0.0" + ]; + }) sources."decode-uri-component-0.2.0" sources."deep-equal-1.0.1" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."deep-is-0.1.3" sources."deepcopy-0.6.3" sources."deepmerge-2.1.0" sources."defaults-1.0.3" sources."define-property-2.0.2" + sources."degenerator-1.0.4" sources."del-2.2.2" sources."delayed-stream-1.0.0" + sources."depd-1.1.1" sources."detect-indent-4.0.0" (sources."dispensary-0.16.0" // { dependencies = [ @@ -44434,14 +44296,12 @@ in sources."domelementtype-1.3.0" sources."domhandler-2.4.1" sources."domutils-1.5.1" - sources."dot-prop-3.0.0" + sources."dot-prop-4.2.0" sources."dtrace-provider-0.8.6" - sources."duplexer2-0.1.4" sources."duplexer3-0.1.4" - sources."duplexify-3.5.4" sources."ecc-jsbn-0.1.1" sources."ecdsa-sig-formatter-1.0.9" - sources."email-validator-1.1.1" + sources."email-validator-2.0.3" sources."emoji-regex-6.1.3" sources."encoding-0.1.12" sources."end-of-stream-1.4.1" @@ -44461,6 +44321,7 @@ in sources."es6-symbol-3.1.1" sources."es6-weak-map-2.0.2" sources."escape-string-regexp-1.0.5" + sources."escodegen-1.9.1" sources."escope-3.6.0" (sources."eslint-4.19.0" // { dependencies = [ @@ -44526,9 +44387,9 @@ in sources."fd-slicer-1.0.1" sources."figures-2.0.0" sources."file-entry-cache-2.0.0" + sources."file-uri-to-path-1.0.0" sources."fill-range-4.0.0" - sources."filled-array-1.1.0" - sources."find-up-1.1.2" + sources."find-up-2.1.0" (sources."firefox-profile-1.1.0" // { dependencies = [ sources."async-2.5.0" @@ -44543,9 +44404,15 @@ in sources."forever-agent-0.6.1" sources."form-data-2.3.2" sources."fragment-cache-0.2.1" + sources."fs-constants-1.0.0" sources."fs-extra-4.0.3" sources."fs.realpath-1.0.0" - sources."fsevents-1.1.3" + sources."fsevents-1.2.3" + (sources."ftp-0.3.10" // { + dependencies = [ + sources."readable-stream-1.1.14" + ]; + }) sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" (sources."fx-runner-1.0.8" // { @@ -44560,6 +44427,11 @@ in sources."generate-object-property-1.2.0" sources."get-caller-file-1.0.2" sources."get-stream-3.0.0" + (sources."get-uri-2.0.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."get-value-2.0.6" sources."getpass-0.1.7" sources."gettext-parser-1.1.0" @@ -44577,7 +44449,7 @@ in sources."global-dirs-0.1.1" sources."globals-9.18.0" sources."globby-5.0.0" - sources."got-5.7.1" + sources."got-6.7.1" sources."graceful-fs-4.1.11" sources."graceful-readlink-1.0.1" sources."graphlib-2.1.5" @@ -44596,12 +44468,14 @@ in sources."home-or-tmp-2.0.0" sources."hosted-git-info-2.6.0" sources."htmlparser2-3.9.2" + sources."http-errors-1.6.2" + sources."http-proxy-agent-2.1.0" sources."http-signature-1.2.0" + sources."https-proxy-agent-2.2.1" sources."iconv-lite-0.4.21" - sources."ignore-3.3.7" + sources."ignore-3.3.8" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" - sources."infinity-agent-2.0.3" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" @@ -44609,23 +44483,24 @@ in sources."interpret-1.1.0" sources."invariant-2.2.4" sources."invert-kv-1.0.0" + sources."ip-1.1.5" sources."is-absolute-0.1.7" sources."is-accessor-descriptor-1.0.0" - sources."is-alphabetical-1.0.1" - sources."is-alphanumerical-1.0.1" + sources."is-alphabetical-1.0.2" + sources."is-alphanumerical-1.0.2" sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" sources."is-builtin-module-1.0.0" sources."is-data-descriptor-1.0.0" - sources."is-decimal-1.0.1" + sources."is-decimal-1.0.2" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-finite-1.0.2" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.0" - sources."is-hexadecimal-1.0.1" + sources."is-hexadecimal-1.0.2" sources."is-installed-globally-0.1.0" sources."is-mergeable-object-1.1.0" sources."is-my-ip-valid-1.0.0" @@ -44648,6 +44523,7 @@ in sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" + sources."is-wsl-1.1.0" sources."isarray-1.0.0" sources."isemail-1.2.0" sources."isexe-2.0.0" @@ -44678,26 +44554,27 @@ in sources."jwa-1.1.5" sources."jws-3.1.4" sources."kind-of-3.2.2" - sources."latest-version-2.0.0" - sources."lazy-cache-1.0.4" + sources."latest-version-3.1.0" + sources."lazy-cache-0.2.7" sources."lazystream-1.0.0" sources."lcid-1.0.0" sources."levn-0.3.0" sources."load-json-file-1.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."lodash.assign-4.2.0" + sources."lodash.assignin-4.2.0" sources."lodash.clonedeep-4.5.0" - sources."lodash.defaults-4.2.0" - sources."lodash.defaultsdeep-4.6.0" - sources."lodash.mergewith-4.6.1" + sources."lodash.flatten-4.4.0" + sources."lodash.get-4.4.2" sources."lodash.once-4.1.1" + sources."lodash.set-4.3.2" sources."lodash.sortby-4.7.0" - sources."longest-1.0.1" sources."longest-streak-1.0.0" sources."loose-envify-1.3.1" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.2" + sources."macos-release-1.1.0" sources."make-dir-1.2.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" @@ -44721,7 +44598,7 @@ in sources."minimist-0.0.8" ]; }) - sources."moment-2.22.0" + sources."moment-2.22.1" sources."ms-2.0.0" sources."mute-stream-0.0.7" sources."mv-2.1.1" @@ -44730,19 +44607,18 @@ in sources."nanomatch-1.2.9" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" - sources."nconf-0.7.2" + sources."nconf-0.10.0" sources."ncp-2.0.0" - (sources."needle-2.2.0" // { + (sources."needle-2.2.1" // { dependencies = [ sources."debug-2.6.9" ]; }) - sources."neo-async-2.5.0" - sources."nested-error-stacks-1.0.2" + sources."neo-async-2.5.1" + sources."netmask-1.0.6" sources."next-tick-1.0.0" sources."node-forge-0.7.5" sources."node-notifier-5.2.1" - sources."node-status-codes-1.0.0" sources."nomnom-1.8.1" sources."normalize-package-data-2.4.0" sources."normalize-path-2.1.1" @@ -44757,26 +44633,27 @@ in sources."once-1.4.0" sources."onetime-2.0.1" sources."open-0.0.5" + sources."opn-5.3.0" sources."optionator-0.8.2" sources."os-homedir-1.0.2" sources."os-locale-2.1.0" - sources."os-name-1.0.3" + sources."os-name-2.0.1" sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" - sources."osx-release-1.1.0" sources."p-finally-1.0.0" sources."p-limit-1.2.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" - sources."package-json-2.4.0" + sources."pac-proxy-agent-2.0.2" + sources."pac-resolver-3.0.0" + sources."package-json-4.0.1" sources."pako-1.0.6" - sources."parse-entities-1.1.1" + sources."parse-entities-1.1.2" sources."parse-json-4.0.0" sources."parse5-3.0.3" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" - sources."path-exists-2.1.0" + sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" @@ -44810,15 +44687,15 @@ in sources."process-nextick-args-2.0.0" sources."progress-2.0.0" sources."promise-7.3.1" + sources."proxy-agent-3.0.0" sources."proxy-from-env-1.0.0" sources."pseudomap-1.0.2" sources."pump-3.0.0" sources."punycode-1.4.1" - sources."qs-6.5.1" - sources."querystring-0.2.0" + sources."qs-6.5.2" sources."quick-format-unescaped-1.1.2" - sources."rc-1.2.6" - sources."read-all-stream-3.1.0" + sources."raw-body-2.3.2" + sources."rc-1.2.7" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" sources."readable-stream-2.3.6" @@ -44851,27 +44728,27 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."require-uncached-1.0.3" - sources."resolve-1.7.0" + sources."resolve-1.7.1" sources."resolve-from-1.0.1" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" sources."ret-0.1.15" - sources."right-align-0.1.3" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."rx-4.1.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.1.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" + sources."secure-keys-1.0.0" sources."semver-5.5.0" sources."semver-diff-2.1.0" sources."set-blocking-2.0.0" sources."set-immediate-shim-1.0.1" sources."set-value-2.0.0" + sources."setprototypeof-1.0.3" sources."sha.js-2.4.11" (sources."shallow-clone-0.1.2" // { dependencies = [ @@ -44911,7 +44788,7 @@ in sources."signal-exit-3.0.2" sources."slash-1.0.0" sources."slice-ansi-1.0.0" - sources."slide-1.1.6" + sources."smart-buffer-1.1.15" (sources."snapdragon-0.8.2" // { dependencies = [ (sources."define-property-0.2.5" // { @@ -44926,73 +44803,52 @@ in sources."snapdragon-node-2.1.1" sources."snapdragon-util-3.0.1" sources."sntp-2.1.0" - (sources."snyk-1.71.0" // { + (sources."snyk-1.78.1" // { dependencies = [ + sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" sources."async-1.5.2" - sources."camelcase-3.0.0" - sources."chalk-1.1.3" - sources."inquirer-1.0.3" - sources."mute-stream-0.0.6" + sources."chalk-2.4.1" + sources."cli-cursor-2.1.0" + sources."figures-2.0.0" + sources."inquirer-3.3.0" + sources."is-fullwidth-code-point-2.0.0" + sources."mute-stream-0.0.7" + sources."onetime-2.0.1" sources."os-locale-1.4.0" + sources."restore-cursor-2.0.0" sources."run-async-2.3.0" + sources."rx-lite-4.0.8" + sources."string-width-2.1.1" sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."yargs-3.15.0" + sources."yargs-3.32.0" ]; }) - (sources."snyk-config-1.0.1" // { + (sources."snyk-config-2.1.0" // { dependencies = [ - sources."async-0.9.2" - sources."debug-2.6.9" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" ]; }) - sources."snyk-go-plugin-1.4.6" - sources."snyk-gradle-plugin-1.2.0" - (sources."snyk-module-1.8.1" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."snyk-mvn-plugin-1.1.1" - (sources."snyk-nuget-plugin-1.3.9" // { - dependencies = [ - sources."es6-promise-4.2.4" - ]; - }) - sources."snyk-php-plugin-1.3.2" - (sources."snyk-policy-1.10.2" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."snyk-python-plugin-1.5.7" - (sources."snyk-resolve-1.0.0" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - (sources."snyk-resolve-deps-1.7.0" // { - dependencies = [ - sources."configstore-2.1.0" - sources."debug-2.6.9" - sources."update-notifier-0.6.3" - sources."uuid-2.0.3" - sources."yargs-4.8.1" - ]; - }) - (sources."snyk-sbt-plugin-1.2.5" // { + sources."snyk-go-plugin-1.5.0" + sources."snyk-gradle-plugin-1.3.0" + sources."snyk-module-1.8.2" + sources."snyk-mvn-plugin-1.2.0" + sources."snyk-nuget-plugin-1.4.0" + sources."snyk-php-plugin-1.5.0" + sources."snyk-policy-1.12.0" + sources."snyk-python-plugin-1.6.0" + sources."snyk-resolve-1.0.1" + sources."snyk-resolve-deps-3.1.0" + (sources."snyk-sbt-plugin-1.3.0" // { dependencies = [ sources."debug-2.6.9" ]; }) sources."snyk-tree-1.0.0" - (sources."snyk-try-require-1.2.0" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) + sources."snyk-try-require-1.3.0" + sources."socks-1.1.10" + sources."socks-proxy-agent-3.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.1" (sources."source-map-support-0.5.3" // { @@ -45017,8 +44873,8 @@ in sources."sprintf-js-1.0.3" sources."sshpk-1.14.1" sources."static-extend-0.1.2" + sources."statuses-1.5.0" sources."stream-parser-0.3.1" - sources."stream-shift-1.0.0" sources."stream-to-array-2.3.0" (sources."stream-to-promise-2.2.0" // { dependencies = [ @@ -45026,10 +44882,9 @@ in sources."once-1.3.3" ]; }) - sources."string-length-1.0.1" sources."string-width-2.1.1" sources."string_decoder-1.1.1" - sources."stringify-entities-1.3.1" + sources."stringify-entities-1.3.2" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."strip-bom-3.0.0" @@ -45040,12 +44895,9 @@ in sources."structured-source-3.0.2" sources."supports-color-2.0.0" sources."table-4.0.2" - sources."tar-stream-1.5.5" - (sources."tempfile-1.1.1" // { - dependencies = [ - sources."uuid-2.0.3" - ]; - }) + sources."tar-stream-1.6.0" + sources."temp-dir-1.0.0" + sources."tempfile-2.0.0" sources."term-size-1.2.0" sources."text-table-0.2.0" sources."then-fs-2.0.0" @@ -45053,8 +44905,10 @@ in sources."thenify-all-1.6.0" sources."through-2.3.8" sources."through2-2.0.3" - sources."timed-out-3.1.3" + sources."thunkify-2.1.2" + sources."timed-out-4.0.1" sources."tmp-0.0.33" + sources."to-buffer-1.1.1" sources."to-fast-properties-1.0.3" sources."to-object-path-0.3.0" sources."to-regex-3.0.2" @@ -45068,15 +44922,19 @@ in sources."traverse-0.4.6" sources."trim-0.0.1" sources."trim-right-1.0.1" - sources."trim-trailing-lines-1.1.0" - sources."trough-1.0.1" + sources."trim-trailing-lines-1.1.1" + sources."trough-1.0.2" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."typedarray-0.0.6" - sources."undefsafe-0.0.3" + (sources."undefsafe-2.0.2" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."underscore-1.8.3" - sources."unherit-1.1.0" + sources."unherit-1.1.1" sources."unified-4.2.1" (sources."union-value-1.0.0" // { dependencies = [ @@ -45084,10 +44942,11 @@ in ]; }) sources."unique-string-1.0.0" - sources."unist-util-is-2.1.1" - sources."unist-util-remove-position-1.1.1" - sources."unist-util-visit-1.3.0" + sources."unist-util-is-2.1.2" + sources."unist-util-remove-position-1.1.2" + sources."unist-util-visit-1.3.1" sources."universalify-0.1.1" + sources."unpipe-1.0.0" (sources."unset-value-1.0.0" // { dependencies = [ (sources."has-value-0.3.1" // { @@ -45097,27 +44956,11 @@ in }) ]; }) - sources."unzip-response-1.0.2" + sources."unzip-response-2.0.1" sources."upath-1.0.4" - (sources."update-notifier-2.3.0" // { - dependencies = [ - sources."boxen-1.3.0" - sources."configstore-3.1.2" - sources."dot-prop-4.2.0" - sources."got-6.7.1" - sources."latest-version-3.1.0" - sources."package-json-4.0.1" - sources."pify-3.0.0" - sources."timed-out-4.0.1" - sources."unzip-response-2.0.1" - sources."widest-line-2.0.0" - sources."write-file-atomic-2.3.0" - sources."xdg-basedir-3.0.0" - ]; - }) + sources."update-notifier-2.3.0" sources."update-section-0.3.3" sources."urix-0.1.0" - sources."url-0.11.0" sources."url-parse-lax-1.0.0" (sources."use-3.1.0" // { dependencies = [ @@ -45130,7 +44973,7 @@ in sources."validate-npm-package-license-3.0.3" sources."verror-1.10.0" sources."vfile-1.4.0" - sources."vfile-location-2.0.2" + sources."vfile-location-2.0.3" (sources."watchpack-1.5.0" // { dependencies = [ sources."define-property-1.0.0" @@ -45158,15 +45001,11 @@ in }) sources."wcwidth-1.0.1" sources."webidl-conversions-4.0.2" - (sources."whatwg-url-6.3.0" // { - dependencies = [ - sources."punycode-2.1.0" - ]; - }) + sources."whatwg-url-6.3.0" sources."when-3.7.7" sources."which-1.3.0" - sources."which-module-1.0.0" - sources."widest-line-1.0.0" + sources."which-module-2.0.0" + sources."widest-line-2.0.0" sources."win-release-1.1.1" sources."window-size-0.1.4" sources."winreg-0.0.12" @@ -45174,27 +45013,31 @@ in sources."wrap-ansi-2.1.0" sources."wrappy-1.0.2" sources."write-0.2.1" - sources."write-file-atomic-1.3.4" - sources."xdg-basedir-2.0.0" + sources."write-file-atomic-2.3.0" + sources."xdg-basedir-3.0.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" - sources."xregexp-4.0.0" + sources."xregexp-2.0.0" sources."xtend-4.0.1" sources."y18n-3.2.1" sources."yallist-2.1.2" (sources."yargs-6.6.0" // { dependencies = [ sources."camelcase-3.0.0" - sources."cliui-3.2.0" sources."decamelize-1.2.0" + sources."find-up-1.1.2" sources."is-fullwidth-code-point-1.0.0" sources."os-locale-1.4.0" + sources."parse-json-2.2.0" + sources."path-exists-2.1.0" sources."string-width-1.0.2" + sources."strip-bom-2.0.0" + sources."which-module-1.0.0" sources."yargs-parser-4.2.1" ]; }) - sources."yargs-parser-2.4.1" + sources."yargs-parser-9.0.2" sources."yauzl-2.9.1" sources."zip-1.2.0" (sources."zip-dir-1.0.2" // { @@ -45233,10 +45076,10 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "1.5.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.5.1.tgz"; - sha1 = "e8680360e832ac89521eb80dad3a7bc27a40bab4"; + url = "https://registry.npmjs.org/yarn/-/yarn-1.6.0.tgz"; + sha1 = "9cec6f7986dc237d39ec705ce74d95155fe55d4b"; }; buildInputs = globalBuildInputs; meta = { @@ -45250,10 +45093,10 @@ in yo = nodeEnv.buildNodePackage { name = "yo"; packageName = "yo"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/yo/-/yo-2.0.1.tgz"; - sha512 = "390n0gdbxr25mr804mrwfqw6r6srk4q9spnsnnlfvlsfvr6dwd93nrgh0l2sr76a9jdw2jiycwc0241h6zch6hi0jlhg3w8hk6i4hyy"; + url = "https://registry.npmjs.org/yo/-/yo-2.0.2.tgz"; + sha512 = "13z42dkmgbs67a3i6wfzf1h3lp54r6xj9p063kyx2nq0v132lqnkss2srl2kayfljcdprr7pw7dfm6h08kqnkhzrlzi1ls7h7cz2qgy"; }; dependencies = [ sources."@sindresorhus/is-0.7.0" @@ -45333,7 +45176,7 @@ in sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."default-uid-1.0.0" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -45376,8 +45219,9 @@ in sources."getpass-0.1.7" sources."glob-7.1.2" sources."global-dirs-0.1.1" + sources."global-tunnel-ng-2.1.1" sources."globby-6.1.0" - sources."got-8.3.0" + sources."got-8.3.1" sources."graceful-fs-4.1.11" sources."grouped-queue-0.3.3" sources."har-schema-2.0.0" @@ -45404,9 +45248,9 @@ in dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."strip-ansi-4.0.0" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" ]; }) (sources."insight-0.8.4" // { @@ -45471,7 +45315,7 @@ in sources."latest-version-3.1.0" sources."load-json-file-1.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."lodash._getnative-3.9.1" sources."lodash.debounce-3.1.1" sources."lodash.pad-4.5.1" @@ -45568,9 +45412,9 @@ in sources."process-nextick-args-2.0.0" sources."pseudomap-1.0.2" sources."punycode-1.4.1" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."query-string-5.1.1" - sources."rc-1.2.6" + sources."rc-1.2.7" sources."read-pkg-1.1.0" (sources."read-pkg-up-2.0.0" // { dependencies = [ @@ -45598,7 +45442,7 @@ in sources."rx-4.1.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."scoped-regex-1.0.0" sources."semver-5.5.0" @@ -45661,6 +45505,7 @@ in sources."tmp-0.0.33" sources."tough-cookie-2.3.4" sources."trim-newlines-1.0.0" + sources."tunnel-0.0.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."twig-0.8.9" @@ -45668,13 +45513,13 @@ in sources."unique-string-1.0.0" sources."untildify-3.0.2" sources."unzip-response-2.0.1" - (sources."update-notifier-2.4.0" // { + (sources."update-notifier-2.5.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."camelcase-4.1.0" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."execa-0.7.0" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" ]; }) sources."url-parse-lax-3.0.0" @@ -45714,11 +45559,11 @@ in (sources."yeoman-environment-2.0.6" // { dependencies = [ sources."ansi-styles-3.2.1" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."debug-3.1.0" sources."log-symbols-2.2.0" sources."pify-2.3.0" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" ]; }) (sources."yosay-2.0.2" // { diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json index 2d987cbfb1b..62428e9dbf3 100644 --- a/pkgs/development/node-packages/node-packages-v8.json +++ b/pkgs/development/node-packages/node-packages-v8.json @@ -15,4 +15,5 @@ , "vue-cli" , "swagger" , "npm" +, "three" ] diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 4b2e714c42d..88aed5fd823 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -22,13 +22,13 @@ let sha512 = "0ahsk9basb6qimsb40yr40vxxkmmfiqlig23brc5dymic61gfhzg2mzqz5cvkiz2y8g2rwnlwb619fkd3f4hw1yg8bkbczcaxzcrqn0"; }; }; - "@cycle/isolate-3.2.0" = { + "@cycle/isolate-3.3.0" = { name = "_at_cycle_slash_isolate"; packageName = "@cycle/isolate"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cycle/isolate/-/isolate-3.2.0.tgz"; - sha512 = "1g3jcq2dmxpqn3nyvclbf9hnp18h4c41vsqywp2yf2mda92bzdjwidq8f231yxb6rs6r39zpvn741kjify4h5zl4d8ix1xigilbcyj7"; + url = "https://registry.npmjs.org/@cycle/isolate/-/isolate-3.3.0.tgz"; + sha512 = "0406glnab9c4579lfqikh8w67xjd7fvll3sysxy80sxjv3iaks6w08bgjl8418pk2x0iid8shd3ad7xqiw1lvdjarxnrydmnj3c8mjq"; }; }; "@cycle/run-3.4.0" = { @@ -49,13 +49,13 @@ let sha1 = "cbc4b9a68981bf0b501ccd06a9058acd65309bf7"; }; }; - "@types/node-9.6.2" = { + "@types/node-10.0.4" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "9.6.2"; + version = "10.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-9.6.2.tgz"; - sha512 = "30kq6rikl2ya5krnyglrbi52xrm0f3q0nyzj99haady8c2s03l3rcp42cxkkd4v3mrvsw3jan0kz7vb4j148qg8wklh2igvsmii2sai"; + url = "https://registry.npmjs.org/@types/node/-/node-10.0.4.tgz"; + sha512 = "2zwjjfa4s706r0w45siwgzax5c8g5j3z79dkckwzgrzqxglj070ijv0m9g1ipc1y4kr7l0r9qia9yfxc9syw64hib8vh216cxk1las6"; }; }; "@types/superagent-3.5.6" = { @@ -481,13 +481,13 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "atob-2.1.0" = { + "atob-2.1.1" = { name = "atob"; packageName = "atob"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/atob/-/atob-2.1.0.tgz"; - sha512 = "0dyf7054n94f1pwp9chcy6vawgwd2wqp8jqrnvxl489jyxxbg46n2vkb5vfs5jqnkmh6kbyv4lpysrn13hzzh5q021frc6vrcgqms2a"; + url = "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz"; + sha1 = "ae2d5a729477f289d60dd7f96a6314a22dd6c22a"; }; }; "atomic-batcher-1.0.2" = { @@ -940,13 +940,13 @@ let sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; }; }; - "chalk-2.3.2" = { + "chalk-2.4.1" = { name = "chalk"; packageName = "chalk"; - version = "2.3.2"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz"; - sha512 = "06jlrzx0nb92910rcfhx55n28jgvhc0qda49scnfyifnmc31dyfqsl5qqiwhsxkrhrc6c07x69q037f1pwg06kkfd1qdzaxz7dj7kk4"; + url = "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz"; + sha512 = "1yl5ffjp5w65b9ydnw4vp13n563121hs64xbnajif51grhpqmslaqllj24zm1pfaw9ywvdx69n8ppa3riwlps25k5934zgnbf3pmcrr"; }; }; "chardet-0.4.2" = { @@ -1228,13 +1228,13 @@ let sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; }; }; - "colors-1.2.1" = { + "colors-1.2.4" = { name = "colors"; packageName = "colors"; - version = "1.2.1"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.2.1.tgz"; - sha512 = "0m8vssxhc3xlx639gz68425ll6mqh0rib6yr7s2v2vg1hwnqka02zijxmg16iyvzmd5sbsczjs2mqs0n428pc1cgkgj439fsa9b1kxk"; + url = "https://registry.npmjs.org/colors/-/colors-1.2.4.tgz"; + sha512 = "1ch53w9md043zff52vsmh89qirws3x7n4zw88xxw0h98fjg71dsll3gh1b598a48xq98d15qpjb07g9ddjsfknrba0byp56fl3a53z9"; }; }; "combine-errors-3.0.3" = { @@ -1570,13 +1570,13 @@ let sha512 = "0yyadc98mdpvqdszc1v26zcgd6zqxink2wrhxw9ax60wk0sxqw6mm3m2jbqvibj54p1gjsmgsf1yhv20xsm77kkb7qwj79jlx8kvfad"; }; }; - "dat-doctor-1.3.1" = { + "dat-doctor-1.4.0" = { name = "dat-doctor"; packageName = "dat-doctor"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-1.3.1.tgz"; - sha512 = "19cfxdik2pv94dbfsz4nm6a0v6vfx5s1isaagmsjrb44czbcl55sjj9nf1302hqc8ckijsdmlsrna02hb0mjzzhsy0m6c8r3cv0wabk"; + url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-1.4.0.tgz"; + sha512 = "3ysgc2z0pjbka9617lqykw8c0bqbacgixd6j8nlcdi7sz7j94w2sl17mq3xaq7b6kr5wdngi64y584hj8baqgxw2aaavgvk96kff3fl"; }; }; "dat-encoding-4.0.2" = { @@ -1669,22 +1669,13 @@ let sha512 = "13cbr004milnmjisg774rqqw82vyjg1p1d6gvm3xji516rq7zzc1x7da397njig5s2rg2qmw1dixdn4cpkmvc8irq4y1dzb3h46sz2c"; }; }; - "dat-swarm-defaults-1.0.0" = { + "dat-swarm-defaults-1.0.1" = { name = "dat-swarm-defaults"; packageName = "dat-swarm-defaults"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/dat-swarm-defaults/-/dat-swarm-defaults-1.0.0.tgz"; - sha1 = "ba7d58c309cf60c3924afad869b75192b61fe354"; - }; - }; - "datland-swarm-defaults-1.0.2" = { - name = "datland-swarm-defaults"; - packageName = "datland-swarm-defaults"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/datland-swarm-defaults/-/datland-swarm-defaults-1.0.2.tgz"; - sha1 = "277b895a39f1aa7f96a495a02fb3662a5ed9f2e0"; + url = "https://registry.npmjs.org/dat-swarm-defaults/-/dat-swarm-defaults-1.0.1.tgz"; + sha512 = "0kgq4nz4axx3kpfam6lxid88x5gx39gbk3kzcgmbhxld9vwl3469q58hkd2zjripg3955483j450yvszk1pwpn895adz62mn0xsarag"; }; }; "debug-2.2.0" = { @@ -1786,13 +1777,13 @@ let sha1 = "84b745896f34c684e98f2ce0e42abaf43bba017d"; }; }; - "deep-extend-0.4.2" = { + "deep-extend-0.5.1" = { name = "deep-extend"; packageName = "deep-extend"; - version = "0.4.2"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz"; - sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f"; + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz"; + sha512 = "3bzqm7nqgh7m8xjhl0q8jc0ccm9riymsfmy0144x6n2qy9v1gin2ww8s9wjlayk0xyzq9cz9pyar02yiv30mhqsj7rmw35ywrsc3jrp"; }; }; "define-property-0.2.5" = { @@ -2047,13 +2038,13 @@ let sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; }; }; - "duplexify-3.5.4" = { + "duplexify-3.6.0" = { name = "duplexify"; packageName = "duplexify"; - version = "3.5.4"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz"; - sha512 = "2qcky919ps17a9ndimxvcqc73wlrcjmq8ppddbnl45xs9yqp1dmzzfaspfn63xzp14rl3dlk4g6y2ia71s6r9nggd0mb891hcni4di7"; + url = "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz"; + sha512 = "12hhn0igd7y8nmni0qd63wpc9w1fl5rgdh4d1mq65n6r00l7byh7fs5v6m6pd8xzwmnxhrxqrc1y5yh6hswbh2i9ic9la21if5w7vbw"; }; }; "ecc-jsbn-0.1.1" = { @@ -2605,6 +2596,15 @@ let sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; }; }; + "fs-constants-1.0.0" = { + name = "fs-constants"; + packageName = "fs-constants"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz"; + sha512 = "2iv1j05gzx1sgpckd597sdd2f5x54rgcib3rpwgf31050wqxn5h27map6cn9wk4vix393s4ws2xv6kgps5zfby2iirb2zw8hk1818yb"; + }; + }; "fs-extra-0.24.0" = { name = "fs-extra"; packageName = "fs-extra"; @@ -2641,13 +2641,13 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "fsevents-1.1.3" = { + "fsevents-1.2.3" = { name = "fsevents"; packageName = "fsevents"; - version = "1.1.3"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz"; - sha512 = "3jw51f4iayxvp9wfxczk1xgcvhsydhlgah64jmpl0mqiii2h8i5pp0lrqac5xn7296gxqrvy4lgm4k4hkifk8gipgqxd68x764gp2jq"; + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.3.tgz"; + sha512 = "3nsv4z5qk2hhcrp6bng9bzpj4nsk0b41i363phlqfp69dq1p2x6a1g3y86z2j7aj4mfj88y1i1agkb1y0pg5c388223h394jqxppvjz"; }; }; "fstream-1.0.11" = { @@ -3046,13 +3046,13 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; - "hypercore-6.13.0" = { + "hypercore-6.14.0" = { name = "hypercore"; packageName = "hypercore"; - version = "6.13.0"; + version = "6.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.13.0.tgz"; - sha512 = "056r7rmx6zkfivza10a0fs5p2wlgxrb82gb1sz8hmjgczvc9gx652ybhbckmr0a0bjknc1yzd23zw6v3r2svasymvdfgcp9k98qf1hw"; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.14.0.tgz"; + sha512 = "3liw77yhvn3nlrczf9s30vvn4bxrn3glh65a2psy1va9pvcnjwx6wfh52v5l9qbd7zyp4q4nb7qrq0n3am7jwmz3dkb5fzvdnlwikkh"; }; }; "hypercore-protocol-6.6.4" = { @@ -3910,13 +3910,13 @@ let sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6"; }; }; - "lodash-4.17.5" = { + "lodash-4.17.10" = { name = "lodash"; packageName = "lodash"; - version = "4.17.5"; + version = "4.17.10"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz"; - sha512 = "11hikgyas884mz8a58vyixaahxbpdwljdw4cb6qp15xa3sfqikp2mm6wgv41jsl34nzsv1hkx9kw3nwczvas5p73whirmaz4sxggwmj"; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz"; + sha512 = "1ba5b80jjzwrh9fbdk5ywv8sic0dynij21wgrfxsfjzwvwd7x1n6azdhdc0vjdxqmcpm0mhshd1k7n2ascxpz00z3p8a3k97mwg1s2i"; }; }; "lodash-compat-3.10.2" = { @@ -4567,13 +4567,13 @@ let sha512 = "2agpbdf9h90nhafdam3jwrw8gcz3jw1i40cx6bhwaw8qaf2s863gi2b77l73dc3hmf5dx491hv5km1rqzabgsbpkjxrvdcwy6pr8gp1"; }; }; - "mirror-folder-2.1.1" = { + "mirror-folder-2.2.0" = { name = "mirror-folder"; packageName = "mirror-folder"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-2.1.1.tgz"; - sha1 = "1ad3b777b39e403cc27bf52086c23e41ef4c9604"; + url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-2.2.0.tgz"; + sha512 = "3js8pwgmj4lzzi6nzl0wp021rhsnz31jpkkzdf35xzwm1l65m6ygjf4hz77vvy3dk2h5jb2d32nvzy26n3d5hswg3nb8s0rylvv510r"; }; }; "mixin-deep-1.3.1" = { @@ -4801,13 +4801,13 @@ let sha512 = "15fbq2bchsjk85zklc34xl74skmdxbipsf0zjf1k6jfq1fr31h5bn7c6438ff55i9yzrhf11k85ahvahyb73khfjl4sj59zjrqksj9d"; }; }; - "needle-2.2.0" = { + "needle-2.2.1" = { name = "needle"; packageName = "needle"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.2.0.tgz"; - sha512 = "3ry4wyih9w3nc3d319bmfd9l4jj8fn00lqfs1d00sfy6azvy66yhm6jv411cn1c1zqc01hvj59dlavm82mzxw5mlar8ck9ylz5s0mkq"; + url = "https://registry.npmjs.org/needle/-/needle-2.2.1.tgz"; + sha512 = "3wnlvqmkxw69bl3clghqpsl1kxqm7hkq4v4ab0rm6dx7xqyg3bn8q38i6hmxm47ccfn6bxcvl53c4madxdgblnm06ika99x4g06rxmp"; }; }; "nets-3.2.0" = { @@ -4846,13 +4846,13 @@ let sha512 = "0vkilw1ghsjca0lrj9gsdgsi8wj4bvpfr25q1qzx1kp5hhvjdhapmvpmrd2hikwq9dxydw6sdvv0730wwvmsg36xqf0hgp9777l3ns8"; }; }; - "nodemon-1.17.3" = { + "nodemon-1.17.4" = { name = "nodemon"; packageName = "nodemon"; - version = "1.17.3"; + version = "1.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.3.tgz"; - sha512 = "1i6m13ad9c1p8xilw0vjcgmj0nnk1y9b3lncx6kwljxw89hmk5z9vv8m452wfd5qg9bqf9r0b236d9vxbc3i2sx2flamfrr03xm42zh"; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.4.tgz"; + sha512 = "3bmxd7fd494gy4ddax3mihjz1iy484iakyssbhy87cc2kwbky9xkb8l47vphc3n858q9p9afxl57w0849i24amsdjhwbqh8vxhjy1v5"; }; }; "nopt-1.0.10" = { @@ -5503,13 +5503,13 @@ let sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607"; }; }; - "qs-6.5.1" = { + "qs-6.5.2" = { name = "qs"; packageName = "qs"; - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz"; - sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; + url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; + sha512 = "0c46ws0x9g3mmkgfmvd78bzvnmv2b8ryg4ah6jvyyqgjv9v994z7xdyvsc4vg9sf98gg7phvy3q1ahgaj5fy3dwzf2rki6bixgl15ip"; }; }; "raf-3.3.2" = { @@ -5539,13 +5539,13 @@ let sha1 = "72f3d865b4b55a259879473e2fb2de3569c69ee2"; }; }; - "random-access-storage-1.1.1" = { + "random-access-storage-1.2.0" = { name = "random-access-storage"; packageName = "random-access-storage"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.1.1.tgz"; - sha512 = "1dswb4yr7m8350bx8z0z19iqgk2a43qbfc1qf8n3w483mqqg0f5gsykd5cg14yy8jik0n9ghy7j2f5kp1anzjna46ih9ncxpm0vq0k1"; + url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.2.0.tgz"; + sha512 = "3jz9jky55s8w0pd5q2v58fxdgca5ymbhlif0zn6jv55jr7bvp1xvn60bz4b2k6m399zzxzdk196385wl3gw6xasxzi3mq8xkp9al118"; }; }; "randomatic-1.1.7" = { @@ -5584,13 +5584,13 @@ let sha1 = "a2c2f98c8531cee99c63d8d238b7de97bb659fca"; }; }; - "rc-1.2.6" = { + "rc-1.2.7" = { name = "rc"; packageName = "rc"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.6.tgz"; - sha1 = "eb18989c6d4f4f162c399f79ddd29f3835568092"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz"; + sha512 = "30b4pqzhk8f4ppzyk5diwxac7xpf4hd3rysyin012l59da9v5iaai4wd6yzlz3rjspfvvy191q6qcsw47mwlw9y07n35kzq23rw7lid"; }; }; "read-1.0.7" = { @@ -5881,13 +5881,13 @@ let sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; }; }; - "safe-buffer-5.1.1" = { + "safe-buffer-5.1.2" = { name = "safe-buffer"; packageName = "safe-buffer"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; - sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r"; }; }; "safe-regex-1.1.0" = { @@ -6187,13 +6187,13 @@ let sha512 = "3451wvpagbw2ib50galmlfrb5za3zh0ml1irbm2ijd0lbjblg9va4fnag6sfs7msb1m0i5zicz93jwp90c22v0n40qzpczhicg85jah"; }; }; - "sodium-native-2.1.5" = { + "sodium-native-2.1.6" = { name = "sodium-native"; packageName = "sodium-native"; - version = "2.1.5"; + version = "2.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.5.tgz"; - sha512 = "3cwd4rvsggx0lzc7433v6321fjs65q9nqr3c9gcz7j51ca580aq6ciacmmq788yxb3ih78b1fkpkprm75d0hadj3ng2bznc6qsl1var"; + url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.6.tgz"; + sha512 = "3y0f008galwxign4qb49q2kfkhz68nfxazpcq5y63wahaqly89x640nnv8cv4rg9xn1vbp5wia76vkmh1ja13dp95vjzw2lv5q2zymx"; }; }; "sodium-universal-2.0.0" = { @@ -6574,6 +6574,15 @@ let sha512 = "0sxwwjllf26hx079lw1w3c1zywq2af9ssi7f0n334xzz1mgnfx2lr5l532a988zyi3bigzmfidqgdrfmwv6ghgzs77qsw87yr0zhlc1"; }; }; + "superagent-3.8.3" = { + name = "superagent"; + packageName = "superagent"; + version = "3.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz"; + sha512 = "0a4ra91hgzbhnyccsx319r1xzaw4cb3k144g7xrp10y3wckzd98vxhf5vk34cfvvlrav8pyf2vqr11scimkiyivg2w84458q0n2vd0q"; + }; + }; "supports-color-1.2.0" = { name = "supports-color"; packageName = "supports-color"; @@ -6601,13 +6610,13 @@ let sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c"; }; }; - "supports-color-5.3.0" = { + "supports-color-5.4.0" = { name = "supports-color"; packageName = "supports-color"; - version = "5.3.0"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz"; - sha512 = "0v9skvg8c5hgqfsm98p7d7hisk11syjdvl3nxid3ik572hbjwv4vyzws7q0n1yz8mvb1asbk00838fi09hyfskrng54icn8nbag98yi"; + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz"; + sha512 = "3ks7qkl6s064qcdc5qnpzcwzcrnlzccz9m3faw54fnmsm2k8fzb9saqr5nhx7w9lnd4nbp0zg047zz8mwsd4fxfnalpb7kra619fdnf"; }; }; "swagger-converter-0.1.7" = { @@ -6673,22 +6682,22 @@ let sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"; }; }; - "tar-4.4.1" = { + "tar-4.4.2" = { name = "tar"; packageName = "tar"; - version = "4.4.1"; + version = "4.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz"; - sha512 = "33gymcvk33znj1lscj0kds60g5jzagw2dcx1fcbpxz85pi21kqlazvwz579p301x0vqvir1nslh901zq28sfx2zpsnd7qldvjpzbsrv"; + url = "https://registry.npmjs.org/tar/-/tar-4.4.2.tgz"; + sha512 = "25ypdsz6l4xmg1f89pjy8s773j3lzx855iiakbdknz115vxyg4p4z1j0i84iyjpzwgfjfs2l2njpd0y2hlr5sh4n01nh6124zs09y85"; }; }; - "tar-stream-1.5.5" = { + "tar-stream-1.6.0" = { name = "tar-stream"; packageName = "tar-stream"; - version = "1.5.5"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz"; - sha512 = "219gn10gvilrq6h3yshbhn25fx46n0wlgg66h0v326jhzz8gmpxsinb8bnhx1py35z0cv2248v91k2vy6vmkajmvpmkfmizywn601wr"; + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.0.tgz"; + sha512 = "2kw4php0986jgdzqvrih64plc8md1f1v3wfc8mz3y0lz95dmmvba1lpjmwp1v4crgfky63r8an3syfavn3gb0d56xk7615zy40a47cn"; }; }; "term-size-1.2.0" = { @@ -6790,13 +6799,13 @@ let sha512 = "0drg2bck1cj8677rgs1l98v7vqaxawcqh6ja87qilwnd719l5y0lzv5ssn3pcwa37fdbg4188y6x15a90vkllyvfpd9v7fai2b8j44d"; }; }; - "to-buffer-1.1.0" = { + "to-buffer-1.1.1" = { name = "to-buffer"; packageName = "to-buffer"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.0.tgz"; - sha1 = "375bc03edae5c35a8fa0b3fe95a1f3985db1dcfa"; + url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz"; + sha512 = "1b8wsfz1rp8fsb2kz7isrsx292vl5w4cmx9qvivxqsj61avx9ph1azxa6zr3mc85cz8qddbkxm6ski8zvacmpadc22wp6pv5gk427wp"; }; }; "to-iso-string-0.0.2" = { @@ -7114,22 +7123,22 @@ let sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; }; }; - "upath-1.0.4" = { + "upath-1.0.5" = { name = "upath"; packageName = "upath"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/upath/-/upath-1.0.4.tgz"; - sha512 = "0xw24ba88hfvwwgniyn17n26av45g1pxqf095231065l4n9dp5w3hyc7azjd8sqyix7pnfx1pmr44fzmwwazkz0ly83cp214g4qk13p"; + url = "https://registry.npmjs.org/upath/-/upath-1.0.5.tgz"; + sha512 = "31m1lljcfngdnpyz67gpkwvb66gx6750si3jzmf1vg6kq420fq5lcd34cfgp6wz3manjpqbp9i98ax2yjl2xs7mq824chw38vvsgcm9"; }; }; - "update-notifier-2.4.0" = { + "update-notifier-2.5.0" = { name = "update-notifier"; packageName = "update-notifier"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.4.0.tgz"; - sha1 = "f9b4c700fbfd4ec12c811587258777d563d8c866"; + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz"; + sha512 = "07vkna9y5i0ak6rwcbinrrgpabrcmav91ys805c42jskyc6kfla3wd12klsr858vzv5civi7arh5xz8bv7jdj81zgzyh6j70a31s0w3"; }; }; "uri-js-3.0.2" = { @@ -7222,13 +7231,13 @@ let sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; }; }; - "utp-native-1.7.0" = { + "utp-native-1.7.1" = { name = "utp-native"; packageName = "utp-native"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.0.tgz"; - sha512 = "1d0ccaz56506y44838shld6zkqx9rcx3cpw5qddbfbyjyjr73704gysrl3qwii6i80kx1i2ysnn8bdx6q0i4biwzjj36ksx2865i0yz"; + url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.1.tgz"; + sha512 = "2mflgna04nng4cj8z4pr53pw0fm3z447mvbnvcahlvq8wpg46znrvg4fkgh18k14bkiq3gic5d2h975bgy7h7l64cfjpc8r2km3naqm"; }; }; "uuid-3.2.1" = { @@ -7519,13 +7528,13 @@ let sha1 = "a81981ea70a57946133883f029c5821a89359a7f"; }; }; - "z-schema-3.19.1" = { + "z-schema-3.20.0" = { name = "z-schema"; packageName = "z-schema"; - version = "3.19.1"; + version = "3.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/z-schema/-/z-schema-3.19.1.tgz"; - sha512 = "29crh8y7kjqp652n8wpbh4ljd4j579jg9kwaw9anmd8nhkdz5ljg9arxm8wpcpir5rka60l7h3i13mahcrsq95ydl3f1pxfcfm77wwc"; + url = "https://registry.npmjs.org/z-schema/-/z-schema-3.20.0.tgz"; + sha512 = "2fmqk4rayvsp7kjhfmr7ldrwvfvg1aif9dwpsqbqvmsz8j18q5lxs1vm4frg7pla8fwj2xacjzy0fsm2xfqvwmsxa5yxvsb21y5v2pn"; }; }; }; @@ -7576,23 +7585,23 @@ in dependencies = [ sources."@cycle/dom-18.3.0" sources."@cycle/http-14.9.0" - sources."@cycle/isolate-3.2.0" + sources."@cycle/isolate-3.3.0" sources."@cycle/run-3.4.0" (sources."@cycle/time-0.10.1" // { dependencies = [ sources."chalk-1.1.3" ]; }) - sources."@types/node-9.6.2" + sources."@types/node-10.0.4" sources."@types/superagent-3.5.6" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."asynckit-0.4.0" - (sources."chalk-2.3.2" // { + (sources."chalk-2.4.1" // { dependencies = [ sources."ansi-styles-3.2.1" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" ]; }) sources."chardet-0.4.2" @@ -7638,7 +7647,7 @@ in sources."is-promise-2.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."lodash._baseiteratee-4.7.0" sources."lodash._basetostring-4.12.0" sources."lodash._baseuniq-4.6.0" @@ -7662,14 +7671,14 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.0" sources."pseudomap-1.0.2" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."raf-3.3.2" sources."readable-stream-2.3.6" sources."restore-cursor-2.0.0" sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."setimmediate-1.0.5" sources."shebang-command-1.2.0" @@ -7758,7 +7767,7 @@ in sources."bytes-3.0.0" sources."call-me-maybe-1.0.1" sources."caseless-0.12.0" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."circular-append-file-1.0.1" sources."cli-truncate-1.1.0" sources."cliclopts-1.1.1" @@ -7766,7 +7775,7 @@ in sources."codecs-1.2.1" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."colors-1.2.1" + sources."colors-1.2.4" sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" @@ -7782,7 +7791,7 @@ in sources."cycle-1.0.3" sources."dashdash-1.14.1" sources."dat-dns-1.3.2" - (sources."dat-doctor-1.3.1" // { + (sources."dat-doctor-1.4.0" // { dependencies = [ sources."debug-2.6.9" sources."dns-packet-1.3.1" @@ -7823,8 +7832,7 @@ in sources."dat-registry-4.0.0" sources."dat-secret-storage-4.0.1" sources."dat-storage-1.0.4" - sources."dat-swarm-defaults-1.0.0" - sources."datland-swarm-defaults-1.0.2" + sources."dat-swarm-defaults-1.0.1" sources."debug-3.1.0" sources."deep-equal-0.2.2" sources."delayed-stream-1.0.0" @@ -7849,7 +7857,7 @@ in sources."dns-socket-3.0.0" sources."dns-txt-2.0.2" sources."dom-walk-0.1.1" - sources."duplexify-3.5.4" + sources."duplexify-3.6.0" sources."ecc-jsbn-0.1.1" sources."end-of-stream-1.4.1" sources."escape-string-regexp-1.0.5" @@ -7884,7 +7892,7 @@ in sources."hoek-4.2.1" sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.13.0" // { + (sources."hypercore-6.14.0" // { dependencies = [ sources."varint-5.0.0" ]; @@ -7947,7 +7955,7 @@ in sources."min-document-2.19.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" - sources."mirror-folder-2.1.1" + sources."mirror-folder-2.2.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."multi-random-access-2.1.1" @@ -7993,10 +8001,10 @@ in sources."protocol-buffers-encodings-1.1.0" sources."pump-2.0.1" sources."punycode-1.4.1" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."random-access-file-2.0.1" sources."random-access-memory-2.4.0" - sources."random-access-storage-1.1.1" + sources."random-access-storage-1.2.0" (sources."randomatic-1.1.7" // { dependencies = [ (sources."is-number-3.0.0" // { @@ -8019,14 +8027,14 @@ in sources."revalidator-0.1.8" sources."rimraf-2.6.2" sources."rusha-0.8.13" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."signed-varint-2.0.1" sources."simple-sha1-2.1.0" sources."siphash24-1.1.0" sources."slice-ansi-1.0.0" sources."sntp-2.1.0" sources."sodium-javascript-0.5.5" - sources."sodium-native-2.1.5" + sources."sodium-native-2.1.6" sources."sodium-universal-2.0.0" sources."sorted-array-functions-1.1.0" sources."sorted-indexof-1.0.0" @@ -8048,7 +8056,7 @@ in sources."debug-2.6.9" ]; }) - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" (sources."throttle-1.0.3" // { dependencies = [ sources."debug-2.6.9" @@ -8056,7 +8064,7 @@ in }) sources."through2-2.0.3" sources."thunky-1.0.2" - sources."to-buffer-1.1.0" + sources."to-buffer-1.1.1" sources."toiletdb-1.4.1" sources."tough-cookie-2.3.4" sources."township-client-1.3.2" @@ -8072,7 +8080,7 @@ in sources."untildify-3.0.2" sources."util-deprecate-1.0.2" sources."utile-0.3.0" - sources."utp-native-1.7.0" + sources."utp-native-1.7.1" sources."uuid-3.2.1" sources."varint-3.0.1" sources."verror-1.10.0" @@ -8134,10 +8142,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "5.0.5"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-5.0.5.tgz"; - sha512 = "20cyp9x4b3gfrd50w8dcfkm0dv2mc6z0ikvfpkc8dzca6hppslgn0yiw2qdzc4ggf234kzcdvs0hw7lnv7ywilaml4w39vr6r93ghyw"; + url = "https://registry.npmjs.org/mocha/-/mocha-5.1.1.tgz"; + sha512 = "23wcnn35p90xhsc5z94w45s30j756s97acm313h6lacnbliqlaka3drq2xbsi4br8gdkld3r4dc33vglq8kf5jb408c7b2agpyar8lh"; }; dependencies = [ sources."balanced-match-1.0.0" @@ -8282,11 +8290,11 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.0" sources."punycode-1.4.1" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."readable-stream-2.3.6" sources."request-2.85.0" sources."rimraf-2.6.2" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."semver-5.3.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" @@ -8336,10 +8344,10 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.9.0.tgz"; - sha1 = "bdd4c3afac9b1b1ebff0a9ff3362859eb6781bb8"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz"; + sha512 = "10s7f95mxnxcwziwzx44l62zy3yjmhky942pw134dbd48wshl7abr1ja8qx1rfzz9vgygcx1vlz1jlldy61da33zq0bfi8bfji09f8v"; }; dependencies = [ sources."abbrev-1.1.1" @@ -8354,7 +8362,7 @@ in sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" sources."debug-2.6.9" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."delegates-1.0.0" sources."detect-libc-1.0.3" sources."fs-minipass-1.2.5" @@ -8375,7 +8383,7 @@ in sources."minizlib-1.1.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" - sources."needle-2.2.0" + sources."needle-2.2.1" sources."nopt-4.0.1" sources."npm-bundled-1.0.3" sources."npm-packlist-1.1.10" @@ -8388,14 +8396,14 @@ in sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" sources."process-nextick-args-2.0.0" - (sources."rc-1.2.6" // { + (sources."rc-1.2.7" // { dependencies = [ sources."minimist-1.2.0" ]; }) sources."readable-stream-2.3.6" sources."rimraf-2.6.2" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."semver-5.5.0" @@ -8405,7 +8413,7 @@ in sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."tar-4.4.1" + sources."tar-4.4.2" sources."util-deprecate-1.0.2" sources."wide-align-1.1.2" sources."wrappy-1.0.2" @@ -8423,10 +8431,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "1.38.3"; + version = "1.41.3"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-1.38.3.tgz"; - sha1 = "84b7ce1eee5d893c51995752e8afc2ee726539e3"; + url = "https://registry.npmjs.org/pnpm/-/pnpm-1.41.3.tgz"; + sha1 = "66b38792c8447702c47553a87dddc5748a3aefca"; }; buildInputs = globalBuildInputs; meta = { @@ -8475,12 +8483,12 @@ in sources."graceful-readlink-1.0.1" sources."inherits-2.0.3" sources."isarray-1.0.0" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."minimatch-3.0.4" sources."process-nextick-args-2.0.0" sources."readable-stream-2.3.6" sources."readdirp-2.1.0" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."set-immediate-shim-1.0.1" sources."string_decoder-1.1.1" sources."util-deprecate-1.0.2" @@ -8531,7 +8539,10 @@ in sources."boom-4.3.1" sources."brace-expansion-1.1.11" sources."buffer-3.6.0" + sources."buffer-alloc-1.1.0" + sources."buffer-alloc-unsafe-0.1.1" sources."buffer-crc32-0.2.13" + sources."buffer-fill-0.1.1" sources."builtins-1.0.3" sources."camelcase-1.2.1" sources."capture-stack-trace-1.0.0" @@ -8542,7 +8553,7 @@ in ]; }) sources."center-align-0.1.3" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."chardet-0.4.2" sources."cli-cursor-2.1.0" sources."cli-spinners-1.3.1" @@ -8611,6 +8622,7 @@ in sources."filenamify-2.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.2" + sources."fs-constants-1.0.0" sources."fs-extra-0.26.7" sources."fs.realpath-1.0.0" sources."get-proxy-2.1.0" @@ -8669,7 +8681,7 @@ in sources."kind-of-3.2.2" sources."klaw-1.3.1" sources."lazy-cache-1.0.4" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."log-symbols-2.2.0" sources."longest-1.0.1" sources."lowercase-keys-1.0.1" @@ -8714,7 +8726,7 @@ in sources."process-nextick-args-2.0.0" sources."proto-list-1.2.4" sources."punycode-1.4.1" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."read-metadata-1.0.0" sources."readable-stream-2.3.6" sources."recursive-readdir-2.2.2" @@ -8730,7 +8742,7 @@ in sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."seek-bzip-1.0.5" sources."semver-5.5.0" @@ -8746,14 +8758,15 @@ in sources."strip-ansi-4.0.0" sources."strip-dirs-2.1.0" sources."strip-outer-1.0.1" - sources."supports-color-5.3.0" - sources."tar-stream-1.5.5" + sources."supports-color-5.4.0" + sources."tar-stream-1.6.0" sources."through-2.3.8" sources."thunkify-2.1.2" sources."thunkify-wrap-1.0.4" sources."tildify-1.2.0" sources."timed-out-4.0.1" sources."tmp-0.0.33" + sources."to-buffer-1.1.1" sources."toml-2.3.3" sources."tough-cookie-2.3.4" sources."trim-repeated-1.0.0" @@ -8839,7 +8852,7 @@ in sources."async-1.5.2" sources."async-each-1.0.1" sources."asynckit-0.4.0" - sources."atob-2.1.0" + sources."atob-2.1.1" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -8917,7 +8930,7 @@ in sources."debug-2.6.9" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."depd-1.1.2" @@ -8961,7 +8974,7 @@ in sources."from-0.1.7" sources."fs-extra-0.24.0" sources."fs.realpath-1.0.0" - sources."fsevents-1.1.3" + sources."fsevents-1.2.3" sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."glob-7.1.2" @@ -9026,13 +9039,13 @@ in dependencies = [ sources."debug-3.1.0" sources."ms-2.0.0" - sources."qs-6.5.1" - sources."superagent-3.8.2" + sources."qs-6.5.2" + sources."superagent-3.8.3" ]; }) (sources."json-schema-deref-sync-0.3.4" // { dependencies = [ - sources."lodash-4.17.5" + sources."lodash-4.17.10" ]; }) sources."jsonfile-2.4.0" @@ -9115,11 +9128,11 @@ in sources."nan-2.10.0" sources."nanomatch-1.2.9" sources."native-promise-only-0.8.1" - (sources."nodemon-1.17.3" // { + (sources."nodemon-1.17.4" // { dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."debug-3.1.0" sources."define-property-1.0.0" sources."extend-shallow-2.0.1" @@ -9146,7 +9159,7 @@ in sources."lru-cache-4.1.2" sources."minimist-1.2.0" sources."strip-ansi-4.0.0" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" ]; }) sources."nopt-1.0.10" @@ -9187,7 +9200,7 @@ in sources."bytes-2.1.0" ]; }) - sources."rc-1.2.6" + sources."rc-1.2.7" sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."readline2-1.0.1" @@ -9205,7 +9218,7 @@ in sources."rimraf-2.6.2" sources."run-async-0.1.0" sources."rx-lite-3.1.2" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."sanitize-filename-1.6.1" sources."semver-5.5.0" @@ -9287,7 +9300,7 @@ in sources."form-data-1.0.0-rc3" sources."formidable-1.0.17" sources."isarray-0.0.1" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."mime-1.3.4" sources."ms-0.7.1" sources."object-assign-3.0.0" @@ -9337,8 +9350,8 @@ in ]; }) sources."unzip-response-2.0.1" - sources."upath-1.0.4" - sources."update-notifier-2.4.0" + sources."upath-1.0.5" + sources."update-notifier-2.5.0" sources."uri-js-3.0.2" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" @@ -9362,7 +9375,7 @@ in sources."xtend-4.0.1" sources."yallist-2.1.2" sources."yargs-3.10.0" - sources."z-schema-3.19.1" + sources."z-schema-3.20.0" ]; buildInputs = globalBuildInputs; meta = { @@ -9376,10 +9389,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "5.8.0"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.8.0.tgz"; - sha512 = "32zs775qksijpj23rwly4h8gs435lbsgaxzw6dmyjjg3i8qd40bmmadv3ac9mdxd0cd2x0m3ncsqa0j5vkmkvh8dknn0j9d1k6ig30f"; + url = "https://registry.npmjs.org/npm/-/npm-6.0.0.tgz"; + sha512 = "1s1pq7rdh5xxd4phq7bf1fikbfwc9iiglgayiy0bf14skvivj96j7f5mzyh3631gzhm7vmpak0k523axik5n4hza8gd8c90s203plqj"; }; buildInputs = globalBuildInputs; meta = { @@ -9390,4 +9403,21 @@ in production = true; bypassCache = true; }; + three = nodeEnv.buildNodePackage { + name = "three"; + packageName = "three"; + version = "0.92.0"; + src = fetchurl { + url = "https://registry.npmjs.org/three/-/three-0.92.0.tgz"; + sha1 = "8d3d1f5af890e62da7f4cb45d20c09fa51057dcd"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "JavaScript 3D library"; + homepage = https://threejs.org/; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; } \ No newline at end of file From 4e9892f84591b16333c51da081b6d69d6e875f59 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Tue, 24 Apr 2018 15:36:02 +0200 Subject: [PATCH 139/695] nodePackages_8_x.mathjax: Init at 2.7.4 --- .../node-packages/node-packages-v8.json | 1 + .../node-packages/node-packages-v8.nix | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json index 62428e9dbf3..4236064c754 100644 --- a/pkgs/development/node-packages/node-packages-v8.json +++ b/pkgs/development/node-packages/node-packages-v8.json @@ -16,4 +16,5 @@ , "swagger" , "npm" , "three" +, "mathjax" ] diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 88aed5fd823..e64364eb68b 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -9420,4 +9420,21 @@ in production = true; bypassCache = true; }; + mathjax = nodeEnv.buildNodePackage { + name = "mathjax"; + packageName = "mathjax"; + version = "2.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mathjax/-/mathjax-2.7.4.tgz"; + sha512 = "37hnj84ls531nqjxr4r6k4bjbqz4zqpb9adg7k6klah8dlj3rh38j4p8mbjh4h0v7r575kkc528rspincfabpm4j8y5v68kh6v8p907"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Beautiful math in all browsers. MathJax is an open-source JavaScript display engine for LaTeX, MathML, and AsciiMath notation that works in all browsers."; + homepage = "https://github.com/mathjax/MathJax#readme"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = true; + }; } \ No newline at end of file From fe24a0fa386e8a45919904ee62a35c11712f71ae Mon Sep 17 00:00:00 2001 From: Demyan Rogozhin Date: Sat, 5 May 2018 00:45:24 +0200 Subject: [PATCH 140/695] particl-core: init at 0.16.0.4 Particl is privacy-focused altcoin build for p2p eCommerce. Added Particl Core - daemon used to run staking node. --- maintainers/maintainer-list.nix | 5 ++ pkgs/applications/altcoins/default.nix | 2 + .../altcoins/particl/particl-core.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 56 insertions(+) create mode 100644 pkgs/applications/altcoins/particl/particl-core.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9369a76688c..782a3ee6aad 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -998,6 +998,11 @@ github = "demin-dmitriy"; name = "Dmitriy Demin"; }; + demyanrogozhin = { + email = "demyan.rogozhin@gmail.com"; + github = "demyanrogozhin"; + name = "Demyan Rogozhin"; + }; derchris = { email = "derchris@me.com"; github = "derchrisuk"; diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index fa704b59659..9915e0a301a 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -87,4 +87,6 @@ rec { parity = callPackage ./parity { }; parity-beta = callPackage ./parity/beta.nix { }; parity-ui = callPackage ./parity-ui { }; + + particl-core = callPackage ./particl/particl-core.nix { boost = boost165; miniupnpc = miniupnpc_2; withGui = false; }; } diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix new file mode 100644 index 00000000000..c9454963b22 --- /dev/null +++ b/pkgs/applications/altcoins/particl/particl-core.nix @@ -0,0 +1,47 @@ +{ stdenv +, autoconf +, automake +, autoreconfHook +, boost +, db48 +, fetchurl +, libevent +, libtool +, miniupnpc +, openssl +, pkgconfig +, utillinux +, zeromq +, zlib +, withGui +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "particl-core-${version}"; + version = "0.16.0.4"; + + src = fetchurl { + url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz"; + sha256 = "1yy8pw13rn821jpi1zvzwi3ipxi1bgfxv8g6jz49qlbjzjmjcr68"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ openssl db48 boost zlib + miniupnpc libevent zeromq ] + ++ optionals stdenv.isLinux [ utillinux ]; + + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; + + meta = { + description = "Privacy-Focused Marketplace & Decentralized Application Platform"; + longDescription= '' + An open source, decentralized privacy platform built for global person to person eCommerce. + ''; + homepage = https://particl.io/; + maintainers = with maintainers; [ demyanrogozhin ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c4d182d2d3..512e8b15062 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14896,6 +14896,8 @@ with pkgs; stellar-core = self.altcoins.stellar-core; + particl-core = self.altcoins.particl-core; + aumix = callPackage ../applications/audio/aumix { gtkGUI = false; }; From 42a0b11450948fd83b45e1ee60c252f8b9e84e81 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 6 May 2018 04:38:47 +0200 Subject: [PATCH 141/695] dockerTools.pullImage: Fix build with sandboxing Regression introduced in 736848723e5aefa5d24396c58dc6de603399efde. This commit most certainly hasn't been tested with sandboxing enabled and breaks not only pullImage but also the docker-tools NixOS VM test because it doesn't find it's certificate path and also relies on /var/tmp being there. Fixing the certificate path is the easiest one because it can be done via environment variable. I've used overrideAttrs for changing the hardcoded path to /tmp (which is available in sandboxed builds and even hardcoded in Nix), so that whenever someone uses Skopeo from all-packages.nix the path is still /var/tmp. The reason why this is hardcoded to /var/tmp can be seen in a comment in vendor/github.com/containers/image/storage/storage_image.go: Do not use the system default of os.TempDir(), usually /tmp, because with systemd it could be a tmpfs. With sandboxed builds this isn't the case, however for using Nix without NixOS this could turn into a problem if this indeed is the case. So in the long term this needs to have a proper solution. In addition to that, I cleaned up the expression a bit. Tested by building dockerTools.examples.nixFromDockerHub and the docker-tools NixOS VM test. Signed-off-by: aszlig Cc: @nlewo, @Mic92, @Profpatsch, @globin, @LnL7 --- pkgs/build-support/docker/default.nix | 50 +++++++++++++++++---------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 584beb3d89b..374b71d42a3 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -32,28 +32,42 @@ rec { inherit pkgs buildImage pullImage shadowSetup buildImageWithNixDb; }; - pullImage = - let - fixName = name: builtins.replaceStrings ["/" ":"] ["-" "-"] name; - in { - imageName, + pullImage = let + fixName = name: builtins.replaceStrings ["/" ":"] ["-" "-"] name; + in + { imageName # To find the digest of an image, you can use skopeo: # skopeo inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest' # sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b - imageDigest, - sha256, + , imageDigest + , sha256 # This used to set a tag to the pulled image - finalImageTag ? "latest", - name ? (fixName "docker-image-${imageName}-${finalImageTag}.tar") }: - runCommand name { - impureEnvVars=pkgs.stdenv.lib.fetchers.proxyImpureEnvVars; - outputHashMode="flat"; - outputHashAlgo="sha256"; - outputHash=sha256; - } - '' - ${pkgs.skopeo}/bin/skopeo copy docker://${imageName}@${imageDigest} docker-archive://$out:${imageName}:${finalImageTag} - ''; + , finalImageTag ? "latest" + , name ? fixName "docker-image-${imageName}-${finalImageTag}.tar" + }: + + runCommand name { + impureEnvVars = pkgs.stdenv.lib.fetchers.proxyImpureEnvVars; + outputHashMode = "flat"; + outputHashAlgo = "sha256"; + outputHash = sha256; + + # One of the dependencies of Skopeo uses a hardcoded /var/tmp for storing + # big image files, which is not available in sandboxed builds. + nativeBuildInputs = lib.singleton (pkgs.skopeo.overrideAttrs (drv: { + postPatch = (drv.postPatch or "") + '' + sed -i -e 's!/var/tmp!/tmp!g' \ + vendor/github.com/containers/image/storage/storage_image.go \ + vendor/github.com/containers/image/internal/tmpdir/tmpdir.go + ''; + })); + SSL_CERT_FILE = "${pkgs.cacert.out}/etc/ssl/certs/ca-bundle.crt"; + + sourceURL = "docker://${imageName}@${imageDigest}"; + destNameTag = "${imageName}:${finalImageTag}"; + } '' + skopeo copy "$sourceURL" "docker-archive://$out:$destNameTag" + ''; # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash. # And we cannot untar it, because then we cannot preserve permissions ecc. From 8ce802e8c8e99a0a7aed26e4f22725c56dd4cf80 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 6 May 2018 05:07:39 +0200 Subject: [PATCH 142/695] gopass: Add xclip to wrapperPath This is another dependency needed when invoked with "gopass -c". I opted for xclip instead of xsel, because xclip is tried first in order. Signed-off-by: aszlig Cc: @andir, @suvash, @mkaito --- pkgs/tools/security/gopass/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 743f9136ae5..1bbd4169f2e 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, makeWrapper }: +{ stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, xclip, makeWrapper }: buildGoPackage rec { version = "1.6.11"; @@ -18,6 +18,7 @@ buildGoPackage rec { wrapperPath = with stdenv.lib; makeBinPath ([ git gnupg + xclip ]); postInstall = '' From f8351ba5f0cf067579ceac19b67a797d0a4de3fc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 5 May 2018 23:28:36 -0500 Subject: [PATCH 143/695] pythonPackages.scrapy: enable darwin build --- pkgs/development/python-modules/scrapy/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 005d02e6047..f33acc79a2b 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchurl, glibcLocales, mock, pytest, botocore, +{ stdenv, buildPythonPackage, fetchurl, glibcLocales, mock, pytest, botocore, testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl, service-identity, parsel, pydispatcher, cssselect, lib }: buildPythonPackage rec { @@ -20,8 +20,9 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8"; checkPhase = '' - py.test --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py + py.test --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py ${lib.optionalString stdenv.isDarwin "--ignore=tests/test_utils_iterators.py"} # The ignored tests require mitmproxy, which depends on protobuf, but it's disabled on Python3 + # Ignore iteration test, because lxml can't find encodings on darwin https://bugs.launchpad.net/lxml/+bug/707396 ''; src = fetchurl { @@ -34,6 +35,6 @@ buildPythonPackage rec { homepage = http://scrapy.org/; license = licenses.bsd3; maintainers = with maintainers; [ drewkett ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 4e906935ccb27ccdfcc2bc5af8bd2867dcbc679e Mon Sep 17 00:00:00 2001 From: jD91mZM2 Date: Sun, 6 May 2018 07:28:42 +0200 Subject: [PATCH 144/695] powerline-rs: 0.1.6 -> 0.1.7 --- pkgs/tools/misc/powerline-rs/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix index 1a386a9f619..ff020d45101 100644 --- a/pkgs/tools/misc/powerline-rs/default.nix +++ b/pkgs/tools/misc/powerline-rs/default.nix @@ -1,14 +1,14 @@ { lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, cmake, libgit2, openssl_1_1_0, libssh2, libzip }: rustPlatform.buildRustPackage rec { name = "powerline-rs-${version}"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "jD91mZM2"; repo = "powerline-rs"; rev = version; - sha256 = "11rhirnk8zh4vf00df9cgy9vw5h8n7kgnhjbjbnlpl9i6wal9nvl"; + sha256 = "0ry1axia78sp9vmn6p119l69sj3dqx2san1k71a5npf60rf4gfkc"; }; cargoSha256 = "184s432a6damzvl0lv6jar1iml9dq60r190aqjy44lcg938981zc"; @@ -19,6 +19,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "powerline-shell rewritten in Rust, inspired by powerline-go"; + license = licenses.mit; maintainers = with maintainers; [ jD91mZM2 ]; platforms = platforms.unix; }; From f76301c6cb2a4eaeb4364aa2480bd0c7a2cb1115 Mon Sep 17 00:00:00 2001 From: Vladyslav Mykhailichenko Date: Sun, 6 May 2018 09:43:01 +0300 Subject: [PATCH 145/695] emby: 3.3.1.0 -> 3.4.0.0 --- pkgs/servers/emby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 964fa77c31a..4defe9787ba 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.3.1.0"; + version = "3.4.0.0"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; - sha256 = "04qq3rl3pwxnsr8z6x3dwplh6brn1nd0jpmmnvizln4ffx9wspb8"; + sha256 = "1936d5bcrf23av5nc8yh6708gxngsbkh86gvmzpsv3d33jgqv1nl"; }; buildInputs = with pkgs; [ From 560e91f1a79f8bae58ce609da26cdbc981b14704 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Sun, 6 May 2018 11:49:04 +0200 Subject: [PATCH 146/695] nixos/matrix-synapse service: url_preview_url_blacklist fix (#40027) Moved list of ip ranges to url_preview_ip_range_blacklist defaults. Fixes #40017 --- nixos/modules/services/misc/matrix-synapse.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 7e880ad09b8..10901e10222 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -395,7 +395,14 @@ in { }; url_preview_ip_range_blacklist = mkOption { type = types.listOf types.str; - default = []; + default = [ + "127.0.0.0/8" + "10.0.0.0/8" + "172.16.0.0/12" + "192.168.0.0/16" + "100.64.0.0/10" + "169.254.0.0/16" + ]; description = '' List of IP address CIDR ranges that the URL preview spider is denied from accessing. @@ -412,14 +419,7 @@ in { }; url_preview_url_blacklist = mkOption { type = types.listOf types.str; - default = [ - "127.0.0.0/8" - "10.0.0.0/8" - "172.16.0.0/12" - "192.168.0.0/16" - "100.64.0.0/10" - "169.254.0.0/16" - ]; + default = []; description = '' Optional list of URL matches that the URL preview spider is denied from accessing. From f57986597fb287478db18445e785e7dcb708b997 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 6 May 2018 12:27:31 +0200 Subject: [PATCH 147/695] mkcast: drop and replace with `xscast` (#40026) The package has been declared as unmaintained, `xscast` is the way to go: https://github.com/KeyboardFire/mkcast#obsolete Replacement for `mkcast` (https://github.com/KeyboardFire/mkcast#obsolete) --- pkgs/applications/video/mkcast/default.nix | 37 ---------------------- pkgs/applications/video/xscast/default.nix | 35 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +-- 3 files changed, 37 insertions(+), 39 deletions(-) delete mode 100644 pkgs/applications/video/mkcast/default.nix create mode 100644 pkgs/applications/video/xscast/default.nix diff --git a/pkgs/applications/video/mkcast/default.nix b/pkgs/applications/video/mkcast/default.nix deleted file mode 100644 index 2d5d2d3b102..00000000000 --- a/pkgs/applications/video/mkcast/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchFromGitHub, wmctrl, pythonPackages, byzanz -, xdpyinfo, makeWrapper, gtk2, xorg, gnome3 }: - -stdenv.mkDerivation rec { - name = "mkcast-2015-03-13"; - - src = fetchFromGitHub { - owner = "KeyboardFire"; - repo = "mkcast"; - rev = "cac22cb6c6f8ec2006339698af5e9199331759e0"; - sha256 = "15wp3n3z8gw7kjdxs4ahda17n844awhxsqbql5ipsdhqfxah2d8p"; - }; - - buildInputs = with pythonPackages; [ makeWrapper pygtk gtk2 xlib ]; - - makeFlags = [ "PREFIX=$(out)" ]; - - postInstall = '' - for f in $out/bin/*; do #*/ - wrapProgram $f --prefix PATH : "${stdenv.lib.makeBinPath [ xdpyinfo wmctrl byzanz gnome3.gnome-terminal ]}:$out/bin" - done - - rm -r screenkey/.bzr - cp -R screenkey $out/bin - - wrapProgram $out/bin/screenkey/screenkey \ - --prefix PATH : "${xorg.xmodmap}/bin"\ - --prefix PYTHONPATH : "$PYTHONPATH" - ''; - - meta = with stdenv.lib; { - description = "A tool for creating GIF screencasts of a terminal, with key presses overlaid"; - homepage = https://github.com/KeyboardFire/mkcast; - platforms = platforms.linux; - maintainers = with maintainers; [ domenkozar pSub ]; - }; -} diff --git a/pkgs/applications/video/xscast/default.nix b/pkgs/applications/video/xscast/default.nix new file mode 100644 index 00000000000..ae048f1bdac --- /dev/null +++ b/pkgs/applications/video/xscast/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, makeWrapper, ffmpeg, imagemagick, dzen2, xorg }: + +stdenv.mkDerivation rec { + name = "xscast-unstable-${version}"; + version = "2016-07-26"; + + src = fetchFromGitHub { + owner = "KeyboardFire"; + repo = "xscast"; + rev = "9e6fd3c28d3f5ae630619f6dbccaf1f6ca594b21"; + sha256 = "0br27bq9bpglfdpv63h827bipgvhlh10liyhmhcxls4227kagz72"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + install -Dm755 xscast.sh $out/bin/xscast + install -Dm644 xscast.1 $out/share/man/man1/xscast.1 + patchShebangs $out/bin + + wrapProgram "$out/bin/xscast" \ + --prefix PATH : ${stdenv.lib.makeBinPath [ ffmpeg dzen2 xorg.xwininfo xorg.xinput xorg.xmodmap imagemagick ]} + + runHook postInstall + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/KeyboardFire/xscast; + license = licenses.mit; + description = "Screencasts of windows with list of keystrokes overlayed"; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c4d182d2d3..9199f7af2f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3334,8 +3334,6 @@ with pkgs; motion = callPackage ../applications/video/motion { }; - mkcast = callPackage ../applications/video/mkcast { }; - mtail = callPackage ../servers/monitoring/mtail { }; multitail = callPackage ../tools/misc/multitail { }; @@ -5576,6 +5574,8 @@ with pkgs; xprintidle-ng = callPackage ../tools/X11/xprintidle-ng {}; + xscast = callPackage ../applications/video/xscast { }; + xsettingsd = callPackage ../tools/X11/xsettingsd { }; xsensors = callPackage ../os-specific/linux/xsensors { }; From 5fada46e88dca3ae889b29ffd4bf410d0e94b232 Mon Sep 17 00:00:00 2001 From: jD91mZM2 Date: Sun, 6 May 2018 13:17:32 +0200 Subject: [PATCH 148/695] powerline-rs: add bash & fish completion --- pkgs/tools/misc/powerline-rs/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix index ff020d45101..e48816db935 100644 --- a/pkgs/tools/misc/powerline-rs/default.nix +++ b/pkgs/tools/misc/powerline-rs/default.nix @@ -1,6 +1,7 @@ -{ lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, cmake, libgit2, openssl_1_1_0, libssh2, libzip }: +{ lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, cmake, openssl_1_1_0, libssh2, libgit2, libzip }: rustPlatform.buildRustPackage rec { - name = "powerline-rs-${version}"; + pname = "powerline-rs"; + name = "${pname}-${version}"; version = "0.1.7"; src = fetchFromGitHub { @@ -14,8 +15,12 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "184s432a6damzvl0lv6jar1iml9dq60r190aqjy44lcg938981zc"; nativeBuildInputs = [ pkgconfig file perl cmake ]; - buildInputs = [ libgit2 ]; - propagatedBuildInputs = [ openssl_1_1_0 libssh2 libzip ]; + buildInputs = [ openssl_1_1_0 libssh2 libgit2 libzip ]; + + postInstall = '' + install -Dm 755 "${pname}.bash" "$out/etc/bash_completion.d/${pname}" + install -Dm 755 "${pname}.fish" "$out/share/fish/vendor_completions.d/${pname}" + ''; meta = with lib; { description = "powerline-shell rewritten in Rust, inspired by powerline-go"; From 2d08df417fa9008440081a6d2d1cd6db9d854ff9 Mon Sep 17 00:00:00 2001 From: jD91mZM2 Date: Sat, 5 May 2018 20:15:59 +0200 Subject: [PATCH 149/695] termplay: init at 2.0.4 --- pkgs/tools/misc/termplay/default.nix | 38 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/tools/misc/termplay/default.nix diff --git a/pkgs/tools/misc/termplay/default.nix b/pkgs/tools/misc/termplay/default.nix new file mode 100644 index 00000000000..5771ec6aff1 --- /dev/null +++ b/pkgs/tools/misc/termplay/default.nix @@ -0,0 +1,38 @@ +{ rustPlatform, fetchFromGitHub, lib, makeWrapper, gst_all_1, libsixel }: +rustPlatform.buildRustPackage rec { + name = "termplay-${version}"; + version = "2.0.4"; + + src = fetchFromGitHub { + owner = "jD91mZM2"; + repo = "termplay"; + rev = version; + + sha256 = "0qgx9xmi8n3sq5n5m6gai777sllw9hyki2kwsj2k4h1ykibzq9r0"; + }; + + cargoBuildFlags = ["--features" "bin"]; + cargoSha256 = "1ghvp4n6mvckamvn3hk672wh29jlrwmhrd4hv3mh98li1x9ssbmf"; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-ugly + gst_all_1.gst-plugins-bad + libsixel + ]; + + postInstall = '' + wrapProgram $out/bin/termplay --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + ''; + + meta = with lib; { + description = "Play an image/video in your terminal"; + homepage = https://jd91mzm2.github.io/termplay/; + license = licenses.mit; + maintainers = with maintainers; [ jD91mZM2 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e502294289f..47619b28cfa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5143,6 +5143,8 @@ with pkgs; telepresence = callPackage ../tools/networking/telepresence { }; + termplay = callPackage ../tools/misc/termplay { }; + tewisay = callPackage ../tools/misc/tewisay { }; texmacs = if stdenv.isDarwin From f92cf4b93fecdd6b9ff91640ed6062dbd43aafd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Sun, 6 May 2018 14:06:15 +0200 Subject: [PATCH 150/695] pythonPackages.pyopengl: fix build --- pkgs/top-level/python-packages.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4da4910bbbd..75cf7561ab6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11567,11 +11567,15 @@ in { sha256 = "9b47c5c3a094fa518ca88aeed35ae75834d53e4285512c61879f67a48c94ddaf"; }; propagatedBuildInputs = [ pkgs.libGLU_combined pkgs.freeglut self.pillow ]; - patchPhase = '' - sed -i "s|util.find_library( name )|name|" OpenGL/platform/ctypesloader.py - sed -i "s|'GL',|'libGL.so',|" OpenGL/platform/glx.py - sed -i "s|'GLU',|'${pkgs.libGLU_combined}/lib/libGLU.so',|" OpenGL/platform/glx.py - sed -i "s|'glut',|'${pkgs.freeglut}/lib/libglut.so',|" OpenGL/platform/glx.py + patchPhase = let + ext = stdenv.hostPlatform.extensions.sharedLibrary; in '' + substituteInPlace OpenGL/platform/glx.py \ + --replace "'GL'" "'${pkgs.libGL}/lib/libGL${ext}'" \ + --replace "'GLU'" "'${pkgs.libGLU}/lib/libGLU${ext}'" \ + --replace "'glut'" "'${pkgs.freeglut}/lib/libglut${ext}'" + substituteInPlace OpenGL/platform/darwin.py \ + --replace "'OpenGL'" "'${pkgs.libGL}/lib/libGL${ext}'" \ + --replace "'GLUT'" "'${pkgs.freeglut}/lib/libglut${ext}'" ''; meta = { homepage = http://pyopengl.sourceforge.net/; From cf09900bbcca8f09a4af4927e3d6554647d695db Mon Sep 17 00:00:00 2001 From: jD91mZM2 Date: Thu, 3 May 2018 16:58:32 +0200 Subject: [PATCH 151/695] xidlehook: init at 0.4.6 --- pkgs/tools/X11/xidlehook/default.nix | 32 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/X11/xidlehook/default.nix diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix new file mode 100644 index 00000000000..a71531eebc5 --- /dev/null +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -0,0 +1,32 @@ +{ lib, rustPlatform, fetchFromGitHub, x11, xorg, libpulseaudio, pkgconfig, patchelf }: + +rustPlatform.buildRustPackage rec { + name = "xidlehook-${version}"; + version = "0.4.6"; + + src = fetchFromGitHub { + owner = "jD91mZM2"; + repo = "xidlehook"; + rev = version; + + sha256 = "0h84ichm1v2wdmm4w1n7jr70yfb9hhi7kykvd99ppg00h1x9lr7w"; + }; + + cargoSha256 = "0a1bl6fnfw6xy71q3b5zij52p9skylj1ivqj8my44bfsid2qfn7d"; + + buildInputs = [ x11 xorg.libXScrnSaver libpulseaudio ]; + nativeBuildInputs = [ pkgconfig patchelf ]; + + postFixup = '' + RPATH="$(patchelf --print-rpath $out/bin/xidlehook)" + patchelf --set-rpath "$RPATH:${libpulseaudio}/lib" $out/bin/xidlehook + ''; + + meta = with lib; { + description = "xautolock rewrite in Rust, with a few extra features"; + homepage = https://github.com/jD91mZM2/xidlehook; + license = licenses.mit; + maintainers = with maintainers; [ jD91mZM2 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c4d182d2d3..bd6e3086f43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5770,6 +5770,8 @@ with pkgs; xiccd = callPackage ../tools/misc/xiccd { }; + xidlehook = callPackage ../tools/X11/xidlehook {}; + xorriso = callPackage ../tools/cd-dvd/xorriso { }; xpf = callPackage ../tools/text/xml/xpf { From 17950abc787d00451b3e5dd5a15a8bcffd351a5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 6 May 2018 15:05:11 +0100 Subject: [PATCH 152/695] wllvm: 1.1.5 -> 1.2.0 --- pkgs/development/tools/wllvm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/development/tools/wllvm/default.nix index c78767e115a..399a8e66860 100644 --- a/pkgs/development/tools/wllvm/default.nix +++ b/pkgs/development/tools/wllvm/default.nix @@ -1,13 +1,13 @@ { stdenv, python3Packages }: python3Packages.buildPythonApplication rec { - version = "1.1.5"; + version = "1.2.0"; pname = "wllvm"; name = "${pname}-${version}"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "02lnilhqz7mq0w6mp574rmjxiszp1wyla16jqr89r0z9vjg2j9rv"; + sha256 = "1hriyv5gfkcxjqk71l3030qfy3scsjr3mp12hkxfknh65inlqs5z"; }; meta = with stdenv.lib; { From 71a8d0ca59a081299aa15391a04518a35ead0b6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 6 May 2018 15:15:04 +0100 Subject: [PATCH 153/695] particl-core: replace utillinux with unixtools.hexdump to make it platform agnostic --- pkgs/applications/altcoins/particl/particl-core.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix index c9454963b22..2524408429c 100644 --- a/pkgs/applications/altcoins/particl/particl-core.nix +++ b/pkgs/applications/altcoins/particl/particl-core.nix @@ -1,6 +1,4 @@ { stdenv -, autoconf -, automake , autoreconfHook , boost , db48 @@ -14,6 +12,7 @@ , zeromq , zlib , withGui +, unixtools }: with stdenv.lib; @@ -28,9 +27,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ openssl db48 boost zlib - miniupnpc libevent zeromq ] - ++ optionals stdenv.isLinux [ utillinux ]; + buildInputs = [ + openssl db48 boost zlib miniupnpc libevent zeromq + unixtools.hexdump + ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; From 716d877d0f8449f66ef7824460823711fb653aa7 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 6 May 2018 17:10:35 +0100 Subject: [PATCH 154/695] gitea: 1.4.0 -> 1.4.1 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index da9ee9b4081..71b59ed4aef 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gitea-${version}"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "07fbcd134n7giwxpqli5hfywmi0vb8awgdh3gyiwyzhjwwzfrxkq"; + sha256 = "1mid67c4021m7mi4ablx1w5v43831gzn8xpg8n30a4zmr70781wm"; }; patches = [ ./static-root-path.patch ]; From 472f21951a6e5bf4170594a5dc3c2616c7af316d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Sun, 6 May 2018 16:46:55 +0200 Subject: [PATCH 155/695] qt5.qtwebkit: Reduce log size to fix hydra build This should fix the darwin build of qtwebkit. --- pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 6834b7ce87b..d73bc370f99 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -28,10 +28,15 @@ qtModule { preConfigure = '' QMAKEPATH="$PWD/Tools/qmake''${QMAKEPATH:+:}$QMAKEPATH" fixQtBuiltinPaths . '*.pr?' + # Fix hydra's "Log limit exceeded" + export qmakeFlags="$qmakeFlags CONFIG+=silent" ''; NIX_CFLAGS_COMPILE = - [ "-Wno-expansion-to-defined" ] # with gcc7 this warning blows the log over Hydra's limit + # with gcc7 this warning blows the log over Hydra's limit + [ "-Wno-expansion-to-defined" ] + # with clang this warning blows the log over Hydra's limit + ++ optional stdenv.isDarwin "-Wno-inconsistent-missing-override" ++ optionals flashplayerFix [ ''-DNIXPKGS_LIBGTK2="${getLib gtk2}/lib/libgtk-x11-2.0"'' From 11096b2cfef32136132361fabeb38cd1baed8a11 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 6 May 2018 18:08:44 +0200 Subject: [PATCH 156/695] hackage2nix: disable failing Hydra builds @gebner: hledger-diff no longer compiles --- .../configuration-hackage2nix.yaml | 40 ++++++++++++++++++- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index c602d312a3b..412c3bfd57e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2479,8 +2479,6 @@ package-maintainers: - streamproc - structured-haskell-mode - titlecase - gebner: - - hledger-diff gridaphobe: - ghc-srcspan-plugin - located-base @@ -2740,6 +2738,7 @@ dont-distribute-packages: alerta: [ i686-linux, x86_64-linux, x86_64-darwin ] alex-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] alfred: [ i686-linux, x86_64-linux, x86_64-darwin ] + alg: [ i686-linux, x86_64-linux, x86_64-darwin ] alga: [ i686-linux, x86_64-linux, x86_64-darwin ] algebra-sql: [ i686-linux, x86_64-linux, x86_64-darwin ] algebraic-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3089,6 +3088,7 @@ dont-distribute-packages: barrier-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] barrier: [ i686-linux, x86_64-linux, x86_64-darwin ] base-compat-batteries: [ i686-linux, x86_64-linux, x86_64-darwin ] + base-compat-migrate: [ i686-linux, x86_64-linux, x86_64-darwin ] base-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] base-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] base-noprelude: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3168,6 +3168,7 @@ dont-distribute-packages: bindings-friso: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-gsl: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-gts: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-hamlib: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-hdf5: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-K8055: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-levmar: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3294,6 +3295,7 @@ dont-distribute-packages: bson-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] btree-concurrent: [ i686-linux, x86_64-linux, x86_64-darwin ] btree: [ i686-linux, x86_64-linux, x86_64-darwin ] + buchhaltung: [ i686-linux, x86_64-linux, x86_64-darwin ] buffer-builder-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] buffer: [ i686-linux, x86_64-linux, x86_64-darwin ] buffon: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3327,6 +3329,7 @@ dont-distribute-packages: c-dsl: [ i686-linux, x86_64-linux, x86_64-darwin ] c-io: [ i686-linux, x86_64-linux, x86_64-darwin ] c2hsc: [ i686-linux, x86_64-linux, x86_64-darwin ] + ca: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-audit: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-bounds: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-cargs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3427,7 +3430,9 @@ dont-distribute-packages: categorical-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] category-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] category-traced: [ i686-linux, x86_64-linux, x86_64-darwin ] + category: [ i686-linux, x86_64-linux, x86_64-darwin ] catnplus: [ i686-linux, x86_64-linux, x86_64-darwin ] + cautious-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] cayley-client: [ i686-linux, x86_64-linux, x86_64-darwin ] cblrepo: [ i686-linux, x86_64-linux, x86_64-darwin ] CBOR: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3693,6 +3698,7 @@ dont-distribute-packages: constrained-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] constrained-monads: [ i686-linux, x86_64-linux, x86_64-darwin ] constraint-manip: [ i686-linux, x86_64-linux, x86_64-darwin ] + constraint: [ i686-linux, x86_64-linux, x86_64-darwin ] ConstraintKinds: [ i686-linux, x86_64-linux, x86_64-darwin ] constructive-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] consul-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3896,6 +3902,7 @@ dont-distribute-packages: data-type: [ i686-linux, x86_64-linux, x86_64-darwin ] database-study: [ i686-linux, x86_64-linux, x86_64-darwin ] datadog: [ i686-linux, x86_64-linux, x86_64-darwin ] + datafix: [ i686-linux, x86_64-linux, x86_64-darwin ] datalog: [ i686-linux, x86_64-linux, x86_64-darwin ] DataTreeView: [ i686-linux, x86_64-linux, x86_64-darwin ] datetime-sb: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3910,6 +3917,7 @@ dont-distribute-packages: dbmigrations-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] dbus-client: [ i686-linux, x86_64-linux, x86_64-darwin ] dbus-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + dbus-hslogger: [ i686-linux, x86_64-linux, x86_64-darwin ] dbus-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] dbus-th-introspection: [ i686-linux, x86_64-linux, x86_64-darwin ] DBus: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4318,6 +4326,7 @@ dont-distribute-packages: exp-extended: [ i686-linux, x86_64-linux, x86_64-darwin ] expand: [ i686-linux, x86_64-linux, x86_64-darwin ] expat-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] + expiring-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] explain: [ i686-linux, x86_64-linux, x86_64-darwin ] explicit-determinant: [ i686-linux, x86_64-linux, x86_64-darwin ] explicit-iomodes-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4326,6 +4335,7 @@ dont-distribute-packages: explicit-sharing: [ i686-linux, x86_64-linux, x86_64-darwin ] explore: [ i686-linux, x86_64-linux, x86_64-darwin ] exposed-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] + expressions-z3: [ i686-linux, x86_64-linux, x86_64-darwin ] extcore: [ i686-linux, x86_64-linux, x86_64-darwin ] extemp: [ i686-linux, x86_64-linux, x86_64-darwin ] extended-categories: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4957,6 +4967,7 @@ dont-distribute-packages: gore-and-ash-actor: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-async: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] + gore-and-ash-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-lambdacube: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-network: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-sdl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5019,6 +5030,7 @@ dont-distribute-packages: gridfs: [ i686-linux, x86_64-linux, x86_64-darwin ] gridland: [ i686-linux, x86_64-linux, x86_64-darwin ] grm: [ i686-linux, x86_64-linux, x86_64-darwin ] + groot: [ i686-linux, x86_64-linux, x86_64-darwin ] gross: [ i686-linux, x86_64-linux, x86_64-darwin ] GroteTrap: [ i686-linux, x86_64-linux, x86_64-darwin ] groundhog-converters: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5037,6 +5049,7 @@ dont-distribute-packages: gtfs: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk-serialized-event: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk-sni-tray: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk-strut: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk-toy: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-cast-glade: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5594,6 +5607,7 @@ dont-distribute-packages: HLearn-datastructures: [ i686-linux, x86_64-linux, x86_64-darwin ] HLearn-distributions: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] + hledger-diff: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-irr: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibBladeRF: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5619,7 +5633,9 @@ dont-distribute-packages: hmatrix-nipals: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-nlopt: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-quadprogpp: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmatrix-sparse: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-static: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmatrix-sundials: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] hmeap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] hmeap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5720,6 +5736,7 @@ dont-distribute-packages: hpqtypes-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] hpqtypes: [ i686-linux, x86_64-linux, x86_64-darwin ] hprotoc-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] + hprotoc: [ i686-linux, x86_64-linux, x86_64-darwin ] hps-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] hps-kmeans: [ i686-linux, x86_64-linux, x86_64-darwin ] hps: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6088,6 +6105,7 @@ dont-distribute-packages: instant-hashable: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] instapaper-sender: [ i686-linux, x86_64-linux, x86_64-darwin ] + int-multimap: [ i686-linux, x86_64-linux, x86_64-darwin ] integer-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] intel-aes: [ i686-linux, x86_64-linux, x86_64-darwin ] interleavableGen: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6262,6 +6280,7 @@ dont-distribute-packages: katip-syslog: [ i686-linux, x86_64-linux, x86_64-darwin ] katt: [ i686-linux, x86_64-linux, x86_64-darwin ] kawaii: [ i686-linux, x86_64-linux, x86_64-darwin ] + kazura-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] kd-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] kdesrc-build-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] kdt: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6700,6 +6719,7 @@ dont-distribute-packages: mattermost-api-qc: [ i686-linux, x86_64-linux, x86_64-darwin ] mattermost-api: [ i686-linux, x86_64-linux, x86_64-darwin ] maude: [ i686-linux, x86_64-linux, x86_64-darwin ] + maxent-learner-hw-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] maxent: [ i686-linux, x86_64-linux, x86_64-darwin ] maxsharing: [ i686-linux, x86_64-linux, x86_64-darwin ] maybench: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6766,6 +6786,7 @@ dont-distribute-packages: MHask: [ i686-linux, x86_64-linux, x86_64-darwin ] mi: [ i686-linux, x86_64-linux, x86_64-darwin ] Michelangelo: [ i686-linux, x86_64-linux, x86_64-darwin ] + microaeson: [ i686-linux, x86_64-linux, x86_64-darwin ] microformats2-types: [ i686-linux, x86_64-linux, x86_64-darwin ] microlens-each: [ i686-linux, x86_64-linux, x86_64-darwin ] micrologger: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6962,6 +6983,7 @@ dont-distribute-packages: mvc-updates: [ i686-linux, x86_64-linux, x86_64-darwin ] mvc: [ i686-linux, x86_64-linux, x86_64-darwin ] mvclient: [ i686-linux, x86_64-linux, x86_64-darwin ] + mxnet-dataiter: [ i686-linux, x86_64-linux, x86_64-darwin ] mxnet-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] mxnet-nn: [ i686-linux, x86_64-linux, x86_64-darwin ] mxnet-nnvm: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7279,6 +7301,7 @@ dont-distribute-packages: pandoc-unlit: [ i686-linux, x86_64-linux, x86_64-darwin ] PandocAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] pang-a-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] + pangraph: [ i686-linux, x86_64-linux, x86_64-darwin ] panpipe: [ i686-linux, x86_64-linux, x86_64-darwin ] pansite: [ i686-linux, x86_64-linux, x86_64-darwin ] papa-export: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7394,6 +7417,7 @@ dont-distribute-packages: pgstream: [ i686-linux, x86_64-linux, x86_64-darwin ] phasechange: [ i686-linux, x86_64-linux, x86_64-darwin ] phaser: [ i686-linux, x86_64-linux, x86_64-darwin ] + phoityne: [ i686-linux, x86_64-linux, x86_64-darwin ] phone-metadata: [ i686-linux, x86_64-linux, x86_64-darwin ] phone-numbers: [ i686-linux, x86_64-linux, x86_64-darwin ] phone-push: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7410,6 +7434,7 @@ dont-distribute-packages: picoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] picosat: [ i686-linux, x86_64-linux, x86_64-darwin ] pictikz: [ i686-linux, x86_64-linux, x86_64-darwin ] + pier: [ i686-linux, x86_64-linux, x86_64-darwin ] piet: [ i686-linux, x86_64-linux, x86_64-darwin ] pig: [ i686-linux, x86_64-linux, x86_64-darwin ] pinchot: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7570,6 +7595,7 @@ dont-distribute-packages: preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] press: [ i686-linux, x86_64-linux, x86_64-darwin ] presto-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] + pretty-relative-time: [ i686-linux, x86_64-linux, x86_64-darwin ] prettyprinter-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] primesieve: [ i686-linux, x86_64-linux, x86_64-darwin ] primitive-simd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7597,6 +7623,7 @@ dont-distribute-packages: procrastinating-variable: [ i686-linux, x86_64-linux, x86_64-darwin ] procstat: [ i686-linux, x86_64-linux, x86_64-darwin ] producer: [ i686-linux, x86_64-linux, x86_64-darwin ] + product: [ i686-linux, x86_64-linux, x86_64-darwin ] prof2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] prof2pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] profiteur: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7666,6 +7693,7 @@ dont-distribute-packages: puzzle-draw-cmdline: [ i686-linux, x86_64-linux, x86_64-darwin ] puzzle-draw: [ i686-linux, x86_64-linux, x86_64-darwin ] pvd: [ i686-linux, x86_64-linux, x86_64-darwin ] + PyF: [ i686-linux, x86_64-linux, x86_64-darwin ] pyffi: [ i686-linux, x86_64-linux, x86_64-darwin ] pyfi: [ i686-linux, x86_64-linux, x86_64-darwin ] python-pickle: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7746,6 +7774,7 @@ dont-distribute-packages: rand-vars: [ i686-linux, x86_64-linux, x86_64-darwin ] randfile: [ i686-linux, x86_64-linux, x86_64-darwin ] random-access-list: [ i686-linux, x86_64-linux, x86_64-darwin ] + random-class: [ i686-linux, x86_64-linux, x86_64-darwin ] random-derive: [ i686-linux, x86_64-linux, x86_64-darwin ] random-eff: [ i686-linux, x86_64-linux, x86_64-darwin ] random-effin: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8514,6 +8543,8 @@ dont-distribute-packages: stable-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] stack-bump: [ i686-linux, x86_64-linux, x86_64-darwin ] stack-hpc-coveralls: [ i686-linux, x86_64-linux, x86_64-darwin ] + stack-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + stack-network: [ i686-linux, x86_64-linux, x86_64-darwin ] stack-prism: [ i686-linux, x86_64-linux, x86_64-darwin ] stack-run-auto: [ i686-linux, x86_64-linux, x86_64-darwin ] stack-run: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8587,6 +8618,7 @@ dont-distribute-packages: stream-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] stream: [ i686-linux, x86_64-linux, x86_64-darwin ] streamed: [ i686-linux, x86_64-linux, x86_64-darwin ] + streaming-base64: [ i686-linux, x86_64-linux, x86_64-darwin ] streaming-benchmarks: [ i686-linux, x86_64-linux, x86_64-darwin ] streaming-concurrency: [ i686-linux, x86_64-linux, x86_64-darwin ] streaming-eversion: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8784,6 +8816,7 @@ dont-distribute-packages: termplot: [ i686-linux, x86_64-linux, x86_64-darwin ] terntup: [ i686-linux, x86_64-linux, x86_64-darwin ] terrahs: [ i686-linux, x86_64-linux, x86_64-darwin ] + tersmu: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-doctest: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9015,6 +9048,7 @@ dont-distribute-packages: twitter-types: [ i686-linux, x86_64-linux, x86_64-darwin ] twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] tx: [ i686-linux, x86_64-linux, x86_64-darwin ] + txt: [ i686-linux, x86_64-linux, x86_64-darwin ] txtblk: [ i686-linux, x86_64-linux, x86_64-darwin ] TYB: [ i686-linux, x86_64-linux, x86_64-darwin ] tyfam-witnesses: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9133,6 +9167,7 @@ dont-distribute-packages: utc: [ i686-linux, x86_64-linux, x86_64-darwin ] utf8-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] UTFTConverter: [ i686-linux, x86_64-linux, x86_64-darwin ] + util: [ i686-linux, x86_64-linux, x86_64-darwin ] uu-options: [ i686-linux, x86_64-linux, x86_64-darwin ] uuagc-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] uuid-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9206,6 +9241,7 @@ dont-distribute-packages: vk-aws-route53: [ i686-linux, x86_64-linux, x86_64-darwin ] vowpal-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] voyeur: [ i686-linux, x86_64-linux, x86_64-darwin ] + vpq: [ i686-linux, x86_64-linux, x86_64-darwin ] vrpn: [ i686-linux, x86_64-linux, x86_64-darwin ] vte: [ i686-linux, x86_64-linux, x86_64-darwin ] vtegtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] From fe95c5c64f9eb8a8766a6ea1ddcf69ca9436fb46 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 May 2018 02:30:40 +0200 Subject: [PATCH 157/695] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.9.2-9-g07ca643 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/d2c0010babe227d411d0f5c207ae391c5b56b5e6. --- .../haskell-modules/hackage-packages.nix | 1017 +++++++++++++---- 1 file changed, 797 insertions(+), 220 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e9d076343f8..f0b8c3d6316 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -15223,6 +15223,7 @@ self: { ]; description = "Quasiquotations for a python like interpolated string formater"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "QIO" = callPackage @@ -19370,12 +19371,12 @@ self: { shell32 = null; shfolder = null; shlwapi = null; user32 = null; winmm = null;}; - "Win32_2_7_0_0" = callPackage + "Win32_2_8_0_0" = callPackage ({ mkDerivation }: mkDerivation { pname = "Win32"; - version = "2.7.0.0"; - sha256 = "1583c2x208bpwgvk0gyy2931604vikx57kyiiaxf7mp8shh13fhi"; + version = "2.8.0.0"; + sha256 = "0ppvpf2zx6547bqx7ysbq9ld99hf1v9rfa9s4f57hkn758l9ldm4"; homepage = "https://github.com/haskell/win32"; description = "A binding to Windows Win32 API"; license = stdenv.lib.licenses.bsd3; @@ -19800,6 +19801,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) xinput;}; + "XML" = callPackage + ({ mkDerivation, base, base-unicode-symbols, smallcheck, tasty + , tasty-smallcheck, txt, util, vector + }: + mkDerivation { + pname = "XML"; + version = "0.0.0.0"; + sha256 = "1arlnyzj3zdzqrsr9lhicx2y1ag00cgf6jzn6nyxa7d7avp42025"; + libraryHaskellDepends = [ + base base-unicode-symbols txt util vector + ]; + testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; + description = "Extensible Markup Language"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "XMLParser" = callPackage ({ mkDerivation, base, parsec }: mkDerivation { @@ -23476,8 +23493,8 @@ self: { }: mkDerivation { pname = "aivika-distributed"; - version = "1.3"; - sha256 = "1sm56b6z8ajkap3nlcrsl592m40vgb5zmhhnc8al6arrra2j21pc"; + version = "1.4"; + sha256 = "0fpl6xa32w4f1bl4l8b5pwagm68k42nn45w7d1hsh9ffy4bfsq0k"; libraryHaskellDepends = [ aivika aivika-transformers array base binary containers distributed-process exceptions mtl mwc-random random stm time @@ -23820,6 +23837,7 @@ self: { libraryHaskellDepends = [ base util ]; description = "Algebraic structures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alga" = callPackage @@ -27269,6 +27287,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ansi-terminal_0_8_0_3" = callPackage + ({ mkDerivation, base, colour }: + mkDerivation { + pname = "ansi-terminal"; + version = "0.8.0.3"; + sha256 = "18466bjgsmn2f96i3q6sp5f72paa2flqh40n9h137z29kvr53sva"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base colour ]; + homepage = "https://github.com/feuerbach/ansi-terminal"; + description = "Simple ANSI terminal support, with Windows compatibility"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ansi-terminal-game" = callPackage ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal , clock, hspec, linebreak, split, terminal-size, timers-tick @@ -30181,8 +30214,8 @@ self: { }: mkDerivation { pname = "atlassian-connect-descriptor"; - version = "0.4.6.0"; - sha256 = "1yyc5cp10zqhmi2hay0hiz526lxfcn56g13ikfh25pqzayrxnd8b"; + version = "0.4.7.0"; + sha256 = "0n9a0bkf525gw1fcik6gmaarf5l7zmn29whiyrcp3dv7afqdfhwa"; libraryHaskellDepends = [ aeson base cases network network-uri text time-units unordered-containers @@ -30509,8 +30542,10 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "2.10.0.20"; - sha256 = "0k73jcj2za79wvb6nki1k02d6rj7zrnl0vz494ajh4d96gwdwacp"; + version = "2.10.1.5"; + sha256 = "14y4mpk6hkqvw8jh49idj9gx2wxcy2ppz00abny6fsbw6iff4xrs"; + revision = "1"; + editedCabalFile = "0ff0nslsi5b4g8gp63x6js3c026ajgfamd8pg2k1aygwx8x3zqk9"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; @@ -30551,21 +30586,21 @@ self: { "ats-storable" = callPackage ({ mkDerivation, base, bytestring, composition-prelude, hspec - , microlens, microlens-th, text + , storable, text }: mkDerivation { pname = "ats-storable"; - version = "0.3.0.1"; - sha256 = "1apzmyq9a4hjn9d0fz7pxvxflq61kp26fa6gz3c50pdjby55zhns"; + version = "0.3.0.3"; + sha256 = "1a9id432vhvr3n69m1f7iyc899nc2wa4w8jpa7s7aqkixw2vqlr2"; libraryHaskellDepends = [ - base bytestring composition-prelude microlens microlens-th text + base bytestring composition-prelude text ]; testHaskellDepends = [ base hspec ]; - homepage = "https://github.com//ats-generic#readme"; + testSystemDepends = [ storable ]; description = "Marshal ATS types into Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {storable = null;}; "attempt" = callPackage ({ mkDerivation, base, failure }: @@ -30927,6 +30962,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "attoparsec-varword" = callPackage + ({ mkDerivation, attoparsec, base, bytestring + , bytestring-builder-varword, hspec, QuickCheck + }: + mkDerivation { + pname = "attoparsec-varword"; + version = "0.1.0.0"; + sha256 = "1rrc4pqi7slsq2rhiasid7m7fm489vd851jvakb8z5z64mrxc409"; + libraryHaskellDepends = [ attoparsec base ]; + testHaskellDepends = [ + attoparsec base bytestring bytestring-builder-varword hspec + QuickCheck + ]; + homepage = "https://github.com/concert/hs-varword#readme"; + description = "Variable-length integer decoding for Attoparsec"; + license = stdenv.lib.licenses.lgpl3; + }) {}; + "attosplit" = callPackage ({ mkDerivation, attoparsec, base, bytestring }: mkDerivation { @@ -31542,8 +31595,8 @@ self: { }: mkDerivation { pname = "avro"; - version = "0.3.0.0"; - sha256 = "0sfi6jc7pcigpwgkfqq9ckwm7bzhfc9kf2rhznrrsy9qw5i7xrll"; + version = "0.3.0.1"; + sha256 = "1day4zpypk1jirkn0zfvmfwy0pnsvggibi9k2gk23kqnn904sv77"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific @@ -33098,6 +33151,7 @@ self: { homepage = "https://github.com/bergmark/base-compat-migrate#readme"; description = "Helps migrating projects to base-compat(-batteries)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base-encoding" = callPackage @@ -35779,6 +35833,7 @@ self: { homepage = "https://github.com/relrod/hamlib-haskell"; description = "Hamlib bindings for Haskell"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) hamlib;}; "bindings-hdf5" = callPackage @@ -37432,6 +37487,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "blank-canvas_0_6_2" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64-bytestring + , bytestring, colour, containers, data-default-class, directory + , http-types, kansas-comet, mime-types, process, scotty, semigroups + , shake, stm, text, text-show, time, transformers, unix, vector + , wai, wai-extra, warp + }: + mkDerivation { + pname = "blank-canvas"; + version = "0.6.2"; + sha256 = "1qhdvxia8wlnv0ss9dsrxdfw3qsf376ypnpsijz7vxkj9dmzyq84"; + revision = "4"; + editedCabalFile = "03l1k5b58b9p8ajm2aiq5xfryj45zipzv04mxc2qnl5xk9jz0iqw"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base base-compat base64-bytestring bytestring colour + containers data-default-class http-types kansas-comet mime-types + scotty semigroups stm text text-show transformers vector wai + wai-extra warp + ]; + testHaskellDepends = [ + base containers directory process shake stm text time unix vector + ]; + homepage = "https://github.com/ku-fpg/blank-canvas/wiki"; + description = "HTML5 Canvas Graphics Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blank-canvas" = callPackage ({ mkDerivation, aeson, base, base-compat-batteries , base64-bytestring, bytestring, colour, containers @@ -39836,6 +39920,7 @@ self: { homepage = "http://johannesgerer.com/buchhaltung"; description = "Automates most of your plain text accounting data entry in ledger format"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "buffer" = callPackage @@ -40565,6 +40650,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bytestring-builder-varword" = callPackage + ({ mkDerivation, attoparsec, attoparsec-varword, base, bytestring + , hspec, QuickCheck + }: + mkDerivation { + pname = "bytestring-builder-varword"; + version = "0.1.0.0"; + sha256 = "1lpcy47z3jf023iv0vdwsy5l2bsjb4i8vbnzjk9hzg0n9866f2g1"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + attoparsec attoparsec-varword base bytestring hspec QuickCheck + ]; + homepage = "https://github.com/concert/hs-varword#readme"; + description = "Variable-length integer encoding"; + license = stdenv.lib.licenses.lgpl3; + }) {}; + "bytestring-class" = callPackage ({ mkDerivation, base, bytestring, utf8-string }: mkDerivation { @@ -41207,6 +41309,7 @@ self: { libraryHaskellDepends = [ alg base ]; description = "Cellular Automata"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cab" = callPackage @@ -44002,6 +44105,7 @@ self: { libraryHaskellDepends = [ alg base ]; description = "Categorical types and classes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "category-extras" = callPackage @@ -44119,6 +44223,7 @@ self: { ]; homepage = "https://github.com/Nickske666/cautious#readme"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cayley-client" = callPackage @@ -44291,8 +44396,8 @@ self: { }: mkDerivation { pname = "cdeps"; - version = "0.1.0.2"; - sha256 = "1yd1ahf2ri31lwcs0mvhn6wgpglgk3vsf5698qw6asm8rl1gcaz9"; + version = "0.1.1.0"; + sha256 = "1pgarp84p757jyx71qma64g84fcyg6rrhrmrh4c1sszykqjnw7g0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -44836,22 +44941,23 @@ self: { "cgrep" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, async, base , bytestring, cmdargs, containers, directory, dlist, either - , filepath, ghc-prim, mtl, process, regex-base, regex-pcre - , regex-posix, safe, split, stm, stringsearch, transformers - , unicode-show, unix-compat, unordered-containers, utf8-string - , yaml + , exceptions, filepath, ghc-prim, mtl, process, regex-base + , regex-pcre, regex-posix, safe, split, stm, stringsearch + , transformers, unicode-show, unix-compat, unordered-containers + , utf8-string, yaml }: mkDerivation { pname = "cgrep"; - version = "6.6.24"; - sha256 = "0clnnhr5srrl3z2crfrs7csihrgcq5p9d9vgqbgxsf741jnfmhcx"; + version = "6.6.25"; + sha256 = "0cary2b5jg8151n48a4vij32g68mrql791mhw43v44wvhlag8plw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson ansi-terminal array async base bytestring cmdargs containers - directory dlist either filepath ghc-prim mtl process regex-base - regex-pcre regex-posix safe split stm stringsearch transformers - unicode-show unix-compat unordered-containers utf8-string yaml + directory dlist either exceptions filepath ghc-prim mtl process + regex-base regex-pcre regex-posix safe split stm stringsearch + transformers unicode-show unix-compat unordered-containers + utf8-string yaml ]; homepage = "http://awgn.github.io/cgrep/"; description = "Command line tool"; @@ -50918,8 +51024,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "concurrent-utilities"; - version = "0.2.0.1"; - sha256 = "168prywiw4fhh2syzj452pyqj8byy4sb929mgkv5srgwkzqr6g0f"; + version = "0.2.0.2"; + sha256 = "1phc9a90nvx6dk741hmg3w5m9y8ra5a7zsgmzw173ibaapr2yhqi"; libraryHaskellDepends = [ base ]; homepage = "-"; description = "More utilities and broad-used datastructures for concurrency"; @@ -52126,6 +52232,7 @@ self: { libraryHaskellDepends = [ base category ]; description = "Reified constraints"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "constraint-classes" = callPackage @@ -52190,12 +52297,12 @@ self: { }) {}; "constrictor" = callPackage - ({ mkDerivation, base, transformers }: + ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { pname = "constrictor"; - version = "0.1.1.0"; - sha256 = "0vid1m5lsmpdx9bpc78ad3nk720z62chd0j9rx03laiz2fjzx2bh"; - libraryHaskellDepends = [ base transformers ]; + version = "0.1.1.1"; + sha256 = "0rw36xbrrqm40rqacl8zps7hm424nqwkhxr82c98b16n182zvnan"; + libraryHaskellDepends = [ base ghc-prim transformers ]; homepage = "https://github.com/chessai/constrictor.git"; description = "strict versions of many things in base"; license = stdenv.lib.licenses.mit; @@ -52503,8 +52610,8 @@ self: { ({ mkDerivation, base, criterion, hspec, recursion-schemes }: mkDerivation { pname = "continued-fraction"; - version = "0.1.0.8"; - sha256 = "1izjdvm65zj960dcgg8xamg6ysfhn04qjxb9q7mpgzg8yi6f326c"; + version = "0.1.0.9"; + sha256 = "1831a093wnbf7kvplsp59xkdhj0g8wva08ixf9w12x6vl0yyj6sb"; libraryHaskellDepends = [ base recursion-schemes ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion ]; @@ -56298,21 +56405,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "curl-runnings_0_3_0" = callPackage + "curl-runnings_0_6_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring , case-insensitive, cmdargs, directory, hspec, hspec-expectations - , http-conduit, http-types, text, unordered-containers, vector - , yaml + , http-conduit, http-types, megaparsec, text, unordered-containers + , vector, yaml }: mkDerivation { pname = "curl-runnings"; - version = "0.3.0"; - sha256 = "0bcapr5kcwlc65bkg6w3aq69jzrb2rydkw13v99dcf9fn43kwcfj"; + version = "0.6.0"; + sha256 = "06dcxwhmzsinmay63m9wnsjsy1cgwyms64c0jicndnc3nhbl0824"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring case-insensitive directory hspec - hspec-expectations http-conduit http-types text + hspec-expectations http-conduit http-types megaparsec text unordered-containers vector yaml ]; executableHaskellDepends = [ base cmdargs text ]; @@ -57886,14 +57993,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse_3_0_0_0" = callPackage + "data-diverse_3_1_0_0" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim , hspec, tagged }: mkDerivation { pname = "data-diverse"; - version = "3.0.0.0"; - sha256 = "1sxv9pyggdpwba0771vpvrawnycjrnvpayq0fjf7ly57mrdi3zd0"; + version = "3.1.0.0"; + sha256 = "0jg8g8zp8s14qalrmqa3faspg9kfifzdv0mi8a25xmqgi6rz64aq"; libraryHaskellDepends = [ base containers deepseq ghc-prim tagged ]; @@ -57924,14 +58031,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse-lens_3_1_0_0" = callPackage + "data-diverse-lens_3_1_1_0" = callPackage ({ mkDerivation, base, data-diverse, data-has, generic-lens, hspec , lens, profunctors, tagged }: mkDerivation { pname = "data-diverse-lens"; - version = "3.1.0.0"; - sha256 = "0g1cnn1kw36ac68wm8qmd8pdzjpl4xcil7shailxwawldi52v549"; + version = "3.1.1.0"; + sha256 = "1ynw9j8a92ny8327i0r037swsc3rj3723dnlar77x640849nif0p"; libraryHaskellDepends = [ base data-diverse data-has generic-lens lens profunctors tagged ]; @@ -59177,6 +59284,7 @@ self: { homepage = "https://github.com/sgraf812/datafix"; description = "Fixing data-flow problems"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dataflow" = callPackage @@ -59683,6 +59791,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dbus-hslogger" = callPackage + ({ mkDerivation, base, dbus, hslogger, optparse-applicative }: + mkDerivation { + pname = "dbus-hslogger"; + version = "0.1.0.1"; + sha256 = "0i2y69kagp53cmlb7p3y6ysr9k5wvfd0vcnpwsasyn1jpk6g80zi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base dbus hslogger ]; + executableHaskellDepends = [ + base dbus hslogger optparse-applicative + ]; + homepage = "https://github.com/IvanMalison/dbus-hslogger#readme"; + description = "Expose a dbus server to control hslogger"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dbus-qq" = callPackage ({ mkDerivation, base, containers, dbus, parsec, QuickCheck , template-haskell @@ -60659,8 +60785,8 @@ self: { ({ mkDerivation, base, foldl }: mkDerivation { pname = "deferred-folds"; - version = "0.2.3"; - sha256 = "0v3nr8svnsqgj4rmbki4f38fndq03gxghkwb9q6qjd9w2m2hx3y1"; + version = "0.4.0.1"; + sha256 = "1n2wr03bqpp2yfm1jl54b3xrq4q2dwdj0ijssk8hbk3mzr4pac00"; libraryHaskellDepends = [ base foldl ]; homepage = "https://github.com/metrix-ai/deferred-folds"; description = "Abstractions over deferred folds"; @@ -61698,7 +61824,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall_1_13_0" = callPackage + "dhall_1_13_1" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, case-insensitive , containers, contravariant, cryptonite, deepseq, directory , exceptions, filepath, formatting, haskeline, http-client @@ -61710,8 +61836,8 @@ self: { }: mkDerivation { pname = "dhall"; - version = "1.13.0"; - sha256 = "1fn3yi2zv2l88jjapk0zhij247cy4yh0w07icyr41g341wx7gfv4"; + version = "1.13.1"; + sha256 = "1mjhxkdpw7blcdci6cmm3x2c9ascp7djc8c77dblfpzyqa3sqxf0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -61932,8 +62058,8 @@ self: { }: mkDerivation { pname = "di"; - version = "0.2"; - sha256 = "1vmhd8zph5ai13n2cfrjaxcdifwqv7wiggqbfi5ifhancxwlfq7p"; + version = "0.3"; + sha256 = "1kwkr2lb4vii530sijlrll9nj1k93pixcqk4bn96877bzf5963wj"; libraryHaskellDepends = [ base stm time transformers ]; testHaskellDepends = [ base bytestring QuickCheck stm tasty tasty-hunit tasty-quickcheck @@ -63467,6 +63593,8 @@ self: { pname = "directory"; version = "1.3.2.2"; sha256 = "0m4dhcz7d1y0y08hn8ny378ly67gqbx676srgardq6800w2iqhzj"; + revision = "1"; + editedCabalFile = "1qdpglb2xzgcm1yja9d9hvw75cg85wai292f7rb6h0hsjnhrans3"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -68137,8 +68265,8 @@ self: { pname = "ekg"; version = "0.4.0.15"; sha256 = "1k3d5kiqm034qs04k0pcisf4zbdmx2fcgl9a6c1lzzjw96zf6aj8"; - revision = "1"; - editedCabalFile = "05995gywwysmfhrvalvqnkvw7gh6z85jrb91a1knnvi0jwq4c6m3"; + revision = "2"; + editedCabalFile = "0dn8xysffy7pgz88h4h6lpjpl5n978dm3yxlzyxbk2k1byhzzx7d"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring ekg-core ekg-json filepath network snap-core @@ -68379,6 +68507,8 @@ self: { pname = "ekg-statsd"; version = "0.2.3.0"; sha256 = "05lakyb0sp6g8nziy6jzk2l19v2371cdnih6pp6myyj6iflx9smf"; + revision = "1"; + editedCabalFile = "1k4sndkjg1prvzhiii9gcgkx8zfkk9c4nf548x0hrbmj1laj8d62"; libraryHaskellDepends = [ base bytestring ekg-core network text time unordered-containers ]; @@ -71281,8 +71411,8 @@ self: { }: mkDerivation { pname = "eventloop"; - version = "0.8.2.6"; - sha256 = "1f3dmkrxjfj128pdkarrc6mka09jmh360bn6vgbp4qm2xv5hl16s"; + version = "0.8.2.7"; + sha256 = "0rqgb224v9zy2kkchk2v3zwpdwh805ff03j5y5vswmc0l52bkw7w"; libraryHaskellDepends = [ aeson base bytestring concurrent-utilities deepseq network stm suspend text timers websockets @@ -71672,6 +71802,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "exception-transformers_0_4_0_7" = callPackage + ({ mkDerivation, base, HUnit, stm, test-framework + , test-framework-hunit, transformers, transformers-compat + }: + mkDerivation { + pname = "exception-transformers"; + version = "0.4.0.7"; + sha256 = "1vzjy6mz6y9jacpwq2bax86nwzq9mk4b9y3r3r98l50r7pmn2nwj"; + libraryHaskellDepends = [ + base stm transformers transformers-compat + ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit transformers + transformers-compat + ]; + description = "Type classes and monads for unchecked extensible exceptions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "exceptional" = callPackage ({ mkDerivation, base, exceptions }: mkDerivation { @@ -72152,6 +72302,7 @@ self: { homepage = "https://github.com/metrix-ai/expiring-containers"; description = "Expiring containers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "expiring-mvar" = callPackage @@ -72355,6 +72506,7 @@ self: { ]; description = "Encode and Decode expressions from Z3 ASTs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extcore" = callPackage @@ -79627,6 +79779,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fuzzy-dates" = callPackage + ({ mkDerivation, base, hourglass, hspec, lens, parsec }: + mkDerivation { + pname = "fuzzy-dates"; + version = "0.1.1.1"; + sha256 = "1hanmwzr1g11am4z3r9wrkzfycvk76a03cg9bqpifidv7y9hcd73"; + libraryHaskellDepends = [ base hourglass hspec lens parsec ]; + testHaskellDepends = [ base hourglass hspec lens parsec ]; + homepage = "https://github.com/ReedOei/fuzzy-dates#readme"; + description = "Libary for parsing dates in strings in varied formats"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fuzzy-timings" = callPackage ({ mkDerivation, base, containers, glpk-hs, HUnit, mtl, QuickCheck , random, test-framework, test-framework-hunit @@ -81456,14 +81621,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-hspec_0_6_0_1" = callPackage + "genvalidity-hspec_0_6_0_2" = callPackage ({ mkDerivation, base, doctest, genvalidity, genvalidity-property , hspec, hspec-core, QuickCheck, validity }: mkDerivation { pname = "genvalidity-hspec"; - version = "0.6.0.1"; - sha256 = "18srjw0c8li10nbnxwbnhrggkl9nhdfjy02jpxd6hpij345y3j47"; + version = "0.6.0.2"; + sha256 = "0l14vn5hddkvyzhch8l9abwh3naya27p9f6lz918zd8i5l5pd32n"; libraryHaskellDepends = [ base genvalidity genvalidity-property hspec hspec-core QuickCheck validity @@ -81695,14 +81860,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "genvalidity-property_0_2_0_0" = callPackage + "genvalidity-property_0_2_0_1" = callPackage ({ mkDerivation, base, directory, doctest, filepath, genvalidity , hspec, QuickCheck, validity }: mkDerivation { pname = "genvalidity-property"; - version = "0.2.0.0"; - sha256 = "10przvvqrmjyr9cmbna79kj15wjhi0r4j64qn5824gslyy7g39pa"; + version = "0.2.0.1"; + sha256 = "02ypm53llfdrqasji79bng3ybkjs8ak7klcrhkg15k6jgk0ca877"; libraryHaskellDepends = [ base genvalidity hspec QuickCheck validity ]; @@ -81851,15 +82016,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-unordered-containers_0_2_0_0" = callPackage + "genvalidity-unordered-containers_0_2_0_2" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable , hspec, QuickCheck, unordered-containers, validity , validity-unordered-containers }: mkDerivation { pname = "genvalidity-unordered-containers"; - version = "0.2.0.0"; - sha256 = "1kfn6g3h33g215qy0iffhr35vd2np9nsf6634fjk40mbz1san0m8"; + version = "0.2.0.2"; + sha256 = "0sjs06qf0pk6xvgc38qayzfqk6wm1qgpx3yzglpkhdy809gl5pfa"; libraryHaskellDepends = [ base genvalidity hashable QuickCheck unordered-containers validity validity-unordered-containers @@ -81893,14 +82058,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-uuid_0_1_0_0" = callPackage + "genvalidity-uuid_0_1_0_1" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, uuid, validity, validity-uuid }: mkDerivation { pname = "genvalidity-uuid"; - version = "0.1.0.0"; - sha256 = "1j4q3smhz812cfgsv6vmjgng068knd9v7xg0hkvx868wbndgk37h"; + version = "0.1.0.1"; + sha256 = "1ssihh980iz9kx2apygbw0r5qdb40hnvjkpsn2qw55r8d5hc4sa6"; libraryHaskellDepends = [ base genvalidity QuickCheck uuid validity validity-uuid ]; @@ -81933,14 +82098,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-vector_0_2_0_0" = callPackage + "genvalidity-vector_0_2_0_1" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, validity, validity-vector, vector }: mkDerivation { pname = "genvalidity-vector"; - version = "0.2.0.0"; - sha256 = "0ww3hzkzhblx8qp062vz74vwaqvv38l0sl0dwyxrqra68qglxr4f"; + version = "0.2.0.1"; + sha256 = "1xinffnzcaws7i6k0l3x89g6kzkg1vhiwkngh5ag69wvpzq3if7n"; libraryHaskellDepends = [ base genvalidity QuickCheck validity validity-vector vector ]; @@ -85481,6 +85646,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "github-webhooks_0_10_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptonite, deepseq, deepseq-generics, hspec, memory, text, time + , vector + }: + mkDerivation { + pname = "github-webhooks"; + version = "0.10.0"; + sha256 = "1pvif863yi6qxwjd43insjvrzizaz78b3kf8l13rmy3irjlqljh8"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptonite deepseq + deepseq-generics memory text time vector + ]; + testHaskellDepends = [ aeson base bytestring hspec text vector ]; + homepage = "https://github.com/onrock-eng/github-webhooks#readme"; + description = "Aeson instances for GitHub Webhook payloads"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "githud" = callPackage ({ mkDerivation, base, mtl, parsec, process, tasty, tasty-hunit , tasty-quickcheck, tasty-smallcheck, text, unix @@ -89074,6 +89259,7 @@ self: { homepage = "https://github.com/Teaspot-Studio/gore-and-ash-glfw"; description = "Core module for Gore&Ash engine for GLFW input events"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gore-and-ash-lambdacube" = callPackage @@ -90526,6 +90712,7 @@ self: { homepage = "https://github.com/alonsodomin/groot#readme"; description = "Command line utility to manage AWS ECS resources"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gross" = callPackage @@ -91135,20 +91322,22 @@ self: { "gtk-sni-tray" = callPackage ({ mkDerivation, base, bytestring, containers, dbus, directory - , gi-dbusmenugtk3, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gtk, gtk-strut - , gtk3, haskell-gi, haskell-gi-base, hslogger, optparse-applicative + , enclosed-exceptions, filepath, gi-dbusmenugtk3, gi-gdk + , gi-gdkpixbuf, gi-glib, gi-gtk, gtk-strut, gtk3, haskell-gi + , haskell-gi-base, hslogger, optparse-applicative , status-notifier-item, text, transformers, unix }: mkDerivation { pname = "gtk-sni-tray"; - version = "0.1.1.0"; - sha256 = "16wif6b94ipw49810jyjgl6h8mhx7bkz0pkl8ri6ir9ljp0mnvp0"; + version = "0.1.2.0"; + sha256 = "1imgna34fdsg2fwlxk5xb0dvw8sbqjk7qgvh1p3wc8q9yx8zl0qm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring containers dbus directory gi-dbusmenugtk3 gi-gdk - gi-gdkpixbuf gi-glib gi-gtk gtk-strut haskell-gi haskell-gi-base - hslogger status-notifier-item text transformers unix + base bytestring containers dbus directory enclosed-exceptions + filepath gi-dbusmenugtk3 gi-gdk gi-gdkpixbuf gi-glib gi-gtk + gtk-strut haskell-gi haskell-gi-base hslogger status-notifier-item + text transformers unix ]; libraryPkgconfigDepends = [ gtk3 ]; executableHaskellDepends = [ @@ -91158,6 +91347,7 @@ self: { homepage = "https://github.com/IvanMalison/gtk-sni-tray#readme"; description = "A standalone StatusNotifierItem/AppIndicator tray"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {gtk3 = pkgs.gnome3.gtk;}; "gtk-strut" = callPackage @@ -91627,20 +91817,23 @@ self: { }) {}; "h-gpgme" = callPackage - ({ mkDerivation, base, bindings-gpgme, bytestring, either, HUnit - , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, time + ({ mkDerivation, base, bindings-gpgme, bytestring, data-default + , directory, email-validate, exceptions, filepath, HUnit + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, temporary, time , transformers, unix }: mkDerivation { pname = "h-gpgme"; - version = "0.4.0.0"; - sha256 = "0v85bz57jn265v5pnr0xjw838qmiy7v6vinvvd6m7pj5zls5hx9m"; + version = "0.5.0.0"; + sha256 = "0fvkj7cz7nfz52a2zccngb8gbs8p94whvgccvnxpwmkg90m45mfp"; libraryHaskellDepends = [ - base bindings-gpgme bytestring either time unix + base bindings-gpgme bytestring data-default email-validate time + transformers unix ]; testHaskellDepends = [ - base bindings-gpgme bytestring either HUnit QuickCheck tasty - tasty-hunit tasty-quickcheck time transformers unix + base bindings-gpgme bytestring data-default directory + email-validate exceptions filepath HUnit QuickCheck tasty + tasty-hunit tasty-quickcheck temporary time transformers unix ]; homepage = "https://github.com/rethab/h-gpgme"; description = "High Level Binding for GnuPG Made Easy (gpgme)"; @@ -97440,7 +97633,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "haskell-lsp_0_2_1_0" = callPackage + "haskell-lsp_0_2_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , directory, filepath, hashable, haskell-lsp-types, hslogger, hspec , lens, mtl, network-uri, parsec, sorted-list, stm, text, time @@ -97448,8 +97641,8 @@ self: { }: mkDerivation { pname = "haskell-lsp"; - version = "0.2.1.0"; - sha256 = "09wv2ic66lc03pndpx4xsmmv3zxwram5i82483j340avm2rp06c0"; + version = "0.2.2.0"; + sha256 = "1h3ibwd0i0z2c35fxw0m0gyd6dj45pf17x9hc5cgf3sql4qr5yxd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -97499,8 +97692,8 @@ self: { }: mkDerivation { pname = "haskell-lsp-types"; - version = "0.2.1.0"; - sha256 = "0byslqf8qw7rc1kva3inm8bsm9z12h19y3b3yzgwz1hlkshjl2d0"; + version = "0.2.2.0"; + sha256 = "0wchy8qrd450s90j6d26psznrd3n245lvn01qxa42l5akljmlymx"; libraryHaskellDepends = [ aeson base bytestring data-default filepath hashable lens network-uri text unordered-containers @@ -104823,6 +105016,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hint_0_8_0" = callPackage + ({ mkDerivation, base, directory, exceptions, extensible-exceptions + , filepath, ghc, ghc-boot, ghc-paths, HUnit, mtl, random, unix + }: + mkDerivation { + pname = "hint"; + version = "0.8.0"; + sha256 = "0h8wan0hb16m1gcil1csaay9f9f1pq3kfgbzfsfpjszmr1i2sw1f"; + libraryHaskellDepends = [ + base directory exceptions filepath ghc ghc-boot ghc-paths mtl + random unix + ]; + testHaskellDepends = [ + base directory exceptions extensible-exceptions filepath HUnit unix + ]; + homepage = "https://github.com/mvdan/hint"; + description = "Runtime Haskell interpreter (GHC API wrapper)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hint-server" = callPackage ({ mkDerivation, base, eprocess, exceptions, hint, monad-loops, mtl }: @@ -104839,6 +105053,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hinter" = callPackage + ({ mkDerivation, base, directory, exceptions, extensible-exceptions + , filepath, ghc, ghc-boot, ghc-paths, HUnit, mtl, random, unix + }: + mkDerivation { + pname = "hinter"; + version = "0.1.0.0"; + sha256 = "0r790y7j64y79rqg7ip4dk5a8pbpryisp008lcmswzc0si35jfgl"; + libraryHaskellDepends = [ + base directory exceptions filepath ghc ghc-boot ghc-paths mtl + random unix + ]; + testHaskellDepends = [ + base directory exceptions extensible-exceptions filepath HUnit unix + ]; + homepage = "https://github.com/strake/hint.hs"; + description = "Runtime Haskell interpreter (GHC API wrapper)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hinterface" = callPackage ({ mkDerivation, array, async, base, binary, bytestring, containers , cryptonite, exceptions, hspec, lifted-async, lifted-base, memory @@ -105708,7 +105942,7 @@ self: { homepage = "https://github.com/gebner/hledger-diff"; description = "Compares the transactions in two ledger files"; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ gebner ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-iadd" = callPackage @@ -106002,8 +106236,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.1.4"; - sha256 = "01qgnljgsd331zx9df2diijnfvy78p1j6ysqqq317v66yxpz6vlh"; + version = "2.1.5"; + sha256 = "00kib9b80s0bhdv267dgybl68knmzzmq7n0maygzc0kxc9k1bwj1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -106260,6 +106494,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hmatrix-backprop_0_1_2_1" = callPackage + ({ mkDerivation, 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.2.1"; + sha256 = "0qcm2hkdh50xgvxhs6nr303h0gs1x9apiklgnk8xjzgibsy8vb1n"; + libraryHaskellDepends = [ + backprop base finite-typelits 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hmatrix-banded" = callPackage ({ mkDerivation, base, hmatrix, liblapack, transformers }: mkDerivation { @@ -106450,6 +106709,7 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Sparse linear solver"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {mkl_core = null; mkl_intel = null; mkl_sequential = null;}; "hmatrix-special" = callPackage @@ -106515,6 +106775,7 @@ self: { homepage = "https://github.com/idontgetoutmuch/hmatrix/tree/sundials"; description = "hmatrix interface to sundials"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {sundials_arkode = null;}; "hmatrix-svdlibc" = callPackage @@ -109203,6 +109464,7 @@ self: { 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 @@ -115230,6 +115492,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-streams_0_8_6_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base + , base64-bytestring, blaze-builder, bytestring, Cabal + , case-insensitive, directory, ghc-prim, HsOpenSSL, hspec + , hspec-expectations, http-common, HUnit, io-streams, lifted-base + , mtl, network, network-uri, openssl-streams, snap-core + , snap-server, system-fileio, system-filepath, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "http-streams"; + version = "0.8.6.1"; + sha256 = "18vxd35n7s3z4gjvad94bknc8z1w9d7ccgphnhsxlz5cackizmxq"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-builder bytestring + case-insensitive directory HsOpenSSL http-common io-streams mtl + network network-uri openssl-streams text transformers + unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty attoparsec base base64-bytestring blaze-builder + bytestring case-insensitive directory ghc-prim HsOpenSSL hspec + hspec-expectations http-common HUnit io-streams lifted-base mtl + network network-uri openssl-streams snap-core snap-server + system-fileio system-filepath text transformers + unordered-containers + ]; + homepage = "https://github.com/afcowie/http-streams/"; + description = "An HTTP client using io-streams"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-test" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client, lens , lens-aeson, mtl, tasty, tasty-hunit, text, time, wreq @@ -116569,7 +116865,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-rankselect_0_12_0_0" = callPackage + "hw-rankselect_0_12_0_1" = callPackage ({ mkDerivation, base, bytestring, conduit, criterion, deepseq , directory, hedgehog, hspec, hw-balancedparens, hw-bits , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, lens @@ -116577,8 +116873,8 @@ self: { }: mkDerivation { pname = "hw-rankselect"; - version = "0.12.0.0"; - sha256 = "1yp9fmxk55ikhrrpkff4r1sgqadg4b0yfz2w1xardxb3n09n4xpa"; + version = "0.12.0.1"; + sha256 = "0jg27cpdw341gr1mjnqm5rq66q84q1rzwa5bp8czzws71m5kpfpy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120924,18 +121220,24 @@ self: { }) {}; "int-multimap" = callPackage - ({ mkDerivation, base, containers, hashable, unordered-containers + ({ mkDerivation, base, containers, hashable, tasty, tasty-hunit + , tasty-quickcheck, unordered-containers }: mkDerivation { pname = "int-multimap"; - version = "0.2"; - sha256 = "17hwqly7v5224fddan9nkywv4pp478nby7iswaj32x27qwn9p11f"; + version = "0.2.1"; + sha256 = "080ypcd99pvw0wsrydz6hzd9hrr18v4kcb3wihz6v8ylfn08d6ci"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; + testHaskellDepends = [ + base containers hashable tasty tasty-hunit tasty-quickcheck + unordered-containers + ]; homepage = "https://github.com/metrix-ai/int-multimap"; description = "A data structure that associates each Int key with a set of values"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "integer-gmp_1_0_2_0" = callPackage @@ -126520,6 +126822,7 @@ self: { homepage = "http://github.com/asakamirai/kazura-queue"; description = "Fast concurrent queues much inspired by unagi-chan"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kbq-gu" = callPackage @@ -132637,6 +132940,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lift-read-show" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "lift-read-show"; + version = "0.1.0.0"; + sha256 = "0sp725nflvqzxvhycjj1v9j46y4cx1vvbr9k6pfwz585n35gs1a0"; + libraryHaskellDepends = [ base ]; + description = "Helper methods to define `Read1`, `Read2`, `Show1`, `Show2` instances"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lifted-async" = callPackage ({ mkDerivation, async, base, constraints, criterion, deepseq , HUnit, lifted-base, monad-control, mtl, tasty, tasty-hunit @@ -134599,7 +134913,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {llvm-config = null;}; - "llvm-hs_6_0_0" = callPackage + "llvm-hs_6_1_1" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, Cabal , containers, exceptions, llvm-config, llvm-hs-pure, mtl , pretty-show, QuickCheck, tasty, tasty-hunit, tasty-quickcheck @@ -134607,10 +134921,8 @@ self: { }: mkDerivation { pname = "llvm-hs"; - version = "6.0.0"; - sha256 = "1hll3s40bbrzyylyfnh0w907cpkbxx6qn3a6wv7kfi107zfx2rgd"; - revision = "1"; - editedCabalFile = "1apyscxr48g37qw15wmqb98si8gcnx8cky6bj68ai3jfjfphbjly"; + version = "6.1.1"; + sha256 = "0vlp1rgddgavs4kg0s1qmny6mlx4rpz12ybcrqg6vmv68w1qyr5r"; setupHaskellDepends = [ base Cabal containers ]; libraryHaskellDepends = [ array attoparsec base bytestring containers exceptions llvm-hs-pure @@ -134629,22 +134941,22 @@ self: { "llvm-hs-pretty" = callPackage ({ mkDerivation, array, base, bytestring, directory, filepath - , llvm-hs, llvm-hs-pure, mtl, pretty-show, tasty, tasty-golden - , tasty-hspec, tasty-hunit, text, transformers, wl-pprint-text + , llvm-hs, llvm-hs-pure, mtl, tasty, tasty-golden, tasty-hspec + , tasty-hunit, text, transformers, wl-pprint-text }: mkDerivation { pname = "llvm-hs-pretty"; - version = "0.2.0.0"; - sha256 = "133kyksbp88q0wavp3wdjg69h9fpwi7nq626nvikdy46cf7lgklh"; + version = "0.2.1.0"; + sha256 = "1v8nz7c7wvvh29c48li10m12lj8y3yn5b8rs1b86y351s11vsag6"; libraryHaskellDepends = [ array base bytestring llvm-hs-pure text wl-pprint-text ]; testHaskellDepends = [ - base directory filepath llvm-hs llvm-hs-pure mtl pretty-show tasty - tasty-golden tasty-hspec tasty-hunit text transformers + base directory filepath llvm-hs llvm-hs-pure mtl tasty tasty-golden + tasty-hspec tasty-hunit text transformers ]; homepage = "https://github.com/llvm-hs/llvm-hs-pretty"; - description = "Pretty printer for LLVM IR"; + description = "A pretty printer for LLVM IR"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -134671,24 +134983,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "llvm-hs-pure_6_0_0" = callPackage + "llvm-hs-pure_6_1_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, fail - , hspec, mtl, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, text, transformers, unordered-containers + , mtl, tasty, tasty-hunit, tasty-quickcheck, template-haskell + , transformers, unordered-containers }: mkDerivation { pname = "llvm-hs-pure"; - version = "6.0.0"; - sha256 = "005414p1jv5nyf3awiybksc1paf092a9070x23l2y6fvd9jhy0sl"; - revision = "1"; - editedCabalFile = "05idczj2c9iv3kb7fyfhc0ypfsmcjkf9n46w24ivarjbs8fykrb3"; + version = "6.1.0"; + sha256 = "12fivm5w4nz306p7w0bxsmgb2cnbkp06dyrdfi64vrsgm9kgbqmw"; libraryHaskellDepends = [ attoparsec base bytestring containers fail mtl template-haskell transformers unordered-containers ]; testHaskellDepends = [ - base bytestring containers hspec mtl tasty tasty-hunit - tasty-quickcheck text transformers unordered-containers + base containers mtl tasty tasty-hunit tasty-quickcheck transformers ]; homepage = "http://github.com/llvm-hs/llvm-hs/"; description = "Pure Haskell LLVM functionality (no FFI)"; @@ -135090,19 +135399,16 @@ self: { }) {}; "locators" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, cryptohash - , hspec, hspec-expectations, HUnit, QuickCheck + ({ mkDerivation, base, bytestring, containers, cryptohash, hspec + , HUnit, QuickCheck }: mkDerivation { pname = "locators"; - version = "0.2.4.3"; - sha256 = "0wcp56hy8zs7sngspzywyq4j39y0pji0xwqj7x1i26rg77wi7xw4"; - libraryHaskellDepends = [ - base bytestring cereal containers cryptohash - ]; + version = "0.2.4.4"; + sha256 = "19csw13qbxxv7lr3blx856k2y21sidgpnv56dq45la3f4100jv9d"; + libraryHaskellDepends = [ base bytestring containers cryptohash ]; testHaskellDepends = [ - base bytestring cereal containers cryptohash hspec - hspec-expectations HUnit QuickCheck + base bytestring containers cryptohash hspec HUnit QuickCheck ]; description = "Human exchangable identifiers and locators"; license = stdenv.lib.licenses.bsd3; @@ -139482,17 +139788,17 @@ self: { , brick, brick-skylighting, bytestring, cheapskate, checkers , config-ini, connection, containers, directory, filepath, gitrev , hashable, Hclip, mattermost-api, mattermost-api-qc - , microlens-platform, mtl, process, quickcheck-text, semigroups - , skylighting-core, stm, stm-delay, strict, string-conversions - , tasty, tasty-hunit, tasty-quickcheck, temporary, text - , text-zipper, time, timezone-olson, timezone-series, transformers - , Unique, unix, unordered-containers, utf8-string, vector, vty - , word-wrap, xdg-basedir + , microlens-platform, mtl, process, quickcheck-text, random + , semigroups, skylighting-core, stm, stm-delay, strict + , string-conversions, tasty, tasty-hunit, tasty-quickcheck + , temporary, text, text-zipper, time, timezone-olson + , timezone-series, transformers, Unique, unix, unordered-containers + , utf8-string, uuid, vector, vty, word-wrap, xdg-basedir }: mkDerivation { pname = "matterhorn"; - version = "40900.0.1"; - sha256 = "1ygnh27dv5hprb5fqqxwjxsf43ik784pwdagndn3sdiddy2k3yf7"; + version = "40901.0.0"; + sha256 = "1ra1ikivf5y17mzwjvfsvg1kz4438wllv2qwxzaigb9cirrz0n4r"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -139500,9 +139806,9 @@ self: { aeson aspell-pipe async base base-compat brick brick-skylighting bytestring cheapskate config-ini connection containers directory filepath gitrev hashable Hclip mattermost-api microlens-platform - mtl process semigroups skylighting-core stm stm-delay strict + mtl process random semigroups skylighting-core stm stm-delay strict temporary text text-zipper time timezone-olson timezone-series - transformers unix unordered-containers utf8-string vector vty + transformers unix unordered-containers utf8-string uuid vector vty word-wrap xdg-basedir ]; testHaskellDepends = [ @@ -139511,8 +139817,8 @@ self: { mattermost-api mattermost-api-qc microlens-platform mtl process quickcheck-text semigroups stm strict string-conversions tasty tasty-hunit tasty-quickcheck text text-zipper time timezone-olson - timezone-series transformers Unique unordered-containers vector vty - xdg-basedir + timezone-series transformers Unique unordered-containers uuid + vector vty xdg-basedir ]; description = "Terminal client for the Mattermost chat system"; license = stdenv.lib.licenses.bsd3; @@ -139648,6 +139954,7 @@ self: { homepage = "https://github.com/george-steel/maxent-learner"; description = "GUI for maxent-learner-hw"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "maximal-cliques" = callPackage @@ -141195,6 +141502,7 @@ self: { ]; description = "A tiny JSON library with light dependency footprint"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microbench" = callPackage @@ -143298,8 +143606,8 @@ self: { }: mkDerivation { pname = "monad-classes"; - version = "0.3.2.0"; - sha256 = "0r6wfl7xd870ml1mysznih1yly9rnj869cpr30fjwy9dsybkbfwr"; + version = "0.3.2.1"; + sha256 = "0vclcwxy0qc9y1i3iw0ysymcvikn12mi5lfbarxykdhygmi1w5m5"; libraryHaskellDepends = [ base ghc-prim mmorph monad-control peano reflection transformers transformers-base transformers-compat @@ -144118,6 +144426,8 @@ self: { pname = "monad-ste"; version = "0.1.0.0"; sha256 = "0yqkx7rlrfms7wiymb41y5nxh8fyi4049729iamwablx6hdpsrw6"; + revision = "1"; + editedCabalFile = "17xfha8zn0snlqwi8cr44my3d1zbyvhh83qlmb747dblhmj1rdi1"; libraryHaskellDepends = [ base exceptions ghc-prim primitive ]; testHaskellDepends = [ base hspec HUnit ]; homepage = "http://github.com/cartazio/monad-ste"; @@ -144696,6 +145006,38 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "mongoDB_2_4_0_0" = callPackage + ({ mkDerivation, array, base, base16-bytestring, base64-bytestring + , binary, bson, bytestring, conduit, conduit-extra, containers + , criterion, cryptohash, data-default-class, hashtables, hspec + , lifted-base, monad-control, mtl, network, nonce, old-locale + , parsec, pureMD5, random, random-shuffle, resourcet, stm, tagged + , text, time, tls, transformers, transformers-base + }: + mkDerivation { + pname = "mongoDB"; + version = "2.4.0.0"; + sha256 = "06g7mvazsymbyzm1zhsyfpbmhvlizidb4lp5l6axfw2wh90h5f7x"; + libraryHaskellDepends = [ + array base base16-bytestring base64-bytestring binary bson + bytestring conduit conduit-extra containers cryptohash + data-default-class hashtables lifted-base monad-control mtl network + nonce parsec pureMD5 random random-shuffle resourcet stm tagged + text time tls transformers transformers-base + ]; + testHaskellDepends = [ base hspec mtl old-locale text time ]; + benchmarkHaskellDepends = [ + array base base16-bytestring base64-bytestring binary bson + bytestring containers criterion cryptohash data-default-class + hashtables lifted-base monad-control mtl network nonce parsec + random random-shuffle stm text transformers-base + ]; + homepage = "https://github.com/mongodb-haskell/mongodb"; + description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mongodb-queue" = callPackage ({ mkDerivation, base, data-default, hspec, lifted-base , monad-control, mongoDB, network, text, transformers @@ -146615,6 +146957,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "multivector" = callPackage + ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck, Vector + , vector + }: + mkDerivation { + pname = "multivector"; + version = "0.1.0.0"; + sha256 = "183i59ri20fci2f2w4algmr8crz6q2aj1yirhgwjilkj3f4h6h4d"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ + base smallcheck tasty tasty-smallcheck Vector + ]; + description = "Vectors of packed tuples"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {Vector = null;}; + "muon" = callPackage ({ mkDerivation, base, blaze-html, ConfigFile, directory, Glob , happstack-server, HStringTemplate, markdown, MissingH, process @@ -147340,6 +147700,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) mxnet;}; + "mxnet-dataiter" = callPackage + ({ mkDerivation, base, conduit, conduit-combinators, hspec, mxnet + , mxnet-nn, streaming, template-haskell + }: + mkDerivation { + pname = "mxnet-dataiter"; + version = "0.1.0.0"; + sha256 = "1cicxgasx0s840vvkc6n6v6rsrr8rk9jhpqh96kiy6dk0m4k02s9"; + libraryHaskellDepends = [ + base conduit conduit-combinators mxnet mxnet-nn streaming + template-haskell + ]; + testHaskellDepends = [ base hspec mxnet streaming ]; + homepage = "https://github.com/pierric/mxnet-dataiter#readme"; + description = "mxnet dataiters"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mxnet-examples" = callPackage ({ mkDerivation, base, mxnet }: mkDerivation { @@ -147359,16 +147738,17 @@ self: { ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring , exceptions, ghc-prim, lens, mmorph, mtl, mxnet, resourcet , streaming, streaming-bytestring, streaming-utils - , unordered-containers, vector + , transformers-base, unordered-containers, vector }: mkDerivation { pname = "mxnet-nn"; - version = "0.0.1.2"; - sha256 = "0w5ri77ccav65dza3a4aanzvylcwscs4rf4yqylc12w03xh0rshp"; + version = "0.0.1.3"; + sha256 = "0693ca7rwai4s8i8vqbmmq3q50pd23svcnnnd1cxjbqxh6hgsbs1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base lens mtl mxnet resourcet unordered-containers vector + base lens mtl mxnet resourcet transformers-base + unordered-containers vector ]; executableHaskellDepends = [ attoparsec attoparsec-binary base bytestring exceptions ghc-prim @@ -148860,8 +149240,8 @@ self: { }: mkDerivation { pname = "nest"; - version = "0.0.1"; - sha256 = "1ndd93z9yqa1slhb8wq3j5fr3rc2fna0cb5xqh9s3dynb966zqqk"; + version = "0.0.2"; + sha256 = "15q7c2ppw1ajnhglfawlc2a65k7d2cvcpav88y8kjqmp68hvgpic"; libraryHaskellDepends = [ base bytestring containers text transformers unix ]; @@ -156573,18 +156953,18 @@ self: { "pandoc-placetable" = callPackage ({ mkDerivation, aeson, base, bytestring, explicit-exception - , http-conduit, pandoc-types, spreadsheet, utf8-string + , http-conduit, pandoc-types, spreadsheet, text, utf8-string }: mkDerivation { pname = "pandoc-placetable"; - version = "0.4.2"; - sha256 = "0y8mz2jgnfzr8ib7w4bfwwdsljs3a2qpq3pxgvl2jwi7wdrcslai"; + version = "0.5"; + sha256 = "0kjlx2krgwf32y30cca09xnf1h3c91s0pzsv5xf7l8zw85jikxah"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ aeson base bytestring explicit-exception http-conduit pandoc-types - spreadsheet utf8-string + spreadsheet text utf8-string ]; homepage = "https://github.com/mb21/pandoc-placetable"; description = "Pandoc filter to include CSV files"; @@ -156786,6 +157166,7 @@ self: { homepage = "https://github.com/tuura/pangraph#readme"; description = "A set of parsers for graph languages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "panhandle" = callPackage @@ -158362,8 +158743,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.6.1.1"; - sha256 = "153d2ij27jjsh0h014d1v3y06diri1njbmwzvq2kgwdbdqgkhf0y"; + version = "0.7.0.0"; + sha256 = "0w7k1s8nma0bp4cvacmpa3fxxslarcijpxvbvasjyik3inazqhsd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -160954,6 +161335,7 @@ self: { testHaskellDepends = [ base hspec ]; description = "Deprecated - ghci debug viewer with simple editor"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "phoityne-vscode" = callPackage @@ -161177,6 +161559,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pi-hoole" = callPackage + ({ mkDerivation, aeson, base, base58-bytestring, blaze-html + , bytestring, containers, directory, filepath, http-types + , megaparsec, optparse-generic, process, regex-pcre, shakespeare + , text, unix, wai, warp, yaml + }: + mkDerivation { + pname = "pi-hoole"; + version = "0.2.0.0"; + sha256 = "0qjs8b7ljybvklx9s5xmb9kg2mxlaqfwjf7d52c31y3f21d5q8q0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers directory filepath megaparsec process text + ]; + executableHaskellDepends = [ + aeson base base58-bytestring blaze-html bytestring containers + directory filepath http-types megaparsec optparse-generic + regex-pcre shakespeare text unix wai warp yaml + ]; + testHaskellDepends = [ base ]; + description = "Lightweight access control solution for the pijul vcs"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "pi-lcd" = callPackage ({ mkDerivation, base, bytestring, clock, deepseq, text, unix , unordered-containers @@ -161396,6 +161803,7 @@ self: { homepage = "https://github.com/judah/pier#readme"; description = "Yet another Haskell build system"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "piet" = callPackage @@ -162159,6 +162567,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pipes-group_1_0_10" = callPackage + ({ mkDerivation, base, doctest, free, lens-family-core, pipes + , pipes-parse, transformers + }: + mkDerivation { + pname = "pipes-group"; + version = "1.0.10"; + sha256 = "1j37sj0i7lkmk228lchp5kkvf86fiwrkikwwrfibpb6xwixjmlr8"; + libraryHaskellDepends = [ + base free pipes pipes-parse transformers + ]; + testHaskellDepends = [ base doctest lens-family-core ]; + description = "Group streams into substreams"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-http" = callPackage ({ mkDerivation, base, bytestring, http-client, http-client-tls , pipes @@ -162981,8 +163406,8 @@ self: { }: mkDerivation { pname = "planb-token-introspection"; - version = "0.1.1.0"; - sha256 = "0b54sr1zvrczjxlx9xrb5zcy1kmybv396cigqvm652k9q16zifc5"; + version = "0.1.2.0"; + sha256 = "09b54m2m90g8ci6sxsgayvfxd9gmkwp2xw16gk1afxnha39lzwlq"; libraryHaskellDepends = [ aeson aeson-casing base bytestring containers http-client http-client-tls http-types mtl safe-exceptions text transformers @@ -163714,6 +164139,8 @@ self: { pname = "pointfree-fancy"; version = "1.1.1.7"; sha256 = "1xw2p96ghclfxmc12kwxyh25r5k9k6h3zriaf38wz5d3j36npa7w"; + revision = "1"; + editedCabalFile = "0mdanymbifnxc85z3aixmn5v08kxa1fjazadrhc0jjf5y110sxc2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165510,8 +165937,8 @@ self: { }: mkDerivation { pname = "potoki"; - version = "0.11.2"; - sha256 = "1c07q872d6k75cah1rfjw7wfam76fn8dc4x265v0xrngys6k9iwh"; + version = "0.11.3"; + sha256 = "134wy711qnkrwa9c78d7lv8vnc3b5a2dqyslzvs59xqx4csh61xj"; libraryHaskellDepends = [ attoparsec base base-prelude bytestring directory foldl hashable potoki-core profunctors ptr text transformers unagi-chan @@ -166331,6 +166758,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "preprocessor-tools_2_0_2" = callPackage + ({ mkDerivation, base, mtl, parsec, syb }: + mkDerivation { + pname = "preprocessor-tools"; + version = "2.0.2"; + sha256 = "0m825wnz7vs3as10glfzy7j0laf6j9w566isly95005gj2sb0lwp"; + libraryHaskellDepends = [ base mtl parsec syb ]; + homepage = "https://github.com/tov/preprocessor-tools-hs"; + description = "A framework for extending Haskell's syntax via quick-and-dirty preprocessors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "presburger" = callPackage ({ mkDerivation, base, containers, pretty, QuickCheck }: mkDerivation { @@ -166516,6 +166956,7 @@ self: { homepage = "https://github.com/NorfairKing/pretty-relative-time#readme"; description = "Pretty relative time"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pretty-show" = callPackage @@ -166798,6 +167239,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "prim-ref" = callPackage + ({ mkDerivation, base, ghc-prim, primitive, semigroups }: + mkDerivation { + pname = "prim-ref"; + version = "0.1"; + sha256 = "0fyjxpk4xllkh3r5b7fbb4sb6whxwbdm5lr9zn44qb9v4g0nx2d8"; + libraryHaskellDepends = [ base ghc-prim primitive semigroups ]; + homepage = "https://github.com/andrewthad/prim-array#readme"; + description = "Primitive byte array with type variable"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "prim-spoon" = callPackage ({ mkDerivation, base, criterion, ghc-prim, HUnit, QuickCheck , spoon @@ -167532,6 +167985,7 @@ self: { libraryHaskellDepends = [ base category ]; description = "Product category"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "product-isomorphic" = callPackage @@ -170940,15 +171394,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "quickcheck-classes_0_4_9" = callPackage + "quickcheck-classes_0_4_10" = callPackage ({ mkDerivation, aeson, base, bifunctors, containers, primitive , QuickCheck, semigroupoids, semigroups, tagged, transformers , vector }: mkDerivation { pname = "quickcheck-classes"; - version = "0.4.9"; - sha256 = "1m5qszs50hjfycds84arfcfqj7z4l622479bd2w55vin49mp12pn"; + version = "0.4.10"; + sha256 = "1x01746853wbfrfry807gva15wn02jcd0cfqbag7f5xm1fd8nlss"; libraryHaskellDepends = [ aeson base bifunctors containers primitive QuickCheck semigroupoids semigroups tagged transformers @@ -171189,6 +171643,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-state-machine-distributed" = callPackage + ({ mkDerivation, base, binary, containers, directory + , distributed-process, mtl, network-transport + , network-transport-tcp, QuickCheck, random, stm, strict, tasty + , tasty-quickcheck, temporary + }: + mkDerivation { + pname = "quickcheck-state-machine-distributed"; + version = "0.0.1"; + sha256 = "0451xx4c3698nk3c2jhq7xmc0nnaxlj422i30sh7cgyrfrbdw9wj"; + libraryHaskellDepends = [ + base binary containers distributed-process mtl network-transport + network-transport-tcp QuickCheck random stm + ]; + testHaskellDepends = [ + base binary containers directory distributed-process mtl + network-transport network-transport-tcp QuickCheck random stm + strict tasty tasty-quickcheck temporary + ]; + homepage = "https://github.com/advancedtelematic/quickcheck-state-machine-distributed#readme"; + description = "Test monadic programs using state machine based models"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "quickcheck-string-random" = callPackage ({ mkDerivation, base, QuickCheck, string-random, tasty , tasty-quickcheck, text @@ -172213,6 +172691,7 @@ self: { libraryHaskellDepends = [ base primitive transformers util ]; description = "Class of random value generation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "random-derive" = callPackage @@ -173557,8 +174036,8 @@ self: { ({ mkDerivation, base, doctest, reactive-banana, stm, time }: mkDerivation { pname = "reactive-banana-automation"; - version = "0.1.1"; - sha256 = "0fn3frv0idgdg9faysri7x5nzrxrzhpy41s5nm6v8ckqcnzq7vvv"; + version = "0.3.0"; + sha256 = "1f752kmfmgdx9mhvzljm37vrn18jn7wgz0m4byl3v4npcv502cyr"; libraryHaskellDepends = [ base reactive-banana stm time ]; testHaskellDepends = [ base doctest ]; description = "home (etc) automation using reactive-banana"; @@ -174119,6 +174598,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "record-dot-preprocessor" = callPackage + ({ mkDerivation, base, extra, filepath }: + mkDerivation { + pname = "record-dot-preprocessor"; + version = "0.1"; + sha256 = "1py5bkwxwwq1jjsa16rmjm92hxnil0clim5579h5mizzq47fczrd"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base extra filepath ]; + homepage = "https://github.com/ndmitchell/record-dot-preprocessor#readme"; + description = "Preprocessor to allow record.field syntax"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "record-gl" = callPackage ({ mkDerivation, base, base-prelude, containers, GLUtil, HUnit , linear, OpenGL, record, tagged, template-haskell, test-framework @@ -180329,21 +180822,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "s3-signer_0_4_0_0" = callPackage + "s3-signer_0_5_0_0" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, byteable , bytestring, case-insensitive, cryptohash, http-types, time , utf8-string }: mkDerivation { pname = "s3-signer"; - version = "0.4.0.0"; - sha256 = "1s1l5zj4azbgl0p6w52498d6shc5c0yqnzrbjfz1hh45hh2182qf"; + version = "0.5.0.0"; + sha256 = "1r48j7ni8byzdi0girkj6lf2hp4q85ir2xnqpckzdxd0ppap2dnp"; libraryHaskellDepends = [ base base64-bytestring blaze-builder byteable bytestring case-insensitive cryptohash http-types time utf8-string ]; - testHaskellDepends = [ base blaze-builder bytestring time ]; - doHaddock = false; + testHaskellDepends = [ + base base64-bytestring blaze-builder byteable bytestring + case-insensitive cryptohash http-types time utf8-string + ]; homepage = "https://github.com/dmjio/s3-signer"; description = "Pre-signed Amazon S3 URLs"; license = stdenv.lib.licenses.bsd3; @@ -183655,15 +184150,16 @@ self: { "semirings" = callPackage ({ mkDerivation, base, constrictor, containers, hashable - , integer-gmp, unordered-containers, vector + , integer-gmp, semigroups, transformers, unordered-containers + , vector }: mkDerivation { pname = "semirings"; - version = "0.1.1"; - sha256 = "1vrvid3ix80vwmf7qmp5f1f97nyzkq4a01bxf62kpqlbri2m9mz3"; + version = "0.1.2"; + sha256 = "1fn1hbrnljgx8kdnmk0c01zi1r0pk59cildla9gb6bykqs4rwmws"; libraryHaskellDepends = [ - base constrictor containers hashable integer-gmp - unordered-containers vector + base constrictor containers hashable integer-gmp semigroups + transformers unordered-containers vector ]; homepage = "http://github.com/chessai/semirings"; description = "two monoids as one, in holy haskimony"; @@ -187151,8 +187647,8 @@ self: { }: mkDerivation { pname = "shake-ats"; - version = "1.8.0.2"; - sha256 = "16gmyn1rbfx33dxxkyxrswa8cvjpiq3i2vm59hy4y9lag10nq9xn"; + version = "1.8.0.4"; + sha256 = "036clj4q6rwgzjc3abirir5yqrn78vnj7c5w8p9b82jkrlka8w6g"; libraryHaskellDepends = [ base binary dependency directory hashable hs2ats language-ats lens shake shake-ext text @@ -187186,8 +187682,8 @@ self: { }: mkDerivation { pname = "shake-ext"; - version = "2.11.0.2"; - sha256 = "1wmvk91gfmrd1cqj3k70h3lc2xypiqs2d2dh4xlq97fsqm2kmfmy"; + version = "2.11.0.3"; + sha256 = "0v5n7l3xx1a0y4vvrn0zi61pb3wd41pqh1g3vnq1dr12dhrrx1ac"; libraryHaskellDepends = [ base Cabal cdeps composition-prelude cpphs directory shake template-haskell @@ -195465,6 +195961,7 @@ self: { homepage = "https://github.com/clintonmead/stack-lib#readme"; description = "Wrapper to use stack as a library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack-network" = callPackage @@ -195507,6 +196004,7 @@ self: { homepage = "https://github.com/McGizzle/stack-network#readme"; description = "A program for extending Stack to add distributed capabilities"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack-prism" = callPackage @@ -197817,6 +198315,7 @@ self: { ]; description = "Streaming conversion from/to base64"; license = stdenv.lib.licenses.cc0; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-benchmarks" = callPackage @@ -201410,8 +201909,8 @@ self: { ({ mkDerivation, attoparsec, base, process, text }: mkDerivation { pname = "system-info"; - version = "0.4.0.0"; - sha256 = "1sl1m19ia5n8rws49596lipjzx5q3jn9yjqhjlfs4vvh9rc2dnkh"; + version = "0.4.0.1"; + sha256 = "1v18ds9k7vnvzghpyqkh1ixskf27cb94f9r696982h2vp373zh43"; libraryHaskellDepends = [ attoparsec base process text ]; testHaskellDepends = [ base ]; homepage = "https://github.com/ChaosGroup/system-info"; @@ -201931,34 +202430,37 @@ self: { "taffybar" = callPackage ({ mkDerivation, alsa-mixer, base, cairo, ConfigFile, containers - , dbus, directory, dyre, either, enclosed-exceptions, filepath - , gi-gdk, gi-gdkpixbuf, gi-gdkx11, gi-gtk, glib, gtk-traymanager - , gtk3, haskell-gi-base, HStringTemplate, HTTP, mtl, multimap - , network, network-uri, old-locale, parsec, process, rate-limit - , safe, split, stm, text, time, time-locale-compat, time-units - , transformers, transformers-base, tuple, unix, utf8-string, X11 - , xdg-basedir, xml, xml-helpers, xmonad, xmonad-contrib + , dbus, dbus-hslogger, directory, dyre, either, enclosed-exceptions + , filepath, gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gdkx11, gi-glib + , gi-gtk, glib, gtk-sni-tray, gtk-strut, gtk-traymanager, gtk3 + , haskell-gi, haskell-gi-base, hslogger, HStringTemplate, HTTP, mtl + , multimap, network, network-uri, old-locale, optparse-applicative + , parsec, process, rate-limit, regex-compat, safe, split + , status-notifier-item, stm, text, time, time-locale-compat + , time-units, transformers, transformers-base, tuple, unix + , utf8-string, X11, xdg-basedir, xml, xml-helpers, xmonad + , xmonad-contrib }: mkDerivation { pname = "taffybar"; - version = "1.0.2"; - sha256 = "05061nfnp0m833z1hqz8q6v4gphal03w4prvpfb12vwvsvsvsin9"; - revision = "1"; - editedCabalFile = "02ip0c6fq3ra6zhhq2adxjx8j4w07x19zndkk0jj6jn6kj5qggf3"; + version = "2.0.0"; + sha256 = "1s3nqvsivi4wgi6hi7b3f83r75sl5qp0hsqr0cdwd7s8fqai3wia"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - alsa-mixer base cairo ConfigFile containers dbus directory dyre - either enclosed-exceptions filepath gi-gdk gi-gdkpixbuf gi-gdkx11 - gi-gtk glib gtk-traymanager gtk3 haskell-gi-base HStringTemplate - HTTP mtl multimap network network-uri old-locale parsec process - rate-limit safe split stm text time time-locale-compat time-units + alsa-mixer base cairo ConfigFile containers dbus dbus-hslogger + directory dyre either enclosed-exceptions filepath gi-cairo gi-gdk + gi-gdkpixbuf gi-gdkx11 gi-glib gi-gtk glib gtk-sni-tray gtk-strut + gtk-traymanager gtk3 haskell-gi haskell-gi-base hslogger + HStringTemplate HTTP mtl multimap network network-uri old-locale + parsec process rate-limit regex-compat safe split + status-notifier-item stm text time time-locale-compat time-units transformers transformers-base tuple unix utf8-string X11 xdg-basedir xml xml-helpers xmonad xmonad-contrib ]; - executableHaskellDepends = [ base ]; - homepage = "http://github.com/travitch/taffybar"; + executableHaskellDepends = [ base hslogger optparse-applicative ]; + homepage = "http://github.com/taffybar/taffybar"; description = "A desktop bar similar to xmobar, but with more GUI"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -203769,16 +204271,16 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "teardown_0_4_1_0" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, gauge, rio, tasty + "teardown_0_5_0_0" = callPackage + ({ mkDerivation, base, gauge, prettyprinter, rio, tasty , tasty-hunit, typed-process, unliftio }: mkDerivation { pname = "teardown"; - version = "0.4.1.0"; - sha256 = "1w8yblzn0i8i03bfg97qgq4c6i6l2p04krvwg41q157rcgb91gq0"; + version = "0.5.0.0"; + sha256 = "0p1rjvl36gl4dqpvcjsb06jyiwsxg2qyha8rfdiddljb4ixw1sjh"; libraryHaskellDepends = [ - ansi-wl-pprint base rio typed-process unliftio + base prettyprinter rio typed-process unliftio ]; testHaskellDepends = [ base rio tasty tasty-hunit typed-process unliftio @@ -204775,6 +205277,7 @@ self: { homepage = "http://mbays.freeshell.org/tersmu"; description = "A semantic parser for lojban"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "test-fixture" = callPackage @@ -212608,6 +213111,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "txt" = callPackage + ({ mkDerivation, base, bytestring, deepseq, smallcheck, tasty + , tasty-smallcheck, utf8-string, util + }: + mkDerivation { + pname = "txt"; + version = "0.0.2.1"; + sha256 = "0cdng6qlskycpmr1yxvr25q5j876nji5iw3hlx2xb7n0rvk3ylh5"; + libraryHaskellDepends = [ + base bytestring deepseq utf8-string util + ]; + testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; + description = "Text"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "txt-sushi" = callPackage ({ mkDerivation, base, binary, bytestring, containers, directory , parsec, regex-posix @@ -216712,6 +217232,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Utilities"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "util-plus" = callPackage @@ -217422,14 +217943,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "validity-aeson_0_2_0_0" = callPackage + "validity-aeson_0_2_0_1" = callPackage ({ mkDerivation, aeson, base, validity, validity-scientific , validity-text, validity-unordered-containers, validity-vector }: mkDerivation { pname = "validity-aeson"; - version = "0.2.0.0"; - sha256 = "01ck9kbclrjxbjb7rvr1y95cizbdq5lzdd0xfpbpaf4rfgjd3w56"; + version = "0.2.0.1"; + sha256 = "001smpck69y4bmrzrykjvjnrwjllny83kh1l1c2fyy4zzjw14lpy"; libraryHaskellDepends = [ aeson base validity validity-scientific validity-text validity-unordered-containers validity-vector @@ -219408,6 +219929,28 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "voicebase" = callPackage + ({ mkDerivation, aeson, base, bytestring, HsOpenSSL, http-client + , http-client-openssl, json-autotype, lens, mime-types, options + , text, wreq + }: + mkDerivation { + pname = "voicebase"; + version = "0.1.1.1"; + sha256 = "1nc2cmfmdalggb7f9xw4xrhms31cky478wxxkq50as6bryl3k3q3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring HsOpenSSL http-client http-client-openssl + json-autotype lens mime-types text wreq + ]; + executableHaskellDepends = [ base bytestring mime-types options ]; + testHaskellDepends = [ base ]; + homepage = "https://bitbucket.org/daisee/voicebase"; + description = "Upload audio files to voicebase to get a transcription"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "void" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -219460,6 +220003,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "vpq" = callPackage + ({ mkDerivation, base, primitive, smallcheck, tasty + , tasty-smallcheck, util, vector + }: + mkDerivation { + pname = "vpq"; + version = "0.1.0.0"; + sha256 = "1qa3l71ch96slan8s2zx9wc4ljsl4jgl83m7h0rfb9nd9cawflf7"; + libraryHaskellDepends = [ base primitive util vector ]; + testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; + description = "Priority queue based on vector"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vrpn" = callPackage ({ mkDerivation, base, vrpn }: mkDerivation { @@ -222871,14 +223429,15 @@ self: { }: mkDerivation { pname = "weeder"; - version = "1.0.4"; - sha256 = "0xcqhc09v81ynpfxyqb2nyjypcxw84b7ac7cwmkfwf1i71ixf28q"; - isLibrary = false; + version = "1.0.5"; + sha256 = "0blaknr11j95sxdm6k2pyfmq1f2llg4hdmy24rvjy9jb82d3vrsi"; + isLibrary = true; isExecutable = true; - executableHaskellDepends = [ + libraryHaskellDepends = [ aeson base bytestring cmdargs deepseq directory extra filepath foundation hashable process text unordered-containers vector yaml ]; + executableHaskellDepends = [ base ]; homepage = "https://github.com/ndmitchell/weeder#readme"; description = "Detect dead code"; license = stdenv.lib.licenses.bsd3; @@ -223990,6 +224549,8 @@ self: { pname = "wordchoice"; version = "0.1.2.6"; sha256 = "16x595vv9fbq6j634a8wqnd1agmzbv09372sc99lq1a997crmq2w"; + revision = "1"; + editedCabalFile = "1igc5fc91ilva7yqhcmdsd6yq6q974ybb2hwk856cpqpmas0402j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -224033,21 +224594,21 @@ self: { "wordpass" = callPackage ({ mkDerivation, base, containers, deepseq, directory, filepath - , hflags, random-fu, random-source, text, unix-compat, vector + , optparse-applicative, QuickCheck, text, unix-compat, vector }: mkDerivation { pname = "wordpass"; - version = "1.0.0.7"; - sha256 = "1n6r47ki83xzvms90sxnyqfyqzrs7j705ji2832mf5160xld30r2"; + version = "1.0.0.9"; + sha256 = "0gkcqcfl0n9z94bjg2ajzlwjm55qxsc9yd2q97azw4g2c69sn8lq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers deepseq directory filepath random-fu random-source - text unix-compat vector + base containers deepseq directory filepath optparse-applicative + QuickCheck text unix-compat vector ]; executableHaskellDepends = [ - base containers deepseq directory filepath hflags random-fu - random-source text unix-compat vector + base containers deepseq directory filepath optparse-applicative + QuickCheck text unix-compat vector ]; homepage = "https://github.com/mgajda/wordpass"; description = "Dictionary-based password generator"; @@ -224844,6 +225405,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wuss_1_1_9" = callPackage + ({ mkDerivation, base, bytestring, connection, network, websockets + }: + mkDerivation { + pname = "wuss"; + version = "1.1.9"; + sha256 = "1la0zvdsb1w0k2sj8f9wrnsirljjnbx0a1kalzwalh6d82h2jd9z"; + libraryHaskellDepends = [ + base bytestring connection network websockets + ]; + homepage = "https://github.com/tfausak/wuss#readme"; + description = "Secure WebSocket (WSS) clients"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wx" = callPackage ({ mkDerivation, base, stm, time, wxcore }: mkDerivation { From 4764a6e2e9d375ec7ecba642fe5f2666ca0c6256 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Sat, 5 May 2018 07:33:37 -0400 Subject: [PATCH 158/695] haskell-gi, gi-gdkx11: fix builds The `haskell-gi` build fails its doctests because of a missing library; I'm not 100% convinced that setting it to `dontCheck` is the right thing to do, but I don't have a better idea at the moment. The `gi-gdkx11` build fails because, surprise, Gdk-X11 isn't found; by looking around in my store, I found that that that library seems to live in gtk3 these days; this override is just a stop-gap, though, I've also submitted the change to cabal2nix that I believe will fix the automatic generation of the package in the future. --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8c7ef561f17..84c08aaffdd 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -422,6 +422,9 @@ self: super: { # https://github.com/evanrinehart/mikmod/issues/1 mikmod = addExtraLibrary super.mikmod pkgs.libmikmod; + haskell-gi = dontCheck super.haskell-gi; + gi-gdkx11 = super.gi-gdkx11.override { gdk-x11 = pkgs.gtk3; }; + # https://github.com/basvandijk/threads/issues/10 threads = dontCheck super.threads; From 127de7480e8dfc6c29aae06eb4669bb08c41763e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 6 May 2018 18:05:08 +0200 Subject: [PATCH 159/695] haskell-attoparsec-varword: fix infinite recursion in test dependencies --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 84c08aaffdd..7dc1145411b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -47,12 +47,12 @@ self: super: { hoogleLocal = { packages ? [] }: self.callPackage ./hoogle.nix { inherit packages; }; # Break infinite recursions. + attoparsec-varword = super.attoparsec-varword.override { bytestring-builder-varword = dontCheck self.bytestring-builder-varword; }; clock = dontCheck super.clock; Dust-crypto = dontCheck super.Dust-crypto; hasql-postgres = dontCheck super.hasql-postgres; hspec = super.hspec.override { stringbuilder = dontCheck self.stringbuilder; }; hspec-core = super.hspec-core.override { silently = dontCheck self.silently; temporary = dontCheck self.temporary; }; - hspec-expectations = dontCheck super.hspec-expectations; HTTP = dontCheck super.HTTP; http-streams = dontCheck super.http-streams; From bd7c16e9c3e392950b7e8d7b2574aac170ea735b Mon Sep 17 00:00:00 2001 From: Vladyslav Mykhailichenko Date: Sun, 6 May 2018 21:10:24 +0300 Subject: [PATCH 160/695] iwd: 0.1 -> 0.2 --- pkgs/os-specific/linux/iwd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index a1c577d2bb5..792c7bcb084 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -3,17 +3,17 @@ let ell = fetchgit { url = https://git.kernel.org/pub/scm/libs/ell/ell.git; - rev = "0.4"; - sha256 = "0l203n1jnqa2mcifir8ydxhcvbiwlvk89ailm0lida83l9vdlwpv"; + rev = "0.5"; + sha256 = "0xw53bigh99nhacjb67qs1g145fwls7065l8vsrziwzpkyd5s6a8"; }; in stdenv.mkDerivation rec { name = "iwd-${version}"; - version = "0.1"; + version = "0.2"; src = fetchgit { url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; rev = version; - sha256 = "1f8c6xvcvqw8z78mskynd2fkghggcl7vfz8vxzvpx0fkqcprn5n0"; + sha256 = "0khc017s27n6y6c6wbqhmcghzggnagxbi8j36hl5g73y6s44vx42"; }; nativeBuildInputs = [ From ca9ea31ae1052c7b563e9ab48129dcfc9173fe00 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sun, 6 May 2018 21:09:56 +0200 Subject: [PATCH 161/695] liblapack: 3.4.1 -> 3.8.0 --- .../science/math/liblapack/3.5.0.nix | 64 ------------------- .../science/math/liblapack/default.nix | 7 +- pkgs/top-level/all-packages.nix | 5 +- 3 files changed, 4 insertions(+), 72 deletions(-) delete mode 100644 pkgs/development/libraries/science/math/liblapack/3.5.0.nix diff --git a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix deleted file mode 100644 index 61a45cbab94..00000000000 --- a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - stdenv, - fetchurl, - gfortran, - cmake, - python2, - atlas ? null, - shared ? false -}: -let - atlasMaybeShared = if atlas != null then atlas.override { inherit shared; } - else null; - usedLibExtension = if shared then ".so" else ".a"; - inherit (stdenv.lib) optional optionals concatStringsSep; - inherit (builtins) hasAttr attrNames; - version = "3.5.0"; -in - -stdenv.mkDerivation rec { - name = "liblapack-${version}"; - src = fetchurl { - url = "http://www.netlib.org/lapack/lapack-${version}.tgz"; - sha256 = "0lk3f97i9imqascnlf6wr5mjpyxqcdj73pgj97dj2mgvyg9z1n4s"; - }; - - propagatedBuildInputs = [ atlasMaybeShared ]; - buildInputs = [ gfortran cmake ]; - nativeBuildInputs = [ python2 ]; - - cmakeFlags = [ - "-DUSE_OPTIMIZED_BLAS=ON" - "-DCMAKE_Fortran_FLAGS=-fPIC" - ] - ++ (optionals (atlas != null) [ - "-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}" - "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}" - ]) - ++ (optional shared "-DBUILD_SHARED_LIBS=ON") - # If we're on darwin, CMake will automatically detect impure paths. This switch - # prevents that. - ++ (optional stdenv.isDarwin "-DCMAKE_OSX_SYSROOT:PATH=''") - ; - - doCheck = ! shared; - - checkPhase = " - sed -i 's,^#!.*,#!${python2.interpreter},' lapack_testing.py - ctest - "; - - enableParallelBuilding = true; - - passthru = { - blas = atlas; - }; - - meta = with stdenv.lib; { - inherit version; - description = "Linear Algebra PACKage"; - homepage = http://www.netlib.org/lapack/; - license = licenses.bsd3; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index baf77696b16..c68454fbe4a 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -13,14 +13,14 @@ let usedLibExtension = if shared then ".so" else ".a"; inherit (stdenv.lib) optional optionals concatStringsSep; inherit (builtins) hasAttr attrNames; - version = "3.4.1"; + version = "3.8.0"; in stdenv.mkDerivation rec { name = "liblapack-${version}"; src = fetchurl { - url = "http://www.netlib.org/lapack/lapack-${version}.tgz"; - sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f"; + url = "http://www.netlib.org/lapack/lapack-${version}.tar.gz"; + sha256 = "1xmwi2mqmipvg950gb0rhgprcps8gy8sjm8ic9rgy2qjlv22rcny"; }; propagatedBuildInputs = [ atlasMaybeShared ]; @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { doCheck = ! shared; checkPhase = " - sed -i 's,^#!.*,#!${python2.interpreter},' lapack_testing.py ctest "; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fb532e14c4..f4bc65ad478 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19943,7 +19943,7 @@ with pkgs; # great feature, but it's of limited use with pre-built binaries # coming from a central build farm. tolerateCpuTimingInaccuracy = true; - liblapack = liblapack_3_5_0WithoutAtlas; + liblapack = liblapackWithoutAtlas; withLapack = false; }; @@ -19966,10 +19966,7 @@ with pkgs; # without atlas. Etc. liblapackWithAtlas = callPackage ../development/libraries/science/math/liblapack {}; liblapackWithoutAtlas = liblapackWithAtlas.override { atlas = null; }; - liblapack_3_5_0WithAtlas = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix {}; - liblapack_3_5_0WithoutAtlas = liblapack_3_5_0WithAtlas.override { atlas = null; }; liblapack = liblapackWithAtlas; - liblapack_3_5_0 = liblapack_3_5_0WithAtlas; liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; From c642fce38277c4ebd53067fce348e50f498d0972 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Sun, 6 May 2018 22:03:53 +0200 Subject: [PATCH 162/695] lynx: enable IPv6 support --- pkgs/applications/networking/browsers/lynx/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index 9cad2838a39..2a6abfb945b 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -23,7 +23,10 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; - configureFlags = [ "--enable-widec" ] ++ stdenv.lib.optional sslSupport "--with-ssl"; + configureFlags = [ + "--enable-widec" + "--enable-ipv6" + ] ++ stdenv.lib.optional sslSupport "--with-ssl"; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ nukeReferences ] From b131db5f9b0f9314a2deab3cfd1c1738bd02b67c Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Sun, 6 May 2018 22:04:09 +0200 Subject: [PATCH 163/695] lynx: 2.8.9dev.16 -> 2.8.9dev.17 --- pkgs/applications/networking/browsers/lynx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index 2a6abfb945b..9cdd32d2aae 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -9,14 +9,14 @@ assert sslSupport -> openssl != null; stdenv.mkDerivation rec { name = "lynx-${version}"; - version = "2.8.9dev.16"; + version = "2.8.9dev.17"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/lynx/tarballs/lynx${version}.tar.bz2" "https://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2" ]; - sha256 = "1j0vx871ghkm7fgrafnvd2ml3ywcl8d3gyhq02fhfb851c88lc84"; + sha256 = "1lvfsnrw5mmwrmn1m76q9mx287xwm3h5lg8sv7bcqilc0ywi2f54"; }; enableParallelBuilding = true; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A text-mode web browser"; - homepage = http://lynx.invisible-island.net/; + homepage = https://lynx.invisible-island.net/; license = licenses.gpl2Plus; platforms = platforms.unix; }; From faa0d2fa78310bd6331543d2657d773e9805df3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 6 May 2018 22:13:15 +0200 Subject: [PATCH 164/695] todiff: 0.4.0 -> 0.5.0 --- pkgs/applications/misc/todiff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix index 049a9eff347..6af7fae3497 100644 --- a/pkgs/applications/misc/todiff/default.nix +++ b/pkgs/applications/misc/todiff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "todiff-${version}"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "Ekleog"; repo = "todiff"; rev = version; - sha256 = "0n3sifinwhny651q1v1a6y9ybim1b0nd5s1z26sigjdhdvxckn65"; + sha256 = "0xnqw98nccnkqfdmbkblm897v981rw1fagbi5q895bpwfg0p71lk"; }; - cargoSha256 = "0mxdpn98fvmxrp656vwxvzl9vprz5mvqj7d1hvvs4gsjrsiyp0fy"; + cargoSha256 = "0ih7lw5hbayvc66fjqwga0i7l3sb9qn0m26vnham5li39f5i3rqp"; meta = with stdenv.lib; { description = "Human-readable diff for todo.txt files"; From 300af6677760944a3c27f7bf33a1366c380c3317 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 2 May 2018 04:16:27 +0200 Subject: [PATCH 165/695] gnome3.gdm: fix session chooser We are patching GDM to respect GDM_SESSIONS_DIR environment variable, which we are setting in the GDM module. Previously, we only took care of a single code path, the one that handled session start-up; missing the one obtaining the list of sessions. This commit patches the second code path, and also whitelists the GDM_SESSIONS_DIR so that it can be passed to the greeter. Fixes #34101 --- .../gnome-3/core/gdm/sessions_dir.patch | 39 ++++++++++++++++--- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch index bbc803d49c1..7722e2550bd 100644 --- a/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch +++ b/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch @@ -1,8 +1,17 @@ -diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c -index ff3a1acb..b8705d8f 100644 +--- a/daemon/gdm-launch-environment.c ++++ b/daemon/gdm-launch-environment.c +@@ -126,7 +126,7 @@ + "LC_COLLATE", "LC_MONETARY", "LC_MESSAGES", "LC_PAPER", + "LC_NAME", "LC_ADDRESS", "LC_TELEPHONE", "LC_MEASUREMENT", + "LC_IDENTIFICATION", "LC_ALL", "WINDOWPATH", "XCURSOR_PATH", +- "XDG_CONFIG_DIRS", NULL ++ "XDG_CONFIG_DIRS", "GDM_SESSIONS_DIR", NULL + }; + char *system_data_dirs; + int i; --- a/daemon/gdm-session.c +++ b/daemon/gdm-session.c -@@ -344,6 +344,7 @@ get_system_session_dirs (GdmSession *self) +@@ -345,12 +345,17 @@ char **search_dirs; static const char *x_search_dirs[] = { @@ -10,8 +19,7 @@ index ff3a1acb..b8705d8f 100644 "/etc/X11/sessions/", DMCONFDIR "/Sessions/", DATADIR "/gdm/BuiltInSessions/", -@@ -351,6 +352,10 @@ get_system_session_dirs (GdmSession *self) - NULL + DATADIR "/xsessions/", }; + if (getenv("GDM_SESSIONS_DIR") != NULL) { @@ -21,3 +29,24 @@ index ff3a1acb..b8705d8f 100644 static const char *wayland_search_dir = DATADIR "/wayland-sessions/"; search_array = g_array_new (TRUE, TRUE, sizeof (char *)); +--- a/libgdm/gdm-sessions.c ++++ b/libgdm/gdm-sessions.c +@@ -217,6 +217,7 @@ + { + int i; + const char *xorg_search_dirs[] = { ++ "/var/empty/", + "/etc/X11/sessions/", + DMCONFDIR "/Sessions/", + DATADIR "/gdm/BuiltInSessions/", +@@ -224,6 +225,10 @@ + NULL + }; + ++ if (g_getenv("GDM_SESSIONS_DIR") != NULL) { ++ xorg_search_dirs[0] = g_getenv("GDM_SESSIONS_DIR"); ++ }; ++ + #ifdef ENABLE_WAYLAND_SUPPORT + const char *wayland_search_dirs[] = { + DATADIR "/wayland-sessions/", From 85b5fc7c9854d5b147fca2399d8ca6c3412afa2f Mon Sep 17 00:00:00 2001 From: Alexandre Esteves <2335822+alexfmpe@users.noreply.github.com> Date: Sun, 6 May 2018 22:34:05 +0100 Subject: [PATCH 166/695] xcodeenv: fix typo --- pkgs/development/mobile/xcodeenv/simulate-app.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix index 5f71b599408..04b6f2cbc83 100644 --- a/pkgs/development/mobile/xcodeenv/simulate-app.nix +++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { echo "Please provide a UDID of a simulator:" read udid else - # If a parameter has been provided, consider that a device UDID an use that + # If a parameter has been provided, consider that a device UDID and use that udid="$1" fi From ef8996f15ea2dd5aace0f61f9ab03f3dfa3d4975 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 9 Mar 2018 13:41:55 +0100 Subject: [PATCH 167/695] lib/types: Fix coercedTo check Without this change (coercedTo str toInt int).check "foo" would evaluate to true, even though (coercedTo str toInt int).merge {} [{ value = "foo"; }] will throw an error because "foo" can't be coerced to an int. --- lib/types.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/types.nix b/lib/types.nix index a334db5c724..45b0ae5042c 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -420,7 +420,7 @@ rec { mkOptionType rec { name = "coercedTo"; description = "${finalType.description} or ${coercedType.description}"; - check = x: finalType.check x || coercedType.check x; + check = x: finalType.check x || (coercedType.check x && finalType.check (coerceFunc x)); merge = loc: defs: let coerceVal = val: From b16a69289aae7a8aeb7d0410649764d9d2328e2f Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 4 Apr 2018 16:51:46 +0200 Subject: [PATCH 168/695] lib/types: Add coercedTo unsound tests --- lib/tests/modules.sh | 5 +++++ lib/tests/modules/declare-coerced-value-unsound.nix | 10 ++++++++++ lib/tests/modules/define-value-string-arbitrary.nix | 3 +++ lib/tests/modules/define-value-string-bigint.nix | 3 +++ 4 files changed, 21 insertions(+) create mode 100644 lib/tests/modules/declare-coerced-value-unsound.nix create mode 100644 lib/tests/modules/define-value-string-arbitrary.nix create mode 100644 lib/tests/modules/define-value-string-bigint.nix diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 96a91c0fffb..45fd2d624e1 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -138,6 +138,11 @@ checkConfigOutput "\"42\"" config.value ./declare-coerced-value.nix checkConfigOutput "\"24\"" config.value ./declare-coerced-value.nix ./define-value-string.nix checkConfigError 'The option value .* in .* is not.*string or signed integer.*' config.value ./declare-coerced-value.nix ./define-value-list.nix +# Check coerced value with unsound coercion +checkConfigOutput "12" config.value ./declare-coerced-value-unsound.nix +checkConfigError 'The option value .* in .* is not.*8 bit signed integer.* or string.*' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix +checkConfigError 'unrecognised JSON value' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix + cat < Date: Wed, 4 Apr 2018 16:55:45 +0200 Subject: [PATCH 169/695] lib/types: clear up coercedTo description --- lib/tests/modules.sh | 4 ++-- lib/types.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 45fd2d624e1..c6b3fd912a9 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -136,11 +136,11 @@ checkConfigOutput "true" "$@" ./define-module-check.nix # Check coerced value. checkConfigOutput "\"42\"" config.value ./declare-coerced-value.nix checkConfigOutput "\"24\"" config.value ./declare-coerced-value.nix ./define-value-string.nix -checkConfigError 'The option value .* in .* is not.*string or signed integer.*' config.value ./declare-coerced-value.nix ./define-value-list.nix +checkConfigError 'The option value .* in .* is not.*string or signed integer convertible to it' config.value ./declare-coerced-value.nix ./define-value-list.nix # Check coerced value with unsound coercion checkConfigOutput "12" config.value ./declare-coerced-value-unsound.nix -checkConfigError 'The option value .* in .* is not.*8 bit signed integer.* or string.*' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix +checkConfigError 'The option value .* in .* is not.*8 bit signed integer.* or string convertible to it' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix checkConfigError 'unrecognised JSON value' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix cat < Date: Wed, 4 Apr 2018 17:40:47 +0200 Subject: [PATCH 170/695] lib/types: remove unnecessary coerceFunc assertion --- lib/types.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index 4ee9affcb29..17acb92a944 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -425,10 +425,7 @@ rec { let coerceVal = val: if finalType.check val then val - else let - coerced = coerceFunc val; - in assert finalType.check coerced; coerced; - + else coerceFunc val; in finalType.merge loc (map (def: def // { value = coerceVal def.value; }) defs); getSubOptions = finalType.getSubOptions; getSubModules = finalType.getSubModules; From 6e7f4f99d152fef88ed70654f7946d55d2643fcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Mon, 7 May 2018 00:35:45 +0200 Subject: [PATCH 171/695] manual: Document `types.attrs` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Niklas Hambüchen --- nixos/doc/manual/development/option-types.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index 7969d812473..5cb747e6d9f 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -21,6 +21,15 @@ + + types.attrs + + + + A free-form attribute set. + + + types.bool From d79609ac93662396064454d9f67431ce2b80ca66 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 7 May 2018 01:17:16 +0200 Subject: [PATCH 172/695] firefox-bin: use native notifications --- pkgs/applications/networking/browsers/firefox-bin/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 6b2bb541a3a..eaf304ca9fd 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -28,6 +28,7 @@ , libcanberra-gtk2 , libgnome , libgnomeui +, libnotify , defaultIconTheme , libGLU_combined , nspr @@ -112,6 +113,7 @@ stdenv.mkDerivation { libcanberra-gtk2 libgnome libgnomeui + libnotify libGLU_combined nspr nss From 5855459f49b56a0f4e59a08583be1d1f5d111c47 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 7 May 2018 01:42:37 +0200 Subject: [PATCH 173/695] modules/system/boot/luksroot: remove comment about input_leds for caps lock Since f2a9f9aeab5016d28ab4bcf6da81924ceecdd676, we already load "input_leds", so this comment isn't useful anymore. --- nixos/modules/system/boot/luksroot.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 54dfb53fd30..7ebfdb134d7 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -454,7 +454,6 @@ in ["firewire_ohci" "firewire_core" "firewire_sbp2"]; # Some modules that may be needed for mounting anything ciphered - # Also load input_leds to get caps lock light working (#12456) boot.initrd.availableKernelModules = [ "dm_mod" "dm_crypt" "cryptd" "input_leds" ] ++ luks.cryptoModules # workaround until https://marc.info/?l=linux-crypto-vger&m=148783562211457&w=4 is merged From 4d0ab5d698fcb198c462adedff47e15c4edea36e Mon Sep 17 00:00:00 2001 From: Andrew Scott <3648487+ayyjayess@users.noreply.github.com> Date: Mon, 7 May 2018 00:39:32 +0100 Subject: [PATCH 174/695] polybar: add i3 to path --- pkgs/applications/misc/polybar/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index a3b87fd34f6..05ad3e2a906 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -1,6 +1,6 @@ { cairo, cmake, fetchgit, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig , python2 , stdenv, xcbproto, xcbutil, xcbutilimage, xcbutilrenderutil -, xcbutilwm, xcbutilxrm, fetchpatch +, xcbutilwm, xcbutilxrm, fetchpatch, makeWrapper # optional packages-- override the variables ending in 'Support' to enable or # disable modules @@ -52,8 +52,15 @@ stdenv.mkDerivation rec { (if i3Support || i3GapsSupport then jsoncpp else null) (if i3Support then i3 else null) (if i3GapsSupport then i3-gaps else null) + + (if i3Support || i3GapsSupport then makeWrapper else null) ]; + fixupPhase = if (i3Support || i3GapsSupport) then '' + wrapProgram $out/bin/polybar \ + --prefix PATH : "${if i3Support then i3 else i3-gaps}/bin" + '' else null; + nativeBuildInputs = [ cmake pkgconfig ]; From 2b499afa63f01473a19c7166c1f3750fa45a1bab Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 7 May 2018 03:00:22 +0200 Subject: [PATCH 175/695] wget: 1.19.4 -> 1.19.5 for CVE-2018-0494 --- pkgs/tools/networking/wget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index e2d4712d5bc..5c1636ddb86 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -5,11 +5,11 @@ , openssl ? null }: stdenv.mkDerivation rec { - name = "wget-1.19.4"; + name = "wget-1.19.5"; src = fetchurl { url = "mirror://gnu/wget/${name}.tar.lz"; - sha256 = "16jmcqcasx3q9k4azssryli9qyxfq0sfijw998g8zp58cnwzzh1g"; + sha256 = "0xfaxmlnih7dhkyks5wi4vrn0n1xshmy6gx6fb2k1120sprydyr9"; }; patches = [ From 1eeeceb9c7e52734536a4e10323634d4ada2f27e Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 7 May 2018 03:59:38 +0200 Subject: [PATCH 176/695] nixos/nsd: Allow to configure root zone When trying to run NSD to serve the root zone, one gets the following error message: error: illegal name: '.' This is because the name of the zone is used as the derivation name for building the zone file. However, Nix doesn't allow derivation names starting with a period. So whenever the zone is "." now, the file name generated is "root" instead of ".". I also added an assertion that makes sure the user sets services.nsd.rootServer, otherwise NSD will fail at runtime because it prevents serving the root zone without an explicit compile-time option. Tested this by adding a root zone to the "nsd" NixOS VM test. Signed-off-by: aszlig Cc: @hrdinka, @qknight --- nixos/modules/services/networking/nsd.nix | 14 +++++++++++--- nixos/tests/nsd.nix | 9 +++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index 0b52b1d3e30..fc910e59c32 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -20,6 +20,7 @@ let zoneStats = length (collect (x: (x.zoneStats or null) != null) cfg.zones) > 0; }; + mkZoneFileName = name: if name == "." then "root" else name; nsdEnv = pkgs.buildEnv { name = "nsd-env"; @@ -50,8 +51,9 @@ let }; writeZoneData = name: text: pkgs.writeTextFile { - inherit name text; - destination = "/zones/${name}"; + name = "nsd-zone-${mkZoneFileName name}"; + inherit text; + destination = "/zones/${mkZoneFileName name}"; }; @@ -146,7 +148,7 @@ let zoneConfigFile = name: zone: '' zone: name: "${name}" - zonefile: "${stateDir}/zones/${name}" + zonefile: "${stateDir}/zones/${mkZoneFileName name}" ${maybeString "outgoing-interface: " zone.outgoingInterface} ${forEach " rrl-whitelist: " zone.rrlWhitelist} ${maybeString "zonestats: " zone.zoneStats} @@ -887,6 +889,12 @@ in config = mkIf cfg.enable { + assertions = singleton { + assertion = zoneConfigs ? "." -> cfg.rootServer; + message = "You have a root zone configured. If this is really what you " + + "want, please enable 'services.nsd.rootServer'."; + }; + environment.systemPackages = [ nsdPkg ]; users.extraGroups = singleton { diff --git a/nixos/tests/nsd.nix b/nixos/tests/nsd.nix index ad4d4f82243..c3c91e71b5c 100644 --- a/nixos/tests/nsd.nix +++ b/nixos/tests/nsd.nix @@ -41,6 +41,7 @@ in import ./make-test.nix ({ pkgs, ...} : { { address = "dead:beef::1"; prefixLength = 64; } ]; services.nsd.enable = true; + services.nsd.rootServer = true; services.nsd.interfaces = lib.mkForce []; services.nsd.zones."example.com.".data = '' @ SOA ns.example.com noc.example.com 666 7200 3600 1209600 3600 @@ -55,6 +56,11 @@ in import ./make-test.nix ({ pkgs, ...} : { @ A 9.8.7.6 @ AAAA fedc::bbaa ''; + services.nsd.zones.".".data = '' + @ SOA ns.example.com noc.example.com 666 7200 3600 1209600 3600 + root A 1.8.7.4 + root AAAA acbd::4 + ''; }; }; @@ -86,6 +92,9 @@ in import ./make-test.nix ({ pkgs, ...} : { assertHost($_, "a", "deleg.example.com", qr/address 9.8.7.6$/); assertHost($_, "aaaa", "deleg.example.com", qr/address fedc::bbaa$/); + + assertHost($_, "a", "root", qr/address 1.8.7.4$/); + assertHost($_, "aaaa", "root", qr/address acbd::4$/); }; } ''; From 2f467dd584338fd3315e2bcd4dac7a6f12553024 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 6 May 2018 19:49:06 -0700 Subject: [PATCH 177/695] xmrig: 2.5.3 -> 2.6.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xmrig/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 2.6.1 with grep in /nix/store/wsy4vdhmqcr0mydcgp77dncf2xq906kf-xmrig-2.6.1 - directory tree listing: https://gist.github.com/ff33b30777a95f9fa0654b4da0ae47c2 --- pkgs/applications/misc/xmrig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 88adbfff3b9..9814ec92f02 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xmrig-${version}"; - version = "2.5.3"; + version = "2.6.1"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "1f9z9akgaf27r5hjrsjw0clk47p7igi0slbg7z6c3rvy5q9kq0wp"; + sha256 = "05gd3jl8nvj2b73l4x72rfbbxrkw3r8q1h761ly4z35v4f3lahk8"; }; nativeBuildInputs = [ cmake ]; From 0fb4672113f014abc12f4805aec5288ef6fb2e03 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 6 May 2018 19:52:46 -0700 Subject: [PATCH 178/695] xterm: 332 -> 333 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xterm/versions. These checks were done: - built on NixOS - ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/koi8rxterm -h’ got 0 exit code - ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/koi8rxterm help’ got 0 exit code - ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/uxterm -h’ got 0 exit code - ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/uxterm help’ got 0 exit code - ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/xterm -h’ got 0 exit code - ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/xterm help’ got 0 exit code - ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/.xterm-wrapped -h’ got 0 exit code - ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/.xterm-wrapped help’ got 0 exit code - ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/.koi8rxterm-wrapped -h’ got 0 exit code - ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/.koi8rxterm-wrapped help’ got 0 exit code - ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/.uxterm-wrapped -h’ got 0 exit code - ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/.uxterm-wrapped help’ got 0 exit code - found 333 with grep in /nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333 - directory tree listing: https://gist.github.com/1317219946b26e2c85846fe9e169a9e4 --- pkgs/applications/misc/xterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index bcaf89797b4..8b15b030789 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "xterm-332"; + name = "xterm-333"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${name}.tgz" "https://invisible-mirror.net/archives/xterm/${name}.tgz" ]; - sha256 = "0zdjiik4ravc3zld5c9i2ndrvazjmwiwbgl2c21348762wki2jsx"; + sha256 = "0y7gl26mxw6kwqx9j9mi6lx1lp1v3nrlga19ddn07j2m9q0l479g"; }; buildInputs = From 81fc2c35097f81ecb29a576148486cc1ce5a5bcc Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 7 May 2018 04:33:56 +0200 Subject: [PATCH 179/695] nixos/dhparams: Add a defaultBitSize option This allows to set the default bit size for all the Diffie-Hellman parameters defined in security.dhparams.params and it's particularly useful so that we can set it to a very low value in tests (so it doesn't take ages to generate). Regardless for the use in testing, this also has an impact in production systems if the owner wants to set all of them to a different size than 2048, they don't need to set it individually for every params that are set. I've added a subtest to the "dhparams" NixOS test to ensure this is working properly. Signed-off-by: aszlig --- nixos/modules/security/dhparams.nix | 27 ++++++++++++++++++++++----- nixos/tests/dhparams.nix | 14 ++++++++++++++ 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix index beac125fc6e..e2b84c3e3b3 100644 --- a/nixos/modules/security/dhparams.nix +++ b/nixos/modules/security/dhparams.nix @@ -4,13 +4,15 @@ let inherit (lib) mkOption types; cfg = config.security.dhparams; + bitType = types.addCheck types.int (b: b >= 16) // { + name = "bits"; + description = "integer of at least 16 bits"; + }; + paramsSubmodule = { name, config, ... }: { options.bits = mkOption { - type = types.addCheck types.int (b: b >= 16) // { - name = "bits"; - description = "integer of at least 16 bits"; - }; - default = 2048; + type = bitType; + default = cfg.defaultBitSize; description = '' The bit size for the prime that is used during a Diffie-Hellman key exchange. @@ -70,6 +72,11 @@ in { existing ones won't be cleaned up. Of course this only applies if is true. + + For module implementers:It's recommended + to not set a specific bit size here, so that users can easily + override this by setting + . ''; }; @@ -89,6 +96,16 @@ in { ''; }; + defaultBitSize = mkOption { + type = bitType; + default = 2048; + description = '' + This allows to override the default bit size for all of the + Diffie-Hellman parameters set in + . + ''; + }; + path = mkOption { type = types.str; default = "/var/lib/dhparams"; diff --git a/nixos/tests/dhparams.nix b/nixos/tests/dhparams.nix index da75391e4ce..d11dfeec5d0 100644 --- a/nixos/tests/dhparams.nix +++ b/nixos/tests/dhparams.nix @@ -54,6 +54,13 @@ in import ./make-test.nix { security.dhparams.params.bar2.bits = 19; }; + nodes.generation5 = { + imports = [ common ]; + security.dhparams.defaultBitSize = 30; + security.dhparams.params.foo3 = {}; + security.dhparams.params.bar3 = {}; + }; + testScript = { nodes, ... }: let getParamPath = gen: name: let node = "generation${toString gen}"; @@ -126,5 +133,12 @@ in import ./make-test.nix { 'expr match ${getParamPath 4 "bar2"} ${builtins.storeDir}', ); }; + + ${switchToGeneration 5} + + subtest "check whether defaultBitSize works as intended", sub { + ${assertParamBits 5 "foo3" 30} + ${assertParamBits 5 "bar3" 30} + }; ''; } From a8b7372380725af56c213cdb01893640d5097c16 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 7 May 2018 05:02:41 +0200 Subject: [PATCH 180/695] nixos: Add release notes about dhparams changes This is not only to make users aware of the changes but also to give a heads up to developers which are using the module. Specifically if they rely on security.dhparams.path only. Signed-off-by: aszlig --- nixos/doc/manual/release-notes/rl-1809.xml | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 61f9ec8ba99..acf9db8f3e3 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -77,7 +77,57 @@ following incompatible changes: + The module for has two new options + now: + + + + + + Puts the generated Diffie-Hellman parameters into the Nix store + instead of managing them in a stateful manner in + /var/lib/dhparams. + + + + + + The default bit size to use for the generated Diffie-Hellman + parameters. + + + + + + The path to the actual generated parameter files should now be queried + using + config.security.dhparams.params.name.path + because it might be either in the Nix store or in a directory configured + by . + + + + For developers: + + Module implementers should not set a specific bit size in order to let + users configure it by themselves if they want to have a different bit + size than the default (2048). + + + An example usage of this would be: + +{ config, ... }: + +{ + security.dhparams.params.myservice = {}; + environment.etc."myservice.conf".text = '' + dhparams = ${config.security.dhparams.params.myservice.path} + ''; +} + + + From 834b6049c0a9790a991235f3d725dd2a5a40276e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 6 May 2018 20:45:38 -0700 Subject: [PATCH 181/695] snd: 18.2 -> 18.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/snd/versions. These checks were done: - built on NixOS - ran ‘/nix/store/18mdi0m90asngnmnf313bbkpyyzjs96b-snd-18.3/bin/snd --help’ got 0 exit code - found 18.3 with grep in /nix/store/18mdi0m90asngnmnf313bbkpyyzjs96b-snd-18.3 - directory tree listing: https://gist.github.com/3e3d90a56bba746c97163a9bc00919f2 --- pkgs/applications/audio/snd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 660f342dc9d..cacc6e04429 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-18.2"; + name = "snd-18.3"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "0b0ija3cf2c9sqh3cclk5a7i73vagfkyw211aykfd76w7ibirs3r"; + sha256 = "117sgvdv0a03ys1v27bs99mgzpfm2a7xg6s0q6m1f79jniia12ss"; }; nativeBuildInputs = [ pkgconfig ]; From b917daaf60fbc27f03822ee5e79eae5b34b806fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Lang?= Date: Mon, 7 May 2018 00:42:05 -0300 Subject: [PATCH 182/695] fzf: fix vim plugin patch phase During patch phase, the path to the fzf binary is overwritten in the vim plugin source. The sed expression doing this wasn't working because the fzf code changed in this commit: https://github.com/junegunn/fzf/commit/02ceae15a235de6b5cd2aca9de070fb3fff78e5b making the patch useless. I fixed it and added a check to verify that the plugin was effecively patched to prevent this to happen in the future. --- pkgs/tools/misc/fzf/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 1eb4393c978..d9da04c1fa1 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -23,8 +23,13 @@ buildGoPackage rec { goDeps = ./deps.nix; patchPhase = '' - sed -i -e "s|expand(':h:h').'/bin/fzf'|'$bin/bin/fzf'|" plugin/fzf.vim - sed -i -e "s|expand(':h:h').'/bin/fzf-tmux'|'$bin/bin/fzf-tmux'|" plugin/fzf.vim + sed -i -e "s|expand(':h:h')|'$bin'|" plugin/fzf.vim + + # Original and output files can't be the same + if cmp -s $src/plugin/fzf.vim plugin/fzf.vim; then + echo "Vim plugin patch not applied properly. Aborting" && \ + exit 1 + fi ''; preInstall = '' From 871bffd98f41aa0e9d49fcabf74909b227366581 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 6 May 2018 21:43:10 -0700 Subject: [PATCH 183/695] qutebrowser: 1.2.1 -> 1.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qutebrowser/versions. These checks were done: - built on NixOS - ran ‘/nix/store/nckfqg5crmyrx3aazk6szii42qy7v1g3-qutebrowser-1.3.0/bin/qutebrowser -h’ got 0 exit code - ran ‘/nix/store/nckfqg5crmyrx3aazk6szii42qy7v1g3-qutebrowser-1.3.0/bin/qutebrowser --help’ got 0 exit code - ran ‘/nix/store/nckfqg5crmyrx3aazk6szii42qy7v1g3-qutebrowser-1.3.0/bin/..qutebrowser-wrapped-wrapped -h’ got 0 exit code - ran ‘/nix/store/nckfqg5crmyrx3aazk6szii42qy7v1g3-qutebrowser-1.3.0/bin/..qutebrowser-wrapped-wrapped --help’ got 0 exit code - ran ‘/nix/store/nckfqg5crmyrx3aazk6szii42qy7v1g3-qutebrowser-1.3.0/bin/.qutebrowser-wrapped -h’ got 0 exit code - ran ‘/nix/store/nckfqg5crmyrx3aazk6szii42qy7v1g3-qutebrowser-1.3.0/bin/.qutebrowser-wrapped --help’ got 0 exit code - found 1.3.0 with grep in /nix/store/nckfqg5crmyrx3aazk6szii42qy7v1g3-qutebrowser-1.3.0 - directory tree listing: https://gist.github.com/b9f575b232cde51598aeed723a03f7ec --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 2e31f625f2e..0cebdd62140 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -29,13 +29,13 @@ let in python3Packages.buildPythonApplication rec { name = "qutebrowser-${version}${versionPostfix}"; namePrefix = ""; - version = "1.2.1"; + version = "1.3.0"; versionPostfix = ""; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1svbski378x276033v07jailm81b0i6hxdakbiqkwvgh6hkczrhw"; + sha256 = "159h669x60pfla71zx28wnrik8rvsrw5i8kbd3xccynk6klm3kw3"; }; # Needs tox From 5b3b3a1e83b32246c6093a878b9c299cfc4c3d36 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 6 May 2018 21:51:32 -0700 Subject: [PATCH 184/695] riot-web: 0.14.1 -> 0.14.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/riot-web/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 0.14.2 with grep in /nix/store/zglwk185bfl8x2dmkqpl51801rk58gvi-riot-web-0.14.2 - directory tree listing: https://gist.github.com/eae072ce5bb48e5e8b59f7e04caf5b0d --- .../networking/instant-messengers/riot/riot-web.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index ce558130a6c..4946c065492 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -3,11 +3,11 @@ let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "0.14.1"; + version = "0.14.2"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "08paca7wc135hspkv97bgh2a29hbg8vxv0mrp68mgwscpyrl6vnf"; + sha256 = "1qma49a6lvr9anrry3vbhjhvy06bgapknnvbdljnbb3l9c99nmxi"; }; installPhase = '' From cfdcc03feb7c22d6dffc55f7f9f6f0a611624077 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 6 May 2018 22:00:49 -0700 Subject: [PATCH 185/695] qbittorrent: 4.0.4 -> 4.1.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qbittorrent/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 4.1.0 with grep in /nix/store/dyvbm73pl2qs0khv1yzyfsxsyf8kx7yi-qbittorrent-4.1.0 - directory tree listing: https://gist.github.com/a5b770d088c453aa2a25dc90cfc3c348 --- pkgs/applications/networking/p2p/qbittorrent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 90d68a96e5c..b2e9333beb3 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "qbittorrent-${version}"; - version = "4.0.4"; + version = "4.1.0"; src = fetchurl { url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; - sha256 = "13sw0sdw2agm49plp9xvkg6wva274drpvgz76dqj4j2kfxx9s2jk"; + sha256 = "0fdr74sc31x421sb69vlgal1hxpccjxxk8hrrzz9f5bg4jv895pw"; }; nativeBuildInputs = [ pkgconfig which ]; From a600e0c8a5f498a6518603a4495cc0fc38d826e7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 29 Apr 2018 05:57:32 +0000 Subject: [PATCH 186/695] ocaml: default to 4.06 on aarch64 (since 4.05 is broken there) --- pkgs/top-level/ocaml-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 92f772bb25e..bce2662abfd 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1043,5 +1043,10 @@ in rec ocamlPackages_latest = ocamlPackages_4_06; - ocamlPackages = ocamlPackages_4_05; + ocamlPackages = + # OCaml 4.05 is broken on aarch64 + if system == "aarch64-linux" then + ocamlPackages_4_06 + else + ocamlPackages_4_05; } From abea0c6eebb427df3950e0c2f36c62b4e111a62a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 30 Apr 2018 09:52:30 +0000 Subject: [PATCH 187/695] jbuilder: 1.0+beta17 -> 1.0+beta20 --- pkgs/development/tools/ocaml/jbuilder/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/jbuilder/default.nix b/pkgs/development/tools/ocaml/jbuilder/default.nix index d48bc410111..38fd4323d5c 100644 --- a/pkgs/development/tools/ocaml/jbuilder/default.nix +++ b/pkgs/development/tools/ocaml/jbuilder/default.nix @@ -2,16 +2,18 @@ stdenv.mkDerivation rec { name = "jbuilder-${version}"; - version = "1.0+beta17"; + version = "1.0+beta20"; src = fetchFromGitHub { owner = "ocaml"; repo = "dune"; rev = "${version}"; - sha256 = "04pyry459hp2r2s9m5xkcq1glzp20ddz5wb1w8nzp3zgygy0431x"; + sha256 = "0571lzm8caq6wnia7imgy4a27x5l2bvxiflg0jrwwml0ylnii65f"; }; buildInputs = [ ocaml ]; + dontAddPrefix = true; + installPhase = "${opam}/bin/opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; preFixup = "rm -rf $out/jbuilder"; From e973188bcc9f35dbd12f00c0ef5dd9240da1d9d3 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 7 May 2018 00:16:50 -0500 Subject: [PATCH 188/695] souffle: fix on darwin Fixes #39854 --- pkgs/development/compilers/souffle/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index 5289540e944..099a591b407 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, boost, bison, flex, openjdk, doxygen, perl, graphviz, libtool, lsb-release, ncurses, zlib, sqlite }: +{ stdenv, fetchFromGitHub +, boost, bison, flex, openjdk, doxygen +, perl, graphviz, libtool, ncurses, zlib, sqlite +, autoreconfHook }: stdenv.mkDerivation rec { version = "1.2.0"; @@ -11,12 +14,10 @@ stdenv.mkDerivation rec { sha256 = "1g8yvm40h102mab8lacpl1cwgqsw1js0s1yn4l84l9fjdvlh2ygd"; }; + nativeBuildInputs = [ autoreconfHook bison flex ]; + buildInputs = [ - autoconf automake boost bison flex openjdk - # Used for 1.2.0 - libtool lsb-release ncurses zlib sqlite - # Used for docs - doxygen perl graphviz + boost openjdk ncurses zlib sqlite doxygen perl graphviz ]; patchPhase = '' @@ -29,8 +30,6 @@ stdenv.mkDerivation rec { # for boost and failing there, so we tell it what's what here. configureFlags = [ "--with-boost-libdir=${boost}/lib" ]; - preConfigure = "./bootstrap"; - meta = with stdenv.lib; { description = "A translator of declarative Datalog programs into the C++ language"; homepage = "http://souffle-lang.github.io/"; From 3b4ee14a834d791b07f1b597317cce5762cd568a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 6 May 2018 22:49:59 -0700 Subject: [PATCH 189/695] pspg: 1.1.0 -> 1.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pspg/versions. These checks were done: - built on NixOS - ran ‘/nix/store/g5s0d7h461nd55hnzp5k6v74dlfcz6dh-pspg-1.1.1/bin/pspg --help’ got 0 exit code - ran ‘/nix/store/g5s0d7h461nd55hnzp5k6v74dlfcz6dh-pspg-1.1.1/bin/pspg -V’ and found version 1.1.1 - ran ‘/nix/store/g5s0d7h461nd55hnzp5k6v74dlfcz6dh-pspg-1.1.1/bin/pspg --version’ and found version 1.1.1 - found 1.1.1 with grep in /nix/store/g5s0d7h461nd55hnzp5k6v74dlfcz6dh-pspg-1.1.1 - directory tree listing: https://gist.github.com/ba99487fab26f86a314d4a727749a490 --- pkgs/tools/misc/pspg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index ddd76a344e0..0a261671872 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pspg-${version}"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "okbob"; repo = "pspg"; rev = "${version}"; - sha256 = "10r6jfcqw4wclp84f07g3bda844csgm4sh7cjsnk2smmal7nhybs"; + sha256 = "19jiixanyghasd2awkxx7c224fz01d9v0c4qxn4msvkny39m3gz9"; }; nativeBuildInputs = [ pkgconfig ]; From 9389f3f8b3c8acc4adb5535da8fb76320693ae89 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 6 May 2018 23:05:28 -0700 Subject: [PATCH 190/695] osinfo-db: 20180416 -> 20180502 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/osinfo-db/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 20180502 with grep in /nix/store/xsgfilzqf0fkahxgp24ivs90xy8mz6rs-osinfo-db-20180502 - directory tree listing: https://gist.github.com/38c69c0bcc2f185f90e5c56f329dc980 --- pkgs/data/misc/osinfo-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 09c677c35bd..82122335f69 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }: stdenv.mkDerivation rec { - name = "osinfo-db-20180416"; + name = "osinfo-db-20180502"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${name}.tar.xz"; - sha256 = "0qam3qbrwzrz40pikhb8y11lidpb6snsa80ym8s6hp5kh4icr1h6"; + sha256 = "05036mpc5hapx616lfzc67xj157hw3mgyk0arv3brjcx0qmzaram"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; From 716f4ab3a4765295c11f77ff16e7c3b543e9d5b1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 6 May 2018 23:23:35 -0700 Subject: [PATCH 191/695] pdfpc: 4.1 -> 4.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pdfpc/versions. These checks were done: - built on NixOS - ran ‘/nix/store/dvwwb2myl9351rzj9gf2p3x1731d9vnc-pdfpc-4.1.1/bin/pdfpc -h’ got 0 exit code - ran ‘/nix/store/dvwwb2myl9351rzj9gf2p3x1731d9vnc-pdfpc-4.1.1/bin/pdfpc --help’ got 0 exit code - ran ‘/nix/store/dvwwb2myl9351rzj9gf2p3x1731d9vnc-pdfpc-4.1.1/bin/.pdfpc-wrapped -h’ got 0 exit code - ran ‘/nix/store/dvwwb2myl9351rzj9gf2p3x1731d9vnc-pdfpc-4.1.1/bin/.pdfpc-wrapped --help’ got 0 exit code - found 4.1.1 with grep in /nix/store/dvwwb2myl9351rzj9gf2p3x1731d9vnc-pdfpc-4.1.1 - directory tree listing: https://gist.github.com/88ef2cda6a77852e5d7541ebd43e4fec --- pkgs/applications/misc/pdfpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 515127e12eb..f3fd091363f 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "pdfpc"; - version = "4.1"; + version = "4.1.1"; src = fetchFromGitHub { repo = "pdfpc"; owner = "pdfpc"; rev = "v${version}"; - sha256 = "02cp0x5prqrizxdp0sf2sk5ip0363vyw6fxsb3zwyx4dw0vz4g96"; + sha256 = "1yjh9rx49d24wlwg44r2a6b5scybp8l1fi9wyf05sig6zfziw1mm"; }; nativeBuildInputs = [ From ce74ef08c8db63b92c01df3e5c478ae81c2d0e76 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 00:10:39 -0700 Subject: [PATCH 192/695] metabase: 0.28.6 -> 0.29.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/metabase/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - directory tree listing: https://gist.github.com/599c8c50c67bdbbb242bf3136072727a --- pkgs/servers/metabase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index d36810b9f5c..4eae86b00b0 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "metabase-${version}"; - version = "0.28.6"; + version = "0.29.0"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "1dzs57yyx6k93gvyva9y38xdb4pbvdliad3zzgk3vs74fp1zh2vq"; + sha256 = "1dfq06cm8k36pkqpng4cd8ax8cdxbcssww4vapq2w9ccflpnlam2"; }; nativeBuildInputs = [ makeWrapper ]; From 7c8d500825ac1a0294ca7275d2a89345443dd823 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 00:14:33 -0700 Subject: [PATCH 193/695] mbedtls: 2.8.0 -> 2.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mbedtls/versions. These checks were done: - built on NixOS - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_aescrypt2 -h’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_aescrypt2 --help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_aescrypt2 help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_hello -h’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_hello --help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_hello help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_ecdh_curve25519 -h’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_ecdh_curve25519 --help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_ecdh_curve25519 help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_key_app -h’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_key_app --help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_key_app help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_mpi_demo -h’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_mpi_demo --help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_mpi_demo help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_pk_decrypt -h’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_pk_decrypt --help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_pk_decrypt help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_rsa_genkey -h’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_rsa_genkey --help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_rsa_genkey help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_rsa_sign -h’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_rsa_sign --help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_rsa_sign help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_gen_entropy -h’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_gen_entropy --help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_gen_entropy help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_gen_random_ctr_drbg -h’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_gen_random_ctr_drbg --help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_gen_random_ctr_drbg help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_gen_random_havege -h’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_gen_random_havege --help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_gen_random_havege help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_ssl_mail_client -h’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_ssl_mail_client --help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_ssl_mail_client help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_benchmark -h’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_benchmark --help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_benchmark help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_ssl_cert_test -h’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_ssl_cert_test --help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_ssl_cert_test help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_pem2der -h’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_pem2der --help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_pem2der help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_strerror -h’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_strerror --help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_strerror help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_crl_app -h’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_crl_app --help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_crl_app help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_req_app -h’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_req_app --help’ got 0 exit code - ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_req_app help’ got 0 exit code - found 2.9.0 with grep in /nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0 - directory tree listing: https://gist.github.com/fc0f8e7848649388caae66bddc561fb8 --- pkgs/development/libraries/mbedtls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index 8c2a2a694b0..bd10824bfa1 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { - name = "mbedtls-2.8.0"; + name = "mbedtls-2.9.0"; src = fetchFromGitHub { owner = "ARMmbed"; repo = "mbedtls"; rev = name; - sha256 = "1pnwmy0qg8g9lz26fpr5fzpvrdjm59winxpwdjfp6d62qxdjbgmn"; + sha256 = "1pb1my8wwa757hvd06qwidkj58fa1wayf16g98q600xhya5fj3vx"; }; nativeBuildInputs = [ perl ]; From 8d2588fd16b43055ce6be56f36c5a9ff23f86383 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 00:16:15 -0700 Subject: [PATCH 194/695] mypy: 0.590 -> 0.600 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mypy/versions. These checks were done: - built on NixOS - ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.dmypy-wrapped -h’ got 0 exit code - ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.dmypy-wrapped --help’ got 0 exit code - ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.dmypy-wrapped help’ got 0 exit code - ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/dmypy -h’ got 0 exit code - ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/dmypy --help’ got 0 exit code - ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/dmypy help’ got 0 exit code - ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.mypy-wrapped -h’ got 0 exit code - ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.mypy-wrapped --help’ got 0 exit code - ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.mypy-wrapped -V’ and found version 0.600 - ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.mypy-wrapped --version’ and found version 0.600 - ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/mypy -h’ got 0 exit code - ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/mypy --help’ got 0 exit code - ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/mypy -V’ and found version 0.600 - ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/mypy --version’ and found version 0.600 - ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.stubgen-wrapped -h’ got 0 exit code - ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.stubgen-wrapped --help’ got 0 exit code - ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.stubgen-wrapped help’ got 0 exit code - ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/stubgen -h’ got 0 exit code - ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/stubgen --help’ got 0 exit code - ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/stubgen help’ got 0 exit code - found 0.600 with grep in /nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600 - directory tree listing: https://gist.github.com/157118da991905110fee19075e61f99b --- pkgs/development/tools/mypy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/mypy/default.nix b/pkgs/development/tools/mypy/default.nix index fd21a8a23d3..d021f994e49 100644 --- a/pkgs/development/tools/mypy/default.nix +++ b/pkgs/development/tools/mypy/default.nix @@ -2,14 +2,14 @@ buildPythonApplication rec { pname = "mypy"; - version = "0.590"; + version = "0.600"; # Tests not included in pip package. doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "0ynyrrj0wjyw130ay9x1ca88lbhbblp06bfsjrpzbcvp4grgxgq4"; + sha256 = "1pd3kkz435wlvi9fwqbi3xag5zs59jcjqi6c9gzdjdn23friq9dw"; }; propagatedBuildInputs = [ lxml typed-ast psutil ]; From 994307899020df62dc25528961a93ac3359a5370 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Giraudeau Date: Mon, 7 May 2018 09:31:02 +0200 Subject: [PATCH 195/695] blobfuse: 1.0.1-RC-Preview -> 1.0.2 --- pkgs/tools/filesystems/blobfuse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/blobfuse/default.nix b/pkgs/tools/filesystems/blobfuse/default.nix index f847cde98a9..b5694535e94 100644 --- a/pkgs/tools/filesystems/blobfuse/default.nix +++ b/pkgs/tools/filesystems/blobfuse/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "blobfuse-${version}"; - version = "1.0.1-RC-Preview"; + version = "1.0.2"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-fuse"; rev = "v${version}"; - sha256 = "143rxgfmprir4a7frrv8llkv61jxzq50w2v8wn32vx6gl6vci1zs"; + sha256 = "1qh04z1fsj1l6l12sz9yl2sy9hwlrnzac54hwrr7wvsgv90n9gbp"; }; buildInputs = [ curl gnutls libgcrypt libuuid fuse ]; @@ -20,4 +20,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ jbgi ]; platforms = platforms.linux; }; -} +} \ No newline at end of file From 201dd87507d1fe5d77413ae740ce3e96e8df21c4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 01:37:54 -0700 Subject: [PATCH 196/695] mydumper: 0.9.3 -> 0.9.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mydumper/versions. These checks were done: - built on NixOS - ran ‘/nix/store/agcvkgqnz979a024p7brjgrz8cgagsh0-mydumper-0.9.5/bin/mydumper --help’ got 0 exit code - ran ‘/nix/store/agcvkgqnz979a024p7brjgrz8cgagsh0-mydumper-0.9.5/bin/myloader --help’ got 0 exit code - found 0.9.5 with grep in /nix/store/agcvkgqnz979a024p7brjgrz8cgagsh0-mydumper-0.9.5 - directory tree listing: https://gist.github.com/593eb6f7d15a3b04c925f61d0dc068e7 --- pkgs/tools/backup/mydumper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix index da8805bc226..b6c5bfd91fa 100644 --- a/pkgs/tools/backup/mydumper/default.nix +++ b/pkgs/tools/backup/mydumper/default.nix @@ -2,14 +2,14 @@ , glib, zlib, pcre, mysql, libressl }: stdenv.mkDerivation rec { - version = "0.9.3"; + version = "0.9.5"; name = "mydumper-${version}"; src = fetchFromGitHub { owner = "maxbube"; repo = "mydumper"; rev = "v${version}"; - sha256 = "139v6707sxyslg7n1fii8b1ybdq50hbqhc8zf6p1cr3h2hhl6ns9"; + sha256 = "0vbz0ri5hm6yzkrcgnaj8px6bf59myr5dbhyy7fd4cv44hr685k6"; }; nativeBuildInputs = [ cmake pkgconfig ]; From 7169c8a31accf8dc37deff9243f7499d2468924f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 01:42:32 -0700 Subject: [PATCH 197/695] miniupnpd: 2.0.20180422 -> 2.0.20180503 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/miniupnpd/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - directory tree listing: https://gist.github.com/0808e377cf01f4f52c13c600fb4d5e22 --- pkgs/tools/networking/miniupnpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 3a1bba4ce8c..2f907df8dca 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, iptables, libuuid, pkgconfig }: stdenv.mkDerivation rec { - name = "miniupnpd-2.0.20180422"; + name = "miniupnpd-2.0.20180503"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "03g9r519p127sj6rl2x535022bwj8vzvdwp4385v7vnjrd4dswzy"; + sha256 = "031aw66b09ij2yv640xjbp302vkwr8ima5cz7a0951jzhqbfs6xn"; name = "${name}.tar.gz"; }; From a45e8d962b72287a977456d529394d55043de500 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 01:50:49 -0700 Subject: [PATCH 198/695] libofx: 0.9.12 -> 0.9.13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libofx/versions. These checks were done: - built on NixOS - ran ‘/nix/store/3yhk4sd6brh5z7ksmhw9sznflcc3bl8s-libofx-0.9.13/bin/ofx2qif -h’ got 0 exit code - ran ‘/nix/store/3yhk4sd6brh5z7ksmhw9sznflcc3bl8s-libofx-0.9.13/bin/ofx2qif --help’ got 0 exit code - ran ‘/nix/store/3yhk4sd6brh5z7ksmhw9sznflcc3bl8s-libofx-0.9.13/bin/ofx2qif help’ got 0 exit code - ran ‘/nix/store/3yhk4sd6brh5z7ksmhw9sznflcc3bl8s-libofx-0.9.13/bin/ofxdump -h’ got 0 exit code - ran ‘/nix/store/3yhk4sd6brh5z7ksmhw9sznflcc3bl8s-libofx-0.9.13/bin/ofxdump --help’ got 0 exit code - ran ‘/nix/store/3yhk4sd6brh5z7ksmhw9sznflcc3bl8s-libofx-0.9.13/bin/ofxdump help’ got 0 exit code - ran ‘/nix/store/3yhk4sd6brh5z7ksmhw9sznflcc3bl8s-libofx-0.9.13/bin/ofxdump -V’ and found version 0.9.13 - ran ‘/nix/store/3yhk4sd6brh5z7ksmhw9sznflcc3bl8s-libofx-0.9.13/bin/ofxdump --version’ and found version 0.9.13 - found 0.9.13 with grep in /nix/store/3yhk4sd6brh5z7ksmhw9sznflcc3bl8s-libofx-0.9.13 - directory tree listing: https://gist.github.com/408d21f6a77f49bceb283d4730ff7884 --- pkgs/development/libraries/libofx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index 1c8f33d82f7..86166ec608f 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, opensp, pkgconfig, libxml2, curl }: stdenv.mkDerivation rec { - name = "libofx-0.9.12"; + name = "libofx-0.9.13"; src = fetchurl { url = "mirror://sourceforge/libofx/${name}.tar.gz"; - sha256 = "0wvkgffq9qjhjrggg8r1nbhmw65j3lcl4y4cdpmmkrqiz9ia0py1"; + sha256 = "1r60pj1jn269mk4s4025qxllkzgvnbw5r3vby8j2ry5svmygksjp"; }; configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ]; From a6670c01bfa6ca05d29c3246f2f3111d712e6986 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 01:57:17 -0700 Subject: [PATCH 199/695] libcouchbase: 2.8.6 -> 2.8.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libcouchbase/versions. These checks were done: - built on NixOS - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-cat --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-create --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-observe --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-observe-seqno --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-incr --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-decr --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-mcflush --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-hash --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-lock --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-unlock --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-rm --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-stats --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-version -h’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-version --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-version help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-verbosity --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-view --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-n1ql --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-admin --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-admin help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-ping --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-bucket-create --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-bucket-create help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-bucket-delete --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-bucket-delete help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-bucket-flush --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-connstr --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-connstr help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-write-config --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-write-config help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-strerror --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-touch --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-role-list --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-role-list help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-user-list --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-user-list help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-user-upsert --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-user-delete --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-user-delete help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-watch --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-pillowfight --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-n1qlback --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-subdoc --help’ got 0 exit code - ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-proxy --help’ got 0 exit code - found 2.8.7 with grep in /nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7 - directory tree listing: https://gist.github.com/9d8d235fa65642471ef25d1986614fab --- pkgs/development/libraries/libcouchbase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index c3050bf8c67..d6447e449cf 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libcouchbase-${version}"; - version = "2.8.6"; + version = "2.8.7"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "1in0fdl5mgzhwmd8kvniqkizi7isf2g2gvbknfbbdmxkki7a8p95"; + sha256 = "1hx66dlbb3sc3xaj6nsav4rp7qghl9zyv796kxj1sammw9wp98b1"; }; cmakeFlags = "-DLCB_NO_MOCK=ON"; From 1c67dc2f35615d4f3f8bff71f6704db07cfb2357 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 02:08:52 -0700 Subject: [PATCH 200/695] libfm-extra: 1.3.0 -> 1.3.0.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libfm-extra/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 1.3.0.2 with grep in /nix/store/5am33wnj853b12vfyyccsm213yv686kg-libfm-extra-1.3.0.2 - directory tree listing: https://gist.github.com/21b078659a3a745638c69b3d9ef063c4 --- pkgs/development/libraries/libfm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index 01bfe1653fe..ce1d3b138f8 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = if extraOnly then "libfm-extra-${version}" else "libfm-${version}"; - version = "1.3.0"; + version = "1.3.0.2"; src = fetchurl { url = "mirror://sourceforge/pcmanfm/libfm-${version}.tar.xz"; - sha256 = "151jyy8ipmp2h829gd9s4s429qafv1zxl7j6zaj1k1gzm9s5rmnb"; + sha256 = "0wkwbi1nyvqza3r1dhrq846axiiq0fy0dqgngnagh76fjrwnzl0q"; }; nativeBuildInputs = [ pkgconfig ]; From b8e09cdb1e08ca406c4b921b7f21d266bbe6a322 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 02:12:56 -0700 Subject: [PATCH 201/695] lynis: 2.6.3 -> 2.6.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/lynis/versions. These checks were done: - built on NixOS - ran ‘/nix/store/6z5szmm4m9jix1062zrp1m556g75lbwf-lynis-2.6.4/bin/lynis -V’ and found version 2.6.4 - ran ‘/nix/store/6z5szmm4m9jix1062zrp1m556g75lbwf-lynis-2.6.4/bin/lynis --version’ and found version 2.6.4 - ran ‘/nix/store/6z5szmm4m9jix1062zrp1m556g75lbwf-lynis-2.6.4/bin/.lynis-wrapped -V’ and found version 2.6.4 - ran ‘/nix/store/6z5szmm4m9jix1062zrp1m556g75lbwf-lynis-2.6.4/bin/.lynis-wrapped --version’ and found version 2.6.4 - found 2.6.4 with grep in /nix/store/6z5szmm4m9jix1062zrp1m556g75lbwf-lynis-2.6.4 - directory tree listing: https://gist.github.com/bb3a08cde57013b3af4f2511af3cc77c --- pkgs/tools/security/lynis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix index e0a11f57418..56a47ea3874 100644 --- a/pkgs/tools/security/lynis/default.nix +++ b/pkgs/tools/security/lynis/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "lynis"; - version = "2.6.3"; + version = "2.6.4"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "CISOfy"; repo = "${pname}"; rev = "${version}"; - sha256 = "17xfs0jr0rf8xvk860l2wpxg0h1m2c1dq41lqnq6wga9jifxmzqd"; + sha256 = "1p449gsackcavw5h9yn0ckk1fkakx9d55izi22gh8wfvijdfhw10"; }; nativeBuildInputs = [ makeWrapper perl ]; From 69bf313e74bc25245e377c68d4a2e7aea8d775c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 7 May 2018 10:19:16 +0100 Subject: [PATCH 202/695] nodePackages{v6,v8}: update --- .../node-packages/node-packages-v6.nix | 81 ++++++++++--------- .../node-packages/node-packages-v8.nix | 34 ++++---- 2 files changed, 62 insertions(+), 53 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index e50628e014f..27f58d5ad1d 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -3514,13 +3514,13 @@ let sha1 = "8de37f5a300730c305fc3edd9f93348ee8a46288"; }; }; - "bufferutil-3.0.4" = { + "bufferutil-3.0.5" = { name = "bufferutil"; packageName = "bufferutil"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/bufferutil/-/bufferutil-3.0.4.tgz"; - sha512 = "1q344kiig9b8ssskrp7r77kf3xk516bfcjlilgz0a8q5zflz35rnp8im2kx1y9smcp23hw2q1aqsi39i6cb7svzf40a7dk6h4ds54pf"; + url = "https://registry.npmjs.org/bufferutil/-/bufferutil-3.0.5.tgz"; + sha512 = "2b5ha7z8v5gkanyakrbax9k9d00cv9gs2nfnk5g4d16ljmpv40jv3pljawxmnw2jj04z57cqlzbw1w8wr5kyblin8c2jz7a2av09xfi"; }; }; "bufferview-1.0.1" = { @@ -12355,13 +12355,13 @@ let sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1"; }; }; - "iconv-lite-0.4.21" = { + "iconv-lite-0.4.22" = { name = "iconv-lite"; packageName = "iconv-lite"; - version = "0.4.21"; + version = "0.4.22"; src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.21.tgz"; - sha512 = "0myjcmxx7dn5liikg8d2zgwb433sk761dfxwwnszyam16rzv5dzva352jrvav7cnambn0ha8fzh6g6xhdhxsd20l5v1p65r6vvmazhj"; + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.22.tgz"; + sha512 = "1fdqcacbfr3yxs5i2kj9kn06lgx2a9yfrdps0hsmw96p1slawiqp3qyfnqczp570wbbi5sr8valqyll05a5gzj3ahppnkl32waaf26l"; }; }; "iconv-lite-0.4.8" = { @@ -16829,13 +16829,13 @@ let sha512 = "1slngp5z9rczjirv9lpdwiv1ap4xmp28jxl4r0i5hpds1khlm89qp70ziz8k5h2vwjph6srjqi3gb2yrwwsnnwli6p8yxvlyx7nn80p"; }; }; - "minipass-2.2.4" = { + "minipass-2.3.0" = { name = "minipass"; packageName = "minipass"; - version = "2.2.4"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz"; - sha512 = "3r74gps1yd2fabj46qd42hknvpkg4aqwg3cdz8xjn8aqww0rsk3nmbgh8p2h0rkjlpxihg1wnpfa4bmpgmnydlbhpb1rz5dcxcwhdc7"; + url = "https://registry.npmjs.org/minipass/-/minipass-2.3.0.tgz"; + sha512 = "1p0pbj1iwnzb7kkqbh5h0vd6byh1l6na1yx69qmbb0wbmwm0qc5g4hn4z6lr8wkzb4kybvd1hjm4hxd93nrdr8ydbqqd9wd1w9bcq4d"; }; }; "minizlib-1.1.0" = { @@ -17180,6 +17180,15 @@ let sha1 = "5c0a3f29c8ccffbbb1ec941dcec09d71fa32f36a"; }; }; + "mri-1.1.1" = { + name = "mri"; + packageName = "mri"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mri/-/mri-1.1.1.tgz"; + sha1 = "85aa26d3daeeeedf80dc5984af95cc5ca5cad9f1"; + }; + }; "ms-0.1.0" = { name = "ms"; packageName = "ms"; @@ -20445,13 +20454,13 @@ let sha1 = "d9ae0ca85330e03962d93292f95a8b44c2ebf505"; }; }; - "prebuild-install-2.5.3" = { + "prebuild-install-4.0.0" = { name = "prebuild-install"; packageName = "prebuild-install"; - version = "2.5.3"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.5.3.tgz"; - sha512 = "3z8bc2sx9ibs343jllm11azqkcc7vxpf0skfm68dqwz9l59z381vbqip00sgpzg9di2zagjm3wbx65s6g2kg5kj8b1vp0vnqglkgcpy"; + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-4.0.0.tgz"; + sha512 = "2ffx8smnrj269a2r9lsiv4s71rvzhanb3a3hqg1i8daznmhl0w9lfsylh9hw5si1agsmbsn0j2syp8sn9r7cwxm8ps9b80vwv2v5mpf"; }; }; "precond-0.2.3" = { @@ -32480,7 +32489,7 @@ in sources."has-to-string-tag-x-1.4.1" sources."home-or-tmp-2.0.0" sources."hosted-git-info-2.6.0" - sources."iconv-lite-0.4.21" + sources."iconv-lite-0.4.22" (sources."import-jsx-1.3.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -32706,7 +32715,7 @@ in sources."graceful-fs-4.1.11" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."iconv-lite-0.4.21" + sources."iconv-lite-0.4.22" sources."ignore-3.3.8" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" @@ -32889,7 +32898,7 @@ in sources."graceful-fs-4.1.11" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."iconv-lite-0.4.21" + sources."iconv-lite-0.4.22" sources."ignore-3.3.8" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" @@ -34225,7 +34234,7 @@ in sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" - sources."minipass-2.2.4" + sources."minipass-2.3.0" sources."minizlib-1.1.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" @@ -35853,7 +35862,7 @@ in sources."has-flag-3.0.0" sources."has-unicode-2.0.1" sources."hosted-git-info-2.6.0" - sources."iconv-lite-0.4.21" + sources."iconv-lite-0.4.22" sources."imurmurhash-0.1.4" sources."indent-string-2.1.0" sources."inflight-1.0.6" @@ -36087,10 +36096,10 @@ in less = nodeEnv.buildNodePackage { name = "less"; packageName = "less"; - version = "3.0.2"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-3.0.2.tgz"; - sha512 = "1hs3nj50rw6qlk3hjkd6ynhdv7mdlawwl4jzl3d43kbijkych51dm15ccb1ra7i9pmaq13nm24rkzf3bxv3fcpcrqq499cp0lbyg2cj"; + url = "https://registry.npmjs.org/less/-/less-3.0.4.tgz"; + sha512 = "1qmi7lbjfq3w5ygilwf5sagk463c0j6kj2wsidzh6100v02bpfi05c8kbycf395hrdmmy5ffb5f0rsvkvqyhxw9hxrlyvnafc9b4x5b"; }; dependencies = [ sources."ajv-5.5.2" @@ -36150,7 +36159,7 @@ in sources."request-2.85.0" sources."safe-buffer-5.1.2" sources."sntp-2.1.0" - sources."source-map-0.5.7" + sources."source-map-0.6.1" sources."sshpk-1.14.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.4" @@ -36976,7 +36985,7 @@ in sources."mime-db-1.33.0" sources."mime-types-2.1.18" sources."minimist-0.0.8" - sources."minipass-2.2.4" + sources."minipass-2.3.0" sources."minizlib-1.1.0" sources."mkdirp-0.5.1" sources."ncp-0.4.2" @@ -37500,7 +37509,7 @@ in sources."gauge-2.7.4" sources."glob-7.1.2" sources."has-unicode-2.0.1" - sources."iconv-lite-0.4.21" + sources."iconv-lite-0.4.22" sources."ignore-walk-3.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -37509,7 +37518,7 @@ in sources."isarray-1.0.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" - sources."minipass-2.2.4" + sources."minipass-2.3.0" sources."minizlib-1.1.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" @@ -38106,7 +38115,7 @@ in ]; }) sources."mqtt-packet-5.5.0" - sources."mri-1.1.0" + sources."mri-1.1.1" sources."ms-2.0.0" (sources."multer-1.3.0" // { dependencies = [ @@ -38777,7 +38786,7 @@ in sources."hoek-4.2.1" sources."hosted-git-info-2.6.0" sources."https-proxy-agent-2.2.1" - sources."iconv-lite-0.4.21" + sources."iconv-lite-0.4.22" (sources."inquirer-3.3.0" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -40699,7 +40708,7 @@ in sources."esprima-fb-13001.1001.0-dev-harmony-fb" sources."glob-5.0.15" sources."graceful-fs-4.1.11" - sources."iconv-lite-0.4.21" + sources."iconv-lite-0.4.22" sources."inflight-1.0.6" sources."inherits-2.0.3" (sources."jstransform-10.1.0" // { @@ -43025,7 +43034,7 @@ in sources."hawk-6.0.2" sources."hoek-4.2.1" sources."http-signature-1.2.0" - sources."iconv-lite-0.4.21" + sources."iconv-lite-0.4.22" sources."ieee754-1.1.11" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -43766,7 +43775,7 @@ in sources."buffer-fill-0.1.1" sources."buffer-from-1.0.0" sources."buffer-indexof-1.1.1" - (sources."bufferutil-3.0.4" // { + (sources."bufferutil-3.0.5" // { dependencies = [ sources."simple-get-2.8.1" ]; @@ -43895,7 +43904,7 @@ in sources."piece-length-1.0.0" sources."pify-2.3.0" sources."plist-with-patches-0.5.1" - sources."prebuild-install-2.5.3" + sources."prebuild-install-4.0.0" sources."prettier-bytes-1.0.4" sources."process-nextick-args-2.0.0" sources."protobufjs-3.8.2" @@ -44472,7 +44481,7 @@ in sources."http-proxy-agent-2.1.0" sources."http-signature-1.2.0" sources."https-proxy-agent-2.2.1" - sources."iconv-lite-0.4.21" + sources."iconv-lite-0.4.22" sources."ignore-3.3.8" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -45237,7 +45246,7 @@ in sources."http-cache-semantics-3.8.1" sources."http-signature-1.2.0" sources."humanize-string-1.0.2" - sources."iconv-lite-0.4.21" + sources."iconv-lite-0.4.22" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."indent-string-3.2.0" diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index e64364eb68b..cfaa4f0634f 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -3100,13 +3100,13 @@ let sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d"; }; }; - "iconv-lite-0.4.21" = { + "iconv-lite-0.4.22" = { name = "iconv-lite"; packageName = "iconv-lite"; - version = "0.4.21"; + version = "0.4.22"; src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.21.tgz"; - sha512 = "0myjcmxx7dn5liikg8d2zgwb433sk761dfxwwnszyam16rzv5dzva352jrvav7cnambn0ha8fzh6g6xhdhxsd20l5v1p65r6vvmazhj"; + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.22.tgz"; + sha512 = "1fdqcacbfr3yxs5i2kj9kn06lgx2a9yfrdps0hsmw96p1slawiqp3qyfnqczp570wbbi5sr8valqyll05a5gzj3ahppnkl32waaf26l"; }; }; "iconv-lite-0.4.8" = { @@ -4549,13 +4549,13 @@ let sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; - "minipass-2.2.4" = { + "minipass-2.3.0" = { name = "minipass"; packageName = "minipass"; - version = "2.2.4"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz"; - sha512 = "3r74gps1yd2fabj46qd42hknvpkg4aqwg3cdz8xjn8aqww0rsk3nmbgh8p2h0rkjlpxihg1wnpfa4bmpgmnydlbhpb1rz5dcxcwhdc7"; + url = "https://registry.npmjs.org/minipass/-/minipass-2.3.0.tgz"; + sha512 = "1p0pbj1iwnzb7kkqbh5h0vd6byh1l6na1yx69qmbb0wbmwm0qc5g4hn4z6lr8wkzb4kybvd1hjm4hxd93nrdr8ydbqqd9wd1w9bcq4d"; }; }; "minizlib-1.1.0" = { @@ -6646,13 +6646,13 @@ let sha1 = "a4316ccb0d40a77d30dadf91f0f4db7e475f948a"; }; }; - "swagger-test-templates-1.4.3" = { + "swagger-test-templates-1.5.0" = { name = "swagger-test-templates"; packageName = "swagger-test-templates"; - version = "1.4.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-test-templates/-/swagger-test-templates-1.4.3.tgz"; - sha1 = "e047473aec06b938992e427665cafdbb6a01cfc0"; + url = "https://registry.npmjs.org/swagger-test-templates/-/swagger-test-templates-1.5.0.tgz"; + sha512 = "0jmilcls10zf18f7nlcdn29qdf21bl4xsk1kzzayp5h92ljkwx3c9jyy3a3p2yrd6pjnzh0k5c4yih3kbv6nxcd2rpf5vlfm44lg06l"; }; }; "swagger-tools-0.9.16" = { @@ -7635,7 +7635,7 @@ in sources."formidable-1.2.1" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."iconv-lite-0.4.21" + sources."iconv-lite-0.4.22" sources."inherits-2.0.3" (sources."inquirer-3.3.0" // { dependencies = [ @@ -8370,7 +8370,7 @@ in sources."gauge-2.7.4" sources."glob-7.1.2" sources."has-unicode-2.0.1" - sources."iconv-lite-0.4.21" + sources."iconv-lite-0.4.22" sources."ignore-walk-3.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -8379,7 +8379,7 @@ in sources."isarray-1.0.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" - sources."minipass-2.2.4" + sources."minipass-2.3.0" sources."minizlib-1.1.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" @@ -8650,7 +8650,7 @@ in sources."hawk-6.0.2" sources."hoek-4.2.1" sources."http-signature-1.2.0" - sources."iconv-lite-0.4.21" + sources."iconv-lite-0.4.22" sources."ieee754-1.1.11" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -9281,7 +9281,7 @@ in sources."supports-color-2.0.0" sources."swagger-converter-0.2.0" sources."swagger-editor-2.10.5" - (sources."swagger-test-templates-1.4.3" // { + (sources."swagger-test-templates-1.5.0" // { dependencies = [ sources."camelcase-1.2.1" sources."is-extglob-1.0.0" From 639376aff6679e9add23f64089c95944bd2e6b41 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 02:24:49 -0700 Subject: [PATCH 203/695] lean: 3.3.0 -> 3.4.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/lean/versions. These checks were done: - built on NixOS - ran ‘/nix/store/kdbjdracd2m6fv18k9kc5bcmr0p60glx-lean-3.4.1/bin/lean -h’ got 0 exit code - ran ‘/nix/store/kdbjdracd2m6fv18k9kc5bcmr0p60glx-lean-3.4.1/bin/lean --help’ got 0 exit code - ran ‘/nix/store/kdbjdracd2m6fv18k9kc5bcmr0p60glx-lean-3.4.1/bin/leanpkg help’ got 0 exit code - found 3.4.1 with grep in /nix/store/kdbjdracd2m6fv18k9kc5bcmr0p60glx-lean-3.4.1 - directory tree listing: https://gist.github.com/198504c00746718749b3019653fe78fd --- pkgs/applications/science/logic/lean/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 095aa5a7f8c..16fdab59ea0 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lean-${version}"; - version = "3.3.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean"; rev = "v${version}"; - sha256 = "0irh9b4haz0pzzxrb4hwcss91a0xb499kjrcrmr2s59p3zq8bbd9"; + sha256 = "0ww8azlyy3xikhd7nh96f507sg23r53zvayij1mwv5513vmblhhw"; }; nativeBuildInputs = [ cmake ]; From 0e5d6a6644f63ab910cb1103b075148cce6e70d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 7 May 2018 10:28:09 +0100 Subject: [PATCH 204/695] nodePackages.imapnotify: init at 0.4.1 fixes #38025 #37179 --- .../node-packages/node-packages-v6.json | 1 + .../node-packages/node-packages-v6.nix | 80 +++++++++++++++++++ 2 files changed, 81 insertions(+) diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index 9b19a4f5a62..4e9d9e71e8d 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -38,6 +38,7 @@ , "ionic" , "ios-deploy" , "istanbul" +, "imapnotify" , "javascript-typescript-langserver" , "jayschema" , "jsdoc" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 27f58d5ad1d..039401c822f 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -20553,6 +20553,15 @@ let sha512 = "2x2535hml3hmhh6qbsl9r97mpa264mbpvmv0lbsqsfkv3sfd8wv7zw1b68555qsj5c6ma4b66qkgdsrr6355lhbmz052hqzq2qx082h"; }; }; + "printf-0.2.5" = { + name = "printf"; + packageName = "printf"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/printf/-/printf-0.2.5.tgz"; + sha1 = "c438ca2ca33e3927671db4ab69c0e52f936a4f0f"; + }; + }; "private-0.1.8" = { name = "private"; packageName = "private"; @@ -28699,6 +28708,15 @@ let sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4"; }; }; + "xenvar-0.5.1" = { + name = "xenvar"; + packageName = "xenvar"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xenvar/-/xenvar-0.5.1.tgz"; + sha1 = "f82d2fedee63af76687b70115ce6274dc71310e9"; + }; + }; "xhr-2.4.1" = { name = "xhr"; packageName = "xhr"; @@ -34461,6 +34479,68 @@ in production = true; bypassCache = false; }; + imapnotify = nodeEnv.buildNodePackage { + name = "imapnotify"; + packageName = "imapnotify"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/imapnotify/-/imapnotify-0.4.1.tgz"; + sha512 = "0fn58ydrck0mwpq48pj2in6aql522avzyabrddq4ixykr1h29ha3cvh1v0mga8ghg1v9zpkii81qqac74qwm9ikr1kll616fcz0cc0s"; + }; + dependencies = [ + sources."async-0.2.10" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."bunyan-1.8.12" + sources."colors-0.6.2" + sources."concat-map-0.0.1" + sources."core-util-is-1.0.2" + sources."cycle-1.0.3" + sources."dtrace-provider-0.8.6" + sources."eyes-0.1.8" + sources."glob-6.0.4" + sources."imap-0.8.19" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."isarray-0.0.1" + sources."isstream-0.1.2" + sources."minimatch-3.0.4" + sources."minimist-0.0.10" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."moment-2.22.1" + sources."mv-2.1.1" + sources."nan-2.10.0" + sources."ncp-2.0.0" + sources."once-1.4.0" + sources."optimist-0.6.1" + sources."path-is-absolute-1.0.1" + sources."pkginfo-0.3.1" + sources."printf-0.2.5" + sources."readable-stream-1.1.14" + sources."rimraf-2.4.5" + sources."safe-json-stringify-1.1.0" + sources."semver-5.3.0" + sources."stack-trace-0.0.10" + sources."string_decoder-0.10.31" + sources."utf7-1.0.2" + sources."winston-0.8.3" + sources."wordwrap-0.0.3" + sources."wrappy-1.0.2" + sources."xenvar-0.5.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Execute scripts on new messages using IDLE imap command"; + homepage = "https://github.com/a-sk/node-imapnotify#readme"; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; javascript-typescript-langserver = nodeEnv.buildNodePackage { name = "javascript-typescript-langserver"; packageName = "javascript-typescript-langserver"; From d3a8e055386bae4e0113e86adb11fe8bcabff854 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 02:28:31 -0700 Subject: [PATCH 205/695] libraw: 0.18.9 -> 0.18.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libraw/versions. These checks were done: - built on NixOS - ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/raw-identify -h’ got 0 exit code - ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/raw-identify --help’ got 0 exit code - ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/raw-identify help’ got 0 exit code - ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/unprocessed_raw -h’ got 0 exit code - ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/unprocessed_raw --help’ got 0 exit code - ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/unprocessed_raw help’ got 0 exit code - ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/4channels -h’ got 0 exit code - ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/4channels --help’ got 0 exit code - ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/4channels help’ got 0 exit code - ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/simple_dcraw -h’ got 0 exit code - ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/simple_dcraw --help’ got 0 exit code - ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/simple_dcraw help’ got 0 exit code - ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/mem_image -h’ got 0 exit code - ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/mem_image --help’ got 0 exit code - ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/mem_image help’ got 0 exit code - ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/dcraw_half -h’ got 0 exit code - ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/dcraw_half --help’ got 0 exit code - ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/dcraw_half help’ got 0 exit code - ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/half_mt -h’ got 0 exit code - ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/half_mt --help’ got 0 exit code - ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/half_mt help’ got 0 exit code - ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/multirender_test -h’ got 0 exit code - ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/multirender_test --help’ got 0 exit code - ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/multirender_test help’ got 0 exit code - ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/postprocessing_benchmark -h’ got 0 exit code - ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/postprocessing_benchmark help’ got 0 exit code - ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/dcraw_emu -h’ got 0 exit code - ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/dcraw_emu help’ got 0 exit code - found 0.18.10 with grep in /nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10 - directory tree listing: https://gist.github.com/8de105fd367301af8971e9bc3012a0d3 --- pkgs/development/libraries/libraw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 4ad2f7ba34d..1213f93112f 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libraw-${version}"; - version = "0.18.9"; + version = "0.18.10"; src = fetchurl { url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz"; - sha256 = "0kmjfdr409k9q9n17k9ywims5z4kqc16s81ba7y09n7669q1gvyj"; + sha256 = "0klrzg1cn8ksxqbhx52dldi5bbmad190npnhhgkyr2jzpgrbpj88"; }; outputs = [ "out" "lib" "dev" "doc" ]; From f343efcf9bb1b8c0a8c44b3417cfd52eb4d71565 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 7 May 2018 10:30:25 +0100 Subject: [PATCH 206/695] nodePackages.elm-oracle: init at 1.1.1 fixes #38353 #31036 --- .../node-packages/node-packages-v6.json | 1 + .../node-packages/node-packages-v6.nix | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index 4e9d9e71e8d..5f18a286ad7 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -19,6 +19,7 @@ , "dnschain" , "docker-registry-server" , "elasticdump" +, "elm-oracle" , "elm-test" , "emoj" , "eslint" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 039401c822f..66a016ceb51 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -32223,6 +32223,23 @@ in production = true; bypassCache = false; }; + elm-oracle = nodeEnv.buildNodePackage { + name = "elm-oracle"; + packageName = "elm-oracle"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/elm-oracle/-/elm-oracle-1.1.1.tgz"; + sha1 = "61f6d783221b4ad08e7d101d678b9d5a67d3961c"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Query for information about values in elm source files."; + homepage = "https://github.com/ElmCast/elm-oracle#readme"; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = false; + }; elm-test = nodeEnv.buildNodePackage { name = "elm-test"; packageName = "elm-test"; From d813ba2dbf86042d98abf472ead0c251c7a15d73 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 02:43:51 -0700 Subject: [PATCH 207/695] libx86emu: 1.12 -> 1.14 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libx86emu/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - directory tree listing: https://gist.github.com/1727e070918ad2877736d62030608e9a --- pkgs/development/libraries/libx86emu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix index b745098bd64..bbaa6b08961 100644 --- a/pkgs/development/libraries/libx86emu/default.nix +++ b/pkgs/development/libraries/libx86emu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libx86emu-${version}"; - version = "1.12"; + version = "1.14"; src = fetchFromGitHub { owner = "wfeldt"; repo = "libx86emu"; rev = version; - sha256 = "0dlzvwdkk0vc6qf0a0zzbxki3pig1mda8p3fa54rxqaxkwp4mqr6"; + sha256 = "120a01jrrd4rwwjfr5f612xq9hbh35c87a6wnqn7zzw3fqydc2lw"; }; nativeBuildInputs = [ perl ]; From f08e06ba2f955d7c900b6c0a18ad0102db363871 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 02:44:50 -0700 Subject: [PATCH 208/695] libcue: 2.2.0 -> 2.2.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libcue/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 2.2.1 with grep in /nix/store/lqppvr2arq1jmmdil3519c2y7hhm0vq3-libcue-2.2.1 - directory tree listing: https://gist.github.com/49da59ef9dfe640d50f9bc6ee72a7457 --- pkgs/development/libraries/libcue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix index fb0f0d3d3f9..dbc5f1cf4ec 100644 --- a/pkgs/development/libraries/libcue/default.nix +++ b/pkgs/development/libraries/libcue/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libcue-${version}"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "lipnitsk"; repo = "libcue"; rev = "v${version}"; - sha256 = "0znn9scamy1nsz1dzvsamqg46zr7ldfvpxiyzi1ss9d6gbcm0frs"; + sha256 = "1iqw4n01rv2jyk9lksagyxj8ml0kcfwk67n79zy1r6zv1xfp5ywm"; }; nativeBuildInputs = [ cmake bison flex ]; From fe89c1be0308390918f0b4efd384ee9be59d5c3e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 03:01:21 -0700 Subject: [PATCH 209/695] hwdata: 0.311 -> 0.312 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/hwdata/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 0.312 with grep in /nix/store/sfzsz7mns2n1kj0s9wdhv38s5xm0a1c3-hwdata-0.312 - directory tree listing: https://gist.github.com/7c5e5f17dc28268564e6ebf71204803d --- pkgs/os-specific/linux/hwdata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 15b3903ddd1..070ddfd7778 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "hwdata-${version}"; - version = "0.311"; + version = "0.312"; src = fetchurl { - url = "https://github.com/vcrhonek/hwdata/archive/v0.311.tar.gz"; - sha256 = "159av9wvl3biryxd5pgqcwz6wkdaa0ydmcysmzznx939mfv7w18z"; + url = "https://github.com/vcrhonek/hwdata/archive/v0.312.tar.gz"; + sha256 = "04dbxfn40b8vyw49qpkslv20akbqm5hwl3cndmqacp6cik1l0gai"; }; preConfigure = "patchShebangs ./configure"; From e3261386ba07a8db1d015a2d8654d89c793d1760 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 03:15:08 -0700 Subject: [PATCH 210/695] hiawatha: 10.7 -> 10.8.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/hiawatha/versions. These checks were done: - built on NixOS - ran ‘/nix/store/pk9y5j3rn2kh3jyh6shf16x7fwif5j8b-hiawatha-10.8.1/bin/ssi-cgi -h’ got 0 exit code - ran ‘/nix/store/pk9y5j3rn2kh3jyh6shf16x7fwif5j8b-hiawatha-10.8.1/bin/ssi-cgi -v’ and found version 10.8.1 - ran ‘/nix/store/pk9y5j3rn2kh3jyh6shf16x7fwif5j8b-hiawatha-10.8.1/bin/hiawatha -h’ got 0 exit code - ran ‘/nix/store/pk9y5j3rn2kh3jyh6shf16x7fwif5j8b-hiawatha-10.8.1/bin/wigwam -h’ got 0 exit code - ran ‘/nix/store/pk9y5j3rn2kh3jyh6shf16x7fwif5j8b-hiawatha-10.8.1/bin/wigwam -v’ and found version 10.8.1 - found 10.8.1 with grep in /nix/store/pk9y5j3rn2kh3jyh6shf16x7fwif5j8b-hiawatha-10.8.1 - directory tree listing: https://gist.github.com/bed64b3bf49236cbbfafddbb1f63c00a --- pkgs/servers/http/hiawatha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix index 99900bbdb3e..277fa06a707 100644 --- a/pkgs/servers/http/hiawatha/default.nix +++ b/pkgs/servers/http/hiawatha/default.nix @@ -12,11 +12,11 @@ assert enableSSL -> openssl !=null; stdenv.mkDerivation rec { name = "hiawatha-${version}"; - version = "10.7"; + version = "10.8.1"; src = fetchurl { url = "https://github.com/hsleisink/hiawatha/archive/v${version}.tar.gz"; - sha256 = "1k0vgpfkmdxmkimq4ab70cqwhj5qwr4pzq7nnv957ah8cw2ijy1z"; + sha256 = "1f2hlw2lp98b4dx87i7pz7h66vsy2g22b5adfrlij3kj0vfv61w8"; }; buildInputs = [ cmake libxslt zlib libxml2 ] ++ stdenv.lib.optional enableSSL openssl ; From ee95ed11ca1e0df43caf927adb2287bbd7eeeb3a Mon Sep 17 00:00:00 2001 From: Wanja Chresta Date: Mon, 7 May 2018 12:18:06 +0200 Subject: [PATCH 211/695] tamarin-prover: Fix compile issues --- .../science/logic/tamarin-prover/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index 7a9dcc23192..4461fa675e8 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -8,8 +8,8 @@ let src = fetchFromGitHub { owner = "tamarin-prover"; repo = "tamarin-prover"; - rev = "120c7e706f3e1d4646b233faf2bc9936834ed9d3"; - sha256 = "064blwjjwnkycwgsrdn1xkjya976wndpz9h5pjmgjqqirinc8c5x"; + rev = "ab8a155452e9e9c57ccb4bbe1b94d7677ea5ce21"; + sha256 = "02ycxxkcpc0dzybaq63viciydq1ik8wiv2blk8mvnz3ssxw3sjik"; }; # tamarin has its own dependencies, but they're kept inside the repo, @@ -65,6 +65,15 @@ mkDerivation (common "tamarin-prover" src // { enableSharedExecutables = false; postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc"; + # Fix problem with MonadBaseControl not being found + patchPhase = '' + sed -ie 's,\(import *\)Control\.Monad$,&\ + \1Control.Monad.Trans.Control,' src/Web/Handler.hs + + sed -ie 's~\( *, \)mtl~&\ + \1monad-control~' tamarin-prover.cabal + ''; + # wrap the prover to be sure it can find maude, sapic, etc executableToolDepends = [ makeWrapper which maude graphviz sapic ]; postInstall = '' @@ -79,7 +88,7 @@ mkDerivation (common "tamarin-prover" src // { executableHaskellDepends = (with haskellPackages; [ base binary binary-orphans blaze-builder blaze-html bytestring - cmdargs conduit containers deepseq directory fclabels file-embed + cmdargs conduit containers monad-control deepseq directory fclabels file-embed filepath gitrev http-types HUnit lifted-base mtl parsec process resourcet safe shakespeare tamarin-prover-term template-haskell text threads time wai warp yesod-core yesod-static From 9ee600a06f600c91bc5afa90ff58e598ea7f0797 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 03:18:20 -0700 Subject: [PATCH 212/695] insomnia: 5.16.1 -> 5.16.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/insomnia/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 5.16.2 with grep in /nix/store/9jcvxvs1y2jycaq8n26zidh7y3shicp0-insomnia-5.16.2 - directory tree listing: https://gist.github.com/a02ce6405af5678bfbbd0fd9a116e95e --- pkgs/development/web/insomnia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 4e5596fee66..6d1eb0dbe3e 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -15,11 +15,11 @@ let runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl nghttp2 ]; in stdenv.mkDerivation rec { name = "insomnia-${version}"; - version = "5.16.1"; + version = "5.16.2"; src = fetchurl { url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb"; - sha256 = "0r1l7pfcnif8vw9jnxbh5p9sih6wvgjpx8rpfmnvw21pr8cm0zyp"; + sha256 = "1sjcbi45n10lf69a48447lfbxxjib7v2isshaykz43qqasqqrd18"; }; nativeBuildInputs = [ makeWrapper dpkg ]; From 941b2a17cbc27535d65628f1a48731b9b3648619 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 03:41:32 -0700 Subject: [PATCH 213/695] gnuplot: 5.2.2 -> 5.2.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gnuplot/versions. These checks were done: - built on NixOS - ran ‘/nix/store/3kixi49gqbpjnkrgdavmzkbsg7aaw51p-gnuplot-5.2.3/bin/gnuplot -h’ got 0 exit code - ran ‘/nix/store/3kixi49gqbpjnkrgdavmzkbsg7aaw51p-gnuplot-5.2.3/bin/gnuplot --help’ got 0 exit code - ran ‘/nix/store/3kixi49gqbpjnkrgdavmzkbsg7aaw51p-gnuplot-5.2.3/bin/.gnuplot-wrapped -h’ got 0 exit code - ran ‘/nix/store/3kixi49gqbpjnkrgdavmzkbsg7aaw51p-gnuplot-5.2.3/bin/.gnuplot-wrapped --help’ got 0 exit code - found 5.2.3 with grep in /nix/store/3kixi49gqbpjnkrgdavmzkbsg7aaw51p-gnuplot-5.2.3 - directory tree listing: https://gist.github.com/c09c0907f914e36a3f7c086d4b978dbf --- pkgs/tools/graphics/gnuplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index a177f33bb37..b2b8508640b 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -20,11 +20,11 @@ let withX = libX11 != null && !aquaterm && !stdenv.isDarwin; in stdenv.mkDerivation rec { - name = "gnuplot-5.2.2"; + name = "gnuplot-5.2.3"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; - sha256 = "18diyy7aib9mn098x07g25c7jij1x7wbfpicz0z8gwxx08px45m4"; + sha256 = "0977vgjszjpqhz2jahq07zmcmi0k9d6v7wq70ph2klfrb29qrdgy"; }; nativeBuildInputs = [ makeWrapper pkgconfig texinfo ] ++ lib.optional withQt qttools; From fcf66ef1d53850bf3cf8b95c204ceb82815fbb6b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 03:48:36 -0700 Subject: [PATCH 214/695] fswatch: 1.11.2 -> 1.11.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fswatch/versions. These checks were done: - built on NixOS - ran ‘/nix/store/c05hlqp57zslb3imjx6m5dary3ak601d-fswatch-1.11.3/bin/fswatch -h’ got 0 exit code - ran ‘/nix/store/c05hlqp57zslb3imjx6m5dary3ak601d-fswatch-1.11.3/bin/fswatch --help’ got 0 exit code - found 1.11.3 with grep in /nix/store/c05hlqp57zslb3imjx6m5dary3ak601d-fswatch-1.11.3 - directory tree listing: https://gist.github.com/cc22e26348bfd98159c6519a470d3bdb --- pkgs/development/tools/misc/fswatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index 2b26383ed31..9c0c357e186 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.11.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = "emcrisostomo"; repo = "fswatch"; rev = version; - sha256 = "05vgpd1fx9fy3vnnmq5gz236avgva82axix127xy98gaxrac52vq"; + sha256 = "1w83bpgx0wsgn70jyxwrvh9dsivrq41ifcignjzdxdwz9j0rwhh1"; }; nativeBuildInputs = [ autoreconfHook ]; From fb5fbbe29e08eae9fb1cf4a87f6d41e7fdb1eb59 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 03:59:01 -0700 Subject: [PATCH 215/695] gsm: 1.0.17 -> 1.0.18 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gsm/versions. These checks were done: - built on NixOS - ran ‘/nix/store/99q2w40pn8n5mihvg5ar9jwlzafpp9gl-gsm-1.0.18/bin/toast -h’ got 0 exit code - ran ‘/nix/store/99q2w40pn8n5mihvg5ar9jwlzafpp9gl-gsm-1.0.18/bin/toast help’ got 0 exit code - ran ‘/nix/store/99q2w40pn8n5mihvg5ar9jwlzafpp9gl-gsm-1.0.18/bin/tcat -h’ got 0 exit code - ran ‘/nix/store/99q2w40pn8n5mihvg5ar9jwlzafpp9gl-gsm-1.0.18/bin/tcat help’ got 0 exit code - ran ‘/nix/store/99q2w40pn8n5mihvg5ar9jwlzafpp9gl-gsm-1.0.18/bin/untoast -h’ got 0 exit code - ran ‘/nix/store/99q2w40pn8n5mihvg5ar9jwlzafpp9gl-gsm-1.0.18/bin/untoast help’ got 0 exit code - found 1.0.18 with grep in /nix/store/99q2w40pn8n5mihvg5ar9jwlzafpp9gl-gsm-1.0.18 - directory tree listing: https://gist.github.com/af6b37d2f0a0b0757d66e91dce102967 --- pkgs/development/libraries/gsm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix index 57112e2825e..33583a4c6bb 100644 --- a/pkgs/development/libraries/gsm/default.nix +++ b/pkgs/development/libraries/gsm/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { name = "gsm-${version}"; - version = "1.0.17"; + version = "1.0.18"; src = fetchurl { url = "http://www.quut.com/gsm/${name}.tar.gz"; - sha256 = "00bns0d4wwrvc60lj2w7wz4yk49q1f6rpdrwqzrxsha9d78mfnl5"; + sha256 = "041amvpz8cvxykl3pwqldrzxligmmzcg8ncdnxbg32rlqf3q1xh4"; }; patchPhase = '' From fc509faa8786b5293a3fedb037eb2c16a8190a79 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 04:00:55 -0700 Subject: [PATCH 216/695] freeipmi: 1.6.1 -> 1.6.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/freeipmi/versions. These checks were done: - built on NixOS - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/bmc-config --help’ got 0 exit code - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/bmc-device --help’ got 0 exit code - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/bmc-info --help’ got 0 exit code - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-chassis --help’ got 0 exit code - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-chassis-config --help’ got 0 exit code - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-config --help’ got 0 exit code - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-console --help’ got 0 exit code - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-dcmi --help’ got 0 exit code - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-detect --help’ got 0 exit code - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-fru --help’ got 0 exit code - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-locate --help’ got 0 exit code - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-oem --help’ got 0 exit code - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-oem help’ got 0 exit code - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-pef-config --help’ got 0 exit code - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-pet --help’ got 0 exit code - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-ping -V’ and found version 1.6.2 - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-power --help’ got 0 exit code - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-raw --help’ got 0 exit code - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-sel --help’ got 0 exit code - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-sensors --help’ got 0 exit code - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-sensors-config --help’ got 0 exit code - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmiconsole --help’ got 0 exit code - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmidetect --help’ got 0 exit code - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmidetectd --help’ got 0 exit code - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmimonitoring --help’ got 0 exit code - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmiping -V’ and found version 1.6.2 - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmipower --help’ got 0 exit code - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmiseld --help’ got 0 exit code - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/pef-config --help’ got 0 exit code - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/rmcp-ping -V’ and found version 1.6.2 - ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/rmcpping -V’ and found version 1.6.2 - found 1.6.2 with grep in /nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2 - directory tree listing: https://gist.github.com/15391c2b5273ea7e8b859877efa69d3b --- pkgs/tools/system/freeipmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 6996d66abe0..9c7a5b36c5b 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, libgcrypt, readline, libgpgerror }: stdenv.mkDerivation rec { - version = "1.6.1"; + version = "1.6.2"; name = "freeipmi-${version}"; src = fetchurl { url = "mirror://gnu/freeipmi/${name}.tar.gz"; - sha256 = "0jdm1nwsnkj0nzjmcqprmjk25449mhjj25khwzpq3mpjw440wmd2"; + sha256 = "0jhjf21gn1m9lhjsc1ard9zymq25mk7rxcyygjfxgy0vb4j36l9i"; }; buildInputs = [ libgcrypt readline libgpgerror ]; From 5ec51c5d7c863a335d31c6ea5bae3c1da37131ff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 04:20:37 -0700 Subject: [PATCH 217/695] fossil: 2.5 -> 2.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fossil/versions. These checks were done: - built on NixOS - ran ‘/nix/store/by0my4ix1gpichp15gf3i8w3fgfxmsrc-fossil-2.6/bin/fossil --help’ got 0 exit code - ran ‘/nix/store/by0my4ix1gpichp15gf3i8w3fgfxmsrc-fossil-2.6/bin/fossil help’ got 0 exit code - found 2.6 with grep in /nix/store/by0my4ix1gpichp15gf3i8w3fgfxmsrc-fossil-2.6 - directory tree listing: https://gist.github.com/673b50672a3bb2c22d7e37175d1f37d4 --- pkgs/applications/version-management/fossil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index cadc72f0f87..f46a704ea9c 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "fossil-${version}"; - version = "2.5"; + version = "2.6"; src = fetchurl { urls = @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz" ]; name = "${name}.tar.gz"; - sha256 = "1lxawkhr1ki9fqw8076fxib2b1w673449yzb6vxjshqzh5h77c7r"; + sha256 = "1nbfzxwnq66f8162nmddd22xn3nyazqr16kka2c1gghqb5ar99vn"; }; buildInputs = [ zlib openssl readline sqlite which ed ] From 5ef7241e1aaf4d55b8160d4fe1b168465cfe68e7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 04:25:49 -0700 Subject: [PATCH 218/695] fwup: 1.0.0 -> 1.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fwup/versions. These checks were done: - built on NixOS - ran ‘/nix/store/37baank8iw1ksnyhg0m90y0p9sazyhv7-fwup-1.1.0/bin/fwup -h’ got 0 exit code - ran ‘/nix/store/37baank8iw1ksnyhg0m90y0p9sazyhv7-fwup-1.1.0/bin/fwup --help’ got 0 exit code - ran ‘/nix/store/37baank8iw1ksnyhg0m90y0p9sazyhv7-fwup-1.1.0/bin/fwup --version’ and found version 1.1.0 - found 1.1.0 with grep in /nix/store/37baank8iw1ksnyhg0m90y0p9sazyhv7-fwup-1.1.0 - directory tree listing: https://gist.github.com/eafe4f2b1c0b7a6fac5a4910f383ee94 --- pkgs/tools/misc/fwup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index e334a2a8813..3903fde3302 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "fwup-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "1v79q5s4lm8scrz9nmqcszyh40is6k7hkr15r4aljyfbp1gamsfs"; + sha256 = "1jhl50yj5h6wl3fx1hcqi4vb7633srmbbcpsgajprc5fxscjgapm"; }; doCheck = true; From 95e317bf54ed5b78dafc4aa873615f33d123d714 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 04:32:20 -0700 Subject: [PATCH 219/695] dash: 0.5.9.1 -> 0.5.10 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/dash/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - directory tree listing: https://gist.github.com/ac71c74097484baeb4301fc8048b372d --- pkgs/shells/dash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index 1de2a52634b..5f26801ca6d 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dash-0.5.9.1"; + name = "dash-0.5.10"; src = fetchurl { url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz"; - sha256 = "5ecd5bea72a93ed10eb15a1be9951dd51b52e5da1d4a7ae020efd9826b49e659"; + sha256 = "1arimvc9zcghhb3nin9z3yr5706vxfri4a9r3j9j9d0n676f0w5d"; }; hardeningDisable = [ "format" ]; From 7d915bd28d4e5cc91f9d0a1dd7d14c7974698119 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 04:59:30 -0700 Subject: [PATCH 220/695] fanficfare: 2.23.0 -> 2.25.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fanficfare/versions. These checks were done: - built on NixOS - ran ‘/nix/store/v61hi3r06i5xxsmcdk4cs7jijflf1fxh-fanficfare-2.25.0/bin/.fanficfare-wrapped -h’ got 0 exit code - ran ‘/nix/store/v61hi3r06i5xxsmcdk4cs7jijflf1fxh-fanficfare-2.25.0/bin/.fanficfare-wrapped --help’ got 0 exit code - ran ‘/nix/store/v61hi3r06i5xxsmcdk4cs7jijflf1fxh-fanficfare-2.25.0/bin/.fanficfare-wrapped -v’ and found version 2.25.0 - ran ‘/nix/store/v61hi3r06i5xxsmcdk4cs7jijflf1fxh-fanficfare-2.25.0/bin/.fanficfare-wrapped --version’ and found version 2.25.0 - ran ‘/nix/store/v61hi3r06i5xxsmcdk4cs7jijflf1fxh-fanficfare-2.25.0/bin/fanficfare -h’ got 0 exit code - ran ‘/nix/store/v61hi3r06i5xxsmcdk4cs7jijflf1fxh-fanficfare-2.25.0/bin/fanficfare --help’ got 0 exit code - ran ‘/nix/store/v61hi3r06i5xxsmcdk4cs7jijflf1fxh-fanficfare-2.25.0/bin/fanficfare -v’ and found version 2.25.0 - ran ‘/nix/store/v61hi3r06i5xxsmcdk4cs7jijflf1fxh-fanficfare-2.25.0/bin/fanficfare --version’ and found version 2.25.0 - found 2.25.0 with grep in /nix/store/v61hi3r06i5xxsmcdk4cs7jijflf1fxh-fanficfare-2.25.0 - directory tree listing: https://gist.github.com/a5ca8fdb686eb942eb92828f63be5af0 --- pkgs/tools/text/fanficfare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index cffce8e3b88..2ebab9d6390 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python27Packages }: python27Packages.buildPythonApplication rec { - version = "2.23.0"; + version = "2.25.0"; name = "fanficfare-${version}"; nameprefix = ""; src = fetchurl { url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz"; - sha256 = "0589b5pg03rfv9x753cnbkz6pz508xs1n2lla3qfpagxc0pyg8i1"; + sha256 = "1fval2jhrv3w762rmrbhbn8zj161aalvqy8n8q74yr8hzmpcvlwn"; }; propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ]; From fcb6a0a56ed34d43aa234eb1f3b717c3e24b695b Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Mon, 7 May 2018 14:04:15 +0200 Subject: [PATCH 221/695] spotify: remove/update gnome2 references Part of #39976 --- pkgs/applications/audio/spotify/default.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 1a4f2bdd1b5..fefab263065 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,6 +1,8 @@ { fetchurl, stdenv, dpkg, xorg, alsaLib, makeWrapper, openssl, freetype -, glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng, GConf -, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome2 }: +, glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng +, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome3 }: + +assert stdenv.system == "x86_64-linux"; let # Please update the stable branch! @@ -20,7 +22,6 @@ let ffmpeg_0_10 fontconfig freetype - GConf gdk_pixbuf glib gtk2 @@ -93,7 +94,7 @@ stdenv.mkDerivation { librarypath="${stdenv.lib.makeLibraryPath deps}:$libdir" wrapProgram $out/share/spotify/spotify \ --prefix LD_LIBRARY_PATH : "$librarypath" \ - --prefix PATH : "${gnome2.zenity}/bin" + --prefix PATH : "${gnome3.zenity}/bin" # Desktop file mkdir -p "$out/share/applications/" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ea5d55a281..a4d07741f1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17925,7 +17925,6 @@ with pkgs; }; spotify = callPackage ../applications/audio/spotify { - inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; libpng = libpng12; curl = curl.override { From 2dbb29c3340b916ec83892bf514c457f9d88af01 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Mon, 7 May 2018 14:06:35 +0200 Subject: [PATCH 222/695] spotify: remove platform assertion --- pkgs/applications/audio/spotify/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index fefab263065..5f6772256ca 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -2,8 +2,6 @@ , glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome3 }: -assert stdenv.system == "x86_64-linux"; - let # Please update the stable branch! # Latest version number can be found at: From 335931b012d1fcacd3dc908bc14d98b9001480f5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 05:13:43 -0700 Subject: [PATCH 223/695] certbot: 0.23.0 -> 0.24.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/certbot/versions. These checks were done: - built on NixOS - ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/certbot -h’ got 0 exit code - ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/certbot --help’ got 0 exit code - ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/certbot help’ got 0 exit code - ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/certbot --version’ and found version 0.24.0 - ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/..certbot-wrapped-wrapped -h’ got 0 exit code - ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/..certbot-wrapped-wrapped --help’ got 0 exit code - ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/..certbot-wrapped-wrapped help’ got 0 exit code - ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/..certbot-wrapped-wrapped --version’ and found version 0.24.0 - ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/.certbot-wrapped -h’ got 0 exit code - ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/.certbot-wrapped --help’ got 0 exit code - ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/.certbot-wrapped help’ got 0 exit code - ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/.certbot-wrapped --version’ and found version 0.24.0 - found 0.24.0 with grep in /nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0 - directory tree listing: https://gist.github.com/ecc49ff604fc592bc8d187e494c0e9cc --- pkgs/tools/admin/certbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/certbot/default.nix b/pkgs/tools/admin/certbot/default.nix index 3106552a661..7a26896bbc2 100644 --- a/pkgs/tools/admin/certbot/default.nix +++ b/pkgs/tools/admin/certbot/default.nix @@ -4,13 +4,13 @@ pythonPackages.buildPythonApplication rec { name = "certbot-${version}"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "certbot"; repo = "certbot"; rev = "v${version}"; - sha256 = "0dv9d1byppnvx54rhi2w3gqjk01444m5hbr9553n9gin4ribviii"; + sha256 = "0gsq4si0bqwzd7ywf87y7bbprqg1m72qdj11h64qmwb5zl4vh444"; }; propagatedBuildInputs = with pythonPackages; [ From 1d5843550144b8293c2c84e3a8110881594647a4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 05:20:34 -0700 Subject: [PATCH 224/695] asdf: 3.3.1 -> 3.3.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/asdf/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 3.3.2 with grep in /nix/store/mcks1swd685sksr4yjrsyfhphzcrw9nk-asdf-3.3.2 - directory tree listing: https://gist.github.com/3a13d7343736c1454dc2701b3ea3009f --- pkgs/development/lisp-modules/asdf/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix index 27089ee3e52..c9d8d52b068 100644 --- a/pkgs/development/lisp-modules/asdf/default.nix +++ b/pkgs/development/lisp-modules/asdf/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="asdf"; - version="3.3.1"; + version="3.3.2"; name="${baseName}-${version}"; - hash="1yhlhyllabsha84wycqk0mhbcq2w332jdlp19ccx4rplczzn2w3g"; - url="http://common-lisp.net/project/asdf/archives/asdf-3.3.1.tar.gz"; - sha256="1yhlhyllabsha84wycqk0mhbcq2w332jdlp19ccx4rplczzn2w3g"; + hash="1bdrybn97qhny5192ifis8fp8m79djql2k4h9r9q2wnwxf9q2d4x"; + url="http://common-lisp.net/project/asdf/archives/asdf-3.3.2.tar.gz"; + sha256="1bdrybn97qhny5192ifis8fp8m79djql2k4h9r9q2wnwxf9q2d4x"; }; buildInputs = [ texinfo texLive perl From 1e01a6ef38215dd4082bb4035b3e89c4dc94a9cc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 05:20:59 -0700 Subject: [PATCH 225/695] alfred: 2018.0 -> 2018.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/alfred/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 2018.1 with grep in /nix/store/2fj5i6zd4mp4asxchsig266lqz8acliv-alfred-2018.1 - directory tree listing: https://gist.github.com/64f566e02d8018fe290dc3db29fd7c7f --- pkgs/os-specific/linux/batman-adv/alfred.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 9b7484932eb..90489e12d69 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: let - ver = "2018.0"; + ver = "2018.1"; in stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0mzjgjkmgdrrqa6fbpii9q1xqvg3kvwgq2k2kpdf0vy4xxnypky7"; + sha256 = "0xkd842yp227jzfybjq8c5s7y5c7amm1f5ai80k8wyjwysnad3w0"; }; nativeBuildInputs = [ pkgconfig ]; From 253ea95d289221bcb72377b2fa33625ce2cc1dac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 May 2018 02:30:46 +0200 Subject: [PATCH 226/695] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.9.2-11-ga2d666d from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/f60ac8c0ef62f4e6a5aae3dfb9c4ac25a79918a2. --- .../haskell-modules/hackage-packages.nix | 236 ++++++++++++++---- 1 file changed, 182 insertions(+), 54 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f0b8c3d6316..197f2d7cb75 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -33676,8 +33676,8 @@ self: { }: mkDerivation { pname = "battleplace"; - version = "0.1.0.2"; - sha256 = "0gkchw2dqg3cps5xf88qmmn9mzd7zpws1ngsr3k9lh7krah8a7fc"; + version = "0.1.0.3"; + sha256 = "0kvw69br5nrx4nnrp0r00wr55w15wq5kh68df2r89yrd8l5vp02x"; libraryHaskellDepends = [ aeson base bytestring cereal data-default hashable memory servant text vector @@ -61729,6 +61729,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "df1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , QuickCheck, tasty, tasty-quickcheck, text, time + }: + mkDerivation { + pname = "df1"; + version = "0.1"; + sha256 = "0crcwg63d1m47qj44774ydk9v5sssg08vwbjgh1lg8qvqss7qk8l"; + libraryHaskellDepends = [ + attoparsec base bytestring containers text time + ]; + testHaskellDepends = [ + attoparsec base bytestring QuickCheck tasty tasty-quickcheck text + time + ]; + homepage = "https://github.com/k0001/di"; + description = "Type, render and parse the df1 hierarchical structured log format"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dfrac" = callPackage ({ mkDerivation, base, scientific }: mkDerivation { @@ -62053,19 +62073,86 @@ self: { }) {}; "di" = callPackage - ({ mkDerivation, base, bytestring, QuickCheck, stm, tasty - , tasty-hunit, tasty-quickcheck, time, transformers + ({ mkDerivation, base, df1, di-core, di-df1, di-handle, di-monad + , exceptions }: mkDerivation { pname = "di"; - version = "0.3"; - sha256 = "1kwkr2lb4vii530sijlrll9nj1k93pixcqk4bn96877bzf5963wj"; - libraryHaskellDepends = [ base stm time transformers ]; - testHaskellDepends = [ - base bytestring QuickCheck stm tasty tasty-hunit tasty-quickcheck + version = "1.0"; + sha256 = "1bsgq1x4xc1nhfx2wkzmhy3hfy11xkdic35x0lxdc282k2iw7f4i"; + libraryHaskellDepends = [ + base df1 di-core di-df1 di-handle di-monad exceptions ]; homepage = "https://github.com/k0001/di"; - description = "Easy, powerful, structured and typeful logging without monad towers"; + description = "Typeful hierarchical structured logging using di, mtl and df1"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "di-core" = callPackage + ({ mkDerivation, base, containers, exceptions, QuickCheck, stm + , tasty, tasty-hunit, tasty-quickcheck, time + }: + mkDerivation { + pname = "di-core"; + version = "1.0"; + sha256 = "0slggv1c2q8amznf0j38x12v0f4lhg7z7mr0qaayj6v6pkpp5s6j"; + libraryHaskellDepends = [ base containers exceptions stm time ]; + testHaskellDepends = [ + base exceptions QuickCheck stm tasty tasty-hunit tasty-quickcheck + time + ]; + homepage = "https://github.com/k0001/di"; + description = "Typeful hierarchical structured logging without monad towers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "di-df1" = callPackage + ({ mkDerivation, base, bytestring, df1, di-core, di-handle + , di-monad, QuickCheck, stm, tasty, tasty-quickcheck, text, time + }: + mkDerivation { + pname = "di-df1"; + version = "1.0"; + sha256 = "07lz6vb4dxa6j3xxlwxv23gps5xv4rimz571h2n95hhldx8n9jnp"; + libraryHaskellDepends = [ + base df1 di-core di-handle di-monad stm + ]; + testHaskellDepends = [ + base bytestring df1 di-core QuickCheck tasty tasty-quickcheck text + time + ]; + homepage = "https://github.com/k0001/di"; + description = "Write logs in the df1 format using the di logging framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "di-handle" = callPackage + ({ mkDerivation, base, bytestring, di-core, exceptions, unix }: + mkDerivation { + pname = "di-handle"; + version = "1.0"; + sha256 = "1v4jn1dvvfa6nbqx34hhjg47lbjafkmdps8aalq3n5sah99iy26d"; + libraryHaskellDepends = [ + base bytestring di-core exceptions unix + ]; + homepage = "https://github.com/k0001/di"; + description = "IO support for file handles in di-core"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "di-monad" = callPackage + ({ mkDerivation, base, containers, di-core, exceptions, mtl, pipes + , stm, transformers + }: + mkDerivation { + pname = "di-monad"; + version = "1.0"; + sha256 = "1kb2dx4whbl0lp0yb5y7m66ma0qywprzy5zs3msxiqfdbc3ghqvx"; + libraryHaskellDepends = [ + base containers di-core exceptions mtl pipes stm transformers + ]; + homepage = "https://github.com/k0001/di"; + description = "mtl flavoured typeful hierarchical structured logging for di-core"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -84093,8 +84180,8 @@ self: { }) {inherit (pkgs) gdk_pixbuf;}; "gi-gdkx11" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gdk-x11 - , gi-gdk, gi-gio, gi-gobject, gi-xlib, haskell-gi, haskell-gi-base + ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk + , gi-gio, gi-gobject, gi-xlib, gtk3, haskell-gi, haskell-gi-base , haskell-gi-overloading, text, transformers }: mkDerivation { @@ -84106,13 +84193,13 @@ self: { base bytestring containers gi-gdk gi-gio gi-gobject gi-xlib haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ gdk-x11 ]; + libraryPkgconfigDepends = [ gtk3 ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GdkX11 bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {gdk-x11 = null;}; + }) {gtk3 = pkgs.gnome3.gtk;}; "gi-ggit" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio @@ -84159,18 +84246,18 @@ self: { }) {inherit (pkgs) glib;}; "gi-girepository" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject - , gobjectIntrospection, haskell-gi, haskell-gi-base + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, gobjectIntrospection, haskell-gi, haskell-gi-base , haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-girepository"; - version = "1.0.15"; - sha256 = "1g9bvf850zsbqi4dw8i1nbclqwi599zvwny4fsl0hp8lqb9w7ps6"; + version = "1.0.16"; + sha256 = "1kb7vyqks6br8z2bjp9wzj0dvh76s35dbx93iijgl138270ikww6"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers gi-gobject haskell-gi haskell-gi-base - haskell-gi-overloading text transformers + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gobjectIntrospection ]; doHaddock = false; @@ -84343,8 +84430,8 @@ self: { }: mkDerivation { pname = "gi-gstvideo"; - version = "1.0.15"; - sha256 = "1k35x6cc1kiyhwq978dlckib2sfz7k3w2gxfqsha591a0661k10d"; + version = "1.0.16"; + sha256 = "0g6z15di4lk3l6hxpl6yqffw23kya3r2khxs4ah6vmkdn42wcalw"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase @@ -84687,8 +84774,8 @@ self: { }: mkDerivation { pname = "gi-webkit2"; - version = "4.0.18"; - sha256 = "0qxqsg9p2380z6cyvky8g0a90v1zyf90ff9mmislnzm89fmc8013"; + version = "4.0.19"; + sha256 = "1hnxp1vk2qhi7shr4qd7khi2nq0vpn58f1g6j7dkl0h23266fwz2"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib @@ -84711,8 +84798,8 @@ self: { }: mkDerivation { pname = "gi-webkit2webextension"; - version = "4.0.16"; - sha256 = "010svwg3p3sdd209l8cnwhsm2dp9n6qf0shzqjdx5l1pkjv32zqm"; + version = "4.0.17"; + sha256 = "0lpz5a9395bqfmxbhfjfbqi4832a68ybbr1y0c475r8ya6pnx4cq"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-gobject gi-gtk @@ -109614,8 +109701,8 @@ self: { pname = "hquantlib"; version = "0.0.4.0"; sha256 = "0x24qkbpclir0ik52hyxw3ahnqk1nqscxpx1ahnxs4w1bv7bkcmp"; - revision = "1"; - editedCabalFile = "02wp531cckdgj11sjamyafnij0cri7svrg4ddbvak9yki0xpm286"; + revision = "2"; + editedCabalFile = "1wx32kkv1as3rras5b1y3v77abx0sqsam6ssa5s7vm83pncx38y4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126702,24 +126789,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "katydid_0_2_0_1" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq, directory - , filepath, HUnit, hxt, json, mtl, parsec, regex-tdfa, tasty - , tasty-hunit, text + "katydid_0_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , directory, either, extra, filepath, HUnit, hxt, ilist, json, mtl + , parsec, primes, regex-tdfa, tasty, tasty-hunit, text }: mkDerivation { pname = "katydid"; - version = "0.2.0.1"; - sha256 = "1m3rclgrjc7f1rirn39w55rw4vlr769kvm0byw53kg2ib95l2nlg"; + version = "0.3.0.0"; + sha256 = "1r95yxhrsw0ghv55xlq987yzhly69ihiy4bz6k3k41mfj8d7kj8v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers deepseq hxt json mtl parsec regex-tdfa + base bytestring containers deepseq either extra hxt ilist json mtl + parsec regex-tdfa text ]; executableHaskellDepends = [ base mtl ]; testHaskellDepends = [ - base containers directory filepath HUnit hxt json mtl parsec tasty - tasty-hunit + base containers directory filepath HUnit hxt ilist json mtl parsec + primes tasty tasty-hunit text ]; benchmarkHaskellDepends = [ base criterion deepseq directory filepath hxt mtl text @@ -131551,12 +131639,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lens-labels_0_2_0_0" = callPackage + "lens-labels_0_2_0_1" = callPackage ({ mkDerivation, base, ghc-prim, profunctors, tagged }: mkDerivation { pname = "lens-labels"; - version = "0.2.0.0"; - sha256 = "137axpd2j7q4k34mav0338spk985ksh760nfv3vsm59aq9ab76xf"; + version = "0.2.0.1"; + sha256 = "1nn0qp0xl65wc5axy68jlmif1k97af8v5r09sf02fw3iww7ym7wj"; libraryHaskellDepends = [ base ghc-prim profunctors tagged ]; homepage = "https://github.com/google/proto-lens#readme"; description = "Integration of lenses with OverloadedLabels"; @@ -168755,15 +168843,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "proto-lens_0_3_0_0" = callPackage + "proto-lens_0_3_1_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , data-default-class, deepseq, lens-family, lens-labels, parsec , pretty, text, transformers, void }: mkDerivation { pname = "proto-lens"; - version = "0.3.0.0"; - sha256 = "0skbqawzz58ilpvkdcx1hmpaj67pyjz449qmdrp2scdpdcc1nica"; + version = "0.3.1.0"; + sha256 = "1awlp7101vhqf2hhz3h93mf38lyyfx5ay3gvrdna0k3msykimgw7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base bytestring containers data-default-class deepseq @@ -168791,14 +168879,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "proto-lens-arbitrary_0_1_2_0" = callPackage + "proto-lens-arbitrary_0_1_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, lens-family , proto-lens, QuickCheck, text }: mkDerivation { pname = "proto-lens-arbitrary"; - version = "0.1.2.0"; - sha256 = "1xkvv822qsi1h99f7xpbprq4j9yf5ykz6bd5lj5jn8626vfq0n67"; + version = "0.1.2.1"; + sha256 = "08qwn60pih64lk6xnqwzx3q1qja46pvaw6539r1m4kbw3wyh2kl2"; libraryHaskellDepends = [ base bytestring containers lens-family proto-lens QuickCheck text ]; @@ -168815,8 +168903,8 @@ self: { }: mkDerivation { pname = "proto-lens-combinators"; - version = "0.1.0.9"; - sha256 = "1kkns9p2ipq4b3jy1l4lbh9h1m3vvg1l5r6ncqs0ydc2rqy1iasf"; + version = "0.1.0.10"; + sha256 = "0yv6wrg3wsp6617mw02n3d9gmlb9nyvfabffrznpvlaywwk8cnir"; setupHaskellDepends = [ base Cabal proto-lens-protoc ]; libraryHaskellDepends = [ base data-default-class lens-family proto-lens-protoc transformers @@ -168861,14 +168949,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "proto-lens-optparse_0_1_1_1" = callPackage + ({ mkDerivation, base, optparse-applicative, proto-lens, text }: + mkDerivation { + pname = "proto-lens-optparse"; + version = "0.1.1.1"; + sha256 = "1zi6kv6af39bbbcf2v7d1l2fc2f3m6r1i2yvv4ddm6w0i7vhd1qw"; + libraryHaskellDepends = [ + base optparse-applicative proto-lens text + ]; + homepage = "https://github.com/google/proto-lens#readme"; + description = "Adapting proto-lens to optparse-applicative ReadMs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proto-lens-protobuf-types" = callPackage ({ mkDerivation, base, Cabal, lens-family, proto-lens , proto-lens-protoc, text }: mkDerivation { pname = "proto-lens-protobuf-types"; - version = "0.3.0.0"; - sha256 = "1r9pbpapgi8bq938m1fliwbv8cxr18v3a3hbziq33psvas48kwa4"; + version = "0.3.0.1"; + sha256 = "0630yl73s11dnfripbz5pa25mzpsnjzd278qcm5yiy6zmcz0a6ca"; setupHaskellDepends = [ base Cabal proto-lens-protoc ]; libraryHaskellDepends = [ base lens-family proto-lens proto-lens-protoc text @@ -168887,8 +168990,8 @@ self: { }: mkDerivation { pname = "proto-lens-protoc"; - version = "0.3.0.0"; - sha256 = "0fh6q3alm8pw32zsg6yrf8b3gf2ww5yqsjax2hmij3y20fl26s79"; + version = "0.3.1.0"; + sha256 = "0hihwynqlxhbc7280v7syag0p5php4gdvchbpzvwl54hvcjakgvx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -182598,6 +182701,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "scientific_0_3_6_0" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, criterion + , deepseq, hashable, integer-gmp, integer-logarithms, primitive + , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text + }: + mkDerivation { + pname = "scientific"; + version = "0.3.6.0"; + sha256 = "1rdwqw2xi1c6305vbxa0sfyl18rjgir7flbdz2pbdvaj3nw44lr4"; + libraryHaskellDepends = [ + base binary bytestring containers deepseq hashable integer-gmp + integer-logarithms primitive text + ]; + testHaskellDepends = [ + base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml + tasty-hunit tasty-quickcheck tasty-smallcheck text + ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/basvandijk/scientific"; + description = "Numbers represented using scientific notation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "scion" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , filepath, ghc, ghc-paths, ghc-syb, hslogger, json, multiset @@ -219066,8 +219194,8 @@ self: { pname = "vector-space-points"; version = "0.2.1.2"; sha256 = "0jqiy7b3hy21c0imqxbzvcx0hxy33bh97bv47bpv099dx32d7spy"; - revision = "3"; - editedCabalFile = "07jrxmjw7yzrgkncam4axy3b3j5iha1d632kyd24n805b6p7vym3"; + revision = "4"; + editedCabalFile = "1bw8l4nlxsx2nlam9kry60k75vszfx9zxr8zj0mcb3r0r7s178mx"; libraryHaskellDepends = [ base vector-space ]; description = "A type for points, as distinct from vectors"; license = stdenv.lib.licenses.bsd3; From 394d0f2ed947c620213bd75c8c177ef871bf24f0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 May 2018 13:01:03 +0200 Subject: [PATCH 227/695] haskell-gi-gdkx11: drop obsolete override Closes https://github.com/NixOS/nixpkgs/issues/37724. --- pkgs/development/haskell-modules/configuration-common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7dc1145411b..b74515e9e04 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -422,8 +422,9 @@ self: super: { # https://github.com/evanrinehart/mikmod/issues/1 mikmod = addExtraLibrary super.mikmod pkgs.libmikmod; + # The doctest phase fails because it does not have a proper environment in + # which to run the commands it's ought to test. haskell-gi = dontCheck super.haskell-gi; - gi-gdkx11 = super.gi-gdkx11.override { gdk-x11 = pkgs.gtk3; }; # https://github.com/basvandijk/threads/issues/10 threads = dontCheck super.threads; From 8b11e30b84f26a92dfc0b54435e121cf31cf7a7a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 May 2018 13:26:42 +0200 Subject: [PATCH 228/695] github-backup: jailbreak to fix the build --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b74515e9e04..eea7e175816 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1026,6 +1026,9 @@ self: super: { # https://github.com/dmwit/encoding/pull/3 encoding = appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch; + # Work around overspecified constraint on github ==0.18. + github-backup = doJailbreak super.github-backup; + } // From d3784373ad0e34daa9f4e3425d69ad997355aecc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 May 2018 14:24:58 +0200 Subject: [PATCH 229/695] haskell-dbus-hslogger & status-notifier-item: use latest dbus despite lts-11.x --- pkgs/development/haskell-modules/configuration-common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index eea7e175816..2c16b37bba8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -638,6 +638,8 @@ self: super: { # Need newer versions of their dependencies than the ones we have in LTS-11.x. cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_28_2; hackage-db = self.hackage-db_2_0_1; }); + dbus-hslogger = super.dbus-hslogger.overrideScope (self: super: { dbus = self.dbus_1_0_1; }); + status-notifier-item = super.status-notifier-item.overrideScope (self: super: { dbus = self.dbus_1_0_1; }); # https://github.com/bos/configurator/issues/22 configurator = dontCheck super.configurator; From 3f96895417a8ae9ad13b69b49fa3bb4da8bdddca Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 03:24:52 -0700 Subject: [PATCH 230/695] keepass: 2.38 -> 2.39 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/keepass/versions. These checks were done: - built on NixOS - ran ‘/nix/store/0w1c39pg7347dwhkwz3b5jizzzc5v885-keepass-2.39/bin/.keepass-wrapped --help’ got 0 exit code - ran ‘/nix/store/0w1c39pg7347dwhkwz3b5jizzzc5v885-keepass-2.39/bin/keepass --help’ got 0 exit code - found 2.39 with grep in /nix/store/0w1c39pg7347dwhkwz3b5jizzzc5v885-keepass-2.39 - directory tree listing: https://gist.github.com/da7324a17ad7e95a053f6a2655ec07bc --- pkgs/applications/misc/keepass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 5e492fc621f..8676ba70858 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -3,11 +3,11 @@ with builtins; buildDotnetPackage rec { baseName = "keepass"; - version = "2.38"; + version = "2.39"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "0m33gfpvv01xc28k4rrc8llbyk6qanm9rsqcnv8ydms0cr78dbbk"; + sha256 = "05mrbzlkr2h42cls6xhas76dg8kyic4fijwckrh0b0qv5pp71c11"; }; sourceRoot = "."; From d513634e6c590eca232e1ab3828bdf46e882bd6a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 05:59:21 -0700 Subject: [PATCH 231/695] avrgcc: 7.3.0 -> 8.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/avr-gcc/versions. These checks were done: - built on NixOS - ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-g++ --help’ got 0 exit code - ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-c++ --help’ got 0 exit code - ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcc --help’ got 0 exit code - ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcc-8.1.0 --help’ got 0 exit code - ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcov -h’ got 0 exit code - ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcov --help’ got 0 exit code - ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcov help’ got 0 exit code - ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcov-tool -h’ got 0 exit code - ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcov-tool --help’ got 0 exit code - ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcov-dump -h’ got 0 exit code - ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcov-dump --help’ got 0 exit code - ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcov-dump help’ got 0 exit code - ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-cpp --help’ got 0 exit code - ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcc-ar -h’ got 0 exit code - ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcc-ar --help’ got 0 exit code - ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcc-nm -h’ got 0 exit code - ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcc-nm --help’ got 0 exit code - ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcc-ranlib -h’ got 0 exit code - ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcc-ranlib --help’ got 0 exit code - found 8.1.0 with grep in /nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0 - directory tree listing: https://gist.github.com/bc5f032e2fae6d464814f0d61feb07dd --- pkgs/development/misc/avr/gcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/misc/avr/gcc/default.nix b/pkgs/development/misc/avr/gcc/default.nix index 82497929183..cce11616e2f 100644 --- a/pkgs/development/misc/avr/gcc/default.nix +++ b/pkgs/development/misc/avr/gcc/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, gmp, mpfr, libmpc, zlib, avrbinutils, texinfo }: let - version = "7.3.0"; + version = "8.1.0"; in stdenv.mkDerivation { name = "avr-gcc-${version}"; src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "0p71bij6bfhzyrs8676a8jmpjsfz392s2rg862sdnsk30jpacb43"; + sha256 = "0lxil8x0jjx7zbf90cy1rli650akaa6hpk8wk8s62vk2jbwnc60x"; }; patches = [ From 36368d99b78aa0143b8dca55e569e333bd8baae1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 06:01:20 -0700 Subject: [PATCH 232/695] abcm2ps: 8.13.20 -> 8.13.21 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/abcm2ps/versions. These checks were done: - built on NixOS - ran ‘/nix/store/jz4zd20m2cmgcgyixg5xc08y6srqskyv-abcm2ps-8.13.21/bin/abcm2ps -h’ got 0 exit code - found 8.13.21 with grep in /nix/store/jz4zd20m2cmgcgyixg5xc08y6srqskyv-abcm2ps-8.13.21 - directory tree listing: https://gist.github.com/8743b1d2b794435906fc0d11cbfcb803 --- pkgs/tools/audio/abcm2ps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index f93231d8022..6d782fdba35 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "abcm2ps-${version}"; - version = "8.13.20"; + version = "8.13.21"; src = fetchFromGitHub { owner = "leesavide"; repo = "abcm2ps"; rev = "v${version}"; - sha256 = "0zgwrclky6b1l1pd07s31azyxf4clwi3cp5x0wjix0wp78b89pbx"; + sha256 = "03r98xdw2vdwsi726i0zb7p0ljp3fpzjl1nhzfwz57m3zmqvz6r1"; }; prePatch = '' From cabd64a83b047c5769e11218f2b2f3a4db90900c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 06:03:41 -0700 Subject: [PATCH 233/695] abcmidi: 2018.04.24 -> 2018.05.02 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/abcMIDI/versions. These checks were done: - built on NixOS - ran ‘/nix/store/cw3374p08xihakpimdka1afpa8s0kqh9-abcMIDI-2018.05.02/bin/abc2midi -h’ got 0 exit code - ran ‘/nix/store/cw3374p08xihakpimdka1afpa8s0kqh9-abcMIDI-2018.05.02/bin/midi2abc -h’ got 0 exit code - ran ‘/nix/store/cw3374p08xihakpimdka1afpa8s0kqh9-abcMIDI-2018.05.02/bin/midi2abc --help’ got 0 exit code - ran ‘/nix/store/cw3374p08xihakpimdka1afpa8s0kqh9-abcMIDI-2018.05.02/bin/abc2abc -h’ got 0 exit code - ran ‘/nix/store/cw3374p08xihakpimdka1afpa8s0kqh9-abcMIDI-2018.05.02/bin/mftext -h’ got 0 exit code - ran ‘/nix/store/cw3374p08xihakpimdka1afpa8s0kqh9-abcMIDI-2018.05.02/bin/mftext --help’ got 0 exit code - ran ‘/nix/store/cw3374p08xihakpimdka1afpa8s0kqh9-abcMIDI-2018.05.02/bin/mftext help’ got 0 exit code - ran ‘/nix/store/cw3374p08xihakpimdka1afpa8s0kqh9-abcMIDI-2018.05.02/bin/yaps -h’ got 0 exit code - ran ‘/nix/store/cw3374p08xihakpimdka1afpa8s0kqh9-abcMIDI-2018.05.02/bin/abcmatch -h’ got 0 exit code - directory tree listing: https://gist.github.com/ab3313bb3097bf194e4ac83d6cc0b9bc --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index ff6a7af03ef..a0e7b1f906c 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2018.04.24"; + version = "2018.05.02"; src = fetchzip { url = "http://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "02n5xnagj1z44b23zmaxdkmn8nisrb34r8hb5xs7cr1wq7m4fmlh"; + sha256 = "0pva0kwkwdrq4mfgiz389dhaqv66csqjaddirzxmhvvi6qji5d24"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase From 084efc26e728ed801283375438b524a3bc5c41a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 7 May 2018 10:07:54 -0300 Subject: [PATCH 234/695] iconpack-obsidian: restrict platforms to linux --- pkgs/data/icons/iconpack-obsidian/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/pkgs/data/icons/iconpack-obsidian/default.nix index efcaa1cbc53..b033f510f0b 100644 --- a/pkgs/data/icons/iconpack-obsidian/default.nix +++ b/pkgs/data/icons/iconpack-obsidian/default.nix @@ -28,7 +28,8 @@ stdenv.mkDerivation rec { description = "Gnome Icon Pack based upon Faenza"; homepage = https://github.com/madmaxms/iconpack-obsidian; license = licenses.lgpl3; - platforms = platforms.all; + # darwin cannot deal with file names differing only in case + platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; } From 9fde82e3ff7f1106643d40f21c636309922b6506 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 06:27:02 -0700 Subject: [PATCH 235/695] cfr: 0_125 -> 0.128 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cfr/versions. These checks were done: - built on NixOS - ran ‘/nix/store/8hlizlz9d6cp6n3w3qx7s0wm2z3d3g8f-cfr-0.128/bin/cfr -h’ got 0 exit code - ran ‘/nix/store/8hlizlz9d6cp6n3w3qx7s0wm2z3d3g8f-cfr-0.128/bin/cfr --help’ got 0 exit code - ran ‘/nix/store/8hlizlz9d6cp6n3w3qx7s0wm2z3d3g8f-cfr-0.128/bin/cfr help’ got 0 exit code - found 0.128 with grep in /nix/store/8hlizlz9d6cp6n3w3qx7s0wm2z3d3g8f-cfr-0.128 - directory tree listing: https://gist.github.com/3d40ccd7bfb3d81eb71e8a9033d1a127 --- pkgs/development/tools/java/cfr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix index c7cc0543976..39677ba719e 100644 --- a/pkgs/development/tools/java/cfr/default.nix +++ b/pkgs/development/tools/java/cfr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cfr-${version}"; - version = "0_125"; + version = "0.128"; src = fetchurl { url = "http://www.benf.org/other/cfr/cfr_${version}.jar"; - sha256 = "1ad9ddg79cybv8j8l3mm67znyw54z5i55x4m9n239fn26p1ndawa"; + sha256 = "09mx1f6d1p57q5r05nvgm1xrhqv34n7v7rwq875whb441h1dnsix"; }; buildInputs = [ makeWrapper ]; From b083a86d745f42faddba24c127c3ce71701c33dc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 06:34:51 -0700 Subject: [PATCH 236/695] bzflag: 2.4.12 -> 2.4.14 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/bzflag/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 2.4.14 with grep in /nix/store/z93gp3xa0spbywriag5pg04k2yy8jy3z-bzflag-2.4.14 - directory tree listing: https://gist.github.com/b4b3a993ddc5d7c26bb2c23aad53029c --- pkgs/games/bzflag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix index 332e84402bb..e6d23cf1b9f 100644 --- a/pkgs/games/bzflag/default.nix +++ b/pkgs/games/bzflag/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bzflag"; - version = "2.4.12"; + version = "2.4.14"; src = fetchurl { url = "https://download.bzflag.org/${pname}/source/${version}/${name}.tar.bz2"; - sha256 = "0380y47kgl97ld3dybjgjr2zwxqky8f938k9z7vad647cic3m8d8"; + sha256 = "1p4vaap8msk7cfqkcc2nrchw7pp4inbyx706zmlwnmpr9k0nx909"; }; nativeBuildInputs = [ pkgconfig ]; From 9167bd48507d4a9e28540e3c105f8d93191d781e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 7 May 2018 14:44:30 +0100 Subject: [PATCH 237/695] mydumper: restrict to linux --- pkgs/tools/backup/mydumper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix index b6c5bfd91fa..e8787855125 100644 --- a/pkgs/tools/backup/mydumper/default.nix +++ b/pkgs/tools/backup/mydumper/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = ''High-perfomance MySQL backup tool''; homepage = https://github.com/maxbube/mydumper; license = licenses.gpl3; - platforms = platforms.all; + platforms = platforms.linux; maintainers = with maintainers; [ izorkin ]; }; } From f5249fa04211d7f66ab9c1f4037816b2bfc13ffa Mon Sep 17 00:00:00 2001 From: WilliButz Date: Mon, 7 May 2018 15:39:38 +0200 Subject: [PATCH 238/695] grafana: 5.1.0 -> 5.1.1 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index df89e67bffc..bcae836cbf2 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "5.1.0"; + version = "5.1.1"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "1j8l8v5iq1mpvc8j7vbwqqd0xhv9ysl05lxwm524cqljynslaq8f"; + sha256 = "0b8i293bfxyblfqwxpb1dkgva95f0bljpvp27j4l4hmjm2g8bpd9"; }; srcStatic = fetchurl { url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz"; - sha256 = "08wha1n3lqn27pc3bc3sg94y47npy69ydh2ad1rbkmvllnjbwx3z"; + sha256 = "0kyfyxcj2yy9v1in6h6kh6sl5p7m03g643qpjriplwwa93bdmk8k"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; From 8be7bb656f3131d57e71aed37b46aa263653ba51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20Mass=C3=A9?= Date: Mon, 7 May 2018 17:10:19 +0200 Subject: [PATCH 239/695] sublime3: 3162(dev), 3143(stable) -> 3170(stable, dev) --- pkgs/applications/editors/sublime/3/packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/sublime/3/packages.nix b/pkgs/applications/editors/sublime/3/packages.nix index 01445ade473..98cfc03c3d2 100644 --- a/pkgs/applications/editors/sublime/3/packages.nix +++ b/pkgs/applications/editors/sublime/3/packages.nix @@ -5,14 +5,14 @@ let in rec { sublime3-dev = common { - buildVersion = "3162"; - x32sha256 = "190il02hqvv64w17w7xc1fz2wkbhk5a5y96jb25dvafmslm46d4i"; - x64sha256 = "1nsjhjs6zajhx7m3dk7i450krg6pb03zffm1n3m1v0xb9zr37xz3"; + buildVersion = "3170"; + x32sha256 = "04ll92mqnpvvaa161il6l02gvd0g0x95sci0yrywr6jzk6am1fzg"; + x64sha256 = "1snzjr000qrjyvzd876x5j66138glh0bff3c1b2cb2bfc88c3kzx"; } {}; sublime3 = common { - buildVersion = "3143"; - x32sha256 = "0dgpx4wij2m77f478p746qadavab172166bghxmj7fb61nvw9v5i"; - x64sha256 = "06b554d2cvpxc976rvh89ix3kqc7klnngvk070xrs8wbyb221qcw"; + buildVersion = "3170"; + x32sha256 = "04ll92mqnpvvaa161il6l02gvd0g0x95sci0yrywr6jzk6am1fzg"; + x64sha256 = "1snzjr000qrjyvzd876x5j66138glh0bff3c1b2cb2bfc88c3kzx"; } {}; } From 9f1017c67927998fb2ff29ea48f4df43c1b91cee Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Sun, 6 May 2018 09:35:01 -0700 Subject: [PATCH 240/695] sit: 0.3.0 -> 0.3.2 --- .../version-management/sit/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index 84211543c3b..0cc75f8bd5a 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -1,23 +1,25 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform, cmake, libzip }: rustPlatform.buildRustPackage rec { name = "sit-${version}"; - version = "0.3.0"; + version = "0.3.2"; src = fetchFromGitHub { owner = "sit-it"; repo = "sit"; rev = "v${version}"; - sha256 = "1si4fg02wxi35hpkr58na06h19yjw6qd9c5mbb9xfkkzgz5mnssj"; + sha256 = "0lhl4rrfmsi76498mg5si2xagl8l2pi5d92dxhsyzszpwn5jdp57"; }; - cargoSha256 = "083p7z7blj064840ddgnxvqjmih4bmy92clds3qgv5v7lh63wfmn"; + buildInputs = [ cmake libzip ]; + + cargoSha256 = "102haqix13nwcncng1s8qkw68spn6fhh3vysk2nbahw6f78zczqg"; meta = with stdenv.lib; { description = "Serverless Information Tracker"; - homepage = http://sit-it.org/; + homepage = https://sit.sh/; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ dywedir ]; + maintainers = with maintainers; [ dywedir yrashk ]; platforms = platforms.all; }; } From 04002e2b7186c166af87c20da7a7ceb8c0edb021 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 7 May 2018 11:01:50 -0500 Subject: [PATCH 241/695] tamarin-prover: 1.3.1 -> 1.4.0 Signed-off-by: Austin Seipp --- .../science/logic/tamarin-prover/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index 4461fa675e8..fb37554b65f 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -4,12 +4,12 @@ }: let - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "tamarin-prover"; repo = "tamarin-prover"; - rev = "ab8a155452e9e9c57ccb4bbe1b94d7677ea5ce21"; - sha256 = "02ycxxkcpc0dzybaq63viciydq1ik8wiv2blk8mvnz3ssxw3sjik"; + rev = "7ced07a69f8e93178f9a95797479277a736ae572"; + sha256 = "02pyw22h90228g6qybjpdvpcm9d5lh96f5qwmy2hv2bylz05z3nn"; }; # tamarin has its own dependencies, but they're kept inside the repo, @@ -80,7 +80,7 @@ mkDerivation (common "tamarin-prover" src // { wrapProgram $out/bin/tamarin-prover \ --prefix PATH : ${lib.makeBinPath [ which maude graphviz sapic ]} # so that the package can be used as a vim plugin to install syntax coloration - install -Dt $out/share/vim-plugins/tamarin-prover/syntax/ etc/{spthy,sapic}.vim + install -Dt $out/share/vim-plugins/tamarin-prover/syntax/ etc/{spthy,sapic}.vim install etc/filetype.vim -D $out/share/vim-plugins/tamarin-prover/ftdetect/tamarin.vim ''; @@ -89,7 +89,7 @@ mkDerivation (common "tamarin-prover" src // { executableHaskellDepends = (with haskellPackages; [ base binary binary-orphans blaze-builder blaze-html bytestring cmdargs conduit containers monad-control deepseq directory fclabels file-embed - filepath gitrev http-types HUnit lifted-base mtl parsec process + filepath gitrev http-types HUnit lifted-base mtl monad-unlift parsec process resourcet safe shakespeare tamarin-prover-term template-haskell text threads time wai warp yesod-core yesod-static ]) ++ [ tamarin-prover-utils From 046e374c9958969462919d192872606bb9f0ed4a Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 5 May 2018 00:11:10 +0200 Subject: [PATCH 242/695] virtualisation/qemu-vm.nix: use lib.optionalString --- nixos/modules/virtualisation/qemu-vm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 66ff43c8547..6acaf63c26a 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -23,7 +23,7 @@ let cfg = config.virtualisation; - qemuGraphics = if cfg.graphics then "" else "-nographic"; + qemuGraphics = lib.optionalString (!cfg.graphics) "-nographic"; kernelConsole = if cfg.graphics then "" else "console=${qemuSerialDevice}"; ttys = [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ]; From 36f4b7f6ba9506a336587c5a528416e948299448 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 5 May 2018 00:12:06 +0200 Subject: [PATCH 243/695] virtualisation/qemu-vm.nix: remove ttys unused. --- nixos/modules/virtualisation/qemu-vm.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 6acaf63c26a..5b98f359de0 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -25,7 +25,6 @@ let qemuGraphics = lib.optionalString (!cfg.graphics) "-nographic"; kernelConsole = if cfg.graphics then "" else "console=${qemuSerialDevice}"; - ttys = [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ]; # XXX: This is very ugly and in the future we really should use attribute # sets to build ALL of the QEMU flags instead of this mixed mess of Nix From 70c57fe3638555d3ae1366e26be445d7f67a81e7 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 5 May 2018 13:44:45 +0200 Subject: [PATCH 244/695] qemu: fix spaces in postInstall --- pkgs/applications/virtualization/qemu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index dd68eb19380..eee42d2ce1e 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -133,7 +133,7 @@ stdenv.mkDerivation rec { postInstall = if stdenv.isx86_64 then ''makeWrapper $out/bin/qemu-system-x86_64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else if stdenv.isi686 then ''makeWrapper $out/bin/qemu-system-i386 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' - else if stdenv.isAarch32 then ''makeWrapper $out/bin/qemu-system-arm $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' + else if stdenv.isAarch32 then ''makeWrapper $out/bin/qemu-system-arm $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else if stdenv.isAarch64 then ''makeWrapper $out/bin/qemu-system-aarch64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else ""; From d4468bedb52bf03ff125d721634f83604bddd589 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 5 May 2018 13:51:04 +0200 Subject: [PATCH 245/695] modules/virtualisation/qemu-vm: always enable serial console Always enable both tty and serial console, but set preferred console depending on cfg.graphical. Even in qemu graphical mode, you can switch to the serial console via Ctrl+Alt+3. With that being done, you also don't need to specify `systemd.services."serial-getty@ttyS0".enable = true;` either as described in https://nixos.wiki/wiki/Cheatsheet#Building_a_service_as_a_VM_.28for_testing.29, as systemd automatically spawns a getty on consoles passwd via cmdline. This also means, vms built by 'nixos-rebuild build-vm' can simply be run properly in nographic mode by appending `-nographic` to `result/bin/run-*-vm`, without the need to explicitly add platform-specific QEMU_KERNEL_PARAMS. --- nixos/modules/virtualisation/qemu-vm.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 5b98f359de0..c788f3ff8ba 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -24,7 +24,11 @@ let cfg = config.virtualisation; qemuGraphics = lib.optionalString (!cfg.graphics) "-nographic"; - kernelConsole = if cfg.graphics then "" else "console=${qemuSerialDevice}"; + + # enable both serial console and tty0. select preferred console (last one) based on cfg.graphics + kernelConsoles = let + consoles = [ "console=${qemuSerialDevice}" "console=tty0" ]; + in lib.concatStringsSep " " (if cfg.graphics then consoles else reverseList consoles); # XXX: This is very ugly and in the future we really should use attribute # sets to build ALL of the QEMU flags instead of this mixed mess of Nix @@ -107,7 +111,7 @@ let ${mkDiskIfaceDriveFlag "0" "file=$NIX_DISK_IMAGE,cache=writeback,werror=report"} \ -kernel ${config.system.build.toplevel}/kernel \ -initrd ${config.system.build.toplevel}/initrd \ - -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${kernelConsole} $QEMU_KERNEL_PARAMS" \ + -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${kernelConsoles} $QEMU_KERNEL_PARAMS" \ ''} \ $extraDisks \ ${qemuGraphics} \ @@ -247,9 +251,10 @@ in default = true; description = '' - Whether to run QEMU with a graphics window, or access - the guest computer serial port through the host tty. - ''; + Whether to run QEMU with a graphics window, or in nographic mode. + Serial console will be enabled on both settings, but this will + change the preferred console. + ''; }; virtualisation.cores = From 7499e4a5b917227696b7292ae1bd728d6b1978b0 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 5 May 2018 14:12:10 +0200 Subject: [PATCH 246/695] modules/virtualisation/qemu-vm: set console baudrate to 115200 --- nixos/modules/virtualisation/qemu-vm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index c788f3ff8ba..f7ec5b088c1 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -27,7 +27,7 @@ let # enable both serial console and tty0. select preferred console (last one) based on cfg.graphics kernelConsoles = let - consoles = [ "console=${qemuSerialDevice}" "console=tty0" ]; + consoles = [ "console=${qemuSerialDevice},115200n8" "console=tty0" ]; in lib.concatStringsSep " " (if cfg.graphics then consoles else reverseList consoles); # XXX: This is very ugly and in the future we really should use attribute From 1bcd9c48fc30b02bc5565f01aaca4d3a9fb5178f Mon Sep 17 00:00:00 2001 From: Risto Helinko Date: Mon, 7 May 2018 20:46:39 +0300 Subject: [PATCH 247/695] libu2f-server: 1.0.1 -> 1.1.0 --- pkgs/development/libraries/libu2f-server/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libu2f-server/default.nix b/pkgs/development/libraries/libu2f-server/default.nix index 5d7da127c2a..6140c13e493 100644 --- a/pkgs/development/libraries/libu2f-server/default.nix +++ b/pkgs/development/libraries/libu2f-server/default.nix @@ -1,15 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, json_c, openssl, check }: +{ stdenv, fetchurl, pkgconfig, json_c, openssl, check, file, help2man, which, gengetopt }: stdenv.mkDerivation rec { - name = "libu2f-server-1.0.1"; - + name = "libu2f-server-1.1.0"; src = fetchurl { url = "https://developers.yubico.com/libu2f-server/Releases/${name}.tar.xz"; - sha256 = "0vhzixz1s629qv9dpdj6b7fxfyxnr5j2vx2cq9q6v790a68ga656"; + sha256 = "0xx296nmmqa57w0v5p2kasl5zr1ms2gh6qi4lhv6xvzbmjp3rkcd"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ json_c openssl check ]; + buildInputs = [ json_c openssl check file help2man which gengetopt ]; meta = with stdenv.lib; { homepage = https://developers.yubico.com/libu2f-server/; From 0b04ed61771d9f4848347d468b73ed581d43f847 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Mon, 7 May 2018 12:53:03 -0500 Subject: [PATCH 248/695] xidlehook: only fixup on linux --- pkgs/tools/X11/xidlehook/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index a71531eebc5..e5717f7f7d4 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ x11 xorg.libXScrnSaver libpulseaudio ]; nativeBuildInputs = [ pkgconfig patchelf ]; - postFixup = '' + postFixup = lib.optionalString stdenv.isLinux '' RPATH="$(patchelf --print-rpath $out/bin/xidlehook)" patchelf --set-rpath "$RPATH:${libpulseaudio}/lib" $out/bin/xidlehook ''; From a55484469259bf6074ce7e4e1c025678c397d6af Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Mon, 7 May 2018 19:53:08 +0200 Subject: [PATCH 249/695] pythonPackages.phonenumbers: 8.9.3 -> 8.9.5 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 47a154a529c..5f1c1b76704 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.9.3"; + version = "8.9.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "68f7402c6d2646adff4df895471f2b47fd61d0cf57c59a06aacc88dfff04a1cb"; + sha256 = "09swdf3f9sdvqyyzkap93012m9fnhamizf42d5kzpdjwikvsfx8x"; }; meta = { From 4b93f21ced4f648de11a92e2d8c5d9bdfc39d086 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Mon, 7 May 2018 19:44:56 +0200 Subject: [PATCH 250/695] unixtools: refactor for less redundancy --- pkgs/top-level/unix-tools.nix | 216 +++++++++++++++++----------------- 1 file changed, 105 insertions(+), 111 deletions(-) diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 26adcda8ee1..6d6e2b2f251 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -11,7 +11,6 @@ # input, not "procps" which requires Linux. let - singleBinary = cmd: providers: let provider = "${lib.getBin providers.${hostPlatform.parsed.kernel.name}}/bin/${cmd}"; in runCommand cmd { @@ -27,8 +26,6 @@ let ln -s "${provider}" "$out/bin/${cmd}" ''; -in rec { - # more is unavailable in darwin # just use less more_compat = runCommand "more" {} '' @@ -36,117 +33,114 @@ in rec { ln -s ${pkgs.less}/bin/less $out/bin/more ''; - # singular binaries - arp = singleBinary "arp" { - linux = pkgs.nettools; - darwin = pkgs.darwin.network_cmds; + bins = lib.mapAttrs singleBinary { + # singular binaries + arp = { + linux = pkgs.nettools; + darwin = pkgs.darwin.network_cmds; + }; + col = { + linux = pkgs.utillinux; + darwin = pkgs.darwin.text_cmds; + }; + eject = { + linux = pkgs.utillinux; + }; + getopt = { + linux = pkgs.utillinux; + darwin = pkgs.getopt; + }; + fdisk = { + linux = pkgs.utillinux; + darwin = pkgs.darwin.diskdev_cmds; + }; + fsck = { + linux = pkgs.utillinux; + darwin = pkgs.darwin.diskdev_cmds; + }; + hexdump = { + linux = pkgs.utillinux; + darwin = pkgs.darwin.shell_cmds; + }; + hostname = { + linux = pkgs.nettools; + darwin = pkgs.darwin.shell_cmds; + }; + ifconfig = { + linux = pkgs.nettools; + darwin = pkgs.darwin.network_cmds; + }; + logger = { + linux = pkgs.utillinux; + }; + more = { + linux = pkgs.utillinux; + darwin = more_compat; + }; + mount = { + linux = pkgs.utillinux; + darwin = pkgs.darwin.diskdev_cmds; + }; + netstat = { + linux = pkgs.nettools; + darwin = pkgs.darwin.network_cmds; + }; + ping = { + linux = pkgs.iputils; + darwin = pkgs.darwin.network_cmds; + }; + ps = { + linux = pkgs.procps; + darwin = pkgs.darwin.ps; + }; + quota = { + linux = pkgs.linuxquota; + darwin = pkgs.darwin.diskdev_cmds; + }; + route = { + linux = pkgs.nettools; + darwin = pkgs.darwin.network_cmds; + }; + script = { + linux = pkgs.utillinux; + darwin = pkgs.darwin.shell_cmds; + }; + sysctl = { + linux = pkgs.procps; + darwin = pkgs.darwin.system_cmds; + }; + top = { + linux = pkgs.procps; + darwin = pkgs.darwin.top; + }; + umount = { + linux = pkgs.utillinux; + darwin = pkgs.darwin.diskdev_cmds; + }; + whereis = { + linux = pkgs.utillinux; + darwin = pkgs.darwin.shell_cmds; + }; + wall = { + linux = pkgs.utillinux; + }; + write = { + linux = pkgs.utillinux; + darwin = pkgs.darwin.basic_cmds; + }; }; - col = singleBinary "col" { - linux = pkgs.utillinux; - darwin = pkgs.darwin.text_cmds; - }; - eject = singleBinary "eject" { - linux = pkgs.utillinux; - }; - getopt = singleBinary "getopt" { - linux = pkgs.utillinux; - darwin = pkgs.getopt; - }; - fdisk = singleBinary "fdisk" { - linux = pkgs.utillinux; - darwin = pkgs.darwin.diskdev_cmds; - }; - fsck = singleBinary "fsck" { - linux = pkgs.utillinux; - darwin = pkgs.darwin.diskdev_cmds; - }; - hexdump = singleBinary "hexdump" { - linux = pkgs.utillinux; - darwin = pkgs.darwin.shell_cmds; - }; - hostname = singleBinary "hostname" { - linux = pkgs.nettools; - darwin = pkgs.darwin.shell_cmds; - }; - ifconfig = singleBinary "ifconfig" { - linux = pkgs.nettools; - darwin = pkgs.darwin.network_cmds; - }; - logger = singleBinary "logger" { - linux = pkgs.utillinux; - }; - more = singleBinary "more" { - linux = pkgs.utillinux; - darwin = more_compat; - }; - mount = singleBinary "mount" { - linux = pkgs.utillinux; - darwin = pkgs.darwin.diskdev_cmds; - }; - netstat = singleBinary "netstat" { - linux = pkgs.nettools; - darwin = pkgs.darwin.network_cmds; - }; - ping = singleBinary "ping" { - linux = pkgs.iputils; - darwin = pkgs.darwin.network_cmds; - }; - ps = singleBinary "ps" { - linux = pkgs.procps; - darwin = pkgs.darwin.ps; - }; - quota = singleBinary "quota" { - linux = pkgs.linuxquota; - darwin = pkgs.darwin.diskdev_cmds; - }; - route = singleBinary "route" { - linux = pkgs.nettools; - darwin = pkgs.darwin.network_cmds; - }; - script = singleBinary "script" { - linux = pkgs.utillinux; - darwin = pkgs.darwin.shell_cmds; - }; - sysctl = singleBinary "sysctl" { - linux = pkgs.procps; - darwin = pkgs.darwin.system_cmds; - }; - top = singleBinary "top" { - linux = pkgs.procps; - darwin = pkgs.darwin.top; - }; - umount = singleBinary "umount" { - linux = pkgs.utillinux; - darwin = pkgs.darwin.diskdev_cmds; - }; - whereis = singleBinary "whereis" { - linux = pkgs.utillinux; - darwin = pkgs.darwin.shell_cmds; - }; - wall = singleBinary "wall" { - linux = pkgs.utillinux; - }; - write = singleBinary "write" { - linux = pkgs.utillinux; - darwin = pkgs.darwin.basic_cmds; + + makeCompat = name': value: buildEnv { + name = name' + "-compat"; + paths = value; }; # Compatibility derivations # Provided for old usage of these commands. - - procps = buildEnv { - name = "procps-compat"; - paths = [ ps sysctl top ]; + compat = with bins; lib.mapAttrs makeCompat { + procps = [ ps sysctl top ]; + utillinux = [ fsck fdisk getopt hexdump mount + script umount whereis write col ]; + nettools = [ arp hostname ifconfig netstat route ]; }; - - utillinux = buildEnv { - name = "utillinux-compat"; - paths = [ fsck fdisk getopt hexdump mount - script umount whereis write col ]; - }; - - nettools = buildEnv { - name = "nettools-compat"; - paths = [ arp hostname ifconfig netstat route ]; - }; -} +in bins // compat From ab0d4f26ff6a35df04968dd97e2a79a5fd901cfb Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Mon, 7 May 2018 20:16:58 +0200 Subject: [PATCH 251/695] unixtools: use 2-space indent --- pkgs/top-level/unix-tools.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 6d6e2b2f251..36fba3fbd47 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -131,8 +131,8 @@ let }; makeCompat = name': value: buildEnv { - name = name' + "-compat"; - paths = value; + name = name' + "-compat"; + paths = value; }; # Compatibility derivations From 08e8701673a84b800e0960c50f78793a23e635ba Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 24 Mar 2018 17:38:45 +0100 Subject: [PATCH 252/695] lib.types: fix loaOf behavior for long lists Assigning a list of 10 or more elements to an option having the type `loaOf a` produces a configuration value that is not honoring the order of the original list. This commit fixes this and a related issue arising when 10 or more lists are merged into this type of option. --- lib/tests/modules.sh | 6 ++++ lib/tests/modules/loaOf-with-long-list.nix | 19 ++++++++++++ .../modules/loaOf-with-many-list-merges.nix | 19 ++++++++++++ lib/types.nix | 29 +++++++++++++------ 4 files changed, 64 insertions(+), 9 deletions(-) create mode 100644 lib/tests/modules/loaOf-with-long-list.nix create mode 100644 lib/tests/modules/loaOf-with-many-list-merges.nix diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index c6b3fd912a9..b83e1eb7d82 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -143,6 +143,12 @@ checkConfigOutput "12" config.value ./declare-coerced-value-unsound.nix checkConfigError 'The option value .* in .* is not.*8 bit signed integer.* or string convertible to it' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix checkConfigError 'unrecognised JSON value' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix +# Check loaOf with long list. +checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-long-list.nix + +# Check loaOf with many merges of lists. +checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-many-list-merges.nix + cat <"]); getSubModules = elemType.getSubModules; substSubModules = m: loaOf (elemType.substSubModules m); From c7577fa1c3aab76f20c5798948f9448c33cb3ae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 7 May 2018 19:11:18 +0100 Subject: [PATCH 253/695] mbedtls: remove darwin patch --- .../libraries/mbedtls/darwin_dylib.patch | 28 ------------------- .../development/libraries/mbedtls/default.nix | 20 ++++++------- 2 files changed, 10 insertions(+), 38 deletions(-) delete mode 100644 pkgs/development/libraries/mbedtls/darwin_dylib.patch diff --git a/pkgs/development/libraries/mbedtls/darwin_dylib.patch b/pkgs/development/libraries/mbedtls/darwin_dylib.patch deleted file mode 100644 index bc6992d6e77..00000000000 --- a/pkgs/development/libraries/mbedtls/darwin_dylib.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/library/Makefile b/library/Makefile -index 28f9231..ad9cc32 100644 ---- a/library/Makefile -+++ b/library/Makefile -@@ -103,9 +103,9 @@ libmbedtls.so: libmbedtls.$(SOEXT_TLS) - echo " LN $@ -> $<" - ln -sf $< $@ - --libmbedtls.dylib: $(OBJS_TLS) -+libmbedtls.dylib: $(OBJS_TLS) libmbedx509.dylib - echo " LD $@" -- $(CC) -dynamiclib $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_TLS) -+ $(CC) -dynamiclib -L. -lmbedcrypto -lmbedx509 $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_TLS) - - libmbedtls.dll: $(OBJS_TLS) libmbedx509.dll - echo " LD $@" -@@ -126,9 +126,9 @@ libmbedx509.so: libmbedx509.$(SOEXT_X509) - echo " LN $@ -> $<" - ln -sf $< $@ - --libmbedx509.dylib: $(OBJS_X509) -+libmbedx509.dylib: $(OBJS_X509) libmbedcrypto.dylib - echo " LD $@" -- $(CC) -dynamiclib $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_X509) -+ $(CC) -dynamiclib -L. -lmbedcrypto $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_X509) - - libmbedx509.dll: $(OBJS_X509) libmbedcrypto.dll - echo " LD $@" diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index bd10824bfa1..74be133b068 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl ]; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin_dylib.patch ]; - postPatch = '' patchShebangs . '' + stdenv.lib.optionalString stdenv.isDarwin '' @@ -34,15 +32,17 @@ stdenv.mkDerivation rec { ]; postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedtls.dylib - install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedx509.dylib - install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $out/lib/libmbedtls.dylib + install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedtls.dylib + install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedx509.dylib + install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $out/lib/libmbedtls.dylib - for exe in $out/bin/*; do - install_name_tool -change libmbedtls.dylib $out/lib/libmbedtls.dylib $exe - install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $exe - install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $exe - done + for exe in $out/bin/*; do + if [[ $exe != *.sh ]]; then + install_name_tool -change libmbedtls.dylib $out/lib/libmbedtls.dylib $exe + install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $exe + install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $exe + fi + done ''; doCheck = true; From 248b05046222d1bcd2df6ef49769e233df3d21d7 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Mon, 7 May 2018 13:38:23 -0500 Subject: [PATCH 254/695] xidlehook: fix eavl --- pkgs/tools/X11/xidlehook/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index e5717f7f7d4..733a8eb630d 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -1,4 +1,5 @@ -{ lib, rustPlatform, fetchFromGitHub, x11, xorg, libpulseaudio, pkgconfig, patchelf }: +{ lib, rustPlatform, fetchFromGitHub, x11, xorg, libpulseaudio, pkgconfig, patchelf +, stdenv}: rustPlatform.buildRustPackage rec { name = "xidlehook-${version}"; From 97947e680b63f63a47363224d2615b457cbd5862 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 7 May 2018 20:45:37 +0200 Subject: [PATCH 255/695] pgpdump: 0.32 -> 0.33 --- pkgs/tools/security/pgpdump/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/tools/security/pgpdump/default.nix index 09b5b5f58ca..82bec2486e8 100644 --- a/pkgs/tools/security/pgpdump/default.nix +++ b/pkgs/tools/security/pgpdump/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "pgpdump-${version}"; - version = "0.32"; + version = "0.33"; src = fetchFromGitHub { owner = "kazu-yamamoto"; repo = "pgpdump"; rev = "v${version}"; - sha256 = "1ip7q5sgh3nwdqbrzpp6sllkls5kma98kns53yspw1830xi1n8xc"; + sha256 = "0pi9qdbmcmi58gmljin51ylbi3zkknl8fm26jm67cpl55hvfsn23"; }; buildInputs = stdenv.lib.optionals supportCompressedPackets [ zlib bzip2 ]; @@ -27,4 +27,3 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ primeos ]; }; } - From 95928538a5fb206b414fb69206b6363365b09aa6 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 7 May 2018 12:33:38 +0200 Subject: [PATCH 256/695] pythonPackages.aiohue: init at 1.3.1 --- .../python-modules/aiohue/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/python-modules/aiohue/default.nix diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix new file mode 100644 index 00000000000..0211fef1606 --- /dev/null +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -0,0 +1,19 @@ +{ lib, stdenv, buildPythonPackage, fetchPypi, aiohttp }: + +buildPythonPackage rec { + pname = "aiohue"; + version = "1.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "05b2fj8pzbij8hglx6p5ckfx0h1b7wcfpys306l853vp56d882yh"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + meta = with lib; { + description = "asyncio package to talk to Philips Hue"; + homepage = https://github.com/balloob/aiohue; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 75cf7561ab6..69cdef2c907 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18253,6 +18253,8 @@ EOF h11 = callPackage ../development/python-modules/h11 { }; python-docx = callPackage ../development/python-modules/python-docx { }; + + aiohue = callPackage ../development/python-modules/aiohue { }; }); in fix' (extends overrides packages) From c7d735a27bc187d3e375a680680424f077162add Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 7 May 2018 12:34:29 +0200 Subject: [PATCH 257/695] pythonPackages.PyMVGLive: init at 1.1.4 --- .../python-modules/pymvglive/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/python-modules/pymvglive/default.nix diff --git a/pkgs/development/python-modules/pymvglive/default.nix b/pkgs/development/python-modules/pymvglive/default.nix new file mode 100644 index 00000000000..1263c498a46 --- /dev/null +++ b/pkgs/development/python-modules/pymvglive/default.nix @@ -0,0 +1,19 @@ +{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: + +buildPythonPackage rec { + pname = "PyMVGLive"; + version = "1.1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0sh4xm74im9qxzpbrlc5h1vnpgvpybnpvdcav1iws0b561zdr08c"; + }; + + propagatedBuildInputs = [ requests ]; + + meta = with lib; { + description = "get live-data from mvg-live.de"; + homepage = https://github.com/pc-coholic/PyMVGLive; + license = licenses.free; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 69cdef2c907..0a8b65e42a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18255,6 +18255,8 @@ EOF python-docx = callPackage ../development/python-modules/python-docx { }; aiohue = callPackage ../development/python-modules/aiohue { }; + + PyMVGLive = callPackage ../development/python-modules/pymvglive { }; }); in fix' (extends overrides packages) From 509a340d901228667cc8484d29319dfaee59ddf1 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 7 May 2018 12:35:16 +0200 Subject: [PATCH 258/695] pythonPackages.coinmarketcap: init at 4.2.1 --- .../python-modules/coinmarketcap/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/python-modules/coinmarketcap/default.nix diff --git a/pkgs/development/python-modules/coinmarketcap/default.nix b/pkgs/development/python-modules/coinmarketcap/default.nix new file mode 100644 index 00000000000..52afdee46ab --- /dev/null +++ b/pkgs/development/python-modules/coinmarketcap/default.nix @@ -0,0 +1,19 @@ +{ lib, stdenv, buildPythonPackage, fetchPypi, requests-cache }: + +buildPythonPackage rec { + pname = "coinmarketcap"; + version = "4.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0bk530cmfqri84m9386ydn3f89gq23nxylvnl523gr5589vw54bj"; + }; + + propagatedBuildInputs = [ requests-cache ]; + + meta = with lib; { + description = "A python wrapper around the https://coinmarketcap.com API."; + homepage = https://github.com/barnumbirr/coinmarketcap; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0a8b65e42a5..034622e213b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18257,6 +18257,8 @@ EOF aiohue = callPackage ../development/python-modules/aiohue { }; PyMVGLive = callPackage ../development/python-modules/pymvglive { }; + + coinmarketcap = callPackage ../development/python-modules/coinmarketcap { }; }); in fix' (extends overrides packages) From 11ad51893516dbc284a5eb5958f12de9b2230b84 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 7 May 2018 12:35:40 +0200 Subject: [PATCH 259/695] pythonPackages.pyowm: init at 2.8.0 --- .../python-modules/pyowm/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/python-modules/pyowm/default.nix diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix new file mode 100644 index 00000000000..26606a580a4 --- /dev/null +++ b/pkgs/development/python-modules/pyowm/default.nix @@ -0,0 +1,19 @@ +{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: + +buildPythonPackage rec { + pname = "pyowm"; + version = "2.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0y2r322pcamabar70513pbyiq26x33l1aq9cim6k30lk9p4aq310"; + }; + + propagatedBuildInputs = [ requests ]; + + meta = with lib; { + description = "A Python wrapper around the OpenWeatherMap web API"; + homepage = https://pyowm.readthedocs.io/; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 034622e213b..7868f7d7ff0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18259,6 +18259,8 @@ EOF PyMVGLive = callPackage ../development/python-modules/pymvglive { }; coinmarketcap = callPackage ../development/python-modules/coinmarketcap { }; + + pyowm = callPackage ../development/python-modules/pyowm { }; }); in fix' (extends overrides packages) From 1a7a886234b4cf638c0d6ebd42016333edffb428 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 7 May 2018 12:36:03 +0200 Subject: [PATCH 260/695] home-assistant: use new python modules for components --- pkgs/servers/home-assistant/component-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 3e95b41fb7e..6e0e216488d 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -116,7 +116,7 @@ "homematic" = ps: with ps; [ pyhomematic ]; "homematicip_cloud" = ps: with ps; [ ]; "http" = ps: with ps; [ aiohttp-cors ]; - "hue" = ps: with ps; [ ]; + "hue" = ps: with ps; [ aiohue ]; "ifttt" = ps: with ps; [ ]; "ihc" = ps: with ps; [ ]; "image_processing.dlib_face_detect" = ps: with ps; [ face_recognition ]; @@ -285,7 +285,7 @@ "sensor.bme680" = ps: with ps; [ ]; "sensor.broadlink" = ps: with ps; [ ]; "sensor.buienradar" = ps: with ps; [ ]; - "sensor.coinmarketcap" = ps: with ps; [ ]; + "sensor.coinmarketcap" = ps: with ps; [ coinmarketcap ]; "sensor.cpuspeed" = ps: with ps; [ ]; "sensor.crimereports" = ps: with ps; [ ]; "sensor.cups" = ps: with ps; [ pycups ]; @@ -335,12 +335,12 @@ "sensor.miflora" = ps: with ps; [ ]; "sensor.modem_callerid" = ps: with ps; [ ]; "sensor.mopar" = ps: with ps; [ ]; - "sensor.mvglive" = ps: with ps; [ ]; + "sensor.mvglive" = ps: with ps; [ PyMVGLive ]; "sensor.nederlandse_spoorwegen" = ps: with ps; [ ]; "sensor.neurio_energy" = ps: with ps; [ ]; "sensor.nut" = ps: with ps; [ ]; "sensor.openevse" = ps: with ps; [ ]; - "sensor.openweathermap" = ps: with ps; [ ]; + "sensor.openweathermap" = ps: with ps; [ pyowm ]; "sensor.otp" = ps: with ps; [ ]; "sensor.plex" = ps: with ps; [ ]; "sensor.pocketcasts" = ps: with ps; [ ]; @@ -453,7 +453,7 @@ "weather.buienradar" = ps: with ps; [ ]; "weather.darksky" = ps: with ps; [ ]; "weather.metoffice" = ps: with ps; [ ]; - "weather.openweathermap" = ps: with ps; [ ]; + "weather.openweathermap" = ps: with ps; [ pyowm ]; "weather.yweather" = ps: with ps; [ yahooweather ]; "wemo" = ps: with ps; [ ]; "wink" = ps: with ps; [ ]; From b0d70d336dd769bf06ff336882faabe5cebf2343 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Mon, 7 May 2018 21:48:08 +0200 Subject: [PATCH 261/695] iml: use openblas instead of atlas --- pkgs/development/libraries/iml/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/development/libraries/iml/default.nix index 4af2bba9160..b55d13ecc3f 100644 --- a/pkgs/development/libraries/iml/default.nix +++ b/pkgs/development/libraries/iml/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gmp, atlas}: +{stdenv, autoreconfHook, fetchurl, gmp, openblas}: stdenv.mkDerivation rec { name = "iml-${version}"; version = "1.0.5"; @@ -6,8 +6,18 @@ stdenv.mkDerivation rec { url = "http://www.cs.uwaterloo.ca/~astorjoh/iml-${version}.tar.bz2"; sha256 = "0akwhhz9b40bz6lrfxpamp7r7wkk48p455qbn04mfnl9a1l6db8x"; }; - buildInputs = [gmp atlas]; - configureFlags = "--with-gmp-include=${gmp.dev}/include --with-gmp-lib=${gmp}/lib"; + buildInputs = [ + gmp + openblas + ]; + nativeBuildInputs = [ + autoreconfHook + ]; + configureFlags = [ + "--with-gmp-include=${gmp.dev}/include" + "--with-gmp-lib=${gmp}/lib" + "--with-cblas=-lopenblas" + ]; meta = { inherit version; description = ''Algorithms for computing exact solutions to dense systems of linear equations over the integers''; From fcfecf8c2009d6dd67bed14e82fbbc44a1bd8a17 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 7 May 2018 21:47:26 +0200 Subject: [PATCH 262/695] =?UTF-8?q?telepathy-logger:=200.8.0=20=E2=86=92?= =?UTF-8?q?=200.8.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The previous update attempt (76f9a4d7111a362035ee741cd08ea22a27bbd6bc) did not change the hash 😞 --- .../networking/instant-messengers/telepathy/logger/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index f1b3c55d14c..1791a7ff1dd 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2"; - sha256 = "18i00l8lnp5dghqmgmpxnn0is2a20pkisxy0sb78hnd2dz0z6xnl"; + sha256 = "1bjx85k7jyfi5pvl765fzc7q2iz9va51anrc2djv7caksqsdbjlg"; }; nativeBuildInputs = [ From 4ee409a59c106a63697b82f8f2c7e2df45a748f7 Mon Sep 17 00:00:00 2001 From: Roland Koebler Date: Mon, 7 May 2018 22:25:14 +0200 Subject: [PATCH 263/695] i3lock/i3lock-color: meta: improve description - i3lock-color: extend description to differ from i3lock - i3lock/i3lock-color: add long description --- .../window-managers/i3/lock-color.nix | 25 +++++++++++++++++-- pkgs/applications/window-managers/i3/lock.nix | 5 ++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index 66a6af2fbb0..ea1f1bda9f1 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -27,8 +27,29 @@ stdenv.mkDerivation rec { mv $out/bin/i3lock $out/bin/i3lock-color ''; meta = with stdenv.lib; { - description = "A simple screen locker like slock"; - homepage = https://i3wm.org/i3lock/; + description = "A simple screen locker like slock, enhanced version with extra configuration options"; + longDescription = '' + Simple screen locker. After locking, a colored background (default: white) or + a configurable image is shown, and a ring-shaped unlock-indicator gives feedback + for every keystroke. After entering your password, the screen is unlocked again. + + i3lock-color is forked from i3lock (https://i3wm.org/i3lock/) with the following + enhancements / additional configuration options: + + - indicator: + - shape: ring or bar + - size: configurable + - all colors: configurable + - all texts: configurable + - visibility: can be always visible, can be restricted to some screens + + - background: optionally show a blurred screen instead of a single color + + - more information: show text at configurable positions: + - clock: time/date with configurable format + - keyboard-layout + ''; + homepage = http://github.com/PandorasFox/i3lock-color; maintainers = with maintainers; [ garbas malyn ]; license = licenses.bsd3; diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index 4d572e8c040..d4bb3cdc1c2 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -23,6 +23,11 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple screen locker like slock"; + longDescription = '' + Simple screen locker. After locking, a colored background (default: white) or + a configurable image is shown, and a ring-shaped unlock-indicator gives feedback + for every keystroke. After entering your password, the screen is unlocked again. + ''; homepage = https://i3wm.org/i3lock/; maintainers = with maintainers; [ garbas malyn domenkozar ]; license = licenses.bsd3; From 783d547bddf66070b3a33b1fd4b972d945e5942c Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Mon, 7 May 2018 13:33:51 -0700 Subject: [PATCH 264/695] sit: fix tests on aarch64 As we found out in #40032, sit tests won't pass on aarch64. The problem seems to be related to `create_dir` not returning an error if the directory already exists, happening specifically on aarch64+debug (not aarch64+release) This update injects a patch for tests that will also be included in subsequent versions of SIT. --- .../version-management/sit/aarch64-eexist.patch | 17 +++++++++++++++++ .../version-management/sit/default.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/applications/version-management/sit/aarch64-eexist.patch diff --git a/pkgs/applications/version-management/sit/aarch64-eexist.patch b/pkgs/applications/version-management/sit/aarch64-eexist.patch new file mode 100644 index 00000000000..8b45e77d040 --- /dev/null +++ b/pkgs/applications/version-management/sit/aarch64-eexist.patch @@ -0,0 +1,17 @@ +diff --git a/sit-core/src/repository.rs b/sit-core/src/repository.rs +index ebd357d..074dcc9 100644 +--- a/sit-core/src/repository.rs ++++ b/sit-core/src/repository.rs +@@ -305,6 +305,12 @@ impl Repository { + let id: String = name.into(); + let mut path = self.items_path.clone(); + path.push(&id); ++ #[cfg(all(debug_assertions, target_arch = "aarch64"))] { ++ use std::io; ++ if path.is_dir() { ++ return Err(io::Error::from_raw_os_error(17).into()); // 17 is EEXIST ++ } ++ } + fs::create_dir(path)?; + let id = OsString::from(id); + Ok(Item { diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index 0cc75f8bd5a..ae84add283e 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -15,6 +15,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "102haqix13nwcncng1s8qkw68spn6fhh3vysk2nbahw6f78zczqg"; + patches = [ ./aarch64-eexist.patch ]; + meta = with stdenv.lib; { description = "Serverless Information Tracker"; homepage = https://sit.sh/; From 810976e5912771722ee0331d59c5451c914da44a Mon Sep 17 00:00:00 2001 From: Roland Koebler Date: Mon, 7 May 2018 23:19:02 +0200 Subject: [PATCH 265/695] i3lock-color: fix manpage-name and manpage (#40095) - rename manpage from i3lock.1 to i3lock-color.1 - change "i3lock" to "i3lock-color" in manpage-synopsis --- pkgs/applications/window-managers/i3/lock-color.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index 66a6af2fbb0..b7545d5cd1c 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc MANDIR=\${out}/share/man"; postInstall = '' mv $out/bin/i3lock $out/bin/i3lock-color + mv $out/share/man/man1/i3lock.1 $out/share/man/man1/i3lock-color.1 + sed -i 's/\(^\|\s\|"\)i3lock\(\s\|$\)/\1i3lock-color\2/g' $out/share/man/man1/i3lock-color.1 ''; meta = with stdenv.lib; { description = "A simple screen locker like slock"; From ec198337c4d50e4bd94e84db6bc886d375761564 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 7 May 2018 23:57:48 +0200 Subject: [PATCH 266/695] love_11: init at 11.1 --- pkgs/development/interpreters/love/11.1.nix | 41 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/interpreters/love/11.1.nix diff --git a/pkgs/development/interpreters/love/11.1.nix b/pkgs/development/interpreters/love/11.1.nix new file mode 100644 index 00000000000..e92a84b40b8 --- /dev/null +++ b/pkgs/development/interpreters/love/11.1.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU_combined, openal, luajit, + libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg, + libtheora, which, autoconf, automake, libtool +}: + +let + pname = "love"; + version = "11.1"; +in + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + src = fetchFromBitbucket { + owner = "rude"; + repo = "love"; + rev = "${version}"; + sha256 = "16jn6klbsz8qi2wn3llbr7ri5arlc0b19la19ypzk6p7v20z4sfr"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + SDL2 libGLU_combined openal luajit libdevil freetype physfs libmodplug mpg123 + libvorbis libogg libtheora autoconf which libtool automake + ]; + + preConfigure = "$shell ./platform/unix/automagic"; + + configureFlags = [ + "--with-lua=luajit" + ]; + + NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3 + + meta = { + homepage = http://love2d.org; + description = "A Lua-based 2D game engine/scripting language"; + license = stdenv.lib.licenses.zlib; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.raskin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35daa86a615..3d0b125b8a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7115,6 +7115,7 @@ with pkgs; love_0_8 = callPackage ../development/interpreters/love/0.8.nix { lua=lua5_1; }; love_0_9 = callPackage ../development/interpreters/love/0.9.nix { }; love_0_10 = callPackage ../development/interpreters/love/0.10.nix { }; + love_11 = callPackage ../development/interpreters/love/11.1.nix { }; love = love_0_10; ### LUA MODULES From b45fa92de64c4df29587e78ccbeb69052d032596 Mon Sep 17 00:00:00 2001 From: Roland Koebler Date: Tue, 8 May 2018 00:39:38 +0200 Subject: [PATCH 267/695] ext4magic: init at 0.3.2 --- maintainers/maintainer-list.nix | 5 +++ pkgs/tools/filesystems/ext4magic/default.nix | 39 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 46 insertions(+) create mode 100644 pkgs/tools/filesystems/ext4magic/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9369a76688c..91db07f4795 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3144,6 +3144,11 @@ github = "rittelle"; name = "Lennart Rittel"; }; + rkoe = { + email = "rk@simple-is-better.org"; + github = "rkoe"; + name = "Roland Koebler"; + }; rlupton20 = { email = "richard.lupton@gmail.com"; github = "rlupton20"; diff --git a/pkgs/tools/filesystems/ext4magic/default.nix b/pkgs/tools/filesystems/ext4magic/default.nix new file mode 100644 index 00000000000..0211ab63b3e --- /dev/null +++ b/pkgs/tools/filesystems/ext4magic/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, fetchpatch, file, libuuid, e2fsprogs, zlib, bzip2 }: + +stdenv.mkDerivation rec { + version = "0.3.2"; + name = "ext4magic-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/ext4magic/${name}.tar.gz"; + sha256 = "8d9c6a594f212aecf4eb5410d277caeaea3adc03d35378257dfd017ef20ea115"; + }; + + patches = [ + (fetchpatch { + url = https://sourceforge.net/p/ext4magic/tickets/10/attachment/ext4magic-0.3.2-i_dir_acl.patch; + sha256 = "1accydd8kigid68yir2fbihm3r3x8ws3iyznp25snkx41w6y6x8c"; + }) + ]; + + buildInputs = [ file libuuid e2fsprogs zlib bzip2 ]; + installFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "Recover / undelete files from ext3 or ext4 partitions"; + longDescription = '' + ext4magic can recover/undelete files from ext3 or ext4 partitions + by retrieving file-information from the filesystem journal. + + If the information in the journal are sufficient, ext4magic can + recover the most file types, with original filename, owner and group, + file mode bits and also the old atime/mtime stamps. + + It's much more effective and works much better than extundelete. + ''; + homepage = http://ext4magic.sourceforge.net/ext4magic_en.html; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.rkoe ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fb532e14c4..8f8184075a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2209,6 +2209,8 @@ with pkgs; exiftool = perlPackages.ImageExifTool; + ext4magic = callPackage ../tools/filesystems/ext4magic { }; + extundelete = callPackage ../tools/filesystems/extundelete { }; expect = callPackage ../tools/misc/expect { }; From 480d52ebed1c80e3eff8e8dc6ddb2a402bf3d102 Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Mon, 7 May 2018 16:18:22 -0700 Subject: [PATCH 268/695] sit: better fix for aarch64 bug --- .../version-management/sit/aarch64-eexist.patch | 17 ----------------- .../version-management/sit/aarch64-isel.patch | 9 +++++++++ .../version-management/sit/default.nix | 2 +- 3 files changed, 10 insertions(+), 18 deletions(-) delete mode 100644 pkgs/applications/version-management/sit/aarch64-eexist.patch create mode 100644 pkgs/applications/version-management/sit/aarch64-isel.patch diff --git a/pkgs/applications/version-management/sit/aarch64-eexist.patch b/pkgs/applications/version-management/sit/aarch64-eexist.patch deleted file mode 100644 index 8b45e77d040..00000000000 --- a/pkgs/applications/version-management/sit/aarch64-eexist.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/sit-core/src/repository.rs b/sit-core/src/repository.rs -index ebd357d..074dcc9 100644 ---- a/sit-core/src/repository.rs -+++ b/sit-core/src/repository.rs -@@ -305,6 +305,12 @@ impl Repository { - let id: String = name.into(); - let mut path = self.items_path.clone(); - path.push(&id); -+ #[cfg(all(debug_assertions, target_arch = "aarch64"))] { -+ use std::io; -+ if path.is_dir() { -+ return Err(io::Error::from_raw_os_error(17).into()); // 17 is EEXIST -+ } -+ } - fs::create_dir(path)?; - let id = OsString::from(id); - Ok(Item { diff --git a/pkgs/applications/version-management/sit/aarch64-isel.patch b/pkgs/applications/version-management/sit/aarch64-isel.patch new file mode 100644 index 00000000000..411922cfd8e --- /dev/null +++ b/pkgs/applications/version-management/sit/aarch64-isel.patch @@ -0,0 +1,9 @@ +diff --git a/.cargo/config b/.cargo/config +new file mode 100644 +index 0000000..15e7649 +--- /dev/null ++++ b/.cargo/config +@@ -0,0 +1,3 @@ ++# https://github.com/rust-lang/rust/issues/50516 ++[target.'cfg(all(debug_assertions, target_arch = "aarch64"))'] ++rustflags = ["-C", "llvm-args=-fast-isel"] diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index ae84add283e..e189241531d 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "102haqix13nwcncng1s8qkw68spn6fhh3vysk2nbahw6f78zczqg"; - patches = [ ./aarch64-eexist.patch ]; + patches = [ ./aarch64-isel.patch ]; meta = with stdenv.lib; { description = "Serverless Information Tracker"; From 8b5ecf9141ded0e10e33537b17bb48b01669fbc4 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Tue, 24 Apr 2018 23:30:27 +0200 Subject: [PATCH 269/695] brial: init at 1.2.3 --- .../libraries/science/math/brial/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/libraries/science/math/brial/default.nix diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix new file mode 100644 index 00000000000..0c0332f1366 --- /dev/null +++ b/pkgs/development/libraries/science/math/brial/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +, pkgconfig +, boost +, m4ri +, gd +}: + +stdenv.mkDerivation rec { + version = "1.2.3"; + name = "brial-${version}"; + + src = fetchFromGitHub { + owner = "BRiAl"; + repo = "BRiAl"; + rev = version; + sha256 = "0qy4cwy7qrk4zg151cmws5cglaa866z461cnj9wdnalabs7v7qbg"; + }; + + # FIXME package boost-test and enable checks + doCheck = false; + + configureFlags = [ + "--with-boost-unit-test-framework=no" + ]; + + buildInputs = [ + boost + m4ri + gd + ]; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/BRiAl/BRiAl; + description = "Legacy version of PolyBoRi maintained by sagemath developers"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9199f7af2f8..442c4b21d68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19947,6 +19947,8 @@ with pkgs; blas = callPackage ../development/libraries/science/math/blas { }; + brial = callPackage ../development/libraries/science/math/brial { }; + clblas = callPackage ../development/libraries/science/math/clblas { inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo OpenCL; }; From 16463d728b81f159e3b5f4eaae241841b227d86f Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Tue, 8 May 2018 01:00:36 +0200 Subject: [PATCH 270/695] zoom-us: liblgvnd fix for libGL.so in libpath --- .../networking/instant-messengers/zoom-us/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index db32dd0c23e..692a4362935 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, system, makeWrapper, makeDesktopItem, alsaLib, dbus, glib, fontconfig, freetype, libpulseaudio, - utillinux, zlib, xorg, udev, sqlite, expat, libv4l, procps }: + utillinux, zlib, xorg, udev, sqlite, expat, libv4l, procps, libGL }: let @@ -24,6 +24,7 @@ in stdenv.mkDerivation { expat glib freetype + libGL libpulseaudio zlib dbus From 302c4c5f2da82794f2f7fb217a1b977897f852fa Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 7 May 2018 19:53:56 -0400 Subject: [PATCH 271/695] stdenv: Put back isArm, with deprecation notice. This was always meant to be deprecated rather than removed. --- pkgs/stdenv/generic/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 190fc500068..e9ae54811a2 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -118,6 +118,7 @@ let inherit (hostPlatform) isDarwin isLinux isSunOS isHurd isCygwin isFreeBSD isOpenBSD isi686 isx86_64 is64bit isAarch32 isAarch64 isMips isBigEndian; + isArm = builtins.trace "stdenv.isArm is deprecated after 18.03" hostPlatform.isArm; # Whether we should run paxctl to pax-mark binaries. needsPax = isLinux; From 3e7bcb69377fdb18cf283c9c18b884536a1326bb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 8 May 2018 02:34:14 +0200 Subject: [PATCH 272/695] =?UTF-8?q?meld:=203.18.0=20=E2=86=92=203.18.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/version-management/meld/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index e3cafe6b646..f6816ec1548 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -5,14 +5,14 @@ let pname = "meld"; - version = "3.18.0"; + version = "3.18.1"; inherit (python3Packages) python buildPythonApplication pycairo pygobject3; in buildPythonApplication rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0gi2jzgsrd5q2icyp6wphbn532ddg82nxhfxlffkniy7wnqmi0c4"; + sha256 = "0yg8i1ff3rsavsaxbnd6dxmfsiyv49kk8rv5wqnyhf2zmfp8rxis"; }; buildInputs = [ From 9ad901ae1f4c7e9bb9aedf497b1a904dd960359e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 8 May 2018 02:34:36 +0200 Subject: [PATCH 273/695] =?UTF-8?q?gnome3.bijiben:=203.28.1=20=E2=86=92=20?= =?UTF-8?q?3.28.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/apps/bijiben/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/apps/bijiben/default.nix index 93a2c41caf3..5ed4b487bdd 100644 --- a/pkgs/desktops/gnome-3/apps/bijiben/default.nix +++ b/pkgs/desktops/gnome-3/apps/bijiben/default.nix @@ -5,13 +5,13 @@ , gnome3, libxml2 }: let - version = "3.28.1"; + version = "3.28.2"; in stdenv.mkDerivation rec { name = "bijiben-${version}"; src = fetchurl { url = "mirror://gnome/sources/bijiben/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0ivx3hbpg7qaqzpbbn06lz9w3q285vhwgfr353b14bg0nsidwy17"; + sha256 = "1z1dqspjpyym27yav7pr813x7k0jdxifgj5rdxgp4m6cs1ixcvjs"; }; doCheck = true; From 715adbfad3e2c8d5638bbf8d4f747936f8cf9502 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 8 May 2018 02:34:50 +0200 Subject: [PATCH 274/695] =?UTF-8?q?evolution:=203.28.1=20=E2=86=92=203.28.?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/apps/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index d7def6e2709..4470f11597e 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -5,13 +5,13 @@ , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }: let - version = "3.28.1"; + version = "3.28.2"; in stdenv.mkDerivation rec { name = "evolution-${version}"; src = fetchurl { url = "mirror://gnome/sources/evolution/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0sdv5lg2vlz5f4raymz9d8a5jq4j18vbqyigaip6508p3bjnfj8l"; + sha256 = "0lx9amjxmfnwc0089griyxms9prmb78wfnfvdsvli8yw1cns4i74"; }; propagatedUserEnvPkgs = [ gnome3.evolution-data-server ]; From cafac77e205abebc42dec80eafe9a021116b7236 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 8 May 2018 02:35:09 +0200 Subject: [PATCH 275/695] =?UTF-8?q?gnome3.gnome-boxes:=203.28.2=20?= =?UTF-8?q?=E2=86=92=203.28.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 8921d70787c..0ba4199630a 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -9,13 +9,13 @@ # TODO: ovirt (optional) let - version = "3.28.2"; + version = "3.28.3"; in stdenv.mkDerivation rec { name = "gnome-boxes-${version}"; src = fetchurl { url = "mirror://gnome/sources/gnome-boxes/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0xss6wrs4hkmr0aa9qxr9b6wxbygrkjz4p0c4xnymicq97jnwra1"; + sha256 = "05x9c7w60cafcd3bdkr68ra8pbh7m8pciw67871hckaqafw76q1d"; }; doCheck = true; From df8665d04e81be9434a0887f38c563b5f5e4066f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 8 May 2018 02:35:29 +0200 Subject: [PATCH 276/695] =?UTF-8?q?gnome3.gnome-calendar:=203.28.1=20?= =?UTF-8?q?=E2=86=92=203.28.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index b88bad2f649..347cd7a16ae 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -4,13 +4,13 @@ let pname = "gnome-calendar"; - version = "3.28.1"; + version = "3.28.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1jacznnjql5jgzvzcp5kh2k0cd0y41cri6qz2bsakpllf7adbrq6"; + sha256 = "0x6wxngf8fkwgbl6x7rzp0srrb43rm55klpb2vfjk2hahpbjvxyw"; }; passthru = { From 2a5ce6157af7192bce259c4d2d088aab1c86401d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 8 May 2018 02:35:43 +0200 Subject: [PATCH 277/695] =?UTF-8?q?gnome3.gnome-characters:=203.28.0=20?= =?UTF-8?q?=E2=86=92=203.28.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/apps/gnome-characters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index 1587fec2c69..b07417ecc35 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gnome-characters-${version}"; - version = "3.28.0"; + version = "3.28.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "14q92ysg7krawxlwv6ymgsxz2plk81wgfz6knlma7lm13jsczmf0"; + sha256 = "04nmn23iw65wsczx1l6fa4jfdsv65klb511p39zj1pgwyisgj5l0"; }; postPatch = '' From 048de32f28baff1e0defd5c27370dbb56559ea04 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 8 May 2018 02:35:52 +0200 Subject: [PATCH 278/695] =?UTF-8?q?gnome3.gnome-logs:=203.28.0=20=E2=86=92?= =?UTF-8?q?=203.28.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/apps/gnome-logs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index c184bcbb42d..614308f7b63 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gnome-logs-${version}"; - version = "3.28.0"; + version = "3.28.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-logs/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0j3wkbz7c2snmx4kjmh767175nf2lqxx2p8b8xa2qslknxc3gq6b"; + sha256 = "0qqmw55rrxdz2n9xwn85nm7j9y9i85fxlxjfgv683mbpdyv0gbg0"; }; configureFlags = [ "--disable-tests" ]; From 2415bdc78e04068fc79a54d2bf694b761061b2f9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 8 May 2018 02:36:02 +0200 Subject: [PATCH 279/695] =?UTF-8?q?gnome3.gnome-maps:=203.28.1=20=E2=86=92?= =?UTF-8?q?=203.28.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/apps/gnome-maps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index b5c8188bd06..cade274e69a 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-maps"; - version = "3.28.1"; + version = "3.28.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "19xx1v25ycr8ih4jwb1vc662jcx6kynaf7baj4i569ccrcwaj2d5"; + sha256 = "1yzi08a9316jplgsl2z0qzlqxhghyqcjhv0m6i94wcain4mxk1z7"; }; doCheck = true; From 47d29c502f00afc6949baaa22e537fda7ef0c1e8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 8 May 2018 02:36:10 +0200 Subject: [PATCH 280/695] =?UTF-8?q?gnome3.gnome-music:=203.28.1=20?= =?UTF-8?q?=E2=86=92=203.28.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/apps/gnome-music/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index c2d5045e79e..9aa8eee0bca 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "3.28.1"; + version = "3.28.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${pname}-${version}.tar.xz"; - sha256 = "0xbwndfl72292dx4x99vm0iyrcy8xw2i5fhsch7b073rk4ydbyfx"; + sha256 = "0xkbw9cp002vwwq6vlsbkahz9xbwpkyydd9cvh7az379sdlz4rid"; }; nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobjectIntrospection ]; From ffda669690e5b91ba55cc2ce5803a3dcb46c539c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 8 May 2018 02:36:21 +0200 Subject: [PATCH 281/695] =?UTF-8?q?gnome3.eog:=203.28.1=20=E2=86=92=203.28?= =?UTF-8?q?.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/eog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index 85587d11178..7f7a533a550 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -4,13 +4,13 @@ let pname = "eog"; - version = "3.28.1"; + version = "3.28.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1v3s4x4xdmfa488drwvxfps33jiyh3qz9z8v8s3779n1jn92rmbq"; + sha256 = "1gasrfqi7qrzdq1idh29r0n6ikkqjb6pbp7a8k5krfz5hkhyfin0"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobjectIntrospection ]; From 44e49b9e450f9b532f59cc75d9969e731ad7a37d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 8 May 2018 02:36:37 +0200 Subject: [PATCH 282/695] =?UTF-8?q?evolution-data-server:=203.28.1=20?= =?UTF-8?q?=E2=86=92=203.28.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/evolution-data-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 2e87c4a44a1..a9516206859 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "evolution-data-server-${version}"; - version = "3.28.1"; + version = "3.28.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "12b9lfgwd57rzn9394xrbvl9ym5aqldpz9v7c9a421dsv8dgq13b"; + sha256 = "1azk8zh167a6hyxzz73yh36gbpf7i52b7zi10hnnnsywh80pj6jk"; }; nativeBuildInputs = [ From 6353a952ceae4785e879d5614a92121d4987452a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 8 May 2018 02:36:57 +0200 Subject: [PATCH 283/695] =?UTF-8?q?gnome3.gjs:=201.52.2=20=E2=86=92=201.52?= =?UTF-8?q?.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/gjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix index fc352de2acf..1bf640f713f 100644 --- a/pkgs/desktops/gnome-3/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/core/gjs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gjs-${version}"; - version = "1.52.2"; + version = "1.52.3"; src = fetchurl { url = "mirror://gnome/sources/gjs/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "00x08ypx61i3k84bmvkhdj37q81g79lzm5sxqm1lz4xzzad9rg98"; + sha256 = "1z4n15wdz6pbqd2hfzrqc8mmprhv50v4jk43p08v0xv07yldh8ff"; }; passthru = { From 6465aaac0640f88d1fe0d9aa56543381e118769d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 8 May 2018 02:37:17 +0200 Subject: [PATCH 284/695] =?UTF-8?q?gnome3.gnome-contacts:=203.28.1=20?= =?UTF-8?q?=E2=86=92=203.28.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/gnome-contacts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index c8636cb1dc1..5799e613d5b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -5,13 +5,13 @@ , vala, meson, ninja }: let - version = "3.28.1"; + version = "3.28.2"; in stdenv.mkDerivation rec { name = "gnome-contacts-${version}"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "17iinxqf221kk9yppv3yhg0m7jxk5zvwxmdf3hjygf9xgfw7z3zi"; + sha256 = "1ilgmvgprn1slzmrzbs0zwgbzxp04rn5ycqd9c8zfvyh6zzwwr8w"; }; propagatedUserEnvPkgs = [ evolution-data-server ]; From fef1129d4e648d7beebff3bcc7fc00d37e798fb6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 8 May 2018 02:37:35 +0200 Subject: [PATCH 285/695] =?UTF-8?q?gnome3.gnome-keyring:=203.28.0.2=20?= =?UTF-8?q?=E2=86=92=203.28.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/gnome-keyring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index 740748631ee..39108141c93 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-keyring-${version}"; - version = "3.28.0.2"; + version = "3.28.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-keyring/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0a52xz535vgfymjw3cxmryi3xn2ik24vwk6sixyb7q6jgmqi4bw8"; + sha256 = "0sk4las4ji8wv9nx8mldzqccmpmkvvr9pdwv9imj26r10xyin5w1"; }; passthru = { From 2b1db532967ec7d902868e286dd00a9b237b5032 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 8 May 2018 02:37:59 +0200 Subject: [PATCH 286/695] =?UTF-8?q?gnome3.gnome-shell-extensions:=203.28.0?= =?UTF-8?q?=20=E2=86=92=203.28.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gnome-3/core/gnome-shell-extensions/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index 7ba3545848f..a963ea148ba 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gnome-shell-extensions-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "00xm5r4q40c0ji80vrsqg2fkrvzb1nm75p3ikv6bsmd3gfvwwp91"; + sha256 = "0n4h8rdnq3knrvlg6inrl62a73h20dbhfgniwy18572jicrh5ip9"; }; passthru = { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # Fixup adapted from export-zips.sh in the source. extensiondir=$out/share/gnome-shell/extensions - schemadir=$out/share/gsettings-schemas/gnome-shell-extensions-3.28.0/glib-2.0/schemas/ + schemadir=$out/share/gsettings-schemas/${name}/glib-2.0/schemas/ glib-compile-schemas $schemadir From df805805213aa1a6b699e194f2aa4f3570fd3919 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 8 May 2018 02:38:21 +0200 Subject: [PATCH 287/695] =?UTF-8?q?gnome3.gnome-shell:=203.28.0=20?= =?UTF-8?q?=E2=86=92=203.28.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 70177d0a516..6b1e15bbc99 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -1,7 +1,7 @@ { fetchurl, fetchpatch, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, libcroco, gettext, libsecret , python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core , libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info -, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42 +, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils , libpulseaudio, libical, nss, gobjectIntrospection, gstreamer, wrapGAppsHook , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet , sassc, systemd, gst_all_1 }: @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { name = "gnome-shell-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0kmsh305cfr3fg40rhwykqbl466lwcq9djda25kf29ib7h6w1pn7"; + sha256 = "1k2cgaky293kcjis0pmh9hw1aby3yyilb5dzrbww62wxzppc9s35"; }; # Needed to find /etc/NetworkManager/VPN @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales - sassc + sassc desktop-file-utils ]; buildInputs = with gnome3; [ systemd caribou From c477acec9efc4347fb5bdc36f84d14f94a523731 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 8 May 2018 02:38:42 +0200 Subject: [PATCH 288/695] =?UTF-8?q?gnome3.mutter:=203.28.0=20=E2=86=92=203?= =?UTF-8?q?.28.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/mutter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 623d2b1251e..866888feba0 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "mutter-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/mutter/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1c46sf10mgvwgym4c6hbjm7wa82dvfv8j8dx4zdbc7zj4n0grzsq"; + sha256 = "1bhmjvf6l1fj5igsw2xlg3nv5526laiwaxh47dgk50f40qax1qin"; }; passthru = { From fd0d1f35a5f6d8dd321df74828144aa67da7f15f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 8 May 2018 02:39:09 +0200 Subject: [PATCH 289/695] =?UTF-8?q?gvfs:=201.36.1=20=E2=86=92=201.36.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/gvfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 238edddaf3a..4f3bc64b5d4 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -18,14 +18,14 @@ let pname = "gvfs"; - version = "1.36.1"; + version = "1.36.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "09phj9kqk8lzcmkjfq7qmzpkj4xp1vg4mskv6d2s9j62hvrxyh1q"; + sha256 = "1xq105596sk9yram5a143b369wpaiiwc9gz86n0j1kfr7nipkqn4"; }; # Uncomment when switching back to meson From 376c55fcea12e76dee22f74efa6fba5b4228891b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Tue, 8 May 2018 03:36:41 +0200 Subject: [PATCH 290/695] cargo-fuzz: init at 0.5.3 --- .../tools/rust/cargo-fuzz/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/rust/cargo-fuzz/default.nix diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix new file mode 100644 index 00000000000..cc5d90b223d --- /dev/null +++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, fetchurl, runCommand, rustPlatform }: + +rustPlatform.buildRustPackage rec { + name = "cargo-fuzz-${version}"; + version = "0.5.3"; # Note to self: on 0.5.4, remove the hand-added Cargo.lock + + src = + let + source = fetchFromGitHub { + owner = "rust-fuzz"; + repo = "cargo-fuzz"; + rev = version; + sha256 = "1l452fnjw7i10nrd4y4rssi5d457vgjp6rhdr9cnq32bjhdkprrs"; + }; + cargo-lock = fetchurl { + url = "https://gist.githubusercontent.com/Ekleog/7d5b62d13b7207aafa4c37d1bbdf2de7/raw/c6027fc1c531947f4d6836a3c4cba1b3e24df24c/Cargo.lock"; + sha256 = "0d7b6kxfbfvwksybzrihylamg2zv5fmsk9m6xshryhwipskzzvmd"; + }; + in + runCommand "cargo-fuzz-src" {} '' + cp -R ${source} $out + chmod +w $out + cp ${cargo-lock} $out/Cargo.lock + ''; + + cargoSha256 = "0ajm8qp8hi7kn7199ywv26cmjv13phxv72lz8kcq97hxg17x0dkk"; + + meta = with stdenv.lib; { + description = "Command line helpers for fuzzing"; + homepage = https://github.com/rust-fuzz/cargo-fuzz; + license = with licenses; [ mit asl20 ]; + maintainers = [ maintainers.ekleog ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 567167fc460..53635e51b4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6848,7 +6848,7 @@ with pkgs; buildRustCrate = callPackage ../build-support/rust/build-rust-crate.nix { }; - cargo-vendor = callPackage ../build-support/rust/cargo-vendor {}; + cargo-vendor = callPackage ../build-support/rust/cargo-vendor { }; carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { }; @@ -6873,6 +6873,8 @@ with pkgs; cargo-edit = callPackage ../tools/package-management/cargo-edit { }; + cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; + rainicorn = callPackage ../development/tools/rust/rainicorn { }; rustfmt = callPackage ../development/tools/rust/rustfmt { }; rustracer = callPackage ../development/tools/rust/racer { }; From a33756a866e1d64337e58c78e3fef2303a00af3d Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Mon, 7 May 2018 23:48:04 -0400 Subject: [PATCH 291/695] Use build packages GHC for haskell.packages.integer-simple --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 937c930ac75..8a395fbec18 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -159,7 +159,7 @@ in rec { (name: ! builtins.elem name integerSimpleExcludes) (pkgs.lib.attrNames packages); in pkgs.lib.genAttrs integerSimpleGhcNames (name: packages."${name}".override { - ghc = compiler.integer-simple."${name}"; + ghc = bh.compiler.integer-simple."${name}"; overrides = _self : _super : { integer-simple = null; integer-gmp = null; From 0afb45d5747d812d434e687ce8bfc78e40a54060 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Mon, 7 May 2018 23:52:05 -0400 Subject: [PATCH 292/695] Set the C standard when building GHC Should this be in cc-wrapper? --- pkgs/development/compilers/ghc/8.4.2.nix | 2 ++ pkgs/development/compilers/ghc/head.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix index cf4e5772719..bbe82354c8c 100644 --- a/pkgs/development/compilers/ghc/8.4.2.nix +++ b/pkgs/development/compilers/ghc/8.4.2.nix @@ -50,6 +50,8 @@ let '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' GhcLibHcOpts += -fPIC GhcRtsHcOpts += -fPIC + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + EXTRA_CC_OPTS += -std=gnu99 ''; # Splicer will pull out correct variations diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 51497e0d9ce..f0e21b0cf5b 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -50,6 +50,8 @@ let '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' GhcLibHcOpts += -fPIC GhcRtsHcOpts += -fPIC + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + EXTRA_CC_OPTS += -std=gnu99 ''; # Splicer will pull out correct variations From 8012aee0a7d9fe14fe77d20b6fdd8d2e6120bcc1 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Mon, 7 May 2018 23:52:34 -0400 Subject: [PATCH 293/695] Don't enableShared in GHC when using android prebuilt --- pkgs/development/compilers/ghc/8.4.2.nix | 2 +- pkgs/development/compilers/ghc/head.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix index bbe82354c8c..b588592a71c 100644 --- a/pkgs/development/compilers/ghc/8.4.2.nix +++ b/pkgs/development/compilers/ghc/8.4.2.nix @@ -22,7 +22,7 @@ , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. - enableShared ? true + enableShared ? !targetPlatform.useAndroidPrebuilt , version ? "8.4.2" }: diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index f0e21b0cf5b..7e1c73d166a 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -22,7 +22,7 @@ , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. - enableShared ? true + enableShared ? !targetPlatform.useAndroidPrebuilt , version ? "8.5.20180118" }: From 219b1c1e1bfbf2ec56584c2e6fd7c1fb937d253a Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 8 May 2018 15:14:54 +0900 Subject: [PATCH 294/695] flashplayer: 29.0.0.140 -> 29.0.0.171 --- .../networking/browsers/chromium/plugins.nix | 4 ++-- .../browsers/mozilla-plugins/flashplayer/default.nix | 10 +++++----- .../mozilla-plugins/flashplayer/standalone.nix | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index f0862aebafe..cb2121553ac 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -98,12 +98,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "29.0.0.140"; + version = "29.0.0.171"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "1p0jr7s6vyzxw1mhbrl5yx092z2wpvfw0jjw127gs576z0zwamwh"; + sha256 = "1j7w81wjfrpkir11m719jdahnbnw4sph448hs90hvai6rsn3imib"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 162dd88054c..6c19b684aaa 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "29.0.0.140"; + version = "29.0.0.171"; src = fetchurl { url = @@ -84,14 +84,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "0bj0d899dswfbkbrm08c381yzm0hlqdv53sgbl2z9zj4x8rqyi3p" + "140galarr38lmfnd2chl2msvxizx96kdi000gbikir9xnd7bx1hc" else - "16as2dydgqip6qlg13jh83sd4lb2cgrny4ibqg7jlx1d1a1i0jwh" + "0wzmf12xrmyq8vqqyii932yx4nadrvkn2j9s86xcw67lb40xj5ig" else if arch == "x86_64" then - "10s6j5izsy2v2ljljcv2vk898jg9xmp6zqqazmj07zy7m5vywfi7" + "17c57xgs0w71p4xsjw5an7dg484769wanq3kx86ppaqw8vqhnqc3" else - "0xk8a2brpzfxi87mqqfv8l5xi5j9x71cy0ik64dzwcq7ka16gpz1"; + "06pjbc9050fgi2njzf9vm6py7c22i6chw852rbm8flx3cmplw23b"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 42d7aa2f56f..fa9c89b442b 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -55,7 +55,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "29.0.0.140"; + version = "29.0.0.171"; src = fetchurl { url = @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "1gvfm4z46m2y39fswpzhx18dlwcxwwy5mins3kx2m425dgp76zd5" + "1q2lmsb9g2cxbwxb712javmadk6vmcgkihd244394nr10isdzw67" else - "08a21c0l47w97xhwiby8j5055kl37ld5insfd459gz92d3f145fl"; + "0qj5qdc9k53pgqxb5jpcbgfsgavmlyzp0cpz468c4zacsvxgq502"; }; nativeBuildInputs = [ unzip ]; From 5d66a6bbdb78e8c25876146e185898b1afb71993 Mon Sep 17 00:00:00 2001 From: Joel Burget Date: Tue, 8 May 2018 00:23:07 -0700 Subject: [PATCH 295/695] 1password: init at version 0.4 (#40158) --- maintainers/maintainer-list.nix | 5 +++ pkgs/applications/misc/1password/default.nix | 34 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 41 insertions(+) create mode 100644 pkgs/applications/misc/1password/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 782a3ee6aad..e31b84b03b0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1825,6 +1825,11 @@ github = "joamaki"; name = "Jussi Maki"; }; + joelburget = { + email = "joelburget@gmail.com"; + github = "joelburget"; + name = "Joel Burget"; + }; joelmo = { email = "joel.moberg@gmail.com"; github = "joelmo"; diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix new file mode 100644 index 00000000000..b0b6111b334 --- /dev/null +++ b/pkgs/applications/misc/1password/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchzip, makeWrapper }: + +stdenv.mkDerivation rec { + name = "1password-${version}"; + version = "0.4"; + src = if stdenv.system == "i686-linux" then fetchzip { + url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; + sha256 = "0mhlqvd3az50gnfil0xlq10855v3bg7yb05j6ndg4h2c551jrq41"; + stripRoot = false; + } else fetchzip { + url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; + sha256 = "15cv8xi4slid9jicdmc5xx2r9ag63wcx1mn7hcgzxbxbhyrvwhyf"; + stripRoot = false; + }; + + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' + mkdir -p $out/bin + install -D op $out/share/1password/op + + # https://github.com/NixOS/patchelf/issues/66#issuecomment-267743051 + makeWrapper $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/op \ + --argv0 op \ + --add-flags $out/share/1password/op + ''; + + meta = with stdenv.lib; { + description = "1Password command-line tool"; + homepage = "https://blog.agilebits.com/2017/09/06/announcing-the-1password-command-line-tool-public-beta/"; + maintainers = with maintainers; [ joelburget ]; + license = licenses.unfree; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 546a9d9bd76..6a5d8e6f0df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -400,6 +400,8 @@ with pkgs; ### TOOLS + _1password = callPackage ../applications/misc/1password { }; + _9pfs = callPackage ../tools/filesystems/9pfs { }; a2ps = callPackage ../tools/text/a2ps { }; From c2b4cfbe0827d309efd9ccf25352b3e32caa8dd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 8 May 2018 09:12:13 +0100 Subject: [PATCH 296/695] xmrig: restrict to x86 --- pkgs/applications/misc/xmrig/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 9814ec92f02..5b389d99da7 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { description = "Monero (XMR) CPU miner"; homepage = "https://github.com/xmrig/xmrig"; license = licenses.gpl3Plus; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ fpletz ]; }; } From a8768c610efdbe27af26256c001609b5f05f0af9 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 8 May 2018 10:22:25 +0200 Subject: [PATCH 297/695] bluemix-cli: init at 0.6.6 (#40147) Adds the (non-free, binary) IBM Bluemix CLI which is required to administrate IBM Bluemix services. --- pkgs/tools/admin/bluemix-cli/default.nix | 25 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/admin/bluemix-cli/default.nix diff --git a/pkgs/tools/admin/bluemix-cli/default.nix b/pkgs/tools/admin/bluemix-cli/default.nix new file mode 100644 index 00000000000..f014d09b5c7 --- /dev/null +++ b/pkgs/tools/admin/bluemix-cli/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "bluemix-cli-${version}"; + version = "0.6.6"; + + src = fetchurl { + name = "linux64.tar.gz"; + url = "https://clis.ng.bluemix.net/download/bluemix-cli/${version}/linux64"; + sha256 = "1swjawc4szqrl0wgjcb4na1hbxylaqp2mp53lxsbfbk1db0c3y85"; + }; + + installPhase = '' + install -m755 -D --target $out/bin bin/bluemix bin/bluemix-analytics bin/cfcli/cf + ''; + + meta = with lib; { + description = "Administration CLI for IBM BlueMix"; + homepage = "https://console.bluemix.net/docs/cli/index.html"; + downloadPage = "https://console.bluemix.net/docs/cli/reference/bluemix_cli/download_cli.html#download_install"; + license = licenses.unfree; + maintainers = maintainers.tazjin; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a5d8e6f0df..b65b28bb020 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -833,6 +833,8 @@ with pkgs; blink = callPackage ../applications/networking/instant-messengers/blink { }; + bluemix-cli = callPackage ../tools/admin/bluemix-cli { }; + libqmatrixclient = libsForQt5.callPackage ../development/libraries/libqmatrixclient { }; quaternion = libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { }; From aad0a825f9190539002fbac010b06b268c1dadbf Mon Sep 17 00:00:00 2001 From: scalavision Date: Tue, 8 May 2018 10:40:10 +0200 Subject: [PATCH 298/695] singularity: 2.4.6 -> 2.5.1 --- pkgs/applications/virtualization/singularity/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index d6913a94432..2048d7d2ed9 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -13,11 +13,12 @@ , gnused , curl , utillinux +, libarchive }: stdenv.mkDerivation rec { name = "singularity-${version}"; - version = "2.4.6"; + version = "2.5.1"; enableParallelBuilding = true; @@ -45,11 +46,11 @@ stdenv.mkDerivation rec { owner = "singularityware"; repo = "singularity"; rev = version; - sha256 = "0bs1jqm7v7wv1kdxq8kyqn3gl5m76j0wwwgjyjnndrhczlsh5m1d"; + sha256 = "1i029qs6dfpyirhbdz0nrx2sh5fddysk4wqkjqj5m60kxs4x8a3d"; }; nativeBuildInputs = [ autoreconfHook makeWrapper ]; - buildInputs = [ coreutils gnugrep python e2fsprogs which gnutar squashfsTools gzip gnused curl utillinux ]; + buildInputs = [ coreutils gnugrep python e2fsprogs which gnutar squashfsTools gzip gnused curl utillinux libarchive ]; meta = with stdenv.lib; { homepage = http://singularity.lbl.gov/; From 41d4bd29acbbbc65dc7412cdc1596fd7c2d861dc Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Mon, 23 Apr 2018 10:37:15 +0200 Subject: [PATCH 299/695] nixos/keepalived: Implemented vrrp-instance tracking scripts and interfaces. Tracking scripts in particular, cannot be included in extraOpts, because script declaration has to be above script usage in keepalived.conf. Changes are fully backward compatible. --- .../networking/keepalived/default.nix | 62 +++++++++++++++++- ...-options.nix => vrrp-instance-options.nix} | 14 ++++ .../keepalived/vrrp-script-options.nix | 64 +++++++++++++++++++ 3 files changed, 138 insertions(+), 2 deletions(-) rename nixos/modules/services/networking/keepalived/{vrrp-options.nix => vrrp-instance-options.nix} (88%) create mode 100644 nixos/modules/services/networking/keepalived/vrrp-script-options.nix diff --git a/nixos/modules/services/networking/keepalived/default.nix b/nixos/modules/services/networking/keepalived/default.nix index 378cd936584..c9ac2ee2599 100644 --- a/nixos/modules/services/networking/keepalived/default.nix +++ b/nixos/modules/services/networking/keepalived/default.nix @@ -8,10 +8,12 @@ let keepalivedConf = pkgs.writeText "keepalived.conf" '' global_defs { + ${optionalString cfg.enableScriptSecurity "enable_script_security"} ${snmpGlobalDefs} ${cfg.extraGlobalDefs} } + ${vrrpScriptStr} ${vrrpInstancesStr} ${cfg.extraConfig} ''; @@ -26,6 +28,22 @@ let + optionalString enableTraps "enable_traps" ); + vrrpScriptStr = concatStringsSep "\n" (map (s: + '' + vrrp_script ${s.name} { + script "${s.script}" + interval ${toString s.interval} + fall ${toString s.fall} + rise ${toString s.rise} + timeout ${toString s.timeout} + weight ${toString s.weight} + user ${s.user} ${optionalString (s.group != null) s.group} + + ${s.extraConfig} + } + '' + ) vrrpScripts); + vrrpInstancesStr = concatStringsSep "\n" (map (i: '' vrrp_instance ${i.name} { @@ -49,6 +67,18 @@ let ${concatMapStringsSep "\n" virtualIpLine i.virtualIps} } + ${optionalString (builtins.length i.trackScripts > 0) '' + track_script { + ${concatStringsSep "\n" i.trackScripts} + } + ''} + + ${optionalString (builtins.length i.trackInterfaces > 0) '' + track_interface { + ${concatStringsSep "\n" i.trackInterfaces} + } + ''} + ${i.extraConfig} } '' @@ -64,6 +94,12 @@ let notNullOrEmpty = s: !(s == null || s == ""); + vrrpScripts = mapAttrsToList (name: config: + { + inherit name; + } // config + ) cfg.vrrpScripts; + vrrpInstances = mapAttrsToList (iName: iConfig: { name = iName; @@ -86,7 +122,8 @@ let { assertion = !i.vmacXmitBase || i.useVmac; message = "services.keepalived.vrrpInstances.${i.name}.vmacXmitBase has no effect when services.keepalived.vrrpInstances.${i.name}.useVmac is not set."; } - ] ++ flatten (map (virtualIpAssertions i.name) i.virtualIps); + ] ++ flatten (map (virtualIpAssertions i.name) i.virtualIps) + ++ flatten (map (vrrpScriptAssertion i.name) i.trackScripts); virtualIpAssertions = vrrpName: ip: [ { assertion = ip.addr != ""; @@ -94,6 +131,11 @@ let } ]; + vrrpScriptAssertion = vrrpName: scriptName: { + assertion = builtins.hasAttr scriptName cfg.vrrpScripts; + message = "services.keepalived.vrrpInstances.${vrrpName} trackscript ${scriptName} is not defined in services.keepalived.vrrpScripts."; + }; + pidFile = "/run/keepalived.pid"; in @@ -110,6 +152,14 @@ in ''; }; + enableScriptSecurity = mkOption { + type = types.bool; + default = false; + description = '' + Don't run scripts configured to be run as root if any part of the path is writable by a non-root user. + ''; + }; + snmp = { enable = mkOption { @@ -181,8 +231,16 @@ in }; + vrrpScripts = mkOption { + type = types.attrsOf (types.submodule (import ./vrrp-script-options.nix { + inherit lib; + })); + default = {}; + description = "Declarative vrrp script config"; + }; + vrrpInstances = mkOption { - type = types.attrsOf (types.submodule (import ./vrrp-options.nix { + type = types.attrsOf (types.submodule (import ./vrrp-instance-options.nix { inherit lib; })); default = {}; diff --git a/nixos/modules/services/networking/keepalived/vrrp-options.nix b/nixos/modules/services/networking/keepalived/vrrp-instance-options.nix similarity index 88% rename from nixos/modules/services/networking/keepalived/vrrp-options.nix rename to nixos/modules/services/networking/keepalived/vrrp-instance-options.nix index 79eff3ae541..85b9bc33772 100644 --- a/nixos/modules/services/networking/keepalived/vrrp-options.nix +++ b/nixos/modules/services/networking/keepalived/vrrp-instance-options.nix @@ -108,6 +108,20 @@ with lib; description = "Declarative vhost config"; }; + trackScripts = mkOption { + type = types.listOf types.str; + default = []; + example = [ "chk_cmd1" "chk_cmd2" ]; + description = "List of script names to invoke for health tracking."; + }; + + trackInterfaces = mkOption { + type = types.listOf types.str; + default = []; + example = [ "eth0" "eth1" ]; + description = "List of network interfaces to monitor for health tracking."; + }; + extraConfig = mkOption { type = types.lines; default = ""; diff --git a/nixos/modules/services/networking/keepalived/vrrp-script-options.nix b/nixos/modules/services/networking/keepalived/vrrp-script-options.nix new file mode 100644 index 00000000000..a3f794c40a8 --- /dev/null +++ b/nixos/modules/services/networking/keepalived/vrrp-script-options.nix @@ -0,0 +1,64 @@ +{ lib } : + +with lib; +with lib.types; +{ + options = { + + script = mkOption { + type = str; + example = "\${pkgs.curl} -f http://localhost:80"; + description = "(Path of) Script command to execute followed by args, i.e. cmd [args]..."; + }; + + interval = mkOption { + type = int; + default = 1; + description = "Seconds between script invocations."; + }; + + timeout = mkOption { + type = int; + default = 5; + description = "Seconds after which script is considered to have failed."; + }; + + weight = mkOption { + type = int; + default = 0; + description = "Following a failure, adjust the priority by this weight."; + }; + + rise = mkOption { + type = int; + default = 5; + description = "Required number of successes for OK transition."; + }; + + fall = mkOption { + type = int; + default = 3; + description = "Required number of failures for KO transition."; + }; + + user = mkOption { + type = str; + default = "keepalived_script"; + description = "Name of user to run the script under."; + }; + + group = mkOption { + type = nullOr str; + default = null; + description = "Name of group to run the script under. Defaults to user group."; + }; + + extraConfig = mkOption { + type = lines; + default = ""; + description = "Extra lines to be added verbatim to the vrrp_script section."; + }; + + }; + +} From bf02618e1f26f914283a29ab458ad67464a20f82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Boros?= Date: Tue, 8 May 2018 11:41:52 +0200 Subject: [PATCH 300/695] idrisPackages.vdom: init at 0.6.0 --- pkgs/development/idris-modules/default.nix | 2 ++ pkgs/development/idris-modules/vdom.nix | 28 ++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/idris-modules/vdom.nix diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix index 12fbc8dfd17..1dfa4e48899 100644 --- a/pkgs/development/idris-modules/default.nix +++ b/pkgs/development/idris-modules/default.nix @@ -194,6 +194,8 @@ union_type = callPackage ./union_type.nix {}; + vdom = callPackage ./vdom.nix {}; + vecspace = callPackage ./vecspace.nix {}; webgl = callPackage ./webgl.nix {}; diff --git a/pkgs/development/idris-modules/vdom.nix b/pkgs/development/idris-modules/vdom.nix new file mode 100644 index 00000000000..034bda583db --- /dev/null +++ b/pkgs/development/idris-modules/vdom.nix @@ -0,0 +1,28 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, base +, lib +, idris +}: +build-idris-package { + name = "vdom"; + version = "0.6.0"; + + idrisDeps = [ prelude base ]; + + src = fetchFromGitHub { + owner = "brandondyck"; + repo = "idris-vdom"; + rev = "ff32c14feeac937f7418830a9a3463cd9582be8a"; + sha256 = "0aila1qdpmhrp556dzaxk7yn7vgkwcnbp9jhw8f8pl51xs3s2kvf"; + }; + + meta = { + description = "Virtual DOM in pure Idris"; + homepage = https://github.com/brandondyck/idris-vdom; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} From eb774f30475547033d7059b1ea5de6393e3996bc Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 8 May 2018 11:10:09 +0200 Subject: [PATCH 301/695] akonadi-import-wizard: Add package expression This is required for kdepim-addons and packaging this is pretty much straightforward with no hurdles. I tried to keep the coding style close to other packages in kdeApplications so that it stays consistent. Signed-off-by: aszlig Cc: @ttuegel, @vandenoever --- .../kde/akonadi-import-wizard.nix | 20 +++++++++++++++++++ pkgs/applications/kde/default.nix | 1 + 2 files changed, 21 insertions(+) create mode 100644 pkgs/applications/kde/akonadi-import-wizard.nix diff --git a/pkgs/applications/kde/akonadi-import-wizard.nix b/pkgs/applications/kde/akonadi-import-wizard.nix new file mode 100644 index 00000000000..cc1acbc6dd0 --- /dev/null +++ b/pkgs/applications/kde/akonadi-import-wizard.nix @@ -0,0 +1,20 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, karchive, kcontacts, kcrash, kidentitymanagement, kio, + kmailtransport, kwallet, mailcommon, mailimporter, messagelib +}: + +mkDerivation { + name = "akonadi-import-wizard"; + meta = { + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi karchive kcontacts kcrash kidentitymanagement kio + kmailtransport kwallet mailcommon mailimporter messagelib + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 5870179b6c0..5b21844dd18 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -67,6 +67,7 @@ let akonadi = callPackage ./akonadi {}; akonadi-calendar = callPackage ./akonadi-calendar.nix {}; akonadi-contacts = callPackage ./akonadi-contacts.nix {}; + akonadi-import-wizard = callPackage ./akonadi-import-wizard.nix {}; akonadi-mime = callPackage ./akonadi-mime.nix {}; akonadi-notes = callPackage ./akonadi-notes.nix {}; akonadi-search = callPackage ./akonadi-search.nix {}; From dace4813771fa3563eda06b83d8362388ba8a96b Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 8 May 2018 11:22:28 +0200 Subject: [PATCH 302/695] kdepim-addons: Add package expression This is needed in order to add location information to contacts in KAddressbook. Packaging was quite straightforward except that it needed akonadi-import-wizard, which I have packaged in the previous commit. I'm committing this directly to master without a pull request, because nothing depends on it (for obvious reasons) and packaging was trivial enough so that if things are not as they supposed to be it can still be changed very easily. Tested this using the following VM configuration, because I don't run a Plasma desktop: (import { configuration = { pkgs, ... }: { environment.systemPackages = with import {}; [ kdeApplications.kaddressbook kdeApplications.kdepim-addons ]; users.users.test.isNormalUser = true; virtualisation.diskSize = 4096; virtualisation.memorySize = 2048; services.xserver = { enable = true; inherit ((import {}).config.services.xserver) layout; displayManager.sddm.enable = true; displayManager.sddm.autoLogin.enable = true; displayManager.sddm.autoLogin.user = "test"; desktopManager.default = "plasma5"; desktopManager.plasma5.enable = true; }; }; }).vm The test I've done is using KAddressbook and check whether the location tab is working and it does now. Signed-off-by: aszlig Cc: @ttuegel, @vandenoever --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kdepim-addons.nix | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/kde/kdepim-addons.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 5b21844dd18..f602e5c92d9 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -102,6 +102,7 @@ let kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {}; kdenlive = callPackage ./kdenlive.nix {}; kdepim-runtime = callPackage ./kdepim-runtime.nix {}; + kdepim-addons = callPackage ./kdepim-addons.nix {}; kdepim-apps-libs = callPackage ./kdepim-apps-libs {}; kdf = callPackage ./kdf.nix {}; kdialog = callPackage ./kdialog.nix {}; diff --git a/pkgs/applications/kde/kdepim-addons.nix b/pkgs/applications/kde/kdepim-addons.nix new file mode 100644 index 00000000000..fd3fe2d6c09 --- /dev/null +++ b/pkgs/applications/kde/kdepim-addons.nix @@ -0,0 +1,23 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, shared-mime-info, + akonadi-import-wizard, akonadi-notes, calendarsupport, eventviews, + incidenceeditor, kcalcore, kcalutils, kconfig, kdbusaddons, kdeclarative, + kdepim-apps-libs, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar, + libksieve, mailcommon, mailimporter, messagelib, poppler_qt5, prison +}: + +mkDerivation { + name = "kdepim-addons"; + meta = { + license = with lib.licenses; [ gpl2Plus lgpl21Plus ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; + buildInputs = [ + akonadi-import-wizard akonadi-notes calendarsupport eventviews + incidenceeditor kcalcore kcalutils kconfig kdbusaddons kdeclarative + kdepim-apps-libs kholidays ki18n kmime ktexteditor ktnef libgravatar + libksieve mailcommon mailimporter messagelib poppler_qt5 prison + ]; +} From 199e7f18ede0057777ef19648ea7d27c623ed4dc Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Tue, 8 May 2018 11:53:33 +0200 Subject: [PATCH 303/695] bluemix: Fix eval of maintainers --- pkgs/tools/admin/bluemix-cli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/bluemix-cli/default.nix b/pkgs/tools/admin/bluemix-cli/default.nix index f014d09b5c7..2c24728fab9 100644 --- a/pkgs/tools/admin/bluemix-cli/default.nix +++ b/pkgs/tools/admin/bluemix-cli/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = "https://console.bluemix.net/docs/cli/index.html"; downloadPage = "https://console.bluemix.net/docs/cli/reference/bluemix_cli/download_cli.html#download_install"; license = licenses.unfree; - maintainers = maintainers.tazjin; + maintainers = [ maintainers.tazjin ]; platforms = [ "x86_64-linux" ]; }; } From a604fc6fcb4c645ffe2d2738b1b0990c2f715707 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 8 May 2018 12:08:06 +0200 Subject: [PATCH 304/695] kontemplate: 1.4.0 -> 1.5.0 Moves to release version 1.5.0 (released 2018-05-08). --- pkgs/applications/networking/cluster/kontemplate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix index 56cbef7f005..fd599cd8658 100644 --- a/pkgs/applications/networking/cluster/kontemplate/default.nix +++ b/pkgs/applications/networking/cluster/kontemplate/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kontemplate-${version}"; - version = "1.4.0"; + version = "1.5.0"; goPackagePath = "github.com/tazjin/kontemplate"; goDeps = ./deps.nix; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "tazjin"; repo = "kontemplate"; rev = "v${version}"; - sha256 = "11aqc9sgyqz3pscx7njnb3xghl7d61vzdgl3bqndady0dxsccrpj"; + sha256 = "0k3yr0ypw6brj1lxqs041zsyi0r09113i0x3xfj48zv4ralq74b6"; }; meta = with lib; { From 6c4c36fcbc2fcf4b7c1fcf4b372a94b069d3ee3d Mon Sep 17 00:00:00 2001 From: jD91mZM2 Date: Thu, 3 May 2018 14:05:43 +0200 Subject: [PATCH 305/695] NetworkManager: add noDns option --- nixos/doc/manual/release-notes/rl-1809.xml | 6 +++++ nixos/modules/rename.nix | 1 + .../services/networking/networkmanager.nix | 23 ++++++++++++------- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 7259be4c904..01b5e9d7746 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -227,6 +227,12 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' + + + networking.networkmanager.useDnsmasq has been deprecated. Use + networking.networkmanager.dns instead. + + diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index a1ead80cc21..56b7bf00448 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -17,6 +17,7 @@ with lib; (mkRenamedOptionModule [ "networking" "enableIntel2100BGFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) (mkRenamedOptionModule [ "networking" "enableRalinkFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) (mkRenamedOptionModule [ "networking" "enableRTL8192cFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) + (mkRenamedOptionModule [ "networking" "networkmanager" "useDnsmasq" ] [ "networking" "networkmanager" "dns" ]) (mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ]) (mkChangedOptionModule [ "services" "printing" "gutenprint" ] [ "services" "printing" "drivers" ] diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 10e96eb4036..f4c4adcaaeb 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -10,7 +10,8 @@ let stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc"; dns = - if cfg.useDnsmasq then "dnsmasq" + if cfg.dns == "none" then "none" + else if cfg.dns == "dnsmasq" then "dnsmasq" else if config.services.resolved.enable then "systemd-resolved" else if config.services.unbound.enable then "unbound" else "default"; @@ -205,14 +206,20 @@ in { }; }; - useDnsmasq = mkOption { - type = types.bool; - default = false; + dns = mkOption { + type = types.enum [ "auto" "dnsmasq" "none" ]; + default = "auto"; description = '' - Enable NetworkManager's dnsmasq integration. NetworkManager will run - dnsmasq as a local caching nameserver, using a "split DNS" - configuration if you are connected to a VPN, and then update - resolv.conf to point to the local nameserver. + Options: + - auto: Check for systemd-resolved, unbound, or use default. + - dnsmasq: + Enable NetworkManager's dnsmasq integration. NetworkManager will run + dnsmasq as a local caching nameserver, using a "split DNS" + configuration if you are connected to a VPN, and then update + resolv.conf to point to the local nameserver. + - none: + Disable NetworkManager's DNS integration completely. + It will not touch your /etc/resolv.conf. ''; }; From 9ef306bb4dc930f967678d9a2e9b4d4f2d1d5d03 Mon Sep 17 00:00:00 2001 From: Ben Barclay Date: Tue, 8 May 2018 22:46:24 +1000 Subject: [PATCH 306/695] bazel: 0.11.1 -> 0.12.0 (#39585) --- pkgs/development/tools/build-managers/bazel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 593fe6c159b..d5eaa24c167 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { - version = "0.11.1"; + version = "0.12.0"; meta = with stdenv.lib; { homepage = "https://github.com/bazelbuild/bazel/"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "e8d762bcc01566fa50952c8028e95cfbe7545a39b8ceb3a0d0d6df33b25b333f"; + sha256 = "3b3e7dc76d145046fdc78db7cac9a82bc8939d3b291e53a7ce85315feb827754"; }; sourceRoot = "."; From 851d5d72a3c87d06d26dd78f8b3a421537fc8a52 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Wed, 25 Apr 2018 21:18:26 +0000 Subject: [PATCH 307/695] dovecot2: added ssl_dh using security.dhparams The 18.03 channel includes dovecot 2.3, which requires ssl_dh to be set. -> fixes https://github.com/nixcloud/nixcloud-webservices/issues/21 --- nixos/modules/services/mail/dovecot.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 543e732127a..96e60f9c88e 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -25,6 +25,7 @@ let ssl_cert = <${cfg.sslServerCert} ssl_key = <${cfg.sslServerKey} ${optionalString (!(isNull cfg.sslCACert)) ("ssl_ca = <" + cfg.sslCACert)} + ssl_dh = <${config.security.dhparams.path}/dovecot2.pem disable_plaintext_auth = yes '') @@ -297,10 +298,15 @@ in config = mkIf cfg.enable { - security.pam.services.dovecot2 = mkIf cfg.enablePAM {}; - services.dovecot2.protocols = + security.dhparams = mkIf (! isNull cfg.sslServerCert) { + enable = true; + params = { + dovecot2 = 2048; + }; + }; + services.dovecot2.protocols = optional cfg.enableImap "imap" ++ optional cfg.enablePop3 "pop3" ++ optional cfg.enableLmtp "lmtp"; From d541169e1a28d22f591ad7ca0edc48f76fa8eff4 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 8 May 2018 16:03:52 +0300 Subject: [PATCH 308/695] wesnoth: unite with wesnoth-dev There's no Wesnoth development version now. --- pkgs/games/wesnoth/default.nix | 27 ++++++++-------------- pkgs/games/wesnoth/dev.nix | 41 --------------------------------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 11 insertions(+), 59 deletions(-) delete mode 100644 pkgs/games/wesnoth/dev.nix diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index d3128210a1b..81ffd6b135f 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -1,35 +1,28 @@ -{ stdenv, fetchurl, cmake, pkgconfig, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf -, pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre -, makeWrapper, enableTools ? false +{ stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf +, pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu +, enableTools ? false }: stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.12.6"; + version = "1.14.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "0kifp6g1dsr16m6ngjq2hx19h851fqg326ps3krnhpyix963h3x5"; + sha256 = "09niq53y17faizhmd98anx3dha7hvacvj9a0a64lg8wn915cm0bw"; }; - nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; + nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext boost - libvorbis fribidi dbus libpng pcre ]; + buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf pango gettext boost + libvorbis fribidi dbus libpng pcre openssl icu ]; cmakeFlags = [ "-DENABLE_TOOLS=${if enableTools then "ON" else "OFF"}" ]; enableParallelBuilding = true; - # Wesnoth doesn't support input frameworks and Unicode input breaks when they are enabled. - postInstall = '' - for i in $out/bin/*; do - wrapProgram "$i" --unset XMODIFIERS - done - ''; - meta = with stdenv.lib; { description = "The Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme"; longDescription = '' @@ -42,7 +35,7 @@ stdenv.mkDerivation rec { homepage = http://www.wesnoth.org/; license = licenses.gpl2; - maintainers = with maintainers; [ kkallio abbradar ]; - platforms = platforms.unix; + maintainers = with maintainers; [ abbradar ]; + platforms = platforms.linux; }; } diff --git a/pkgs/games/wesnoth/dev.nix b/pkgs/games/wesnoth/dev.nix deleted file mode 100644 index 81ffd6b135f..00000000000 --- a/pkgs/games/wesnoth/dev.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf -, pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu -, enableTools ? false -}: - -stdenv.mkDerivation rec { - pname = "wesnoth"; - version = "1.14.0"; - - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "09niq53y17faizhmd98anx3dha7hvacvj9a0a64lg8wn915cm0bw"; - }; - - nativeBuildInputs = [ cmake pkgconfig ]; - - buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf pango gettext boost - libvorbis fribidi dbus libpng pcre openssl icu ]; - - cmakeFlags = [ "-DENABLE_TOOLS=${if enableTools then "ON" else "OFF"}" ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "The Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme"; - longDescription = '' - The Battle for Wesnoth is a Free, turn-based tactical strategy - game with a high fantasy theme, featuring both single-player, and - online/hotseat multiplayer combat. Fight a desperate battle to - reclaim the throne of Wesnoth, or take hand in any number of other - adventures. - ''; - - homepage = http://www.wesnoth.org/; - license = licenses.gpl2; - maintainers = with maintainers; [ abbradar ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b65b28bb020..7ab3665873b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19622,7 +19622,7 @@ with pkgs; wesnoth = callPackage ../games/wesnoth { }; - wesnoth-dev = callPackage ../games/wesnoth/dev.nix { }; + wesnoth-dev = wesnoth; widelands = callPackage ../games/widelands { lua = lua5_2; From 9c50f53065917249a47693041e8ab52ae96e0d06 Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Tue, 8 May 2018 13:19:14 +0200 Subject: [PATCH 309/695] squashfsTools: apply reproducibility patches Without these patches, the output of mksquashfs is not reproducible. The patches are taken from https://github.com/squashfskit/squashfskit, a fork of squashfs-tools, licensed under the GPL2 or later like squashfs-tools itself. --- ...POCH-is-set-override-timestamps-with.patch | 90 +++++++ ...POCH-is-set-also-clamp-content-times.patch | 83 +++++++ .../0003-remove-frag-deflator-thread.patch | 220 ++++++++++++++++++ pkgs/tools/filesystems/squashfs/default.nix | 9 + 4 files changed, 402 insertions(+) create mode 100644 pkgs/tools/filesystems/squashfs/0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch create mode 100644 pkgs/tools/filesystems/squashfs/0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch create mode 100644 pkgs/tools/filesystems/squashfs/0003-remove-frag-deflator-thread.patch diff --git a/pkgs/tools/filesystems/squashfs/0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch b/pkgs/tools/filesystems/squashfs/0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch new file mode 100644 index 00000000000..5626800e723 --- /dev/null +++ b/pkgs/tools/filesystems/squashfs/0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch @@ -0,0 +1,90 @@ +From 0ab12a8585373be2de5129e14d979c62e7a90d82 Mon Sep 17 00:00:00 2001 +From: Chris Lamb +Date: Mon, 21 Nov 2016 09:33:05 +0100 +Subject: [PATCH] If SOURCE_DATE_EPOCH is set, override timestamps with that + value. + +See https://reproducible-builds.org/specs/source-date-epoch/ for more +information about this environment variable. + +Based on a patch by Alexander Couzens posted on +https://sourceforge.net/p/squashfs/mailman/message/34673610/ + +Signed-off-by: Chris Lamb +--- + squashfs-tools/mksquashfs.c | 38 ++++++++++++++++++++++++++++++++++++- + 1 file changed, 37 insertions(+), 1 deletion(-) + +diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c +index c2098bd..b49e956 100644 +--- a/squashfs-tools/mksquashfs.c ++++ b/squashfs-tools/mksquashfs.c +@@ -137,6 +137,9 @@ unsigned int cache_bytes = 0, cache_size = 0, inode_count = 0; + /* inode lookup table */ + squashfs_inode *inode_lookup_table = NULL; + ++/* override filesystem creation time */ ++time_t mkfs_fixed_time = -1; ++ + /* in memory directory data */ + #define I_COUNT_SIZE 128 + #define DIR_ENTRIES 32 +@@ -5104,6 +5107,9 @@ int main(int argc, char *argv[]) + int total_mem = get_default_phys_mem(); + int progress = TRUE; + int force_progress = FALSE; ++ char *source_date_epoch, *endptr; ++ unsigned long long epoch; ++ + struct file_buffer **fragment = NULL; + + if(argc > 1 && strcmp(argv[1], "-version") == 0) { +@@ -5641,6 +5647,36 @@ printOptions: + } + } + ++ /* if SOURCE_DATE_EPOCH is set, use that timestamp for the mkfs time */ ++ source_date_epoch = getenv("SOURCE_DATE_EPOCH"); ++ if(source_date_epoch) { ++ errno = 0; ++ epoch = strtoull(source_date_epoch, &endptr, 10); ++ if((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0)) ++ || (errno != 0 && epoch == 0)) { ++ ERROR("Environment variable $SOURCE_DATE_EPOCH: " ++ "strtoull: %s\n", strerror(errno)); ++ EXIT_MKSQUASHFS(); ++ } ++ if(endptr == source_date_epoch) { ++ ERROR("Environment variable $SOURCE_DATE_EPOCH: " ++ "No digits were found: %s\n", endptr); ++ EXIT_MKSQUASHFS(); ++ } ++ if(*endptr != '\0') { ++ ERROR("Environment variable $SOURCE_DATE_EPOCH: " ++ "Trailing garbage: %s\n", endptr); ++ EXIT_MKSQUASHFS(); ++ } ++ if(epoch > ULONG_MAX) { ++ ERROR("Environment variable $SOURCE_DATE_EPOCH: " ++ "value must be smaller than or equal to " ++ "%lu but was found to be: %llu \n", ULONG_MAX, epoch); ++ EXIT_MKSQUASHFS(); ++ } ++ mkfs_fixed_time = (time_t)epoch; ++ } ++ + /* + * Some compressors may need the options to be checked for validity + * once all the options have been processed +@@ -5993,7 +6029,7 @@ printOptions: + sBlk.flags = SQUASHFS_MKFLAGS(noI, noD, noF, noX, no_fragments, + always_use_fragments, duplicate_checking, exportable, + no_xattrs, comp_opts); +- sBlk.mkfs_time = time(NULL); ++ sBlk.mkfs_time = mkfs_fixed_time != -1 ? mkfs_fixed_time : time(NULL); + + disable_info(); + +-- +2.17.0 + diff --git a/pkgs/tools/filesystems/squashfs/0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch b/pkgs/tools/filesystems/squashfs/0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch new file mode 100644 index 00000000000..5002375887f --- /dev/null +++ b/pkgs/tools/filesystems/squashfs/0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch @@ -0,0 +1,83 @@ +From 32a07d4156a281084c90a4b78affc8b0b32a26fc Mon Sep 17 00:00:00 2001 +From: intrigeri +Date: Mon, 21 Nov 2016 11:41:28 +0000 +Subject: [PATCH] If SOURCE_DATE_EPOCH is set, also clamp content timestamps + with that value. + +Based on a patch by Alexander Couzens posted on +https://sourceforge.net/p/squashfs/mailman/message/34673610/ +--- + squashfs-tools/mksquashfs.c | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c +index b49e956..9f020bf 100644 +--- a/squashfs-tools/mksquashfs.c ++++ b/squashfs-tools/mksquashfs.c +@@ -137,6 +137,9 @@ unsigned int cache_bytes = 0, cache_size = 0, inode_count = 0; + /* inode lookup table */ + squashfs_inode *inode_lookup_table = NULL; + ++/* clamp all timestamps to SOURCE_DATE_EPOCH */ ++time_t content_clamp_time = -1; ++ + /* override filesystem creation time */ + time_t mkfs_fixed_time = -1; + +@@ -2246,6 +2249,8 @@ restat: + pathname_reader(dir_ent), strerror(errno)); + goto read_err; + } ++ if(content_clamp_time != -1 && buf2.st_mtime >= content_clamp_time) ++ buf2.st_mtime = content_clamp_time; + + if(read_size != buf2.st_size) { + close(file); +@@ -3101,7 +3106,7 @@ void dir_scan(squashfs_inode *inode, char *pathname, + buf.st_mode = S_IRWXU | S_IRWXG | S_IRWXO | S_IFDIR; + buf.st_uid = getuid(); + buf.st_gid = getgid(); +- buf.st_mtime = time(NULL); ++ buf.st_mtime = content_clamp_time != -1 ? content_clamp_time : time(NULL); + buf.st_dev = 0; + buf.st_ino = 0; + dir_ent->inode = lookup_inode2(&buf, PSEUDO_FILE_OTHER, 0); +@@ -3127,6 +3115,8 @@ void dir_scan(squashfs_inode *inode, char *pathname, + /* source directory has disappeared? */ + BAD_ERROR("Cannot stat source directory %s because %s\n", + pathname, strerror(errno)); ++ if(content_clamp_time != -1 && buf.st_mtime >= content_clamp_time) ++ buf.st_mtime = content_clamp_time; + dir_ent->inode = lookup_inode(&buf); + } + +@@ -3365,6 +3372,8 @@ struct dir_info *dir_scan1(char *filename, char *subpath, + free_dir_entry(dir_ent); + continue; + } ++ if(content_clamp_time != -1 && buf.st_mtime >= content_clamp_time) ++ buf.st_mtime = content_clamp_time; + + if((buf.st_mode & S_IFMT) != S_IFREG && + (buf.st_mode & S_IFMT) != S_IFDIR && +@@ -3544,7 +3553,7 @@ void dir_scan2(struct dir_info *dir, struct pseudo *pseudo) + buf.st_gid = pseudo_ent->dev->gid; + buf.st_rdev = makedev(pseudo_ent->dev->major, + pseudo_ent->dev->minor); +- buf.st_mtime = time(NULL); ++ buf.st_mtime = content_clamp_time != -1 ? content_clamp_time : time(NULL); + buf.st_ino = pseudo_ino ++; + + if(pseudo_ent->dev->type == 'd') { +@@ -5674,7 +5683,7 @@ printOptions: + "%lu but was found to be: %llu \n", ULONG_MAX, epoch); + EXIT_MKSQUASHFS(); + } +- mkfs_fixed_time = (time_t)epoch; ++ mkfs_fixed_time = content_clamp_time = (time_t)epoch; + } + + /* +-- +2.17.0 + diff --git a/pkgs/tools/filesystems/squashfs/0003-remove-frag-deflator-thread.patch b/pkgs/tools/filesystems/squashfs/0003-remove-frag-deflator-thread.patch new file mode 100644 index 00000000000..4be4b96369a --- /dev/null +++ b/pkgs/tools/filesystems/squashfs/0003-remove-frag-deflator-thread.patch @@ -0,0 +1,220 @@ +From afc0c76a170bd17cbd29bbec6ae6d2227e398570 Mon Sep 17 00:00:00 2001 +From: Alexander Couzens +Date: Fri, 13 Jan 2017 22:00:37 +0100 +Subject: [PATCH] remove frag_deflator_thread + +frag_deflator_thread compress fragments. +Replace the deflator_thread with a function and +use the function instead of the to_frag queue. +--- + squashfs-tools/info.c | 5 --- + squashfs-tools/mksquashfs.c | 76 +++++++++++++------------------------ + squashfs-tools/mksquashfs.h | 2 +- + squashfs-tools/restore.c | 15 +------- + 4 files changed, 30 insertions(+), 68 deletions(-) + +diff --git a/squashfs-tools/info.c b/squashfs-tools/info.c +index 7968c77..028d578 100644 +--- a/squashfs-tools/info.c ++++ b/squashfs-tools/info.c +@@ -96,11 +96,6 @@ void dump_state() + printf("compressed block queue (deflate thread(s) -> main thread)\n"); + dump_seq_queue(to_main, 0); + +- printf("uncompressed packed fragment queue (main thread -> fragment" +- " deflate thread(s))\n"); +- dump_queue(to_frag); +- +- + printf("locked frag queue (compressed frags waiting while multi-block" + " file is written)\n"); + dump_queue(locked_fragment); +diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c +index cf48e40..cacf14c 100644 +--- a/squashfs-tools/mksquashfs.c ++++ b/squashfs-tools/mksquashfs.c +@@ -270,10 +270,10 @@ unsigned int sid_count = 0, suid_count = 0, sguid_count = 0; + struct cache *reader_buffer, *fragment_buffer, *reserve_cache; + struct cache *bwriter_buffer, *fwriter_buffer; + struct queue *to_reader, *to_deflate, *to_writer, *from_writer, +- *to_frag, *locked_fragment, *to_process_frag; ++ *locked_fragment, *to_process_frag; + struct seq_queue *to_main; + pthread_t reader_thread, writer_thread, main_thread; +-pthread_t *deflator_thread, *frag_deflator_thread, *frag_thread; ++pthread_t *deflator_thread, *frag_thread; + pthread_t *restore_thread = NULL; + pthread_mutex_t fragment_mutex = PTHREAD_MUTEX_INITIALIZER; + pthread_mutex_t pos_mutex = PTHREAD_MUTEX_INITIALIZER; +@@ -323,7 +323,7 @@ struct dir_info *scan1_opendir(char *pathname, char *subpath, int depth); + void write_filesystem_tables(struct squashfs_super_block *sBlk, int nopad); + unsigned short get_checksum_mem(char *buff, int bytes); + void check_usable_phys_mem(int total_mem); +- ++void frag_deflator(struct file_buffer *file_buffer); + + void prep_exit() + { +@@ -1540,7 +1540,7 @@ void write_fragment(struct file_buffer *fragment) + pthread_mutex_lock(&fragment_mutex); + fragment_table[fragment->block].unused = 0; + fragments_outstanding ++; +- queue_put(to_frag, fragment); ++ frag_deflator(fragment); + pthread_cleanup_pop(1); + } + +@@ -2412,51 +2412,34 @@ void *deflator(void *arg) + } + + +-void *frag_deflator(void *arg) ++void frag_deflator(struct file_buffer *file_buffer) + { +- void *stream = NULL; +- int res; + +- res = compressor_init(comp, &stream, block_size, 1); +- if(res) +- BAD_ERROR("frag_deflator:: compressor_init failed\n"); +- +- pthread_cleanup_push((void *) pthread_mutex_unlock, &fragment_mutex); +- +- while(1) { +- int c_byte, compressed_size; +- struct file_buffer *file_buffer = queue_get(to_frag); +- struct file_buffer *write_buffer = ++ int c_byte, compressed_size; ++ struct file_buffer *write_buffer = + cache_get(fwriter_buffer, file_buffer->block); + +- c_byte = mangle2(stream, write_buffer->data, file_buffer->data, +- file_buffer->size, block_size, noF, 1); +- compressed_size = SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte); +- write_buffer->size = compressed_size; +- pthread_mutex_lock(&fragment_mutex); +- if(fragments_locked == FALSE) { +- fragment_table[file_buffer->block].size = c_byte; +- fragment_table[file_buffer->block].start_block = bytes; +- write_buffer->block = bytes; +- bytes += compressed_size; +- fragments_outstanding --; +- queue_put(to_writer, write_buffer); +- pthread_mutex_unlock(&fragment_mutex); +- TRACE("Writing fragment %lld, uncompressed size %d, " +- "compressed size %d\n", file_buffer->block, +- file_buffer->size, compressed_size); +- } else { +- add_pending_fragment(write_buffer, c_byte, +- file_buffer->block); +- pthread_mutex_unlock(&fragment_mutex); +- } +- cache_block_put(file_buffer); ++ c_byte = mangle2(stream, write_buffer->data, file_buffer->data, ++ file_buffer->size, block_size, noF, 1); ++ compressed_size = SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte); ++ write_buffer->size = compressed_size; ++ if(fragments_locked == FALSE) { ++ fragment_table[file_buffer->block].size = c_byte; ++ fragment_table[file_buffer->block].start_block = bytes; ++ write_buffer->block = bytes; ++ bytes += compressed_size; ++ fragments_outstanding --; ++ queue_put(to_writer, write_buffer); ++ TRACE("Writing fragment %lld, uncompressed size %d, " ++ "compressed size %d\n", file_buffer->block, ++ file_buffer->size, compressed_size); ++ } else { ++ add_pending_fragment(write_buffer, c_byte, ++ file_buffer->block); + } +- +- pthread_cleanup_pop(0); ++ cache_block_put(file_buffer); + } + +- + struct file_buffer *get_file_buffer() + { + struct file_buffer *file_buffer = seq_queue_get(to_main); +@@ -4257,19 +4240,17 @@ void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq, + multiply_overflow(processors * 3, sizeof(pthread_t))) + BAD_ERROR("Processors too large\n"); + +- deflator_thread = malloc(processors * 3 * sizeof(pthread_t)); ++ deflator_thread = malloc(processors * 2 * sizeof(pthread_t)); + if(deflator_thread == NULL) + MEM_ERROR(); + +- frag_deflator_thread = &deflator_thread[processors]; +- frag_thread = &frag_deflator_thread[processors]; ++ frag_thread = &deflator_thread[processors]; + + to_reader = queue_init(1); + to_deflate = queue_init(reader_size); + to_process_frag = queue_init(reader_size); + to_writer = queue_init(bwriter_size + fwriter_size); + from_writer = queue_init(1); +- to_frag = queue_init(fragment_size); + locked_fragment = queue_init(fragment_size); + to_main = seq_queue_init(); + reader_buffer = cache_init(block_size, reader_size, 0, 0); +@@ -4285,9 +4266,6 @@ void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq, + for(i = 0; i < processors; i++) { + if(pthread_create(&deflator_thread[i], NULL, deflator, NULL)) + BAD_ERROR("Failed to create thread\n"); +- if(pthread_create(&frag_deflator_thread[i], NULL, frag_deflator, +- NULL) != 0) +- BAD_ERROR("Failed to create thread\n"); + if(pthread_create(&frag_thread[i], NULL, frag_thrd, + (void *) destination_file) != 0) + BAD_ERROR("Failed to create thread\n"); +diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h +index 55708a3..dc5bde4 100644 +--- a/squashfs-tools/mksquashfs.h ++++ b/squashfs-tools/mksquashfs.h +@@ -135,7 +135,7 @@ struct append_file { + extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache; + struct cache *bwriter_buffer, *fwriter_buffer; + extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer, +- *to_frag, *locked_fragment, *to_process_frag; ++ *locked_fragment, *to_process_frag; + extern struct append_file **file_mapping; + extern struct seq_queue *to_main; + extern pthread_mutex_t fragment_mutex, dup_mutex; +diff --git a/squashfs-tools/restore.c b/squashfs-tools/restore.c +index 5e336b3..a7aaf2e 100644 +--- a/squashfs-tools/restore.c ++++ b/squashfs-tools/restore.c +@@ -47,8 +47,8 @@ + #define TRUE 1 + + extern pthread_t reader_thread, writer_thread, main_thread; +-extern pthread_t *deflator_thread, *frag_deflator_thread, *frag_thread; +-extern struct queue *to_deflate, *to_writer, *to_frag, *to_process_frag; ++extern pthread_t *deflator_thread, *frag_thread; ++extern struct queue *to_deflate, *to_writer, *to_process_frag; + extern struct seq_queue *to_main; + extern void restorefs(); + extern int processors; +@@ -120,17 +120,6 @@ void *restore_thrd(void *arg) + pthread_cancel(main_thread); + pthread_join(main_thread, NULL); + +- /* then flush the main thread to fragment deflator thread(s) +- * queue. The fragment deflator thread(s) will idle +- */ +- queue_flush(to_frag); +- +- /* now kill the fragment deflator thread(s) */ +- for(i = 0; i < processors; i++) +- pthread_cancel(frag_deflator_thread[i]); +- for(i = 0; i < processors; i++) +- pthread_join(frag_deflator_thread[i], NULL); +- + /* + * then flush the main thread/fragment deflator thread(s) + * to writer thread queue. The writer thread will idle +-- +2.17.0 + diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index a2fc5bc3d40..08951113b3b 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -15,6 +15,15 @@ stdenv.mkDerivation rec { rev = "9c1db6d13a51a2e009f0027ef336ce03624eac0d"; }; + # These patches ensures that mksquashfs output is reproducible. + # See also https://reproducible-builds.org/docs/system-images/ + # and https://github.com/NixOS/nixpkgs/issues/40144. + patches = [ + ./0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch + ./0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch + ./0003-remove-frag-deflator-thread.patch + ]; + buildInputs = [ zlib xz ] ++ stdenv.lib.optional lz4Support lz4; From 61a87491dc226267f7a979ea0f7ab81386c453d9 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 3 May 2018 13:08:11 +0300 Subject: [PATCH 310/695] pacparser: init at 1.3.7 --- pkgs/tools/networking/pacparser/default.nix | 27 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/networking/pacparser/default.nix diff --git a/pkgs/tools/networking/pacparser/default.nix b/pkgs/tools/networking/pacparser/default.nix new file mode 100644 index 00000000000..54b3cf8fd81 --- /dev/null +++ b/pkgs/tools/networking/pacparser/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "pacparser-${version}"; + version = "1.3.7"; + + src = fetchurl { + url = "https://github.com/manugarg/pacparser/releases/download/${version}/${name}.tar.gz"; + sha256 = "0jfjm8lqyhdy9ny8a8icyd4rhclhfn608cr1i15jml82q8pyqj7b"; + }; + + makeFlags = [ "NO_INTERNET=1" ]; + + preConfigure = '' + export makeFlags="$makeFlags PREFIX=$out" + patchShebangs tests/runtests.sh + cd src + ''; + + meta = with stdenv.lib; { + description = "A library to parse proxy auto-config (PAC) files"; + homepage = http://pacparser.manugarg.com/; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ab3665873b..d6759098dfa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -657,6 +657,8 @@ with pkgs; lastpass-cli = callPackage ../tools/security/lastpass-cli { }; + pacparser = callPackage ../tools/networking/pacparser { }; + pass = callPackage ../tools/security/pass { }; passExtensions = recurseIntoAttrs pass.extensions; From a08645e9bea56a19df944763347269cf18a1b8ab Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 3 Apr 2018 10:43:15 +0300 Subject: [PATCH 311/695] nginx module: add upstream extraConfig --- nixos/modules/services/web-servers/nginx/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 815c3147e64..0aa780bf6da 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -38,6 +38,7 @@ let ${toString (flip mapAttrsToList upstream.servers (name: server: '' server ${name} ${optionalString server.backup "backup"}; ''))} + ${upstream.extraConfig} } '')); @@ -492,6 +493,13 @@ in ''; default = {}; }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + These lines go to the end of the upstream verbatim. + ''; + }; }; }); description = '' From 3510b983c41196fce90729289c8c300ada1ccaea Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 8 May 2018 10:01:48 -0400 Subject: [PATCH 312/695] linux: 4.17-rc3 -> 4.17-rc4 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index d02ab415719..92225670330 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.17-rc3"; - modDirVersion = "4.17.0-rc3"; + version = "4.17-rc4"; + modDirVersion = "4.17.0-rc4"; extraMeta.branch = "4.17"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1divgjzmpl98b5j416vhkq53li0y9v5vvdwbgwpr2xznspzbkygq"; + sha256 = "1y34hpzgxblwqslhsfsmzmpv9f3s936r93wgn4kmhkcwsm0in292"; }; # Should the testing kernels ever be built on Hydra? From 7936474efcef8fae93e96fe66d36b5cb363d4857 Mon Sep 17 00:00:00 2001 From: Emmanuel Rosa Date: Tue, 8 May 2018 10:49:49 -0400 Subject: [PATCH 313/695] gnucash: restore version 2.4 --- pkgs/applications/office/gnucash/2.4.nix | 85 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 8 +++ 2 files changed, 93 insertions(+) create mode 100644 pkgs/applications/office/gnucash/2.4.nix diff --git a/pkgs/applications/office/gnucash/2.4.nix b/pkgs/applications/office/gnucash/2.4.nix new file mode 100644 index 00000000000..252c6d878d0 --- /dev/null +++ b/pkgs/applications/office/gnucash/2.4.nix @@ -0,0 +1,85 @@ +{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk2, libgnomeui, libofx +, libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui +, intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade +, libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar +}: + +/* If you experience GConf errors when running GnuCash on NixOS, see + * http://wiki.nixos.org/wiki/Solve_GConf_errors_when_running_GNOME_applications + * for a possible solution. + */ + +stdenv.mkDerivation rec { + name = "gnucash-2.4.15"; + + src = fetchurl { + url = "mirror://sourceforge/gnucash/${name}.tar.bz2"; + sha256 = "058mgfwic6a2g7jq6iip5hv45md1qaxy25dj4lvlzjjr141wm4gx"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + libxml2 gconf glib gtk2 libgnomeui libgtkhtml gtkhtml + libgnomeprint goffice enchant gettext intltool perl guile slibGuile + swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl + perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar + ]; + propagatedUserEnvPkgs = [ gconf ]; + + configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx --enable-aqbanking"; + + postInstall = '' + # Auto-updaters don't make sense in Nix. + rm $out/bin/gnc-fq-update + + sed -i $out/bin/update-gnucash-gconf \ + -e 's|--config-source=[^ ]* --install-schema-file|--makefile-install-rule|' + + for prog in $(echo "$out/bin/"*) + do + # Don't wrap the gnc-fq-* scripts, since gnucash calls them as + # "perl