From 0d64cc340b96f394e784b4821d4173e9d0972748 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 26 Aug 2020 07:21:04 +0000 Subject: [PATCH 001/299] ktlint: 0.37.2 -> 0.38.1 --- pkgs/development/tools/ktlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index fce25903aca..3b5233d8895 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.37.2"; + version = "0.38.1"; src = fetchurl { url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint"; - sha256 = "1hhycvvp21gy6g71hwf3pk2jnccpnhcf2z7c85shzffhddy1wc0v"; + sha256 = "0wz839ikvqjxpx2rzaxaji12pcqxcgmmb91xypz2dzlplxvzxvdj"; }; nativeBuildInputs = [ makeWrapper ]; From a323331e6ad6a82a276966330057a294cb6b0ab3 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 17 Sep 2020 15:33:17 -0300 Subject: [PATCH 002/299] dart: Fix dart2native by patching all ELFs Before: $ /nix/store/ihlzjcxahcack6chfzphb74bkccmq6br-dart-2.7.2/bin/dart2native hello.dart Failed to generate native files: ProcessException: No such file or directory Command: /nix/store/ihlzjcxahcack6chfzphb74bkccmq6br-dart-2.7.2/bin/utils/gen_snapshot --snapshot-kind=app-aot-elf --elf=/tmp/HSHJQU/snapshot.aot /tmp/HSHJQU/kernel.dill After: $ /nix/store/czw7kpdmcqa76a9j00v2pjygrq7gy4c7-dart-2.7.2/bin/dart2native hello.dart Generated: /home/thiagoko/hello.exe $ ./hello.exe Hello, World! --- pkgs/development/interpreters/dart/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index 050e7f14979..6ce43d55173 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -69,9 +69,7 @@ stdenv.mkDerivation { mkdir -p $out cp -R * $out/ echo $libPath - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libPath \ - $out/bin/dart + find $out/bin -executable -type f -exec patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \; ''; libPath = makeLibraryPath [ stdenv.cc.cc ]; From 59c4870a9691d23fd4372af53fff740e4e66cfab Mon Sep 17 00:00:00 2001 From: Denys Pavlov Date: Thu, 1 Oct 2020 19:19:49 -0400 Subject: [PATCH 003/299] maintainers: add meatcar --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 33e34fbab33..35cf19572e2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5452,6 +5452,12 @@ fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94"; }]; }; + meatcar = { + email = "nixpkgs@denys.me"; + github = "meatcar"; + githubId = 191622; + name = "Denys Pavlov"; + }; meditans = { email = "meditans@gmail.com"; github = "meditans"; From 01762fec0ab7576e3b371eda3dd3fd576e640798 Mon Sep 17 00:00:00 2001 From: Justinas Stankevicius Date: Mon, 3 Aug 2020 17:48:19 +0300 Subject: [PATCH 004/299] prometheus-sql-exporter: init at 0.3.0 --- .../monitoring/prometheus/sql-exporter.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 24 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/sql-exporter.nix diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/servers/monitoring/prometheus/sql-exporter.nix new file mode 100644 index 00000000000..c689cc1ed79 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/sql-exporter.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: + +buildGoModule rec { + pname = "sql_exporter"; + version = "0.3.0"; + + vendorSha256 = null; + + src = fetchFromGitHub { + owner = "justwatchcom"; + repo = "sql_exporter"; + rev = "v${version}"; + sha256 = "125brlxgwhkn3z5v0522gpm0sk6v905ghh05c4c3wf1hlm7bhnrc"; + }; + + meta = with stdenv.lib; { + description = "Flexible SQL exporter for Prometheus"; + homepage = "https://github.com/justwatchcom/sql_exporter"; + license = licenses.mit; + maintainers = with maintainers; [ justinas ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c540fc45b97..ee0946f5d02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17048,6 +17048,7 @@ in prometheus-redis-exporter = callPackage ../servers/monitoring/prometheus/redis-exporter.nix { }; prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { }; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; + prometheus-sql-exporter = callPackage ../servers/monitoring/prometheus/sql-exporter.nix { }; prometheus-tor-exporter = callPackage ../servers/monitoring/prometheus/tor-exporter.nix { }; prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { }; prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { }; From 40d972a6f659ff4e21a34fd11bbc9f1b6794cab6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 13:17:49 +0000 Subject: [PATCH 005/299] python37Packages.nbsmoke: 0.4.1 -> 0.5.0 --- pkgs/development/python-modules/nbsmoke/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbsmoke/default.nix b/pkgs/development/python-modules/nbsmoke/default.nix index 8f263246893..b7ddf35caec 100644 --- a/pkgs/development/python-modules/nbsmoke/default.nix +++ b/pkgs/development/python-modules/nbsmoke/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "nbsmoke"; - version = "0.4.1"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "06as8vh17m0nkp3fpkp42m990a5zjfl2iaa17da99ksh7886mjpc"; + sha256 = "2400d7878e97714e822ab200a71fc71ede487e671f42b4b411745dba95f9cb32"; }; propagatedBuildInputs = [ From aff604993fbc67300455b2ad90fefb7d837bfbe4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 12:28:47 +0000 Subject: [PATCH 006/299] hpx: 1.5.0 -> 1.5.1 --- pkgs/development/libraries/hpx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix index b6d6b688752..ba7da8f5b77 100644 --- a/pkgs/development/libraries/hpx/default.nix +++ b/pkgs/development/libraries/hpx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hpx"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "STEllAR-GROUP"; repo = "hpx"; rev = version; - sha256 = "10hgjavhvn33y3k5j3l1326x13bxffghg2arxjrh7i7zd3qprfv5"; + sha256 = "1ld2k00500p107jarw379hsd1nlnm33972nv9c3ssfq619bj01c9"; }; buildInputs = [ boost hwloc gperftools ]; From 1321ae850c12ae223b4ca8468ecb14519e1d69f8 Mon Sep 17 00:00:00 2001 From: Anton Plotnikov Date: Tue, 13 Oct 2020 12:01:23 +0300 Subject: [PATCH 007/299] fido2luks: 0.2.3 -> 0.2.15 Also remove interactive flag from initrd, because of broken io. --- nixos/modules/system/boot/luksroot.nix | 2 +- pkgs/tools/security/fido2luks/default.nix | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 88190e8200b..8dd2ea20519 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -404,7 +404,7 @@ let echo "Please move your mouse to create needed randomness." ''} echo "Waiting for your FIDO2 device..." - fido2luks -i open ${device} ${name} ${fido2.credential} --await-dev ${toString fido2.gracePeriod} --salt string:$passphrase + fido2luks open ${device} ${name} ${fido2.credential} --await-dev ${toString fido2.gracePeriod} --salt string:$passphrase if [ $? -ne 0 ]; then echo "No FIDO2 key found, falling back to normal open procedure" open_normally diff --git a/pkgs/tools/security/fido2luks/default.nix b/pkgs/tools/security/fido2luks/default.nix index 729a3f7297c..d2a5d91467a 100644 --- a/pkgs/tools/security/fido2luks/default.nix +++ b/pkgs/tools/security/fido2luks/default.nix @@ -3,23 +3,29 @@ , fetchFromGitHub , cryptsetup , pkg-config +, clang +, llvmPackages }: rustPlatform.buildRustPackage rec { pname = "fido2luks"; - version = "0.2.3"; + version = "0.2.15"; src = fetchFromGitHub { owner = "shimunn"; repo = pname; rev = version; - sha256 = "0340xp7q6f0clb7wmqpgllllwsixmsy37k1f5kj3hwvb730rz93x"; + sha256 = "1v5gxcz4zbc673i5kbsnjq8bikf7jdbn3wjfz1wppjrgwnkgvsh9"; }; buildInputs = [ cryptsetup ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config clang ]; - cargoSha256 = "0rp4f6xnwmvf3pv6h0qwsg01jrndf77yn67675ac39kxzmrzfy2f"; + configurePhase = '' + export LIBCLANG_PATH="${llvmPackages.libclang}/lib" + ''; + + cargoSha256 = "19drjql13z8bw257z10kjppxm25jlfgrpc9g1jf68ka5j2b3nx7k"; meta = with stdenv.lib; { description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator"; From 038793bd1e9d661dea67b78a0bd66219d0ab35b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Mon, 26 Oct 2020 14:10:29 +0100 Subject: [PATCH 008/299] asterisk_18: Init at 18.0.0 I hope I bumped all attributes correctly. --- pkgs/servers/asterisk/default.nix | 18 ++++++++++++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index b0e7d6aec56..4c2bd80f42e 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -91,17 +91,18 @@ let }; in rec { - # Supported releases (as of 2020-10-07). + # Supported releases (as of 2020-10-26). # Source: https://wiki.asterisk.org/wiki/display/AST/Asterisk+Versions # Exact version can be found at https://www.asterisk.org/downloads/asterisk/all-asterisk-versions/ # # Series Type Rel. Date Sec. Fixes EOL # 13.x LTS 2014-10-24 2020-10-24 2021-10-24 # 16.x LTS 2018-10-09 2022-10-09 2023-10-09 - asterisk-lts = asterisk_16; + # 18.x LTS 2020-10-20 2024-10-20 2025-10-20 + asterisk-lts = asterisk_18; # 17.x Standard 2019-10-28 2020-10-28 2021-10-28 - asterisk-stable = asterisk_17; - asterisk = asterisk_17; + asterisk-stable = asterisk_18; + asterisk = asterisk_18; asterisk_13 = common { version = "13.36.0"; @@ -129,4 +130,13 @@ in rec { "addons/mp3" = mp3-202; }; }; + + asterisk_18 = common { + version = "18.0.0"; + sha256 = "174zasx8d7ragy2fz4vwc4pbra9wl471mnisz1z0a3b2qsbh4y4v"; + externals = { + "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10; + "addons/mp3" = mp3-202; + }; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f1cb87dcc5..37c00d7dca1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16409,7 +16409,7 @@ in inherit (callPackages ../servers/asterisk { }) asterisk asterisk-stable asterisk-lts - asterisk_13 asterisk_16 asterisk_17; + asterisk_13 asterisk_16 asterisk_17 asterisk_18; asterisk-module-sccp = callPackage ../servers/asterisk/sccp { }; From ff3dca56ede5b2c4baedbbba627d8c6f9f91815e Mon Sep 17 00:00:00 2001 From: Denys Pavlov Date: Thu, 1 Oct 2020 19:20:04 -0400 Subject: [PATCH 009/299] pythonPackages.sqlite-utils: init at 2.22 --- .../python-modules/sqlite-utils/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/sqlite-utils/default.nix diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix new file mode 100644 index 00000000000..9fc4c328b2c --- /dev/null +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, click +, click-default-group +, tabulate +, pytestCheckHook +, pytestrunner +, black +}: + +buildPythonPackage rec { + pname = "sqlite-utils"; + version = "2.22"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0g8zzp4qw6miijirykjcd78ib027k7dmg6lb9m4xysvah5jh8vfv"; + }; + + propagatedBuildInputs = [ + click + click-default-group + tabulate + ]; + + checkInputs = [ + pytestCheckHook + pytestrunner + black + ]; + + meta = with lib; { + description = "Python CLI utility and library for manipulating SQLite databases"; + homepage = "https://github.com/simonw/sqlite-utils"; + license = licenses.asl20; + maintainers = [ maintainers.meatcar ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51b344f622b..09eaa48b9fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11612,6 +11612,8 @@ in sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { }; + sqlite-utils = with python3Packages; toPythonApplication sqlite-utils; + sqlite-web = callPackage ../development/tools/database/sqlite-web { }; sqlmap = with python3Packages; toPythonApplication sqlmap; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 10ab7ea9497..eaf30e0e899 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6734,6 +6734,8 @@ in { sqlitedict = callPackage ../development/python-modules/sqlitedict { }; + sqlite-utils = callPackage ../development/python-modules/sqlite-utils { }; + sqlmap = callPackage ../development/python-modules/sqlmap { }; sqlobject = callPackage ../development/python-modules/sqlobject { }; From 11f9033305c6f88dcd1e24688159f0245bd36096 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Tue, 27 Oct 2020 22:28:41 +0100 Subject: [PATCH 010/299] python3.pkgs.pyosmium: 2.15.3 -> 3.0.1 --- pkgs/development/python-modules/pyosmium/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix index e63fd00bb57..ffcd3569e0a 100644 --- a/pkgs/development/python-modules/pyosmium/default.nix +++ b/pkgs/development/python-modules/pyosmium/default.nix @@ -1,16 +1,18 @@ { lib, buildPythonPackage, fetchFromGitHub, cmake, python , libosmium, protozero, boost, expat, bzip2, zlib, pybind11 -, nose, shapely, mock, isPy3k }: +, nose, shapely, pythonOlder, isPyPy }: buildPythonPackage rec { pname = "pyosmium"; - version = "2.15.3"; + version = "3.0.1"; + + disabled = pythonOlder "3.4" || isPyPy; src = fetchFromGitHub { owner = "osmcode"; repo = pname; rev = "v${version}"; - sha256 = "1523ym9i4rnwi5kcp7n2lm67kxlhar8xlv91s394ixzwax9bgg7w"; + sha256 = "06jngbmmmswhyi5q5bjph6gwss28d2azn5414zf0arik5bcvz128"; }; nativeBuildInputs = [ cmake ]; @@ -18,7 +20,7 @@ buildPythonPackage rec { preBuild = "cd .."; - checkInputs = [ nose shapely ] ++ lib.optionals (!isPy3k) [ mock ]; + checkInputs = [ nose shapely ]; checkPhase = "(cd test && ${python.interpreter} run_tests.py)"; From 4897591ab17f05754e8ab94e5a35396c30c84fbe Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 30 Oct 2020 08:48:15 +0100 Subject: [PATCH 011/299] thunderbird: set build timeout at eight hours This matches a similar change made to Firefox in #96767. A lot of code is shared between Firefox and Thunderbird so it makes sense to increase timeouts for Thunderbird as well. --- pkgs/applications/networking/mailreaders/thunderbird/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 7494c113805..d284ca14090 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -332,5 +332,6 @@ stdenv.mkDerivation rec { ]; platforms = platforms.linux; license = licenses.mpl20; + timeout = 28800; # eight hours }; } From fa20999c64d72085dabdece091914914da0b7617 Mon Sep 17 00:00:00 2001 From: toonn Date: Fri, 30 Oct 2020 08:52:57 +0100 Subject: [PATCH 012/299] wire-desktop: linux 3.20.2934 -> 3.21.2936 --- .../networking/instant-messengers/wire-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 44aa3a6ac66..385f491f495 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -23,12 +23,12 @@ let version = { x86_64-darwin = "3.20.3912"; - x86_64-linux = "3.20.2934"; + x86_64-linux = "3.21.2936"; }.${system} or throwSystem; sha256 = { x86_64-darwin = "1crkdqzq3iccxbrqlrar4ai43qzjsgd4hvcajgzmz2y33f30xgqr"; - x86_64-linux = "0z6vrhzrhrrnl3swjbxrbl1dhk2fx86s45n2z2in2shdlv08dcx7"; + x86_64-linux = "033804nkz1fdmq3p8iplrlx708x1fjlr09bmrpy36lqg5h7m3yd6"; }.${system} or throwSystem; meta = with stdenv.lib; { From e6a44b2fc418e24e647f45756df6608df2aacd50 Mon Sep 17 00:00:00 2001 From: toonn Date: Fri, 30 Oct 2020 08:54:19 +0100 Subject: [PATCH 013/299] wire-desktop: mac 3.20.3912 -> 3.21.3959 --- .../networking/instant-messengers/wire-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 385f491f495..b198b954bd4 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -22,12 +22,12 @@ let pname = "wire-desktop"; version = { - x86_64-darwin = "3.20.3912"; + x86_64-darwin = "3.21.3959"; x86_64-linux = "3.21.2936"; }.${system} or throwSystem; sha256 = { - x86_64-darwin = "1crkdqzq3iccxbrqlrar4ai43qzjsgd4hvcajgzmz2y33f30xgqr"; + x86_64-darwin = "0fgzzqf1wnkjbcr0j0vjn6sggkz0z1kx6w4gi7gk4c4markdicm1"; x86_64-linux = "033804nkz1fdmq3p8iplrlx708x1fjlr09bmrpy36lqg5h7m3yd6"; }.${system} or throwSystem; From 42a9cfe540687fd32cfd23ff511c9e197f2fcc72 Mon Sep 17 00:00:00 2001 From: Atemu Date: Fri, 25 Sep 2020 11:40:46 +0200 Subject: [PATCH 014/299] mlterm: stdenv.lib -> lib --- .../terminal-emulators/mlterm/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index 7c7906fc841..0ec8d7a4740 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, autoconf, makeDesktopItem +{ stdenv, lib, fetchurl, pkgconfig, autoconf, makeDesktopItem , libX11, gdk-pixbuf, cairo, libXft, gtk3, vte , harfbuzz #substituting glyphs with opentype fonts , fribidi, m17n_lib #bidi and encoding @@ -46,9 +46,9 @@ stdenv.mkDerivation rec { -L${stdenv.cc.cc.lib}/lib -lX11 -lgdk_pixbuf-2.0 -lcairo -lfontconfig -lfreetype -lXft -lvte-2.91 -lgtk-3 -lharfbuzz -lfribidi -lm17n - " + stdenv.lib.optionalString (openssl != null) " + " + lib.optionalString (openssl != null) " -lcrypto - " + stdenv.lib.optionalString (libssh2 != null) " + " + lib.optionalString (libssh2 != null) " -lssh2 "; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { "--with-tools=mlclient,mlconfig,mlcc,mlterm-menu,mlimgloader,registobmp,mlfc" #mlterm-menu and mlconfig depend on enabling gnome3.at-spi2-core #and configuring ~/.mlterm/key correctly. - ] ++ stdenv.lib.optional (libssh2 == null) "--disable-ssh2"; + ] ++ lib.optional (libssh2 == null) "--disable-ssh2"; postInstall = '' install -D contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg" @@ -80,13 +80,13 @@ stdenv.mkDerivation rec { comment = "Terminal emulator"; desktopName = "mlterm"; genericName = "Terminal emulator"; - categories = stdenv.lib.concatStringsSep ";" [ + categories = lib.concatStringsSep ";" [ "Application" "System" "TerminalEmulator" ]; startupNotify = "false"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Multi Lingual TERMinal emulator on X11"; homepage = "http://mlterm.sourceforge.net/"; license = licenses.bsd3; From 43776fb11e17781ebffb3bd110b83af224aa5624 Mon Sep 17 00:00:00 2001 From: Benjamin Andresen Date: Sat, 31 Oct 2020 21:42:24 +0100 Subject: [PATCH 015/299] clojure: 1.10.1.645 -> 1.10.1.727 --- pkgs/development/interpreters/clojure/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 39db54babe4..bebb5376b8a 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.1.645"; + version = "1.10.1.727"; src = fetchurl { url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "1z6a9an8ls992y4japmzdxay7c5d2z9s2q1xl4g615r23jwpcsf9"; + sha256 = "1mnxvy4n7g72vcwhvrgr0xqri3p9d9w76c8a78kphhmd8lq0m92q"; }; nativeBuildInputs = [ @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cp clojure-tools-${version}.jar $out/libexec cp example-deps.edn $out cp deps.edn $out - cp clj_exec.clj $out + cp exec.jar $out substituteInPlace clojure --replace PREFIX $out From afa6047e12169f14d9b761124975d7e145ed4519 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 1 Nov 2020 00:24:33 +0000 Subject: [PATCH 016/299] gromacs: 2020.3 -> 2020.4 --- .../science/molecular-dynamics/gromacs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 151abb099f5..bfa4a1f4339 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -9,11 +9,11 @@ }: stdenv.mkDerivation { - name = "gromacs-2020.3"; + name = "gromacs-2020.4"; src = fetchurl { - url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.3.tar.gz"; - sha256 = "1acjrhcfzpqy2dncblhj97602jbg9gdha4q1bgji9nrj25lq6cch"; + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.4.tar.gz"; + sha256 = "1rplvgna60nqyb8nspaz3bfkwb044kv3zxdaa5whql5m441nj6am"; }; nativeBuildInputs = [ cmake ]; From efa79e6e535a56d6943ae6379f6a27138727b0a3 Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Sun, 1 Nov 2020 10:33:06 +0100 Subject: [PATCH 017/299] agda-categories: fix hash Apparently, v0.1.4 was released twice. The current version of the build points to the first edition of v0.1.4, which is no longer attached to the tag "v0.1.4" on GitHub. Hence currently, downloading fails. This commit adjusts the hash to appropriately refer to the second edition of v0.1.4 --- pkgs/development/libraries/agda/agda-categories/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/agda/agda-categories/default.nix b/pkgs/development/libraries/agda/agda-categories/default.nix index f2215b9b984..fb6cc727967 100644 --- a/pkgs/development/libraries/agda/agda-categories/default.nix +++ b/pkgs/development/libraries/agda/agda-categories/default.nix @@ -8,7 +8,7 @@ mkDerivation rec { owner = "agda"; repo = "agda-categories"; rev = "v${version}"; - sha256 = "0n6y9xarqhj95i4h56klx10gy0fyckxbfwgiissfknpfq6l0m7r6"; + sha256 = "1bcvmxcnl1ig38fxqkx8ydidhxq6a0kn2k9waf0lygh4ap928sgk"; }; buildInputs = [ standard-library ]; From ef7fff6a49986fd67be37ef9cb1e7e0a84c589de Mon Sep 17 00:00:00 2001 From: Kir Ax Date: Mon, 2 Nov 2020 21:13:09 +0700 Subject: [PATCH 018/299] textadept: moved to subdir for 10th version --- pkgs/applications/editors/textadept/{ => 10}/default.nix | 0 pkgs/applications/editors/textadept/{ => 10}/deps.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/editors/textadept/{ => 10}/default.nix (100%) rename pkgs/applications/editors/textadept/{ => 10}/deps.nix (100%) diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/10/default.nix similarity index 100% rename from pkgs/applications/editors/textadept/default.nix rename to pkgs/applications/editors/textadept/10/default.nix diff --git a/pkgs/applications/editors/textadept/deps.nix b/pkgs/applications/editors/textadept/10/deps.nix similarity index 100% rename from pkgs/applications/editors/textadept/deps.nix rename to pkgs/applications/editors/textadept/10/deps.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6825cd25c2..ac1cb1b8839 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7502,7 +7502,7 @@ in texstudio = libsForQt5.callPackage ../applications/editors/texstudio { }; - textadept = callPackage ../applications/editors/textadept { }; + textadept = callPackage ../applications/editors/textadept/10 { }; texworks = libsForQt514.callPackage ../applications/editors/texworks { }; From 2f00a2b06660548f6a0fae97bbcb74b647de67d6 Mon Sep 17 00:00:00 2001 From: Kir Ax Date: Mon, 2 Nov 2020 21:19:55 +0700 Subject: [PATCH 019/299] textadept-11: add textadept 11_beta --- .../editors/textadept/11/default.nix | 53 +++++++++++++++++++ .../editors/textadept/11/deps.nix | 50 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 105 insertions(+) create mode 100644 pkgs/applications/editors/textadept/11/default.nix create mode 100644 pkgs/applications/editors/textadept/11/deps.nix diff --git a/pkgs/applications/editors/textadept/11/default.nix b/pkgs/applications/editors/textadept/11/default.nix new file mode 100644 index 00000000000..487f1b3767f --- /dev/null +++ b/pkgs/applications/editors/textadept/11/default.nix @@ -0,0 +1,53 @@ +{ lib, stdenv, fetchhg, fetchFromGitHub, fetchurl, gtk2, glib, pkgconfig, unzip, ncurses, zip }: + +stdenv.mkDerivation rec { + version = "11.0_beta"; + pname = "textadept11"; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + gtk2 ncurses glib unzip zip + ]; + + src = fetchFromGitHub { + name = "textadept11"; + owner = "orbitalquark"; + repo = "textadept"; + rev = "8da5f6b4a13f14b9dd3cb9dc23ad4f7bf41e91c1"; + sha256 = "0v11v3x8g6v696m3l1bm52zy2g9xzz7hlmn912sn30nhcag3raxs"; + }; + + preConfigure = + lib.concatStringsSep "\n" (lib.mapAttrsToList (name: params: + "ln -s ${fetchurl params} $PWD/src/${name}" + ) (import ./deps.nix)) + '' + + cd src + make deps + ''; + + postBuild = '' + make curses + ''; + + preInstall = '' + mkdir -p $out/share/applications + mkdir -p $out/share/pixmaps + ''; + + postInstall = '' + make curses install PREFIX=$out MAKECMDGOALS=curses + ''; + + makeFlags = [ + "PREFIX=$(out) WGET=true PIXMAPS_DIR=$(out)/share/pixmaps" + ]; + + meta = with stdenv.lib; { + description = "An extensible text editor based on Scintilla with Lua scripting. Version 11_beta"; + homepage = "http://foicica.com/textadept"; + license = licenses.mit; + maintainers = with maintainers; [ raskin mirrexagon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/editors/textadept/11/deps.nix b/pkgs/applications/editors/textadept/11/deps.nix new file mode 100644 index 00000000000..2ab72574bbd --- /dev/null +++ b/pkgs/applications/editors/textadept/11/deps.nix @@ -0,0 +1,50 @@ +{ + "scintilla445.tgz" = { + url = "https://www.scintilla.org/scintilla445.tgz"; + sha256 = "1v1kyxj7rv5rxadbg8gl8wh1jafpy7zj0wr6dcyxq9209dl6h8ag"; + }; + "9e2ffa159299899c9345aea15c17ba1941953871.zip" = { + url = "https://github.com/orbitalquark/scinterm/archive/9e2ffa159299899c9345aea15c17ba1941953871.zip"; + sha256 = "12h7prgp689w45p4scxd8vvsyw8fkv27g6gvgis55xr44daa6122"; + }; + "scintillua_4.4.5-1.zip" = { + url = "https://github.com/orbitalquark/scintillua/archive/scintillua_4.4.5-1.zip"; + sha256 = "095wpbid2kvr5xgkhd5bd4sd7ljgk6gd9palrjkmdcwfgsf1lp04"; + }; + "lua-5.3.5.tar.gz" = { + url = "http://www.lua.org/ftp/lua-5.3.5.tar.gz"; + sha256 = "1b2qn2rv96nmbm6zab4l877bd4zq7wpwm8drwjiy2ih4jqzysbhc"; + }; + "lpeg-1.0.2.tar.gz" = { + url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz"; + sha256 = "1zjzl7acvcdavmcg5l7wi12jd4rh95q9pl5aiww7hv0v0mv6bmj8"; + }; + "v1_7_0_2.zip" = { + url = "https://github.com/keplerproject/luafilesystem/archive/v1_7_0_2.zip"; + sha256 = "0y44ymc7higz5dd2w3c6ib7mwmpr6yvszcl7lm12nf8x3y4snx4i"; + }; + "64587546482a1a6324706d75c80b77d2f87118a4.zip" = { + url = "https://github.com/orbitalquark/gtdialog/archive/64587546482a1a6324706d75c80b77d2f87118a4.zip"; + sha256 = "10mglbnn8r1cakqn9h285pwfnh7kfa98v7j8qh83c24n66blyfh9"; + }; + "cdk-5.0-20150928.tgz" = { + url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20150928.tgz"; + sha256 = "0j74l874y33i26y5kjg3pf1vswyjif8k93pqhi0iqykpbxfsg382"; + }; + "libtermkey-0.20.tar.gz" = { + url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.20.tar.gz"; + sha256 = "1xfj6lchhfljmbcl6dz8dpakppyy13nbl4ykxiv5x4dr9b4qf3bc"; + }; + "pdcurs39.zip" = { + url = "https://github.com/wmcbrine/PDCurses/archive/3.9.zip"; + sha256 = "0ydsa15d6fgk15zcavbxsi4vj3knlr2495dc5v4f5xzvv2qwlb2w"; + }; + "bombay.zip" = { + url = "http://foicica.com/hg/bombay/archive/b25520cc76bb.zip"; + sha256 = "07spq7jmkfyq20gv67yffara3ln3ns2xi0k02m2mxdms3xm1q36h"; + }; + "cloc-1.60.pl" = { + url = "http://prdownloads.sourceforge.net/cloc/cloc-1.60.pl"; + sha256 = "0p504bi19va3dh274v7lb7giqrydwa5yyry60f7jpz84y6z71a2a"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac1cb1b8839..ac7cc62fc59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7504,6 +7504,8 @@ in textadept = callPackage ../applications/editors/textadept/10 { }; + textadept11 = callPackage ../applications/editors/textadept/11 { }; + texworks = libsForQt514.callPackage ../applications/editors/texworks { }; thc-hydra = callPackage ../tools/security/thc-hydra { }; From f352109086994421bbd4bc09e9c0481d20fda70e Mon Sep 17 00:00:00 2001 From: CrystalGamma Date: Tue, 20 Oct 2020 11:15:03 +0200 Subject: [PATCH 020/299] jsoncpp: 1.9.2 -> 1.9.4 Merges both patches previously applied. Also seems to change the path that the library is written to. --- .../development/libraries/jsoncpp/default.nix | 25 ++++++------------- 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 5e361a09d35..73aaaec4e4c 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -2,13 +2,15 @@ stdenv.mkDerivation rec { pname = "jsoncpp"; - version = "1.9.2"; + version = "1.9.4"; + + outputs = ["out" "dev"]; src = fetchFromGitHub { owner = "open-source-parsers"; repo = "jsoncpp"; rev = version; - sha256 = "037d1b1qdmn3rksmn1j71j26bv4hkjv7sn7da261k853xb5899sg"; + sha256 = "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv"; }; /* During darwin bootstrap, we have a cp that doesn't understand the @@ -23,30 +25,17 @@ stdenv.mkDerivation rec { # Hack to be able to run the test, broken because we use # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install preBuild = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH="`pwd`/src/lib_json''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" + export DYLD_LIBRARY_PATH="$PWD/lib''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" '' else '' - export LD_LIBRARY_PATH="`pwd`/src/lib_json''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$PWD/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ''; nativeBuildInputs = [ cmake python validatePkgConfig ]; - patches = [ - # Fix generation of pkg-config file (https://github.com/open-source-parsers/jsoncpp/pull/1199) - (fetchpatch { - url = "https://github.com/open-source-parsers/jsoncpp/commit/b05a21342a646a986b11c28ba6b19665756d21d2.patch"; - sha256 = "0dn4cvvkcp9mnxbzyaqb49z6bv5yqsx1wlf1lyki1n2rni2hn63p"; - }) - ] ++ stdenv.lib.optionals (stdenv.isAarch64 || stdenv.isAarch32) [ - # fix inverted sense in isAnyCharRequiredQuoting on arm. See: https://github.com/open-source-parsers/jsoncpp/pull/1120 - (fetchpatch { - url = "https://github.com/open-source-parsers/jsoncpp/commit/9093358efae9e5981aa60013487fc7215f040a59.patch"; - sha256 = "1wiqp70sck2md14sfc0zdkblqk9750cl55ykf9d6b9vs1ifzzzq5"; - }) - ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DBUILD_STATIC_LIBS=OFF" + "-DBUILD_OBJECT_LIBS=OFF" "-DJSONCPP_WITH_CMAKE_PACKAGE=ON" ]; From e07dc55964a2ba57afe03f654f1f70f1783436d7 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Mon, 2 Nov 2020 19:15:50 +0300 Subject: [PATCH 021/299] cdesktopenv: fix build w/glibc-2.32 --- ...cated-sys_errlist-and-replace-with-A.patch | 336 ++++++++++++++++++ pkgs/desktops/cdesktopenv/default.nix | 6 +- 2 files changed, 340 insertions(+), 2 deletions(-) create mode 100644 pkgs/desktops/cdesktopenv/0001-all-remove-deprecated-sys_errlist-and-replace-with-A.patch diff --git a/pkgs/desktops/cdesktopenv/0001-all-remove-deprecated-sys_errlist-and-replace-with-A.patch b/pkgs/desktops/cdesktopenv/0001-all-remove-deprecated-sys_errlist-and-replace-with-A.patch new file mode 100644 index 00000000000..4382cdcf35b --- /dev/null +++ b/pkgs/desktops/cdesktopenv/0001-all-remove-deprecated-sys_errlist-and-replace-with-A.patch @@ -0,0 +1,336 @@ +From 67f62e5a8acd70d30f7067f1f44ac7b15c67011a Mon Sep 17 00:00:00 2001 +From: Peter Howkins +Date: Mon, 2 Nov 2020 05:30:08 +0000 +Subject: [PATCH] all: remove deprecated sys_errlist[] and replace with ANSI C + strerror() + +--- + cde/config/imake/imake.c | 13 ------------- + cde/lib/tt/bin/dbck/spec.C | 8 -------- + cde/lib/tt/lib/tt_options.h | 12 ------------ + cde/programs/dtcm/dtcm/dnd.c | 4 ---- + cde/programs/dtcm/libDtCmP/util.c | 5 +---- + .../dthelp/parser.ccdf/volumegen/Volumegen.c | 1 - + cde/programs/dtimsstart/remote.c | 4 ---- + cde/programs/dtimsstart/start.c | 12 +++--------- + cde/programs/dtinfo/dtinfo/src/external-api/comm.c | 5 +---- + .../dtksh/ksh93/src/lib/libast/string/fmterror.c | 9 +-------- + .../dtksh/ksh93/src/lib/libast/string/strerror.c | 8 +------- + cde/programs/dtlogin/dm.h | 7 +------ + 12 files changed, 8 insertions(+), 80 deletions(-) + +diff --git a/cde/config/imake/imake.c b/cde/config/imake/imake.c +index 574af7c7..83834aa7 100644 +--- a/cde/config/imake/imake.c ++++ b/config/imake/imake.c +@@ -242,19 +242,6 @@ extern int errno; + #include + #include "imakemdep.h" + +-/* +- * This define of strerror is copied from (and should be identical to) +- * Xos.h, which we don't want to include here for bootstrapping reasons. +- */ +-#if defined(X_NOT_STDC_ENV) || (defined(sun) && !defined(SVR4)) +-# ifndef strerror +-extern char *sys_errlist[]; +-extern int sys_nerr; +-# define strerror(n) \ +- (((n) >= 0 && (n) < sys_nerr) ? sys_errlist[n] : "unknown error") +-# endif +-#endif +- + #define TRUE 1 + #define FALSE 0 + +diff --git a/cde/lib/tt/bin/dbck/spec.C b/cde/lib/tt/bin/dbck/spec.C +index 18bba3fb..eaf2d6b7 100644 +--- a/cde/lib/tt/bin/dbck/spec.C ++++ b/lib/tt/bin/dbck/spec.C +@@ -44,14 +44,6 @@ + #include "ttdbck.h" + #include "tt_db_server_consts.h" + +-#if !defined(OPT_STRERROR) +-// No strerror(), fake it +-char * +-strerror(int e) +-{ +- return ((e sys_nerr) +- (void) fprintf(stderr, ":Unknown error %d", saveerr); +- else +- (void) fprintf(stderr, ":%s", sys_errlist[saveerr]); ++ (void) fprintf(stderr, ":%s", strerror(saveerr)); + } + #endif + +diff --git a/cde/programs/dthelp/parser.ccdf/volumegen/Volumegen.c b/cde/programs/dthelp/parser.ccdf/volumegen/Volumegen.c +index d9a42943..08de4809 100644 +--- a/cde/programs/dthelp/parser.ccdf/volumegen/Volumegen.c ++++ b/programs/dthelp/parser.ccdf/volumegen/Volumegen.c +@@ -56,7 +56,6 @@ + typedef int Boolean; + + /* extern int errno; */ +-/* extern char *sys_errlist[]; */ + /* extern int sys_nerr; */ + + static void GenTopicList ( +diff --git a/cde/programs/dtimsstart/remote.c b/cde/programs/dtimsstart/remote.c +index 68773673..71d32977 100644 +--- a/cde/programs/dtimsstart/remote.c ++++ b/programs/dtimsstart/remote.c +@@ -37,10 +37,6 @@ + #include /* for X_ChangeHosts */ + #include /* for XA_STRING */ + +-#if !defined(__linux__) && !defined(CSRG_BASED) +-extern char *sys_errlist[]; +-#endif +- + static char *conf_msg_id = STR_CONFDATA; + + #define CONF_MSG_ID_LEN strlen(conf_msg_id) +diff --git a/cde/programs/dtimsstart/start.c b/cde/programs/dtimsstart/start.c +index 78fc2a38..1dafa189 100644 +--- a/cde/programs/dtimsstart/start.c ++++ b/programs/dtimsstart/start.c +@@ -27,14 +27,10 @@ + #include + #include + #include ++#include + + #if (defined(__linux__) || defined(CSRG_BASED)) && !defined(_NFILE) + #define _NFILE FOPEN_MAX +-#endif +- +-#if !defined(__linux__) && !defined(CSRG_BASED) +-extern char *sys_errlist[]; +-extern int sys_nerr; + #endif + + /* local functions */ +@@ -599,8 +595,7 @@ static int invoke_ims(UserSelection *sel) + + pid = fork(); + if (pid == (pid_t) -1) { +- put_xims_log("fork failed [%s]", +- (errno <= sys_nerr) ? sys_errlist[errno] : NULL, 0, 0); ++ put_xims_log("fork failed [%s]", strerror(errno), 0, 0); + #ifdef DEBUG + perror("fork"); + #endif +@@ -617,8 +612,7 @@ static int invoke_ims(UserSelection *sel) + #endif + execl(SH_PATH, "sh", "-c", renv->cmdbuf, NULL); + +- put_xims_log("%s: exec failed [%s]", SH_PATH, +- (errno <= sys_nerr) ? sys_errlist[errno] : NULL, 0, 0); ++ put_xims_log("%s: exec failed [%s]", SH_PATH, strerror(errno) , 0, 0); + /* perror(SH_PATH); */ + sleep(1); + _exit(1); +diff --git a/cde/programs/dtinfo/dtinfo/src/external-api/comm.c b/cde/programs/dtinfo/dtinfo/src/external-api/comm.c +index d61ccb7a..6aa2fc91 100644 +--- a/cde/programs/dtinfo/dtinfo/src/external-api/comm.c ++++ b/programs/dtinfo/dtinfo/src/external-api/comm.c +@@ -53,9 +53,6 @@ + #include + #endif + +-extern char *sys_errlist[]; +- +- + static OliasEvent *current_event; + static int reply_status; + #define NO_REPLY 0 +@@ -332,7 +329,7 @@ wait_for_reply (Widget toplevel) + XtAppWarningMsg (XtWidgetToApplicationContext (toplevel), + "communicationsError", "select", + "Olias API", "Select failed: %s", +- &sys_errlist[errno], &num_params); ++ strerror(errno), &num_params); + continue; + } + continue; +diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/string/fmterror.c b/cde/programs/dtksh/ksh93/src/lib/libast/string/fmterror.c +index 313b67bc..8dd87ab8 100644 +--- a/cde/programs/dtksh/ksh93/src/lib/libast/string/fmterror.c ++++ b/programs/dtksh/ksh93/src/lib/libast/string/fmterror.c +@@ -92,14 +92,7 @@ + #endif + #include + +-extern __MANGLE__ int sys_nerr; +-extern __MANGLE__ char* sys_errlist[]; +- + char* + fmterror __PARAM__((int err), (err)) __OTORP__(int err;){ +- static char msg[28]; +- +- if (err > 0 && err <= sys_nerr) return(sys_errlist[err]); +- sfsprintf(msg, sizeof(msg), "Error %d", err); +- return(msg); ++ return strerror(err); + } +diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/string/strerror.c b/cde/programs/dtksh/ksh93/src/lib/libast/string/strerror.c +index 7686a54d..a6aa7ce8 100644 +--- a/cde/programs/dtksh/ksh93/src/lib/libast/string/strerror.c ++++ b/programs/dtksh/ksh93/src/lib/libast/string/strerror.c +@@ -108,18 +108,12 @@ NoN(strerror) + + #include + +-extern __MANGLE__ int sys_nerr; +-extern __MANGLE__ char* sys_errlist[]; + + char* + strerror __PARAM__((int err), (err)) __OTORP__(int err;) + #line 25 + { +- static char msg[28]; +- +- if (err > 0 && err <= sys_nerr) return(sys_errlist[err]); +- sfsprintf(msg, sizeof(msg), "Error %d", err); +- return(msg); ++ return strerror(err); + } + + #endif +diff --git a/cde/programs/dtlogin/dm.h b/cde/programs/dtlogin/dm.h +index 3e0f2499..e67edc3c 100644 +--- a/cde/programs/dtlogin/dm.h ++++ b/programs/dtlogin/dm.h +@@ -68,8 +68,7 @@ + # include /* for passwd structure */ + # include + # include /* for exit(), malloc(), abort() */ +-# include /* for string functions, bcopy(), +- sys_errlist */ ++# include /* for string functions, bcopy() */ + # include /* for NGROUPS */ + # include /* for fd_set */ + # include /* for Internet socket stuff */ +@@ -475,10 +474,6 @@ struct verify_info { + * + ***************************************************************************/ + +-#if !defined(__linux__) && !defined(CSRG_BASED) +-extern char *sys_errlist[]; /* system error msgs */ +-extern int sys_nerr; /* system error msgs */ +-#endif + extern XrmDatabase XresourceDB; + + +-- +2.28.0 + diff --git a/pkgs/desktops/cdesktopenv/default.nix b/pkgs/desktops/cdesktopenv/default.nix index 7e6b49957b8..7454603e7ac 100644 --- a/pkgs/desktops/cdesktopenv/default.nix +++ b/pkgs/desktops/cdesktopenv/default.nix @@ -2,7 +2,8 @@ , libXinerama, libXt, libXext, libtirpc, motif, libXft, xbitmaps , libjpeg, libXmu, libXdmcp, libXScrnSaver, symlinkJoin, bdftopcf , ncompress, mkfontdir, tcl, libXaw, gcc, glibcLocales, gawk -, autoPatchelfHook, libredirect, makeWrapper, xset, xrdb, fakeroot }: +, autoPatchelfHook, libredirect, makeWrapper, xset, xrdb, fakeroot +, rpcsvc-proto }: let x11ProjectRoot = symlinkJoin { @@ -25,6 +26,7 @@ in stdenv.mkDerivation rec { # remove with next release patches = [ ./2.3.2.patch + ./0001-all-remove-deprecated-sys_errlist-and-replace-with-A.patch ]; buildInputs = [ @@ -33,6 +35,7 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ bison ncompress gawk autoPatchelfHook makeWrapper fakeroot + rpcsvc-proto ]; makeFlags = [ @@ -74,6 +77,5 @@ EOF license = licenses.lgpl2; maintainers = [ maintainers.gnidorah ]; platforms = [ "i686-linux" "x86_64-linux" ]; - broken = true; # not compatible with glibc 2.32 }; } From 3024a74046cce1b16b2ea2c6078f5794969b5dd0 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 30 Oct 2020 15:23:54 -0400 Subject: [PATCH 022/299] wrangler: 1.10.3 -> 1.12.2 --- pkgs/development/tools/wrangler/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix index fd84afb1617..8844ed25588 100644 --- a/pkgs/development/tools/wrangler/default.nix +++ b/pkgs/development/tools/wrangler/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin }: +{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin, perl }: rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.10.3"; + version = "1.12.2"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "0703zlrmv0if575rj1mrgfg1a5qbf98sqjhhj09hab69i96wbrk9"; + sha256 = "1w0j6if1fnih1036hlb9a3c6wgjw4p057llhjf0f3d568ah1244a"; }; - cargoSha256 = "0znzyqzvbqcl4mmxpsvaf592xrs968x57czj45jibmafq033dbfa"; + cargoSha256 = "0d9wvdjjakznz8dnqx4gqxh0xkxrh4229460hg6dr9qn492p7nfx"; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config perl ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ From ef16b3f77cbbe3b05e7ade61a9c6d3ecd3711953 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sun, 1 Nov 2020 13:14:53 -0500 Subject: [PATCH 023/299] linuxPackages.xpadneo: 0.8.3 -> 0.8.4 --- pkgs/os-specific/linux/xpadneo/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/xpadneo/default.nix b/pkgs/os-specific/linux/xpadneo/default.nix index 5f101896921..e0e2bcc21d9 100644 --- a/pkgs/os-specific/linux/xpadneo/default.nix +++ b/pkgs/os-specific/linux/xpadneo/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, kernel, bluez }: +{ lib, stdenv, fetchFromGitHub, kernel, bluez }: stdenv.mkDerivation rec { pname = "xpadneo"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "atar-axis"; repo = pname; rev = "v${version}"; - sha256 = "1g3ml7vq0dzwl9815c3l0i0qz3a7v8c376c6dqbfkbj2f1d43vqs"; + sha256 = "113xa2mxs2hc4fpjdk3jhhchy81kli6jxdd6vib7zz61n10cjb85"; }; setSourceRoot = '' @@ -34,10 +34,11 @@ stdenv.mkDerivation rec { installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; installTargets = [ "modules_install" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Advanced Linux driver for Xbox One wireless controllers"; homepage = "https://atar-axis.github.io/xpadneo"; license = licenses.gpl3Plus; + maintainers = with maintainers; [ metadark ]; platforms = platforms.linux; }; } From 258bae917a76e393beb4d7409b616498aae39d91 Mon Sep 17 00:00:00 2001 From: Moises Nessim Date: Mon, 2 Nov 2020 23:10:37 -0500 Subject: [PATCH 024/299] Move to backup file to change LICENSE to lowercase. --- pkgs/development/tools/build-managers/msbuild/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/msbuild/default.nix b/pkgs/development/tools/build-managers/msbuild/default.nix index aea215cc927..1b805df95a0 100644 --- a/pkgs/development/tools/build-managers/msbuild/default.nix +++ b/pkgs/development/tools/build-managers/msbuild/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { nuget sources Add -Name nixos -Source $(pwd)/nixos # license check is case sensitive - mv LICENSE license + mv LICENSE license.bak && mv license.bak license mkdir -p artifacts unzip ${xplat} -d artifacts From 055a9adabfe9ae165f109bb51e0784e0f2b911e3 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Wed, 28 Oct 2020 13:09:10 +0100 Subject: [PATCH 025/299] nextcloud19: 19.0.3 -> 19.0.4 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index a072536dbfd..9babdb6f68f 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -46,8 +46,8 @@ in { }; nextcloud19 = generic { - version = "19.0.3"; - sha256 = "0sc9cnsdh8kj60h7i3knh40ngdz1w1wmdqw2v2axfkmax22kjl7w"; + version = "19.0.4"; + sha256 = "0y5fccn61qf9fxjjpqdvhmxr9w5n4dgl1d7wcl2dzjv4bmqi2ms6"; }; nextcloud20 = generic { From 7a36e413755a857a48d8ecb8075c78d05e61a0b8 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Wed, 28 Oct 2020 13:09:36 +0100 Subject: [PATCH 026/299] nextcloud18: 18.0.9 -> 18.0.10 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 9babdb6f68f..6b1e7de8324 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -40,8 +40,8 @@ in { ''; nextcloud18 = generic { - version = "18.0.9"; - sha256 = "0rigg5pv2vnxgmjznlvxfc41s00raxa8jhib5vsznhj55qn99jm1"; + version = "18.0.10"; + sha256 = "0kv9mdn36shr98kh27969b8xs7pgczbyjklrfskxy9mph7bbzir6"; insecure = true; }; From c07ce093ecc6a62e10a9abff39e96a27540c3fbc Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 7 May 2020 13:12:38 +0200 Subject: [PATCH 027/299] unbound: allow building with systemd support Systemd has to remain an optional (non-default) dependency as otherwise we will have an unpleasant bootstrap cycle. Most (if not all) of the (lib)unbound consumers will likely not care about unbound's systemd integration that only affects the daemon mode, anyway. --- pkgs/tools/networking/unbound/default.nix | 40 ++++++++++++++++++----- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 9b33d53e54f..72653b672ee 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -1,4 +1,24 @@ -{ stdenv, fetchurl, openssl, nettle, expat, libevent, dns-root-data }: +{ stdenv +, lib +, fetchurl +, openssl +, nettle +, expat +, libevent +, dns-root-data +, pkg-config + # + # By default unbound will not be built with systemd support. Unbound is a very + # commmon dependency. The transitive dependency closure of systemd also + # contains unbound. + # Since most (all?) (lib)unbound users outside of the unbound daemon usage do + # not need the systemd integration it is likely best to just default to no + # systemd integration. + # For the daemon use-case, that needs to notify systemd, use `unbound-with-systemd`. + # +, withSystemd ? false +, systemd ? null +}: stdenv.mkDerivation rec { pname = "unbound"; @@ -11,7 +31,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB - buildInputs = [ openssl nettle expat libevent ]; + buildInputs = [ openssl nettle expat libevent ] ++ lib.optionals withSystemd [ pkg-config systemd ]; configureFlags = [ "--with-ssl=${openssl.dev}" @@ -25,6 +45,8 @@ stdenv.mkDerivation rec { "--enable-relro-now" ] ++ stdenv.lib.optional stdenv.hostPlatform.isStatic [ "--disable-flto" + ] ++ lib.optionals withSystemd [ + "--enable-systemd" ]; installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ]; @@ -33,7 +55,7 @@ stdenv.mkDerivation rec { make unbound-event-install ''; - preFixup = stdenv.lib.optionalString (stdenv.isLinux && !stdenv.hostPlatform.isMusl) # XXX: revisit + preFixup = lib.optionalString (stdenv.isLinux && !stdenv.hostPlatform.isMusl) # XXX: revisit # Build libunbound again, but only against nettle instead of openssl. # This avoids gnutls.out -> unbound.lib -> openssl.out. # There was some problem with this on Darwin; let's not complicate non-Linux. @@ -43,17 +65,17 @@ stdenv.mkDerivation rec { buildPhase installPhase '' - # get rid of runtime dependencies on $dev outputs + # get rid of runtime dependencies on $dev outputs + ''substituteInPlace "$lib/lib/libunbound.la" '' - + stdenv.lib.concatMapStrings - (pkg: " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' --replace '-R${pkg.dev}/lib' '-R${pkg.out}/lib'") - buildInputs; + + lib.concatMapStrings + (pkg: lib.optionalString (pkg ? dev) " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' --replace '-R${pkg.dev}/lib' '-R${pkg.out}/lib'") + (builtins.filter (p: p != null) buildInputs); - meta = with stdenv.lib; { + meta = with lib; { description = "Validating, recursive, and caching DNS resolver"; license = licenses.bsd3; homepage = "https://www.unbound.net"; maintainers = with maintainers; [ ehmry fpletz globin ]; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; }; } From f6d570b2589b61c4605f19bca0cba2ce1f076d44 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 7 May 2020 13:15:04 +0200 Subject: [PATCH 028/299] unbound-with-systemd: init This introduces an unbound variant that is built with systemd support. That means it is able to signal readiness to systemd once it did start or finished reloading. This likely allows us to close a small gap during bootup where the service is assumed up but doesn't respond to DNS queries just yet. --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fbad7d9145b..3a75ed3c391 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8076,7 +8076,11 @@ in unclutter-xfixes = callPackage ../tools/misc/unclutter-xfixes { }; - unbound = callPackage ../tools/networking/unbound { }; + unbound = callPackage ../tools/networking/unbound {}; + + unbound-with-systemd = unbound.override { + withSystemd = true; + }; unicorn = callPackage ../development/libraries/unicorn { }; From 5e602f88d1e8ba97491dd60c794c2faca273eccf Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 7 May 2020 13:17:14 +0200 Subject: [PATCH 029/299] nixos/modules/services/networking/unbound: update systemd unit Previously we just applied a very minimal set of restrictions and trusted unbound to properly drop root privs and capabilities. With this change I am (for the most part) just using the upstream example unit file for unbound. The main difference is that we start unbound was `unbound` user with the required capabilities instead of letting unbound do the chroot & uid/gid changes. The upstream unit configuration this is based on is a lot stricter with all kinds of permissions then our previous variant. It also came with the default of having the `Type` set to `notify`, therefore we are also using the `unbound-with-systemd` package here. Unbound will start up, read the configuration files and start listening on the configured ports before systemd will declare the unit "running". This will likely help with startup order and the occasional race condition during system activation where the DNS service is started but not yet ready to answer queries. Aditionally to the much stricter runtime environmet I removed the `/dev/urandom` mount lines we previously had in the code (that would randomly fail during `stop`-phase). The `preStart` script is now only required if we enabled the trust anchor updates (which are still enabled by default). Another beneefit of the refactoring is that we can now issue reloads via either `pkill -HUP unbound` or `systemctl reload unbound` to reload the running configuration without taking the daemon offline. A prerequisite of this was that unbound configuration is available on a well known path on the file system. I went for /etc/unbound/unbound.conf as that is the default in the CLI tooling which in turn enables us to use `unbound-control` without passing a custom configuration location. --- nixos/modules/services/networking/unbound.nix | 100 ++++++++++++------ 1 file changed, 68 insertions(+), 32 deletions(-) diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index baed83591e1..bcb48678b21 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -1,9 +1,7 @@ { config, lib, pkgs, ... }: with lib; - let - cfg = config.services.unbound; stateDir = "/var/lib/unbound"; @@ -17,12 +15,12 @@ let forward = optionalString (any isLocalAddress cfg.forwardAddresses) '' do-not-query-localhost: no - '' + - optionalString (cfg.forwardAddresses != []) '' + '' + + optionalString (cfg.forwardAddresses != []) '' forward-zone: name: . - '' + - concatMapStringsSep "\n" (x: " forward-addr: ${x}") cfg.forwardAddresses; + '' + + concatMapStringsSep "\n" (x: " forward-addr: ${x}") cfg.forwardAddresses; rootTrustAnchorFile = "${stateDir}/root.key"; @@ -31,19 +29,20 @@ let confFile = pkgs.writeText "unbound.conf" '' server: + ip-freebind: yes directory: "${stateDir}" username: unbound - chroot: "${stateDir}" + chroot: "" pidfile: "" + # when running under systemd there is no need to daemonize + do-daemonize: no ${interfaces} ${access} ${trustAnchor} ${cfg.extraConfig} ${forward} ''; - in - { ###### interface @@ -55,8 +54,8 @@ in package = mkOption { type = types.package; - default = pkgs.unbound; - defaultText = "pkgs.unbound"; + default = pkgs.unbound-with-systemd; + defaultText = "pkgs.unbound-with-systemd"; description = "The unbound package to use"; }; @@ -69,11 +68,14 @@ in interfaces = mkOption { default = [ "127.0.0.1" ] ++ optional config.networking.enableIPv6 "::1"; type = types.listOf types.str; - description = "What addresses the server should listen on."; + description = '' + What addresses the server should listen on. This supports the interface syntax documented in + unbound.conf8. + ''; }; forwardAddresses = mkOption { - default = [ ]; + default = []; type = types.listOf types.str; description = "What servers to forward queries to."; }; @@ -110,6 +112,9 @@ in networking.resolvconf.useLocalResolver = mkDefault true; + + environment.etc."unbound/unbound.conf".source = confFile; + systemd.services.unbound = { description = "Unbound recursive Domain Name Server"; after = [ "network.target" ]; @@ -117,32 +122,63 @@ in wants = [ "nss-lookup.target" ]; wantedBy = [ "multi-user.target" ]; - preStart = '' - mkdir -m 0755 -p ${stateDir}/dev/ - cp ${confFile} ${stateDir}/unbound.conf - ${optionalString cfg.enableRootTrustAnchor '' - ${cfg.package}/bin/unbound-anchor -a ${rootTrustAnchorFile} || echo "Root anchor updated!" - chown unbound ${stateDir} ${rootTrustAnchorFile} - ''} - touch ${stateDir}/dev/random - ${pkgs.utillinux}/bin/mount --bind -n /dev/urandom ${stateDir}/dev/random + preStart = lib.mkIf cfg.enableRootTrustAnchor '' + ${cfg.package}/bin/unbound-anchor -a ${rootTrustAnchorFile} || echo "Root anchor updated!" ''; - serviceConfig = { - ExecStart = "${cfg.package}/bin/unbound -d -c ${stateDir}/unbound.conf"; - ExecStopPost="${pkgs.utillinux}/bin/umount ${stateDir}/dev/random"; + restartTriggers = [ + confFile + ]; - ProtectSystem = true; - ProtectHome = true; + serviceConfig = { + ExecStart = "${cfg.package}/bin/unbound -p -d -c /etc/unbound/unbound.conf"; + ExecReload = "+/run/current-system/sw/bin/kill -HUP $MAINPID"; + + NotifyAccess = "main"; + Type = "notify"; + + AmbientCapabilities = [ + "CAP_NET_BIND_SERVICE" + "CAP_NET_RAW" + "CAP_SETGID" + "CAP_SETUID" + "CAP_SYS_CHROOT" + "CAP_SYS_RESOURCE" + ]; + + User = "unbound"; + + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; PrivateDevices = true; - Restart = "always"; - RestartSec = "5s"; + PrivateTmp = true; + ProtectHome = true; + ProtectControlGroups = true; + ProtectKernelModules = true; + ProtectSystem = "strict"; + RuntimeDirectory = "unbound"; + ConfigurationDirectory = "unbound"; + StateDirectory = "unbound"; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ]; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "~@clock" + "@cpu-emulation" + "@debug" + "@keyring" + "@module" + "mount" + "@obsolete" + "@resources" + ]; + RestrictNamespaces = true; + LockPersonality = true; + RestrictSUIDSGID = true; + ReadWritePaths = [ "/run/unbound" "${stateDir}" ]; }; }; - # If networkmanager is enabled, ask it to interface with unbound. networking.networkmanager.dns = "unbound"; - }; - } From 72fbf05c17374b01abd7b6b1927de4146a7251eb Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sun, 1 Nov 2020 22:11:11 +0100 Subject: [PATCH 030/299] nixos/unbound: note about the AmbientCapabilities --- nixos/modules/services/networking/unbound.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index bcb48678b21..bc2d5e550ba 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -137,6 +137,7 @@ in NotifyAccess = "main"; Type = "notify"; + # FIXME: Which of these do we actualy need, can we drop the chroot flag? AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" "CAP_NET_RAW" From aadc07618aff8106f888c67383fb32e471dd817e Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sun, 1 Nov 2020 22:22:08 +0100 Subject: [PATCH 031/299] nixos/unbound: drop ReadWritePaths from systemd unit configuration Both of the configured paths should be implicit due to RuntimeDirectory & StateDirectory. --- nixos/modules/services/networking/unbound.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index bc2d5e550ba..07e58481a77 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -176,7 +176,6 @@ in RestrictNamespaces = true; LockPersonality = true; RestrictSUIDSGID = true; - ReadWritePaths = [ "/run/unbound" "${stateDir}" ]; }; }; # If networkmanager is enabled, ask it to interface with unbound. From a040a8a2e3e598d24be81d36b66fd8c195c019da Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 21 Oct 2020 01:34:24 +0200 Subject: [PATCH 032/299] nixos/tests/unbound: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/unbound.nix | 247 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 248 insertions(+) create mode 100644 nixos/tests/unbound.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 4e4d8b5e689..f1d14c9f2d5 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -362,6 +362,7 @@ in trezord = handleTest ./trezord.nix {}; trickster = handleTest ./trickster.nix {}; tuptime = handleTest ./tuptime.nix {}; + unbound = handleTest ./unbound.nix {}; udisks2 = handleTest ./udisks2.nix {}; unit-php = handleTest ./web-servers/unit-php.nix {}; upnp = handleTest ./upnp.nix {}; diff --git a/nixos/tests/unbound.nix b/nixos/tests/unbound.nix new file mode 100644 index 00000000000..bbccfa9c043 --- /dev/null +++ b/nixos/tests/unbound.nix @@ -0,0 +1,247 @@ +/* + Test that our unbound module indeed works as most users would expect. + There are a few settings that we must consider when modifying the test. The + ususal use-cases for unbound are + * running a recursive DNS resolver on the local machine + * running a recursive DNS resolver on the local machine, forwarding to a local DNS server via UDP/53 & TCP/53 + * running a recursive DNS resolver on the local machine, forwarding to a local DNS server via TCP/853 (DoT) + * running a recursive DNS resolver on a machine in the network awaiting input from clients over TCP/53 & UDP/53 + * running a recursive DNS resolver on a machine in the network awaiting input from clients over TCP/853 (DoT) + + In the below test setup we are trying to implement all of those use cases + without creating a bazillion machines. +*/ +import ./make-test-python.nix ({ pkgs, lib, ... }: + let + # common client configuration that we can just use for the multitude of + # clients we are constructing + common = { lib, pkgs, ... }: { + config = { + environment.systemPackages = [ pkgs.knot-dns ]; + + # disable the root anchor update as we do not have internet access during + # the test execution + services.unbound.enableRootTrustAnchor = false; + }; + }; + + cert = pkgs.runCommandNoCC "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' + openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=dns.example.local' + mkdir -p $out + cp key.pem cert.pem $out + ''; + in + { + name = "unbound"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ andir ]; + }; + + nodes = { + + # The server that actually serves our zones, this tests unbounds authoriative mode + authoritative = { lib, pkgs, config, ... }: { + imports = [ common ]; + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ + { address = "192.168.0.1"; prefixLength = 24; } + ]; + networking.interfaces.eth1.ipv6.addresses = lib.mkForce [ + { address = "fd21::1"; prefixLength = 64; } + ]; + networking.firewall.allowedTCPPorts = [ 53 ]; + networking.firewall.allowedUDPPorts = [ 53 ]; + + services.unbound = { + enable = true; + interfaces = [ "192.168.0.1" "fd21::1" "::1" "127.0.0.1" ]; + allowedAccess = [ "192.168.0.0/24" "fd21::/64" "::1" "127.0.0.0/8" ]; + extraConfig = '' + server: + local-data: "example.local. IN A 1.2.3.4" + local-data: "example.local. IN AAAA abcd::eeff" + ''; + }; + }; + + # The resolver that knows that fowards (only) to the authoritative server + # and listens on UDP/53, TCP/53 & TCP/853. + resolver = { lib, nodes, ... }: { + imports = [ common ]; + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ + { address = "192.168.0.2"; prefixLength = 24; } + ]; + networking.interfaces.eth1.ipv6.addresses = lib.mkForce [ + { address = "fd21::2"; prefixLength = 64; } + ]; + networking.firewall.allowedTCPPorts = [ + 53 # regular DNS + 853 # DNS over TLS + ]; + networking.firewall.allowedUDPPorts = [ 53 ]; + + services.unbound = { + enable = true; + allowedAccess = [ "192.168.0.0/24" "fd21::/64" "::1" "127.0.0.0/8" ]; + interfaces = [ "::1" "127.0.0.1" "192.168.0.2" "fd21::2" "192.168.0.2@853" "fd21::2@853" "::1@853" "127.0.0.1@853" ]; + forwardAddresses = [ + (lib.head nodes.authoritative.config.networking.interfaces.eth1.ipv6.addresses).address + (lib.head nodes.authoritative.config.networking.interfaces.eth1.ipv4.addresses).address + ]; + extraConfig = '' + server: + tls-service-pem: ${cert}/cert.pem + tls-service-key: ${cert}/key.pem + ''; + }; + }; + + # machine that runs a local unbound that will be reconfigured during test execution + local_resolver = { lib, nodes, ... }: { + imports = [ common ]; + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ + { address = "192.168.0.3"; prefixLength = 24; } + ]; + networking.interfaces.eth1.ipv6.addresses = lib.mkForce [ + { address = "fd21::3"; prefixLength = 64; } + ]; + networking.firewall.allowedTCPPorts = [ + 53 # regular DNS + ]; + networking.firewall.allowedUDPPorts = [ 53 ]; + + services.unbound = { + enable = true; + allowedAccess = [ "::1" "127.0.0.0/8" ]; + interfaces = [ "::1" "127.0.0.1" ]; + extraConfig = '' + include: "/etc/unbound/extra*.conf" + ''; + }; + + environment.etc = { + "unbound-extra1.conf".text = '' + forward-zone: + name: "example.local." + forward-addr: ${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv6.addresses).address} + forward-addr: ${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv4.addresses).address} + ''; + "unbound-extra2.conf".text = '' + auth-zone: + name: something.local. + zonefile: ${pkgs.writeText "zone" '' + something.local. IN A 3.4.5.6 + ''} + ''; + }; + }; + + + # plain node that only has network access and doesn't run any part of the + # resolver software locally + client = { lib, nodes, ... }: { + imports = [ common ]; + networking.nameservers = [ + (lib.head nodes.resolver.config.networking.interfaces.eth1.ipv6.addresses).address + (lib.head nodes.resolver.config.networking.interfaces.eth1.ipv4.addresses).address + ]; + networking.interfaces.eth1.ipv4.addresses = [ + { address = "192.168.0.10"; prefixLength = 24; } + ]; + networking.interfaces.eth1.ipv6.addresses = [ + { address = "fd21::10"; prefixLength = 64; } + ]; + }; + }; + + testScript = { nodes, ... }: '' + import typing + import json + + zone = "example.local." + records = [("AAAA", "abcd::eeff"), ("A", "1.2.3.4")] + + + def query( + machine, + host: str, + query_type: str, + query: str, + expected: typing.Optional[str] = None, + args: typing.Optional[typing.List[str]] = None, + ): + """ + Execute a single query and compare the result with expectation + """ + text_args = "" + if args: + text_args = " ".join(args) + + out = machine.succeed( + f"kdig {text_args} {query} {query_type} @{host} +short" + ).strip() + machine.log(f"{host} replied with {out}") + if expected: + assert expected == out, f"Expected `{expected}` but got `{out}`" + + + def test(machine, remotes, /, doh=False, zone=zone, records=records, args=[]): + """ + Run queries for the given remotes on the given machine. + """ + for query_type, expected in records: + for remote in remotes: + query(machine, remote, query_type, zone, expected, args) + query(machine, remote, query_type, zone, expected, ["+tcp"] + args) + if doh: + query( + machine, + remote, + query_type, + zone, + expected, + ["+tcp", "+tls"] + args, + ) + + + client.start() + authoritative.wait_for_unit("unbound.service") + + # verify that we can resolve locally + with subtest("test the authoritative servers local responses"): + test(authoritative, ["::1", "127.0.0.1"]) + + resolver.wait_for_unit("unbound.service") + + # verify that the resolver is able to resolve on all the local protocols + with subtest("test that the resolver resolves on all protocols and transports"): + test(resolver, ["::1", "127.0.0.1"], doh=True) + + resolver.wait_for_unit("multi-user.target") + + with subtest("client should be able to query the resolver"): + test(client, ["${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv6.addresses).address}", "${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv4.addresses).address}"], doh=True) + + # discard the client we do not need anymore + client.shutdown() + + local_resolver.wait_for_unit("multi-user.target") + + # link a new config file to /etc/unbound/extra.conf + local_resolver.succeed("ln -s /etc/unbound-extra1.conf /etc/unbound/extra1.conf") + + # reload the server & ensure the forwarding works + with subtest("test that the local resolver resolves on all protocols and transports"): + local_resolver.succeed("systemctl reload unbound") + print(local_resolver.succeed("journalctl -u unbound -n 1000")) + test(local_resolver, ["::1", "127.0.0.1"], args=["+timeout=60"]) + + # link a new config file to /etc/unbound/extra.conf + local_resolver.succeed("ln -sf /etc/unbound-extra2.conf /etc/unbound/extra2.conf") + + # reload the server & ensure the new local zone works + with subtest("test that we can query the new local zone"): + local_resolver.succeed("systemctl reload unbound") + r = [("A", "3.4.5.6")] + test(local_resolver, ["::1", "127.0.0.1"], zone="something.local.", records=r) + ''; + }) From b67cc6298e366aae63a381a895cf21c3b75ed649 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 23 Oct 2020 22:14:28 +0200 Subject: [PATCH 033/299] nixos/tests/unbound: add test to verify control sockets work --- nixos/tests/unbound.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/tests/unbound.nix b/nixos/tests/unbound.nix index bbccfa9c043..9a7a652b405 100644 --- a/nixos/tests/unbound.nix +++ b/nixos/tests/unbound.nix @@ -132,6 +132,12 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: something.local. IN A 3.4.5.6 ''} ''; + "unbound-extra3.conf".text = '' + remote-control: + control-enable: yes + control-interface: /run/unbound/unbound.ctl + ''; + }; }; @@ -243,5 +249,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: local_resolver.succeed("systemctl reload unbound") r = [("A", "3.4.5.6")] test(local_resolver, ["::1", "127.0.0.1"], zone="something.local.", records=r) + + with subtest("test that we can enable unbound control sockets on the fly"): + local_resolver.succeed("ln -sf /etc/unbound-extra3.conf /etc/unbound/extra3.conf") + local_resolver.succeed("systemctl reload unbound") + local_resolver.succeed("unbound-control list_forwards") ''; }) From 2aa64e5df5819f7ebeaacfdefb8324736f7f68ba Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sun, 1 Nov 2020 22:15:42 +0100 Subject: [PATCH 034/299] nixos/unbound: add option to configure the local control socket path This option allows users to specify a local UNIX control socket to "remote control" the daemon. System users, that should be permitted to access the daemon, must be in the `unbound` group in order to access the socket. When a socket path is configured we are also creating the required group. Currently this only supports the UNIX socket mode while unbound actually supports more advanced types. Users are still able to configure more complex scenarios via the `extraConfig` attribute. When this option is set to `null` (the default) it doesn't affect the system configuration at all. The unbound defaults for control sockets apply and no additional groups are created. --- nixos/modules/services/networking/unbound.nix | 36 +++++++++++++ nixos/tests/unbound.nix | 50 +++++++++++++------ 2 files changed, 71 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index 07e58481a77..2650de4ebeb 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -39,6 +39,11 @@ let ${interfaces} ${access} ${trustAnchor} + ${lib.optionalString (cfg.localControlSocketPath != null) '' + remote-control: + control-enable: yes + control-interface: ${cfg.localControlSocketPath} + ''} ${cfg.extraConfig} ${forward} ''; @@ -86,6 +91,28 @@ in description = "Use and update root trust anchor for DNSSEC validation."; }; + localControlSocketPath = mkOption { + default = null; + # FIXME: What is the proper type here so users can specify strings, + # paths and null? + # My guess would be `types.nullOr (types.either types.str types.path)` + # but I haven't verified yet. + type = types.nullOr types.str; + example = "/run/unbound/unbound.ctl"; + description = '' + When not set to null this option defines the path + at which the unbound remote control socket should be created at. The + socket will be owned by the unbound user (unbound) + and group will be nogroup. + + Users that should be permitted to access the socket must be in the + unbound group. + + If this option is null remote control will not be + configured at all. Unbounds default values apply. + ''; + }; + extraConfig = mkOption { default = ""; type = types.lines; @@ -108,6 +135,14 @@ in users.users.unbound = { description = "unbound daemon user"; isSystemUser = true; + group = lib.mkIf (cfg.localControlSocketPath != null) (lib.mkDefault "unbound"); + }; + + # We need a group so that we can give users access to the configured + # control socket. Unbound allows access to the socket only to the unbound + # user and the primary group. + users.groups = lib.mkIf (cfg.localControlSocketPath != null) { + unbound = {}; }; networking.resolvconf.useLocalResolver = mkDefault true; @@ -148,6 +183,7 @@ in ]; User = "unbound"; + Group = lib.mkIf (cfg.localControlSocketPath != null) (lib.mkDefault "unbound"); MemoryDenyWriteExecute = true; NoNewPrivileges = true; diff --git a/nixos/tests/unbound.nix b/nixos/tests/unbound.nix index 9a7a652b405..dc8e5a9d3ed 100644 --- a/nixos/tests/unbound.nix +++ b/nixos/tests/unbound.nix @@ -8,8 +8,13 @@ * running a recursive DNS resolver on a machine in the network awaiting input from clients over TCP/53 & UDP/53 * running a recursive DNS resolver on a machine in the network awaiting input from clients over TCP/853 (DoT) - In the below test setup we are trying to implement all of those use cases - without creating a bazillion machines. + In the below test setup we are trying to implement all of those use cases. + + Another aspect that we cover is access to the local control UNIX socket. It + can optionally be enabled and users can optionally be in a group to gain + access. Users that are not in the group (except for root) should not have + access to that socket. Also, when there is no socket configured, users + shouldn't be able to access the control socket at all. Not even root. */ import ./make-test-python.nix ({ pkgs, lib, ... }: let @@ -96,7 +101,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: }; # machine that runs a local unbound that will be reconfigured during test execution - local_resolver = { lib, nodes, ... }: { + local_resolver = { lib, nodes, config, ... }: { imports = [ common ]; networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ { address = "192.168.0.3"; prefixLength = 24; } @@ -113,11 +118,22 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: enable = true; allowedAccess = [ "::1" "127.0.0.0/8" ]; interfaces = [ "::1" "127.0.0.1" ]; + localControlSocketPath = "/run/unbound/unbound.ctl"; extraConfig = '' include: "/etc/unbound/extra*.conf" ''; }; + users.users = { + # user that is permitted to access the unix socket + someuser.extraGroups = [ + config.users.users.unbound.group + ]; + + # user that is not permitted to access the unix socket + unauthorizeduser = {}; + }; + environment.etc = { "unbound-extra1.conf".text = '' forward-zone: @@ -132,12 +148,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: something.local. IN A 3.4.5.6 ''} ''; - "unbound-extra3.conf".text = '' - remote-control: - control-enable: yes - control-interface: /run/unbound/unbound.ctl - ''; - }; }; @@ -218,6 +228,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: resolver.wait_for_unit("unbound.service") + with subtest("root is unable to use unbounc-control when the socket is not configured"): + resolver.succeed("which unbound-control") # the binary must exist + resolver.fail("unbound-control list_forwards") # the invocation must fail + # verify that the resolver is able to resolve on all the local protocols with subtest("test that the resolver resolves on all protocols and transports"): test(resolver, ["::1", "127.0.0.1"], doh=True) @@ -241,18 +255,24 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: print(local_resolver.succeed("journalctl -u unbound -n 1000")) test(local_resolver, ["::1", "127.0.0.1"], args=["+timeout=60"]) + with subtest("test that we can use the unbound control socket"): + out = local_resolver.succeed( + "sudo -u someuser -- unbound-control list_forwards" + ).strip() + + # Thank you black! Can't really break this line into a readable version. + expected = "example.local. IN forward ${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv6.addresses).address} ${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv4.addresses).address}" + assert out == expected, f"Expected `{expected}` but got `{out}` instead." + local_resolver.fail("sudo -u unauthorizeduser -- unbound-control list_forwards") + + # link a new config file to /etc/unbound/extra.conf local_resolver.succeed("ln -sf /etc/unbound-extra2.conf /etc/unbound/extra2.conf") # reload the server & ensure the new local zone works with subtest("test that we can query the new local zone"): - local_resolver.succeed("systemctl reload unbound") + local_resolver.succeed("unbound-control reload") r = [("A", "3.4.5.6")] test(local_resolver, ["::1", "127.0.0.1"], zone="something.local.", records=r) - - with subtest("test that we can enable unbound control sockets on the fly"): - local_resolver.succeed("ln -sf /etc/unbound-extra3.conf /etc/unbound/extra3.conf") - local_resolver.succeed("systemctl reload unbound") - local_resolver.succeed("unbound-control list_forwards") ''; }) From 5c16c31e067573616feda611858f742777af0555 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Tue, 3 Nov 2020 13:41:00 +0100 Subject: [PATCH 035/299] nixos/unbound: add release notes for the changes that were introduced As part of this patch series a few changes have been made to the unbound serivce the deserve proper documentation. --- nixos/doc/manual/release-notes/rl-2103.xml | 56 ++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml index 85eedfe0ec7..da20c9e8067 100644 --- a/nixos/doc/manual/release-notes/rl-2103.xml +++ b/nixos/doc/manual/release-notes/rl-2103.xml @@ -140,6 +140,62 @@ All services should use or StartLimitIntervalSec in instead. + + + The Unbound DNS resolver service (services.unbound) has been refactored to allow reloading, control sockets and to fix startup ordering issues. + + + + It is now possible to enable a local UNIX control socket for unbound by setting the + option. + + + + Previously we just applied a very minimal set of restrictions and + trusted unbound to properly drop root privs and capabilities. + + + + As of this we are (for the most part) just using the upstream + example unit file for unbound. The main difference is that we start + unbound as unbound user with the required capabilities instead of + letting unbound do the chroot & uid/gid changes. + + + + The upstream unit configuration this is based on is a lot stricter with + all kinds of permissions then our previous variant. It also came with + the default of having the Type set to notify, therefore we are now also + using the unbound-with-systemd package here. Unbound will start up, + read the configuration files and start listening on the configured ports + before systemd will declare the unit active (running). + This will likely help with startup order and the occasional race condition during system + activation where the DNS service is started but not yet ready to answer + queries. Services depending on nss-lookup.target or unbound.service + are now be able to use unbound when those targets have been reached. + + + + Aditionally to the much stricter runtime environmet the + /dev/urandom mount lines we previously had in the code (that would + randomly failed during the stop-phase) have been removed as systemd will take care of those for us. + + + + The preStart script is now only required if we enabled the trust + anchor updates (which are still enabled by default). + + + + Another benefit of the refactoring is that we can now issue reloads via + either pkill -HUP unbound and systemctl reload unbound to reload the + running configuration without taking the daemon offline. A prerequisite + of this was that unbound configuration is available on a well known path + on the file system. We are using the path /etc/unbound/unbound.conf as that is the + default in the CLI tooling which in turn enables us to use + unbound-control without passing a custom configuration location. + + From 5903ea539513c8ec2a1412d88465559b957b6483 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Tue, 3 Nov 2020 19:21:39 +0100 Subject: [PATCH 036/299] nixos/unbond: unbound should be required for nss-lookup.target Other units depend on nss-lookup.target and expect the DNS resolution to work once that target is reached. The previous version `wants=nss-lookup.target` made this unit require the nss-lookup.target to be reached before this was started. Another change that we can probalby do is drop the before relationship with the nss-lookup.target. That might just be implied with the current version. --- nixos/modules/services/networking/unbound.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index 2650de4ebeb..9a46fa3075f 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -154,8 +154,7 @@ in description = "Unbound recursive Domain Name Server"; after = [ "network.target" ]; before = [ "nss-lookup.target" ]; - wants = [ "nss-lookup.target" ]; - wantedBy = [ "multi-user.target" ]; + wantedBy = [ "multi-user.target" "nss-lookup.target" ]; preStart = lib.mkIf cfg.enableRootTrustAnchor '' ${cfg.package}/bin/unbound-anchor -a ${rootTrustAnchorFile} || echo "Root anchor updated!" From 4e1db3daf010c32882d8fc7b9309be7973c19da4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Nov 2020 00:18:43 +0000 Subject: [PATCH 037/299] pcm: 202008 -> 202009 --- pkgs/os-specific/linux/pcm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix index 3c49e53d800..3e9a8d41b3a 100644 --- a/pkgs/os-specific/linux/pcm/default.nix +++ b/pkgs/os-specific/linux/pcm/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "202008"; + version = "202009"; pname = "pcm"; src = fetchFromGitHub { owner = "opcm"; repo = "pcm"; rev = version; - sha256 = "1paxwq0p39vp2ma0rg7dkalc3r28wzj77sm3alavvk2vxgvxi0ig"; + sha256 = "1phkdmbgvrmv5w0xa4i2j9v7lcxkxjdhzi5x6l52z9y9as30dzbd"; }; installPhase = '' From 1581e7ed746db7a677451fd2f134ae01511e4a04 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Nov 2020 05:36:45 +0000 Subject: [PATCH 038/299] php73Extensions.blackfire: 1.41.0 -> 1.43.0 --- pkgs/development/tools/misc/blackfire/php-probe.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index 5de2a05349a..a14f5b0edb6 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -17,11 +17,11 @@ let }.${lib.versions.majorMinor php.version} or (throw "Unsupported PHP version."); in stdenv.mkDerivation rec { pname = "php-blackfire"; - version = "1.41.0"; + version = "1.43.0"; src = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-php_${version}_amd64.deb"; - sha256 = "0vbl48bccswk9ygb4sshn24cl33fk0xg8d1bcg7ihvdc45any9ww"; + sha256 = "1038qbpqkamd51ip25z6fbbz69faggahhdw75lnsd8prrwjcpli7"; }; nativeBuildInputs = [ From f76171b0dbb45708ecb7a626c642f4762cb989c8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 4 Nov 2020 08:02:51 +0100 Subject: [PATCH 039/299] =?UTF-8?q?blackfire:=201.44.1=20=E2=86=92=201.44.?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/misc/blackfire/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index 08496d9f520..27e043a9ac4 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "blackfire-agent"; - version = "1.44.1"; + version = "1.44.2"; src = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-agent_${version}_amd64.deb"; - sha256 = "1p00flipm5x6r36gblfrfrd14byipilybrhfzv8rzpahz2b7r5hb"; + sha256 = "1bam4sb0yhxciykph7wn41zs8fa7c9iwnbihd5kza0cylbb7fbkb"; }; nativeBuildInputs = [ From 319ec9b2fa92fc98629abcccbcc3afdf1ae3864e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Nov 2020 10:53:58 +0000 Subject: [PATCH 040/299] postman: 7.32.0 -> 7.34.0 --- pkgs/development/web/postman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index 1495b811d09..c12e0260fbe 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "postman"; - version = "7.32.0"; + version = "7.34.0"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "0dn9awzhaafsdsiwwj6870zyqw4spsmc08zgcc5dhnpcnjcyldf3"; + sha256 = "13d3wc49wp8rh8kxrn1krsyh24g5m6wl0mfhvbjylv0q6kp5jlan"; name = "${pname}.tar.gz"; }; From 74a37c61a0c7c145ef0c74bdf8471a2a84b45c8c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Nov 2020 17:41:38 +0000 Subject: [PATCH 041/299] python27Packages.iniconfig: 1.0.1 -> 1.1.1 --- pkgs/development/python-modules/iniconfig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iniconfig/default.nix b/pkgs/development/python-modules/iniconfig/default.nix index f6383e46d23..ae4d08f498f 100644 --- a/pkgs/development/python-modules/iniconfig/default.nix +++ b/pkgs/development/python-modules/iniconfig/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "iniconfig"; - version = "1.0.1"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "0s9z9n4603fdpv2vzh6ddzfgsjmb09n6qalkjl2xwrss6n4jzyg5"; + sha256 = "bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"; }; doCheck = false; # avoid circular import with pytest From eddeeb12e4e5e0b548ed91ff7de6631acd94ce12 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Nov 2020 23:54:40 +0000 Subject: [PATCH 042/299] python27Packages.flask-paginate: 0.5.4 -> 0.7.1 --- pkgs/development/python-modules/flask-paginate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix index f0cf96d1367..0d618e2b55d 100644 --- a/pkgs/development/python-modules/flask-paginate/default.nix +++ b/pkgs/development/python-modules/flask-paginate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flask-paginate"; - version = "0.5.4"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "60079a1c4c600cb4d4a9f7c386ea357b5ee02355ae6d6e8b41f769ae3f7af3ad"; + sha256 = "949b93d0535d1223b91ac0048586bd878aaebf4044c54c1dc3068acc9bdf441f"; }; propagatedBuildInputs = [ flask ]; From e1c4c96c286b1b41684f3b3def429de577953cd3 Mon Sep 17 00:00:00 2001 From: Paul <423357+toothbrush@users.noreply.github.com> Date: Thu, 5 Nov 2020 10:39:51 +0930 Subject: [PATCH 043/299] mercury: 20.06 -> 20.06.1 --- pkgs/development/compilers/mercury/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix index b9225cbd793..d7029733381 100644 --- a/pkgs/development/compilers/mercury/default.nix +++ b/pkgs/development/compilers/mercury/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mercury"; - version = "20.06"; + version = "20.06.1"; src = fetchurl { url = "https://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.gz"; - sha256 = "1gkr9w8lsdzqykqwd3f1a1phsqv090648i14ilhv8jdg85frdimr"; + sha256 = "ef093ae81424c4f3fe696eff9aefb5fb66899e11bb17ae0326adfb70d09c1c1f"; }; buildInputs = [ gcc flex bison texinfo jdk erlang makeWrapper From 926c4d7d5901c9511dabeac313c0ca06dd1409c3 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sun, 18 Oct 2020 16:00:40 -0700 Subject: [PATCH 044/299] maintainers: add r-burns --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4bfd01be5f1..93e5b583233 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7065,6 +7065,12 @@ fingerprint = "7573 56D7 79BB B888 773E 415E 736C CDF9 EF51 BD97"; }]; }; + r-burns = { + email = "rtburns@protonmail.com"; + github = "r-burns"; + githubId = 52847440; + name = "Ryan Burns"; + }; raboof = { email = "arnout@bzzt.net"; github = "raboof"; From 949ddf17619bdfb87bbc34441ffd357890ffe9f0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 5 Nov 2020 09:10:47 +0000 Subject: [PATCH 045/299] python27Packages.numpy-stl: 2.11.2 -> 2.12.0 --- pkgs/development/python-modules/numpy-stl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index b862319d947..2207d4244ed 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "numpy-stl"; - version = "2.11.2"; + version = "2.12.0"; src = fetchPypi { inherit pname version; - sha256 = "1dil1rklb41m3v6a0i93ymimv453whsg1m9z6g0z17jbg7gmc98r"; + sha256 = "10912d7749ab02b0ee2ee61fc04c38fa211fc9d00a9b73a7d1c2465c53c1abf5"; }; checkInputs = [ pytest pytestrunner ]; From be5ef7d85dba4248ce079d280a114f4a2e279321 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 Nov 2020 16:56:00 +0100 Subject: [PATCH 046/299] homeassistant: 0.117.4 -> 0.117.5 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 8f6f555474f..6597eeaf117 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.117.4"; + version = "0.117.5"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 995d0bd0ede..d0d88f73bc1 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -67,7 +67,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.117.4"; + hassVersion = "0.117.5"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -83,7 +83,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "0f5a5y6d9wxdfd5l526dz34xz2n1a6ia7vdcr7sqf2qp51brpw52"; + sha256 = "1al2pwj2xrhqyaz2pal4a1bdh4sm63ijfaw8pajghz5z23gf62r0"; }; # leave this in, so users don't have to constantly update their downstream patch handling From 66d8c7d29a54a833559bc4c62b4601ea082865c4 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 5 Nov 2020 13:08:06 -0500 Subject: [PATCH 047/299] jenkins: Inline update script, add test reference --- .../jenkins/default.nix | 43 ++++++++++++++++++- .../continuous-integration/jenkins/update.sh | 22 ---------- 2 files changed, 41 insertions(+), 24 deletions(-) delete mode 100755 pkgs/development/tools/continuous-integration/jenkins/update.sh diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index d9eb540c3f2..c95a21c012d 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, nix, nixfmt, writeScript, nixosTests, jq, cacert, curl }: stdenv.mkDerivation rec { pname = "jenkins"; @@ -14,11 +14,50 @@ stdenv.mkDerivation rec { cp "$src" "$out/webapps/jenkins.war" ''; + passthru = { + tests = { inherit (nixosTests) jenkins; }; + + updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -o errexit + PATH=${ + stdenv.lib.makeBinPath [ + cacert + common-updater-scripts + coreutils + curl + git + gnused + jq + nix + nixfmt + ] + } + + core_json="$(curl -s --fail --location https://updates.jenkins.io/stable/update-center.actual.json | jq .core)" + oldVersion=$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion jenkins" | tr -d '"') + + version="$(jq -r .version <<<$core_json)" + sha256="$(jq -r .sha256 <<<$core_json)" + hash="$(nix-hash --type sha256 --to-base32 "$sha256")" + url="$(jq -r .url <<<$core_json)" + + if [ ! "$oldVersion" = "$version" ]; then + update-source-version jenkins "$version" "$hash" "$url" + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix" + nixfmt "$default_nix" + else + echo "jenkins is already up-to-date" + fi + ''; + }; + meta = with stdenv.lib; { description = "An extendable open source continuous integration server"; homepage = "https://jenkins-ci.org"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ coconnor fpletz earldouglas ]; + maintainers = with maintainers; [ coconnor fpletz earldouglas nequissimus ]; }; } diff --git a/pkgs/development/tools/continuous-integration/jenkins/update.sh b/pkgs/development/tools/continuous-integration/jenkins/update.sh deleted file mode 100755 index 4f2f6527ecc..00000000000 --- a/pkgs/development/tools/continuous-integration/jenkins/update.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl common-updater-scripts jq - -set -eu -o pipefail - -core_json="$(curl -s --fail --location https://updates.jenkins.io/stable/update-center.actual.json | jq .core)" -oldVersion=$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion jenkins" | tr -d '"') - -version="$(jq -r .version <<<$core_json)" -sha256="$(jq -r .sha256 <<<$core_json)" -hash="$(nix-hash --type sha256 --to-base32 "$sha256")" -url="$(jq -r .url <<<$core_json)" - -if [ ! "${oldVersion}" = "${version}" ]; then - update-source-version jenkins "$version" "$hash" "$url" - nixpkgs="$(git rev-parse --show-toplevel)" - default_nix="$nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix" - git add "${default_nix}" - git commit -m "jenkins: ${oldVersion} -> ${version}" -else - echo "jenkins is already up-to-date" -fi From 37cd50fa353fbede65ba2d5de002e289bc73f0b6 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 5 Nov 2020 18:09:36 +0000 Subject: [PATCH 048/299] =?UTF-8?q?jenkins:=202.249.2=20=E2=86=92=202.249.?= =?UTF-8?q?3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/continuous-integration/jenkins/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index c95a21c012d..b4cc2843c33 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, nix, nixfmt, writeScript, nixosTests, jq, cacert, curl }: +{ stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, nix, nixfmt +, writeScript, nixosTests, jq, cacert, curl }: stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.249.2"; + version = "2.249.3"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "08m5z4ik96gnhw92hjzch7rpvrs0dipi9fps4rihwwzg5k26rc0v"; + sha256 = "00lpqkkz7k0m2czz1sg54gb90sljc14i5a2kpikrkiw8aqfz3s4d"; }; buildCommand = '' @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { #!${stdenv.shell} set -o errexit PATH=${ - stdenv.lib.makeBinPath [ + stdenv.lib.makeBinPath [ cacert common-updater-scripts coreutils From 4653f62f44b1062c41eaad7d3bc5bbaf2f298d18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 5 Nov 2020 20:44:01 +0100 Subject: [PATCH 049/299] _1password-gui: 0.9.1 -> 0.9.2-1 Changes: https://1password.community/discussion/116663/1password-beta-0-9-2 --- pkgs/tools/security/1password-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix index b9e668aaa40..0a76a04196c 100644 --- a/pkgs/tools/security/1password-gui/default.nix +++ b/pkgs/tools/security/1password-gui/default.nix @@ -13,11 +13,11 @@ in stdenv.mkDerivation rec { pname = "1password"; - version = "0.9.1"; + version = "0.9.2-1"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - sha256 = "04hv7hw4s3f65kf3ggh9l0nrx25k5yj2kqv83nl7pvam5lvnv8sz"; + sha256 = "19m8qfhmdzgz76xba9wi5cb12jqwr17afqzajvgq681i52fij0lr"; }; nativeBuildInputs = [ makeWrapper ]; From adf334a0c653a5c163e00e05cc6f5088295cc4d8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 5 Nov 2020 20:38:18 -0500 Subject: [PATCH 050/299] nanorc: 2020-01-25 -> 2020-10-10 Add update script --- .../editors/nano/nanorc/default.nix | 43 ++++++++++++++++--- 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/nano/nanorc/default.nix b/pkgs/applications/editors/nano/nanorc/default.nix index 4d4b093233b..54442fc21f4 100644 --- a/pkgs/applications/editors/nano/nanorc/default.nix +++ b/pkgs/applications/editors/nano/nanorc/default.nix @@ -1,14 +1,17 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, writeScript, nixosTests, common-updater-scripts +, coreutils, git, gnused, nix, nixfmt }: -stdenv.mkDerivation { +let + owner = "scopatz"; + repo = "nanorc"; +in stdenv.mkDerivation rec { pname = "nanorc"; - version = "2020-01-25"; + version = "2020-10-10"; src = fetchFromGitHub { - owner = "scopatz"; - repo = "nanorc"; - rev = "2020.1.25"; - sha256 = "1y8jk3jsl4bd6r4hzmxzcf77hv8bwm0318yv7y2npkkd3a060z8d"; + inherit owner repo; + rev = builtins.replaceStrings [ "-" ] [ "." ] version; + sha256 = "3B2nNFYkwYHCX6pQz/hMO/rnVqlCiw1BSNmGmJ6KCqE="; }; dontBuild = true; @@ -19,6 +22,32 @@ stdenv.mkDerivation { install *.nanorc $out/share/ ''; + passthru.updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -o errexit + PATH=${ + stdenv.lib.makeBinPath [ + common-updater-scripts + coreutils + git + gnused + nix + nixfmt + ] + } + oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"' | sed 's|\\.|-|g')" + latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags git@github.com:${owner}/${repo} '*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3)" + if [ "$oldVersion" != "$latestTag" ]; then + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix" + newTag=$(echo $latestTag | sed 's|\.|-|g') + update-source-version ${pname} "$newTag" --version-key=version --print-changes + nixfmt "$default_nix" + else + echo "${pname} is already up-to-date" + fi + ''; + meta = { description = "Improved Nano Syntax Highlighting Files"; homepage = "https://github.com/scopatz/nanorc"; From 43907de6a754597006e0f12fc763a6d7475cf566 Mon Sep 17 00:00:00 2001 From: AmineChikhaoui Date: Thu, 5 Nov 2020 20:58:08 -0500 Subject: [PATCH 051/299] ec2-amis: update AMIs to use gpt partition table Use changes made as part of #102182. --- nixos/modules/virtualisation/ec2-amis.nix | 36 +++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index 4d9c391e046..3da63078a21 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -329,24 +329,24 @@ let self = { "20.03".ap-east-1.hvm-ebs = "ami-0d18fdd309cdefa86"; "20.03".sa-east-1.hvm-ebs = "ami-09859378158ae971d"; - # 20.09.1465.9a0b14b097d - "20.09".eu-west-1.hvm-ebs = "ami-0d90f16418e3c364c"; - "20.09".eu-west-2.hvm-ebs = "ami-0635ec0780ea57cfe"; - "20.09".eu-west-3.hvm-ebs = "ami-0714e94352f2eabb9"; - "20.09".eu-central-1.hvm-ebs = "ami-0979d39762a4d2a02"; - "20.09".eu-north-1.hvm-ebs = "ami-0b14e273185c66e9b"; - "20.09".us-east-1.hvm-ebs = "ami-0f8b063ac3f2d9645"; - "20.09".us-east-2.hvm-ebs = "ami-0959202a0393fdd0c"; - "20.09".us-west-1.hvm-ebs = "ami-096d50833b785478b"; - "20.09".us-west-2.hvm-ebs = "ami-0fc31031df0df6104"; - "20.09".ca-central-1.hvm-ebs = "ami-0787786a38cde3905"; - "20.09".ap-southeast-1.hvm-ebs = "ami-0b3f693d3a2a0b9ae"; - "20.09".ap-southeast-2.hvm-ebs = "ami-02471872bc876b610"; - "20.09".ap-northeast-1.hvm-ebs = "ami-06505fd2bf44a59a7"; - "20.09".ap-northeast-2.hvm-ebs = "ami-0754b4c014eea1e8a"; - "20.09".ap-south-1.hvm-ebs = "ami-05100e32242ae65a6"; - "20.09".ap-east-1.hvm-ebs = "ami-045288859a39de009"; - "20.09".sa-east-1.hvm-ebs = "ami-0a937748db48fb00d"; + # 20.09.1632.a6a3a368dda + "20.09".eu-west-1.hvm-ebs = "ami-01a79d5ce435f4db3"; + "20.09".eu-west-2.hvm-ebs = "ami-0cbe14f32904e6331"; + "20.09".eu-west-3.hvm-ebs = "ami-07f493412d6213de6"; + "20.09".eu-central-1.hvm-ebs = "ami-01d4a0c2248cbfe38"; + "20.09".eu-north-1.hvm-ebs = "ami-0003f54dd99d68e0f"; + "20.09".us-east-1.hvm-ebs = "ami-068a62d478710462d"; + "20.09".us-east-2.hvm-ebs = "ami-01ac677ff61399caa"; + "20.09".us-west-1.hvm-ebs = "ami-04befdb203b4b17f6"; + "20.09".us-west-2.hvm-ebs = "ami-0fb7bd4a43261c6b2"; + "20.09".ca-central-1.hvm-ebs = "ami-06d5ee429f153f856"; + "20.09".ap-southeast-1.hvm-ebs = "ami-0db0304e23c535b2a"; + "20.09".ap-southeast-2.hvm-ebs = "ami-045983c4db7e36447"; + "20.09".ap-northeast-1.hvm-ebs = "ami-0beb18d632cf64e5a"; + "20.09".ap-northeast-2.hvm-ebs = "ami-0dd0316af578862db"; + "20.09".ap-south-1.hvm-ebs = "ami-008d15ced81c88aed"; + "20.09".ap-east-1.hvm-ebs = "ami-071f49713f86ea965"; + "20.09".sa-east-1.hvm-ebs = "ami-05ded1ae35209b5a8"; latest = self."20.09"; }; in self From 8846bd9f79bcfed13d0209e03bb4920f19775807 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 5 Nov 2020 20:54:12 -0500 Subject: [PATCH 052/299] coursier: Add update script --- pkgs/development/tools/coursier/default.nix | 61 +++++++++++++++++---- 1 file changed, 49 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index d3c1cc50d0e..662cea9558c 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -1,18 +1,25 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ stdenv, fetchurl, makeWrapper, jre, writeScript, common-updater-scripts +, coreutils, git, gnused, nix, nixfmt }: let - zshCompletion = version: fetchurl { - url = "https://raw.githubusercontent.com/coursier/coursier/v${version}/modules/cli/src/main/resources/completions/zsh"; - sha256 = "0afxzrk9w1qinfsz55jjrxydw0fcv6p722g1q955dl7f6xbab1jh"; - }; -in -stdenv.mkDerivation rec { - pname = "coursier"; version = "2.0.6"; + zshCompletion = fetchurl { + url = + "https://raw.githubusercontent.com/coursier/coursier/v${version}/modules/cli/src/main/resources/completions/zsh"; + sha256 = "0afxzrk9w1qinfsz55jjrxydw0fcv6p722g1q955dl7f6xbab1jh"; + }; + + repo = "git@github.com:coursier/coursier.git"; +in stdenv.mkDerivation rec { + inherit version; + + pname = "coursier"; + src = fetchurl { - url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "0zg07bi44a5p0zfc77i1vmjz9rwzxzf6p0xsybsv3n1saq884wij"; + url = + "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; + sha256 = "MnKCEFY62LH18rqDa9zvn+f0Zd0hnsPcB7coQuI64H0="; }; nativeBuildInputs = [ makeWrapper ]; @@ -23,12 +30,42 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/coursier --prefix PATH ":" ${jre}/bin # copy zsh completion - install -Dm755 ${zshCompletion version} $out/share/zsh/site-functions/_coursier + install -Dm755 ${zshCompletion} $out/share/zsh/site-functions/_coursier + ''; + + passthru.updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -o errexit + PATH=${ + stdenv.lib.makeBinPath [ + common-updater-scripts + coreutils + git + gnused + nix + nixfmt + ] + } + oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" + latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${repo} 'v*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')" + if [ "$oldVersion" != "$latestTag" ]; then + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/development/tools/coursier/default.nix" + update-source-version ${pname} "$latestTag" --version-key=version --print-changes + url="${builtins.head zshCompletion.urls}" + completion_url=$(echo $url | sed "s|$oldVersion|$latestTag|g") + completion_sha256="$(nix-prefetch-url --type sha256 $completion_url)" + sed -i "s|${zshCompletion.outputHash}|$completion_sha256|g" "$default_nix" + nixfmt "$default_nix" + else + echo "${pname} is already up-to-date" + fi ''; meta = with stdenv.lib; { homepage = "https://get-coursier.io/"; - description = "A Scala library to fetch dependencies from Maven / Ivy repositories"; + description = + "A Scala library to fetch dependencies from Maven / Ivy repositories"; license = licenses.asl20; maintainers = with maintainers; [ adelbertc nequissimus ]; }; From 0f0af1dbd49c4637e8d40efa237e3b0de5206294 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 5 Nov 2020 20:32:50 -0500 Subject: [PATCH 053/299] linux-hardened: Do not block channel --- nixos/release-combined.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 945ba90e345..384ae5765b8 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -71,7 +71,6 @@ in rec { (onFullSupported "nixos.tests.fontconfig-default-fonts") (onFullSupported "nixos.tests.gnome3") (onFullSupported "nixos.tests.gnome3-xorg") - (onFullSupported "nixos.tests.hardened") (onSystems ["x86_64-linux"] "nixos.tests.hibernate") (onFullSupported "nixos.tests.i3wm") (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSimple") @@ -93,7 +92,6 @@ in rec { (onFullSupported "nixos.tests.keymap.dvp") (onFullSupported "nixos.tests.keymap.neo") (onFullSupported "nixos.tests.keymap.qwertz") - (onFullSupported "nixos.tests.latestKernel.hardened") (onFullSupported "nixos.tests.latestKernel.login") (onFullSupported "nixos.tests.lightdm") (onFullSupported "nixos.tests.login") From 487c44867ad97ad32d2624fbb2c3b9c4032b7a86 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 6 Nov 2020 04:20:00 +0000 Subject: [PATCH 054/299] archiver: 3.4.0 -> 3.5.0 --- pkgs/applications/misc/archiver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/applications/misc/archiver/default.nix index aec0b9d5118..1691ab07361 100644 --- a/pkgs/applications/misc/archiver/default.nix +++ b/pkgs/applications/misc/archiver/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "archiver"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "mholt"; repo = pname; rev = "v${version}"; - sha256 = "16jawybywqfkp68035bnf206a2w4khjw239saa429a21lxrfyk4a"; + sha256 = "0fdkqfs87svpijccz8m11gvby8pvmznq6fs9k94vbzak0kxhw1wg"; }; - vendorSha256 = "0m89ibj3dm58j49d99dhkn0ryivnianxz7lkpkvhs0cdbzzc02az"; + vendorSha256 = "0avnskay23mpl3qkyf1h75rr7szpsxis2bj5pplhwf8q8q0212xf"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=unknown" ]; From 17fc38828d963bf8ac0693f2dedb0eda94298b58 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 6 Nov 2020 04:20:00 +0000 Subject: [PATCH 055/299] python27Packages.iniconfig: fix homepage --- pkgs/development/python-modules/iniconfig/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/iniconfig/default.nix b/pkgs/development/python-modules/iniconfig/default.nix index ae4d08f498f..90761f76f9d 100644 --- a/pkgs/development/python-modules/iniconfig/default.nix +++ b/pkgs/development/python-modules/iniconfig/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "brain-dead simple parsing of ini files"; - homepage = "https://github.com/CHANGE/iniconfig/"; + homepage = "https://github.com/RonnyPfannschmidt/iniconfig"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; From ac019684705b3ccfdb9d7edf7aef85d016fdd064 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 6 Nov 2020 04:20:00 +0000 Subject: [PATCH 056/299] skim: 0.9.2 -> 0.9.3 https://github.com/lotabout/skim/releases/tag/v0.9.3 --- pkgs/tools/misc/skim/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index 6a613869e14..996e6b4490e 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "skim"; - version = "0.9.2"; + version = "0.9.3"; src = fetchCrate { inherit pname version; - sha256 = "0k101ymr6shi8hivf7kv52vwgcad2dwhyma0yg2pnp9q3ll0iszb"; + sha256 = "026mgqcp9sg6wwikghrc3rgh5p6wdbnvav5pb3xvs79lj85d5ga7"; }; outputs = [ "out" "vim" ]; - cargoSha256 = "0b4pj30w07p67zvpn5af23ddkvknmfp5a33sy6ai8argfi73bf4c"; + cargoSha256 = "07bs23x2vxzlrca5swwq8khmd9fbdhlhm0avwp9y231df6xdi2ys"; postPatch = '' sed -i -e "s|expand(':h:h')|'$out'|" plugin/skim.vim From 11d1486a852c6ab699697394a8c622a70a6e9fac Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 6 Nov 2020 04:20:00 +0000 Subject: [PATCH 057/299] ktlint: 0.38.1 -> 0.39.0 https://github.com/pinterest/ktlint/releases/tag/0.39.0 --- pkgs/development/tools/ktlint/default.nix | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 3b5233d8895..b26c328dba8 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -1,38 +1,31 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ stdenv, fetchurl, makeWrapper, jre_headless }: stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.38.1"; + version = "0.39.0"; src = fetchurl { url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint"; - sha256 = "0wz839ikvqjxpx2rzaxaji12pcqxcgmmb91xypz2dzlplxvzxvdj"; + sha256 = "0lvi4d731ypdjcskj0hdfd37wa3ldspibs2dgaahg7d7zhp1l76g"; }; nativeBuildInputs = [ makeWrapper ]; - propagatedBuildInputs = [ jre ]; - - unpackCmd = '' - mkdir -p ${pname}-${version} - cp $curSrc ${pname}-${version}/ktlint - ''; + dontUnpack = true; installPhase = '' - mkdir -p $out/bin - mv ktlint $out/bin/ktlint - chmod +x $out/bin/ktlint + install -Dm755 $src $out/bin/ktlint ''; postFixup = '' - wrapProgram $out/bin/ktlint --prefix PATH : "${jre}/bin" + wrapProgram $out/bin/ktlint --prefix PATH : "${jre_headless}/bin" ''; meta = with stdenv.lib; { description = "An anti-bikeshedding Kotlin linter with built-in formatter"; homepage = "https://ktlint.github.io/"; license = licenses.mit; - platforms = platforms.all; + platforms = jre_headless.meta.platforms; maintainers = with maintainers; [ tadfisher ]; }; } From a4afd835dad793e4265e96a1b6c7a329b5a6805c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 6 Nov 2020 04:20:00 +0000 Subject: [PATCH 058/299] nushell: 0.21.0 -> 0.22.0 http://www.nushell.sh/blog/2020/11/03/nushell_0_22.html --- pkgs/shells/nushell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index d025ed1ddcd..20624293e85 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "19bpxx9pi3cl5y7h5qg4a2pmvwqavm1vciyvsq96kxkc7rq2xwvl"; + sha256 = "1nj8cjj5db5r4wnxbcsd5z9n5kqf2p1j54l5z0m650370z41df1f"; }; - cargoSha256 = "1ghbzahz8lbk11sjy2kis12w22rjr92aaw451rmc86pk2lsxn0dx"; + cargoSha256 = "0sh6z8dclla3lrjzwfjb7avsbkagaq9d9q3d8ll8y0mahv1a135w"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; From b79b4c0eb09932669a731410bb1df773cd03336e Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Thu, 5 Nov 2020 21:10:30 -0800 Subject: [PATCH 059/299] wally-cli: enable on darwin --- pkgs/development/tools/wally-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/wally-cli/default.nix b/pkgs/development/tools/wally-cli/default.nix index d9abe6163a2..ffa66646859 100644 --- a/pkgs/development/tools/wally-cli/default.nix +++ b/pkgs/development/tools/wally-cli/default.nix @@ -27,8 +27,8 @@ buildGoModule rec { meta = with lib; { description = "A tool to flash firmware to mechanical keyboards"; homepage = "https://ergodox-ez.com/pages/wally-planck"; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; license = licenses.mit; - maintainers = [ maintainers.spacekookie ]; + maintainers = with maintainers; [ spacekookie r-burns ]; }; } From ef4e78e71b3d5de1ef3dabceeaddfa8141bc97a9 Mon Sep 17 00:00:00 2001 From: Tom Ho Date: Fri, 6 Nov 2020 18:13:35 +1100 Subject: [PATCH 060/299] Adding MajesticMullet to maintainers-list.nix --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bacd3dab9aa..2178e9f79f9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5268,6 +5268,12 @@ githubId = 1238350; name = "Matthias Herrmann"; }; + majesticmullet = { + email = "hoccthomas@gmail.com.au"; + github = "MajesticMullet"; + githubId = 31056089; + name = "Tom Ho"; + }; makefu = { email = "makefu@syntax-fehler.de"; github = "makefu"; From 7fede29d8339ad4efebfe8f9e050e89611ebb4af Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 6 Nov 2020 00:39:50 -0800 Subject: [PATCH 061/299] nixos/octoprint: remove references to deprecated/removed m33-fio plugin --- nixos/modules/services/misc/octoprint.nix | 2 +- .../misc/octoprint/m33-fio-one-library.patch | 175 ------------------ 2 files changed, 1 insertion(+), 176 deletions(-) delete mode 100644 pkgs/applications/misc/octoprint/m33-fio-one-library.patch diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index e2fbd3b401c..a69e6507305 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -68,7 +68,7 @@ in plugins = mkOption { default = plugins: []; defaultText = "plugins: []"; - example = literalExample "plugins: with plugins; [ m33-fio stlviewer ]"; + example = literalExample "plugins: with plugins; [ themeify stlviewer ]"; description = "Additional plugins to be used. Available plugins are passed through the plugins input."; }; diff --git a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch b/pkgs/applications/misc/octoprint/m33-fio-one-library.patch deleted file mode 100644 index 24c9c4a80f5..00000000000 --- a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 314bcebfcd1759981ce12255be29d8ae68cd400b Mon Sep 17 00:00:00 2001 -From: Nikolay Amiantov -Date: Wed, 23 Nov 2016 00:40:48 +0300 -Subject: [PATCH] Build and use one version of preprocessor library - ---- - octoprint_m33fio/__init__.py | 73 ++---------------------------------------- - shared library source/Makefile | 62 +++-------------------------------- - 2 files changed, 6 insertions(+), 129 deletions(-) - -diff --git a/octoprint_m33fio/__init__.py b/octoprint_m33fio/__init__.py -index 054870a..4d5ecc1 100755 ---- a/octoprint_m33fio/__init__.py -+++ b/octoprint_m33fio/__init__.py -@@ -1189,78 +1189,9 @@ class M33FioPlugin( - # Check if using shared library or checking if it is usable - if self._settings.get_boolean(["UseSharedLibrary"]) or isUsable : - -- # Check if running on Linux -- if platform.uname()[0].startswith("Linux") : -- -- # Check if running on a Raspberry Pi 1 -- if platform.uname()[4].startswith("armv6l") and self.getCpuHardware() == "BCM2708" : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_arm1176jzf-s.so") -- -- # Otherwise check if running on a Raspberry Pi 2 or Raspberry Pi 3 -- elif platform.uname()[4].startswith("armv7l") and self.getCpuHardware() == "BCM2709" : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_arm_cortex-a7.so") -- -- # Otherwise check if running on an ARM7 device -- elif platform.uname()[4].startswith("armv7") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_arm7.so") -- -- # Otherwise check if using an i386 or x86-64 device -- elif platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64") : -- -- # Check if Python is running as 32-bit -- if platform.architecture()[0].startswith("32") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_i386.so") -- -- # Otherwise check if Python is running as 64-bit -- elif platform.architecture()[0].startswith("64") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.so") -- -- # Otherwise check if running on Windows and using an i386 or x86-64 device -- elif platform.uname()[0].startswith("Windows") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) : -+ # Set shared library -+ self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so") - -- # Check if Python is running as 32-bit -- if platform.architecture()[0].startswith("32") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_i386.dll") -- -- # Otherwise check if Python is running as 64-bit -- elif platform.architecture()[0].startswith("64") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.dll") -- -- # Otherwise check if running on macOS and using an i386 or x86-64 device -- elif platform.uname()[0].startswith("Darwin") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) : -- -- # Check if Python is running as 32-bit -- if platform.architecture()[0].startswith("32") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_i386.dylib") -- -- # Otherwise check if Python is running as 64-bit -- elif platform.architecture()[0].startswith("64") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.dylib") -- -- # Otherwise check if running FreeBSD -- elif platform.uname()[0].startswith("FreeBSD") : -- -- # TODO: Compile FreeBSD shared library pre-processors -- pass -- - # Check if shared library was set - if self.sharedLibrary : - -diff --git a/shared library source/Makefile b/shared library source/Makefile -index 792b4f4..4c74f5c 100755 ---- a/shared library source/Makefile -+++ b/shared library source/Makefile -@@ -1,68 +1,14 @@ --# Target platform options: LINUX32, LINUX64, WINDOWS32, WINDOWS64, PI, PI2, ARM7, MACOS32, MACOS64 --LIBRARY_NAME = preprocessor --TARGET_PLATFORM = LINUX64 -+LIBRARY_NAME = libpreprocessor - VER = .1 - --ifeq ($(TARGET_PLATFORM), LINUX32) -- PROG = $(LIBRARY_NAME)_i386.so -- CC = g++ -- CFLAGS = -fPIC -m32 -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ --endif -- --ifeq ($(TARGET_PLATFORM), LINUX64) -- PROG = $(LIBRARY_NAME)_x86-64.so -- CC = g++ -- CFLAGS = -fPIC -m64 -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ --endif -- --ifeq ($(TARGET_PLATFORM), WINDOWS32) -- PROG = $(LIBRARY_NAME)_i386.dll -- CC = i686-w64-mingw32-g++ -- CFLAGS = -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ --endif -- --ifeq ($(TARGET_PLATFORM), WINDOWS64) -- PROG = $(LIBRARY_NAME)_x86-64.dll -- CC = x86_64-w64-mingw32-g++ -- CFLAGS = -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ --endif -- --ifeq ($(TARGET_PLATFORM), PI) -- PROG = $(LIBRARY_NAME)_arm1176jzf-s.so -- CC = /opt/arm-toolchain/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++ -- CFLAGS = -fPIC -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ --endif -- --ifeq ($(TARGET_PLATFORM), PI2) -- PROG = $(LIBRARY_NAME)_arm_cortex-a7.so -- CC = /opt/arm-toolchain/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++ -- CFLAGS = -fPIC -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ --endif -- --ifeq ($(TARGET_PLATFORM), ARM7) -- PROG = $(LIBRARY_NAME)_arm7.so -- CC = /opt/arm-toolchain/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-g++ -- CFLAGS = -fPIC -mcpu=generic-armv7-a -mfpu=vfp -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ --endif -- --ifeq ($(TARGET_PLATFORM), MACOS32) -- PROG = $(LIBRARY_NAME)_i386.dylib -- CC = clang++ -- CFLAGS = -fPIC -m32 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER) -- --endif -- --ifeq ($(TARGET_PLATFORM), MACOS64) -- PROG = $(LIBRARY_NAME)_x86-64.dylib -- CC = clang++ -- CFLAGS = -fPIC -m64 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER) --endif -+PROG = $(LIBRARY_NAME).so -+CFLAGS = -fPIC -O3 -Wl,-soname,$(PROG)$(VER) - - SRCS = preprocessor.cpp gcode.cpp vector.cpp - CFLAGS += -Wall -std=c++11 -fvisibility=hidden -shared - - all: -- $(CC) $(CFLAGS) -o ../octoprint_m33fio/static/libraries/$(PROG) $(SRCS) -+ $(CXX) $(CFLAGS) -o ../octoprint_m33fio/static/libraries/$(PROG) $(SRCS) - - clean: - rm -f ../octoprint_m33fio/static/libraries/$(PROG) --- -2.14.1 - From 702b62657065bbf0fa7f58ce843100d6e6681370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 6 Nov 2020 09:55:12 +0100 Subject: [PATCH 062/299] mkl: Fix pkg-config file There was a spurious `intel64` in some library paths. --- pkgs/development/libraries/science/math/mkl/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 2be3baed449..7cbc50bc5b3 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -90,7 +90,8 @@ in stdenvNoCC.mkDerivation { substituteInPlace $f \ --replace "prefix=/mkl" "prefix=$out" \ --replace $\{MKLROOT} "$out" \ - --replace "lib/intel64_lin" "lib" + --replace "lib/intel64_lin" "lib" \ + --replace "lib/intel64" "lib" done for f in $(find opt/intel -name 'mkl*iomp.pc') ; do From 6057cb97860496d9ad7e98a7196d1f360ff8f219 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 6 Nov 2020 10:29:51 +0100 Subject: [PATCH 063/299] ghc*: Increase build timeout to 1 day The default of 10 hours is insufficient for some of the slower platforms like macOS and aarch64. --- pkgs/development/compilers/ghc/8.10.1.nix | 1 + pkgs/development/compilers/ghc/8.10.2.nix | 1 + pkgs/development/compilers/ghc/8.6.5.nix | 1 + pkgs/development/compilers/ghc/8.8.2.nix | 1 + pkgs/development/compilers/ghc/8.8.3.nix | 1 + pkgs/development/compilers/ghc/8.8.4.nix | 1 + pkgs/development/compilers/ghc/9.0.1.nix | 1 + 7 files changed, 7 insertions(+) diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix index d3835d01e5a..42eb994b8fe 100644 --- a/pkgs/development/compilers/ghc/8.10.1.nix +++ b/pkgs/development/compilers/ghc/8.10.1.nix @@ -246,6 +246,7 @@ stdenv.mkDerivation (rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; diff --git a/pkgs/development/compilers/ghc/8.10.2.nix b/pkgs/development/compilers/ghc/8.10.2.nix index f3d64ced81e..2407a48090b 100644 --- a/pkgs/development/compilers/ghc/8.10.2.nix +++ b/pkgs/development/compilers/ghc/8.10.2.nix @@ -242,6 +242,7 @@ stdenv.mkDerivation (rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index a5d2bb5c88d..3d660dd9521 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -256,6 +256,7 @@ stdenv.mkDerivation (rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; diff --git a/pkgs/development/compilers/ghc/8.8.2.nix b/pkgs/development/compilers/ghc/8.8.2.nix index 371a369496e..fbb75637df6 100644 --- a/pkgs/development/compilers/ghc/8.8.2.nix +++ b/pkgs/development/compilers/ghc/8.8.2.nix @@ -241,6 +241,7 @@ stdenv.mkDerivation (rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; diff --git a/pkgs/development/compilers/ghc/8.8.3.nix b/pkgs/development/compilers/ghc/8.8.3.nix index e26eacca204..538655a0d05 100644 --- a/pkgs/development/compilers/ghc/8.8.3.nix +++ b/pkgs/development/compilers/ghc/8.8.3.nix @@ -246,6 +246,7 @@ stdenv.mkDerivation (rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index cd579c05ec5..e69766bccda 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -250,6 +250,7 @@ stdenv.mkDerivation (rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; diff --git a/pkgs/development/compilers/ghc/9.0.1.nix b/pkgs/development/compilers/ghc/9.0.1.nix index 23daee56a75..bdb1a7555c2 100644 --- a/pkgs/development/compilers/ghc/9.0.1.nix +++ b/pkgs/development/compilers/ghc/9.0.1.nix @@ -237,6 +237,7 @@ stdenv.mkDerivation (rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; From 7ac71d78a33a3ae0ab8fd76e40e786befa563cf4 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 6 Nov 2020 11:35:19 +0100 Subject: [PATCH 064/299] ghc8102: Fix whitespace --- pkgs/development/compilers/ghc/8.10.2.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.10.2.nix b/pkgs/development/compilers/ghc/8.10.2.nix index 2407a48090b..41aa5e16ba1 100644 --- a/pkgs/development/compilers/ghc/8.10.2.nix +++ b/pkgs/development/compilers/ghc/8.10.2.nix @@ -107,9 +107,9 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; - # https://gitlab.haskell.org/ghc/ghc/-/issues/18549 - patches = [ - ./issue-18549.patch + # https://gitlab.haskell.org/ghc/ghc/-/issues/18549 + patches = [ + ./issue-18549.patch ]; postPatch = "patchShebangs ."; @@ -190,7 +190,7 @@ stdenv.mkDerivation (rec { strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; + dontAddExtraLibs = true; nativeBuildInputs = [ perl autoconf automake m4 python3 sphinx From 65d60c1259c240eb976c2d0507095f0ca0c72e8a Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Wed, 4 Nov 2020 16:03:46 +0200 Subject: [PATCH 065/299] pythonPackages.pypass: init at 0.2.1 --- .../python-modules/pypass/default.nix | 84 ++++++ .../pypass/mark-executables.patch | 255 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 341 insertions(+) create mode 100644 pkgs/development/python-modules/pypass/default.nix create mode 100644 pkgs/development/python-modules/pypass/mark-executables.patch diff --git a/pkgs/development/python-modules/pypass/default.nix b/pkgs/development/python-modules/pypass/default.nix new file mode 100644 index 00000000000..2458a29ac31 --- /dev/null +++ b/pkgs/development/python-modules/pypass/default.nix @@ -0,0 +1,84 @@ +{ buildPythonPackage +, click +, colorama +, enum34 +, fetchPypi +, git +, gnugrep +, gnupg +, nose +, pbr +, pexpect +, pythonAtLeast +, pythonOlder +, stdenv +, substituteAll +, tree +, xclip +}: + +# NOTE: pypass can also be used as an application, but probably the most +# important usecase is as a library. So, let's use buildPythonPackage and +# support any Python version instead of defining it as an application with +# buildPythonApplication. +buildPythonPackage rec { + pname = "pypass"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1nm4mj7pd7gz4ghic6b3wrnd1b59hd1f0axavdabfl79wy511l7r"; + }; + + # Set absolute nix store paths to the executables that pypass uses + patches = [ + (substituteAll { + src = ./mark-executables.patch; + git_exec = "${git}/bin/git"; + grep_exec = "${gnugrep}/bin/grep"; + gpg_exec = "${gnupg}/bin/gpg2"; + tree_exec = "${tree}/bin/tree"; + xclip_exec = "${xclip}/bin/xclip"; + }) + ]; + + # Remove enum34 requirement if Python >= 3.4 + postPatch = stdenv.lib.optionalString (pythonAtLeast "3.4") '' + substituteInPlace requirements.txt --replace "enum34" "" + ''; + + nativeBuildInputs = [ pbr ]; + + propagatedBuildInputs = [ + click + colorama + pexpect + ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; + + checkInputs = [ nose ]; + + # Configuration so that the tests work + preCheck = '' + HOME=$TEMP ${git}/bin/git config --global user.email "nix-builder@nixos.org" + HOME=$TEMP ${git}/bin/git config --global user.name "Nix Builder" + HOME=$TEMP ${git}/bin/git config --global pull.ff only + HOME=$TEMP make setup_gpg + ''; + + # Run tests but exclude the test that uses clipboard as I wasn't able to make + # it work - probably the X clipboard just doesn't work in the build + # environment.. + checkPhase = '' + runHook preCheck + HOME=$TEMP GNUPGHOME=pypass/tests/gnupg nosetests -v --exclude=test_show_clip . + runHook postCheck + ''; + + meta = { + description = "Password manager pass in Python"; + homepage = "https://github.com/aviau/python-pass"; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/development/python-modules/pypass/mark-executables.patch b/pkgs/development/python-modules/pypass/mark-executables.patch new file mode 100644 index 00000000000..9bde97c5110 --- /dev/null +++ b/pkgs/development/python-modules/pypass/mark-executables.patch @@ -0,0 +1,255 @@ +diff --git a/Makefile b/Makefile +index 1ef67c8..d49031a 100644 +--- a/Makefile ++++ b/Makefile +@@ -16,5 +16,5 @@ test: kill build + setup_gpg: pypass/tests/gnupg + pypass/tests/gnupg: pypass/tests/test_key_sec.asc pypass/tests/test_ownertrust.txt + mkdir -m 700 -p pypass/tests/gnupg +- GNUPGHOME=pypass/tests/gnupg gpg --allow-secret-key-import --import pypass/tests/test_key_sec.asc +- GNUPGHOME=pypass/tests/gnupg gpg --import-ownertrust pypass/tests/test_ownertrust.txt ++ GNUPGHOME=pypass/tests/gnupg @gpg_exec@ --allow-secret-key-import --import pypass/tests/test_key_sec.asc ++ GNUPGHOME=pypass/tests/gnupg @gpg_exec@ --import-ownertrust pypass/tests/test_ownertrust.txt +diff --git a/pypass/command.py b/pypass/command.py +index 4616a5f..a72cf5d 100644 +--- a/pypass/command.py ++++ b/pypass/command.py +@@ -173,7 +173,7 @@ def show(config, path, clip): + if clip: + xclip = subprocess.Popen( + [ +- 'xclip', ++ '@xclip_exec@', + '-selection', 'clipboard' + ], + stdin=subprocess.PIPE +@@ -206,7 +206,7 @@ def connect(config, path): + def ls(config, subfolder): + tree = subprocess.Popen( + [ +- 'tree', ++ '@tree_exec@', + '-C', + '-l', + '--noreport', +@@ -239,7 +239,7 @@ def find(config, search_terms): + + tree = subprocess.Popen( + [ +- 'tree', ++ '@tree_exec@', + '-C', + '-l', + '--noreport', +@@ -273,7 +273,7 @@ def grep(config, search_string): + config['password_store'].get_decrypted_password(password) + + grep = subprocess.Popen( +- ['grep', '-e', search_string], ++ ['@grep_exec@', '-e', search_string], + stdout=subprocess.PIPE, + stdin=subprocess.PIPE + ) +@@ -397,7 +397,7 @@ def git(config, commands): + else: + subprocess.call( + [ +- 'git', ++ '@git_exec@', + '--git-dir=%s' % config['password_store'].git_dir, + '--work-tree=%s' % config['password_store'].path, + ] + command_list, +diff --git a/pypass/passwordstore.py b/pypass/passwordstore.py +index 9de0376..8cf20a4 100644 +--- a/pypass/passwordstore.py ++++ b/pypass/passwordstore.py +@@ -26,18 +26,7 @@ import re + from .entry_type import EntryType + + # Find the right gpg binary +-if subprocess.call( +- ['which', 'gpg2'], +- stdout=subprocess.PIPE, +- stderr=subprocess.PIPE) == 0: +- GPG_BIN = 'gpg2' +-elif subprocess.call( +- ['which', 'gpg'], +- stdout=subprocess.PIPE, +- stderr=subprocess.PIPE) == 0: +- GPG_BIN = 'gpg' +-else: +- raise Exception("Could not find GPG") ++GPG_BIN = '@gpg_exec@' + + + class PasswordStore(object): +@@ -215,7 +204,7 @@ class PasswordStore(object): + # Init git repo + subprocess.call( + [ +- "git", ++ "@git_exec@", + "--git-dir=%s" % git_dir, + "--work-tree=%s" % git_work_tree, + "init", path +@@ -226,7 +215,7 @@ class PasswordStore(object): + # Add remote repo + subprocess.call( + [ +- "git", ++ "@git_exec@", + "--git-dir=%s" % git_dir, + "--work-tree=%s" % git_work_tree, + "remote", +@@ -241,7 +230,7 @@ class PasswordStore(object): + # TODO: add parameters for remote and branch ? + subprocess.call( + [ +- "git", ++ "@git_exec@", + "--git-dir=%s" % git_dir, + "--work-tree=%s" % git_work_tree, + "pull", +@@ -272,7 +261,7 @@ class PasswordStore(object): + + subprocess.call( + [ +- 'git', ++ '@git_exec@', + "--git-dir=%s" % self.git_dir, + "--work-tree=%s" % self.path, + 'init', +@@ -298,7 +287,7 @@ class PasswordStore(object): + + subprocess.call( + [ +- 'git', ++ '@git_exec@', + "--git-dir=%s" % self.git_dir, + "--work-tree=%s" % self.path, + 'config', +@@ -311,7 +300,7 @@ class PasswordStore(object): + + subprocess.call( + [ +- 'git', ++ '@git_exec@', + "--git-dir=%s" % self.git_dir, + "--work-tree=%s" % self.path, + 'config', +@@ -326,7 +315,7 @@ class PasswordStore(object): + + subprocess.call( + [ +- 'git', ++ '@git_exec@', + "--git-dir=%s" % self.git_dir, + "--work-tree=%s" % self.path, + 'add', +@@ -338,7 +327,7 @@ class PasswordStore(object): + if message: + subprocess.call( + [ +- 'git', ++ '@git_exec@', + "--git-dir=%s" % self.git_dir, + "--work-tree=%s" % self.path, + 'commit', +@@ -350,7 +339,7 @@ class PasswordStore(object): + else: + subprocess.call( + [ +- 'git', ++ '@git_exec@', + "--git-dir=%s" % self.git_dir, + "--work-tree=%s" % self.path, + 'commit' +diff --git a/pypass/tests/test_command.py b/pypass/tests/test_command.py +index 4966b34..960a8ed 100644 +--- a/pypass/tests/test_command.py ++++ b/pypass/tests/test_command.py +@@ -127,7 +127,7 @@ class TestCommand(unittest.TestCase): + + # Check if the password is in the clipoard + xclip = subprocess.Popen( +- ['xclip', '-o', '-selection', 'clipboard'], ++ ['@xclip_exec@', '-o', '-selection', 'clipboard'], + stdout=subprocess.PIPE) + xclip.wait() + self.assertEqual(xclip.stdout.read().decode('utf8'), 'clipme999') +@@ -301,7 +301,7 @@ class TestCommand(unittest.TestCase): + # git init should set diff.gpg.binary to True + diff_gpg_binary = subprocess.Popen( + [ +- 'git', ++ '@git_exec@', + '--git-dir=%s' % os.path.join(self.dir, '.git'), + '--work-tree=%s' % self.dir, + 'config', +@@ -317,7 +317,7 @@ class TestCommand(unittest.TestCase): + # git init should set diff.gpg.textconv to 'gpg -d' + gpg = subprocess.Popen( + [ +- 'git', ++ '@git_exec@', + '--git-dir=%s' % os.path.join(self.dir, '.git'), + '--work-tree=%s' % self.dir, + 'config', +@@ -337,7 +337,7 @@ class TestCommand(unittest.TestCase): + + subprocess.Popen( + [ +- 'git', ++ '@git_exec@', + '--git-dir=%s' % origin_git_dir, + '--work-tree=%s' % origin_dir, + 'init', +@@ -350,7 +350,7 @@ class TestCommand(unittest.TestCase): + + subprocess.call( + [ +- 'git', ++ '@git_exec@', + '--git-dir=%s' % origin_git_dir, + '--work-tree=%s' % origin_dir, + 'add', 'test_git_init_clone.gpg', +@@ -359,7 +359,7 @@ class TestCommand(unittest.TestCase): + + subprocess.call( + [ +- 'git', ++ '@git_exec@', + '--git-dir=%s' % origin_git_dir, + '--work-tree=%s' % origin_dir, + 'commit', +diff --git a/pypass/tests/test_passwordstore.py b/pypass/tests/test_passwordstore.py +index 6decc5f..ceb5181 100644 +--- a/pypass/tests/test_passwordstore.py ++++ b/pypass/tests/test_passwordstore.py +@@ -171,7 +171,7 @@ class TestPasswordStore(unittest.TestCase): + + subprocess.Popen( + [ +- 'git', ++ '@git_exec@', + '--git-dir=%s' % os.path.join(origin_dir, '.git'), + '--work-tree=%s' % origin_dir, + 'init', +@@ -184,7 +184,7 @@ class TestPasswordStore(unittest.TestCase): + + subprocess.Popen( + [ +- 'git', ++ '@git_exec@', + '--git-dir=%s' % os.path.join(origin_dir, '.git'), + '--work-tree=%s' % origin_dir, + 'add', 'test_git_init_clone.gpg', +@@ -193,7 +193,7 @@ class TestPasswordStore(unittest.TestCase): + + subprocess.Popen( + [ +- 'git', ++ '@git_exec@', + '--git-dir=%s' % os.path.join(origin_dir, '.git'), + '--work-tree=%s' % origin_dir, + 'commit', diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8eccc39b5ab..6b102363718 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5287,6 +5287,8 @@ in { pyparted = callPackage ../development/python-modules/pyparted { }; + pypass = callPackage ../development/python-modules/pypass { }; + pypblib = callPackage ../development/python-modules/pypblib { }; pypcap = callPackage ../development/python-modules/pypcap { }; From efa1a8b5c43a8d8e9602480d5da313f2cd67573a Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Wed, 4 Nov 2020 16:04:13 +0200 Subject: [PATCH 066/299] pass-secret-service: init at unstable-2020-04-12 --- .../misc/pass-secret-service/default.nix | 61 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/applications/misc/pass-secret-service/default.nix diff --git a/pkgs/applications/misc/pass-secret-service/default.nix b/pkgs/applications/misc/pass-secret-service/default.nix new file mode 100644 index 00000000000..678bc06f800 --- /dev/null +++ b/pkgs/applications/misc/pass-secret-service/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchFromGitHub, python3, dbus, gnupg }: + +python3.pkgs.buildPythonApplication rec { + pname = "pass-secret-service"; + # PyPI has old alpha version. Since then the project has switched from using a + # seemingly abandoned D-Bus package pydbus and started using maintained + # dbus-next. So let's use latest from GitHub. + version = "unstable-2020-04-12"; + + src = fetchFromGitHub { + owner = "mdellweg"; + repo = "pass_secret_service"; + rev = "f6fbca6ac3ccd16bfec407d845ed9257adf74dfa"; + sha256 = "0rm4pbx1fiwds1v7f99khhh7x3inv9yniclwd95mrbgljk3cc6a4"; + }; + + + # Need to specify session.conf file for tests because it won't be found under + # /etc/ in check phase. + postPatch = '' + substituteInPlace Makefile \ + --replace \ + "dbus-run-session" \ + "dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf" + ''; + + propagatedBuildInputs = with python3.pkgs; [ + click + cryptography + dbus-next + decorator + pypass + secretstorage + ]; + + checkInputs = + let + ps = python3.pkgs; + in + [ + dbus + gnupg + ps.pytest + ps.pytest-asyncio + ps.pypass + ]; + + checkPhase = '' + runHook preCheck + make test + runHook postCheck + ''; + + meta = { + description = "Libsecret D-Bus API with pass as the backend"; + homepage = "https://github.com/mdellweg/pass_secret_service/"; + license = stdenv.lib.licenses.gpl3Only; + platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e65aa28b25b..b33c46b6eb9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21401,6 +21401,8 @@ in musikcube = callPackage ../applications/audio/musikcube {}; + pass-secret-service = callPackage ../applications/misc/pass-secret-service { }; + pinboard = with python3Packages; toPythonApplication pinboard; pinboard-notes-backup = haskell.lib.overrideCabal From b5d27eb87c99a476460f5bec2a636848a4e7cef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 6 Nov 2020 09:56:13 +0100 Subject: [PATCH 067/299] mkl: Add a small test program The MKL pkg-config files often change and are then incorrect for our paths. pkg-config validation finds some issues, but not incorrect paths. So, add a small test program to test whether the generated pkg-config files can actually be used to build a functioning binary. Hopefully this catches future regressions. --- .../libraries/science/math/mkl/default.nix | 5 ++- .../science/math/mkl/test/default.nix | 33 +++++++++++++++++++ .../libraries/science/math/mkl/test/test.c | 12 +++++++ 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/science/math/mkl/test/default.nix create mode 100644 pkgs/development/libraries/science/math/mkl/test/test.c diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 7cbc50bc5b3..7b91940033d 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -1,4 +1,5 @@ -{ stdenvNoCC +{ callPackage +, stdenvNoCC , fetchurl , rpmextract , undmg @@ -157,6 +158,8 @@ in stdenvNoCC.mkDerivation { dontStrip = true; dontPatchELF = true; + passthru.tests.pkg-config = callPackage ./test { }; + meta = with stdenvNoCC.lib; { description = "Intel Math Kernel Library"; longDescription = '' diff --git a/pkgs/development/libraries/science/math/mkl/test/default.nix b/pkgs/development/libraries/science/math/mkl/test/default.nix new file mode 100644 index 00000000000..688c0ec7c39 --- /dev/null +++ b/pkgs/development/libraries/science/math/mkl/test/default.nix @@ -0,0 +1,33 @@ +{ stdenv, pkg-config, mkl }: + +stdenv.mkDerivation { + pname = "mkl-test"; + version = mkl.version; + + src = ./.; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ mkl ]; + + doCheck = true; + + buildPhase = '' + # Check regular Nix build. + gcc $(pkg-config --cflags --libs mkl-dynamic-ilp64-seq) test.c -o test + + # Clear flags to ensure that we are purely relying on options + # provided by pkg-config. + NIX_CFLAGS_COMPILE="" \ + NIX_LDFLAGS="" \ + gcc $(pkg-config --cflags --libs mkl-dynamic-ilp64-seq) test.c -o test + ''; + + installPhase = '' + touch $out + ''; + + checkPhase = '' + ./test + ''; +} diff --git a/pkgs/development/libraries/science/math/mkl/test/test.c b/pkgs/development/libraries/science/math/mkl/test/test.c new file mode 100644 index 00000000000..9413ac0c68e --- /dev/null +++ b/pkgs/development/libraries/science/math/mkl/test/test.c @@ -0,0 +1,12 @@ +#include + +#include + +int main() { + float u[] = {1., 2., 3.}; + float v[] = {4., 5., 6.}; + + float dp = cblas_sdot(3, u, 1, v, 1); + + assert(dp == 32.); +} From 8051411322da516ab395ba597a457f41afcb9e58 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 6 Nov 2020 13:45:12 +0100 Subject: [PATCH 068/299] cargo-make: 0.32.7 -> 0.32.8 https://github.com/sagiegurari/cargo-make/releases/tag/0.32.8 --- pkgs/development/tools/rust/cargo-make/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 4d1c851198f..4249e55247c 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -4,11 +4,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.32.7"; + version = "0.32.8"; src = fetchCrate { inherit pname version; - sha256 = "0x8alv0jdk7xl63b2m4696w2hwqnbwxfqz6f3gisljll42xp6n2z"; + sha256 = "sha256-TwutU4RjiYtxc2vT67Bgqe/WRHi5aXwgzvZu7Wk4Cao="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoSha256 = "1y2izxlc1nz3kqzrnhh9ir8j1gwvpj4cma2iqd65s9cf7xpkr6cx"; + cargoSha256 = "sha256-HzRriPVaMn6qDu6h/NQjILglO4/0//8J1orV4Uz+XEI="; # Some tests fail because they need network access. # However, Travis ensures a proper build. From f71d393b942b32ed4f0182007aca00c083754242 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 6 Nov 2020 13:46:18 +0100 Subject: [PATCH 069/299] curlie: 1.5.4 -> 1.6.0 https://github.com/rs/curlie/releases/tag/v1.6.0 Fixes integration with `curl-7.73.0` which we have on `master` since 4df8aa7b008575c1646f430ac1d78b382053ae53. --- pkgs/tools/networking/curlie/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/curlie/default.nix b/pkgs/tools/networking/curlie/default.nix index 542bb888bfe..9ae9644eb94 100644 --- a/pkgs/tools/networking/curlie/default.nix +++ b/pkgs/tools/networking/curlie/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "curlie"; - version = "1.5.4"; + version = "1.6.0"; src= fetchFromGitHub { owner = "rs"; repo = pname; rev = "v${version}"; - sha256 = "0z92gz39m0gk8j7l2nwa5vrfr3mq160vr1b15sy13jwi1zspc7hx"; + sha256 = "sha256-rrwdqaKrC37BaI9RuTTv6EiOZ3ztgd7nGuplmeW02h8="; }; - vendorSha256 = "1qnl15b9cs6xi8z368a9n34v3wr2adwp376cjzhyllni7sf6v1mm"; + vendorSha256 = "sha256-tYZtnD7RUurhl8yccXlTIvOxybBJITM+it1ollYJ1OI="; doCheck = false; From b62b76b78bfc93ae89a61636ba3615e5b651f20a Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 4 Nov 2020 18:59:02 +0100 Subject: [PATCH 070/299] php: Refactor to have the different versions as separate files This should enable easier auto updates of the packages. --- pkgs/development/interpreters/php/7.3.nix | 20 +++++++++++ pkgs/development/interpreters/php/7.4.nix | 17 ++++++++++ .../php/{default.nix => generic.nix} | 34 ++----------------- pkgs/top-level/all-packages.nix | 25 +++++++++----- 4 files changed, 56 insertions(+), 40 deletions(-) create mode 100644 pkgs/development/interpreters/php/7.3.nix create mode 100644 pkgs/development/interpreters/php/7.4.nix rename pkgs/development/interpreters/php/{default.nix => generic.nix} (90%) diff --git a/pkgs/development/interpreters/php/7.3.nix b/pkgs/development/interpreters/php/7.3.nix new file mode 100644 index 00000000000..832a8323d58 --- /dev/null +++ b/pkgs/development/interpreters/php/7.3.nix @@ -0,0 +1,20 @@ +{ callPackage, lib, stdenv, nixosTests, ... }@_args: + +let + generic = (import ./generic.nix) _args; + + base = callPackage generic (_args // { + version = "7.3.24"; + sha256 = "1655rj4w63n5fkvdj3kz9f5jfyjgvzw8a6j8zkzgic1p42xszdsm"; + + # https://bugs.php.net/bug.php?id=76826 + extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch; + }); + +in base.withExtensions ({ all, ... }: with all; ([ + bcmath calendar curl ctype dom exif fileinfo filter ftp gd + gettext gmp hash iconv intl json ldap mbstring mysqli mysqlnd + opcache openssl pcntl pdo pdo_mysql pdo_odbc pdo_pgsql pdo_sqlite + pgsql posix readline session simplexml sockets soap sodium sqlite3 + tokenizer xmlreader xmlwriter zip zlib +] ++ lib.optionals (!stdenv.isDarwin) [ imap ])) diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix new file mode 100644 index 00000000000..571c7af8fc6 --- /dev/null +++ b/pkgs/development/interpreters/php/7.4.nix @@ -0,0 +1,17 @@ +{ callPackage, lib, stdenv, nixosTests, ... }@_args: + +let + generic = (import ./generic.nix) _args; + + base = callPackage generic (_args // { + version = "7.4.12"; + sha256 = "0rwrl7xgfq2bbgmy34klgfsqa7v935074ibanmic9pwy4g676vvf"; + }); + +in base.withExtensions ({ all, ... }: with all; ([ + bcmath calendar curl ctype dom exif fileinfo filter ftp gd + gettext gmp iconv intl json ldap mbstring mysqli mysqlnd opcache + openssl pcntl pdo pdo_mysql pdo_odbc pdo_pgsql pdo_sqlite pgsql + posix readline session simplexml sockets soap sodium sqlite3 + tokenizer xmlreader xmlwriter zip zlib +] ++ lib.optionals (!stdenv.isDarwin) [ imap ])) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/generic.nix similarity index 90% rename from pkgs/development/interpreters/php/default.nix rename to pkgs/development/interpreters/php/generic.nix index efd9441e909..ef50eacc5fc 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -1,7 +1,7 @@ # We have tests for PCRE and PHP-FPM in nixos/tests/php/ or # both in the same attribute named nixosTests.php -{ callPackage, lib, stdenv, nixosTests }@_args: +{ callPackage, lib, stdenv, nixosTests, ... }: let generic = @@ -271,34 +271,4 @@ let outputsToInstall = [ "out" "dev" ]; }; }; - - php73base = callPackage generic (_args // { - version = "7.3.24"; - sha256 = "1655rj4w63n5fkvdj3kz9f5jfyjgvzw8a6j8zkzgic1p42xszdsm"; - - # https://bugs.php.net/bug.php?id=76826 - extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch; - }); - - php74base = callPackage generic (_args // { - version = "7.4.12"; - sha256 = "0rwrl7xgfq2bbgmy34klgfsqa7v935074ibanmic9pwy4g676vvf"; - }); - - defaultPhpExtensions = { all, ... }: with all; ([ - bcmath calendar curl ctype dom exif fileinfo filter ftp gd - gettext gmp iconv intl json ldap mbstring mysqli mysqlnd opcache - openssl pcntl pdo pdo_mysql pdo_odbc pdo_pgsql pdo_sqlite pgsql - posix readline session simplexml sockets soap sodium sqlite3 - tokenizer xmlreader xmlwriter zip zlib - ] ++ lib.optionals (!stdenv.isDarwin) [ imap ]); - - defaultPhpExtensionsWithHash = { all, ... }: - (defaultPhpExtensions { inherit all; }) ++ [ all.hash ]; - - php74 = php74base.withExtensions defaultPhpExtensions; - php73 = php73base.withExtensions defaultPhpExtensionsWithHash; - -in { - inherit php73 php74; -} +in generic diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb08f0ec578..c5f07d2f504 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10315,19 +10315,28 @@ in pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; - php = php74; + # PHP interpreters, packages and extensions. + # + # Set default PHP interpreter, extensions and packages + php = php74; + phpExtensions = php74Extensions; phpPackages = php74Packages; - php73Packages = recurseIntoAttrs php73.packages; + + # Import PHP74 interpreter, extensions and packages + php74 = callPackage ../development/interpreters/php/7.4.nix { + stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; + }; + php74Extensions = recurseIntoAttrs php74.extensions; php74Packages = recurseIntoAttrs php74.packages; - phpExtensions = php74Extensions; - php73Extensions = recurseIntoAttrs php73.extensions; - php74Extensions = recurseIntoAttrs php74.extensions; - - inherit (callPackage ../development/interpreters/php { + # Import PHP73 interpreter, extensions and packages + php73 = callPackage ../development/interpreters/php/7.3.nix { stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; - }) php74 php73; + }; + php73Extensions = recurseIntoAttrs php73.extensions; + php73Packages = recurseIntoAttrs php73.packages; + picoc = callPackage ../development/interpreters/picoc {}; From b06e65aad2b37485c0d48bb34e302aa0dbe8d6b4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 6 Nov 2020 13:48:52 +0100 Subject: [PATCH 071/299] vagrant: 2.2.10 -> 2.2.11 https://github.com/hashicorp/vagrant/blob/main/CHANGELOG.md#2211-november-05-2020 --- pkgs/development/tools/vagrant/default.nix | 4 +- pkgs/development/tools/vagrant/gemset.nix | 106 +++--------------- .../tools/vagrant/gemset_libvirt.nix | 73 +++++++++--- 3 files changed, 75 insertions(+), 108 deletions(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 4e2930f97a2..24f93f55eff 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -5,9 +5,9 @@ let # NOTE: bumping the version and updating the hash is insufficient; # you must use bundix to generate a new gemset.nix in the Vagrant source. - version = "2.2.10"; + version = "2.2.11"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - sha256 = "07wlj4m79m9li3za1jkk4imdhqwpca86qz3c0h706s0w8cmv4bbj"; + sha256 = "sha256-KDQDEMebqQYgsBroHmQrm/OJWTES9C9eGl0dDHTBpIc="; deps = bundlerEnv rec { name = "${pname}-${version}"; diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix index 3c22b74efed..f1b9fa11979 100644 --- a/pkgs/development/tools/vagrant/gemset.nix +++ b/pkgs/development/tools/vagrant/gemset.nix @@ -39,17 +39,6 @@ }; version = "1.1.7"; }; - domain_name = { - dependencies = ["unf"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; - type = "gem"; - }; - version = "0.5.20190701"; - }; ed25519 = { groups = ["default"]; platforms = []; @@ -70,15 +59,15 @@ }; version = "1.9.0"; }; - erubis = { + excon = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; + sha256 = "1hi89v53pm2abfv9j8lgqdd7hgkr7fr0gwrczr940iwbb3xv7rrs"; type = "gem"; }; - version = "2.7.0"; + version = "0.78.0"; }; ffi = { groups = ["default"]; @@ -122,17 +111,6 @@ }; version = "0.1.5"; }; - http-cookie = { - dependencies = ["domain_name"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; - type = "gem"; - }; - version = "1.0.3"; - }; httpclient = { groups = ["default"]; platforms = []; @@ -196,16 +174,6 @@ }; version = "2.3.0"; }; - mime = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nskys7brz2bylhxiknl0z9i19w3wb1knf0h93in6mjq70jdw5cr"; - type = "gem"; - }; - version = "0.4.4"; - }; mime-types = { dependencies = ["mime-types-data"]; groups = ["default"]; @@ -222,10 +190,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753"; + sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag"; type = "gem"; }; - version = "3.2020.0512"; + version = "3.2020.1104"; }; multi_json = { groups = ["default"]; @@ -264,20 +232,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jp3jgcn8cij407xx9ldb5h9c6jv13jc4cf6kk2idclz43ww21c9"; + sha256 = "1hlyp6z3ffwdcnzq9khrkz6waxggn4hnzsczbp3mz61lhx4qiri3"; type = "gem"; }; - version = "6.1.0"; - }; - netrc = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; - type = "gem"; - }; - version = "0.11.0"; + version = "6.2.0.rc1"; }; nori = { groups = ["default"]; @@ -321,17 +279,6 @@ }; version = "0.2.5"; }; - rest-client = { - dependencies = ["http-cookie" "mime-types" "netrc"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j"; - type = "gem"; - }; - version = "2.0.2"; - }; ruby_dep = { groups = ["default"]; platforms = []; @@ -362,37 +309,16 @@ }; version = "2.3.0"; }; - unf = { - dependencies = ["unf_ext"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; - type = "gem"; - }; - version = "0.1.4"; - }; - unf_ext = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; - type = "gem"; - }; - version = "0.0.7.7"; - }; vagrant_cloud = { - dependencies = ["rest-client"]; + dependencies = ["excon" "log4r"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16jpnq4xa7gavm024wk1rgmkfb850g89rv56f26dkh0rdhbqiqvs"; + sha256 = "0b3b9ybd6mskfz2vffb6li2y6njdc9xqhik9c4mvzq9dchxpbxlj"; type = "gem"; }; - version = "2.0.3"; + version = "3.0.2"; }; wdm = { groups = ["default"]; @@ -410,10 +336,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13c0vf32vinkp3ia86rvq779dacl37v4v2814v4g9qrk3liv0dym"; + sha256 = "0k9i86v805gpya3pyqahjykljbdwpjsrk7hsdqrl05j2rpidvk4v"; type = "gem"; }; - version = "2.3.4"; + version = "2.3.5"; }; winrm-elevated = { dependencies = ["erubi" "winrm" "winrm-fs"]; @@ -421,10 +347,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yawwrs3pnvbbm9xn0nbzvyl92kgf1jr439qfbqx0mb8zzkyi2dv"; + sha256 = "0savhyfry7ii9axcmprvbzhrz4sd9byd8wifn74bd7y78asrbpdq"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; winrm-fs = { dependencies = ["erubi" "logging" "rubyzip" "winrm"]; @@ -432,9 +358,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "093f698l9b9cx6vcqwjc9hi5hbd86ynp1g5c7g9k18y6h7fxjk43"; + sha256 = "0gb91k6s1yjqw387x4w1nkpnxblq3pjdqckayl0qvz5n3ygdsb0d"; type = "gem"; }; - version = "1.3.4"; + version = "1.3.5"; }; } \ No newline at end of file diff --git a/pkgs/development/tools/vagrant/gemset_libvirt.nix b/pkgs/development/tools/vagrant/gemset_libvirt.nix index 2631833dc00..df6b6c40496 100644 --- a/pkgs/development/tools/vagrant/gemset_libvirt.nix +++ b/pkgs/development/tools/vagrant/gemset_libvirt.nix @@ -1,24 +1,34 @@ { + builder = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + type = "gem"; + }; + version = "3.2.4"; + }; excon = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2"; + sha256 = "1hi89v53pm2abfv9j8lgqdd7hgkr7fr0gwrczr940iwbb3xv7rrs"; type = "gem"; }; - version = "0.62.0"; + version = "0.78.0"; }; fog-core = { - dependencies = ["builder" "excon" "formatador"]; + dependencies = ["builder" "excon" "formatador" "mime-types"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ac25s2wv7m6av7h7vjzd2bg3srhnn5yrz3lq1xpimhnfmp82sw6"; + sha256 = "0bwqm9n69y5y0a5iickr358z7w4hml3flqwfz8b7cnj1ldabhnjn"; type = "gem"; }; - version = "1.43.0"; + version = "2.2.3"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; @@ -37,10 +47,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gk16gsjd51x71wla7h5jqr6x5ywpwz5l8jdv76f9mr6fp1j2bkf"; + sha256 = "0by97bx0szdz47kdy0fqvx6j2kzy5yhrwbvvsfbh27dm9c0vfwgr"; type = "gem"; }; - version = "0.5.0"; + version = "0.7.0"; }; fog-xml = { dependencies = ["fog-core" "nokogiri"]; @@ -68,20 +78,51 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz"; type = "gem"; }; - version = "2.1.0"; + version = "2.3.1"; + }; + mime-types = { + dependencies = ["mime-types-data"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; + type = "gem"; + }; + version = "3.3.1"; + }; + mime-types-data = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag"; + type = "gem"; + }; + version = "3.2020.1104"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; + }; + multi_json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + type = "gem"; + }; + version = "1.15.0"; }; nokogiri = { dependencies = ["mini_portile2"]; @@ -89,10 +130,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz"; + sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; type = "gem"; }; - version = "1.8.5"; + version = "1.10.10"; }; ruby-libvirt = { groups = ["default"]; @@ -110,9 +151,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wm5yvml3sxdzpnlp4q6yhy695syy8byd1g7cxll4pmj1kwlknym"; + sha256 = "1b1m8fg1rin6ps15ykqhwz6qm7isadb83r22b733dkw2gvvj91jv"; type = "gem"; }; - version = "0.0.45"; + version = "0.2.1"; }; -} +} \ No newline at end of file From f7e691ac7e7cda4ef5b2f46e16b0d50a1ad2a4b8 Mon Sep 17 00:00:00 2001 From: Danielle Lancashire Date: Fri, 6 Nov 2020 15:01:43 +0100 Subject: [PATCH 072/299] xorg.xf86videointel: Fix build Since c2526545844bdbb8347f9d9169a77728bf2bdd73, building xf86videointel has been broken on my system due to missing libXv. This commit explicitly includes the dependency when building the package to hopefully avoid things being broken for others. --- pkgs/servers/x11/xorg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 96f40649c0f..263ae993330 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1963,7 +1963,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation { + xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC, libXv }: stdenv.mkDerivation { name = "xf86-video-intel-2.99.917"; builder = ./builder.sh; src = fetchurl { @@ -1972,7 +1972,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cairo xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC ]; + buildInputs = [ cairo xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC libXv ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; From 18c596964a2175d6bcebb30fad4e518a34698e4a Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 6 Nov 2020 13:33:43 +0100 Subject: [PATCH 073/299] =?UTF-8?q?ocamlPackages.asn1-combinators:=200.2.3?= =?UTF-8?q?=20=E2=86=92=200.2.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/asn1-combinators/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix index 556c749011f..ed314bde06f 100644 --- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -6,11 +6,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.05"; pname = "asn1-combinators"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { url = "https://github.com/mirleft/ocaml-asn1-combinators/releases/download/v${version}/asn1-combinators-v${version}.tbz"; - sha256 = "1z73hc17f5m2i4bfxw0g94fsri67f8vha812mm8klz4ggs8y7d6r"; + sha256 = "09rn5wwqhwg7x51b9ycl15s7007hgha6lwaz2bpw85fr70jq3i9r"; }; propagatedBuildInputs = [ cstruct zarith bigarray-compat stdlib-shims ptime ]; From 255f45ea20b215fd843861e9882e87446dee21bc Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 6 Nov 2020 14:02:00 +0100 Subject: [PATCH 074/299] ocamlPackages.asn1-combinators: use dune 2 --- pkgs/development/ocaml-modules/asn1-combinators/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix index ed314bde06f..ddc181a4992 100644 --- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -8,6 +8,8 @@ buildDunePackage rec { pname = "asn1-combinators"; version = "0.2.4"; + useDune2 = true; + src = fetchurl { url = "https://github.com/mirleft/ocaml-asn1-combinators/releases/download/v${version}/asn1-combinators-v${version}.tbz"; sha256 = "09rn5wwqhwg7x51b9ycl15s7007hgha6lwaz2bpw85fr70jq3i9r"; From d050e5e399618302aa51b214b90d05e941e6e329 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 1 Nov 2020 18:40:20 +0100 Subject: [PATCH 075/299] ocamlPackages.email_message: remove at 0.11.0 --- .../ocaml-modules/janestreet/default.nix | 8 ------- .../email-message-angstrom-0.14.patch | 22 ------------------- 2 files changed, 30 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/janestreet/email-message-angstrom-0.14.patch diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index 837504f9a7f..25b498bb7da 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -529,14 +529,6 @@ rec { meta.description = "Writing Emacs plugin in OCaml"; }; - email_message = janePackage { - pname = "email_message"; - hash = "131jd72k4s8cdbgg6gyg7w5v8mphdlvdx4fgvh8d9a1m7kkvbxfg"; - propagatedBuildInputs = [ async angstrom core_extended cryptokit magic-mime ounit ]; - patches = [ ./email-message-angstrom-0.14.patch ]; - meta.description = "E-mail message parser"; - }; - incremental_kernel = janePackage { version = "0.11.1"; pname = "incremental_kernel"; diff --git a/pkgs/development/ocaml-modules/janestreet/email-message-angstrom-0.14.patch b/pkgs/development/ocaml-modules/janestreet/email-message-angstrom-0.14.patch deleted file mode 100644 index 624a3e5334b..00000000000 --- a/pkgs/development/ocaml-modules/janestreet/email-message-angstrom-0.14.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/email_address/src/email_address.ml b/email_address/src/email_address.ml -index 7470273..d070465 100644 ---- a/email_address/src/email_address.ml -+++ b/email_address/src/email_address.ml -@@ -38,7 +38,7 @@ module Stable = struct - let of_string ?default_domain input_str = - let open Core_kernel in - let open! Int.Replace_polymorphic_compare in -- match Angstrom.parse_string Email_address_parser_stable_v1.email_only input_str with -+ match Angstrom.parse_string ~consume:Prefix Email_address_parser_stable_v1.email_only input_str with - | Error error -> - Or_error.error_s [%message - "Failed to parse email address" -@@ -104,7 +104,7 @@ module T = Stable.V1.With_comparator - include T - - let list_of_string ?default_domain input_str = -- match Angstrom.parse_string Email_address_parser_stable_v1.email_list_only input_str with -+ match Angstrom.parse_string ~consume:Prefix Email_address_parser_stable_v1.email_list_only input_str with - | Error error -> - Or_error.error_s [%message - "Failed to parse email address(es)" From 2e2aae2ccd124d80eabdca540476bf8383b4ddff Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 1 Nov 2020 18:40:25 +0100 Subject: [PATCH 076/299] =?UTF-8?q?ocamlPackages.cryptokit:=201.14=20?= =?UTF-8?q?=E2=86=92=201.16.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/cryptokit/default.nix | 40 ++++++------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index 69f8445e217..272ff72d8c5 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -1,43 +1,29 @@ -{ stdenv, fetchurl, zlib, ocaml, findlib, ocamlbuild, zarith, ncurses }: +{ lib, buildDunePackage, fetchurl, zlib, dune-configurator, zarith, ncurses }: -assert stdenv.lib.versionAtLeast ocaml.version "3.12"; - -let param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" - then { - version = "1.14"; - url = "https://github.com/xavierleroy/cryptokit/archive/release114.tar.gz"; - sha256 = "0wkh72idkb7dahiwyl94hhbq27cc7x9fnmxkpnbqli6wi8wd7d05"; - inherit zarith; - } else { - version = "1.10"; - url = "http://forge.ocamlcore.org/frs/download.php/1493/cryptokit-1.10.tar.gz"; - sha256 = "1k2f2ixm7jcsgrzn9lz1hm9qqgq71lk9lxy3v3cwsd8xdrj3jrnv"; - zarith = null; - }; -in - -stdenv.mkDerivation { +buildDunePackage { pname = "cryptokit"; - inherit (param) version; + version = "1.16.1"; + + useDune2 = true; src = fetchurl { - inherit (param) url sha256; + url = "https://github.com/xavierleroy/cryptokit/archive/release1161.tar.gz"; + sha256 = "0kzqkk451m69nqi5qiwak0rd0rp5vzi613gcngsiig7dyxwka61c"; }; - buildInputs = [ ocaml findlib ocamlbuild ncurses ]; - propagatedBuildInputs = [ param.zarith zlib ]; + dontConfigure = true; - buildFlags = [ "setup.data" "build" ]; + buildInputs = [ dune-configurator ncurses ]; + propagatedBuildInputs = [ zarith zlib ]; - preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs"; + doCheck = true; meta = { homepage = "http://pauillac.inria.fr/~xleroy/software.html"; description = "A library of cryptographic primitives for OCaml"; - platforms = ocaml.meta.platforms or []; + license = lib.licenses.lgpl2Only; maintainers = [ - stdenv.lib.maintainers.maggesi + lib.maintainers.maggesi ]; }; } From 44ee3ae9b13966dba1e717bb20e34cada17f5ab4 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 6 Nov 2020 13:24:35 +0100 Subject: [PATCH 077/299] =?UTF-8?q?ocamlPackages.tls:=200.12.5=20=E2=86=92?= =?UTF-8?q?=200.12.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index b52561d760e..375c2de27e0 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -6,12 +6,12 @@ buildDunePackage rec { minimumOCamlVersion = "4.08"; - version = "0.12.5"; + version = "0.12.6"; pname = "tls"; src = fetchurl { url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz"; - sha256 = "1zsh3fx8l3d9lc9w516apzabqsix2ss8nv6kbbzjmp2d4hwh818b"; + sha256 = "14b2289nhb65qm8wrw51y8qgz5ysn8hcbrj5plznd1pdzl46zxc9"; }; useDune2 = true; From cf5397d5f9819bddd441874df46c7b65b1475f94 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 6 Nov 2020 15:32:50 +0100 Subject: [PATCH 078/299] waypipe: 0.7.0 -> 0.7.1 --- pkgs/applications/networking/remote/waypipe/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/remote/waypipe/default.nix b/pkgs/applications/networking/remote/waypipe/default.nix index 0393a5bdeb8..2c91d6496a0 100644 --- a/pkgs/applications/networking/remote/waypipe/default.nix +++ b/pkgs/applications/networking/remote/waypipe/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitLab , meson, ninja, pkg-config, scdoc -, wayland, wayland-protocols, openssh +, openssh , mesa, lz4, zstd, ffmpeg, libva }: stdenv.mkDerivation rec { pname = "waypipe-unstable"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mstoeckl"; repo = "waypipe"; rev = "v${version}"; - sha256 = "0bkmibask7gfnwkn3fg3l6zaabp95n1zsdnz3dwng8j80a0kakyy"; + sha256 = "00skyxmbssfxksb8wlqdr8gajpysadirjcn230fd5gaf5msvllx7"; }; postPatch = '' @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config scdoc ]; buildInputs = [ - wayland wayland-protocols # Optional dependencies: mesa lz4 zstd ffmpeg libva ]; From c100f8851b7150982748f0e7482369fc311dbcf3 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Fri, 6 Nov 2020 15:08:11 +0000 Subject: [PATCH 079/299] skypeforlinux: 8.65.0.78 -> 8.66.0.74 --- .../networking/instant-messengers/skypeforlinux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index b7aa2d845b1..47a79c7309d 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.65.0.78"; + version = "8.66.0.74"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -65,7 +65,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "04qcpz3w2clpa23axh0xx68rm792d2l029r3wy1hfzbxd51z09lh"; + sha256 = "11bpzr3j6fa5x62xrx2q2sr1wxjrn0a37053j4prxjcvdrc5in8f"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; From d447c2413cbace4fdcbeb6a364bc08d310309c4e Mon Sep 17 00:00:00 2001 From: Justinas Stankevicius Date: Thu, 6 Aug 2020 09:56:35 +0300 Subject: [PATCH 080/299] nixos/prometheus-sql-exporter: new module --- .../monitoring/prometheus/exporters.nix | 9 ++ .../monitoring/prometheus/exporters/sql.nix | 104 ++++++++++++++++++ nixos/tests/prometheus-exporters.nix | 44 ++++++++ 3 files changed, 157 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/sql.nix diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 1233e5cdd1a..754a775605a 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -44,6 +44,7 @@ let "redis" "rspamd" "snmp" + "sql" "surfboard" "tor" "unifi" @@ -217,6 +218,14 @@ in Please specify either 'services.prometheus.exporters.mail.configuration' or 'services.prometheus.exporters.mail.configFile'. ''; + } { + assertion = cfg.sql.enable -> ( + (cfg.sql.configFile == null) != (cfg.sql.configuration == null) + ); + message = '' + Please specify either 'services.prometheus.exporters.sql.configuration' or + 'services.prometheus.exporters.sql.configFile' + ''; } ]; }] ++ [(mkIf config.services.minio.enable { services.prometheus.exporters.minio.minioAddress = mkDefault "http://localhost:9000"; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/sql.nix b/nixos/modules/services/monitoring/prometheus/exporters/sql.nix new file mode 100644 index 00000000000..d9be724ebc0 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/sql.nix @@ -0,0 +1,104 @@ +{ config, lib, pkgs, options }: +with lib; +let + cfg = config.services.prometheus.exporters.sql; + cfgOptions = { + options = with types; { + jobs = mkOption { + type = attrsOf (submodule jobOptions); + default = { }; + description = "An attrset of metrics scraping jobs to run."; + }; + }; + }; + jobOptions = { + options = with types; { + interval = mkOption { + type = str; + description = '' + How often to run this job, specified in + Go duration format. + ''; + }; + connections = mkOption { + type = listOf str; + description = "A list of connection strings of the SQL servers to scrape metrics from"; + }; + startupSql = mkOption { + type = listOf str; + default = []; + description = "A list of SQL statements to execute once after making a connection."; + }; + queries = mkOption { + type = attrsOf (submodule queryOptions); + description = "SQL queries to run."; + }; + }; + }; + queryOptions = { + options = with types; { + help = mkOption { + type = nullOr str; + default = null; + description = "A human-readable description of this metric."; + }; + labels = mkOption { + type = listOf str; + default = [ ]; + description = "A set of columns that will be used as Prometheus labels."; + }; + query = mkOption { + type = str; + description = "The SQL query to run."; + }; + values = mkOption { + type = listOf str; + description = "A set of columns that will be used as values of this metric."; + }; + }; + }; + + configFile = + if cfg.configFile != null + then cfg.configFile + else + let + nameInline = mapAttrsToList (k: v: v // { name = k; }); + renameStartupSql = j: removeAttrs (j // { startup_sql = j.startupSql; }) [ "startupSql" ]; + configuration = { + jobs = map renameStartupSql + (nameInline (mapAttrs (k: v: (v // { queries = nameInline v.queries; })) cfg.configuration.jobs)); + }; + in + builtins.toFile "config.yaml" (builtins.toJSON configuration); +in +{ + extraOpts = { + configFile = mkOption { + type = with types; nullOr path; + default = null; + description = '' + Path to configuration file. + ''; + }; + configuration = mkOption { + type = with types; nullOr (submodule cfgOptions); + default = null; + description = '' + Exporter configuration as nix attribute set. Mutually exclusive with 'configFile' option. + ''; + }; + }; + + port = 9237; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-sql-exporter}/bin/sql_exporter \ + -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + -config.file ${configFile} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index ad2fff2b01f..a7e946f5c46 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -578,6 +578,50 @@ let ''; }; + sql = { + exporterConfig = { + configuration.jobs.points = { + interval = "1m"; + connections = [ + "postgres://prometheus-sql-exporter@/data?host=/run/postgresql&sslmode=disable" + ]; + queries = { + points = { + labels = [ "name" ]; + help = "Amount of points accumulated per person"; + values = [ "amount" ]; + query = "SELECT SUM(amount) as amount, name FROM points GROUP BY name"; + }; + }; + }; + enable = true; + user = "postgres"; + }; + metricProvider = { + services.postgresql = { + enable = true; + initialScript = builtins.toFile "init.sql" '' + CREATE DATABASE data; + \c data; + CREATE TABLE points (amount INT, name TEXT); + INSERT INTO points(amount, name) VALUES (1, 'jack'); + INSERT INTO points(amount, name) VALUES (2, 'jill'); + INSERT INTO points(amount, name) VALUES (3, 'jack'); + + CREATE USER "prometheus-sql-exporter"; + GRANT ALL PRIVILEGES ON DATABASE data TO "prometheus-sql-exporter"; + GRANT SELECT ON points TO "prometheus-sql-exporter"; + ''; + }; + systemd.services.prometheus-sql-exporter.after = [ "postgresql.service" ]; + }; + exporterTest = '' + wait_for_unit("prometheus-sql-exporter.service") + wait_for_open_port(9237) + succeed("curl http://localhost:9237/metrics | grep -c 'sql_points{' | grep -q 2") + ''; + }; + surfboard = { exporterConfig = { enable = true; From 428fc4e297093eefa5a17689a3a9e9a6b8b7f154 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 6 Nov 2020 16:43:07 +0100 Subject: [PATCH 081/299] nixos/prometheus-exporters: fix `sql` test --- nixos/tests/prometheus-exporters.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index a7e946f5c46..53080403dd6 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -595,7 +595,7 @@ let }; }; enable = true; - user = "postgres"; + user = "prometheus-sql-exporter"; }; metricProvider = { services.postgresql = { From e24e104f42b5d6387827be6372fef140acc6b15a Mon Sep 17 00:00:00 2001 From: David Birks Date: Fri, 6 Nov 2020 11:18:18 -0500 Subject: [PATCH 082/299] material-shell: 8 -> 9 (#102286) --- pkgs/desktops/gnome-3/extensions/material-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/material-shell/default.nix b/pkgs/desktops/gnome-3/extensions/material-shell/default.nix index 87869f27d45..7b5156997b2 100644 --- a/pkgs/desktops/gnome-3/extensions/material-shell/default.nix +++ b/pkgs/desktops/gnome-3/extensions/material-shell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-material-shell"; - version = "8"; + version = "9"; src = fetchFromGitHub { owner = "material-shell"; repo = "material-shell"; rev = version; - sha256 = "08zc6xl2b7k7l5l6afr40ii3gnxxbysan3cqv2s9g614rbsmc62r"; + sha256 = "154ids72hkkvibqpq3522wf6h9qw7zkjnf8dgz50vxbkiiy015xn"; }; # This package has a Makefile, but it's used for building a zip for From ae614ffc30f73ae85339247c7f309ad11cdad0c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 5 Nov 2020 20:47:09 +0100 Subject: [PATCH 083/299] python3Packages.setuptools-rust: 0.11.3 -> 0.11.4 Changelog: https://github.com/PyO3/setuptools-rust/releases/tag/v0.11.4 --- .../development/python-modules/setuptools-rust/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix index a00ea9e818f..b04fa39149c 100644 --- a/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/pkgs/development/python-modules/setuptools-rust/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 , semantic-version , setuptools , setuptools_scm @@ -9,11 +10,13 @@ buildPythonPackage rec { pname = "setuptools-rust"; - version = "0.11.3"; + version = "0.11.4"; + + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1p21sw77197m7pciy8g25bwwaakq1675h0x1lis9sypzr46p2s11"; + sha256 = "9714fcb94c78e6ab1864ddac7750049e105fd4f7c52103aecf40d408e94a722f"; }; nativeBuildInputs = [ setuptools_scm ]; From e75e997253e872a89a684ef0870a274f33813620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 6 Nov 2020 07:47:11 +0100 Subject: [PATCH 084/299] python3Packages.thinc: 7.4.1 -> 7.4.2 Changelog: https://github.com/explosion/thinc/releases/tag/v7.4.1 --- pkgs/development/python-modules/thinc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 9272e25a1ba..5ac55f5f57d 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "thinc"; - version = "7.4.1"; + version = "7.4.2"; src = fetchPypi { inherit pname version; - sha256 = "17lampllwq50yjl2djs9bs5rp29xw55gqj762npqi3cvvj2glf81"; + sha256 = "772f1a27b9b31e51003d1d2a7476cc49cc81044dd87088112237f93bd2091f0b"; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ From b1178783876f51864f03f68eb89e9e93656bc57b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 6 Nov 2020 07:52:08 +0100 Subject: [PATCH 085/299] pythonPackages.blis: 0.7.1 -> 0.7.2 Changelog: https://github.com/explosion/cython-blis/releases/tag/v0.7.2 --- pkgs/development/python-modules/blis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index 5d4b9bcb5e2..1d6d7806b97 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "blis"; - version = "0.7.1"; + version = "0.7.2"; src = fetchPypi { inherit pname version; - sha256 = "014771a0f753a64ef5610c5b3d4a090b263073bdd59b8ad0d872ce1e06e7315a"; + sha256 = "c14fb9ec3f5ed7c4940c132c7691469ac5d3e302891d95e935623bf1d4e17fbb"; }; nativeBuildInputs = [ From 9bd690bb000a4acd49511147c06f077af60246d0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Nov 2020 13:41:44 +0000 Subject: [PATCH 086/299] python27Packages.flask-compress: 1.5.0 -> 1.8.0 --- pkgs/development/python-modules/flask-compress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix index cf9abdc596a..fe55705bb52 100644 --- a/pkgs/development/python-modules/flask-compress/default.nix +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -3,12 +3,12 @@ }: buildPythonPackage rec { - version = "1.5.0"; + version = "1.8.0"; pname = "Flask-Compress"; src = fetchPypi { inherit pname version; - sha256 = "f367b2b46003dd62be34f7fb1379938032656dca56377a9bc90e7188e4289a7c"; + sha256 = "c132590e7c948877a96d675c13cbfa64edec0faafa2381678dea6f36aa49a552"; }; propagatedBuildInputs = [ flask brotli ]; From c0d11ea66ccdd77228bc84959ade21d80cc87893 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Fri, 25 Sep 2020 14:47:54 -0400 Subject: [PATCH 087/299] gambit-unstable: 2020-07-29 -> 2020-09-20 --- pkgs/development/compilers/gambit/unstable.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix index 7284e5b531d..a689991a1e1 100644 --- a/pkgs/development/compilers/gambit/unstable.nix +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -1,13 +1,13 @@ { callPackage, fetchFromGitHub, gambit-support }: callPackage ./build.nix { - version = "unstable-2020-07-29"; - git-version = "4.9.3-1232-gbba388b8"; + version = "unstable-2020-09-20"; + git-version = "4.9.3-1234-g6acd87df"; src = fetchFromGitHub { owner = "feeley"; repo = "gambit"; - rev = "bba388b80ca62a77883a8936d64b03316808696a"; - sha256 = "0iqlp1mvxz8g32kqrqm0phnnp1i5c4jrapqh2wqwa8fh1vgnizg1"; + rev = "6acd87dfa95bfca33082a431e72f023345dc07ee"; + sha256 = "0a3dy4ij8hzlp3sjam4b6dp6yvyz5d7g2x784qm3gp89fi2ck56r"; }; gambit-params = gambit-support.unstable-params; } From 078d667f9e46e50c152e6fc3480b4287ec3e31f6 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Mon, 24 Aug 2020 00:04:04 -0400 Subject: [PATCH 088/299] gerbil-unstable: 2020-08-02 -> 2020-11-05 --- pkgs/development/compilers/gerbil/unstable.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix index 7b54438b5c9..d4ff3ca7a98 100644 --- a/pkgs/development/compilers/gerbil/unstable.nix +++ b/pkgs/development/compilers/gerbil/unstable.nix @@ -1,13 +1,13 @@ { callPackage, fetchFromGitHub, gambit-unstable, gambit-support }: callPackage ./build.nix rec { - version = "unstable-2020-08-02"; - git-version = "0.16-120-g3f248e13"; + version = "unstable-2020-11-05"; + git-version = "0.16-152-g808929ae"; src = fetchFromGitHub { owner = "vyzo"; repo = "gerbil"; - rev = "3f248e139dfa11be74284fc812253fbecafbaf31"; - sha256 = "18v192cypj0nbmfcyflm8qnwp27qwy65m0a19ggs47wwbzhgvgqh"; + rev = "808929aeb8823959191f35df53bc0c0150911b4b"; + sha256 = "0d9k2gkrs9qvlnk7xa3gjzs3gln3ydds7yd2313pvbw4q2lcz8iw"; }; inherit gambit-support; gambit = gambit-unstable; From 8ff03048f93297392a82d37310a854062b843e7e Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Fri, 25 Sep 2020 21:19:24 -0400 Subject: [PATCH 089/299] gerbilPackages-unstable.smug-gerbil: init at 2019-12-24 --- .../compilers/gerbil/gerbil-support.nix | 10 ++++--- .../compilers/gerbil/smug-gerbil.nix | 30 +++++++++++++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/compilers/gerbil/smug-gerbil.nix diff --git a/pkgs/development/compilers/gerbil/gerbil-support.nix b/pkgs/development/compilers/gerbil/gerbil-support.nix index e3f4bb0e0d2..37f5c00efdb 100644 --- a/pkgs/development/compilers/gerbil/gerbil-support.nix +++ b/pkgs/development/compilers/gerbil/gerbil-support.nix @@ -1,4 +1,4 @@ -{ pkgs, gccStdenv, callPackage, fetchFromGitHub }: +{ pkgs, lib, gccStdenv, callPackage, fetchFromGitHub }: # See ../gambit/build.nix regarding gccStdenv rec { @@ -9,6 +9,7 @@ rec { gerbil-poo = callPackage ./gerbil-poo.nix { }; gerbil-persist = callPackage ./gerbil-persist.nix { }; gerbil-ethereum = callPackage ./gerbil-ethereum.nix { }; + smug-gerbil = callPackage ./smug-gerbil.nix { }; }; # Use this function in any package that uses Gerbil libraries, to define the GERBIL_LOADPATH. @@ -23,6 +24,7 @@ rec { gambit-params ? pkgs.gambit-support.stable-params, gerbilInputs ? [], buildInputs ? [], + buildScript ? "./build.ss", softwareName ? ""} : let buildInputs_ = buildInputs; in gccStdenv.mkDerivation rec { @@ -33,8 +35,8 @@ rec { set -e ; if [ -n "${version-path}.ss" ] ; then echo -e '(import :clan/versioning${builtins.concatStringsSep "" - (map (x : if x.passthru.version-path != "" - then " :${x.passthru.gerbil-package}/${x.passthru.version-path}" else "") + (map (x : lib.optionalString (x.passthru.version-path != "") + " :${x.passthru.gerbil-package}/${x.passthru.version-path}") gerbilInputs) })\n(register-software "${softwareName}" "v${git-version}")\n' > "${passthru.version-path}.ss" fi @@ -50,7 +52,7 @@ rec { buildPhase = '' runHook preBuild - ./build.ss + ${buildScript} runHook postBuild ''; diff --git a/pkgs/development/compilers/gerbil/smug-gerbil.nix b/pkgs/development/compilers/gerbil/smug-gerbil.nix new file mode 100644 index 00000000000..732cdb500b9 --- /dev/null +++ b/pkgs/development/compilers/gerbil/smug-gerbil.nix @@ -0,0 +1,30 @@ +{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: + +gerbil-support.gerbilPackage { + pname = "smug-gerbil"; + version = "unstable-2019-12-24"; + git-version = "95d60d4"; + gerbil-package = "drewc/smug"; + gerbil = gerbil-unstable; + gerbilInputs = []; + buildInputs = []; + gambit-params = gambit-support.unstable-params; + version-path = ""; #"version"; + softwareName = "Smug-Gerbil"; + src = fetchFromGitHub { + owner = "drewc"; + repo = "smug-gerbil"; + rev = "95d60d486c1603743c6d3c525e6d5f5761b984e5"; + sha256 = "0ys07z78gq60z833si2j7xa1scqvbljlx1zb32vdf32f1b27c04j"; + }; + meta = { + description = "Super Monadic Über Go-into : Parsers and Gerbil Scheme"; + homepage = "https://github.com/drewc/smug-gerbil"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ fare ]; + }; + buildScript = '' + for i in primitive simple tokens smug ; do gxc -O $i.ss ; done + ''; +} From 520e10f6a50c59e2cc05f3233bf98bbbca140541 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Mon, 24 Aug 2020 00:05:00 -0400 Subject: [PATCH 090/299] gerbilPackages-unstable.gerbil-utils: 2020-08-02 -> 2020-10-18 --- pkgs/development/compilers/gerbil/gerbil-utils.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/gerbil/gerbil-utils.nix b/pkgs/development/compilers/gerbil/gerbil-utils.nix index 7e1a9bf0557..6d89e1181f2 100644 --- a/pkgs/development/compilers/gerbil/gerbil-utils.nix +++ b/pkgs/development/compilers/gerbil/gerbil-utils.nix @@ -2,8 +2,8 @@ gerbil-support.gerbilPackage { pname = "gerbil-utils"; - version = "unstable-2020-08-02"; - git-version = "0.2-21-g7e7d053"; + version = "unstable-2020-10-18"; + git-version = "0.2-36-g8b481b7"; gerbil-package = "clan"; gerbil = gerbil-unstable; gambit-params = gambit-support.unstable-params; @@ -12,8 +12,8 @@ gerbil-support.gerbilPackage { src = fetchFromGitHub { owner = "fare"; repo = "gerbil-utils"; - rev = "7e7d053ec5e78cc58d38cb03baf554d83b31b0c6"; - sha256 = "078vqdcddfavqq0d9pw430iz1562cgx1ck3fw6dpwxjkyc6m4bms"; + rev = "8b481b787e13e07e14d0718d670aab016131a090"; + sha256 = "0br8k5b2wcv4wcp65r2bfhji3af2qgqjspf41syqslq9awx47f3m"; }; meta = { description = "Gerbil Clan: Community curated Collection of Common Utilities"; From 78bf0aca7071400ceeaf5170541c11aa88cfbacc Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Mon, 24 Aug 2020 00:05:50 -0400 Subject: [PATCH 091/299] gerbilPackages-unstable.gerbil-poo: 2020-08-02 -> 2020-10-17 --- pkgs/development/compilers/gerbil/gerbil-poo.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/gerbil/gerbil-poo.nix b/pkgs/development/compilers/gerbil/gerbil-poo.nix index 55673368eea..c6580ea0c77 100644 --- a/pkgs/development/compilers/gerbil/gerbil-poo.nix +++ b/pkgs/development/compilers/gerbil/gerbil-poo.nix @@ -2,8 +2,8 @@ gerbil-support.gerbilPackage { pname = "gerbil-ethereum"; - version = "unstable-2020-08-02"; - git-version = "0.0-13-g1014154"; + version = "unstable-2020-10-17"; + git-version = "0.0-35-g44d490d"; gerbil-package = "clan/poo"; gerbil = gerbil-unstable; gerbilInputs = with gerbil-support.gerbilPackages-unstable; [gerbil-utils gerbil-crypto]; @@ -14,8 +14,8 @@ gerbil-support.gerbilPackage { src = fetchFromGitHub { owner = "fare"; repo = "gerbil-poo"; - rev = "1014154fe4943dfbec7524666c831b601ba88559"; - sha256 = "0g8l5mi007n07qs79m9h3h3am1p7h0kzq7yb49h562b8frh5gp97"; + rev = "44d490d95b9d1b5d54eaedf2602419af8e086837"; + sha256 = "082ndpy281saybcnp3bdidcibkk2ih6glrkbb5fdj1524ban4d0k"; }; meta = { description = "Gerbil POO: Prototype Object Orientation for Gerbil Scheme"; From 58bddc26d4a2daa63e56f4c51080025040e53ecf Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Mon, 24 Aug 2020 00:06:22 -0400 Subject: [PATCH 092/299] gerbilPackages-unstable.gerbil-persist: 2020-08-02 -> 2020-08-31 --- pkgs/development/compilers/gerbil/gerbil-persist.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/gerbil/gerbil-persist.nix b/pkgs/development/compilers/gerbil/gerbil-persist.nix index 1be6684bf44..74485c19c2d 100644 --- a/pkgs/development/compilers/gerbil/gerbil-persist.nix +++ b/pkgs/development/compilers/gerbil/gerbil-persist.nix @@ -2,8 +2,8 @@ gerbil-support.gerbilPackage { pname = "gerbil-persist"; - version = "unstable-2020-08-02"; - git-version = "0.0-4-ga3b2bd1"; + version = "unstable-2020-08-31"; + git-version = "0.0-8-gd211390"; gerbil-package = "clan/persist"; gerbil = gerbil-unstable; gerbilInputs = with gerbil-support.gerbilPackages-unstable; [gerbil-utils gerbil-crypto gerbil-poo]; @@ -14,8 +14,8 @@ gerbil-support.gerbilPackage { src = fetchFromGitHub { owner = "fare"; repo = "gerbil-persist"; - rev = "a3b2bd104612db0e4492737f09f72adea6684483"; - sha256 = "0mc01wva26ww1i7n8naa95mfw7i6lj8qg0bwsik7gb3dsj2acjvh"; + rev = "d211390c8a199cf2b8c7400cd98977524e960015"; + sha256 = "13s6ws8ziwalfp23nalss41qnz667z2712lr3y123sypm5n5axk7"; }; meta = { description = "Gerbil Persist: Persistent data and activities"; From 65a90770955a27f5a5b73649526bb0e1770183d1 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Mon, 24 Aug 2020 00:06:38 -0400 Subject: [PATCH 093/299] gerbilPackages-unstable.gerbil-ethereum: 2020-08-02 -> 2020-10-18 --- pkgs/development/compilers/gerbil/gerbil-ethereum.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/gerbil/gerbil-ethereum.nix b/pkgs/development/compilers/gerbil/gerbil-ethereum.nix index 9b90cc053e1..e498818d2e6 100644 --- a/pkgs/development/compilers/gerbil/gerbil-ethereum.nix +++ b/pkgs/development/compilers/gerbil/gerbil-ethereum.nix @@ -2,8 +2,8 @@ gerbil-support.gerbilPackage { pname = "gerbil-ethereum"; - version = "unstable-2020-08-02"; - git-version = "0.0-15-g7cd2dd7"; + version = "unstable-2020-10-18"; + git-version = "0.0-26-gf27ada8"; gerbil-package = "mukn/ethereum"; gerbil = gerbil-unstable; gerbilInputs = with gerbil-support.gerbilPackages-unstable; @@ -15,8 +15,8 @@ gerbil-support.gerbilPackage { src = fetchFromGitHub { owner = "fare"; repo = "gerbil-ethereum"; - rev = "7cd2dd7436b11917d0729dbafe087cfa8ec38f86"; - sha256 = "0qq3ch2dg735yrj3l2c9pb9qlvz98x3vjfi2xyr4fwr78smpqgb5"; + rev = "f27ada8e7f4de4f8fbdfede9fe055914b254d8e7"; + sha256 = "1lykjqim6a44whj1r8kkpiz68wghkfqx5vjlrc2ldxlmgd4r9gvd"; }; meta = { description = "Gerbil Ethereum: a Scheme alternative to web3.js"; From 0febc5788322885bf5dcb092044f3d5cd29385bf Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Wed, 21 Oct 2020 00:08:26 -0400 Subject: [PATCH 094/299] gambit: support targets, modules --- pkgs/development/compilers/gambit/build.nix | 2 ++ pkgs/development/compilers/gambit/gambit-support.nix | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix index c6a48bd744e..a4b884147db 100644 --- a/pkgs/development/compilers/gambit/build.nix +++ b/pkgs/development/compilers/gambit/build.nix @@ -35,6 +35,7 @@ gccStdenv.mkDerivation rec { #runtimeDeps = [ gnused gnugrep ]; configureFlags = [ + "--enable-targets=${gambit-params.targets}" "--enable-single-host" "--enable-c-opt=${optimizationSetting}" "--enable-gcc-opts" @@ -94,6 +95,7 @@ gccStdenv.mkDerivation rec { # Now use the bootstrap compiler to build the real thing! make -j$NIX_BUILD_CORES from-scratch + ${lib.optionalString gambit-params.modules "make -j$NIX_BUILD_CORES modules"} ''; postInstall = '' diff --git a/pkgs/development/compilers/gambit/gambit-support.nix b/pkgs/development/compilers/gambit/gambit-support.nix index 0e78831f2e4..be745367ec0 100644 --- a/pkgs/development/compilers/gambit/gambit-support.nix +++ b/pkgs/development/compilers/gambit/gambit-support.nix @@ -2,12 +2,16 @@ rec { stable-params = { + stable = true; defaultRuntimeOptions = "f8,-8,t8"; buildRuntimeOptions = "f8,-8,t8"; fix-stamp = git-version : ""; + targets = "java,js,php,python,ruby"; + modules = false; }; unstable-params = { + stable = false; defaultRuntimeOptions = "iL,fL,-L,tL"; buildRuntimeOptions = "i8,f8,-8,t8"; fix-stamp = git-version : '' @@ -15,6 +19,8 @@ rec { --replace "$(grep '^PACKAGE_VERSION=.*$' configure)" 'PACKAGE_VERSION="v${git-version}"' \ --replace "$(grep '^PACKAGE_STRING=.*$' configure)" 'PACKAGE_STRING="Gambit v${git-version}"' ; ''; + targets = "arm,java,js,php,python,riscv-32,riscv-64,ruby,x86,x86-64"; # eats 100% cpu on _digest + modules = false; }; export-gambopt = params : "export GAMBOPT=${params.buildRuntimeOptions} ;"; From 3d33e4f7995fb666fc594016a67ada374b1fdf36 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Wed, 28 Oct 2020 01:13:46 -0400 Subject: [PATCH 095/299] gerbilPackages-unstable.gerbil-libp2p: init at 2018-12-27 --- .../compilers/gerbil/gerbil-libp2p.nix | 27 +++++++++++++++++++ .../compilers/gerbil/gerbil-support.nix | 1 + 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/compilers/gerbil/gerbil-libp2p.nix diff --git a/pkgs/development/compilers/gerbil/gerbil-libp2p.nix b/pkgs/development/compilers/gerbil/gerbil-libp2p.nix new file mode 100644 index 00000000000..336f5af89c3 --- /dev/null +++ b/pkgs/development/compilers/gerbil/gerbil-libp2p.nix @@ -0,0 +1,27 @@ +{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: + +gerbil-support.gerbilPackage { + pname = "gerbil-libp2p"; + version = "unstable-2018-12-27"; + git-version = "2376b3f"; + gerbil-package = "vyzo"; + gerbil = gerbil-unstable; + gerbilInputs = []; + buildInputs = []; # Note: at *runtime*, depends on go-libp2p-daemon + gambit-params = gambit-support.unstable-params; + version-path = "version"; + softwareName = "Gerbil-libp2p"; + src = fetchFromGitHub { + owner = "vyzo"; + repo = "gerbil-libp2p"; + rev = "2376b3f39cee04dd4ec455c8ea4e5faa93c2bf88"; + sha256 = "0jcy7hfg953078msigyfwp2g4ii44pi6q7vcpmq01cbbvxpxz6zw"; + }; + meta = { + description = "Gerbil libp2p: use libp2p from Gerbil"; + homepage = "https://github.com/vyzo/gerbil-libp2p"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ fare ]; + }; +} diff --git a/pkgs/development/compilers/gerbil/gerbil-support.nix b/pkgs/development/compilers/gerbil/gerbil-support.nix index 37f5c00efdb..9cb9954544c 100644 --- a/pkgs/development/compilers/gerbil/gerbil-support.nix +++ b/pkgs/development/compilers/gerbil/gerbil-support.nix @@ -4,6 +4,7 @@ rec { # Gerbil libraries gerbilPackages-unstable = { + gerbil-libp2p = callPackage ./gerbil-libp2p.nix { }; gerbil-utils = callPackage ./gerbil-utils.nix { }; gerbil-crypto = callPackage ./gerbil-crypto.nix { }; gerbil-poo = callPackage ./gerbil-poo.nix { }; From 9bf2cf0a73293d448f5c96d97cc0a80e6d5d414e Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Sat, 31 Oct 2020 21:21:55 -0400 Subject: [PATCH 096/299] go-libp2p-daemon: init at 0.3.0 --- pkgs/servers/go-libp2p-daemon/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/servers/go-libp2p-daemon/default.nix diff --git a/pkgs/servers/go-libp2p-daemon/default.nix b/pkgs/servers/go-libp2p-daemon/default.nix new file mode 100644 index 00000000000..995cfe2d26d --- /dev/null +++ b/pkgs/servers/go-libp2p-daemon/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule { + pname = "go-libp2p-daemon"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "libp2p"; + repo = "go-libp2p-daemon"; + rev = "bfa207ed34c27947f0828a4ae8d10bda62aa49a9"; + sha256 = "1f3gjkmpqngajjpijpjdmkmsjfm9bdgakb5r28fnc6w9dmfyj51x"; + }; + + vendorSha256 = "0g25r7wd1hvnwxxq18mpx1r1wig6dnlnvzkpvgw79q6nymxlppmv"; + + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/libp2p/go-libp2p-daemon"; + license = licenses.mit; + maintainers = with maintainers; [ fare ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9379d6a618..3bdee66d7d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20726,6 +20726,8 @@ in exercism = callPackage ../applications/misc/exercism { }; + go-libp2p-daemon = callPackage ../servers/go-libp2p-daemon { }; + go-motion = callPackage ../development/tools/go-motion { }; gpg-mdp = callPackage ../applications/misc/gpg-mdp { }; From d8d1dc10714d373cde81b2fafc868500980f548c Mon Sep 17 00:00:00 2001 From: upkeep-bot Date: Fri, 6 Nov 2020 12:11:43 +0000 Subject: [PATCH 097/299] vscodium: 1.50.1 -> 1.51.0 --- pkgs/applications/editors/vscode/vscodium.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 650e88a260b..6cfcb491afe 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1sarih1yah69ympp12bmgyb0y9ybrxasppb47l58w05iz1wpn6v0"; - x86_64-darwin = "1pj041kccj2i77v223i86xxqj9bg88k0sfbshm7qiynwyj9p05ji"; + x86_64-linux = "0qims8qypx6aackw1b47pb7hkf0lffh94c69bm5rld2swzczcfnj"; + x86_64-darwin = "1i96qhynjl1ihycq25xjakqlyvszindg5g8kgyhd6ab0q0zhmxqy"; }.${system}; sourceRoot = { @@ -27,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.50.1"; + version = "1.51.0"; pname = "vscodium"; executableName = "codium"; From b936e6f3b3070c98ba2e76a4a961b5b406fce405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Thu, 5 Nov 2020 14:38:19 -0600 Subject: [PATCH 098/299] ldc: 1.20.1 -> 1.24.0 --- pkgs/development/compilers/ldc/default.nix | 5 ++--- pkgs/development/compilers/ldc/generic.nix | 8 ++------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index 5a4baabcf8d..e0a689c7fa0 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -1,5 +1,4 @@ import ./generic.nix { - version = "1.20.1"; - ldcSha256 = "1bqsgab22v02pc3c9gcyf15y7aimadv24d68icaw5lpgnvzxy89b"; + version = "1.24.0"; + ldcSha256 = "0g5svf55i0kq55q49awmwqj9qi1n907cyrn1vjdjgs8nx6nn35gx"; } - diff --git a/pkgs/development/compilers/ldc/generic.nix b/pkgs/development/compilers/ldc/generic.nix index c93d423945c..214d64cfa76 100644 --- a/pkgs/development/compilers/ldc/generic.nix +++ b/pkgs/development/compilers/ldc/generic.nix @@ -1,5 +1,5 @@ { version, ldcSha256 }: -{ stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata +{ stdenv, fetchurl, cmake, ninja, llvm_11, curl, tzdata , libconfig, lit, gdb, unzip, darwin, bash , callPackage, makeWrapper, runCommand, targetPackages , ldcBootstrap ? callPackage ./bootstrap.nix { } @@ -56,16 +56,12 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - cmake ninja makeWrapper unzip ldcBootstrap lit lit.python + cmake ldcBootstrap lit lit.python llvm_11 makeWrapper ninja unzip ] ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation - # https://github.com/NixOS/nixpkgs/issues/57120 - # https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515 - llvm_5 ] ++ stdenv.lib.optionals (!stdenv.hostPlatform.isDarwin) [ - llvm_8 # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 gdb ]; From 55fc82d6d2bec1cc625b28dcc32ca35f2b87e743 Mon Sep 17 00:00:00 2001 From: upkeep-bot Date: Fri, 6 Nov 2020 12:12:35 +0000 Subject: [PATCH 099/299] vscode: 1.50.1 -> 1.51.0 --- pkgs/applications/editors/vscode/vscode.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 528a0496d91..ce6122bddc4 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0mpb4641icr3z89y2rlh5anli40p1f48sl5xagr7h3nb5c84k10x"; - x86_64-darwin = "1azmc79zf72007qc1xndp9wdkd078mvqgv35hf231q7kdi6wzxcp"; + x86_64-linux = "18fx2nsgn09l2gzgr1abi0cp4g8z2v9177sdl2rqr0yvmwk5i3p0"; + x86_64-darwin = "14qdfz8q1dz0skkcgpamksgdvgsid2mcm9h09cvkh4z3v458100r"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +21,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.50.1"; + version = "1.51.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From e4747121dfdec22630514fa192db65d9b0f63db2 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Thu, 5 Nov 2020 21:23:00 -0800 Subject: [PATCH 100/299] python3Packages.poetry: 1.1.1 -> 1.1.4 --- pkgs/development/python-modules/poetry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 8000c667e6d..bad38ea582f 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "poetry"; - version = "1.1.1"; + version = "1.1.4"; format = "pyproject"; disabled = isPy27; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "1j3ij8qsd709p7ww5r4759f2xnk2s7g40kzm9vx99l98zw890g05"; + sha256 = "0lx3qpz5dad0is7ki5a4vxphvc8cm8fnv4bmrx226a6nvvaj6ahs"; }; postPatch = '' From 37c564ae5089dbdfd23e92ee63ca0d8b84405097 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 5 Nov 2020 17:21:34 -0800 Subject: [PATCH 101/299] python3Packages.dotnetcore2: remove Outdated, and new package isn't trivial to package anymore. Not really useful outside of Azure Machine Learning anyway. --- .../python-modules/dotnetcore2/default.nix | 59 ------------------- .../python-modules/dotnetcore2/runtime.patch | 22 ------- pkgs/top-level/python-packages.nix | 2 - 3 files changed, 83 deletions(-) delete mode 100644 pkgs/development/python-modules/dotnetcore2/default.nix delete mode 100644 pkgs/development/python-modules/dotnetcore2/runtime.patch diff --git a/pkgs/development/python-modules/dotnetcore2/default.nix b/pkgs/development/python-modules/dotnetcore2/default.nix deleted file mode 100644 index 7cc069707aa..00000000000 --- a/pkgs/development/python-modules/dotnetcore2/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, python, isPy27 -, dotnet-sdk -, substituteAll -, distro -, unzip -}: - -buildPythonPackage rec { - pname = "dotnetcore2"; - version = "2.1.14"; - format = "wheel"; - disabled = isPy27; - - src = fetchPypi { - inherit pname version format; - python = "py3"; - platform = "manylinux1_x86_64"; - sha256 = "0dxp9a73ncjylc09bjwq81fgj5ysk1yi27l8ka5f98121k1kmn6q"; - }; - - nativeBuildInputs = [ unzip ]; - - propagatedBuildInputs = [ distro ]; - - # needed to apply patches - prePatch = '' - unzip dist/dotnet* - ''; - - patches = [ - ( substituteAll { - src = ./runtime.patch; - dotnet = dotnet-sdk; - } - ) - ]; - - # remove bin, which has a broken dotnetcore installation - installPhase = '' - rm -rf dotnetcore2/bin - mkdir -p $out/${python.sitePackages}/ - cp -r dotnetcore2 $out/${python.sitePackages}/ - ''; - - # no tests, ensure it's one useful function works - checkPhase = '' - rm -r dotnetcore2 # avoid importing local directory - export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH - ${python.interpreter} -c 'from dotnetcore2 import runtime; print(runtime.get_runtime_path()); runtime.ensure_dependencies()' - ''; - - meta = with lib; { - description = "DotNet Core runtime"; - homepage = "https://github.com/dotnet/core"; - license = licenses.mit; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ jonringer ]; - }; -} diff --git a/pkgs/development/python-modules/dotnetcore2/runtime.patch b/pkgs/development/python-modules/dotnetcore2/runtime.patch deleted file mode 100644 index 28cf10e21d1..00000000000 --- a/pkgs/development/python-modules/dotnetcore2/runtime.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/dotnetcore2/runtime.py b/dotnetcore2/runtime.py -index 475e2b4..5b578ec 100644 ---- a/dotnetcore2/runtime.py -+++ b/dotnetcore2/runtime.py -@@ -41,6 +41,7 @@ def _get_bin_folder() -> str: - - - def get_runtime_path(): -+ return "@dotnet@/dotnet" - search_string = os.path.join(_get_bin_folder(), 'dotnet*') - matches = [f for f in glob.glob(search_string, recursive=True)] - return matches[0] -@@ -96,8 +97,7 @@ class _FileLock(): - - - def ensure_dependencies() -> Optional[str]: -- if dist is None: -- return None -+ return None - - bin_folder = _get_bin_folder() - deps_path = os.path.join(bin_folder, 'deps') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e52d78f0f3c..2609284bf61 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1811,8 +1811,6 @@ in { dot2tex = callPackage ../development/python-modules/dot2tex { inherit (pkgs) graphviz; }; - dotnetcore2 = callPackage ../development/python-modules/dotnetcore2 { inherit (pkgs) substituteAll dotnet-sdk; }; - dparse = callPackage ../development/python-modules/dparse { }; dpath = callPackage ../development/python-modules/dpath { }; From 52b180ad540884619b2cde7176f924e261a9d513 Mon Sep 17 00:00:00 2001 From: Andrew Fontaine Date: Thu, 5 Nov 2020 19:04:07 -0500 Subject: [PATCH 102/299] plexamp: 3.2.0 -> 3.3.1 Release notes: https://forums.plex.tv/t/plexamp-release-notes/221280/20 --- pkgs/applications/audio/plexamp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 27738245231..2c33584e362 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,13 +2,13 @@ let pname = "plexamp"; - version = "3.2.0"; + version = "3.3.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; - sha256 = "R1BhobnwoU7oJ7bNes8kH2neXqHlMPbRCNjcHyzUPqo="; name="${pname}-${version}.AppImage"; + sha256 = "6/asP8VR+rJ52lKKds46gSw1or9suUEmyR75pjdWHIQ="; }; appimageContents = appimageTools.extractType2 { From 40bd50cbbb1fd71e0ff639779d4e5f523038a688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Fri, 6 Nov 2020 05:02:09 +0100 Subject: [PATCH 103/299] megasync: 4.3.1.0 -> 4.3.5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolves #102634 Signed-off-by: Michal Minář --- pkgs/applications/misc/megasync/default.nix | 36 +++++++++++++++++---- 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index d5da4c7d773..3b25d7e606a 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -1,17 +1,40 @@ -{ stdenv, autoconf, automake, c-ares, cryptopp, curl, doxygen, fetchFromGitHub -, fetchpatch, ffmpeg_3, libmediainfo, libraw, libsodium, libtool, libuv, libzen -, lsb-release, mkDerivation, pkgconfig, qtbase, qttools, sqlite, swig, unzip -, wget }: +{ stdenv +, autoconf +, automake +, c-ares +, cryptopp +, curl +, doxygen +, fetchFromGitHub +, fetchpatch +, ffmpeg_3 +, libmediainfo +, libraw +, libsodium +, libtool +, libuv +, libzen +, lsb-release +, mkDerivation +, pkgconfig +, qtbase +, qttools +, qtx11extras +, sqlite +, swig +, unzip +, wget +}: mkDerivation rec { pname = "megasync"; - version = "4.3.1.0"; + version = "4.3.5.0"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAsync"; rev = "v${version}_Linux"; - sha256 = "0b68wpif8a0wf1vfn1nr19dmz8f31dprb27jpldxrxhyfslc43yj"; + sha256 = "0rr1jjy0n5bj1lh6xi3nbbcikvq69j3r9qnajp4mhywr5izpccvs"; fetchSubmodules = true; }; @@ -29,6 +52,7 @@ mkDerivation rec { libuv libzen qtbase + qtx11extras sqlite unzip wget From bf8f06748a016b95e43661d9afd65c24efedc940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Fri, 6 Nov 2020 05:40:50 +0100 Subject: [PATCH 104/299] megasync: bumped qt to 5.15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Minář --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9379d6a618..b20511f88d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2345,7 +2345,7 @@ in medusa = callPackage ../tools/security/medusa { }; - megasync = libsForQt514.callPackage ../applications/misc/megasync { }; + megasync = libsForQt515.callPackage ../applications/misc/megasync { }; megacmd = callPackage ../applications/misc/megacmd { }; From 7ac7ce8b1ab5020639c4a3d53f85e8b1dcc36ac7 Mon Sep 17 00:00:00 2001 From: oxalica Date: Tue, 3 Nov 2020 22:31:16 +0800 Subject: [PATCH 105/299] rust-analyzer: 2020-10-19 -> 2020-11-02 --- .../node-packages/node-packages.nix | 2272 +++++++---------- .../tools/rust/rust-analyzer/default.nix | 6 +- .../tools/rust/rust-analyzer/generic.nix | 5 - .../rust/rust-analyzer/no-track_env_var.patch | 120 - .../rust-analyzer/build-deps/package.json | 2 +- 5 files changed, 914 insertions(+), 1491 deletions(-) delete mode 100644 pkgs/development/tools/rust/rust-analyzer/no-track_env_var.patch diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index dc154881054..0d35f0fbd5f 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -31,15 +31,6 @@ let sha512 = "twM8V03ujBIGVpgV1PBlSDodUdxtUb7WakutfWafAvEHUsgwzfvQz2VtKWvjNZ9AiYjnCuwkQaclqVv0VHNo9w=="; }; }; - "@angular-devkit/core-10.0.7" = { - name = "_at_angular-devkit_slash_core"; - packageName = "@angular-devkit/core"; - version = "10.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.7.tgz"; - sha512 = "pXaZgsQ8LHpRx4QGAUYDE8GwBQLAtoqPh6oUCwRJwBExm5rl13OGPTBWewHiq0ysV/SnFXvOjxwAaHQvC1AgZw=="; - }; - }; "@angular-devkit/core-10.2.0" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; @@ -49,15 +40,6 @@ let sha512 = "XAszFhSF3mZw1VjoOsYGbArr5NJLcStjOvcCGjBPl1UBM2AKpuCQXHxI9XJGYKL3B93Vp5G58d8qkHvamT53OA=="; }; }; - "@angular-devkit/schematics-10.0.7" = { - name = "_at_angular-devkit_slash_schematics"; - packageName = "@angular-devkit/schematics"; - version = "10.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.0.7.tgz"; - sha512 = "eyyYPgpjtr3h7WbnNbkDubJ/p+8TgKU6abWd+NmBfTvyeHrpVFUYZabNRcdXwUDSVzfTQKdmLynIkESj/KROrg=="; - }; - }; "@angular-devkit/schematics-10.2.0" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; @@ -67,13 +49,13 @@ let sha512 = "TQI5NnE6iM3ChF5gZQ9qb+lZgMWa7aLoF5ksOyT3zrmOuICiQYJhA6SsjV95q7J4M55qYymwBib8KTqU/xuQww=="; }; }; - "@angular-devkit/schematics-cli-0.1000.7" = { + "@angular-devkit/schematics-cli-0.1002.0" = { name = "_at_angular-devkit_slash_schematics-cli"; packageName = "@angular-devkit/schematics-cli"; - version = "0.1000.7"; + version = "0.1002.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-0.1000.7.tgz"; - sha512 = "5zXO0WfyRySZudv2/EEC/UVfG75y7TGrdMfVZNc1WP0SB54psA0U3Z3jT+6Y9VjdjmXdxjVfybhuOzZ4I1fs0Q=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-0.1002.0.tgz"; + sha512 = "wV5YPdcolPAXo5oyMu9vM3fm3grb3ZT9amrTMC9oc3OWQUVFySPCIzvguHf8bVGMQ/AHfel2TaYxIQv/LurBrQ=="; }; }; "@antora/asciidoc-loader-2.3.4" = { @@ -184,13 +166,13 @@ let sha512 = "eorTmZW7zc6ZHgGLt3Vrq7mzPuobPeJnyfli50/m/DIQ91slkqjPKUYGcq4paPEz6IWoa7LT2ZwtwA5KzMyTPg=="; }; }; - "@apollo/federation-0.20.2" = { + "@apollo/federation-0.20.4" = { name = "_at_apollo_slash_federation"; packageName = "@apollo/federation"; - version = "0.20.2"; + version = "0.20.4"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.20.2.tgz"; - sha512 = "SrwUK0dZdlHLDkv/8K/Q5OK1AE/RypNkLmxhBndlOKAb2e5li6dZy6FJGNbErgHBAJQSx2Xp1gCF5CZONbFxpw=="; + url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.20.4.tgz"; + sha512 = "A/2BtgSytrrA2nSuCrKIlXYemfMEzCosIOD4vUjK7Y1LvNuPCBxt6mdZ+hjKrfpY4IXhZdgbtHjI5/Q2Pkqsmg=="; }; }; "@apollo/protobufjs-1.0.5" = { @@ -328,13 +310,13 @@ let sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; }; }; - "@babel/generator-7.11.6" = { + "@babel/generator-7.12.1" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.11.6"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz"; - sha512 = "DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz"; + sha512 = "DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg=="; }; }; "@babel/generator-7.12.5" = { @@ -1372,13 +1354,13 @@ let sha512 = "UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg=="; }; }; - "@babel/types-7.12.5" = { + "@babel/types-7.12.6" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.12.5"; + version = "7.12.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.12.5.tgz"; - sha512 = "gyTcvz7JFa4V45C0Zklv//GmFOAal5fL23OWpBLqc4nZ4Yrz67s4kCNwSK1Gu0MXGTU8mRY3zJYtacLdKXlzig=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz"; + sha512 = "hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA=="; }; }; "@bugsnag/browser-7.5.1" = { @@ -1741,13 +1723,13 @@ let sha512 = "fQRc4+RG+rEw1IdjFx/5t2AvOlJT8ktv2dfObD3aW838ohZxCx1QvFUY/Gdx5JA1JY/KrHRGuEqQLH9ayiexyg=="; }; }; - "@expo/config-3.3.13" = { + "@expo/config-3.3.14" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "3.3.13"; + version = "3.3.14"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-3.3.13.tgz"; - sha512 = "ZFkMQxtk6Zobfc+BPy60rAAuiXFd5ybV7QFF3A7tTy7e6T0/YmuiSMyTM6fqs2c0O47F8/1eoaefXWUl7ppz3w=="; + url = "https://registry.npmjs.org/@expo/config/-/config-3.3.14.tgz"; + sha512 = "nYnnNJRr3UZlBsUk4esbeYS2AfR3EFw4x9bVZQbbWKgDapFj26QIjGYeolZrO0yFhllSC/TU+2YNIyt6sQwRpw=="; }; }; "@expo/config-types-40.0.0-beta.1" = { @@ -1768,22 +1750,22 @@ let sha512 = "6n7ji1WKDCdLe2Mto4u4W72kTLhAbhXhC7ydVk1HxDYCcbewNLfgiwhchPtPGyUMnSDizVWph5aDoiKxqVHqNQ=="; }; }; - "@expo/dev-server-0.1.38" = { + "@expo/dev-server-0.1.39" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.38"; + version = "0.1.39"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.38.tgz"; - sha512 = "LOLqo/SpjVfYuSEOicKgCnUzIvbV0oYvXTS9Rr/LBxw3Q/Smy8p8FbYZ/7RTbSnFbCW1oZWERJ+Qe1ghWKbAEw=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.39.tgz"; + sha512 = "PTNrPQ7z3yYLijePiqOKTtjTtzpn9HECE0LQKFcf/IVHxxVe/ScRWJAu6xndL51sXWJgE3PXg8r47UMLHb7Y2w=="; }; }; - "@expo/dev-tools-0.13.57" = { + "@expo/dev-tools-0.13.58" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.57"; + version = "0.13.58"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.57.tgz"; - sha512 = "eRP49UYFVytfK7cHA6notnfmCiWvcQ2FOFJABeti2zUa3O55IDP0b/NDqdyLRDpuTxsRZl/K0MBLD5NAUsHMHQ=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.58.tgz"; + sha512 = "CdlCPWEzvA69ZucdeCYFoM0fEBVufcSwOOs2xcEJo2cVHGJkCUFhEwASXHdPOGt773DF1ISF4mKQAUsLtmA7qw=="; }; }; "@expo/eas-build-job-0.1.2" = { @@ -1813,13 +1795,13 @@ let sha512 = "i34lfcMVt5Wv2Cf5apZUj3o9JlFt8WOPSZjrECryunBQ9/BsQQYY5NHgGjhhZnnRE+6JFf0CPQTjXdoQ1w3w0w=="; }; }; - "@expo/metro-config-0.1.38" = { + "@expo/metro-config-0.1.39" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.1.38"; + version = "0.1.39"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.38.tgz"; - sha512 = "t7BW8cgmm7nmxiY20g1ZMKvXFyDr5Kq+9Ppnskvhg+QffXcY3db/kYSOR0QswscqF5/jBPVGjox7m4+SBKHCDg=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.39.tgz"; + sha512 = "oCeBGyLPmo65HeUPKEBMiZCbh2RfEbH8AO7Apwitn1zs8LZf9DvVtpEh7mlYRJlmKCrxaM4NjuFZMcquh72aiQ=="; }; }; "@expo/ngrok-2.4.3" = { @@ -2020,22 +2002,22 @@ let sha512 = "YaFAYYOOxImYNx9s6X3tY6fC1y6rka0KXstrs2zrS+vHyyBD8IOhNtIUvybHScM3jUL+qukgKElAb+7gzlF6Eg=="; }; }; - "@expo/webpack-config-0.12.42" = { + "@expo/webpack-config-0.12.43" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.12.42"; + version = "0.12.43"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.42.tgz"; - sha512 = "VqQIzFiQQQLMQISdmIqBgJHeGD9LO8eP9sI5puW6y8oEB7Cd8asU+DOC3xJVS1MrqK2usQhW5EJhi2wV7RVG8g=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.43.tgz"; + sha512 = "2XNqppNrngC4WrJJRnKpST6Xzez6GbUxB+SwhKVef8qf4Uw2vE50p0zpGTcIzs+aAIaKW3cFSIRQnhxkVrGXww=="; }; }; - "@expo/xdl-58.0.18" = { + "@expo/xdl-58.0.19" = { name = "_at_expo_slash_xdl"; packageName = "@expo/xdl"; - version = "58.0.18"; + version = "58.0.19"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/xdl/-/xdl-58.0.18.tgz"; - sha512 = "CwwLtdEIj857iXwhc10V+gjuepOQ0S21wWM0oKny0TzGSmCz8uVvTCnKK+Geem5hsqyKkCsayirUKTeZ2ToMqA=="; + url = "https://registry.npmjs.org/@expo/xdl/-/xdl-58.0.19.tgz"; + sha512 = "+YWCOSJi6CoBLSgktJfy8/ijQGK3WbPUmujndcxY/WPmCe+Wek6kajmxclMMuDVAjg4RFXdH/fuLwOb/abOU5g=="; }; }; "@fluentui/date-time-utilities-7.9.0" = { @@ -2065,22 +2047,22 @@ let sha512 = "t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ=="; }; }; - "@fluentui/react-7.149.3" = { + "@fluentui/react-7.149.4" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.149.3"; + version = "7.149.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.149.3.tgz"; - sha512 = "CmeTmPcqEy+lHCKsxg2Y0QnvU1dfyh8F/3Bkt48yo+B6/eCEUUCQW+Xl3ktp3tvlijdLaskKV68L9lNh3RZP4Q=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.149.4.tgz"; + sha512 = "yZqU5EFYDlXZQfFLIm085/A/nYW9SL/YccPT6E+r51vwn4NlfRSQ6K0IFD5cGnMPOhA+mwyT79uFgxb3/I281A=="; }; }; - "@fluentui/react-focus-7.16.16" = { + "@fluentui/react-focus-7.16.17" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "7.16.16"; + version = "7.16.17"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.16.tgz"; - sha512 = "1YtdaoFUwQWiVfBnhIcMxb0U6ZH3uyk9asfjluW9d6GsUTWczY+PNKZWukIQT1dtpr4+LcOw+F5oSTnzux/Mpg=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.17.tgz"; + sha512 = "Uioe+9tZoiXxp5aKam6Y+PyU46UDGMCF4xYctgP3tIpPyi7xfka7Aat6IyIFcTxN53UKea2IcCMzbOhpK0VTLg=="; }; }; "@fluentui/react-window-provider-1.0.1" = { @@ -2092,13 +2074,13 @@ let sha512 = "5hvruDyF0uE8+6YN6Y+d2sEzexBadxUNxUjDcDreTPsmtHPwF5FPBYLhoD7T84L5U4YNvKxKh25tYJm6E0GE2w=="; }; }; - "@fluentui/theme-1.5.4" = { + "@fluentui/theme-1.6.0" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "1.5.4"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.5.4.tgz"; - sha512 = "f89jKHET6/f4Z+BzKzs1YXA3mAsBBIDSOtc5ZXfNwYcKPJ0ZqKYtplRz668LcvHdz1ysMR0XxtA0Y5eNUXyLxw=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.6.0.tgz"; + sha512 = "X+uJx7+9ChfM0SAq+eDLgL9t65ZA8NAc1Ifrw4eek6cS3c1eY95/tgf1EkX+hOE9+oIuEATujM9THzk+4yd1VQ=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -2128,13 +2110,13 @@ let sha512 = "+ywPfK6N2Ddna6oOa5Qb1Mv7EA8LOwRNOAPP9dL37FEhksJM9pYqPSceUcqMqg7S9b0+Cgr78s408rgvurV3/Q=="; }; }; - "@graphql-tools/delegate-7.0.3" = { + "@graphql-tools/delegate-7.0.4" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "7.0.3"; + version = "7.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.3.tgz"; - sha512 = "BSRF/Wg9XNllWo3Kdt0QBBaFltexn3vAnTOWH1qLrNcmfQAvUMf17/TsAqH9ZLSKU1NW9XCOsd7YMHhhUuTCEg=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.4.tgz"; + sha512 = "6/qL9V31FgECNPwc5As1359hpsAt4ASWsiYBSYWL+Iq9/K0YRcNeEmSseXIyCP4oh8k/9HS/w/m2lkMk/YSUpQ=="; }; }; "@graphql-tools/graphql-file-loader-6.2.5" = { @@ -3343,13 +3325,13 @@ let sha512 = "/NdX1Ql8hKNM0vHFJnEr/bcw6BG0ULHD3HhInpniZw5ixpl+n/QIRfMEEmLCn7acedbM1zGdZvU5ZMbn9kcF5Q=="; }; }; - "@microsoft/load-themed-styles-1.10.125" = { + "@microsoft/load-themed-styles-1.10.126" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.125"; + version = "1.10.126"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.125.tgz"; - sha512 = "qig3jfhrlwvK0tDQc3mrEbg6hUt432FDK4y3zJH9upT068Qrk40s6J62Kv7YW+lIMfX5h/tTi5Y/RyvqwcM+Nw=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.126.tgz"; + sha512 = "6GoapdGJPmWq6WChTaImAZ6UjuPb2FWHeP/pTEHw6Dz+d4/4TnyWcVR9uDLx+8n6xn3ZpU6OtW0FEGzNNa+TUw=="; }; }; "@mozilla/readability-0.3.0" = { @@ -3478,40 +3460,40 @@ let sha512 = "Ovgkw9b7HSLsdhTBA+LNq3KY83gU9DP0xHbwDlg07zLpY3RtRN2IBy11w+nRPjQwfNT33OmuTvayH6amJDku5Q=="; }; }; - "@netlify/traffic-mesh-agent-0.24.0-pre.23" = { + "@netlify/traffic-mesh-agent-0.24.0" = { name = "_at_netlify_slash_traffic-mesh-agent"; packageName = "@netlify/traffic-mesh-agent"; - version = "0.24.0-pre.23"; + version = "0.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent/-/traffic-mesh-agent-0.24.0-pre.23.tgz"; - sha512 = "uv5F3grah5C0CPGm8raASIyVDi+lYBR4os+wG0GXkUVCU2r2Pcl8MStLeN3phe1G3AjVkco5WcAKC8XfBvvqEw=="; + url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent/-/traffic-mesh-agent-0.24.0.tgz"; + sha512 = "m3nfdolp8+jwy7sBKz6iuw1MRRZR27onrUtQz3Iwor7CE0+rIWJm+aPc5AFYUlISDM5zTCXgVGDeiPHJv5cOQQ=="; }; }; - "@netlify/traffic-mesh-agent-darwin-x64-0.24.0-pre.23" = { + "@netlify/traffic-mesh-agent-darwin-x64-0.24.0" = { name = "_at_netlify_slash_traffic-mesh-agent-darwin-x64"; packageName = "@netlify/traffic-mesh-agent-darwin-x64"; - version = "0.24.0-pre.23"; + version = "0.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-darwin-x64/-/traffic-mesh-agent-darwin-x64-0.24.0-pre.23.tgz"; - sha512 = "XDn77F+tx+qQZ9sMwqmwRAOEm56syA7xO1rScDY4JV8oSyvwa6sfUWnFXefyxUt1uLNfIQhiKDnA4sOyCRJxDw=="; + url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-darwin-x64/-/traffic-mesh-agent-darwin-x64-0.24.0.tgz"; + sha512 = "aFh/04aTRNI7BAyUbpXvH6AZ+XcJMxwroQWfMYjyVm7F+T4bg0XRcteoVjX/U2NhxkNhCXMqBgrHFsVNZLlJ7w=="; }; }; - "@netlify/traffic-mesh-agent-linux-x64-0.24.0-pre.23" = { + "@netlify/traffic-mesh-agent-linux-x64-0.24.0" = { name = "_at_netlify_slash_traffic-mesh-agent-linux-x64"; packageName = "@netlify/traffic-mesh-agent-linux-x64"; - version = "0.24.0-pre.23"; + version = "0.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-linux-x64/-/traffic-mesh-agent-linux-x64-0.24.0-pre.23.tgz"; - sha512 = "9D2sFOcO72IBsqiHgU1Z5tQ6+lvjRBUeOc0iFKgcUPG5eJ46pgrOAD8B8tNd2FscNz2lyrJxZc1kGAOjYikzUQ=="; + url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-linux-x64/-/traffic-mesh-agent-linux-x64-0.24.0.tgz"; + sha512 = "cUHUpajpK3WrE78F29fEuOKuRG+mkXoPoe2SL9wO+sCrAw18A9px/tfWWFwC9iJLSr/WLHYAAOJhdm02ypa65A=="; }; }; - "@netlify/traffic-mesh-agent-win32-x64-0.24.0-pre.23" = { + "@netlify/traffic-mesh-agent-win32-x64-0.24.0" = { name = "_at_netlify_slash_traffic-mesh-agent-win32-x64"; packageName = "@netlify/traffic-mesh-agent-win32-x64"; - version = "0.24.0-pre.23"; + version = "0.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-win32-x64/-/traffic-mesh-agent-win32-x64-0.24.0-pre.23.tgz"; - sha512 = "kFImydqG6Er+kgG5UFjIWBp7TxFcf/eOoXSOWr6a+3kJu2iwZP2IdflyNK9EsKdW/KA+W43PXleF4VQwLm830w=="; + url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-win32-x64/-/traffic-mesh-agent-win32-x64-0.24.0.tgz"; + sha512 = "9K4QA5VcJK9Wrx9BTKSaeOaX9es7lfS97iJMB1micSFuLIK5o/DS9oxaa4tMjzIy0Ck/Pa717XX9TGx9MpCexA=="; }; }; "@netlify/zip-it-and-ship-it-1.4.0" = { @@ -3523,58 +3505,58 @@ let sha512 = "xPJDEMkHnIoHk19enEbg4qiIwszXS8XOUi8UpD4YMA81GXGT0xi16Z17kOACipDG6Tmmy5Jl6pe3cKqQvM/WyQ=="; }; }; - "@node-red/editor-api-1.2.2" = { + "@node-red/editor-api-1.2.3" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.2.tgz"; - sha512 = "5bKIH2lPYiYMYLQIpBplwu4tkuFk4JI24sCOyYsPTkT1EB2zx4qxQndwc+crKjBCMbMvHdh2D3zw9mc1Av9B7g=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.3.tgz"; + sha512 = "7xw02VV69E08jx4cnLkVaOaX+XrQNPlFCRSobAQyj6KKGizMbclWKbsIF6gWSnWEHJdQR/kbAuaK0Qm/F19YuA=="; }; }; - "@node-red/editor-client-1.2.2" = { + "@node-red/editor-client-1.2.3" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.2.tgz"; - sha512 = "bkNPwzTFhe1AYVydmgqHNfhUsdHfJx261PGLOS9ZJYf9Ww2jVDKXGxHz25qd4lgeRqnUcT7b6T2bOzqVs1zMWA=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.3.tgz"; + sha512 = "nYmt4B2GwZOAQIAeHDj6dj85aJ2KnyXdX4nHqRkpBO3UMqfaZuG2WuhDful/TOUEhgTOXWLzXVPQwzFt3q9fRA=="; }; }; - "@node-red/nodes-1.2.2" = { + "@node-red/nodes-1.2.3" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.2.tgz"; - sha512 = "cbHfjdV5QGEQtwYpqZh7ylUnI3zbXmfvcIoGRMXVyhHTgok00ltAgJtJ3PGHSSOsd/OWshPKO2OPoM0xenepTw=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.3.tgz"; + sha512 = "HHWRtbronw4OaFGlF58CYSCFHTVzvfzT+mWmqTucP7iD14658hDHUAVPC8eFmP6E2tbo+Vy3+Rdu80djcaRyUQ=="; }; }; - "@node-red/registry-1.2.2" = { + "@node-red/registry-1.2.3" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.2.tgz"; - sha512 = "HTpv/5OmptMkXYzlGfwQZl8lb+e5ta72z0nexNgbox5nc1Cg65CaFvhwcjC9UVK7ROblwDlVnutBG03eZvyOoA=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.3.tgz"; + sha512 = "wGJ1KK1+NycM+Sbmib6FIL4/OwWxB0sx4IHLI5tYdGYLaf7MYSKTcNxpLvUwjsE2k0ngeiqW43oPhyFrK01Ihw=="; }; }; - "@node-red/runtime-1.2.2" = { + "@node-red/runtime-1.2.3" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.2.tgz"; - sha512 = "a4dGwF4BgAYAFyKGGyeLjashn1hstl1i7g2nwGFfnI2hJvF05fzj2lGy8dWE6wYq6c2FZQv4OetAwBfN1akxsg=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.3.tgz"; + sha512 = "qFEJ8Xgg5lgtlYPW/Zfi2r8HBMzTzwP+ws7f9So28fG76SGcXk8MfNnx2GTSGRnp+a9Mn1/SRlunNQqw9bQ/LA=="; }; }; - "@node-red/util-1.2.2" = { + "@node-red/util-1.2.3" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.2.tgz"; - sha512 = "7rj3qb/puqcNaHIz12wtLjuJ1pHWsZzPZ+vEubs116SxAas6OVYYLuBGEPhHWeE3zg3t6Erv7wYNaDZeyUm/CQ=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.3.tgz"; + sha512 = "myAbQ35tk/oIJJfwUehpQbobFcAkeLxRKmRE5FOda8S79RHJh3OJVdISSm2lgUh0QlwFl4D8fZvu+2wZ5GoB0Q=="; }; }; "@nodelib/fs.scandir-2.1.3" = { @@ -3685,6 +3667,15 @@ let sha512 = "M9o+DOrb8l603qvgz1FogJBUGLqcMFL1aFg2ZEL0FbXJofiNTLOWIeB4faeZTLwE6dt0xH9GpCVpzksMMzGbmA=="; }; }; + "@oclif/command-1.6.1" = { + name = "_at_oclif_slash_command"; + packageName = "@oclif/command"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/command/-/command-1.6.1.tgz"; + sha512 = "pvmMmfGn+zm4e4RwVw63mg9sIaqKqmVsFbImQoUrCO/43UmWzoSHWNXKdgEGigOezWrkZfFucaeZcSbp149OWg=="; + }; + }; "@oclif/command-1.8.0" = { name = "_at_oclif_slash_command"; packageName = "@oclif/command"; @@ -3694,6 +3685,15 @@ let sha512 = "5vwpq6kbvwkQwKqAoOU3L72GZ3Ta8RRrewKj9OJRolx28KLJJ8Dg9Rf7obRwt5jQA9bkYd8gqzMTrI7H3xLfaw=="; }; }; + "@oclif/config-1.15.1" = { + name = "_at_oclif_slash_config"; + packageName = "@oclif/config"; + version = "1.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/config/-/config-1.15.1.tgz"; + sha512 = "GdyHpEZuWlfU8GSaZoiywtfVBsPcfYn1KuSLT1JTfvZGpPG6vShcGr24YZ3HG2jXUFlIuAqDcYlTzOrqOdTPNQ=="; + }; + }; "@oclif/config-1.17.0" = { name = "_at_oclif_slash_config"; packageName = "@oclif/config"; @@ -3703,6 +3703,15 @@ let sha512 = "Lmfuf6ubjQ4ifC/9bz1fSCHc6F6E653oyaRXxg+lgT4+bYf9bk+nqrUpAbrXyABkCqgIBiFr3J4zR/kiFdE1PA=="; }; }; + "@oclif/errors-1.2.2" = { + name = "_at_oclif_slash_errors"; + packageName = "@oclif/errors"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/errors/-/errors-1.2.2.tgz"; + sha512 = "Eq8BFuJUQcbAPVofDxwdE0bL14inIiwt5EaKRVY9ZDIG11jwdXZqiQEECJx0VfnLyUZdYfRd/znDI/MytdJoKg=="; + }; + }; "@oclif/errors-1.3.3" = { name = "_at_oclif_slash_errors"; packageName = "@oclif/errors"; @@ -4621,13 +4630,13 @@ let sha512 = "rJRTTTL8CMMFb3ebCvAVHKHxuNzRqy/HtbXhJ82l5Xo/jXcm74eV2Q0RBUrNo1yBKWFIR+FIwiXLJaGcC/R9Pw=="; }; }; - "@schematics/schematics-0.1000.7" = { + "@schematics/schematics-0.1002.0" = { name = "_at_schematics_slash_schematics"; packageName = "@schematics/schematics"; - version = "0.1000.7"; + version = "0.1002.0"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/schematics/-/schematics-0.1000.7.tgz"; - sha512 = "mucBf5EkhME9O0TvxPeiUTEuudRvEOSjhF/YFHEp/9NZB1JH9lXtBQ60IN6xtCLEbxJmAzhZSns9QPPrHaZRrw=="; + url = "https://registry.npmjs.org/@schematics/schematics/-/schematics-0.1002.0.tgz"; + sha512 = "A6z0j+GCgj3NPAJ3+OZPgU/8KYLHcVWN+ZELuQTFXZgN6mpgbxCmM3yymfo7+riaF0xx1mXlt8G+tO7xDsLVvQ=="; }; }; "@schematics/update-0.1002.0" = { @@ -4684,13 +4693,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-4.1.1" = { + "@serverless/enterprise-plugin-4.1.2" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.1.1.tgz"; - sha512 = "ga9g/bRyA6LCckYPU8jvx63Q9+Po/yZxbdbYb2KiCZ+0S1YcQQsjDJwsOTAAgQ6AEp95TtrQkn3BycYTSGEm7A=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.1.2.tgz"; + sha512 = "aAHF9ElWr0eaAEVXy6M9DvokiyVV/y5xokiBnAhQisMT2faTVlCX1B8D1nJef0NdJ6pXJVOd3JrXC4rIxjz0zg=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -4711,13 +4720,13 @@ let sha512 = "zTJBhzjWtDBogLFnzoz6NYiQ6CThsxuvHQxSbBLcNK4+VQPIkrZOxaQ+dNCNLeLN1Tb3NnZDPNGkoThvgGwq3Q=="; }; }; - "@serverless/platform-client-china-2.0.7" = { + "@serverless/platform-client-china-2.0.8" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "2.0.7"; + version = "2.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.0.7.tgz"; - sha512 = "SuHCHqwCjZXODdSlgetXFGksz+ksAWy3kbCpFhAC9nkiFSWR01CLX4a6UW+VhOeb6j6F3wbkczzqi38P17+USg=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.0.8.tgz"; + sha512 = "20sceKHkGP56HnwMgrdHwD963bxew63+hE2aNrcu1DtLuUqcRvP5evaWO/CwMDTajJJDhEwi3wQDxPpxtKlJ7A=="; }; }; "@serverless/platform-sdk-2.3.2" = { @@ -4954,13 +4963,13 @@ let sha512 = "uWKtjh29I/d0mfmfBN7w6RwwNBQxQVKrauF5ND/gqb0PVsKV22GIpkI+viWjI7KNKso6/B0tMmsv7TX2tsNcLQ=="; }; }; - "@sorg/log-2.2.0" = { + "@sorg/log-2.2.1" = { name = "_at_sorg_slash_log"; packageName = "@sorg/log"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sorg/log/-/log-2.2.0.tgz"; - sha512 = "w5aH2k4caUWxO3dzJ0+GUJJGSqsg0gT6myhypQumlJXsKzYqzsZGZRWA2s/0zQIx6+B2wDvdweVogiWMAAbaKw=="; + url = "https://registry.npmjs.org/@sorg/log/-/log-2.2.1.tgz"; + sha512 = "GGtgReHuH7M+FS0pGy6tb3QPNVipjUl5+RWvG8yMP3Hb+Lq0AqsFYgBUz+FVECQ9J3otvsAzgOfz+8BIqRUr0Q=="; }; }; "@starptech/expression-parser-0.10.0" = { @@ -5089,13 +5098,13 @@ let sha512 = "PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ=="; }; }; - "@tencent-sdk/capi-1.1.5" = { + "@tencent-sdk/capi-1.1.6" = { name = "_at_tencent-sdk_slash_capi"; packageName = "@tencent-sdk/capi"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@tencent-sdk/capi/-/capi-1.1.5.tgz"; - sha512 = "cHkoMY/1L5VxeiKv51uKxbFK8lZ7pZbY3CukzOHro8YKT6dETKYzTGO/F8jDhH7r8vKWxuA+ZcALzxYuVlmwsg=="; + url = "https://registry.npmjs.org/@tencent-sdk/capi/-/capi-1.1.6.tgz"; + sha512 = "3Ietq/r8B/CQu94qXr4YrNE79p5emhtMI6szHh/cD9xz1/6OOUwW/agcCO1748v94jjxOFEspAvva6jGVriuGA=="; }; }; "@textlint/ast-node-types-4.3.4" = { @@ -5854,13 +5863,13 @@ let sha512 = "EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA=="; }; }; - "@types/lodash-4.14.164" = { + "@types/lodash-4.14.165" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.164"; + version = "4.14.165"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.164.tgz"; - sha512 = "fXCEmONnrtbYUc5014avwBeMdhHHO8YJCkOBflUL9EoJBSKZ1dei+VO74fA7JkTHZ1GvZack2TyIw5U+1lT8jg=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.165.tgz"; + sha512 = "tjSSOTHhI5mCHTy/OOXYIhi2Wt1qcbHmuXD1Ha7q70CgI/I71afO4XtLb/cVexki1oVYchpul/TOuu3Arcdxrg=="; }; }; "@types/long-4.0.1" = { @@ -6340,22 +6349,13 @@ let sha512 = "GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw=="; }; }; - "@types/vscode-1.50.0" = { + "@types/vscode-1.51.0" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.50.0"; + version = "1.51.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.50.0.tgz"; - sha512 = "QnIeyi4L2DiD9M2bAQKRzT/EQvc80qP9UL6JD5TiLlNRL1khIDg4ej4mDSRbtFrDAsRntFI1RhMvdomUThMsqg=="; - }; - }; - "@types/webpack-4.41.21" = { - name = "_at_types_slash_webpack"; - packageName = "@types/webpack"; - version = "4.41.21"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.21.tgz"; - sha512 = "2j9WVnNrr/8PLAB5csW44xzQSJwS26aOnICsP3pSGCEdsu6KYtfQ6QJsVUKHWRnm1bL7HziJsfh5fHqth87yKA=="; + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.51.0.tgz"; + sha512 = "C/jZ35OT5k/rsJyAK8mS1kM++vMcm89oSWegkzxRCvHllIq0cToZAkIDs6eCY4SKrvik3nrhELizyLcM0onbQA=="; }; }; "@types/webpack-4.41.24" = { @@ -6511,22 +6511,22 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@uifabric/foundation-7.9.18" = { + "@uifabric/foundation-7.9.19" = { name = "_at_uifabric_slash_foundation"; packageName = "@uifabric/foundation"; - version = "7.9.18"; + version = "7.9.19"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.18.tgz"; - sha512 = "xDDuKAyYNEppKF7lFqolUTQoIYbv70f2teLudsh0yeRDVoISNT4A87nDc/Xa4bkTwttc9Di+D1HEZWP9Wqpj1w=="; + url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.19.tgz"; + sha512 = "F/kKiFL4uSiosnqdv1BT3aQ3w9bQ3l+F3NiMqDbJpnlBAOMOlH2X7xAxZsNYbS66pgTPKsSP/8/SK3A+0wzMXg=="; }; }; - "@uifabric/icons-7.5.15" = { + "@uifabric/icons-7.5.16" = { name = "_at_uifabric_slash_icons"; packageName = "@uifabric/icons"; - version = "7.5.15"; + version = "7.5.16"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.15.tgz"; - sha512 = "jNrPY7lsEs7gPUXokIYFxZs4TuX5Xiivx/KtxtoZKM4cpurLJx3ddCyOMp+kNn1ljzaNKNbcJae/ONB/jMJkQA=="; + url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.16.tgz"; + sha512 = "S+KGDZeN9y5sBJfg7Jgi3/598CxE0hvlMtl1XzzftKPdD2Jw8QCQazgYFqG8iZj6R5ILFjezoDr+yXYj6dMXMQ=="; }; }; "@uifabric/merge-styles-7.19.1" = { @@ -6556,13 +6556,13 @@ let sha512 = "9E+YKtnH2kyMKnK9XZZsqyM8OCxEJIIfxtaThTlQpYOzrWAGJxQADFbZ7+Usi0U2xHnWNPFROjq+B9ocEzhqMA=="; }; }; - "@uifabric/styling-7.16.16" = { + "@uifabric/styling-7.16.17" = { name = "_at_uifabric_slash_styling"; packageName = "@uifabric/styling"; - version = "7.16.16"; + version = "7.16.17"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.16.tgz"; - sha512 = "FFRXMjRPCagj+fN1o8O/FsbO7jHqVKEJyKT5j+zCwl0yBx5XqbQLcX9wzAEdBItB4anlgO7C5ZtFBUholwcCiA=="; + url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.17.tgz"; + sha512 = "9TZP5npZopaQUkb7V418bu2OzqjL+4uov9n59Kh/Ll2Bq9WyWg/kngGUMX793gxjOMy9w2IUEd2LN3odM05OlQ=="; }; }; "@uifabric/utilities-7.33.2" = { @@ -7159,22 +7159,22 @@ let sha512 = "tDV8V15wm7mmbAH6XvQRU1X+oPGmeOzYsd6h7hlRLz6QpV4Ec/KKxM8OpLtFmQPLCreGxTp+HuxtH4pRIZyL9w=="; }; }; - "@webpack-cli/info-1.0.2" = { + "@webpack-cli/info-1.1.0" = { name = "_at_webpack-cli_slash_info"; packageName = "@webpack-cli/info"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.0.2.tgz"; - sha512 = "FEfLQwmN4pXZSYSrtp+KC84rFanoCIxXFpS2wUvviDCE2fnajwxw2GXzbj83IlH4Dl8Wq8kJjavVwvxv3YJmnw=="; + url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.1.0.tgz"; + sha512 = "uNWSdaYHc+f3LdIZNwhdhkjjLDDl3jP2+XBqAq9H8DjrJUvlOKdP8TNruy1yEaDfgpAIgbSAN7pye4FEHg9tYQ=="; }; }; - "@webpack-cli/serve-1.0.1" = { + "@webpack-cli/serve-1.1.0" = { name = "_at_webpack-cli_slash_serve"; packageName = "@webpack-cli/serve"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.0.1.tgz"; - sha512 = "WGMaTMTK6NOe29Hw1WBEok9vGLfKg5C6jWzNOS/6HH1YadR+RL+TRWRcSyc81Dzulljhk/Ree9mrDM4Np9GGOQ=="; + url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.1.0.tgz"; + sha512 = "7RfnMXCpJ/NThrhq4gYQYILB18xWyoQcBey81oIyVbmgbc6m5ZHHyFK+DyH7pLHJf0p14MxL4mTsoPAgBSTpIg=="; }; }; "@wry/context-0.4.4" = { @@ -7807,15 +7807,6 @@ let sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; }; }; - "ajv-6.12.3" = { - name = "ajv"; - packageName = "ajv"; - version = "6.12.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz"; - sha512 = "4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA=="; - }; - }; "ajv-6.12.4" = { name = "ajv"; packageName = "ajv"; @@ -8347,13 +8338,13 @@ let sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw=="; }; }; - "apollo-2.31.0" = { + "apollo-2.31.1" = { name = "apollo"; packageName = "apollo"; - version = "2.31.0"; + version = "2.31.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo/-/apollo-2.31.0.tgz"; - sha512 = "galQp/6UAiP+Aa2WtJZPIPPAiQqR6Um/fe0cOC8wu3c1BmXF2fHzjj2NSOv7xqAHZPyBRn/ixIe0aVUy3gcCLw=="; + url = "https://registry.npmjs.org/apollo/-/apollo-2.31.1.tgz"; + sha512 = "qx64LGc09GSwpEIUbRJX90zq6ixVsgo6ZPGuCsDTY83Lz5ITMeXIs7+CF/1oAU1IzEI+YRMVsFTkK2aIBZzSYA=="; }; }; "apollo-cache-1.3.5" = { @@ -8392,49 +8383,49 @@ let sha512 = "jiPlMTN6/5CjZpJOkGeUV0mb4zxx33uXWdj/xQCfAMkuNAC3HN7CvYDyMHHEzmcQ5GV12LszWoQ/VlxET24CtA=="; }; }; - "apollo-codegen-core-0.38.0" = { + "apollo-codegen-core-0.38.1" = { name = "apollo-codegen-core"; packageName = "apollo-codegen-core"; - version = "0.38.0"; + version = "0.38.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.38.0.tgz"; - sha512 = "NZnmS1qWFSlYaraxyi9q4uVFDGktr3IgQmgGI5Jj7iBY5iFTNJIIDXb2ufB8UvLBF3eKqHR9VxpQIAi4wfo8+w=="; + url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.38.1.tgz"; + sha512 = "LOeLQdSeKnHJBYxjhrJ/4b8RR9V4f9QhUAB/wYyJ7g8eCT4ZcjdGdwQ/KnijI0GmrWaz+t4Z5zn3wpXaudn7bA=="; }; }; - "apollo-codegen-flow-0.36.0" = { + "apollo-codegen-flow-0.36.1" = { name = "apollo-codegen-flow"; packageName = "apollo-codegen-flow"; - version = "0.36.0"; + version = "0.36.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.36.0.tgz"; - sha512 = "OJ3aRqxbI63NnUrUrPaindeXCI9bOCGmIHoENGGXwNrtS229lUJ9b6rTelqyfAwKau8AysJQoMfAclula3Br7A=="; + url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.36.1.tgz"; + sha512 = "+986zLn9gA44fKF+7iKrPrtSN0cCtlgXeqBHZFujcyGaWWzra8+/lj23L+toFCT+FI93KYGZLqslrlwoMbcD3g=="; }; }; - "apollo-codegen-scala-0.37.0" = { + "apollo-codegen-scala-0.37.1" = { name = "apollo-codegen-scala"; packageName = "apollo-codegen-scala"; - version = "0.37.0"; + version = "0.37.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.37.0.tgz"; - sha512 = "Wsvd/eF6XBnzJvl1AceiAXw3pFwGYWyKXWbCzneuNHggf3ONc09V0zPQ2dqcsMnslIn6y+HnZav9rQB/iJNNEQ=="; + url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.37.1.tgz"; + sha512 = "+pSDQ4MbGZNbQ1VgfHK0P+w+iDoIHDQ2Bq7WhjX8ZayKTpLb/X9eWYMzrfQRtr0uDrXbbPkM0YGj1kcdGehINw=="; }; }; - "apollo-codegen-swift-0.38.0" = { + "apollo-codegen-swift-0.38.1" = { name = "apollo-codegen-swift"; packageName = "apollo-codegen-swift"; - version = "0.38.0"; + version = "0.38.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.38.0.tgz"; - sha512 = "kUoDUOOY3h7fUg4hpNNZrQl+bfPzwxN49pl8lrGoEB8uvgaCBj5C77NbHTISomSk1OzdT8uVlm4l4oJiMsT28g=="; + url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.38.1.tgz"; + sha512 = "VJROl4GQzDJn8EnFX6IEP/G1KMeHZblD/Mrbweza+3Kel4wH6SpD533Jc/W4pd4pxdzbhbmfXkJSzkL/xPIvbg=="; }; }; - "apollo-codegen-typescript-0.38.0" = { + "apollo-codegen-typescript-0.38.1" = { name = "apollo-codegen-typescript"; packageName = "apollo-codegen-typescript"; - version = "0.38.0"; + version = "0.38.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.38.0.tgz"; - sha512 = "sEAIoE38ASFtqU7bhj31vtSRLKix5H8ltwvU9MRMbpgWfos/r29krKrNSJi8DeouC1/QSQAOaFzsghCMe5fkrQ=="; + url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.38.1.tgz"; + sha512 = "UAHh1HliM8ahraF7csRYrbhrYhDcgqlE0PEu1WwqFISE1r7wRtLZXg+ic25iyRpTIZqkB8mfkym20Z5nZgmNbw=="; }; }; "apollo-datasource-0.7.2" = { @@ -8464,13 +8455,13 @@ let sha512 = "BxTf5LOQe649e9BNTPdyCGItVv4Ll8wZ2BKnmiYpRAocYEXAVrQPWuSr3dO4iipqAU8X0gvle/Xu9mSqg5b7Qg=="; }; }; - "apollo-language-server-1.24.0" = { + "apollo-language-server-1.24.1" = { name = "apollo-language-server"; packageName = "apollo-language-server"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.24.0.tgz"; - sha512 = "n1o1QmQ6hQcl5Rx+K23yO9MrDcF94Xygychn1pxJG5xKEZ8kkKxqNqjUhjFxIN908LJ4yuFjTW6OEtEym4haxg=="; + url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.24.1.tgz"; + sha512 = "2LYW/pWWBkG0/BggMedZ3EEHAQIKFc9PxHroxKhXh2Y5SXha4yQmmFILloQFrA6z7fU39IF6Tudgt5yNw2Cw/w=="; }; }; "apollo-link-1.2.1" = { @@ -9877,13 +9868,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.784.0" = { + "aws-sdk-2.786.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.784.0"; + version = "2.786.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.784.0.tgz"; - sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.786.0.tgz"; + sha512 = "oL+rDkoBdn0Q3AxiEzSemCE3WqW6kBf0A72SIjDQZJb4/NDvA2mL2rpNQGaxaFX3zMHEwfUGcMu7T3q7I6Q0lw=="; }; }; "aws-sign2-0.6.0" = { @@ -10984,6 +10975,15 @@ let sha512 = "hJmWKucJQfdSkQPDPBKmWogM9s8+NOSzDT9QVbJbjinXaQ0bJKPu/cn98qRWy3PDNWtKw4XaoUP3XruGRIKEgg=="; }; }; + "bitfield-4.0.0" = { + name = "bitfield"; + packageName = "bitfield"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bitfield/-/bitfield-4.0.0.tgz"; + sha512 = "jtuSG9CQr5yoHFuvhgf50+DH8Aezl3C/mMSfqdG4DqP7Kqe34uBUtCEHPN9oWaldTm96/i7y5e778SnM5ES4rw=="; + }; + }; "bitfield-rle-2.2.1" = { name = "bitfield-rle"; packageName = "bitfield-rle"; @@ -11020,6 +11020,15 @@ let sha512 = "fvb6M58Ceiv/S94nu6zeaiMoJvUYOeIqRbgaClm+kJTzCAqJPtAR/31pXNYB5iEReOoKqQB5zY33gY0W6ZRWQQ=="; }; }; + "bittorrent-lsd-1.0.0" = { + name = "bittorrent-lsd"; + packageName = "bittorrent-lsd"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bittorrent-lsd/-/bittorrent-lsd-1.0.0.tgz"; + sha512 = "rM3ECQrtEiE1ef5TTdQbWJgbpd4NQur3bxrNs0r5VPcYfnFhXT85m75+whkyV5NIwNsndS7M/D+Uf/Mi/BUrWg=="; + }; + }; "bittorrent-peerid-1.3.3" = { name = "bittorrent-peerid"; packageName = "bittorrent-peerid"; @@ -11029,13 +11038,13 @@ let sha512 = "tSh9HdQgwyEAfo1jzoGEis6o/zs4CcdRTchG93XVl5jct+DCAN90M5MVUV76k2vJ9Xg3GAzLB5NLsY/vnVTh6w=="; }; }; - "bittorrent-protocol-3.1.2" = { + "bittorrent-protocol-3.2.0" = { name = "bittorrent-protocol"; packageName = "bittorrent-protocol"; - version = "3.1.2"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.1.2.tgz"; - sha512 = "vjKcxwQ/rDd3FeqImBZXLKk14eawf8sXVXPJd8LgrTZmpDzCn8kquhNIiYbE7M3SybAQ1r5uILJ7f2V2TlT8bQ=="; + url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.2.0.tgz"; + sha512 = "8xgCgK8xUg7MXZBxhqJapZy9hexHwN2TCD+b8m4yWg56/ZFfdkULxhxQkzuhpXyUfvKIKxeRzGmLT43li7FDKg=="; }; }; "bittorrent-tracker-7.7.0" = { @@ -11821,13 +11830,13 @@ let sha512 = "c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg=="; }; }; - "buffer-5.7.0" = { + "buffer-5.7.1" = { name = "buffer"; packageName = "buffer"; - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.7.0.tgz"; - sha512 = "cd+5r1VLBwUqTrmnzW+D7ABkJUM6mr7uv1dv+6jRw4Rcl7tFIFHDqHPL98LhpGFn3dbAt3gtLxtrWp4m1kFrqg=="; + url = "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"; + sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; }; }; "buffer-alloc-1.2.0" = { @@ -12550,13 +12559,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001154" = { + "caniuse-lite-1.0.30001156" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001154"; + version = "1.0.30001156"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001154.tgz"; - sha512 = "y9DvdSti8NnYB9Be92ddMZQrcOe04kcQtcxtBx4NkB04+qZ+JUWotnXBJTmxlKudhxNTQ3RRknMwNU2YQl/Org=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001156.tgz"; + sha512 = "z7qztybA2eFZTB6Z3yvaQBIoJpQtsewRD74adw2UbRWwsRq3jIPvgrQGawBMbfafekQaD21FWuXNcywtTDGGCw=="; }; }; "canvas-2.6.1" = { @@ -13081,15 +13090,6 @@ let sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; }; }; - "chokidar-3.4.2" = { - name = "chokidar"; - packageName = "chokidar"; - version = "3.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz"; - sha512 = "IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A=="; - }; - }; "chokidar-3.4.3" = { name = "chokidar"; packageName = "chokidar"; @@ -13378,6 +13378,15 @@ let sha512 = "eDu0vN44ZBvoEU0oRIKwWPIccGWXtdnUNmKJuTukZ1de00Uoqavb5pfIMKiC7/r+knQ5RbvAjGuVZiN3JwJL4Q=="; }; }; + "clean-stack-1.3.0" = { + name = "clean-stack"; + packageName = "clean-stack"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz"; + sha1 = "9e821501ae979986c46b1d66d2d432db2fd4ae31"; + }; + }; "clean-stack-2.2.0" = { name = "clean-stack"; packageName = "clean-stack"; @@ -13594,6 +13603,15 @@ let sha512 = "/1owvF0SZ5Gn54cgrikJ0QskgTzeg30HGjkmjFoaHDJzAqFpuX1DBpFR8aLvsE1J5s9MgeYRENQK4BFwOag5VA=="; }; }; + "cli-ux-5.4.6" = { + name = "cli-ux"; + packageName = "cli-ux"; + version = "5.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.4.6.tgz"; + sha512 = "EeiS2TzEndRVknCqE+8Ri8g0bsP617a1nq6n+3Trwft1JCDzyUNlX2J1fl7fwTgRPWtmBmiF6xIyueL5YGs65g=="; + }; + }; "cli-ux-5.5.0" = { name = "cli-ux"; packageName = "cli-ux"; @@ -15161,13 +15179,13 @@ let sha512 = "jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA=="; }; }; - "conventional-changelog-angular-5.0.11" = { + "conventional-changelog-angular-5.0.12" = { name = "conventional-changelog-angular"; packageName = "conventional-changelog-angular"; - version = "5.0.11"; + version = "5.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.11.tgz"; - sha512 = "nSLypht/1yEflhuTogC03i7DX7sOrXGsRn14g131Potqi6cbGbGEE9PSDEHKldabB6N76HiSyw9Ph+kLmC04Qw=="; + url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.12.tgz"; + sha512 = "5GLsbnkR/7A89RyHLvvoExbiGbd9xKdKqDTrArnPbOqBqG/2wIosu0fHwpeIRI8Tl94MhVNBXcLJZl92ZQ5USw=="; }; }; "conventional-changelog-core-3.2.3" = { @@ -15188,31 +15206,31 @@ let sha512 = "GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g=="; }; }; - "conventional-changelog-writer-4.0.17" = { + "conventional-changelog-writer-4.0.18" = { name = "conventional-changelog-writer"; packageName = "conventional-changelog-writer"; - version = "4.0.17"; + version = "4.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.17.tgz"; - sha512 = "IKQuK3bib/n032KWaSb8YlBFds+aLmzENtnKtxJy3+HqDq5kohu3g/UdNbIHeJWygfnEbZjnCKFxAW0y7ArZAw=="; + url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.18.tgz"; + sha512 = "mAQDCKyB9HsE8Ko5cCM1Jn1AWxXPYV0v8dFPabZRkvsiWUul2YyAqbIaoMKF88Zf2ffnOPSvKhboLf3fnjo5/A=="; }; }; - "conventional-commits-filter-2.0.6" = { + "conventional-commits-filter-2.0.7" = { name = "conventional-commits-filter"; packageName = "conventional-commits-filter"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.6.tgz"; - sha512 = "4g+sw8+KA50/Qwzfr0hL5k5NWxqtrOVw4DDk3/h6L85a9Gz0/Eqp3oP+CWCNfesBvZZZEFHF7OTEbRe+yYSyKw=="; + url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz"; + sha512 = "ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA=="; }; }; - "conventional-commits-parser-3.1.0" = { + "conventional-commits-parser-3.2.0" = { name = "conventional-commits-parser"; packageName = "conventional-commits-parser"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.1.0.tgz"; - sha512 = "RSo5S0WIwXZiRxUGTPuYFbqvrR4vpJ1BDdTlthFgvHt5kEdnd1+pdvwWphWn57/oIl4V72NMmOocFqqJ8mFFhA=="; + url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.0.tgz"; + sha512 = "XmJiXPxsF0JhAKyfA2Nn+rZwYKJ60nanlbSWwwkGwLQFbugsc0gv1rzc7VbbUWAzJfR1qR87/pNgv9NgmxtBMQ=="; }; }; "conventional-recommended-bump-5.0.1" = { @@ -15494,13 +15512,22 @@ let sha512 = "vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="; }; }; - "core-js-compat-3.6.5" = { + "core-js-3.7.0" = { + name = "core-js"; + packageName = "core-js"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-3.7.0.tgz"; + sha512 = "NwS7fI5M5B85EwpWuIwJN4i/fbisQUwLwiSNUWeXlkAZ0sbBjLEvLvFLf1uzAUV66PcEPt4xCGCmOZSxVf3xzA=="; + }; + }; + "core-js-compat-3.7.0" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.6.5"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz"; - sha512 = "7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.7.0.tgz"; + sha512 = "V8yBI3+ZLDVomoWICO6kq/CD28Y4r1M7CWeO4AGpMdMfseu8bkSubBmUPySMGKRTS+su4XQ07zUkAsiu9FCWTg=="; }; }; "core-util-is-1.0.2" = { @@ -16835,13 +16862,13 @@ let sha512 = "3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw=="; }; }; - "dayjs-1.9.4" = { + "dayjs-1.9.5" = { name = "dayjs"; packageName = "dayjs"; - version = "1.9.4"; + version = "1.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.9.4.tgz"; - sha512 = "ABSF3alrldf7nM9sQ2U+Ln67NRwmzlLOqG7kK03kck0mw3wlSSEKv/XhKGGxUjQcS57QeiCyNdrFgtj9nWlrng=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.9.5.tgz"; + sha512 = "WULIw7UpW/E0y6VywewpbXAMH3d5cZijEhoHLwM+OMVbk/NtchKS/W+57H/0P1rqU7gHrAArjiRLHCUhgMQl6w=="; }; }; "deasync-0.1.15" = { @@ -19004,13 +19031,13 @@ let sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w=="; }; }; - "electron-to-chromium-1.3.587" = { + "electron-to-chromium-1.3.589" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.587"; + version = "1.3.589"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.587.tgz"; - sha512 = "8XFNxzNj0R8HpTQslWAw6UWpGSuOKSP3srhyFHVbGUGb8vTHckZGCyWi+iQlaXJx5DNeTQTQLd6xN11WSckkmA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.589.tgz"; + sha512 = "rQItBTFnol20HaaLm26UgSUduX7iGerwW7pEYX17MB1tI6LzFajiLV7iZ7LVcUcsN/7HrZUoCLrBauChy/IqEg=="; }; }; "elegant-spinner-1.0.1" = { @@ -19320,6 +19347,15 @@ let sha512 = "b4Q85dFkGw+TqgytGPrGgACRUhsdKc9S9ErRAXpPGy/CXKs4tYoHDkvIRdsseAF7NjfVwjRFIn6KTnbw7LwJZg=="; }; }; + "engine.io-4.0.1" = { + name = "engine.io"; + packageName = "engine.io"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-4.0.1.tgz"; + sha512 = "6EaSBxasBUwxRdf6B68SEYpD3tcrG80J4YTzHl/D+9Q+vM0AMHZabfYcc2WdnvEaQxZjX/UZsa+UdGoM0qQQkQ=="; + }; + }; "engine.io-client-1.3.1" = { name = "engine.io-client"; packageName = "engine.io-client"; @@ -19356,6 +19392,15 @@ let sha512 = "x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg=="; }; }; + "engine.io-parser-4.0.1" = { + name = "engine.io-parser"; + packageName = "engine.io-parser"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-4.0.1.tgz"; + sha512 = "v5aZK1hlckcJDGmHz3W8xvI3NUHYc9t8QtTbqdR5OaH3S9iJZilPubauOm+vLWOMMWzpE3hiq92l9lTAHamRCg=="; + }; + }; "enhanced-resolve-2.3.0" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; @@ -20769,13 +20814,13 @@ let sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; }; }; - "expo-pwa-0.0.48" = { + "expo-pwa-0.0.49" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.48"; + version = "0.0.49"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.48.tgz"; - sha512 = "4KaL0+YhFxS9zrpQG/BNW+fxMldvgx9dM16b6sZ2t7eMkDlUO7Vo6B+zxeg5l/naP27CA02bMUkeEHr61Y5ojA=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.49.tgz"; + sha512 = "HzwUGdnN9g5Ov/3r2uXwyjYP0xNtgOre1Z+Cywxg7GQWoFiklBfvYraIQFfwOjXVnsgo7bF4GFd4QW4v5vi9wA=="; }; }; "express-2.5.11" = { @@ -21831,15 +21876,6 @@ let sha512 = "t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ=="; }; }; - "find-process-1.4.4" = { - name = "find-process"; - packageName = "find-process"; - version = "1.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/find-process/-/find-process-1.4.4.tgz"; - sha512 = "rRSuT1LE4b+BFK588D2V8/VG9liW0Ark1XJgroxZXI0LtwmQJOb490DvDYvbm+Hek9ETFzTutGfJ90gumITPhQ=="; - }; - }; "find-requires-1.0.0" = { name = "find-requires"; packageName = "find-requires"; @@ -22434,13 +22470,13 @@ let sha512 = "DuVkPNrM12jR41KM2e+N+styka0EgLkTnXmNcXdgOM37vtGeY+oCBK/Jx0hzSeEU6memFCtWb4htrHPMDfwwUQ=="; }; }; - "fork-ts-checker-webpack-plugin-5.1.0" = { + "fork-ts-checker-webpack-plugin-5.2.1" = { name = "fork-ts-checker-webpack-plugin"; packageName = "fork-ts-checker-webpack-plugin"; - version = "5.1.0"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.1.0.tgz"; - sha512 = "vuKyEjSLGbhQbEr5bifXXOkr9iV73L6n72mHoHIv7okvrf7O7z6RKeplM6C6ATPsukoQivij+Ba1vcptL60Z2g=="; + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.1.tgz"; + sha512 = "SVi+ZAQOGbtAsUWrZvGzz38ga2YqjWvca1pXQFUArIVXqli0lLoDQ8uS0wg0kSpcwpZmaW5jVCZXQebkyUQSsw=="; }; }; "form-data-1.0.0-rc3" = { @@ -22911,13 +22947,13 @@ let sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; }; }; - "fsevents-2.2.0" = { + "fsevents-2.2.1" = { name = "fsevents"; packageName = "fsevents"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.2.0.tgz"; - sha512 = "pKnaUh2TNvk+/egJdBw1h46LwyLx8BzEq+MGCf/RMCVfEHHsGOCWG00dqk91kUPPArIIwMBg9T/virxwzP03cA=="; + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.2.1.tgz"; + sha512 = "bTLYHSeC0UH/EFXS9KqWnXuOl/wHK5Z/d+ghd5AsFMYN7wIGkUCOJyzy88+wJKkZPGON8u4Z9f6U4FdgURE9qA=="; }; }; "fstream-0.1.31" = { @@ -23586,15 +23622,6 @@ let sha512 = "kbuvus1dWQB2sSW4cbfTeGpCMd8ge9jx9RKnhXhuJ7tnvT+NIrTVfYZxjtflZddQYcmdOTlkAcjmx7bor+15AQ=="; }; }; - "git-url-parse-11.2.0" = { - name = "git-url-parse"; - packageName = "git-url-parse"; - version = "11.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.2.0.tgz"; - sha512 = "KPoHZg8v+plarZvto4ruIzzJLFQoRx+sUs5DQSr07By9IBKguVd+e6jwrFR6/TP6xrCJlNV1tPqLO1aREc7O2g=="; - }; - }; "git-url-parse-11.4.0" = { name = "git-url-parse"; packageName = "git-url-parse"; @@ -26684,15 +26711,6 @@ let sha512 = "Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ=="; }; }; - "inquirer-7.1.0" = { - name = "inquirer"; - packageName = "inquirer"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz"; - sha512 = "5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg=="; - }; - }; "inquirer-7.3.3" = { name = "inquirer"; packageName = "inquirer"; @@ -27278,13 +27296,13 @@ let sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345"; }; }; - "is-core-module-2.0.0" = { + "is-core-module-2.1.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.0.0.tgz"; - sha512 = "jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.1.0.tgz"; + sha512 = "YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA=="; }; }; "is-data-descriptor-0.1.4" = { @@ -29420,13 +29438,13 @@ let sha512 = "KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA=="; }; }; - "jsonata-1.8.3" = { + "jsonata-1.8.4" = { name = "jsonata"; packageName = "jsonata"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/jsonata/-/jsonata-1.8.3.tgz"; - sha512 = "r6ztI6ohbpRo77AxBm6vMs3aHZi2L2PaakW7TCPwSkeGcuAZ/SxXGLWH2Npwqq5+YBM/fg/g0EXg/pI9HvXQ8Q=="; + url = "https://registry.npmjs.org/jsonata/-/jsonata-1.8.4.tgz"; + sha512 = "OqzmM5IICtm/687zckG5BROZzInGCEuKojpYs48H8RnkII8Np+o912ryvhnYwsRrSI24TQRG/qqrSwBuaneDbg=="; }; }; "jsonc-parser-1.0.3" = { @@ -29726,13 +29744,13 @@ let sha1 = "7d86bd56679f58ce6a84704a657dd392bba81a79"; }; }; - "jwt-decode-3.0.0" = { + "jwt-decode-3.1.1" = { name = "jwt-decode"; packageName = "jwt-decode"; - version = "3.0.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.0.0.tgz"; - sha512 = "RBQv2MTm3FNKQkdzhEyQwh5MbdNgMa+FyIJIK5RMWEn6hRgRHr7j55cRxGhRe6vGJDElyi6f6u/yfkP7AoXddA=="; + url = "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.1.tgz"; + sha512 = "EaH9dTD9ogCmxZRdiTsIUIJslqjoFfk8nEAi+Bq8u/aUjrVuhZ6eZjhWRH6SC9NBA0Lwr3K35H2zDnWvK/n4vQ=="; }; }; "k-bucket-0.6.0" = { @@ -33228,13 +33246,13 @@ let sha512 = "EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw=="; }; }; - "marked-1.2.2" = { + "marked-1.2.3" = { name = "marked"; packageName = "marked"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-1.2.2.tgz"; - sha512 = "5jjKHVl/FPo0Z6ocP3zYhKiJLzkwJAw4CZoLjv57FkvbUuwOX4LIBBGGcXjAY6ATcd1q9B8UTj5T9Umauj0QYQ=="; + url = "https://registry.npmjs.org/marked/-/marked-1.2.3.tgz"; + sha512 = "RQuL2i6I6Gn+9n81IDNGbL0VHnta4a+8ZhqvryXEniTb/hQNtf3i26hi1XWUhzb9BgVyWHKR3UO8MaHtKoYibw=="; }; }; "marked-terminal-4.1.0" = { @@ -33741,15 +33759,6 @@ let sha512 = "qVQ/CjkMyMInPaaRMrwWNDvf6boRZXaT/DbQeMYcCWuXPEBf1v8qChOc9OlEVQp2uOvRXa1Qu30fLmKhY6NipA=="; }; }; - "memorystore-1.6.2" = { - name = "memorystore"; - packageName = "memorystore"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/memorystore/-/memorystore-1.6.2.tgz"; - sha512 = "HQM+cZB/kY1+jj57It22FsptJ3nuZRYxnwh3rWZEvDZO1zuzhIrX9uyFcjP9AhFQvM5WS6vZKtn3veohDH4S7w=="; - }; - }; "memorystore-1.6.4" = { name = "memorystore"; packageName = "memorystore"; @@ -33822,6 +33831,15 @@ let sha512 = "GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA=="; }; }; + "meow-8.0.0" = { + name = "meow"; + packageName = "meow"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/meow/-/meow-8.0.0.tgz"; + sha512 = "nbsTRz2fwniJBFgUkcdISq8y/q9n9VbiHYbfwklFh5V4V2uAcxtKQkDc0yCLPM/kP0d+inZBewn3zJqewHE7kg=="; + }; + }; "merge-1.2.1" = { name = "merge"; packageName = "merge"; @@ -34776,15 +34794,6 @@ let sha512 = "Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg=="; }; }; - "moment-2.28.0" = { - name = "moment"; - packageName = "moment"; - version = "2.28.0"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.28.0.tgz"; - sha512 = "Z5KOjYmnHyd/ukynmFd/WwyXHd7L4J9vTI/nn5Ap9AVUgaAE15VvQ9MOGmJJygEUklupqIrFnor/tjTwRU+tQw=="; - }; - }; "moment-2.29.1" = { name = "moment"; packageName = "moment"; @@ -34902,13 +34911,13 @@ let sha512 = "NOeCoW6AYc3hLi30npe7uzbD9b4FQZKH40YKABUCCvaKKL5agj6YzvHoNx8jQpDMNPgIa5bvSZQbQpWBAVD0Kw=="; }; }; - "mqtt-4.2.1" = { + "mqtt-4.2.4" = { name = "mqtt"; packageName = "mqtt"; - version = "4.2.1"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.1.tgz"; - sha512 = "Iv893r+jWlo5GkNcPOfCGwW8M49IixwHiKLFFYTociEymSibUVCORVEjPXWPGzSxhn7BdlUeHicbRmWiv0Crkg=="; + url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.4.tgz"; + sha512 = "g3tJt5UOS1Wqn/xntl4JhlJW51OM8CvgEmY8cwZ1zecE5G7uuwjSUUvgGeVDiEMWJ5vXCfZz2VMCQGNvKhzfEQ=="; }; }; "mqtt-packet-6.6.0" = { @@ -36290,13 +36299,13 @@ let sha512 = "MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg=="; }; }; - "node-html-parser-1.4.6" = { + "node-html-parser-1.4.8" = { name = "node-html-parser"; packageName = "node-html-parser"; - version = "1.4.6"; + version = "1.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-1.4.6.tgz"; - sha512 = "VgX2Bk8dq59yFeNC46LdA6VzRXffOPVNOMoeZquACZVwbC1VYJ3ssd5/mncTBGBrd3M+t6cMD5KQWdK/l+qPFQ=="; + url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-1.4.8.tgz"; + sha512 = "goyDL2T1qnepirf64Qu1ttJ2UZmNGp1CPbG3pkh2VYc1yqzgPX0rjKN7vqThFcZmEIzC+ratLIod1O/MNXwgzg=="; }; }; "node-int64-0.4.0" = { @@ -36668,6 +36677,15 @@ let sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; }; }; + "normalize-package-data-3.0.0" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.0.tgz"; + sha512 = "6lUjEI0d3v6kFrtgA/lOx4zHCWULXsFNIjHolnZCKCTLA6m/G625cdn3O7eNmT0iD3jfo6HZ9cdImGZwf21prw=="; + }; + }; "normalize-path-2.1.1" = { name = "normalize-path"; packageName = "normalize-path"; @@ -37560,13 +37578,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.149.3" = { + "office-ui-fabric-react-7.149.4" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.149.3"; + version = "7.149.4"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.149.3.tgz"; - sha512 = "R0iqyTGX8l+cUB5h8SvhB/i5QexNhlXP8GW3j5NCb8U0ZiEuTVpxCCMDua/0Mmdj6MZmcK/hcL9gmK6ZPUe6qg=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.149.4.tgz"; + sha512 = "9gfzIGlQr9tijkR10S+chRkNhxtyf2bonPFwTvJh/vrJ3R2/CHanHEWh+k4KUjsz2+4bf/+aRY5mjKCpEG65qA=="; }; }; "omggif-1.0.10" = { @@ -37830,13 +37848,13 @@ let sha512 = "TbgwwOnlatb+xSYh/XALQjrVO3dirVNXuONR6CLQHVI/i1e+nq/ubW8I5i6rlGpnFLZNZKXZ0gF7RMvjLBk8ow=="; }; }; - "openapi-framework-7.0.2" = { + "openapi-framework-7.1.0" = { name = "openapi-framework"; packageName = "openapi-framework"; - version = "7.0.2"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.0.2.tgz"; - sha512 = "62gOWK5iq75HJVS0KWKuLXR7CYynjrbvgxLrTc0Tr0fTcI9ZiJV61KDmz9bz37rHhk/uQIVSMMuTjTC8bmyQtA=="; + url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.1.0.tgz"; + sha512 = "GB1TUdv51fYKdvzy0Xg3fLtsuHXJY0v0PR6XGjdSKgxLYK8PA1/dQfxtTRftzx7XVI6uMegdG8aCAPwYTsypWQ=="; }; }; "openapi-jsonschema-parameters-1.2.0" = { @@ -37866,13 +37884,13 @@ let sha512 = "UFRzW7C7Q31FUOFHEMYNeSuEmETH7KGlsMgMJanv0RxXkACyzKpKANPfM3oiMubQENPya3Ie9ZIq5HLvZEy/eQ=="; }; }; - "openapi-request-coercer-7.0.1" = { + "openapi-request-coercer-7.1.0" = { name = "openapi-request-coercer"; packageName = "openapi-request-coercer"; - version = "7.0.1"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-7.0.1.tgz"; - sha512 = "nKSRnLX7KQ3Iu1TTZ+1PdEoz0Ke47vH4EcZIM9EOkdqadCFj2pSG/6oMcyqipCs2X7oMFi9Df/UGDRnTdzmPog=="; + url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-7.1.0.tgz"; + sha512 = "6nvSgvOvLYMkUBu3NbHQU6Lcol1WxDr0DsOe3oYHb2tZhokrNEuOF20QYPV+CGZYyEzc0f+Hdas774n5B0euLg=="; }; }; "openapi-request-validator-4.2.0" = { @@ -38028,13 +38046,13 @@ let sha512 = "xH6qaz/hS55rEX8xURz4HRUO96cpj821WY6UEG9rgcusZ8Jsq54jGWP1EMCjGvgngonw8vgSljM1i2OESv16Gw=="; }; }; - "opentracing-0.14.4" = { + "opentracing-0.14.5" = { name = "opentracing"; packageName = "opentracing"; - version = "0.14.4"; + version = "0.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/opentracing/-/opentracing-0.14.4.tgz"; - sha512 = "nNnZDkUNExBwEpb7LZaeMeQgvrlO8l4bgY/LvGNZCR0xG/dGWqHqjKrAmR5GUoYo0FIz38kxasvA1aevxWs2CA=="; + url = "https://registry.npmjs.org/opentracing/-/opentracing-0.14.5.tgz"; + sha512 = "XLKtEfHxqrWyF1fzxznsv78w3csW41ucHnjiKnfzZLD5FN8UBDZZL1i4q0FR29zjxXhm+2Hop+5Vr/b8tKIvEg=="; }; }; "opn-3.0.3" = { @@ -38226,15 +38244,6 @@ let sha512 = "eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg=="; }; }; - "ora-4.0.4" = { - name = "ora"; - packageName = "ora"; - version = "4.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-4.0.4.tgz"; - sha512 = "77iGeVU1cIdRhgFzCK8aw1fbtT1B/iZAvWjS+l/o1x0RShMgxHUZaD2yDpWsNCPwXg9z1ZA78Kbdvr8kBmG/Ww=="; - }; - }; "ora-4.1.1" = { name = "ora"; packageName = "ora"; @@ -38343,6 +38352,15 @@ let sha512 = "h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg=="; }; }; + "os-name-4.0.0" = { + name = "os-name"; + packageName = "os-name"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-name/-/os-name-4.0.0.tgz"; + sha512 = "caABzDdJMbtykt7GmSogEat3faTKQhmZf0BS5l/pZGmP0vPWQjXWqOhbLyK+b6j2/DQPmEvYdzLXJXXLJNVDNg=="; + }; + }; "os-shim-0.1.3" = { name = "os-shim"; packageName = "os-shim"; @@ -38901,13 +38919,13 @@ let sha512 = "JcMmHiK6h6rcncj2HLayiyJZg28iJXJafXcmEGw2NjKH3WE8ZgSwyMZs7+f+aliPD57PDhB31IEgUtLXp0YZxA=="; }; }; - "pacote-11.1.12" = { + "pacote-11.1.13" = { name = "pacote"; packageName = "pacote"; - version = "11.1.12"; + version = "11.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-11.1.12.tgz"; - sha512 = "suazooYMzefXr3glexAX4+q+qqH3wrzchtj+EivwiCCr/tsaHe9HtdHSx3R8YPjulAhojBZ2JkAVy13QwA8Jpg=="; + url = "https://registry.npmjs.org/pacote/-/pacote-11.1.13.tgz"; + sha512 = "oJ7Bg7p3izrIMhZPHCCHmMHQl+xb+pKBXL5ZYeM2oCZrw6sBRSx7f8l7F+95V2qA0BP3c1cNaaBmUNkbo6Hn9w=="; }; }; "pacote-9.5.12" = { @@ -39855,13 +39873,13 @@ let sha1 = "b942e6d4bde653005ef6b71361def8727d0645e0"; }; }; - "patrisika-0.21.0" = { + "patrisika-0.22.0" = { name = "patrisika"; packageName = "patrisika"; - version = "0.21.0"; + version = "0.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/patrisika/-/patrisika-0.21.0.tgz"; - sha1 = "b82c27f7d4041522dc5c31b43b7c6efb19e47482"; + url = "https://registry.npmjs.org/patrisika/-/patrisika-0.22.0.tgz"; + sha512 = "2ug3pMunBT5js9S6+6cpt7KkfQA+nQ35nZi6aiiS6S0GdqvXhcsaSvOnczJosEZK9Xrar4j8t9J1VpNnVMrHWw=="; }; }; "patrisika-scopes-0.11.1" = { @@ -43024,13 +43042,13 @@ let sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw=="; }; }; - "query-string-6.13.6" = { + "query-string-6.13.7" = { name = "query-string"; packageName = "query-string"; - version = "6.13.6"; + version = "6.13.7"; src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-6.13.6.tgz"; - sha512 = "/WWZ7d9na6s2wMEGdVCVgKWE9Rt7nYyNIf7k8xmHXcesPMlEzicWo3lbYwHyA4wBktI2KrXxxZeACLbE84hvSQ=="; + url = "https://registry.npmjs.org/query-string/-/query-string-6.13.7.tgz"; + sha512 = "CsGs8ZYb39zu0WLkeOhe0NMePqgYdAuCqxOYKDR5LVCytDZYMGx3Bb+xypvQvPHVPijRXB0HZNFllCzHRe4gEA=="; }; }; "querystring-0.2.0" = { @@ -43816,15 +43834,6 @@ let sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; }; }; - "readdirp-3.4.0" = { - name = "readdirp"; - packageName = "readdirp"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz"; - sha512 = "0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ=="; - }; - }; "readdirp-3.5.0" = { name = "readdirp"; packageName = "readdirp"; @@ -45643,15 +45652,6 @@ let sha512 = "xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw=="; }; }; - "rxjs-6.5.5" = { - name = "rxjs"; - packageName = "rxjs"; - version = "6.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz"; - sha512 = "WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ=="; - }; - }; "rxjs-6.6.2" = { name = "rxjs"; packageName = "rxjs"; @@ -45670,13 +45670,13 @@ let sha512 = "trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ=="; }; }; - "s.color-0.0.13" = { + "s.color-0.0.15" = { name = "s.color"; packageName = "s.color"; - version = "0.0.13"; + version = "0.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/s.color/-/s.color-0.0.13.tgz"; - sha512 = "56rTWlPg3jQX5n2wv201gUBn8fSgnGwbNjN159FV+JeD4EeqZiVnhDASmivhE4+f9Ivzj59y5AgoFflsf25KwA=="; + url = "https://registry.npmjs.org/s.color/-/s.color-0.0.15.tgz"; + sha512 = "AUNrbEUHeKY8XsYr/DYpl+qk5+aM+DChopnWOPEzn8YKzOhv4l2zH6LzZms3tOZP3wwdOyc0RmTciyi46HLIuA=="; }; }; "s3-stream-upload-2.0.2" = { @@ -45823,13 +45823,13 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-1.28.0" = { + "sass-1.29.0" = { name = "sass"; packageName = "sass"; - version = "1.28.0"; + version = "1.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.28.0.tgz"; - sha512 = "9FWX/0wuE1KxwfiP02chZhHaPzu6adpx9+wGch7WMOuHy5npOo0UapRI3FNSHva2CczaYJu2yNUBN8cCSqHz/A=="; + url = "https://registry.npmjs.org/sass/-/sass-1.29.0.tgz"; + sha512 = "ZpwAUFgnvAUCdkjwPREny+17BpUj8nh5Yr6zKPGtLNTLrmtoRYIjm7njP24COhjJldjwW1dcv52Lpf4tNZVVRA=="; }; }; "sass-formatter-0.5.1" = { @@ -47569,6 +47569,15 @@ let sha512 = "WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g=="; }; }; + "socket.io-adapter-2.0.3" = { + name = "socket.io-adapter"; + packageName = "socket.io-adapter"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.0.3.tgz"; + sha512 = "2wo4EXgxOGSFueqvHAdnmi5JLZzWqMArjuP4nqC26AtLh5PoCPsaRbRdah2xhcwTAMooZfjYiNVNkkmmSMaxOQ=="; + }; + }; "socket.io-client-1.0.6" = { name = "socket.io-client"; packageName = "socket.io-client"; @@ -47632,6 +47641,15 @@ let sha512 = "11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A=="; }; }; + "socket.io-parser-4.0.1" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.1.tgz"; + sha512 = "5JfNykYptCwU2lkOI0ieoePWm+6stEhkZ2UnLDjqnE1YEjUlXXLd1lpxPZ+g+h3rtaytwWkWrLQCaJULlGqjOg=="; + }; + }; "sockjs-0.3.20" = { name = "sockjs"; packageName = "sockjs"; @@ -50044,24 +50062,6 @@ let sha512 = "es33J1g2HjMpyAhz8lOR+ICmXXAqTuKbuXuUWLhOLew20oN9oUCgCJx615U/v7aioZg7IX5lIh9x34vwneu4pA=="; }; }; - "suf-cli-0.1.3" = { - name = "suf-cli"; - packageName = "suf-cli"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/suf-cli/-/suf-cli-0.1.3.tgz"; - sha512 = "dM85t6+egHKKM7ChM1JpkZUeXNczRb7vAQN3Y8UAyRjeW6UvfChPi8YbV73eTUBp6N7VfKqwwrsYsbdEb/u0Rg=="; - }; - }; - "suf-node-1.2.1" = { - name = "suf-node"; - packageName = "suf-node"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/suf-node/-/suf-node-1.2.1.tgz"; - sha512 = "LFLshqEwm1bXd3fEl0STYXZzEHbAz8HwsyItA8vvxhMZrIo+CpB7RrtLvor6mk+7SdfgJhmV3RdIdDIcPAJTTg=="; - }; - }; "suf-regex-0.0.25" = { name = "suf-regex"; packageName = "suf-regex"; @@ -50467,13 +50467,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.27.11" = { + "systeminformation-4.28.1" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.27.11"; + version = "4.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.27.11.tgz"; - sha512 = "U7bigXbOnsB8k1vNHS0Y13RCsRz5/UohiUmND+3mMUL6vfzrpbe/h4ZqewowB+B+tJNnmGFDj08Z8xGfYo45dQ=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.28.1.tgz"; + sha512 = "g9WQy+Igsf0efbbTlXzDkV7iYeUerFJeqI/zh07F9sWHxclejmXn5hrGdgHf2ok+1DuRmC9t4mEh7XS0b8Zk9w=="; }; }; "syswide-cas-5.3.0" = { @@ -51854,13 +51854,13 @@ let sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29"; }; }; - "torrent-discovery-9.3.0" = { + "torrent-discovery-9.4.0" = { name = "torrent-discovery"; packageName = "torrent-discovery"; - version = "9.3.0"; + version = "9.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.3.0.tgz"; - sha512 = "rdOfm+o6d+E+nRjeYiCzXGrM9ou7spkZpxu9xhnfKoTJgtWpSYEHXO4BT9hwVF1uoUpm+hOwNnwgkSfBZNMh7g=="; + url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.4.0.tgz"; + sha512 = "+YW9JGbO5bCuDw9YYW//p4iVLV0aP4C+AYrNQjL/+dSNPUtD1ufK1V8UZERt6rIoeNGhutkSVyeO4Fid9Tjxjg=="; }; }; "torrent-piece-1.1.2" = { @@ -52601,6 +52601,15 @@ let sha512 = "eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg=="; }; }; + "type-fest-0.18.0" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.18.0.tgz"; + sha512 = "fbDukFPnJBdn2eZ3RR+5mK2slHLFd6gYHY7jna1KWWy4Yr4XysHuCdXRzy+RiG/HwG4WJat00vdC2UHky5eKiQ=="; + }; + }; "type-fest-0.3.1" = { name = "type-fest"; packageName = "type-fest"; @@ -52826,13 +52835,13 @@ let sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; - "uglify-js-3.11.2" = { + "uglify-js-3.11.4" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.11.2"; + version = "3.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.2.tgz"; - sha512 = "G440NU6fewtnQftSgqRV1r2A5ChKbU1gqFCJ7I8S7MPpY/eZZfLGefaY6gUZYiWebMaO+txgiQ1ZyLDuNWJulg=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.4.tgz"; + sha512 = "FyYnoxVL1D6+jDGQpbK5jW6y/2JlVfRfEeQ67BPCUg5wfCjaKOpr2XeceE4QL+MkhxliLtf5EbrMDZgzpt2CNw=="; }; }; "uglify-js-3.11.5" = { @@ -54114,13 +54123,13 @@ let sha256 = "e23c172456a8fa0af48dba3f89ca0d525dd870408f7bd6ad1d776cdbe13f0489"; }; }; - "ut_metadata-3.5.1" = { + "ut_metadata-3.5.2" = { name = "ut_metadata"; packageName = "ut_metadata"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.5.1.tgz"; - sha512 = "D98YM9dKGHzNFUuqLHLV1vXqbHNfyvTx/rADtvF9P6D1HYV/0JuArlpnQIHhOuWXQGUVyR5XJGRVLKbeNu0o5A=="; + url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.5.2.tgz"; + sha512 = "3XZZuJSeoIUyMYSuDbTbVtP4KAVGHPfU8nmHFkr8LJc+THCaUXwnu/2AV+LCSLarET/hL9IlbNfYTGrt6fOVuQ=="; }; }; "ut_pex-2.0.1" = { @@ -55392,6 +55401,15 @@ let sha512 = "IAgsltQPwg/pXOPsdXgbUTCaO9VSKZwirZN5SGtkdYQ/R3VjeC4v00WTVvoNayWMZpoC3O9u0ogqmsKzKhVasQ=="; }; }; + "vscode-jsonrpc-6.0.0-next.7" = { + name = "vscode-jsonrpc"; + packageName = "vscode-jsonrpc"; + version = "6.0.0-next.7"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.7.tgz"; + sha512 = "1nG+6cuTtpzmXe7yYfO9GCkYlyV6Ai+jDnwidHiT2T7zhc+bJM+VTtc0T/CdTlDyTNTqIcCj0V1nD4TcVjJ7Ug=="; + }; + }; "vscode-languageclient-4.0.1" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; @@ -55401,13 +55419,13 @@ let sha512 = "0fuBZj9pMkeJ8OMyIvSGeRaRVhUaJt+yeFxi7a3sz/AbrngQdcxOovMXPgKuieoBSBKS05gXPS88BsWpJZfBkA=="; }; }; - "vscode-languageclient-7.0.0-next.9" = { + "vscode-languageclient-7.0.0-next.12" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; - version = "7.0.0-next.9"; + version = "7.0.0-next.12"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.9.tgz"; - sha512 = "lFO+rN/i72CM2va6iKXq1lD7pJg8J93KEXf0w0boWVqU+DJhWzLrV3pXl8Xk1nCv//qOAyhlc/nx2KZCTeRF/A=="; + url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.12.tgz"; + sha512 = "OrzvOvhS5o26C0KctTJC7hkwh3avCwkVhllzy42AqwpIUZ3p2aVqkSG2uVxaeodq8ThBb3TLgtg50vxyWs6FEg=="; }; }; "vscode-languageserver-3.5.1" = { @@ -55500,6 +55518,15 @@ let sha512 = "zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw=="; }; }; + "vscode-languageserver-protocol-3.16.0-next.10" = { + name = "vscode-languageserver-protocol"; + packageName = "vscode-languageserver-protocol"; + version = "3.16.0-next.10"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.10.tgz"; + sha512 = "YRTctHUZvts0Z1xXKNYU0ha0o+Tlgtwr+6O8OmDquM086N8exiSKBMwMC+Ra1QtIE+1mfW43Wxsme2FnMkAS9A=="; + }; + }; "vscode-languageserver-protocol-3.16.0-next.2" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; @@ -56022,15 +56049,6 @@ let sha512 = "GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g=="; }; }; - "webpack-4.44.1" = { - name = "webpack"; - packageName = "webpack"; - version = "4.44.1"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.44.1.tgz"; - sha512 = "4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ=="; - }; - }; "webpack-4.44.2" = { name = "webpack"; packageName = "webpack"; @@ -56040,6 +56058,15 @@ let sha512 = "6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q=="; }; }; + "webpack-5.4.0" = { + name = "webpack"; + packageName = "webpack"; + version = "5.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack/-/webpack-5.4.0.tgz"; + sha512 = "udpYTyqz8toTTdaOsL2QKPLeZLt2IEm9qY7yTXuFEQhKu5bk0yQD9BtAdVQksmz4jFbbWOiWmm3NHarO0zr/ng=="; + }; + }; "webpack-cli-3.3.12" = { name = "webpack-cli"; packageName = "webpack-cli"; @@ -56112,13 +56139,13 @@ let sha512 = "TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g=="; }; }; - "webpack-node-externals-2.5.1" = { + "webpack-node-externals-2.5.2" = { name = "webpack-node-externals"; packageName = "webpack-node-externals"; - version = "2.5.1"; + version = "2.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-2.5.1.tgz"; - sha512 = "RWxKGibUU5kuJT6JDYmXGa3QsZskqIaiBvZ2wBxHlJzWVJPOyBMnroXf23uxEHnj1rYS8jNdyUfrNAXJ2bANNw=="; + url = "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-2.5.2.tgz"; + sha512 = "aHdl/y2N7PW2Sx7K+r3AxpJO+aDMcYzMQd60Qxefq3+EwhewSbTBqNumOsCE1JsCUNoyfGj5465N0sSf6hc/5w=="; }; }; "webpack-sources-1.4.3" = { @@ -56220,13 +56247,13 @@ let sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw=="; }; }; - "whatwg-fetch-3.4.1" = { + "whatwg-fetch-3.5.0" = { name = "whatwg-fetch"; packageName = "whatwg-fetch"; - version = "3.4.1"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.4.1.tgz"; - sha512 = "sofZVzE1wKwO+EYPbWfiwzaKovWiZXf4coEzjGP9b2GBVgQRLQUZ2QcuPpQExGDAW5GItpEm6Tl4OU5mywnAoQ=="; + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz"; + sha512 = "jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A=="; }; }; "whatwg-mimetype-2.3.0" = { @@ -56499,6 +56526,15 @@ let sha512 = "OSOGH1QYiW5yVor9TtmXKQvt2vjQqbYS+DqmsZw+r7xDwLXEeT3JGW0ZppFmHx4diyXmxt238KFR3N9jzevBRg=="; }; }; + "windows-release-4.0.0" = { + name = "windows-release"; + packageName = "windows-release"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz"; + sha512 = "OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg=="; + }; + }; "winreg-0.0.12" = { name = "winreg"; packageName = "winreg"; @@ -58288,7 +58324,7 @@ in sources."inquirer-7.3.3" sources."ip-1.1.5" sources."is-callable-1.2.2" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-date-object-1.0.2" sources."is-docker-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -58583,7 +58619,7 @@ in sources."bops-0.0.7" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - (sources."buffer-5.7.0" // { + (sources."buffer-5.7.1" // { dependencies = [ sources."base64-js-1.3.1" ]; @@ -59034,40 +59070,38 @@ in "@nestjs/cli" = nodeEnv.buildNodePackage { name = "_at_nestjs_slash_cli"; packageName = "@nestjs/cli"; - version = "7.5.1"; + version = "7.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/cli/-/cli-7.5.1.tgz"; - sha512 = "18EfBO48ojVm7YzwyPc8PRjas9KcIVjdlD+v7tIImKzrf5THcpAYxvzUvZUspSbLIIIqwTgKj/loqamkwOk/XA=="; + url = "https://registry.npmjs.org/@nestjs/cli/-/cli-7.5.2.tgz"; + sha512 = "qxh5aqQbxzQe8Tuc3CF8nLb1KsWCjLabSAZm+hlxrWYSJzbffbn947MPmsIwZdXgAXZ6AprmJV5KeB2U6DoM+w=="; }; dependencies = [ - sources."@angular-devkit/core-10.0.7" - (sources."@angular-devkit/schematics-10.0.7" // { + sources."@angular-devkit/core-10.2.0" + (sources."@angular-devkit/schematics-10.2.0" // { dependencies = [ - sources."ora-4.0.4" - ]; - }) - (sources."@angular-devkit/schematics-cli-0.1000.7" // { - dependencies = [ - sources."inquirer-7.1.0" + sources."chalk-4.1.0" + sources."ora-5.0.0" ]; }) + sources."@angular-devkit/schematics-cli-0.1002.0" sources."@babel/code-frame-7.10.4" sources."@babel/helper-validator-identifier-7.10.4" (sources."@babel/highlight-7.10.4" // { dependencies = [ + sources."ansi-styles-3.2.1" sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" ]; }) - (sources."@nestjs/schematics-7.2.1" // { - dependencies = [ - sources."@angular-devkit/core-10.2.0" - sources."@angular-devkit/schematics-10.2.0" - sources."ajv-6.12.4" - sources."rxjs-6.6.2" - ]; - }) - sources."@schematics/schematics-0.1000.7" + sources."@nestjs/schematics-7.2.1" + sources."@schematics/schematics-0.1002.0" sources."@types/anymatch-1.3.1" + sources."@types/eslint-7.2.4" + sources."@types/eslint-scope-3.7.0" + sources."@types/estree-0.0.45" sources."@types/json-schema-7.0.6" sources."@types/json5-0.0.29" sources."@types/node-14.14.6" @@ -59079,7 +59113,7 @@ in sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-4.41.21" // { + (sources."@types/webpack-4.41.24" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -59105,177 +59139,50 @@ in sources."@webassemblyjs/wast-printer-1.9.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-6.4.2" - sources."ajv-6.12.3" - sources."ajv-errors-1.0.1" + sources."acorn-8.0.4" + sources."ajv-6.12.4" sources."ajv-keywords-3.5.2" sources."ansi-escapes-4.3.1" sources."ansi-regex-5.0.0" - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.3.0" sources."anymatch-3.1.1" - sources."aproba-1.2.0" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" - sources."array-unique-0.3.2" - (sources."asn1.js-5.4.1" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) - (sources."assert-1.5.0" // { - dependencies = [ - sources."inherits-2.0.1" - sources."util-0.10.3" - ]; - }) - sources."assign-symbols-1.0.0" - sources."async-each-1.0.3" sources."at-least-node-1.0.0" - sources."atob-2.1.2" sources."balanced-match-1.0.0" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - sources."base64-js-1.3.1" - sources."big.js-5.2.2" sources."binary-extensions-2.1.0" - sources."bindings-1.5.0" - sources."bluebird-3.7.2" - sources."bn.js-5.1.3" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."brorand-1.1.0" - sources."browserify-aes-1.2.0" - sources."browserify-cipher-1.0.1" - sources."browserify-des-1.0.2" - (sources."browserify-rsa-4.0.1" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) - (sources."browserify-sign-4.2.1" // { - dependencies = [ - sources."readable-stream-3.6.0" - sources."safe-buffer-5.2.1" - ]; - }) - sources."browserify-zlib-0.2.0" - sources."buffer-4.9.2" + sources."browserslist-4.14.6" sources."buffer-from-1.1.1" - sources."buffer-xor-1.0.3" - sources."builtin-status-codes-3.0.0" - (sources."cacache-12.0.4" // { - dependencies = [ - sources."rimraf-2.7.1" - ]; - }) - sources."cache-base-1.0.1" sources."callsites-3.1.0" - (sources."chalk-3.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) + sources."caniuse-lite-1.0.30001156" + sources."chalk-3.0.0" sources."chardet-0.7.0" - sources."chokidar-3.4.2" - sources."chownr-1.1.4" + sources."chokidar-3.4.3" sources."chrome-trace-event-1.0.2" - sources."cipher-base-1.0.4" - (sources."class-utils-0.3.6" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) sources."cli-cursor-3.1.0" sources."cli-spinners-2.5.0" - (sources."cli-table3-0.5.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) - sources."cli-width-2.2.1" + sources."cli-table3-0.5.1" + sources."cli-width-3.0.0" sources."clone-1.0.4" - sources."collection-visit-1.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."colors-1.4.0" sources."commander-4.1.1" - sources."commondir-1.0.1" - sources."component-emitter-1.3.0" sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - sources."console-browserify-1.2.0" - sources."constants-browserify-1.0.0" - (sources."copy-concurrently-1.0.5" // { - dependencies = [ - sources."rimraf-2.7.1" - ]; - }) - sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."cosmiconfig-6.0.0" - (sources."create-ecdh-4.0.4" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) - sources."create-hash-1.2.0" - sources."create-hmac-1.1.7" - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."crypto-browserify-3.12.0" - sources."cyclist-1.0.1" - sources."debug-2.6.9" - sources."decode-uri-component-0.2.0" + sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."define-property-2.0.2" - sources."des.js-1.0.1" - (sources."diffie-hellman-5.0.3" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) - sources."domain-browser-1.2.0" - sources."duplexify-3.7.1" - (sources."elliptic-6.5.3" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) + sources."electron-to-chromium-1.3.589" sources."emoji-regex-8.0.0" - sources."emojis-list-3.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-4.3.0" sources."errno-0.1.7" sources."error-ex-1.3.2" + sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" - sources."eslint-scope-4.0.3" + sources."eslint-scope-5.1.1" (sources."esrecurse-4.3.0" // { dependencies = [ sources."estraverse-5.2.0" @@ -59283,134 +59190,55 @@ in }) sources."estraverse-4.3.0" sources."events-3.2.0" - sources."evp_bytestokey-1.0.3" - sources."execa-1.0.0" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) + sources."execa-4.1.0" sources."external-editor-3.1.0" - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - sources."figgy-pudding-3.5.2" sources."figures-3.2.0" - sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" - sources."find-cache-dir-2.1.0" - sources."find-up-3.0.0" - sources."flush-write-stream-1.1.1" - sources."for-in-1.0.2" - (sources."fork-ts-checker-webpack-plugin-5.1.0" // { + sources."find-up-4.1.0" + (sources."fork-ts-checker-webpack-plugin-5.2.1" // { dependencies = [ - sources."ansi-styles-4.3.0" sources."chalk-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" ]; }) - sources."fragment-cache-0.2.1" - sources."from2-2.3.0" sources."fs-extra-9.0.1" sources."fs-monkey-1.0.1" - sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" sources."function-bind-1.1.1" - sources."get-stream-4.1.0" - sources."get-value-2.0.6" + sources."get-stream-5.2.0" sources."glob-7.1.6" sources."glob-parent-5.1.1" + sources."glob-to-regexp-0.4.1" sources."graceful-fs-4.2.4" sources."has-1.0.3" - sources."has-flag-3.0.0" - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."kind-of-4.0.0" - ]; - }) - (sources."hash-base-3.1.0" // { - dependencies = [ - sources."readable-stream-3.6.0" - sources."safe-buffer-5.2.1" - ]; - }) - sources."hash.js-1.1.7" - sources."hmac-drbg-1.0.1" - sources."https-browserify-1.0.0" + sources."has-flag-4.0.0" + sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" - sources."iferr-0.1.5" sources."import-fresh-3.2.2" - sources."imurmurhash-0.1.4" - sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" (sources."inquirer-7.3.3" // { dependencies = [ - sources."ansi-styles-4.3.0" sources."chalk-4.1.0" - sources."cli-width-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."rxjs-6.6.3" - sources."supports-color-7.2.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" ]; }) sources."interpret-1.4.0" - sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" - sources."is-buffer-1.1.6" - sources."is-core-module-2.0.0" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" - sources."is-extendable-0.1.1" + sources."is-core-module-2.1.0" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" sources."is-interactive-1.0.0" sources."is-number-7.0.0" - sources."is-plain-object-2.0.4" - sources."is-stream-1.1.0" - sources."is-windows-1.0.2" - sources."is-wsl-1.1.0" + sources."is-stream-2.0.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-3.0.1" + sources."jest-worker-26.6.2" sources."js-tokens-4.0.0" sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-2.3.1" @@ -59421,372 +59249,152 @@ in sources."universalify-2.0.0" ]; }) - sources."kind-of-6.0.3" sources."lines-and-columns-1.1.6" - sources."loader-runner-2.4.0" - sources."loader-utils-1.4.0" - sources."locate-path-3.0.0" + sources."loader-runner-4.1.0" + sources."locate-path-5.0.0" sources."lodash-4.17.20" sources."lodash.toarray-4.4.0" - (sources."log-symbols-3.0.0" // { + (sources."log-symbols-4.0.0" // { dependencies = [ - sources."chalk-2.4.2" + sources."chalk-4.1.0" ]; }) - sources."lru-cache-5.1.1" sources."macos-release-2.4.1" sources."magic-string-0.25.7" - (sources."make-dir-2.1.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" - sources."md5.js-1.3.5" sources."memfs-3.2.0" sources."memory-fs-0.5.0" - (sources."micromatch-3.1.10" // { - dependencies = [ - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-range-2.1.1" - ]; - }) - (sources."miller-rabin-4.0.1" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) + sources."merge-stream-2.0.0" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-2.1.0" - sources."minimalistic-assert-1.0.1" - sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mississippi-3.0.0" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."mkdirp-0.5.5" - (sources."move-concurrently-1.0.1" // { - dependencies = [ - sources."rimraf-2.7.1" - ]; - }) - sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nan-2.14.2" - sources."nanomatch-1.2.13" sources."neo-async-2.6.2" - sources."nice-try-1.0.5" sources."node-emoji-1.10.0" - (sources."node-libs-browser-2.2.1" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."node-releases-1.1.65" sources."normalize-path-3.0.0" - sources."npm-run-path-2.0.2" + sources."npm-run-path-4.0.1" sources."object-assign-4.1.1" - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" - ]; - }) - sources."object-visit-1.0.1" - sources."object.pick-1.3.0" sources."once-1.4.0" sources."onetime-5.1.2" - (sources."ora-5.0.0" // { + (sources."ora-5.1.0" // { dependencies = [ - sources."ansi-styles-4.3.0" sources."chalk-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."log-symbols-4.0.0" - sources."supports-color-7.2.0" ]; }) - sources."os-browserify-0.3.0" - sources."os-name-3.1.0" + sources."os-name-4.0.0" sources."os-tmpdir-1.0.2" - sources."p-finally-1.0.0" sources."p-limit-2.3.0" - sources."p-locate-3.0.0" + sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."pako-1.0.11" - sources."parallel-transform-1.2.0" sources."parent-module-1.0.1" - sources."parse-asn1-5.1.6" sources."parse-json-5.1.0" - sources."pascalcase-0.1.1" - sources."path-browserify-0.0.1" - sources."path-dirname-1.0.2" - sources."path-exists-3.0.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" + sources."path-key-3.1.1" sources."path-parse-1.0.6" sources."path-type-4.0.0" - sources."pbkdf2-3.1.1" sources."picomatch-2.2.2" - sources."pify-4.0.1" - sources."pkg-dir-3.0.0" + sources."pkg-dir-4.2.0" sources."pluralize-8.0.0" - sources."posix-character-classes-0.1.1" - sources."process-0.11.10" sources."process-nextick-args-2.0.1" - sources."promise-inflight-1.0.1" sources."prr-1.0.1" - (sources."public-encrypt-4.0.3" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) sources."pump-3.0.0" - (sources."pumpify-1.5.1" // { - dependencies = [ - sources."pump-2.0.1" - ]; - }) sources."punycode-2.1.1" - sources."querystring-0.2.0" - sources."querystring-es3-0.2.1" sources."randombytes-2.1.0" - sources."randomfill-1.0.4" sources."readable-stream-2.3.7" - sources."readdirp-3.4.0" + sources."readdirp-3.5.0" sources."rechoir-0.6.2" - sources."regex-not-1.0.2" - sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.3" - sources."repeat-string-1.6.1" sources."resolve-1.18.1" sources."resolve-from-4.0.0" - sources."resolve-url-0.2.1" sources."restore-cursor-3.1.0" - sources."ret-0.1.15" sources."rimraf-3.0.2" - sources."ripemd160-2.0.2" sources."run-async-2.4.1" - sources."run-queue-1.0.3" - sources."rxjs-6.5.5" + sources."rxjs-6.6.2" sources."safe-buffer-5.1.2" - sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."schema-utils-2.7.0" sources."semver-7.3.2" - sources."serialize-javascript-4.0.0" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."setimmediate-1.0.5" - sources."sha.js-2.4.11" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."serialize-javascript-5.0.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."shelljs-0.8.4" sources."signal-exit-3.0.3" - (sources."snapdragon-0.8.2" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - sources."source-map-0.5.7" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) sources."source-list-map-2.0.1" sources."source-map-0.7.3" - sources."source-map-resolve-0.5.3" (sources."source-map-support-0.5.19" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."source-map-url-0.4.0" sources."sourcemap-codec-1.4.8" - sources."split-string-3.1.0" - sources."ssri-6.0.1" - (sources."static-extend-0.1.2" // { + (sources."string-width-2.1.1" // { dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" ]; }) - sources."stream-browserify-2.0.2" - sources."stream-each-1.2.3" - sources."stream-http-2.8.3" - sources."stream-shift-1.0.1" - sources."string-width-4.2.0" sources."string_decoder-1.1.1" sources."strip-ansi-6.0.0" sources."strip-bom-3.0.0" - sources."strip-eof-1.0.0" - sources."supports-color-5.5.0" + sources."strip-final-newline-2.0.0" + sources."supports-color-7.2.0" sources."symbol-observable-1.2.0" sources."tapable-1.1.3" - (sources."terser-4.8.0" // { + (sources."terser-5.3.8" // { dependencies = [ sources."commander-2.20.3" - sources."source-map-0.6.1" ]; }) - (sources."terser-webpack-plugin-1.4.5" // { + (sources."terser-webpack-plugin-5.0.3" // { dependencies = [ - sources."schema-utils-1.0.0" + sources."ajv-6.12.6" + sources."p-limit-3.0.2" + sources."schema-utils-3.0.0" sources."source-map-0.6.1" ]; }) sources."through-2.3.8" - sources."through2-2.0.5" - sources."timers-browserify-2.0.12" sources."tmp-0.0.33" - sources."to-arraybuffer-1.0.1" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-3.0.2" sources."to-regex-range-5.0.1" sources."tree-kill-1.2.2" sources."tsconfig-paths-3.9.0" (sources."tsconfig-paths-webpack-plugin-3.3.0" // { dependencies = [ + sources."ansi-styles-3.2.1" sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" ]; }) sources."tslib-1.14.1" - sources."tty-browserify-0.0.0" sources."type-fest-0.11.0" - sources."typedarray-0.0.6" - sources."typescript-3.9.7" - sources."union-value-1.0.1" - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" + sources."typescript-4.0.5" sources."universalify-1.0.0" - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - ]; - }) - sources."upath-1.2.0" sources."uri-js-4.4.0" - sources."urix-0.1.0" - (sources."url-0.11.0" // { - dependencies = [ - sources."punycode-1.3.2" - ]; - }) - sources."use-3.1.1" - (sources."util-0.11.1" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) sources."util-deprecate-1.0.2" - sources."vm-browserify-1.1.2" - sources."watchpack-1.7.4" - (sources."watchpack-chokidar2-2.0.0" // { - dependencies = [ - sources."anymatch-2.0.0" - sources."binary-extensions-1.13.1" - sources."braces-2.3.2" - sources."chokidar-2.1.8" - sources."extend-shallow-2.0.1" - sources."fill-range-4.0.0" - sources."fsevents-1.2.13" - sources."glob-parent-3.1.0" - sources."is-binary-path-1.0.1" - sources."is-glob-3.1.0" - sources."is-number-3.0.0" - sources."kind-of-3.2.2" - sources."normalize-path-2.1.1" - sources."readdirp-2.2.1" - sources."to-regex-range-2.1.1" - ]; - }) + sources."watchpack-2.0.1" sources."wcwidth-1.0.1" - (sources."webpack-4.44.1" // { + (sources."webpack-5.4.0" // { dependencies = [ - sources."memory-fs-0.4.1" - sources."schema-utils-1.0.0" + sources."ajv-6.12.6" + sources."enhanced-resolve-5.3.1" + sources."schema-utils-3.0.0" + sources."tapable-2.0.0" ]; }) - sources."webpack-node-externals-2.5.1" - (sources."webpack-sources-1.4.3" // { + sources."webpack-node-externals-2.5.2" + (sources."webpack-sources-2.2.0" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."which-1.3.1" - sources."windows-release-3.3.3" - sources."worker-farm-1.7.0" + sources."which-2.0.2" + sources."windows-release-4.0.0" sources."wrappy-1.0.2" - sources."xtend-4.0.2" - sources."y18n-4.0.0" - sources."yallist-3.1.1" sources."yaml-1.10.0" ]; buildInputs = globalBuildInputs; @@ -59809,7 +59417,7 @@ in }; dependencies = [ sources."@akryum/winattr-3.0.0" - sources."@apollo/federation-0.20.2" + sources."@apollo/federation-0.20.4" (sources."@apollo/protobufjs-1.0.5" // { dependencies = [ sources."@types/node-10.17.44" @@ -59825,14 +59433,13 @@ in sources."@babel/compat-data-7.12.5" (sources."@babel/core-7.12.3" // { dependencies = [ - sources."@babel/generator-7.12.5" - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" sources."semver-5.7.1" ]; }) - (sources."@babel/generator-7.11.6" // { + (sources."@babel/generator-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" ]; }) sources."@babel/helper-annotate-as-pure-7.10.4" @@ -59846,12 +59453,12 @@ in sources."@babel/helper-create-regexp-features-plugin-7.12.1" (sources."@babel/helper-define-map-7.10.5" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" ]; }) (sources."@babel/helper-explode-assignable-expression-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" ]; }) sources."@babel/helper-function-name-7.10.4" @@ -59859,17 +59466,17 @@ in sources."@babel/helper-hoist-variables-7.10.4" (sources."@babel/helper-member-expression-to-functions-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" ]; }) (sources."@babel/helper-module-imports-7.12.5" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" ]; }) (sources."@babel/helper-module-transforms-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" ]; }) sources."@babel/helper-optimise-call-expression-7.10.4" @@ -59877,27 +59484,27 @@ in sources."@babel/helper-regex-7.10.5" (sources."@babel/helper-remap-async-to-generator-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" ]; }) (sources."@babel/helper-replace-supers-7.12.5" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" ]; }) (sources."@babel/helper-simple-access-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" ]; }) (sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" ]; }) (sources."@babel/helper-split-export-declaration-7.11.0" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" ]; }) sources."@babel/helper-validator-identifier-7.10.4" @@ -59905,7 +59512,7 @@ in sources."@babel/helper-wrap-function-7.12.3" (sources."@babel/helpers-7.12.5" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" ]; }) sources."@babel/highlight-7.10.4" @@ -59973,7 +59580,7 @@ in sources."@babel/plugin-transform-unicode-regex-7.12.1" (sources."@babel/preset-env-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" sources."semver-5.7.1" ]; }) @@ -59992,7 +59599,7 @@ in (sources."@babel/traverse-7.12.5" // { dependencies = [ sources."@babel/generator-7.12.5" - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" ]; }) sources."@babel/types-7.10.4" @@ -60070,9 +59677,10 @@ in sources."strip-ansi-5.2.0" ]; }) - (sources."@oclif/plugin-plugins-1.9.0" // { + (sources."@oclif/plugin-plugins-1.9.1" // { dependencies = [ - sources."npm-run-path-3.1.0" + sources."fs-extra-9.0.1" + sources."npm-run-path-4.0.1" sources."path-key-3.1.1" sources."semver-7.3.2" sources."tslib-2.0.3" @@ -60151,14 +59759,14 @@ in sources."@vue/cli-ui-addon-widgets-4.5.8" (sources."@vue/compiler-core-3.0.2" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" sources."source-map-0.6.1" ]; }) sources."@vue/compiler-dom-3.0.2" (sources."@vue/compiler-sfc-3.0.2" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" sources."source-map-0.6.1" ]; }) @@ -60210,7 +59818,7 @@ in sources."to-regex-range-2.1.1" ]; }) - (sources."apollo-2.31.0" // { + (sources."apollo-2.31.1" // { dependencies = [ sources."mkdirp-1.0.4" sources."strip-ansi-5.2.0" @@ -60220,21 +59828,21 @@ in sources."apollo-cache-control-0.11.4" sources."apollo-cache-inmemory-1.6.6" sources."apollo-client-2.6.10" - (sources."apollo-codegen-core-0.38.0" // { + (sources."apollo-codegen-core-0.38.1" // { dependencies = [ sources."recast-0.20.4" sources."source-map-0.6.1" sources."tslib-2.0.3" ]; }) - sources."apollo-codegen-flow-0.36.0" - sources."apollo-codegen-scala-0.37.0" - sources."apollo-codegen-swift-0.38.0" - sources."apollo-codegen-typescript-0.38.0" + sources."apollo-codegen-flow-0.36.1" + sources."apollo-codegen-scala-0.37.1" + sources."apollo-codegen-swift-0.38.1" + sources."apollo-codegen-typescript-0.38.1" sources."apollo-datasource-0.7.2" sources."apollo-env-0.6.5" sources."apollo-graphql-0.6.0" - sources."apollo-language-server-1.24.0" + sources."apollo-language-server-1.24.1" sources."apollo-link-1.2.14" sources."apollo-link-context-1.0.20" sources."apollo-link-error-1.1.13" @@ -60342,7 +59950,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browserslist-4.14.6" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -60369,7 +59977,7 @@ in sources."callsites-2.0.0" sources."camel-case-4.1.1" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001154" + sources."caniuse-lite-1.0.30001156" sources."capital-case-1.0.3" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" @@ -60485,8 +60093,8 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-3.6.5" - (sources."core-js-compat-3.6.5" // { + sources."core-js-3.7.0" + (sources."core-js-compat-3.7.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -60577,7 +60185,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.587" + sources."electron-to-chromium-1.3.589" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -60709,7 +60317,7 @@ in ]; }) sources."git-up-4.0.2" - sources."git-url-parse-11.2.0" + sources."git-url-parse-11.4.0" sources."glob-7.1.5" sources."glob-parent-5.1.1" sources."glob-to-regexp-0.3.0" @@ -60851,7 +60459,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-ci-1.2.1" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -61032,7 +60640,7 @@ in ]; }) sources."mkdirp-0.5.5" - sources."moment-2.28.0" + sources."moment-2.29.1" sources."ms-2.0.0" sources."mute-stream-0.0.8" sources."nan-2.14.2" @@ -61783,7 +61391,7 @@ in sources."@babel/highlight-7.10.4" sources."@babel/parser-7.12.5" sources."@babel/template-7.10.4" - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" sources."@webassemblyjs/ast-1.9.1" sources."@webassemblyjs/floating-point-hex-parser-1.9.1" sources."@webassemblyjs/helper-api-error-1.9.1" @@ -61888,7 +61496,7 @@ in sources."@babel/parser-7.12.5" sources."@babel/template-7.10.4" sources."@babel/traverse-7.12.5" - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -61929,7 +61537,7 @@ in sources."homedir-polyfill-1.0.3" sources."ini-1.3.5" sources."is-3.3.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-windows-1.0.2" sources."isexe-2.0.0" sources."js-tokens-4.0.0" @@ -62219,7 +61827,7 @@ in sources."inherits-2.0.4" sources."intersect-1.0.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-finite-1.1.0" sources."is-plain-obj-1.1.0" sources."is-utf8-0.2.1" @@ -62423,7 +62031,7 @@ in sources."is-arguments-1.0.4" sources."is-buffer-1.1.6" sources."is-callable-1.2.2" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-date-object-1.0.2" sources."is-generator-function-1.0.7" sources."is-negative-zero-2.0.0" @@ -62704,7 +62312,7 @@ in sources."ip-set-1.0.2" sources."ipaddr.js-2.0.0" sources."is-arrayish-0.2.1" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-finite-1.1.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -63050,7 +62658,7 @@ in sources."pkginfo-0.4.1" sources."prompt-1.0.0" sources."punycode-2.1.1" - sources."query-string-6.13.6" + sources."query-string-6.13.7" sources."read-1.0.7" sources."revalidator-0.1.8" sources."rimraf-2.7.1" @@ -63063,7 +62671,7 @@ in sources."universal-url-2.0.0" sources."utile-0.3.0" sources."webidl-conversions-4.0.2" - sources."whatwg-fetch-3.4.1" + sources."whatwg-fetch-3.5.0" sources."whatwg-url-7.1.0" (sources."winston-2.1.1" // { dependencies = [ @@ -63277,10 +62885,10 @@ in coc-jest = nodeEnv.buildNodePackage { name = "coc-jest"; packageName = "coc-jest"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-jest/-/coc-jest-1.1.1.tgz"; - sha512 = "9Gkw9wznxtYIiPbgORZqwN5sjHQQYe2rZBvYNPMX2AVlF++OuTXUfy4Aidw6hstbzxKR8JEnjez7JiVaUF6M/A=="; + url = "https://registry.npmjs.org/coc-jest/-/coc-jest-1.1.2.tgz"; + sha512 = "vQKfTnF+LMEJEDR/+oTWowOUylr2+3pkOHGUr+OgNMhdjQPy+K1/Kcuqkm4qTpmhQFwg7OzF7GYDfoQojEEmBQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -63612,7 +63220,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001154" + sources."caniuse-lite-1.0.30001156" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" sources."chalk-2.4.2" @@ -63669,7 +63277,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.6.5" + sources."core-js-3.7.0" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" (sources."cross-spawn-6.0.5" // { @@ -63709,7 +63317,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.587" + sources."electron-to-chromium-1.3.589" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -63916,7 +63524,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-ci-1.2.1" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -64584,10 +64192,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "2.2.3"; + version = "2.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.2.3.tgz"; - sha512 = "mK3oTm3gjQzV37Hq9r/bTj2N63p5tzO7IppuksQ7Yk0hURrHUzyx58PdBhfVOsD77FIo37dY1E0gOXv5t7a1dg=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.2.5.tgz"; + sha512 = "YtWw6yFdKxgIxjoUyEgzmT3YVtp3JX7AZUOYDbbnPbneyck5poZyOpjwL+3Wu2TzohDtg2H4ivTDyttv2wXvRQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -64646,7 +64254,7 @@ in sources."@babel/parser-7.12.5" sources."@babel/template-7.10.4" sources."@babel/traverse-7.12.5" - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -64671,7 +64279,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001154" + sources."caniuse-lite-1.0.30001156" sources."ccount-1.1.0" (sources."chalk-4.1.0" // { dependencies = [ @@ -64712,7 +64320,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.587" + sources."electron-to-chromium-1.3.589" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -64767,7 +64375,7 @@ in sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-decimal-1.0.4" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -65006,7 +64614,7 @@ in sources."has-flag-3.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."minimatch-3.0.4" @@ -65121,7 +64729,7 @@ in sources."@nodelib/fs.walk-1.2.4" sources."@prettier/plugin-pug-1.10.1" sources."@sindresorhus/is-0.14.0" - sources."@sorg/log-2.2.0" + sources."@sorg/log-2.2.1" sources."@starptech/expression-parser-0.10.0" sources."@starptech/hast-util-from-webparser-0.10.0" (sources."@starptech/prettyhtml-0.10.0" // { @@ -65306,7 +64914,7 @@ in sources."config-chain-1.1.12" sources."configstore-4.0.0" sources."copy-descriptor-0.1.1" - sources."core-js-3.6.5" + sources."core-js-3.7.0" sources."core-util-is-1.0.2" sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" @@ -65316,7 +64924,6 @@ in ]; }) sources."css-parse-2.0.0" - sources."csstype-2.6.13" sources."currently-unhandled-0.4.1" sources."debug-3.2.6" sources."decamelize-1.2.0" @@ -65496,7 +65103,7 @@ in sources."format-0.2.2" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-2.2.0" + sources."fsevents-2.2.1" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-caller-file-1.0.3" @@ -65583,7 +65190,7 @@ in sources."is-binary-path-2.1.0" sources."is-buffer-2.0.5" sources."is-ci-2.0.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-data-descriptor-1.0.0" sources."is-decimal-1.0.4" sources."is-descriptor-1.0.2" @@ -65691,7 +65298,6 @@ in sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."nice-try-1.0.5" - sources."node-fetch-2.6.1" sources."nopt-5.0.0" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" @@ -65866,7 +65472,7 @@ in sources."run-async-2.4.1" sources."run-parallel-1.1.10" sources."rxjs-6.6.3" - sources."s.color-0.0.13" + sources."s.color-0.0.15" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -65995,8 +65601,6 @@ in ]; }) sources."stylus-supremacy-2.14.5" - sources."suf-cli-0.1.3" - sources."suf-node-1.2.1" sources."suf-regex-0.0.25" sources."supports-color-5.5.0" sources."symbol-0.2.3" @@ -66648,7 +66252,7 @@ in sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-ci-2.0.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-docker-2.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" @@ -66846,7 +66450,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."systeminformation-4.27.11" + sources."systeminformation-4.28.1" sources."term-size-2.2.1" sources."through-2.3.8" sources."tmp-0.2.1" @@ -67073,7 +66677,7 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -68418,7 +68022,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.784.0" + sources."aws-sdk-2.786.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.3.1" @@ -68589,7 +68193,7 @@ in sources."@babel/plugin-transform-react-jsx-7.12.5" sources."@babel/template-7.10.4" sources."@babel/traverse-7.12.5" - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" sources."@sindresorhus/is-4.0.0" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" @@ -68716,7 +68320,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-docker-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-obj-2.0.0" @@ -68921,10 +68525,10 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.149.3" - sources."@fluentui/react-focus-7.16.16" + sources."@fluentui/react-7.149.4" + sources."@fluentui/react-focus-7.16.17" sources."@fluentui/react-window-provider-1.0.1" - sources."@fluentui/theme-1.5.4" + sources."@fluentui/theme-1.6.0" (sources."@gulp-sourcemaps/identity-map-1.0.2" // { dependencies = [ sources."normalize-path-2.1.1" @@ -68935,7 +68539,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.125" + sources."@microsoft/load-themed-styles-1.10.126" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -68980,12 +68584,12 @@ in sources."@types/sqlite3-3.1.6" sources."@types/tough-cookie-4.0.0" sources."@types/url-join-4.0.0" - sources."@uifabric/foundation-7.9.18" - sources."@uifabric/icons-7.5.15" + sources."@uifabric/foundation-7.9.19" + sources."@uifabric/icons-7.5.16" sources."@uifabric/merge-styles-7.19.1" sources."@uifabric/react-hooks-7.13.9" sources."@uifabric/set-version-7.0.23" - sources."@uifabric/styling-7.16.16" + sources."@uifabric/styling-7.16.17" sources."@uifabric/utilities-7.33.2" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -69155,7 +68759,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."buffer-equal-1.0.0" sources."buffer-from-1.1.1" sources."buffer-writer-2.0.0" @@ -69661,7 +69265,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-dir-1.0.0" @@ -69957,15 +69561,15 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.149.3" + sources."office-ui-fabric-react-7.149.4" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-2.0.1" sources."openapi-default-setter-7.0.1" - sources."openapi-framework-7.0.2" + sources."openapi-framework-7.1.0" sources."openapi-jsonschema-parameters-7.0.2" - sources."openapi-request-coercer-7.0.1" + sources."openapi-request-coercer-7.1.0" sources."openapi-request-validator-7.0.2" sources."openapi-response-validator-7.0.1" sources."openapi-schema-validator-7.0.1" @@ -70151,7 +69755,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sass-1.28.0" + sources."sass-1.29.0" sources."sax-1.2.4" sources."scheduler-0.19.1" sources."schema-utils-2.7.1" @@ -70859,10 +70463,10 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "3.28.4"; + version = "3.28.5"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-3.28.4.tgz"; - sha512 = "nVk7Tc8I3hzhKnZwIOWh08Qq8VDZqYLA81Zrdu7HeIfJYAzppgYPB6tiZFouWwZl9/twf2JSYAUZmLwVhLK61A=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-3.28.5.tgz"; + sha512 = "Lam0JkBx57gs1xhlI+rXx3aJqOebIPBPf9sWAvUpTFDSVkyZN86rFXJWud6QnAFBLGqUgGFZJDC1tMq+l7Mgng=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -70997,7 +70601,7 @@ in sources."lodash-4.17.20" ]; }) - (sources."@babel/types-7.12.5" // { + (sources."@babel/types-7.12.6" // { dependencies = [ sources."lodash-4.17.20" ]; @@ -71008,7 +70612,7 @@ in sources."uuid-3.4.0" ]; }) - (sources."@expo/config-3.3.13" // { + (sources."@expo/config-3.3.14" // { dependencies = [ sources."semver-7.3.2" sources."slash-3.0.0" @@ -71023,7 +70627,7 @@ in sources."pngjs-5.0.0" ]; }) - (sources."@expo/dev-server-0.1.38" // { + (sources."@expo/dev-server-0.1.39" // { dependencies = [ sources."body-parser-1.19.0" sources."bytes-3.1.0" @@ -71040,7 +70644,7 @@ in sources."type-fest-0.12.0" ]; }) - sources."@expo/dev-tools-0.13.57" + sources."@expo/dev-tools-0.13.58" sources."@expo/eas-build-job-0.1.2" (sources."@expo/image-utils-0.3.7" // { dependencies = [ @@ -71053,7 +70657,7 @@ in sources."json5-1.0.1" ]; }) - sources."@expo/metro-config-0.1.38" + sources."@expo/metro-config-0.1.39" (sources."@expo/ngrok-2.4.3" // { dependencies = [ sources."uuid-3.4.0" @@ -71101,14 +70705,14 @@ in sources."@expo/spawn-async-1.5.0" sources."@expo/traveling-fastlane-darwin-1.15.1" sources."@expo/traveling-fastlane-linux-1.15.1" - (sources."@expo/webpack-config-0.12.42" // { + (sources."@expo/webpack-config-0.12.43" // { dependencies = [ sources."@babel/runtime-7.9.0" sources."is-wsl-2.2.0" sources."react-refresh-0.8.3" ]; }) - (sources."@expo/xdl-58.0.18" // { + (sources."@expo/xdl-58.0.19" // { dependencies = [ sources."chownr-1.1.4" sources."es6-error-4.1.1" @@ -71283,7 +70887,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.6" sources."@types/keyv-3.1.1" - sources."@types/lodash-4.14.164" + sources."@types/lodash-4.14.165" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" sources."@types/node-9.6.61" @@ -71513,7 +71117,7 @@ in }) sources."browserify-zlib-0.2.0" sources."browserslist-4.14.6" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."buffer-equal-0.0.1" sources."buffer-from-1.1.1" sources."buffer-indexof-1.1.1" @@ -71551,7 +71155,7 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001154" + sources."caniuse-lite-1.0.30001156" sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" (sources."chalk-4.1.0" // { @@ -71674,8 +71278,8 @@ in sources."slash-3.0.0" ]; }) - sources."core-js-3.6.5" - (sources."core-js-compat-3.6.5" // { + sources."core-js-3.7.0" + (sources."core-js-compat-3.7.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -71737,7 +71341,7 @@ in sources."dag-map-1.0.2" sources."dashdash-1.14.1" sources."dateformat-3.0.3" - sources."dayjs-1.9.4" + sources."dayjs-1.9.5" sources."debug-4.3.0" sources."debuglog-1.0.1" sources."decache-4.4.0" @@ -71810,7 +71414,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.587" + sources."electron-to-chromium-1.3.589" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -71893,7 +71497,7 @@ in sources."ms-2.0.0" ]; }) - (sources."expo-pwa-0.0.48" // { + (sources."expo-pwa-0.0.49" // { dependencies = [ sources."commander-2.20.0" ]; @@ -72177,7 +71781,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-color-stop-1.1.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -72454,7 +72058,7 @@ in sources."which-2.0.2" ]; }) - sources."node-html-parser-1.4.6" + sources."node-html-parser-1.4.8" (sources."node-libs-browser-2.2.1" // { dependencies = [ sources."buffer-4.9.2" @@ -72583,7 +72187,7 @@ in sources."url-parse-lax-3.0.0" ]; }) - (sources."pacote-11.1.12" // { + (sources."pacote-11.1.13" // { dependencies = [ sources."minipass-3.1.3" sources."mkdirp-1.0.4" @@ -73680,7 +73284,7 @@ in sources."indent-string-2.1.0" sources."inherits-2.0.4" sources."is-arrayish-0.2.1" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-finite-1.1.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" @@ -74443,7 +74047,7 @@ in ]; }) sources."is-arrayish-0.2.1" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" sources."is-stream-2.0.0" @@ -75378,7 +74982,7 @@ in sources."inquirer-autocomplete-prompt-1.3.0" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-fullwidth-code-point-3.0.0" sources."is-installed-globally-0.3.2" sources."is-interactive-1.0.0" @@ -75567,7 +75171,7 @@ in sources."@graphql-tools/utils-7.0.2" ]; }) - (sources."@graphql-tools/delegate-7.0.3" // { + (sources."@graphql-tools/delegate-7.0.4" // { dependencies = [ sources."@graphql-tools/utils-7.0.2" ]; @@ -75641,7 +75245,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."bufferutil-4.0.2" (sources."cacheable-request-6.1.0" // { dependencies = [ @@ -76232,7 +75836,7 @@ in sources."is-absolute-1.0.0" sources."is-accessor-descriptor-1.0.0" sources."is-buffer-1.1.6" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -76478,7 +76082,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-4.27.11" + sources."systeminformation-4.28.1" sources."term-canvas-0.0.5" sources."type-fest-0.11.0" sources."wordwrap-0.0.3" @@ -76712,7 +76316,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -77105,7 +76709,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -78422,7 +78026,7 @@ in sources."inherits-2.0.4" sources."invert-kv-1.0.0" sources."is-arrayish-0.2.1" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -78503,7 +78107,7 @@ in sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" sources."path-type-1.1.0" - sources."patrisika-0.21.0" + sources."patrisika-0.22.0" sources."patrisika-scopes-0.11.1" sources."pegjs-0.10.0" sources."performance-now-2.1.0" @@ -78712,7 +78316,7 @@ in sources."object-assign-4.1.1" sources."object-hash-1.3.1" sources."once-1.4.0" - sources."opentracing-0.14.4" + sources."opentracing-0.14.5" sources."path-is-absolute-1.0.1" sources."pathval-1.1.0" sources."process-0.10.1" @@ -78806,7 +78410,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.784.0" // { + (sources."aws-sdk-2.786.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -78827,7 +78431,7 @@ in sources."bcrypt-pbkdf-1.0.2" (sources."bl-4.0.3" // { dependencies = [ - sources."buffer-5.7.0" + sources."buffer-5.7.1" ]; }) sources."brace-expansion-1.1.11" @@ -80936,22 +80540,24 @@ in sources."concat-stream-1.6.2" sources."config-chain-1.1.12" sources."console-control-strings-1.1.0" - sources."conventional-changelog-angular-5.0.11" + sources."conventional-changelog-angular-5.0.12" (sources."conventional-changelog-core-3.2.3" // { dependencies = [ sources."through2-3.0.2" ]; }) sources."conventional-changelog-preset-loader-2.3.4" - (sources."conventional-changelog-writer-4.0.17" // { + (sources."conventional-changelog-writer-4.0.18" // { dependencies = [ - sources."through2-3.0.2" + sources."readable-stream-3.6.0" + sources."through2-4.0.2" ]; }) - sources."conventional-commits-filter-2.0.6" - (sources."conventional-commits-parser-3.1.0" // { + sources."conventional-commits-filter-2.0.7" + (sources."conventional-commits-parser-3.2.0" // { dependencies = [ - sources."through2-3.0.2" + sources."readable-stream-3.6.0" + sources."through2-4.0.2" ]; }) (sources."conventional-recommended-bump-5.0.1" // { @@ -81231,7 +80837,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-ci-2.0.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -81299,15 +80905,21 @@ in sources."map-cache-0.2.2" sources."map-obj-4.1.0" sources."map-visit-1.0.0" - (sources."meow-7.1.1" // { + (sources."meow-8.0.0" // { dependencies = [ sources."find-up-4.1.0" + sources."hosted-git-info-3.0.7" sources."locate-path-5.0.0" + sources."lru-cache-6.0.0" + sources."normalize-package-data-3.0.0" sources."p-locate-4.1.0" sources."parse-json-5.1.0" sources."path-exists-4.0.0" (sources."read-pkg-5.2.0" // { dependencies = [ + sources."hosted-git-info-2.8.8" + sources."normalize-package-data-2.5.0" + sources."semver-5.7.1" sources."type-fest-0.6.0" ]; }) @@ -81316,8 +80928,10 @@ in sources."type-fest-0.8.1" ]; }) - sources."type-fest-0.13.1" - sources."yargs-parser-18.1.3" + sources."semver-7.3.2" + sources."type-fest-0.18.0" + sources."yallist-4.0.0" + sources."yargs-parser-20.2.3" ]; }) sources."merge2-1.4.1" @@ -82724,7 +82338,7 @@ in sources."@babel/runtime-7.12.5" sources."@babel/template-7.10.4" sources."@babel/traverse-7.12.5" - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -82872,7 +82486,7 @@ in sources."bindings-1.5.0" (sources."bl-4.0.3" // { dependencies = [ - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."readable-stream-3.6.0" ]; }) @@ -82923,7 +82537,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001154" + sources."caniuse-lite-1.0.30001156" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -82995,7 +82609,7 @@ in }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.11" - (sources."core-js-compat-3.6.5" // { + (sources."core-js-compat-3.7.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -83046,7 +82660,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.587" + sources."electron-to-chromium-1.3.589" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -83145,7 +82759,7 @@ in sources."fs-constants-1.0.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-2.2.0" + sources."fsevents-2.2.1" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" sources."get-assigned-identifiers-1.2.0" @@ -83217,7 +82831,7 @@ in sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" sources."is-ci-2.0.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-data-descriptor-1.0.0" sources."is-deflate-1.0.0" sources."is-descriptor-1.0.2" @@ -83849,7 +83463,7 @@ in sources."link-check-4.5.2" sources."lodash-4.17.20" sources."markdown-link-extractor-1.2.6" - sources."marked-1.2.2" + sources."marked-1.2.3" sources."mime-db-1.44.0" sources."mime-types-2.1.27" sources."ms-2.1.2" @@ -84030,7 +83644,7 @@ in sources."inherits-2.0.4" sources."inquirer-0.12.0" sources."interpret-1.4.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-fullwidth-code-point-1.0.0" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.5" @@ -84247,7 +83861,7 @@ in sources."base64-js-1.3.1" sources."bl-4.0.3" sources."brace-expansion-1.1.11" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."chalk-4.1.0" sources."chownr-1.1.4" @@ -84323,19 +83937,19 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.149.3" - sources."@fluentui/react-focus-7.16.16" + sources."@fluentui/react-7.149.4" + sources."@fluentui/react-focus-7.16.17" sources."@fluentui/react-window-provider-1.0.1" - sources."@fluentui/theme-1.5.4" - sources."@microsoft/load-themed-styles-1.10.125" + sources."@fluentui/theme-1.6.0" + sources."@microsoft/load-themed-styles-1.10.126" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@uifabric/foundation-7.9.18" - sources."@uifabric/icons-7.5.15" + sources."@uifabric/foundation-7.9.19" + sources."@uifabric/icons-7.5.16" sources."@uifabric/merge-styles-7.19.1" sources."@uifabric/react-hooks-7.13.9" sources."@uifabric/set-version-7.0.23" - sources."@uifabric/styling-7.16.16" + sources."@uifabric/styling-7.16.17" sources."@uifabric/utilities-7.33.2" sources."accepts-1.3.7" sources."ajv-6.12.6" @@ -84356,7 +83970,7 @@ in sources."basic-auth-2.0.1" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."builtin-status-codes-3.0.0" sources."bytes-3.1.0" @@ -84462,7 +84076,7 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.149.3" + sources."office-ui-fabric-react-7.149.4" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -84848,10 +84462,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "2.67.2"; + version = "2.68.0"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.67.2.tgz"; - sha512 = "tCb/TqAtxrtRTzBayfRmg7Gd809ymXfg6vVrBAAXqi93ijobB6qjopIQYlq5Tgq50m5rI/EgxvLU3BCUSEq/eQ=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.68.0.tgz"; + sha512 = "nrdMstEiFYtwLmPF+UsMxnOekeKIayUwRpEMzaLtK+i9Yf/IjCPxKwMF7Z+yc3wjYIjxjlWSBqq0I8bcwxUDnQ=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -84959,7 +84573,7 @@ in sources."@babel/runtime-7.12.5" sources."@babel/template-7.10.4" sources."@babel/traverse-7.12.5" - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" sources."@bugsnag/browser-7.5.1" sources."@bugsnag/core-7.3.5" sources."@bugsnag/cuid-3.0.0" @@ -84994,10 +84608,10 @@ in sources."@netlify/open-api-0.18.1" sources."@netlify/plugin-edge-handlers-1.9.0" sources."@netlify/run-utils-1.0.5" - sources."@netlify/traffic-mesh-agent-0.24.0-pre.23" - sources."@netlify/traffic-mesh-agent-darwin-x64-0.24.0-pre.23" - sources."@netlify/traffic-mesh-agent-linux-x64-0.24.0-pre.23" - sources."@netlify/traffic-mesh-agent-win32-x64-0.24.0-pre.23" + sources."@netlify/traffic-mesh-agent-0.24.0" + sources."@netlify/traffic-mesh-agent-darwin-x64-0.24.0" + sources."@netlify/traffic-mesh-agent-linux-x64-0.24.0" + sources."@netlify/traffic-mesh-agent-win32-x64-0.24.0" (sources."@netlify/zip-it-and-ship-it-1.4.0" // { dependencies = [ sources."resolve-2.0.0-next.2" @@ -85026,39 +84640,37 @@ in sources."supports-color-5.5.0" ]; }) - (sources."@oclif/command-1.8.0" // { + (sources."@oclif/command-1.6.1" // { dependencies = [ sources."@oclif/plugin-help-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."is-fullwidth-code-point-2.0.0" + sources."semver-5.7.1" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" sources."wrap-ansi-4.0.0" ]; }) - (sources."@oclif/config-1.17.0" // { + sources."@oclif/config-1.15.1" + (sources."@oclif/errors-1.2.2" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.3" - sources."array-union-2.1.0" - sources."braces-3.0.2" - sources."dir-glob-3.0.1" - sources."fast-glob-3.2.4" - sources."fill-range-7.0.1" - sources."glob-parent-5.1.1" - sources."globby-11.0.1" - sources."ignore-5.1.8" - sources."is-number-7.0.0" - sources."micromatch-4.0.2" - sources."slash-3.0.0" - sources."to-regex-range-5.0.1" - sources."tslib-2.0.3" - ]; - }) - (sources."@oclif/errors-1.3.3" // { - dependencies = [ - sources."clean-stack-3.0.0" - sources."wrap-ansi-7.0.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."clean-stack-1.3.0" + sources."indent-string-3.2.0" + sources."is-fullwidth-code-point-2.0.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) + sources."strip-ansi-5.2.0" + (sources."wrap-ansi-4.0.0" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) ]; }) sources."@oclif/linewrap-1.0.0" @@ -85089,20 +84701,16 @@ in dependencies = [ sources."ansi-styles-3.2.1" sources."cli-ux-4.9.3" - sources."fs-extra-7.0.1" sources."has-flag-3.0.0" sources."indent-string-3.2.0" - sources."is-wsl-1.1.0" - sources."jsonfile-4.0.0" sources."semver-5.7.1" sources."strip-ansi-5.2.0" sources."supports-color-5.5.0" - sources."universalify-0.1.2" ]; }) - (sources."@oclif/plugin-plugins-1.9.1" // { + (sources."@oclif/plugin-plugins-1.9.0" // { dependencies = [ - sources."npm-run-path-4.0.1" + sources."npm-run-path-3.1.0" sources."path-key-3.1.1" sources."tslib-2.0.3" ]; @@ -85238,10 +84846,9 @@ in sources."ast-module-types-2.7.1" sources."async-3.2.0" sources."asynckit-0.4.0" - sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.784.0" // { + (sources."aws-sdk-2.786.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -85302,7 +84909,7 @@ in }) sources."browserslist-4.14.6" sources."btoa-lite-1.0.0" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -85324,7 +84931,7 @@ in sources."call-bind-1.0.0" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001154" + sources."caniuse-lite-1.0.30001156" sources."cardinal-2.1.1" sources."caw-2.0.1" sources."ccount-1.1.0" @@ -85373,14 +84980,16 @@ in sources."cli-cursor-2.1.0" sources."cli-progress-3.8.2" sources."cli-spinners-2.5.0" - (sources."cli-ux-5.5.0" // { + (sources."cli-ux-5.4.6" // { dependencies = [ sources."ansi-escapes-4.3.1" - sources."chalk-4.1.0" - sources."clean-stack-3.0.0" - sources."extract-stack-2.0.0" - sources."supports-hyperlinks-2.1.0" - sources."tslib-2.0.3" + sources."emoji-regex-7.0.3" + sources."has-flag-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."semver-5.7.1" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + sources."supports-color-5.5.0" sources."type-fest-0.11.0" ]; }) @@ -85431,7 +85040,7 @@ in sources."readdirp-2.2.1" ]; }) - (sources."core-js-compat-3.6.5" // { + (sources."core-js-compat-3.7.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -85573,7 +85182,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.587" + sources."electron-to-chromium-1.3.589" sources."elf-tools-1.1.2" (sources."elliptic-6.5.3" // { dependencies = [ @@ -85714,7 +85323,7 @@ in sources."from2-2.3.0" sources."from2-array-0.0.4" sources."fs-constants-1.0.0" - sources."fs-extra-9.0.1" + sources."fs-extra-7.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" sources."function-bind-1.1.1" @@ -85888,7 +85497,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-ci-2.0.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -85922,7 +85531,7 @@ in sources."is-typedarray-1.0.0" sources."is-url-1.2.4" sources."is-windows-1.0.2" - sources."is-wsl-2.2.0" + sources."is-wsl-1.1.0" sources."is-yarn-global-0.3.0" sources."isarray-1.0.0" sources."isbuffer-0.0.0" @@ -85946,13 +85555,9 @@ in sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-2.3.1" sources."json5-2.1.3" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) + sources."jsonfile-4.0.0" sources."junk-3.1.0" - sources."jwt-decode-3.0.0" + sources."jwt-decode-3.1.1" sources."keep-func-props-3.0.1" sources."keyv-3.1.0" sources."kind-of-6.0.3" @@ -86191,12 +85796,12 @@ in sources."mimic-fn-2.1.0" ]; }) - sources."open-7.3.0" - (sources."opn-5.5.0" // { + (sources."open-7.3.0" // { dependencies = [ - sources."is-wsl-1.1.0" + sources."is-wsl-2.2.0" ]; }) + sources."opn-5.5.0" sources."optionator-0.8.3" (sources."ora-4.1.1" // { dependencies = [ @@ -86614,7 +86219,7 @@ in sources."unist-util-visit-2.0.3" sources."unist-util-visit-parents-3.1.1" sources."universal-user-agent-4.0.1" - sources."universalify-1.0.0" + sources."universalify-0.1.2" (sources."unixify-1.0.0" // { dependencies = [ sources."normalize-path-2.1.1" @@ -86979,7 +86584,7 @@ in sources."invert-kv-1.0.0" sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" @@ -87253,16 +86858,16 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-1.2.2.tgz"; - sha512 = "/cGajoUjpCgP1Plqjtvupm8gE+19Vzm/z31M25f50XIuLpy3wieTki+e2oIPPyuzTD7Gz04JMySbcB8tx0voNA=="; + url = "https://registry.npmjs.org/node-red/-/node-red-1.2.3.tgz"; + sha512 = "2SnJJ8YPTz0IzbRyEVpMZmDukm5DiAbNS+Nvv4g8dEtHFgOMj2Qid3OgqbSsYyRE5aH5FZ8xVLyFrBMPMRj24g=="; }; dependencies = [ sources."@babel/runtime-7.12.5" - sources."@node-red/editor-api-1.2.2" - sources."@node-red/editor-client-1.2.2" - (sources."@node-red/nodes-1.2.2" // { + sources."@node-red/editor-api-1.2.3" + sources."@node-red/editor-client-1.2.3" + (sources."@node-red/nodes-1.2.3" // { dependencies = [ sources."cookie-0.4.1" sources."http-errors-1.7.3" @@ -87276,9 +86881,9 @@ in }) ]; }) - sources."@node-red/registry-1.2.2" - sources."@node-red/runtime-1.2.2" - sources."@node-red/util-1.2.2" + sources."@node-red/registry-1.2.3" + sources."@node-red/runtime-1.2.3" + sources."@node-red/util-1.2.3" sources."abbrev-1.1.1" sources."accepts-1.3.7" (sources."agent-base-6.0.2" // { @@ -87343,7 +86948,7 @@ in sources."body-parser-1.19.0" sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."busboy-0.2.14" sources."bytes-3.1.0" @@ -87381,7 +86986,6 @@ in sources."cron-1.7.2" sources."css-select-1.2.0" sources."css-what-2.1.3" - sources."d-1.0.1" sources."dashdash-1.14.1" sources."debug-2.6.9" sources."deep-extend-0.6.0" @@ -87409,19 +87013,9 @@ in sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."entities-1.1.2" - sources."es5-ext-0.10.53" - sources."es6-iterator-2.0.3" - sources."es6-map-0.1.5" - (sources."es6-set-0.1.5" // { - dependencies = [ - sources."es6-symbol-3.1.1" - ]; - }) - sources."es6-symbol-3.1.3" sources."escape-html-1.0.3" sources."esprima-4.0.1" sources."etag-1.8.1" - sources."event-emitter-0.3.5" (sources."express-4.17.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -87432,11 +87026,6 @@ in sources."depd-2.0.0" ]; }) - (sources."ext-1.4.0" // { - dependencies = [ - sources."type-2.1.0" - ]; - }) sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" @@ -87513,7 +87102,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" - sources."jsonata-1.8.3" + sources."jsonata-1.8.4" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" sources."leven-2.1.0" @@ -87532,9 +87121,10 @@ in sources."lodash.some-4.6.0" sources."lru-cache-4.1.5" sources."media-typer-0.3.0" - (sources."memorystore-1.6.2" // { + (sources."memorystore-1.6.4" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-4.3.0" + sources."ms-2.1.2" ]; }) sources."merge-descriptors-1.0.1" @@ -87557,14 +87147,13 @@ in sources."mkdirp-0.5.5" sources."moment-2.29.1" sources."moment-timezone-0.5.31" - (sources."mqtt-4.2.1" // { + (sources."mqtt-4.2.4" // { dependencies = [ + sources."concat-stream-2.0.0" sources."debug-4.3.0" - sources."isarray-1.0.0" sources."ms-2.1.2" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" + sources."readable-stream-3.6.0" + sources."string_decoder-1.3.0" sources."ws-7.3.1" ]; }) @@ -87586,7 +87175,6 @@ in ]; }) sources."negotiator-0.6.2" - sources."next-tick-1.0.0" (sources."node-pre-gyp-0.14.0" // { dependencies = [ sources."chownr-1.1.4" @@ -87723,10 +87311,9 @@ in sources."tslib-2.0.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-1.2.0" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.11.2" + sources."uglify-js-3.11.4" sources."uid-safe-2.1.5" sources."uid2-0.0.3" sources."unc-path-regex-0.1.2" @@ -87831,7 +87418,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" @@ -88363,7 +87950,7 @@ in sources."semver-6.3.0" ]; }) - sources."pacote-11.1.12" + sources."pacote-11.1.13" sources."parse-github-url-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" @@ -88792,7 +88379,7 @@ in sources."@babel/runtime-7.12.5" sources."@babel/template-7.10.4" sources."@babel/traverse-7.12.5" - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -88911,7 +88498,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001154" + sources."caniuse-lite-1.0.30001156" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -88937,7 +88524,7 @@ in sources."convert-source-map-1.7.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.11" - (sources."core-js-compat-3.6.5" // { + (sources."core-js-compat-3.7.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -89049,7 +88636,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.587" + sources."electron-to-chromium-1.3.589" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -89188,7 +88775,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-color-stop-1.1.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -90357,7 +89944,7 @@ in sources."is-arguments-1.0.4" sources."is-arrayish-0.2.1" sources."is-callable-1.2.2" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-date-object-1.0.2" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" @@ -90601,7 +90188,7 @@ in sources."bncode-0.5.3" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -91093,7 +90680,7 @@ in sources."inherits-2.0.4" sources."ip-1.1.5" sources."is-binary-path-2.1.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-number-7.0.0" @@ -91180,7 +90767,7 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-4.27.11" + sources."systeminformation-4.28.1" sources."thunkify-2.1.2" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" @@ -91542,7 +91129,7 @@ in ]; }) sources."is-buffer-1.1.6" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."json-stable-stringify-0.0.1" @@ -92090,7 +91677,7 @@ in sources."@babel/runtime-7.12.5" sources."@babel/template-7.10.4" sources."@babel/traverse-7.12.5" - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" @@ -92159,7 +91746,7 @@ in sources."color-name-1.1.3" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" - sources."core-js-3.6.5" + sources."core-js-3.7.0" sources."core-util-is-1.0.2" (sources."create-ecdh-4.0.4" // { dependencies = [ @@ -92459,7 +92046,7 @@ in sources."@types/node-12.7.12" sources."@types/node-fetch-2.5.7" sources."@types/resolve-1.17.1" - sources."@types/vscode-1.50.0" + sources."@types/vscode-1.51.0" (sources."@typescript-eslint/eslint-plugin-3.10.1" // { dependencies = [ sources."semver-7.3.2" @@ -92613,7 +92200,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" @@ -92747,10 +92334,10 @@ in sources."semver-5.7.1" ]; }) - sources."vscode-jsonrpc-6.0.0-next.5" - sources."vscode-languageclient-7.0.0-next.9" - sources."vscode-languageserver-protocol-3.16.0-next.7" - sources."vscode-languageserver-types-3.16.0-next.3" + sources."vscode-jsonrpc-6.0.0-next.7" + sources."vscode-languageclient-7.0.0-next.12" + sources."vscode-languageserver-protocol-3.16.0-next.10" + sources."vscode-languageserver-types-3.16.0-next.4" sources."vscode-test-1.4.1" sources."which-2.0.2" sources."which-module-2.0.0" @@ -92934,10 +92521,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.28.0"; + version = "1.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.28.0.tgz"; - sha512 = "9FWX/0wuE1KxwfiP02chZhHaPzu6adpx9+wGch7WMOuHy5npOo0UapRI3FNSHva2CczaYJu2yNUBN8cCSqHz/A=="; + url = "https://registry.npmjs.org/sass/-/sass-1.29.0.tgz"; + sha512 = "ZpwAUFgnvAUCdkjwPREny+17BpUj8nh5Yr6zKPGtLNTLrmtoRYIjm7njP24COhjJldjwW1dcv52Lpf4tNZVVRA=="; }; dependencies = [ sources."anymatch-3.1.1" @@ -93093,10 +92680,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.10.0.tgz"; - sha512 = "5q/8gJvOh3ssqskIw/UNLyXWWLEfJtvRiPK7qnOS71uvjz19mtL+a3XrowMNe/KINRXzzMWBGpGNwzcLEAhcZQ=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.11.0.tgz"; + sha512 = "xR6ntWPdLA2gMauiuXAXUImUEFEVe8vmPbIZ4pbc34VwbztyeAnhUf4JyOL9wfDHStdJC2vqZ/zDngTJbM0DxQ=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -93141,10 +92728,10 @@ in sources."semver-6.3.0" ]; }) - sources."@serverless/enterprise-plugin-4.1.1" + sources."@serverless/enterprise-plugin-4.1.2" sources."@serverless/event-mocks-1.1.1" sources."@serverless/platform-client-3.1.2" - sources."@serverless/platform-client-china-2.0.7" + sources."@serverless/platform-client-china-2.0.8" (sources."@serverless/platform-sdk-2.3.2" // { dependencies = [ sources."chalk-2.4.2" @@ -93166,12 +92753,12 @@ in sources."@serverless/utils-china-1.0.10" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@tencent-sdk/capi-1.1.5" + sources."@tencent-sdk/capi-1.1.6" sources."@types/cacheable-request-6.0.1" sources."@types/caseless-0.12.2" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/lodash-4.14.164" + sources."@types/lodash-4.14.165" sources."@types/long-4.0.1" sources."@types/node-14.14.6" sources."@types/request-2.48.5" @@ -93230,7 +92817,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.784.0" // { + (sources."aws-sdk-2.786.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -93281,7 +92868,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -93363,7 +92950,7 @@ in ]; }) sources."dashdash-1.14.1" - sources."dayjs-1.9.4" + sources."dayjs-1.9.5" sources."debug-3.1.0" sources."decode-uri-component-0.2.0" sources."decompress-4.2.1" @@ -93471,13 +93058,6 @@ in sources."filenamify-3.0.0" sources."filesize-6.1.0" sources."fill-range-7.0.1" - (sources."find-process-1.4.4" // { - dependencies = [ - sources."commander-5.1.0" - sources."debug-4.3.0" - sources."ms-2.1.2" - ]; - }) sources."find-requires-1.0.0" sources."flat-5.0.2" sources."follow-redirects-1.5.10" @@ -94593,10 +94173,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.424.1"; + version = "1.424.4"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.424.1.tgz"; - sha512 = "jPfGpI/cCPc1xn335GP7fVVHkqw/ss3W8ie9p+KM748QgZkc5JMuUJKc9lB1y+5+H7wpCnt4wuO1jKkFBpwSUQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.424.4.tgz"; + sha512 = "l+p0PgYx7+xmAYNGy4hvd8hXtDIcQzYM1SrI7uM4CtlxR0Hjze93p0TcE3GYxSuia3IUDub95DIVtWmxLCeCMw=="; }; dependencies = [ sources."@sindresorhus/is-2.1.1" @@ -94678,7 +94258,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browserify-zlib-0.1.4" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."bytes-3.1.0" sources."cacheable-lookup-5.0.3" @@ -95218,68 +94798,29 @@ in "socket.io" = nodeEnv.buildNodePackage { name = "socket.io"; packageName = "socket.io"; - version = "2.3.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-2.3.0.tgz"; - sha512 = "2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.0.tgz"; + sha512 = "arLQtd+UoJ08NXBRBGUJDyQ9B+cc9WwD67hc5s1WQcs2DyAkYzI5HWg4U0CrFtK00kjyAWxBGhLwVbfOeMqz1A=="; }; dependencies = [ sources."accepts-1.3.7" - sources."after-0.8.2" - sources."arraybuffer.slice-0.0.7" - sources."async-limiter-1.0.1" - sources."backo2-1.0.2" - sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" - sources."better-assert-1.0.2" - sources."blob-0.0.5" - sources."callsite-1.0.0" - sources."component-bind-1.0.0" - sources."component-emitter-1.2.1" - sources."component-inherit-0.0.3" - sources."cookie-0.3.1" + sources."component-emitter-1.3.0" + sources."cookie-0.4.1" + sources."cors-2.8.5" sources."debug-4.1.1" - sources."engine.io-3.4.2" - (sources."engine.io-client-3.4.4" // { - dependencies = [ - sources."component-emitter-1.3.0" - sources."debug-3.1.0" - sources."ms-2.0.0" - sources."parseqs-0.0.6" - sources."parseuri-0.0.6" - sources."ws-6.1.4" - ]; - }) - sources."engine.io-parser-2.2.1" - sources."has-binary2-1.0.3" - sources."has-cors-1.1.0" - sources."indexof-0.0.1" - sources."isarray-2.0.1" + sources."engine.io-4.0.1" + sources."engine.io-parser-4.0.1" sources."mime-db-1.44.0" sources."mime-types-2.1.27" sources."ms-2.1.2" sources."negotiator-0.6.2" - sources."object-component-0.0.3" - sources."parseqs-0.0.5" - sources."parseuri-0.0.5" - sources."socket.io-adapter-1.1.2" - (sources."socket.io-client-2.3.0" // { - dependencies = [ - sources."base64-arraybuffer-0.1.5" - sources."ms-2.0.0" - (sources."socket.io-parser-3.3.1" // { - dependencies = [ - sources."component-emitter-1.3.0" - sources."debug-3.1.0" - ]; - }) - ]; - }) - sources."socket.io-parser-3.4.1" - sources."to-array-0.1.4" + sources."object-assign-4.1.1" + sources."socket.io-adapter-2.0.3" + sources."socket.io-parser-4.0.1" + sources."vary-1.1.2" sources."ws-7.3.1" - sources."xmlhttprequest-ssl-1.5.5" - sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -95358,7 +94899,7 @@ in sources."ini-1.3.5" sources."is-arrayish-0.2.1" sources."is-ci-1.2.1" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" @@ -95520,7 +95061,7 @@ in sources."brace-expansion-1.1.11" sources."braces-1.8.5" sources."broadcast-stream-0.2.2" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."buffer-from-1.1.1" (sources."cache-base-1.0.1" // { dependencies = [ @@ -96392,7 +95933,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.784.0" // { + (sources."aws-sdk-2.786.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -96647,7 +96188,7 @@ in sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" (sources."is-expression-3.0.0" // { dependencies = [ sources."acorn-4.0.13" @@ -98145,7 +97686,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-callable-1.2.2" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-date-object-1.0.2" sources."is-decimal-1.0.4" sources."is-file-1.0.0" @@ -98518,7 +98059,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" sources."is-ci-2.0.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-decimal-1.0.4" sources."is-empty-1.2.0" sources."is-fullwidth-code-point-2.0.0" @@ -99258,7 +98799,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.6.5" + sources."core-js-3.7.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -100524,7 +100065,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-fullwidth-code-point-1.0.0" sources."isarray-1.0.0" sources."mimic-response-2.1.0" @@ -100826,7 +100367,7 @@ in sources."@types/json5-0.0.30" sources."@types/mocha-7.0.2" sources."@types/node-8.10.66" - sources."@types/vscode-1.50.0" + sources."@types/vscode-1.51.0" sources."@types/yauzl-2.9.1" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -101681,7 +101222,7 @@ in sources."bl-1.2.3" sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -102235,7 +101776,7 @@ in sources."format-0.2.2" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-2.2.0" + sources."fsevents-2.2.1" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-caller-file-1.0.3" @@ -102311,7 +101852,7 @@ in sources."is-binary-path-2.1.0" sources."is-buffer-2.0.5" sources."is-ci-2.0.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-data-descriptor-1.0.0" sources."is-decimal-1.0.4" sources."is-descriptor-1.0.2" @@ -103000,7 +102541,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."buffer-equal-constant-time-1.0.1" sources."buffer-from-1.1.1" @@ -103898,10 +103439,10 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.14.6" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001154" + sources."caniuse-lite-1.0.30001156" sources."chrome-trace-event-1.0.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.587" + sources."electron-to-chromium-1.3.589" sources."enhanced-resolve-5.3.1" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" @@ -103971,16 +103512,15 @@ in webpack-cli = nodeEnv.buildNodePackage { name = "webpack-cli"; packageName = "webpack-cli"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.1.0.tgz"; - sha512 = "NdhxXMZmoik62Y05t0h1y65LjBM7BwFPq311ihXuMM3RY6dlc4KkCTyHLzTuBEc+bqq6d3xh+CWmU0xRexNJBA=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.2.0.tgz"; + sha512 = "EIl3k88vaF4fSxWSgtAQR+VwicfLMTZ9amQtqS4o+TDPW9HGaEpbFBbAZ4A3ZOT5SOnMxNOzROsSTPiE8tBJPA=="; }; dependencies = [ - sources."@webpack-cli/info-1.0.2" - sources."@webpack-cli/serve-1.0.1" + sources."@webpack-cli/info-1.1.0" + sources."@webpack-cli/serve-1.1.0" sources."ansi-colors-4.1.1" - sources."ansi-escapes-4.3.1" sources."ansi-styles-3.2.1" sources."array-back-4.0.1" sources."chalk-2.4.2" @@ -104004,9 +103544,10 @@ in sources."human-signals-1.1.1" sources."import-local-3.0.2" sources."interpret-2.2.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-stream-2.0.0" sources."isexe-2.0.0" + sources."leven-3.1.0" sources."locate-path-5.0.0" sources."lodash-4.17.20" sources."merge-stream-2.0.0" @@ -104033,7 +103574,6 @@ in sources."strip-final-newline-2.0.0" sources."supports-color-5.5.0" sources."table-layout-1.0.1" - sources."type-fest-0.11.0" sources."typical-5.2.0" sources."v8-compile-cache-2.2.0" sources."webpack-merge-4.2.2" @@ -104793,13 +104333,20 @@ in sources."ms-2.1.2" ]; }) - sources."bittorrent-peerid-1.3.3" - (sources."bittorrent-protocol-3.1.2" // { + (sources."bittorrent-lsd-1.0.0" // { dependencies = [ sources."debug-4.3.0" sources."ms-2.1.2" ]; }) + sources."bittorrent-peerid-1.3.3" + (sources."bittorrent-protocol-3.2.0" // { + dependencies = [ + sources."bitfield-4.0.0" + sources."debug-4.3.0" + sources."ms-2.1.2" + ]; + }) (sources."bittorrent-tracker-9.15.0" // { dependencies = [ sources."debug-4.3.0" @@ -105011,7 +104558,7 @@ in sources."thunky-0.1.0" sources."timeout-refresh-1.0.3" sources."to-arraybuffer-1.0.1" - (sources."torrent-discovery-9.3.0" // { + (sources."torrent-discovery-9.4.0" // { dependencies = [ sources."debug-4.3.0" sources."ms-2.1.2" @@ -105026,8 +104573,9 @@ in sources."upnp-device-client-1.0.2" sources."upnp-mediarenderer-client-1.4.0" sources."url-join-4.0.1" - (sources."ut_metadata-3.5.1" // { + (sources."ut_metadata-3.5.2" // { dependencies = [ + sources."bitfield-4.0.0" sources."debug-4.3.0" sources."ms-2.1.2" ]; @@ -105322,7 +104870,7 @@ in sources."config-chain-1.1.12" sources."configstore-3.1.5" sources."copy-descriptor-0.1.1" - sources."core-js-3.6.5" + sources."core-js-3.7.0" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -105515,7 +105063,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-ci-1.2.1" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-docker-1.1.0" diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 2e6db32966d..b77ff811c70 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2020-10-19"; + rev = "2020-11-02"; version = "unstable-${rev}"; - sha256 = "1xvyk1d26zn1d9i42h78qsm6bg57nhn1rgr46jwa46gsb31nabjh"; - cargoSha256 = "18s5yrc9fdj2ndylwyf07l0kmwxka7mnbj254xmq3g7ragw71xjw"; + sha256 = "1f64286ywsjw9s8kai3jw2dqnqswm2vnms6ilxx1x706mridxjv0"; + cargoSha256 = "0q53w43gag2pfb20jywikdbac291rvr1zmjnmwq462m5wfz0w127"; }; rust-analyzer = callPackage ./wrapper.nix {} { diff --git a/pkgs/development/tools/rust/rust-analyzer/generic.nix b/pkgs/development/tools/rust/rust-analyzer/generic.nix index ca72f91953c..cbcab33e0db 100644 --- a/pkgs/development/tools/rust/rust-analyzer/generic.nix +++ b/pkgs/development/tools/rust/rust-analyzer/generic.nix @@ -16,11 +16,6 @@ rustPlatform.buildRustPackage { inherit rev sha256; }; - # FIXME: Temporary fixes for our rust 1.46.0 - patches = [ - ./no-track_env_var.patch # Requires rustc 1.47.0 - ]; - buildAndTestSubdir = "crates/rust-analyzer"; cargoBuildFlags = lib.optional useMimalloc "--features=mimalloc"; diff --git a/pkgs/development/tools/rust/rust-analyzer/no-track_env_var.patch b/pkgs/development/tools/rust/rust-analyzer/no-track_env_var.patch deleted file mode 100644 index f5173c4bacb..00000000000 --- a/pkgs/development/tools/rust/rust-analyzer/no-track_env_var.patch +++ /dev/null @@ -1,120 +0,0 @@ -This patch revert 3d169bd3f4cdc2dc3dd09eadbbc17c19214d69f3 (Add track_env_var to the proc macro server). - -diff --git a/crates/proc_macro_srv/src/proc_macro/bridge/client.rs b/crates/proc_macro_srv/src/proc_macro/bridge/client.rs -index 55d6330cc..cb4b3bdb0 100644 ---- a/crates/proc_macro_srv/src/proc_macro/bridge/client.rs -+++ b/crates/proc_macro_srv/src/proc_macro/bridge/client.rs -@@ -160,7 +160,6 @@ macro_rules! define_handles { - } - define_handles! { - 'owned: -- FreeFunctions, - TokenStream, - TokenStreamBuilder, - TokenStreamIter, -diff --git a/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs b/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs -index b97886eb9..aeb05aad4 100644 ---- a/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs -+++ b/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs -@@ -57,10 +57,6 @@ use std::thread; - macro_rules! with_api { - ($S:ident, $self:ident, $m:ident) => { - $m! { -- FreeFunctions { -- fn drop($self: $S::FreeFunctions); -- fn track_env_var(var: &str, value: Option<&str>); -- }, - TokenStream { - fn drop($self: $S::TokenStream); - fn clone($self: &$S::TokenStream) -> $S::TokenStream; -diff --git a/crates/proc_macro_srv/src/proc_macro/bridge/server.rs b/crates/proc_macro_srv/src/proc_macro/bridge/server.rs -index 3acb239af..45d41ac02 100644 ---- a/crates/proc_macro_srv/src/proc_macro/bridge/server.rs -+++ b/crates/proc_macro_srv/src/proc_macro/bridge/server.rs -@@ -11,8 +11,6 @@ use super::client::HandleStore; - /// Declare an associated item of one of the traits below, optionally - /// adjusting it (i.e., adding bounds to types and default bodies to methods). - macro_rules! associated_item { -- (type FreeFunctions) => -- (type FreeFunctions: 'static;); - (type TokenStream) => - (type TokenStream: 'static + Clone;); - (type TokenStreamBuilder) => -diff --git a/crates/proc_macro_srv/src/proc_macro/mod.rs b/crates/proc_macro_srv/src/proc_macro/mod.rs -index fc6e7344f..ee0dc9722 100644 ---- a/crates/proc_macro_srv/src/proc_macro/mod.rs -+++ b/crates/proc_macro_srv/src/proc_macro/mod.rs -@@ -924,25 +924,3 @@ impl fmt::Debug for Literal { - self.0.fmt(f) - } - } -- --pub mod tracked_env { -- use std::env::{self, VarError}; -- use std::ffi::OsStr; -- -- /// Retrieve an environment variable and add it to build dependency info. -- /// Build system executing the compiler will know that the variable was accessed during -- /// compilation, and will be able to rerun the build when the value of that variable changes. -- /// Besides the dependency tracking this function should be equivalent to `env::var` from the -- /// standard library, except that the argument must be UTF-8. -- pub fn var + AsRef>(key: K) -> Result { -- use std::ops::Deref; -- -- let key: &str = key.as_ref(); -- let value = env::var(key); -- super::bridge::client::FreeFunctions::track_env_var( -- key, -- value.as_ref().map(|t| t.deref()).ok(), -- ); -- value -- } --} -diff --git a/crates/proc_macro_srv/src/rustc_server.rs b/crates/proc_macro_srv/src/rustc_server.rs -index c5fe3591e..7d1695c86 100644 ---- a/crates/proc_macro_srv/src/rustc_server.rs -+++ b/crates/proc_macro_srv/src/rustc_server.rs -@@ -242,8 +242,6 @@ impl TokenStreamBuilder { - } - } - --pub struct FreeFunctions; -- - #[derive(Clone)] - pub struct TokenStreamIter { - trees: IntoIter, -@@ -256,7 +254,6 @@ pub struct Rustc { - } - - impl server::Types for Rustc { -- type FreeFunctions = FreeFunctions; - type TokenStream = TokenStream; - type TokenStreamBuilder = TokenStreamBuilder; - type TokenStreamIter = TokenStreamIter; -@@ -270,13 +267,6 @@ impl server::Types for Rustc { - type MultiSpan = Vec; - } - --impl server::FreeFunctions for Rustc { -- fn track_env_var(&mut self, _var: &str, _value: Option<&str>) { -- // FIXME: track env var accesses -- // https://github.com/rust-lang/rust/pull/71858 -- } --} -- - impl server::TokenStream for Rustc { - fn new(&mut self) -> Self::TokenStream { - Self::TokenStream::new() -diff --git a/xtask/src/install.rs b/xtask/src/install.rs -index fcc4f05e4..d829790d7 100644 ---- a/xtask/src/install.rs -+++ b/xtask/src/install.rs -@@ -7,7 +7,7 @@ use anyhow::{bail, format_err, Context, Result}; - use crate::not_bash::{pushd, run}; - - // Latest stable, feel free to send a PR if this lags behind. --const REQUIRED_RUST_VERSION: u32 = 47; -+const REQUIRED_RUST_VERSION: u32 = 46; - - pub struct InstallCmd { - pub client: Option, diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json index 4af15f4619e..ea91b6d6470 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json +++ b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json @@ -3,7 +3,7 @@ "version": "0.4.0-dev", "dependencies": { "node-fetch": "^2.6.1", - "vscode-languageclient": "7.0.0-next.9", + "vscode-languageclient": "7.0.0-next.12", "@rollup/plugin-commonjs": "^13.0.2", "@rollup/plugin-node-resolve": "^8.4.0", "@types/glob": "^7.1.3", From 79a01d91e2ed1fc9795717bfc30024aacd609ede Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 5 Nov 2020 08:23:14 +0000 Subject: [PATCH 106/299] python27Packages.libtmux: 0.8.3 -> 0.8.5 --- pkgs/development/python-modules/libtmux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 605cbe04026..9df5cffec97 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libtmux"; - version = "0.8.3"; + version = "0.8.5"; src = fetchPypi { inherit pname version; - sha256 = "a4c7379604ccdc684aa865723211184709f9a2b45511772989b5f26ad156650e"; + sha256 = "1d35b9f8451944d31c5ed22ed9e6c8e18034adcc75718fcc5b27fbd9621543e1"; }; checkInputs = [ pytest ]; From a7de168b125701f03f18a15973a007745358047d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 5 Nov 2020 08:57:47 +0000 Subject: [PATCH 107/299] python37Packages.proto-plus: 1.10.1 -> 1.11.0 --- pkgs/development/python-modules/proto-plus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index d542d6f6477..4a36b625298 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.10.1"; + version = "1.11.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0n8ia51jg2dkab2sf0qnh39bssqhz65ybcqr78f3zzf7ja923lkr"; + sha256 = "416a0f13987789333cd8760a0ee998f8eccd6d7165ee9f283d64ca2de3e8774d"; }; propagatedBuildInputs = [ protobuf ]; From 2778cf633a2cec6277ac8ead1f7297ffe980e04f Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 2 Nov 2020 17:13:56 -0800 Subject: [PATCH 108/299] python3Packages.google-cloud-iam: init at 2.0.0 --- .../google-cloud-iam/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/google-cloud-iam/default.nix diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix new file mode 100644 index 00000000000..9d612062938 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder +, google_api_core, libcst, mock, proto-plus, pytest-asyncio }: + +buildPythonPackage rec { + pname = "google-cloud-iam"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1zxsx5avs8njiyw32zvsx2yblmmiwxy771x334hbgmy0aqms4lak"; + }; + + propagatedBuildInputs = [ google_api_core libcst proto-plus ]; + checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + + meta = with lib; { + description = "Google Cloud IAM API client library"; + homepage = "https://github.com/googleapis/python-iam"; + license = licenses.asl20; + maintainers = with maintainers; [ austinbutler ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2609284bf61..d21021bc36e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2470,6 +2470,8 @@ in { google_cloud_firestore = callPackage ../development/python-modules/google_cloud_firestore { }; + google-cloud-iam = callPackage ../development/python-modules/google-cloud-iam { }; + google_cloud_iot = callPackage ../development/python-modules/google_cloud_iot { }; google_cloud_kms = callPackage ../development/python-modules/google_cloud_kms { }; From b6421926db39a3fdb07eaf76e4bcfe361dafbeed Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 2 Nov 2020 17:14:27 -0800 Subject: [PATCH 109/299] python3Packages.google_api_core: 1.22.1 -> 1.22.4 --- .../google_api_core/default.nix | 36 +++++++++---------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix index a72f68c19ff..40c80010085 100644 --- a/pkgs/development/python-modules/google_api_core/default.nix +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -1,32 +1,27 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27 -, google_auth, protobuf, googleapis_common_protos, requests, setuptools, grpcio -, mock -}: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, google_auth, protobuf +, googleapis_common_protos, requests, grpcio, mock, pytest, pytest-asyncio, pytestCheckHook }: buildPythonPackage rec { pname = "google-api-core"; - version = "1.22.1"; - disabled = isPy27; # google namespace no longer works on python2 + version = "1.22.4"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "35cba563034d668ae90ffe1f03193a84e745b38f09592f60258358b5e5ee6238"; + sha256 = "06pck3hwl1pks26q843hv6pxchby9viab05mxf72k7ksab17m7aa"; }; - propagatedBuildInputs = [ - googleapis_common_protos protobuf - google_auth requests setuptools grpcio - ]; + propagatedBuildInputs = + [ googleapis_common_protos protobuf google_auth requests grpcio ]; - # requires nox - doCheck = false; - checkInputs = [ mock ]; + checkInputs = [ google_auth mock protobuf pytest-asyncio pytestCheckHook ]; - pythonImportsCheck = [ - "google.auth" - "google.protobuf" - "google.api" - ]; + # prevent google directory from shadowing google imports + preCheck = '' + rm -r google + ''; + + pythonImportsCheck = [ "google.auth" "google.protobuf" "google.api" ]; meta = with lib; { description = "Core Library for Google Client Libraries"; @@ -35,7 +30,8 @@ buildPythonPackage rec { helpers used by all Google API clients. ''; homepage = "https://github.com/googleapis/python-api-core"; - changelog = "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md"; + changelog = + "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; From 618da3917d0992b864db9f0255f50fce07537053 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 2 Nov 2020 17:14:43 -0800 Subject: [PATCH 110/299] python3Packages.google_auth: 1.20.1 -> 1.22.1 --- .../python-modules/google_auth/default.nix | 35 ++++++------------- 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google_auth/default.nix index 59ed94d3486..3f201aee233 100644 --- a/pkgs/development/python-modules/google_auth/default.nix +++ b/pkgs/development/python-modules/google_auth/default.nix @@ -1,29 +1,19 @@ -{ stdenv, buildPythonPackage, fetchpatch, fetchPypi -, cachetools -, flask -, freezegun -, mock -, oauth2client -, pyasn1-modules -, pytest -, pytest-localserver -, requests -, responses -, rsa -, setuptools -, six -, urllib3 -}: +{ stdenv, buildPythonPackage, fetchpatch, fetchPypi, pythonOlder +, pytestCheckHook, cachetools, flask, freezegun, mock, oauth2client +, pyasn1-modules, pytest, pytest-localserver, requests, responses, rsa +, setuptools, six, urllib3 }: buildPythonPackage rec { pname = "google-auth"; - version = "1.20.1"; + version = "1.22.1"; src = fetchPypi { inherit pname version; - sha256 = "2f34dd810090d0d4c9d5787c4ad7b4413d1fbfb941e13682c7a2298d3b6cdcc8"; + sha256 = "1fs448jcx2cbpk0nq3picndfryjsakmd9allggvh7mrqjiw723ww"; }; + disabled = pythonOlder "3.5"; + propagatedBuildInputs = [ six pyasn1-modules cachetools rsa setuptools ]; checkInputs = [ @@ -31,17 +21,13 @@ buildPythonPackage rec { freezegun mock oauth2client - pytest + pytestCheckHook pytest-localserver requests responses urllib3 ]; - checkPhase = '' - py.test - ''; - meta = with stdenv.lib; { description = "Google Auth Python Library"; longDescription = '' @@ -49,7 +35,8 @@ buildPythonPackage rec { authentication mechanisms to access Google APIs. ''; homepage = "https://github.com/googleapis/google-auth-library-python"; - changelog = "https://github.com/googleapis/google-auth-library-python/blob/v${version}/CHANGELOG.md"; + changelog = + "https://github.com/googleapis/google-auth-library-python/blob/v${version}/CHANGELOG.md"; # Documentation: https://googleapis.dev/python/google-auth/latest/index.html license = licenses.asl20; maintainers = with maintainers; [ ]; From c4d8e9743a009081dc406b69ed4e8a8d8d840a51 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 2 Nov 2020 17:15:01 -0800 Subject: [PATCH 111/299] python3Packages.google_cloud_automl: 1.0.1 -> 2.0.0 --- .../google_cloud_automl/default.nix | 38 ++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_automl/default.nix b/pkgs/development/python-modules/google_cloud_automl/default.nix index 43ffdc7a70d..8ed42aeed28 100644 --- a/pkgs/development/python-modules/google_cloud_automl/default.nix +++ b/pkgs/development/python-modules/google_cloud_automl/default.nix @@ -1,34 +1,38 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, enum34 -, google_api_core -, google_cloud_storage -, pandas -, pytest -, mock -}: +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytestCheckHook, libcst +, google_api_core, google_cloud_storage, google_cloud_testutils, pandas +, proto-plus, pytest-asyncio, mock }: buildPythonPackage rec { pname = "google-cloud-automl"; - version = "1.0.1"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "f08abe78d37fb94a3748aa43e66dae2bad52f991cc7740501a341bc6f6387fd5"; + sha256 = "16hr1i2771z4yh19xg6kk037h9cv5j64q5bxb9nmkvj12hdwbwgv"; }; - checkInputs = [ pandas pytest mock google_cloud_storage ]; - propagatedBuildInputs = [ enum34 google_api_core ]; + disabled = pythonOlder "3.6"; + + checkInputs = [ + google_cloud_storage + google_cloud_testutils + mock + pandas + pytest-asyncio + pytestCheckHook + ]; + propagatedBuildInputs = [ google_api_core libcst proto-plus ]; # ignore tests which need credentials - checkPhase = '' - pytest tests/unit -k 'not upload and not prediction_client_client_info' + disabledTests = [ "test_prediction_client_client_info" ]; + preCheck = '' + rm -r google + rm tests/system/gapic/v1beta1/test_system_tables_client_v1.py ''; meta = with stdenv.lib; { description = "Cloud AutoML API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-automl"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; From f2b0d07cf08824234cd0cefe3ee579b1ae3ba3d9 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 2 Nov 2020 17:15:10 -0800 Subject: [PATCH 112/299] python3Packages.google_cloud_bigquery: 1.26.1 -> 2.1.0 --- .../google_cloud_bigquery/default.nix | 52 ++++++++++--------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_bigquery/default.nix b/pkgs/development/python-modules/google_cloud_bigquery/default.nix index b8120285917..356850876a7 100644 --- a/pkgs/development/python-modules/google_cloud_bigquery/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigquery/default.nix @@ -1,42 +1,46 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, freezegun -, google_resumable_media -, google_api_core -, google_cloud_core -, pandas -, pyarrow -, pytest -, mock -, ipython -}: +{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder, freezegun +, google_api_core, google_cloud_core, google_cloud_testutils +, google_resumable_media, grpcio, ipython, mock, pandas, proto-plus, pyarrow }: buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "1.26.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "51c29b95d460486d9e0210f63e8193691cd08480b69775270e84dd3db87c1bf2"; + sha256 = "0x5g6n151rcdgq4s80f71zpsl7bsvyyrs07l58psdpyd3kwf4sbk"; }; - checkInputs = [ pytest mock ipython freezegun ]; - propagatedBuildInputs = [ google_resumable_media google_api_core google_cloud_core pandas pyarrow ]; + disabled = pythonOlder "3.6"; - # prevent local directory from shadowing google imports - # call_api_applying_custom_retry_on_timeout requires credentials + checkInputs = + [ freezegun google_cloud_testutils ipython mock pytestCheckHook ]; + propagatedBuildInputs = [ + google_resumable_media + google_api_core + google_cloud_core + pandas + proto-plus + pyarrow + ]; + + # prevent google directory from shadowing google imports # test_magics requires modifying sys.path - checkPhase = '' + preCheck = '' rm -r google - pytest tests/unit \ - -k 'not call_api_applying_custom_retry_on_timeout' \ - --ignore=tests/unit/test_magics.py + rm tests/unit/test_magics.py ''; + # call_api_applying_custom_retry_on_timeout requires credentials + # to_dataframe_timestamp_out_of_pyarrow_bounds has inconsistent results + disabledTests = [ + "call_api_applying_custom_retry_on_timeout" + "to_dataframe_timestamp_out_of_pyarrow_bounds" + ]; + meta = with stdenv.lib; { description = "Google BigQuery API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://pypi.org/project/google-cloud-bigquery"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; From 7cbe301ffc940496b5929c01750892b9fdfbe05b Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 2 Nov 2020 17:15:22 -0800 Subject: [PATCH 113/299] python3Packages.google_cloud_container: 2.0.1 -> 2.1.0 --- .../google_cloud_container/default.nix | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_container/default.nix b/pkgs/development/python-modules/google_cloud_container/default.nix index ec41592b48b..e155a545a15 100644 --- a/pkgs/development/python-modules/google_cloud_container/default.nix +++ b/pkgs/development/python-modules/google_cloud_container/default.nix @@ -1,23 +1,20 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, google_api_core -, grpc_google_iam_v1 -, pytest -, mock -}: +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, google_api_core +, grpc_google_iam_v1, libcst, mock, proto-plus, pytest, pytest-asyncio }: buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.0.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "6f714e3d427e2b36d1365fc400f4d379972529fb40f798d9c0e06c7c3418fc89"; + sha256 = "07rcq4c49zfaacyn5df62bs7qjf5hpmdm9mpb6nx510lylq0507x"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core grpc_google_iam_v1 ]; + disabled = pythonOlder "3.6"; + + checkInputs = [ mock pytest pytest-asyncio ]; + propagatedBuildInputs = + [ google_api_core grpc_google_iam_v1 libcst proto-plus ]; checkPhase = '' pytest tests/unit @@ -25,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Google Container Engine API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-container"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; From d1cd5b6f54002793e757ebbdd8737d22d6aa3210 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 2 Nov 2020 17:15:39 -0800 Subject: [PATCH 114/299] python3Packages.google_cloud_core: 1.4.1 -> 1.4.3 --- .../google_cloud_core/default.nix | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_core/default.nix b/pkgs/development/python-modules/google_cloud_core/default.nix index f277711e8f1..88bc24d493c 100644 --- a/pkgs/development/python-modules/google_cloud_core/default.nix +++ b/pkgs/development/python-modules/google_cloud_core/default.nix @@ -1,26 +1,30 @@ -{ stdenv, buildPythonPackage, fetchPypi, python -, google_api_core, grpcio, pytest, mock, setuptools }: +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytestCheckHook, python +, google_api_core, grpcio, mock }: buildPythonPackage rec { pname = "google-cloud-core"; - version = "1.4.1"; + version = "1.4.3"; src = fetchPypi { inherit pname version; - sha256 = "613e56f164b6bee487dd34f606083a0130f66f42f7b10f99730afdf1630df507"; + sha256 = "103bgv9d6fw01vbbdx0qxa5gqdzxqmiwlpdvibmqxkhb3c6bgbr1"; }; - propagatedBuildInputs = [ google_api_core grpcio setuptools ]; - checkInputs = [ pytest mock ]; + disabled = pythonOlder "3.5"; - checkPhase = '' - cd tests - ${python.interpreter} -m unittest discover + propagatedBuildInputs = [ google_api_core grpcio ]; + checkInputs = [ google_api_core mock pytestCheckHook ]; + + pythonImportsCheck = [ "google.cloud" ]; + + # prevent google directory from shadowing google imports + preCheck = '' + rm -r google ''; meta = with stdenv.lib; { description = "API Client library for Google Cloud: Core Helpers"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-cloud-core"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; From 3305029ef16af369e2ee92f6a528405f39252623 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 2 Nov 2020 17:15:57 -0800 Subject: [PATCH 115/299] python3Packages.google_cloud_error_reporting: 0.34.0 -> 1.0.0 --- .../google_cloud_error_reporting/default.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_error_reporting/default.nix b/pkgs/development/python-modules/google_cloud_error_reporting/default.nix index 72502a4f4ad..350bbaea115 100644 --- a/pkgs/development/python-modules/google_cloud_error_reporting/default.nix +++ b/pkgs/development/python-modules/google_cloud_error_reporting/default.nix @@ -1,31 +1,31 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, google_cloud_logging -, pytest -, mock -}: +{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder +, google_cloud_logging, google_cloud_testutils, libcst, mock, proto-plus +, pytest-asyncio }: buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "0.34.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "34edd11601b17c87a89c2e1cefdc27d975e1e9243a88ba3c0c48bfe6a05c404f"; + sha256 = "1y5vkkg1cmzshj5j68zk1876857z8a7sjm0wqhf4rzgqgkr2kcdd"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_cloud_logging ]; + disabled = pythonOlder "3.6"; - checkPhase = '' + checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ]; + propagatedBuildInputs = [ google_cloud_logging libcst proto-plus ]; + + # Disable tests that require credentials + disabledTests = [ "test_report_error_event" "test_report_exception" ]; + # prevent google directory from shadowing google imports + preCheck = '' rm -r google - pytest tests/unit ''; meta = with stdenv.lib; { description = "Stackdriver Error Reporting API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-error-reporting"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; From 3eda2da78d92f2437d49693947015ecba0d2135a Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 2 Nov 2020 17:16:19 -0800 Subject: [PATCH 116/299] python3Packages.google_cloud_kms: 2.0.1 -> 2.2.0 --- .../google_cloud_kms/default.nix | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_kms/default.nix b/pkgs/development/python-modules/google_cloud_kms/default.nix index 79fe4bcc80f..a4d2439fb49 100644 --- a/pkgs/development/python-modules/google_cloud_kms/default.nix +++ b/pkgs/development/python-modules/google_cloud_kms/default.nix @@ -1,32 +1,28 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, enum34 -, grpc_google_iam_v1 -, google_api_core -, pytest -, mock +{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder +, grpc_google_iam_v1, google_api_core, libcst, mock, proto-plus, pytest-asyncio }: buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.0.1"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "c590a8ab12a3f776ab35e570d21c0881f9d73c444bd509e54321a4c715233372"; + sha256 = "0f3k2ixp1zsgydpvkj75bs2mb805389snyw30hn41c38qq5ksdga"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ]; + disabled = pythonOlder "3.6"; - checkPhase = '' - pytest tests/unit - ''; + checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + propagatedBuildInputs = + [ grpc_google_iam_v1 google_api_core libcst proto-plus ]; + + # Disable tests that need credentials + disabledTests = [ "test_list_global_key_rings" ]; meta = with stdenv.lib; { description = "Cloud Key Management Service (KMS) API API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-kms"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; From 9324ba634dd9452c9ef547eb4b1530f9799578eb Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 2 Nov 2020 17:16:31 -0800 Subject: [PATCH 117/299] python3Packages.google_cloud_logging: fix tests --- .../google_cloud_logging/default.nix | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_logging/default.nix b/pkgs/development/python-modules/google_cloud_logging/default.nix index 6aeef14b692..ef155a18a1d 100644 --- a/pkgs/development/python-modules/google_cloud_logging/default.nix +++ b/pkgs/development/python-modules/google_cloud_logging/default.nix @@ -1,14 +1,6 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, google_api_core -, google_cloud_core -, pytest -, mock -, webapp2 -, django -, flask -}: +{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder, django +, flask, google_api_core, google_cloud_core, google_cloud_testutils, mock +, webapp2 }: buildPythonPackage rec { pname = "google-cloud-logging"; @@ -19,17 +11,27 @@ buildPythonPackage rec { sha256 = "cb0d4af9d684eb8a416f14c39d9fa6314be3adf41db2dd8ee8e30db9e8853d90"; }; - checkInputs = [ pytest mock webapp2 django flask ]; + disabled = pythonOlder "3.5"; + + checkInputs = + [ django flask google_cloud_testutils mock pytestCheckHook webapp2 ]; propagatedBuildInputs = [ google_api_core google_cloud_core ]; - checkPhase = '' + # api_url test broken, fix not yet released + # https://github.com/googleapis/python-logging/pull/66 + disabledTests = + [ "test_build_api_url_w_custom_endpoint" "test_write_log_entries" ]; + + # prevent google directory from shadowing google imports + # remove system integration tests + preCheck = '' rm -r google - pytest tests/unit + rm tests/system/test_system.py ''; meta = with stdenv.lib; { description = "Stackdriver Logging API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-logging"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; From 24d644de7d035e7ad02ce1ae733109060037cb74 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 2 Nov 2020 17:16:49 -0800 Subject: [PATCH 118/299] python3Packages.google_cloud_pubsub: 1.7.0 -> 2.1.0 --- .../google_cloud_pubsub/default.nix | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_pubsub/default.nix b/pkgs/development/python-modules/google_cloud_pubsub/default.nix index 56a95692846..4af622dc66e 100644 --- a/pkgs/development/python-modules/google_cloud_pubsub/default.nix +++ b/pkgs/development/python-modules/google_cloud_pubsub/default.nix @@ -1,36 +1,34 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, enum34 -, grpc_google_iam_v1 -, google_api_core -, pytest -, mock -}: +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytestCheckHook +, google_api_core, google_cloud_testutils, grpc_google_iam_v1, libcst, mock +, proto-plus, pytest-asyncio }: buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "1.7.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "c8d098ebd208d00c8f3bb55eefecd8553e7391d59700426a97d35125f0dcb248"; + sha256 = "0358g5q4igq1pgy8dznbbkc6y7zf36y4m81hhh8hvzzhaa37vc22"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ]; + disabled = pythonOlder "3.6"; - # tests don't clean up file descriptors correctly - doCheck = false; - checkPhase = '' - pytest tests/unit + checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ]; + propagatedBuildInputs = + [ grpc_google_iam_v1 google_api_core libcst proto-plus ]; + + # prevent google directory from shadowing google imports + # Tests in pubsub_v1 attempt to contact pubsub.googleapis.com + preCheck = '' + rm -r google + rm -r tests/unit/pubsub_v1 ''; pythonImportsCheck = [ "google.cloud.pubsub" ]; meta = with stdenv.lib; { description = "Google Cloud Pub/Sub API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://pypi.org/project/google-cloud-pubsub"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; From 7fbefa7cf9a892c526bff6c8f59c833538993c3b Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 2 Nov 2020 17:17:14 -0800 Subject: [PATCH 119/299] python3Packages.google_cloud_resource_manager: fix tests --- .../google_cloud_resource_manager/default.nix | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_resource_manager/default.nix b/pkgs/development/python-modules/google_cloud_resource_manager/default.nix index 84fac88bcfa..a4b310797a7 100644 --- a/pkgs/development/python-modules/google_cloud_resource_manager/default.nix +++ b/pkgs/development/python-modules/google_cloud_resource_manager/default.nix @@ -1,11 +1,5 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, google_cloud_core -, google_api_core -, pytest -, mock -}: +{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder +, google_cloud_core, google_api_core, mock, pytest }: buildPythonPackage rec { pname = "google-cloud-resource-manager"; @@ -16,17 +10,24 @@ buildPythonPackage rec { sha256 = "de7eba5235df61deee2291a2fe70b904154df613a334109488afdea7a4c0011f"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_cloud_core google_api_core ]; + disabled = pythonOlder "3.5"; - checkPhase = '' + checkInputs = [ mock pytestCheckHook ]; + propagatedBuildInputs = [ google_api_core google_cloud_core ]; + + # api_url test broken, fix not yet released + # https://github.com/googleapis/python-resource-manager/pull/31 + disabledTests = + [ "api_url_no_extra_query_param" "api_url_w_custom_endpoint" ]; + + # prevent google directory from shadowing google imports + preCheck = '' rm -r google - pytest tests/unit ''; meta = with stdenv.lib; { description = "Google Cloud Resource Manager API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-resource-manager"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; From d6e7e3c6f82d8ae75247ee77d9cd57fc7366a97f Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 2 Nov 2020 17:17:29 -0800 Subject: [PATCH 120/299] python3Packages.google_cloud_runtimeconfig: fix tests --- .../google_cloud_runtimeconfig/default.nix | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix b/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix index 08e2c38ea1b..80bdcd1b83c 100644 --- a/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix +++ b/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix @@ -1,11 +1,5 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, google_api_core -, google_cloud_core -, pytest -, mock -}: +{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder +, google_api_core, google_cloud_core, mock }: buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; @@ -16,18 +10,24 @@ buildPythonPackage rec { sha256 = "3d125c01817d5bef2b644095b044d22b03b9d8d4591088cadd8e97851f7a150a"; }; - checkInputs = [ pytest mock ]; + disabled = pythonOlder "3.5"; + + checkInputs = [ mock pytestCheckHook ]; propagatedBuildInputs = [ google_api_core google_cloud_core ]; - # ignore tests which require credentials or network - checkPhase = '' + # api_url test broken, fix not yet released + # https://github.com/googleapis/python-resource-manager/pull/31 + # Client tests require credentials + disabledTests = [ "build_api_url_w_custom_endpoint" "client_options" ]; + + # prevent google directory from shadowing google imports + preCheck = '' rm -r google - pytest tests/unit -k 'not client and not extra_headers' ''; meta = with stdenv.lib; { description = "Google Cloud RuntimeConfig API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://pypi.org/project/google-cloud-runtimeconfig"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; From d0b54015df388b33683c71d546373833d172f5b0 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 2 Nov 2020 17:17:50 -0800 Subject: [PATCH 121/299] python3Packages.google_cloud_spanner: 1.17.1 -> 1.19.1 --- .../google_cloud_spanner/default.nix | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_spanner/default.nix b/pkgs/development/python-modules/google_cloud_spanner/default.nix index ce03add44e4..4e86908b426 100644 --- a/pkgs/development/python-modules/google_cloud_spanner/default.nix +++ b/pkgs/development/python-modules/google_cloud_spanner/default.nix @@ -1,35 +1,32 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, grpc_google_iam_v1 -, grpcio-gcp -, google_api_core -, google_cloud_core -, pytest -, mock -}: +{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder +, grpc_google_iam_v1, grpcio-gcp, google_api_core, google_cloud_core +, google_cloud_testutils, mock, pytest }: buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "1.17.1"; + version = "1.19.1"; src = fetchPypi { inherit pname version; - sha256 = "3240a04eaa6496e9d8bf4929f4ff04de1652621fd49555eb83b743c48ed9ca04"; + sha256 = "0b9ifh9i4hkcs19b4l6v8j8v93yd8p3j19qrrjvvf5a44bc7bhsh"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ grpcio-gcp grpc_google_iam_v1 google_api_core google_cloud_core ]; + disabled = pythonOlder "3.5"; - # avoid importing local package - checkPhase = '' + checkInputs = [ google_cloud_testutils mock pytestCheckHook ]; + propagatedBuildInputs = + [ grpcio-gcp grpc_google_iam_v1 google_api_core google_cloud_core ]; + + # prevent google directory from shadowing google imports + # remove tests that require credentials + preCheck = '' rm -r google - pytest tests/unit + rm tests/system/test_system.py ''; meta = with stdenv.lib; { description = "Cloud Spanner API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://pypi.org/project/google-cloud-spanner"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; From d19278d5eef2a8646aeabaa6b8fd87df9737c7e0 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 2 Nov 2020 17:18:50 -0800 Subject: [PATCH 122/299] python3Packages.google_cloud_storage: fix tests --- .../google_cloud_storage/default.nix | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/pkgs/development/python-modules/google_cloud_storage/default.nix index 7a92e731042..bcb8b604e45 100644 --- a/pkgs/development/python-modules/google_cloud_storage/default.nix +++ b/pkgs/development/python-modules/google_cloud_storage/default.nix @@ -1,13 +1,7 @@ -{ lib -, buildPythonPackage -, fetchPypi -, google_resumable_media -, google_api_core -, google_cloud_core -, pytest -, mock -, setuptools -}: +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder +, google_api_core, google_auth, google-cloud-iam, google_cloud_core +, google_cloud_kms, google_cloud_testutils, google_resumable_media, mock +, requests }: buildPythonPackage rec { pname = "google-cloud-storage"; @@ -18,27 +12,36 @@ buildPythonPackage rec { sha256 = "da12b7bd79bbe978a7945a44b600604fbc10ece2935d31f243e751f99135e34f"; }; + disabled = pythonOlder "3.5"; + propagatedBuildInputs = [ google_api_core + google_auth google_cloud_core google_resumable_media - setuptools + requests ]; checkInputs = [ + google-cloud-iam + google_cloud_kms + google_cloud_testutils mock - pytest + pytestCheckHook ]; - # remove directory from interferring with importing modules - # ignore tests which require credentials - checkPhase = '' + # disable tests which require credentials + disabledTests = [ "create" "get" "post" "test_build_api_url" ]; + + # prevent google directory from shadowing google imports + # remove tests which require credentials + preCheck = '' rm -r google - pytest tests/unit -k 'not (create or get or post)' + rm tests/system/test_system.py tests/unit/test_client.py ''; meta = with lib; { description = "Google Cloud Storage API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-storage"; license = licenses.asl20; maintainers = with maintainers; [ costrouc ]; }; From 51f17159974848d72c74b7748a09ed00d9bbbbc4 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 2 Nov 2020 17:19:08 -0800 Subject: [PATCH 123/299] pythonPackages.google_cloud_testutils: unstable -> 0.1.0 --- .../google_cloud_testutils/default.nix | 32 ++++++------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_testutils/default.nix b/pkgs/development/python-modules/google_cloud_testutils/default.nix index 90e4683f7b0..dfd6354dcc4 100644 --- a/pkgs/development/python-modules/google_cloud_testutils/default.nix +++ b/pkgs/development/python-modules/google_cloud_testutils/default.nix @@ -1,34 +1,22 @@ -{ stdenv -, buildPythonPackage -, fetchFromGitHub -, six -, google_auth -}: +{ stdenv, buildPythonPackage, fetchPypi, google_auth, pytest, six }: -buildPythonPackage { +buildPythonPackage rec { pname = "google-cloud-testutils"; - version = "unstable-36ffa923c7037e8b4fdcaa76272cb6267e908a9d"; + version = "0.1.0"; - # google-cloud-testutils is not "really" - # released as a python package - # but it is required for google-cloud-* tests - # so why not package it as a module - src = fetchFromGitHub { - owner = "googleapis"; - repo = "google-cloud-python"; - rev = "36ffa923c7037e8b4fdcaa76272cb6267e908a9d"; - sha256 = "1fvcnssmpgf4lfr7l9h7cz984rbc5mfr1j1br12japcib5biwzjy"; + src = fetchPypi { + inherit pname version; + sha256 = "1bn1pz00lxym3vkl6l45b3nydpmfdvmylwggh2lspldrxwx39a0k"; }; - propagatedBuildInputs = [ six google_auth ]; + propagatedBuildInputs = [ google_auth six ]; - postPatch = '' - cd test_utils - ''; + # There are no tests + doCheck = false; meta = with stdenv.lib; { description = "System test utilities for google-cloud-python"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-test-utils"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; From 9a902f2a71e336949954691ad7c8f1f59d19962f Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 2 Nov 2020 17:19:22 -0800 Subject: [PATCH 124/299] python3Packages.google_cloud_texttospeech: fix build --- .../google_cloud_texttospeech/default.nix | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix b/pkgs/development/python-modules/google_cloud_texttospeech/default.nix index 3a052c73cda..32e8fa223a8 100644 --- a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix +++ b/pkgs/development/python-modules/google_cloud_texttospeech/default.nix @@ -1,10 +1,5 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, google_api_core -, pytest -, mock -}: +{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder +, google_api_core, libcst, mock, proto-plus, pytest-asyncio, }: buildPythonPackage rec { pname = "google-cloud-texttospeech"; @@ -15,16 +10,17 @@ buildPythonPackage rec { sha256 = "cbbd397e72b6189668134f3c8e8c303198188334a4e6a5f77cc90c3220772f9e"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core ]; + disabled = pythonOlder "3.5"; - checkPhase = '' - pytest tests/unit - ''; + checkInputs = [ mock pytest-asyncio pytestCheckHook ]; + propagatedBuildInputs = [ google_api_core libcst proto-plus ]; + + # Disable tests that require credentials + disabledTests = ["test_synthesize_speech" "test_list_voices"]; meta = with stdenv.lib; { description = "Google Cloud Text-to-Speech API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-texttospeech"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; From 3a0da735d945d1e0d6b48955583717b942db1360 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 2 Nov 2020 17:19:33 -0800 Subject: [PATCH 125/299] python3Packages.google_cloud_translate: fix tests --- .../google_cloud_translate/default.nix | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_translate/default.nix b/pkgs/development/python-modules/google_cloud_translate/default.nix index f25f4badc81..60f9e3e11ae 100644 --- a/pkgs/development/python-modules/google_cloud_translate/default.nix +++ b/pkgs/development/python-modules/google_cloud_translate/default.nix @@ -1,12 +1,6 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, google_api_core -, google_cloud_core -, grpcio -, pytest -, mock -}: +{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder +, google_api_core, google_cloud_core, google_cloud_testutils, grpcio, libcst +, mock, proto-plus, pytest-asyncio }: buildPythonPackage rec { pname = "google-cloud-translate"; @@ -17,18 +11,29 @@ buildPythonPackage rec { sha256 = "ecdea3e176e80f606d08c4c7fd5acea6b3dd960f4b2e9a65951aaf800350a759"; }; - # google_cloud_core[grpc] -> grpcio - propagatedBuildInputs = [ google_api_core google_cloud_core grpcio ]; + disabled = pythonOlder "3.6"; - checkInputs = [ pytest mock ]; - checkPhase = '' - cd tests # prevent local google/__init__.py from getting loaded - pytest unit -k 'not extra_headers' + # google_cloud_core[grpc] -> grpcio + propagatedBuildInputs = + [ google_api_core google_cloud_core grpcio libcst proto-plus ]; + + checkInputs = [ google_cloud_testutils mock pytest-asyncio pytestCheckHook ]; + + # test_http.py broken, fix not yet released + # https://github.com/googleapis/python-translate/pull/69 + disabledTests = [ + "test_build_api_url_w_extra_query_params" + "test_build_api_url_no_extra_query_params" + "test_build_api_url_w_custom_endpoint" + ]; + + preCheck = '' + rm -r google ''; meta = with stdenv.lib; { description = "Google Cloud Translation API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-translate"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; From b99504f142ae85751747d362f6380b296fd2ce1d Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 2 Nov 2020 17:19:58 -0800 Subject: [PATCH 126/299] python3Packages.google_cloud_websecurityscanner: fix build --- .../default.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix b/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix index a43f7fd5f9c..356759f9bcb 100644 --- a/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix @@ -1,10 +1,5 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, google_api_core -, pytest -, mock -}: +{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder +, google_api_core, libcst, mock, proto-plus, pytest-asyncio }: buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; @@ -15,16 +10,14 @@ buildPythonPackage rec { sha256 = "1de60f880487b898b499345f46f7acf38651f5356ebca8673116003a57f25393"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core ]; + disabled = pythonOlder "3.6"; - checkPhase = '' - pytest tests/unit - ''; + checkInputs = [ mock pytest-asyncio pytestCheckHook ]; + propagatedBuildInputs = [ google_api_core libcst proto-plus ]; meta = with stdenv.lib; { description = "Google Cloud Web Security Scanner API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-websecurityscanner"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; From a361626b6ea0f508b399434534563ccfeecc6461 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 2 Nov 2020 17:20:14 -0800 Subject: [PATCH 127/299] patroni: fix tests --- pkgs/servers/sql/patroni/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/patroni/default.nix b/pkgs/servers/sql/patroni/default.nix index 1634b0b5b74..bd06aa2ff7d 100644 --- a/pkgs/servers/sql/patroni/default.nix +++ b/pkgs/servers/sql/patroni/default.nix @@ -39,7 +39,7 @@ pythonPackages.buildPythonApplication rec { checkInputs = with pythonPackages; [ flake8 mock - pytest + pytestCheckHook pytestcov requests ]; From 68060f6f6f491201724192ea0997d67dbeb2e302 Mon Sep 17 00:00:00 2001 From: oxalica Date: Sat, 7 Nov 2020 00:31:25 +0800 Subject: [PATCH 128/299] makeRustPlatform: add rustLibSrc rust-analyzer: rustcSrc -> rustLibSrc to fix build --- .../development/compilers/rust/make-rust-platform.nix | 4 ++++ pkgs/development/compilers/rust/rust-lib-src.nix | 11 +++++++++++ pkgs/development/tools/rust/rust-analyzer/generic.nix | 2 +- pkgs/development/tools/rust/rust-analyzer/wrapper.nix | 5 +++-- 4 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/compilers/rust/rust-lib-src.nix diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix index 6a827cff9a1..4b1f572bebb 100644 --- a/pkgs/development/compilers/rust/make-rust-platform.nix +++ b/pkgs/development/compilers/rust/make-rust-platform.nix @@ -18,4 +18,8 @@ rec { rustcSrc = callPackage ./rust-src.nix { inherit rustc; }; + + rustLibSrc = callPackage ./rust-lib-src.nix { + inherit rustc; + }; } diff --git a/pkgs/development/compilers/rust/rust-lib-src.nix b/pkgs/development/compilers/rust/rust-lib-src.nix new file mode 100644 index 00000000000..67a7fa3641a --- /dev/null +++ b/pkgs/development/compilers/rust/rust-lib-src.nix @@ -0,0 +1,11 @@ +{ stdenv, rustc }: + +stdenv.mkDerivation { + name = "rust-lib-src"; + src = rustc.src; + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mv library $out + ''; +} diff --git a/pkgs/development/tools/rust/rust-analyzer/generic.nix b/pkgs/development/tools/rust/rust-analyzer/generic.nix index cbcab33e0db..1bab5b95183 100644 --- a/pkgs/development/tools/rust/rust-analyzer/generic.nix +++ b/pkgs/development/tools/rust/rust-analyzer/generic.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage { inherit doCheck; preCheck = lib.optionalString doCheck '' - export RUST_SRC_PATH=${rustPlatform.rustcSrc} + export RUST_SRC_PATH=${rustPlatform.rustLibSrc} ''; doInstallCheck = true; diff --git a/pkgs/development/tools/rust/rust-analyzer/wrapper.nix b/pkgs/development/tools/rust/rust-analyzer/wrapper.nix index 8ca3ff1a6d2..bed20628182 100644 --- a/pkgs/development/tools/rust/rust-analyzer/wrapper.nix +++ b/pkgs/development/tools/rust/rust-analyzer/wrapper.nix @@ -4,7 +4,8 @@ lib.makeOverridable ({ unwrapped, pname ? "rust-analyzer", version ? unwrapped.version, - rustcSrc ? rustPlatform.rustcSrc, + # Use name from `RUST_SRC_PATH` + rustSrc ? rustPlatform.rustLibSrc, }: runCommandNoCC "${pname}-${version}" { inherit pname version; inherit (unwrapped) src meta; @@ -12,5 +13,5 @@ lib.makeOverridable ({ } '' mkdir -p $out/bin makeWrapper ${unwrapped}/bin/rust-analyzer $out/bin/rust-analyzer \ - --set-default RUST_SRC_PATH "${rustcSrc}" + --set-default RUST_SRC_PATH "${rustSrc}" '') From 038497d3b3fee1121c155c2787830e55c8559847 Mon Sep 17 00:00:00 2001 From: Andika Demas Riyandi Date: Sat, 7 Nov 2020 00:59:51 +0700 Subject: [PATCH 129/299] nar-serve: init at 0.3.0 (#95420) * nar-serve: init at 0.3.0 * nixos/nar-serve: add new module Co-authored-by: zimbatm --- nixos/modules/module-list.nix | 1 + .../modules/services/networking/nar-serve.nix | 55 +++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/nar-serve.nix | 48 ++++++++++++++++ pkgs/tools/nix/nar-serve/default.nix | 31 +++++++++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 138 insertions(+) create mode 100644 nixos/modules/services/networking/nar-serve.nix create mode 100644 nixos/tests/nar-serve.nix create mode 100644 pkgs/tools/nix/nar-serve/default.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3fd7ebd1ca7..6ac12e4e138 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -680,6 +680,7 @@ ./services/networking/murmur.nix ./services/networking/mxisd.nix ./services/networking/namecoind.nix + ./services/networking/nar-serve.nix ./services/networking/nat.nix ./services/networking/ndppd.nix ./services/networking/networkmanager.nix diff --git a/nixos/modules/services/networking/nar-serve.nix b/nixos/modules/services/networking/nar-serve.nix new file mode 100644 index 00000000000..ddd42fa0107 --- /dev/null +++ b/nixos/modules/services/networking/nar-serve.nix @@ -0,0 +1,55 @@ +{ config, pkgs, lib, ... }: + +with lib; +let + cfg = config.services.nar-serve; +in +{ + meta = { + maintainers = [ maintainers.rizary ]; + }; + options = { + services.nar-serve = { + enable = mkEnableOption "Serve NAR file contents via HTTP"; + + port = mkOption { + type = types.int; + default = 8383; + description = '' + Port number where nar-serve will listen on. + ''; + }; + + cacheURL = mkOption { + type = types.str; + default = "https://cache.nixos.org/"; + description = '' + Binary cache URL to connect to. + + The URL format is compatible with the nix remote url style, such as: + - http://, https:// for binary caches via HTTP or HTTPS + - s3:// for binary caches stored in Amazon S3 + - gs:// for binary caches stored in Google Cloud Storage + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.nar-serve = { + description = "NAR server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + environment.PORT = toString cfg.port; + environment.NAR_CACHE_URL = cfg.cacheURL; + + serviceConfig = { + Restart = "always"; + RestartSec = "5s"; + ExecStart = "${pkgs.nar-serve}/bin/nar-serve"; + DynamicUser = true; + }; + }; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e2a5263a95d..7d582aa5921 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -225,6 +225,7 @@ in mysql-backup = handleTest ./mysql/mysql-backup.nix {}; mysql-replication = handleTest ./mysql/mysql-replication.nix {}; nagios = handleTest ./nagios.nix {}; + nar-serve = handleTest ./nar-serve.nix {}; nat.firewall = handleTest ./nat.nix { withFirewall = true; }; nat.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; }; nat.standalone = handleTest ./nat.nix { withFirewall = false; }; diff --git a/nixos/tests/nar-serve.nix b/nixos/tests/nar-serve.nix new file mode 100644 index 00000000000..9ee738ffb17 --- /dev/null +++ b/nixos/tests/nar-serve.nix @@ -0,0 +1,48 @@ +import ./make-test-python.nix ( + { pkgs, lib, ... }: + { + name = "nar-serve"; + meta.maintainers = [ lib.maintainers.rizary ]; + nodes = + { + server = { pkgs, ... }: { + services.nginx = { + enable = true; + virtualHosts.default.root = "/var/www"; + }; + services.nar-serve = { + enable = true; + # Connect to the localhost nginx instead of the default + # https://cache.nixos.org + cacheURL = "http://localhost/"; + }; + environment.systemPackages = [ + pkgs.hello + pkgs.curl + ]; + + networking.firewall.allowedTCPPorts = [ 8383 ]; + + # virtualisation.diskSize = 2 * 1024; + }; + }; + testScript = '' + start_all() + + # Create a fake cache with Nginx service the static files + server.succeed( + "nix copy --to file:///var/www ${pkgs.hello}" + ) + server.wait_for_unit("nginx.service") + server.wait_for_open_port(80) + + # Check that nar-serve can return the content of the derivation + drvName = os.path.basename("${pkgs.hello}") + drvHash = drvName.split("-")[0] + server.wait_for_unit("nar-serve.service") + server.succeed( + "curl -o hello -f http://localhost:8383/nix/store/{}/bin/hello".format(drvHash) + ) + ''; + } +) diff --git a/pkgs/tools/nix/nar-serve/default.nix b/pkgs/tools/nix/nar-serve/default.nix new file mode 100644 index 00000000000..89a38b40a19 --- /dev/null +++ b/pkgs/tools/nix/nar-serve/default.nix @@ -0,0 +1,31 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, stdenv +}: +let + pname = "nar-serve"; + version = "0.3.0"; + +in +buildGoModule rec { + inherit pname version; + + src = fetchFromGitHub { + owner = "numtide"; + repo = "nar-serve"; + rev = "v${version}"; + sha256 = "000xxrar5ngrqqfi7ynx84i6wi27mirgm26brhyg0y4pygc9ykhz"; + }; + + vendorSha256 = "0qkzbr85wkx3r7qgnzg9pdl7vsli10bzcdbj2gqd1kdzwb8khszs"; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Serve NAR file contents via HTTP"; + homepage = "https://github.com/numtide/nar-serve"; + license = licenses.mit; + maintainers = with maintainers; [ rizary ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b20511f88d2..68001e7db32 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27314,6 +27314,8 @@ in mynewt-newt = callPackage ../tools/package-management/mynewt-newt { }; + nar-serve = callPackage ../tools/nix/nar-serve { }; + inherit (callPackage ../tools/package-management/nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; From c45792d6c95d6a7eaefdc5968c91f82b430070f9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 5 Nov 2020 04:53:52 +0000 Subject: [PATCH 130/299] python27Packages.param: 1.9.3 -> 1.10.0 --- pkgs/development/python-modules/param/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix index 096bb2cfb91..9f6d78a8ecb 100644 --- a/pkgs/development/python-modules/param/default.nix +++ b/pkgs/development/python-modules/param/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "param"; - version = "1.9.3"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "10crjlsn5vx03xwlnhga9faqq2rlw0qwabi45vnvhmz22qbd8w43"; + sha256 = "a284c1b42aff6367e8eea2f649d4f3f70a9f16c6f17d8ad672a31ff36089f995"; }; checkInputs = [ flake8 nose ]; From a3ca1528d74a3892576bf46bcd48d890ad380c58 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 6 Nov 2020 15:32:50 +0100 Subject: [PATCH 131/299] vimPlugins.neuron-vim: ihsanturk/neuron.vim -> fiatjaf/neuron.vim The current derivation for `vimPlugins.neuron-vim` points to [ihsanturk/neuron.vim], which doesn't seem to be actively maintained. This PR switches over to an actively maintained fork, [fiatjaf/neuron.vim], which works with recent versions of [neuron]. [ihsanturk/neuron.vim]: https://github.com/ihsanturk/neuron.vim [fiatjaf/neuron.vim]: https://github.com/fiatjaf/neuron.vim [neuron]: https://github.com/srid/neuron --- pkgs/misc/vim-plugins/generated.nix | 10 +++++----- pkgs/misc/vim-plugins/vim-plugin-names | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index e1d8171ea0c..82374718b16 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2472,14 +2472,14 @@ let neuron-vim = buildVimPluginFrom2Nix { pname = "neuron-vim"; - version = "2020-08-07"; + version = "2020-10-29"; src = fetchFromGitHub { - owner = "ihsanturk"; + owner = "fiatjaf"; repo = "neuron.vim"; - rev = "07521a3ef2940bd726e7b4d50b82e46898e686cc"; - sha256 = "0myadiy6y2p73lhdzk2w55whg4i5rs004jaw1m21cz0dk8k8ibn2"; + rev = "2b4321bf12a4d0b589cd8c26aabb7e31311dab26"; + sha256 = "0h8m72n4jdl9fa308wrchckn6xsbs3b5w8b0714qf9rdpg8jzwa6"; }; - meta.homepage = "https://github.com/ihsanturk/neuron.vim/"; + meta.homepage = "https://github.com/fiatjaf/neuron.vim/"; }; nim-vim = buildVimPluginFrom2Nix { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index d161392ef16..cb62025a8f8 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -109,6 +109,7 @@ fatih/vim-go fcpg/vim-osc52 FelikZ/ctrlp-py-matcher fenetikm/falcon +fiatjaf/neuron.vim fisadev/vim-isort flazz/vim-colorschemes floobits/floobits-neovim @@ -159,7 +160,6 @@ iamcco/coc-vimlsp ianks/vim-tsx idanarye/vim-merginal idris-hackers/idris-vim -ihsanturk/neuron.vim Inazuma110/deoplete-greek inkarkat/vim-SyntaxRange int3/vim-extradite From 7ff16d8155ab1669503409e44180f63f189459f8 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 6 Nov 2020 18:28:28 +0000 Subject: [PATCH 132/299] firmwareLinuxNonfree: 2020-09-18 -> 2020-10-22 --- .../linux/firmware/firmware-linux-nonfree/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 76ea5230bec..fcebea126fe 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "firmware-linux-nonfree"; - version = "2020-09-18"; + version = "2020-10-22"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; rev = lib.replaceStrings ["-"] [""] version; - sha256 = "06k2x6y9dhzs6nnbs1ws7rxbz0xijzmyn24sa223n0bmbb96n4f0"; + sha256 = "15l32993pfm0albx7ky64c5i60vph150hrdkg87md15919a6naia"; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1avpf2x1g7dlpva76pcnldxngkjabsyaknkkjbrhg1mj6z9g1mx7"; + outputHash = "0y2dpp3gklzym2gr0w9wddf6cn6p0sv9n2xh401j1299sjsr57m9"; meta = with stdenv.lib; { description = "Binary firmware collection packaged by kernel.org"; From 8fb56a487fe57e420209d9f37a085fcc89a5d108 Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Thu, 15 Oct 2020 16:07:12 +0200 Subject: [PATCH 133/299] python3Packages.pyelftools: disable tests on Darwin af27072 broke the build on Darwin. There does not seem to be any way to sanely enable tests on Darwin. Tests initially fail because of missing 'greadelf' expected by test/run_readelf_tests.py. This is fixed by: - adding 'binutils-unwrapped' to checkInputs - hardlinking 'readelf' to 'greadelf' in a temp bin dir - exporting temp bin dir to PATH This leads to further test failures because of 'readelf' version mismatch causing output inconsistencies. See test/run_readelf_tests.py:31 for further details. Signed-off-by: Sirio Balmelli --- pkgs/development/python-modules/pyelftools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyelftools/default.nix b/pkgs/development/python-modules/pyelftools/default.nix index 08fba705aa8..51e1886f1d0 100644 --- a/pkgs/development/python-modules/pyelftools/default.nix +++ b/pkgs/development/python-modules/pyelftools/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-O7l1kj0k8bOSOtZJVzS674oVnM+X3oP00Ybs0qjb64Q="; }; - doCheck = stdenv.is64bit; + doCheck = stdenv.is64bit && !stdenv.isDarwin; checkPhase = '' patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" test/external_tools/readelf From 0a2f47b51b0b99bac14a23e5ff4b29aed4f8162e Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Thu, 5 Nov 2020 15:31:28 -0500 Subject: [PATCH 134/299] nvidia_x11.persistenced: fix build on master --- pkgs/os-specific/linux/nvidia-x11/persistenced.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index ff2792ac315..5979f7e9a22 100644 --- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -1,6 +1,10 @@ nvidia_x11: sha256: -{ stdenv, fetchFromGitHub, m4 }: +{ stdenv +, fetchFromGitHub +, m4 +, libtirpc +}: stdenv.mkDerivation rec { pname = "nvidia-persistenced"; @@ -14,6 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ m4 ]; + buildInputs = [ libtirpc ]; installFlags = [ "PREFIX=$(out)" ]; @@ -27,6 +32,9 @@ stdenv.mkDerivation rec { $out/bin/nvidia-persistenced ''; + NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + NIX_LDFLAGS = [ "-ltirpc" ]; + meta = with stdenv.lib; { homepage = "https://www.nvidia.com/object/unix.html"; description = "Settings application for NVIDIA graphics cards"; From e173880ed54b0d0cb0c2a35ce05770dd81ba6e2b Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 14:14:28 +0100 Subject: [PATCH 135/299] pugixml: 1.9 -> 1.10 * split to multiple outputs when using the shared library version * enabled the tests * validate the pkg-config files --- .../development/libraries/pugixml/default.nix | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index 8bd86154068..d9b04781ba1 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -1,34 +1,41 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, shared ? false }: +{ stdenv, lib, fetchFromGitHub, cmake, check, validatePkgConfig, shared ? false }: stdenv.mkDerivation rec { pname = "pugixml"; - version = "1.9"; + version = "1.10"; src = fetchFromGitHub { owner = "zeux"; repo = "pugixml"; rev = "v${version}"; - sha256 = "0iraznwm78pyyzc9snvd3dyz8gddvmxsm1b3kpw7wixkvcawdviv"; + sha256 = "dywnLSJHeGaR3+0lTLpacWQL0rWlF8+LNCy+oCCO9C4="; }; - patches = [ - # To be removed after a version newer than 1.9 is released - (fetchpatch { - url = "https://github.com/zeux/pugixml/pull/193.patch"; - sha256 = "0s4anqlr2ppfibxyl29nrqbcprrg89k7il6303dm91s6620ydmka"; - }) + outputs = if shared then [ "out" "dev" ] else [ "out" ]; + + nativeBuildInputs = [ cmake validatePkgConfig ]; + + cmakeFlags = [ + "-DBUILD_TESTS=ON" + "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"}" ]; - nativeBuildInputs = [ cmake ]; + checkInputs = [ check ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"}" ]; + # Hack to be able to run the test, broken because we use + # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install + preBuild = if stdenv.isDarwin then '' + export DYLD_LIBRARY_PATH="`pwd`''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" + '' else '' + export LD_LIBRARY_PATH="`pwd`''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + ''; preConfigure = '' # Enable long long support (required for filezilla) sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' src/pugiconfig.hpp ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Light-weight, simple and fast XML parser for C++ with XPath support"; homepage = "https://pugixml.org"; license = licenses.mit; From 2a2f3d4aed78f665b1a7de5da3e89484dcd5730c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 6 Nov 2020 19:16:29 +0000 Subject: [PATCH 136/299] python27Packages.msgpack-numpy: 0.4.6.1 -> 0.4.7.1 --- pkgs/development/python-modules/msgpack-numpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix index d380f18f772..ad612550d7e 100644 --- a/pkgs/development/python-modules/msgpack-numpy/default.nix +++ b/pkgs/development/python-modules/msgpack-numpy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msgpack-numpy"; - version = "0.4.6.1"; + version = "0.4.7.1"; src = fetchPypi { inherit pname version; - sha256 = "9f9b57abb2b155c2d3e411c2dd5b98f14998bd053a20c6ed0ab64a6ceb8ad51d"; + sha256 = "7eaf51acf82d7c467d21aa71df94e1c051b2055e54b755442051b474fa7cf5e1"; }; buildInputs = [ From 1122d28e9f814829a1f14cf9951d19a2b2e0ca00 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 6 Nov 2020 00:52:46 -0800 Subject: [PATCH 137/299] octoprint.python.pkgs.marlingcodevisualizer: init at 0.11.0 --- pkgs/applications/misc/octoprint/plugins.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 366b3866dfd..421690f29d4 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -109,6 +109,25 @@ in { }; }; + marlingcodedocumentation = buildPlugin rec { + pname = "MarlinGcodeDocumentation"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "costas-basdekis"; + repo = pname; + rev = "v${version}"; + sha256 = "0vx06w9hqwy0k4r8g67y8gdckfdx7wl8ghfx6hmxc1s8fgkghfkc"; + }; + + meta = with stdenv.lib; { + description = "Displays GCode documentation for Marlin in the Octoprint terminal command line"; + homepage = "https://github.com/costas-basdekis/MarlinGcodeDocumentation"; + license = licenses.agpl3; + maintainers = with maintainers; [ lovesegfault ]; + }; + }; + mqtt = buildPlugin rec { pname = "MQTT"; version = "0.8.7"; From 5eaa17ae4de6a854212c8461f10fb41cb75c654e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 6 Nov 2020 19:26:31 +0000 Subject: [PATCH 138/299] python27Packages.pyphen: 0.9.5 -> 0.10.0 --- pkgs/development/python-modules/pyphen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyphen/default.nix b/pkgs/development/python-modules/pyphen/default.nix index 7a182b6be4a..b5018e40d7e 100644 --- a/pkgs/development/python-modules/pyphen/default.nix +++ b/pkgs/development/python-modules/pyphen/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Pyphen"; - version = "0.9.5"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "3b633a50873156d777e1f1075ba4d8e96a6ad0a3ca42aa3ea9a6259f93f18921"; + sha256 = "719b21dfb4b04fbc11cc0f6112418535fe35474021120cccfffc43a25fe63128"; }; meta = with stdenv.lib; { From b5008f9e303c03baf98f8878ac119a7d749a62d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Fri, 6 Nov 2020 20:54:12 +0100 Subject: [PATCH 139/299] texmacs: 1.99.13 -> 1.99.14 --- pkgs/applications/editors/texmacs/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index aeef43e3f0b..32892c7c26e 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -16,7 +16,7 @@ let pname = "TeXmacs"; - version = "1.99.13"; + version = "1.99.14"; common = callPackage ./common.nix { inherit tex extraFonts chineseFonts japaneseFonts koreanFonts; }; @@ -26,22 +26,9 @@ mkDerivation { src = fetchurl { url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; - sha256 = "Aq0cS47QqmFQHelxRjANeJlgXCXagnYRykpAq7wHqbQ="; + sha256 = "1zbl1ddhppgnn3j213jl1b9mn8zmwnknxiqswm25p4llj0mqcgna"; }; - patches = [ - # Minor patch for Qt 5.15 support, should be included in next release. - (fetchpatch { - url = "https://github.com/texmacs/texmacs/commit/3cf56af92326b74538f5e943928199ba6e963d0b.patch"; - sha256 = "+OBQmnKgvQZZkLx6ea773Dwq0o7L92Sex/kcVUhmg6Q="; - }) - # Fix returned version, lets hope they remember to bump the version next release. - (fetchpatch { - url = "https://github.com/texmacs/texmacs/commit/da5b67005d2fc31bb32ea1ead882c26af12d8cbb.patch"; - sha256 = "czMgdraQErrdvN83jY76P673L52BpQkDwntmKvF0Ykg="; - }) - ]; - enableParallelBuilding = true; nativeBuildInputs = [ cmake pkgconfig ]; From e552d657c3fc659f1123e6e18878b7557e52bea4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 6 Nov 2020 19:42:00 +0000 Subject: [PATCH 140/299] python37Packages.pytest_6: 6.1.1 -> 6.1.2 --- pkgs/development/python-modules/pytest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 29def3082a4..93282218871 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -21,14 +21,14 @@ }: buildPythonPackage rec { - version = "6.1.1"; + version = "6.1.2"; pname = "pytest"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "8f593023c1a0f916110285b6efd7f99db07d59546e3d8c36fc60e2ab05d3be92"; + sha256 = "c0a7e94a8cdbc5422a51ccdad8e6f1024795939cc89159a0ae7f0b316ad3823e"; }; checkInputs = [ hypothesis pygments ]; From befa4e168771e1beb8e8c4ca4e5bc12ab91645b9 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Fri, 6 Nov 2020 12:07:51 -0800 Subject: [PATCH 141/299] kent: add to all-packages.nix --- 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 9a69bf422ca..f4829945657 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4951,6 +4951,8 @@ in kexpand = callPackage ../development/tools/kexpand { }; + kent = callPackage ../applications/science/biology/kent { }; + keybase = callPackage ../tools/security/keybase { # Reasoning for the inherited apple_sdk.frameworks: # 1. specific compiler errors about: AVFoundation, AudioToolbox, MediaToolbox From f979b589c780c448a38908a15fa9eeb686765460 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 28 Oct 2020 16:57:31 +0100 Subject: [PATCH 142/299] elf-dissector: init at unstable-2020-11-14 --- .../misc/elf-dissector/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/misc/elf-dissector/default.nix diff --git a/pkgs/applications/misc/elf-dissector/default.nix b/pkgs/applications/misc/elf-dissector/default.nix new file mode 100644 index 00000000000..36ceb49d5c4 --- /dev/null +++ b/pkgs/applications/misc/elf-dissector/default.nix @@ -0,0 +1,26 @@ +{ mkDerivation, fetchgit, lib, cmake, extra-cmake-modules, kitemmodels +, libiberty, libelf, libdwarf, libopcodes }: + +mkDerivation rec { + pname = "elf-dissector"; + version = "unstable-2020-11-14"; + + src = fetchgit { + url = "https://invent.kde.org/sdk/elf-dissector.git"; + rev = "d1700e76e3f60aff0a2a9fb63bc001251d2be522"; + sha256 = "1h1xr3ag1sbf005drcx8g8dc5mk7fb2ybs73swrld7clcawhxnk8"; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules ]; + + buildInputs = [ kitemmodels libiberty libelf libdwarf libopcodes ]; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://invent.kde.org/sdk/elf-dissector"; + description = "Tools for inspecting, analyzing and optimizing ELF files"; + license = licenses.gpl2; + maintainers = with maintainers; [ ehmry ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 679b4deb858..8bc9fac15a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20598,6 +20598,8 @@ in elementary-planner = callPackage ../applications/office/elementary-planner { }; + elf-dissector = libsForQt5.callPackage ../applications/misc/elf-dissector { }; + elinks = callPackage ../applications/networking/browsers/elinks { }; elvis = callPackage ../applications/editors/elvis { }; From be459ef9ff5bb8eb1d0418f2bdf625afb814c8cf Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 31 Oct 2020 11:21:04 +0100 Subject: [PATCH 143/299] tup: 0.7.9 -> 0.7.10 --- .../tools/build-managers/tup/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix index 80ee38105ca..628e0c4797b 100644 --- a/pkgs/development/tools/build-managers/tup/default.nix +++ b/pkgs/development/tools/build-managers/tup/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchFromGitHub, fuse, pkgconfig, pcre }: +{ stdenv, fetchFromGitHub, fuse3, pkgconfig, pcre }: stdenv.mkDerivation rec { pname = "tup"; - version = "0.7.9"; + version = "0.7.10"; + outputs = [ "bin" "man" "out" ]; src = fetchFromGitHub { owner = "gittup"; repo = "tup"; rev = "v${version}"; - sha256 = "1b9rllwfdmjvfmwvzqfbqfi1flf4y9zzjmyp0dizq23gpkvhi42f"; + sha256 = "1qd07h4wi0743l7z2vybfvhwp61g2p2pc5qhl40672ryl24nvd1d"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fuse pcre ]; + buildInputs = [ fuse3 pcre ]; configurePhase = '' sed -i 's/`git describe`/v${version}/g' src/tup/link.sh @@ -30,11 +31,8 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/bin - cp tup $out/bin/ - - mkdir -p $out/share/man/man1 - cp tup.1 $out/share/man/man1/ + install -D tup -t $bin/bin/ + install -D tup.1 -t $man/share/man/man1/ ''; setupHook = ./setup-hook.sh; From 0fa596936b0bf07b34530599dcd35aae0d1ba21e Mon Sep 17 00:00:00 2001 From: Kai Harries Date: Sat, 31 Oct 2020 17:02:05 +0100 Subject: [PATCH 144/299] haskellPackages.git-mediate: mark as not broken After update to 1.0.8.1 git-mediate is buildable again --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 3a31056fd12..13b94368c8c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5415,7 +5415,6 @@ broken-packages: - git-fmt - git-gpush - git-jump - - git-mediate - git-monitor - git-object - git-remote-ipfs From 17eee57642f0cd010176767a873c42d34167cde4 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Tue, 3 Nov 2020 16:45:15 +0900 Subject: [PATCH 145/299] haskellPackages.shellFor: improve documentation --- .../haskell-modules/make-package-set.nix | 156 +++++++++++++++--- 1 file changed, 131 insertions(+), 25 deletions(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 1418cfef057..c5604aa4196 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -258,6 +258,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # packages themselves. Using nix-shell on this derivation will # give you an environment suitable for developing the listed # packages with an incremental tool like cabal-install. + # # In addition to the "packages" arg and "withHoogle" arg, anything that # can be passed into stdenv.mkDerivation can be included in the input attrset # @@ -274,7 +275,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # (import ./.).shellFor { # packages = p: [p.frontend p.backend p.common]; # withHoogle = true; - # buildInputs = [ pkgs.python ]; + # buildInputs = [ pkgs.python pkgs.cabal-install ]; # } # # -- cabal.project @@ -285,38 +286,143 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # # bash$ nix-shell --run "cabal new-build all" # bash$ nix-shell --run "python" - shellFor = { packages, withHoogle ? false, ... } @ args: + shellFor = + { # Packages to create this development shell for. These are usually + # your local packages. + packages + , # Whether or not to generated a Hoogle database for all the + # dependencies. + withHoogle ? false + , ... + } @ args: let - combinedPackageFor = packages: - let - selected = packages self; + # A list of the packages we want to build a development shell for. + # + # This is a list of Haskell package derivations. + selected = packages self; - pname = if pkgs.lib.length selected == 1 - then (pkgs.lib.head selected).name - else "packages"; + # This is a list of attribute sets, where the each attribute set + # corresponds to the build inputs one of the packages input to shellFor. + # + # Each attribute has keys like buildDepends, executableHaskellDepends, + # testPkgconfigDepends, etc. The values for the keys of the attribute + # set are lists of dependencies. + # + # Example: + # cabalDepsForSelected + # => [ + # # This may be the attribute set corresponding to the `backend` + # # package in the example above. + # { buildDepends = [ gcc ... ]; + # libraryHaskellDepends = [ lens conduit ... ]; + # ... + # } + # # This may be the attribute set corresponding to the `common` + # # package in the example above. + # { testHaskellDepends = [ tasty hspec ... ]; + # libraryHaskellDepends = [ lens aeson ]; + # benchmarkHaskellDepends = [ criterion ... ]; + # ... + # } + # ... + # ] + cabalDepsForSelected = map (p: p.getCabalDeps) selected; - # If `packages = [ a b ]` and `a` depends on `b`, don't build `b`, - # because cabal will end up ignoring that built version, assuming - # new-style commands. - combinedPackages = pkgs.lib.filter - (input: pkgs.lib.all (p: input.outPath or null != p.outPath) selected); + # A predicate that takes a derivation as input, and tests whether it is + # the same as any of the `selected` packages. + # + # Returns true if the input derivation is not in the list of `selected` + # packages. + # + # isNotSelected :: Derivation -> Bool + # + # Example: + # + # isNotSelected common [ frontend backend common ] + # => false + # + # isNotSelected lens [ frontend backend common ] + # => true + isNotSelected = input: pkgs.lib.all (p: input.outPath or null != p.outPath) selected; - # Returns an attrset containing a combined list packages' inputs for each - # stage of the build process - packageInputs = pkgs.lib.zipAttrsWith - (_: pkgs.lib.concatMap combinedPackages) - (map (p: p.getCabalDeps) selected); + # A function that takes a list of list of derivations, filters out all + # the `selected` packages from each list, and concats the results. + # + # zipperCombinedPkgs :: [[Derivation]] -> [Derivation] + # + # Example: + # zipperCombinedPkgs [ [ lens conduit ] [ aeson frontend ] ] + # => [ lens conduit aeson ] + # + # Note: The reason this isn't just the function `pkgs.lib.concat` is + # that we need to be careful to remove dependencies that are in the + # `selected` packages. + # + # For instance, in the above example, if `common` is a dependency of + # `backend`, then zipperCombinedPkgs needs to be careful to filter out + # `common`, because cabal will end up ignoring that built version, + # assuming new-style commands. + zipperCombinedPkgs = vals: + pkgs.lib.concatMap + (drvList: pkgs.lib.filter isNotSelected drvList) + vals; - genericBuilderArgs = { - inherit pname; - version = "0"; - license = null; - } // packageInputs; + # Zip `cabalDepsForSelected` into a single attribute list, combining + # the derivations in all the individual attributes. + # + # Example: + # packageInputs + # => # Assuming the value of cabalDepsForSelected is the same as + # # the example in cabalDepsForSelected: + # { buildDepends = [ gcc ... ]; + # libraryHaskellDepends = [ lens conduit aeson ... ]; + # testHaskellDepends = [ tasty hspec ... ]; + # benchmarkHaskellDepends = [ criterion ... ]; + # ... + # } + # + # See the Note in `zipperCombinedPkgs` for what gets filtered out from + # each of these dependency lists. + packageInputs = + pkgs.lib.zipAttrsWith (_name: zipperCombinedPkgs) cabalDepsForSelected; - in self.mkDerivation genericBuilderArgs; + # A attribute set to pass to `haskellPackages.mkDerivation`. + # + # The important thing to note here is that all the fields from + # packageInputs are set correctly. + genericBuilderArgs = { + pname = + if pkgs.lib.length selected == 1 + then (pkgs.lib.head selected).name + else "packages"; + version = "0"; + license = null; + } + // packageInputs; + + # This is a pseudo Haskell package derivation that contains all the + # dependencies for the packages in `selected`. + # + # This is a derivation created with `haskellPackages.mkDerivation`. + # + # pkgWithCombinedDeps :: HaskellDerivation + pkgWithCombinedDeps = self.mkDerivation genericBuilderArgs; + + # The derivation returned from `envFunc` for `pkgWithCombinedDeps`. + # + # This is a derivation that can be run with `nix-shell`. It provides a + # GHC with a package database with all the dependencies of our + # `selected` packages. + # + # This is a derivation created with `stdenv.mkDerivation` (not + # `haskellPackages.mkDerivation`). + # + # pkgWithCombinedDepsDevDrv :: Derivation + pkgWithCombinedDepsDevDrv = pkgWithCombinedDeps.envFunc { inherit withHoogle; }; mkDerivationArgs = builtins.removeAttrs args [ "packages" "withHoogle" ]; - in ((combinedPackageFor packages).envFunc { inherit withHoogle; }).overrideAttrs (old: mkDerivationArgs // { + + in pkgWithCombinedDepsDevDrv.overrideAttrs (old: mkDerivationArgs // { nativeBuildInputs = old.nativeBuildInputs ++ mkDerivationArgs.nativeBuildInputs or []; buildInputs = old.buildInputs ++ mkDerivationArgs.buildInputs or []; }); From d26890fd15c9e0c7cee1698b7bef8c3ffa478919 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Wed, 4 Nov 2020 09:18:56 +0900 Subject: [PATCH 146/299] haskellPackages.shellFor: fix spelling and grammar mistakes Co-authored-by: maralorn --- pkgs/development/haskell-modules/make-package-set.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index c5604aa4196..6994dcf5e54 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -290,19 +290,18 @@ in package-set { inherit pkgs stdenv callPackage; } self // { { # Packages to create this development shell for. These are usually # your local packages. packages - , # Whether or not to generated a Hoogle database for all the + , # Whether or not to generate a Hoogle database for all the # dependencies. withHoogle ? false , ... } @ args: let # A list of the packages we want to build a development shell for. - # # This is a list of Haskell package derivations. selected = packages self; - # This is a list of attribute sets, where the each attribute set - # corresponds to the build inputs one of the packages input to shellFor. + # This is a list of attribute sets, where each attribute set + # corresponds to the build inputs of one of the packages input to shellFor. # # Each attribute has keys like buildDepends, executableHaskellDepends, # testPkgconfigDepends, etc. The values for the keys of the attribute From 86a1b6c41d5f14d2558d849794766dd64cc8e6dc Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Wed, 4 Nov 2020 14:21:32 +0800 Subject: [PATCH 147/299] haskellPackages.vulkan-utils: Add necessary dependency on vulkan-headers Also mark as unbroken --- pkgs/development/haskell-modules/configuration-common.nix | 3 ++- .../development/haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ce309376396..41b2080d0d6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -922,8 +922,9 @@ self: super: { # This package refers to the wrong library (itself in fact!) vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; }; - # Compiles some C++ source which requires these headers + # Compiles some C or C++ source which requires these headers VulkanMemoryAllocator = addExtraLibrary super.VulkanMemoryAllocator pkgs.vulkan-headers; + vulkan-utils = addExtraLibrary super.vulkan-utils pkgs.vulkan-headers; # https://github.com/dmwit/encoding/pull/3 encoding = doJailbreak (appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 13b94368c8c..4cdcd9f3aab 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -10987,7 +10987,6 @@ broken-packages: - vty-menu - vty-ui - vty-ui-extras - - vulkan-utils - waargonaut - wacom-daemon - waddle From 22dbcb3b571fb78749bdda55a20c930152aa72dd Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Wed, 4 Nov 2020 14:23:05 +0800 Subject: [PATCH 148/299] haskellPackages.autoapply: Depend on correct version of th-desugar Also mark as unbroken --- pkgs/development/haskell-modules/configuration-common.nix | 2 ++ pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 41b2080d0d6..f11ba9458ad 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1484,6 +1484,8 @@ self: super: { # Too tight version bounds, see https://github.com/haskell-hvr/microaeson/pull/4 microaeson = doJailbreak super.microaeson; + autoapply = super.autoapply.override { th-desugar = self.th-desugar_1_11; }; + # haskell-language-server needs a more current version of pantry to compile } // (let inherit (self) hls-ghcide hls-brittany; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 4cdcd9f3aab..e3bb173c128 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3205,7 +3205,6 @@ broken-packages: - authenticate-ldap - authinfo-hs - authoring - - autoapply - AutoForms - autom - automata From 65c119e6e722fc0fe138eb21459e9f1ffb165ac3 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Wed, 4 Nov 2020 14:29:08 +0800 Subject: [PATCH 149/299] haskellPackages.exact-real: mark unbroken --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index e3bb173c128..ab4714fc6f6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -4855,7 +4855,6 @@ broken-packages: - every-bit-counts - ewe - exact-cover - - exact-real - exact-real-positional - except-exceptions - exception-monads-fd From f78fb98f18da47afb10e4f50173187eb41817eb5 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Wed, 4 Nov 2020 14:30:09 +0800 Subject: [PATCH 150/299] haskellPackages.orbits: mark unbroken --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ab4714fc6f6..b3d00f9dcf2 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -8377,7 +8377,6 @@ broken-packages: - optparse-applicative-simple - optparse-enum - optparse-helper - - orbits - orc - orchestrate - OrchestrateDB From d3fb9a25b3b4bd0bab4fb0f4c1164e7f97b9d853 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Wed, 4 Nov 2020 10:00:30 +0900 Subject: [PATCH 151/299] haskellPackages.shellFor: add a doBenchmark argument for enabling benchmarks deps --- .../development/haskell-modules/make-package-set.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 6994dcf5e54..ac65fad3527 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -293,6 +293,10 @@ in package-set { inherit pkgs stdenv callPackage; } self // { , # Whether or not to generate a Hoogle database for all the # dependencies. withHoogle ? false + , # Whether or not to include benchmark dependencies of your local + # packages. You should set this to true if you have benchmarks defined + # in your local packages that you want to be able to run with cabal benchmark + doBenchmark ? false , ... } @ args: let @@ -397,7 +401,11 @@ in package-set { inherit pkgs stdenv callPackage; } self // { version = "0"; license = null; } - // packageInputs; + // packageInputs + // pkgs.lib.optionalAttrs doBenchmark { + # `doBenchmark` needs to explicitly be set here because haskellPackages.mkDerivation defaults it to `false`. If the user wants benchmark dependencies included in their development shell, it has to be explicitly enabled here. + doBenchmark = true; + }; # This is a pseudo Haskell package derivation that contains all the # dependencies for the packages in `selected`. @@ -419,7 +427,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # pkgWithCombinedDepsDevDrv :: Derivation pkgWithCombinedDepsDevDrv = pkgWithCombinedDeps.envFunc { inherit withHoogle; }; - mkDerivationArgs = builtins.removeAttrs args [ "packages" "withHoogle" ]; + mkDerivationArgs = builtins.removeAttrs args [ "packages" "withHoogle" "doBenchmark" ]; in pkgWithCombinedDepsDevDrv.overrideAttrs (old: mkDerivationArgs // { nativeBuildInputs = old.nativeBuildInputs ++ mkDerivationArgs.nativeBuildInputs or []; From 696f1c191c09c63eb97a4674b27899a761d81c89 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Nov 2020 11:44:43 +0100 Subject: [PATCH 152/299] haskell-gi-base: update override for the new version --- 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 f11ba9458ad..9c027d8fcb1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1352,7 +1352,7 @@ self: super: { # 2020-08-14: gi-pango from stackage is to old for the C libs it links against in nixpkgs. # That's why we need to bump a ton of dependency versions to unbreak them. gi-pango = assert super.gi-pango.version == "1.0.22"; self.gi-pango_1_0_23; - haskell-gi-base = assert super.haskell-gi-base.version == "0.23.0"; addBuildDepends (self.haskell-gi-base_0_24_3) [ pkgs.gobject-introspection ]; + haskell-gi-base = assert super.haskell-gi-base.version == "0.23.0"; addBuildDepends (self.haskell-gi-base_0_24_4) [ pkgs.gobject-introspection ]; haskell-gi = assert super.haskell-gi.version == "0.23.1"; self.haskell-gi_0_24_5; gi-cairo = assert super.gi-cairo.version == "1.0.23"; self.gi-cairo_1_0_24; gi-glib = assert super.gi-glib.version == "2.0.23"; self.gi-glib_2_0_24; From 5e386edc22478aabe44478a11a1e6955bfcb12f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Nov 2020 11:54:17 +0100 Subject: [PATCH 153/299] pandoc: update override for the new version --- 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 9c027d8fcb1..546783ec172 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1468,7 +1468,7 @@ self: super: { skylighting-core = doDistribute super.skylighting-core_0_10_0_3; hslua = doDistribute self.hslua_1_1_2; jira-wiki-markup = doDistribute self.jira-wiki-markup_1_3_2; - pandoc = doDistribute self.pandoc_2_11_0_4; + pandoc = doDistribute self.pandoc_2_11_1; # jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc pandoc-citeproc = doJailbreak (doDistribute self.pandoc-citeproc_0_17_0_2); pandoc-types = doDistribute self.pandoc-types_1_22; From ef5068f06973b388ca70c31252e80aac6b039877 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Nov 2020 11:55:05 +0100 Subject: [PATCH 154/299] haskell-configuration-common: cosmetic --- pkgs/development/haskell-modules/configuration-common.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 546783ec172..0ec9fad1e8a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1476,7 +1476,6 @@ self: super: { # The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox. domain-auth = dontCheck super.domain-auth; - # INSERT NEW OVERRIDES ABOVE THIS LINE # stack-2.5.1 needs a more current version of pantry to compile pantry = self.pantry_0_5_1_3; @@ -1486,7 +1485,7 @@ self: super: { autoapply = super.autoapply.override { th-desugar = self.th-desugar_1_11; }; - # haskell-language-server needs a more current version of pantry to compile + # INSERT NEW OVERRIDES ABOVE THIS LINE } // (let inherit (self) hls-ghcide hls-brittany; hlsScopeOverride = self: super: { From 78bb20c424d50388ec4c1a8b03632d954c981de7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Nov 2020 11:56:23 +0100 Subject: [PATCH 155/299] all-cabal-hashes: update to Hackage at 2020-11-06T01:07:40Z --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index c9950d9fcd1..3c9a531ab62 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/197a82b352062bfeeefd4b62bfec19dd51a3728d.tar.gz"; - sha256 = "11c9a67j421vf6a7vvh280gsmssf49rxqnamdp1n9iljkhlfh5z1"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/59ba02b3424684458764210fa9e32ca08e516db2.tar.gz"; + sha256 = "0m4scz6b7xg7kisy6zlnw258pkfksmzzppw9gp0g6rdl0cxly239"; } From 3edd552cf075c7d9f7c6e325ef927f425256ce34 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Nov 2020 11:59:00 +0100 Subject: [PATCH 156/299] hackage2nix: update list of broken builds to fix evaluation errors on Hydra Ping @cdepillabout because of broken spago build. --- .../configuration-hackage2nix.yaml | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index b3d00f9dcf2..8213b47785b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2892,6 +2892,7 @@ broken-packages: - accentuateus - access-time - access-token-provider + - achille - acid-state-dist - acid-state-tls - ACME @@ -3121,6 +3122,8 @@ broken-packages: - armor - arpa - arpack + - array-builder + - array-chunks - array-forth - array-list - array-primops @@ -3455,6 +3458,7 @@ broken-packages: - bitcoin-hs - bitcoin-rpc - bitcoin-script + - bitcoin-scripting - bitcoin-tx - bitcoind-regtest - bitcoind-rpc @@ -3600,7 +3604,11 @@ broken-packages: - byline - bytable - bytearray-parsing + - bytebuild + - bytehash - bytelog + - byteslice + - bytesmith - bytestring-arbitrary - bytestring-builder-varword - bytestring-class @@ -3994,6 +4002,7 @@ broken-packages: - compdata-dags - compdata-param - compdoc + - compdoc-dhall-decoder - competition - compilation - complexity @@ -4100,7 +4109,9 @@ broken-packages: - context-free-grammar - context-stack - ContextAlgebra + - contiguous - contiguous-checked + - contiguous-fft - continue - continuum - continuum-client @@ -4534,6 +4545,7 @@ broken-packages: - discord-gateway - discord-haskell - discord-hs + - discord-register - discord-rest - discord-types - discordian-calendar @@ -4599,6 +4611,9 @@ broken-packages: - doi - DOM - dom-lt + - domain + - domain-core + - domain-optics - domplate - dot-linker - dotfs @@ -4798,6 +4813,7 @@ broken-packages: - eros - eros-client - eros-http + - error-codes - error-context - error-continuations - error-list @@ -5260,6 +5276,8 @@ broken-packages: - garepinoh - gargoyle - gargoyle-postgresql + - gargoyle-postgresql-connect + - gargoyle-postgresql-nix - gas - gbu - gc-monitoring-wai @@ -5515,6 +5533,7 @@ broken-packages: - GoogleSB - GoogleTranslate - gopherbot + - gopro-plus - gore-and-ash - gore-and-ash-actor - gore-and-ash-async @@ -6155,6 +6174,7 @@ broken-packages: - hevolisa - hevolisa-dph - hex + - hex-text - HExcel - hexchat - hexif @@ -6925,6 +6945,7 @@ broken-packages: - iostring - iothread - iotransaction + - ip - ip2location - ip2proxy - ipatch @@ -7586,6 +7607,7 @@ broken-packages: - lxd-client - lye - Lykah + - lz4-bytes - lz4-conduit - lz4-frame-conduit - lzma-enumerator @@ -7608,6 +7630,7 @@ broken-packages: - maclight - macos-corelibs - macosx-make-standalone + - macrm - madlang - mage - magic-tyfams @@ -7823,6 +7846,7 @@ broken-packages: - mltool - mm2 - mmsyn4 + - mmsyn7h - mmtf - mmtl - mmtl-base @@ -7925,8 +7949,10 @@ broken-packages: - morfette - morfeusz - morley + - morloc - morpheus-graphql-cli - morpheus-graphql-client + - morpheus-graphql-subscriptions - morphisms-functors - morphisms-functors-inventory - morphisms-objects @@ -8729,6 +8755,7 @@ broken-packages: - pointless-haskell - pointless-lenses - pointless-rewrite + - poke - pokemon-go-protobuf-types - poker-eval - pokitdok @@ -8747,6 +8774,7 @@ broken-packages: - polysemy-kvstore-jsonfile - polysemy-methodology - polysemy-optics + - polysemy-path - polysemy-RandomFu - polysemy-resume - polysemy-test @@ -8777,6 +8805,7 @@ broken-packages: - poseidon - poseidon-postgis - posix-acl + - posix-api - posix-realtime - posix-waitpid - posplyu @@ -8855,10 +8884,15 @@ broken-packages: - primal - primal-memory - primes-type + - primitive-atomic + - primitive-containers + - primitive-extras - primitive-indexed - primitive-maybe - primitive-simd + - primitive-sort - primitive-stablename + - primitive-unlifted - PrimitiveArray-Pretty - primula-board - primula-bot @@ -9184,6 +9218,7 @@ broken-packages: - reflex-dom-svg - reflex-dynamic-containers - reflex-fsnotify + - reflex-gadt-api - reflex-ghci - reflex-gloss - reflex-gloss-scene @@ -9412,6 +9447,7 @@ broken-packages: - ruin - ruler - ruler-core + - run-st - rungekutta - runhs - runmany @@ -9853,6 +9889,7 @@ broken-packages: - sme - smerdyakov - smiles + - smith - smith-cli - smith-client - Smooth @@ -10117,6 +10154,7 @@ broken-packages: - stm-chunked-queues - stm-containers - stm-firehose + - stm-hamt - stm-promise - stm-stats - stm-supply @@ -10327,6 +10365,7 @@ broken-packages: - tart - task - task-distribution + - taskell - TaskMonad - tasty-auto - tasty-bdd @@ -10454,6 +10493,7 @@ broken-packages: - th-instances - th-kinds - th-kinds-fork + - th-lego - th-pprint - th-sccs - th-tc @@ -10742,6 +10782,7 @@ broken-packages: - typescript-docs - typograffiti - tyro + - tz - u2f - uber - uberlast @@ -11285,6 +11326,7 @@ broken-packages: - yaml-rpc - yaml-rpc-scotty - yaml-rpc-snap + - yaml-unscrambler - YamlReference - Yampa - yampa-canvas From 753cb4fc51bc40d372a000447707c56d5ca9b886 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 31 Oct 2020 02:30:28 +0100 Subject: [PATCH 157/299] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-27-g11a103b from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/6ce5b767941b7361d0db86fdb076b7ffe64e07b2. --- .../haskell-modules/hackage-packages.nix | 2246 +++++++++++++---- 1 file changed, 1783 insertions(+), 463 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6169d134dda..6ad8267d448 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3387,15 +3387,15 @@ self: { broken = true; }) {}; - "Color_0_2_0" = callPackage + "Color_0_3_0" = callPackage ({ mkDerivation, base, colour, criterion, data-default-class , deepseq, doctest, hspec, HUnit, JuicyPixels, massiv, massiv-test , QuickCheck, random, vector }: mkDerivation { pname = "Color"; - version = "0.2.0"; - sha256 = "1w7d1wjssldybbg46s4hc83f96n49v53wyq0sc1q8mkvqdl35vsh"; + version = "0.3.0"; + sha256 = "18aissrpllxll01k203i2agfff89ffah465zvb0yx0lvs8jh2xr7"; libraryHaskellDepends = [ base data-default-class deepseq vector ]; testHaskellDepends = [ base colour doctest hspec HUnit JuicyPixels massiv massiv-test @@ -6928,8 +6928,8 @@ self: { ({ mkDerivation, async, base, containers, GLFW-b, GPipe, stm }: mkDerivation { pname = "GPipe-GLFW"; - version = "1.4.1.3"; - sha256 = "0czrq3zhcxfl9pzypmxpxgn11faqb0kw05m5k3apr4b88prbj1ij"; + version = "1.4.1.4"; + sha256 = "13qbiy2gv682xyj0dpy336zbg4224a1sgzqq9kq1v6f8pwavw6bk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ async base containers GLFW-b GPipe stm ]; description = "GLFW OpenGL context creation for GPipe"; @@ -8071,8 +8071,8 @@ self: { }: mkDerivation { pname = "HDBC-postgresql"; - version = "2.3.2.8"; - sha256 = "0c76di7a134xhw5pmzdjasgyqxj6gkjkj45mr4mwfrchgdg4cvil"; + version = "2.4.0.0"; + sha256 = "1zmilqvlp170nb7zakbhdpihykkq95s7nb7la2sdas1fv69mhnx3"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -9537,6 +9537,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "HUnit_1_6_1_0" = callPackage + ({ mkDerivation, base, call-stack, deepseq, filepath }: + mkDerivation { + pname = "HUnit"; + version = "1.6.1.0"; + sha256 = "1rpi52rnjpyv379rm6n3s706z6mv114aychf03dq456wfa4b7123"; + libraryHaskellDepends = [ base call-stack deepseq ]; + testHaskellDepends = [ base call-stack deepseq filepath ]; + description = "A unit testing framework for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HUnit-Diff" = callPackage ({ mkDerivation, ansi-terminal, base, Diff, groom, HUnit }: mkDerivation { @@ -10848,6 +10861,21 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {inherit (pkgs) openssl;}; + "HsOpenSSL_0_11_5_1" = callPackage + ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: + mkDerivation { + pname = "HsOpenSSL"; + version = "0.11.5.1"; + sha256 = "1np4yyiq4935p1vbf89m0ifkilzc6vzab9i8x7c21y9s7rsv4rj9"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base bytestring network time ]; + librarySystemDepends = [ openssl ]; + testHaskellDepends = [ base bytestring ]; + description = "Partial OpenSSL binding for Haskell"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) openssl;}; + "HsOpenSSL-x509-system" = callPackage ({ mkDerivation, base, bytestring, HsOpenSSL, unix }: mkDerivation { @@ -20739,13 +20767,14 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.3.7"; - sha256 = "1y2dmk60dvk8d9n16in98cmin5ckvdx3knwlfzcs0jl6vyh8n51n"; + version = "0.3.7.1"; + sha256 = "18al9vr5zy8smn090dd7fwnm4pqcsxld97azrxni7xsqdb22kja8"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; description = "Bindings to the VulkanMemoryAllocator library"; license = stdenv.lib.licenses.bsd3; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "WAVE" = callPackage @@ -21104,12 +21133,12 @@ self: { platforms = stdenv.lib.platforms.none; }) {}; - "Win32_2_10_0_0" = callPackage + "Win32_2_10_1_0" = callPackage ({ mkDerivation }: mkDerivation { pname = "Win32"; - version = "2.10.0.0"; - sha256 = "09g61dgw3xvg066qdydw7nxn8vk1nxxwzi1wwr19rkaxhz43149n"; + version = "2.10.1.0"; + sha256 = "1il70gh3ysmp4pnhk7dxcbd0c0mh5ay33b9ijmmj0ikmbw0nfpbv"; description = "A binding to Windows Win32 API"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.none; @@ -22975,6 +23004,8 @@ self: { ]; description = "A library for building static site generators"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "acid-state" = callPackage @@ -25537,6 +25568,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "agda2lagda" = callPackage + ({ mkDerivation, base, directory, filepath, optparse-applicative }: + mkDerivation { + pname = "agda2lagda"; + version = "0.2020.11.1"; + sha256 = "0yl44jdczy9306b5ifd8iwchr8izna8sd5v2h2qm9ns909wcs1l8"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath optparse-applicative + ]; + description = "Translate .agda files into .lagda.tex files."; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "agentx" = callPackage ({ mkDerivation, base, binary, bitwise, bytestring, containers , data-default, Diff, fclabels, mtl, network, pipes @@ -32898,6 +32944,8 @@ self: { testHaskellDepends = [ base tasty tasty-hunit ]; description = "Builders for arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "array-chunks" = callPackage @@ -32915,6 +32963,8 @@ self: { ]; description = "Lists of chunks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "array-forth" = callPackage @@ -35361,6 +35411,8 @@ self: { pname = "aura"; version = "3.2.2"; sha256 = "07ska8w2k3sl084aadjclw8v0ykrp8hiwhim5zd6wd7q95njyk2f"; + revision = "1"; + editedCabalFile = "033ycqm18zqq69yam189whpcbnajanj2yp8na8ad344ghcn1gs5l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35526,8 +35578,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Template Haskell to automatically pass values to functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "autoexporter" = callPackage @@ -37967,17 +38017,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "base16-bytestring_1_0_0_0" = callPackage + "base16-bytestring_1_0_1_0" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, HUnit , QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2 }: mkDerivation { pname = "base16-bytestring"; - version = "1.0.0.0"; - sha256 = "12bnl2fs0h4hcjpr69xqqngjh0117dlvkv56lxski6g6fnbwps2r"; - revision = "2"; - editedCabalFile = "16nmmf3mmkdrssx6i77drh7ac7r6cfb1dnbna62z32h11yyyk49j"; + version = "1.0.1.0"; + sha256 = "1ynnplw8iz3v5ld0xxgpxgasb0hg62x62wxxf5lx6lxyb15hmiy0"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring HUnit QuickCheck test-framework @@ -40453,10 +40501,8 @@ self: { }: mkDerivation { pname = "binary-instances"; - version = "1.0.0.1"; - sha256 = "0f8ilzpwj7gbyvlswlkd48dzpj9m13ipinw55lvjag0ir52idk9a"; - revision = "1"; - editedCabalFile = "19xmaj5vlabsifkdk1kpxp4nadfml7a51w316sd4fxd69ncvwd72"; + version = "1.0.1"; + sha256 = "0whqjziwqrqslf6byliry84pg47z7vc6yjligpzb8gb5db2gw1h0"; libraryHaskellDepends = [ aeson base binary binary-orphans case-insensitive hashable scientific tagged text text-binary time-compat unordered-containers @@ -42524,6 +42570,29 @@ self: { broken = true; }) {}; + "bitcoin-scripting" = callPackage + ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring + , cereal, containers, haskoin-core, tasty, tasty-hunit + , tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "bitcoin-scripting"; + version = "0.1.0"; + sha256 = "1hd45rr4mq7dizdw7d1wkypr15azaaqc4fy6rkr9gim93jzc8707"; + libraryHaskellDepends = [ + attoparsec base base16-bytestring bytestring cereal containers + haskoin-core text transformers + ]; + testHaskellDepends = [ + base base16-bytestring bytestring cereal haskoin-core tasty + tasty-hunit tasty-quickcheck text + ]; + description = "Resources for working with miniscript, and script descriptors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "bitcoin-tx" = callPackage ({ mkDerivation, base, binary, bitcoin-script, bitcoin-types , bytestring, cryptohash, hexstring, hspec, lens @@ -42566,44 +42635,51 @@ self: { }) {}; "bitcoind-regtest" = callPackage - ({ mkDerivation, base, bitcoind-rpc, cereal, containers - , haskoin-core, http-client, process, servant, servant-client - , tasty, tasty-hunit, temporary, text + ({ mkDerivation, base, bitcoind-rpc, bytestring, cereal, containers + , haskoin-core, http-client, optparse-applicative, process, servant + , servant-client, tasty, tasty-hunit, temporary, text }: mkDerivation { pname = "bitcoind-regtest"; - version = "0.1.0.0"; - sha256 = "078834ndl253d1s6f68a8cq1dc0hq3r3ic4a90wbr4msw9zn626q"; + version = "0.2.0.0"; + sha256 = "06sk8kb3vjf7a2k7rhqpc7j1lbqd69xyhb25dc8bk7110m5l38cf"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bitcoind-rpc cereal containers haskoin-core http-client process servant servant-client temporary text ]; + executableHaskellDepends = [ + base bitcoind-rpc bytestring cereal haskoin-core http-client + optparse-applicative process servant servant-client temporary text + ]; testHaskellDepends = [ base bitcoind-rpc cereal haskoin-core http-client process servant servant-client tasty tasty-hunit temporary text ]; description = "A library for working with bitcoin-core regtest networks"; - license = stdenv.lib.licenses.isc; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; "bitcoind-rpc" = callPackage - ({ mkDerivation, aeson, base, bytestring, cereal, haskoin-core + ({ mkDerivation, aeson, base, base16-bytestring + , bitcoin-compact-filters, bytestring, cereal, haskoin-core , http-client, scientific, servant, servant-client , servant-jsonrpc-client, text, time, transformers }: mkDerivation { pname = "bitcoind-rpc"; - version = "0.1.0.0"; - sha256 = "1a3p49lzzsqd9m7ivisxksb6c7yc0dg5rps6ym85s4aasr1ln1j8"; + version = "0.2.0.0"; + sha256 = "0y5y5bdbhc1kcdk2nwjv2x5nz9vg5j38mc3l9pjyizz1s5yzn9rc"; libraryHaskellDepends = [ - aeson base bytestring cereal haskoin-core http-client scientific - servant servant-client servant-jsonrpc-client text time - transformers + aeson base base16-bytestring bitcoin-compact-filters bytestring + cereal haskoin-core http-client scientific servant servant-client + servant-jsonrpc-client text time transformers ]; description = "A streamlined interface to bitcoin core using Haskoin types and Servant"; - license = stdenv.lib.licenses.isc; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -43269,14 +43345,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "blanks_0_4_2" = callPackage + "blanks_0_5_0" = callPackage ({ mkDerivation, adjunctions, base, containers, deepseq , distributive, megaparsec, mtl, tasty, tasty-hunit, text }: mkDerivation { pname = "blanks"; - version = "0.4.2"; - sha256 = "0dbp923x0zy94kc61j2szmib299y99v208fqs5wir3lzyd55gdsc"; + version = "0.5.0"; + sha256 = "1a38cwk65zkzhq8yc95v4kamyp9k1y1vnfii84yqzvrrlbfzxbqf"; libraryHaskellDepends = [ adjunctions base containers deepseq distributive mtl ]; @@ -47143,8 +47219,8 @@ self: { }: mkDerivation { pname = "bytebuild"; - version = "0.3.6.0"; - sha256 = "15nk9r9mx798kmjl04qf01il1csfjyi3jx44yhi4hmgl66p9fdx3"; + version = "0.3.7.0"; + sha256 = "1vckm98sarxzqh6ib89y5kzhbf1yxc9wgrbpwbsrh0dv5gi3pclj"; libraryHaskellDepends = [ base byteslice bytestring integer-logarithms natural-arithmetic primitive primitive-offset primitive-unlifted run-st text-short @@ -47161,6 +47237,8 @@ self: { ]; description = "Serialize to a small byte arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bytedump" = callPackage @@ -47201,6 +47279,8 @@ self: { ]; description = "Universal hashing of bytes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bytelog" = callPackage @@ -47287,6 +47367,8 @@ self: { benchmarkHaskellDepends = [ base gauge primitive ]; description = "Slicing managed and unmanaged memory"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bytesmith" = callPackage @@ -47311,6 +47393,8 @@ self: { ]; description = "Nonresumable byte parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bytestring_0_11_0_0" = callPackage @@ -49629,8 +49713,8 @@ self: { }: mkDerivation { pname = "cachix"; - version = "0.3.8"; - sha256 = "0n05ys0jz6if3k121hr5znzbbd0v6xmckhh4vyya90r3kvgp1526"; + version = "0.5.0"; + sha256 = "05z5gnj5fkl0pqhinlvnq9zf51v5xhc6lhgnm061aj89rclhm6bg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -49658,25 +49742,22 @@ self: { ({ mkDerivation, aeson, base, base16-bytestring, bytestring , conduit, cookie, cryptonite, deepseq, exceptions, hspec , hspec-discover, http-api-data, http-media, jose, lens, memory - , protolude, resourcet, servant, servant-auth, servant-auth-server - , servant-auth-swagger, servant-client, servant-swagger - , servant-swagger-ui-core, string-conv, swagger2, text - , transformers + , nix-narinfo, protolude, resourcet, servant, servant-auth + , servant-auth-server, servant-auth-swagger, servant-client + , servant-swagger, servant-swagger-ui-core, string-conv, swagger2 + , text, time, transformers }: mkDerivation { pname = "cachix-api"; - version = "0.4.0"; - sha256 = "14hwn9nrnaypwzgy70l4kcscq7fcw1z5rs3a46cm2v5qqj72r2jx"; - isLibrary = true; - isExecutable = true; + version = "0.5.0"; + sha256 = "14b4vg6wv7kzxkfbh64ml2wvm9w8fyv2k2sm7ncaa0pp0f26pswy"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring conduit cookie cryptonite deepseq exceptions http-api-data http-media jose lens memory - protolude resourcet servant servant-auth servant-auth-server - servant-auth-swagger servant-client servant-swagger string-conv - swagger2 text transformers + nix-narinfo protolude resourcet servant servant-auth + servant-auth-server servant-client string-conv swagger2 text time + transformers ]; - executableHaskellDepends = [ aeson base protolude ]; testHaskellDepends = [ aeson base base16-bytestring bytestring conduit cookie cryptonite hspec http-api-data http-media lens memory protolude servant @@ -54658,8 +54739,8 @@ self: { }: mkDerivation { pname = "citeproc"; - version = "0.1.0.3"; - sha256 = "10zkkn00b2rm1lfnwdpmbxp82vmzbh69ivsda40kh0x2d8r1rzxp"; + version = "0.1.1.1"; + sha256 = "1w6ivzkwjpgaqd8nnb73krp2xwnkli5ggd0nmw3llxfzcvpg0mxz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57217,8 +57298,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.3.8"; - sha256 = "1x3ikycb9v9hmn1j57sddnr50kb3kvnch6w09fsyqzzmbnfc6nys"; + version = "0.1.3.10"; + sha256 = "0fdx96f9kn09nwpcdqpys3rvxlwrvynba5ipb509vriny96p7vrr"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack deepseq http-conduit hyraxAbif lens linear mtl split text vector @@ -58678,8 +58759,8 @@ self: { }: mkDerivation { pname = "commonmark"; - version = "0.1.0.2"; - sha256 = "00rqy02pn4gg0wpwvxyqxvzqg75lvb1qawn4m8rnjq6v43c4g23l"; + version = "0.1.1.2"; + sha256 = "13gk08gigih75zq7kwc101yxmxvj3hvfyi67ap13nrabv70l6zjm"; libraryHaskellDepends = [ base bytestring containers parsec text transformers ]; @@ -58720,8 +58801,8 @@ self: { }: mkDerivation { pname = "commonmark-extensions"; - version = "0.2.0.1"; - sha256 = "08i6167d78b5wf6aqsrjz2sb1qaanwrjzhpfg1jn4grd9g8i2ql6"; + version = "0.2.0.4"; + sha256 = "166ywkh6vyyrrwq7ww68pwzdkwmhi23hjvw28769m010ksimz2wh"; libraryHaskellDepends = [ base bytestring commonmark containers emojis parsec text transformers @@ -59183,8 +59264,8 @@ self: { }: mkDerivation { pname = "compdoc"; - version = "0.1.0.0"; - sha256 = "0m7xrl1ki3agp69yczgy396xlb84kggslmqnjglziyg6sziv58ak"; + version = "0.2.0.0"; + sha256 = "0cdgyvbx2xf7dgvg0h6k980yfh9vj7yg5vsg08i7cb8iik2w0k0m"; libraryHaskellDepends = [ aeson base composite-aeson composite-aeson-throw composite-base pandoc pandoc-throw path rio vinyl @@ -59195,6 +59276,26 @@ self: { broken = true; }) {}; + "compdoc-dhall-decoder" = callPackage + ({ mkDerivation, base, compdoc, composite-aeson, composite-base + , dhall, either, pandoc, text + }: + mkDerivation { + pname = "compdoc-dhall-decoder"; + version = "0.2.0.0"; + sha256 = "0iygbgcqcs3ixdnphhrp57s1ihpwnf9q59z7r74qqj7qx1yjrxig"; + revision = "1"; + editedCabalFile = "1g15qxkxfipvf6al3k8bdcvvcl1vyhjhg3r1w2z2g91ngz0b5y18"; + libraryHaskellDepends = [ + base compdoc composite-aeson composite-base dhall either pandoc + text + ]; + description = "Allows you to write FromDhall instances for Compdoc"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "compendium-client" = callPackage ({ mkDerivation, aeson, base, http-client, language-protobuf , megaparsec, servant, servant-client, text @@ -62661,6 +62762,8 @@ self: { ]; description = "Unified interface for primitive arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "contiguous-checked" = callPackage @@ -62685,6 +62788,8 @@ self: { libraryHaskellDepends = [ base contiguous primitive semirings ]; description = "dft of contiguous memory structures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "continue" = callPackage @@ -63559,6 +63664,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "core-data_0_2_1_9" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, core-text + , hashable, prettyprinter, scientific, text, unordered-containers + , vector + }: + mkDerivation { + pname = "core-data"; + version = "0.2.1.9"; + sha256 = "098bxx2g4mh3agpx7bccxhq8lpxjgl7a017vzp3ab65ni8126b1r"; + libraryHaskellDepends = [ + aeson base bytestring containers core-text hashable prettyprinter + scientific text unordered-containers vector + ]; + description = "Convenience wrappers around common data structures and encodings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "core-haskell" = callPackage ({ mkDerivation, base, haskeline, haskell-src-exts, hint }: mkDerivation { @@ -63597,6 +63720,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "core-program_0_2_6_0" = callPackage + ({ mkDerivation, async, base, bytestring, chronologique, core-data + , core-text, directory, exceptions, filepath, fsnotify, hashable + , hourglass, mtl, prettyprinter, safe-exceptions, stm + , template-haskell, terminal-size, text, text-short, transformers + , unix + }: + mkDerivation { + pname = "core-program"; + version = "0.2.6.0"; + sha256 = "1qyl7kcdqxfl2inx66n7pa1z2pqjxrz1bpg3jjknjj0kpw9rlhf3"; + libraryHaskellDepends = [ + async base bytestring chronologique core-data core-text directory + exceptions filepath fsnotify hashable hourglass mtl prettyprinter + safe-exceptions stm template-haskell terminal-size text text-short + transformers unix + ]; + description = "Opinionated Haskell Interoperability"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "core-text" = callPackage ({ mkDerivation, base, bytestring, deepseq, fingertree, hashable , prettyprinter, prettyprinter-ansi-terminal, template-haskell @@ -63614,6 +63759,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "core-text_0_3_0_0" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq + , fingertree, hashable, prettyprinter, template-haskell, text + , text-short + }: + mkDerivation { + pname = "core-text"; + version = "0.3.0.0"; + sha256 = "103fd1bbhkh1l9di0f88yxl9mdaxjh31pgg49bk6yhx9cmdhgn1x"; + libraryHaskellDepends = [ + ansi-terminal base bytestring colour deepseq fingertree hashable + prettyprinter template-haskell text text-short + ]; + description = "A rope type based on a finger tree over UTF-8 fragments"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "corebot-bliki" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers , directory, filepath, filestore, http-types, monads-tf, pandoc @@ -64787,15 +64950,16 @@ self: { "crdt-event-fold" = callPackage ({ mkDerivation, base, binary, containers, data-default-class - , data-dword + , data-dword, hspec }: mkDerivation { pname = "crdt-event-fold"; - version = "1.0.0.2"; - sha256 = "0bhfbzxb7s49x6nk1gg1n5nf26h8xqgy41ln7d5j59zp0lri5c04"; + version = "1.1.0.0"; + sha256 = "084vbx98b8ca5q2p6icbz0hv0hh4djk8iain7vv60w18453pz8fc"; libraryHaskellDepends = [ base binary containers data-default-class data-dword ]; + testHaskellDepends = [ base hspec ]; description = "Garbage collected event folding CRDT"; license = stdenv.lib.licenses.mit; }) {}; @@ -67319,8 +67483,8 @@ self: { }: mkDerivation { pname = "cut-the-crap"; - version = "2.2.0"; - sha256 = "19i1wmh9163fb8wggnla4c8r51j71wiwyzhhh3mznckhaws40fqa"; + version = "2.3.1"; + sha256 = "1q7jp39xyhximpb9k4yw2baccpgixgsdcrrlx1a0s84nxv8d0hl6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69812,8 +69976,8 @@ self: { pname = "data-tree-print"; version = "0.1.0.2"; sha256 = "00jh37anim8qsn553467gmfhajcz1c61zrgh1ypkqsll0gc29vy3"; - revision = "1"; - editedCabalFile = "1r6dnvc7d50q5p9fdqqwfvi7kwn7r89319plj7v284sjai9b6ld4"; + revision = "2"; + editedCabalFile = "00qpzhm3lndhpql8aj93aj6r3x9n0gw3nx6n0q60xxrd6agyjifq"; libraryHaskellDepends = [ base pretty syb ]; description = "Print Data instances as a nested tree"; license = stdenv.lib.licenses.bsd3; @@ -72250,15 +72414,15 @@ self: { "dependent-sum-aeson-orphans" = callPackage ({ mkDerivation, aeson, base, constraints, constraints-extras - , dependent-map, dependent-sum + , dependent-map, dependent-sum, some }: mkDerivation { pname = "dependent-sum-aeson-orphans"; - version = "0.2.1.0"; - sha256 = "04flfszrn4ah9vrm6hyp2pk0sbldcjp0jjibdny7lxdmv0fskzj5"; + version = "0.3.0.0"; + sha256 = "1wpjrynv9zva3hw1wgmqd5pmhhpa491yh85p1dnbpkj7h0g1pl1a"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map - dependent-sum + dependent-sum some ]; description = "JSON instances for DSum, DMap, and Some"; license = stdenv.lib.licenses.bsd3; @@ -75857,6 +76021,39 @@ self: { broken = true; }) {}; + "discord-register" = callPackage + ({ mkDerivation, base, calamity, dhall, di, di-polysemy + , generic-lens, hspec, hspec-megaparsec, megaparsec, polysemy + , polysemy-plugin, text, text-show, unboxing-vector + , unordered-containers, vector + }: + mkDerivation { + pname = "discord-register"; + version = "0.0.1"; + sha256 = "1crwbdkyg6k4777lcc7yi5n47xpsnvl3s1652n896k1hck7ckrr8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base calamity dhall di di-polysemy generic-lens hspec + hspec-megaparsec megaparsec polysemy polysemy-plugin text text-show + unboxing-vector unordered-containers vector + ]; + executableHaskellDepends = [ + base calamity dhall di di-polysemy generic-lens hspec + hspec-megaparsec megaparsec polysemy polysemy-plugin text text-show + unboxing-vector unordered-containers vector + ]; + testHaskellDepends = [ + base calamity dhall di di-polysemy generic-lens hspec + hspec-megaparsec megaparsec polysemy polysemy-plugin text text-show + unboxing-vector unordered-containers vector + ]; + description = "Discord verification bot"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "discord-rest" = callPackage ({ mkDerivation, aeson, base, bytestring, comonad, data-default , discord-types, hashable, hslogger, http-client, mtl, req, stm @@ -78196,6 +78393,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "domain" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, domain-core, foldl + , hashable, parser-combinators, QuickCheck, quickcheck-instances + , rerebase, tasty, tasty-hunit, tasty-quickcheck, template-haskell + , template-haskell-compat-v0208, text, th-lego, th-orphans + , yaml-unscrambler + }: + mkDerivation { + pname = "domain"; + version = "0.1"; + sha256 = "1lr97k14wc35myckknsv3vyximqfv5vq04f5kpd8167lk3vjahm2"; + libraryHaskellDepends = [ + attoparsec base bytestring domain-core foldl hashable + parser-combinators template-haskell template-haskell-compat-v0208 + text th-lego yaml-unscrambler + ]; + testHaskellDepends = [ + base domain-core QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck template-haskell text th-orphans + ]; + description = "Codegen helping you define domain models"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "domain-auth" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, attoparsec, base , bytestring, containers, cryptonite, dns, doctest, iproute, memory @@ -78214,6 +78437,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "domain-core" = callPackage + ({ mkDerivation, base, template-haskell + , template-haskell-compat-v0208, text, th-lego, th-lift-instances + }: + mkDerivation { + pname = "domain-core"; + version = "0.1"; + sha256 = "1qxscw4rcbnak9mp21455gzjdnjj6cqisdhq63gdibhrazfsjvd3"; + libraryHaskellDepends = [ + base template-haskell template-haskell-compat-v0208 text th-lego + th-lift-instances + ]; + description = "Low-level API of \"domain\""; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "domain-optics" = callPackage + ({ mkDerivation, base, domain, domain-core, optics, optics-core + , rerebase, template-haskell, template-haskell-compat-v0208, text + , th-lego, unordered-containers + }: + mkDerivation { + pname = "domain-optics"; + version = "0.1"; + sha256 = "0nivzn3nw30n1wb0i2j9qzxfmqcyknc187z3rkfyz5a5y7iq7x4m"; + libraryHaskellDepends = [ + base domain-core optics-core template-haskell + template-haskell-compat-v0208 text th-lego unordered-containers + ]; + testHaskellDepends = [ domain optics rerebase ]; + description = "Integration of domain with optics"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "dominion" = callPackage ({ mkDerivation, base, containers, hspec, lens, mtl, random }: mkDerivation { @@ -81336,15 +81597,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "egison-pattern-src_0_2_1_1" = callPackage + "egison-pattern-src_0_2_1_2" = callPackage ({ mkDerivation, base, containers, free, megaparsec, mtl , parser-combinators, prettyprinter, recursion-schemes, tasty , tasty-discover, tasty-hunit, text }: mkDerivation { pname = "egison-pattern-src"; - version = "0.2.1.1"; - sha256 = "0zpaxkskpdhq5nm1h6fh1klww4cslz96a3w4fhlaz0v0wdbkbrfs"; + version = "0.2.1.2"; + sha256 = "14g13m9c4353j8hir5inqhfzwapkxdkbvkzfbrrgca6hyj7mn1vf"; libraryHaskellDepends = [ base containers free megaparsec mtl parser-combinators prettyprinter recursion-schemes text @@ -81364,8 +81625,8 @@ self: { }: mkDerivation { pname = "egison-pattern-src-haskell-mode"; - version = "0.2.1.1"; - sha256 = "0k21fi28imqnn2rp5182mjxnrahssbdxay3pzhzj5yyfjp8qymwp"; + version = "0.2.1.2"; + sha256 = "1v76k77p8d86sp8lpd9h7gqdd9srbbiq8sd3bvvdvn7sj44gzw9m"; libraryHaskellDepends = [ base egison-pattern-src haskell-src-exts mtl text ]; @@ -81399,6 +81660,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "egison-pattern-src-th-mode_0_2_1_2" = callPackage + ({ mkDerivation, base, egison-pattern-src, haskell-src-exts + , haskell-src-meta, mtl, pretty, tasty, tasty-discover, tasty-hunit + , template-haskell, text + }: + mkDerivation { + pname = "egison-pattern-src-th-mode"; + version = "0.2.1.2"; + sha256 = "0zm3ds6vcxhahcwwryhk8f65141f0bnzj6mxy681npzwzgvljiyd"; + libraryHaskellDepends = [ + base egison-pattern-src haskell-src-exts haskell-src-meta mtl + pretty template-haskell text + ]; + testHaskellDepends = [ + base egison-pattern-src haskell-src-exts mtl tasty tasty-hunit + template-haskell text + ]; + testToolDepends = [ tasty-discover ]; + description = "Parser and pretty printer for Egison pattern expressions to use with TH"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "egison-quote" = callPackage ({ mkDerivation, base, egison, mtl, parsec, template-haskell }: mkDerivation { @@ -84257,6 +84541,8 @@ self: { testHaskellDepends = [ base ]; description = "Error code functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "error-context" = callPackage @@ -84702,7 +84988,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "esqueleto_3_4_0_0" = callPackage + "esqueleto_3_4_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql , mysql-simple, persistent, persistent-mysql, persistent-postgresql @@ -84712,8 +84998,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.4.0.0"; - sha256 = "0a4wrkcwlzgw0mds1pnxspv6ddzy9mz0md0qdx0x9s51z9ldswaj"; + version = "3.4.0.1"; + sha256 = "1vq8yfrixgqps8g6wvfgr9n42zmwj1jybiq3sbrgfj318n6dm5mc"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -86069,8 +86355,8 @@ self: { }: mkDerivation { pname = "exact-real"; - version = "0.12.4"; - sha256 = "09i0pi141cmqc09mxgsmdk7n3a0rcmjc7w2j4a0ckf0i41vb9yni"; + version = "0.12.4.1"; + sha256 = "194qx4dq8c9w1nbr4vyalmvp0m1a0q1pxjckg59m7c3fsz9r88jg"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base integer-gmp random ]; testHaskellDepends = [ @@ -86080,8 +86366,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Exact real arithmetic"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "exact-real-positional" = callPackage @@ -92911,7 +93195,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "foldl_1_4_9" = callPackage + "foldl_1_4_10" = callPackage ({ mkDerivation, base, bytestring, comonad, containers , contravariant, criterion, doctest, hashable, mwc-random , primitive, profunctors, semigroupoids, text, transformers @@ -92919,10 +93203,8 @@ self: { }: mkDerivation { pname = "foldl"; - version = "1.4.9"; - sha256 = "06cl9nyamzrmk894zm5na5hkbvnfyla1yvs2dk2ydms5m0v7z1na"; - revision = "1"; - editedCabalFile = "1fp5fym1620zcp570naa3wqhs4x3l9qgdxk77ddmijm9q3j0vqmm"; + version = "1.4.10"; + sha256 = "1fl1vahga6dv21nkgjd265nlhmgqzr8sa0fb5dfqzk34fb01vvvq"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable mwc-random primitive profunctors semigroupoids text transformers @@ -97209,14 +97491,14 @@ self: { "gargoyle" = callPackage ({ mkDerivation, base, directory, filelock, filepath, network - , process + , process, unix }: mkDerivation { pname = "gargoyle"; - version = "0.1"; - sha256 = "1yjvn1bfjnr8prs6inz5nhmywszwp8f38iz6v6i3lfazcck8qb43"; + version = "0.1.1.0"; + sha256 = "1rjkz0v8jmzxxh41fs777fyhdp7lizwngg33886awmg08hdk24rq"; libraryHaskellDepends = [ - base directory filelock filepath network process + base directory filelock filepath network process unix ]; description = "Automatically spin up and spin down local daemons"; license = stdenv.lib.licenses.bsd3; @@ -97225,17 +97507,18 @@ self: { }) {}; "gargoyle-postgresql" = callPackage - ({ mkDerivation, base, bytestring, directory, gargoyle, process - , stringsearch, text, unix + ({ mkDerivation, base, bytestring, directory, gargoyle + , posix-escape, process, stringsearch, text, unix }: mkDerivation { pname = "gargoyle-postgresql"; - version = "0.1"; - sha256 = "13s2r5kxqkpq4g13dpqig7y2ya0n19xw5ng1sw093kp2kmfjs4h4"; + version = "0.2.0.1"; + sha256 = "1k12cfrz58hmdrjnrxyb3dixj8yfz41xpq0dqgvxzwlrd3d4nb9g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring directory gargoyle process stringsearch text unix + base bytestring directory gargoyle posix-escape process + stringsearch text unix ]; executableHaskellDepends = [ base bytestring gargoyle process text unix @@ -97246,6 +97529,49 @@ self: { broken = true; }) {}; + "gargoyle-postgresql-connect" = callPackage + ({ mkDerivation, base, bytestring, directory, gargoyle + , gargoyle-postgresql, gargoyle-postgresql-nix, postgresql-simple + , resource-pool + }: + mkDerivation { + pname = "gargoyle-postgresql-connect"; + version = "0.1.0.0"; + sha256 = "00gfs33hcmjla7h32hiazjpsdcszvig7fajhsx48yr8jq9srkm3d"; + revision = "2"; + editedCabalFile = "052glxfxsd9wvdyqxdj49vp1b1vvqr77zrdv85r3iqm7mvf16gmk"; + libraryHaskellDepends = [ + base bytestring directory gargoyle gargoyle-postgresql + gargoyle-postgresql-nix postgresql-simple resource-pool + ]; + description = "Connect to gargoyle-managed postgresql instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "gargoyle-postgresql-nix" = callPackage + ({ mkDerivation, base, bytestring, gargoyle, gargoyle-postgresql + , which + }: + mkDerivation { + pname = "gargoyle-postgresql-nix"; + version = "0.3.0.0"; + sha256 = "1cjh9hqk4ba1bz29b4vj0h249vpfpdgn8zsznqcr7b58czd8cf4y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring gargoyle gargoyle-postgresql which + ]; + executableHaskellDepends = [ + base gargoyle gargoyle-postgresql which + ]; + description = "Manage PostgreSQL servers with gargoyle and nix"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "garlic-bread" = callPackage ({ mkDerivation, base, hspec, mtl, transformers }: mkDerivation { @@ -98122,7 +98448,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "generic-data_0_9_1_0" = callPackage + "generic-data_0_9_2_0" = callPackage ({ mkDerivation, ap-normalize, base, base-orphans, Cabal , cabal-doctest, contravariant, criterion, deepseq, doctest , generic-lens, ghc-boot-th, inspection-testing, one-liner @@ -98131,8 +98457,8 @@ self: { }: mkDerivation { pname = "generic-data"; - version = "0.9.1.0"; - sha256 = "0p58z70wp3vapxrwg7hkr5n6px7hws9398v9shc08c2aigq36kqa"; + version = "0.9.2.0"; + sha256 = "00zwfr21kmgcdjfjvacn4pvs5i8bl6xbbzw95746g67ap5nz624d"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ap-normalize base base-orphans contravariant ghc-boot-th @@ -98255,13 +98581,13 @@ self: { }) {}; "generic-functor" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, ap-normalize, base, transformers }: mkDerivation { pname = "generic-functor"; - version = "0.1.0.0"; - sha256 = "02anlx3l0zn4hx9pckpdpp93yp1xyqcafpy6rk7s1zpv7nqk12z2"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; + version = "0.2.0.0"; + sha256 = "0zrjsn78ip9kigqgw5cxzm9d7pqf1svdzrc3rm041889ca0szwjv"; + libraryHaskellDepends = [ ap-normalize base ]; + testHaskellDepends = [ base transformers ]; description = "Deriving generalized functors with GHC.Generics"; license = stdenv.lib.licenses.mit; }) {}; @@ -103355,8 +103681,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20201007"; - sha256 = "0v11yc4kkxnzvwqry277dpjwlavinrjiagfw0ayhrfwd703j1y8a"; + version = "8.20201103"; + sha256 = "1z9ikpsz3by48yfw87qav5dy7j4k9ky4a7nqnasl15kdm3lav9pl"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -103642,8 +103968,6 @@ self: { ]; description = "Tool to help resolving git conflicts"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "git-monitor" = callPackage @@ -108184,8 +108508,8 @@ self: { }: mkDerivation { pname = "goldplate"; - version = "0.1.1"; - sha256 = "0qjqx3yxlyfdj6glych7vwrrh47nrp6xi0vncga2a94hb5sljzzl"; + version = "0.1.2"; + sha256 = "1qbh23sqx0jvwrmhb88683z3rx31jy99xh8h24iqv1ykmjvmqwvf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -108569,15 +108893,16 @@ self: { "gopro-plus" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, exceptions - , filepath, generic-deriving, HUnit, lens, lens-aeson, mtl, random + , filepath, generic-deriving, generic-random, HUnit, lens + , lens-aeson, mtl, QuickCheck, quickcheck-instances, random , raw-strings-qq, retry, tasty, tasty-hunit, tasty-quickcheck, text , time, transformers, unix, unliftio, unordered-containers, vector , wreq }: mkDerivation { pname = "gopro-plus"; - version = "0.4.1.1"; - sha256 = "1vcy9r4jnnrfc6xp34b4w5z4xgxhcnsv5sy26iazw6g07mg1v73p"; + version = "0.4.1.3"; + sha256 = "1924d0qymm18zy5pw04irf1nmwdbkbscxcvw4cmjqm9xj7cnyja0"; libraryHaskellDepends = [ aeson base bytestring containers exceptions filepath generic-deriving lens lens-aeson mtl random retry text time @@ -108585,12 +108910,15 @@ self: { ]; testHaskellDepends = [ aeson base bytestring containers exceptions filepath - generic-deriving HUnit lens lens-aeson mtl random raw-strings-qq - retry tasty tasty-hunit tasty-quickcheck text time transformers - unix unliftio unordered-containers vector wreq + generic-deriving generic-random HUnit lens lens-aeson mtl + QuickCheck quickcheck-instances random raw-strings-qq retry tasty + tasty-hunit tasty-quickcheck text time transformers unix unliftio + unordered-containers vector wreq ]; description = "GoPro Plus Client API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gore-and-ash" = callPackage @@ -112065,6 +112393,55 @@ self: { broken = true; }) {}; + "hOpenPGP_2_9_5" = callPackage + ({ mkDerivation, aeson, asn1-encoding, attoparsec, base + , base16-bytestring, bifunctors, binary, binary-conduit, bytestring + , bz2, conduit, conduit-extra, containers, criterion + , crypto-cipher-types, cryptonite, errors, hashable + , incremental-parser, ixset-typed, lens, memory, monad-loops + , nettle, network, network-uri, openpgp-asciiarmor, prettyprinter + , QuickCheck, quickcheck-instances, resourcet, split, tasty + , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat + , transformers, unliftio-core, unordered-containers, zlib + }: + mkDerivation { + pname = "hOpenPGP"; + version = "2.9.5"; + sha256 = "1wzvlk7my7a8rwmsw1glw2dlph3b2hwyz2jkcjr0hd1jj8ywksnx"; + libraryHaskellDepends = [ + aeson asn1-encoding attoparsec base base16-bytestring bifunctors + binary binary-conduit bytestring bz2 conduit conduit-extra + containers crypto-cipher-types cryptonite errors hashable + incremental-parser ixset-typed lens memory monad-loops nettle + network-uri openpgp-asciiarmor prettyprinter resourcet split text + time time-locale-compat transformers unliftio-core + unordered-containers zlib + ]; + testHaskellDepends = [ + aeson asn1-encoding attoparsec base base16-bytestring bifunctors + binary binary-conduit bytestring bz2 conduit conduit-extra + containers crypto-cipher-types cryptonite errors hashable + incremental-parser ixset-typed lens memory monad-loops nettle + network network-uri prettyprinter QuickCheck quickcheck-instances + resourcet split tasty tasty-hunit tasty-quickcheck text time + time-locale-compat transformers unliftio-core unordered-containers + zlib + ]; + benchmarkHaskellDepends = [ + aeson base base16-bytestring bifunctors binary binary-conduit + bytestring bz2 conduit conduit-extra containers criterion + crypto-cipher-types cryptonite errors hashable incremental-parser + ixset-typed lens memory monad-loops nettle network network-uri + openpgp-asciiarmor prettyprinter resourcet split text time + time-locale-compat transformers unliftio-core unordered-containers + zlib + ]; + description = "native Haskell implementation of OpenPGP (RFC4880)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hPDB" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , ghc-prim, iterable, linear, mmap, mtl, Octree, parallel @@ -112992,10 +113369,8 @@ self: { }: mkDerivation { pname = "hackage-security-HTTP"; - version = "0.1.1"; - sha256 = "0chkrn4d33qjh50fpbkrkqj6jsxd5y5c2mrgqgwsdx3x08kaq8nd"; - revision = "3"; - editedCabalFile = "1nsvfqg2k1yj8pvbfx1083m29v1c9kcb9h389r380ga1b32v89nl"; + version = "0.1.1.1"; + sha256 = "14hp7gssf80b9937j7m56w8sxrv3hrzjf2s9kgfk76v6llgx79k2"; libraryHaskellDepends = [ base bytestring hackage-security HTTP mtl network network-uri zlib ]; @@ -114488,15 +114863,15 @@ self: { }) {}; "hakyll-typescript" = callPackage - ({ mkDerivation, base, bytestring, directory, hakyll, hjsmin, tasty - , tasty-hunit, typed-process + ({ mkDerivation, base, bytestring, directory, hakyll + , hakyll-process, hjsmin, tasty, tasty-hunit }: mkDerivation { pname = "hakyll-typescript"; - version = "0.0.1.0"; - sha256 = "1vhkhbmy0pflcnzfhb9gck436rr5wr6hfpcb3sz8r27l1fml26ji"; + version = "0.0.2.0"; + sha256 = "03vxfv693grnyrkr3qz9vxh97dmaw1qqnb4hrfi8hpkqb094yw5d"; libraryHaskellDepends = [ - base bytestring hakyll hjsmin typed-process + base bytestring hakyll hakyll-process hjsmin ]; testHaskellDepends = [ base directory hakyll tasty tasty-hunit ]; description = "Typescript and javascript hakyll compilers"; @@ -117963,12 +118338,12 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; - "haskell-gi-base_0_24_3" = callPackage + "haskell-gi-base_0_24_4" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.24.3"; - sha256 = "007qy63s9d6rdhybnd7cfb5jsx0kzg7lbgximxkh5rd66bjbk9pc"; + version = "0.24.4"; + sha256 = "1xdl2pfpk30h4649avh0ms6gq9dij3yxpfxn6kwxyjcsxdggzmdg"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; @@ -120266,7 +120641,7 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "haskoin-core_0_17_0" = callPackage + "haskoin-core_0_17_1" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring , cereal, conduit, containers, cryptonite, deepseq, entropy , hashable, hspec, hspec-discover, HUnit, lens, lens-aeson, memory @@ -120276,8 +120651,8 @@ self: { }: mkDerivation { pname = "haskoin-core"; - version = "0.17.0"; - sha256 = "0zsi5390ig611clahj3p2l3h3w7b3lzl3dfiqliihanivlnrmkag"; + version = "0.17.1"; + sha256 = "07w2ddgrq3s4xhhhh616a65zm3xnlmcfk7wzdj6dr26h0frpz6zi"; libraryHaskellDepends = [ aeson array base base16-bytestring bytestring cereal conduit containers cryptonite deepseq entropy hashable hspec memory mtl @@ -123417,8 +123792,8 @@ self: { }: mkDerivation { pname = "hdocs"; - version = "0.5.4.0"; - sha256 = "1qj7kcpfwpsgzbmhiix22n66173kgxqgf3fb6mc2ybdc4zmkfa29"; + version = "0.5.5.0"; + sha256 = "1bwwvqlxpjh77fi443ay269i8n9cxzdv7nspql6lrks9wh8jf8cf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125388,32 +125763,32 @@ self: { "hevm" = callPackage ({ mkDerivation, abstract-par, aeson, ansi-wl-pprint, async, base - , base16-bytestring, binary, brick, bytestring, cborg, cereal - , containers, cryptonite, data-dword, deepseq, directory, ff, fgl - , filepath, free, haskeline, here, HUnit, lens, lens-aeson - , megaparsec, memory, monad-par, mtl, multiset, operational - , optparse-generic, process, QuickCheck, quickcheck-text - , regex-tdfa, restless-git, rosezipper, s-cargot, sbv, scientific - , secp256k1, semver-range, tasty, tasty-hunit, tasty-quickcheck - , temporary, text, text-format, time, transformers, tree-view - , unordered-containers, vector, vty, witherable, wreq + , base16-bytestring, binary, brick, bytestring, cereal, containers + , cryptonite, data-dword, deepseq, directory, ff, fgl, filepath + , free, haskeline, here, HUnit, lens, lens-aeson, megaparsec + , memory, monad-par, mtl, multiset, operational, optparse-generic + , process, QuickCheck, quickcheck-text, regex-tdfa, restless-git + , rosezipper, s-cargot, sbv, scientific, secp256k1, semver-range + , tasty, tasty-hunit, tasty-quickcheck, temporary, text + , text-format, time, transformers, tree-view, unordered-containers + , vector, vty, witherable, wreq }: mkDerivation { pname = "hevm"; - version = "0.41.0"; - sha256 = "13qf0bh47dppqbxv1g07411c1lfmfxl0pm2s3xkwdf7kr219l0hw"; + version = "0.42.0"; + sha256 = "0p736bxsg91l7n82xad52j5gqvyx6ik7hbmlnnz5bsrnsm05maxz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ abstract-par aeson ansi-wl-pprint base base16-bytestring binary - brick bytestring cborg cereal containers cryptonite data-dword - deepseq directory fgl filepath free haskeline lens lens-aeson - megaparsec memory monad-par mtl multiset operational - optparse-generic process QuickCheck quickcheck-text regex-tdfa - restless-git rosezipper s-cargot sbv scientific semver-range - temporary text text-format time transformers tree-view - unordered-containers vector vty witherable wreq + brick bytestring cereal containers cryptonite data-dword deepseq + directory fgl filepath free haskeline lens lens-aeson megaparsec + memory monad-par mtl multiset operational optparse-generic process + QuickCheck quickcheck-text regex-tdfa restless-git rosezipper + s-cargot sbv scientific semver-range temporary text text-format + time transformers tree-view unordered-containers vector vty + witherable wreq ]; librarySystemDepends = [ ff secp256k1 ]; executableHaskellDepends = [ @@ -125497,6 +125872,8 @@ self: { testHaskellDepends = [ base doctest ]; description = "ByteString-Text hexidecimal conversions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hexchat" = callPackage @@ -127537,6 +127914,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hinotify_0_4_1" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , unix + }: + mkDerivation { + pname = "hinotify"; + version = "0.4.1"; + sha256 = "06pqfikfa61i45g92b65br83kplwmizqkm42yp8d0ddgmq0b21qk"; + libraryHaskellDepends = [ async base bytestring containers unix ]; + testHaskellDepends = [ base bytestring directory unix ]; + description = "Haskell binding to inotify"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hinotify-bytestring" = callPackage ({ mkDerivation, base, bytestring, containers, directory , posix-paths, unix, utf8-string @@ -129884,8 +130276,8 @@ self: { }: mkDerivation { pname = "hnix"; - version = "0.10.1"; - sha256 = "19a5pa1ji4hjr3vjvbkjmhnysnd8jcpkzlj9f2qw67h5iagysccy"; + version = "0.11.0"; + sha256 = "01m23sn3r2pr6ldblk4m41y082jc0lrgpfzbx63sx168ldhwxar3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131246,6 +131638,39 @@ self: { broken = true; }) {}; + "hopenpgp-tools_0_23_3" = callPackage + ({ mkDerivation, aeson, alex, array, base, base16-bytestring + , binary, binary-conduit, bytestring, conduit, conduit-extra + , containers, cryptonite, directory, errors, fgl, graphviz, happy + , hOpenPGP, http-client, http-client-tls, http-types, ixset-typed + , lens, memory, monad-loops, mtl, openpgp-asciiarmor + , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal + , prettyprinter-convert-ansi-wl-pprint, resourcet, text, time + , time-locale-compat, transformers, unordered-containers, vector + , yaml + }: + mkDerivation { + pname = "hopenpgp-tools"; + version = "0.23.3"; + sha256 = "1h6hg05i7vm0cnhn3sifmmv01hjxy0w030j4m3fig3ic57658q2p"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson array base base16-bytestring binary binary-conduit bytestring + conduit conduit-extra containers cryptonite directory errors fgl + graphviz hOpenPGP http-client http-client-tls http-types + ixset-typed lens memory monad-loops mtl openpgp-asciiarmor + optparse-applicative prettyprinter prettyprinter-ansi-terminal + prettyprinter-convert-ansi-wl-pprint resourcet text time + time-locale-compat transformers unordered-containers vector yaml + ]; + executableToolDepends = [ alex happy ]; + description = "hOpenPGP-based command-line tools"; + license = stdenv.lib.licenses.agpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hopenssl" = callPackage ({ mkDerivation, base, bytestring, HUnit, openssl }: mkDerivation { @@ -132501,8 +132926,10 @@ self: { }: mkDerivation { pname = "hprotoc"; - version = "2.4.13"; - sha256 = "0z88kiirwpnzw6hxg99kg42j2hkf002vcsmbcm7nqdfqajrggiy0"; + version = "2.4.17"; + sha256 = "1r7zr4sbg6355zavbzjixvfv10aglz1zs9ajnznpjhnj6lfisf32"; + revision = "2"; + editedCabalFile = "0hxhvjk3mswx712viv7krcgiynxq4bjs71vbk2pgm2d50i5qr8mr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134851,30 +135278,31 @@ self: { ({ mkDerivation, aeson, aeson-pretty, array, async, attoparsec , base, bytestring, Cabal, containers, cpphs, data-default, deepseq , direct-sqlite, directory, exceptions, filepath, fsnotify, ghc - , ghc-boot, ghc-paths, haddock-api, haddock-library, haskell-names - , haskell-src-exts, hdocs, hformat, hlint, hspec, http-client, lens - , lens-aeson, lifted-base, mmorph, monad-control, monad-loops, mtl - , network, network-uri, optparse-applicative, process - , regex-pcre-builtin, scientific, simple-log, sqlite-simple, stm - , syb, template-haskell, text, text-region, time, transformers - , transformers-base, uniplate, unix, unordered-containers, vector + , ghc-boot, ghc-lib-parser, ghc-paths, haddock-api, haddock-library + , haskell-names, haskell-src-exts, hdocs, hformat, hlint, hspec + , http-client, lens, lens-aeson, lifted-base, mmorph, monad-control + , monad-loops, mtl, network, network-uri, optparse-applicative + , process, regex-pcre-builtin, scientific, simple-log + , sqlite-simple, stm, syb, template-haskell, text, text-region + , time, transformers, transformers-base, uniplate, unix + , unordered-containers, vector }: mkDerivation { pname = "hsdev"; - version = "0.3.3.8"; - sha256 = "01dagwpg70h9af5kzr2f19qsvy4h5cx5rjdrcq0r36fbmdkbza2z"; + version = "0.3.4.0"; + sha256 = "1qp1rsqxnv842kamhcf9hylj7ja1hwxni4m29d7pqfwbqsfwf55h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty array async attoparsec base bytestring Cabal containers cpphs data-default deepseq direct-sqlite directory - exceptions filepath fsnotify ghc ghc-boot ghc-paths haddock-api - haddock-library haskell-names haskell-src-exts hdocs hformat hlint - http-client lens lifted-base mmorph monad-control monad-loops mtl - network network-uri optparse-applicative process regex-pcre-builtin - scientific simple-log sqlite-simple stm syb template-haskell text - text-region time transformers transformers-base uniplate unix - unordered-containers vector + exceptions filepath fsnotify ghc ghc-boot ghc-lib-parser ghc-paths + haddock-api haddock-library haskell-names haskell-src-exts hdocs + hformat hlint http-client lens lifted-base mmorph monad-control + monad-loops mtl network network-uri optparse-applicative process + regex-pcre-builtin scientific simple-log sqlite-simple stm syb + template-haskell text text-region time transformers + transformers-base uniplate unix unordered-containers vector ]; executableHaskellDepends = [ aeson aeson-pretty base bytestring containers deepseq directory @@ -134996,6 +135424,20 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "hsemail_2_2_1" = callPackage + ({ mkDerivation, base, hspec, parsec, time, time-compat }: + mkDerivation { + pname = "hsemail"; + version = "2.2.1"; + sha256 = "108xjspr7apx248gvv7w1hh2pqnb7qg699a8l8f8z64cv6s9ksmm"; + libraryHaskellDepends = [ base parsec time time-compat ]; + testHaskellDepends = [ base hspec parsec time ]; + description = "Parsec parsers for the Internet Message format (e-mail)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "hsemail-ns" = callPackage ({ mkDerivation, base, doctest, hspec, mtl, old-time, parsec }: mkDerivation { @@ -139491,6 +139933,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-rfc7807" = callPackage + ({ mkDerivation, aeson, base, call-stack, hspec-expectations-json + , http-media, http-types, servant, servant-server, tasty + , tasty-hunit, text + }: + mkDerivation { + pname = "http-rfc7807"; + version = "0.1.0.0"; + sha256 = "1wysqi3rfyg1fb7p9plb6ihcqzvyb2cqhsfx46ciwgym9nxg8lr4"; + libraryHaskellDepends = [ + aeson base http-media http-types servant servant-server text + ]; + testHaskellDepends = [ + aeson base call-stack hspec-expectations-json tasty tasty-hunit + text + ]; + description = "RFC7807 style response messages"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "http-server" = callPackage ({ mkDerivation, base, HTTP, mime, network, network-uri, text, unix , url, utf8-string @@ -139661,10 +140123,8 @@ self: { }: mkDerivation { pname = "http2-client"; - version = "0.9.0.0"; - sha256 = "1z46an4sign2ashjsj2y07vkf73i2wzx5x10qsdaf4av5ib8ykxq"; - revision = "1"; - editedCabalFile = "00fg9a62qkjwp7rb38j7z7yy6dk3mkh6mgwspd79v2ycmn4mr25q"; + version = "0.10.0.0"; + sha256 = "0kv4qa9cbwwj6b62manzpl1sk4jnsb5vx2y73w49drlfkrw1vpgy"; libraryHaskellDepends = [ async base bytestring containers deepseq http2 lifted-async lifted-base mtl network stm time tls transformers-base @@ -146616,6 +147076,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "integer-logarithms_1_0_3_1" = callPackage + ({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck + , smallcheck, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck + }: + mkDerivation { + pname = "integer-logarithms"; + version = "1.0.3.1"; + sha256 = "0zzapclfabc76g8jzsbsqwdllx2zn0gp4raq076ib6v0mfgry2lv"; + libraryHaskellDepends = [ array base ghc-prim integer-gmp ]; + testHaskellDepends = [ + base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + description = "Integer logarithms"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "integer-pure" = callPackage ({ mkDerivation }: mkDerivation { @@ -147865,6 +148344,8 @@ self: { ]; description = "Library for IP and MAC addresses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ip-quoter" = callPackage @@ -154889,8 +155370,8 @@ self: { }: mkDerivation { pname = "kubernetes-client"; - version = "0.3.0.0"; - sha256 = "1wpcamcvyphs2y370qzn5fmc18zyn8nb0099si12n9xgk5zdmcrq"; + version = "0.3.1.0"; + sha256 = "1ys3b143wckkgc7wjwfilkvr35j7as775p2d2riqkjpfi88kh301"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring connection containers data-default-class either filepath hoauth2 http-client @@ -154924,8 +155405,8 @@ self: { }: mkDerivation { pname = "kubernetes-client-core"; - version = "0.3.0.0"; - sha256 = "0ifn69iqxwxkl4y2qlz5d25fbyqb2pks0cd064j54hc0fjwlxlzk"; + version = "0.3.1.0"; + sha256 = "0rb5iyln1grpdg36hf2655sm3chrw4cddbmfhxjpispybr1ypl9c"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq exceptions http-api-data http-client http-client-tls @@ -159565,10 +160046,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.3.2.0"; - sha256 = "134f9ijnd1dw2l9k5m1ay643pc4jqmq5kx17cnijb7ff93442s0n"; - revision = "2"; - editedCabalFile = "0xijjp1ysybbd9n3f5vcaph1qdad5v9ynp0jia5aaizr34lwx94z"; + version = "1.4.0.0"; + sha256 = "1f5jcprb2l65nyysxgdkhd9vsg1ixn8qfpjgmgvi8cqm0zp28zw7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -159641,22 +160120,28 @@ self: { }) {}; "less-arbitrary" = callPackage - ({ mkDerivation, base, containers, generic-arbitrary, hashable, mtl - , QuickCheck, quickcheck-classes, quickcheck-instances, random - , scientific, text, transformers, unordered-containers, vector + ({ mkDerivation, base, containers, email-validate + , generic-arbitrary, genvalidity, genvalidity-hspec + , genvalidity-property, hashable, hspec, mtl, QuickCheck + , quickcheck-classes, quickcheck-instances, random, scientific + , text, time, transformers, unordered-containers, validity, vector }: mkDerivation { pname = "less-arbitrary"; - version = "0.1.0.1"; - sha256 = "1hbiwyk49qqqdfglydywj02ycymdb486nv5cp8710gfwh75i29xw"; + version = "0.1.0.2"; + sha256 = "0xqhlk4qqykb173pm6akd7jvygm5ya3qqw3xc649aiq053ralvif"; libraryHaskellDepends = [ - base containers generic-arbitrary hashable mtl QuickCheck random - scientific text transformers unordered-containers vector + base containers email-validate generic-arbitrary genvalidity + genvalidity-hspec genvalidity-property hashable hspec mtl + QuickCheck random scientific text time transformers + unordered-containers validity vector ]; testHaskellDepends = [ - base containers generic-arbitrary hashable mtl QuickCheck - quickcheck-classes quickcheck-instances random scientific text - transformers unordered-containers vector + base containers email-validate generic-arbitrary genvalidity + genvalidity-hspec genvalidity-property hashable hspec mtl + QuickCheck quickcheck-classes quickcheck-instances random + scientific text time transformers unordered-containers validity + vector ]; description = "Linear time testing with variant of Arbitrary class that always terminates"; license = stdenv.lib.licenses.bsd3; @@ -164050,6 +164535,19 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "loc_0_1_3_10" = callPackage + ({ mkDerivation, base, containers, doctest, hedgehog }: + mkDerivation { + pname = "loc"; + version = "0.1.3.10"; + sha256 = "0vl0pyimcm7jp4lgdmsqgcg9shqfrj60lz4psjkdfdcm3vkdqnkw"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers doctest hedgehog ]; + description = "Types representing line and column positions and ranges in text files"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "loc-test" = callPackage ({ mkDerivation, base, containers, hedgehog, loc }: mkDerivation { @@ -165695,6 +166193,8 @@ self: { pname = "lsp"; version = "1.0.0.0"; sha256 = "05m9kxcf7g2xb4bhbn08bfbf09b8vvvw3nvpcfldpx180yz3n02r"; + revision = "1"; + editedCabalFile = "1pgxvwfn7avkpdl6f3p7rqaivdz438yqkzsz0rp1y0s80mymvz1i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165777,8 +166277,8 @@ self: { }: mkDerivation { pname = "lsp-types"; - version = "1.0.0.0"; - sha256 = "1cf07hdzgh5inskabdyli3zg95grc3qlw9d5xiqf1hwlspsyxis9"; + version = "1.0.0.1"; + sha256 = "1yrm42qsbqk94ql0khifcpvicy9lbvwwrvnr41lplbb1vhqvqc27"; libraryHaskellDepends = [ aeson base binary bytestring containers data-default deepseq dependent-sum-template directory filepath hashable hslogger lens @@ -166481,6 +166981,8 @@ self: { ]; description = "Bindings to LZ4"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lz4-conduit" = callPackage @@ -167116,6 +167618,32 @@ self: { broken = true; }) {}; + "macrm" = callPackage + ({ mkDerivation, base, bytestring, cmdargs, cond, directory + , exceptions, filepath, githash, hspec, inline-c, main-tester + , MissingH, process, text, time, unix, uuid + }: + mkDerivation { + pname = "macrm"; + version = "1.0.0.5"; + sha256 = "0j1lcg5igypppj7c5plxifyvcl065j0mqhkdyb8nkpgjp95f7r0n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base cmdargs cond directory exceptions githash inline-c MissingH + process text time unix + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring directory filepath hspec main-tester MissingH + process unix uuid + ]; + description = "Alternative rm command for macOS that remove files/dirs to the system trash"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "mad-props" = callPackage ({ mkDerivation, base, containers, lens, logict, MonadRandom, mtl , psqueues, random, random-shuffle, raw-strings-qq, transformers @@ -168867,6 +169395,30 @@ self: { broken = true; }) {}; + "massiv_0_5_5_0" = callPackage + ({ mkDerivation, base, bytestring, data-default-class, deepseq + , doctest, exceptions, mersenne-random-pure64, primitive + , QuickCheck, random, scheduler, splitmix, template-haskell + , unliftio-core, vector + }: + mkDerivation { + pname = "massiv"; + version = "0.5.5.0"; + sha256 = "1nlx8lakwnpplmgiiv692jbs03b52wqvclfyvaxcaf8yqdjms3r9"; + libraryHaskellDepends = [ + base bytestring data-default-class deepseq exceptions primitive + scheduler unliftio-core vector + ]; + testHaskellDepends = [ + base doctest mersenne-random-pure64 QuickCheck random splitmix + template-haskell + ]; + description = "Massiv (Массив) is an Array Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "massiv-io" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, Color , data-default-class, deepseq, doctest, exceptions, filepath, hspec @@ -168894,7 +169446,7 @@ self: { broken = true; }) {}; - "massiv-io_0_3_0_1" = callPackage + "massiv-io_0_4_0_0" = callPackage ({ mkDerivation, base, bytestring, Color, data-default-class , deepseq, doctest, exceptions, filepath, hspec, JuicyPixels , massiv, massiv-test, netpbm, QuickCheck, random, template-haskell @@ -168902,8 +169454,8 @@ self: { }: mkDerivation { pname = "massiv-io"; - version = "0.3.0.1"; - sha256 = "0r0nkgpdkjwsdxcfys3idk1m7q0paz5c3gx1sx7xwsj7c5gyp5gs"; + version = "0.4.0.0"; + sha256 = "18q09pz563jp8lmnvmcynmhrk6pmqxr8whlcp6f9kilkzy7hzy9k"; libraryHaskellDepends = [ base bytestring Color data-default-class deepseq exceptions filepath JuicyPixels massiv netpbm unliftio vector @@ -170273,6 +170825,8 @@ self: { pname = "medea"; version = "1.2.0"; sha256 = "019jfz29gz3d06b5yi7fygqa79lp6c6vbzxcb5ka7d8w0zv7w60v"; + revision = "1"; + editedCabalFile = "1zkwy3p9q3rd4qcnmgr67xi3fv9frw35rsqpwh5l1mfvv772qap9"; libraryHaskellDepends = [ aeson algebraic-graphs base bytestring containers deepseq free hashable megaparsec microlens-ghc mtl nonempty-containers @@ -173576,20 +174130,20 @@ self: { "miv" = callPackage ({ mkDerivation, aeson, async, base, concurrent-output, directory - , filepath, ghc-prim, hashable, hspec, monad-parallel, process - , SafeSemaphore, text, time, unix-compat, unordered-containers - , xdg-basedir, yaml + , filepath, filepattern, ghc-prim, hashable, hspec, monad-parallel + , process, SafeSemaphore, text, time, unix-compat + , unordered-containers, xdg-basedir, yaml }: mkDerivation { pname = "miv"; - version = "0.4.3"; - sha256 = "0i2ikjr36qdr2i92bapx2p4lq4jvfmzh12b2nslhqq4xnf2fs2ib"; + version = "0.4.4"; + sha256 = "0is2ckkglh9wnhwnvyhhjy7as67mk7bs4az98q32nk3hx0yj9nq8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson async base concurrent-output directory filepath ghc-prim - hashable monad-parallel process SafeSemaphore text time unix-compat - unordered-containers xdg-basedir yaml + aeson async base concurrent-output directory filepath filepattern + ghc-prim hashable monad-parallel process SafeSemaphore text time + unix-compat unordered-containers xdg-basedir yaml ]; testHaskellDepends = [ aeson base directory ghc-prim hashable hspec monad-parallel process @@ -173970,6 +174524,8 @@ self: { ]; description = "Produces a sound recording specified by the Ukrainian text"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mmsyn7l" = callPackage @@ -176532,8 +177088,8 @@ self: { pname = "monoidal-containers"; version = "0.6.0.1"; sha256 = "1j5mfs0ysvwk3jsmq4hlj4l3kasfc28lk1b3xaymf9dw48ac5j82"; - revision = "1"; - editedCabalFile = "06agyfnhr4cr42m4zj7xwl5an3skbjvba53a5i6sl9890gx7mml3"; + revision = "2"; + editedCabalFile = "1b98zf8c2mz7qrp24pyq6wqx5ljlckc7hyk62kiyj23svq7sxpzz"; libraryHaskellDepends = [ aeson base containers deepseq hashable lens newtype semialign semigroups these unordered-containers @@ -176885,6 +177441,46 @@ self: { license = stdenv.lib.licenses.agpl3Plus; }) {}; + "morloc" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , docopt, extra, filepath, haskell-src-meta, megaparsec, mtl + , parsec, partial-order, pretty-simple, prettyprinter + , prettyprinter-ansi-terminal, process, QuickCheck, raw-strings-qq + , safe, scientific, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, template-haskell, text, unordered-containers + , yaml + }: + mkDerivation { + pname = "morloc"; + version = "0.33.0"; + sha256 = "089p6hajqlzsgpgmn1s467c4m9d3d0h507vml6vvxlhlph1gda76"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory extra filepath + haskell-src-meta megaparsec mtl parsec partial-order pretty-simple + prettyprinter prettyprinter-ansi-terminal process raw-strings-qq + safe scientific template-haskell text unordered-containers yaml + ]; + executableHaskellDepends = [ + aeson base bytestring containers directory docopt extra filepath + haskell-src-meta megaparsec mtl parsec partial-order pretty-simple + prettyprinter prettyprinter-ansi-terminal process raw-strings-qq + safe scientific template-haskell text unordered-containers yaml + ]; + testHaskellDepends = [ + aeson base bytestring containers directory extra filepath + haskell-src-meta megaparsec mtl parsec partial-order pretty-simple + prettyprinter prettyprinter-ansi-terminal process QuickCheck + raw-strings-qq safe scientific tasty tasty-golden tasty-hunit + tasty-quickcheck template-haskell text unordered-containers yaml + ]; + description = "A multi-lingual, typed, workflow language"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "morph" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath , optparse-applicative, postgresql-simple, text, yaml @@ -176929,26 +177525,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "morpheus-graphql_0_15_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, megaparsec - , morpheus-graphql-core, mtl, scientific, tasty, tasty-hunit - , template-haskell, text, transformers, unliftio-core - , unordered-containers, uuid, vector, websockets + "morpheus-graphql_0_16_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers + , morpheus-graphql-core, morpheus-graphql-subscriptions, mtl + , relude, tasty, tasty-hunit, template-haskell, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "morpheus-graphql"; - version = "0.15.1"; - sha256 = "1vk1rzrham61pnn5c77rvrn0zb02hc1birxdnyz80sjdap5fk8in"; + version = "0.16.0"; + sha256 = "18sayr7avxdavppzj8nh3fli0cdryl4yyrzw8d38qk0p8hw84wgc"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base bytestring containers megaparsec morpheus-graphql-core - mtl scientific template-haskell text transformers unliftio-core - unordered-containers uuid vector websockets + aeson base bytestring containers morpheus-graphql-core mtl relude + template-haskell text transformers unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring containers megaparsec morpheus-graphql-core - mtl scientific tasty tasty-hunit template-haskell text transformers - unliftio-core unordered-containers uuid vector websockets + aeson base bytestring containers morpheus-graphql-core + morpheus-graphql-subscriptions mtl relude tasty tasty-hunit + template-haskell text transformers unordered-containers vector ]; description = "Morpheus GraphQL"; license = stdenv.lib.licenses.mit; @@ -176979,21 +177574,22 @@ self: { "morpheus-graphql-client" = callPackage ({ mkDerivation, aeson, base, bytestring, directory - , morpheus-graphql-core, mtl, tasty, tasty-hunit, template-haskell - , text, transformers, unordered-containers + , morpheus-graphql-core, mtl, relude, tasty, tasty-hunit + , template-haskell, text, transformers, unordered-containers }: mkDerivation { pname = "morpheus-graphql-client"; - version = "0.15.1"; - sha256 = "1gmyil518qjn5l30kljrm52fznkib1d1qyxnjhyb535jc9f44zhz"; + version = "0.16.0"; + sha256 = "1apm35yy1f1hkqihk4ilzzlg1p4fk13i7zmd7fkcd33aiajzw5mh"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base bytestring morpheus-graphql-core mtl template-haskell - text transformers unordered-containers + aeson base bytestring morpheus-graphql-core mtl relude + template-haskell text transformers unordered-containers ]; testHaskellDepends = [ - aeson base bytestring directory morpheus-graphql-core mtl tasty - tasty-hunit template-haskell text transformers unordered-containers + aeson base bytestring directory morpheus-graphql-core mtl relude + tasty tasty-hunit template-haskell text transformers + unordered-containers ]; description = "Morpheus GraphQL Client"; license = stdenv.lib.licenses.mit; @@ -177025,32 +177621,57 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "morpheus-graphql-core_0_15_1" = callPackage + "morpheus-graphql-core_0_16_0" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, hashable - , megaparsec, mtl, scientific, tasty, tasty-hunit, template-haskell - , text, th-lift-instances, transformers, unordered-containers - , vector + , megaparsec, mtl, relude, scientific, tasty, tasty-hunit + , template-haskell, text, th-lift-instances, transformers + , unordered-containers, vector }: mkDerivation { pname = "morpheus-graphql-core"; - version = "0.15.1"; - sha256 = "0nakm33ybrj8y3ci0a4697dvz8q38z17vr2mkcbm7h14h06kg8wr"; + version = "0.16.0"; + sha256 = "0c5gbqrxgib2irysmvl35j7ccz5fi1aqb3p3fyxkvcw44nnmkl5g"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base bytestring hashable megaparsec mtl scientific + aeson base bytestring hashable megaparsec mtl relude scientific template-haskell text th-lift-instances transformers unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring directory hashable megaparsec mtl scientific - tasty tasty-hunit template-haskell text th-lift-instances - transformers unordered-containers vector + aeson base bytestring directory hashable megaparsec mtl relude + scientific tasty tasty-hunit template-haskell text + th-lift-instances transformers unordered-containers vector ]; description = "Morpheus GraphQL Core"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "morpheus-graphql-subscriptions" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory + , morpheus-graphql-core, mtl, relude, tasty, tasty-hunit, text + , transformers, unliftio-core, unordered-containers, uuid + , websockets + }: + mkDerivation { + pname = "morpheus-graphql-subscriptions"; + version = "0.16.0"; + sha256 = "1bilw276nlzx9fqcc6g5cmnf4jws17v7djz1m8n184a1skxbd02l"; + libraryHaskellDepends = [ + aeson base bytestring morpheus-graphql-core mtl relude text + transformers unliftio-core unordered-containers uuid websockets + ]; + testHaskellDepends = [ + aeson base bytestring directory morpheus-graphql-core mtl relude + tasty tasty-hunit text transformers unliftio-core + unordered-containers uuid websockets + ]; + description = "Morpheus GraphQL Subscriptions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "morphisms" = callPackage ({ mkDerivation }: mkDerivation { @@ -180573,8 +181194,8 @@ self: { }: mkDerivation { pname = "mysql-haskell"; - version = "0.8.4.2"; - sha256 = "1lg9w9kwjnrx948r24flw0yjwxc8f93ygg45dl2djk4kfxdfnlaz"; + version = "0.8.4.3"; + sha256 = "1gjq8spl6s05kcckw78d1wi2k8blr25mbvicd1kwr653lj2d3w74"; libraryHaskellDepends = [ base binary binary-ieee754 binary-parsers blaze-textual bytestring bytestring-lexing cryptonite io-streams memory monad-loops network @@ -180612,8 +181233,8 @@ self: { }: mkDerivation { pname = "mysql-haskell-openssl"; - version = "0.8.3.0"; - sha256 = "0pm5vd2gpb1x68n2i5brvspngfplp283jlw9a351z2yrnpwmwd24"; + version = "0.8.3.1"; + sha256 = "1fq1990423is1zmyd3qa6dxyyj5ackrgsr9i3wvzkw3xys472j2w"; libraryHaskellDepends = [ base binary HsOpenSSL mysql-haskell tcp-streams tcp-streams-openssl wire-streams @@ -190452,8 +191073,8 @@ self: { ({ mkDerivation, base, mtl }: mkDerivation { pname = "optparse-declarative"; - version = "0.3.1"; - sha256 = "1s3bkkn5a8bgkbqdsf5ir18r0j0r2r0agz04q2ccafd26d8xdx2s"; + version = "0.4.1"; + sha256 = "0paa7r64y0nb9yv3x387pdid68lnc1gn2m28kcli55dvh1x4wwxr"; libraryHaskellDepends = [ base mtl ]; description = "Declarative command line option parser"; license = stdenv.lib.licenses.mit; @@ -190582,8 +191203,6 @@ self: { ]; description = "Types and functions for Kepler orbits"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "orc" = callPackage @@ -191088,6 +191707,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ormolu_0_1_3_1" = callPackage + ({ mkDerivation, base, bytestring, containers, dlist, exceptions + , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl + , optparse-applicative, path, path-io, syb, text + }: + mkDerivation { + pname = "ormolu"; + version = "0.1.3.1"; + sha256 = "1qad2s270rhgm2chhrmjd5zsv6bqykba978vn0hakm29mgck2zgw"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers dlist exceptions ghc-lib-parser mtl syb + text + ]; + executableHaskellDepends = [ + base ghc-lib-parser gitrev optparse-applicative text + ]; + testHaskellDepends = [ + base containers filepath hspec path path-io text + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "orthotope" = callPackage ({ mkDerivation, base, deepseq, dlist, HUnit, pretty, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -192091,7 +192738,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_11_0_4" = callPackage + "pandoc_2_11_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions @@ -192110,8 +192757,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.11.0.4"; - sha256 = "18nqdhvk0rgrzmbhab9vb05g8w9hvwx0ncf5cqp5ijxycilcskb8"; + version = "2.11.1"; + sha256 = "0gvpal4v92x8vscmm5h3jjlx9q03a4qbz0zwcbw24y02xmaz09d8"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -192292,6 +192939,17 @@ self: { broken = true; }) {}; + "pandoc-dhall-decoder" = callPackage + ({ mkDerivation, base, dhall, either, pandoc, text }: + mkDerivation { + pname = "pandoc-dhall-decoder"; + version = "0.1.0.1"; + sha256 = "032fx8fy134hysg10y5c57c7jkvq8lkc0q2r8ylc54qbfmvqd820"; + libraryHaskellDepends = [ base dhall either pandoc text ]; + description = "Decodes pandoc to dhall"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pandoc-emphasize-code" = callPackage ({ mkDerivation, base, filepath, hashable, lucid, mtl, pandoc-types , process, semigroups, tasty, tasty-discover, tasty-hspec @@ -194932,15 +195590,15 @@ self: { }: mkDerivation { pname = "patch"; - version = "0.0.3.1"; - sha256 = "1dkms6ngr01d4gvyjbl6z30b6qz4cnxnh0y7advrc9fib0237gnl"; + version = "0.0.3.2"; + sha256 = "1b819d1iramxb0sf0zm4ry8mrd74y35iffbb6qys3a2xq1d382xa"; libraryHaskellDepends = [ base constraints-extras containers dependent-map dependent-sum lens monoidal-containers semialign semigroupoids these transformers witherable ]; testHaskellDepends = [ base directory filemanip filepath hlint ]; - description = "Infrastructure for writing patches which act on other types"; + description = "Data structures for describing changes to other data structures"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -197017,6 +197675,34 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent_2_11_0_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , blaze-html, bytestring, conduit, containers, fast-logger, hspec + , http-api-data, monad-logger, mtl, path-pieces, resource-pool + , resourcet, scientific, silently, text, time, transformers + , unliftio, unliftio-core, unordered-containers, vector + }: + mkDerivation { + pname = "persistent"; + version = "2.11.0.1"; + sha256 = "0nmgjk5jpsh7dxwyghvmnislxj8m77sdp9hg6anh7ba94xs7wcjv"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + conduit containers fast-logger http-api-data monad-logger mtl + path-pieces resource-pool resourcet scientific silently text time + transformers unliftio unliftio-core unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + containers hspec http-api-data path-pieces scientific text time + transformers unordered-containers vector + ]; + description = "Type-safe, multi-backend data serialization"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "persistent-audit" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , getopt-generics, hashable, hspec, mongoDB, persistent @@ -197229,10 +197915,8 @@ self: { }: mkDerivation { pname = "persistent-mongoDB"; - version = "2.10.0.1"; - sha256 = "194cxlxyaxwzgm7a7q8530bh842s5s1vmq33pclldp78nfy1dczm"; - revision = "1"; - editedCabalFile = "084gdbb25qn2cw0qz20hksr9ypf401iwwx2kysibi0y4zxvpcy2z"; + version = "2.11.0.0"; + sha256 = "19szqr1f028hqhzigvb7sa6r2vm8q9pi5fhvx483ag0agcypmhhb"; libraryHaskellDepends = [ aeson base bson bytestring cereal conduit http-api-data mongoDB network path-pieces persistent resource-pool resourcet text time @@ -197276,6 +197960,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "persistent-mysql_2_10_3" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit + , containers, fast-logger, hspec, HUnit, monad-logger, mysql + , mysql-simple, persistent, persistent-qq, persistent-template + , persistent-test, QuickCheck, quickcheck-instances, resource-pool + , resourcet, text, time, transformers, unliftio-core + }: + mkDerivation { + pname = "persistent-mysql"; + version = "2.10.3"; + sha256 = "1da2vbkz55lngpi5ggndnnxv8gm9ckcv3gd3y8z47yh129b04csk"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring conduit containers monad-logger + mysql mysql-simple persistent resource-pool resourcet text + transformers unliftio-core + ]; + testHaskellDepends = [ + base bytestring containers fast-logger hspec HUnit monad-logger + mysql persistent persistent-qq persistent-template persistent-test + QuickCheck quickcheck-instances resourcet text time transformers + unliftio-core + ]; + description = "Backend for the persistent library using MySQL database server"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-mysql-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , fast-logger, hspec, HUnit, io-streams, monad-logger @@ -197375,6 +198086,8 @@ self: { pname = "persistent-postgresql"; version = "2.10.1.2"; sha256 = "1q7n0h16argvpw2y3f8mxzmvy24q6if46ab9nvybviki283zbvlb"; + revision = "1"; + editedCabalFile = "0vzm2d9smg9zvskaz3dv7c90d14pb0as7qpnsnvswhh8vn0862g3"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-logger persistent postgresql-libpq postgresql-simple resource-pool @@ -197391,6 +198104,37 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "persistent-postgresql_2_11_0_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring + , conduit, containers, fast-logger, hspec, hspec-expectations + , HUnit, monad-logger, mtl, persistent, persistent-qq + , persistent-template, persistent-test, postgresql-libpq + , postgresql-simple, QuickCheck, quickcheck-instances + , resource-pool, resourcet, string-conversions, text, time + , transformers, unliftio-core, unordered-containers, vector + }: + mkDerivation { + pname = "persistent-postgresql"; + version = "2.11.0.0"; + sha256 = "12h72dj6zmk8m45m62syc3inwvqgb03whymi7wds0aklzn4j83b4"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder bytestring conduit containers + monad-logger mtl persistent postgresql-libpq postgresql-simple + resource-pool resourcet string-conversions text time transformers + unliftio-core + ]; + testHaskellDepends = [ + aeson base bytestring containers fast-logger hspec + hspec-expectations HUnit monad-logger persistent persistent-qq + persistent-template persistent-test QuickCheck quickcheck-instances + resourcet text time transformers unliftio-core unordered-containers + vector + ]; + description = "Backend for the persistent library using postgresql"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-protobuf" = callPackage ({ mkDerivation, base, bytestring, persistent, protocol-buffers , protocol-buffers-descriptor, template-haskell, text @@ -197570,6 +198314,8 @@ self: { pname = "persistent-sqlite"; version = "2.10.6.2"; sha256 = "0l6287ni2ksi8l8kv6gbsyjxhjpcqn6a1gw577ii7fixbyvbpbnf"; + revision = "1"; + editedCabalFile = "1kg5cikbw7mpdzwc1f1kfxwjq7q2raqdxsdq5rb65rk87wl3fih5"; configureFlags = [ "-fsystemlib" ]; isLibrary = true; isExecutable = true; @@ -197590,6 +198336,39 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {inherit (pkgs) sqlite;}; + "persistent-sqlite_2_11_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , exceptions, fast-logger, hspec, HUnit, microlens-th, monad-logger + , persistent, persistent-template, persistent-test, QuickCheck + , resource-pool, resourcet, sqlite, system-fileio, system-filepath + , temporary, text, time, transformers, unliftio-core + , unordered-containers + }: + mkDerivation { + pname = "persistent-sqlite"; + version = "2.11.0.0"; + sha256 = "1kfijsn00brqm42ypaa66bmwq41r9n6h66r6jmgldhzpcbv46sfv"; + configureFlags = [ "-fsystemlib" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers microlens-th monad-logger + persistent resource-pool resourcet text time transformers + unliftio-core unordered-containers + ]; + librarySystemDepends = [ sqlite ]; + testHaskellDepends = [ + base bytestring containers exceptions fast-logger hspec HUnit + monad-logger persistent persistent-template persistent-test + QuickCheck resourcet system-fileio system-filepath temporary text + time transformers unliftio-core + ]; + description = "Backend for the persistent library using sqlite3"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {inherit (pkgs) sqlite;}; + "persistent-template" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, deepseq-generics, file-embed, hspec, http-api-data @@ -197601,8 +198380,8 @@ self: { pname = "persistent-template"; version = "2.8.2.3"; sha256 = "1y96aj5i3c1j2ls6980l8lfjj9b3vfmp3766xk5af1870vj1s1lf"; - revision = "1"; - editedCabalFile = "0ilgcn3k72b2zm53yy4na4y0f8xfrlw6s5w3xhhavg6blyw971j7"; + revision = "2"; + editedCabalFile = "0n0zr4fxzrgdbgl26mikfl9hyn0269isblrr9rj3i045p96a0y5s"; libraryHaskellDepends = [ aeson base bytestring containers http-api-data monad-control monad-logger path-pieces persistent template-haskell text @@ -197620,7 +198399,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent-template_2_9" = callPackage + "persistent-template_2_9_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, deepseq-generics, file-embed, hspec, http-api-data , monad-control, monad-logger, path-pieces, persistent, QuickCheck @@ -197629,8 +198408,8 @@ self: { }: mkDerivation { pname = "persistent-template"; - version = "2.9"; - sha256 = "181ag017wj41pzlc954mcx7s7v1dnqgjnry03hly8zln4iii63yw"; + version = "2.9.1.0"; + sha256 = "19ilgz8r6p5wy111rb4v0d6cnrj8jfiv2pnzdynpxd9ay66vgbca"; libraryHaskellDepends = [ aeson base bytestring containers http-api-data monad-control monad-logger path-pieces persistent template-haskell text @@ -197694,7 +198473,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "persistent-test_2_0_3_3" = callPackage + "persistent-test_2_0_3_5" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit , containers, exceptions, hspec, hspec-expectations, HUnit , monad-control, monad-logger, mtl, path-pieces, persistent @@ -197704,8 +198483,8 @@ self: { }: mkDerivation { pname = "persistent-test"; - version = "2.0.3.3"; - sha256 = "0ry6inln7grmcj58k3sfjid24069n4kmph6sikvm352b9ffw6h5x"; + version = "2.0.3.5"; + sha256 = "16m3nlmpwxibfhgrfl3xqh3a518bkrd7qaa8hklfq2qwlvjbb31v"; libraryHaskellDepends = [ aeson base blaze-html bytestring conduit containers exceptions hspec hspec-expectations HUnit monad-control monad-logger mtl @@ -198345,13 +199124,58 @@ self: { ({ mkDerivation, base, subG, vector }: mkDerivation { pname = "phonetic-languages-common"; - version = "0.1.0.0"; - sha256 = "12al80szl9mxapwq6b0kp6bnhnwqxjqzyf72ycxvpx1xlppsfza9"; + version = "0.1.1.0"; + sha256 = "08i9g7yaiwryy9ndd0adbl3cskqva71mi45x55knc6r9wdhnprph"; libraryHaskellDepends = [ base subG vector ]; description = "A generalization of the uniqueness-periods-vector-common package"; license = stdenv.lib.licenses.mit; }) {}; + "phonetic-languages-examples" = callPackage + ({ mkDerivation, base, parallel, phonetic-languages-common + , phonetic-languages-general, phonetic-languages-plus + , phonetic-languages-properties, phonetic-languages-ukrainian + , phonetic-languages-vector, print-info, subG + , ukrainian-phonetics-basic, uniqueness-periods-vector-filters + , uniqueness-periods-vector-stats, vector + }: + mkDerivation { + pname = "phonetic-languages-examples"; + version = "0.1.1.0"; + sha256 = "1i95kglsif5zd5k7yri69mwh8n3a63cqwh3kvn91qpyxqf8zgdzz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base phonetic-languages-common phonetic-languages-properties + phonetic-languages-vector vector + ]; + executableHaskellDepends = [ + base parallel phonetic-languages-common phonetic-languages-general + phonetic-languages-plus phonetic-languages-properties + phonetic-languages-ukrainian phonetic-languages-vector print-info + subG ukrainian-phonetics-basic uniqueness-periods-vector-filters + uniqueness-periods-vector-stats vector + ]; + description = "A generalization of the uniqueness-periods-vector-examples functionality"; + license = stdenv.lib.licenses.mit; + }) {}; + + "phonetic-languages-general" = callPackage + ({ mkDerivation, base, phonetic-languages-common + , phonetic-languages-plus, print-info, subG, vector + }: + mkDerivation { + pname = "phonetic-languages-general"; + version = "0.1.0.0"; + sha256 = "1vv1n58npgwy1shp7xhm48fdqm9a8kqb3lbqkl0sn7qwkph5x53k"; + libraryHaskellDepends = [ + base phonetic-languages-common phonetic-languages-plus print-info + subG vector + ]; + description = "A generalization of the uniqueness-periods-vector-general functionality"; + license = stdenv.lib.licenses.mit; + }) {}; + "phonetic-languages-plus" = callPackage ({ mkDerivation, base, bytestring, lists-flines, parallel , uniqueness-periods-vector-stats @@ -198371,6 +199195,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "phonetic-languages-properties" = callPackage + ({ mkDerivation, base, phonetic-languages-common + , phonetic-languages-rhythmicity, phonetic-languages-vector + , ukrainian-phonetics-basic, vector + }: + mkDerivation { + pname = "phonetic-languages-properties"; + version = "0.1.1.0"; + sha256 = "1c312i66rpwxfk34rpzh8ai3m4lbxwj4ayqh1vzbj17mciachaqf"; + libraryHaskellDepends = [ + base phonetic-languages-common phonetic-languages-rhythmicity + phonetic-languages-vector ukrainian-phonetics-basic vector + ]; + description = "A generalization of the uniqueness-periods-vector-properties package"; + license = stdenv.lib.licenses.mit; + }) {}; + "phonetic-languages-rhythmicity" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -201601,6 +202442,39 @@ self: { broken = true; }) {}; + "poke" = callPackage + ({ mkDerivation, base, calamity, dhall, di, di-polysemy + , generic-lens, hspec, hspec-megaparsec, megaparsec, polysemy + , polysemy-plugin, text, text-show, unboxing-vector + , unordered-containers, vector + }: + mkDerivation { + pname = "poke"; + version = "0.0.0.1"; + sha256 = "0y63j8pv482f92nmk2x7f8kfkvrqbq9bz2vi9br6hpk4612vas4c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base calamity dhall di di-polysemy generic-lens hspec + hspec-megaparsec megaparsec polysemy polysemy-plugin text text-show + unboxing-vector unordered-containers vector + ]; + executableHaskellDepends = [ + base calamity dhall di di-polysemy generic-lens hspec + hspec-megaparsec megaparsec polysemy polysemy-plugin text text-show + unboxing-vector unordered-containers vector + ]; + testHaskellDepends = [ + base calamity dhall di di-polysemy generic-lens hspec + hspec-megaparsec megaparsec polysemy polysemy-plugin text text-show + unboxing-vector unordered-containers vector + ]; + description = "Discord verification bot"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "pokemon-go-protobuf-types" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , lens-family, proto-lens, text @@ -202012,6 +202886,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "polysemy_1_4_0_0" = callPackage + ({ mkDerivation, async, base, Cabal, cabal-doctest, containers + , criterion, doctest, first-class-families, free, freer-simple + , hspec, hspec-discover, inspection-testing, mtl, QuickCheck, stm + , syb, template-haskell, th-abstraction, transformers, type-errors + , type-errors-pretty, unagi-chan + }: + mkDerivation { + pname = "polysemy"; + version = "1.4.0.0"; + sha256 = "1zbfx3l390kqxq45lb1wms72cxckwh3sl7vk52q68d0l7j5cvn8n"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + async base containers first-class-families mtl QuickCheck stm syb + template-haskell th-abstraction transformers type-errors + type-errors-pretty unagi-chan + ]; + testHaskellDepends = [ + async base containers doctest first-class-families hspec + inspection-testing mtl QuickCheck stm syb template-haskell + th-abstraction transformers type-errors type-errors-pretty + unagi-chan + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + async base containers criterion first-class-families free + freer-simple mtl QuickCheck stm syb template-haskell th-abstraction + transformers type-errors type-errors-pretty unagi-chan + ]; + description = "Higher-order, low-boilerplate free monads"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "polysemy-RandomFu" = callPackage ({ mkDerivation, base, hspec, hspec-discover, polysemy , polysemy-plugin, polysemy-zoo, random-fu, random-source, text @@ -202064,13 +202972,30 @@ self: { pname = "polysemy-extra"; version = "0.1.0.0"; sha256 = "1y5k935jh6dfs87kdih1ibb61ljkp39wyrkg1n2zss020cdhbi7g"; + revision = "1"; + editedCabalFile = "0nh9laqwr40dhkh0806v748zqg61agmv3ih4fyidzr9h30lcl0q8"; libraryHaskellDepends = [ base containers polysemy polysemy-zoo ]; - description = "Run a KVStore as a filesystem in polysemy"; + description = "Extra transformations functions for polysemy"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; + "polysemy-fs" = callPackage + ({ mkDerivation, base, bytestring, path, polysemy, rio, temporary + , text, unliftio-path + }: + mkDerivation { + pname = "polysemy-fs"; + version = "0.1.0.0"; + sha256 = "16lf6a5ypf5injdl8aljrnrdrfz21b0rhcmypx5ngvw1k2mgh6zl"; + libraryHaskellDepends = [ + base bytestring path polysemy rio temporary text unliftio-path + ]; + description = "Low level filesystem operations for polysemy"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "polysemy-fskvstore" = callPackage ({ mkDerivation, base, bytestring, path, polysemy, polysemy-zoo , rio, unliftio-path @@ -202141,13 +203066,15 @@ self: { }) {}; "polysemy-methodology" = callPackage - ({ mkDerivation, base, polysemy, polysemy-plugin, polysemy-zoo }: + ({ mkDerivation, base, co-log-polysemy, polysemy, polysemy-plugin + , polysemy-zoo + }: mkDerivation { pname = "polysemy-methodology"; - version = "0.1.2.1"; - sha256 = "0is4jnmfn2gx78ijxwvhm8qwk2gqz31hh9pg5r8y43hyx7im40ay"; + version = "0.1.5.0"; + sha256 = "1gi2rjf1vgcamjyqqi4wnasv9i5yaazlh14hbjspvsyv8h2zyl4i"; libraryHaskellDepends = [ - base polysemy polysemy-plugin polysemy-zoo + base co-log-polysemy polysemy polysemy-plugin polysemy-zoo ]; description = "Domain modelling algebra for polysemy"; license = stdenv.lib.licenses.mit; @@ -202168,6 +203095,23 @@ self: { broken = true; }) {}; + "polysemy-path" = callPackage + ({ mkDerivation, base, path, polysemy, polysemy-plugin + , polysemy-zoo + }: + mkDerivation { + pname = "polysemy-path"; + version = "0.0.1.0"; + sha256 = "12iw6qq1pigvvb0bnbkxz7gdmr4z609vqdsn5sxzh5va02dn1r57"; + libraryHaskellDepends = [ + base path polysemy polysemy-plugin polysemy-zoo + ]; + description = "Polysemy versions of Path functions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "polysemy-plugin" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest , ghc, ghc-tcplugins-extra, hspec, hspec-discover @@ -202176,8 +203120,8 @@ self: { }: mkDerivation { pname = "polysemy-plugin"; - version = "0.2.5.1"; - sha256 = "14iz5p5g57ki9lbjyy8i3lx7xk2qmrc8dqkd94jrbilsvn4m5gf3"; + version = "0.2.5.2"; + sha256 = "13qfbgwn187vgdqs2rkl5lhcfbaw992qnlpz90pr9nw64k2ylcmp"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers ghc ghc-tcplugins-extra polysemy syb transformers @@ -202268,8 +203212,8 @@ self: { }: mkDerivation { pname = "polysemy-video"; - version = "0.1.1.0"; - sha256 = "1f8fzhxjg3cpqb8sdrdl8mx9dwas5l32aw98s5m2p4xv1amnjl39"; + version = "0.1.2.0"; + sha256 = "1q6acrcxin32ykhzrmd562xb45d972c37sqydh9mz1xp49764fy9"; libraryHaskellDepends = [ base formatting path path-utils polysemy text turtle ]; @@ -203101,6 +204045,8 @@ self: { ]; description = "posix bindings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) systemd;}; "posix-error-codes" = callPackage @@ -203547,6 +204493,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) postgresql;}; + "postgresql-libpq_0_9_4_3" = callPackage + ({ mkDerivation, base, bytestring, Cabal, postgresql, unix }: + mkDerivation { + pname = "postgresql-libpq"; + version = "0.9.4.3"; + sha256 = "1gfnhc5pibn7zmifdf2g0c112xrpzsk756ln2kjzqljkspf4dqp3"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base bytestring unix ]; + librarySystemDepends = [ postgresql ]; + testHaskellDepends = [ base bytestring ]; + description = "low-level binding to libpq"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) postgresql;}; + "postgresql-libpq-notify" = callPackage ({ mkDerivation, async, base, hspec, postgres-options , postgresql-libpq, stm, text, tmp-postgres @@ -204904,28 +205865,26 @@ self: { ({ mkDerivation, aeson, aeson-pretty, base, binary, bytestring , comonad, constraints, containers, deepseq, directory, doctest , hashable, lens, lens-action, pcre-heavy, pcre-light - , pretty-terminal, QuickCheck, random, safe, stm - , string-conversions, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, text, th-lift, these, time + , pretty-terminal, QuickCheck, safe, stm, string-conversions, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, text, th-lift + , th-lift-instances, these, time }: mkDerivation { pname = "predicate-typed"; - version = "0.7.4.0"; - sha256 = "04vxyw4bgzbkk56dw7p8b4x12m4wymxwh83537hvphdv9qj71ph9"; - revision = "1"; - editedCabalFile = "064zfd03nw1bd0p8vwymk0kscbpvxrgzbwmqys3ys1rqzjpnfdrp"; + version = "0.7.4.2"; + sha256 = "0n1r8ysjyc61pr107y5kkarc30crjzps865kx9k25kjcmk5ynlgz"; libraryHaskellDepends = [ aeson aeson-pretty base binary bytestring comonad constraints containers deepseq directory hashable lens lens-action pcre-heavy - pcre-light pretty-terminal QuickCheck random safe - string-conversions template-haskell text th-lift these time + pcre-light pretty-terminal QuickCheck safe string-conversions + template-haskell text th-lift th-lift-instances these time ]; testHaskellDepends = [ aeson aeson-pretty base binary bytestring comonad constraints containers deepseq directory doctest hashable lens lens-action - pcre-heavy pcre-light pretty-terminal QuickCheck random safe stm + pcre-heavy pcre-light pretty-terminal QuickCheck safe stm string-conversions tasty tasty-hunit tasty-quickcheck - template-haskell text th-lift these time + template-haskell text th-lift th-lift-instances these time ]; description = "Predicates, Refinement types and Dsl"; license = stdenv.lib.licenses.bsd3; @@ -206150,6 +207109,8 @@ self: { testHaskellDepends = [ base primitive primitive-unlifted ]; description = "Wrappers for primops around atomic operations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "primitive-checked" = callPackage @@ -206186,6 +207147,8 @@ self: { ]; description = "containers backed by arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "primitive-convenience" = callPackage @@ -206219,6 +207182,8 @@ self: { ]; description = "Extras for the \"primitive\" library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "primitive-foreign" = callPackage @@ -206311,6 +207276,8 @@ self: { benchmarkHaskellDepends = [ base gauge ghc-prim primitive random ]; description = "Sort primitive arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "primitive-stablename" = callPackage @@ -206339,15 +207306,24 @@ self: { }) {}; "primitive-unlifted" = callPackage - ({ mkDerivation, base, bytestring, primitive, stm, text-short }: + ({ mkDerivation, array, base, bytestring, primitive, QuickCheck + , quickcheck-classes-base, stm, tasty, tasty-quickcheck, text-short + }: mkDerivation { pname = "primitive-unlifted"; - version = "0.1.3.0"; - sha256 = "1q7scarsdv51x74g6ahvc5znk9h628s984a7bawig0lnx67wzwih"; - libraryHaskellDepends = [ base bytestring primitive text-short ]; - testHaskellDepends = [ base primitive stm ]; + version = "1.0.0.0"; + sha256 = "07b53730nxzqyhac71xxijg598304ppb7wa8lfhw1glicj9h0wad"; + libraryHaskellDepends = [ + array base bytestring primitive text-short + ]; + testHaskellDepends = [ + base primitive QuickCheck quickcheck-classes-base stm tasty + tasty-quickcheck + ]; description = "Primitive GHC types with unlifted types inside"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "primula-board" = callPackage @@ -207595,16 +208571,16 @@ self: { }) {}; "prolude" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, mongoDB - , safe-exceptions, scientific, text, time, vector + ({ mkDerivation, aeson, base, bytestring, cassava, containers + , mongoDB, safe-exceptions, scientific, text, time, vector }: mkDerivation { pname = "prolude"; - version = "0.0.0.4"; - sha256 = "147kn423jxc4rcb4vbsj7av8pxdz8lgcgblbmrvq821h26vgc1ai"; + version = "0.0.0.6"; + sha256 = "1f3apqs82lv7fq69mjqycs8ynj3hhprg1rrclvs3yix2lc3465vf"; libraryHaskellDepends = [ - aeson base bytestring containers mongoDB safe-exceptions scientific - text time vector + aeson base bytestring cassava containers mongoDB safe-exceptions + scientific text time vector ]; description = "ITProTV's custom prelude"; license = stdenv.lib.licenses.mit; @@ -208421,8 +209397,8 @@ self: { }: mkDerivation { pname = "protocol-buffers"; - version = "2.4.13"; - sha256 = "0xwfb2bkh4nd34s24q786ph4zyrnnl3bcry2kqx3sw20yk3zfdsc"; + version = "2.4.17"; + sha256 = "027y1xfk93119d6xfzj0a9n77bdqzkxfp05hz9bn0hyf33lb4jzb"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers directory filepath mtl parsec syb text utf8-string vector @@ -208437,8 +209413,10 @@ self: { ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; - version = "2.4.13"; - sha256 = "1c3aiysjlk7r02l5902iq020iasiswk9c1mvf4f9h1yijba4x4fp"; + version = "2.4.17"; + sha256 = "1dir8v79hzc8smlf405a8m3y5jhjqiphj2jm6rbshd1vg6l3vjia"; + revision = "1"; + editedCabalFile = "0zin8qqvb1hg5kq2s17rkik55pjnws556xflg76x1xrqkyivhqlg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers protocol-buffers @@ -211229,7 +212207,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "quickcheck-instances_0_3_24" = callPackage + "quickcheck-instances_0_3_25" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive , containers, data-fix, hashable, integer-logarithms, old-time , QuickCheck, scientific, splitmix, strict, tagged, text, these @@ -211238,8 +212216,8 @@ self: { }: mkDerivation { pname = "quickcheck-instances"; - version = "0.3.24"; - sha256 = "0jvb3d43hc1sa8aal1gjpwmrh65mswi72yssb98bj5hca4z8grk5"; + version = "0.3.25"; + sha256 = "08lp5fwmhj1ld9zmhxv6aiqc7668nlkz0ckykgp57bv0i6sh4n7q"; libraryHaskellDepends = [ array base bytestring case-insensitive containers data-fix hashable integer-logarithms old-time QuickCheck scientific splitmix strict @@ -215367,8 +216345,8 @@ self: { ({ mkDerivation, base, composition-prelude }: mkDerivation { pname = "recursion"; - version = "2.2.4.2"; - sha256 = "15ahlgm0dilapk0y5jhwdvrims7nyzdsbdccq4x9jj0ddsszqr02"; + version = "2.2.4.3"; + sha256 = "0k5as7i7xyas6qhpr7wpnnf0rc93nsh4s9gsxdsk72xkwd86chkj"; libraryHaskellDepends = [ base composition-prelude ]; description = "A recursion schemes library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -215590,8 +216568,8 @@ self: { }: mkDerivation { pname = "redis-io"; - version = "1.0.0"; - sha256 = "119qga77xv0kq6cppgz6ry3f1ql4slswqwqg7qyiyg639sli9nfp"; + version = "1.1.0"; + sha256 = "0q2gr8sbxxpfx2qn9qmyxiwjj4nx32zmx4lv7g2vfmkj329crrdd"; libraryHaskellDepends = [ attoparsec auto-update base bytestring containers exceptions iproute monad-control mtl network operational redis-resp @@ -216065,7 +217043,7 @@ self: { , constraints-extras, containers, criterion, data-default, deepseq , dependent-map, dependent-sum, directory, exception-transformers , filemanip, filepath, haskell-src-exts, haskell-src-meta, hlint - , hspec, lens, loch-th, MemoTrie, monad-control + , hspec, lens, loch-th, MemoTrie, mmorph, monad-control , monoidal-containers, mtl, patch, prim-uniq, primitive, process , proctest, profunctors, random, ref-tf, reflection, semialign , semigroupoids, split, stm, syb, template-haskell, text, these @@ -216073,15 +217051,16 @@ self: { }: mkDerivation { pname = "reflex"; - version = "0.7.1.0"; - sha256 = "0qxxhgkh3cv3fzxd9pgy78kxhi9b4q72jcq4n002h9qh8i6wwp7a"; + version = "0.8.0.0"; + sha256 = "14pw033ljs6x5bi5657cm5lpwwj6gkfgskbv5lpdi2hp7svzayql"; libraryHaskellDepends = [ base bifunctors comonad constraints-extras containers data-default dependent-map dependent-sum exception-transformers haskell-src-exts - haskell-src-meta lens MemoTrie monad-control monoidal-containers - mtl patch prim-uniq primitive profunctors random ref-tf reflection - semialign semigroupoids stm syb template-haskell these time - transformers unbounded-delays witherable + haskell-src-meta lens MemoTrie mmorph monad-control + monoidal-containers mtl patch prim-uniq primitive profunctors + random ref-tf reflection semialign semigroupoids stm syb + template-haskell these time transformers unbounded-delays + witherable ]; testHaskellDepends = [ base bifunctors constraints constraints-extras containers deepseq @@ -216192,8 +217171,8 @@ self: { }: mkDerivation { pname = "reflex-dom"; - version = "0.6.0.0"; - sha256 = "1iimsk89akb7v2i1k1gaa6a6bhdyf2rsggac9k1xizxkylara5k4"; + version = "0.6.1.0"; + sha256 = "190g56y16xvj508qdp3znlbbv4gb3ska38jbjpblvq8cz2d4nkdc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -216256,8 +217235,8 @@ self: { }: mkDerivation { pname = "reflex-dom-core"; - version = "0.6.0.0"; - sha256 = "0819858z5p6847ac1rb1hsfr5ikn7x5xii8vgqbih4fg39mqfy14"; + version = "0.6.1.0"; + sha256 = "072bkjjmz6mjw42gchlbswhjhr9xs0vaybf6mvdycs618lb1zhf0"; libraryHaskellDepends = [ aeson base bifunctors bimap blaze-builder bytestring case-insensitive constraints containers contravariant data-default @@ -216342,8 +217321,8 @@ self: { }: mkDerivation { pname = "reflex-dom-retractable"; - version = "0.1.3.0"; - sha256 = "0l2nz78cjx0p03h0h9pflhfd59p2j4drsglsm9yxys0zglbxnqwl"; + version = "0.1.6.0"; + sha256 = "0xmxbyf72jnlyyr1iqgms43has4z3qv7ini5jrn1xkyhjmdanrcw"; libraryHaskellDepends = [ base containers jsaddle mtl ref-tf reflex reflex-dom ]; @@ -216400,27 +217379,53 @@ self: { }: mkDerivation { pname = "reflex-fsnotify"; - version = "0.2.1.1"; - sha256 = "0r7fv01dgg5l45yspgj3n2gh6yq0qkjv19hj9vq6284x04vldnqj"; + version = "0.2.1.2"; + sha256 = "1g5zm12ypqr0agrgmbyglhh5f9p933hba2dismbyywsgdmn1i9bl"; libraryHaskellDepends = [ base containers directory filepath fsnotify reflex ]; - description = "reflex-frp interface for watching files"; + description = "Reflex FRP interface for watching files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "reflex-gadt-api" = callPackage + ({ mkDerivation, aeson, aeson-gadt-th, base, bytestring + , constraints, constraints-extras, containers, data-default + , dependent-sum, jsaddle, reflex, reflex-dom-core, text, time + }: + mkDerivation { + pname = "reflex-gadt-api"; + version = "0.2.0.1"; + sha256 = "0lyzabjyx1fyxrkxpmzhwhkpph9358hw7bpnmsppvwsdaq3m1yqq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-gadt-th base bytestring constraints constraints-extras + containers data-default dependent-sum jsaddle reflex + reflex-dom-core text time + ]; + executableHaskellDepends = [ + aeson aeson-gadt-th base constraints-extras reflex-dom-core text + time + ]; + description = "Interact with a GADT API in your reflex-dom application"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; "reflex-ghci" = callPackage - ({ mkDerivation, base, bytestring, dependent-sum, directory - , filepath, fsnotify, mtl, optparse-applicative, primitive, process - , ref-tf, reflex, reflex-fsnotify, reflex-process, reflex-vty - , regex-tdfa, temporary, text, unix, vty + ({ mkDerivation, base, bytestring, directory, filepath, fsnotify + , optparse-applicative, process, reflex, reflex-fsnotify + , reflex-process, reflex-vty, regex-tdfa, temporary, text, unix + , vty }: mkDerivation { pname = "reflex-ghci"; - version = "0.1.4.1"; - sha256 = "0505glpxc6yf7nwkgz9l2m8diqm39sal7vg9h1g8f8i3x6ab1rw3"; + version = "0.1.5.1"; + sha256 = "1m4sphj2qhj9ckjxjy6m4yzb2d6lq68a0fynv5q9ibc6550bm1sx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -216432,8 +217437,7 @@ self: { text vty ]; testHaskellDepends = [ - base bytestring dependent-sum directory mtl primitive process - ref-tf reflex reflex-process reflex-vty temporary text + base directory process reflex reflex-process temporary ]; description = "A GHCi widget library for use in reflex applications"; license = stdenv.lib.licenses.bsd3; @@ -216547,8 +217551,8 @@ self: { }: mkDerivation { pname = "reflex-process"; - version = "0.3.0.0"; - sha256 = "1hfzp0hnqhpdcri6qqqbndl3nlf028hn78kmdc6h1mzwx5va7rh5"; + version = "0.3.1.0"; + sha256 = "1z86h7wkzg69d6kw0y37pzr4ldpg9qkl8wx5mw7r1h82isb9wgbl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -216561,7 +217565,7 @@ self: { async base bytestring containers dependent-sum hspec mtl primitive process ref-tf reflex unix ]; - description = "reflex-frp interface for running shell commands"; + description = "Reflex FRP interface for running system processes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -216635,8 +217639,10 @@ self: { }: mkDerivation { pname = "reflex-vty"; - version = "0.1.4.0"; - sha256 = "0z4yca6hh5rwgybsf6ssklhvpl34ikvi9j6wq99df5y0hpy9185f"; + version = "0.1.4.1"; + sha256 = "0hv2h1pzz808bg2bvignb3d2wma1aw96zdf545f9p01vjr1b656a"; + revision = "1"; + editedCabalFile = "0gpfbpzcg516kghsgwc4gnbp217p6phw9bh1qhlkzd0ji35gdibm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -216647,7 +217653,7 @@ self: { executableHaskellDepends = [ base containers reflex text time transformers vty ]; - description = "Reflex FRP host and widgets for vty applications"; + description = "Reflex FRP host and widgets for VTY applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -217696,6 +218702,35 @@ self: { broken = true; }) {}; + "registry_0_2_0_1" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , exceptions, generic-lens, hashable, hedgehog, io-memoize, mmorph + , MonadRandom, mtl, multimap, protolude, random, resourcet + , semigroupoids, semigroups, tasty, tasty-discover, tasty-hedgehog + , tasty-th, template-haskell, text, transformers-base, universum + }: + mkDerivation { + pname = "registry"; + version = "0.2.0.1"; + sha256 = "0vpgjxm5mx11vnfhnvlzlawaqwa0a99iyimpd333ibz0psw10wka"; + libraryHaskellDepends = [ + base containers exceptions hashable mmorph mtl protolude resourcet + semigroupoids semigroups template-haskell text transformers-base + ]; + testHaskellDepends = [ + async base bytestring containers directory exceptions generic-lens + hashable hedgehog io-memoize mmorph MonadRandom mtl multimap + protolude random resourcet semigroupoids semigroups tasty + tasty-discover tasty-hedgehog tasty-th template-haskell text + transformers-base universum + ]; + testToolDepends = [ tasty-discover ]; + description = "data structure for assembling components"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "registry-hedgehog" = callPackage ({ mkDerivation, base, containers, generic-lens, hedgehog, mmorph , multimap, protolude, registry, tasty, tasty-discover @@ -223195,6 +224230,8 @@ self: { libraryHaskellDepends = [ base primitive primitive-unlifted ]; description = "runST without boxing penalty"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rungekutta" = callPackage @@ -225347,6 +226384,28 @@ self: { broken = true; }) {}; + "scheduler_1_5_0" = callPackage + ({ mkDerivation, atomic-primops, base, deepseq, doctest, exceptions + , genvalidity-hspec, hspec, mwc-random, primitive, pvar, QuickCheck + , template-haskell, unliftio, unliftio-core, vector + }: + mkDerivation { + pname = "scheduler"; + version = "1.5.0"; + sha256 = "19sgc3ydbjjlgd6jh9pqfxv3gq1mbgaicshf7kbj5yf5cnimq5vp"; + libraryHaskellDepends = [ + atomic-primops base deepseq exceptions primitive pvar unliftio-core + ]; + testHaskellDepends = [ + base deepseq doctest genvalidity-hspec hspec mwc-random QuickCheck + template-haskell unliftio vector + ]; + description = "Work stealing scheduler"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "schedyield" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -226520,6 +227579,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) SDL2;}; + "sdl2_2_5_3_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, exceptions, linear + , SDL2, StateVar, text, transformers, vector, weigh + }: + mkDerivation { + pname = "sdl2"; + version = "2.5.3.0"; + sha256 = "08l24cb92spnx3bn26bj0z2cszpsawhaa9vvhblvsr3d6z76065q"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring exceptions linear StateVar text transformers vector + ]; + librarySystemDepends = [ SDL2 ]; + libraryPkgconfigDepends = [ SDL2 ]; + testHaskellDepends = [ base deepseq linear vector weigh ]; + description = "Both high- and low-level bindings to the SDL library (version 2.0.6+)."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) SDL2;}; + "sdl2-cairo" = callPackage ({ mkDerivation, base, cairo, linear, sdl2 }: mkDerivation { @@ -227733,6 +228814,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "semver_0_4_0_1" = callPackage + ({ mkDerivation, attoparsec, base, criterion, deepseq, hashable + , tasty, tasty-hunit, text + }: + mkDerivation { + pname = "semver"; + version = "0.4.0.1"; + sha256 = "0hgn3wd1wv3y1723kvd9clj72z65f6m28yf75mxl1zjfd0kf6ivw"; + revision = "1"; + editedCabalFile = "13c692s2fbn6xygw70aglj84a8hq549gcj1p40g11j77w68p9xx4"; + libraryHaskellDepends = [ attoparsec base deepseq hashable text ]; + testHaskellDepends = [ base tasty tasty-hunit text ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Representation, manipulation, and de/serialisation of Semantic Versions"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "semver-range" = callPackage ({ mkDerivation, base, classy-prelude, hspec, parsec, QuickCheck , text, unordered-containers @@ -228524,22 +229623,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant_0_18" = callPackage + "servant_0_18_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors , bytestring, case-insensitive, deepseq, hspec, hspec-discover , http-api-data, http-media, http-types, mmorph, mtl, network-uri - , QuickCheck, quickcheck-instances, singleton-bool + , QuickCheck, quickcheck-instances, singleton-bool, sop-core , string-conversions, tagged, text, transformers, vault }: mkDerivation { pname = "servant"; - version = "0.18"; - sha256 = "1dcb92q8w2fim087plspf1hs2gq2hdfiaggp71jqbljhnznlf5vj"; + version = "0.18.1"; + sha256 = "15brknvia5kd1fiyxlqghhhnajwrgai9yspkg5nd0v2k1g9dllky"; libraryHaskellDepends = [ aeson attoparsec base base-compat bifunctors bytestring case-insensitive deepseq http-api-data http-media http-types mmorph - mtl network-uri QuickCheck singleton-bool string-conversions tagged - text transformers vault + mtl network-uri QuickCheck singleton-bool sop-core + string-conversions tagged text transformers vault ]; testHaskellDepends = [ aeson base base-compat bytestring hspec http-media mtl QuickCheck @@ -229026,6 +230125,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-blaze_0_9_1" = callPackage + ({ mkDerivation, base, blaze-html, http-media, servant + , servant-server, wai, warp + }: + mkDerivation { + pname = "servant-blaze"; + version = "0.9.1"; + sha256 = "08fvy904mz5xjqda702kq4ch25m3nda1yhpp4g7i62j0jmxs2ji6"; + libraryHaskellDepends = [ base blaze-html http-media servant ]; + testHaskellDepends = [ base blaze-html servant-server wai warp ]; + description = "Blaze-html support for servant"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-cassava" = callPackage ({ mkDerivation, base, base-compat, bytestring, cassava, http-media , servant, servant-server, vector, wai, warp @@ -229149,19 +230263,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-client_0_18" = callPackage + "servant-client_0_18_1" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, containers , deepseq, entropy, exceptions, hspec, hspec-discover , http-api-data, http-client, http-media, http-types, HUnit , kan-extensions, markdown-unlit, monad-control, mtl, network , QuickCheck, semigroupoids, servant, servant-client-core - , servant-server, stm, tdigest, text, time, transformers + , servant-server, sop-core, stm, tdigest, text, time, transformers , transformers-base, transformers-compat, wai, warp }: mkDerivation { pname = "servant-client"; - version = "0.18"; - sha256 = "17m0cakf4apdrpq7wic9mbxcn2hd9cwh9xrcbxshabfffgkq791i"; + version = "0.18.1"; + sha256 = "0pv9xj5a6caqxsnlnv4ijzavgmsgi0n3zri4h84mrjki2h2z1837"; + revision = "1"; + editedCabalFile = "1d2f8l2zs2gy880g3i9l3jwjrxygb705qz1f81ral7ik56465m83"; libraryHaskellDepends = [ base base-compat bytestring containers deepseq exceptions http-client http-media http-types kan-extensions monad-control mtl @@ -229171,8 +230287,8 @@ self: { testHaskellDepends = [ aeson base base-compat bytestring entropy hspec http-api-data http-client http-types HUnit kan-extensions markdown-unlit mtl - network QuickCheck servant servant-client-core servant-server stm - tdigest text transformers transformers-compat wai warp + network QuickCheck servant servant-client-core servant-server + sop-core stm tdigest text transformers transformers-compat wai warp ]; testToolDepends = [ hspec-discover markdown-unlit ]; description = "Automatic derivation of querying functions for servant"; @@ -229203,20 +230319,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-client-core_0_18" = callPackage + "servant-client-core_0_18_1" = callPackage ({ mkDerivation, aeson, base, base-compat, base64-bytestring , bytestring, containers, deepseq, exceptions, free, hspec , hspec-discover, http-media, http-types, network-uri, QuickCheck - , safe, servant, template-haskell, text, transformers + , safe, servant, sop-core, template-haskell, text, transformers }: mkDerivation { pname = "servant-client-core"; - version = "0.18"; - sha256 = "198kixjiy34z05vavs18wb2kp62pk5bzr5cl7dvhkl73alvj3rhn"; + version = "0.18.1"; + sha256 = "1pp4r8l1130ph680kcw7zpk1p76z88ip21cf4dghckmj0lflyw9h"; + revision = "1"; + editedCabalFile = "04lk4zwx5g652krn561fd02wbrsg9jrj93hw7gv6z2xay8dr05m1"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring bytestring containers deepseq exceptions free http-media http-types network-uri safe - servant template-haskell text transformers + servant sop-core template-haskell text transformers ]; testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; @@ -229401,7 +230519,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-docs_0_11_6" = callPackage + "servant-docs_0_11_7" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , case-insensitive, hashable, http-media, http-types, lens, servant , string-conversions, tasty, tasty-golden, tasty-hunit, text @@ -229409,8 +230527,8 @@ self: { }: mkDerivation { pname = "servant-docs"; - version = "0.11.6"; - sha256 = "07qabs5xi6dw8anmrnl2135fps901k4y1s2xywgdxhqyg01rljhq"; + version = "0.11.7"; + sha256 = "01m8ixxs310mcmnd1c5na2ycbnc9xwizdnzzcjdbli5r1mngpgc8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -229831,8 +230949,10 @@ self: { }: mkDerivation { pname = "servant-http-streams"; - version = "0.18"; - sha256 = "1krpmmzjc1vagcy8rdgcl3zm8zlfjf8ikicaqrqp6d95f8bz4kaz"; + version = "0.18.1"; + sha256 = "05ji6zg6v8cysfbh0850cmwrian0n2clvqn3b348cz3qms0ijrpg"; + revision = "1"; + editedCabalFile = "0xpscs5y480n19n3i4sn7xmb6kra7cyjxq64ic18cpqijv1jwlm1"; libraryHaskellDepends = [ base base-compat bytestring case-insensitive containers deepseq exceptions http-common http-media http-streams http-types @@ -230170,8 +231290,10 @@ self: { }: mkDerivation { pname = "servant-multipart"; - version = "0.11.6"; - sha256 = "0yzr5hv2ki9ig4g6735bjnzv6mkpgj5l68g9hlvp9g9i0ryxqahn"; + version = "0.12"; + sha256 = "1hs1h66zjhknfnz1bdi5c0d2sfb20fc7x9adbc87gq168k8riqvl"; + revision = "1"; + editedCabalFile = "0pc254b458v4k5xw729fvw3q3klwpkai2mmp455dw2i7g02dv0da"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -230256,8 +231378,8 @@ self: { }: mkDerivation { pname = "servant-openapi3"; - version = "2.0.0.1"; - sha256 = "14vxvvnzjk7w7lzivmjh5ib7byqqywrhr72rx0nafzq2vsw1wzng"; + version = "2.0.1.0"; + sha256 = "14mfa7l3rqjmqp89x9gny5sy3c1w41czkyx7qp1d8dz1y4qi4ipf"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -230785,26 +231907,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-server_0_18" = callPackage + "servant-server_0_18_1" = callPackage ({ mkDerivation, aeson, base, base-compat, base64-bytestring , bytestring, containers, directory, exceptions, filepath, hspec , hspec-discover, hspec-wai, http-api-data, http-media, http-types , monad-control, mtl, network, network-uri, QuickCheck, resourcet - , safe, servant, should-not-typecheck, string-conversions, tagged - , temporary, text, transformers, transformers-base + , safe, servant, should-not-typecheck, sop-core, string-conversions + , tagged, temporary, text, transformers, transformers-base , transformers-compat, wai, wai-app-static, wai-extra, warp, word8 }: mkDerivation { pname = "servant-server"; - version = "0.18"; - sha256 = "0knbzr6ls9p2wjn3kfggy99gxavl817xw48m53plhf2r4s4vjrw8"; + version = "0.18.1"; + sha256 = "1azyaprki2mxqxb67h792qrjzxy8cy9m9f7zxg22g60l3j197df5"; + revision = "1"; + editedCabalFile = "1z136vqfbxliq141y4i6m9d3bif4k0ay34xximlnnfxjazx4r0ph"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base-compat base64-bytestring bytestring containers exceptions filepath http-api-data http-media http-types monad-control mtl - network network-uri resourcet servant string-conversions tagged - text transformers transformers-base wai wai-app-static word8 + network network-uri resourcet servant sop-core string-conversions + tagged text transformers transformers-base wai wai-app-static word8 ]; executableHaskellDepends = [ aeson base base-compat servant text wai warp @@ -231160,6 +232284,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-swagger-ui_0_3_4_3_36_1" = callPackage + ({ mkDerivation, base, bytestring, file-embed-lzma, servant + , servant-server, servant-swagger-ui-core, swagger2, text + }: + mkDerivation { + pname = "servant-swagger-ui"; + version = "0.3.4.3.36.1"; + sha256 = "0j66ci53mlv1v57xg0hx6sm876i7yj99v573zizgb497c747dy8n"; + libraryHaskellDepends = [ + base bytestring file-embed-lzma servant servant-server + servant-swagger-ui-core swagger2 text + ]; + description = "Servant swagger ui"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-swagger-ui-core" = callPackage ({ mkDerivation, base, blaze-markup, bytestring, http-media , servant, servant-blaze, servant-server, swagger2, text @@ -231169,8 +232310,8 @@ self: { pname = "servant-swagger-ui-core"; version = "0.3.3"; sha256 = "0gpdjnclbjjr6gwc0gyx1d4w06cjf6z5b2ngjfcgbn885wqllwh3"; - revision = "3"; - editedCabalFile = "0yx3q7y533v61ca4bm4wi8h7chbghj2rz92b330a544w7ac8il0p"; + revision = "4"; + editedCabalFile = "1kj72caf8skcl25bfw4nh7kj7hh33wd55sggsd474di57wi9j2c4"; libraryHaskellDepends = [ base blaze-markup bytestring http-media servant servant-blaze servant-server swagger2 text transformers transformers-compat @@ -231188,8 +232329,8 @@ self: { pname = "servant-swagger-ui-jensoleg"; version = "0.3.3"; sha256 = "02zwymqxq54xwc8wmzhbcfgx9plvk0n4kp1907sbl98mhh2frwrw"; - revision = "3"; - editedCabalFile = "08fwi8zq3clski4bac2p2ahqf4475xwzba31jw4f4lcr01rickqk"; + revision = "4"; + editedCabalFile = "19h7n1g847ly7addv03vzy5915n48xa0y7l88dzamy6ly1jrmdg2"; libraryHaskellDepends = [ base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core swagger2 text @@ -231206,8 +232347,8 @@ self: { pname = "servant-swagger-ui-redoc"; version = "0.3.3.1.22.3"; sha256 = "0bzkrh1hf29vfa1r1sgifb9j2zcg6i43fal4abbx4lcqvf155pzv"; - revision = "2"; - editedCabalFile = "195vfc3871l1clk85kzxjvz1zr986lbvgy26fazfkfsn032s74c6"; + revision = "3"; + editedCabalFile = "1csz8gzmrrjbjvr6kx4vmyp419i5vbzk84a01vh5zr6ncrpx5nf3"; libraryHaskellDepends = [ base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core swagger2 text @@ -232859,12 +234000,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "shake-plus_0_3_3_0" = callPackage + "shake-plus_0_3_3_1" = callPackage ({ mkDerivation, base, extra, path, rio, shake }: mkDerivation { pname = "shake-plus"; - version = "0.3.3.0"; - sha256 = "13a5n6gh1msrygi671lk5y83shcd75yz64x3r2smxif5hsfazwqv"; + version = "0.3.3.1"; + sha256 = "09zinaphlmdshny3hiyibbqqkfflj2rkxh8zkpnnk5dvf2qb15p5"; libraryHaskellDepends = [ base extra path rio shake ]; description = "Re-export of Shake using well-typed paths and ReaderT"; license = stdenv.lib.licenses.mit; @@ -232894,35 +234035,44 @@ self: { "shakebook" = callPackage ({ mkDerivation, aeson, aeson-better-errors, aeson-with, base - , binary, binary-instances, comonad, comonad-extras - , composite-aeson, composite-base, doctemplates, feed, free - , hashable-time, http-conduit, ixset-typed, ixset-typed-conversions - , lens, lens-aeson, lucid, lucid-cdn, mtl, mustache, pandoc - , pandoc-types, path, path-extensions, rio, shake-plus - , shake-plus-extended, sitemap-gen, slick, split, tasty - , tasty-golden, text-time, vinyl, zipper-extra + , binary-instances, comonad, comonad-extras, compdoc + , composite-aeson, composite-aeson-cofree-list + , composite-aeson-path, composite-aeson-throw + , composite-aeson-writeonly, composite-base, composite-binary + , composite-hashable, composite-tuple, composite-xstep + , doctemplates, feed, free, hashable-time, ixset-typed + , ixset-typed-conversions, lens, lens-aeson, lucid, lucid-cdn, mtl + , pandoc, pandoc-throw, pandoc-types, path, path-extensions + , path-utils, rio, shake-plus, shake-plus-extended, sitemap-gen + , skylighting, split, stache, tasty, tasty-golden, vinyl + , zipper-extra }: mkDerivation { pname = "shakebook"; - version = "0.11.0.0"; - sha256 = "0h6pq3y7ll5l83a682mwk60zipsm91w0srgrigdgi7l4wdhn7qzb"; + version = "0.13.1.0"; + sha256 = "1c2qklpjyszc3rfqm7p73bkb4ma43lwvsc9h8p8dyc5s1dxv8d4f"; libraryHaskellDepends = [ - aeson aeson-better-errors aeson-with base binary binary-instances - comonad comonad-extras composite-aeson composite-base doctemplates - feed free hashable-time http-conduit ixset-typed - ixset-typed-conversions lens lens-aeson lucid lucid-cdn mtl - mustache pandoc pandoc-types path path-extensions rio shake-plus - shake-plus-extended sitemap-gen slick split text-time vinyl - zipper-extra + aeson aeson-better-errors aeson-with base binary-instances comonad + comonad-extras compdoc composite-aeson composite-aeson-cofree-list + composite-aeson-path composite-aeson-throw + composite-aeson-writeonly composite-base composite-binary + composite-hashable composite-tuple composite-xstep doctemplates + feed free hashable-time ixset-typed ixset-typed-conversions lens + lens-aeson lucid lucid-cdn mtl pandoc pandoc-throw pandoc-types + path path-extensions path-utils rio shake-plus shake-plus-extended + sitemap-gen skylighting stache vinyl zipper-extra ]; testHaskellDepends = [ - aeson aeson-better-errors aeson-with base binary binary-instances - comonad comonad-extras composite-aeson composite-base doctemplates - feed free hashable-time http-conduit ixset-typed - ixset-typed-conversions lens lens-aeson lucid lucid-cdn mtl - mustache pandoc pandoc-types path path-extensions rio shake-plus - shake-plus-extended sitemap-gen slick split tasty tasty-golden - text-time vinyl zipper-extra + aeson aeson-better-errors aeson-with base binary-instances comonad + comonad-extras compdoc composite-aeson composite-aeson-cofree-list + composite-aeson-path composite-aeson-throw + composite-aeson-writeonly composite-base composite-binary + composite-hashable composite-tuple composite-xstep doctemplates + feed free hashable-time ixset-typed ixset-typed-conversions lens + lens-aeson lucid lucid-cdn mtl pandoc pandoc-throw pandoc-types + path path-extensions path-utils rio shake-plus shake-plus-extended + sitemap-gen skylighting split stache tasty tasty-golden vinyl + zipper-extra ]; description = "Shake-based technical documentation generator; HTML & PDF"; license = stdenv.lib.licenses.mit; @@ -237492,6 +238642,8 @@ self: { libraryHaskellDepends = [ base bytesmith primitive ]; description = "Parse arrays of tokens"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smith-cli" = callPackage @@ -244745,6 +245897,8 @@ self: { ]; description = "STM-specialised Hash Array Mapped Trie"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stm-incremental" = callPackage @@ -252015,6 +253169,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "A command-line kanban board/task manager"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "taskpool" = callPackage @@ -252819,8 +253975,8 @@ self: { pname = "tasty-travis"; version = "0.2.0.2"; sha256 = "0g1qwmr11rgpvm964367mskgrjzbi34lbxzf9c0knx5ij9565gfg"; - revision = "4"; - editedCabalFile = "10kvalx02kyx2dx6shw00s689hb1qgllpagwy6nxvah6cky438ks"; + revision = "5"; + editedCabalFile = "1m1npkvi3g1i7vn7aiq2558l3hbv2w6nz1ix9mv1djn6ccjlh1gk"; libraryHaskellDepends = [ base tasty ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Fancy Travis CI output for tasty tests"; @@ -256797,8 +257953,8 @@ self: { }: mkDerivation { pname = "th-lego"; - version = "0.2.2"; - sha256 = "0z9bpycyayvjr01pl704yhmchdfiyfi58drkq9ccxahgrwa0gpfc"; + version = "0.2.3"; + sha256 = "1c2q1gz04072kh2dxs22hqvcjkfq66ylixl0631wnlmvivbm2ahz"; libraryHaskellDepends = [ base template-haskell template-haskell-compat-v0208 text ]; @@ -256808,6 +257964,8 @@ self: { ]; description = "Template Haskell construction utilities"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "th-lift" = callPackage @@ -258282,6 +259440,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "time-compat_1_9_4" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, deepseq, HUnit + , QuickCheck, tagged, tasty, tasty-hunit, tasty-quickcheck, time + }: + mkDerivation { + pname = "time-compat"; + version = "1.9.4"; + sha256 = "0fpk2bpxfyzwd24lk06k3cpra713hrpva5ylnwa28zq34azy1snz"; + libraryHaskellDepends = [ base base-orphans deepseq time ]; + testHaskellDepends = [ + base base-compat deepseq HUnit QuickCheck tagged tasty tasty-hunit + tasty-quickcheck time + ]; + description = "Compatibility package for time"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "time-extras" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -260207,12 +261383,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tonalude_0_1_1_1" = callPackage + ({ mkDerivation, base, bytestring, doctest, Glob, rio, unliftio }: + mkDerivation { + pname = "tonalude"; + version = "0.1.1.1"; + sha256 = "19pl0l0nz3nywhf31190qld7crbzry241h5dw0234w5qyiwf5h0h"; + libraryHaskellDepends = [ base bytestring rio unliftio ]; + testHaskellDepends = [ base bytestring doctest Glob rio unliftio ]; + description = "A standard library for Tonatona framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tonaparser" = callPackage ({ mkDerivation, base, doctest, envy, Glob, rio, say, tonatona }: mkDerivation { pname = "tonaparser"; - version = "0.1.0.0"; - sha256 = "0v9qfc13lyjclk7pqsld1lzzbdhimz7gziix7w2x6v2rr2nia8j0"; + version = "0.1.0.1"; + sha256 = "1hhg8iil1gradmr2nr6rms5y8f1478splfw6q8n8548zgaqlrzig"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base envy rio say ]; @@ -260225,8 +261414,8 @@ self: { ({ mkDerivation, base, doctest, Glob, rio, tonaparser }: mkDerivation { pname = "tonatona"; - version = "0.1.1.0"; - sha256 = "17hd93m2i79pb39z00x0sdvhfds3b5fgyhld8pr64rlnr9wm039l"; + version = "0.1.2.1"; + sha256 = "0995j5z87s5bq7ax3byhqrzq794fra5khswf1vj5ppymj6sgq9pf"; libraryHaskellDepends = [ base rio tonaparser ]; testHaskellDepends = [ base doctest Glob rio tonaparser ]; description = "meta application framework"; @@ -260261,8 +261450,8 @@ self: { ({ mkDerivation, base, doctest, Glob, rio, tonaparser, tonatona }: mkDerivation { pname = "tonatona-logger"; - version = "0.2.0.0"; - sha256 = "14pirmflhyfmw6y7j1af7ryh8iq30prx7xsdjwmliacszhsqvvfa"; + version = "0.2.0.2"; + sha256 = "047mhgzkk1jkyblbmh41ha56fifgsfccq6jzq3s0y6fx4sgc95nn"; libraryHaskellDepends = [ base rio tonaparser tonatona ]; testHaskellDepends = [ base doctest Glob rio tonaparser tonatona ]; description = "tonatona plugin for logging"; @@ -260275,8 +261464,8 @@ self: { }: mkDerivation { pname = "tonatona-persistent-postgresql"; - version = "0.1.0.1"; - sha256 = "1fxf3h024bl02aldcwc9mhjish9l2y57ir9shra6liddk6065g5n"; + version = "0.1.0.2"; + sha256 = "1lib6akp6xnq7iqjgyxgd14l9mgswx8y61v0qpdj8q13xxs5m1si"; libraryHaskellDepends = [ base monad-logger persistent persistent-postgresql resource-pool rio tonaparser tonatona @@ -260297,8 +261486,8 @@ self: { }: mkDerivation { pname = "tonatona-persistent-sqlite"; - version = "0.1.0.1"; - sha256 = "0a0jgi01pdirr7ay2ah3cvf3nv2pnmvxag34zif04vc6sbs8pryb"; + version = "0.1.0.2"; + sha256 = "185bkhikkhk7m8l96rapcy6nwccw3js7kpnif7dlrniv0ckjdwzg"; libraryHaskellDepends = [ base monad-logger persistent persistent-sqlite resource-pool rio tonaparser tonatona @@ -260318,8 +261507,8 @@ self: { }: mkDerivation { pname = "tonatona-servant"; - version = "0.1.0.3"; - sha256 = "1v414apf2znvwm6vdph6wr0slhd5ki2nc666frhc8blmwj3whqrr"; + version = "0.1.0.4"; + sha256 = "0zldxq7qygswa0pyxb82p1bbwap6lfr18dw2802ailv5y6gxsjg0"; libraryHaskellDepends = [ base data-default exceptions http-types monad-logger rio servant servant-server tonaparser tonatona tonatona-logger wai wai-extra @@ -263038,6 +264227,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ttc_0_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-hunit + , template-haskell, text + }: + mkDerivation { + pname = "ttc"; + version = "0.3.0.0"; + sha256 = "0k23fsp9fji17341iag3rv79lsxj7x26chhijl8lh3jraqvj9y4p"; + libraryHaskellDepends = [ base bytestring template-haskell text ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit template-haskell text + ]; + description = "Textual Type Classes"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ttl-hashtables" = callPackage ({ mkDerivation, base, clock, containers, data-default, failable , hashable, hashtables, hspec, mtl, transformers @@ -264780,6 +265986,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "type-of-html_1_6_0_0" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, containers + , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim + , hspec, QuickCheck, random, text, weigh + }: + mkDerivation { + pname = "type-of-html"; + version = "1.6.0.0"; + sha256 = "1blwdwr0ryq3as7dc1wh9ixxy81q600hmm5d4bw768a5kbjc1sj6"; + libraryHaskellDepends = [ + base bytestring containers double-conversion ghc-prim text + ]; + testHaskellDepends = [ base bytestring hspec QuickCheck ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring criterion deepseq ghc ghc-paths random + text weigh + ]; + description = "High performance type driven html generation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "type-of-html-static" = callPackage ({ mkDerivation, base, template-haskell, type-of-html }: mkDerivation { @@ -265610,6 +266838,8 @@ self: { preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; description = "Efficient time zone handling"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tzdata" = callPackage @@ -266081,8 +267311,8 @@ self: { ({ mkDerivation, base, bytestring, mmsyn2, mmsyn5, vector }: mkDerivation { pname = "ukrainian-phonetics-basic"; - version = "0.1.7.0"; - sha256 = "0rjyy6yxwd799svqd34wjjz5wvxzlkr7bl65s1wmvdfbs9dvfk95"; + version = "0.1.10.0"; + sha256 = "14rc2jx621brka5sgxa8m5s38bqyzqdc1jw808zw6mll4hg6scvx"; libraryHaskellDepends = [ base bytestring mmsyn2 mmsyn5 vector ]; description = "A library to work with the basic Ukrainian phonetics and syllable segmentation"; license = stdenv.lib.licenses.mit; @@ -266213,8 +267443,8 @@ self: { }: mkDerivation { pname = "unbeliever"; - version = "0.10.0.7"; - sha256 = "17yjw8lgwm93hhf4rk0npj35h77jfig3ziampdmg5cjhyy2h4sd7"; + version = "0.10.0.8"; + sha256 = "062xr66i96kwvbwf4pr51ybiavy6wbijzz7zy0si18g13x00x54c"; libraryHaskellDepends = [ base core-data core-program core-text ]; testHaskellDepends = [ base bytestring core-data core-program core-text fingertree @@ -268466,21 +269696,31 @@ self: { }) {}; "update-nix-fetchgit" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, errors, hnix - , prettyprinter, process, text, time, transformers, uniplate - , utf8-string + ({ mkDerivation, aeson, async, base, bytestring, data-fix + , directory, filepath, github-rest, hnix, monad-validate, mtl + , optparse-applicative, optparse-generic, process, regex-tdfa, say + , syb, tasty, tasty-discover, tasty-golden, template-haskell + , temporary, text, time, utf8-string, vector }: mkDerivation { pname = "update-nix-fetchgit"; - version = "0.1.2.0"; - sha256 = "0i2dmz95l8nnjqys2vjyjww47rnlny6wpwpj8k5kjl0fbz4h001d"; + version = "0.2.3"; + sha256 = "1fmpmwg31gnablwp22a90l7q5hj6xxd57cxf3zbp3mv1xabd341k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base bytestring errors hnix prettyprinter process text - time transformers uniplate utf8-string + aeson async base bytestring data-fix github-rest hnix + monad-validate mtl process regex-tdfa syb template-haskell text + time utf8-string vector ]; - executableHaskellDepends = [ base text ]; + executableHaskellDepends = [ + base optparse-applicative optparse-generic regex-tdfa say text + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-discover tasty-golden + temporary text + ]; + testToolDepends = [ tasty-discover ]; description = "A program to update fetchgit values in Nix expressions"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ sorki ]; @@ -270196,8 +271436,8 @@ self: { pname = "validated-literals"; version = "0.3.0"; sha256 = "1k77jp19kl7h4v9hl2jhsmbq8dhzl8z9sgkw1jxx1rblm3fszjx1"; - revision = "3"; - editedCabalFile = "0m7iggm5676nayzkj0ip866qg8d4ld6gv38krl02z020m96zax5b"; + revision = "4"; + editedCabalFile = "16fwvivw1barrgkw7cl2hfgksfhambfmhrwibhi6n8096sj79h0j"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base bytestring deepseq tasty tasty-hunit tasty-travis @@ -270281,18 +271521,19 @@ self: { }) {}; "validationt" = callPackage - ({ mkDerivation, aeson, base, containers, exceptions, lens + ({ mkDerivation, aeson, base, containers, doctest, exceptions, lens , monad-control, mtl, QuickCheck, text, transformers - , transformers-base, transformers-lift, vector + , transformers-base, vector }: mkDerivation { pname = "validationt"; - version = "0.2.1.0"; - sha256 = "0b91rn6fvdc9cypaljhm4q8gn4fivyszk00h47qvvs4by8rx5q58"; + version = "0.3.0"; + sha256 = "14kvkiawsychqq55nm0afpfwxjvxh9izbr35zgp3wg2j0zqzkhnz"; libraryHaskellDepends = [ aeson base containers exceptions lens monad-control mtl QuickCheck - text transformers transformers-base transformers-lift vector + text transformers transformers-base vector ]; + testHaskellDepends = [ base doctest ]; description = "Straightforward validation monad"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -272920,12 +274161,13 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.6.11"; - sha256 = "065l0nk4w3if01aavfzgnalpp39xz1j8xw022l9w9pmdmb2y0fjm"; + version = "3.6.12"; + sha256 = "1ysqa9vps8jkrcapbrans3k4aljw3wysqlq5z9qds29zrhki4dd0"; libraryHaskellDepends = [ base bytestring transformers vector ]; librarySystemDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; license = stdenv.lib.licenses.bsd3; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {vulkan = null;}; "vulkan-api" = callPackage @@ -272945,16 +274187,14 @@ self: { }: mkDerivation { pname = "vulkan-utils"; - version = "0.1.2"; - sha256 = "1him27687nbqc5mv56gf8nr9hg4wpx702sijrci0ls7mpjz9qlxp"; + version = "0.1.2.1"; + sha256 = "1ixjw397aqw04p2gy1d1pg9c3rdww2czakqg21ihg7ldi894n8pa"; libraryHaskellDepends = [ base bytestring extra file-embed filepath template-haskell temporary typed-process vulkan ]; description = "Utils for the vulkan package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "waargonaut" = callPackage @@ -273365,7 +274605,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "wai-extra_3_1_1" = callPackage + "wai-extra_3_1_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring , bytestring, call-stack, case-insensitive, containers, cookie , data-default-class, deepseq, directory, fast-logger, hspec @@ -273375,8 +274615,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.1.1"; - sha256 = "0x3lixv64j9s6zp9ghl53dj5lgw25mpl65v1cwjfs8kbk44nvbsk"; + version = "3.1.2"; + sha256 = "03aszasb9508jy7dpazay89cy1zs4p5g0n08zjhsl8c47rap16ks"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -273679,15 +274919,16 @@ self: { }) {}; "wai-log" = callPackage - ({ mkDerivation, aeson, base, http-types, log-base - , string-conversions, text, time, wai + ({ mkDerivation, aeson, base, bytestring, http-types, log-base + , string-conversions, text, time, uuid, wai }: mkDerivation { pname = "wai-log"; - version = "0.2.0.0"; - sha256 = "02lsvkh7mkqd6p69qffrl62pdxzn5h1a4wnqflb3sycifi8dmj9b"; + version = "0.3.0.0"; + sha256 = "0mgby05lq9j31ssyk2yp6mghqwgpffkki7pygday1lmg130n8n74"; libraryHaskellDepends = [ - aeson base http-types log-base string-conversions text time wai + aeson base bytestring http-types log-base string-conversions text + time uuid wai ]; description = "A logging middleware for WAI applications"; license = stdenv.lib.licenses.bsd3; @@ -274477,8 +275718,8 @@ self: { }: mkDerivation { pname = "wai-predicates"; - version = "0.10.0"; - sha256 = "1hnpzf7zwizx67ql4fwpqj7xlgkn6c2ms8w4kjapmgxv8z8zdcxp"; + version = "1.0.0"; + sha256 = "0m6aqpafc7rgcp81g0kilshz9bxsp4vxllrya2wjccan3n5pajji"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-conversion case-insensitive cookie http-types singletons text transformers vault vector wai @@ -282461,6 +283702,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "yaml-unscrambler" = callPackage + ({ mkDerivation, acc, attoparsec, attoparsec-data, attoparsec-time + , base, base64, bytestring, conduit, containers, foldl, hashable + , libyaml, mtl, neat-interpolation, QuickCheck + , quickcheck-instances, rerebase, scientific, selective, tasty + , tasty-hunit, tasty-quickcheck, text, text-builder, time + , transformers, unordered-containers, uuid, vector, yaml + }: + mkDerivation { + pname = "yaml-unscrambler"; + version = "0.1.0.1"; + sha256 = "05z892g8c9alwmjwjm1405s43s8cdbj42ymqc9jlb27qc8ikc4n7"; + libraryHaskellDepends = [ + acc attoparsec attoparsec-data attoparsec-time base base64 + bytestring conduit containers foldl hashable libyaml mtl scientific + selective text text-builder time transformers unordered-containers + uuid vector yaml + ]; + testHaskellDepends = [ + foldl neat-interpolation QuickCheck quickcheck-instances rerebase + tasty tasty-hunit tasty-quickcheck + ]; + description = "Flexible declarative YAML parsing toolkit"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "yaml2owl" = callPackage ({ mkDerivation, base, containers, directory, filepath, network , network-uri, swish, text, xml, yaml @@ -283277,6 +284546,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-auth_1_6_10_1" = callPackage + ({ mkDerivation, aeson, authenticate, base, base16-bytestring + , base64-bytestring, binary, blaze-builder, blaze-html + , blaze-markup, bytestring, conduit, conduit-extra, containers + , cryptonite, data-default, email-validate, file-embed, http-client + , http-client-tls, http-conduit, http-types, memory, network-uri + , nonce, persistent, random, safe, shakespeare, template-haskell + , text, time, transformers, unliftio, unliftio-core + , unordered-containers, wai, yesod-core, yesod-form + , yesod-persistent + }: + mkDerivation { + pname = "yesod-auth"; + version = "1.6.10.1"; + sha256 = "12bnadmf3afbkni3k8gc1srv2makssy62zciygg4dh8q7rr2pw2s"; + libraryHaskellDepends = [ + aeson authenticate base base16-bytestring base64-bytestring binary + blaze-builder blaze-html blaze-markup bytestring conduit + conduit-extra containers cryptonite data-default email-validate + file-embed http-client http-client-tls http-conduit http-types + memory network-uri nonce persistent random safe shakespeare + template-haskell text time transformers unliftio unliftio-core + unordered-containers wai yesod-core yesod-form yesod-persistent + ]; + description = "Authentication for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-auth-account" = callPackage ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger , mtl, nonce, persistent, persistent-sqlite, pwstore-fast @@ -283590,8 +284888,8 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth"; - version = "1.6.0.1"; - sha256 = "0b9sp2rbj8yd343whcgg1ph4ybfk136d0ln09q7z56xqxn4brl3s"; + version = "1.6.0.2"; + sha256 = "1rr21vclcvy4lrv6r3v6f6sslmwg49jr7jiad63snn81nz854da1"; libraryHaskellDepends = [ authenticate-oauth base bytestring text unliftio yesod-auth yesod-core yesod-form @@ -284629,6 +285927,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-persistent_1_6_0_5" = callPackage + ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent + , persistent-sqlite, persistent-template, resource-pool, resourcet + , text, transformers, wai-extra, yesod-core + }: + mkDerivation { + pname = "yesod-persistent"; + version = "1.6.0.5"; + sha256 = "0chvpzhfj0l1lacwslizhawsc9ns307q0wc6mcalz6gv7cm7mfi3"; + libraryHaskellDepends = [ + base blaze-builder conduit persistent persistent-template + resource-pool resourcet transformers yesod-core + ]; + testHaskellDepends = [ + base blaze-builder conduit hspec persistent persistent-sqlite text + wai-extra yesod-core + ]; + description = "Some helpers for using Persistent from Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-platform" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, asn1-encoding , asn1-parse, asn1-types, attoparsec-conduit, authenticate From 58b878c74801770f32c925636ada56366ff02d26 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 6 Nov 2020 15:13:09 +0100 Subject: [PATCH 158/299] haskellPackages.dependent-sum-aeson-orphans: Remove obsolete patch --- pkgs/development/haskell-modules/configuration-common.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0ec9fad1e8a..d73a69c8583 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1382,13 +1382,6 @@ self: super: { sha256 = "1c5ck2ibag2gcyag6rjivmlwdlp5k0dmr8nhk7wlkzq2vh7zgw63"; }); - # Version bumps have not been merged by upstream yet. - # https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/5 - dependent-sum-aeson-orphans = appendPatch super.dependent-sum-aeson-orphans (pkgs.fetchpatch { - url = "https://github.com/obsidiansystems/dependent-sum-aeson-orphans/commit/5a369e433ad7e3eef54c7c3725d34270f6aa48cc.patch"; - sha256 = "1lzrcicvdg77hd8j2fg37z19amp5yna5xmw1fc06zi0j95csll4r"; - }); - # Tests are broken because of missing files in hackage tarball. # https://github.com/jgm/commonmark-hs/issues/55 commonmark-extensions = dontCheck super.commonmark-extensions; From a146baff16c99bf347beda70294a558875cc40fc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Nov 2020 20:04:38 +0100 Subject: [PATCH 159/299] git-annex: update sha256 hash for new version 8.20201103 --- 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 d73a69c8583..4894b59c4ad 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -69,7 +69,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "05yvl09ksyvzykibs95996rni9x6w03yfqyv2fadd73z1m6lq5bf"; + sha256 = "1g5ba1lv0v4zjk5ghdp78wxgszspfda1lrl734fi7hyavqrfjxkz"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; From e0073ccae7392a3395694c0faea66263590ff453 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Nov 2020 20:11:45 +0100 Subject: [PATCH 160/299] ghcjs: mark build broken --- pkgs/development/compilers/ghcjs-ng/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 7b6fbc460a9..c6c81491fe6 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -104,4 +104,6 @@ in stdenv.mkDerivation { meta.platforms = passthru.bootPkgs.ghc.meta.platforms; meta.maintainers = [lib.maintainers.elvishjerricco]; + meta.hydraPlatforms = []; + meta.broken = true; # https://hydra.nixos.org/build/129701778 } From 7347bbf45443f55ce591079ea5a49712a0560a2e Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Fri, 6 Nov 2020 22:50:00 +0800 Subject: [PATCH 161/299] haskellPackages.vulkan: add 32 bit platforms to unsupported-platforms Same for haskellPackages.VulkanMemoryAllocator --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 8213b47785b..4328d6a7589 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2738,6 +2738,8 @@ unsupported-platforms: sdl2-mixer: [ x86_64-darwin ] sdl2-ttf: [ x86_64-darwin ] tokyotyrant-haskell: [ x86_64-darwin ] + vulkan: [ i686-linux, armv7l-linux ] + VulkanMemoryAllocator: [ i686-linux, armv7l-linux ] Win32-console: [ i686-linux, x86_64-linux, x86_64-darwin ] Win32-dhcp-server: [ i686-linux, x86_64-linux, x86_64-darwin ] Win32-errors: [ i686-linux, x86_64-linux, x86_64-darwin ] From 8925f7ae79303004e5ed2c056aa6d9e569357e40 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Nov 2020 21:27:34 +0100 Subject: [PATCH 162/299] haskell-binary-instances: drop obsolete override Unfortunately, this doesn't mean that the package now compiles because it still depends on an newer version of time-compat. :-( --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4894b59c4ad..821e32ab8a1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1173,9 +1173,6 @@ self: super: { # 2020-06-22: NOTE: > 0.4.0 => rm Jailbreak: https://github.com/serokell/nixfmt/issues/71 nixfmt = doJailbreak super.nixfmt; - # 2020-06-22: NOTE: QuickCheck upstreamed https://github.com/phadej/binary-instances/issues/7 - binary-instances = dontCheck super.binary-instances; - # The test suite depends on an impure cabal-install installation in # $HOME, which we don't have in our build sandbox. cabal-install-parsers = dontCheck super.cabal-install-parsers; From d1e684cd2456cdd5ff87d01a2624d67b63e3b3bf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Nov 2020 21:33:53 +0100 Subject: [PATCH 163/299] haskell: drop obsolete patches for patch and reflex --- .../haskell-modules/configuration-common.nix | 37 +------------------ 1 file changed, 2 insertions(+), 35 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 821e32ab8a1..ff3a7be3b13 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1252,41 +1252,8 @@ self: super: { x509-validation = dontCheck super.x509-validation; tls = dontCheck super.tls; - patch = appendPatches super.patch [ - # Upstream PR: https://github.com/reflex-frp/patch/pull/20 - # Makes tests work with hlint 3 - (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/patch/commit/3ed23a4e4049ee17e64a1a5bbebf1990cdbe033a.patch"; - sha256 ="1hfa980wln8kzbqw1lr8ddszgcibw25xf12ki2jb9xkl464aynzf"; - }) - # Upstream PR: https://github.com/reflex-frp/patch/pull/17 - # Bumps version dependencies - (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/patch/commit/a191ed9ded708ed7ff0cf53ad6dafaf54db5b95a.patch"; - sha256 ="1x9w5fimhk3a0l2aa5z91nqaa6s2irz1775iidd0191m6w25vszp"; - }) - ]; - - reflex = appendPatches super.reflex [ - # Upstream PR: https://github.com/reflex-frp/reflex/pull/434 - # Bump version bounds - (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/reflex/commit/e6104bdfd7f664f524b6765275490722e376df4d.patch"; - sha256 ="1awp5p4640cnhfd50dplsvp0kzy6h8r0hpbw1s40blni74r3dhzr"; - }) - # Upstream PR: https://github.com/reflex-frp/reflex/pull/436 - # Fix build with newest dependent-map version - (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/reflex/commit/dc3bf44d822d70594e3c474fe3869261776c3554.patch"; - sha256 ="0rbjfj9b8p6zkvd5j4pak5kpgard6cyfvzk750s4xwpc1v84iiqd"; - }) - # Upstream PR: https://github.com/reflex-frp/reflex/pull/437 - # Fix tests with newer dep versions - (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/reflex/commit/87c74a1b9d9098eae8a56148c59ed4963a5232c2.patch"; - sha256 ="0qhjjgd6n4fms1hpbblny78c95bfh74izhx9dvrdlnhz6q7xlm9q"; - }) - ]; + # Allow building with recent versions of hlint. + patch = doJailbreak super.patch; # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392 # Tests disabled because of very old dep: https://github.com/reflex-frp/reflex-dom/issues/393 From f6d0d8c265caed8620d799a0a2817d6f0e757f20 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 5 Nov 2020 07:30:53 +0000 Subject: [PATCH 164/299] python27Packages.objgraph: 3.4.1 -> 3.5.0 --- pkgs/development/python-modules/objgraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix index 860f8c0051e..79c448b5cce 100644 --- a/pkgs/development/python-modules/objgraph/default.nix +++ b/pkgs/development/python-modules/objgraph/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "objgraph"; - version = "3.4.1"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "bf29512d7f8b457b53fa0722ea59f516abb8abc59b78f97f0ef81394a0c615a7"; + sha256 = "4752ca5bcc0e0512e41b8cc4d2780ac2fd3b3eabd03b7e950a5594c06203dfc4"; }; # Tests fail with PyPy. From 9f1022241ec6159ad3d457c62c9af3784ae56d86 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 6 Nov 2020 14:28:59 -0800 Subject: [PATCH 165/299] README.md: bump pkg count to 60k repology has us at 65k+ packages https://repology.org/repository/nix_unstable --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 70d50e5efcd..16cfeabfa7e 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@

[Nixpkgs](https://github.com/nixos/nixpkgs) is a collection of over -40,000 software packages that can be installed with the +60,000 software packages that can be installed with the [Nix](https://nixos.org/nix/) package manager. It also implements [NixOS](https://nixos.org/nixos/), a purely-functional Linux distribution. From ade59d25e88352838a577ffeff161a989c692961 Mon Sep 17 00:00:00 2001 From: Peter Stewart Date: Thu, 5 Nov 2020 18:55:39 +1100 Subject: [PATCH 166/299] mono6: 6.0.0.313 -> 6.12.0.90 --- pkgs/development/compilers/mono/6.nix | 4 ++-- pkgs/development/compilers/mono/generic.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/mono/6.nix b/pkgs/development/compilers/mono/6.nix index 0157fa7b7f6..04028648a25 100644 --- a/pkgs/development/compilers/mono/6.nix +++ b/pkgs/development/compilers/mono/6.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix ({ inherit Foundation libobjc; - version = "6.0.0.313"; + version = "6.12.0.90"; srcArchiveSuffix = "tar.xz"; - sha256 = "0l0cd6q5xh1vdm6zr78rkfqdsmrgzanjgpxvgig0pyd3glfyjim9"; + sha256 = "1b6d0926rd0nkmsppwjgmwsxx1479jjvr1gm7zwk64siml15rpji"; enableParallelBuilding = true; }) diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index c510f372666..ca3b3147807 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256, autoconf, libtool, automake, cmake, which +{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python3, version, sha256, autoconf, libtool, automake, cmake, which , gnumake42 , enableParallelBuilding ? true , srcArchiveSuffix ? "tar.bz2" @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gnumake42 ]; buildInputs = - [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib python autoconf libtool automake cmake which + [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib python3 autoconf libtool automake cmake which ] ++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]); From 419c760564853a6db4b0d01d4ec8c40dc21e9d97 Mon Sep 17 00:00:00 2001 From: evalexpr Date: Fri, 6 Nov 2020 22:36:09 +0000 Subject: [PATCH 167/299] vimPlugins.barbar-nvim: init at 2020-11-06 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 82374718b16..87ce6f2dadb 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -219,6 +219,18 @@ let meta.homepage = "https://github.com/ayu-theme/ayu-vim/"; }; + barbar-nvim = buildVimPluginFrom2Nix { + pname = "barbar-nvim"; + version = "2020-11-06"; + src = fetchFromGitHub { + owner = "romgrk"; + repo = "barbar.nvim"; + rev = "92e70f9e369d106476de283354bc30e37a94e864"; + sha256 = "17az4flcsry4f2p4xnmgw0ymbbybcfycajm25g6r692hcbgkg5dx"; + }; + meta.homepage = "https://github.com/romgrk/barbar.nvim/"; + }; + base16-vim = buildVimPluginFrom2Nix { pname = "base16-vim"; version = "2019-06-07"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index cb62025a8f8..4a50581cec8 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -429,6 +429,7 @@ rhysd/vim-operator-surround rodjek/vim-puppet romainl/vim-cool roman/golden-ratio +romgrk/barbar.nvim ron89/thesaurus_query.vim roxma/nvim-cm-racer roxma/nvim-completion-manager From 56d09147f13293dc365d08f857c787f12904a1f2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Nov 2020 08:33:41 +0000 Subject: [PATCH 168/299] python37Packages.aioresponses: 0.6.4 -> 0.7.1 --- pkgs/development/python-modules/aioresponses/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix index 7b12cefc8c7..6a0d69371a8 100644 --- a/pkgs/development/python-modules/aioresponses/default.nix +++ b/pkgs/development/python-modules/aioresponses/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "aioresponses"; - version = "0.6.4"; + version = "0.7.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "4397ca736238a1ada8c7f47e557dda05e9ecfdd467b9f6b83871efd365af7e9f"; + sha256 = "f65bba2be1e9a4997ee166bc0161a50be0fef7350ad09e6afdb2adccf74dfefe"; }; nativeBuildInputs = [ From 050aad187bc99f45328b2c5abf3c0ab29cbbe254 Mon Sep 17 00:00:00 2001 From: Jeremy Schlatter Date: Mon, 19 Oct 2020 17:30:15 -0700 Subject: [PATCH 169/299] pythonPackages.inform: init at 1.23 --- .../python-modules/inform/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/inform/default.nix diff --git a/pkgs/development/python-modules/inform/default.nix b/pkgs/development/python-modules/inform/default.nix new file mode 100644 index 00000000000..158f1161cb4 --- /dev/null +++ b/pkgs/development/python-modules/inform/default.nix @@ -0,0 +1,36 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, arrow +, six +, hypothesis +, pytest +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "inform"; + version = "1.23"; + + src = fetchFromGitHub { + owner = "KenKundert"; + repo = "inform"; + rev = "v${version}"; + sha256 = "02zlprvidkz51aypss4knhv7dbr0sbpz3caqjzf9am2n1jx2viyy"; + }; + + propagatedBuildInputs = [ arrow six ]; + + checkInputs = [ pytest hypothesis ]; + checkPhase = "./test.doctests.py && ./test.inform.py && pytest"; + + meta = with lib; { + description = "Print and logging utilities"; + longDescription = '' + Inform is designed to display messages from programs that are typically + run from a console. It provides a collection of ‘print’ functions that + allow you to simply and cleanly print different types of messages. + ''; + homepage = "https://inform.readthedocs.io"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ jeremyschlatter ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aab9f760dba..6ae48a44d63 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2907,6 +2907,8 @@ in { infoqscraper = callPackage ../development/python-modules/infoqscraper { }; + inform = callPackage ../development/python-modules/inform { }; + iniconfig = callPackage ../development/python-modules/iniconfig { }; inifile = callPackage ../development/python-modules/inifile { }; From 1120f899daee5681cff8f6bf59ed531d4dd58a85 Mon Sep 17 00:00:00 2001 From: Jeremy Schlatter Date: Mon, 19 Oct 2020 17:30:53 -0700 Subject: [PATCH 170/299] pythonPackages.nestedtext: init at 1.2 --- .../python-modules/nestedtext/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/nestedtext/default.nix diff --git a/pkgs/development/python-modules/nestedtext/default.nix b/pkgs/development/python-modules/nestedtext/default.nix new file mode 100644 index 00000000000..1fbfde7b26a --- /dev/null +++ b/pkgs/development/python-modules/nestedtext/default.nix @@ -0,0 +1,43 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, inform +, pytestCheckHook +, docopt +, natsort +, voluptuous +}: + +buildPythonPackage rec { + pname = "nestedtext"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "KenKundert"; + repo = "nestedtext"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "1dwks5apghg29aj90nc4qm0chk195jh881297zr1wk7mqd2n159y"; + }; + + propagatedBuildInputs = [ inform ]; + + checkInputs = [ pytestCheckHook docopt natsort voluptuous ]; + pytestFlagsArray = [ "--ignore=build" ]; # Avoids an ImportMismatchError. + + meta = with lib; { + description = "A human friendly data format"; + longDescription = '' + NestedText is a file format for holding data that is to be entered, + edited, or viewed by people. It allows data to be organized into a nested + collection of dictionaries, lists, and strings. In this way it is similar + to JSON, YAML and TOML, but without the complexity and risk of YAML and + without the syntactic clutter of JSON and TOML. NestedText is both simple + and natural. Only a small number of concepts and rules must be kept in + mind when creating it. It is easily created, modified, or viewed with a + text editor and easily understood and used by both programmers and + non-programmers. + ''; + homepage = "https://nestedtext.org"; + license = licenses.mit; + maintainers = with maintainers; [ jeremyschlatter ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6ae48a44d63..beb4b050d6c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3978,6 +3978,8 @@ in { nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; + nestedtext = callPackage ../development/python-modules/nestedtext { }; + netaddr = callPackage ../development/python-modules/netaddr { }; netcdf4 = callPackage ../development/python-modules/netcdf4 { }; From 5cd0d6d710d1156a248d334dd4775fa5934bc047 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 5 Nov 2020 21:28:40 -0800 Subject: [PATCH 171/299] plater: init at 2020-07-30 --- pkgs/applications/misc/plater/default.nix | 30 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/misc/plater/default.nix diff --git a/pkgs/applications/misc/plater/default.nix b/pkgs/applications/misc/plater/default.nix new file mode 100644 index 00000000000..9d29390870e --- /dev/null +++ b/pkgs/applications/misc/plater/default.nix @@ -0,0 +1,30 @@ +{ mkDerivation +, cmake +, fetchFromGitHub +, lib +, libGLU +, qtbase +}: + +mkDerivation rec { + pname = "plater"; + version = "2020-07-30"; + + src = fetchFromGitHub { + owner = "Rhoban"; + repo = "Plater"; + rev = "f8de6d038f95a9edebfcfe142c8e9783697d5b47"; + sha256 = "0r20mbzd16zv1aiadjqdy7z6sp09rr6lgfxhvir4ll3cpakkynr4"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libGLU qtbase ]; + + meta = with lib; { + description = "3D-printer parts placer and plate generator"; + homepage = "https://github.com/Rhoban/Plater"; + maintainers = with maintainers; [ lovesegfault ]; + platforms = platforms.linux; + license = licenses.cc-by-nc-30; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb08f0ec578..84cf77b2cfe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22989,6 +22989,8 @@ in pistol = callPackage ../tools/misc/pistol { }; + plater = libsForQt5.callPackage ../applications/misc/plater { }; + plexamp = callPackage ../applications/audio/plexamp { }; plex-media-player = libsForQt512.callPackage ../applications/video/plex-media-player { }; From d8bdeac599f4f8a9c86a88f34900cd651a7a544b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 7 Nov 2020 04:20:00 +0000 Subject: [PATCH 172/299] nix-linter: fix build --- pkgs/development/tools/analysis/nix-linter/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/tools/analysis/nix-linter/default.nix b/pkgs/development/tools/analysis/nix-linter/default.nix index 62de8bdfdaa..138933ebb57 100644 --- a/pkgs/development/tools/analysis/nix-linter/default.nix +++ b/pkgs/development/tools/analysis/nix-linter/default.nix @@ -1,6 +1,7 @@ { lib , mkDerivation , fetchFromGitHub +, fetchpatch , fixplate , tasty , tasty-hunit @@ -36,6 +37,14 @@ mkDerivation rec { executableHaskellDepends = [ streamly mtl path pretty-terminal text base aeson cmdargs containers hnix bytestring path-io ]; testHaskellDepends = [ tasty tasty-hunit tasty-th ]; + patches = [ + # raise upper bound on hnix https://github.com/Synthetica9/nix-linter/pull/46 + (fetchpatch { + url = "https://github.com/Synthetica9/nix-linter/commit/b406024e525977b3c69d78d6a94a683e2ded121f.patch"; + sha256 = "0viwbprslcmy70bxy3v27did79nqhlc0jcx4kp0lycswaccvnp1j"; + }) + ]; + description = "Linter for Nix(pkgs), based on hnix"; homepage = "https://github.com/Synthetica9/nix-linter"; license = lib.licenses.bsd3; From dd30093d6fd45262cf5c3777a00682b8e4f66ac6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Nov 2020 05:13:58 +0000 Subject: [PATCH 173/299] python27Packages.user-agents: 2.1.0 -> 2.2.0 --- pkgs/development/python-modules/user-agents/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/user-agents/default.nix b/pkgs/development/python-modules/user-agents/default.nix index 80985eed481..5fb926607ba 100644 --- a/pkgs/development/python-modules/user-agents/default.nix +++ b/pkgs/development/python-modules/user-agents/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "user-agents"; - version = "2.1.0"; + version = "2.2.0"; # PyPI is missing devices.json src = fetchFromGitHub { owner = "selwin"; repo = "python-user-agents"; rev = "v${version}"; - sha256 = "04bndajsfnpymxfiggnj7g38cmlvca3ry5k2611x8ibp38x53yhc"; + sha256 = "0pcbjqj21c2ixhl414bh2h8khi8y1igzfpkyqwan1pakix0lq45a"; }; propagatedBuildInputs = [ ua-parser ]; From 425e98b91fdec295d23af3baddce2606493fea08 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Nov 2020 05:38:56 +0000 Subject: [PATCH 174/299] python27Packages.sh: 1.14.0 -> 1.14.1 --- pkgs/development/python-modules/sh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix index 3ef3393363a..964512460bf 100644 --- a/pkgs/development/python-modules/sh/default.nix +++ b/pkgs/development/python-modules/sh/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "sh"; - version = "1.14.0"; + version = "1.14.1"; src = fetchPypi { inherit pname version; - sha256 = "05c7e520cdf70f70a7228a03b589da9f96c6e0d06fc487ab21fc62b26a592e59"; + sha256 = "39aa9af22f6558a0c5d132881cf43e34828ca03e4ae11114852ca6a55c7c1d8e"; }; patches = [ From e57a4bfc4b905a54dda49186102f685680b0b2ee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Nov 2020 05:53:33 +0000 Subject: [PATCH 175/299] python37Packages.rq: 1.5.1 -> 1.5.2 --- pkgs/development/python-modules/rq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index 66ca024b2bb..c788d416410 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "rq"; - version = "1.5.1"; + version = "1.5.2"; disabled = isPy27; src = fetchFromGitHub { owner = "rq"; repo = "rq"; rev = "v${version}"; - sha256 = "0i7yyw828wdvl7ap4gb7jhm4p94502is3xxrgrdgwwp0l1rac004"; + sha256 = "0ikqmpq0g1qiqwd7ar1286l4hqjb6aj2wr844gihhb8ijzwhp8va"; }; # test require a running redis rerver, which is something we can't do yet From 7c0d90e11eda5bd5cf3e970dd786c950c9bc35f6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Nov 2020 06:19:11 +0000 Subject: [PATCH 176/299] quilter: 2.5.0 -> 2.5.1 --- pkgs/applications/editors/quilter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix index 4d1cf5dafb7..b69d20850ad 100644 --- a/pkgs/applications/editors/quilter/default.nix +++ b/pkgs/applications/editors/quilter/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "quilter"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "0622mh46z3fi6zvipmgj8k4d4gj1c2781l10frk7wqq1sysjrxps"; + sha256 = "0ya1iwzfzvrci083zyrjj6ac4ys25j90slpk8yydw9n99kb750rk"; }; nativeBuildInputs = [ From 981c8bb5e24f25014c75cbe050dd16697ca68157 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Thu, 29 Oct 2020 00:14:42 -0700 Subject: [PATCH 177/299] soil: fix dead url, enable on darwin --- pkgs/development/libraries/soil/default.nix | 45 ++++++++++++++------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 34 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/soil/default.nix b/pkgs/development/libraries/soil/default.nix index cf0896170c1..dcec1c897b3 100644 --- a/pkgs/development/libraries/soil/default.nix +++ b/pkgs/development/libraries/soil/default.nix @@ -1,28 +1,45 @@ -{ stdenv, fetchurl, unzip, mesa, libX11, libGL }: +{ stdenv, lib +, Carbon +, fetchzip +, libGL +, libX11 +}: stdenv.mkDerivation { name = "soil"; - src = fetchurl { - url = "http://www.lonesock.net/files/soil.zip"; - sha256 = "00gpwp9dldzhsdhksjvmbhsd2ialraqbv6v6dpikdmpncj6mnc52"; + src = fetchzip { + url = "https://web.archive.org/web/20200104042737id_/http://www.lonesock.net/files/soil.zip"; + sha256 = "1c05nwbnfdgwaz8ywn7kg2xrcvrcbpdyhcfkkiiwk69zvil0pbgd"; }; - buildInputs = [ unzip mesa libGL libX11 ]; + buildInputs = if stdenv.hostPlatform.isDarwin then [ + Carbon + ] else [ + libGL + libX11 + ]; - sourceRoot = "Simple OpenGL Image Library/projects/makefile"; - preBuild = "mkdir obj"; - preInstall = "mkdir -p $out/lib $out/include"; - makeFlags = [ "LOCAL=$(out)" ]; + buildPhase = '' + cd src + $CC $NIX_CFLAGS_COMPILE -c *.c + $AR rcs libSOIL.a *.o + ''; + installPhase = '' + mkdir -p $out/lib $out/include/SOIL + cp libSOIL.a $out/lib/ + cp SOIL.h $out/include/SOIL/ + ''; - meta = { - description = "Simple OpenGL Image Library"; + meta = with lib; { + description = "Simple OpenGL Image Library"; longDescription = '' SOIL is a tiny C library used primarily for uploading textures into OpenGL. ''; - homepage = "https://www.lonesock.net/soil.html"; - license = stdenv.lib.licenses.publicDomain; - platforms = stdenv.lib.platforms.linux; + homepage = "https://www.lonesock.net/soil.html"; + license = licenses.publicDomain; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 250e2522895..3e571724c0f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15704,7 +15704,9 @@ in sofia_sip = callPackage ../development/libraries/sofia-sip { }; - soil = callPackage ../development/libraries/soil { }; + soil = callPackage ../development/libraries/soil { + inherit (darwin.apple_sdk.frameworks) Carbon; + }; sonic = callPackage ../development/libraries/sonic { }; From 33a3ac31693030f0942a960ec0cc411f5a5b0dbe Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 7 Nov 2020 03:12:41 +0900 Subject: [PATCH 178/299] thunderbird-bin: 78.4.0 -> 78.4.1 --- .../thunderbird-bin/release_sources.nix | 530 +++++++++--------- 1 file changed, 265 insertions(+), 265 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 3ffd171295c..ca2b8a77347 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "78.4.0"; + version = "78.4.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/af/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/af/thunderbird-78.4.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "589fe4c9a7ceffb4d027f493e0b074647bb958a62046deef5b8268fd43e6aae9"; + sha256 = "36268a7fe6ec5a0ea0243f83ffbd73204d5c4ef257b0c8857a50428304b2d4c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ar/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ar/thunderbird-78.4.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "b94d46899a7458f9c94849db71975e0028004bf93d5b0695a454fbac24a41ec6"; + sha256 = "831e70f807f05ce2f82bb11db35d05ed80dac53ad00c12ff6e191a627d0d42d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ast/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ast/thunderbird-78.4.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "c6057f5e2937a05f84decc3c2f26de4555314c627210a961882773b2c745ddbf"; + sha256 = "e6efde72ce7aeeda5f7c6d7cc0f3a08265c44546a0f8fc84a2adbc11cc038601"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/be/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/be/thunderbird-78.4.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "94d7bd38e35745f4829abe6cf3ada8e947a2df881dcb1e5f6ef823bbd6e0aa75"; + sha256 = "07fe33390caf37a96c000e0f5435d07711f7a95dbe04f85a222b17ae5a13f1bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/bg/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/bg/thunderbird-78.4.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "d482c6a6873ddb34dc49002b8ecac94e82579fde7d24514500f2de28fc777e18"; + sha256 = "d460e201cbe4a1d6548a52121a33c2aaa7cbbf0e126fa1c4e8a431423424fb9e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/br/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/br/thunderbird-78.4.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "18fc5e174942874ecc41838451aec780485a263584121decfb9f9607ee35322c"; + sha256 = "9e85928f1145391d9c3f238612b93e6344a2ad5e6179bf09502b1b69c8ad1b03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ca/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ca/thunderbird-78.4.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "269762ee175f69ecc9ffdeab2ad66788d24d2b9ba1e8d05f74ff222848077735"; + sha256 = "1516236c252f22933adf23bfe93d73fa272a4574deb674aef6e1f35006a6cc50"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/cak/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/cak/thunderbird-78.4.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "735baa9541d1dfad828db27a2cba54caa681973f792c0712300e4f952803dbfb"; + sha256 = "c46508321d32c468d067d86c04973ca345b09b0e983954eaa123d02778d61fbd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/cs/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/cs/thunderbird-78.4.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "04763e1461106c76b51c31522de9bd6376d531c9f93e79d4a4c00d5bacb9de29"; + sha256 = "227209429c07238f38d334e5ac8a5fd895a4c87f51b21b4376df89c50bb6a789"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/cy/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/cy/thunderbird-78.4.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "974885f8e17be1b744f65c0e392747921508d7e0f286ab9fa20580cc205a56ee"; + sha256 = "b272926205e5470df8aec8b22d6733e4f47993e76123fe81d4be26ad5a153062"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/da/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/da/thunderbird-78.4.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "f0e13b8952478b5ebc46552405421b796d645fbb0a16aa759a045b48fd43739d"; + sha256 = "13f9fe10c84d2b8d8d0215cb58a9852486741f5bc8c6979f0a701bef14a70f4f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/de/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/de/thunderbird-78.4.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "735eb8e1d318e09d9dca6560074960cf9ce2fcd5a720754608886f6e51e87266"; + sha256 = "590f9a5a975544d2effedda942e3989a13be23b95f4e6707f9905fed3fc08214"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/dsb/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/dsb/thunderbird-78.4.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "b1b5fad405049cc62784dbb6e938cce6492df3b620c25a0987a594a88d0caaa1"; + sha256 = "5b572c847f9ec76b25c225652c23ecf8c56523ffc3071b437310f0d8f9049b05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/el/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/el/thunderbird-78.4.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "1bb01c5fa05d3dae7d1216a0b3e01354655e96f728f63b8213d1ac4ca08e5b8e"; + sha256 = "7cad76ea5a07dce6bdd3db78485f83a998ff27037f8ca68f8617659a06910a05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/en-CA/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/en-CA/thunderbird-78.4.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "cc7280af5ca21c82ae8e4fbcceac117b1b3c2a2e95db418cd60322161eeaa0ba"; + sha256 = "f261b38fbc8d83c20be63015a444644a95f7d8b6584fcfc193145abcc69a4164"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/en-GB/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/en-GB/thunderbird-78.4.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "6bf5112867c3493df18880858e483b684946b657bd10960f55a0e55bc364d8a5"; + sha256 = "5c0c364b1408182c0cbae1c2d05041781e2e4f3a17fb1735d61196c9b647dba4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/en-US/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/en-US/thunderbird-78.4.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "24780daa2b17799f263a6c16b770b0e6710d14f7f1f502f4868fe48d81ca8e48"; + sha256 = "a152c3b8c6ad4ba3a92a8a1f909b99599d8c3ded62b57e9721fb333b47f6509d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/es-AR/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/es-AR/thunderbird-78.4.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "ac6e82b950f6cd0d7a964815c58a28f602580813ce29cb33bfcde36205d06def"; + sha256 = "dc06a64e0b20dd174d6158e5d2f393bf6a6907f8f515120220bb2a8480f58d1c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/es-ES/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/es-ES/thunderbird-78.4.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "67a03e3c7b00d5e0953ae9eae031ddb42337e23ff9e65ed7c0b759e1c2fa4426"; + sha256 = "7d3b7ff0ffb9b19f10bd7c2cffb5dbff8216c65c01fd4032ba5b7924c73ce343"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/et/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/et/thunderbird-78.4.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "fe5af4823e15422da39c49c3fed60fe460ad23b7c78f6b4fc85ce247a09cd0a8"; + sha256 = "a9a8e610bc1c696137ee650fa11f2cbf8dece4ba32d1f0961ae697f6433cf1b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/eu/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/eu/thunderbird-78.4.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "94699170301daed68a6d8554816c37cc8c51d72fbd1642cc5a066ae4d5a394b2"; + sha256 = "6835e8459b4191cd4bb5ae8011d032d475631e7a532450b98f0b087ed0a80fb6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/fa/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/fa/thunderbird-78.4.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "fd22c75cb11bf3fe1a3d2faec1cb7a2332131ac62324bffdd51cc8f03e95a372"; + sha256 = "7cfd8681a7ed38364a823881fbb42af8cf33d17bf911e9f5b97dd18102b412f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/fi/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/fi/thunderbird-78.4.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "df3632903e77b9eb5fda1ff1d8a155b1f3c4861a8821efeb1fef4d39878a9349"; + sha256 = "8c84662afb60e3dc94eace5a493f7feef6598b78613fe99f195408e4ee2b0a11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/fr/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/fr/thunderbird-78.4.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "5100b9facddae8451550fa0a65b9bd345066e7e465916ed3728b40cc9ac06e65"; + sha256 = "24449816c690757b05d1913ff1fa12eed47f316ac13c76a195ae0628c6950da0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/fy-NL/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/fy-NL/thunderbird-78.4.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "40c7fe9bea5b5edc5a3e62f7d1cf18ae036544c0172954440d036086f90ee119"; + sha256 = "9a0334f032333eda16cdabd5dffb05f5a22edb1dcf4bcd0b47495defd0d9f3dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ga-IE/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ga-IE/thunderbird-78.4.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "4ec2f91ba73d3a7ab99d69af2a7d99cfb2280c3872fd4dcd7436ae9362586d06"; + sha256 = "33e5a54e2259984ff29d3394fe936b5af8830e489e0775ff36eace4c6b3dc145"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/gd/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/gd/thunderbird-78.4.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "f6d168939a0157c2d450c43d818005e3b9a59e8caad5796492e8078947234b29"; + sha256 = "b91c4b3aafa2166cd27c52977711c55aa425f68c5f7cca64be1dd07fd533bc05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/gl/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/gl/thunderbird-78.4.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "2fb6b4995f722e82503bf88fbb3b5275faa4d392bfa5832735ac1d40bbe3ee38"; + sha256 = "d1c03b3b92bef4f3c94518981cf99840944c8a36aab7b2cfe3f72f1f0e57e045"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/he/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/he/thunderbird-78.4.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "70f0bf4db60ad4f1656f0aca1575fadce3a697634f60353bc3d63e3336225d2f"; + sha256 = "7fdaf0e83eeb39b66a6d1c2600f2c6f1b69ec4f67dd7b33a39132e838a699f06"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/hr/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/hr/thunderbird-78.4.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "d37ac64cd63a4cd66fff1bd30ee3643be75cb977581f2182a95c27a16607f3a0"; + sha256 = "4ba99eaa25964bde6108eeab702b096ba50b45d8db7e36f3203b0a71cc1e30cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/hsb/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/hsb/thunderbird-78.4.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "85e823db225258e9f74e04c61faa89e7c9553445900083f22b7aceb22ef3d901"; + sha256 = "187a5f2b2e1b16fad948356f31b2ac903fe318432d9a3f105055c23d1225d11b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/hu/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/hu/thunderbird-78.4.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "da897b48a2e4a5a3734016ef18c503864792d5c0943bcb2644c272c1a7c63f16"; + sha256 = "8f6b79692143e6e27cc844985366004d06c8e55184a73477fd20020575947ad8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/hy-AM/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/hy-AM/thunderbird-78.4.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "dbe1276b14b5864be5fc2de3708ea320d2dcc80eb654e9bad56950f818903484"; + sha256 = "4066683e4a635b163b9b14e1921d834b37a95cee8dd04fc6885094c5e0394dee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/id/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/id/thunderbird-78.4.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "86c7be9b6385ef437323069a7e2497b3a18a552af9d9c4523789be4ee2e07b22"; + sha256 = "1fed6d3a9a11d303db2f2c6f7a92639b92ca144ce3b45eed4607696ea4617511"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/is/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/is/thunderbird-78.4.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "8e062c75b579d52d1a887d2165bcd3eb1d0c4e435dffc05d0d76d4404dd061eb"; + sha256 = "a627c95d2284b4e828a466865aa19262aa84a1a2267235c3f62d13c52081c580"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/it/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/it/thunderbird-78.4.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "932de1926441066a472d5e68b933fd4035f2e858fdabd4b9d4e71ee6e64202a3"; + sha256 = "6b01e88da702deee95a3a6d526e563e854be7ae13414fed3a2c9cc427e906ffa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ja/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ja/thunderbird-78.4.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "2bacdb192fda85f10f747a8c8a2ef3bc60345075c1ba33947594fcc66eb35e5a"; + sha256 = "3b63cf4c45945f4a40159a417ed217b77128905de82812fe2165c0c5f66410a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ka/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ka/thunderbird-78.4.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "110d71951f0f3235ab63c02e8d979b2777de4abd4906409b96107fac1f6d7466"; + sha256 = "c9d11ae298691f2e302078f865b047b1c2b568ae763495fbfe2f2d4f04a9ef6a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/kab/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/kab/thunderbird-78.4.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "f765a32900f0100f03aac4cdce7f33abb44e53911011cef6f6db8f9dddd11124"; + sha256 = "b6367ccb74b2ced8708ca9f4c2c06aeaaf4f3bcba0b2b2fdf2c552aa10fcfc03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/kk/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/kk/thunderbird-78.4.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "9af2ab317e0736e0dbab419f5061a6a5c83e521d15f38911455a2d57f6bae945"; + sha256 = "99ece9975a3981fa33887d3b5d60cd6874e1dab7c51d830dc0d13c28c103ca79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ko/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ko/thunderbird-78.4.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "06669829857f1c49acf7a58f6a7f0e5a4d8e4ce93703cde0d36525f5bb9697cb"; + sha256 = "d81c844cbd490e5eeeb2739a9b040062baf3bbdf13ddfbceb59b5630019b935d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/lt/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/lt/thunderbird-78.4.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "f85e547d17b6bae2597d4b780b14f9076d70dc7c63ae85427b54c01f0c559b72"; + sha256 = "56b5813a5b0debfe90fa2a20fb9a13ea210e2eed37f180f3e23e851f871241e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ms/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ms/thunderbird-78.4.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "e21639c89686480be875a0514c1b1d99fefca6b79da80a5406f37a63e316348d"; + sha256 = "8dc3f341a69b9ef458c1203ff15779beecf3db2dede1cd8740ee19a9552f22f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/nb-NO/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/nb-NO/thunderbird-78.4.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "652d43cabbab6ab158b3d3ab70cf83d8ed3ae3524232aa340d17c248dc5fa869"; + sha256 = "0fe431d3773de39431cd777cf301d2c3d8074dd41596bf6a6f1bef96870413b4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/nl/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/nl/thunderbird-78.4.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "2c5f173545ef0ddd0c93c921931850e9a7f457575188a91d243245236fe09384"; + sha256 = "4127bdb6338210d9928fc84838a57cfb731aa3254aa5427471deca00bb12beca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/nn-NO/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/nn-NO/thunderbird-78.4.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "f89082f26cb871befb4f8c82c31a9d1cdd5587d20ad3a9a1e78515f947ce4271"; + sha256 = "cf0c6d67115ee36b80010d93d50991a544af332ca19f1ed1199f49c7dd125049"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/pa-IN/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/pa-IN/thunderbird-78.4.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "75d7f3bbe88ef2bab33e62834a765f814f75a28e2277afef2517a91be98201ba"; + sha256 = "283c2be7f9bc0aa3d505f1838f1c03721a4b956870ac2b1e762b966e87767ce0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/pl/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/pl/thunderbird-78.4.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "c016668ef5f80043eb3e3eff6c8d2327adc3ed86375e81318fb8a4a9fc4689bb"; + sha256 = "4c07e4500ad4c0d698942e3c47ced3bbd6142e4a70292629ebbe53ef5f1816f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/pt-BR/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/pt-BR/thunderbird-78.4.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "637a97f3b584e315ebec350a08fa54d17cde8825385736a2bc4ca1937dd552f3"; + sha256 = "c6ace3452d1720681e668da50d16811286c1e73021bd06ab9b538c6f6fc5fda6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/pt-PT/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/pt-PT/thunderbird-78.4.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "9719af4fc96ecc0e01f8ad4829f8a94004cdeb518d10f12deb41073f6b0d6f32"; + sha256 = "b9ab4d38b271e2987b5e425a277042dc149794cf461283114553133e7fed5f06"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/rm/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/rm/thunderbird-78.4.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "d3467e689f512a3032f9dd8b022af58bf7d61dcdcb1c69317629f0c0b37aa2d4"; + sha256 = "50fc69135b789b2bb5d8008292d3fc25f1a0a30bba35c6e24ddfeabe55231407"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ro/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ro/thunderbird-78.4.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "25985053e562792ffdc5757f201d6171cd7f30199eae7ae2f50cf39b5090feeb"; + sha256 = "1e050b33a942dc815e739c57944a0d705982e18e74637172b0366a9b06916f7b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ru/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ru/thunderbird-78.4.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "2c0769be95e0a21471197a1f1b979bd36b9793f4242f7ac329c7fe0fe88fc5a3"; + sha256 = "c295bda57db84e07f28affa4201c4f612478efce733cb9c69962f6d7a797218b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/si/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/si/thunderbird-78.4.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "2a6d7e47e92166ac1636495e5cbd1849285576cdd812d650767130730002aa6c"; + sha256 = "63dc83cfab8be94893ca6a0d60e448d14db1afcae55192149a882456dca77e9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/sk/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sk/thunderbird-78.4.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "5d0de7356dd46a9ac1cb98254167fa7be34b6897e5ea69ca093e71a850d53363"; + sha256 = "5ab5ea76649582ddf10fa77bbb95040d157883e0905df72f5bc0ae79167d97be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/sl/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sl/thunderbird-78.4.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "8c7e69e7fbe49ba34277e8cb7cbf45eeade086eb460a92e243698824cdf3d5ce"; + sha256 = "da3f8a30797386bc7c9ba135ba360cee01143bc76a2315e7a2223bab90e2283e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/sq/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sq/thunderbird-78.4.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "95cfe7b956bb590c790c156f22ac3c5cdc1dd3e4d7b64422583597fc9ccd8c28"; + sha256 = "f2f9639c4b4dc4bfba476aa92814fee65ecd3fca27652177614d1107e4200246"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/sr/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sr/thunderbird-78.4.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "82573f011da92f7d93d6cf0a700c9eae31a46c6d09671afa63afa533f063e5bd"; + sha256 = "3bcad0c845e4481a22c1b330b6cd94c3c6fc46c33597ce5af0594368579a8260"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/sv-SE/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sv-SE/thunderbird-78.4.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "5fda7b6e8095bc456e684887a82cb2adcc14fdfdd9f14731f2bdf2789eac4930"; + sha256 = "9b09d4ab71000429c5015dd8a0642cfe0eeeaa785d2cac6e876b1cd6aadaeb44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/th/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/th/thunderbird-78.4.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "0e33b43cb7fdb2ae4c30480e264e00651181f2034af42d7a3ac2bfb57c148896"; + sha256 = "b33e42f0271ee84a581a737513197d5f036695706b19697a53000834c199c75f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/tr/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/tr/thunderbird-78.4.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "05019602190a28ecefbdc5100b40409d3d6288f076d589136724d07e111bf324"; + sha256 = "f419ed9f0f06575da2f89486d830ab7fd2b439dcfcac92f1b31c573901e7b9ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/uk/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/uk/thunderbird-78.4.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "2940500895c734857b258550b85f846e9eb5be68b6faaf808ed7a9867c423d14"; + sha256 = "bcecec66a6ef8b928da2aa5d52d89f4f1587d4e45bf0e836b71912b0e5a43f7c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/uz/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/uz/thunderbird-78.4.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "de82b265c6e19495abc70c36f377cef705137f352da0aa7d01aa874e2a9f1f70"; + sha256 = "2b33f40b9da386e61f3bdcacd9c16fc06dac18d2b36865292700744dfbe2da25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/vi/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/vi/thunderbird-78.4.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "cf02606c0eff0b941c1c2ef654e250d5d6a8cb7deda752468e779af1b616c0e1"; + sha256 = "b5d005c45221c41e1e81234b755f6a9d380220cc03f43012c40440a0378c19e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/zh-CN/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/zh-CN/thunderbird-78.4.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "54a1a869a746ff3af8d5ec27b11f1d3a0efeb49480043fbf776e9646b5be944d"; + sha256 = "c08765cc8562cce08b4cda04123cd8672f5abb130b597f36f4c143d74b09b9b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/zh-TW/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/zh-TW/thunderbird-78.4.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "0c9530adcb5029ae570a8d25d790f243c0a3d6ad7701ed071fad326d3718bea3"; + sha256 = "56f84ea43a5288a6cd34f8de5f69dde05737474f11c70d638981ef2ff4ea5bfa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/af/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/af/thunderbird-78.4.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "29b39333cfd9919830cecf1b0043faf4dd829c36554fdcbcff6a8dbf11882060"; + sha256 = "95384cf3d0ab6ad8d3bb133e8ff7c1881523c0f7be840c5ab6016325ebc7f9ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ar/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ar/thunderbird-78.4.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "49896345d391f22f262592e055b2bc5fc1852d5fe1f9812392ef09b9f329afee"; + sha256 = "c2cf87579a092bec69042b35743574872b8b791d54628c35c28d44c1dc605b6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ast/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ast/thunderbird-78.4.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "71a952590eec188661f8cf95f62efb2c9f2465aadec361c990bb62481938b128"; + sha256 = "127ce24b2c06606e9567e2106ba5cb9628d8bda10620b01cbfe60bc287977c94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/be/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/be/thunderbird-78.4.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "d99a81043f6c158376c960d0dbd60f6d2e73ee1e6a015aee55ff42786e58fc21"; + sha256 = "e8acd7cc25f91af91caee7487598cf1f60512864cf1fee714d2289a65f0cc195"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/bg/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/bg/thunderbird-78.4.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "1226b669b2b2e7c890a1de0a628e663069c2279369587a8b819756584be2ba0d"; + sha256 = "461e4ec0b0f3dcb78426a99f0b8dc32b14dbc561b89e8d422433f5360425448d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/br/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/br/thunderbird-78.4.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "2f656a4269f37dd8513cf2f0b799d97225ffe55b00e778dbeedac66bf7b00d47"; + sha256 = "ba3902a457d0570d3eeaa63cc83a67e35532e547127b71f38781158bc3cc5e60"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ca/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ca/thunderbird-78.4.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "34dcc816776f2da32bf7412a802a8d3d7a0b31afcfb1811c617f1295ced05adc"; + sha256 = "609de3623c6f4075bedee741533843f6f9fd1afc5933fe3a8709f5c16c7d7bc5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/cak/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/cak/thunderbird-78.4.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "f9fb448edc5238b69fe3c08c665a30320e5662c1df78101ba4807d371a6a15d4"; + sha256 = "4a5aa707eca53cf5490189a09d222abaa8290ea3366d4bf081273c23e89b3fc0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/cs/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/cs/thunderbird-78.4.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "156c36781f43fbaa3eb5d1d32ca7d6b3c9573261757dc9c78e8cf0be24a6c717"; + sha256 = "0450c73284b274af21f3f0c4c21842e11fa2a86fcb38f96332c1ca8984149c62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/cy/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/cy/thunderbird-78.4.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "0e48e453cddf00929e189546f0dd478e273dcd8bc891fe875f553825f0b4fcc4"; + sha256 = "5686316ec53a76dab272934dbd274a47802c5c31f2ae8719bcf85c22e12cc3f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/da/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/da/thunderbird-78.4.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "e614911f79a2a86055e6914aa0f4922979eebe4229b26b18f6ff31cc6bb49c89"; + sha256 = "2025f5946989905fd197fe5bf6c51160e7c9d281d6cfd220ea3ee0393cc54ca0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/de/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/de/thunderbird-78.4.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "a8c916da07945657672b5b71a722485fa7117dd912896bc9eec8b9b82dfcc48b"; + sha256 = "906e8a5de0aa12b496f4d4447df25432b11c88d79b7ab4a55291a9d65434aa03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/dsb/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/dsb/thunderbird-78.4.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "0b3ac7ec984e26b66cd3c5df733c3cac6b83f4388cd65344dc40310651798c05"; + sha256 = "d6bfb2b790d8391344916515d1cc6ca2eb68a3e58934cacba14e77788aec6b09"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/el/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/el/thunderbird-78.4.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "dbfd90c1810dcad51bda6a7d2de6a132f428a5c6151c107cd09a98a48b2ce98d"; + sha256 = "5f96345a945697326b24fcd73a96fa2f49edb66b02f4c23b6d392fad87935e08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/en-CA/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/en-CA/thunderbird-78.4.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "3ccd8193d486596ebd70e3e1803563a3a8d59ca25c29eeaaeab78ab78cb0e72c"; + sha256 = "b57e44fd16e33b178778a60f0bd47519585a3e648b3b621f1fd693836c5fb598"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/en-GB/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/en-GB/thunderbird-78.4.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "6d74ef15e0196a2b07302f40bc3992acc8ffc94ff7d90433a00d766a0840226a"; + sha256 = "6f656dcbd7aaab5995beb11a9847e32f8820199272e2f9ce27583cd3d7e50a76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/en-US/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/en-US/thunderbird-78.4.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "718e57f9b1d7f1ca5c52dfa8aa109f8cdda279cfb6dea649add651b6637fc6bc"; + sha256 = "8c6bccc757df947bed74a3f7448a3885932a4f6c21d24ab6b5c7a94ab83ebae5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/es-AR/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/es-AR/thunderbird-78.4.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "26dea055b9c6ea2b8f7e15b0c93cd3d880c83bd1c9f23f8d572a92659740986a"; + sha256 = "55bbc629ceadf359e0ad05e763a31479f6c57c38f372e55812b028681a5ff32a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/es-ES/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/es-ES/thunderbird-78.4.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "90d115cb34ae852332e5bd792067c66f1bad920721da68f59b38a2a86a8a0105"; + sha256 = "bf30dd8882b2b35bfaa62a6c4b40a823333476128a6d5dd3e3d2c8eb16303b9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/et/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/et/thunderbird-78.4.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "a82aed816b1ea065e21120a8e6e0345c477b90f9c672c04cee9d15ffed85ef28"; + sha256 = "5b977eab7f203e230d6a03b36afebdb32c481f1eb8129e454977791469ed5651"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/eu/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/eu/thunderbird-78.4.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "7f1bf5742159e15fd566827db713421778262377a8da9ac269fc6af635f1b20b"; + sha256 = "f2d606a6f825640c0f344cf470d87a1dea5fc6ff538239ce25c3d7c9fc76237d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/fa/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/fa/thunderbird-78.4.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "25d97499486a7c3d38c4686f7ff5daf930694f6614d3d556af85c3cb99193403"; + sha256 = "95d0d3d1b456c035cc6ed09df970e9e772a71af3703f05e9388e844d7f80edab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/fi/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/fi/thunderbird-78.4.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "5531179571b0306ae2c1d5f4af40047ea9a5fdf65137bc7c255ee7f5dae2bab6"; + sha256 = "e0be2532774bbe017a6091d7e1ec79901f692c39e04e01fe4094f7c8179fbaf4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/fr/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/fr/thunderbird-78.4.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "12e33246e17aebac0547801d5d4e23db0523ff260b5345b8f0a19fc5cf44f2b5"; + sha256 = "48cc16a61958160f369b32e8a0dcd2979ee65e18efe3d1dd3a4af1109842718b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/fy-NL/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/fy-NL/thunderbird-78.4.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "50c6dff9614b113ea57d4c75dd0768a8524743a7b9f462f84f27f10daadbc1f5"; + sha256 = "386d0a2ed01b158f0fe18eb6820ff9a17fbbea61241eaf873782271ac84eb103"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ga-IE/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ga-IE/thunderbird-78.4.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "6c6229aa064098560b13369a0d11133156d47193a8f8b2fdc241fbcba3cb3f9c"; + sha256 = "c0c15410e6812e8652181ab347b3fe60fdce3b5b9958d54ef3f96ecc46a4d344"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/gd/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/gd/thunderbird-78.4.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "6e5f686d98b02bc97e14f5788eac7b93e5e2652e9feaab0906cb026a883b1485"; + sha256 = "3989f0c0f87ebfca3e4cfad0ac9ca2964791ab8f1163f1bec340444ae4a72a7b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/gl/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/gl/thunderbird-78.4.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "2ccde2411bb2c3e4b492b4cacbe8d756dc22c2164fbe7364bc2381c1ff582f75"; + sha256 = "eb1b58c93e492a79f92660909e671ee7ec504701b8e074d3dc6f3d3fe3619660"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/he/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/he/thunderbird-78.4.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "30fe226741e47f86f07c5acbb8fe3d2aa2fb7102fb4743189f12612c817415c1"; + sha256 = "f584e117ba4fbfbb7d2c28b68377a88aad87929657141adac5ce960bcf5f4fa3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/hr/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/hr/thunderbird-78.4.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "4230396816f72ce2784bab21fa2fe731ea378f1ceeace609e0423e2b5e7ea83e"; + sha256 = "633eab2f8ac99426dd85b614f04d96509125f0799c187305b7678496d9ceff0f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/hsb/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/hsb/thunderbird-78.4.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "155a4e98c597f7876ab44276ab8814ab185a5a59e1fdb743260bef2f78b27e4a"; + sha256 = "80e4b98bbc9874de9b4c8e35633f6eea7b5707cfc4943df7264cf0bbfba49d99"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/hu/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/hu/thunderbird-78.4.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "bb0b46dc74b926e9d13c4bd8b0371d730ce03aeffa5c41689eeb797ae1ce4382"; + sha256 = "5a9339a876a7e0dced6769a99a948329f6eaa400acb6920a24d06695120f682a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/hy-AM/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/hy-AM/thunderbird-78.4.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "7ee0ee79ac2143fe3ce8930c3916f201910d6d7a40437fdc49a8c617d49871d8"; + sha256 = "286542d67a76a6e8f0c34e7aca9c23c8922bf85f8be77c913285e208f8b195a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/id/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/id/thunderbird-78.4.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "e1a4072dfdccfdf35401e9a58e77cbff2277703ff2c78a52fc0df801bca8f91a"; + sha256 = "930cbbe1520c544a25cfbdf8d10b4e6ae19a812c8a20ce51053ba0d5fc2b4b24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/is/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/is/thunderbird-78.4.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "d4d63add23724c58fd92d992165748f7002540f73df591914540f6361dc0089b"; + sha256 = "7fca3c4c9d3a309ec182d1486438973741fe2f1e39afd3ccb769256657db20a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/it/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/it/thunderbird-78.4.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "28ec9beacfb8b27b80e1f1deba83d81324a2d3baa0d9572a41a94f920c8c60aa"; + sha256 = "3b44f63975cfe7460f3eadd9f71f13db9ded5d9e5622ec322f556692f979434b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ja/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ja/thunderbird-78.4.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "ad1f9e091cfd66683964f8d683653b3134068174daf24fe061aad00d0c864176"; + sha256 = "1284e52cda834b1ef9b5ac6a1dc29858f6e1519d0fd47d330744c0d294338650"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ka/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ka/thunderbird-78.4.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "9074e7b2eb10943f6b87e79be9ec9ae706eeb4300c85ffe456bb34f11798b81a"; + sha256 = "b12a79e20fce3db2541dcde61e04206e82530d1d79b58637bfcede87294fd801"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/kab/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/kab/thunderbird-78.4.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "7b7d17a26dc9914d46de8959c08d56ed92b263d3eae383ca71d45a1b37a9650f"; + sha256 = "9766eab276e77b0e33ad7ecbf8f26b84aa2a079a4fc9e4dfc992c41074513e40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/kk/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/kk/thunderbird-78.4.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "b38db92efa1b4bc1067eeee7eaf7307d6e86e6c6d3f4dd1b81496768c981d5af"; + sha256 = "aec202db7c28ae69c9f7684a2e4f30a16ab29ec983aacb32bbe4b5bd31b76e94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ko/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ko/thunderbird-78.4.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "951a2e6e2cae525618646f8f054d127b32a535028930eeb3be7dfd2720c4ccea"; + sha256 = "b0e553c14925413461a87f1d81591bfa4e2ce2c5ad87e8ec609fef76ba4f17d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/lt/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/lt/thunderbird-78.4.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "5e76866c25f63aa283e54c871e1014a10e4ecdb8182ca6bc3ac1d16a344ae8f8"; + sha256 = "6036247e3025c2b513762577e7de1d1eda050572f674c31391e583ccd16e80f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ms/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ms/thunderbird-78.4.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "74e28f4ed81a233bd8aa721515667b31e83f7a6d6bad0aaef421f1f1e4b0c4c9"; + sha256 = "0852cb745130e22af327e2ce39249751ed482c8216c18f4545bd294f4afb4e29"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/nb-NO/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/nb-NO/thunderbird-78.4.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "4cfa6097b0879de04314773d96d3e03aee3b7e1680e97cee3dbb6fca9e4010ca"; + sha256 = "eebec58d3a20956894711266715ce5a4afcfd44b5eb7b334dc0c22068fbb10a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/nl/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/nl/thunderbird-78.4.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "e097065367e8bcaa331803c779ff71e43dfa7dcc5b516fd5d73f60b1c614c7a0"; + sha256 = "0c6d35960d89681087bcfbf403ff727f53ba2e67de9c69d04f96b68447b616d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/nn-NO/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/nn-NO/thunderbird-78.4.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "e3bc6a3754f13db3dc5f70c3fd9b70b4250be494a47c7d20546dccb57b914ae5"; + sha256 = "b761b921ba2e604dcde7ac0e03a83ef29a3311309cb95bc39801b8bcfd80ef98"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/pa-IN/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/pa-IN/thunderbird-78.4.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "80a785335bd49d5d0e8c669a7d548c0e077c413c184eb50133aaf5790fe1148a"; + sha256 = "fa350ad64a3ff760a6e2cc6ac6b6ad1d6b9ad300b6c3420477148152bc207499"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/pl/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/pl/thunderbird-78.4.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "bc20f221babef7c3a3992d57ab5a3afcad12faa0263ff8978c96a1267af54c28"; + sha256 = "8b187d44bc1364dc76258ff3452610483b2ab3d060c9de43e47c25fd3103c5d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/pt-BR/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/pt-BR/thunderbird-78.4.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "6dd040a2046c418d51bd7103d93a50b58e3345de5ed0c8917c0a8a8c7bf87c7c"; + sha256 = "1ff199f91e49d72bd9821bfe3e2d33cb4a750a6c46aaf16a80554c195694ed43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/pt-PT/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/pt-PT/thunderbird-78.4.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "45f67266e6af96dccae07d6db4f5d62c3d6d26e1a76e4951f08591c664122359"; + sha256 = "098043202612b362a16353c84a5b9e662331c2311679357592b5a77a6690b68d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/rm/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/rm/thunderbird-78.4.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "1d53a7290332375212c0d58af23265d59502bce1a6a4629b56bc86d048be65a9"; + sha256 = "ab9bb22e53da48744885634a14886ddb23dd5ccab376e5323824daa3f22ae0cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ro/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ro/thunderbird-78.4.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "de3e5496ce5b8c4dff6fcbcf2b8a47b0c81d026fb5334e2668b8f9fc293c5216"; + sha256 = "fb3e61830c5693c7f3b84eb4e3c60ff97324c5654352008aabbe9f16ea40cb0e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ru/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ru/thunderbird-78.4.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "838b9a02684541ef7df67a23b9966282ff9d8b12b64dfcbcfea8e8381b24951a"; + sha256 = "f9fceef81a605ebc66fd90e2759205c4eb7160095312579eb7543b4293dd7a7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/si/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/si/thunderbird-78.4.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "202f815bdf7538d50f4770e601d10c8a1ffddb042a3c7dfd1a1b65e9b5dc5ec6"; + sha256 = "0903c3d1bf790c5c10167839e3bc60d80a23e4230895703f7c931856cb617038"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/sk/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sk/thunderbird-78.4.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "44c5aa3723919798493e7f43c927ac48891eecf94a69c79b86be107984e9e068"; + sha256 = "2018e5685fbcb5c2cc8925be39b04f6d98347cb59446af62846378818d6435f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/sl/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sl/thunderbird-78.4.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "2d5125d9625f916788265db46ee1fb47ace3b6099dae26ecb734aecf36160949"; + sha256 = "d20b13b5caa2f5c9c431f3e69095f094800fa520b3a5a57c27a4c9c565961fb8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/sq/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sq/thunderbird-78.4.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "2aa337b0fd8ccfe86feadef605ca863499f21c3ca7f194121064fc060d5a3de7"; + sha256 = "164041c3958f57f90d17fe1457205a420f326c17e88da0197732435cf6a5dfca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/sr/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sr/thunderbird-78.4.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "fe690670c6702ed63684eac68a3f3f29f12bd27af7d34c63af768e0362a1eb11"; + sha256 = "8ffcd2dea1b4980519220a27346b5c0fa955b89580836c38711c21c8eb7d26c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/sv-SE/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sv-SE/thunderbird-78.4.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "74525ce44ca330e8fd29785842992c62cf3b5494675ec9a8148ea14d945fcaae"; + sha256 = "83536011e7bfe2e7a0a760ed879e041b4caa3ee27e95829331faefd29e8deebb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/th/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/th/thunderbird-78.4.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "0503e2ed79dae95302bf2d9d8055589ed1ca511c16c35a9b84445548a7a306d4"; + sha256 = "13be237b698dc9b468af7a2b8ff062118421a7b798771f1db4f82bcb1098f83c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/tr/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/tr/thunderbird-78.4.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "c4b14f4f22549c66f5f445a2ad5826d0e90332c9d76783851078625245625bbb"; + sha256 = "c70d085f6ceed58e7ea55ab01d121627a55df2f5e961ef160f4965db941660b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/uk/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/uk/thunderbird-78.4.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "cf06114027f9bf14ef506fe37e6a7ef6a1cbdb201cde061a754c82d9b3ef0c39"; + sha256 = "c1b7b0efe7af03a488c80020247e2d8038d6dffa313188083bb75c1bc09c35fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/uz/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/uz/thunderbird-78.4.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "c805d88694b105412f05dd840e038edfef90b4a48b5a79b0bac5b5575d50a14a"; + sha256 = "f4b8d20603c5e1dcc72760623803fc4cb34fffffd7b394c1998b860b5e3bc129"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/vi/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/vi/thunderbird-78.4.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "ca30574d981964eed7c3a100dd76f90c518a24d7dcde74f0790ede4a0a8d3285"; + sha256 = "6d9d7885ba742ae28766ed98e64aa59892ffb51ad67eb9bc47d5a3974b8a7f50"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/zh-CN/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/zh-CN/thunderbird-78.4.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "6cb1566d330e36b03e86bcfe96ad887fee511ba314167d235facba6c47871688"; + sha256 = "e47c2e9b66c99c8ba02c60f739d31ea2d679cdc4d6f1f407257ef3372cabf364"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/zh-TW/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/zh-TW/thunderbird-78.4.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "7af0d92565a54bef6c962dd8b9b100198e2cac8d47ede749bade87c30d5ee37b"; + sha256 = "1cbab249ae670a204e464a9082365967a74ce2533bdab60682c14fe65dafba16"; } ]; } From c8b7c9bf69053850d67b74ea3f3e3c2de3733fa5 Mon Sep 17 00:00:00 2001 From: ilmari-lauhakangas Date: Sat, 7 Nov 2020 10:53:46 +0200 Subject: [PATCH 179/299] Remove vigra and glew as obsolete LibreOffice dependencies --- pkgs/applications/office/libreoffice/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 111e50b7d45..2f961f43da0 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -6,11 +6,11 @@ , openssl, gperf, cppunit, poppler, utillinux , librsvg, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr -, libwpg, dbus-glib, clucene_core, libcdr, lcms, vigra +, libwpg, dbus-glib, clucene_core, libcdr, lcms , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio , fontsConf, pkgconfig, bluez5, libtool, carlito , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf -, librevenge, libe-book, libmwaw, glm, glew, gst_all_1 +, librevenge, libe-book, libmwaw, glm, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook , gnome3, glib, ncurses, epoxy, gpgme , langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "zh-CN" ] @@ -394,10 +394,10 @@ in (mkDrv rec { libXdmcp libpthreadstubs libGLU libGL mythes glib libmysqlclient neon nspr nss openldap openssl pam perl pkgconfig poppler - python3 sane-backends unzip vigra which zip zlib + python3 sane-backends unzip which zip zlib mdds bluez5 libcmis libwps libabw libzmf libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux - librevenge libe-book libmwaw glm glew ncurses epoxy + librevenge libe-book libmwaw glm ncurses epoxy libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]) From 00213ef17f8bc35aae3227012256713d17b1d0d8 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 7 Nov 2020 03:13:09 +0900 Subject: [PATCH 180/299] thunderbird: 78.4.0 -> 78.4.1 --- .../networking/mailreaders/thunderbird/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 7494c113805..1f58ec59a7c 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -70,13 +70,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.4.0"; + version = "78.4.1"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "04b6n3gsan0a5abh371ws3c3rry4dcb3c6rbqmcxkzrdjg2xr5vn6xhlg3dgl3l01p0hp1xqpckj8g5yb2dq2x07xgg1hnyhs9aadh5"; + "2mbb139xdi69bnvvg7zabwbw181xnz7y154viynmkwyh4iww0hcsvr88q246gnif8a7jns3pi4qgqxgzflyl6mzpsvfdrbjs5hylanx"; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a69bf422ca..86da651d900 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23811,7 +23811,9 @@ in thunderbird = thunderbird-78; thunderbird-78 = callPackage ../applications/networking/mailreaders/thunderbird { - inherit (rustPackages) cargo rustc; + # Using older Rust for workaround: + # https://bugzilla.mozilla.org/show_bug.cgi?id=1663715 + inherit (rustPackages_1_45) cargo rustc; libpng = libpng_apng; icu = icu67; libvpx = libvpx_1_8; From 1fe5d52eb8516c93e52e983b3a73b7b104d170c4 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Sat, 7 Nov 2020 11:05:37 +0000 Subject: [PATCH 181/299] dasel: 1.1.0 -> 1.2.0 - Add support for YAML multi-document files --- pkgs/applications/misc/dasel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index ef1279cddfc..0e5c33c00b5 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dasel"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "sha256:11xm47p7n79mq2zkv9q9m5v4a1gga01pkzi2j42gq1ma9hwz4idz"; + sha256 = "sha256-Un9tqODwiWsaw66t2m8NyaDF0+hq/e0tmRFi3/T4LMI="; }; vendorSha256 = "sha256:1552k85z4s6gv7sss7dccv3h8x22j2sr12icp6s7s0a3i4iwyksw"; From 4c68a713372a6a021e4e3f4f16565be1605f10d0 Mon Sep 17 00:00:00 2001 From: Josh Holland Date: Tue, 16 Jun 2020 13:23:01 +0100 Subject: [PATCH 182/299] maintainers: add jshholland --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 87694473cd5..94588050cc4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4284,6 +4284,12 @@ githubId = 16374374; name = "Joshua Campbell"; }; + jshholland = { + email = "josh@inv.alid.pw"; + github = "jshholland"; + githubId = 107689; + name = "Josh Holland"; + }; jtcoolen = { email = "jtcoolen@pm.me"; name = "Julien Coolen"; From bcb92f53d59bb9f63fbe537ac17b9780852a339b Mon Sep 17 00:00:00 2001 From: Josh Holland Date: Tue, 28 Jul 2020 12:54:30 +0100 Subject: [PATCH 183/299] as-tree: init at 0.12.0 --- pkgs/tools/misc/as-tree/cargo-lock.patch | 13 ++++++++++++ pkgs/tools/misc/as-tree/default.nix | 27 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 42 insertions(+) create mode 100644 pkgs/tools/misc/as-tree/cargo-lock.patch create mode 100644 pkgs/tools/misc/as-tree/default.nix diff --git a/pkgs/tools/misc/as-tree/cargo-lock.patch b/pkgs/tools/misc/as-tree/cargo-lock.patch new file mode 100644 index 00000000000..f7a06c050d2 --- /dev/null +++ b/pkgs/tools/misc/as-tree/cargo-lock.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 991ecd8..9e94574 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -11,7 +11,7 @@ dependencies = [ + + [[package]] + name = "as-tree" +-version = "0.11.1" ++version = "0.12.0" + dependencies = [ + "ansi_term", + "atty", diff --git a/pkgs/tools/misc/as-tree/default.nix b/pkgs/tools/misc/as-tree/default.nix new file mode 100644 index 00000000000..7cc97fd79e4 --- /dev/null +++ b/pkgs/tools/misc/as-tree/default.nix @@ -0,0 +1,27 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "as-tree"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "jez"; + repo = pname; + rev = version; + sha256 = "0c0g32pkyhyvqpgvzlw9244c80npq6s8mxy3may7q4qyd7hi3dz5"; + }; + + cargoSha256 = "0yhd9svdxg7akv61msn7rf3rfblb7kxnyn955dfdwyxbxq48qwpr"; + # the upstream 0.12.0 release didn't update the Cargo.lock file properly + # they have updated their release script, so this patch can be removed + # when the next version is released. + cargoPatches = [ ./cargo-lock.patch ]; + + meta = with lib; { + description = "Print a list of paths as a tree of paths"; + homepage = "https://github.com/jez/as-tree"; + license = with licenses; [ blueOak100 ]; + maintainers = with maintainers; [ jshholland ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 250e2522895..456ecfc3ca0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1338,6 +1338,8 @@ in }; aria = aria2; + as-tree = callPackage ../tools/misc/as-tree { }; + asmfmt = callPackage ../development/tools/asmfmt { }; aspcud = callPackage ../tools/misc/aspcud { }; From aec3bd0bcb79c9a58eb638e4e67da46338146912 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Thu, 5 Nov 2020 16:48:09 +0100 Subject: [PATCH 184/299] seaweedfs: init at 2.07 --- .../networking/seaweedfs/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/networking/seaweedfs/default.nix diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix new file mode 100644 index 00000000000..be583755868 --- /dev/null +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "seaweedfs"; + version = "2.07"; + + src = fetchFromGitHub { + owner = "chrislusf"; + repo = "seaweedfs"; + rev = version; + sha256 = "0yrfpj4ph9f321vqfn1zadv44pqa3ivjq9rx6gsz9hlv50gfaqn1"; + }; + + vendorSha256 = "1ysqagi4y25bi84h5fhkdimnsigy43klf6hrcqn7q75382fb4bzn"; + + subPackages = [ "weed" ]; + + meta = with lib; { + description = "Simple and highly scalable distributed file system"; + homepage = "https://github.com/chrislusf/seaweedfs"; + maintainers = [ maintainers.raboof ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6269c16b5cf..12a74cf0de3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7031,6 +7031,8 @@ in skim = callPackage ../tools/misc/skim { }; + seaweedfs = callPackage ../applications/networking/seaweedfs { }; + sec = callPackage ../tools/admin/sec { }; seccure = callPackage ../tools/security/seccure { }; From a71f07694c1b51ff2100a46ef3a54ff19e4632d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 7 Nov 2020 13:50:23 +0100 Subject: [PATCH 185/299] libtorch-bin: cleanup passthru test - Make passthru.tests an attrset. - Remove CMake VERBOSE option. - Remove spurious `cat CMakeLists.txt`. - Run the test as well. - Actually test some functionality. --- .../libraries/science/math/libtorch/bin.nix | 2 +- .../science/math/libtorch/test/default.nix | 8 ++------ .../science/math/libtorch/test/test.cpp | 17 +++++++++++++++-- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix index 33229bbefc8..6180c14c4d7 100644 --- a/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -100,7 +100,7 @@ in stdenv.mkDerivation { outputs = [ "out" "dev" ]; - passthru.tests = callPackage ./test { }; + passthru.tests.cmake = callPackage ./test { }; meta = with stdenv.lib; { description = "C++ API of the PyTorch machine learning framework"; diff --git a/pkgs/development/libraries/science/math/libtorch/test/default.nix b/pkgs/development/libraries/science/math/libtorch/test/default.nix index d661ec28db9..e69807871f4 100644 --- a/pkgs/development/libraries/science/math/libtorch/test/default.nix +++ b/pkgs/development/libraries/science/math/libtorch/test/default.nix @@ -6,16 +6,12 @@ stdenv.mkDerivation { src = ./.; - postPatch = '' - cat CMakeLists.txt - ''; - - makeFlags = [ "VERBOSE=1" ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ libtorch-bin ]; + doCheck = true; + installPhase = '' touch $out ''; diff --git a/pkgs/development/libraries/science/math/libtorch/test/test.cpp b/pkgs/development/libraries/science/math/libtorch/test/test.cpp index 5537724ce5f..ca238fba521 100644 --- a/pkgs/development/libraries/science/math/libtorch/test/test.cpp +++ b/pkgs/development/libraries/science/math/libtorch/test/test.cpp @@ -1,7 +1,20 @@ -#include +#undef NDEBUG +#include + #include +#include + int main() { torch::Tensor tensor = torch::eye(3); - std::cout << tensor << std::endl; + + float checkData[] = { + 1, 0, 0, + 0, 1, 0, + 0, 0, 1 + }; + + torch::Tensor check = torch::from_blob(checkData, {3, 3}); + + assert(tensor.allclose(check)); } From 0c131ae1186d2833b44fb6382391e07a28b46221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Sat, 7 Nov 2020 13:20:38 +0000 Subject: [PATCH 186/299] linux_zen: 5.9.3 -> 5.9.6 --- pkgs/os-specific/linux/kernel/linux-zen.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 9ee6dad7680..cfeaa6d1ec7 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.9.3"; + version = "5.9.6"; in buildLinux (args // { @@ -13,7 +13,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-zen1"; - sha256 = "0004fp3qnz2dpahnxkbc02yyijyqiavqmacyng1fi5wrw5kl2aj3"; + sha256 = "0v8nc2zy75ij4hn8js23998spadbiid8qc9cib5d0apmzkhilqwq"; }; extraMeta = { From eb3fd61bb6fd92e0e5f6f717fa21128e278d4e56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 7 Nov 2020 14:53:42 +0100 Subject: [PATCH 187/299] firefox-esr: fix build by using older rust It's probably the same issue as with thunderbird. --- pkgs/applications/networking/browsers/firefox/common.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 03cf35e1a6b..a98891df4d1 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -9,7 +9,7 @@ , hunspell, libXdamage, libevent, libstartup_notification , libvpx_1_8 , icu67, libpng, jemalloc, glib -, autoconf213, which, gnused, cargo, rustc +, autoconf213, which, gnused, rustPackages, rustPackages_1_45 , rust-cbindgen, nodejs, nasm, fetchpatch , gnum4 , debugBuild ? false @@ -102,6 +102,10 @@ let buildStdenv = if ltoSupport then overrideCC stdenv llvmPackages.lldClang else stdenv; + + # 78 ESR won't build with rustc 1.47 + inherit (if lib.versionAtLeast ffversion "82" then rustPackages else rustPackages_1_45) + rustc cargo; in buildStdenv.mkDerivation ({ From fa5367f2cb3e1205953937aec936736ec8e4cb91 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 7 Nov 2020 15:18:21 +0100 Subject: [PATCH 188/299] =?UTF-8?q?pythonPackages.psautohint:=202.1.1=20?= =?UTF-8?q?=E2=86=92=202.1.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/psautohint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix index b439c05f0b8..fb9237c8934 100644 --- a/pkgs/development/python-modules/psautohint/default.nix +++ b/pkgs/development/python-modules/psautohint/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "psautohint"; - version = "2.1.1"; + version = "2.1.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "adobe-type-tools"; repo = pname; - sha256 = "00n9bycjmvx1fb4332bdj53f01q86ajndrvid9idpiyzybmd5vp4"; + sha256 = "1s2l54gzn11y07zaggprwif7r3ia244qijjhkbvjdx4jsgc5df8n"; rev = "v${version}"; fetchSubmodules = true; # data dir for tests }; From c48faf07f44e73f7e7da9d28031118262bad231b Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Fri, 6 Nov 2020 23:08:22 +0100 Subject: [PATCH 189/299] transmission: fix #98904 --- nixos/modules/services/torrent/transmission.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index aeb58a7194f..717c18d367f 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -236,6 +236,7 @@ in # an AppArmor profile is provided to get a confinement based upon paths and rights. builtins.storeDir "/etc" + "/run" ] ++ optional (cfg.settings.script-torrent-done-enabled && cfg.settings.script-torrent-done-filename != "") @@ -408,6 +409,7 @@ in #r @{PROC}/@{pid}/environ, r @{PROC}/@{pid}/mounts, rwk /tmp/tr_session_id_*, + r /run/systemd/resolve/stub-resolv.conf, r ${pkgs.openssl.out}/etc/**, r ${config.systemd.services.transmission.environment.CURL_CA_BUNDLE}, From 756f36b554c318ce77cc73502ac7280f0f37dd20 Mon Sep 17 00:00:00 2001 From: Evils Date: Fri, 23 Oct 2020 15:17:47 +0200 Subject: [PATCH 190/299] kicad: 5.1.6 -> 5.1.7 --- .../science/electronics/kicad/default.nix | 3 +- .../science/electronics/kicad/versions.nix | 28 +++++++++---------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 7290503311d..48a5779d207 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -212,11 +212,10 @@ stdenv.mkDerivation rec { # why does $makeWrapperArgs have to be added explicitly? # $out and $program_PYTHONPATH don't exist when makeWrapperArgs gets set? - # kicad-ogltest's source seems to indicate that crashing is expected behaviour... installPhase = let tools = [ "kicad" "pcbnew" "eeschema" "gerbview" "pcb_calculator" "pl_editor" "bitmap2component" ]; - utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad2step" "kicad-ogltest" ]; + utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad2step" ]; in (concatStringsSep "\n" (flatten [ diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 1afb33b6fbd..0252f69aeae 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,25 +3,25 @@ { "kicad" = { kicadVersion = { - version = "5.1.6"; + version = "5.1.7"; src = { - rev = "c6e7f7de7df655fd59b57823499efc443009de6b"; - sha256 = "1pa3z0h0679jmgxlzc833h6q85b5paxdp69kf2h93vkaryj58622"; + rev = "a382d34a883a5bf4250e86ec4bc390aa0a385012"; + sha256 = "1gjh0rny4pw52kpljfim51sivs8x1cvy11hx1isgp4dsn2zdwg95"; }; }; libVersion = { - version = "5.1.6"; + version = "5.1.7"; libSources = { - i18n.rev = "5ad171ce5c8d90f4740517c2adecb310d8be51bd"; - i18n.sha256 = "0qryi8xjm23ka363zfl7bbga0v5c31fr3d4nyxp3m168vkv9zhha"; - symbols.rev = "5150eaa2a7d15cfc6bb1459c527c4ebaa66d7708"; - symbols.sha256 = "12w3rdy085drlikkpb27n9ni7cyg9l0pqy7hnr86cxjcw3l5wcx6"; - templates.rev = "9213d439f757e6049b7e54f3ea08272a0d0f44a9"; - templates.sha256 = "1hppcsrkn4dk6ggby6ckh0q65qxkywrbyxa4lwpaf7pxjyv498xg"; - footprints.rev = "a61b4e49762fb355f654e65a1c7db1aaf7bb2332"; - footprints.sha256 = "1kmf91a5mmvj9izrv40mkaw1w36yjgn8daczd9rq2wlmd0rdp1zx"; - packages3d.rev = "150ff1caf0b01dc04c84f4f966f4f88fedfa8f8c"; - packages3d.sha256 = "0b9jglf77fy0n0r8xs4yqkv6zvipyfvp0z5dnqlzp32csy5aqpi1"; + i18n.rev = "d24af2da8cab4ce1081c401909a4a880514e5549"; + i18n.sha256 = "0r0sv52k84sw4jxf10lrmzwmn58d2fv5h57fdrspnmvnh10q63xf"; + symbols.rev = "bf475af94877e8fd9cf80e667578ff61835e02bb"; + symbols.sha256 = "1ii3r813653ng2ycggnknqx4g3ja7dbm4qyxrf9aq48ws0xkvhx3"; + templates.rev = "1ccbaf3704e8ff4030d0915f71e051af621ef7d7"; + templates.sha256 = "1a8xfcbdbb4ylrb5m7n2jjk9kwvgmlx1pmnn2cwj327a2b3m4jjs"; + footprints.rev = "302ac78bac21825532f970fb92714fa5973ad79b"; + footprints.sha256 = "0gyqxryda273hjn2rv8dha461j9bjh054y5dlpiw1wiha65lrf9i"; + packages3d.rev = "7abe02f30fd79b8f4f66c01589861df7f8f72f04"; + packages3d.sha256 = "1szcin52fcsyb55bj7xq7lz6ig187dpz3lk7blwab7b9c4dn3c3y"; }; }; }; From 50ec961174f634c0de08bfd223060ae1477235d3 Mon Sep 17 00:00:00 2001 From: Evils Date: Fri, 6 Nov 2020 06:53:42 +0100 Subject: [PATCH 191/299] kicad: fix update.sh bootstrapping it will now correctly build a version.nix file from scratch --- pkgs/applications/science/electronics/kicad/update.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/update.sh b/pkgs/applications/science/electronics/kicad/update.sh index 8c154c302c8..cfd78323b77 100755 --- a/pkgs/applications/science/electronics/kicad/update.sh +++ b/pkgs/applications/science/electronics/kicad/update.sh @@ -110,7 +110,7 @@ for version in "${all_versions[@]}"; do echo "Checking src" >&2 src_rev="$(${get_rev} "${gitlab}"/code/kicad.git "${version}" | cut -f1)" has_rev="$(grep -sm 1 "\"${pname}\"" -A 4 "${file}" | grep -sm 1 "${src_rev}" || true)" - has_hash="$(grep -sm 1 "\"${pname}\"" -A 5 "${file}" | grep -sm 1 "sha256")" + has_hash="$(grep -sm 1 "\"${pname}\"" -A 5 "${file}" | grep -sm 1 "sha256" || true)" if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then echo "Reusing old ${pname}.src.sha256, already latest .rev" >&2 grep -sm 1 "\"${pname}\"" -A 5 "${file}" | grep -sm 1 "rev" -A 1 @@ -130,7 +130,7 @@ for version in "${all_versions[@]}"; do echo "Checking i18n" >&2 i18n_rev="$(${get_rev} "${i18n}" "${version}" | cut -f1)" has_rev="$(grep -sm 1 "\"${pname}\"" -A 11 "${file}" | grep -sm 1 "${i18n_rev}" || true)" - has_hash="$(grep -sm 1 "\"${pname}\"" -A 12 "${file}" | grep -sm 1 "i18n.sha256")" + has_hash="$(grep -sm 1 "\"${pname}\"" -A 12 "${file}" | grep -sm 1 "i18n.sha256" || true)" if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then echo "Reusing old kicad-i18n-${today}.src.sha256, already latest .rev" >&2 grep -sm 1 "\"${pname}\"" -A 12 "${file}" | grep -sm 1 "i18n" -A 1 @@ -146,7 +146,7 @@ for version in "${all_versions[@]}"; do url="${gitlab}/libraries/kicad-${lib}.git" lib_rev="$(${get_rev} "${url}" "${version}" | cut -f1 | head -n1)" has_rev="$(grep -sm 1 "\"${pname}\"" -A 19 "${file}" | grep -sm 1 "${lib_rev}" || true)" - has_hash="$(grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}.sha256")" + has_hash="$(grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}.sha256" || true)" if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then echo "Reusing old kicad-${lib}-${today}.src.sha256, already latest .rev" >&2 grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}" -A 1 From 905134a79f18255f547c04fd0f63ec353b4151c4 Mon Sep 17 00:00:00 2001 From: Evils Date: Fri, 6 Nov 2020 01:23:16 +0100 Subject: [PATCH 192/299] kicad: 5.1.7 -> 5.1.8 --- .../science/electronics/kicad/versions.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 0252f69aeae..0ba69e5a502 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,17 +3,17 @@ { "kicad" = { kicadVersion = { - version = "5.1.7"; + version = "5.1.8"; src = { - rev = "a382d34a883a5bf4250e86ec4bc390aa0a385012"; - sha256 = "1gjh0rny4pw52kpljfim51sivs8x1cvy11hx1isgp4dsn2zdwg95"; + rev = "db9833491010954bc27fac92c83d2864bd95c23c"; + sha256 = "08ni9j2lw2hjc1csk6rkydcxwdal6da17ch60zkjij5vfsif2hix"; }; }; libVersion = { - version = "5.1.7"; + version = "5.1.8"; libSources = { - i18n.rev = "d24af2da8cab4ce1081c401909a4a880514e5549"; - i18n.sha256 = "0r0sv52k84sw4jxf10lrmzwmn58d2fv5h57fdrspnmvnh10q63xf"; + i18n.rev = "78adcd19e7ed53f4889d6db65a33dd8ec2d323e9"; + i18n.sha256 = "0x0w2m6d3xfm22y4anp5j2j67iwzby149ynj6qjlw2kcsi8kwk1j"; symbols.rev = "bf475af94877e8fd9cf80e667578ff61835e02bb"; symbols.sha256 = "1ii3r813653ng2ycggnknqx4g3ja7dbm4qyxrf9aq48ws0xkvhx3"; templates.rev = "1ccbaf3704e8ff4030d0915f71e051af621ef7d7"; From a52e974cff8fb80c427e0d55c01b3b8c770ccec4 Mon Sep 17 00:00:00 2001 From: Evils Date: Fri, 6 Nov 2020 01:33:48 +0100 Subject: [PATCH 193/299] kicad-unstable: 2020-10-09 -> 2020-11-07 patch for issue 72248 no longer applies issue doesn't seem to occur without it anymore... --- pkgs/applications/science/electronics/kicad/base.nix | 11 ----------- .../science/electronics/kicad/versions.nix | 12 ++++++------ 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 3d83e905103..7f11f483a9d 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -55,17 +55,6 @@ stdenv.mkDerivation rec { src = kicadSrc; - # quick fix for #72248 - # should be removed if a a more permanent fix is published - patches = [ - ( - fetchpatch { - url = "https://github.com/johnbeard/kicad/commit/dfb1318a3989e3d6f9f2ac33c924ca5030ea273b.patch"; - sha256 = "00ifd3fas8lid8svzh1w67xc8kyx89qidp7gm633r014j3kjkgcd"; - } - ) - ]; - # tagged releases don't have "unknown" # kicad nightlies use git describe --dirty # nix removes .git, so its approximated here diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 0ba69e5a502..beadd1724e1 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -27,17 +27,17 @@ }; "kicad-unstable" = { kicadVersion = { - version = "2020-10-09"; + version = "2020-11-07"; src = { - rev = "560428a70f0196fb4ade620042c5ddefc1685ebe"; - sha256 = "0rzn83bpl06v1d49lcvwfg93nirn684bqqq536zxhmjm0ayx29ka"; + rev = "9454f9df9245aea037d1ad5baf050c2d9101159c"; + sha256 = "03bd0dk234ihqnwrv4n40gi856xcjqgxplfwjzlwcq521gwykv30"; }; }; libVersion = { - version = "2020-10-09"; + version = "2020-11-07"; libSources = { - i18n.rev = "d24af2da8cab4ce1081c401909a4a880514e5549"; - i18n.sha256 = "0r0sv52k84sw4jxf10lrmzwmn58d2fv5h57fdrspnmvnh10q63xf"; + i18n.rev = "e89d9a89bec59199c1ade56ee2556591412ab7b0"; + i18n.sha256 = "04zaqyhj3qr4ymyd3k5vjpcna64j8klpsygcgjcv29s3rdi8glfl"; symbols.rev = "9c50f4333bafc5a1abf7786436db5ffb6a66758d"; symbols.sha256 = "06ic59svz0256isy93863i5ay4k8wshvp1kspnqrc776wmq03l3k"; templates.rev = "41eae4ccd3ac02fdb969e3aa272c07ab51dcf5af"; From 51acdda61805c8965d408cf5d1e6c3800075bf8c Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 7 Nov 2020 16:25:28 +0100 Subject: [PATCH 194/299] bear: 2.4.2 -> 3.0.1 Bear has been completely redone, this is basically a new package --- .../build-managers/bear/cmakepaths.patch | 13 ------ .../tools/build-managers/bear/default.nix | 41 +++++++++++++++---- .../build-managers/bear/ignore_wrapper.patch | 27 ------------ .../bear/no-double-relative.patch | 14 +++++++ 4 files changed, 48 insertions(+), 47 deletions(-) delete mode 100644 pkgs/development/tools/build-managers/bear/cmakepaths.patch delete mode 100644 pkgs/development/tools/build-managers/bear/ignore_wrapper.patch create mode 100644 pkgs/development/tools/build-managers/bear/no-double-relative.patch diff --git a/pkgs/development/tools/build-managers/bear/cmakepaths.patch b/pkgs/development/tools/build-managers/bear/cmakepaths.patch deleted file mode 100644 index d237267078e..00000000000 --- a/pkgs/development/tools/build-managers/bear/cmakepaths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 04c5c58..429ca47 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -24,7 +24,7 @@ set(CMAKE_OSX_ARCHITECTURES "i386;x86_64" CACHE STRING "Rogue") - - set(EAR_LIB_FILE ${CMAKE_SHARED_LIBRARY_PREFIX}ear${CMAKE_SHARED_LIBRARY_SUFFIX}) - set(EAR_LIB_PATH "${CMAKE_INSTALL_LIBDIR}/bear") --set(DEFAULT_PRELOAD_FILE ${CMAKE_INSTALL_PREFIX}/${EAR_LIB_PATH}/${EAR_LIB_FILE} CACHE STRING "Default path to libear.") -+set(DEFAULT_PRELOAD_FILE ${EAR_LIB_PATH}/${EAR_LIB_FILE} CACHE STRING "Default path to libear.") - - add_subdirectory(libear) - add_subdirectory(bear) diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index bc7bb46cd5b..cd5e508fbdd 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -1,22 +1,49 @@ -{ stdenv, fetchFromGitHub, cmake, python3 }: +{ stdenv +, fetchFromGitHub +, cmake +, pkg-config +, grpc +, protobuf +, openssl +, nlohmann_json +, gtest +, fmt +, spdlog +, c-ares +, abseil-cpp +, zlib +}: stdenv.mkDerivation rec { pname = "bear"; - version = "2.4.2"; + version = "3.0.1"; src = fetchFromGitHub { owner = "rizsotto"; repo = pname; rev = version; - sha256 = "1w1kyjzvvy5lj16kn3yyf7iil2cqlfkszi8kvagql7f5h5l6w9b1"; + sha256 = "02vzlm48ywf6s3fly19j94k11dqx94x8pgmkq1ylx3z3d1y3b5zb"; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ python3 ]; # just for shebang of bin/bear + nativeBuildInputs = [ cmake pkg-config ]; - doCheck = false; # all fail + buildInputs = [ + grpc + protobuf + openssl + nlohmann_json + gtest + fmt + spdlog + c-ares + abseil-cpp + zlib + ]; - patches = [ ./ignore_wrapper.patch ./cmakepaths.patch ]; + patches = [ + # Default libexec would be set to /nix/store/*-bear//nix/store/*-bear/libexec/... + ./no-double-relative.patch + ]; meta = with stdenv.lib; { description = "Tool that generates a compilation database for clang tooling"; diff --git a/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch b/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch deleted file mode 100644 index 8effc723bba..00000000000 --- a/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/bear/main.py.in -+++ b/bear/main.py.in -@@ -49,6 +49,7 @@ import tempfile - import shutil - import contextlib - import logging -+from distutils.spawn import find_executable - - # Map of ignored compiler option for the creation of a compilation database. - # This map is used in _split_command method, which classifies the parameters -@@ -569,7 +570,15 @@ class Compilation: - (compiler, language, rest of the command) otherwise """ - - if command: # not empty list will allow to index '0' and '1:' -- executable = os.path.basename(command[0]) # type: str -+ executable_file = find_executable(command[0]) -+ if executable_file: -+ absolute_executable = os.path.realpath(executable_file) -+ # Ignore Nix wrappers. -+ if 'wrapper' in absolute_executable: -+ return None -+ executable = os.path.basename(absolute_executable) -+ else: -+ executable = os.path.basename(command[0]) - parameters = command[1:] # type: List[str] - # 'wrapper' 'parameters' and - # 'wrapper' 'compiler' 'parameters' are valid. \ No newline at end of file diff --git a/pkgs/development/tools/build-managers/bear/no-double-relative.patch b/pkgs/development/tools/build-managers/bear/no-double-relative.patch new file mode 100644 index 00000000000..0184bdfd6ba --- /dev/null +++ b/pkgs/development/tools/build-managers/bear/no-double-relative.patch @@ -0,0 +1,14 @@ +diff --git a/source/config.h.in b/source/config.h.in +index 2ca8853..2564c63 100644 +--- a/source/config.h.in ++++ b/source/config.h.in +@@ -65,6 +65,6 @@ constexpr char VERSION[] = "@CMAKE_PROJECT_VERSION@"; + + constexpr char CITNAMES_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/citnames"; + constexpr char INTERCEPT_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/intercept"; +-constexpr char LIBRARY_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; +-constexpr char EXECUTOR_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/er"; +-constexpr char WRAPPER_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d"; ++constexpr char LIBRARY_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; ++constexpr char EXECUTOR_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/er"; ++constexpr char WRAPPER_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d"; From 62b33a614d9b57be89dcc2f2036dd4bc1e21a6e6 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 31 Oct 2020 12:19:03 +0100 Subject: [PATCH 195/299] mlterm: add Darwin support --- .../terminal-emulators/mlterm/default.nix | 44 ++++++++++++++----- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index 0ec8d7a4740..eea267445a6 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -5,6 +5,7 @@ , openssl, libssh2 #build-in ssh , fcitx, ibus, uim #IME , wrapGAppsHook #color picker in mlconfig +, Cocoa #Darwin }: stdenv.mkDerivation rec { @@ -18,9 +19,25 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf wrapGAppsHook ]; buildInputs = [ - libX11 gdk-pixbuf.dev cairo libXft gtk3 vte - harfbuzz fribidi m17n_lib openssl libssh2 - fcitx ibus uim + libX11 + gdk-pixbuf.dev + cairo + libXft + gtk3 + harfbuzz + fribidi + ] ++ lib.optionals (!stdenv.isDarwin) [ + # need linker magic, not adapted for Darwin yet + openssl + libssh2 + + # Not supported on Darwin + vte + m17n_lib + + fcitx + ibus + uim ]; #bad configure.ac and Makefile.in everywhere @@ -42,7 +59,7 @@ stdenv.mkDerivation rec { --replace "-m 2755 -g utmp" " " \ --replace "-m 4755 -o root" " " ''; - NIX_LDFLAGS = " + NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) " -L${stdenv.cc.cc.lib}/lib -lX11 -lgdk_pixbuf-2.0 -lcairo -lfontconfig -lfreetype -lXft -lvte-2.91 -lgtk-3 -lharfbuzz -lfribidi -lm17n @@ -53,23 +70,30 @@ stdenv.mkDerivation rec { "; configureFlags = [ - "--with-x=yes" - "--with-gui=xlib,fb" "--with-imagelib=gdk-pixbuf" #or mlimgloader depending on your bugs of choice "--with-type-engines=cairo,xft,xcore" "--with-gtk=3.0" "--enable-ind" #indic scripts "--enable-fribidi" #bidi scripts - "--enable-m17nlib" #character encodings "--with-tools=mlclient,mlconfig,mlcc,mlterm-menu,mlimgloader,registobmp,mlfc" #mlterm-menu and mlconfig depend on enabling gnome3.at-spi2-core #and configuring ~/.mlterm/key correctly. - ] ++ lib.optional (libssh2 == null) "--disable-ssh2"; + ] ++ lib.optionals (!stdenv.isDarwin) [ + "--with-x=yes" + "--with-gui=xlib,fb" + "--enable-m17nlib" #character encodings + ] ++ lib.optionals stdenv.isDarwin [ + "--with-gui=quartz" + ] ++ lib.optionals (libssh2 == null) [ " --disable-ssh2" ]; postInstall = '' install -D contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg" install -D contrib/icon/mlterm-icon-gnome2.png "$out/share/icons/hicolor/48x48/apps/mlterm.png" install -D -t $out/share/applications $desktopItem/share/applications/* + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications/ + cp -a cocoa/mlterm.app $out/Applications/ + install $out/bin/mlterm -Dt $out/Applications/mlterm.app/Contents/MacOS/ ''; desktopItem = makeDesktopItem { @@ -87,10 +111,10 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "Multi Lingual TERMinal emulator on X11"; + description = "Multi Lingual TERMinal emulator"; homepage = "http://mlterm.sourceforge.net/"; license = licenses.bsd3; maintainers = with maintainers; [ vrthra ramkromberg ]; - platforms = with platforms; linux; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82bf8bc78ca..0f5f1970012 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -722,6 +722,7 @@ in mlterm = callPackage ../applications/terminal-emulators/mlterm { libssh2 = null; openssl = null; + inherit (darwin.apple_sdk.frameworks) Cocoa; }; mrxvt = callPackage ../applications/terminal-emulators/mrxvt { }; From c6b47ff67838b9cedf3fc0e1df9afd1fcf1cb88a Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 31 Oct 2020 12:32:38 +0100 Subject: [PATCH 196/299] mlterm: add myself as maintainer --- pkgs/applications/terminal-emulators/mlterm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index eea267445a6..853fe22f0bf 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { description = "Multi Lingual TERMinal emulator"; homepage = "http://mlterm.sourceforge.net/"; license = licenses.bsd3; - maintainers = with maintainers; [ vrthra ramkromberg ]; + maintainers = with maintainers; [ vrthra ramkromberg atemu ]; platforms = with platforms; linux ++ darwin; }; } From 6e5d98ebdb0ebe1625a95ae6e6e00dab65da7f48 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Tue, 3 Nov 2020 17:37:24 +0100 Subject: [PATCH 197/299] framac: use wrapGAppsHook this solves a gdk-pixbuf related problem when using nix-bundle --- pkgs/development/tools/analysis/frama-c/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 179a74c56d5..bb3c21f43f5 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, makeWrapper, writeText , autoconf, ncurses, graphviz, doxygen -, ocamlPackages, ltl2ba, coq, why3, +, ocamlPackages, ltl2ba, coq, why3 +, gdk-pixbuf, wrapGAppsHook }: let @@ -33,20 +34,18 @@ stdenv.mkDerivation rec { preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")"; - nativeBuildInputs = [ autoconf makeWrapper ]; + nativeBuildInputs = [ autoconf wrapGAppsHook ]; buildInputs = with ocamlPackages; [ ncurses ocaml findlib ltl2ba ocamlgraph yojson menhir camlzip lablgtk coq graphviz zarith apron why3 mlgmpidl doxygen + gdk-pixbuf ]; enableParallelBuilding = true; - fixupPhase = '' - for p in $out/bin/frama-c{,-gui}; - do - wrapProgram $p --prefix OCAMLPATH ':' ${ocamlpath} - done + preFixup = '' + gappsWrapperArgs+=(--prefix OCAMLPATH ':' ${ocamlpath}) ''; # Allow loading of external Frama-C plugins From 3dd8f8e0bac2b88aeba3a20f4ce5b532970b3f75 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Tue, 3 Nov 2020 17:49:28 +0100 Subject: [PATCH 198/299] framac: fix setup hook without plugins in nix-review --- pkgs/development/tools/analysis/frama-c/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index bb3c21f43f5..4638427b3ed 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -52,16 +52,16 @@ stdenv.mkDerivation rec { setupHook = writeText "setupHook.sh" '' addFramaCPath () { if test -d "''$1/lib/frama-c/plugins"; then - export FRAMAC_PLUGIN="''${FRAMAC_PLUGIN}''${FRAMAC_PLUGIN:+:}''$1/lib/frama-c/plugins" - export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/frama-c/plugins" + export FRAMAC_PLUGIN="''${FRAMAC_PLUGIN-}''${FRAMAC_PLUGIN:+:}''$1/lib/frama-c/plugins" + export OCAMLPATH="''${OCAMLPATH-}''${OCAMLPATH:+:}''$1/lib/frama-c/plugins" fi if test -d "''$1/lib/frama-c"; then - export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/frama-c" + export OCAMLPATH="''${OCAMLPATH-}''${OCAMLPATH:+:}''$1/lib/frama-c" fi if test -d "''$1/share/frama-c/"; then - export FRAMAC_EXTRA_SHARE="''${FRAMAC_EXTRA_SHARE}''${FRAMAC_EXTRA_SHARE:+:}''$1/share/frama-c" + export FRAMAC_EXTRA_SHARE="''${FRAMAC_EXTRA_SHARE-}''${FRAMAC_EXTRA_SHARE:+:}''$1/share/frama-c" fi } From d07bef461c625e26f3c6efdd4866ad8db203756b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 3 Nov 2020 09:21:31 +0000 Subject: [PATCH 199/299] libngspice: 31 -> 33 --- pkgs/development/libraries/libngspice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix index e1b9e4f0bdc..84bd9b33e79 100644 --- a/pkgs/development/libraries/libngspice/default.nix +++ b/pkgs/development/libraries/libngspice/default.nix @@ -4,11 +4,11 @@ # the ngspice derivation. stdenv.mkDerivation rec { pname = "libngspice"; - version = "31"; + version = "33"; src = fetchurl { url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; - sha256 = "10n2lnfrpsv4vyrirkphr4jwjjhy7i617g6za78dwirfjq63npw4"; + sha256 = "1wa1hmpn13spmxqgbb1m7vgy32mwvjqwrxhymzll8z65q5nbd7dr"; }; nativeBuildInputs = [ flex bison ]; From ba3b59939f6d62e4bb033001aea6b0afeefc8bfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 7 Nov 2020 06:56:53 +0100 Subject: [PATCH 200/299] python3.pkgs.hbmqtt: needs setuptools at runtime --- pkgs/development/python-modules/hbmqtt/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hbmqtt/default.nix b/pkgs/development/python-modules/hbmqtt/default.nix index b00e3a88d3e..76ae5718024 100644 --- a/pkgs/development/python-modules/hbmqtt/default.nix +++ b/pkgs/development/python-modules/hbmqtt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, setuptools , transitions, websockets, passlib, docopt, pyyaml, nose }: buildPythonPackage rec { @@ -12,7 +12,9 @@ buildPythonPackage rec { sha256 = "1n9c8yj11npiq9qxivwmfhib1qkjpcyw42a7q0w641bdrz3x6r37"; }; - propagatedBuildInputs = [ transitions websockets passlib docopt pyyaml ]; + propagatedBuildInputs = [ + transitions websockets passlib docopt pyyaml setuptools + ]; postPatch = '' # test tries to bind same port multiple times and fails From 045c2abdfafaab8b7e080439cbd6c50c9c74bd49 Mon Sep 17 00:00:00 2001 From: Benjamin Andresen Date: Sat, 7 Nov 2020 19:52:45 +0100 Subject: [PATCH 201/299] clj-kondo: 2020.04.05 -> 2020.11.07 --- pkgs/development/tools/clj-kondo/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 92596a068f7..702e5935689 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -1,23 +1,23 @@ -{ stdenv, lib, graalvm8-ce, fetchurl }: +{ stdenv, lib, graalvm11-ce, fetchurl }: stdenv.mkDerivation rec { pname = "clj-kondo"; - version = "2020.04.05"; + version = "2020.11.07"; reflectionJson = fetchurl { name = "reflection.json"; url = "https://raw.githubusercontent.com/borkdude/${pname}/v${version}/reflection.json"; - sha256 = "1m6kja38p6aypawbynkyq8bdh8wpdjmyqrhslinqid9r8cl25rcq"; + sha256 = "0mwclqjh38alkddr5r7bfqn5lplx06h9gladi89kp06qdxc1hp7a"; }; src = fetchurl { url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "0k9samcqkpkdgzbzr2bpixf75987lsabh97101v1fg12qvjhf187"; + sha256 = "1xqryfcn82bp8wasqnllfgvhl5w9zm63yw8c2kgxz18dayhq4i31"; }; dontUnpack = true; - buildInputs = [ graalvm8-ce ]; + buildInputs = [ graalvm11-ce ]; buildPhase = '' native-image \ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "A linter for Clojure code that sparks joy"; homepage = "https://github.com/borkdude/clj-kondo"; license = licenses.epl10; - platforms = graalvm8-ce.meta.platforms; + platforms = graalvm11-ce.meta.platforms; maintainers = with maintainers; [ jlesquembre bandresen ]; }; } From 17a861413b6a4b151b9ba7a4cf6119566c8018ca Mon Sep 17 00:00:00 2001 From: Mazurel Date: Thu, 5 Nov 2020 16:26:06 +0100 Subject: [PATCH 202/299] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 102 ++++++++++++++-------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 87ce6f2dadb..e08a3f5214c 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2020-10-15"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "557a1ed5da70cb443a8650766f4e8ea95e8c0da3"; - sha256 = "105rp35mp6nr79vyz93v36x48yjja38n9n4ngxnpsnm7qf9q8x5n"; + rev = "1ec573bf0df6cbc5eef8b593f93081e4c1837c1b"; + sha256 = "0h4aa3bd0wc9hz8af66biv9gcxw1m3bvp87jnc1jp3m3qxk93knl"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -137,12 +137,12 @@ let asyncomplete-vim = buildVimPluginFrom2Nix { pname = "asyncomplete-vim"; - version = "2020-10-21"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "asyncomplete.vim"; - rev = "2107094f83e58818ec9b8ca033a75eeeb49db163"; - sha256 = "0bxxl1jj1bigwnvd07wb0ypsp5rn0b5c864m4k44llw7v1r3nrms"; + rev = "ed75b1c92fb144bbe236bfb4d60a98dccf637c58"; + sha256 = "1szxam9hq3s1s542i5fk5pkr5kdpdlz5849yq68i2nnkkh8xwrar"; }; meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; @@ -317,12 +317,12 @@ let caw-vim = buildVimPluginFrom2Nix { pname = "caw-vim"; - version = "2020-10-09"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "tyru"; repo = "caw.vim"; - rev = "26279f70cdfe5da2226cd15d7dd832ef6242ed26"; - sha256 = "0sdkcbh0rxx9wf5qa7wwvm8zjk57vvclvss4cadll54zi6q8xq1s"; + rev = "41be34ca231c97d6be6c05e7ecb5b020f79cd37f"; + sha256 = "0da1v913nlf9kddyk1hqx4h6n95r67b0lxa71hkp8lhqzy9z0gw0"; }; meta.homepage = "https://github.com/tyru/caw.vim/"; }; @@ -473,12 +473,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-11-02"; + version = "2020-11-05"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "0cbd225b922c3702e4828608bab1c6bf699a3eeb"; - sha256 = "05r8nfbf702bsrzpps2gj04d62kjaa9h6h116c0ql0iwi2zi0kmi"; + rev = "815d105fe9bada4fda9c85f98557005b70a9e667"; + sha256 = "0hxrja25hwcnw31bwcrs8krvjdxwvb6wxjrrx9zwbplj4x7xbkyp"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1040,12 +1040,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-10-29"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "3c94074f71faac00a7d8f4eef2c4bdea96212cd5"; - sha256 = "1g5bll38gw1bpmhss398s1lj9jhvszv1xzbi5qc698y2zi5cm87z"; + rev = "9aacded51b323f338859f01fcdca30a4acaf7dcc"; + sha256 = "07gmj9cljbn4h7naxayq05p38930ffby97zg3x2c98x3hxldqsq8"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1112,12 +1112,12 @@ let dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2020-11-02"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "261765405c07bfbf808c69cb6126e0e5a7c6ea4f"; - sha256 = "03abvp7fhssgynm5405bx6qdnbv4j4hrwwz6npqnb5ajqwl6y4cm"; + rev = "8242b8f5aaa07fb3102d8ef649797454039b261b"; + sha256 = "15sjrn8ajagbymxswa5qmaqbw517s2j9xavzhfxmfffv9h10rs3c"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -1956,12 +1956,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2020-10-20"; + version = "2020-11-05"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "8769bbb84cd22b475275cc4f9f06a25445357a49"; - sha256 = "1q1pmfvzvdsknw67zi00b3bn8y10mx7wjfc1nxfy1h33vzhl2g2r"; + rev = "53176a0b75d6389d775d7bce0d494e58fc654f38"; + sha256 = "0wg0nrjbr8my98ivaawj3khyx1fkkgbafwhmq6mlb8j8aj47pigx"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; @@ -1980,12 +1980,12 @@ let lsp_extensions-nvim = buildVimPluginFrom2Nix { pname = "lsp_extensions-nvim"; - version = "2020-10-30"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "lsp_extensions.nvim"; - rev = "8740c4b52dd6f9c2a564209db466ae72a3412dcc"; - sha256 = "0sakmg4fkzji3rl9qmfx2rphz3ma5b6sysf7h7sag4n4lykinayj"; + rev = "eaa389f8a80d9700cc2c3bce787b00b61761a0f0"; + sha256 = "0zndlyn3xgzxwshjk79yfva5914xchzg9v8qimfgn7jlmn5ljhwm"; }; meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/"; }; @@ -2604,12 +2604,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2020-11-03"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "f999dc41131c3c69f2411af13597932c042e8e5a"; - sha256 = "0zn8lf290cm2pwjd4iawjrlbpcxqrgqj2agarvsqrlmdxhgq7a77"; + rev = "6e80f426bf9dc44c14b73d3589c6e19cbe9aa682"; + sha256 = "14nprh59sif0kvkdxqw8ij7wnnm4d5zcv4cfgah4y7mj5a99na53"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3313,12 +3313,12 @@ let syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2020-09-27"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "dd226673063b189683b98133d7a2243c1316e71e"; - sha256 = "1kk7xavirj9lh77nsci5ws7p8a1bm3wz5la7sj7y82sr426rmlix"; + rev = "5788b1c6df63bc31ae93d6c1a3523e0602c60901"; + sha256 = "1a6mr5ffwx7f7yclp9i2hvkq2lf3zm1j4761vqmc8nq73w4sbd2z"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -3902,12 +3902,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-10-30"; + version = "2020-11-05"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "44b7b729381738cef0fc28a35fbe78fc2abe4d48"; - sha256 = "09kvdm8yakqg0pjv1zbq5yy2wzzl3ax639mykk833b7g8hi6115q"; + rev = "d64e5f8dd7ac0b094f0caacc63453a0418b37fdb"; + sha256 = "0kspf0m00slrscld6qg5rj3i4lr9pwv25xvqqldyk8h884b182g7"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -3926,24 +3926,24 @@ let vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2020-10-29"; + version = "2020-11-05"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "5307367693f770a6b06d1a498c9bc9bf4cf9a884"; - sha256 = "14iyfihlirp5adih8v117nz02wskaap4qlbrkgb7w0x87gfa3yqp"; + rev = "3dafdfc0424716bae21f5340314f7d90a9ddf4f2"; + sha256 = "1j18anw9202cplfzgmsy8y6pl8zrxwnrhyn9djy580slakrk1s8k"; }; meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2020-04-25"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "1e5ee4f2a3281201aeb71766d45800e192c103f2"; - sha256 = "1d187w74y0viv502gqxfqi0kyak0lyi0dbpcfkjd9c0fjbqrydd6"; + rev = "5007343968e21bba30d85af982689d1c1f9145e1"; + sha256 = "17c3yhnn016k03f2g3cjfwnazg2525pgwy4zqcv0vrgq2g4dil82"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; }; @@ -4130,12 +4130,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2020-11-03"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "d7bbe7529680662025f633954501a537ba226942"; - sha256 = "042qzd3dg3y5m1sggsxhzhz2i4mnlv8sii817xx6vfif49pg7b0r"; + rev = "992c2d43318ba096eedac0592a0c2d6f90fed236"; + sha256 = "1nl29l1zb9prsm5iz0psiav846fv2ybwxd06rmf2mcigg96502vr"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -4382,12 +4382,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2020-09-26"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "929dbd023f0de84d1abb502b7d77eddad33419a6"; - sha256 = "15qj771nss9jxfrqnfgvk0d5zrna3g064lqbwrfxmc816k1j56w0"; + rev = "383159d338024f09e4d56585a9301958b6fefad6"; + sha256 = "1mzr45pxjm3xfc0x92clybxzj67akwmfjwwbmdd1wxjw37qdjvpw"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -5451,12 +5451,12 @@ let vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2020-10-29"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "eba0839b79b7f036f492b2b8c4a62269f72b3dab"; - sha256 = "0fbz5yfjcjslpwkw81x1x2i6gd3p5rbssfqw13rbvj6ivf5qgglh"; + rev = "594751093da71a662c0ef371ee60c05c1c96b63b"; + sha256 = "0wanchva7g455v2bic6sfsh9wdcn0x644k9bfsbr14s8kfwpyair"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -6003,12 +6003,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-11-02"; + version = "2020-11-03"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "cd768124020d3c565f1d400ea0537949351b26a2"; - sha256 = "1wa8wk60vs9d3qflq4m49h15bwv86gwl2hqbcbfbqdq57y3l3r87"; + rev = "4af1321588c7dcb718022226cb27ec325973c2f0"; + sha256 = "1dghqg23c47qmicmlrhjh6i1fan5bj5s21yinpf58ki7l68rf881"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; From 11ffb0a362e39a4e0af58d9a79b6574c85863557 Mon Sep 17 00:00:00 2001 From: Mazurel Date: Thu, 5 Nov 2020 16:41:50 +0100 Subject: [PATCH 203/299] vimPlugins.vim-lsp-cxx-highlight: init at 2020-08-12 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index e08a3f5214c..a1698b40395 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -5461,6 +5461,18 @@ let meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; + vim-lsp-cxx-highlight = buildVimPluginFrom2Nix { + pname = "vim-lsp-cxx-highlight"; + version = "2020-08-12"; + src = fetchFromGitHub { + owner = "jackguo380"; + repo = "vim-lsp-cxx-highlight"; + rev = "7c47d39d808118f0ef030b15db28ff3995d91cb6"; + sha256 = "0yiyxfhicqhhpp83ilknngr8l9r8z9bchkn3xd2ri8bx0bm7i4l7"; + }; + meta.homepage = "https://github.com/jackguo380/vim-lsp-cxx-highlight/"; + }; + vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; version = "2020-09-23"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 4a50581cec8..dae2f4d3ba2 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -169,6 +169,7 @@ itchyny/thumbnail.vim itchyny/vim-cursorword itchyny/vim-gitbranch ivanov/vim-ipython +jackguo380/vim-lsp-cxx-highlight jacoborus/tender.vim jaredgorski/SpaceCamp jaxbot/semantic-highlight.vim From 0c6e5e15f8c952f0b2844cead019868e93aedb19 Mon Sep 17 00:00:00 2001 From: Mazurel Date: Thu, 5 Nov 2020 16:43:14 +0100 Subject: [PATCH 204/299] vimPlugins.vim-racket: init at 2020-07-24 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index a1698b40395..41a1e6c90c7 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -6169,6 +6169,18 @@ let meta.homepage = "https://github.com/racer-rust/vim-racer/"; }; + vim-racket = buildVimPluginFrom2Nix { + pname = "vim-racket"; + version = "2020-07-24"; + src = fetchFromGitHub { + owner = "wlangstroth"; + repo = "vim-racket"; + rev = "bca2643c3d8bd0fcd46ab73bee69023a5da1964b"; + sha256 = "059a79d66yxhhwq127sjl84ky1153im7mm5ixjcsgg9glgvd39jy"; + }; + meta.homepage = "https://github.com/wlangstroth/vim-racket/"; + }; + vim-ragtag = buildVimPluginFrom2Nix { pname = "vim-ragtag"; version = "2020-01-26"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index dae2f4d3ba2..2cc00b630f5 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -611,6 +611,7 @@ whonore/Coqtail will133/vim-dirdiff wincent/command-t wincent/ferret +wlangstroth/vim-racket wsdjeg/vim-fetch xavierd/clang_complete xolox/vim-easytags From 99c9647e69e3c500022f07f13f2e56bd7ede19e6 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 22:27:48 +0100 Subject: [PATCH 205/299] pkgsStatic.brotli: fix patch --- pkgs/tools/compression/brotli/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index fd4872cf844..a69740ea1ff 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -16,9 +16,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; patches = stdenv.lib.optional staticOnly (fetchpatch { - # from https://github.com/google/brotli/pull/655 - url = "https://github.com/google/brotli/commit/7289e5a378ba13801996a84d89d8fe95c3fc4c11.patch"; - sha256 = "1bghbdvj24jrvb0sqfdif9vwg7wx6pn8dvl6flkrcjkhpj0gi0jg"; + # context from https://github.com/google/brotli/pull/655 + # updated patch from https://github.com/google/brotli/pull/655 + url = "https://github.com/google/brotli/commit/47a554804ceabb899ae924aaee54df806053d0d1.patch"; + sha256 = "sOeXNVsCaBSD9i82GRUDrkyreGeQ7qaJWjjy/uLL0/0="; }); cmakeFlags = [] From 4e81c65d724c22b90f8a123e6638b2b01093592d Mon Sep 17 00:00:00 2001 From: Sebastian Jordan Date: Sat, 7 Nov 2020 15:06:06 +0100 Subject: [PATCH 206/299] mypy: 0.782 -> 0.790 --- pkgs/development/python-modules/mypy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 0bcf216fa46..2e751c6f48d 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "mypy"; - version = "0.782"; + version = "0.790"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "030kn709515452n6gy2i1d9fg6fyrkmdz228lfpmbslybsld9xzg"; + sha256 = "sha256-KyG6Ra2e8uLriM5K6t0BEtD1AmQYMkF2/UlKaCS3SXU="; }; propagatedBuildInputs = [ typed-ast psutil mypy-extensions typing-extensions ]; From f671d7e1918ac66552da3459d680235f1d931f86 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Mon, 2 Nov 2020 04:45:43 +0100 Subject: [PATCH 207/299] python3Packages.hyperopt: init at 0.1.2 --- .../python-modules/hyperopt/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/hyperopt/default.nix diff --git a/pkgs/development/python-modules/hyperopt/default.nix b/pkgs/development/python-modules/hyperopt/default.nix new file mode 100644 index 00000000000..7a907224993 --- /dev/null +++ b/pkgs/development/python-modules/hyperopt/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchPypi, buildPythonPackage +, cloudpickle, numpy, future, networkx +, six, tqdm, scipy, pymongo +}: + +buildPythonPackage rec { + pname = "hyperopt"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "34xIpivBYUvcN/XMVwBkqTpLgaFlWWIduazuP2U2tlg="; + }; + + propagatedBuildInputs = [ future cloudpickle numpy networkx six tqdm scipy pymongo ]; + + # tries to use /homeless-shelter to mimic container usage, etc + doCheck = false; + + pythonImportsCheck = [ "hyperopt" ]; + + meta = with stdenv.lib; { + description = "Distributed Asynchronous Hyperparameter Optimization"; + homepage = "http://hyperopt.github.com/hyperopt/"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ freezeboy ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dddf6a23d51..0570c01dda6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2826,6 +2826,8 @@ in { hyperlink = callPackage ../development/python-modules/hyperlink { }; + hyperopt = callPackage ../development/python-modules/hyperopt { }; + hypothesis_4 = callPackage ../development/python-modules/hypothesis/2.nix { }; # File name is called 2.nix because this one will need to remain for Python 2. From bf066b27b424c96a64ce7860d45d38e85d8b515e Mon Sep 17 00:00:00 2001 From: freezeboy Date: Mon, 2 Nov 2020 04:46:41 +0100 Subject: [PATCH 208/299] python3Packages.click-help-colors: init at 0.8 --- .../click-help-colors/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/click-help-colors/default.nix diff --git a/pkgs/development/python-modules/click-help-colors/default.nix b/pkgs/development/python-modules/click-help-colors/default.nix new file mode 100644 index 00000000000..ac1cab90d0a --- /dev/null +++ b/pkgs/development/python-modules/click-help-colors/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchPypi, buildPythonPackage +, click, pytest +}: + +buildPythonPackage rec { + pname = "click-help-colors"; + version = "0.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "EZ5fr2nPyRnJlcWWIyasj9h/EeVqNxr1lOPf2EWPTG4="; + }; + + propagatedBuildInputs = [ click ]; + + # tries to use /homeless-shelter to mimic container usage, etc + #doCheck = false; + checkInputs = [ pytest ]; + + pythonImportsCheck = [ "click_help_colors" ]; + + meta = with stdenv.lib; { + description = "Colorization of help messages in Click"; + homepage = "https://github.com/r-m-n/click-help-colors"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ freezeboy ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0570c01dda6..3b2b9cf40bb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1200,6 +1200,8 @@ in { click-didyoumean = callPackage ../development/python-modules/click-didyoumean { }; + click-help-colors = callPackage ../development/python-modules/click-help-colors { }; + click-log = callPackage ../development/python-modules/click-log { }; click-plugins = callPackage ../development/python-modules/click-plugins { }; From bbc0af82bdaa768a2d6fd2e7e586e6cb1c15a29b Mon Sep 17 00:00:00 2001 From: freezeboy Date: Mon, 2 Nov 2020 04:47:55 +0100 Subject: [PATCH 209/299] python3Packages.gradient_sdk: init at 0.0.4 --- .../python-modules/gradient_sdk/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/gradient_sdk/default.nix diff --git a/pkgs/development/python-modules/gradient_sdk/default.nix b/pkgs/development/python-modules/gradient_sdk/default.nix new file mode 100644 index 00000000000..3ee66a1c524 --- /dev/null +++ b/pkgs/development/python-modules/gradient_sdk/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchPypi, buildPythonPackage +, hyperopt +}: + +buildPythonPackage rec { + pname = "gradient_sdk"; + version = "0.0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "Q9oeYjjgJf2lhxW1ypsweQAPpMglmW9PxgzMsgTqJkY="; + }; + + propagatedBuildInputs = [ hyperopt ]; + + pythonImportsCheck = [ "gradient_sdk" ]; + + meta = with stdenv.lib; { + description = "Gradient ML SDK"; + homepage = "https://github.com/Paperspace/gradient-sdk"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ freezeboy ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3b2b9cf40bb..135050e5a4d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2562,6 +2562,8 @@ in { gpyopt = callPackage ../development/python-modules/gpyopt { }; + gradient_sdk = callPackage ../development/python-modules/gradient_sdk { }; + grammalecte = callPackage ../development/python-modules/grammalecte { }; grandalf = callPackage ../development/python-modules/grandalf { }; From a73cedd74fef4c279f191dacd8519def5ad430b7 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Mon, 2 Nov 2020 04:48:36 +0100 Subject: [PATCH 210/299] python3Packages.gradient_statsd: init at 1.0.1 --- .../gradient_statsd/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/gradient_statsd/default.nix diff --git a/pkgs/development/python-modules/gradient_statsd/default.nix b/pkgs/development/python-modules/gradient_statsd/default.nix new file mode 100644 index 00000000000..0521b4a57d6 --- /dev/null +++ b/pkgs/development/python-modules/gradient_statsd/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchPypi, buildPythonPackage +, boto3, requests, datadog, configparser, python +}: + +buildPythonPackage rec { + pname = "gradient_statsd"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "iWlNX43ZtvU73wz4+8DgDulQNOnssJGxTBkvAaLj530="; + }; + + propagatedBuildInputs = [ requests datadog ] + ++ lib.optional python.isPy2 configparser; + + pythonImportsCheck = [ "gradient_statsd" ]; + + meta = with stdenv.lib; { + description = "Wrapper around the DogStatsd client"; + homepage = "https://paperspace.com"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ freezeboy ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 135050e5a4d..2ef9459b13f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2564,6 +2564,8 @@ in { gradient_sdk = callPackage ../development/python-modules/gradient_sdk { }; + gradient_statsd = callPackage ../development/python-modules/gradient_statsd { }; + grammalecte = callPackage ../development/python-modules/grammalecte { }; grandalf = callPackage ../development/python-modules/grandalf { }; From c0efa713da5b88e7801febf9774d328b77e6f495 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Mon, 2 Nov 2020 04:49:18 +0100 Subject: [PATCH 211/299] python3Packages.paperspace: unbreak --- pkgs/development/python-modules/paperspace/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/paperspace/default.nix b/pkgs/development/python-modules/paperspace/default.nix index c439b4099a0..fad394a5339 100644 --- a/pkgs/development/python-modules/paperspace/default.nix +++ b/pkgs/development/python-modules/paperspace/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchPypi, buildPythonPackage -, boto3, requests +, boto3, requests, gradient_statsd, terminaltables +, click-completion , click-didyoumean, click-help-colors +, colorama, requests_toolbelt, gradient_sdk, progressbar2 }: buildPythonPackage rec { @@ -11,7 +13,10 @@ buildPythonPackage rec { sha256 = "7959305128fea6da8ca0cdc528783a89859dacb9b54bf8eb89fd04a518872191"; }; - propagatedBuildInputs = [ boto3 requests ]; + propagatedBuildInputs = [ boto3 requests gradient_statsd terminaltables + click-completion click-didyoumean click-help-colors requests_toolbelt + colorama gradient_sdk progressbar2 + ]; # tries to use /homeless-shelter to mimic container usage, etc doCheck = false; @@ -22,6 +27,5 @@ buildPythonPackage rec { license = licenses.isc; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ]; - broken = true; }; } From 10687019df67acac0479ef570c2c47afbc155ee8 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Mon, 2 Nov 2020 23:44:34 +0100 Subject: [PATCH 212/299] xautoclick: 0.31 -> 0.34 Migrate to Gtk3 and Qt5 Adds support for fltk too --- pkgs/applications/misc/xautoclick/default.nix | 42 +++++++++---------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix index 4f441d8a9a9..f259b28131d 100644 --- a/pkgs/applications/misc/xautoclick/default.nix +++ b/pkgs/applications/misc/xautoclick/default.nix @@ -1,32 +1,30 @@ -{ stdenv, fetchurl, xorg, pkgconfig -, gtkSupport ? true, gtk2 -, qtSupport ? true, qt4 +{ stdenv, fetchFromGitHub, xorg, pkg-config +, cmake, libevdev +, gtkSupport ? true, gtk3, pcre, glib, wrapGAppsHook +, fltkSupport ? true, fltk +, qtSupport ? true, qt5 }: -stdenv.mkDerivation { - version = "0.31"; +stdenv.mkDerivation rec { pname = "xautoclick"; - src = fetchurl { - url = "mirror://sourceforge/project/xautoclick/xautoclick/xautoclick-0.31/xautoclick-0.31.tar.gz"; - sha256 = "0h522f12a7v2b89411xm51iwixmjp2mp90rnizjgiakx9ajnmqnm"; + version = "0.34"; + + src = fetchFromGitHub { + owner = "qarkai"; + repo = "xautoclick"; + rev = "v${version}"; + sha256 = "GN3zI5LQnVmRC0KWffzUTHKrxcqnstiL55hopwTTwpE="; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xorg.libX11 xorg.libXtst xorg.xinput xorg.libXi xorg.libXext ] - ++ stdenv.lib.optionals gtkSupport [ gtk2 ] - ++ stdenv.lib.optionals qtSupport [ qt4 ]; - patchPhase = '' - substituteInPlace configure --replace /usr/X11R6 ${xorg.libX11.dev} - ''; - preConfigure = stdenv.lib.optional qtSupport '' - mkdir .bin - ln -s ${qt4}/bin/moc .bin/moc-qt4 - addToSearchPath PATH .bin - sed -i -e "s@LD=\$_cc@LD=\$_cxx@" configure - ''; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ libevdev xorg.libXtst ] + ++ stdenv.lib.optionals gtkSupport [ gtk3 pcre glib wrapGAppsHook ] + ++ stdenv.lib.optionals fltkSupport [ fltk ] + ++ stdenv.lib.optionals qtSupport [ qt5.qtbase qt5.wrapQtAppsHook ]; meta = with stdenv.lib; { description = "Autoclicker application, which enables you to automatically click the left mousebutton"; - homepage = "http://xautoclick.sourceforge.net"; + homepage = "https://github.com/qarkai/xautoclick"; license = licenses.gpl2; platforms = platforms.linux; }; From ad4a4e12e859410161a348d3091b8ce93d369b25 Mon Sep 17 00:00:00 2001 From: Finn Behrens Date: Sat, 7 Nov 2020 20:33:49 +0100 Subject: [PATCH 213/299] onefetch: 2.6.0 -> 2.7.0 --- pkgs/tools/misc/onefetch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index 61f6fdde5d3..ba210ca3632 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "onefetch"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "o2sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KdPr/6wGyoHhEwfPektL+B1khyoRfxDHI4aFcKNU0TM="; + sha256 = "sha256-9HZLr/dwr5T1m6H/SHy9ULfKMkyrLNb2Z8W3RlSWzGM="; }; - cargoSha256 = "sha256-MLlGz7Sid0G52//XekqkZgzLqFL7xoUwT6OvpaF4jm0="; + cargoSha256 = "sha256-cyffVX1XEF5zaNbk/VeZEtKG/Npwv5Yzz9OU5G9UyGc="; buildInputs = with stdenv; lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ]; From e3ca5483203b44dd888f46bab4a27c4928fb7f62 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 7 Nov 2020 20:00:37 +0100 Subject: [PATCH 214/299] k3s: add version field --- pkgs/applications/networking/cluster/k3s/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index ae98fbbcc2d..8fa288f0401 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -222,6 +222,7 @@ let in stdenv.mkDerivation rec { name = "k3s"; + version = k3sVersion; # Important utilities used by the kubelet, see # https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494 From 4fcf71f9a28fc9a9530cac476a1403293a4b6b37 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 6 Nov 2020 19:34:02 -0300 Subject: [PATCH 215/299] picom: 8.1 -> 8.2 --- pkgs/applications/window-managers/picom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/applications/window-managers/picom/default.nix index 9a00b3a2efa..064e555f3a5 100644 --- a/pkgs/applications/window-managers/picom/default.nix +++ b/pkgs/applications/window-managers/picom/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "picom"; - version = "8.1"; + version = "8.2"; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; rev = "v${version}"; - sha256 = "0iwixf3gaichmpvhczxdg5srkb72yh61i5wh7m3fab657h3r7di6"; + sha256 = "0gjksayz2xpmgglvw17ppsan2imrd1fijs579kbf27xwp503xgfl"; fetchSubmodules = true; }; From e9e003e247b67e38f9f5625b6ed6f4e646323a16 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 7 Nov 2020 23:50:18 +0100 Subject: [PATCH 216/299] mutt: 1.14.7 -> 2.0.0 Signed-off-by: Matthias Beyer --- pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 0b18a579e3b..49a4790f8a8 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "1.14.7"; + version = "2.0.0"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "0r58xnjgkw0kmnnzhb32mk5gkkani5kbi5krybpbag156fqhgxg4"; + sha256 = "1bxf8976mrl3vbn3s5i32i1lf908yag5rsf84n76dllmly61794k"; }; patches = optional smimeSupport (fetchpatch { From 169ab0b89f124694e81639ff52c8bafc695d961d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sun, 11 Oct 2020 03:15:19 +0200 Subject: [PATCH 217/299] redis service: Listen on localhost by default. Fixes #100192. All other database servers in NixOS also use this safe-by-default setting. --- nixos/doc/manual/release-notes/rl-2103.xml | 5 +++++ nixos/modules/services/databases/redis.nix | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml index 7fd7ff5c2a9..dc61f095a5c 100644 --- a/nixos/doc/manual/release-notes/rl-2103.xml +++ b/nixos/doc/manual/release-notes/rl-2103.xml @@ -159,6 +159,11 @@ to nextcloud20. + + + The setting defaults to 127.0.0.1 now, making Redis listen on the loopback interface only, and not all public network interfaces. + + NixOS now emits a deprecation warning if systemd's StartLimitInterval setting is used in a serviceConfig section instead of in a unitConfig; that setting is deprecated and now undocumented for the service section by systemd upstream, but still effective and somewhat buggy there, which can be confusing. See #45785 for details. diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index f1777854e14..6b8853ae390 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -87,9 +87,12 @@ in bind = mkOption { type = with types; nullOr str; - default = null; # All interfaces - description = "The IP interface to bind to."; - example = "127.0.0.1"; + default = "127.0.0.1"; + description = '' + The IP interface to bind to. + null means "all interfaces". + ''; + example = "192.0.2.1"; }; unixSocket = mkOption { From d07dc0aba1b08a6891a4dc0e5dcb3c82acd665d5 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 8 Nov 2020 01:13:08 +0000 Subject: [PATCH 218/299] libreoffice-fresh: 7.0.0.3 -> 7.0.3.1 Also, replace HTTP with HTTPS. --- .../libreoffice/generate-libreoffice-srcs.py | 4 +- .../office/libreoffice/src-fresh/download.nix | 264 +++++++++--------- .../office/libreoffice/src-fresh/primary.nix | 10 +- 3 files changed, 139 insertions(+), 139 deletions(-) diff --git a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py index 636f36cb383..c4d15927f38 100755 --- a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py +++ b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py @@ -53,10 +53,10 @@ def main(): def construct_url(x): if x['brief']: - return 'http://dev-www.libreoffice.org/src/{}{}'.format( + return 'https://dev-www.libreoffice.org/src/{}{}'.format( x.get('subdir', ''), x['tarball']) else: - return 'http://dev-www.libreoffice.org/src/{}{}-{}'.format( + return 'https://dev-www.libreoffice.org/src/{}{}-{}'.format( x.get('subdir', ''), x['md5'], x['tarball']) diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix index 16d754a18a1..e26081a0298 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -1,882 +1,882 @@ [ { name = "libabw-0.1.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz"; sha256 = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed"; md5 = ""; md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz"; } { name = "commons-logging-1.2-src.tar.gz"; - url = "http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz"; sha256 = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81"; md5 = ""; md5name = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81-commons-logging-1.2-src.tar.gz"; } { name = "apr-1.5.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz"; sha256 = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb"; md5 = ""; md5name = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb-apr-1.5.2.tar.gz"; } { name = "apr-util-1.5.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz"; sha256 = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19"; md5 = ""; md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { name = "boost_1_71_0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/boost_1_71_0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/boost_1_71_0.tar.xz"; sha256 = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543"; md5 = ""; md5name = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543-boost_1_71_0.tar.xz"; } { name = "breakpad.zip"; - url = "http://dev-www.libreoffice.org/src/breakpad.zip"; + url = "https://dev-www.libreoffice.org/src/breakpad.zip"; sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9"; md5 = ""; md5name = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9-breakpad.zip"; } { name = "bsh-2.0b6-src.zip"; - url = "http://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; + url = "https://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; sha256 = "9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e622235e01c96"; md5 = "beeca87be45ec87d241ddd0e1bad80c1"; md5name = "beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; } { name = "bzip2-1.0.6.tar.gz"; - url = "http://dev-www.libreoffice.org/src/00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; + url = "https://dev-www.libreoffice.org/src/00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; sha256 = "a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"; md5 = "00b516f4704d4a7cb50a1d97e6e8e15b"; md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; } { name = "cairo-1.16.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/cairo-1.16.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/cairo-1.16.0.tar.xz"; sha256 = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331"; md5 = ""; md5name = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331-cairo-1.16.0.tar.xz"; } { name = "libcdr-0.1.6.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libcdr-0.1.6.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libcdr-0.1.6.tar.xz"; sha256 = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861"; md5 = ""; md5name = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861-libcdr-0.1.6.tar.xz"; } { name = "clucene-core-2.3.3.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; sha256 = "ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab"; md5 = "48d647fbd8ef8889e5a7f422c1bfda94"; md5name = "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; } { name = "dtoa-20180411.tgz"; - url = "http://dev-www.libreoffice.org/src/dtoa-20180411.tgz"; + url = "https://dev-www.libreoffice.org/src/dtoa-20180411.tgz"; sha256 = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4"; md5 = ""; md5name = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4-dtoa-20180411.tgz"; } { name = "libcmis-0.5.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz"; sha256 = "d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2"; md5 = ""; md5name = "d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2-libcmis-0.5.2.tar.xz"; } { name = "CoinMP-1.7.6.tgz"; - url = "http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz"; + url = "https://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz"; sha256 = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f"; md5 = ""; md5name = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f-CoinMP-1.7.6.tgz"; } { name = "cppunit-1.15.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz"; sha256 = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7"; md5 = ""; md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { name = "converttexttonumber-1-5-0.oxt"; - url = "http://dev-www.libreoffice.org/src/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; + url = "https://dev-www.libreoffice.org/src/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; sha256 = "71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3"; md5 = "1f467e5bb703f12cbbb09d5cf67ecf4a"; md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { name = "curl-7.71.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/curl-7.71.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-7.71.0.tar.xz"; sha256 = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772"; md5 = ""; md5name = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772-curl-7.71.0.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz"; sha256 = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9"; md5 = ""; md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz"; } { name = "libepoxy-1.5.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libepoxy-1.5.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libepoxy-1.5.3.tar.xz"; sha256 = "002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d"; md5 = ""; md5name = "002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d-libepoxy-1.5.3.tar.xz"; } { name = "epm-3.7.tar.gz"; - url = "http://dev-www.libreoffice.org/src/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; + url = "https://dev-www.libreoffice.org/src/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; sha256 = "b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7713ddb91"; md5 = "3ade8cfe7e59ca8e65052644fed9fca4"; md5name = "3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; } { name = "libepubgen-0.1.1.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz"; sha256 = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad"; md5 = ""; md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz"; } { name = "libetonyek-0.1.9.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.9.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.9.tar.xz"; sha256 = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a"; md5 = ""; md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz"; } { name = "expat-2.2.8.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2"; sha256 = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102"; md5 = ""; md5name = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102-expat-2.2.8.tar.bz2"; } { name = "Firebird-3.0.0.32483-0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2"; sha256 = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860"; md5 = ""; md5name = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860-Firebird-3.0.0.32483-0.tar.bz2"; } { name = "fontconfig-2.13.91.tar.gz"; - url = "http://dev-www.libreoffice.org/src/fontconfig-2.13.91.tar.gz"; + url = "https://dev-www.libreoffice.org/src/fontconfig-2.13.91.tar.gz"; sha256 = "19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5"; md5 = ""; md5name = "19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5-fontconfig-2.13.91.tar.gz"; } { name = "crosextrafonts-20130214.tar.gz"; - url = "http://dev-www.libreoffice.org/src/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz"; + url = "https://dev-www.libreoffice.org/src/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz"; sha256 = "c48d1c2fd613c9c06c959c34da7b8388059e2408d2bb19845dc3ed35f76e4d09"; md5 = "368f114c078f94214a308a74c7e991bc"; md5name = "368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz"; } { name = "crosextrafonts-carlito-20130920.tar.gz"; - url = "http://dev-www.libreoffice.org/src/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz"; + url = "https://dev-www.libreoffice.org/src/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz"; sha256 = "4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a"; md5 = "c74b7223abe75949b4af367942d96c7a"; md5name = "c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz"; } { name = "dejavu-fonts-ttf-2.37.zip"; - url = "http://dev-www.libreoffice.org/src/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip"; + url = "https://dev-www.libreoffice.org/src/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip"; sha256 = "7576310b219e04159d35ff61dd4a4ec4cdba4f35c00e002a136f00e96a908b0a"; md5 = "33e1e61fab06a547851ed308b4ffef42"; md5name = "33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip"; } { name = "GentiumBasic_1102.zip"; - url = "http://dev-www.libreoffice.org/src/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip"; + url = "https://dev-www.libreoffice.org/src/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip"; sha256 = "2f1a2c5491d7305dffd3520c6375d2f3e14931ee35c6d8ae1e8f098bf1a7b3cc"; md5 = "1725634df4bb3dcb1b2c91a6175f8789"; md5name = "1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip"; } { name = "liberation-narrow-fonts-ttf-1.07.6.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liberation-narrow-fonts-ttf-1.07.6.tar.gz"; + url = "https://dev-www.libreoffice.org/src/liberation-narrow-fonts-ttf-1.07.6.tar.gz"; sha256 = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3"; md5 = ""; md5name = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3-liberation-narrow-fonts-ttf-1.07.6.tar.gz"; } { name = "liberation-fonts-ttf-2.00.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.00.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.00.4.tar.gz"; sha256 = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45"; md5 = ""; md5name = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45-liberation-fonts-ttf-2.00.4.tar.gz"; } { name = "LinLibertineG-20120116.zip"; - url = "http://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; + url = "https://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; sha256 = "54adcb2bc8cac0927a647fbd9362f45eff48130ce6e2379dc3867643019e08c5"; md5 = "e7a384790b13c29113e22e596ade9687"; md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; } { name = "source-code-pro-2.030R-ro-1.050R-it.tar.gz"; - url = "http://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; + url = "https://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; sha256 = "09466dce87653333f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f"; md5 = "907d6e99f241876695c19ff3db0b8923"; md5name = "907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; } { name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; - url = "http://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; + url = "https://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; sha256 = "e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61"; md5 = "edc4d741888bc0d38e32dbaa17149596"; md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; } { name = "source-serif-pro-3.000R.tar.gz"; - url = "http://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz"; + url = "https://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz"; sha256 = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3"; md5 = ""; md5name = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3-source-serif-pro-3.000R.tar.gz"; } { name = "EmojiOneColor-SVGinOT-1.3.tar.gz"; - url = "http://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz"; + url = "https://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz"; sha256 = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7"; md5 = ""; md5name = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7-EmojiOneColor-SVGinOT-1.3.tar.gz"; } { name = "noto-fonts-20171024.tar.gz"; - url = "http://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz"; + url = "https://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz"; sha256 = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994"; md5 = ""; md5name = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994-noto-fonts-20171024.tar.gz"; } { name = "culmus-0.131.tar.gz"; - url = "http://dev-www.libreoffice.org/src/culmus-0.131.tar.gz"; + url = "https://dev-www.libreoffice.org/src/culmus-0.131.tar.gz"; sha256 = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b"; md5 = ""; md5name = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b-culmus-0.131.tar.gz"; } { name = "libre-hebrew-1.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libre-hebrew-1.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libre-hebrew-1.0.tar.gz"; sha256 = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a"; md5 = ""; md5name = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a-libre-hebrew-1.0.tar.gz"; } { name = "alef-1.001.tar.gz"; - url = "http://dev-www.libreoffice.org/src/alef-1.001.tar.gz"; + url = "https://dev-www.libreoffice.org/src/alef-1.001.tar.gz"; sha256 = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52"; md5 = ""; md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz"; } { name = "Amiri-0.111.zip"; - url = "http://dev-www.libreoffice.org/src/Amiri-0.111.zip"; + url = "https://dev-www.libreoffice.org/src/Amiri-0.111.zip"; sha256 = "1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166"; md5 = ""; md5name = "1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166-Amiri-0.111.zip"; } { name = "ttf-kacst_2.01+mry.tar.gz"; - url = "http://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz"; + url = "https://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz"; sha256 = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56"; md5 = ""; md5name = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56-ttf-kacst_2.01+mry.tar.gz"; } { name = "ReemKufi-0.7.zip"; - url = "http://dev-www.libreoffice.org/src/ReemKufi-0.7.zip"; + url = "https://dev-www.libreoffice.org/src/ReemKufi-0.7.zip"; sha256 = "f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f"; md5 = ""; md5name = "f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f-ReemKufi-0.7.zip"; } { name = "Scheherazade-2.100.zip"; - url = "http://dev-www.libreoffice.org/src/Scheherazade-2.100.zip"; + url = "https://dev-www.libreoffice.org/src/Scheherazade-2.100.zip"; sha256 = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5"; md5 = ""; md5name = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5-Scheherazade-2.100.zip"; } { name = "libfreehand-0.1.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz"; sha256 = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac"; md5 = ""; md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { name = "freetype-2.9.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/freetype-2.9.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/freetype-2.9.1.tar.bz2"; sha256 = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d"; md5 = ""; md5name = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d-freetype-2.9.1.tar.bz2"; } { name = "glm-0.9.9.7.zip"; - url = "http://dev-www.libreoffice.org/src/glm-0.9.9.7.zip"; + url = "https://dev-www.libreoffice.org/src/glm-0.9.9.7.zip"; sha256 = "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95"; md5 = ""; md5name = "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95-glm-0.9.9.7.zip"; } { name = "gpgme-1.9.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2"; sha256 = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb"; md5 = ""; md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2"; } { name = "graphite2-minimal-1.3.14.tgz"; - url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.14.tgz"; + url = "https://dev-www.libreoffice.org/src/graphite2-minimal-1.3.14.tgz"; sha256 = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc"; md5 = ""; md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz"; } { name = "harfbuzz-2.6.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-2.6.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/harfbuzz-2.6.0.tar.xz"; sha256 = "9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966"; md5 = ""; md5name = "9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966-harfbuzz-2.6.0.tar.xz"; } { name = "hsqldb_1_8_0.zip"; - url = "http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; + url = "https://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; sha256 = "d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370"; md5 = "17410483b5b5f267aa18b7e00b65e6e0"; md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; } { name = "hunspell-1.7.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/hunspell-1.7.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/hunspell-1.7.0.tar.gz"; sha256 = "57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951"; md5 = ""; md5name = "57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951-hunspell-1.7.0.tar.gz"; } { name = "hyphen-2.8.8.tar.gz"; - url = "http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; + url = "https://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; sha256 = "304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705"; md5 = "5ade6ae2a99bc1e9e57031ca88d36dad"; md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { name = "icu4c-67_1-src.tgz"; - url = "http://dev-www.libreoffice.org/src/icu4c-67_1-src.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-67_1-src.tgz"; sha256 = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc"; md5 = ""; md5name = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc-icu4c-67_1-src.tgz"; } { name = "icu4c-67_1-data.zip"; - url = "http://dev-www.libreoffice.org/src/icu4c-67_1-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-67_1-data.zip"; sha256 = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e"; md5 = ""; md5name = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e-icu4c-67_1-data.zip"; } { name = "flow-engine-0.9.4.zip"; - url = "http://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"; + url = "https://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"; sha256 = "233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd"; md5 = "ba2930200c9f019c2d93a8c88c651a0f"; md5name = "ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"; } { name = "flute-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"; sha256 = "1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133"; md5 = "d8bd5eed178db6e2b18eeed243f85aa8"; md5name = "d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"; } { name = "libbase-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"; sha256 = "75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba"; md5 = "eeb2c7ddf0d302fba4bfc6e97eac9624"; md5name = "eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"; } { name = "libfonts-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"; sha256 = "e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743"; md5 = "3bdf40c0d199af31923e900d082ca2dd"; md5name = "3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"; } { name = "libformula-1.1.7.zip"; - url = "http://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"; + url = "https://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"; sha256 = "5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b"; md5 = "3404ab6b1792ae5f16bbd603bd1e1d03"; md5name = "3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"; } { name = "liblayout-0.2.10.zip"; - url = "http://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"; + url = "https://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"; sha256 = "e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772"; md5 = "db60e4fde8dd6d6807523deb71ee34dc"; md5name = "db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"; } { name = "libloader-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"; sha256 = "3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8"; md5 = "97b2d4dba862397f446b217e2b623e71"; md5name = "97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"; } { name = "librepository-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"; sha256 = "abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095"; md5 = "8ce2fcd72becf06c41f7201d15373ed9"; md5name = "8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"; } { name = "libserializer-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"; sha256 = "05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343"; md5 = "f94d9870737518e3b597f9265f4e9803"; md5name = "f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"; } { name = "libxml-1.1.7.zip"; - url = "http://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"; + url = "https://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"; sha256 = "7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66"; md5 = "ace6ab49184e329db254e454a010f56d"; md5name = "ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"; } { name = "sacjava-1.3.zip"; - url = "http://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; + url = "https://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; sha256 = "085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045"; md5 = "39bb3fcea1514f1369fcfc87542390fd"; md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; } { name = "libjpeg-turbo-1.5.3.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.3.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.3.tar.gz"; sha256 = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523"; md5 = ""; md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { name = "language-subtag-registry-2020-04-01.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2020-04-01.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2020-04-01.tar.bz2"; sha256 = "fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da"; md5 = ""; md5name = "fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da-language-subtag-registry-2020-04-01.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; sha256 = "48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d"; md5 = "b63e6340a02ff1cacfeadb2c42286161"; md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; } { name = "lcms2-2.9.tar.gz"; - url = "http://dev-www.libreoffice.org/src/lcms2-2.9.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lcms2-2.9.tar.gz"; sha256 = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20"; md5 = ""; md5name = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20-lcms2-2.9.tar.gz"; } { name = "libassuan-2.5.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2"; sha256 = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449"; md5 = ""; md5name = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449-libassuan-2.5.1.tar.bz2"; } { name = "libatomic_ops-7.6.8.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libatomic_ops-7.6.8.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.6.8.tar.gz"; sha256 = "1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665"; md5 = ""; md5name = "1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665-libatomic_ops-7.6.8.tar.gz"; } { name = "libeot-0.01.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2"; sha256 = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a"; md5 = ""; md5name = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a-libeot-0.01.tar.bz2"; } { name = "libexttextcat-3.4.5.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz"; sha256 = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8"; md5 = ""; md5name = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8-libexttextcat-3.4.5.tar.xz"; } { name = "libffi-3.3.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libffi-3.3.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libffi-3.3.tar.gz"; sha256 = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056"; md5 = ""; md5name = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056-libffi-3.3.tar.gz"; } { name = "libgpg-error-1.27.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2"; sha256 = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2"; md5 = ""; md5name = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2-libgpg-error-1.27.tar.bz2"; } { name = "liblangtag-0.6.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2"; sha256 = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e"; md5 = ""; md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2"; } { name = "libnumbertext-1.0.6.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libnumbertext-1.0.6.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libnumbertext-1.0.6.tar.xz"; sha256 = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57"; md5 = ""; md5name = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57-libnumbertext-1.0.6.tar.xz"; } { name = "ltm-1.0.zip"; - url = "http://dev-www.libreoffice.org/src/ltm-1.0.zip"; + url = "https://dev-www.libreoffice.org/src/ltm-1.0.zip"; sha256 = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483"; md5 = ""; md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { name = "xmlsec1-1.2.30.tar.gz"; - url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.30.tar.gz"; + url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.30.tar.gz"; sha256 = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8"; md5 = ""; md5name = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8-xmlsec1-1.2.30.tar.gz"; } { name = "libxml2-2.9.10.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz"; sha256 = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f"; md5 = ""; md5name = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f-libxml2-2.9.10.tar.gz"; } { name = "libxslt-1.1.34.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz"; sha256 = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"; md5 = ""; md5name = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f-libxslt-1.1.34.tar.gz"; } { name = "lp_solve_5.5.tar.gz"; - url = "http://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; + url = "https://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; sha256 = "171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695"; md5 = "26b3e95ddf3d9c077c480ea45874b3b8"; md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; } { name = "lxml-4.1.1.tgz"; - url = "http://dev-www.libreoffice.org/src/lxml-4.1.1.tgz"; + url = "https://dev-www.libreoffice.org/src/lxml-4.1.1.tgz"; sha256 = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e"; md5 = ""; md5name = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e-lxml-4.1.1.tgz"; } { name = "mariadb-connector-c-3.1.8-src.tar.gz"; - url = "http://dev-www.libreoffice.org/src/mariadb-connector-c-3.1.8-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.1.8-src.tar.gz"; sha256 = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b"; md5 = ""; md5name = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b-mariadb-connector-c-3.1.8-src.tar.gz"; } { name = "mdds-1.6.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/mdds-1.6.0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/mdds-1.6.0.tar.bz2"; sha256 = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d"; md5 = ""; md5name = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d-mdds-1.6.0.tar.bz2"; } { name = "mDNSResponder-878.200.35.tar.gz"; - url = "http://dev-www.libreoffice.org/src/mDNSResponder-878.200.35.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mDNSResponder-878.200.35.tar.gz"; sha256 = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0"; md5 = ""; md5name = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0-mDNSResponder-878.200.35.tar.gz"; } { name = "libmspub-0.1.4.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz"; sha256 = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba"; md5 = ""; md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { name = "libmwaw-0.3.16.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.16.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.16.tar.xz"; sha256 = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868"; md5 = ""; md5name = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868-libmwaw-0.3.16.tar.xz"; } { name = "mythes-1.2.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; sha256 = "1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f"; md5 = "a8c2c5b8f09e7ede322d5c602ff6a4b6"; md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; } { name = "neon-0.30.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz"; sha256 = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca"; md5 = ""; md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; } { - name = "nss-3.47.1-with-nspr-4.23.tar.gz"; - url = "http://dev-www.libreoffice.org/src/nss-3.47.1-with-nspr-4.23.tar.gz"; - sha256 = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64"; + name = "nss-3.55-with-nspr-4.27.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.55-with-nspr-4.27.tar.gz"; + sha256 = "ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45"; md5 = ""; - md5name = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64-nss-3.47.1-with-nspr-4.23.tar.gz"; + md5name = "ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45-nss-3.55-with-nspr-4.27.tar.gz"; } { name = "libodfgen-0.1.6.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"; sha256 = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2"; md5 = ""; md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; } { name = "odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; - url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; + url = "https://dev-www.libreoffice.org/src/../extern/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; sha256 = "d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0"; md5 = ""; md5name = "d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0-odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; } { name = "officeotron-0.7.4-master.jar"; - url = "http://dev-www.libreoffice.org/src/../extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; + url = "https://dev-www.libreoffice.org/src/../extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; sha256 = "f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770"; md5 = "8249374c274932a21846fa7629c2aa9b"; md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; } { name = "openldap-2.4.45.tgz"; - url = "http://dev-www.libreoffice.org/src/openldap-2.4.45.tgz"; + url = "https://dev-www.libreoffice.org/src/openldap-2.4.45.tgz"; sha256 = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824"; md5 = ""; md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { name = "openssl-1.0.2t.tar.gz"; - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz"; sha256 = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc"; md5 = ""; md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz"; } { name = "liborcus-0.15.4.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/liborcus-0.15.4.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/liborcus-0.15.4.tar.bz2"; sha256 = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61"; md5 = ""; md5name = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61-liborcus-0.15.4.tar.bz2"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; - url = "http://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; + url = "https://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; sha256 = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb"; md5 = ""; md5name = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb-owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; } { name = "libpagemaker-0.0.4.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz"; sha256 = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d"; md5 = ""; md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { name = "pdfium-4137.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/pdfium-4137.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-4137.tar.bz2"; sha256 = "9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6"; md5 = ""; md5name = "9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6-pdfium-4137.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"; sha256 = "21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e"; md5 = "e80ebae4da01e77f68744319f01d52a3"; md5name = "e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"; } { name = "libpng-1.6.37.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libpng-1.6.37.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpng-1.6.37.tar.xz"; sha256 = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca"; md5 = ""; md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; } { name = "poppler-0.82.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz"; sha256 = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df"; md5 = ""; md5name = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df-poppler-0.82.0.tar.xz"; } { name = "postgresql-9.2.24.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2"; sha256 = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126"; md5 = ""; md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; } { name = "Python-3.7.7.tar.xz"; - url = "http://dev-www.libreoffice.org/src/Python-3.7.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.7.7.tar.xz"; sha256 = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136"; md5 = ""; md5name = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136-Python-3.7.7.tar.xz"; } { name = "QR-Code-generator-1.4.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz"; sha256 = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a"; md5 = ""; md5name = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a-QR-Code-generator-1.4.0.tar.gz"; } { name = "libqxp-0.0.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz"; sha256 = "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c"; md5 = ""; md5name = "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c-libqxp-0.0.2.tar.xz"; } { name = "raptor2-2.0.15.tar.gz"; - url = "http://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"; + url = "https://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"; sha256 = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed"; md5 = "a39f6c07ddb20d7dd2ff1f95fa21e2cd"; md5name = "a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"; } { name = "rasqal-0.9.33.tar.gz"; - url = "http://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"; + url = "https://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"; sha256 = "6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c"; md5 = "1f5def51ca0026cd192958ef07228b52"; md5name = "1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"; } { name = "redland-1.0.17.tar.gz"; - url = "http://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"; + url = "https://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"; sha256 = "de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681"; md5 = "e5be03eda13ef68aabab6e42aa67715e"; md5name = "e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"; } { name = "librevenge-0.0.4.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"; sha256 = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf"; md5 = ""; md5name = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf-librevenge-0.0.4.tar.bz2"; } { name = "rhino1_5R5.zip"; - url = "http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; + url = "https://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; sha256 = "1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753"; md5 = "798b2ffdc8bcfe7bca2cf92b62caf685"; md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; } { name = "serf-1.2.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"; sha256 = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700"; md5 = ""; md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2"; } { - name = "skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz"; - url = "http://dev-www.libreoffice.org/src/skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz"; - sha256 = "f88dc1a500d29c87ef5251c5a6c3ea66aa4c7daf0cf5d349ece64b36f7623be0"; + name = "skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"; + sha256 = "3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760"; md5 = ""; - md5name = "f88dc1a500d29c87ef5251c5a6c3ea66aa4c7daf0cf5d349ece64b36f7623be0-skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz"; + md5name = "3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760-skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"; } { name = "libstaroffice-0.0.7.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libstaroffice-0.0.7.tar.xz"; sha256 = "f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db"; md5 = ""; md5name = "f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db-libstaroffice-0.0.7.tar.xz"; } { name = "swingExSrc.zip"; - url = "http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; + url = "https://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; sha256 = "64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1"; md5 = "35c94d2df8893241173de1d16b6034c0"; md5name = "35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; } { name = "twaindsm_2.4.1.orig.tar.gz"; - url = "http://dev-www.libreoffice.org/src/twaindsm_2.4.1.orig.tar.gz"; + url = "https://dev-www.libreoffice.org/src/twaindsm_2.4.1.orig.tar.gz"; sha256 = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6"; md5 = ""; md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz"; } { name = "ucpp-1.3.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; sha256 = "983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776"; md5 = "0168229624cfac409e766913506961a8"; md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; } { name = "libvisio-0.1.7.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"; sha256 = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c"; md5 = ""; md5name = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c-libvisio-0.1.7.tar.xz"; } { name = "libwpd-0.10.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwpd-0.10.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libwpd-0.10.3.tar.xz"; sha256 = "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09"; md5 = ""; md5name = "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09-libwpd-0.10.3.tar.xz"; } { name = "libwpg-0.3.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz"; sha256 = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c"; md5 = ""; md5name = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c-libwpg-0.3.3.tar.xz"; } { name = "libwps-0.4.11.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwps-0.4.11.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libwps-0.4.11.tar.xz"; sha256 = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1"; md5 = ""; md5name = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1-libwps-0.4.11.tar.xz"; } { name = "xsltml_2.1.2.zip"; - url = "http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; + url = "https://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; sha256 = "75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870"; md5 = "a7983f859eafb2677d7ff386a023bc40"; md5name = "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; } { name = "zlib-1.2.11.tar.xz"; - url = "http://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz"; + url = "https://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz"; sha256 = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066"; md5 = ""; md5name = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066-zlib-1.2.11.tar.xz"; } { name = "libzmf-0.0.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz"; sha256 = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22"; md5 = ""; md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix index 1beb8f1156c..dbfd249901e 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -8,8 +8,8 @@ rec { major = "7"; minor = "0"; - patch = "0"; - tweak = "3"; + patch = "3"; + tweak = "1"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "sha256-sl+vgnLGIWtyw8Y/ovVsxThdOMg2Gby4SRaiaqvZVB0="; + sha256 = "0b998k2dxbbj7hn3srn07fgsah236h14ncyyahamdff6h3hvqrk5"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "sha256-i3yfD5cmM6D9BctjablIFRqfibjrwLAaxxPIsQdk0sY="; + sha256 = "0s3ic79q0c16hbd6r06mwkyqhw4fdfy9z3xbqvdxp7jl64cjlaj4"; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "sha256-hYBEEPRmh16zgGZBUN20xfTY6qL07aKMC1lC/0ij9/0="; + sha256 = "14wjkcdmcflfcc7264jx64s6clk5rdsprx7nkbv08z0bp6ff677b"; }; } From 16ee3d1e09da3113157b38c49bc01c90f91242b7 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Fri, 6 Nov 2020 16:21:27 -0800 Subject: [PATCH 219/299] cocoapods: 1.9.3 -> 1.10.0 --- .../development/mobile/cocoapods/Gemfile.lock | 47 +++++----- pkgs/development/mobile/cocoapods/gemset.nix | 89 +++++++++++-------- 2 files changed, 77 insertions(+), 59 deletions(-) diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock index 9e891569d92..d4de7cd698d 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -2,25 +2,26 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.2) - activesupport (4.2.11.3) - i18n (~> 0.7) + activesupport (5.2.4.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - algoliasearch (1.27.2) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.9.3) - activesupport (>= 4.0.2, < 5) + cocoapods (1.10.0) + addressable (~> 2.6) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.9.3) + cocoapods-core (= 1.10.0) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.2.2, < 2.0) + cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) - cocoapods-stats (>= 1.0.0, < 2.0) cocoapods-trunk (>= 1.4.0, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) @@ -30,55 +31,57 @@ GEM molinillo (~> 0.6.6) nap (~> 1.0) ruby-macho (~> 1.4) - xcodeproj (>= 1.14.0, < 2.0) - cocoapods-core (1.9.3) - activesupport (>= 4.0.2, < 6) + xcodeproj (>= 1.19.0, < 2.0) + cocoapods-core (1.10.0) + activesupport (> 5.0, < 6) + addressable (~> 2.6) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) fuzzy_match (~> 2.0.4) nap (~> 1.0) netrc (~> 0.11) + public_suffix typhoeus (~> 1.0) cocoapods-deintegrate (1.0.4) - cocoapods-downloader (1.3.0) + cocoapods-downloader (1.4.0) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.0) - cocoapods-stats (1.1.0) cocoapods-trunk (1.5.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.1.6) + concurrent-ruby (1.1.7) escape (0.0.4) ethon (0.12.0) ffi (>= 1.3.0) - ffi (1.12.2) + ffi (1.13.1) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) - i18n (0.9.5) + i18n (1.8.5) concurrent-ruby (~> 1.0) - json (2.3.0) - minitest (5.14.1) + json (2.3.1) + minitest (5.14.2) molinillo (0.6.6) - nanaimo (0.2.6) + nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) + public_suffix (4.0.6) ruby-macho (1.4.0) thread_safe (0.3.6) typhoeus (1.4.0) ethon (>= 0.9.0) tzinfo (1.2.7) thread_safe (~> 0.1) - xcodeproj (1.16.0) + xcodeproj (1.19.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.2.6) + nanaimo (~> 0.3.0) PLATFORMS ruby diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix index 8ff1b2e118b..3641186186e 100644 --- a/pkgs/development/mobile/cocoapods/gemset.nix +++ b/pkgs/development/mobile/cocoapods/gemset.nix @@ -1,14 +1,25 @@ { activesupport = { - dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wp36wi3r3dscmcr0q6sbz13hr5h911c24ar7zrmmcy7p32ial2i"; + sha256 = "0dpnk20s754fz6jfz9sp3ri49hn46ksw4hf6ycnlw7s3hsdxqgcd"; type = "gem"; }; - version = "4.2.11.3"; + version = "5.2.4.4"; + }; + addressable = { + dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + type = "gem"; + }; + version = "2.7.0"; }; algoliasearch = { dependencies = ["httpclient" "json"]; @@ -16,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b3xk42ry6dlsqn379p884zdi4iyra67xh45rwl6vcrwmrnbq7f0"; + sha256 = "0ly8zsgvih540xmxr098hsngv61cf119wf28q5hbvi1f7kgwvh96"; type = "gem"; }; - version = "1.27.2"; + version = "1.27.5"; }; atomos = { source = { @@ -50,26 +61,26 @@ version = "1.0.3"; }; cocoapods = { - dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; + dependencies = ["addressable" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zqj1878izp34cn7552q2djs3zd4a5ylyv0af3yxbz34z0qllk60"; + sha256 = "1bbpg93gqjryxwr864z7s3jp3ic5pig313jcly4g3n159ssx3a4j"; type = "gem"; }; - version = "1.9.3"; + version = "1.10.0"; }; cocoapods-core = { - dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "typhoeus"]; + dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sn1561sdhq2bh35pmi9nhq1adjcgdkhxybd9pxcjs75zmqzpz13"; + sha256 = "1sb07hj2kjygrzbdkzsyabcsfmip8gcfpjgacw4gfc71h3cnzra4"; type = "gem"; }; - version = "1.9.3"; + version = "1.10.0"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -86,10 +97,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08vn0pgcyn6w6fq5xjd7szv2h9s5rzl17kyidnd7fl5qdmzc9c54"; + sha256 = "1j03hxvz3m82fwgx3jayw0y2iqm7zpacn88r6nfj2arkbjxmvjwz"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.0"; }; cocoapods-plugins = { dependencies = ["nap"]; @@ -108,16 +119,6 @@ }; version = "1.0.0"; }; - cocoapods-stats = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xhdh5v94p6l612rwrk290nd2hdfx8lbaqfbkmj34md218kilqww"; - type = "gem"; - }; - version = "1.1.0"; - }; cocoapods-trunk = { dependencies = ["nap" "netrc"]; groups = ["default"]; @@ -152,10 +153,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; + sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; type = "gem"; }; - version = "1.1.6"; + version = "1.1.7"; }; escape = { source = { @@ -181,10 +182,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; + sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; type = "gem"; }; - version = "1.12.2"; + version = "1.13.1"; }; fourflusher = { groups = ["default"]; @@ -224,32 +225,34 @@ }; i18n = { dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3"; + sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; type = "gem"; }; - version = "0.9.5"; + version = "1.8.5"; }; json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn"; + sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz"; type = "gem"; }; - version = "2.3.0"; + version = "2.3.1"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g"; + sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v"; type = "gem"; }; - version = "5.14.1"; + version = "5.14.2"; }; molinillo = { source = { @@ -260,12 +263,14 @@ version = "0.6.6"; }; nanaimo = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ajfyaqjw3dzykk612yw8sm21savfqy292hgps8h8l4lvxww1lz6"; + sha256 = "0xi36h3f7nm8bc2k0b6svpda1lyank2gf872lxjbhw3h95hdrbma"; type = "gem"; }; - version = "0.2.6"; + version = "0.3.0"; }; nap = { source = { @@ -283,6 +288,16 @@ }; version = "0.11.0"; }; + public_suffix = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + type = "gem"; + }; + version = "4.0.6"; + }; ruby-macho = { groups = ["default"]; platforms = []; @@ -329,9 +344,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bkk8y6lzd86w9yx72hd1nil3fkk5f0v3il9vm554gzpl6dhc2bi"; + sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn"; type = "gem"; }; - version = "1.16.0"; + version = "1.19.0"; }; } \ No newline at end of file From a5ec423734fbf4ef1fe15026116f6f0911fb9196 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Fri, 6 Nov 2020 16:21:42 -0800 Subject: [PATCH 220/299] cocoapods-beta: 1.10.0.beta.2 -> 1.10.0 --- .../mobile/cocoapods/Gemfile-beta.lock | 18 ++++++------ .../mobile/cocoapods/gemset-beta.nix | 28 +++++++++---------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index 98963ba4128..9c5e10d3a48 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -2,22 +2,22 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.2) - activesupport (5.2.4.3) + activesupport (5.2.4.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - algoliasearch (1.27.3) + algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.10.0.beta.2) + cocoapods (1.10.0) addressable (~> 2.6) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.10.0.beta.2) + cocoapods-core (= 1.10.0) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -31,8 +31,8 @@ GEM molinillo (~> 0.6.6) nap (~> 1.0) ruby-macho (~> 1.4) - xcodeproj (>= 1.17.0, < 2.0) - cocoapods-core (1.10.0.beta.2) + xcodeproj (>= 1.19.0, < 2.0) + cocoapods-core (1.10.0) activesupport (> 5.0, < 6) addressable (~> 2.6) algoliasearch (~> 1.0) @@ -64,19 +64,19 @@ GEM i18n (1.8.5) concurrent-ruby (~> 1.0) json (2.3.1) - minitest (5.14.1) + minitest (5.14.2) molinillo (0.6.6) nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) - public_suffix (4.0.5) + public_suffix (4.0.6) ruby-macho (1.4.0) thread_safe (0.3.6) typhoeus (1.4.0) ethon (>= 0.9.0) tzinfo (1.2.7) thread_safe (~> 0.1) - xcodeproj (1.18.0) + xcodeproj (1.19.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix index b456f728b4c..9067f2cec43 100644 --- a/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02fdawr3wyvpzpja3r7mvb8lmn2mm5jdw502bx3ncr2sy2nw1kx6"; + sha256 = "0dpnk20s754fz6jfz9sp3ri49hn46ksw4hf6ycnlw7s3hsdxqgcd"; type = "gem"; }; - version = "5.2.4.3"; + version = "5.2.4.4"; }; addressable = { dependencies = ["public_suffix"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z94dnx0rljsfa3k24i1nc0vf1nfk3bbk89nqc6n1ax25h4fs5sw"; + sha256 = "0ly8zsgvih540xmxr098hsngv61cf119wf28q5hbvi1f7kgwvh96"; type = "gem"; }; - version = "1.27.3"; + version = "1.27.5"; }; atomos = { groups = ["default"]; @@ -68,10 +68,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jf5q75h410b6gymy86j4zy9yhb6n28wa7hrk8p7y2dsafdzbric"; + sha256 = "1bbpg93gqjryxwr864z7s3jp3ic5pig313jcly4g3n159ssx3a4j"; type = "gem"; }; - version = "1.10.0.beta.2"; + version = "1.10.0"; }; cocoapods-core = { dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; @@ -79,10 +79,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vrw6v5fp0m903ghvfwaw3mbxrr68x7hz9bj34rj4icirwp4ifyl"; + sha256 = "1sb07hj2kjygrzbdkzsyabcsfmip8gcfpjgacw4gfc71h3cnzra4"; type = "gem"; }; - version = "1.10.0.beta.2"; + version = "1.10.0"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -263,10 +263,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g"; + sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v"; type = "gem"; }; - version = "5.14.1"; + version = "5.14.2"; }; molinillo = { groups = ["default"]; @@ -313,10 +313,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vywld400fzi17cszwrchrzcqys4qm6sshbv73wy5mwcixmrgg7g"; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; type = "gem"; }; - version = "4.0.5"; + version = "4.0.6"; }; ruby-macho = { groups = ["default"]; @@ -366,9 +366,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18idiqfbvyrcyflccwy4qw125psckrnqy7ggci33m8f3zs8h7hnm"; + sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn"; type = "gem"; }; - version = "1.18.0"; + version = "1.19.0"; }; } \ No newline at end of file From c60ef6a249b952ed975c51a8701d1bd22a6185d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 8 Nov 2020 02:45:57 +0100 Subject: [PATCH 221/299] vgo2nix: 2020-05-05 -> 2020-11-07 --- pkgs/development/tools/vgo2nix/default.nix | 36 ++-- pkgs/development/tools/vgo2nix/deps.nix | 210 --------------------- 2 files changed, 17 insertions(+), 229 deletions(-) delete mode 100644 pkgs/development/tools/vgo2nix/deps.nix diff --git a/pkgs/development/tools/vgo2nix/default.nix b/pkgs/development/tools/vgo2nix/default.nix index 880703383d1..d48787ea017 100644 --- a/pkgs/development/tools/vgo2nix/default.nix +++ b/pkgs/development/tools/vgo2nix/default.nix @@ -1,41 +1,39 @@ -{ stdenv -, lib -, buildGoPackage -, go +{ lib +, fetchFromGitHub +, buildGoModule , makeWrapper , nix-prefetch-git -, fetchFromGitHub +, go }: -buildGoPackage { +buildGoModule { pname = "vgo2nix"; - version = "unstable-2020-05-05"; - goPackagePath = "github.com/adisbladis/vgo2nix"; - - nativeBuildInputs = [ makeWrapper ]; + version = "unstable-2020-11-07"; src = fetchFromGitHub { owner = "nix-community"; repo = "vgo2nix"; - rev = "71e59bf268d5257a0f89b2f59cd20fd468c8c6ac"; - sha256 = "1pcdkknq2v7nrs0siqcvvq2x0qqz5snwdz2lpjnad8i33rwhmayh"; + rev = "4546d8056ab09ece3d2489594627c0541b15a397"; + sha256 = "0n9pf0i5y59kiiv6dq8h8w1plaz9w6s67rqr2acqgxa45iq36mkh"; }; - goDeps = ./deps.nix; + vendorSha256 = "1lzhhg9wimn8nfzrrla5bshgk1ghnlsdfmq6iask0zqz311g96bv"; + + subPackages = [ "." ]; + + nativeBuildInputs = [ makeWrapper ]; allowGoReference = true; - postInstall = with stdenv; let - binPath = lib.makeBinPath [ nix-prefetch-git go ]; - in '' - wrapProgram $out/bin/vgo2nix --prefix PATH : ${binPath} + postInstall = '' + wrapProgram $out/bin/vgo2nix --prefix PATH : ${lib.makeBinPath [ nix-prefetch-git go ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Convert go.mod files to nixpkgs buildGoPackage compatible deps.nix files"; homepage = "https://github.com/nix-community/vgo2nix"; license = licenses.mit; - maintainers = with maintainers; [ adisbladis ]; + maintainers = with maintainers; [ adisbladis SuperSandro2000 ]; }; } diff --git a/pkgs/development/tools/vgo2nix/deps.nix b/pkgs/development/tools/vgo2nix/deps.nix deleted file mode 100644 index 2d9a130e43e..00000000000 --- a/pkgs/development/tools/vgo2nix/deps.nix +++ /dev/null @@ -1,210 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/alecthomas/assert"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/assert"; - rev = "405dbfeb8e38"; - sha256 = "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l"; - }; - } - { - goPackagePath = "github.com/alecthomas/colour"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/colour"; - rev = "60882d9e2721"; - sha256 = "0iq566534gbzkd16ixg7fk298wd766821vvs80838yifx9yml5vs"; - }; - } - { - goPackagePath = "github.com/alecthomas/kingpin"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/kingpin"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "github.com/alecthomas/repr"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/repr"; - rev = "117648cd9897"; - sha256 = "05v1rgzdqc8razf702laagrvhvx68xd9yxxmzd3dyz0d6425pdrp"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cf"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.3"; - sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; - }; - } - { - goPackagePath = "github.com/orivej/e"; - fetch = { - type = "git"; - url = "https://github.com/orivej/e"; - rev = "ac3492690fda"; - sha256 = "11jizr28kfkr6zscjxg95pqi6cjp08aqnhs41sdhc98nww78ilkr"; - }; - } - { - goPackagePath = "github.com/orivej/go-nix"; - fetch = { - type = "git"; - url = "https://github.com/orivej/go-nix"; - rev = "dae45d921a44"; - sha256 = "17hfmsz8hs3h2d5c06j1bvbw8ijrhzm3iz911z5zydsl4x7y0cgy"; - }; - } - { - goPackagePath = "github.com/pkg/profile"; - fetch = { - type = "git"; - url = "https://github.com/pkg/profile"; - rev = "v1.2.1"; - sha256 = "0blqmvgqvdbqmh3fp9pfdxc9w1qfshrr0zy9whj0sn372bw64qnr"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/sergi/go-diff"; - fetch = { - type = "git"; - url = "https://github.com/sergi/go-diff"; - rev = "v1.0.0"; - sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - { - goPackagePath = "github.com/yuin/goldmark"; - fetch = { - type = "git"; - url = "https://github.com/yuin/goldmark"; - rev = "v1.1.27"; - sha256 = "1872cqnii0kwiqcy81yin0idvjy5mdy4zlzz0csb319lcjs3b923"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "87dc89f01550"; - sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g"; - }; - } - { - goPackagePath = "golang.org/x/mod"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mod"; - rev = "v0.2.0"; - sha256 = "1fp6885dclq77mh73v7i54v2b9llpv4di193zc8vmsbbkkc483cl"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "0de0cce0169b"; - sha256 = "1db7s5kbzyh2zd5lpv05n7hp8wbwdvgk0wpiwrlnig94mkr0y5aq"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "cd5d95a43a6e"; - sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "97732733099d"; - sha256 = "118hkp01i4z1f5h6hcjm0ff2ngqhrzj1f7731n0kw8dr6hvbx0sw"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "0c9eba77bc32"; - sha256 = "1xz0jyxdmibkams6vd61va5cw963l25jjf3i9r33m0i739qwg4lj"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "9bdfabe68543"; - sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; - }; - } -] From c8d6ea6925e5dfc9eeba73e5d7e1b5be65b12aeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 29 Oct 2020 15:37:21 +0100 Subject: [PATCH 222/299] restic-rest-server: 0.9.7 -> 0.10.0 --- pkgs/tools/backup/restic/rest-server.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/backup/restic/rest-server.nix b/pkgs/tools/backup/restic/rest-server.nix index 45a4df74b15..9f2a52d64dc 100644 --- a/pkgs/tools/backup/restic/rest-server.nix +++ b/pkgs/tools/backup/restic/rest-server.nix @@ -1,25 +1,20 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "restic-rest-server"; - version = "0.9.7"; - - goPackagePath = "github.com/restic/rest-server"; + version = "0.10.0"; src = fetchFromGitHub { owner = "restic"; repo = "rest-server"; rev = "v${version}"; - sha256 = "1g47ly1pxwn0znbj3v5j6kqhn66d4wf0d5gjqzig75pzknapv8qj"; + sha256 = "1msa6mah76zfif5wp0129jjk2jlq5ff38p9p6d241mw45i1xjfy7"; }; - buildPhase = '' - cd go/src/${goPackagePath} - go run build.go - ''; + vendorSha256 = "04w63sx7p0fm9xq0m7xab808az7lgw7i3p8basndszky8kgvxhmg"; - installPhase = '' - install -Dt $out/bin rest-server + preCheck = '' + substituteInPlace handlers_test.go --replace "TestJoin" "SkipTestJoin" ''; meta = with lib; { From d63af62a6eff7516a8189ecf9cc3f0a7b61de590 Mon Sep 17 00:00:00 2001 From: Danielle Lancashire Date: Sun, 13 Sep 2020 18:29:15 +0200 Subject: [PATCH 223/299] nomad: 0.12.3 -> 0.12.4 --- pkgs/applications/networking/cluster/nomad/0.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/0.12.nix b/pkgs/applications/networking/cluster/nomad/0.12.nix index 3687b58b5a7..d3942a89192 100644 --- a/pkgs/applications/networking/cluster/nomad/0.12.nix +++ b/pkgs/applications/networking/cluster/nomad/0.12.nix @@ -2,6 +2,6 @@ callPackage ./generic.nix { inherit buildGoPackage; - version = "0.12.3"; - sha256 = "100ynhc4nm4mmjxx1jhq2kjbqshxvi5x8y482520j8gsyn40g6zc"; + version = "0.12.4"; + sha256 = "0lwrkynq7iksfjk2m7i56l59d06gibyn6vd9bw80x5h08yw2zdks"; } From b64df08a5fa2b12be9275c4cf963b1bd83446af9 Mon Sep 17 00:00:00 2001 From: Danielle Lancashire Date: Sun, 13 Sep 2020 18:29:35 +0200 Subject: [PATCH 224/299] nomad: Default package 0.11 -> 0.12 Nomad 0.12 has now reached a fairly stable point release, this means we should now be able to bump the default pretty safely, with recent releases bug fixes primarily targetting 0.12 exclusive features, or long standing latent bugs. --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fde911a0a7c..75928eb7dcc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5901,7 +5901,8 @@ in noip = callPackage ../tools/networking/noip { }; - nomad = nomad_0_11; + nomad = nomad_0_12; + # Nomad never updates major go versions within a release series and is unsupported # on Go versions that it did not ship with. Due to historic bugs when compiled # with different versions we pin Go for all versions. From dff0cadbc6c631c65fe7f1fe27a587e934a4b897 Mon Sep 17 00:00:00 2001 From: "Maxine E. Aubrey" Date: Wed, 21 Oct 2020 19:21:20 +0200 Subject: [PATCH 225/299] nomad_0_12: 0.12.4 -> 0.12.5 --- pkgs/applications/networking/cluster/nomad/0.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/0.12.nix b/pkgs/applications/networking/cluster/nomad/0.12.nix index d3942a89192..987ecaac157 100644 --- a/pkgs/applications/networking/cluster/nomad/0.12.nix +++ b/pkgs/applications/networking/cluster/nomad/0.12.nix @@ -2,6 +2,6 @@ callPackage ./generic.nix { inherit buildGoPackage; - version = "0.12.4"; - sha256 = "0lwrkynq7iksfjk2m7i56l59d06gibyn6vd9bw80x5h08yw2zdks"; + version = "0.12.5"; + sha256 = "15cadw8rwdi7iphki8hg3jvxfh0cbxn4i0b1mds1j8z0s7j75mci"; } From decc5fbbc6d17119ac9b27f4d119253fe349350f Mon Sep 17 00:00:00 2001 From: "Maxine E. Aubrey" Date: Thu, 22 Oct 2020 10:56:09 +0200 Subject: [PATCH 226/299] nomad_0_11: 0.11.4 -> 0.11.5 --- pkgs/applications/networking/cluster/nomad/0.11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/0.11.nix b/pkgs/applications/networking/cluster/nomad/0.11.nix index ff0d1c69f41..8c54f5bc1eb 100644 --- a/pkgs/applications/networking/cluster/nomad/0.11.nix +++ b/pkgs/applications/networking/cluster/nomad/0.11.nix @@ -2,6 +2,6 @@ callPackage ./generic.nix { inherit buildGoPackage; - version = "0.11.4"; - sha256 = "1sykp9sji6f564s7bz0cvnr9w5x92n0l1r1djf1bl7jvv2mi1mcb"; + version = "0.11.5"; + sha256 = "0g7i7qd0zksd7s8y4l63kk7xdc7nrw8radba6ws3hw0h2kr2cmp8"; } From ed6f7108df0d37cd14bf5523ceb796c18511ed9a Mon Sep 17 00:00:00 2001 From: "Maxine E. Aubrey" Date: Thu, 22 Oct 2020 10:56:21 +0200 Subject: [PATCH 227/299] nomad_0_12: 0.12.5 -> 0.12.6 --- pkgs/applications/networking/cluster/nomad/0.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/0.12.nix b/pkgs/applications/networking/cluster/nomad/0.12.nix index 987ecaac157..b92bf568b79 100644 --- a/pkgs/applications/networking/cluster/nomad/0.12.nix +++ b/pkgs/applications/networking/cluster/nomad/0.12.nix @@ -2,6 +2,6 @@ callPackage ./generic.nix { inherit buildGoPackage; - version = "0.12.5"; - sha256 = "15cadw8rwdi7iphki8hg3jvxfh0cbxn4i0b1mds1j8z0s7j75mci"; + version = "0.12.6"; + sha256 = "1fd7i50zc7g7d879bijh1ckvyq0h28169p6hw5ip71n71zhvvgp0"; } From 2ff401dd59283ad249c70834bd99db27dede722a Mon Sep 17 00:00:00 2001 From: "Maxine E. Aubrey" Date: Fri, 23 Oct 2020 19:24:14 +0200 Subject: [PATCH 228/299] nomad_0_11: 0.11.5 -> 0.11.6 --- pkgs/applications/networking/cluster/nomad/0.11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/0.11.nix b/pkgs/applications/networking/cluster/nomad/0.11.nix index 8c54f5bc1eb..aec421bf1a7 100644 --- a/pkgs/applications/networking/cluster/nomad/0.11.nix +++ b/pkgs/applications/networking/cluster/nomad/0.11.nix @@ -2,6 +2,6 @@ callPackage ./generic.nix { inherit buildGoPackage; - version = "0.11.5"; - sha256 = "0g7i7qd0zksd7s8y4l63kk7xdc7nrw8radba6ws3hw0h2kr2cmp8"; + version = "0.11.6"; + sha256 = "09ym9fd4fp2461ddhrb5nlz8l24iq4hsbqikzc21ainagq2g1azf"; } From e8469ca6537b68291e9bac4e1259fe40577b24be Mon Sep 17 00:00:00 2001 From: "Maxine E. Aubrey" Date: Fri, 23 Oct 2020 19:24:30 +0200 Subject: [PATCH 229/299] nomad_0_12: 0.12.6 -> 0.12.7 --- pkgs/applications/networking/cluster/nomad/0.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/0.12.nix b/pkgs/applications/networking/cluster/nomad/0.12.nix index b92bf568b79..863f7cbed2f 100644 --- a/pkgs/applications/networking/cluster/nomad/0.12.nix +++ b/pkgs/applications/networking/cluster/nomad/0.12.nix @@ -2,6 +2,6 @@ callPackage ./generic.nix { inherit buildGoPackage; - version = "0.12.6"; - sha256 = "1fd7i50zc7g7d879bijh1ckvyq0h28169p6hw5ip71n71zhvvgp0"; + version = "0.12.7"; + sha256 = "0y1nwmpc4fqgjyb19n1f2w4y5k7fy4p68v2vnnry11nj3im7ia14"; } From b2f62cfa27c0264407fbe0502daa34e8666902c2 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sun, 8 Nov 2020 00:32:39 -0500 Subject: [PATCH 230/299] nwg-launchers: 0.4.0 -> 0.4.2 --- pkgs/applications/misc/nwg-launchers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/nwg-launchers/default.nix b/pkgs/applications/misc/nwg-launchers/default.nix index d14d4d43e83..77eae10293d 100644 --- a/pkgs/applications/misc/nwg-launchers/default.nix +++ b/pkgs/applications/misc/nwg-launchers/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "nwg-launchers"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "0r0wj4w3jj3l56z1lx6ypkzz4fsgx4vzqbvs95661l8q362pndzw"; + sha256 = "0flp7mwj1pgcwx3k9pzc8pmqlkhbddj0maimdnvlazk87kzxpfd0"; }; nativeBuildInputs = [ From 28860ab1ad6e17355dae0452cf222c011dee6802 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sun, 8 Nov 2020 00:57:56 -0500 Subject: [PATCH 231/299] restic: 0.10.0 -> 0.11.0 --- pkgs/tools/backup/restic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 6839b47a5ff..3317ada541a 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "restic"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "restic"; repo = "restic"; rev = "v${version}"; - sha256 = "0nrh52cjymzcf093sqqa3kfw2nimnx6qwn8aw0wsci2v2r84yzzx"; + sha256 = "13zmx9wzv29z0np3agx4rsz1j9pgrvlnngjsb971i1dnzwv5l3hf"; }; - vendorSha256 = "1pfixq3mbfn12gyablc4g0j8r00md3887q0l8xgxy76z0d8w924s"; + vendorSha256 = "09sa5jpdj73w595c063mib14132zacswh54nmjqp2n440cflmwjh"; subPackages = [ "cmd/restic" ]; From e6fd6ab41e12159609c922216287aeb100cdc403 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sun, 8 Nov 2020 01:27:04 -0500 Subject: [PATCH 232/299] dogdns: init at 0.1.0 --- pkgs/tools/networking/dogdns/default.nix | 30 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/networking/dogdns/default.nix diff --git a/pkgs/tools/networking/dogdns/default.nix b/pkgs/tools/networking/dogdns/default.nix new file mode 100644 index 00000000000..2875f202515 --- /dev/null +++ b/pkgs/tools/networking/dogdns/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +, pkg-config +, openssl +}: + +rustPlatform.buildRustPackage rec { + pname = "dogdns"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "ogham"; + repo = "dog"; + rev = "v${version}"; + sha256 = "088ib0sncv0vrvnqfvxf5zc79v7pnxd2cmgp4378r6pmgax9z9zy"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + cargoSha256 = "08scc6vh703245rg3xkffhalrk5pisd0wg54fd49d7gdbyjivgi6"; + + meta = with stdenv.lib; { + description = "Command-line DNS client"; + homepage = "https://dns.lookup.dog"; + license = licenses.eupl12; + maintainers = with maintainers; [ bbigras ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75928eb7dcc..03be57b914c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3355,6 +3355,8 @@ in dog = callPackage ../tools/system/dog { }; + dogdns = callPackage ../tools/networking/dogdns { }; + dosfstools = callPackage ../tools/filesystems/dosfstools { }; dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { }; From bbf6b239902bfc8636759f1389a090eacc0fffa5 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Mon, 2 Nov 2020 22:20:41 -0500 Subject: [PATCH 233/299] nuspell: 4.0.0 -> 4.0.1 --- pkgs/development/libraries/nuspell/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index c8cb7734e90..3fac1421899 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, icu, catch2, ronn }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, icu, catch2, pandoc }: stdenv.mkDerivation rec { pname = "nuspell"; - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - sha256 = "1jfnwva2i67i9pyh123a5h2zs5p7gw77qh4w7qkx61jigsyxc5v7"; + sha256 = "1p90a3wv4b8m5fdpbnr9cyd1x3a504q9rc4cghq02xff63h5gclf"; }; - nativeBuildInputs = [ cmake pkgconfig ronn ]; + nativeBuildInputs = [ cmake pkgconfig pandoc ]; buildInputs = [ boost icu ]; outputs = [ "out" "lib" "dev" "man" ]; From f4c13d1d9d23d974695bb11e06dc55b4cc699c03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 8 Nov 2020 09:43:36 +0100 Subject: [PATCH 234/299] brotli.meta.maintainers: unlist myself Years ago I thought I might use it for something, but anything like that seems very unlikely to ever materialize, so let me focus on packages that I consider more important. --- pkgs/tools/compression/brotli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index a69740ea1ff..7e04d05516a 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; - maintainers = [ maintainers.vcunat ]; + maintainers = [ ]; platforms = platforms.all; }; } From 7b117f15b15c512ae857c2cdf00cfac417614dce Mon Sep 17 00:00:00 2001 From: Vonfry Date: Thu, 29 Oct 2020 19:22:09 +0800 Subject: [PATCH 235/299] fortune-mod: 2.10.0 -> 3.2.0 --- pkgs/tools/misc/fortune/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix index 74c21d21fcc..0804d8b0637 100644 --- a/pkgs/tools/misc/fortune/default.nix +++ b/pkgs/tools/misc/fortune/default.nix @@ -2,11 +2,13 @@ stdenv.mkDerivation rec { pname = "fortune-mod"; - version = "2.10.0"; + version = "3.2.0"; + # We use fetchurl instead of fetchFromGitHub because the release pack has some + # special files. src = fetchurl { - url = "https://www.shlomifish.org/open-source/projects/fortune-mod/arcs/fortune-mod-${version}.tar.xz"; - sha256 = "07g50hij87jb7m40pkvgd47qfvv4s805lwiz79jbqcxzd7zdyax7"; + url = "https://github.com/shlomif/fortune-mod/releases/download/${pname}-${version}/${pname}-${version}.tar.xz"; + sha256 = "0j554ja4min5rbqni8qn5gzk4xiyd643b8r50jyi32pcs88dwp7n"; }; nativeBuildInputs = [ cmake perl ]; @@ -31,12 +33,13 @@ stdenv.mkDerivation rec { ) my_exe( - -- + -- '') ]; meta = with stdenv.lib; { description = "A program that displays a pseudorandom message from a database of quotations"; license = licenses.bsdOriginal; platforms = platforms.unix; + maintainers = with maintainers; [ vonfry ]; }; } From 2c330cba4a082e357351f57de28334479e437967 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 8 Nov 2020 10:41:06 +0000 Subject: [PATCH 236/299] pythonModules.pyscard: 1.9.9 -> 2.0.0 --- pkgs/development/python-modules/pyscard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index d563a62a46b..fefeaf7ebb5 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -9,12 +9,12 @@ let in buildPythonPackage rec { - version = "1.9.9"; + version = "2.0.0"; pname = "pyscard"; src = fetchPypi { inherit pname version; - sha256 = "082cjkbxadaz2jb4rbhr0mkrirzlqyqhcf3r823qb0q1k50ybgg6"; + sha256 = "0yap0p8mp6dx58n3nina6ryhc2cysaj75sq98wf3qybf33cxjr5k"; }; postPatch = if withApplePCSC then '' From 3f659d76e643cc4ae6ea5a35b9ce582505888904 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 8 Nov 2020 13:44:32 +0100 Subject: [PATCH 237/299] pmix: 3.1.5 -> 3.2.0 --- pkgs/development/libraries/pmix/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix index c8d8be4e8cb..32e5c5381b6 100644 --- a/pkgs/development/libraries/pmix/default.nix +++ b/pkgs/development/libraries/pmix/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchFromGitHub, perl, autoconf, automake -, libtool, flex, libevent, hwloc, munge, zlib +, libtool, flex, libevent, hwloc, munge, zlib, pandoc } : let - version = "3.1.5"; + version = "3.2.0"; in stdenv.mkDerivation { pname = "pmix"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { repo = "openpmix"; owner = "openpmix"; rev = "v${version}"; - sha256 = "0fvfsig20amcigyn4v3gcdxc0jif44vqg37b8zzh0s8jqqj7jz5w"; + sha256 = "171hpz0m6lpyjd1hkxy7fl06fcgymz8cssqgbxzg92b7x595276b"; }; postPatch = '' @@ -21,7 +21,7 @@ in stdenv.mkDerivation { patchShebangs ./config ''; - nativeBuildInputs = [ perl autoconf automake libtool flex ]; + nativeBuildInputs = [ pandoc perl autoconf automake libtool flex ]; buildInputs = [ libevent hwloc munge zlib ]; From d1dc6f61f9eae66428ceeb9c7ce76c30c2be30d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 24 Oct 2020 21:15:35 +0200 Subject: [PATCH 238/299] python3.pkgs.smbus-cffi: init at 0.5.1 --- .../python-modules/smbus-cffi/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/smbus-cffi/default.nix diff --git a/pkgs/development/python-modules/smbus-cffi/default.nix b/pkgs/development/python-modules/smbus-cffi/default.nix new file mode 100644 index 00000000000..b762730914b --- /dev/null +++ b/pkgs/development/python-modules/smbus-cffi/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cffi +, pytestCheckHook +, pyserial +, fetchpatch +}: + +buildPythonPackage rec { + pname = "smbus-cffi"; + version = "0.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "fb4195aaabfc01586863f60d3190b5cb1bf8f12622fd597e23e48768dad6bde8"; + }; + + patches = [ + # https://github.com/bivab/smbus-cffi/pull/24 + (fetchpatch { + url = "https://github.com/bivab/smbus-cffi/commit/ba79ae174a9d84e767d95f165c43ee212b1bbb92.patch"; + sha256 = "sha256-WtRuK5y6fWDEhm0Xy5XqS5yCkn7vXXYtjlOjS90gla4="; + }) + ]; + + propagatedBuildInputs = [ cffi ]; + + installCheckPhase = '' + # we want to import the installed module that also contains the compiled library + rm -rf smbus + runHook pytestCheckPhase + ''; + + # requires hardware access + pytestFlagsArray = [ "--ignore=test/test_smbus_integration.py" ]; + + checkInputs = [ pytestCheckHook pyserial ]; + + meta = with lib; { + description = "Python module for SMBus access through Linux I2C /dev interface"; + homepage = "https://github.com/bivab/smbus-cffi"; + license = licenses.gpl2; + maintainers = with maintainers; [ mic92 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ef9459b13f..80f157dbd4e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6664,6 +6664,8 @@ in { smartypants = callPackage ../development/python-modules/smartypants { }; + smbus-cffi = callPackage ../development/python-modules/smbus-cffi { }; + smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 smmap = callPackage ../development/python-modules/smmap { }; From 105dd1dfaef4c684e5c4cc84b759bcd6df1d75ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 24 Oct 2020 21:26:58 +0200 Subject: [PATCH 239/299] python3.pkgs.bme680: init at 1.0.5 --- .../python-modules/bme680/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/bme680/default.nix diff --git a/pkgs/development/python-modules/bme680/default.nix b/pkgs/development/python-modules/bme680/default.nix new file mode 100644 index 00000000000..0fd28701816 --- /dev/null +++ b/pkgs/development/python-modules/bme680/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, smbus-cffi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "bme680"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "pimoroni"; + repo = "bme680-python"; + rev = "v${version}"; + sha256 = "sha256-oIXh1JnGTI/Cj4MQFpWq+sWR2X+ioCsK0Q+T7wPITCQ="; + }; + + propagatedBuildInputs = [ smbus-cffi ]; + + preBuild = '' + cd library + ''; + checkInputs = [ pytestCheckHook ]; + + # next release will have tests, but not the current one + doCheck = false; + + pythonImportsCheck = [ "bme680" ]; + + meta = with lib; { + description = "Python library for driving the Pimoroni BME680 Breakout"; + homepage = "https://github.com/pimoroni/bme680-python"; + license = licenses.mit; + maintainers = with maintainers; [ mic92 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80f157dbd4e..947e631a1c8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -913,6 +913,8 @@ in { bluepy = callPackage ../development/python-modules/bluepy { }; + bme680 = callPackage ../development/python-modules/bme680 { }; + bokeh = callPackage ../development/python-modules/bokeh { }; boltons = callPackage ../development/python-modules/boltons { }; From 0c1ff16a7c64afd7657347957e3e9f74878f1768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 8 Nov 2020 10:53:13 +0100 Subject: [PATCH 240/299] home-assistant: regenerate with new deps --- pkgs/servers/home-assistant/component-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 8f6f555474f..4f5fa58a29d 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -74,7 +74,7 @@ "bbb_gpio" = ps: with ps; [ ]; # missing inputs: Adafruit_BBIO "bbox" = ps: with ps; [ ]; # missing inputs: pybbox "beewi_smartclim" = ps: with ps; [ ]; # missing inputs: beewi_smartclim - "bh1750" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi + "bh1750" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense "binary_sensor" = ps: with ps; [ ]; "bitcoin" = ps: with ps; [ ]; # missing inputs: blockchain "bizkaibus" = ps: with ps; [ ]; # missing inputs: bizkaibus @@ -88,8 +88,8 @@ "bluesound" = ps: with ps; [ xmltodict ]; "bluetooth_le_tracker" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL] "bluetooth_tracker" = ps: with ps; [ bt_proximity ]; # missing inputs: pybluez - "bme280" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi - "bme680" = ps: with ps; [ ]; # missing inputs: bme680 smbus-cffi + "bme280" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense + "bme680" = ps: with ps; [ bme680 smbus-cffi ]; "bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280 "bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected "bond" = ps: with ps; [ ]; # missing inputs: bond-api @@ -222,7 +222,7 @@ "enphase_envoy" = ps: with ps; [ ]; # missing inputs: envoy_reader "entur_public_transport" = ps: with ps; [ ]; # missing inputs: enturclient "environment_canada" = ps: with ps; [ ]; # missing inputs: env_canada - "envirophat" = ps: with ps; [ ]; # missing inputs: envirophat smbus-cffi + "envirophat" = ps: with ps; [ smbus-cffi ]; # missing inputs: envirophat "envisalink" = ps: with ps; [ ]; # missing inputs: pyenvisalink "ephember" = ps: with ps; [ ]; # missing inputs: pyephember "epson" = ps: with ps; [ ]; # missing inputs: epson-projector @@ -358,7 +358,7 @@ "hp_ilo" = ps: with ps; [ ]; # missing inputs: python-hpilo "html5" = ps: with ps; [ aiohttp-cors pywebpush ]; "http" = ps: with ps; [ aiohttp-cors ]; - "htu21d" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi + "htu21d" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense "huawei_lte" = ps: with ps; [ getmac stringcase ]; # missing inputs: huawei-lte-api url-normalize "huawei_router" = ps: with ps; [ ]; "hue" = ps: with ps; [ aiohue ]; @@ -657,7 +657,7 @@ "rainforest_eagle" = ps: with ps; [ ]; # missing inputs: eagle200_reader uEagle "rainmachine" = ps: with ps; [ ]; # missing inputs: regenmaschine "random" = ps: with ps; [ ]; - "raspihats" = ps: with ps; [ ]; # missing inputs: raspihats smbus-cffi + "raspihats" = ps: with ps; [ smbus-cffi ]; # missing inputs: raspihats "raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client "recollect_waste" = ps: with ps; [ ]; # missing inputs: recollect-waste "recorder" = ps: with ps; [ sqlalchemy ]; From 545456ddcae2ed5bdc91ebc5c7fd0b04b1796475 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 8 Nov 2020 14:01:52 +0100 Subject: [PATCH 241/299] rdma-core: 31.0 -> 31.1 --- pkgs/os-specific/linux/rdma-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index 59a7125aad6..13f48405cd1 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -4,7 +4,7 @@ } : let - version = "31.0"; + version = "31.1"; in stdenv.mkDerivation { pname = "rdma-core"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "0qr8a25ylmkwfgyj519zvl74q16bhf4895xjich2r98rl2yg0qdl"; + sha256 = "1xkmdix6mgv6kjjj6wi844bfddhl0ybalrp5g8pf5izasc43brg7"; }; nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ]; From 9621822607fc3c37c2f7c23505ec8de8f567644a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 8 Nov 2020 16:15:55 +0100 Subject: [PATCH 242/299] asymptote: 2.66 -> 2.67; fix build with fresh ghostscript --- pkgs/tools/graphics/asymptote/default.nix | 18 +++++++++++++----- pkgs/tools/graphics/asymptote/default.upstream | 4 ---- 2 files changed, 13 insertions(+), 9 deletions(-) delete mode 100644 pkgs/tools/graphics/asymptote/default.upstream diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 67afac2cdcc..6b8c6870a66 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,24 +1,32 @@ -{ stdenv, fetchFromGitHub, fetchurl +{ stdenv, fetchFromGitHub, fetchurl, fetchpatch , autoreconfHook, bison, glm, yacc, flex , freeglut, ghostscriptX, imagemagick, fftw , boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv , python3Packages -, zlib, perl +, zlib, perl, curl , texLive, texinfo , darwin }: stdenv.mkDerivation rec { - version = "2.66"; + version = "2.67"; pname = "asymptote"; src = fetchFromGitHub { owner = "vectorgraphics"; repo = pname; rev = version; - sha256 = "0c445j950n6nxgr1zxj7a26daa5d9f3i91506b7r7627s943b1kd"; + sha256 = "sha256:1lawj2gf0985clzbyym26s5mxxp2syl1dqqxfzk0sq9s30l2rj3l"; }; + patches = + (stdenv.lib.optional (stdenv.lib.versionOlder version "2.68") + (fetchpatch { + url = "https://github.com/vectorgraphics/asymptote/commit/3361214340d58235f4dbb8f24017d0cd5d94da72.patch"; + sha256 = "sha256:1z2b41x8v7683myd45lq6niixpdjy0b185x0xl61130vrijhq5nm"; + })) + ; + nativeBuildInputs = [ autoreconfHook bison @@ -30,7 +38,7 @@ stdenv.mkDerivation rec { buildInputs = [ ghostscriptX imagemagick fftw boehmgc ncurses readline gsl libsigsegv - zlib perl + zlib perl curl texLive ] ++ (with python3Packages; [ python diff --git a/pkgs/tools/graphics/asymptote/default.upstream b/pkgs/tools/graphics/asymptote/default.upstream deleted file mode 100644 index e86d81ba443..00000000000 --- a/pkgs/tools/graphics/asymptote/default.upstream +++ /dev/null @@ -1,4 +0,0 @@ -url https://sourceforge.net/projects/asymptote/files/ -SF_version_dir -version_link 'src[.]tgz/download$' -SF_redirect From 19fda989f3e973563c78705ad46f49e892326757 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 8 Nov 2020 16:19:21 +0100 Subject: [PATCH 243/299] wlroots: 0.11.0 -> 0.12.0 The libseat session backend [0] will be disabled for now since NixOS depends on systemd anyway (so we can use logind). But if someone wants/requires libseat [1] and would maintain it in Nixpkgs we could enable it. [0]: https://github.com/swaywm/wlroots/pull/2364 [1]: https://sr.ht/~kennylevinsen/seatd/ --- pkgs/development/libraries/wlroots/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 67faad8cd74..13132c8cc1c 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "wlroots"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "swaywm"; repo = "wlroots"; rev = version; - sha256 = "08d5d52m8wy3imfc6mdxpx8swhh2k4s1gmfaykg02j59z84awc6p"; + sha256 = "01j38lmgs2c6fq68v8b75pkilia2wsgzgp46ivfbi9hhx47kgcfn"; }; # $out for the library and $examples for the example programs (in examples): @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { libpng ffmpeg ]; - mesonFlags = [ "-Dlogind-provider=systemd" ]; + mesonFlags = [ "-Dlogind-provider=systemd" "-Dlibseat=disabled" ]; postFixup = '' # Install ALL example programs to $examples: From db6b85391fee03650b9ea937e64f8b4bfa1b0361 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 8 Nov 2020 16:50:11 +0100 Subject: [PATCH 244/299] sway: Fix the build with wlroots 0.12.0 Sway 1.5 isn't affected by the breaking changes of wlroots 0.12.0 so we can simply relax the version requirement. --- pkgs/applications/window-managers/sway/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index da58d844ee8..0af46db0a1c 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -22,7 +22,9 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace meson.build --replace "v1.5" "1.5" + substituteInPlace meson.build \ + --replace "v1.5" "1.5" \ + --replace "wlroots_version = ['>=0.11.0', '<0.12.0']" "wlroots_version = ['>=0.11.0', '<0.13.0']" ''; nativeBuildInputs = [ From 2f845dccbf525cbf79ac64629e9eb932f56dc86f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sun, 8 Nov 2020 16:58:58 +0100 Subject: [PATCH 245/299] manual: nginx: Mention ProtectHome in release notes. See #85567. See https://github.com/NixOS/nixpkgs/pull/85567#pullrequestreview-525820684 --- nixos/doc/manual/release-notes/rl-2009.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 01f113198eb..5845cc48c54 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -885,6 +885,17 @@ php.override { systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; + + Nginx is also started with the systemd option ProtectHome = mkDefault true; + which forbids it to read anything from /home, /root + and /run/user (see + ProtectHome docs + for details). + If you require serving files from home directories, you may choose to set e.g. + +systemd.services.nginx.serviceConfig.ProtectHome = "read-only"; + + From c65164ec759510798482a24455f11918a2d59285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 8 Nov 2020 17:26:54 +0100 Subject: [PATCH 246/299] nixos/release-notes: Mutt 2.x has some backward incompatible changes --- nixos/doc/manual/release-notes/rl-2103.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml index 7fd7ff5c2a9..2a84959f601 100644 --- a/nixos/doc/manual/release-notes/rl-2103.xml +++ b/nixos/doc/manual/release-notes/rl-2103.xml @@ -136,6 +136,13 @@ stanchion package removed along with services.stanchion module. + + + mutt has been updated to a new major version (2.x), which comes with + some backward incompatible changes that are described in the + release notes for Mutt 2.0. + + From 2e7b320931a1bf2a8b7f1dd2f2ee4343a8dc0847 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sun, 8 Nov 2020 17:55:11 +0100 Subject: [PATCH 247/299] manual: nginx: Remove reference to `stateDir` from release notes. Fixes #102211. Fixed wording taken from: https://github.com/NixOS/nixpkgs/issues/102211#issuecomment-719976230 --- nixos/doc/manual/release-notes/rl-2009.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 5845cc48c54..75c8adbf45e 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -879,7 +879,7 @@ php.override { Nginx web server now starting with additional sandbox/hardening options. By default, write access - to services.nginx.stateDir is allowed. To allow writing to other folders, + to /var/log/nginx and /var/cache/nginx is allowed. To allow writing to other folders, use systemd.services.nginx.serviceConfig.ReadWritePaths systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; From b39390867307e040fc274003740c193769d7cff4 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sun, 25 Oct 2020 19:27:09 +0100 Subject: [PATCH 248/299] ocamlPackages.ocaml-lsp: init at 1.1.0 --- .../ocaml-modules/ocaml-lsp/default.nix | 66 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 2 files changed, 68 insertions(+) create mode 100644 pkgs/development/ocaml-modules/ocaml-lsp/default.nix diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix new file mode 100644 index 00000000000..0db0164589c --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix @@ -0,0 +1,66 @@ +{ buildDunePackage +, stdlib-shims +, ppx_yojson_conv_lib +, ocaml-syntax-shims +, omd +, octavius +, dune-build-info +, uutf +, csexp +, cmdliner +, fetchzip +, lib +}: +let + version = "1.1.0"; + src = fetchzip { + url = "https://github.com/ocaml/ocaml-lsp/releases/download/${version}/ocaml-lsp-server-${version}.tbz"; + sha256 = "0al89waw43jl80k9z06kh44byhjhwb5hmzx07sddwi1kr1vc6jrb"; + }; + + # unvendor some (not all) dependencies. + # They are vendored by upstream only because it is then easier to install + # ocaml-lsp without messing with your opam switch, but nix should prevent + # this type of problems without resorting to vendoring. + preBuild = '' + rm -r vendor/{octavius,uutf,ocaml-syntax-shims,omd,cmdliner} + ''; + + buildInputs = [ + stdlib-shims + ppx_yojson_conv_lib + ocaml-syntax-shims + octavius + uutf + csexp + dune-build-info + omd + cmdliner + ]; + + lsp = buildDunePackage { + pname = "lsp"; + inherit version src; + useDune2 = true; + minimumOCamlVersion = "4.06"; + + inherit buildInputs preBuild; + }; + +in +buildDunePackage { + pname = "ocaml-lsp-server"; + inherit version src; + useDune2 = true; + + inherit preBuild; + + buildInputs = buildInputs ++ [ lsp ]; + + meta = with lib; { + description = "OCaml Language Server Protocol implementation"; + license = lib.licenses.isc; + platforms = platforms.unix; + maintainers = [ maintainers.symphorien ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 1cdcb31c97e..757a77f0403 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -654,6 +654,8 @@ let ocamlify = callPackage ../development/tools/ocaml/ocamlify { }; + ocaml-lsp = callPackage ../development/ocaml-modules/ocaml-lsp { }; + ocaml-migrate-parsetree = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree { }; ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { }; From 602d26e8bd6b45add7aef3bd528e9c20ad3a1249 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 8 Nov 2020 16:37:40 +0100 Subject: [PATCH 249/299] libexif: apply patches for CVE-2020-0196, CVE-2020-0452 * CVE-2020-0198: unsigned integer overflow in exif_data_load_data_content * CVE-2020-0452: compiler optimization could remove an a bufferoverflow check, making a buffer overflow possible with some EXIF tags Fixes: CVE-2020-0196, CVE-2020-0452 --- pkgs/development/libraries/libexif/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix index fd2ed39e34a..a0f831e927e 100644 --- a/pkgs/development/libraries/libexif/default.nix +++ b/pkgs/development/libraries/libexif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gettext }: +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gettext }: stdenv.mkDerivation rec { pname = "libexif"; @@ -11,6 +11,20 @@ stdenv.mkDerivation rec { sha256 = "0mzndakdi816zcs13z7yzp7hj031p2dcyfq2p391r63d9z21jmy1"; }; + patches = [ + (fetchpatch { + name = "CVE-2020-0198.patch"; + url = "https://github.com/libexif/libexif/commit/ce03ad7ef4e8aeefce79192bf5b6f69fae396f0c.patch"; + sha256 = "1040278g5dbq3vvlyk8cmzb7flpi9bfsp99268hw69i6ilwbdf2k"; + }) + (fetchpatch { + name = "CVE-2020-0452.patch"; + url = "https://github.com/libexif/libexif/commit/9266d14b5ca4e29b970fa03272318e5f99386e06.patch"; + excludes = [ "NEWS" ]; + sha256 = "0k4z1gbbkli6wwyy9qm2qvn0h00qda6wqym61nmmbys7yc2zryj6"; + }) + ]; + nativeBuildInputs = [ autoreconfHook gettext ]; meta = with stdenv.lib; { From de572aea82fcfc83cb469dcb283a0622f7620971 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 8 Nov 2020 19:52:32 +0100 Subject: [PATCH 250/299] python3Packages.deepmerge: 0.1.0 -> 0.1.1 --- pkgs/development/python-modules/deepmerge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deepmerge/default.nix b/pkgs/development/python-modules/deepmerge/default.nix index 1cdf0449c68..dd6059da974 100644 --- a/pkgs/development/python-modules/deepmerge/default.nix +++ b/pkgs/development/python-modules/deepmerge/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "deepmerge"; - version = "0.1.0"; + version = "0.1.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0d1ab9lxwymqxxd58j50id1wib48xym3ss5xw172i2jfwwwzfdrx"; + sha256 = "07rcz699fr0jgx6i6fvh8dxa72j7745inix760nw3g46jwk487gs"; }; propagatedBuildInputs = [ From 91b20fb1aa6b44fbd9c9d26d62f3e956cfacda63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sun, 8 Nov 2020 22:20:18 +0100 Subject: [PATCH 251/299] roundcube service: Restart on config changes. Until now, e.g. `extraConfig` changes did not reflect in the system on `nixos-rebuild switch`. --- nixos/modules/services/mail/roundcube.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix index a0bbab64985..ee7aa7e22fb 100644 --- a/nixos/modules/services/mail/roundcube.nix +++ b/nixos/modules/services/mail/roundcube.nix @@ -204,6 +204,11 @@ in }; systemd.services.phpfpm-roundcube.after = [ "roundcube-setup.service" ]; + # Restart on config changes. + systemd.services.phpfpm-roundcube.restartTriggers = [ + config.environment.etc."roundcube/config.inc.php".source + ]; + systemd.services.roundcube-setup = mkMerge [ (mkIf (cfg.database.host == "localhost") { requires = [ "postgresql.service" ]; From 197ddbced2ae72efbef0f5f8838a7ad3fbd986eb Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 15 Oct 2020 16:22:14 +0200 Subject: [PATCH 252/299] mesa: Replace all usages of old aliases --- pkgs/applications/networking/browsers/chromium/common.nix | 4 ++-- .../networking/browsers/ungoogled-chromium/common.nix | 4 ++-- pkgs/games/katago/default.nix | 6 +++--- pkgs/top-level/aliases.nix | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 76f53dcecc8..92403598a03 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -22,7 +22,7 @@ # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport , libva ? null # useVaapi -, libdrm ? null, wayland ? null, mesa_drivers ? null, libxkbcommon ? null # useOzone +, libdrm ? null, wayland ? null, mesa ? null, libxkbcommon ? null # useOzone # package customization , useOzone ? false @@ -146,7 +146,7 @@ let ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio - ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ]; + ++ optionals useOzone [ libdrm wayland mesa.drivers libxkbcommon ]; patches = [ ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed) diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix index de409f80370..fd5a8604455 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix @@ -22,7 +22,7 @@ # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport , libva ? null # useVaapi -, libdrm ? null, wayland ? null, mesa_drivers ? null, libxkbcommon ? null # useOzone +, libdrm ? null, wayland ? null, mesa ? null, libxkbcommon ? null # useOzone # package customization , useOzone ? false @@ -153,7 +153,7 @@ let ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio - ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ]; + ++ optionals useOzone [ libdrm wayland mesa.drivers libxkbcommon ]; patches = [ ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed) diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix index 20ad47d3e0a..0f9e4b8d67a 100644 --- a/pkgs/games/katago/default.nix +++ b/pkgs/games/katago/default.nix @@ -9,7 +9,7 @@ , fetchpatch , cudnn ? null , cudatoolkit ? null -, libGL_driver ? null +, mesa ? null , opencl-headers ? null , ocl-icd ? null , gperftools ? null @@ -25,7 +25,7 @@ assert !enableGPU -> ( !enableCuda); assert enableCuda -> ( - libGL_driver != null && + mesa != null && cudatoolkit != null && cudnn != null); @@ -65,7 +65,7 @@ in env.mkDerivation rec { eigen ] ++ lib.optionals (enableGPU && enableCuda) [ cudnn - libGL_driver + mesa.drivers ] ++ lib.optionals (enableGPU && !enableCuda) [ opencl-headers ocl-icd diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 41024876d55..f8228f45701 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -261,7 +261,7 @@ mapAliases ({ libgnome_keyring = libgnome-keyring; # added 2018-02-25 libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25 libgumbo = gumbo; # added 2018-01-21 - libGL_driver = mesa.drivers; + libGL_driver = mesa.drivers; # added 2019-05-28 libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14 libjpeg_drop = libjpeg_original; # added 2020-06-05 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 From 95d509a27827e5ec5db79c03f58d44670f87df59 Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Mon, 9 Nov 2020 11:17:40 +1300 Subject: [PATCH 253/299] CODEOWNERS: Add utdemir to docker tools --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 500d63b8cbf..3762b2eaf8f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -207,7 +207,7 @@ /nixos/tests/podman.nix @NixOS/podman @zowoq # Docker tools -/pkgs/build-support/docker @roberth +/pkgs/build-support/docker @roberth @utdemir /nixos/tests/docker-tools-overlay.nix @roberth /nixos/tests/docker-tools.nix @roberth /doc/builders/images/dockertools.xml @roberth From cd1c5633af2665bf5aee46935ff46f3bacdce317 Mon Sep 17 00:00:00 2001 From: snicket2100 <57048005+snicket2100@users.noreply.github.com> Date: Sun, 8 Nov 2020 23:25:59 +0100 Subject: [PATCH 254/299] firejail: 0.9.62 -> 0.9.64 --- pkgs/os-specific/linux/firejail/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 272b8612d7a..497314a6d44 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="firejail"; - version="0.9.62"; + version="0.9.64"; name="${baseName}-${version}"; url="mirror://sourceforge/firejail/firejail/firejail-${version}.tar.xz"; - sha256="1q2silgy882fl61p5qa9f9jqkxcqnwa71jig3c729iahx4f0hs05"; + sha256="1zgjwy2k57nx0r63fzr15gijah098ig0bll66jd615vc9q3snfz5"; }; buildInputs = [ which @@ -20,19 +20,6 @@ stdenv.mkDerivation { name = "${s.name}.tar.bz2"; }; - patches = [ - (fetchpatch { - name = "CVE-2020-17367.patch"; - url = "https://github.com/netblue30/firejail/commit/2c734d6350ad321fccbefc5ef0382199ac331b37.patch"; - sha256 = "1gxz4jxp80gxnn46195qxcpmikwqab9d0ylj9zkm62lycp84ij6n"; - }) - (fetchpatch { - name = "CVE-2020-17368.patch"; - url = "https://github.com/netblue30/firejail/commit/34193604fed04cad2b7b6b0f1a3a0428afd9ed5b.patch"; - sha256 = "0n4ch3qykxx870201l8lz81f7h84vk93pzz77f5cjbd30cxnbddl"; - }) - ]; - prePatch = '' # Allow whitelisting ~/.nix-profile substituteInPlace etc/firejail.config --replace \ From 5813ab6de2ec1077f24e6cc3d53535468732a7e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 8 Nov 2020 17:51:50 +0100 Subject: [PATCH 255/299] Fix SDL_image loading jpeg and others It was using dlopen and its shared object didn't have the proper rpath to do so. This fixes tuxpaint loading of jpeg pictures. --- pkgs/development/libraries/SDL_image/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index 8e3078563e2..968fc3d38af 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -17,7 +17,12 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest"; + configureFlags = [ + # Disable its dynamic loading or dlopen will fail because of no proper rpath + "--disable-jpg-shared" + "--disable-png-shared" + "--disable-tif-shared" + ] ++ stdenv.lib.optional stdenv.isDarwin "--disable-sdltest"; buildInputs = [ SDL libpng libjpeg libtiff libungif libXpm ]; From 88de0d7354f174379119cc1663e9ccc4203a4e20 Mon Sep 17 00:00:00 2001 From: Masanori Ogino <167209+omasanori@users.noreply.github.com> Date: Mon, 9 Nov 2020 09:29:53 +0900 Subject: [PATCH 256/299] maxima: 5.42.2 -> 5.44.0 (#102861) Reference: https://sourceforge.net/p/maxima/code/ci/master/tree/ChangeLog-5.43.md Reference: https://sourceforge.net/p/maxima/code/ci/master/tree/ChangeLog-5.44.md Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com> --- .../science/math/maxima/default.nix | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 49ff0d5d5a0..1bf7d16f290 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, fetchpatch, sbcl, texinfo, perl, python, makeWrapper, rlwrap ? null -, tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false +{ stdenv, fetchurl, fetchpatch, sbcl, texinfo, perl, python, makeWrapper, autoreconfHook +, rlwrap ? null, tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false }: let name = "maxima"; - version = "5.42.2"; + version = "5.44.0"; searchPath = stdenv.lib.makeBinPath @@ -16,14 +16,20 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "0kdncy6137sg3rradirxzj10mkcvafxd892zlclwhr9sa7b12zhn"; + sha256 = "1v6jr5s6hhj6r18gfk6hgxk2qd6z1dxkrjq9ss2z1y6sqi45wgyr"; }; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = stdenv.lib.filter (x: x != null) [ sbcl ecl texinfo perl python makeWrapper gnuplot # required in the test suite ]; + postPatch = '' + substituteInPlace doc/info/Makefile.am --replace "/usr/bin/env perl" "${perl}/bin/perl" + ''; + postInstall = '' # Make sure that maxima can find its runtime dependencies. for prog in "$out/bin/"*; do @@ -57,13 +63,6 @@ stdenv.mkDerivation ({ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx"; }) - - # upstream bug https://sourceforge.net/p/maxima/bugs/2520/ (not fixed) - # introduced in https://trac.sagemath.org/ticket/13364 - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/0001-taylor2-Avoid-blowing-the-stack-when-diff-expand-isn.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "0xa0b6cr458zp7lc7qi0flv5ar0r3ivsqhjl0c3clv86di2y522d"; - }) ] ++ stdenv.lib.optionals ecl-fasl [ # build fasl, needed for ECL support (fetchpatch { @@ -74,11 +73,13 @@ stdenv.mkDerivation ({ # The test suite is disabled since 5.42.2 because of the following issues: # - # Errors found in /build/maxima-5.42.2/share/linearalgebra/rtest_matrixexp.mac, problems: + # Error(s) found: + # /build/maxima-5.44.0/share/linearalgebra/rtest_matrixexp.mac problems: # (20 21 22) - # Error found in rtest_arag, problem: - # (error break) - # 3 tests failed out of 3,881 total tests. + # Tests that were expected to fail but passed: + # /build/maxima-5.44.0/share/vector/rtest_vect.mac problem: + # (19) + # 3 tests failed out of 16,184 total tests. # # These failures don't look serious. It would be nice to fix them, but I # don't know how and probably won't have the time to find out. From 145be290858682eddb4efa17a9b13d6b66e33287 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 9 Nov 2020 09:48:44 +1000 Subject: [PATCH 257/299] miniserve: 0.10.0 -> 0.10.1 https://github.com/svenstaro/miniserve/releases/tag/v0.10.1 --- pkgs/tools/misc/miniserve/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index a0fe350a273..c40f70c6f7f 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -8,18 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "01nsviw5nc5lb6z3j2yiymiwhiq719nwqpvqbyb5p65s98sph7yh"; + sha256 = "0d3jfxlk6r52ikqlvrj34grj2anq6r8653icn1dsjcrnwam5vn39"; }; - cargoSha256 = "098p4645air5402shqignc57zdm6755shahhby17nqv1s27gfinc"; - - RUSTC_BOOTSTRAP = 1; + cargoSha256 = "0zzfx7j36cxjx8vbcghg5icimda7lwm2qhlnvxcd67fws3ggmn5x"; nativeBuildInputs = [ pkg-config zlib ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; From 0c75dfb732d471ff9641ea24a89defa780d849be Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 9 Nov 2020 01:45:09 +0000 Subject: [PATCH 258/299] convertall: init at 0.8.0 (#103108) --- .../science/misc/convertall/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/science/misc/convertall/default.nix diff --git a/pkgs/applications/science/misc/convertall/default.nix b/pkgs/applications/science/misc/convertall/default.nix new file mode 100644 index 00000000000..63ed18c89b2 --- /dev/null +++ b/pkgs/applications/science/misc/convertall/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, python3, wrapQtAppsHook }: + +let + inherit (python3.pkgs) wrapPython pyqt5; +in stdenv.mkDerivation rec { + pname = "convertall"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "doug-101"; + repo = "ConvertAll"; + rev = "v${version}"; + sha256 = "02xxasgbjbivsbhyfpn3cpv52lscdx5kc95s6ns1dvnmdg0fpng0"; + }; + + nativeBuildInputs = [ python3 wrapPython wrapQtAppsHook ]; + + propagatedBuildInputs = [ pyqt5 ]; + + installPhase = '' + python3 install.py -p $out -x + ''; + + postFixup = '' + buildPythonPath $out + patchPythonScript $out/share/convertall/convertall.py + makeQtWrapper $out/share/convertall/convertall.py $out/bin/convertall + ''; + + meta = with stdenv.lib; { + homepage = "https://convertall.bellz.org/"; + description = "Graphical unit converter"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ orivej ]; + platforms = pyqt5.meta.platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afa640a9f3f..9f881a85cca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26892,6 +26892,8 @@ in inherit (pkgs.gnome2) gtkglext; }; + convertall = qt5.callPackage ../applications/science/misc/convertall { }; + cytoscape = callPackage ../applications/science/misc/cytoscape { jre = openjdk11; }; From 3a04ea47b74b0c5fbc8b9233666b2cb1fec44901 Mon Sep 17 00:00:00 2001 From: Felix Andreas Date: Wed, 4 Nov 2020 00:28:51 +0100 Subject: [PATCH 259/299] maintainers: add andreasfelix --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bacd3dab9aa..6a5582d2c92 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -514,6 +514,12 @@ githubId = 69135; name = "Andrea Bedini"; }; + andreasfelix = { + email = "fandreas@physik.hu-berlin.de"; + github = "andreasfelix"; + githubId = 24651767; + name = "Felix Andreas"; + }; andres = { email = "ksnixos@andres-loeh.de"; github = "kosmikus"; From 49280e8bb8b874355a1245e36b9276b6573a60af Mon Sep 17 00:00:00 2001 From: Felix Andreas Date: Mon, 9 Nov 2020 03:44:08 +0100 Subject: [PATCH 260/299] vala-language-server: init at 0.48.1 --- .../tools/vala-language-server/default.nix | 59 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/tools/vala-language-server/default.nix diff --git a/pkgs/development/tools/vala-language-server/default.nix b/pkgs/development/tools/vala-language-server/default.nix new file mode 100644 index 00000000000..f26615e26b7 --- /dev/null +++ b/pkgs/development/tools/vala-language-server/default.nix @@ -0,0 +1,59 @@ +{ stdenv +, fetchFromGitHub +, nix-update-script +, meson +, ninja +, pkg-config +, scdoc +, gnome-builder +, gnused +, glib +, libgee +, json-glib +, jsonrpc-glib +, vala +}: + +stdenv.mkDerivation rec { + pname = "vala-language-server"; + version = "0.48.1"; + + src = fetchFromGitHub { + owner = "benwaffle"; + repo = pname; + rev = version; + sha256 = "12k095052jkvbiyz8gzkj6w7r7p16d5m18fyikl48yvh5nln8fw0"; + }; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + # GNOME Builder Plugin + gnused + gnome-builder + ]; + + buildInputs = [ + glib + libgee + json-glib + jsonrpc-glib + vala + ]; + + meta = with stdenv.lib; { + description = "Code Intelligence for Vala & Genie"; + homepage = "https://github.com/benwaffle/vala-language-server"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ andreasfelix worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 006a9dbe765..cee7f463ba7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11899,6 +11899,8 @@ in vagrant = callPackage ../development/tools/vagrant {}; + vala-language-server = callPackage ../development/tools/vala-language-server {}; + bashdb = callPackage ../development/tools/misc/bashdb { }; gdb = callPackage ../development/tools/misc/gdb { From 56172cf2c127884329431e6057f51aec0d505a70 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 9 Nov 2020 12:48:25 +1000 Subject: [PATCH 261/299] miniserve: 0.10.1 -> 0.10.3 --- pkgs/tools/misc/miniserve/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index c40f70c6f7f..3e3c62fd093 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.10.1"; + version = "0.10.3"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "0d3jfxlk6r52ikqlvrj34grj2anq6r8653icn1dsjcrnwam5vn39"; + sha256 = "17m0h0ib7fl0kijagcwdcnvrdcb6z3knix9dl17abg5ivbvkwz8q"; }; - cargoSha256 = "0zzfx7j36cxjx8vbcghg5icimda7lwm2qhlnvxcd67fws3ggmn5x"; + cargoSha256 = "0ddc8b9wph4r1qcy24p8yiaq9s2knii0d7dh0w0qnzrn6cmm17dg"; nativeBuildInputs = [ pkg-config zlib ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; From 7d3fb8234df988c807c8ecc974f15da92d5e8046 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Mon, 9 Nov 2020 04:11:29 +0100 Subject: [PATCH 262/299] brotli: add myself as maintainer (#103129) --- pkgs/tools/compression/brotli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index 7e04d05516a..f4f0ac41563 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ freezeboy ]; platforms = platforms.all; }; } From 1a7131a8420199946d1cc4b9164f1b08132efa8c Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sun, 8 Nov 2020 21:14:34 +0100 Subject: [PATCH 263/299] wordpress: 5.5.1 -> 5.5.3 --- pkgs/servers/web-apps/wordpress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 01998809347..af2a4120267 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.5.1"; + version = "5.5.3"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "15cjp48q23fw8ryy39mlxi4rd3rha2yqyrnk5mhx0h72ygawx8k6"; + sha256 = "sTkmdr9Mulw7XwNEMJBU81rwNV/agNpBjCznGuObrtQ="; }; installPhase = '' From 78bf7f33d9ca4562858414ed22919c9f510ead8e Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Mon, 9 Nov 2020 11:40:52 +0100 Subject: [PATCH 264/299] wtf: 0.33.0 -> 0.34.0 --- pkgs/applications/misc/wtf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index ad8e261cf68..ad107b64472 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.33.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "0dszc3igfvlb6dgf5whyhw72id39lqqmgpd42kyqx5yjf5dw2wg7"; + sha256 = "01zydr1w8byjhxf4xj6z001q4ynq0452cn332ap1l1w0dmx9mxyr"; }; - vendorSha256 = "1wcqk8lfv3jq7dfaj9dj8bzsmq2qislzs1m38gx1hh4jwg1rn2cn"; + vendorSha256 = "1xyai417l8q44b562ssp5qqw04klrhg5397ahr4pc3i30csz8a7a"; doCheck = false; From 22b73d1282c2f5e39d9cd009531c17a931a97965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Fri, 6 Nov 2020 00:28:15 +0100 Subject: [PATCH 265/299] pkgs/*: add final newline to .nix files --- pkgs/applications/science/physics/xflr5/default.nix | 2 +- pkgs/applications/window-managers/windowlab/default.nix | 2 +- pkgs/build-support/fetchsvnrevision/default.nix | 2 +- .../interpreters/python/update-python-libraries/default.nix | 2 +- pkgs/development/libraries/aspell/aspell-with-dicts.nix | 2 +- pkgs/development/libraries/protobuf/2.5.nix | 2 +- pkgs/development/tools/misc/itm-tools/default.nix | 2 +- pkgs/servers/mlflow-server/default.nix | 2 +- pkgs/tools/graphics/diagrams-builder/default.nix | 2 +- pkgs/tools/misc/jugglinglab/default.nix | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/science/physics/xflr5/default.nix b/pkgs/applications/science/physics/xflr5/default.nix index 85838b04cbf..b2e5284796f 100644 --- a/pkgs/applications/science/physics/xflr5/default.nix +++ b/pkgs/applications/science/physics/xflr5/default.nix @@ -20,4 +20,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.esclear ]; platforms = platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/window-managers/windowlab/default.nix b/pkgs/applications/window-managers/windowlab/default.nix index d0a1de7f600..1bbdb7a460f 100644 --- a/pkgs/applications/window-managers/windowlab/default.nix +++ b/pkgs/applications/window-managers/windowlab/default.nix @@ -33,4 +33,4 @@ stdenv.mkDerivation { maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/build-support/fetchsvnrevision/default.nix b/pkgs/build-support/fetchsvnrevision/default.nix index 288451a225c..f2e2a11da8d 100644 --- a/pkgs/build-support/fetchsvnrevision/default.nix +++ b/pkgs/build-support/fetchsvnrevision/default.nix @@ -7,4 +7,4 @@ runCommand: subversion: repository: rev=$(echo p | svn ls -v --depth empty ${repository} |awk '{ print $1 }') echo "[ \"$rev\" ]" > $out echo Latest revision is $rev - '') \ No newline at end of file + '') diff --git a/pkgs/development/interpreters/python/update-python-libraries/default.nix b/pkgs/development/interpreters/python/update-python-libraries/default.nix index 762ca2bdd34..81975bc5250 100644 --- a/pkgs/development/interpreters/python/update-python-libraries/default.nix +++ b/pkgs/development/interpreters/python/update-python-libraries/default.nix @@ -9,4 +9,4 @@ runCommand "update-python-libraries" { cp ${./update-python-libraries.py} $out patchShebangs $out substituteInPlace $out --replace 'GIT = "git"' 'GIT = "${git}/bin/git"' -'' \ No newline at end of file +'' diff --git a/pkgs/development/libraries/aspell/aspell-with-dicts.nix b/pkgs/development/libraries/aspell/aspell-with-dicts.nix index fd5ccf9696c..88b1302271f 100644 --- a/pkgs/development/libraries/aspell/aspell-with-dicts.nix +++ b/pkgs/development/libraries/aspell/aspell-with-dicts.nix @@ -33,4 +33,4 @@ in buildEnv { done popd ''; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/protobuf/2.5.nix b/pkgs/development/libraries/protobuf/2.5.nix index 550d0b1bace..9d7bb38cf3c 100644 --- a/pkgs/development/libraries/protobuf/2.5.nix +++ b/pkgs/development/libraries/protobuf/2.5.nix @@ -7,4 +7,4 @@ callPackage ./generic.nix (args // rec { url = "http://protobuf.googlecode.com/files/${version}.tar.bz2"; sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk"; }; -}) \ No newline at end of file +}) diff --git a/pkgs/development/tools/misc/itm-tools/default.nix b/pkgs/development/tools/misc/itm-tools/default.nix index 6fb25695111..a121cc67099 100644 --- a/pkgs/development/tools/misc/itm-tools/default.nix +++ b/pkgs/development/tools/misc/itm-tools/default.nix @@ -25,4 +25,4 @@ rustPlatform.buildRustPackage rec { license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ hh sb0 ]; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/mlflow-server/default.nix b/pkgs/servers/mlflow-server/default.nix index eb99fffeb16..12f1427555b 100644 --- a/pkgs/servers/mlflow-server/default.nix +++ b/pkgs/servers/mlflow-server/default.nix @@ -34,4 +34,4 @@ py.toPythonApplication cp ${gunicornScript} $gpath chmod 555 $gpath ''; -})) \ No newline at end of file +})) diff --git a/pkgs/tools/graphics/diagrams-builder/default.nix b/pkgs/tools/graphics/diagrams-builder/default.nix index a12e5dbb8bb..8a23375d945 100644 --- a/pkgs/tools/graphics/diagrams-builder/default.nix +++ b/pkgs/tools/graphics/diagrams-builder/default.nix @@ -41,4 +41,4 @@ stdenv.mkDerivation { # Will be faster to build the wrapper locally then to fetch it from a binary cache. preferLocalBuild = true; meta = diagrams-builder.meta; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/jugglinglab/default.nix b/pkgs/tools/misc/jugglinglab/default.nix index 32c45b31a17..1b5f11440fa 100644 --- a/pkgs/tools/misc/jugglinglab/default.nix +++ b/pkgs/tools/misc/jugglinglab/default.nix @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ wnklmnn ]; platforms = platforms.all; }; -} \ No newline at end of file +} From 0950c98059a8e393b37ae1fbd4fa15901740522c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Thu, 5 Nov 2020 12:26:15 +0100 Subject: [PATCH 266/299] docker: add final newline to detjson.py --- pkgs/build-support/docker/detjson.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/docker/detjson.py b/pkgs/build-support/docker/detjson.py index 439c2131387..fe82cbea11b 100644 --- a/pkgs/build-support/docker/detjson.py +++ b/pkgs/build-support/docker/detjson.py @@ -37,4 +37,4 @@ def main(): json.dump(j, sys.stdout, sort_keys=True) if __name__ == '__main__': - main() \ No newline at end of file + main() From 3ca5220350202fb084de03bbf8acdbc91485a536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Thu, 5 Nov 2020 12:27:23 +0100 Subject: [PATCH 267/299] keen4: add final newline to builder.sh --- pkgs/games/keen4/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/keen4/builder.sh b/pkgs/games/keen4/builder.sh index 50d261db865..b5864b8392f 100644 --- a/pkgs/games/keen4/builder.sh +++ b/pkgs/games/keen4/builder.sh @@ -28,4 +28,4 @@ for i in *; do fi done EOF -chmod +x $out/bin/keen4 \ No newline at end of file +chmod +x $out/bin/keen4 From 0e19ef393acc86efca69e5b10bd9d3ee8ec81164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Thu, 5 Nov 2020 12:32:21 +0100 Subject: [PATCH 268/299] idris-modules: add final newline to TODO.md --- pkgs/development/idris-modules/TODO.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/idris-modules/TODO.md b/pkgs/development/idris-modules/TODO.md index 4dcaa61829a..41b0be2b2ef 100644 --- a/pkgs/development/idris-modules/TODO.md +++ b/pkgs/development/idris-modules/TODO.md @@ -1,3 +1,3 @@ * Build the RTS separately from Idris * idris2nix -* Only require gmp, rts when compiling executables \ No newline at end of file +* Only require gmp, rts when compiling executables From 2c9497b430fc3d1b8b7c95648e6e87c8e0f50a01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Thu, 5 Nov 2020 12:44:07 +0100 Subject: [PATCH 269/299] qxmledit: add final newline to qxmledit.json --- pkgs/applications/editors/qxmledit/qxmledit.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/qxmledit/qxmledit.json b/pkgs/applications/editors/qxmledit/qxmledit.json index 3b50532d6a0..88d2e3c4c2b 100644 --- a/pkgs/applications/editors/qxmledit/qxmledit.json +++ b/pkgs/applications/editors/qxmledit/qxmledit.json @@ -3,4 +3,4 @@ "repo": "qxmledit", "rev": "6136dca50ceb3b4447c91a7a18dcf84785ea11d1", "sha256": "1wcnphalwf0a5gz9r44jgk8wcv1w2qipbwjkbzkra2kxanxns834" -} \ No newline at end of file +} From 88bf1b3e92d96cb64c862db09b7e90263d89664e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Thu, 5 Nov 2020 16:24:19 +0100 Subject: [PATCH 270/299] nixos/boot: add final newline to pbkdf2-sha512.c --- nixos/modules/system/boot/pbkdf2-sha512.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/pbkdf2-sha512.c b/nixos/modules/system/boot/pbkdf2-sha512.c index b40c383ac02..67e989957ba 100644 --- a/nixos/modules/system/boot/pbkdf2-sha512.c +++ b/nixos/modules/system/boot/pbkdf2-sha512.c @@ -35,4 +35,4 @@ int main(int argc, char** argv) fwrite(key, 1, key_length, stdout); return 0; -} \ No newline at end of file +} From 433c1a77260ed5bc8ed5da226ab54c9a204a5605 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Thu, 5 Nov 2020 22:06:46 +0100 Subject: [PATCH 271/299] diagrams-builder,mlflow-server: remove trailing whitespace --- pkgs/servers/mlflow-server/default.nix | 2 +- pkgs/tools/graphics/diagrams-builder/default.nix | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/mlflow-server/default.nix b/pkgs/servers/mlflow-server/default.nix index 12f1427555b..45dd6dd43ae 100644 --- a/pkgs/servers/mlflow-server/default.nix +++ b/pkgs/servers/mlflow-server/default.nix @@ -3,7 +3,7 @@ let py = python3.pkgs; in -py.toPythonApplication +py.toPythonApplication (py.mlflow.overridePythonAttrs(old: rec { pname = "mlflow-server"; diff --git a/pkgs/tools/graphics/diagrams-builder/default.nix b/pkgs/tools/graphics/diagrams-builder/default.nix index 8a23375d945..24e43044697 100644 --- a/pkgs/tools/graphics/diagrams-builder/default.nix +++ b/pkgs/tools/graphics/diagrams-builder/default.nix @@ -2,7 +2,7 @@ If user need access to more haskell package for building his diagrams, he simply has to pass these package through the extra packages function as follow in `config.nix`: - + ~~~ diagrams-builder.override { extraPackages = self : [myHaskellPackage]; @@ -15,7 +15,7 @@ let # Used same technique as for the yiCustom package. - wrappedGhc = ghcWithPackages + wrappedGhc = ghcWithPackages (self: [ diagrams-builder ] ++ extraPackages self); ghcVersion = wrappedGhc.version; @@ -25,7 +25,7 @@ let --set NIX_GHC ${wrappedGhc}/bin/ghc \ --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${ghcVersion} ''; - + backends = ["svg" "cairo" "ps"]; in @@ -35,7 +35,7 @@ stdenv.mkDerivation { buildInputs = [ makeWrapper ]; - buildCommand = with stdenv.lib; + buildCommand = with stdenv.lib; concatStrings (intersperse "\n" (map exeWrapper backends)); # Will be faster to build the wrapper locally then to fetch it from a binary cache. From a62b87270e9e1ddbb8d160ea262ba6cd78eda141 Mon Sep 17 00:00:00 2001 From: Chris Double Date: Mon, 9 Nov 2020 21:41:49 +1300 Subject: [PATCH 272/299] namecoin: remove myself as maintainer --- pkgs/applications/blockchains/namecoin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/namecoin.nix b/pkgs/applications/blockchains/namecoin.nix index 936eaa2505e..cbce1773104 100644 --- a/pkgs/applications/blockchains/namecoin.nix +++ b/pkgs/applications/blockchains/namecoin.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency"; homepage = "https://namecoin.org"; license = licenses.mit; - maintainers = with maintainers; [ doublec infinisil ]; + maintainers = with maintainers; [ infinisil ]; platforms = platforms.linux; }; } From f4a3f2e6ce1e8a8c443ce9b2195d7e9b29e014d2 Mon Sep 17 00:00:00 2001 From: Chris Double Date: Mon, 9 Nov 2020 21:41:59 +1300 Subject: [PATCH 273/299] tor-browser-bundle-bin: remove myself as maintainer --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 842ce9ba9a3..f6f6deb7380 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -403,7 +403,7 @@ stdenv.mkDerivation rec { homepage = "https://www.torproject.org/"; changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}"; platforms = attrNames srcs; - maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm hax404 cap KarlJoad ]; + maintainers = with maintainers; [ offline matejc thoughtpolice joachifm hax404 cap KarlJoad ]; hydraPlatforms = []; # MPL2.0+, GPL+, &c. While it's not entirely clear whether # the compound is "libre" in a strict sense (some components place certain From 743169a07b8f795958a2e56a8ecc0dbf3da29a1a Mon Sep 17 00:00:00 2001 From: Chris Double Date: Mon, 9 Nov 2020 21:42:14 +1300 Subject: [PATCH 274/299] freenet: remove myself as maintainer --- pkgs/applications/networking/p2p/freenet/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index 017f059ff6c..d50f5a67931 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -74,7 +74,7 @@ in stdenv.mkDerivation { description = "Decentralised and censorship-resistant network"; homepage = "https://freenetproject.org/"; license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.doublec ]; + maintainers = [ ]; platforms = with stdenv.lib.platforms; linux; }; } From 02004e4a1f673546fab2be9fa9491a388dbced8f Mon Sep 17 00:00:00 2001 From: Chris Double Date: Mon, 9 Nov 2020 21:42:27 +1300 Subject: [PATCH 275/299] ponyc: remove myself as maintainer --- pkgs/development/compilers/ponyc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 566fd7be311..0bfaba914a7 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation (rec { description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language"; homepage = "https://www.ponylang.org"; license = licenses.bsd2; - maintainers = with maintainers; [ doublec kamilchm patternspandemic redvers ]; + maintainers = with maintainers; [ kamilchm patternspandemic redvers ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; }) From b1c43525d0da90263ab564932d6ec4b4ed3f8ac2 Mon Sep 17 00:00:00 2001 From: Chris Double Date: Mon, 9 Nov 2020 21:42:40 +1300 Subject: [PATCH 276/299] tor: remove myself as maintainer --- pkgs/tools/security/tor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index a3a76dd7b83..791ba802886 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; - [ phreedom doublec thoughtpolice joachifm ]; + [ phreedom thoughtpolice joachifm ]; platforms = platforms.unix; }; } From 327e84900f24225f37bff309083d334f202f4ce3 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sun, 8 Nov 2020 00:21:09 -0500 Subject: [PATCH 277/299] swaylock-effects: v1.6-1 -> v1.6-2 --- pkgs/applications/window-managers/sway/lock-effects.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/sway/lock-effects.nix b/pkgs/applications/window-managers/sway/lock-effects.nix index a6c8d5cd1c3..4bb4225d394 100644 --- a/pkgs/applications/window-managers/sway/lock-effects.nix +++ b/pkgs/applications/window-managers/sway/lock-effects.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "swaylock-effects"; - version = "v1.6-1"; + version = "v1.6-2"; src = fetchFromGitHub { owner = "mortie"; repo = "swaylock-effects"; rev = version; - sha256 = "044fc4makjx8v29fkx5xlil6vr1v4r0k6c8741pl67gzvlm4cx3i"; + sha256 = "0fs3c4liajgkax0a2pdc7117v1g9k73nv87g3kyv9wsnkfbbz534"; }; postPatch = '' From c8e9728927e8d0f42345ba84a7ab0a0d160ae76f Mon Sep 17 00:00:00 2001 From: Sebastien Braun Date: Sun, 8 Nov 2020 06:18:50 +0100 Subject: [PATCH 278/299] erlangR23: 23.1 -> 23.1.2 --- pkgs/development/interpreters/erlang/R23.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R23.nix b/pkgs/development/interpreters/erlang/R23.nix index e0e2357cc24..3ad55d806a5 100644 --- a/pkgs/development/interpreters/erlang/R23.nix +++ b/pkgs/development/interpreters/erlang/R23.nix @@ -3,8 +3,8 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "23.1"; - sha256 = "1k74g6m2lidhp04vrcwrg0jszj3zwxyrm4fsma09sfn9rfsra36g"; + version = "23.1.2"; + sha256 = "06dp2sw486khy2lc34cw5dca58ii5jvi26dpchiqxnmyvd6995z0"; prePatch = '' substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" From 64c4adce545a30aab8c7c5591f935d2d7126dd0c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 9 Nov 2020 21:52:41 +1000 Subject: [PATCH 279/299] fzf: 0.24.2 -> 0.24.3 https://github.com/junegunn/fzf/releases/tag/0.24.3 --- pkgs/tools/misc/fzf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index fd9cea21a91..de9e5825114 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fzf"; - version = "0.24.2"; + version = "0.24.3"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "1s9ynpd158cddzppphqksml5v1csyi55ji0az8kz2p10iz89v1ry"; + sha256 = "04ycjgy40if0licc883lp7i6jpndvcndw24xp7lilskmaacpm5if"; }; vendorSha256 = "0dd0qm1fxp3jnlrhfaas8fw87cj7rygaac35a9nk3xh2xsk7q35p"; From 8691178e7adc6039a9a4dd3487fc24ecae64a346 Mon Sep 17 00:00:00 2001 From: Sebastian Jordan Date: Sat, 7 Nov 2020 20:13:30 +0100 Subject: [PATCH 280/299] nix-prefetch-github: 4.0 -> 4.0.1 --- .../python-modules/nix-prefetch-github/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index d4307c65980..152ceddb91f 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "nix-prefetch-github"; - version = "4.0"; + version = "4.0.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-STUyMUCWAHfDA6dkpiOqSRBL3/tubedUbWa94Kp/764="; + sha256 = "asfRohjOgYxMV/wprKvxUD328GVJQkAYnuAkE09kKgs="; }; propagatedBuildInputs = [ From aaae3637a64ee5fa5ccc8974ed78ddab6f5757b0 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Fri, 6 Nov 2020 23:17:42 +0200 Subject: [PATCH 281/299] qbittorrent: 4.2.5 -> 4.3.0.1 --- 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 964752f3b85..9b6a8bd707d 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,13 +10,13 @@ with lib; mkDerivation rec { pname = "qbittorrent"; - version = "4.2.5"; + version = "4.3.0.1"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qbittorrent"; rev = "release-${version}"; - sha256 = "1n613ylg6i9gisgk0dbr2kpfasyizrkdjff1r8smd4vri2qrdksn"; + sha256 = "068sf24mjvc2idimgpzvf7gjk8n9xrr3qqlqfx5j3j598ckm3yfp"; }; # NOTE: 2018-05-31: CMake is working but it is not officially supported From c54bb4e98ed1d1e2b1c3e437777652d7c4cefb66 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Thu, 5 Nov 2020 16:38:06 -0500 Subject: [PATCH 282/299] argocd: 1.4.2 -> 1.7.8 --- .../networking/cluster/argocd/default.nix | 10 +- .../cluster/argocd/use-go-module.patch | 3058 ----------------- 2 files changed, 4 insertions(+), 3064 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/argocd/use-go-module.patch diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 505de3c0802..2f884970fc1 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,24 +2,22 @@ buildGoModule rec { pname = "argocd"; - version = "1.4.2"; - commit = "48cced9d925b5bc94f6aa9fa4a8a19b2a59e128a"; + version = "1.7.8"; + commit = "ef5010c3a0b5e027fd642732d03c5b0391b1e574"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "01vsyrks1k5yfvrarv8ia0isr7snilr21b7lfiy860si82r2r8hj"; + sha256 = "1pwk6mzmlsx43c75wl5lglpxgc2jkgzra4443hwp6n0wfgzajfp4"; }; - vendorSha256 = "0r2nh7v00m6zbdnhsgjn01q9pkiz41ckkqgfnpqmkxaqmjz31iyj"; + vendorSha256 = "0c5gykijwjrq3cx9qg9hm5j7axccngc1kp5qj3429a2ilw80l8pl"; doCheck = false; nativeBuildInputs = [ packr ]; - patches = [ ./use-go-module.patch ]; - buildFlagsArray = '' -ldflags= -X github.com/argoproj/argo-cd/common.version=${version} diff --git a/pkgs/applications/networking/cluster/argocd/use-go-module.patch b/pkgs/applications/networking/cluster/argocd/use-go-module.patch deleted file mode 100644 index ac597f4187e..00000000000 --- a/pkgs/applications/networking/cluster/argocd/use-go-module.patch +++ /dev/null @@ -1,3058 +0,0 @@ -diff --git a/Gopkg.lock b/Gopkg.lock -deleted file mode 100644 -index 03737a95..00000000 ---- a/Gopkg.lock -+++ /dev/null -@@ -1,2103 +0,0 @@ --# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. -- -- --[[projects]] -- digest = "1:6d5a057da97a9dbdb10e7beedd2f43452b6bf7691001c0c8886e8dacf5610349" -- name = "bou.ke/monkey" -- packages = ["."] -- pruneopts = "" -- revision = "bdf6dea004c6fd1cdf4b25da8ad45a606c09409a" -- version = "v1.0.1" -- --[[projects]] -- digest = "1:9702dc153c9bb6ee7ee0587c248b7024700e89e4a7be284faaeeab9da32e1c6b" -- name = "cloud.google.com/go" -- packages = ["compute/metadata"] -- pruneopts = "" -- revision = "767c40d6a2e058483c25fa193e963a22da17236d" -- version = "v0.18.0" -- --[[projects]] -- digest = "1:8ec1618fc3ee146af104d6c13be250f25e5976e34557d4afbfe4b28035ce6c05" -- name = "github.com/Knetic/govaluate" -- packages = ["."] -- pruneopts = "" -- revision = "d216395917cc49052c7c7094cf57f09657ca08a8" -- version = "v3.0.0" -- --[[projects]] -- digest = "1:63e57618d792cccb87ad7cb8a0602e6205732beb3b01b0ea858fc4a5fd3ce8f1" -- name = "github.com/MakeNowJust/heredoc" -- packages = ["."] -- pruneopts = "" -- revision = "efb6ca8de9d5385c3963279701760e37637cf238" -- version = "v2.0.1" -- --[[projects]] -- digest = "1:b856d8248663c39265a764561c1a1a149783f6cc815feb54a1f3a591b91f6eca" -- name = "github.com/Masterminds/semver" -- packages = ["."] -- pruneopts = "" -- revision = "c7af12943936e8c39859482e61f0574c2fd7fc75" -- version = "v1.4.2" -- --[[projects]] -- digest = "1:71c0dfb843260bfb9b03357cae8eac261b8d82e149ad8f76938b87a23aa47c43" -- name = "github.com/PuerkitoBio/purell" -- packages = ["."] -- pruneopts = "" -- revision = "b938d81255b5473c57635324295cb0fe398c7a58" -- --[[projects]] -- branch = "master" -- digest = "1:331a419049c2be691e5ba1d24342fc77c7e767a80c666a18fd8a9f7b82419c1c" -- name = "github.com/PuerkitoBio/urlesc" -- packages = ["."] -- pruneopts = "" -- revision = "de5bf2ad457846296e2031421a34e2568e304e35" -- --[[projects]] -- branch = "master" -- digest = "1:a1b56af5e69569454f55ef4842485a0da5616e240a610d77c987e17a73b0e265" -- name = "github.com/TomOnTime/utfutil" -- packages = ["."] -- pruneopts = "" -- revision = "09c41003ee1d5015b75f331e52215512e7145b8d" -- --[[projects]] -- branch = "master" -- digest = "1:52905b00a73cda93a2ce8c5fa35185daed673d59e39576e81ad6ab6fb7076b3c" -- name = "github.com/argoproj/pkg" -- packages = [ -- "errors", -- "exec", -- "rand", -- "time", -- ] -- pruneopts = "" -- revision = "02a6aac40ac4cd23de448afe7a1ec0ba4b6d2b96" -- --[[projects]] -- digest = "1:d8a2bb36a048d1571bcc1aee208b61f39dc16c6c53823feffd37449dde162507" -- name = "github.com/asaskevich/govalidator" -- packages = ["."] -- pruneopts = "" -- revision = "ccb8e960c48f04d6935e72476ae4a51028f9e22f" -- version = "v9" -- --[[projects]] -- branch = "master" -- digest = "1:c0bec5f9b98d0bc872ff5e834fac186b807b656683bd29cb82fb207a1513fabb" -- name = "github.com/beorn7/perks" -- packages = ["quantile"] -- pruneopts = "" -- revision = "3a771d992973f24aa725d07868b467d1ddfceafb" -- --[[projects]] -- digest = "1:6e2b0748ea11cffebe87b4a671a44ecfb243141cdd5df54cb44b7e8e93cb7ea3" -- name = "github.com/casbin/casbin" -- packages = [ -- ".", -- "config", -- "effect", -- "errors", -- "log", -- "model", -- "persist", -- "persist/file-adapter", -- "rbac", -- "rbac/default-role-manager", -- "util", -- ] -- pruneopts = "" -- revision = "aaed1b7a7eac65d37ec4e15e308429fdf0bd6a9e" -- version = "v1.9.1" -- --[[projects]] -- branch = "master" -- digest = "1:9c19f8c33e635e0439c8afc167d6d02e3aa6eea5b69d64880244fd354a99edc4" -- name = "github.com/chai2010/gettext-go" -- packages = [ -- "gettext", -- "gettext/mo", -- "gettext/plural", -- "gettext/po", -- ] -- pruneopts = "" -- revision = "bf70f2a70fb1b1f36d90d671a72795984eab0fcb" -- --[[projects]] -- branch = "v2" -- digest = "1:d8ee1b165eb7f4fd9ada718e1e7eeb0bc1fd462592d0bd823df694443f448681" -- name = "github.com/coreos/go-oidc" -- packages = ["."] -- pruneopts = "" -- revision = "1180514eaf4d9f38d0d19eef639a1d695e066e72" -- --[[projects]] -- digest = "1:56c130d885a4aacae1dd9c7b71cfe39912c7ebc1ff7d2b46083c8812996dc43b" -- name = "github.com/davecgh/go-spew" -- packages = ["spew"] -- pruneopts = "" -- revision = "346938d642f2ec3594ed81d874461961cd0faa76" -- version = "v1.1.0" -- --[[projects]] -- digest = "1:6098222470fe0172157ce9bbef5d2200df4edde17ee649c5d6e48330e4afa4c6" -- name = "github.com/dgrijalva/jwt-go" -- packages = ["."] -- pruneopts = "" -- revision = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e" -- version = "v3.2.0" -- --[[projects]] -- digest = "1:c05f1899f086e3b4613d94d9e6f7ba6f4b6587498a1aa6037c5c294b22f5a743" -- name = "github.com/docker/distribution" -- packages = [ -- "digestset", -- "reference", -- ] -- pruneopts = "" -- revision = "2461543d988979529609e8cb6fca9ca190dc48da" -- version = "v2.7.1" -- --[[projects]] -- digest = "1:b021ef379356343bdc13ec101e546b756fcef4b1186d08163bef7d3bc8c1e07f" -- name = "github.com/docker/docker" -- packages = [ -- "pkg/term", -- "pkg/term/winconsole", -- ] -- pruneopts = "" -- revision = "fc4825d5ef5e0e1af74904208f9b925c22f0b6f8" -- version = "v1.6.0-rc5" -- --[[projects]] -- branch = "master" -- digest = "1:d6c13a378213e3de60445e49084b8a0a9ce582776dfc77927775dbeb3ff72a35" -- name = "github.com/docker/spdystream" -- packages = [ -- ".", -- "spdy", -- ] -- pruneopts = "" -- revision = "6480d4af844c189cf5dd913db24ddd339d3a4f85" -- --[[projects]] -- branch = "master" -- digest = "1:f1a75a8e00244e5ea77ff274baa9559eb877437b240ee7b278f3fc560d9f08bf" -- name = "github.com/dustin/go-humanize" -- packages = ["."] -- pruneopts = "" -- revision = "9f541cc9db5d55bce703bd99987c9d5cb8eea45e" -- --[[projects]] -- digest = "1:971e9ba63a417c5f1f83ab358677bc59e96ff04285f26c6646ff089fb60b15e8" -- name = "github.com/emicklei/go-restful" -- packages = [ -- ".", -- "log", -- ] -- pruneopts = "" -- revision = "3658237ded108b4134956c1b3050349d93e7b895" -- version = "v2.7.1" -- --[[projects]] -- digest = "1:ba7c75e38d81b9cf3e8601c081567be3b71bccca8c11aee5de98871360aa4d7b" -- name = "github.com/emirpasic/gods" -- packages = [ -- "containers", -- "lists", -- "lists/arraylist", -- "trees", -- "trees/binaryheap", -- "utils", -- ] -- pruneopts = "" -- revision = "f6c17b524822278a87e3b3bd809fec33b51f5b46" -- version = "v1.9.0" -- --[[projects]] -- digest = "1:46ddeb9dd35d875ac7568c4dc1fc96ce424e034bdbb984239d8ffc151398ec01" -- name = "github.com/evanphx/json-patch" -- packages = ["."] -- pruneopts = "" -- revision = "026c730a0dcc5d11f93f1cf1cc65b01247ea7b6f" -- version = "v4.5.0" -- --[[projects]] -- branch = "master" -- digest = "1:549f95037fea25e00a5341ac6a169a5b3e5306be107f45260440107b779b74f9" -- name = "github.com/exponent-io/jsonpath" -- packages = ["."] -- pruneopts = "" -- revision = "d6023ce2651d8eafb5c75bb0c7167536102ec9f5" -- --[[projects]] -- digest = "1:23a5efa4b272df86a8ebffc942f5e0c1aac4b750836037394cc450b6d91e241a" -- name = "github.com/fatih/camelcase" -- packages = ["."] -- pruneopts = "" -- revision = "44e46d280b43ec1531bb25252440e34f1b800b65" -- version = "v1.0.0" -- --[[projects]] -- digest = "1:b13707423743d41665fd23f0c36b2f37bb49c30e94adb813319c44188a51ba22" -- name = "github.com/ghodss/yaml" -- packages = ["."] -- pruneopts = "" -- revision = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7" -- version = "v1.0.0" -- --[[projects]] -- branch = "master" -- digest = "1:eb77b66abaf9649747230eb973350bd1c311a0d0362213192efbdd222082b072" -- name = "github.com/go-openapi/analysis" -- packages = ["."] -- pruneopts = "" -- revision = "5957818e100395077187fb7ef3b8a28227af06c6" -- --[[projects]] -- branch = "master" -- digest = "1:ee273c95c1414ef11bd4da259b40e83f41c1d5a6bee7d1b54a05ef5f3565fd92" -- name = "github.com/go-openapi/errors" -- packages = ["."] -- pruneopts = "" -- revision = "b2b2befaf267d082d779bcef52d682a47c779517" -- --[[projects]] -- branch = "master" -- digest = "1:1287439f7765209116509fffff2b8f853845e4b35572b41a1aadda42cbcffcc2" -- name = "github.com/go-openapi/jsonpointer" -- packages = ["."] -- pruneopts = "" -- revision = "779f45308c19820f1a69e9a4cd965f496e0da10f" -- --[[projects]] -- branch = "master" -- digest = "1:07ac8ac445f68b0bc063d11845d479fb7e09c906ead7a8c4165b59777df09d74" -- name = "github.com/go-openapi/jsonreference" -- packages = ["."] -- pruneopts = "" -- revision = "36d33bfe519efae5632669801b180bf1a245da3b" -- --[[projects]] -- branch = "master" -- digest = "1:c4a8c916364abeda1c5cf36684320298bbf4d87718b0b2bd9c4ca663157fdc75" -- name = "github.com/go-openapi/loads" -- packages = ["."] -- pruneopts = "" -- revision = "2a2b323bab96e6b1fdee110e57d959322446e9c9" -- --[[projects]] -- branch = "master" -- digest = "1:1d9c762f6695e6e7ed0b4c055fa0eab7d20c2b36c935943282273d37f114e302" -- name = "github.com/go-openapi/runtime" -- packages = [ -- ".", -- "logger", -- "middleware", -- "middleware/denco", -- "middleware/header", -- "middleware/untyped", -- "security", -- ] -- pruneopts = "" -- revision = "cd9d8ed52e4b4665463cbc655500e4faa09c3c16" -- --[[projects]] -- branch = "master" -- digest = "1:fd4008f8283b993180f0626d0c7b2f48880e9dbb6bd92a91cac7ded30dc66777" -- name = "github.com/go-openapi/spec" -- packages = ["."] -- pruneopts = "" -- revision = "1de3e0542de65ad8d75452a595886fdd0befb363" -- --[[projects]] -- branch = "master" -- digest = "1:4ddc424130bcfbf6f782f433192ca2502a02a09e4ac55dcbecf91f22ed4e3138" -- name = "github.com/go-openapi/strfmt" -- packages = ["."] -- pruneopts = "" -- revision = "481808443b00a14745fada967cb5eeff0f9b1df2" -- --[[projects]] -- branch = "master" -- digest = "1:366052ef634d344217d6720719c9f8e95de13a94d211f09785b0ba3c4c181b06" -- name = "github.com/go-openapi/swag" -- packages = ["."] -- pruneopts = "" -- revision = "84f4bee7c0a6db40e3166044c7983c1c32125429" -- --[[projects]] -- branch = "master" -- digest = "1:671e25496d550c80a9d6e7e588d32b380c6b4877f113750724f69acc6ce6790f" -- name = "github.com/go-openapi/validate" -- packages = ["."] -- pruneopts = "" -- revision = "b0a3ed684d0fdd3e1eda00433382188ce8aa7169" -- --[[projects]] -- digest = "1:024c9473f363a12918e87e7efc778091839beab514b01309a6ecd8aa336c8065" -- name = "github.com/go-redis/cache" -- packages = [ -- ".", -- "internal/lrucache", -- "internal/singleflight", -- ] -- pruneopts = "" -- revision = "c58ada1e23a3b66593f81c70572c20a0bb805a90" -- version = "v6.3.5" -- --[[projects]] -- digest = "1:b73fabc1ff8f2417bc5cc51d3f7274d6af5300b5ad9b8606967213134c1700dc" -- name = "github.com/go-redis/redis" -- packages = [ -- ".", -- "internal", -- "internal/consistenthash", -- "internal/hashtag", -- "internal/pool", -- "internal/proto", -- "internal/util", -- ] -- pruneopts = "" -- revision = "22be8a3eaf992c828cecb69dc07348313bf08d2e" -- version = "v6.15.1" -- --[[projects]] -- digest = "1:842c1acbacc80da775cfc0c412c4fe322c2d1b86c260db632987730d0d67a6bd" -- name = "github.com/gobuffalo/packr" -- packages = ["."] -- pruneopts = "" -- revision = "7f4074995d431987caaa35088199f13c44b24440" -- version = "v1.11.0" -- --[[projects]] -- digest = "1:9ab1b1c637d7c8f49e39d8538a650d7eb2137b076790cff69d160823b505964c" -- name = "github.com/gobwas/glob" -- packages = [ -- ".", -- "compiler", -- "match", -- "syntax", -- "syntax/ast", -- "syntax/lexer", -- "util/runes", -- "util/strings", -- ] -- pruneopts = "" -- revision = "5ccd90ef52e1e632236f7326478d4faa74f99438" -- version = "v0.2.3" -- --[[projects]] -- branch = "master" -- digest = "1:9a06e7365c6039daf4db9bbf79650e2933a2880982cbab8106cb74a36617f40d" -- name = "github.com/gogits/go-gogs-client" -- packages = ["."] -- pruneopts = "" -- revision = "5a05380e4bc2440e0ec12f54f6f45648dbdd5e55" -- --[[projects]] -- digest = "1:d69d2ba23955582a64e367ff2b0808cdbd048458c178cea48f11ab8c40bd7aea" -- name = "github.com/gogo/protobuf" -- packages = [ -- "gogoproto", -- "plugin/compare", -- "plugin/defaultcheck", -- "plugin/description", -- "plugin/embedcheck", -- "plugin/enumstringer", -- "plugin/equal", -- "plugin/face", -- "plugin/gostring", -- "plugin/marshalto", -- "plugin/oneofcheck", -- "plugin/populate", -- "plugin/size", -- "plugin/stringer", -- "plugin/testgen", -- "plugin/union", -- "plugin/unmarshal", -- "proto", -- "protoc-gen-gofast", -- "protoc-gen-gogo/descriptor", -- "protoc-gen-gogo/generator", -- "protoc-gen-gogo/generator/internal/remap", -- "protoc-gen-gogo/grpc", -- "protoc-gen-gogo/plugin", -- "protoc-gen-gogofast", -- "sortkeys", -- "vanity", -- "vanity/command", -- ] -- pruneopts = "" -- revision = "5628607bb4c51c3157aacc3a50f0ab707582b805" -- version = "v1.3.1" -- --[[projects]] -- branch = "master" -- digest = "1:107b233e45174dbab5b1324201d092ea9448e58243ab9f039e4c0f332e121e3a" -- name = "github.com/golang/glog" -- packages = ["."] -- pruneopts = "" -- revision = "23def4e6c14b4da8ac2ed8007337bc5eb5007998" -- --[[projects]] -- digest = "1:3dd078fda7500c341bc26cfbc6c6a34614f295a2457149fc1045cab767cbcf18" -- name = "github.com/golang/protobuf" -- packages = [ -- "jsonpb", -- "proto", -- "protoc-gen-go", -- "protoc-gen-go/descriptor", -- "protoc-gen-go/generator", -- "protoc-gen-go/generator/internal/remap", -- "protoc-gen-go/grpc", -- "protoc-gen-go/plugin", -- "ptypes", -- "ptypes/any", -- "ptypes/duration", -- "ptypes/empty", -- "ptypes/struct", -- "ptypes/timestamp", -- ] -- pruneopts = "" -- revision = "aa810b61a9c79d51363740d207bb46cf8e620ed5" -- version = "v1.2.0" -- --[[projects]] -- digest = "1:1e5b1e14524ed08301977b7b8e10c719ed853cbf3f24ecb66fae783a46f207a6" -- name = "github.com/google/btree" -- packages = ["."] -- pruneopts = "" -- revision = "4030bb1f1f0c35b30ca7009e9ebd06849dd45306" -- version = "v1.0.0" -- --[[projects]] -- digest = "1:9fcb267c272bc5054564b392e3ff7e65e35400fd9914afb1d169f92b95e7dbc9" -- name = "github.com/google/go-cmp" -- packages = [ -- "cmp", -- "cmp/internal/diff", -- "cmp/internal/flags", -- "cmp/internal/function", -- "cmp/internal/value", -- ] -- pruneopts = "" -- revision = "2d0692c2e9617365a95b295612ac0d4415ba4627" -- version = "v0.3.1" -- --[[projects]] -- digest = "1:14d826ee25139b4674e9768ac287a135f4e7c14e1134a5b15e4e152edfd49f41" -- name = "github.com/google/go-jsonnet" -- packages = [ -- ".", -- "ast", -- "parser", -- ] -- pruneopts = "" -- revision = "dfddf2b4e3aec377b0dcdf247ff92e7d078b8179" -- --[[projects]] -- branch = "master" -- digest = "1:754f77e9c839b24778a4b64422236d38515301d2baeb63113aa3edc42e6af692" -- name = "github.com/google/gofuzz" -- packages = ["."] -- pruneopts = "" -- revision = "24818f796faf91cd76ec7bddd72458fbced7a6c1" -- --[[projects]] -- branch = "master" -- digest = "1:d0899ec7c2f61fd5e4ccba7dbefe72e366a3ecce23ecdb982c768fa1d38812fb" -- name = "github.com/google/shlex" -- packages = ["."] -- pruneopts = "" -- revision = "c34317bd91bf98fab745d77b03933cf8769299fe" -- --[[projects]] -- digest = "1:2a131706ff80636629ab6373f2944569b8252ecc018cda8040931b05d32e3c16" -- name = "github.com/googleapis/gnostic" -- packages = [ -- "OpenAPIv2", -- "compiler", -- "extensions", -- ] -- pruneopts = "" -- revision = "ee43cbb60db7bd22502942cccbc39059117352ab" -- version = "v0.1.0" -- --[[projects]] -- digest = "1:09aa5dd1332b93c96bde671bafb053249dc813febf7d5ca84e8f382ba255d67d" -- name = "github.com/gorilla/websocket" -- packages = ["."] -- pruneopts = "" -- revision = "66b9c49e59c6c48f0ffce28c2d8b8a5678502c6d" -- version = "v1.4.0" -- --[[projects]] -- branch = "master" -- digest = "1:e1fd67b5695fb12f54f979606c5d650a5aa72ef242f8e71072bfd4f7b5a141a0" -- name = "github.com/gregjones/httpcache" -- packages = [ -- ".", -- "diskcache", -- ] -- pruneopts = "" -- revision = "901d90724c7919163f472a9812253fb26761123d" -- --[[projects]] -- branch = "master" -- digest = "1:9dca8c981b8aed7448d94e78bc68a76784867a38b3036d5aabc0b32d92ffd1f4" -- name = "github.com/grpc-ecosystem/go-grpc-middleware" -- packages = [ -- ".", -- "auth", -- "logging", -- "logging/logrus", -- "logging/logrus/ctxlogrus", -- "retry", -- "tags", -- "tags/logrus", -- "util/backoffutils", -- "util/metautils", -- ] -- pruneopts = "" -- revision = "bc372cc64f55abd91995ba3f219b380ffbc59e9d" -- --[[projects]] -- digest = "1:e24dc5ef44694848785de507f439a24e9e6d96d7b43b8cf3d6cfa857aa1e2186" -- name = "github.com/grpc-ecosystem/go-grpc-prometheus" -- packages = ["."] -- pruneopts = "" -- revision = "c225b8c3b01faf2899099b768856a9e916e5087b" -- version = "v1.2.0" -- --[[projects]] -- digest = "1:9feb7485bc57adbcbc1e1037ca05588e9d8b0a3a1875fbf730021fc118859b75" -- name = "github.com/grpc-ecosystem/grpc-gateway" -- packages = [ -- "protoc-gen-grpc-gateway", -- "protoc-gen-grpc-gateway/descriptor", -- "protoc-gen-grpc-gateway/generator", -- "protoc-gen-grpc-gateway/gengateway", -- "protoc-gen-grpc-gateway/httprule", -- "protoc-gen-swagger", -- "protoc-gen-swagger/genswagger", -- "protoc-gen-swagger/options", -- "runtime", -- "runtime/internal", -- "utilities", -- ] -- pruneopts = "" -- revision = "07f5e79768022f9a3265235f0db4ac8c3f675fec" -- version = "v1.3.1" -- --[[projects]] -- branch = "master" -- digest = "1:9c776d7d9c54b7ed89f119e449983c3f24c0023e75001d6092442412ebca6b94" -- name = "github.com/hashicorp/golang-lru" -- packages = [ -- ".", -- "simplelru", -- ] -- pruneopts = "" -- revision = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3" -- --[[projects]] -- digest = "1:23bc0b496ba341c6e3ba24d6358ff4a40a704d9eb5f9a3bd8e8fbd57ad869013" -- name = "github.com/imdario/mergo" -- packages = ["."] -- pruneopts = "" -- revision = "163f41321a19dd09362d4c63cc2489db2015f1f4" -- version = "0.3.2" -- --[[projects]] -- digest = "1:6f7a8f1f3e04174c426eea1c8661ef49a6b4c63bd2e40c0ad74b5ba9051f4812" -- name = "github.com/improbable-eng/grpc-web" -- packages = ["go/grpcweb"] -- pruneopts = "" -- revision = "16092bd1d58ae1b3c2d8be1cb67e65956f945dea" -- version = "0.7.0" -- --[[projects]] -- digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be" -- name = "github.com/inconshreveable/mousetrap" -- packages = ["."] -- pruneopts = "" -- revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" -- version = "v1.0" -- --[[projects]] -- branch = "master" -- digest = "1:95abc4eba158a39873bd4fabdee576d0ae13826b550f8b710881d80ae4093a0f" -- name = "github.com/jbenet/go-context" -- packages = ["io"] -- pruneopts = "" -- revision = "d14ea06fba99483203c19d92cfcd13ebe73135f4" -- --[[projects]] -- digest = "1:302ad9379eb146668760df4d779a95379acab43ce5f9a28f27f3273f98232020" -- name = "github.com/jonboulle/clockwork" -- packages = ["."] -- pruneopts = "" -- revision = "2eee05ed794112d45db504eb05aa693efd2b8b09" -- version = "v0.1.0" -- --[[projects]] -- digest = "1:31c6f3c4f1e15fcc24fcfc9f5f24603ff3963c56d6fa162116493b4025fb6acc" -- name = "github.com/json-iterator/go" -- packages = ["."] -- pruneopts = "" -- revision = "f2b4162afba35581b6d4a50d3b8f34e33c144682" -- --[[projects]] -- branch = "master" -- digest = "1:63e7368fcf6b54804076eaec26fd9cf0c4466166b272393db4b93102e1e962df" -- name = "github.com/kballard/go-shellquote" -- packages = ["."] -- pruneopts = "" -- revision = "95032a82bc518f77982ea72343cc1ade730072f0" -- --[[projects]] -- digest = "1:41e0bed5df4f9fd04c418bf9b6b7179b3671e416ad6175332601ca1c8dc74606" -- name = "github.com/kevinburke/ssh_config" -- packages = ["."] -- pruneopts = "" -- revision = "81db2a75821ed34e682567d48be488a1c3121088" -- version = "0.5" -- --[[projects]] -- branch = "master" -- digest = "1:448b4a6e39e46d8740b00dc871f26d58dc39341b160e01267b7917132831a136" -- name = "github.com/konsorten/go-windows-terminal-sequences" -- packages = ["."] -- pruneopts = "" -- revision = "b729f2633dfe35f4d1d8a32385f6685610ce1cb5" -- --[[projects]] -- branch = "master" -- digest = "1:93018a4331df9925058905133cb997aec8f54d5303f4536a23e49b5648632d06" -- name = "github.com/liggitt/tabwriter" -- packages = ["."] -- pruneopts = "" -- revision = "89fcab3d43de07060e4fd4c1547430ed57e87f24" -- --[[projects]] -- branch = "master" -- digest = "1:ccc20cacf54eb16464dad02efa1c14fa7c0b9e124639b0d2a51dcc87b0154e4c" -- name = "github.com/mailru/easyjson" -- packages = [ -- "buffer", -- "jlexer", -- "jwriter", -- ] -- pruneopts = "" -- revision = "32fa128f234d041f196a9f3e0fea5ac9772c08e1" -- --[[projects]] -- digest = "1:63722a4b1e1717be7b98fc686e0b30d5e7f734b9e93d7dee86293b6deab7ea28" -- name = "github.com/matttproud/golang_protobuf_extensions" -- packages = ["pbutil"] -- pruneopts = "" -- revision = "c12348ce28de40eed0136aa2b644d0ee0650e56c" -- version = "v1.0.1" -- --[[projects]] -- digest = "1:096a8a9182648da3d00ff243b88407838902b6703fc12657f76890e08d1899bf" -- name = "github.com/mitchellh/go-homedir" -- packages = ["."] -- pruneopts = "" -- revision = "ae18d6b8b3205b561c79e8e5f69bff09736185f4" -- version = "v1.0.0" -- --[[projects]] -- digest = "1:713b341855f1480e4baca1e7c5434e1d266441340685ecbde32d59bdc065fb3f" -- name = "github.com/mitchellh/go-wordwrap" -- packages = ["."] -- pruneopts = "" -- revision = "9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c" -- version = "v1.0.0" -- --[[projects]] -- branch = "master" -- digest = "1:eb9117392ee8e7aa44f78e0db603f70b1050ee0ebda4bd40040befb5b218c546" -- name = "github.com/mitchellh/mapstructure" -- packages = ["."] -- pruneopts = "" -- revision = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b" -- --[[projects]] -- digest = "1:0c0ff2a89c1bb0d01887e1dac043ad7efbf3ec77482ef058ac423d13497e16fd" -- name = "github.com/modern-go/concurrent" -- packages = ["."] -- pruneopts = "" -- revision = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94" -- version = "1.0.3" -- --[[projects]] -- digest = "1:e32bdbdb7c377a07a9a46378290059822efdce5c8d96fe71940d87cb4f918855" -- name = "github.com/modern-go/reflect2" -- packages = ["."] -- pruneopts = "" -- revision = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd" -- version = "1.0.1" -- --[[projects]] -- digest = "1:5d9b668b0b4581a978f07e7d2e3314af18eb27b3fb5d19b70185b7c575723d11" -- name = "github.com/opencontainers/go-digest" -- packages = ["."] -- pruneopts = "" -- revision = "279bed98673dd5bef374d3b6e4b09e2af76183bf" -- version = "v1.0.0-rc1" -- --[[projects]] -- digest = "1:4c0404dc03d974acd5fcd8b8d3ce687b13bd169db032b89275e8b9d77b98ce8c" -- name = "github.com/patrickmn/go-cache" -- packages = ["."] -- pruneopts = "" -- revision = "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0" -- version = "v2.1.0" -- --[[projects]] -- digest = "1:049b5bee78dfdc9628ee0e557219c41f683e5b06c5a5f20eaba0105ccc586689" -- name = "github.com/pelletier/go-buffruneio" -- packages = ["."] -- pruneopts = "" -- revision = "c37440a7cf42ac63b919c752ca73a85067e05992" -- version = "v0.2.0" -- --[[projects]] -- branch = "master" -- digest = "1:5f0faa008e8ff4221b55a1a5057c8b02cb2fd68da6a65c9e31c82b72cbc836d0" -- name = "github.com/petar/GoLLRB" -- packages = ["llrb"] -- pruneopts = "" -- revision = "33fb24c13b99c46c93183c291836c573ac382536" -- --[[projects]] -- digest = "1:4709c61d984ef9ba99b037b047546d8a576ae984fb49486e48d99658aa750cd5" -- name = "github.com/peterbourgon/diskv" -- packages = ["."] -- pruneopts = "" -- revision = "0be1b92a6df0e4f5cb0a5d15fb7f643d0ad93ce6" -- version = "v3.0.0" -- --[[projects]] -- digest = "1:7365acd48986e205ccb8652cc746f09c8b7876030d53710ea6ef7d0bd0dcd7ca" -- name = "github.com/pkg/errors" -- packages = ["."] -- pruneopts = "" -- revision = "645ef00459ed84a119197bfb8d8205042c6df63d" -- version = "v0.8.0" -- --[[projects]] -- digest = "1:256484dbbcd271f9ecebc6795b2df8cad4c458dd0f5fd82a8c2fa0c29f233411" -- name = "github.com/pmezard/go-difflib" -- packages = ["difflib"] -- pruneopts = "" -- revision = "792786c7400a136282c1664665ae0a8db921c6c2" -- version = "v1.0.0" -- --[[projects]] -- branch = "master" -- digest = "1:90daff4630a8cf2fa207dbd3ccaed0e860936ead1851a473019674e6b5993a13" -- name = "github.com/pquerna/cachecontrol" -- packages = [ -- ".", -- "cacheobject", -- ] -- pruneopts = "" -- revision = "525d0eb5f91d30e3b1548de401b7ef9ea6898520" -- --[[projects]] -- digest = "1:9d34d575593e3dd27bbd119138ba009ef1535a0df2aad7259e1dd5aed7405eea" -- name = "github.com/prometheus/client_golang" -- packages = [ -- "prometheus", -- "prometheus/internal", -- "prometheus/promhttp", -- ] -- pruneopts = "" -- revision = "7858729281ec582767b20e0d696b6041d995d5e0" -- --[[projects]] -- branch = "master" -- digest = "1:185cf55b1f44a1bf243558901c3f06efa5c64ba62cfdcbb1bf7bbe8c3fb68561" -- name = "github.com/prometheus/client_model" -- packages = ["go"] -- pruneopts = "" -- revision = "5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f" -- --[[projects]] -- branch = "master" -- digest = "1:f477ef7b65d94fb17574fc6548cef0c99a69c1634ea3b6da248b63a61ebe0498" -- name = "github.com/prometheus/common" -- packages = [ -- "expfmt", -- "internal/bitbucket.org/ww/goautoneg", -- "model", -- ] -- pruneopts = "" -- revision = "c7de2306084e37d54b8be01f3541a8464345e9a5" -- --[[projects]] -- branch = "master" -- digest = "1:e04aaa0e8f8da0ed3d6c0700bd77eda52a47f38510063209d72d62f0ef807d5e" -- name = "github.com/prometheus/procfs" -- packages = [ -- ".", -- "internal/util", -- "nfs", -- "xfs", -- ] -- pruneopts = "" -- revision = "05ee40e3a273f7245e8777337fc7b46e533a9a92" -- --[[projects]] -- digest = "1:6bb048133650d1fb7fbff9fb3c35bd5c7e8653fc95c3bae6df94cd17d1580278" -- name = "github.com/robfig/cron" -- packages = ["."] -- pruneopts = "" -- revision = "45fbe1491cdd47d74d1bf1396286d67faee8b8b5" -- version = "v3.0.0" -- --[[projects]] -- digest = "1:5f47c69f85311c4dc292be6cc995a0a3fe8337a6ce38ef4f71e5b7efd5ad42e0" -- name = "github.com/rs/cors" -- packages = ["."] -- pruneopts = "" -- revision = "9a47f48565a795472d43519dd49aac781f3034fb" -- version = "v1.6.0" -- --[[projects]] -- digest = "1:2761e287c811d0948d47d0252b82281eca3801eb3c9d5f9530956643d5b9f430" -- name = "github.com/russross/blackfriday" -- packages = ["."] -- pruneopts = "" -- revision = "05f3235734ad95d0016f6a23902f06461fcf567a" -- version = "v1.5.2" -- --[[projects]] -- digest = "1:3962f553b77bf6c03fc07cd687a22dd3b00fe11aa14d31194f5505f5bb65cdc8" -- name = "github.com/sergi/go-diff" -- packages = ["diffmatchpatch"] -- pruneopts = "" -- revision = "1744e2970ca51c86172c8190fadad617561ed6e7" -- version = "v1.0.0" -- --[[projects]] -- digest = "1:01d968ff6535945510c944983eee024e81f1c949043e9bbfe5ab206ebc3588a4" -- name = "github.com/sirupsen/logrus" -- packages = [ -- ".", -- "hooks/test", -- ] -- pruneopts = "" -- revision = "a67f783a3814b8729bd2dac5780b5f78f8dbd64d" -- version = "v1.1.0" -- --[[projects]] -- branch = "master" -- digest = "1:50b5be512f924d289f20e8b2aef8951d98b9bd8c44666cf169514906df597a4c" -- name = "github.com/skratchdot/open-golang" -- packages = ["open"] -- pruneopts = "" -- revision = "75fb7ed4208cf72d323d7d02fd1a5964a7a9073c" -- --[[projects]] -- digest = "1:022a4e2a8c327eb46a99088a51c0dda5d5be86928ace2afd72145dc1d746a323" -- name = "github.com/soheilhy/cmux" -- packages = ["."] -- pruneopts = "" -- revision = "e09e9389d85d8492d313d73d1469c029e710623f" -- version = "v0.1.4" -- --[[projects]] -- digest = "1:0c63b3c7ad6d825a898f28cb854252a3b29d37700c68a117a977263f5ec94efe" -- name = "github.com/spf13/cobra" -- packages = ["."] -- pruneopts = "" -- revision = "0.0.5" -- --[[projects]] -- digest = "1:8e243c568f36b09031ec18dff5f7d2769dcf5ca4d624ea511c8e3197dc3d352d" -- name = "github.com/spf13/pflag" -- packages = ["."] -- pruneopts = "" -- revision = "583c0c0531f06d5278b7d917446061adc344b5cd" -- version = "v1.0.1" -- --[[projects]] -- digest = "1:b1861b9a1aa0801b0b62945ed7477c1ab61a4bd03b55dfbc27f6d4f378110c8c" -- name = "github.com/src-d/gcfg" -- packages = [ -- ".", -- "scanner", -- "token", -- "types", -- ] -- pruneopts = "" -- revision = "f187355171c936ac84a82793659ebb4936bc1c23" -- version = "v1.3.0" -- --[[projects]] -- digest = "1:306417ea2f31ea733df356a2b895de63776b6a5107085b33458e5cd6eb1d584d" -- name = "github.com/stretchr/objx" -- packages = ["."] -- pruneopts = "" -- revision = "facf9a85c22f48d2f52f2380e4efce1768749a89" -- version = "v0.1" -- --[[projects]] -- digest = "1:c587772fb8ad29ad4db67575dad25ba17a51f072ff18a22b4f0257a4d9c24f75" -- name = "github.com/stretchr/testify" -- packages = [ -- "assert", -- "mock", -- ] -- pruneopts = "" -- revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686" -- version = "v1.2.2" -- --[[projects]] -- digest = "1:51cf0fca93f4866709ceaf01b750e51d997c299a7bd2edf7ccd79e3b428754ae" -- name = "github.com/vmihailenco/msgpack" -- packages = [ -- ".", -- "codes", -- ] -- pruneopts = "" -- revision = "a053f3dac71df214bfe8b367f34220f0029c9c02" -- version = "v3.3.1" -- --[[projects]] -- digest = "1:afc0b8068986a01e2d8f449917829753a54f6bd4d1265c2b4ad9cba75560020f" -- name = "github.com/xanzy/ssh-agent" -- packages = ["."] -- pruneopts = "" -- revision = "640f0ab560aeb89d523bb6ac322b1244d5c3796c" -- version = "v0.2.0" -- --[[projects]] -- branch = "master" -- digest = "1:3cf699a0df65293cc8fd2339606950d3e2f6d02a435703951d1da411a23f7cef" -- name = "github.com/yudai/gojsondiff" -- packages = [ -- ".", -- "formatter", -- ] -- pruneopts = "" -- revision = "0525c875b75ca60b9e67ddc44496aa16f21066b0" -- --[[projects]] -- branch = "master" -- digest = "1:9857bb2293f372b2181004d8b62179bbdb4ab0982ec6f762abe6cf2bfedaff85" -- name = "github.com/yudai/golcs" -- packages = ["."] -- pruneopts = "" -- revision = "ecda9a501e8220fae3b4b600c3db4b0ba22cfc68" -- --[[projects]] -- branch = "master" -- digest = "1:525776d99293affd2c61dfb573007ff9f22863068c20c220ef3f58620758c341" -- name = "github.com/yuin/gopher-lua" -- packages = [ -- ".", -- "ast", -- "parse", -- "pm", -- ] -- pruneopts = "" -- revision = "732aa6820ec4fb93d60c4057dd574c33db8ad4e7" -- --[[projects]] -- branch = "master" -- digest = "1:2ea6df0f542cc95a5e374e9cdd81eaa599ed0d55366eef92d2f6b9efa2795c07" -- name = "golang.org/x/crypto" -- packages = [ -- "bcrypt", -- "blowfish", -- "cast5", -- "curve25519", -- "ed25519", -- "ed25519/internal/edwards25519", -- "internal/chacha20", -- "openpgp", -- "openpgp/armor", -- "openpgp/elgamal", -- "openpgp/errors", -- "openpgp/packet", -- "openpgp/s2k", -- "poly1305", -- "ssh", -- "ssh/agent", -- "ssh/knownhosts", -- "ssh/terminal", -- ] -- pruneopts = "" -- revision = "432090b8f568c018896cd8a0fb0345872bbac6ce" -- --[[projects]] -- branch = "master" -- digest = "1:b4ba046df563f56fe42b6270b20039107a37e1ab47c97aa47a16f848aa5b6d9a" -- name = "golang.org/x/net" -- packages = [ -- "context", -- "context/ctxhttp", -- "http2", -- "http2/hpack", -- "idna", -- "internal/timeseries", -- "lex/httplex", -- "trace", -- ] -- pruneopts = "" -- revision = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb" -- --[[projects]] -- digest = "1:8a58c605e58272e3d280181a24749b07499cf98968da6f7c1d19c8d5649c6b1b" -- name = "golang.org/x/oauth2" -- packages = [ -- ".", -- "google", -- "internal", -- "jws", -- "jwt", -- ] -- pruneopts = "" -- revision = "cce311a261e6fcf29de72ca96827bdb0b7d9c9e6" -- --[[projects]] -- branch = "master" -- digest = "1:b2ea75de0ccb2db2ac79356407f8a4cd8f798fe15d41b381c00abf3ae8e55ed1" -- name = "golang.org/x/sync" -- packages = [ -- "errgroup", -- "semaphore", -- ] -- pruneopts = "" -- revision = "1d60e4601c6fd243af51cc01ddf169918a5407ca" -- --[[projects]] -- branch = "master" -- digest = "1:ed900376500543ca05f2a2383e1f541b4606f19cd22f34acb81b17a0b90c7f3e" -- name = "golang.org/x/sys" -- packages = [ -- "unix", -- "windows", -- ] -- pruneopts = "" -- revision = "d0be0721c37eeb5299f245a996a483160fc36940" -- --[[projects]] -- branch = "master" -- digest = "1:31985a0ed491dba5ba7fe92e18be008acd92ca9435ed9b35b06f3e6c00fd82cb" -- name = "golang.org/x/text" -- packages = [ -- "collate", -- "collate/build", -- "encoding", -- "encoding/internal", -- "encoding/internal/identifier", -- "encoding/unicode", -- "internal/colltab", -- "internal/gen", -- "internal/tag", -- "internal/triegen", -- "internal/ucd", -- "internal/utf8internal", -- "language", -- "runes", -- "secure/bidirule", -- "transform", -- "unicode/bidi", -- "unicode/cldr", -- "unicode/norm", -- "unicode/rangetable", -- "width", -- ] -- pruneopts = "" -- revision = "4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1" -- --[[projects]] -- branch = "master" -- digest = "1:55a681cb66f28755765fa5fa5104cbd8dc85c55c02d206f9f89566451e3fe1aa" -- name = "golang.org/x/time" -- packages = ["rate"] -- pruneopts = "" -- revision = "fbb02b2291d28baffd63558aa44b4b56f178d650" -- --[[projects]] -- branch = "master" -- digest = "1:77e1d6ed91936b206979806b0aacbf817ec54b840803d8f8cd7a1de5bfbf92a4" -- name = "golang.org/x/tools" -- packages = [ -- "go/ast/astutil", -- "imports", -- ] -- pruneopts = "" -- revision = "5e776fee60db37e560cee3fb46db699d2f095386" -- --[[projects]] -- branch = "master" -- digest = "1:e9e4b928898842a138bc345d42aae33741baa6d64f3ca69b0931f9c7a4fd0437" -- name = "gonum.org/v1/gonum" -- packages = [ -- "blas", -- "blas/blas64", -- "blas/cblas128", -- "blas/gonum", -- "floats", -- "graph", -- "graph/internal/linear", -- "graph/internal/ordered", -- "graph/internal/set", -- "graph/internal/uid", -- "graph/iterator", -- "graph/simple", -- "graph/topo", -- "graph/traverse", -- "internal/asm/c128", -- "internal/asm/c64", -- "internal/asm/f32", -- "internal/asm/f64", -- "internal/cmplx64", -- "internal/math32", -- "lapack", -- "lapack/gonum", -- "lapack/lapack64", -- "mat", -- ] -- pruneopts = "" -- revision = "90b7154515874cee6c33cf56b29e257403a09a69" -- --[[projects]] -- digest = "1:934fb8966f303ede63aa405e2c8d7f0a427a05ea8df335dfdc1833dd4d40756f" -- name = "google.golang.org/appengine" -- packages = [ -- ".", -- "datastore", -- "internal", -- "internal/app_identity", -- "internal/base", -- "internal/datastore", -- "internal/log", -- "internal/modules", -- "internal/remote_api", -- "internal/urlfetch", -- "urlfetch", -- ] -- pruneopts = "" -- revision = "150dc57a1b433e64154302bdc40b6bb8aefa313a" -- version = "v1.0.0" -- --[[projects]] -- branch = "master" -- digest = "1:2d833b53e432cd69645da559b822661ebc5c0a13c571dee1c1f80fb1a0241330" -- name = "google.golang.org/genproto" -- packages = [ -- "googleapis/api/annotations", -- "googleapis/rpc/status", -- ] -- pruneopts = "" -- revision = "2b5a72b8730b0b16380010cfe5286c42108d88e7" -- --[[projects]] -- digest = "1:15656947b87a6a240e61dcfae9e71a55a8d5677f240d12ab48f02cdbabf1e309" -- name = "google.golang.org/grpc" -- packages = [ -- ".", -- "balancer", -- "balancer/base", -- "balancer/roundrobin", -- "codes", -- "connectivity", -- "credentials", -- "encoding", -- "encoding/proto", -- "grpclog", -- "internal", -- "internal/backoff", -- "internal/channelz", -- "internal/envconfig", -- "internal/grpcrand", -- "internal/transport", -- "keepalive", -- "metadata", -- "naming", -- "peer", -- "reflection", -- "reflection/grpc_reflection_v1alpha", -- "resolver", -- "resolver/dns", -- "resolver/passthrough", -- "stats", -- "status", -- "tap", -- ] -- pruneopts = "" -- revision = "8dea3dc473e90c8179e519d91302d0597c0ca1d1" -- version = "v1.15.0" -- --[[projects]] -- digest = "1:adf5b0ae3467c3182757ecb86fbfe819939473bb870a42789dc1a3e7729397cd" -- name = "gopkg.in/go-playground/webhooks.v5" -- packages = [ -- "bitbucket", -- "bitbucket-server", -- "github", -- "gitlab", -- "gogs", -- ] -- pruneopts = "" -- revision = "175186584584a83966dc9a7b8ec6c3d3a4ce6110" -- version = "v5.11.0" -- --[[projects]] -- digest = "1:e5d1fb981765b6f7513f793a3fcaac7158408cca77f75f7311ac82cc88e9c445" -- name = "gopkg.in/inf.v0" -- packages = ["."] -- pruneopts = "" -- revision = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4" -- version = "v0.9.0" -- --[[projects]] -- branch = "v2" -- digest = "1:c80894778314c7fb90d94a5ab925214900e1341afeddc953cda7398b8cdcd006" -- name = "gopkg.in/mgo.v2" -- packages = [ -- "bson", -- "internal/json", -- ] -- pruneopts = "" -- revision = "3f83fa5005286a7fe593b055f0d7771a7dce4655" -- --[[projects]] -- digest = "1:de0ec5755ee1a5e61f079c8855cf2073b5a5f614ae3b51db65f2c4e1044455fd" -- name = "gopkg.in/square/go-jose.v2" -- packages = [ -- ".", -- "cipher", -- "json", -- ] -- pruneopts = "" -- revision = "76dd09796242edb5b897103a75df2645c028c960" -- version = "v2.1.6" -- --[[projects]] -- digest = "1:c8f3ff1edaf7208bf7633e5952ffb8d697552343f8010aee12427400b434ae63" -- name = "gopkg.in/src-d/go-billy.v4" -- packages = [ -- ".", -- "helper/chroot", -- "helper/polyfill", -- "osfs", -- "util", -- ] -- pruneopts = "" -- revision = "59952543636f55de3f860b477b615093d5c2c3e4" -- version = "v4.2.1" -- --[[projects]] -- digest = "1:a72d911e18578e34367f4b849340501c7e6a2787a3a05651b3d53c6cb96990f4" -- name = "gopkg.in/src-d/go-git.v4" -- packages = [ -- ".", -- "config", -- "internal/revision", -- "plumbing", -- "plumbing/cache", -- "plumbing/filemode", -- "plumbing/format/config", -- "plumbing/format/diff", -- "plumbing/format/gitignore", -- "plumbing/format/idxfile", -- "plumbing/format/index", -- "plumbing/format/objfile", -- "plumbing/format/packfile", -- "plumbing/format/pktline", -- "plumbing/object", -- "plumbing/protocol/packp", -- "plumbing/protocol/packp/capability", -- "plumbing/protocol/packp/sideband", -- "plumbing/revlist", -- "plumbing/storer", -- "plumbing/transport", -- "plumbing/transport/client", -- "plumbing/transport/file", -- "plumbing/transport/git", -- "plumbing/transport/http", -- "plumbing/transport/internal/common", -- "plumbing/transport/server", -- "plumbing/transport/ssh", -- "storage", -- "storage/filesystem", -- "storage/filesystem/dotgit", -- "storage/memory", -- "utils/binary", -- "utils/diff", -- "utils/ioutil", -- "utils/merkletrie", -- "utils/merkletrie/filesystem", -- "utils/merkletrie/index", -- "utils/merkletrie/internal/frame", -- "utils/merkletrie/noder", -- ] -- pruneopts = "" -- revision = "a1f6ef44dfed1253ef7f3bc049f66b15f8fc2ab2" -- version = "v4.9.1" -- --[[projects]] -- digest = "1:ceec7e96590fb8168f36df4795fefe17051d4b0c2acc7ec4e260d8138c4dafac" -- name = "gopkg.in/warnings.v0" -- packages = ["."] -- pruneopts = "" -- revision = "ec4a0fea49c7b46c2aeb0b51aac55779c607e52b" -- version = "v0.1.2" -- --[[projects]] -- digest = "1:cedccf16b71e86db87a24f8d4c70b0a855872eb967cb906a66b95de56aefbd0d" -- name = "gopkg.in/yaml.v2" -- packages = ["."] -- pruneopts = "" -- revision = "51d6538a90f86fe93ac480b35f37b2be17fef232" -- version = "v2.2.2" -- --[[projects]] -- branch = "release-1.16" -- digest = "1:5e5cfbab57ea5444c1eb295a39fdc403f097f5ace592c829db7b3e0e3ea66903" -- name = "k8s.io/api" -- packages = [ -- "admission/v1", -- "admission/v1beta1", -- "admissionregistration/v1", -- "admissionregistration/v1beta1", -- "apps/v1", -- "apps/v1beta1", -- "apps/v1beta2", -- "auditregistration/v1alpha1", -- "authentication/v1", -- "authentication/v1beta1", -- "authorization/v1", -- "authorization/v1beta1", -- "autoscaling/v1", -- "autoscaling/v2beta1", -- "autoscaling/v2beta2", -- "batch/v1", -- "batch/v1beta1", -- "batch/v2alpha1", -- "certificates/v1beta1", -- "coordination/v1", -- "coordination/v1beta1", -- "core/v1", -- "discovery/v1alpha1", -- "events/v1beta1", -- "extensions/v1beta1", -- "imagepolicy/v1alpha1", -- "networking/v1", -- "networking/v1beta1", -- "node/v1alpha1", -- "node/v1beta1", -- "policy/v1beta1", -- "rbac/v1", -- "rbac/v1alpha1", -- "rbac/v1beta1", -- "scheduling/v1", -- "scheduling/v1alpha1", -- "scheduling/v1beta1", -- "settings/v1alpha1", -- "storage/v1", -- "storage/v1alpha1", -- "storage/v1beta1", -- ] -- pruneopts = "" -- revision = "195af9ec35214c6d98662c5791364285bf2e2cf2" -- --[[projects]] -- branch = "release-1.16" -- digest = "1:7f29d62c07c68767171cf2ed8598e0cb862b99584bb8beb93189e2ed00ac520e" -- name = "k8s.io/apiextensions-apiserver" -- packages = [ -- "pkg/apis/apiextensions", -- "pkg/apis/apiextensions/v1", -- "pkg/apis/apiextensions/v1beta1", -- "pkg/client/clientset/clientset", -- "pkg/client/clientset/clientset/scheme", -- "pkg/client/clientset/clientset/typed/apiextensions/v1", -- "pkg/client/clientset/clientset/typed/apiextensions/v1beta1", -- "pkg/features", -- ] -- pruneopts = "" -- revision = "07afe84a85e43cf2503133660c424a0b594b21db" -- --[[projects]] -- branch = "release-1.16" -- digest = "1:36db89a45a8cb3d565f7ebfd67dafd42c9c0bbb80d6bbd4991629b39b02a4c64" -- name = "k8s.io/apimachinery" -- packages = [ -- "pkg/api/equality", -- "pkg/api/errors", -- "pkg/api/meta", -- "pkg/api/resource", -- "pkg/api/validation", -- "pkg/api/validation/path", -- "pkg/apis/meta/internalversion", -- "pkg/apis/meta/v1", -- "pkg/apis/meta/v1/unstructured", -- "pkg/apis/meta/v1/unstructured/unstructuredscheme", -- "pkg/apis/meta/v1/validation", -- "pkg/apis/meta/v1beta1", -- "pkg/conversion", -- "pkg/conversion/queryparams", -- "pkg/fields", -- "pkg/labels", -- "pkg/runtime", -- "pkg/runtime/schema", -- "pkg/runtime/serializer", -- "pkg/runtime/serializer/json", -- "pkg/runtime/serializer/protobuf", -- "pkg/runtime/serializer/recognizer", -- "pkg/runtime/serializer/streaming", -- "pkg/runtime/serializer/versioning", -- "pkg/selection", -- "pkg/types", -- "pkg/util/cache", -- "pkg/util/clock", -- "pkg/util/diff", -- "pkg/util/duration", -- "pkg/util/errors", -- "pkg/util/framer", -- "pkg/util/httpstream", -- "pkg/util/httpstream/spdy", -- "pkg/util/intstr", -- "pkg/util/json", -- "pkg/util/jsonmergepatch", -- "pkg/util/mergepatch", -- "pkg/util/naming", -- "pkg/util/net", -- "pkg/util/remotecommand", -- "pkg/util/runtime", -- "pkg/util/sets", -- "pkg/util/strategicpatch", -- "pkg/util/validation", -- "pkg/util/validation/field", -- "pkg/util/wait", -- "pkg/util/yaml", -- "pkg/version", -- "pkg/watch", -- "third_party/forked/golang/json", -- "third_party/forked/golang/netutil", -- "third_party/forked/golang/reflect", -- ] -- pruneopts = "" -- revision = "72ed19daf4bb788ae595ae4103c404cb0fa09c84" -- --[[projects]] -- branch = "release-1.16" -- digest = "1:4e236f3f94cfc5f005ceb143948ad39a4b2ad10373f394b232838f797bddd6ef" -- name = "k8s.io/apiserver" -- packages = [ -- "pkg/apis/audit", -- "pkg/authentication/serviceaccount", -- "pkg/authentication/user", -- "pkg/endpoints/request", -- "pkg/features", -- "pkg/util/feature", -- ] -- pruneopts = "" -- revision = "ebfe712c1fff40c4800d779470515e6025eda218" -- --[[projects]] -- branch = "release-1.16" -- digest = "1:b46a88b317c3187b6fa7c5351eca48b35aad182eee371168677747430ff955bb" -- name = "k8s.io/cli-runtime" -- packages = [ -- "pkg/genericclioptions", -- "pkg/kustomize", -- "pkg/kustomize/k8sdeps", -- "pkg/kustomize/k8sdeps/configmapandsecret", -- "pkg/kustomize/k8sdeps/kunstruct", -- "pkg/kustomize/k8sdeps/kv", -- "pkg/kustomize/k8sdeps/transformer", -- "pkg/kustomize/k8sdeps/transformer/hash", -- "pkg/kustomize/k8sdeps/transformer/patch", -- "pkg/kustomize/k8sdeps/validator", -- "pkg/printers", -- "pkg/resource", -- ] -- pruneopts = "" -- revision = "6bff60de437070d7e8644b7a930837d5de512240" -- --[[projects]] -- branch = "release-13.0" -- digest = "1:84f90f6a3b5b16f2c57164c5281d302b2647da8f77aa9cb14d5ebeb17fccc25e" -- name = "k8s.io/client-go" -- packages = [ -- "discovery", -- "discovery/cached/disk", -- "discovery/fake", -- "dynamic", -- "dynamic/fake", -- "informers/core/v1", -- "informers/internalinterfaces", -- "kubernetes", -- "kubernetes/fake", -- "kubernetes/scheme", -- "kubernetes/typed/admissionregistration/v1", -- "kubernetes/typed/admissionregistration/v1/fake", -- "kubernetes/typed/admissionregistration/v1beta1", -- "kubernetes/typed/admissionregistration/v1beta1/fake", -- "kubernetes/typed/apps/v1", -- "kubernetes/typed/apps/v1/fake", -- "kubernetes/typed/apps/v1beta1", -- "kubernetes/typed/apps/v1beta1/fake", -- "kubernetes/typed/apps/v1beta2", -- "kubernetes/typed/apps/v1beta2/fake", -- "kubernetes/typed/auditregistration/v1alpha1", -- "kubernetes/typed/auditregistration/v1alpha1/fake", -- "kubernetes/typed/authentication/v1", -- "kubernetes/typed/authentication/v1/fake", -- "kubernetes/typed/authentication/v1beta1", -- "kubernetes/typed/authentication/v1beta1/fake", -- "kubernetes/typed/authorization/v1", -- "kubernetes/typed/authorization/v1/fake", -- "kubernetes/typed/authorization/v1beta1", -- "kubernetes/typed/authorization/v1beta1/fake", -- "kubernetes/typed/autoscaling/v1", -- "kubernetes/typed/autoscaling/v1/fake", -- "kubernetes/typed/autoscaling/v2beta1", -- "kubernetes/typed/autoscaling/v2beta1/fake", -- "kubernetes/typed/autoscaling/v2beta2", -- "kubernetes/typed/autoscaling/v2beta2/fake", -- "kubernetes/typed/batch/v1", -- "kubernetes/typed/batch/v1/fake", -- "kubernetes/typed/batch/v1beta1", -- "kubernetes/typed/batch/v1beta1/fake", -- "kubernetes/typed/batch/v2alpha1", -- "kubernetes/typed/batch/v2alpha1/fake", -- "kubernetes/typed/certificates/v1beta1", -- "kubernetes/typed/certificates/v1beta1/fake", -- "kubernetes/typed/coordination/v1", -- "kubernetes/typed/coordination/v1/fake", -- "kubernetes/typed/coordination/v1beta1", -- "kubernetes/typed/coordination/v1beta1/fake", -- "kubernetes/typed/core/v1", -- "kubernetes/typed/core/v1/fake", -- "kubernetes/typed/discovery/v1alpha1", -- "kubernetes/typed/discovery/v1alpha1/fake", -- "kubernetes/typed/events/v1beta1", -- "kubernetes/typed/events/v1beta1/fake", -- "kubernetes/typed/extensions/v1beta1", -- "kubernetes/typed/extensions/v1beta1/fake", -- "kubernetes/typed/networking/v1", -- "kubernetes/typed/networking/v1/fake", -- "kubernetes/typed/networking/v1beta1", -- "kubernetes/typed/networking/v1beta1/fake", -- "kubernetes/typed/node/v1alpha1", -- "kubernetes/typed/node/v1alpha1/fake", -- "kubernetes/typed/node/v1beta1", -- "kubernetes/typed/node/v1beta1/fake", -- "kubernetes/typed/policy/v1beta1", -- "kubernetes/typed/policy/v1beta1/fake", -- "kubernetes/typed/rbac/v1", -- "kubernetes/typed/rbac/v1/fake", -- "kubernetes/typed/rbac/v1alpha1", -- "kubernetes/typed/rbac/v1alpha1/fake", -- "kubernetes/typed/rbac/v1beta1", -- "kubernetes/typed/rbac/v1beta1/fake", -- "kubernetes/typed/scheduling/v1", -- "kubernetes/typed/scheduling/v1/fake", -- "kubernetes/typed/scheduling/v1alpha1", -- "kubernetes/typed/scheduling/v1alpha1/fake", -- "kubernetes/typed/scheduling/v1beta1", -- "kubernetes/typed/scheduling/v1beta1/fake", -- "kubernetes/typed/settings/v1alpha1", -- "kubernetes/typed/settings/v1alpha1/fake", -- "kubernetes/typed/storage/v1", -- "kubernetes/typed/storage/v1/fake", -- "kubernetes/typed/storage/v1alpha1", -- "kubernetes/typed/storage/v1alpha1/fake", -- "kubernetes/typed/storage/v1beta1", -- "kubernetes/typed/storage/v1beta1/fake", -- "listers/core/v1", -- "pkg/apis/clientauthentication", -- "pkg/apis/clientauthentication/v1alpha1", -- "pkg/apis/clientauthentication/v1beta1", -- "pkg/version", -- "plugin/pkg/client/auth/exec", -- "plugin/pkg/client/auth/gcp", -- "plugin/pkg/client/auth/oidc", -- "rest", -- "rest/watch", -- "restmapper", -- "scale", -- "scale/scheme", -- "scale/scheme/appsint", -- "scale/scheme/appsv1beta1", -- "scale/scheme/appsv1beta2", -- "scale/scheme/autoscalingv1", -- "scale/scheme/extensionsint", -- "scale/scheme/extensionsv1beta1", -- "testing", -- "third_party/forked/golang/template", -- "tools/auth", -- "tools/cache", -- "tools/clientcmd", -- "tools/clientcmd/api", -- "tools/clientcmd/api/latest", -- "tools/clientcmd/api/v1", -- "tools/metrics", -- "tools/pager", -- "tools/portforward", -- "tools/reference", -- "tools/remotecommand", -- "tools/watch", -- "transport", -- "transport/spdy", -- "util/cert", -- "util/connrotation", -- "util/exec", -- "util/flowcontrol", -- "util/homedir", -- "util/jsonpath", -- "util/keyutil", -- "util/retry", -- "util/workqueue", -- ] -- pruneopts = "" -- revision = "85029d69edeae82e97dd1a0de3b24668cee9a15d" -- --[[projects]] -- branch = "release-1.16" -- digest = "1:254da4cb69b3776686b730a206e081e6f8898bb64760619d1895c25c407e718f" -- name = "k8s.io/code-generator" -- packages = [ -- "cmd/go-to-protobuf", -- "cmd/go-to-protobuf/protobuf", -- "pkg/util", -- "third_party/forked/golang/reflect", -- ] -- pruneopts = "" -- revision = "8e001e5d18949be7e823ccb9cfe9b60026e7bda0" -- --[[projects]] -- branch = "master" -- digest = "1:06c18e328063f3612dfda3c4c5e5b8becda1eabceca689335c8d98704dffe70a" -- name = "k8s.io/component-base" -- packages = ["featuregate"] -- pruneopts = "" -- revision = "435ce712a6949916fa293dc4d3d49429962043d8" -- --[[projects]] -- branch = "master" -- digest = "1:6a2a63e09a59caff3fd2d36d69b7b92c2fe7cf783390f0b7349fb330820f9a8e" -- name = "k8s.io/gengo" -- packages = [ -- "args", -- "examples/set-gen/sets", -- "generator", -- "namer", -- "parser", -- "types", -- ] -- pruneopts = "" -- revision = "e17681d19d3ac4837a019ece36c2a0ec31ffe985" -- --[[projects]] -- digest = "1:9eaf86f4f6fb4a8f177220d488ef1e3255d06a691cca95f14ef085d4cd1cef3c" -- name = "k8s.io/klog" -- packages = ["."] -- pruneopts = "" -- revision = "d98d8acdac006fb39831f1b25640813fef9c314f" -- version = "v0.3.3" -- --[[projects]] -- branch = "master" -- digest = "1:0d737d598e9db0a38d6ef6cba514c358b9fe7e1bc6b1128d02b2622700c75f2a" -- name = "k8s.io/kube-aggregator" -- packages = [ -- "pkg/apis/apiregistration", -- "pkg/apis/apiregistration/v1", -- "pkg/apis/apiregistration/v1beta1", -- ] -- pruneopts = "" -- revision = "e80910364765199a4baebd4dec54c885fe52b680" -- --[[projects]] -- digest = "1:16a343bd9d820ae320de4d1eaa8acc7a214aac4b38fb21d03255d3a457d861df" -- name = "k8s.io/kube-openapi" -- packages = [ -- "cmd/openapi-gen", -- "cmd/openapi-gen/args", -- "pkg/common", -- "pkg/generators", -- "pkg/generators/rules", -- "pkg/util/proto", -- "pkg/util/proto/validation", -- "pkg/util/sets", -- ] -- pruneopts = "" -- revision = "30be4d16710ac61bce31eb28a01054596fe6a9f1" -- --[[projects]] -- branch = "release-1.16" -- digest = "1:687af22932f9b53ff2e6755b2eefe160f076d522794abb980f0ddb187bcefacd" -- name = "k8s.io/kubectl" -- packages = [ -- "pkg/cmd/apply", -- "pkg/cmd/delete", -- "pkg/cmd/util", -- "pkg/cmd/util/editor", -- "pkg/cmd/util/editor/crlf", -- "pkg/cmd/wait", -- "pkg/describe", -- "pkg/describe/versioned", -- "pkg/generated", -- "pkg/rawhttp", -- "pkg/scheme", -- "pkg/util", -- "pkg/util/certificate", -- "pkg/util/deployment", -- "pkg/util/event", -- "pkg/util/fieldpath", -- "pkg/util/i18n", -- "pkg/util/interrupt", -- "pkg/util/openapi", -- "pkg/util/openapi/validation", -- "pkg/util/printers", -- "pkg/util/qos", -- "pkg/util/rbac", -- "pkg/util/resource", -- "pkg/util/slice", -- "pkg/util/storage", -- "pkg/util/templates", -- "pkg/util/term", -- "pkg/validation", -- "pkg/version", -- ] -- pruneopts = "" -- revision = "14647fd13a8b4cffc5a8f327b0018e037f72e4e8" -- --[[projects]] -- branch = "release-1.16" -- digest = "1:02241e5570c239d31e52955b1a8e6d603a35fd6542d14e98882fb6c3c4ef3d56" -- name = "k8s.io/kubernetes" -- packages = [ -- "pkg/api/legacyscheme", -- "pkg/api/v1/pod", -- "pkg/apis/apps", -- "pkg/apis/apps/install", -- "pkg/apis/apps/v1", -- "pkg/apis/apps/v1beta1", -- "pkg/apis/apps/v1beta2", -- "pkg/apis/authentication", -- "pkg/apis/authentication/install", -- "pkg/apis/authentication/v1", -- "pkg/apis/authentication/v1beta1", -- "pkg/apis/authorization", -- "pkg/apis/authorization/install", -- "pkg/apis/authorization/v1", -- "pkg/apis/authorization/v1beta1", -- "pkg/apis/autoscaling", -- "pkg/apis/autoscaling/install", -- "pkg/apis/autoscaling/v1", -- "pkg/apis/autoscaling/v2beta1", -- "pkg/apis/autoscaling/v2beta2", -- "pkg/apis/batch", -- "pkg/apis/batch/install", -- "pkg/apis/batch/v1", -- "pkg/apis/batch/v1beta1", -- "pkg/apis/batch/v2alpha1", -- "pkg/apis/certificates", -- "pkg/apis/certificates/install", -- "pkg/apis/certificates/v1beta1", -- "pkg/apis/coordination", -- "pkg/apis/coordination/install", -- "pkg/apis/coordination/v1", -- "pkg/apis/coordination/v1beta1", -- "pkg/apis/core", -- "pkg/apis/core/install", -- "pkg/apis/core/v1", -- "pkg/apis/events", -- "pkg/apis/events/install", -- "pkg/apis/events/v1beta1", -- "pkg/apis/extensions", -- "pkg/apis/extensions/install", -- "pkg/apis/extensions/v1beta1", -- "pkg/apis/networking", -- "pkg/apis/policy", -- "pkg/apis/policy/install", -- "pkg/apis/policy/v1beta1", -- "pkg/apis/rbac", -- "pkg/apis/rbac/install", -- "pkg/apis/rbac/v1", -- "pkg/apis/rbac/v1alpha1", -- "pkg/apis/rbac/v1beta1", -- "pkg/apis/scheduling", -- "pkg/apis/scheduling/install", -- "pkg/apis/scheduling/v1", -- "pkg/apis/scheduling/v1alpha1", -- "pkg/apis/scheduling/v1beta1", -- "pkg/apis/settings", -- "pkg/apis/settings/install", -- "pkg/apis/settings/v1alpha1", -- "pkg/apis/storage", -- "pkg/apis/storage/install", -- "pkg/apis/storage/v1", -- "pkg/apis/storage/v1alpha1", -- "pkg/apis/storage/v1beta1", -- "pkg/features", -- "pkg/kubectl/cmd/auth", -- "pkg/registry/rbac/reconciliation", -- "pkg/registry/rbac/validation", -- "pkg/util/node", -- "pkg/util/parsers", -- "pkg/util/slice", -- "pkg/util/workqueue/prometheus", -- ] -- pruneopts = "" -- revision = "bfafae8f1c2fdf3c3cfef04674db028531a7c098" -- --[[projects]] -- branch = "master" -- digest = "1:a8a2e6bbef691323b833d0eb11bb0e570e7eb9619ac76f7b11265530e1cac922" -- name = "k8s.io/utils" -- packages = [ -- "buffer", -- "exec", -- "integer", -- "net", -- "pointer", -- "trace", -- ] -- pruneopts = "" -- revision = "6ca3b61696b65b0e81f1a39b4937fc2d2994ed6a" -- --[[projects]] -- branch = "master" -- digest = "1:9b9f12f4c13ca4a4f4b4554c00ba46cb2910ff4079825d96d520b03c447e6da5" -- name = "layeh.com/gopher-json" -- packages = ["."] -- pruneopts = "" -- revision = "97fed8db84274c421dbfffbb28ec859901556b97" -- --[[projects]] -- digest = "1:0b2daace3dcced8712072529b621360cf520f3c2ead92d755f35a0ec8dca2714" -- name = "sigs.k8s.io/kustomize" -- packages = [ -- "pkg/commands/build", -- "pkg/constants", -- "pkg/expansion", -- "pkg/factory", -- "pkg/fs", -- "pkg/git", -- "pkg/gvk", -- "pkg/ifc", -- "pkg/ifc/transformer", -- "pkg/image", -- "pkg/internal/error", -- "pkg/loader", -- "pkg/patch", -- "pkg/patch/transformer", -- "pkg/resid", -- "pkg/resmap", -- "pkg/resource", -- "pkg/target", -- "pkg/transformers", -- "pkg/transformers/config", -- "pkg/transformers/config/defaultconfig", -- "pkg/types", -- ] -- pruneopts = "" -- revision = "a6f65144121d1955266b0cd836ce954c04122dc8" -- version = "v2.0.3" -- --[[projects]] -- digest = "1:321081b4a44256715f2b68411d8eda9a17f17ebfe6f0cc61d2cc52d11c08acfa" -- name = "sigs.k8s.io/yaml" -- packages = ["."] -- pruneopts = "" -- revision = "fd68e9863619f6ec2fdd8625fe1f02e7c877e480" -- version = "v1.1.0" -- --[solve-meta] -- analyzer-name = "dep" -- analyzer-version = 1 -- input-imports = [ -- "bou.ke/monkey", -- "github.com/Masterminds/semver", -- "github.com/TomOnTime/utfutil", -- "github.com/argoproj/pkg/errors", -- "github.com/argoproj/pkg/exec", -- "github.com/argoproj/pkg/time", -- "github.com/casbin/casbin", -- "github.com/casbin/casbin/model", -- "github.com/coreos/go-oidc", -- "github.com/dgrijalva/jwt-go", -- "github.com/dustin/go-humanize", -- "github.com/evanphx/json-patch", -- "github.com/ghodss/yaml", -- "github.com/go-openapi/loads", -- "github.com/go-openapi/runtime/middleware", -- "github.com/go-openapi/spec", -- "github.com/go-redis/cache", -- "github.com/go-redis/redis", -- "github.com/gobuffalo/packr", -- "github.com/gobwas/glob", -- "github.com/gogits/go-gogs-client", -- "github.com/gogo/protobuf/gogoproto", -- "github.com/gogo/protobuf/proto", -- "github.com/gogo/protobuf/protoc-gen-gofast", -- "github.com/gogo/protobuf/protoc-gen-gogofast", -- "github.com/gogo/protobuf/sortkeys", -- "github.com/golang/protobuf/proto", -- "github.com/golang/protobuf/protoc-gen-go", -- "github.com/golang/protobuf/ptypes/empty", -- "github.com/google/go-jsonnet", -- "github.com/google/shlex", -- "github.com/grpc-ecosystem/go-grpc-middleware", -- "github.com/grpc-ecosystem/go-grpc-middleware/auth", -- "github.com/grpc-ecosystem/go-grpc-middleware/logging", -- "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus", -- "github.com/grpc-ecosystem/go-grpc-middleware/retry", -- "github.com/grpc-ecosystem/go-grpc-middleware/tags/logrus", -- "github.com/grpc-ecosystem/go-grpc-prometheus", -- "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway", -- "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger", -- "github.com/grpc-ecosystem/grpc-gateway/runtime", -- "github.com/grpc-ecosystem/grpc-gateway/utilities", -- "github.com/improbable-eng/grpc-web/go/grpcweb", -- "github.com/kballard/go-shellquote", -- "github.com/patrickmn/go-cache", -- "github.com/pkg/errors", -- "github.com/prometheus/client_golang/prometheus", -- "github.com/prometheus/client_golang/prometheus/promhttp", -- "github.com/robfig/cron", -- "github.com/sirupsen/logrus", -- "github.com/sirupsen/logrus/hooks/test", -- "github.com/skratchdot/open-golang/open", -- "github.com/soheilhy/cmux", -- "github.com/spf13/cobra", -- "github.com/spf13/pflag", -- "github.com/stretchr/testify/assert", -- "github.com/stretchr/testify/mock", -- "github.com/vmihailenco/msgpack", -- "github.com/yudai/gojsondiff", -- "github.com/yudai/gojsondiff/formatter", -- "github.com/yuin/gopher-lua", -- "golang.org/x/crypto/bcrypt", -- "golang.org/x/crypto/ssh", -- "golang.org/x/crypto/ssh/knownhosts", -- "golang.org/x/crypto/ssh/terminal", -- "golang.org/x/net/context", -- "golang.org/x/oauth2", -- "golang.org/x/sync/errgroup", -- "golang.org/x/sync/semaphore", -- "google.golang.org/genproto/googleapis/api/annotations", -- "google.golang.org/grpc", -- "google.golang.org/grpc/codes", -- "google.golang.org/grpc/credentials", -- "google.golang.org/grpc/grpclog", -- "google.golang.org/grpc/metadata", -- "google.golang.org/grpc/reflection", -- "google.golang.org/grpc/status", -- "gopkg.in/go-playground/webhooks.v5/bitbucket", -- "gopkg.in/go-playground/webhooks.v5/bitbucket-server", -- "gopkg.in/go-playground/webhooks.v5/github", -- "gopkg.in/go-playground/webhooks.v5/gitlab", -- "gopkg.in/go-playground/webhooks.v5/gogs", -- "gopkg.in/src-d/go-git.v4", -- "gopkg.in/src-d/go-git.v4/config", -- "gopkg.in/src-d/go-git.v4/plumbing", -- "gopkg.in/src-d/go-git.v4/plumbing/transport", -- "gopkg.in/src-d/go-git.v4/plumbing/transport/client", -- "gopkg.in/src-d/go-git.v4/plumbing/transport/http", -- "gopkg.in/src-d/go-git.v4/plumbing/transport/ssh", -- "gopkg.in/src-d/go-git.v4/storage/memory", -- "gopkg.in/src-d/go-git.v4/utils/ioutil", -- "gopkg.in/yaml.v2", -- "k8s.io/api/apps/v1", -- "k8s.io/api/batch/v1", -- "k8s.io/api/core/v1", -- "k8s.io/api/extensions/v1beta1", -- "k8s.io/api/networking/v1beta1", -- "k8s.io/api/rbac/v1", -- "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1", -- "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset", -- "k8s.io/apimachinery/pkg/api/equality", -- "k8s.io/apimachinery/pkg/api/errors", -- "k8s.io/apimachinery/pkg/apis/meta/v1", -- "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", -- "k8s.io/apimachinery/pkg/fields", -- "k8s.io/apimachinery/pkg/labels", -- "k8s.io/apimachinery/pkg/runtime", -- "k8s.io/apimachinery/pkg/runtime/schema", -- "k8s.io/apimachinery/pkg/runtime/serializer", -- "k8s.io/apimachinery/pkg/selection", -- "k8s.io/apimachinery/pkg/types", -- "k8s.io/apimachinery/pkg/util/intstr", -- "k8s.io/apimachinery/pkg/util/jsonmergepatch", -- "k8s.io/apimachinery/pkg/util/runtime", -- "k8s.io/apimachinery/pkg/util/strategicpatch", -- "k8s.io/apimachinery/pkg/util/wait", -- "k8s.io/apimachinery/pkg/watch", -- "k8s.io/cli-runtime/pkg/genericclioptions", -- "k8s.io/cli-runtime/pkg/printers", -- "k8s.io/client-go/discovery", -- "k8s.io/client-go/discovery/fake", -- "k8s.io/client-go/dynamic", -- "k8s.io/client-go/dynamic/fake", -- "k8s.io/client-go/informers/core/v1", -- "k8s.io/client-go/kubernetes", -- "k8s.io/client-go/kubernetes/fake", -- "k8s.io/client-go/kubernetes/scheme", -- "k8s.io/client-go/listers/core/v1", -- "k8s.io/client-go/plugin/pkg/client/auth/gcp", -- "k8s.io/client-go/plugin/pkg/client/auth/oidc", -- "k8s.io/client-go/rest", -- "k8s.io/client-go/testing", -- "k8s.io/client-go/tools/cache", -- "k8s.io/client-go/tools/clientcmd", -- "k8s.io/client-go/tools/clientcmd/api", -- "k8s.io/client-go/tools/portforward", -- "k8s.io/client-go/transport/spdy", -- "k8s.io/client-go/util/flowcontrol", -- "k8s.io/client-go/util/workqueue", -- "k8s.io/code-generator/cmd/go-to-protobuf", -- "k8s.io/klog", -- "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1", -- "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1", -- "k8s.io/kube-openapi/cmd/openapi-gen", -- "k8s.io/kube-openapi/pkg/common", -- "k8s.io/kubectl/pkg/cmd/apply", -- "k8s.io/kubectl/pkg/cmd/util", -- "k8s.io/kubectl/pkg/scheme", -- "k8s.io/kubectl/pkg/util/term", -- "k8s.io/kubernetes/pkg/api/legacyscheme", -- "k8s.io/kubernetes/pkg/api/v1/pod", -- "k8s.io/kubernetes/pkg/apis/apps/install", -- "k8s.io/kubernetes/pkg/apis/authentication/install", -- "k8s.io/kubernetes/pkg/apis/authorization/install", -- "k8s.io/kubernetes/pkg/apis/autoscaling/install", -- "k8s.io/kubernetes/pkg/apis/batch/install", -- "k8s.io/kubernetes/pkg/apis/certificates/install", -- "k8s.io/kubernetes/pkg/apis/coordination/install", -- "k8s.io/kubernetes/pkg/apis/core", -- "k8s.io/kubernetes/pkg/apis/core/install", -- "k8s.io/kubernetes/pkg/apis/events/install", -- "k8s.io/kubernetes/pkg/apis/extensions/install", -- "k8s.io/kubernetes/pkg/apis/policy/install", -- "k8s.io/kubernetes/pkg/apis/rbac/install", -- "k8s.io/kubernetes/pkg/apis/scheduling/install", -- "k8s.io/kubernetes/pkg/apis/settings/install", -- "k8s.io/kubernetes/pkg/apis/storage/install", -- "k8s.io/kubernetes/pkg/kubectl/cmd/auth", -- "k8s.io/kubernetes/pkg/util/node", -- "k8s.io/kubernetes/pkg/util/slice", -- "k8s.io/kubernetes/pkg/util/workqueue/prometheus", -- "k8s.io/utils/pointer", -- "layeh.com/gopher-json", -- ] -- solver-name = "gps-cdcl" -- solver-version = 1 -diff --git a/Gopkg.toml b/Gopkg.toml -deleted file mode 100644 -index 2fa04ee4..00000000 ---- a/Gopkg.toml -+++ /dev/null -@@ -1,117 +0,0 @@ --# Packages should only be added to the following list when we use them *outside* of our go code. --# (e.g. we want to build the binary to invoke as part of the build process, such as in --# generate-proto.sh). Normal use of golang packages should be added via `dep ensure`, and pinned --# with a [[constraint]] or [[override]] when version is important. --required = [ -- "github.com/golang/protobuf/protoc-gen-go", -- "github.com/gogo/protobuf/protoc-gen-gofast", -- "github.com/gogo/protobuf/protoc-gen-gogofast", -- "k8s.io/code-generator/cmd/go-to-protobuf", -- "k8s.io/kube-openapi/cmd/openapi-gen", -- "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway", -- "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger", -- "golang.org/x/sync/errgroup", --] -- --[[constraint]] -- name = "google.golang.org/grpc" -- version = "1.15.0" -- --[[constraint]] -- name = "github.com/gogo/protobuf" -- version = "1.3.1" -- --# override github.com/grpc-ecosystem/go-grpc-middleware's constraint on master --[[override]] -- name = "github.com/golang/protobuf" -- version = "1.2.0" -- --[[constraint]] -- name = "github.com/grpc-ecosystem/grpc-gateway" -- version = "v1.3.1" -- --# prometheus does not believe in semversioning yet --[[constraint]] -- name = "github.com/prometheus/client_golang" -- revision = "7858729281ec582767b20e0d696b6041d995d5e0" -- --[[override]] -- branch = "release-1.16" -- name = "k8s.io/api" -- --[[override]] -- branch = "release-1.16" -- name = "k8s.io/kubernetes" -- --[[override]] -- branch = "release-1.16" -- name = "k8s.io/code-generator" -- --[[override]] -- branch = "release-1.16" -- name = "k8s.io/apimachinery" -- --[[override]] -- branch = "release-1.16" -- name = "k8s.io/apiextensions-apiserver" -- --[[override]] -- branch = "release-1.16" -- name = "k8s.io/apiserver" -- --[[override]] -- branch = "release-1.16" -- name = "k8s.io/kubectl" -- --[[override]] -- branch = "release-1.16" -- name = "k8s.io/cli-runtime" -- --[[override]] -- version = "2.0.3" -- name = "sigs.k8s.io/kustomize" -- --# ASCIIRenderer does not implement blackfriday.Renderer --[[override]] -- name = "github.com/russross/blackfriday" -- version = "1.5.2" -- --[[override]] -- branch = "release-13.0" -- name = "k8s.io/client-go" -- --[[override]] -- name = "github.com/casbin/casbin" -- version = "1.9.1" -- --[[constraint]] -- name = "github.com/stretchr/testify" -- version = "1.2.2" -- --[[constraint]] -- name = "github.com/gobuffalo/packr" -- version = "v1.11.0" -- --[[constraint]] -- branch = "master" -- name = "github.com/argoproj/pkg" -- --[[constraint]] -- branch = "master" -- name = "github.com/yudai/gojsondiff" -- --# Fixes: Could not introduce sigs.k8s.io/kustomize@v2.0.3, as it has a dependency on github.com/spf13/cobra with constraint ^0.0.2, which has no overlap with existing constraint 0.0.5 from (root) --[[override]] -- name = "github.com/spf13/cobra" -- revision = "0.0.5" -- --# TODO: move off of k8s.io/kube-openapi and use controller-tools for CRD spec generation --# (override argoproj/argo contraint on master) --[[override]] -- revision = "30be4d16710ac61bce31eb28a01054596fe6a9f1" -- name = "k8s.io/kube-openapi" -- --# jsonpatch replace operation does not apply: doc is missing key: /metadata/annotations --[[override]] -- name = "github.com/evanphx/json-patch" -- version = "v4.1.0" -diff --git a/go.mod b/go.mod -new file mode 100644 -index 00000000..2e741ab3 ---- /dev/null -+++ b/go.mod -@@ -0,0 +1,114 @@ -+module github.com/argoproj/argo-cd -+ -+go 1.12 -+ -+require ( -+ bou.ke/monkey v1.0.1 -+ github.com/Masterminds/semver v1.4.2 -+ github.com/TomOnTime/utfutil v0.0.0-20180511104225-09c41003ee1d -+ github.com/argoproj/pkg v0.0.0-20191031223000-02a6aac40ac4 -+ github.com/casbin/casbin v1.9.1 -+ github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 // indirect -+ github.com/coreos/go-oidc v2.1.0+incompatible -+ github.com/dgrijalva/jwt-go v3.2.0+incompatible -+ github.com/docker/docker v1.6.0-rc5 // indirect -+ github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect -+ github.com/dustin/go-humanize v1.0.0 -+ github.com/evanphx/json-patch v4.5.0+incompatible -+ github.com/ghodss/yaml v1.0.0 -+ github.com/go-openapi/loads v0.19.2 -+ github.com/go-openapi/runtime v0.19.0 -+ github.com/go-openapi/spec v0.19.2 -+ github.com/go-redis/cache v6.3.5+incompatible -+ github.com/go-redis/redis v6.15.1+incompatible -+ github.com/gobuffalo/packr v1.11.0 -+ github.com/gobwas/glob v0.2.3 -+ github.com/gogits/go-gogs-client v0.0.0-20190616193657-5a05380e4bc2 -+ github.com/gogo/protobuf v1.3.1 -+ github.com/golang/protobuf v1.3.1 -+ github.com/google/btree v1.0.0 // indirect -+ github.com/google/go-cmp v0.3.1 // indirect -+ github.com/google/go-jsonnet v0.10.0 -+ github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf -+ github.com/googleapis/gnostic v0.1.0 // indirect -+ github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect -+ github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79 -+ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 -+ github.com/grpc-ecosystem/grpc-gateway v1.3.1 -+ github.com/improbable-eng/grpc-web v0.0.0-20181111100011-16092bd1d58a -+ github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect -+ github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 -+ github.com/malexdev/utfutil v0.0.0-20180510171754-00c8d4a8e7a8 // indirect -+ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect -+ github.com/patrickmn/go-cache v2.1.0+incompatible -+ github.com/pkg/errors v0.8.1 -+ github.com/pquerna/cachecontrol v0.0.0-20180306154005-525d0eb5f91d // indirect -+ github.com/prometheus/client_golang v0.9.2 -+ github.com/robfig/cron v1.1.0 -+ github.com/rs/cors v1.6.0 // indirect -+ github.com/sirupsen/logrus v1.4.2 -+ github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c -+ github.com/soheilhy/cmux v0.1.4 -+ github.com/spf13/cobra v0.0.5 -+ github.com/spf13/pflag v1.0.5 -+ github.com/stretchr/testify v1.3.0 -+ github.com/vmihailenco/msgpack v3.3.1+incompatible -+ github.com/yudai/gojsondiff v0.0.0-20180504020246-0525c875b75c -+ github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect -+ github.com/yudai/pp v2.0.1+incompatible // indirect -+ github.com/yuin/gopher-lua v0.0.0-20190115140932-732aa6820ec4 -+ golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 -+ golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 -+ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 -+ golang.org/x/sync v0.0.0-20190423024810-112230192c58 -+ google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 -+ google.golang.org/grpc v1.23.0 -+ gopkg.in/go-playground/webhooks.v5 v5.11.0 -+ gopkg.in/src-d/go-git.v4 v4.9.1 -+ gopkg.in/yaml.v2 v2.2.8 -+ k8s.io/api v0.0.0 -+ k8s.io/apiextensions-apiserver v0.0.0 -+ k8s.io/apimachinery v0.16.5-beta.1 -+ k8s.io/cli-runtime v0.0.0 -+ k8s.io/client-go v0.0.0 -+ k8s.io/klog v1.0.0 -+ k8s.io/kube-aggregator v0.0.0 -+ k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a -+ k8s.io/kubectl v0.0.0 -+ k8s.io/kubernetes v0.0.0-20191207011953-bfafae8f1c2f -+ k8s.io/utils v0.0.0-20191114200735-6ca3b61696b6 -+ layeh.com/gopher-json v0.0.0-20190114024228-97fed8db8427 -+) -+ -+replace ( -+ k8s.io/api => k8s.io/api v0.0.0-20200131112707-d64dbec685a4 -+ k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20200208193839-84fe3c0be50e -+ k8s.io/apimachinery => k8s.io/apimachinery v0.16.7-beta.0.0.20200131112342-0c9ec93240c9 -+ k8s.io/apiserver => k8s.io/apiserver v0.0.0-20200208192130-2d005a048922 -+ k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200131120220-9674fbb91442 -+ k8s.io/client-go => k8s.io/client-go v0.0.0-20191016111102-bec269661e48 -+ k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20200131203752-f498d522efeb -+ k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20200131121422-fc6110069b18 -+ k8s.io/code-generator => k8s.io/code-generator v0.16.7-beta.0.0.20200131112027-a3045e5e55c0 -+ k8s.io/component-base => k8s.io/component-base v0.0.0-20200131113804-409d4deb41dd -+ k8s.io/cri-api => k8s.io/cri-api v0.16.8-beta.0 -+ k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20200131121824-f033562d74c3 -+ k8s.io/gengo => k8s.io/gengo v0.0.0-20190822140433-26a664648505 -+ k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1 -+ k8s.io/klog => k8s.io/klog v0.4.0 -+ k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20200208192621-0eeb50407007 -+ k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20200131121224-13b3f231e47d -+ k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf -+ k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20200131120626-5b8ba5e54e1f -+ k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20200131121024-5f0ba0866863 -+ k8s.io/kubectl => k8s.io/kubectl v0.0.0-20200131122652-b28c9fbca10f -+ k8s.io/kubelet => k8s.io/kubelet v0.0.0-20200131120825-905bd8eea4c4 -+ k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20200208200602-3a1c7effd2b3 -+ k8s.io/metrics => k8s.io/metrics v0.0.0-20200131120008-5c623d74062d -+ k8s.io/node-api => k8s.io/node-api v0.0.0-20200131122255-04077c800298 -+ k8s.io/repo-infra => k8s.io/repo-infra v0.0.0-20181204233714-00fe14e3d1a3 -+ k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20200208192953-f8dc80bbc173 -+ k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.0.0-20200131120425-dca0863cb511 -+ k8s.io/sample-controller => k8s.io/sample-controller v0.0.0-20200131115407-2b45fb79af22 -+ k8s.io/utils => k8s.io/utils v0.0.0-20190801114015-581e00157fb1 -+) -diff --git a/go.sum b/go.sum -new file mode 100644 -index 00000000..3d39244f ---- /dev/null -+++ b/go.sum -@@ -0,0 +1,700 @@ -+bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690/go.mod h1:Ulb78X89vxKYgdL24HMTiXYHlyHEvruOj1ZPlqeNEZM= -+bou.ke/monkey v1.0.1 h1:zEMLInw9xvNakzUUPjfS4Ds6jYPqCFx3m7bRmG5NH2U= -+bou.ke/monkey v1.0.1/go.mod h1:FgHuK96Rv2Nlf+0u1OOVDpCMdsWyOFmeeketDHE7LIg= -+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -+cloud.google.com/go v0.38.0 h1:ROfEUZz+Gh5pa62DJWXSaonyu3StP6EA6lPEXPI6mCo= -+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -+github.com/Azure/azure-sdk-for-go v32.5.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -+github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= -+github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= -+github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= -+github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= -+github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -+github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -+github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocmRAJWqST1wQYhyyjXJ3SJc= -+github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod h1:Ha3z/SqBeaalWQvokg3NZAlQTalVMtOIAs1aGK7G6u8= -+github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= -+github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= -+github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -+github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190822182118-27a4ced34534/go.mod h1:iroGtC8B3tQiqtds1l+mgk/BBOrxbqjH+eUfFQYRc14= -+github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod h1:3VYc5hodBMJ5+l/7J4xAyMeuM2PNuepvHlGs8yilUCA= -+github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw= -+github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -+github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd h1:sjQovDkwrZp8u+gxLtPgKGjk5hCxuy2hrRejBTA9xFU= -+github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E= -+github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc= -+github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= -+github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= -+github.com/Microsoft/hcsshim v0.0.0-20190417211021-672e52e9209d/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= -+github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= -+github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -+github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -+github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= -+github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -+github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -+github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= -+github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -+github.com/Rican7/retry v0.1.0/go.mod h1:FgOROf8P5bebcC1DS0PdOQiqGUridaZvikzUmkFW6gg= -+github.com/TomOnTime/utfutil v0.0.0-20180511104225-09c41003ee1d h1:WtAMR0fPCOfK7TPGZ8ZpLLY18HRvL7XJ3xcs0wnREgo= -+github.com/TomOnTime/utfutil v0.0.0-20180511104225-09c41003ee1d/go.mod h1:WML6KOYjeU8N6YyusMjj2qRvaPNUEvrQvaxuFcMRFJY= -+github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs= -+github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= -+github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA= -+github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= -+github.com/argoproj/pkg v0.0.0-20191031223000-02a6aac40ac4 h1:ykGEoo3WuCNoqO+rnaa0j/RdYfXZFp5Aqim+CjzdBaQ= -+github.com/argoproj/pkg v0.0.0-20191031223000-02a6aac40ac4/go.mod h1:2EZ44RG/CcgtPTwrRR0apOc7oU6UIw8GjCUJWZ8X3bM= -+github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -+github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= -+github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -+github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA= -+github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -+github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7/go.mod h1:LWMyo4iOLWXHGdBki7NIht1kHru/0wM179h+d3g8ATM= -+github.com/aws/aws-sdk-go v1.16.26/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -+github.com/bazelbuild/bazel-gazelle v0.0.0-20181012220611-c728ce9f663e/go.mod h1:uHBSeeATKpVazAACZBDPL/Nk/UhQDDsJWDlqYJo8/Us= -+github.com/bazelbuild/buildtools v0.0.0-20180226164855-80c7f0d45d7e/go.mod h1:5JP0TXzWDHXv8qvxRC4InIazwdyDseBDbzESUMKk1yU= -+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0= -+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -+github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115/go.mod h1:zVt7zX3K/aDCk9Tj+VM7YymsX66ERvzCJzw8rFCX2JU= -+github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -+github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= -+github.com/caddyserver/caddy v1.0.3/go.mod h1:G+ouvOY32gENkJC+jhgl62TyhvqEsFaDiZ4uw0RzP1E= -+github.com/casbin/casbin v1.9.1 h1:ucjbS5zTrmSLtH4XogqOG920Poe6QatdXtz1FEbApeM= -+github.com/casbin/casbin v1.9.1/go.mod h1:z8uPsfBJGUsnkagrt3G8QvjgTKFMBJ32UP8HpZllfog= -+github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= -+github.com/cespare/prettybench v0.0.0-20150116022406-03b8cfe5406c/go.mod h1:Xe6ZsFhtM8HrDku0pxJ3/Lr51rwykrzgFwpmTzleatY= -+github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw= -+github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 h1:HD4PLRzjuCVW79mQ0/pdsalOLHJ+FaEoqJLxfltpb2U= -+github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw= -+github.com/checkpoint-restore/go-criu v0.0.0-20190109184317-bdb7599cd87b/go.mod h1:TrMrLQfeENAPYPRsJuq3jsqdlRh3lvi6trTZJG8+tho= -+github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= -+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -+github.com/cloudflare/cfssl v0.0.0-20180726162950-56268a613adf/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA= -+github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313/go.mod h1:P1wt9Z3DP8O6W3rvwCt0REIlshg1InHImaLW0t3ObY0= -+github.com/codegangsta/negroni v1.0.0/go.mod h1:v0y3T5G7Y1UlFfyxFn/QLRU4a2EuNau2iZY63YTKWo0= -+github.com/container-storage-interface/spec v1.1.0/go.mod h1:6URME8mwIBbpVyZV93Ce5St17xBiQJQY67NDsuohiy4= -+github.com/containerd/console v0.0.0-20170925154832-84eeaae905fa/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= -+github.com/containerd/containerd v1.0.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -+github.com/containerd/typeurl v0.0.0-20190228175220-2a93cfde8c20/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= -+github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= -+github.com/coredns/corefile-migration v1.0.2/go.mod h1:OFwBp/Wc9dJt5cAZzHWMNhK1r5L0p0jDwIBc6j8NC8E= -+github.com/coreos/bbolt v1.3.3/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= -+github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -+github.com/coreos/etcd v3.3.17+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -+github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= -+github.com/coreos/go-oidc v2.1.0+incompatible h1:sdJrfw8akMnCuUlaZU3tE/uYXFgfqom8DBE9so9EBsM= -+github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= -+github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -+github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -+github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -+github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -+github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -+github.com/coreos/rkt v1.30.0/go.mod h1:O634mlH6U7qk87poQifK6M2rsFNt+FyUTWNMnP1hF1U= -+github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= -+github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= -+github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -+github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE= -+github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= -+github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -+github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= -+github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= -+github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -+github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -+github.com/docker/docker v1.6.0-rc5 h1:8dnqiCOcZf2QXwR4LNnG7AK9hXeeT6adGmtjicsVswc= -+github.com/docker/docker v1.6.0-rc5/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -+github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= -+github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -+github.com/docker/libnetwork v0.0.0-20180830151422-a9cd636e3789/go.mod h1:93m0aTqz6z+g32wla4l4WxTrdtvBRmVzYRkYvasA5Z8= -+github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= -+github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c h1:ZfSZ3P3BedhKGUhzj7BQlPSU4OvT6tfOKe3DVHzOA7s= -+github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= -+github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= -+github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -+github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e h1:p1yVGRW3nmb85p1Sh1ZJSDm4A4iKLS5QNbvUHMgGu/M= -+github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= -+github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -+github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk= -+github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -+github.com/emirpasic/gods v1.9.0 h1:rUF4PuzEjMChMiNsVjdI+SyLu7rEqpQ5reNFnhC7oFo= -+github.com/emirpasic/gods v1.9.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= -+github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod h1:MhmAMZ8V4CYH4ybgdRwPr2TU5ThnS43puaKEMpja1uw= -+github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -+github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5IcNrDCXZ6OoTAWu7M= -+github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -+github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM= -+github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= -+github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8= -+github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= -+github.com/fatih/color v1.6.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -+github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= -+github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= -+github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= -+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -+github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -+github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -+github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= -+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -+github.com/gliderlabs/ssh v0.1.1 h1:j3L6gSLQalDETeEg/Jg0mGY0/y/N6zI2xX1978P0Uqw= -+github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= -+github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= -+github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is= -+github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= -+github.com/go-acme/lego v2.5.0+incompatible/go.mod h1:yzMNe9CasVUhkquNvti5nAtPmG94USbYxYrZfTkIn0M= -+github.com/go-bindata/go-bindata v3.1.1+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo= -+github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= -+github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= -+github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= -+github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= -+github.com/go-openapi/analysis v0.19.2 h1:ophLETFestFZHk3ji7niPEL4d466QjW+0Tdg5VyDq7E= -+github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk= -+github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= -+github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= -+github.com/go-openapi/errors v0.19.2 h1:a2kIyV3w+OS3S97zxUndRVD46+FhGOUBDFY7nmu4CsY= -+github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= -+github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= -+github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= -+github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= -+github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= -+github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w= -+github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -+github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= -+github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= -+github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= -+github.com/go-openapi/jsonreference v0.19.2 h1:o20suLFB4Ri0tuzpWtyHlh7E7HnkqTNLq6aR6WVNS1w= -+github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= -+github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= -+github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= -+github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= -+github.com/go-openapi/loads v0.19.2 h1:rf5ArTHmIJxyV5Oiks+Su0mUens1+AjpkPoWr5xFRcI= -+github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs= -+github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA= -+github.com/go-openapi/runtime v0.19.0 h1:sU6pp4dSV2sGlNKKyHxZzi1m1kG4WnYtWcJ+HYbygjE= -+github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64= -+github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= -+github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= -+github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= -+github.com/go-openapi/spec v0.19.2 h1:SStNd1jRcYtfKCN7R0laGNs80WYYvn5CbBjM2sOmCrE= -+github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY= -+github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= -+github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= -+github.com/go-openapi/strfmt v0.19.0 h1:0Dn9qy1G9+UJfRU7TR8bmdGxb4uifB7HNrJjOnV0yPk= -+github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY= -+github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= -+github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= -+github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= -+github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -+github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= -+github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -+github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= -+github.com/go-openapi/validate v0.19.2 h1:ky5l57HjyVRrsJfd2+Ro5Z9PjGuKbsmftwyMtk8H7js= -+github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= -+github.com/go-ozzo/ozzo-validation v3.5.0+incompatible/go.mod h1:gsEKFIVnabGBt6mXmxK0MoFy+cZoTJY6mu5Ll3LVLBU= -+github.com/go-redis/cache v6.3.5+incompatible h1:4OUyoXXYRRQ6tKA4ue3TlPUkBzk3occzjtXBZBxCzgs= -+github.com/go-redis/cache v6.3.5+incompatible/go.mod h1:XNnMdvlNjcZvHjsscEozHAeOeSE5riG9Fj54meG4WT4= -+github.com/go-redis/redis v6.15.1+incompatible h1:BZ9s4/vHrIqwOb0OPtTQ5uABxETJ3NRuUNoSUurnkew= -+github.com/go-redis/redis v6.15.1+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= -+github.com/gobuffalo/packr v1.11.0 h1:lxysfHcxVCWGNMHzKABP7ZEL3A7iIVYfkev/D7AR0aM= -+github.com/gobuffalo/packr v1.11.0/go.mod h1:rYwMLC6NXbAbkKb+9j3NTKbxSswkKLlelZYccr4HYVw= -+github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= -+github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= -+github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= -+github.com/gogits/go-gogs-client v0.0.0-20190616193657-5a05380e4bc2 h1:BbwX8wsMRDZRdNYxAna+4ls3wvMKJyn4PT6Zk1CPxP4= -+github.com/gogits/go-gogs-client v0.0.0-20190616193657-5a05380e4bc2/go.mod h1:cY2AIrMgHm6oOHmR7jY+9TtjzSjQ3iG7tURJG3Y6XH0= -+github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= -+github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= -+github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= -+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= -+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -+github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 h1:LbsanbbD6LieFkXbj9YNNBupiGHJgFeLpO0j0Fza1h8= -+github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -+github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -+github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= -+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -+github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho= -+github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8= -+github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk= -+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -+github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= -+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -+github.com/google/cadvisor v0.34.0/go.mod h1:1nql6U13uTHaLYB8rLS5x9IJc2qT6Xd/Tr1sTX6NE48= -+github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg= -+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -+github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg= -+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -+github.com/google/go-jsonnet v0.10.0 h1:NzmG/5DRTYDjNnsL/OmX6wT+ByeKbSoRoV6VxOy+QdM= -+github.com/google/go-jsonnet v0.10.0/go.mod h1:gVu3UVSfOt5fRFq+dh9duBqXa5905QY8S1QvMNcEIVs= -+github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= -+github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw= -+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -+github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf h1:7+FW5aGwISbqUtkfmIpZJGRgNFg2ioYPvFaUxdqpDsg= -+github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf/go.mod h1:RpwtwJQFrIEPstU94h88MWPXP2ektJZ8cZ0YntAmXiE= -+github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -+github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= -+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -+github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= -+github.com/googleapis/gnostic v0.1.0 h1:rVsPeBmXbYv4If/cumu1AzZPwV58q433hvONV1UEZoI= -+github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= -+github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= -+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -+github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -+github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -+github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= -+github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -+github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -+github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA= -+github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -+github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79 h1:lR9ssWAqp9qL0bALxqEEkuudiP1eweOdv9jsRK3e7lE= -+github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= -+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -+github.com/grpc-ecosystem/grpc-gateway v1.3.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= -+github.com/grpc-ecosystem/grpc-gateway v1.3.1 h1:k2neygAEBYavP90THffKBVlkASdxu4XiI8cAWuL3MG0= -+github.com/grpc-ecosystem/grpc-gateway v1.3.1/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= -+github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= -+github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -+github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU= -+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -+github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -+github.com/heketi/heketi v9.0.0+incompatible/go.mod h1:bB9ly3RchcQqsQ9CpyaQwvva7RS5ytVoSoholZQON6o= -+github.com/heketi/rest v0.0.0-20180404230133-aa6a65207413/go.mod h1:BeS3M108VzVlmAue3lv2WcGuPAX94/KN63MUURzbYSI= -+github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6/go.mod h1:xGMAM8JLi7UkZt1i4FQeQy0R2T8GLUwQhOP5M1gBhy4= -+github.com/heketi/utils v0.0.0-20170317161834-435bc5bdfa64/go.mod h1:RYlF4ghFZPPmk2TC5REt5OFwvfb6lzxFWrTWB+qs28s= -+github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= -+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -+github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q= -+github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -+github.com/improbable-eng/grpc-web v0.0.0-20181111100011-16092bd1d58a h1:RweVA0vnEyStwtAelyGmnU8ENDnwd1Q7pQr7U3J/rXo= -+github.com/improbable-eng/grpc-web v0.0.0-20181111100011-16092bd1d58a/go.mod h1:6hRR09jOEG81ADP5wCQju1z71g6OL4eEvELdran/3cs= -+github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= -+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -+github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= -+github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= -+github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -+github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a/go.mod h1:wK6yTYYcgjHE1Z1QtXACPDjcFJyBskHEdagmnq3vsP8= -+github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -+github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo= -+github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -+github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -+github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo= -+github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -+github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 h1:uC1QfSlInpQF+M0ao65imhwqKnz3Q2z/d8PWZRMQvDM= -+github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= -+github.com/karrick/godirwalk v1.7.5/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34= -+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= -+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= -+github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e h1:RgQk53JHp/Cjunrr1WlsXSZpqXn+uREuHvUVcK82CV8= -+github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= -+github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= -+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -+github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= -+github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= -+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= -+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -+github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= -+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= -+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -+github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= -+github.com/libopenstorage/openstorage v1.0.0/go.mod h1:Sp1sIObHjat1BeXhfMqLZ14wnOzEhNx2YQedreMcUyc= -+github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= -+github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= -+github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= -+github.com/lpabon/godbc v0.1.1/go.mod h1:Jo9QV0cf3U6jZABgiJ2skINAXb9j8m51r07g4KI92ZA= -+github.com/lucas-clemente/aes12 v0.0.0-20171027163421-cd47fb39b79f/go.mod h1:JpH9J1c9oX6otFSgdUHwUBUizmKlrMjxWnIAjff4m04= -+github.com/lucas-clemente/quic-clients v0.1.0/go.mod h1:y5xVIEoObKqULIKivu+gD/LU90pL73bTdtQjPBvtCBk= -+github.com/lucas-clemente/quic-go v0.10.2/go.mod h1:hvaRS9IHjFLMq76puFJeWNfmn+H70QZ/CXoxqw9bzao= -+github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced/go.mod h1:NCcRLrOTZbzhZvixZLlERbJtDtYsmMw8Jc4vS8Z0g58= -+github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -+github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -+github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -+github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -+github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e h1:hB2xlXdHp/pmPZq0y3QnmWAArdw9PqbmotexnWx/FU8= -+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -+github.com/malexdev/utfutil v0.0.0-20180510171754-00c8d4a8e7a8 h1:A6SLdFpRzUUF5v9F/7T1fu3DERmOCgTwwP6x54eyFfU= -+github.com/malexdev/utfutil v0.0.0-20180510171754-00c8d4a8e7a8/go.mod h1:UtpLyb/EupVKXF/N0b4NRe1DNg+QYJsnsHQ038romhM= -+github.com/marten-seemann/qtls v0.2.3/go.mod h1:xzjG7avBwGGbdZ8dTGxlBnLArsVKLvwmjgmPuiQEcYk= -+github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= -+github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -+github.com/mattn/go-isatty v0.0.3 h1:ns/ykhmWi7G9O+8a448SecJU3nSMBXJfqQkl0upE1jI= -+github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -+github.com/mattn/go-shellwords v1.0.5/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= -+github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= -+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -+github.com/mesos/mesos-go v0.0.9/go.mod h1:kPYCMQ9gsOXVAle1OsoY4I1+9kPu8GHkf88aV59fDr4= -+github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2/go.mod h1:g4cOPxcjV0oFq3qwpjSA30LReKD8AoIfwAY9VvG35NY= -+github.com/miekg/dns v1.1.3/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -+github.com/miekg/dns v1.1.4/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -+github.com/mindprince/gonvml v0.0.0-20171110221305-fee913ce8fb2/go.mod h1:2eu9pRWp8mo84xCg6KswZ+USQHjwgRhNp06sozOdsTY= -+github.com/mistifyio/go-zfs v2.1.1+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4= -+github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -+github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= -+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -+github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= -+github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= -+github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= -+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= -+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -+github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -+github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= -+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -+github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= -+github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= -+github.com/mrunalp/fileutils v0.0.0-20160930181131-4ee1cc9a8058/go.mod h1:x8F1gnqOkIEiO4rqoeEEEqQbo7HjGMTvyoq3gej4iT0= -+github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -+github.com/mvdan/xurls v1.1.0/go.mod h1:tQlNn3BED8bE/15hnSL2HLkDeLWpNPAwtw7wkEq44oU= -+github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU= -+github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= -+github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0= -+github.com/naoina/toml v0.1.1/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E= -+github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -+github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w= -+github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -+github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= -+github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -+github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo= -+github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -+github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ= -+github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= -+github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -+github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -+github.com/opencontainers/runtime-spec v1.0.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -+github.com/opencontainers/selinux v1.2.2/go.mod h1:+BLncwf63G4dgOzykXAxcmnFlUaOlkDdmw/CqsW6pjs= -+github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= -+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= -+github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= -+github.com/pelletier/go-buffruneio v0.2.0 h1:U4t4R6YkofJ5xHm3dJzuRpPZ0mr5MMCoAWooScCR7aA= -+github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= -+github.com/pelletier/go-toml v1.0.1/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -+github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -+github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= -+github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= -+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= -+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -+github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -+github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= -+github.com/pquerna/cachecontrol v0.0.0-20180306154005-525d0eb5f91d h1:7gXyC293Lsm2YWgQ+0uaAFFFDO82ruiQSwc3ua+Vtlc= -+github.com/pquerna/cachecontrol v0.0.0-20180306154005-525d0eb5f91d/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= -+github.com/pquerna/ffjson v0.0.0-20180717144149-af8b230fcd20/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M= -+github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740= -+github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= -+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8= -+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -+github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jOqq0gIVUe6Yk0/QMZ640k6NvkxcBf+8= -+github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -+github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE= -+github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -+github.com/quobyte/api v0.1.2/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI= -+github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= -+github.com/robfig/cron v1.1.0 h1:jk4/Hud3TTdcrJgUOBgsqrZBarcxl6ADIjSC2iniwLY= -+github.com/robfig/cron v1.1.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k= -+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -+github.com/rs/cors v1.6.0 h1:G9tHG9lebljV9mfp9SNPDL36nCDxmo3zTlAf1YgvzmI= -+github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= -+github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto= -+github.com/russross/blackfriday v0.0.0-20170610170232-067529f716f4/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= -+github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= -+github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= -+github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -+github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= -+github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= -+github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -+github.com/sirupsen/logrus v1.0.5/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= -+github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= -+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -+github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c h1:fyKiXKO1/I/B6Y2U8T7WdQGWzwehOuGIrljPtt7YTTI= -+github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog= -+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -+github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -+github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -+github.com/soheilhy/cmux v0.1.4 h1:0HKaf1o97UwFjHH9o5XsHUOF+tqmdA7KEzXLpiyaw0E= -+github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -+github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -+github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= -+github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -+github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= -+github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -+github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= -+github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= -+github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -+github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= -+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -+github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= -+github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4= -+github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= -+github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc/go.mod h1:ZrLn+e0ZuF3Y65PNF6dIwbJPZqfmtCXxFm9ckv0agOY= -+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= -+github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= -+github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -+github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= -+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -+github.com/syndtr/gocapability v0.0.0-20160928074757-e7cb7fa329f4/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -+github.com/thecodeteam/goscaleio v0.1.0/go.mod h1:68sdkZAsK8bvEwBlbQnlLS+xU+hvLYM/iQ8KXej1AwM= -+github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -+github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= -+github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= -+github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= -+github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= -+github.com/vmihailenco/msgpack v3.3.1+incompatible h1:ibe+d1lqocBmxbJ+gwcDO8LpAHFr3PGDYovoURuTVGk= -+github.com/vmihailenco/msgpack v3.3.1+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= -+github.com/vmware/govmomi v0.20.1/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU= -+github.com/xanzy/ssh-agent v0.2.0 h1:Adglfbi5p9Z0BmK2oKU9nTG+zKfniSfnaMYB+ULd+Ro= -+github.com/xanzy/ssh-agent v0.2.0/go.mod h1:0NyE30eGUDliuLEHJgYte/zncp2zdTStcOnWhgSqHD8= -+github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -+github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod h1:QcJo0QPSfTONNIgpN5RA8prR7fF8nkF6cTWTcNerRO8= -+github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -+github.com/yudai/gojsondiff v0.0.0-20180504020246-0525c875b75c h1:/8Xb/f8s2/ZZpzMzBkFwW2Jvj7Pglk+AW8m8FFqOoIQ= -+github.com/yudai/gojsondiff v0.0.0-20180504020246-0525c875b75c/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= -+github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 h1:BHyfKlQyqbsFN5p3IfnEUduWvb9is428/nNb5L3U01M= -+github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= -+github.com/yudai/pp v2.0.1+incompatible h1:Q4//iY4pNF6yPLZIigmvcl7k/bPgrcTPIFIcmawg5bI= -+github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= -+github.com/yuin/gopher-lua v0.0.0-20190115140932-732aa6820ec4 h1:1yOVVSFiradDwXpgdkDjlGOcGJqcohH/W49Zn8Ywgco= -+github.com/yuin/gopher-lua v0.0.0-20190115140932-732aa6820ec4/go.mod h1:fFiAh+CowNFr0NK5VASokuwKwkbacRmHsVA7Yb1Tqac= -+go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -+go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -+go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -+go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -+golang.org/x/crypto v0.0.0-20180426230345-b49d69b5da94/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -+golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -+golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -+golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -+golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -+golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -+golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -+golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 h1:7KByu05hhLed2MO29w7p1XfZvZ13m8mub3shuVftRs0= -+golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -+golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -+golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -+golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -+golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -+golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -+golang.org/x/net v0.0.0-20181102091132-c10e9556a7bc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -+golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -+golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -+golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -+golang.org/x/net v0.0.0-20190328230028-74de082e2cca/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -+golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -+golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 h1:rjwSpXsdiK0dV8/Naq3kAw9ymfAeJIyd0upUIElB+lI= -+golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0= -+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -+golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= -+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -+golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -+golang.org/x/sys v0.0.0-20180903190138-2b024373dcd9/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -+golang.org/x/sys v0.0.0-20181004145325-8469e314837c/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -+golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -+golang.org/x/sys v0.0.0-20190124100055-b90733256f2e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -+golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -+golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ= -+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= -+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg= -+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -+golang.org/x/tools v0.0.0-20170824195420-5d2fd3ccab98/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -+golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -+golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -+golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -+golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -+golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -+gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= -+gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= -+gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ= -+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -+google.golang.org/api v0.6.1-0.20190607001116-5213b8090861/go.mod h1:btoxGiFvQNVUZQ8W08zLtrVS08CNpINPEfxXxgJL1Q4= -+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -+google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c= -+google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 h1:nfPFGzJkUDX6uBmpN/pSw7MbOAWegH5QDQuoXFHedLg= -+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -+google.golang.org/grpc v1.23.0 h1:AzbTB6ux+okLTzP8Ru1Xs41C303zdcfEht7MQnYJt5A= -+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -+gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= -+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= -+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -+gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= -+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -+gopkg.in/gcfg.v1 v1.2.0/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= -+gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= -+gopkg.in/go-playground/webhooks.v5 v5.11.0 h1:V3vej+ZXrVvO2EmBTKlhClEbpTqXH44K5OyLUMOkHMg= -+gopkg.in/go-playground/webhooks.v5 v5.11.0/go.mod h1:LZbya/qLVdbqDR1aKrGuWV6qbia2zCYSR5dpom2SInQ= -+gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= -+gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -+gopkg.in/mcuadros/go-syslog.v2 v2.2.1/go.mod h1:l5LPIyOOyIdQquNg+oU6Z3524YwrcqEm0aKH+5zpt2U= -+gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= -+gopkg.in/square/go-jose.v2 v2.2.2 h1:orlkJ3myw8CN1nVQHBFfloD+L3egixIa4FvUP6RosSA= -+gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -+gopkg.in/src-d/go-billy.v4 v4.2.1 h1:omN5CrMrMcQ+4I8bJ0wEhOBPanIRWzFC953IiXKdYzo= -+gopkg.in/src-d/go-billy.v4 v4.2.1/go.mod h1:tm33zBoOwxjYHZIE+OV8bxTWFMJLrconzFMd38aARFk= -+gopkg.in/src-d/go-git-fixtures.v3 v3.1.1 h1:XWW/s5W18RaJpmo1l0IYGqXKuJITWRFuA45iOf1dKJs= -+gopkg.in/src-d/go-git-fixtures.v3 v3.1.1/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g= -+gopkg.in/src-d/go-git.v4 v4.9.1 h1:0oKHJZY8tM7B71378cfTg2c5jmWyNlXvestTT6WfY+4= -+gopkg.in/src-d/go-git.v4 v4.9.1/go.mod h1:Vtut8izDyrM8BUVQnzJ+YvmNcem2J89EmfZYCkLokZk= -+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= -+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -+gopkg.in/warnings.v0 v0.1.1/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= -+gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= -+gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= -+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -+gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= -+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -+gotest.tools v2.1.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= -+gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= -+gotest.tools/gotestsum v0.3.5/go.mod h1:Mnf3e5FUzXbkCfynWBGOwLssY7gTQgCHObK9tMpAriY= -+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -+honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -+honnef.co/go/tools v0.0.1-2019.2.2/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -+k8s.io/api v0.0.0-20200131112707-d64dbec685a4 h1:7kA/ATNKWB1TVM0pwxzl/JONybbBVROCxqndoCd57fU= -+k8s.io/api v0.0.0-20200131112707-d64dbec685a4/go.mod h1:SGkmWEIoDg63In+t6yMJLEXQSkK5XxTNDcVydoy58dc= -+k8s.io/apiextensions-apiserver v0.0.0-20200208193839-84fe3c0be50e h1:L/XqOouONrybm+3jyUJZPo5JIMARb5qFNfmmUqy81Eg= -+k8s.io/apiextensions-apiserver v0.0.0-20200208193839-84fe3c0be50e/go.mod h1:YzEcimsSKeVDDQnLTI9Qf8uws94WpMl4qut8Rbx4dVk= -+k8s.io/apimachinery v0.16.7-beta.0.0.20200131112342-0c9ec93240c9 h1:pusQlPC9d40F13jjdYyJDFDwnUjCTDN5P/y5WteLVkA= -+k8s.io/apimachinery v0.16.7-beta.0.0.20200131112342-0c9ec93240c9/go.mod h1:Xk2vD2TRRpuWYLQNM6lT9R7DSFZUYG03SarNkbGrnKE= -+k8s.io/apiserver v0.0.0-20200208192130-2d005a048922 h1:kgU/Yr5/GsGK3GAaFgmSp+y0IMLu+FoZK+wnKlgzIrQ= -+k8s.io/apiserver v0.0.0-20200208192130-2d005a048922/go.mod h1:kcWyL8/bV2c1b/FeWrxbO08zraTaYuhR7leZ4l9iOmo= -+k8s.io/cli-runtime v0.0.0-20200131120220-9674fbb91442 h1:gHF/ZIm6hTWAuN/rKdH1IO/iJfKPjn0d1kdeIMbPiDg= -+k8s.io/cli-runtime v0.0.0-20200131120220-9674fbb91442/go.mod h1:sL3otDuOz8AlMrzsrBeB/ektmi6qYAE4a9Gid/pxtSo= -+k8s.io/client-go v0.0.0-20191016111102-bec269661e48 h1:C2XVy2z0dV94q9hSSoCuTPp1KOG7IegvbdXuz9VGxoU= -+k8s.io/client-go v0.0.0-20191016111102-bec269661e48/go.mod h1:hrwktSwYGI4JK+TJA3dMaFyyvHVi/aLarVHpbs8bgCU= -+k8s.io/cloud-provider v0.0.0-20200131203752-f498d522efeb/go.mod h1:hb9XI7OCOFjqueeUaUYHbEuGG/nSq0UZtydmOu83p6M= -+k8s.io/cluster-bootstrap v0.0.0-20200131121422-fc6110069b18/go.mod h1:2U3dLDmef+EIuACENgQ1f8jQV//Z+aX/bp9DsglDXK0= -+k8s.io/code-generator v0.16.7-beta.0.0.20200131112027-a3045e5e55c0/go.mod h1:wFdrXdVi/UC+xIfLi+4l9elsTT/uEF61IfcN2wOLULQ= -+k8s.io/component-base v0.0.0-20200131113804-409d4deb41dd h1:W0AuOSSgValfdhcR68oayHewqFJh/nMA+JDPQbXGrkg= -+k8s.io/component-base v0.0.0-20200131113804-409d4deb41dd/go.mod h1:55xG5ozAlA2bbjfmFYC2LPf4cQqp4nOJT5e4+cXUDnY= -+k8s.io/cri-api v0.16.8-beta.0/go.mod h1:W6aMMPN5fmxcRGaHnb6BEfoTeS82OsJcsUJyKf+EWYc= -+k8s.io/csi-translation-lib v0.0.0-20200131121824-f033562d74c3/go.mod h1:2NVc4Xw5CEBgQj3/GtHOKPs5M68nhbszaFFuoB+xGUE= -+k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -+k8s.io/heapster v1.2.0-beta.1/go.mod h1:h1uhptVXMwC8xtZBYsPXKVi8fpdlYkTs6k949KozGrM= -+k8s.io/klog v0.4.0 h1:lCJCxf/LIowc2IGS9TPjWDyXY4nOmdGdfcwwDQCOURQ= -+k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= -+k8s.io/kube-aggregator v0.0.0-20200208192621-0eeb50407007 h1:PqWgdqcu7/ZAno0sqGoqo3eC/qhwnz+XTotZfG+84ic= -+k8s.io/kube-aggregator v0.0.0-20200208192621-0eeb50407007/go.mod h1:u6psj4FzpmwlJuQKReXypLOIhIF2UxzZRBThWtnjIDU= -+k8s.io/kube-controller-manager v0.0.0-20200131121224-13b3f231e47d/go.mod h1:rlvqwtZiupLrqd54U19Th2a0sMf0PNbGA1J3zPTwFAc= -+k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf h1:EYm5AW/UUDbnmnI+gK0TJDVK9qPLhM+sRHYanNKw0EQ= -+k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= -+k8s.io/kube-proxy v0.0.0-20200131120626-5b8ba5e54e1f/go.mod h1:3/a8cJm4V50vBnkRwRhpgdIdsTH+4cj/kV66oxybGxc= -+k8s.io/kube-scheduler v0.0.0-20200131121024-5f0ba0866863/go.mod h1:1xme9q7fNwDPtgIELmyOFGQErlOzFlQ1XHjTPUz1GYc= -+k8s.io/kubectl v0.0.0-20200131122652-b28c9fbca10f h1:7764TWFJ+UYY6TX1Vq3jCo/3BkORLtywarY8SEdQh18= -+k8s.io/kubectl v0.0.0-20200131122652-b28c9fbca10f/go.mod h1:d78MZ7MR2Q5xMwSrGvbJARH13CsOo5mSoDZWfjIe1TQ= -+k8s.io/kubelet v0.0.0-20200131120825-905bd8eea4c4/go.mod h1:VkwV80jJy9GciSRBPFduby5qJxI5v5lV3D6WMMCveek= -+k8s.io/kubernetes v0.0.0-20191207011953-bfafae8f1c2f h1:bGmDtZ96ysKXeBFw0+9cw9twoCQjrPRkkpSQqhxEXVs= -+k8s.io/kubernetes v0.0.0-20191207011953-bfafae8f1c2f/go.mod h1:OdJXH1Q9L+NDVj158Zo8f6R3NSaOx1ewLUcaJv8hSRE= -+k8s.io/legacy-cloud-providers v0.0.0-20200208200602-3a1c7effd2b3/go.mod h1:Egd+aHCesdnzDDtUaaWnAhnyt5/dgQIfM4UL5z2WJxg= -+k8s.io/metrics v0.0.0-20200131120008-5c623d74062d/go.mod h1:18pR44uxuhPU05LZpHhJiPPzQvGoFmCf2UlTp2EhSM8= -+k8s.io/repo-infra v0.0.0-20181204233714-00fe14e3d1a3/go.mod h1:+G1xBfZDfVFsm1Tj/HNCvg4QqWx8rJ2Fxpqr1rqp/gQ= -+k8s.io/sample-apiserver v0.0.0-20200208192953-f8dc80bbc173/go.mod h1:Bnw1dM0HuYH49aVse0I8cV6KeyOFPBaWxnhsU7uR2UA= -+k8s.io/utils v0.0.0-20190801114015-581e00157fb1 h1:+ySTxfHnfzZb9ys375PXNlLhkJPLKgHajBU0N62BDvE= -+k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= -+layeh.com/gopher-json v0.0.0-20190114024228-97fed8db8427 h1:RZkKxMR3jbQxdCEcglq3j7wY3PRJIopAwBlx1RE71X0= -+layeh.com/gopher-json v0.0.0-20190114024228-97fed8db8427/go.mod h1:ivKkcY8Zxw5ba0jldhZCYYQfGdb2K6u9tbYK1AwMIBc= -+modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= -+modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= -+modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= -+modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= -+modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= -+sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0= -+sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU= -+sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= -+sigs.k8s.io/structured-merge-diff v1.0.2/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA= -+sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= -+sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= -+vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI= From 3bf8df2877f0eb0bdbd265c8aa96dbd3db8f1e8e Mon Sep 17 00:00:00 2001 From: Luz Date: Thu, 5 Nov 2020 19:14:58 +0100 Subject: [PATCH 283/299] librepcb: 0.1.4 -> 0.1.5 --- .../applications/science/electronics/librepcb/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index de01b095e38..494a5cf2931 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -1,15 +1,15 @@ { lib, mkDerivation, fetchFromGitHub, qtbase, qttools, qmake, wrapQtAppsHook }: -mkDerivation { +mkDerivation rec { pname = "librepcb"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "LibrePCB"; repo = "LibrePCB"; fetchSubmodules = true; - rev = "ae04eef5a71b5ba66ae2cee6b631c1c933ace535"; - sha256 = "0wk5qny1jb6n4mwyyrs7syir3hmwxlwazcd80bpxharmsj7p0rzc"; + rev = version; + sha256 = "0ag8h3id2c1k9ds22rfrvyhf2vjhkv82xnrdrz4n1hnlr9566vcx"; }; enableParallelBuilding = true; From 947d21ca71330925a23d3a84b4ec8cd9a1c64fe2 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Thu, 5 Nov 2020 09:09:15 -0600 Subject: [PATCH 284/299] lazygit: 0.23.6 -> 0.23.7 --- pkgs/development/tools/lazygit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index 65c3a194897..f92eaf3ebf8 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazygit"; - version = "0.23.6"; + version = "0.23.7"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "0afs3h8npbzmcrzm6kzfdva5id3zyifhhsh7zgyrxkmw60qhl498"; + sha256 = "05s0rj785dm9dqr30ak5hi26qy0z2w71zljyln5is4frckxkcvng"; }; vendorSha256 = null; From 6780f45bc16ff03cb110bc56448424b4cf483871 Mon Sep 17 00:00:00 2001 From: Sebastien Braun Date: Thu, 5 Nov 2020 15:12:30 +0100 Subject: [PATCH 285/299] elixir_1_11: 1.11.1 -> 1.11.2 --- pkgs/development/interpreters/elixir/1.11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/elixir/1.11.nix b/pkgs/development/interpreters/elixir/1.11.nix index 3dcd8c19ba8..8f9d869abf3 100644 --- a/pkgs/development/interpreters/elixir/1.11.nix +++ b/pkgs/development/interpreters/elixir/1.11.nix @@ -3,7 +3,7 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz mkDerivation { - version = "1.11.1"; - sha256 = "0czyv98sq9drlvdwv3gw9vnhn8qa3va4xh5vdqpg7m6b93l1r3p1"; + version = "1.11.2"; + sha256 = "0b4nfgxhmi4gwba9h9k103zrkpbxxvk0gmdl0ggrd5xlg6v288ky"; minimumOTPVersion = "21"; } From 286a2017865ab4bf3241cfffa7fed2e3af0ce160 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 5 Nov 2020 01:35:49 +0000 Subject: [PATCH 286/299] wireshark: 3.2.7 -> 3.4.0 https://www.wireshark.org/docs/relnotes/wireshark-3.2.8.html https://www.wireshark.org/docs/relnotes/wireshark-3.4.0.html --- pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index e9f676eae55..d906b445900 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,7 +10,7 @@ assert withQt -> qt5 != null; with stdenv.lib; let - version = "3.2.7"; + version = "3.4.0"; variant = if withQt then "qt" else "cli"; pcap = libpcap.override { withBluez = stdenv.isLinux; }; @@ -21,7 +21,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "1nkhglzxj05hwhgzrgan4glv0z67rmasf9djx1dmqicwdnw2z0xy"; + sha256 = "1bm8jj2rviis9j9l6nixvhxcfx362y9iphkxssgmiz2kj6yypr37"; }; cmakeFlags = [ From 1c9efa61b4ea26ef4c9500050bc839611a185a47 Mon Sep 17 00:00:00 2001 From: Masanori Ogino <167209+omasanori@users.noreply.github.com> Date: Thu, 5 Nov 2020 05:32:28 +0900 Subject: [PATCH 287/299] mrsh: 2020-07-27 -> 2020-11-04 Reference: https://github.com/emersion/mrsh/compare/0da902c0ee...1738e41b2a Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com> --- pkgs/shells/mrsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/mrsh/default.nix b/pkgs/shells/mrsh/default.nix index cc7e3e27be6..c72f23c143b 100644 --- a/pkgs/shells/mrsh/default.nix +++ b/pkgs/shells/mrsh/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mrsh"; - version = "2020-07-27"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "emersion"; repo = "mrsh"; - rev = "0da902c0ee6f443fe703498e60f266af7f12537e"; - sha256 = "1yr09ln5p1s48aj8xv2d6dy0pahqvd86fkiwyc6zrjfq80igxf05"; + rev = "1738e41b2a35e5f99b9a1300a5f687478458226a"; + sha256 = "08gak5261d4sd6b2w2kscmdwa4gwcp5drgfyb3swyrj9cl0nlcbn"; }; nativeBuildInputs = [ meson ninja pkgconfig ]; From 0f6b72ead8fb92a0f000c34de42fdeb32e45f66b Mon Sep 17 00:00:00 2001 From: freezeboy Date: Wed, 4 Nov 2020 13:49:19 +0100 Subject: [PATCH 288/299] elisa: build requires Qt5.14 --- pkgs/applications/kde/elisa.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/kde/elisa.nix b/pkgs/applications/kde/elisa.nix index bd2cd529473..9a51aa786fa 100644 --- a/pkgs/applications/kde/elisa.nix +++ b/pkgs/applications/kde/elisa.nix @@ -3,6 +3,7 @@ , lib , extra-cmake-modules , kdoctools +, qtbase , qtmultimedia , qtquickcontrols2 , qtwebsockets @@ -42,5 +43,6 @@ mkDerivation rec { description = "A simple media player for KDE"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; + broken = lib.versionOlder qtbase.version "5.14"; }; } From 0c441e26d0866b1fc8a1694fe548e8d6fe274fbd Mon Sep 17 00:00:00 2001 From: freezeboy Date: Wed, 4 Nov 2020 13:49:32 +0100 Subject: [PATCH 289/299] kwave: build requires Qt5.14 --- pkgs/applications/kde/kwave.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/kwave.nix b/pkgs/applications/kde/kwave.nix index 78a3d9ab4a5..1a831c7c8dd 100644 --- a/pkgs/applications/kde/kwave.nix +++ b/pkgs/applications/kde/kwave.nix @@ -1,14 +1,17 @@ -{ mkDerivation, lib, extra-cmake-modules, kdoctools, qtmultimedia, kcompletion, kconfig, kcrash, kiconthemes, kio, audiofile, libsamplerate -, alsaLib, libpulseaudio, flac, id3lib, libogg, libmad, libopus, libvorbis, fftw, librsvg }: +{ mkDerivation, lib, extra-cmake-modules, kdoctools, qtmultimedia, kcompletion, kconfig +, kcrash, kiconthemes, kio, audiofile, libsamplerate, alsaLib, libpulseaudio, flac, id3lib +, libogg, libmad, libopus, libvorbis, fftw, librsvg, qtbase }: mkDerivation { name = "kwave"; + meta = with lib; { homepage = "https://kde.org/applications/en/multimedia/org.kde.kwave"; description = "A simple media player"; maintainers = with maintainers; [ freezeboy ]; license = licenses.gpl2Plus; platforms = platforms.linux; + broken = lib.versionOlder qtbase.version "5.14"; }; nativeBuildInputs = [ extra-cmake-modules From 4039c1125560a0a09be255965b5024c4de57cb4f Mon Sep 17 00:00:00 2001 From: freezeboy Date: Wed, 4 Nov 2020 13:49:42 +0100 Subject: [PATCH 290/299] minuet: build requires Qt5.14 --- pkgs/applications/kde/minuet.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/kde/minuet.nix b/pkgs/applications/kde/minuet.nix index cd98d56b86d..2c0f0a5092d 100644 --- a/pkgs/applications/kde/minuet.nix +++ b/pkgs/applications/kde/minuet.nix @@ -1,4 +1,4 @@ -{ mkDerivation +{ mkDerivation, qtbase , lib, extra-cmake-modules, gettext, python , drumstick, fluidsynth , kcoreaddons, kcrash, kdoctools @@ -10,6 +10,7 @@ mkDerivation { meta = with lib; { license = with licenses; [ lgpl21 gpl3 ]; maintainers = with maintainers; [ peterhoeg HaoZeke ]; + broken = lib.versionOlder qtbase.version "5.14"; }; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python qtdeclarative ]; From 10af77af13f7fb9865b68fe3b57ad70802bc0294 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 4 Nov 2020 09:33:35 +0000 Subject: [PATCH 291/299] qgis: 3.10.10 -> 3.10.11 --- pkgs/applications/gis/qgis/unwrapped.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index da66b0d9d25..13990c33875 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -10,7 +10,7 @@ let [ qscintilla-qt5 gdal jinja2 numpy psycopg2 chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ]; in mkDerivation rec { - version = "3.10.10"; + version = "3.10.11"; pname = "qgis"; name = "${pname}-unwrapped-${version}"; @@ -18,7 +18,7 @@ in mkDerivation rec { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "yZBG+bpJA7iKkUEjVo45d+bmRp9WS7mk8z96FLf0ZQ0="; + sha256 = "157hwi9sgnsf0csbfg4x3c7vh0zgf1hnqgn04lhg9xa1n8jjbv2q"; }; passthru = { From b2a20c2a5158db6840f6efb944999b92337e040c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Nov 2020 13:46:23 +0100 Subject: [PATCH 292/299] nats-server: 2.1.7 -> 2.1.9 Fixes: CVE-2020-26521, CVE-2020-26892 --- pkgs/servers/nats-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index b0ae2ebc2dc..d24fe89cc48 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { pname = "nats-server"; - version = "2.1.7"; + version = "2.1.9"; goPackagePath = "github.com/nats-io/${pname}"; @@ -12,7 +12,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "08wqaqar964p9adc0ma8dqg0rf88rylk1m2mddlbbqmd6l4h6m27"; + sha256 = "0y92isca1dlvprik0lbiz8ny1w84svy4zn73brqhzrkxnqppcxi2"; }; meta = { From d1de45ad619be065294fdd9692a268ea1863b083 Mon Sep 17 00:00:00 2001 From: Sandro Date: Tue, 3 Nov 2020 00:52:05 +0100 Subject: [PATCH 293/299] fluent-bit: fix build on darwin --- pkgs/tools/misc/fluent-bit/default.nix | 2 ++ pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 51b58a8102d..0f67ab84d44 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake flex bison ]; + patches = [ ./fix-luajit-darwin.patch ]; + postPatch = '' substituteInPlace src/CMakeLists.txt \ --replace /lib/systemd $out/lib/systemd diff --git a/pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch b/pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch new file mode 100644 index 00000000000..21d9c21f5b9 --- /dev/null +++ b/pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch @@ -0,0 +1,14 @@ +diff -Naur fluent-bit.old/cmake/luajit.cmake fluent-bit.new/cmake/luajit.cmake +--- fluent-bit.old/cmake/luajit.cmake ++++ fluent-bit.new/cmake/luajit.cmake +@@ -11,10 +11,6 @@ + set(LUAJIT_SRC ${CMAKE_CURRENT_SOURCE_DIR}/${FLB_PATH_LIB_LUAJIT}) + set(LUAJIT_DEST ${CMAKE_CURRENT_BINARY_DIR}) + +-if (CMAKE_SYSTEM_NAME MATCHES "Darwin") +- set(CFLAGS "${CFLAGS} -isysroot ${CMAKE_OSX_SYSROOT}") +-endif() +- + # luajit (UNIX) + # ============= + ExternalProject_Add(luajit From 734434c1d8e599ede444bf1e058ab3eba0fd7305 Mon Sep 17 00:00:00 2001 From: Diego Rodriguez Date: Mon, 2 Nov 2020 12:56:20 -0700 Subject: [PATCH 294/299] minikube: 1.14.1 -> 1.14.2 --- pkgs/applications/networking/cluster/minikube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 299c1fb523c..134d25ae678 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { pname = "minikube"; - version = "1.14.1"; + version = "1.14.2"; vendorSha256 = "057mlmja3mygfdf0cp0bcm0chq7s30bjcs5hqacwl6c79ivrjf89"; @@ -21,7 +21,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "000i30qsjx1h2x6b8vb5piq9lhjrz5hj9wza7gxsrzsf2z9rhryg"; + sha256 = "1fidvfm9x3rbqfjn9zm5kx9smk94dmjm4gb98rrdmgsld5fg99xj"; }; nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; From 4365578bdf945936e9c8eefc46614ccadf0e32b8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 05:57:01 +0000 Subject: [PATCH 295/299] groovy: 3.0.3 -> 3.0.6 --- pkgs/development/interpreters/groovy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 97e997bdd69..d075eb4e3f1 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "groovy"; - version = "3.0.3"; + version = "3.0.6"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "0xdm70b61pdj8z3g08az16y9b6cpz5hv7iwvwfyfyxrjdi47h419"; + sha256 = "1wimpcg4nyxykbkh407d7h0b828vmrf7sv412mgmif57p3aw433f"; }; buildInputs = [ unzip makeWrapper ]; From 58f024530a5482759295c282acb99da8efc1ee11 Mon Sep 17 00:00:00 2001 From: Hunter Jones Date: Sun, 1 Nov 2020 13:14:33 -0600 Subject: [PATCH 296/299] indilib: 1.1.0 -> 1.8.6 --- maintainers/maintainer-list.nix | 6 +++++ .../development/libraries/indilib/default.nix | 26 ++++++++++++------- .../libraries/indilib/udev-dir.patch | 23 ++++++++-------- 3 files changed, 33 insertions(+), 22 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4bee75ed035..48f847b3d19 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3493,6 +3493,12 @@ email = "t@larkery.com"; name = "Tom Hinton"; }; + hjones2199 = { + email = "hjones2199@gmail.com"; + github = "hjones2199"; + githubId = 5525217; + name = "Hunter Jones"; + }; hkjn = { email = "me@hkjn.me"; name = "Henrik Jonsson"; diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix index fadd2657b68..212b2f743d3 100644 --- a/pkgs/development/libraries/indilib/default.nix +++ b/pkgs/development/libraries/indilib/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchurl +, fetchFromGitHub , cmake , cfitsio , libusb1 @@ -9,14 +9,18 @@ , curl , libjpeg , gsl +, fftw }: -stdenv.mkDerivation { - name = "indilib-1.1.0"; +stdenv.mkDerivation rec { + pname = "indilib"; + version = "1.8.6"; - src = fetchurl { - url = "mirror://sourceforge/indi/libindi_1.1.0.tar.gz"; - sha256 = "1bs6lkwqd4aashg93mqqkc7nrg7fbx9mdw85qs5263jqa6sr780w"; + src = fetchFromGitHub { + owner = "indilib"; + repo = "indi"; + rev = "v${version}"; + sha256 = "1yzvcm7lwhwssnvv6gp8f7igmnvs35bpidmzz6z15awm5841yw30"; }; patches = [ @@ -36,12 +40,14 @@ stdenv.mkDerivation { libnova libjpeg gsl + fftw ]; - meta = { + meta = with stdenv.lib; { homepage = "https://www.indilib.org/"; - license = stdenv.lib.licenses.lgpl2Plus; - description = "Implementaion of the INDI protocol for POSIX operating systems"; - platforms = stdenv.lib.platforms.unix; + description = "Implementation of the INDI protocol for POSIX operating systems"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ hjones2199 ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/libraries/indilib/udev-dir.patch b/pkgs/development/libraries/indilib/udev-dir.patch index 0f497419e70..70168001291 100644 --- a/pkgs/development/libraries/indilib/udev-dir.patch +++ b/pkgs/development/libraries/indilib/udev-dir.patch @@ -1,12 +1,11 @@ -diff -Naur libindi-1.0.0-upstream/CMakeLists.txt libindi-1.0.0/CMakeLists.txt ---- libindi-1.0.0-upstream/CMakeLists.txt 2015-03-28 21:06:49.576863460 -0430 -+++ libindi-1.0.0/CMakeLists.txt 2015-03-28 21:07:48.420677548 -0430 -@@ -28,7 +28,7 @@ - ## the following are directories where stuff will be installed to - set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/") - set(PKGCONFIG_INSTALL_PREFIX "${LIB_DESTINATION}/pkgconfig/") --set(UDEVRULES_INSTALL_DIR "/lib/udev/rules.d" CACHE STRING "Base directory for udev rules") -+set(UDEVRULES_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/udev/rules.d" CACHE STRING "Base directory for udev rules") - - ################## Includes ################################ - Include (CheckCXXSourceCompiles) +--- indi-1.8.6/CMakeLists.txt 2020-08-21 05:56:59.000000000 -0500 ++++ CMakeLists.txt 2020-11-01 12:50:57.621293870 -0600 +@@ -77,7 +77,7 @@ + ## the following are directories where stuff will be installed to + set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/") + set(PKGCONFIG_INSTALL_PREFIX "${CMAKE_INSTALL_LIBDIR}/pkgconfig/") +-set(UDEVRULES_INSTALL_DIR "/lib/udev/rules.d" CACHE STRING "Base directory for udev rules") ++set(UDEVRULES_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/udev/rules.d" CACHE STRING "Base directory for udev rules") + + set(PKG_CONFIG_LIBDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) + From 5041cbc69114ddb049997f84afb20fa00d7211e5 Mon Sep 17 00:00:00 2001 From: Hunter Jones Date: Mon, 2 Nov 2020 18:34:55 -0600 Subject: [PATCH 297/299] kstars: 2.9.8 -> 3.4.3 --- .../science/astronomy/kstars/default.nix | 37 ++++++++------ .../science/astronomy/kstars/indi-fix.patch | 50 +++++++++++++++++++ 2 files changed, 72 insertions(+), 15 deletions(-) create mode 100644 pkgs/applications/science/astronomy/kstars/indi-fix.patch diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix index 0b53e3e85ac..fde8df61048 100644 --- a/pkgs/applications/science/astronomy/kstars/default.nix +++ b/pkgs/applications/science/astronomy/kstars/default.nix @@ -1,27 +1,30 @@ { - mkDerivation, lib, fetchgit, - extra-cmake-modules, + stdenv, extra-cmake-modules, fetchurl, kconfig, kdoctools, kguiaddons, ki18n, kinit, kiconthemes, kio, - knewstuff, kplotting, kwidgetsaddons, kxmlgui, + knewstuff, kplotting, kwidgetsaddons, kxmlgui, wrapQtAppsHook, qtx11extras, qtwebsockets, eigen, zlib, - cfitsio, indilib, xplanet + cfitsio, indilib, xplanet, libnova, gsl }: -mkDerivation { - name = "kstars"; - - src = fetchgit { - url = "https://anongit.kde.org/kstars.git"; - rev = "7acc527939280edd22823371dc4e22494c6c626a"; - sha256 = "1n1lgi7p3dj893fdnzjbnrha40p4apl0dy8zppcabxwrb1khb84v"; +stdenv.mkDerivation rec { + pname = "kstars"; + version = "3.4.3"; + + src = fetchurl { + url = "https://mirrors.mit.edu/kde/stable/kstars/kstars-${version}.tar.xz"; + sha256 = "0j5yxg6ay6sic194skz6vjzg6yvrpb3gvypvs0frjrcjbsl1j4f8"; }; - - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + + patches = [ + ./indi-fix.patch + ]; + + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapQtAppsHook ]; buildInputs = [ kconfig kdoctools kguiaddons ki18n kinit kiconthemes kio knewstuff kplotting kwidgetsaddons kxmlgui @@ -30,10 +33,14 @@ mkDerivation { eigen zlib - cfitsio indilib xplanet + cfitsio indilib xplanet libnova gsl ]; - meta = with lib; { + cmakeFlags = [ + "-DINDI_NIX_ROOT=${indilib}" + ]; + + meta = with stdenv.lib; { description = "Virtual planetarium astronomy software"; homepage = "https://kde.org/applications/education/org.kde.kstars"; longDescription = '' diff --git a/pkgs/applications/science/astronomy/kstars/indi-fix.patch b/pkgs/applications/science/astronomy/kstars/indi-fix.patch new file mode 100644 index 00000000000..9ff9f8a31dd --- /dev/null +++ b/pkgs/applications/science/astronomy/kstars/indi-fix.patch @@ -0,0 +1,50 @@ +--- CMakeLists.txt 2020-11-02 13:58:06.119743710 -0600 ++++ kstars-3.4.3/CMakeLists.txt 2020-11-02 14:05:01.707799274 -0600 +@@ -4,5 +4,7 @@ + set (KStars_VERSION_REVISION 3) + set (CMAKE_CXX_STANDARD 11) + ++add_definitions(-DINDI_NIX_ROOT=${INDI_NIX_ROOT}) ++ + # Build KStars Lite with -DBUILD_KSTARS_LITE=ON + option(BUILD_KSTARS_LITE "Build KStars Lite" OFF) + +--- ksutils.cpp 2020-11-02 13:47:44.883596916 -0600 ++++ kstars-3.4.3/kstars/auxiliary/ksutils.cpp 2020-11-02 17:41:44.961937090 -0600 +@@ -1076,6 +1076,9 @@ + { + QString snap = QProcessEnvironment::systemEnvironment().value("SNAP"); + QString flat = QProcessEnvironment::systemEnvironment().value("FLATPAK_DEST"); ++#define STR_EXPAND(x) #x ++#define STR(x) STR_EXPAND(x) ++ QString nix = QString(STR(INDI_NIX_ROOT)); + + if (option == "fitsDir") + { +@@ -1089,7 +1091,7 @@ + if (flat.isEmpty() == false) + return flat + "/bin/indiserver"; + else +- return snap + "/usr/bin/indiserver"; ++ return nix + "/bin/indiserver"; + } + else if (option == "INDIHubAgent") + { +@@ -1099,7 +1101,7 @@ + if (flat.isEmpty() == false) + return flat + "/bin/indihub-agent"; + else +- return snap + "/usr/bin/indihub-agent"; ++ return nix + "/bin/indihub-agent"; + } + else if (option == "indiDriversDir") + { +@@ -1109,7 +1111,7 @@ + if (flat.isEmpty() == false) + return flat + "/share/indi"; + else +- return snap + "/usr/share/indi"; ++ return nix + "/share/indi"; + #else + return QStandardPaths::locate(QStandardPaths::GenericDataLocation, "indi", QStandardPaths::LocateDirectory); + #endif From d52578bd31f0c73666749328054f52e13d9d2d26 Mon Sep 17 00:00:00 2001 From: oxalica Date: Mon, 9 Nov 2020 20:33:23 +0800 Subject: [PATCH 298/299] rust-analyzer: fix update script with unstable nix --- pkgs/development/tools/rust/rust-analyzer/update.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/update.sh b/pkgs/development/tools/rust/rust-analyzer/update.sh index b0435be7208..f08ea67cf22 100755 --- a/pkgs/development/tools/rust/rust-analyzer/update.sh +++ b/pkgs/development/tools/rust/rust-analyzer/update.sh @@ -24,24 +24,24 @@ echo "$old_rev -> $rev" sha256=$(nix-prefetch -f "$nixpkgs" rust-analyzer-unwrapped.src --rev "$rev") # Clear cargoSha256 to avoid inconsistency. -sed -e "s/rev = \".*\"/rev = \"$rev\"/" \ - -e "s/sha256 = \".*\"/sha256 = \"$sha256\"/" \ - -e "s/cargoSha256 = \".*\"/cargoSha256 = \"\"/" \ +sed -e "s#rev = \".*\"#rev = \"$rev\"#" \ + -e "s#sha256 = \".*\"#sha256 = \"$sha256\"#" \ + -e "s#cargoSha256 = \".*\"#cargoSha256 = \"\"#" \ --in-place ./default.nix node_src="$(nix-build "$nixpkgs" -A rust-analyzer.src --no-out-link)/editors/code" # Check vscode compatibility req_vscode_ver="$(jq '.engines.vscode' "$node_src/package.json" --raw-output)" req_vscode_ver="${req_vscode_ver#^}" -cur_vscode_ver="$(nix eval --raw -f "$nixpkgs" vscode.version)" -if [[ "$(nix eval "(builtins.compareVersions \"$req_vscode_ver\" \"$cur_vscode_ver\")")" -gt 0 ]]; then +cur_vscode_ver="$(nix-instantiate --eval --strict "$nixpkgs" -A vscode.version | tr -d '"')" +if [[ "$(nix-instantiate --eval --strict -E "(builtins.compareVersions \"$req_vscode_ver\" \"$cur_vscode_ver\")")" -gt 0 ]]; then echo "vscode $cur_vscode_ver is incompatible with the extension requiring ^$req_vscode_ver" exit 1 fi echo "Prebuilding for cargoSha256" cargo_sha256=$(nix-prefetch "{ sha256 }: (import $nixpkgs {}).rust-analyzer-unwrapped.cargoDeps.overrideAttrs (_: { outputHash = sha256; })") -sed "s/cargoSha256 = \".*\"/cargoSha256 = \"$cargo_sha256\"/" \ +sed "s#cargoSha256 = \".*\"#cargoSha256 = \"$cargo_sha256\"#" \ --in-place ./default.nix # Update vscode extension From 4894ffd62022b10a6c52b1623d7b389507407cfd Mon Sep 17 00:00:00 2001 From: oxalica Date: Mon, 9 Nov 2020 20:33:37 +0800 Subject: [PATCH 299/299] rust-analyzer: 2020-11-02 -> 2020-11-09 --- pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index b77ff811c70..a398b7e504d 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2020-11-02"; + rev = "2020-11-09"; version = "unstable-${rev}"; - sha256 = "1f64286ywsjw9s8kai3jw2dqnqswm2vnms6ilxx1x706mridxjv0"; - cargoSha256 = "0q53w43gag2pfb20jywikdbac291rvr1zmjnmwq462m5wfz0w127"; + sha256 = "sha256-SX9dvx2JtYZBxA3+dHQKX/jrjbAMy37/SAybDjlYcSs="; + cargoSha256 = "sha256-+td+wMmI+MyGz9oPC+SPO2TmAV0+3lOORNY7xf6s3vI="; }; rust-analyzer = callPackage ./wrapper.nix {} {