From 6a6f02a25c8d471578d5e8401f1aadbc67242fd5 Mon Sep 17 00:00:00 2001 From: Jacquin Mininger Date: Sun, 30 Aug 2020 15:32:10 -0400 Subject: [PATCH 01/69] adobe-reader: add gkd-pixbuf-xlib based on issue: #96683 --- pkgs/applications/misc/adobe-reader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index b67e514ce54..31e950186df 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk2, glib -, gdk-pixbuf }: +, gdk-pixbuf, gdk-pixbuf-xlib }: assert stdenv.hostPlatform.system == "i686-linux"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { # versions. libPath = stdenv.lib.makeLibraryPath - [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk-pixbuf ]; + [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk-pixbuf gdk-pixbuf-xlib ]; passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux"; From 69027b0c95f1c6573171e96acfee14bd1e9a46e1 Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Tue, 1 Sep 2020 23:41:10 +0200 Subject: [PATCH 02/69] netbeans: 12.0 -> 12.1 --- pkgs/applications/editors/netbeans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 7a5630bb9ba..718b1b8dcb6 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -3,7 +3,7 @@ }: let - version = "12.0"; + version = "12.1"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip"; - sha512 = "91030c9628a08acd85f1a58a7f71eec2e57dc85841c1c475cc6311335b5d8cdc10c1198274b9668b7f61a28d04b07661247dc1c3e36b8e29214aec3748e499e4"; + sha512 = "ad4bb5b191c784ed144b0b4831a8b95e0707c362917833c279d3f6fad11d7b3fb1f004f30121a941b694fc2ce323974b15072aa31cb5449111bc5d33d0d77103"; }; buildCommand = '' From 0e79ce07517f0553abeff40abd052af6e3f4bf96 Mon Sep 17 00:00:00 2001 From: Evils Date: Thu, 3 Sep 2020 14:53:46 +0200 Subject: [PATCH 03/69] openocd: 0.10.0 -> 2020-09-02 latest release is 3.5 years old but the project is still active --- .../tools/misc/openocd/default.nix | 34 ++++++------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 0d6bcd959eb..47212e9967d 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -1,24 +1,17 @@ -{ stdenv, lib, fetchurl, fetchpatch, libftdi1, libusb1, pkgconfig, hidapi }: +{ stdenv, lib, fetchgit, libftdi1, libusb1, pkgconfig, hidapi, autoreconfHook }: stdenv.mkDerivation rec { pname = "openocd"; - version = "0.10.0"; + version = "2020-09-02"; - src = fetchurl { - url = "mirror://sourceforge/openocd/openocd-${version}.tar.bz2"; - sha256 = "1bhn2c85rdz4gf23358kg050xlzh7yxbbwmqp24c0akmh3bff4kk"; + src = fetchgit { + url = "https://git.code.sf.net/p/openocd/code"; + rev = "d46f28c2ea2611f5fbbc679a5eed253d3dcd2fe3"; + sha256 = "1256qqhn3pxmijfk1x0y5b5kc5ar88ivykkvx0h1m7pdwqfs6zm9"; + fetchSubmodules = true; }; - patches = [ - # Fix FTDI channel configuration for SheevaPlug - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=837989 - (fetchpatch { - url = "https://salsa.debian.org/electronics-team/openocd/raw/9a94335daa332a37a51920f87afbad4d36fad2d5/debian/patches/fix-sheeva.patch"; - sha256 = "01x021fagwvgxdpzk7psap7ryqiya4m4mi4nqr27asbmb3q46g5r"; - }) - ]; - - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ libftdi1 libusb1 hidapi ]; configureFlags = [ @@ -34,14 +27,9 @@ stdenv.mkDerivation rec { "--enable-remote-bitbang" ]; - NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ - "-Wno-implicit-fallthrough" - "-Wno-format-truncation" - "-Wno-format-overflow" - "-Wno-error=tautological-compare" - "-Wno-error=array-bounds" + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=cpp" - ]); + ]; postInstall = lib.optionalString stdenv.isLinux '' mkdir -p "$out/etc/udev/rules.d" @@ -64,7 +52,7 @@ stdenv.mkDerivation rec { "remote target" for source-level debugging of embedded systems using the GNU GDB program. ''; - homepage = "http://openocd.sourceforge.net/"; + homepage = "https://openocd.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ bjornfor ]; platforms = platforms.unix; From 10abcfb717babaf186fda5ddbc68a8aeba6cfd15 Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Thu, 3 Sep 2020 20:49:16 +0200 Subject: [PATCH 04/69] crcpp: init at 1.0.1.0 --- pkgs/development/libraries/crcpp/default.nix | 30 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/libraries/crcpp/default.nix diff --git a/pkgs/development/libraries/crcpp/default.nix b/pkgs/development/libraries/crcpp/default.nix new file mode 100644 index 00000000000..c26578804ba --- /dev/null +++ b/pkgs/development/libraries/crcpp/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "crcpp"; + version = "1.0.1.0"; + + src = fetchFromGitHub { + owner = "d-bahr"; + repo = "CRCpp"; + rev = "release-${version}"; + sha256 = "138w97kfxnv8rcnvggba6fcxgbgq8amikkmy3jhqfn6xzy6zaimh"; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/include + cp inc/CRC.h $out/include + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/d-bahr/CRCpp"; + description = "Easy to use and fast C++ CRC library"; + platforms = platforms.all; + maintainers = [ maintainers.ivar ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c0846b90fc..42c4b1e6588 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -962,6 +962,8 @@ in crc32c = callPackage ../development/libraries/crc32c { }; + crcpp = callPackage ../development/libraries/crcpp { }; + cudd = callPackage ../development/libraries/cudd { }; cue = callPackage ../development/tools/cue { }; From 62b3b82dbd9f19807af84f03bdf1820e87559118 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 4 Sep 2020 05:47:43 +0000 Subject: [PATCH 05/69] checksec: 2.2.2 -> 2.2.3 --- pkgs/os-specific/linux/checksec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index f94e6d72d59..5a66e536956 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "checksec"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "slimm609"; repo = "checksec.sh"; rev = version; - sha256 = "0gm438sfh84bif5d40wvaqrfl4dh3fxjvnjk9ab33al8ws3afpsj"; + sha256 = "0hw8bd7dj71m1ml9zvfab2j87jacs542z7a89nziapckmg6kmh6f"; }; patches = [ ./0001-attempt-to-modprobe-config-before-checking-kernel.patch ]; From b90e74cb8a203bf9e53ed7e51c95836537235bfe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 4 Sep 2020 06:45:04 +0000 Subject: [PATCH 06/69] checkstyle: 8.35 -> 8.36 --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 8ea63aa155e..5dba30e7663 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.35"; + version = "8.36"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "1jvm49cbwyqxmz8zb9f6wim4rnna2dg1yk95123h46vl6s5cxcc0"; + sha256 = "1f8g330akx3sdc35dgvy6kksr7y3dnnj7029qrpn745bd9fh92hh"; }; nativeBuildInputs = [ makeWrapper ]; From 145ebb7be90deb82b8566c562858b74cfc18698f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 4 Sep 2020 08:07:03 +0000 Subject: [PATCH 07/69] clevis: 13 -> 14 --- pkgs/tools/security/clevis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/clevis/default.nix b/pkgs/tools/security/clevis/default.nix index daeb5e0d39c..878e4fc9feb 100644 --- a/pkgs/tools/security/clevis/default.nix +++ b/pkgs/tools/security/clevis/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "clevis"; - version = "13"; + version = "14"; src = fetchFromGitHub { owner = "latchset"; repo = pname; rev = "v${version}"; - sha256 = "1p522jjksxmdwjjxa32z2ij1g81ygpkmcx998d07g8pb6rfnknjy"; + sha256 = "1j8id67jk3ikim2xh7vjg7j2ayrpm1a4n8v3n8r8pnr4rhqy76fd"; }; nativeBuildInputs = [ meson ninja pkgconfig asciidoc ]; From bc134692c5e7dd5640529c17cd0a0d0f314f7737 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 4 Sep 2020 09:41:46 +0000 Subject: [PATCH 08/69] crawl: 0.25.0 -> 0.25.1 --- pkgs/games/crawl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index eeb8bd7f9db..20e31c979e6 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.25.0"; + version = "0.25.1"; src = fetchFromGitHub { owner = "crawl"; repo = "crawl"; rev = version; - sha256 = "0swcl8cxz64yw8dl9macz8ar1ccwrkwz89j7s1f60inb5jlxifqm"; + sha256 = "0i1cvwzwmcb07ynz1nk2svprfhsgcqmagvj5jfzayvcb1a2ww23b"; }; # Patch hard-coded paths and remove force library builds From e82cdb4575922f911d533b79bcae6cb561d4454f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 4 Sep 2020 10:14:00 +0000 Subject: [PATCH 09/69] cutelyst: 2.11.0 -> 2.12.0 --- pkgs/development/libraries/cutelyst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix index 94d9776b54d..d5e83f0410c 100644 --- a/pkgs/development/libraries/cutelyst/default.nix +++ b/pkgs/development/libraries/cutelyst/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "cutelyst"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "cutelyst"; repo = "cutelyst"; rev = "v${version}"; - sha256 = "1c4cjzx6jkqlblcfc7pkx66py43576y6rky19j7rjiap724q2yk9"; + sha256 = "1ngacc7ackp08hajby0xvzpvnqahwm2dbxmisw7j7qs1lqrx9k3n"; }; nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; From 04b2a20122e39245bfe5136e61267fcf26c56685 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 4 Sep 2020 11:37:18 +0000 Subject: [PATCH 10/69] dolt: 0.18.3 -> 0.19.0 --- pkgs/servers/sql/dolt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index e8f9923a87b..9e4eadf72da 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.18.3"; + version = "0.19.0"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "0mgawr3nkyna22sqhskvvk7h9c8ivag959liji2qcdfwgfqp0l6z"; + sha256 = "1rfwhh62phz75kariqgpkxi4wzll1crzc34x0ybihxllpjf998zx"; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "0rqkqyvf8mjl7b62ng7vzi6as6qw3sg3lzj2mcg1aiw3h7ikr6hw"; + vendorSha256 = "1bq8z31yxff0nybzjs7jz7rg61hgqz6l2scbab7062j8whg8wybb"; doCheck = false; From 939211bfafa9c7baf1ba701e259e35d603e6794c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 4 Sep 2020 11:58:12 +0000 Subject: [PATCH 11/69] duckdb: 0.1.8 -> 0.2.1 --- pkgs/development/libraries/duckdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index 05961bce89c..dde0806add4 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.1.8"; + version = "0.2.1"; src = fetchFromGitHub { owner = "cwida"; repo = "duckdb"; rev = "v${version}"; - sha256 = "15qn967q9v23l0sgb2jqb77z4qdkyn1zwdpj4b0rd9zk5h3fzj55"; + sha256 = "18l4qdzfm8k9ggn49r3h99cbcmmq01byzkxps3pvmq8q246hb55x"; }; nativeBuildInputs = [ cmake ]; From 48ae44b3a2e1ef160fa9e8dbf8c5ce6195d0d29e Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 4 Sep 2020 22:56:43 +0100 Subject: [PATCH 12/69] pythonPackages.duckdb: patch out attempted use of git replace with `false` as its use here is pointless anyway. --- pkgs/development/python-modules/duckdb/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index c839dea3d1a..ea6dfe32fda 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -13,6 +13,13 @@ buildPythonPackage rec { pname = "duckdb"; inherit (duckdb) version src; + # build attempts to use git to figure out its own version. don't want to add + # the dependency for something pointless. + postPatch = '' + substituteInPlace scripts/package_build.py --replace \ + "'git'" "'false'" + ''; + postConfigure = '' cd tools/pythonpkg export SETUPTOOLS_SCM_PRETEND_VERSION=${version} From bbd7ba6a1cbe0606bb73bba163f81689a2863f1b Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 9 Sep 2020 20:13:57 +0200 Subject: [PATCH 13/69] linuxPackages.exfat-nofuse: 2019-09-06 -> 2020-04-15 add assertion for newer linux kernels which come with native exfat support --- pkgs/os-specific/linux/exfat/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix index 59f9c709e5f..a92754bba7d 100644 --- a/pkgs/os-specific/linux/exfat/default.nix +++ b/pkgs/os-specific/linux/exfat/default.nix @@ -3,16 +3,18 @@ # Upstream build for kernel 4.1 is broken, 3.12 and below seems to be working assert lib.versionAtLeast kernel.version "4.2" || lib.versionOlder kernel.version "4.0"; +# linux kernel above 5.7 comes with its own exfat implementation https://github.com/arter97/exfat-linux/issues/27 +assert lib.versionOlder kernel.version "5.8"; stdenv.mkDerivation rec { name = "exfat-nofuse-${version}-${kernel.version}"; - version = "2019-09-06"; + version = "2020-04-15"; src = fetchFromGitHub { - owner = "AdrianBan"; + owner = "barrybingo"; repo = "exfat-nofuse"; - rev = "5536f067373c196f152061f5000fe0032dc07c48"; - sha256 = "00mhadsv2iw8z00a6170hwbvk3afx484nn3irmd5f5kmhs34sw7k"; + rev = "297a5739cd4a942a1d814d05a9cd9b542e7b8fc8"; + sha256 = "14jahy7n6pr482fjfrlf9ck3f2rkr5ds0n5r85xdfsla37ria26d"; }; hardeningDisable = [ "pic" ]; From 90f01b1c5522347f32ad950fb198dbd9a62e1da0 Mon Sep 17 00:00:00 2001 From: Atemu Date: Wed, 9 Sep 2020 20:48:12 +0200 Subject: [PATCH 14/69] bcachefs-tools: disable tests Tests were failing because they require the bcachefs module to be loaded on the builder Many tests were skipped anyways and Bcachefs is still tested via its nixos test --- pkgs/tools/filesystems/bcachefs-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 26158b0361d..2c5cdf17c31 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { zstd lz4 python3Packages.pytest ] ++ stdenv.lib.optional fuseSupport fuse3; - doCheck = true; + doCheck = false; # needs bcachefs module loaded on builder checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" From 920441f96e44772fb955ad8067ce4894c2792717 Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 17 Aug 2020 11:53:08 +0200 Subject: [PATCH 15/69] bcachefs-tools: 2020-04-04 -> 2020-08-25 --- .../filesystems/bcachefs-tools/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 2c5cdf17c31..ee2af363a56 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils -, liburcu, zlib, libaio, zstd, lz4, valgrind, python3Packages +{ stdenv, fetchFromGitHub, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils +, liburcu, zlib, libaio, udev, zstd, lz4, valgrind, python3Packages , fuseSupport ? false, fuse3 ? null }: assert fuseSupport -> fuse3 != null; stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "2020-04-04"; + version = "2020-08-25"; - src = fetchgit { - url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "5d6e237b728cfb7c3bf2cb1a613e64bdecbd740d"; - sha256 = "1syym9k3njb0bk2mg6832cbf6r42z6y8b6hjv7dg4gmv2h7v7l7g"; + src = fetchFromGitHub { + owner = "koverstreet"; + repo = "bcachefs-tools"; + rev = "487ddeb03c574e902c5b749b4307e87e2150976a"; + sha256 = "1pcid7apxmbl9dyvxcqby3k489wi69k8pl596ddzmkw5gmhgvgid"; }; postPatch = '' @@ -29,7 +30,7 @@ stdenv.mkDerivation { buildInputs = [ libuuid libscrypt libsodium keyutils liburcu zlib libaio - zstd lz4 python3Packages.pytest + zstd lz4 python3Packages.pytest udev valgrind ] ++ stdenv.lib.optional fuseSupport fuse3; doCheck = false; # needs bcachefs module loaded on builder From 3cc3e864b3d78c73f953f912554c5d3bf18a93df Mon Sep 17 00:00:00 2001 From: Atemu Date: Wed, 9 Sep 2020 19:47:20 +0200 Subject: [PATCH 16/69] linux_testing_bcachefs: 5.3 -> 5.8 versioning scheme: major.minor.YYYY.MM.DD -> major.minor.patch-YYYY.MM.DD Makes a lot more sense imho --- .../linux/kernel/linux-testing-bcachefs.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 456913c5e6d..81dcb5d4563 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,13 +1,14 @@ -{ stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args: +{ stdenv, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args: buildLinux (args // { - version = "5.3.2020.04.04"; - modDirVersion = "5.3.0"; + version = "5.8.0-2020.09.07"; + modDirVersion = "5.8.0"; - src = fetchgit { - url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "a27d7265e75f6d65c2b972ce4ac27abfc153c230"; - sha256 = "0wnjl4xs7073d5ipcsplv5qpcxb7zpfqd5gqvh3mhqc5j3qn816x"; + src = fetchFromGitHub { + owner = "koverstreet"; + repo = "bcachefs"; + rev = "fb2821e72648f35d3cff61ac26041d634fd1dacf"; + sha256 = "0f9hx6fz27rm8h1lk9868v727klvyzcbw6hcgm5mypbfq1nqirdy"; }; extraConfig = "BCACHEFS_FS m"; From 2724f7be543ebc57a01f7fc4fa42efb0a13e24cc Mon Sep 17 00:00:00 2001 From: Calvin Kim Date: Tue, 11 Aug 2020 02:49:20 +0900 Subject: [PATCH 17/69] nbxplorer: init at 2.1.42 --- .../blockchains/nbxplorer/default.nix | 54 + .../blockchains/nbxplorer/deps.nix | 1072 +++++++++++++++++ .../blockchains/nbxplorer/update.sh | 6 + .../blockchains/nbxplorer/util/create-deps.sh | 45 + .../nbxplorer/util/update-common.sh | 51 + pkgs/top-level/all-packages.nix | 4 +- 6 files changed, 1231 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/blockchains/nbxplorer/default.nix create mode 100644 pkgs/applications/blockchains/nbxplorer/deps.nix create mode 100755 pkgs/applications/blockchains/nbxplorer/update.sh create mode 100755 pkgs/applications/blockchains/nbxplorer/util/create-deps.sh create mode 100755 pkgs/applications/blockchains/nbxplorer/util/update-common.sh diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix new file mode 100644 index 00000000000..76ca21ef9aa --- /dev/null +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -0,0 +1,54 @@ +{ lib, stdenv, fetchFromGitHub, fetchurl, linkFarmFromDrvs, makeWrapper, + dotnetPackages, dotnetCorePackages +}: + +let + deps = import ./deps.nix { + fetchNuGet = { name, version, sha256 }: fetchurl { + name = "nuget-${name}-${version}.nupkg"; + url = "https://www.nuget.org/api/v2/package/${name}/${version}"; + inherit sha256; + }; + }; + dotnetSdk = dotnetCorePackages.sdk_3_1; +in + +stdenv.mkDerivation rec { + pname = "nbxplorer"; + version = "2.1.42"; + + src = fetchFromGitHub { + owner = "dgarage"; + repo = "NBXplorer"; + rev = "v${version}"; + sha256 = "01q6n7095rrha00xs3l7igzfb9rd743z8crxa2dcz4q5srapfzpi"; + }; + + nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; + + buildPhase = '' + export HOME=$TMP/home + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + + nuget sources Add -Name tmpsrc -Source $TMP/nuget + nuget init ${linkFarmFromDrvs "deps" deps} $TMP/nuget + + dotnet restore --source $TMP/nuget NBXplorer/NBXplorer.csproj + dotnet publish --no-restore --output $out/share/$pname -c Release NBXplorer/NBXplorer.csproj + ''; + + installPhase = '' + makeWrapper $out/share/$pname/NBXplorer $out/bin/$pname \ + --set DOTNET_ROOT "${dotnetSdk}" + ''; + + dontStrip = true; + + meta = with lib; { + description = "Minimalist UTXO tracker for HD Cryptocurrency Wallets"; + maintainers = with maintainers; [ kcalvinalvin earvstedt ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/blockchains/nbxplorer/deps.nix b/pkgs/applications/blockchains/nbxplorer/deps.nix new file mode 100644 index 00000000000..65afa6b72c4 --- /dev/null +++ b/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -0,0 +1,1072 @@ +{ fetchNuGet }: [ + (fetchNuGet { + name = "DBTrie"; + version = "1.0.38"; + sha256 = "09n9f2j0pha2np9cpbgjfs19jwvfmrglws89izarq71gl8jia6d9"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.JsonPatch"; + version = "3.1.5"; + sha256 = "0agcp9c8zf59bliybjfg5whby7k1i1xc4sccyyyj3qcx1snf6lfx"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; + version = "3.1.5"; + sha256 = "1n76xr3jn4bcxm9f3lk8k76zn39mhyqcj5b0dqhi2xykyvvrqjgc"; + }) + (fetchNuGet { + name = "Microsoft.Azure.Amqp"; + version = "2.4.2"; + sha256 = "0pfgl6fnw3apwasfg1dp5pvi5h0z0vmznhn2bfsgwndn1xlfw1g9"; + }) + (fetchNuGet { + name = "Microsoft.Azure.ServiceBus"; + version = "4.1.3"; + sha256 = "1mj21nal3hv8b5678rah808521c5rkb0yh6hrlqirsdgxwnl6z6g"; + }) + (fetchNuGet { + name = "Microsoft.Azure.Services.AppAuthentication"; + version = "1.0.3"; + sha256 = "0as64agcsilwgbvwx7iw3abdxyp9cbfpczbagjz49mqmmgnqp899"; + }) + (fetchNuGet { + name = "Microsoft.CodeCoverage"; + version = "16.6.1"; + sha256 = "01ffm4nflqdb93vq4xl0j3377x360fgx6c6h12mpkcy85ixbv3rl"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.0.1"; + sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.3.0"; + sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.7.0"; + sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "2.1.0"; + sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.EnvironmentVariables"; + version = "2.1.0"; + sha256 = "0xx3idb1l5y1da5zynlys5gyarijmw5pc9hgci8xdxbrcv6rzbjb"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.FileExtensions"; + version = "2.1.0"; + sha256 = "1lz2xwm63clbh9dfhmygbqvcp4dsrwh5jihv82dmqd5h7lqngl40"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Ini"; + version = "2.1.0"; + sha256 = "0bchsljywcq36si4zs2dcx2gj8x98ww93dh2bx2z6x5ilxyjnfip"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration"; + version = "2.1.0"; + sha256 = "04rjl38wlr1jjjpbzgf64jp0ql6sbzbil0brwq9mgr3hdgwd7vx2"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileProviders.Abstractions"; + version = "2.1.0"; + sha256 = "1sxls5f5cgb0wr8cwb05skqmz074683hrhmd3hhq6m5dasnzb8n3"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileProviders.Physical"; + version = "2.1.0"; + sha256 = "1firpsl5bk219i9gdfgiqw1zm68146h1dzx9hvawfpw9slfaa56w"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileSystemGlobbing"; + version = "2.1.0"; + sha256 = "1d2622qp22x1cnlwycnzjbc3sgi9jria26fk78zwzsa08npa3avv"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "1.0.0"; + sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "2.1.0"; + sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "2.1.0"; + sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb"; + }) + (fetchNuGet { + name = "Microsoft.IdentityModel.Clients.ActiveDirectory"; + version = "3.14.2"; + sha256 = "0g9a2z1qjxd71lqqghp0a542xk9jkvz951bbnnnw43is4hlnqncq"; + }) + (fetchNuGet { + name = "Microsoft.IdentityModel.JsonWebTokens"; + version = "5.4.0"; + sha256 = "0a5fn0p10dmkwa7vvbq28xw78aq33xm7c82l7vhla95n0lr178n8"; + }) + (fetchNuGet { + name = "Microsoft.IdentityModel.Logging"; + version = "5.4.0"; + sha256 = "1idlpyg3q3syam6aflfbnsa7iql685mjralr1cnfpryf00lm59v0"; + }) + (fetchNuGet { + name = "Microsoft.IdentityModel.Tokens"; + version = "5.4.0"; + sha256 = "0gpdh5rs0p97zm41pphha8n3ccd50b1iszikj3917f111khpw8l0"; + }) + (fetchNuGet { + name = "Microsoft.NET.Test.Sdk"; + version = "16.6.1"; + sha256 = "0jjdg468jc6pv2z764f3xc19lcr772nzjm9cjfqq3bqw8vkpzmhv"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.0.1"; + sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.0.2"; + sha256 = "17rrj0awknxx6rpdxr7yijdxqdmbbpdlcf2nsadjbd4d2gw7dck0"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.1.0"; + sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Targets"; + version = "1.0.1"; + sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Targets"; + version = "1.1.0"; + sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; + }) + (fetchNuGet { + name = "Microsoft.TestPlatform.ObjectModel"; + version = "16.6.1"; + sha256 = "0q98q1nw6jl4bajm66z4a9vvh928w8ffsd3k6fpsps23ykpsky7h"; + }) + (fetchNuGet { + name = "Microsoft.TestPlatform.TestHost"; + version = "16.6.1"; + sha256 = "0anzvb2mda548swb2ll1hv65knb8gwjm01hwbl0pzzr607my3lix"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Primitives"; + version = "4.0.1"; + sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Primitives"; + version = "4.3.0"; + sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Registry"; + version = "4.3.0"; + sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; + }) + (fetchNuGet { + name = "NBitcoin.Altcoins"; + version = "2.0.19"; + sha256 = "12a3bf1pi6sq78z6h3clyczvycx7cjry8fby4fyi748wjwljjizz"; + }) + (fetchNuGet { + name = "NBitcoin.TestFramework"; + version = "2.0.11"; + sha256 = "09jrbq9p5k67kdic2038s7q299y2nc8ij6m55m3m8hys7jdrrv05"; + }) + (fetchNuGet { + name = "NBitcoin"; + version = "5.0.54"; + sha256 = "0mx2gr8j8bc4mf1vi1fvqj3672qalxvzvincc61if79p46cik24b"; + }) + (fetchNuGet { + name = "NETStandard.Library"; + version = "1.6.1"; + sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; + }) + (fetchNuGet { + name = "NETStandard.Library"; + version = "2.0.3"; + sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; + }) + (fetchNuGet { + name = "Newtonsoft.Json.Bson"; + version = "1.0.2"; + sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "10.0.3"; + sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "11.0.1"; + sha256 = "1z68j07if1xf71lbsrgbia52r812i2dv541sy44ph4dzjjp7pd4m"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "12.0.2"; + sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "9.0.1"; + sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; + }) + (fetchNuGet { + name = "NicolasDorier.CommandLine.Configuration"; + version = "1.0.0.3"; + sha256 = "0al0pd4zhjpmn8m208xjmy17cbyab68grzdvzr2lhsckwkl6b1jg"; + }) + (fetchNuGet { + name = "NicolasDorier.CommandLine"; + version = "1.0.0.2"; + sha256 = "08a9l18zkhcfa6f56xqylzvmqjzgxsmgkpm2r3ckvxfyml6w0qyy"; + }) + (fetchNuGet { + name = "NicolasDorier.StandardConfiguration"; + version = "1.0.0.18"; + sha256 = "0lgssxafv6cqlw21fb79fm0fcln0clgsk6zadcwrnjv9vampfw7b"; + }) + (fetchNuGet { + name = "NuGet.Frameworks"; + version = "5.0.0"; + sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; + }) + (fetchNuGet { + name = "RabbitMQ.Client"; + version = "5.1.2"; + sha256 = "195nxmnva1z2p0ahvn0kswv4d39f5bdy2sl3cxcvfziamc21xrmd"; + }) + (fetchNuGet { + name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; + }) + (fetchNuGet { + name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; + }) + (fetchNuGet { + name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; + }) + (fetchNuGet { + name = "runtime.native.System.IO.Compression"; + version = "4.3.0"; + sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; + }) + (fetchNuGet { + name = "runtime.native.System.Net.Http"; + version = "4.0.1"; + sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; + }) + (fetchNuGet { + name = "runtime.native.System.Net.Http"; + version = "4.3.0"; + sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; + }) + (fetchNuGet { + name = "runtime.native.System.Net.Security"; + version = "4.3.0"; + sha256 = "0dnqjhw445ay3chpia9p6vy4w2j6s9vy3hxszqvdanpvvyaxijr3"; + }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; + }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; + }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography"; + version = "4.0.0"; + sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; + }) + (fetchNuGet { + name = "runtime.native.System"; + version = "4.0.0"; + sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; + }) + (fetchNuGet { + name = "runtime.native.System"; + version = "4.3.0"; + sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; + }) + (fetchNuGet { + name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; + }) + (fetchNuGet { + name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; + }) + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; + }) + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; + }) + (fetchNuGet { + name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; + }) + (fetchNuGet { + name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; + }) + (fetchNuGet { + name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; + }) + (fetchNuGet { + name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; + }) + (fetchNuGet { + name = "System.AppContext"; + version = "4.3.0"; + sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; + }) + (fetchNuGet { + name = "System.Buffers"; + version = "4.3.0"; + sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; + }) + (fetchNuGet { + name = "System.Buffers"; + version = "4.4.0"; + sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; + }) + (fetchNuGet { + name = "System.Buffers"; + version = "4.5.0"; + sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; + }) + (fetchNuGet { + name = "System.Collections.Concurrent"; + version = "4.0.12"; + sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; + }) + (fetchNuGet { + name = "System.Collections.Concurrent"; + version = "4.3.0"; + sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; + }) + (fetchNuGet { + name = "System.Collections.NonGeneric"; + version = "4.3.0"; + sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; + }) + (fetchNuGet { + name = "System.Collections.Specialized"; + version = "4.3.0"; + sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; + }) + (fetchNuGet { + name = "System.Collections"; + version = "4.0.11"; + sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; + }) + (fetchNuGet { + name = "System.Collections"; + version = "4.3.0"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + }) + (fetchNuGet { + name = "System.ComponentModel.Primitives"; + version = "4.3.0"; + sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; + }) + (fetchNuGet { + name = "System.ComponentModel.TypeConverter"; + version = "4.3.0"; + sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; + }) + (fetchNuGet { + name = "System.ComponentModel"; + version = "4.3.0"; + sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; + }) + (fetchNuGet { + name = "System.Console"; + version = "4.3.0"; + sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; + }) + (fetchNuGet { + name = "System.Diagnostics.Debug"; + version = "4.0.11"; + sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; + }) + (fetchNuGet { + name = "System.Diagnostics.Debug"; + version = "4.3.0"; + sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; + }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.3.0"; + sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; + }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.5.1"; + sha256 = "1j8dgilsgd0n7y87wq1cdlnwck96wijhbyhdp4d01l1gzm3074c1"; + }) + (fetchNuGet { + name = "System.Diagnostics.Process"; + version = "4.3.0"; + sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tools"; + version = "4.0.1"; + sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tools"; + version = "4.3.0"; + sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tracing"; + version = "4.1.0"; + sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tracing"; + version = "4.3.0"; + sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; + }) + (fetchNuGet { + name = "System.Dynamic.Runtime"; + version = "4.0.11"; + sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; + }) + (fetchNuGet { + name = "System.Dynamic.Runtime"; + version = "4.3.0"; + sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; + }) + (fetchNuGet { + name = "System.Globalization.Calendars"; + version = "4.0.1"; + sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; + }) + (fetchNuGet { + name = "System.Globalization.Calendars"; + version = "4.3.0"; + sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; + }) + (fetchNuGet { + name = "System.Globalization.Extensions"; + version = "4.3.0"; + sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; + }) + (fetchNuGet { + name = "System.Globalization"; + version = "4.0.11"; + sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; + }) + (fetchNuGet { + name = "System.Globalization"; + version = "4.3.0"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + }) + (fetchNuGet { + name = "System.IdentityModel.Tokens.Jwt"; + version = "5.4.0"; + sha256 = "05f91fjn054bwphmbbg7c38ipl4i81v73j232jgcq6y16dx6ifyc"; + }) + (fetchNuGet { + name = "System.IO.Compression.ZipFile"; + version = "4.3.0"; + sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; + }) + (fetchNuGet { + name = "System.IO.Compression"; + version = "4.3.0"; + sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; + }) + (fetchNuGet { + name = "System.IO.FileSystem.Primitives"; + version = "4.0.1"; + sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; + }) + (fetchNuGet { + name = "System.IO.FileSystem.Primitives"; + version = "4.3.0"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; + }) + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.0.1"; + sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; + }) + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.3.0"; + sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; + }) + (fetchNuGet { + name = "System.IO"; + version = "4.1.0"; + sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + }) + (fetchNuGet { + name = "System.IO"; + version = "4.3.0"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + }) + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.1.0"; + sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; + }) + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.3.0"; + sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; + }) + (fetchNuGet { + name = "System.Linq"; + version = "4.1.0"; + sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; + }) + (fetchNuGet { + name = "System.Linq"; + version = "4.3.0"; + sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; + }) + (fetchNuGet { + name = "System.Memory"; + version = "4.5.0"; + sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; + }) + (fetchNuGet { + name = "System.Net.Http"; + version = "4.3.0"; + sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; + }) + (fetchNuGet { + name = "System.Net.NameResolution"; + version = "4.3.0"; + sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; + }) + (fetchNuGet { + name = "System.Net.Primitives"; + version = "4.0.11"; + sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; + }) + (fetchNuGet { + name = "System.Net.Primitives"; + version = "4.3.0"; + sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; + }) + (fetchNuGet { + name = "System.Net.Security"; + version = "4.3.0"; + sha256 = "1aa5igz31ivk6kpgsrwck3jccab7wd88wr52lddmgypmbh9mmf87"; + }) + (fetchNuGet { + name = "System.Net.Sockets"; + version = "4.3.0"; + sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; + }) + (fetchNuGet { + name = "System.Net.WebHeaderCollection"; + version = "4.0.1"; + sha256 = "10bxpxj80c4z00z3ksrfswspq9qqsw8jwxcbzvymzycb97m9b55q"; + }) + (fetchNuGet { + name = "System.Net.WebHeaderCollection"; + version = "4.3.0"; + sha256 = "0ms3ddjv1wn8sqa5qchm245f3vzzif6l6fx5k92klqpn7zf4z562"; + }) + (fetchNuGet { + name = "System.Net.WebSockets.Client"; + version = "4.0.2"; + sha256 = "0p8m9h94h9za8281hngpi6awka6v26s1gkk0npmxzqq4ilas6b4s"; + }) + (fetchNuGet { + name = "System.Net.WebSockets.Client"; + version = "4.3.2"; + sha256 = "103y8lfsfa5xd1sqmq9sml4qyp4rij2i3fnnw119h119hb04l0rk"; + }) + (fetchNuGet { + name = "System.Net.WebSockets"; + version = "4.0.0"; + sha256 = "04jdhq9dp43x1m6hddn06sq74skc50i1yk6hip0224pj6fwxa4k2"; + }) + (fetchNuGet { + name = "System.Net.WebSockets"; + version = "4.3.0"; + sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; + }) + (fetchNuGet { + name = "System.Numerics.Vectors"; + version = "4.4.0"; + sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; + }) + (fetchNuGet { + name = "System.ObjectModel"; + version = "4.0.12"; + sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; + }) + (fetchNuGet { + name = "System.ObjectModel"; + version = "4.3.0"; + sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; + }) + (fetchNuGet { + name = "System.Private.DataContractSerialization"; + version = "4.1.1"; + sha256 = "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r"; + }) + (fetchNuGet { + name = "System.Private.DataContractSerialization"; + version = "4.3.0"; + sha256 = "06fjipqvjp559rrm825x6pll8gimdj9x1n3larigh5hsm584gndw"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.ILGeneration"; + version = "4.0.1"; + sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.ILGeneration"; + version = "4.3.0"; + sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + version = "4.0.1"; + sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + version = "4.3.0"; + sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.0.1"; + sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.3.0"; + sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + }) + (fetchNuGet { + name = "System.Reflection.Extensions"; + version = "4.0.1"; + sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; + }) + (fetchNuGet { + name = "System.Reflection.Extensions"; + version = "4.3.0"; + sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; + }) + (fetchNuGet { + name = "System.Reflection.Primitives"; + version = "4.0.1"; + sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; + }) + (fetchNuGet { + name = "System.Reflection.Primitives"; + version = "4.3.0"; + sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; + }) + (fetchNuGet { + name = "System.Reflection.TypeExtensions"; + version = "4.1.0"; + sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; + }) + (fetchNuGet { + name = "System.Reflection.TypeExtensions"; + version = "4.3.0"; + sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; + }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.1.0"; + sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; + }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.3.0"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + }) + (fetchNuGet { + name = "System.Resources.ResourceManager"; + version = "4.0.1"; + sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; + }) + (fetchNuGet { + name = "System.Resources.ResourceManager"; + version = "4.3.0"; + sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.5.0"; + sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; + }) + (fetchNuGet { + name = "System.Runtime.Extensions"; + version = "4.1.0"; + sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; + }) + (fetchNuGet { + name = "System.Runtime.Extensions"; + version = "4.3.0"; + sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; + }) + (fetchNuGet { + name = "System.Runtime.Handles"; + version = "4.0.1"; + sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; + }) + (fetchNuGet { + name = "System.Runtime.Handles"; + version = "4.3.0"; + sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.3.0"; + sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.1.0"; + sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.3.0"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + }) + (fetchNuGet { + name = "System.Runtime.Numerics"; + version = "4.0.1"; + sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; + }) + (fetchNuGet { + name = "System.Runtime.Numerics"; + version = "4.3.0"; + sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Formatters"; + version = "4.3.0"; + sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Json"; + version = "4.0.2"; + sha256 = "08ypbzs0sb302ga04ds5b2wxa2gg0q50zpa0nvc87ipjhs0v66dn"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Primitives"; + version = "4.1.1"; + sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Primitives"; + version = "4.3.0"; + sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Xml"; + version = "4.3.0"; + sha256 = "1b2cxl2h7s8cydbhbmxhvvq071n9ck61g08npg4gyw7nvg37rfni"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.1.0"; + sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }) + (fetchNuGet { + name = "System.Security.Claims"; + version = "4.3.0"; + sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Algorithms"; + version = "4.2.0"; + sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Algorithms"; + version = "4.3.0"; + sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Cng"; + version = "4.2.0"; + sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Cng"; + version = "4.3.0"; + sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Csp"; + version = "4.0.0"; + sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Csp"; + version = "4.3.0"; + sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Encoding"; + version = "4.0.0"; + sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Encoding"; + version = "4.3.0"; + sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.OpenSsl"; + version = "4.0.0"; + sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Primitives"; + version = "4.0.0"; + sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Primitives"; + version = "4.3.0"; + sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.X509Certificates"; + version = "4.1.0"; + sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.X509Certificates"; + version = "4.3.0"; + sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; + }) + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "4.3.0"; + sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; + }) + (fetchNuGet { + name = "System.Security.Principal"; + version = "4.3.0"; + sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; + }) + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.0.11"; + sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; + }) + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.3.0"; + sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; + }) + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.0.11"; + sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; + }) + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.3.0"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + }) + (fetchNuGet { + name = "System.Text.RegularExpressions"; + version = "4.1.0"; + sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; + }) + (fetchNuGet { + name = "System.Text.RegularExpressions"; + version = "4.3.0"; + sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; + }) + (fetchNuGet { + name = "System.Threading.Channels"; + version = "4.7.1"; + sha256 = "038fyrriypwzsj5fwgnkw79hm5ya0x63r724yizgahbxf512chr2"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.0.0"; + sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.3.0"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; + }) + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.0.11"; + sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; + }) + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.3.0"; + sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; + }) + (fetchNuGet { + name = "System.Threading.Thread"; + version = "4.3.0"; + sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; + }) + (fetchNuGet { + name = "System.Threading.ThreadPool"; + version = "4.3.0"; + sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; + }) + (fetchNuGet { + name = "System.Threading.Timer"; + version = "4.3.0"; + sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; + }) + (fetchNuGet { + name = "System.Threading"; + version = "4.0.11"; + sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; + }) + (fetchNuGet { + name = "System.Threading"; + version = "4.3.0"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }) + (fetchNuGet { + name = "System.Xml.ReaderWriter"; + version = "4.0.11"; + sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; + }) + (fetchNuGet { + name = "System.Xml.ReaderWriter"; + version = "4.3.0"; + sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; + }) + (fetchNuGet { + name = "System.Xml.XDocument"; + version = "4.0.11"; + sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; + }) + (fetchNuGet { + name = "System.Xml.XDocument"; + version = "4.3.0"; + sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; + }) + (fetchNuGet { + name = "System.Xml.XmlDocument"; + version = "4.0.1"; + sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; + }) + (fetchNuGet { + name = "System.Xml.XmlDocument"; + version = "4.3.0"; + sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; + }) + (fetchNuGet { + name = "System.Xml.XmlSerializer"; + version = "4.0.11"; + sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z"; + }) + (fetchNuGet { + name = "System.Xml.XmlSerializer"; + version = "4.3.0"; + sha256 = "07pa4sx196vxkgl3csvdmw94nydlsm9ir38xxcs84qjn8cycd912"; + }) + (fetchNuGet { + name = "xunit.abstractions"; + version = "2.0.3"; + sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; + }) + (fetchNuGet { + name = "xunit.analyzers"; + version = "0.10.0"; + sha256 = "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j"; + }) + (fetchNuGet { + name = "xunit.assert"; + version = "2.4.1"; + sha256 = "1imynzh80wxq2rp9sc4gxs4x1nriil88f72ilhj5q0m44qqmqpc6"; + }) + (fetchNuGet { + name = "xunit.core"; + version = "2.4.1"; + sha256 = "1nnb3j4kzmycaw1g76ii4rfqkvg6l8gqh18falwp8g28h802019a"; + }) + (fetchNuGet { + name = "xunit.extensibility.core"; + version = "2.4.1"; + sha256 = "103qsijmnip2pnbhciqyk2jyhdm6snindg5z2s57kqf5pcx9a050"; + }) + (fetchNuGet { + name = "xunit.extensibility.execution"; + version = "2.4.1"; + sha256 = "1pbilxh1gp2ywm5idfl0klhl4gb16j86ib4x83p8raql1dv88qia"; + }) + (fetchNuGet { + name = "xunit.runner.visualstudio"; + version = "2.4.2"; + sha256 = "0fi85h43nyrhfc5jzg07znh01r7cpb7bpjdc6mzb9z1pm14ppfm6"; + }) + (fetchNuGet { + name = "xunit"; + version = "2.4.1"; + sha256 = "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20"; + }) +] diff --git a/pkgs/applications/blockchains/nbxplorer/update.sh b/pkgs/applications/blockchains/nbxplorer/update.sh new file mode 100755 index 00000000000..5db2723ef8e --- /dev/null +++ b/pkgs/applications/blockchains/nbxplorer/update.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -euo pipefail + +scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) + +getVersionFromTags=1 "$scriptDir"/util/update-common.sh nbxplorer "$scriptDir"/deps.nix diff --git a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh new file mode 100755 index 00000000000..1402d1cd1eb --- /dev/null +++ b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p dotnet-sdk_3 +set -euo pipefail + +# Writes deps for dotnet package in $pkgSrc to $depsFile. +# Expects $pkgSrc to contain a single .sln file. + +pkgSrc=$1 +depsFile=$2 + +sln=$(cd "$pkgSrc"; find * -maxdepth 0 -name '*.sln' | head -1) +[[ $sln ]] || { echo "No .sln file in $pkgSrc" ; exit 1; } + +tmpdir=$(mktemp -d /tmp/$pkgName-src.XXX) +echo "Using tmp dir: $tmpdir" +cp -rT "$pkgSrc" "$tmpdir" +chmod -R +w "$tmpdir" + +pushd "$tmpdir" > /dev/null +mkdir home +echo "Running dotnet restore for $sln" +HOME=home DOTNET_CLI_TELEMETRY_OPTOUT=1 \ + dotnet restore -v normal --no-cache "$sln" > restore_log + +echo "{ fetchNuGet }: [" > "$depsFile" +while read pkgSpec; do + { read name; read version; } < <( + # Ignore build version part: 1.0.0-beta2+77df2220 -> 1.0.0-beta2 + sed -nE 's/.*([^<]*).*/\1/p; s/.*([^<+]*).*/\1/p' "$pkgSpec" + ) + sha256=$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkgSpec")"/*.nupkg) + cat >> "$depsFile" <> "$depsFile" + +echo "Created $depsFile" + +popd > /dev/null +rm -r $tmpdir diff --git a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh new file mode 100755 index 00000000000..c69168ccbbb --- /dev/null +++ b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh @@ -0,0 +1,51 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p coreutils curl jq common-updater-scripts dotnet-sdk_3 +set -euo pipefail + +# This script uses the following env vars: +# getVersionFromTags +# onlyCreateDeps + +pkgName=$1 +depsFile=$2 + +: ${getVersionFromTags:=} +: ${onlyCreateDeps:=} + +scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) +nixpkgs=$(realpath "$scriptDir"/../../../../..) + +evalNixpkgs() { + nix eval --raw "(with import \"$nixpkgs\" {}; $1)" +} + +getRepo() { + url=$(evalNixpkgs $pkgName.src.meta.homepage) + echo $(basename $(dirname $url))/$(basename $url) +} + +getLatestVersionTag() { + "$nixpkgs"/pkgs/common-updater/scripts/list-git-tags https://github.com/$(getRepo) 2>/dev/null \ + | sort -V | tail -1 | sed 's|^v||' +} + +if [[ ! $onlyCreateDeps ]]; then + oldVersion=$(evalNixpkgs "$pkgName.version") + if [[ $getVersionFromTags ]]; then + newVersion=$(getLatestVersionTag) + else + newVersion=$(curl -s "https://api.github.com/repos/$(getRepo)/releases" | jq -r '.[0].name') + fi + + if [[ $newVersion == $oldVersion ]]; then + echo "nixpkgs already has the latest version $newVersion" + echo "Run this script with env var onlyCreateDeps=1 to recreate "$(basename "$depsFile") + exit 0 + else + echo "Updating $pkgName: $oldVersion -> $newVersion" + (cd "$nixpkgs" && update-source-version "$pkgName" "$newVersion") + fi +fi + +storeSrc="$(nix-build "$nixpkgs" -A $pkgName.src --no-out-link)" +. "$scriptDir"/create-deps.sh "$storeSrc" "$depsFile" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77c8fa56992..2d1b7065ed8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24429,7 +24429,9 @@ in namecoin = callPackage ../applications/blockchains/namecoin.nix { withGui = true; }; namecoind = callPackage ../applications/blockchains/namecoin.nix { withGui = false; }; - pivx = libsForQt514.callPackage ../applications/blockchains/pivx.nix { withGui = true; }; + nbxplorer = callPackage ../applications/blockchains/nbxplorer { }; + + pivx = libsForQt5.callPackage ../applications/blockchains/pivx.nix { withGui = true; }; pivxd = callPackage ../applications/blockchains/pivx.nix { withGui = false; }; ethabi = callPackage ../applications/blockchains/ethabi.nix { }; From 2f55d6f697396e18f6ae644754013e47d9c647d2 Mon Sep 17 00:00:00 2001 From: Calvin Kim Date: Tue, 11 Aug 2020 03:52:53 +0900 Subject: [PATCH 18/69] btcpayserver: init at 1.0.5.4 --- .../blockchains/btcpayserver/default.nix | 66 + .../blockchains/btcpayserver/deps.nix | 1937 +++++++++++++++++ .../blockchains/btcpayserver/update.sh | 6 + pkgs/top-level/all-packages.nix | 2 + 4 files changed, 2011 insertions(+) create mode 100644 pkgs/applications/blockchains/btcpayserver/default.nix create mode 100644 pkgs/applications/blockchains/btcpayserver/deps.nix create mode 100755 pkgs/applications/blockchains/btcpayserver/update.sh diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix new file mode 100644 index 00000000000..eec39e691a8 --- /dev/null +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -0,0 +1,66 @@ +{ lib, stdenv, fetchFromGitHub, fetchurl, linkFarmFromDrvs, makeWrapper, + dotnetPackages, dotnetCorePackages, writeScript, bash +}: + +let + deps = import ./deps.nix { + fetchNuGet = { name, version, sha256 }: fetchurl { + name = "nuget-${name}-${version}.nupkg"; + url = "https://www.nuget.org/api/v2/package/${name}/${version}"; + inherit sha256; + }; + }; + dotnetSdk = dotnetCorePackages.sdk_3_1; +in + +stdenv.mkDerivation rec { + pname = "btcpayserver"; + version = "1.0.5.5"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "11h1nrmb7f44msbhhiz9ddqh5ss2kz6d8ysnvd070x3xj5krgnxz"; + }; + + nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget ]; + + # Due to a bug in btcpayserver, we can't just `dotnet publish` to create a binary. + # Build with `dotnet build` instead and add a custom `dotnet run` script. + buildPhase = '' + export HOME=$TMP/home + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + + nuget sources Add -Name tmpsrc -Source $TMP/nuget + nuget init ${linkFarmFromDrvs "deps" deps} $TMP/nuget + + dotnet restore --source $TMP/nuget BTCPayServer/BTCPayServer.csproj + dotnet build -c Release BTCPayServer/BTCPayServer.csproj + ''; + + runScript = '' + #!${bash}/bin/bash + DOTNET_CLI_TELEMETRY_OPTOUT=1 exec ${dotnetSdk}/bin/dotnet run --no-launch-profile --no-build \ + -c Release -p @@SHARE@@/BTCPayServer/BTCPayServer.csproj -- "$@" + ''; + + installPhase = '' + cd .. + share=$out/share/$pname + mkdir -p $share + mv -T source $share + install -D -m500 <(echo "$runScript" | sed "s|@@SHARE@@|$share|") $out/bin/$pname + ''; + + dontStrip = true; + + meta = with lib; { + description = "Self-hosted, open-source cryptocurrency payment processor"; + homepage = "https://btcpayserver.org"; + maintainers = with maintainers; [ kcalvinalvin earvstedt ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix new file mode 100644 index 00000000000..cb0641b8c85 --- /dev/null +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -0,0 +1,1937 @@ +{ fetchNuGet }: [ + (fetchNuGet { + name = "AngleSharp"; + version = "0.9.11"; + sha256 = "17vf1bizskkxr8pf547lk2b48m12wv3si83gxk145i73bf9gi64a"; + }) + (fetchNuGet { + name = "AWSSDK.Core"; + version = "3.3.104.14"; + sha256 = "157694kb63z1szbsv861515fvjv7amrjrfmgbm3idpyw31afk650"; + }) + (fetchNuGet { + name = "AWSSDK.S3"; + version = "3.3.110.10"; + sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; + }) + (fetchNuGet { + name = "BTCPayServer.Hwi"; + version = "1.1.3"; + sha256 = "1c8hfnrjh2ad8qh75d63gsl170q8czf3j1hk8sv8fnbgnxdnkm7a"; + }) + (fetchNuGet { + name = "BTCPayServer.Lightning.All"; + version = "1.2.3"; + sha256 = "1vx47rb505904pz30n5jzc9x42pcfln695l31q4dv5p4fbf10g4q"; + }) + (fetchNuGet { + name = "BTCPayServer.Lightning.Charge"; + version = "1.2.1"; + sha256 = "0iv9frbr6xfxif3pnfd7c87y8mv31nqkdrnhvnaswrx43nv6s272"; + }) + (fetchNuGet { + name = "BTCPayServer.Lightning.CLightning"; + version = "1.2.0"; + sha256 = "0a47fz20ngcz90h2y01isi2h940jljcmnfy6wyknj029sii7i1zs"; + }) + (fetchNuGet { + name = "BTCPayServer.Lightning.Common"; + version = "1.2.0"; + sha256 = "17di8ndkw8z0ci0zk15mcrqpmganwkz9ys2snr2rqpw5mrlhpwa0"; + }) + (fetchNuGet { + name = "BTCPayServer.Lightning.Eclair"; + version = "1.2.0"; + sha256 = "0w7nwsr0n2hrqak023xa294palsk3r96wlgw2ks8d3p5kxm8kskp"; + }) + (fetchNuGet { + name = "BTCPayServer.Lightning.LND"; + version = "1.2.1"; + sha256 = "0ql4qyvz0rms6ls46pi3bgak3r6hj2c5ivnzahiq6cb84pbl61cr"; + }) + (fetchNuGet { + name = "BTCPayServer.Lightning.Ptarmigan"; + version = "1.2.0"; + sha256 = "1yd6nhlssb9k08p5491knlwwjij9324ildir99sa9cp24rlq5nis"; + }) + (fetchNuGet { + name = "BuildBundlerMinifier"; + version = "3.2.435"; + sha256 = "0y1p226dbvs7q2ngm9w4mpkhfrhw2y122plv1yff7lx5m84ia02l"; + }) + (fetchNuGet { + name = "BundlerMinifier.Core"; + version = "3.2.435"; + sha256 = "17338x8ycr7hjzq16kr0ri30k19802hsn1sy259k3v694mxk59vd"; + }) + (fetchNuGet { + name = "BundlerMinifier.TagHelpers"; + version = "3.2.435"; + sha256 = "0ksmby0lzgsxkv0xfzr840262kcqra9vds91mcx0rf20blksfvsk"; + }) + (fetchNuGet { + name = "CsvHelper"; + version = "15.0.5"; + sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; + }) + (fetchNuGet { + name = "DBriize"; + version = "1.0.1.3"; + sha256 = "0rsm68hwq2ky8i6mv3ckdjkj4vjygnkgk3disva0skl3apk833dc"; + }) + (fetchNuGet { + name = "DigitalRuby.ExchangeSharp"; + version = "0.6.3"; + sha256 = "1vb7ahafcd3lcbiiz552aisilwm1yq3j600gkf1wik8vhvsk02fs"; + }) + (fetchNuGet { + name = "Google.Api.Gax.Rest"; + version = "2.5.0"; + sha256 = "1zkjl5zh6qwdz4qmnxnk5877pas638i2qi25znilhqqf3mrkp0rp"; + }) + (fetchNuGet { + name = "Google.Api.Gax"; + version = "2.5.0"; + sha256 = "0q6pi53px998i3gdndla8v0zqdpyi9gnsy9mdcfpkrg09vfbdsl9"; + }) + (fetchNuGet { + name = "Google.Apis.Auth"; + version = "1.35.1"; + sha256 = "1qdnd1nq9bfgyljmiww91pfi0iz1n29rz2dlizhxcijqya2ldha3"; + }) + (fetchNuGet { + name = "Google.Apis.Auth"; + version = "1.38.0"; + sha256 = "0x3bdwiyqjxw5df99bfasmsv09kb47wzisag938631cijl0g277y"; + }) + (fetchNuGet { + name = "Google.Apis.Core"; + version = "1.35.1"; + sha256 = "01dfw2kxknlc5pm7x1q88lv9j979509lkkgvlffjry5bawsxsja4"; + }) + (fetchNuGet { + name = "Google.Apis.Core"; + version = "1.38.0"; + sha256 = "012gslhnx65vqfyzjnqx4bqk9kb8bwbx966q2f9fdgrfcn26gj9j"; + }) + (fetchNuGet { + name = "Google.Apis.Storage.v1"; + version = "1.38.0.1470"; + sha256 = "0mfrz7fmpfbjvp4zfpjasmnfbgxgxrrjkf8xgp9p6h9g8qh2f2h2"; + }) + (fetchNuGet { + name = "Google.Apis"; + version = "1.35.1"; + sha256 = "1022l8m7v9f3rkjc9l11mkzwsbmqx9sk5f4aym035vn9hdr16d49"; + }) + (fetchNuGet { + name = "Google.Apis"; + version = "1.38.0"; + sha256 = "01j3d1lv106cqw9n0lwgclrxghy852fsibv6av4xr03ivrkm8g40"; + }) + (fetchNuGet { + name = "Google.Cloud.Storage.V1"; + version = "2.3.0"; + sha256 = "01jhrd6m6md8m28chzg2dkdfd4yris79j1xi7r1ydm1cfjhmlj64"; + }) + (fetchNuGet { + name = "HtmlSanitizer"; + version = "4.0.217"; + sha256 = "0szay9mf5mmrp1hx0yc175aaalv76qg0j515lfs133j1d95lj26d"; + }) + (fetchNuGet { + name = "Microsoft.AspNet.SignalR.Client"; + version = "2.3.0"; + sha256 = "1xyj8b88bc6sc7fxgqyalzfmlfgbagfk7adyk29if9hr8ki9bic4"; + }) + (fetchNuGet { + name = "Microsoft.AspNet.WebApi.Client"; + version = "5.2.7"; + sha256 = "1j0wbdmycj5xbk06p32f7xrddc40sbj3yca4d7ywg611yk26mvi1"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Cryptography.Internal"; + version = "3.1.4"; + sha256 = "0d4djj073bl9kps5jkcpydh92lcp6kpa7njhypjw3myaa987dcsh"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Cryptography.KeyDerivation"; + version = "3.1.4"; + sha256 = "1rya2775prm8ss0rz6izsqqcz96gcf1rh0bpcvnfy1mwi04rx8bl"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Hosting.Abstractions"; + version = "2.0.0"; + sha256 = "0x6vw7kiy9z7cdmgbqav0d9wq66032wg39l2c9cv6xvxxvdpbkz7"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Hosting.Server.Abstractions"; + version = "2.0.0"; + sha256 = "1k4dr6l32swi8zasfvzxixnjvgbrra7v6lgpri0929vb3r5lagjb"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Http.Abstractions"; + version = "2.0.0"; + sha256 = "1hgmnd5mj35g8cqq3mdhjf9cmi3wm5lqiyrj5mgfscnig6i686xr"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Http.Features"; + version = "2.0.0"; + sha256 = "1zk5ad3laa7ma83md8r80kijqzps6dcrvv0k1015nddfk1qd74s6"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Identity.EntityFrameworkCore"; + version = "3.1.4"; + sha256 = "0smcpaqm7d95flr0k7i2psrsfvs48lv28kzqgnllv5229hhb670d"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.JsonPatch"; + version = "3.1.1"; + sha256 = "0c0aaz9rlh9chc53dnv5jryp0x0415hipaizrmih3kzwd3fmqpml"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; + version = "3.1.1"; + sha256 = "1c2lrlp64kkacnjgdyygr6fqdawk10l8j4qgppii6rq61yjwhcig"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Mvc.Razor.Extensions"; + version = "3.1.1"; + sha256 = "1iydcr7rfzg3kqky0x70853g6lbzsl9ja9cv8ph6iwpqxnswgdkh"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation"; + version = "3.1.1"; + sha256 = "1q1bblcj9l2dnz46frygsfq7w4v08l96clgryh78wyws83xjm43y"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Razor.Language"; + version = "3.1.1"; + sha256 = "0arqmy04dd0r4wm2fin66gxxwj2kirbgxyf3w7kq6f73lrnazhq0"; + }) + (fetchNuGet { + name = "Microsoft.Bcl.AsyncInterfaces"; + version = "1.1.0"; + sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; + }) + (fetchNuGet { + name = "Microsoft.Bcl.AsyncInterfaces"; + version = "1.1.1"; + sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; + }) + (fetchNuGet { + name = "Microsoft.Bcl.HashCode"; + version = "1.1.0"; + sha256 = "1ggsadahlp76zcn1plapszd5v5ja8rh479fwrahqd3knql4dfnr0"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.Analyzers"; + version = "2.9.3"; + sha256 = "1kskwc9gyd2sx3zwx52qwfsl7s0xhaclmlnxvjsb4jgvpydv3xii"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.Analyzers"; + version = "3.0.0"; + sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.Common"; + version = "3.3.0"; + sha256 = "1vwhsp3pjgcfnpapkps9a3z9n2ryiv5bbhzycfljngj5grj63rg2"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.Common"; + version = "3.6.0"; + sha256 = "0i8x90700jr30j580mpawj6d90fngrb2zpkjjbn7f8r2p1mz75y7"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.CSharp"; + version = "3.3.0"; + sha256 = "09nmd5h1r2q0dwp1dfpn4anvs8sfi3rwcgpcv28lrhky8vc51424"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.CSharp"; + version = "3.6.0"; + sha256 = "0c44qp7lfpja6cq5nk7851qrswm2z1k2pnvsw43j9ybf10a27jrn"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.Razor"; + version = "3.1.1"; + sha256 = "03n5rli6v1kvghha82zar3dvvkbc2vb9g8zp5fjrzhvp4l74ingn"; + }) + (fetchNuGet { + name = "Microsoft.CodeCoverage"; + version = "16.6.1"; + sha256 = "01ffm4nflqdb93vq4xl0j3377x360fgx6c6h12mpkcy85ixbv3rl"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.0.1"; + sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.3.0"; + sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.5.0"; + sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.7.0"; + sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; + }) + (fetchNuGet { + name = "Microsoft.Data.Sqlite.Core"; + version = "3.1.4"; + sha256 = "1pahyqjs4l9g1wg9hvxf68kgzzf72ny2i7n7ai97a389p2c86xvh"; + }) + (fetchNuGet { + name = "Microsoft.DotNet.PlatformAbstractions"; + version = "2.0.4"; + sha256 = "1fdzln4im9hb55agzwchbfgm3vmngigmbpci5j89b0gqcxixmv8j"; + }) + (fetchNuGet { + name = "Microsoft.DotNet.PlatformAbstractions"; + version = "3.1.4"; + sha256 = "1s5h96zdc3vh1v03gizmqfw5hmksajw10bdrj79pm8brbyzipxia"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Abstractions"; + version = "3.1.0"; + sha256 = "1bd6hilnwp47z3l14qspdxi5f5nhv6rivarc6w8wil425bq0h3pd"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Abstractions"; + version = "3.1.4"; + sha256 = "07l7137pzwh0k4m53ji5j6a2zmbbzrl164p18wxcri77ds5is4g7"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Analyzers"; + version = "3.1.0"; + sha256 = "1pjn4wwhxgsiap7byld114kx6m0nm6696r8drspqic7lskm4y305"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Analyzers"; + version = "3.1.4"; + sha256 = "1zaqn9z7ns6p6jgnffzkgpziqr2wqs68g2sa0c11kaclhlhgvvbv"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Design"; + version = "3.1.4"; + sha256 = "10mxnbiw23ia4sln86sd3gn84yhmrb6r2kipzid4h1g15paal9gi"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Relational"; + version = "3.1.0"; + sha256 = "0javqw6c27ppcysigjvcjcw3mk0gg1pv2pmwfpvvryr1pb4a9n55"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Relational"; + version = "3.1.4"; + sha256 = "1344rsavawwg69dx8xsl08hcs43lc6h7z4mn461dcx85rirlwd0v"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Sqlite.Core"; + version = "3.1.4"; + sha256 = "080qz0b52i7v5c1sgnqlh9px9881cfr1x06np66hdgmh0ni5c1lw"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Sqlite"; + version = "3.1.4"; + sha256 = "009mcmakw0p7k8xrz920a8qc0rjv361awiz8jia5i5a8p5ihgkbx"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore"; + version = "3.1.0"; + sha256 = "1l12lsk1xfrv5pjnm0b9w9kncgdh0pcjcbxl4zrsg82s7bs7dhda"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore"; + version = "3.1.4"; + sha256 = "11w63yp7fk9qwmnq3lmpf1h30mlbzfx4zpm89vrs0lprj86g0742"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Caching.Abstractions"; + version = "3.1.0"; + sha256 = "0j5m2a48rwyzzvbz0hpr2md35iv78b86zyqjnrjq0y4vb7sairc0"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Caching.Abstractions"; + version = "3.1.4"; + sha256 = "09f96pvpyzylpdaiw3lsvr7p6rs4i21mmhsxl6pkivg5lpfb79sk"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Caching.Memory"; + version = "3.1.0"; + sha256 = "1hi61647apn25kqjcb37nqafp8fikymdrk43j3kxjbwwwx507jy1"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Caching.Memory"; + version = "3.1.4"; + sha256 = "0b8ijxjd8lgq8mgnvh3wl4y4wbjj3v5b763y6gslm75fn43iyad8"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "1.1.2"; + sha256 = "0z83kxfzsgqlshg4x1mhdnhlrprrwsgnnibvwk257drzy9079994"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "2.0.0"; + sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "2.1.0"; + sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "3.1.0"; + sha256 = "1f7h52kamljglx5k08ccryilvk6d6cvr9c26lcb6b2c091znzk0q"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "3.1.4"; + sha256 = "0r33m68y1vgpmqams4sgciizl0w6y97qkp93m0hyn0nlkxqf72l6"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Binder"; + version = "2.0.0"; + sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Binder"; + version = "3.1.0"; + sha256 = "13jj7jxihiswmhmql7r5jydbca4x5qj6h7zq10z17gagys6dc7pw"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Binder"; + version = "3.1.4"; + sha256 = "1bnf213zlrh0m3sbhsv601yx21l5xp254jiy2g4hm7zpm8vsz1hz"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.EnvironmentVariables"; + version = "2.1.0"; + sha256 = "0xx3idb1l5y1da5zynlys5gyarijmw5pc9hgci8xdxbrcv6rzbjb"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.FileExtensions"; + version = "2.1.0"; + sha256 = "1lz2xwm63clbh9dfhmygbqvcp4dsrwh5jihv82dmqd5h7lqngl40"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Ini"; + version = "2.1.0"; + sha256 = "0bchsljywcq36si4zs2dcx2gj8x98ww93dh2bx2z6x5ilxyjnfip"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration"; + version = "2.0.0"; + sha256 = "0yssxq9di5h6xw2cayp5hj3l9b2p0jw9wcjz73rwk4586spac9s9"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration"; + version = "2.1.0"; + sha256 = "04rjl38wlr1jjjpbzgf64jp0ql6sbzbil0brwq9mgr3hdgwd7vx2"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration"; + version = "3.1.0"; + sha256 = "1rszgz0rd5kvib5fscz6ss3pkxyjwqy0xpd4f2ypgzf5z5g5d398"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration"; + version = "3.1.4"; + sha256 = "0npc18pjl86d06czb0fy6ln3prfpwfb16p6709xx2jrsl96dp9bp"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "2.0.0"; + sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "2.1.0"; + sha256 = "0c0cx8r5xkjpxmcfp51959jnp55qjvq28d9vaslk08avvi1by12s"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "3.1.0"; + sha256 = "1pvms778xkyv1a3gfwrxnh8ja769cxi416n7pcidn9wvg15ifvbh"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "3.1.4"; + sha256 = "03ys96pqca93zwxvh0vprzms09i9y0lmq32w98m6klbizq01fc06"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection"; + version = "2.0.0"; + sha256 = "018izzgykaqcliwarijapgki9kp2c560qv8qsxdjywr7byws5apq"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection"; + version = "3.1.0"; + sha256 = "1xc61dy07bn2q73mx1z3ylrw80xpa682qjby13gklnqq636a3gab"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection"; + version = "3.1.4"; + sha256 = "0rhyjgdpjm56drvrvqd9v1xq1qhyrpwwn2pjsz17g2s462rwliqx"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyModel"; + version = "2.0.4"; + sha256 = "041i1vlcibpzgalxxzdk81g5pgmqvmz2g61k0rqa2sky0wpvijx9"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyModel"; + version = "3.1.1"; + sha256 = "0qa04dspjl4qk7l8d66wqyrvhp5dxcfn2j4r8mmj362xyrp3r8sh"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyModel"; + version = "3.1.4"; + sha256 = "0r0wv4k0ig6mrl6fr184zqbf5f010d6i2an2ws23g2bjvk8jh1bk"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileProviders.Abstractions"; + version = "2.0.0"; + sha256 = "0d6y5isjy6jpf4w3f3w89cwh9p40glzhwvm7cwhx05wkqd8bk9w4"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileProviders.Abstractions"; + version = "2.1.0"; + sha256 = "1sxls5f5cgb0wr8cwb05skqmz074683hrhmd3hhq6m5dasnzb8n3"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileProviders.Physical"; + version = "2.1.0"; + sha256 = "1firpsl5bk219i9gdfgiqw1zm68146h1dzx9hvawfpw9slfaa56w"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileSystemGlobbing"; + version = "2.1.0"; + sha256 = "1d2622qp22x1cnlwycnzjbc3sgi9jria26fk78zwzsa08npa3avv"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Hosting.Abstractions"; + version = "2.0.0"; + sha256 = "056wgjcdzvz1qwb26xv6hgxq4xya56qiimhk30v8an8cgsrjk3mc"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Hosting.Abstractions"; + version = "2.1.0"; + sha256 = "04vm9mdjjzg3lpp2rzpgkpn8h5bzdl3bwcr22lshd3kp602ws4k9"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Identity.Core"; + version = "3.1.4"; + sha256 = "0kyi03l9d7pnsvrcylc86fcxwnj59mhvmbz4c1d142f8djdrqfid"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Identity.Stores"; + version = "3.1.4"; + sha256 = "0jb3syy0glyn4nnd7lb7aj412xnqyrwhfavh98rbc5adq9v09nbw"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "1.0.0"; + sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "1.1.2"; + sha256 = "0j9b4z3pf8a5xphx3ksn6jm01rf4z001vfll5kcbxw995xcidjw1"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "2.0.0"; + sha256 = "1x5isi71z02khikzvm7vaschb006pqqrsv86ky1x08a4hir4s43h"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "2.1.0"; + sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "3.1.0"; + sha256 = "1zyalrcksszmn9r5xjnirfh7847axncgzxkk3k5srbvlcch8fw8g"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "3.1.4"; + sha256 = "1rkl0yqmi5vfivn641866v2mdsgdy8amym546y6lzbab39g24b5n"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Filter"; + version = "1.1.2"; + sha256 = "1pip87q89376xxpi3r5pf9vxhqxx21qrp179fbldbkr2m1577k9m"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging"; + version = "2.0.0"; + sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging"; + version = "3.1.0"; + sha256 = "1d3yhqj1rav7vswm747j7w8fh8paybji4rz941hhlq4b12mfqfh4"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging"; + version = "3.1.4"; + sha256 = "04asfrhfrcl3ijilry2pr28ql5m6pgrwapadikgcg66jjxbx75zq"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Options.ConfigurationExtensions"; + version = "2.0.0"; + sha256 = "1isc3rjbzz60f7wbmgcwslx5d10hm5hisnk7v54vfi2bz7132gll"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Options"; + version = "2.0.0"; + sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Options"; + version = "3.1.0"; + sha256 = "0akccwhpn93a4qrssyb3rszdsp3j4p9hlxbsb7yhqb78xydaqhyh"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Options"; + version = "3.1.4"; + sha256 = "0jphncx82l7jm5xi49dfxhbh24wv86sy44022chd7bkizllsypp4"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.PlatformAbstractions"; + version = "1.1.0"; + sha256 = "0r4j8v2vvp3kalvb11ny9cvpls3nrvqj0c81rxbkh99ynd2dbscp"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "1.1.1"; + sha256 = "0rcwxz1r89y96s8k3bmg0v6zdqanqfp09khy5l99wnl777y15g7x"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "2.0.0"; + sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "2.1.0"; + sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "3.1.0"; + sha256 = "1w1y22njywwysi8qjnj4m83qhbq0jr4mmjib0hfawz6cwamh7xrb"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "3.1.4"; + sha256 = "12xvysk024aghrcwzv4525vznnk8lqmknl2vqqxhq4k5hjxpsysp"; + }) + (fetchNuGet { + name = "Microsoft.NET.Test.Sdk"; + version = "16.6.1"; + sha256 = "0jjdg468jc6pv2z764f3xc19lcr772nzjm9cjfqq3bqw8vkpzmhv"; + }) + (fetchNuGet { + name = "Microsoft.NetCore.Analyzers"; + version = "2.9.8"; + sha256 = "1klybsdy9yw49zlpmix4vjdhmfaibg5h9yx03vszdnijzap7vpsx"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.0.1"; + sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.1.0"; + sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "2.0.0"; + sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "2.1.2"; + sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Targets"; + version = "1.0.1"; + sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Targets"; + version = "1.1.0"; + sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; + }) + (fetchNuGet { + name = "Microsoft.TestPlatform.ObjectModel"; + version = "16.6.1"; + sha256 = "0q98q1nw6jl4bajm66z4a9vvh928w8ffsd3k6fpsps23ykpsky7h"; + }) + (fetchNuGet { + name = "Microsoft.TestPlatform.TestHost"; + version = "16.6.1"; + sha256 = "0anzvb2mda548swb2ll1hv65knb8gwjm01hwbl0pzzr607my3lix"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Primitives"; + version = "4.0.1"; + sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Primitives"; + version = "4.3.0"; + sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; + }) + (fetchNuGet { + name = "MySqlConnector"; + version = "0.61.0"; + sha256 = "0b0mc41dsih4p1ky3kcmibsz4bw14w439nraq5732wjfkq2sqdxg"; + }) + (fetchNuGet { + name = "NBitcoin.Altcoins"; + version = "2.0.16"; + sha256 = "0fsdb96k5lwyq4d7h7yg91qghima08yk0bsw5cvr4h2jsfphk423"; + }) + (fetchNuGet { + name = "NBitcoin"; + version = "5.0.33"; + sha256 = "030q609b9lhapq4wfl1w3impjw5m40kz2rg1s9jn3bn8yjfmsi4a"; + }) + (fetchNuGet { + name = "NBitcoin"; + version = "5.0.4"; + sha256 = "04iafda61izzxb691brk72qs01m5dadqb4970nw5ayck6275s71i"; + }) + (fetchNuGet { + name = "NBitcoin"; + version = "5.0.40"; + sha256 = "1rqzn84yaww4afagwg8jg1l5qdkvqyjdfcyd5widddqwxabbsjvh"; + }) + (fetchNuGet { + name = "NBitcoin"; + version = "5.0.45"; + sha256 = "102vwxwkg367yxv26hycnc7hjxlv2zvsgr8g6adw8dmzsxck5fwk"; + }) + (fetchNuGet { + name = "NBitcoin"; + version = "5.0.51"; + sha256 = "0rg014sl7rqscnranwyfk41xfr5ccjqyx7aidfl5mh0znz44db2g"; + }) + (fetchNuGet { + name = "NBitpayClient"; + version = "1.0.0.39"; + sha256 = "1sgwradg7jnb4n3chwqfkximj1qhgl3r23p0sifmaa0kql2hlira"; + }) + (fetchNuGet { + name = "NBXplorer.Client"; + version = "3.0.17"; + sha256 = "0xx2xshgpci9l9883zpqnmgchpizygy0hcq2wp2ch6yf3hbrj9qq"; + }) + (fetchNuGet { + name = "NETStandard.Library"; + version = "1.6.1"; + sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; + }) + (fetchNuGet { + name = "Newtonsoft.Json.Bson"; + version = "1.0.1"; + sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; + }) + (fetchNuGet { + name = "Newtonsoft.Json.Bson"; + version = "1.0.2"; + sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; + }) + (fetchNuGet { + name = "Newtonsoft.Json.Schema"; + version = "3.0.13"; + sha256 = "04vzjz5fb588rh6ji5a0svfzjsdcfpr1qrz9hxpc64z5zhnh6sf4"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "10.0.3"; + sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "11.0.1"; + sha256 = "1z68j07if1xf71lbsrgbia52r812i2dv541sy44ph4dzjjp7pd4m"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "11.0.2"; + sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "12.0.2"; + sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "12.0.3"; + sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "9.0.1"; + sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; + }) + (fetchNuGet { + name = "NicolasDorier.CommandLine.Configuration"; + version = "1.0.0.3"; + sha256 = "0al0pd4zhjpmn8m208xjmy17cbyab68grzdvzr2lhsckwkl6b1jg"; + }) + (fetchNuGet { + name = "NicolasDorier.CommandLine"; + version = "1.0.0.2"; + sha256 = "08a9l18zkhcfa6f56xqylzvmqjzgxsmgkpm2r3ckvxfyml6w0qyy"; + }) + (fetchNuGet { + name = "NicolasDorier.RateLimits"; + version = "1.1.0"; + sha256 = "06cajxi8wnrxfwqfnk98avphwiyvg1fw428bd42lqjgq9k414rk9"; + }) + (fetchNuGet { + name = "NicolasDorier.StandardConfiguration"; + version = "1.0.0.18"; + sha256 = "0lgssxafv6cqlw21fb79fm0fcln0clgsk6zadcwrnjv9vampfw7b"; + }) + (fetchNuGet { + name = "NLog"; + version = "4.5.10"; + sha256 = "0d4yqxrhqn2k36h3v1f5pn6qqlagbzg67v6gvxqhz3s4zyc3b8rg"; + }) + (fetchNuGet { + name = "Npgsql.EntityFrameworkCore.PostgreSQL"; + version = "3.1.4"; + sha256 = "1ng9pbamh93g0fbnjq8ygaf40d6rs0fy4s08bjmxpa69k3s8c7a4"; + }) + (fetchNuGet { + name = "Npgsql"; + version = "4.1.3.1"; + sha256 = "0qk3hb8s521c2gy4k3m1i6fhpr133mnw9w85cwsy9j7ghxyca1nv"; + }) + (fetchNuGet { + name = "NuGet.Frameworks"; + version = "5.0.0"; + sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; + }) + (fetchNuGet { + name = "NUglify"; + version = "1.5.12"; + sha256 = "0f4gs31z8dwfvd246nrv3m0qkxzav37hxynx2maykza017khynyf"; + }) + (fetchNuGet { + name = "Pomelo.EntityFrameworkCore.MySql"; + version = "3.1.1"; + sha256 = "1jvv2q7pmh5wzsfjim7iby4r1scb30kgj9w6sbm2dp60i6vm32dx"; + }) + (fetchNuGet { + name = "Pomelo.JsonObject"; + version = "2.2.1"; + sha256 = "1w6s9wjbsyvq8cnqknkdzm9chnv0g5gcsrq5i94zp6br9vg7c627"; + }) + (fetchNuGet { + name = "Portable.BouncyCastle"; + version = "1.8.1.3"; + sha256 = "1lv1ljaz8df835jgmp3ny1xgqqjf1s9f25baw7bf8d24qlf25i2g"; + }) + (fetchNuGet { + name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; + }) + (fetchNuGet { + name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; + }) + (fetchNuGet { + name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; + }) + (fetchNuGet { + name = "runtime.native.System.IO.Compression"; + version = "4.3.0"; + sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; + }) + (fetchNuGet { + name = "runtime.native.System.Net.Http"; + version = "4.0.1"; + sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; + }) + (fetchNuGet { + name = "runtime.native.System.Net.Http"; + version = "4.3.0"; + sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; + }) + (fetchNuGet { + name = "runtime.native.System.Net.Security"; + version = "4.3.0"; + sha256 = "0dnqjhw445ay3chpia9p6vy4w2j6s9vy3hxszqvdanpvvyaxijr3"; + }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; + }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; + }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography"; + version = "4.0.0"; + sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; + }) + (fetchNuGet { + name = "runtime.native.System"; + version = "4.0.0"; + sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; + }) + (fetchNuGet { + name = "runtime.native.System"; + version = "4.3.0"; + sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; + }) + (fetchNuGet { + name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; + }) + (fetchNuGet { + name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; + }) + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; + }) + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; + }) + (fetchNuGet { + name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; + }) + (fetchNuGet { + name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; + }) + (fetchNuGet { + name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; + }) + (fetchNuGet { + name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; + }) + (fetchNuGet { + name = "Selenium.WebDriver.ChromeDriver"; + version = "83.0.4103.3900"; + sha256 = "17j9b637209nm5cs5sgr3vflphkhaxpm8bcjizhgj65r52gn17as"; + }) + (fetchNuGet { + name = "Selenium.WebDriver"; + version = "3.141.0"; + sha256 = "09g0zhz6n7yhxmxlrpzjdykfavr3m4z1gb4cmq304dw0gr8s89mq"; + }) + (fetchNuGet { + name = "Serilog.AspNetCore"; + version = "3.2.0"; + sha256 = "14d1lsw1djsshlkxbn5lkmdvj4372hnddb6788m6ix0mv4mhj3bj"; + }) + (fetchNuGet { + name = "Serilog.Extensions.Hosting"; + version = "3.0.0"; + sha256 = "1r01lsy4rp0wj7ffbjcf9dcg3aipdhy7066yjicja45m0z2y42w6"; + }) + (fetchNuGet { + name = "Serilog.Extensions.Logging"; + version = "3.0.1"; + sha256 = "069qy7dm5nxb372ij112ppa6m99b4iaimj3sji74m659fwrcrl9a"; + }) + (fetchNuGet { + name = "Serilog.Formatting.Compact"; + version = "1.0.0"; + sha256 = "0mi1yzzj33v4nkyspyshhc6nn2mx3y07z5dvv26hl7hw6kb6yazw"; + }) + (fetchNuGet { + name = "Serilog.Settings.Configuration"; + version = "3.1.0"; + sha256 = "1cj5am4n073331gbfm2ylqb9cadl4q3ppzgwmm5c8m1drxpiwkb5"; + }) + (fetchNuGet { + name = "Serilog.Sinks.Console"; + version = "3.1.1"; + sha256 = "0j99as641y1k6havwwkhyr0n08vibiblmfjj6nz051mz8g3864fn"; + }) + (fetchNuGet { + name = "Serilog.Sinks.Debug"; + version = "1.0.1"; + sha256 = "0969mb254kr59bgkq01ybyzca89z3f4n9ng5mdj8m53d5653zf22"; + }) + (fetchNuGet { + name = "Serilog.Sinks.File"; + version = "4.1.0"; + sha256 = "1ry7p9hf1zlnai1j5zjhjp4dqm2agsbpq6cvxgpf5l8m26x6mgca"; + }) + (fetchNuGet { + name = "Serilog"; + version = "2.9.0"; + sha256 = "0z0ib82w9b229a728bbyhzc2hnlbl0ki7nnvmgnv3l741f2vr4i6"; + }) + (fetchNuGet { + name = "SQLitePCLRaw.bundle_e_sqlite3"; + version = "2.0.2"; + sha256 = "00p7n7ndmmh45fhhd3clb11igpzklm1n7r50sdrgnbi5yifv1lxl"; + }) + (fetchNuGet { + name = "SQLitePCLRaw.core"; + version = "2.0.2"; + sha256 = "11mnbnsiirpgmilskqh1issvgzgg08ndq3p3nkrw73hyqr7kl958"; + }) + (fetchNuGet { + name = "SQLitePCLRaw.lib.e_sqlite3"; + version = "2.0.2"; + sha256 = "0967w6r6n94hj0fma3kidb9fx1m2p3fgrw6gpsy6q6jbb33qw6vj"; + }) + (fetchNuGet { + name = "SQLitePCLRaw.provider.dynamic_cdecl"; + version = "2.0.2"; + sha256 = "1lzs8yfjygrwfm3hjmkhnbnpsjzq53ijwx9whmii2r9kjg2a46if"; + }) + (fetchNuGet { + name = "SSH.NET"; + version = "2016.1.0"; + sha256 = "0q08bf9sdf1rf9763z4bk2mr6z381iybm73823scmq9qcpr2jk4d"; + }) + (fetchNuGet { + name = "SshNet.Security.Cryptography"; + version = "1.2.0"; + sha256 = "1xlj8bjavpjk6lrkypk66cxpf2xa31wv73ymrk34d72f05z0xrg0"; + }) + (fetchNuGet { + name = "System.AppContext"; + version = "4.1.0"; + sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; + }) + (fetchNuGet { + name = "System.AppContext"; + version = "4.3.0"; + sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; + }) + (fetchNuGet { + name = "System.Buffers"; + version = "4.3.0"; + sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; + }) + (fetchNuGet { + name = "System.Collections.Concurrent"; + version = "4.0.12"; + sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; + }) + (fetchNuGet { + name = "System.Collections.Concurrent"; + version = "4.3.0"; + sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; + }) + (fetchNuGet { + name = "System.Collections.Immutable"; + version = "1.5.0"; + sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; + }) + (fetchNuGet { + name = "System.Collections.Immutable"; + version = "1.7.0"; + sha256 = "1gik4sn9jsi1wcy1pyyp0r4sn2g17cwrsh24b2d52vif8p2h24zx"; + }) + (fetchNuGet { + name = "System.Collections.Immutable"; + version = "1.7.1"; + sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; + }) + (fetchNuGet { + name = "System.Collections.NonGeneric"; + version = "4.3.0"; + sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; + }) + (fetchNuGet { + name = "System.Collections.Specialized"; + version = "4.3.0"; + sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; + }) + (fetchNuGet { + name = "System.Collections"; + version = "4.0.11"; + sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; + }) + (fetchNuGet { + name = "System.Collections"; + version = "4.3.0"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + }) + (fetchNuGet { + name = "System.ComponentModel.Annotations"; + version = "4.7.0"; + sha256 = "06x1m46ddxj0ng28d7gry9gjkqdg2kp89jyf480g5gznyybbs49z"; + }) + (fetchNuGet { + name = "System.ComponentModel.Primitives"; + version = "4.3.0"; + sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; + }) + (fetchNuGet { + name = "System.ComponentModel.TypeConverter"; + version = "4.3.0"; + sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; + }) + (fetchNuGet { + name = "System.ComponentModel"; + version = "4.3.0"; + sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; + }) + (fetchNuGet { + name = "System.Configuration.ConfigurationManager"; + version = "4.5.0"; + sha256 = "1frpy24mn6q7hgwayj98kkx89z861f5dmia4j6zc0a2ydgx8x02c"; + }) + (fetchNuGet { + name = "System.Console"; + version = "4.3.0"; + sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; + }) + (fetchNuGet { + name = "System.Diagnostics.Debug"; + version = "4.0.11"; + sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; + }) + (fetchNuGet { + name = "System.Diagnostics.Debug"; + version = "4.3.0"; + sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; + }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.0.0"; + sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; + }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.3.0"; + sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; + }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.7.0"; + sha256 = "0cr0v5dz8l5ackxv6b772fjcyj2nimqmrmzanjs4cw2668v568n1"; + }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.7.1"; + sha256 = "1mivaifniyrqwlnvzsfaxzrh2sd981bwzs3cbvs5wi7jjzbcqr4p"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tools"; + version = "4.0.1"; + sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tools"; + version = "4.3.0"; + sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; + }) + (fetchNuGet { + name = "System.Diagnostics.TraceSource"; + version = "4.0.0"; + sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tracing"; + version = "4.1.0"; + sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tracing"; + version = "4.3.0"; + sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; + }) + (fetchNuGet { + name = "System.Dynamic.Runtime"; + version = "4.0.11"; + sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; + }) + (fetchNuGet { + name = "System.Dynamic.Runtime"; + version = "4.3.0"; + sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; + }) + (fetchNuGet { + name = "System.Globalization.Calendars"; + version = "4.0.1"; + sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; + }) + (fetchNuGet { + name = "System.Globalization.Calendars"; + version = "4.3.0"; + sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; + }) + (fetchNuGet { + name = "System.Globalization.Extensions"; + version = "4.0.1"; + sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; + }) + (fetchNuGet { + name = "System.Globalization.Extensions"; + version = "4.3.0"; + sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; + }) + (fetchNuGet { + name = "System.Globalization"; + version = "4.0.11"; + sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; + }) + (fetchNuGet { + name = "System.Globalization"; + version = "4.3.0"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + }) + (fetchNuGet { + name = "System.Interactive.Async"; + version = "3.1.1"; + sha256 = "03iq20gq0n2b2sdzs5jhxf46nzkfgvzip6q5248vka2rcvn1yanh"; + }) + (fetchNuGet { + name = "System.IO.Compression.ZipFile"; + version = "4.3.0"; + sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; + }) + (fetchNuGet { + name = "System.IO.Compression"; + version = "4.3.0"; + sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; + }) + (fetchNuGet { + name = "System.IO.FileSystem.Primitives"; + version = "4.0.1"; + sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; + }) + (fetchNuGet { + name = "System.IO.FileSystem.Primitives"; + version = "4.3.0"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; + }) + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.0.1"; + sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; + }) + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.3.0"; + sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; + }) + (fetchNuGet { + name = "System.IO.Pipelines"; + version = "4.7.2"; + sha256 = "16v4qaypm72cfsfqr8z3k6yrpzn0m3apgkh6aljfwpycdk150sf9"; + }) + (fetchNuGet { + name = "System.IO"; + version = "4.1.0"; + sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + }) + (fetchNuGet { + name = "System.IO"; + version = "4.3.0"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + }) + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.1.0"; + sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; + }) + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.3.0"; + sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; + }) + (fetchNuGet { + name = "System.Linq"; + version = "4.1.0"; + sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; + }) + (fetchNuGet { + name = "System.Linq"; + version = "4.3.0"; + sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; + }) + (fetchNuGet { + name = "System.Memory"; + version = "4.5.0"; + sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; + }) + (fetchNuGet { + name = "System.Memory"; + version = "4.5.3"; + sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; + }) + (fetchNuGet { + name = "System.Net.Http"; + version = "4.1.0"; + sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; + }) + (fetchNuGet { + name = "System.Net.Http"; + version = "4.3.0"; + sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; + }) + (fetchNuGet { + name = "System.Net.NameResolution"; + version = "4.0.0"; + sha256 = "0dj3pvpv069nyia28gkl4a0fb7q33hbxz2dg25qvpah3l7pbl0qh"; + }) + (fetchNuGet { + name = "System.Net.NameResolution"; + version = "4.3.0"; + sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; + }) + (fetchNuGet { + name = "System.Net.Primitives"; + version = "4.0.11"; + sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; + }) + (fetchNuGet { + name = "System.Net.Primitives"; + version = "4.3.0"; + sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; + }) + (fetchNuGet { + name = "System.Net.Requests"; + version = "4.0.11"; + sha256 = "13mka55sa6dg6nw4zdrih44gnp8hnj5azynz47ljsh2791lz3d9h"; + }) + (fetchNuGet { + name = "System.Net.Security"; + version = "4.3.0"; + sha256 = "1aa5igz31ivk6kpgsrwck3jccab7wd88wr52lddmgypmbh9mmf87"; + }) + (fetchNuGet { + name = "System.Net.Sockets"; + version = "4.1.0"; + sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; + }) + (fetchNuGet { + name = "System.Net.Sockets"; + version = "4.3.0"; + sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; + }) + (fetchNuGet { + name = "System.Net.WebHeaderCollection"; + version = "4.0.1"; + sha256 = "10bxpxj80c4z00z3ksrfswspq9qqsw8jwxcbzvymzycb97m9b55q"; + }) + (fetchNuGet { + name = "System.Net.WebHeaderCollection"; + version = "4.3.0"; + sha256 = "0ms3ddjv1wn8sqa5qchm245f3vzzif6l6fx5k92klqpn7zf4z562"; + }) + (fetchNuGet { + name = "System.Net.WebSockets.Client"; + version = "4.3.2"; + sha256 = "103y8lfsfa5xd1sqmq9sml4qyp4rij2i3fnnw119h119hb04l0rk"; + }) + (fetchNuGet { + name = "System.Net.WebSockets"; + version = "4.3.0"; + sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; + }) + (fetchNuGet { + name = "System.ObjectModel"; + version = "4.0.12"; + sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; + }) + (fetchNuGet { + name = "System.ObjectModel"; + version = "4.3.0"; + sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.ILGeneration"; + version = "4.0.1"; + sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.ILGeneration"; + version = "4.3.0"; + sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + version = "4.0.1"; + sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + version = "4.3.0"; + sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.0.1"; + sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.3.0"; + sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + }) + (fetchNuGet { + name = "System.Reflection.Extensions"; + version = "4.0.1"; + sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; + }) + (fetchNuGet { + name = "System.Reflection.Extensions"; + version = "4.3.0"; + sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; + }) + (fetchNuGet { + name = "System.Reflection.Metadata"; + version = "1.6.0"; + sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; + }) + (fetchNuGet { + name = "System.Reflection.Primitives"; + version = "4.0.1"; + sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; + }) + (fetchNuGet { + name = "System.Reflection.Primitives"; + version = "4.3.0"; + sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; + }) + (fetchNuGet { + name = "System.Reflection.TypeExtensions"; + version = "4.1.0"; + sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; + }) + (fetchNuGet { + name = "System.Reflection.TypeExtensions"; + version = "4.3.0"; + sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; + }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.1.0"; + sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; + }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.3.0"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + }) + (fetchNuGet { + name = "System.Resources.ResourceManager"; + version = "4.0.1"; + sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; + }) + (fetchNuGet { + name = "System.Resources.ResourceManager"; + version = "4.3.0"; + sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.3.0"; + sha256 = "149xcsa1pphlrc2zfmca9n822g4mxk7s2a44phvf34r0fajm3hk8"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.4.0"; + sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.5.0"; + sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.5.2"; + sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.6.0"; + sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.7.0"; + sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; + }) + (fetchNuGet { + name = "System.Runtime.Extensions"; + version = "4.1.0"; + sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; + }) + (fetchNuGet { + name = "System.Runtime.Extensions"; + version = "4.3.0"; + sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; + }) + (fetchNuGet { + name = "System.Runtime.Handles"; + version = "4.0.1"; + sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; + }) + (fetchNuGet { + name = "System.Runtime.Handles"; + version = "4.3.0"; + sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.0.0"; + sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.3.0"; + sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.1.0"; + sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.3.0"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + }) + (fetchNuGet { + name = "System.Runtime.Numerics"; + version = "4.0.1"; + sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; + }) + (fetchNuGet { + name = "System.Runtime.Numerics"; + version = "4.3.0"; + sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Formatters"; + version = "4.3.0"; + sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Primitives"; + version = "4.1.1"; + sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Primitives"; + version = "4.3.0"; + sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.1.0"; + sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }) + (fetchNuGet { + name = "System.Security.AccessControl"; + version = "4.5.0"; + sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; + }) + (fetchNuGet { + name = "System.Security.Claims"; + version = "4.0.1"; + sha256 = "03dw0ls49bvsrffgwycyifjgz0qzr9r85skqhdyhfd51fqf398n6"; + }) + (fetchNuGet { + name = "System.Security.Claims"; + version = "4.3.0"; + sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Algorithms"; + version = "4.2.0"; + sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Algorithms"; + version = "4.3.0"; + sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Cng"; + version = "4.2.0"; + sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Cng"; + version = "4.3.0"; + sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Csp"; + version = "4.0.0"; + sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Csp"; + version = "4.3.0"; + sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Encoding"; + version = "4.0.0"; + sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Encoding"; + version = "4.3.0"; + sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.OpenSsl"; + version = "4.0.0"; + sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Primitives"; + version = "4.0.0"; + sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Primitives"; + version = "4.3.0"; + sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.ProtectedData"; + version = "4.5.0"; + sha256 = "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.X509Certificates"; + version = "4.1.0"; + sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.X509Certificates"; + version = "4.3.0"; + sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; + }) + (fetchNuGet { + name = "System.Security.Permissions"; + version = "4.5.0"; + sha256 = "192ww5rm3c9mirxgl1nzyrwd18am3izqls0hzm0fvcdjl5grvbhm"; + }) + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "4.0.0"; + sha256 = "1d3vc8i0zss9z8p4qprls4gbh7q4218l9845kclx7wvw41809k6z"; + }) + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "4.3.0"; + sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; + }) + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "4.5.0"; + sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; + }) + (fetchNuGet { + name = "System.Security.Principal"; + version = "4.0.1"; + sha256 = "1nbzdfqvzzbgsfdd5qsh94d7dbg2v4sw0yx6himyn52zf8z6007p"; + }) + (fetchNuGet { + name = "System.Security.Principal"; + version = "4.3.0"; + sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; + }) + (fetchNuGet { + name = "System.Text.Encoding.CodePages"; + version = "4.5.1"; + sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; + }) + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.0.11"; + sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; + }) + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.3.0"; + sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; + }) + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.0.11"; + sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; + }) + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.3.0"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + }) + (fetchNuGet { + name = "System.Text.Encodings.Web"; + version = "4.4.0"; + sha256 = "05qp3yivh6gz0vva0v3wjlj3g1b45d5jmz362f2y8ah6yb3rx088"; + }) + (fetchNuGet { + name = "System.Text.Json"; + version = "4.7.0"; + sha256 = "0fp3xrysccm5dkaac4yb51d793vywxks978kkl5x4db9gw29rfdr"; + }) + (fetchNuGet { + name = "System.Text.Json"; + version = "4.7.2"; + sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; + }) + (fetchNuGet { + name = "System.Text.RegularExpressions"; + version = "4.1.0"; + sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; + }) + (fetchNuGet { + name = "System.Text.RegularExpressions"; + version = "4.3.0"; + sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; + }) + (fetchNuGet { + name = "System.Threading.Channels"; + version = "4.5.0"; + sha256 = "0n6z3wjia7h2a5vl727p97riydnb6jhhkb1pdcnizza02dwkz0nz"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.0.0"; + sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.3.0"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.5.3"; + sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; + }) + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.0.11"; + sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; + }) + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.3.0"; + sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; + }) + (fetchNuGet { + name = "System.Threading.Thread"; + version = "4.0.0"; + sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; + }) + (fetchNuGet { + name = "System.Threading.ThreadPool"; + version = "4.0.10"; + sha256 = "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx"; + }) + (fetchNuGet { + name = "System.Threading.ThreadPool"; + version = "4.3.0"; + sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; + }) + (fetchNuGet { + name = "System.Threading.Timer"; + version = "4.0.1"; + sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; + }) + (fetchNuGet { + name = "System.Threading.Timer"; + version = "4.3.0"; + sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; + }) + (fetchNuGet { + name = "System.Threading"; + version = "4.0.11"; + sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; + }) + (fetchNuGet { + name = "System.Threading"; + version = "4.3.0"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }) + (fetchNuGet { + name = "System.Xml.ReaderWriter"; + version = "4.0.11"; + sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; + }) + (fetchNuGet { + name = "System.Xml.ReaderWriter"; + version = "4.3.0"; + sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; + }) + (fetchNuGet { + name = "System.Xml.XDocument"; + version = "4.0.11"; + sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; + }) + (fetchNuGet { + name = "System.Xml.XDocument"; + version = "4.3.0"; + sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; + }) + (fetchNuGet { + name = "System.Xml.XmlDocument"; + version = "4.0.1"; + sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; + }) + (fetchNuGet { + name = "System.Xml.XmlDocument"; + version = "4.3.0"; + sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; + }) + (fetchNuGet { + name = "System.Xml.XPath.XmlDocument"; + version = "4.0.1"; + sha256 = "0l7yljgif41iv5g56l3nxy97hzzgck2a7rhnfnljhx9b0ry41bvc"; + }) + (fetchNuGet { + name = "System.Xml.XPath"; + version = "4.0.1"; + sha256 = "0fjqgb6y66d72d5n8qq1h213d9nv2vi8mpv8p28j3m9rccmsh04m"; + }) + (fetchNuGet { + name = "Text.Analyzers"; + version = "2.6.4"; + sha256 = "1fm3gjnbfnjap3wphx5x48awriy14a2g3s9c1nc4m8w85k8mqdsl"; + }) + (fetchNuGet { + name = "TwentyTwenty.Storage.Amazon"; + version = "2.12.1"; + sha256 = "03nrkvhki35w1rqx94s97rwxl0qwqlczyiimhrkc72vjppn5p6ph"; + }) + (fetchNuGet { + name = "TwentyTwenty.Storage.Azure"; + version = "2.12.1"; + sha256 = "10q7gpr8kmgzmxrzj3paqlnw4d8li8scwpxkzs11ildscfp6hvlv"; + }) + (fetchNuGet { + name = "TwentyTwenty.Storage.Google"; + version = "2.12.1"; + sha256 = "0d8s7p9brp03h9dpv3wxnqg0xsm7d9p4k6dpxpb9jak535khxzhp"; + }) + (fetchNuGet { + name = "TwentyTwenty.Storage.Local"; + version = "2.12.1"; + sha256 = "1zmjqwd1v3z78ab4vdmaadh94465k1qgpv7ylv8x3sdx4z78yjm8"; + }) + (fetchNuGet { + name = "TwentyTwenty.Storage"; + version = "2.12.1"; + sha256 = "0m41dxzc3hh0f4j1k4q915pvcq6zr0hv1pj6b3sayrn8vjhk64qb"; + }) + (fetchNuGet { + name = "U2F.Core"; + version = "1.0.4"; + sha256 = "0mk32yyihigp9njs54z411fswgzr6x3kw134c7ylwy2d2wmq2n9b"; + }) + (fetchNuGet { + name = "WindowsAzure.Storage"; + version = "9.3.3"; + sha256 = "14b0b0nj85yvyn0h8ghr3kj6di2nkbzjxc2q98f1wcr0151xvdfx"; + }) + (fetchNuGet { + name = "xunit.abstractions"; + version = "2.0.3"; + sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; + }) + (fetchNuGet { + name = "xunit.analyzers"; + version = "0.10.0"; + sha256 = "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j"; + }) + (fetchNuGet { + name = "xunit.assert"; + version = "2.4.1"; + sha256 = "1imynzh80wxq2rp9sc4gxs4x1nriil88f72ilhj5q0m44qqmqpc6"; + }) + (fetchNuGet { + name = "xunit.core"; + version = "2.4.1"; + sha256 = "1nnb3j4kzmycaw1g76ii4rfqkvg6l8gqh18falwp8g28h802019a"; + }) + (fetchNuGet { + name = "xunit.extensibility.core"; + version = "2.4.1"; + sha256 = "103qsijmnip2pnbhciqyk2jyhdm6snindg5z2s57kqf5pcx9a050"; + }) + (fetchNuGet { + name = "xunit.extensibility.execution"; + version = "2.4.1"; + sha256 = "1pbilxh1gp2ywm5idfl0klhl4gb16j86ib4x83p8raql1dv88qia"; + }) + (fetchNuGet { + name = "xunit.runner.visualstudio"; + version = "2.4.2"; + sha256 = "0fi85h43nyrhfc5jzg07znh01r7cpb7bpjdc6mzb9z1pm14ppfm6"; + }) + (fetchNuGet { + name = "xunit"; + version = "2.4.1"; + sha256 = "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20"; + }) + (fetchNuGet { + name = "YamlDotNet"; + version = "8.0.0"; + sha256 = "09hr1jimmfhcpk97p963y94h2k5p7wzcj4mpwqpdnwzbyrp2flpm"; + }) +] diff --git a/pkgs/applications/blockchains/btcpayserver/update.sh b/pkgs/applications/blockchains/btcpayserver/update.sh new file mode 100755 index 00000000000..1f7dbedd020 --- /dev/null +++ b/pkgs/applications/blockchains/btcpayserver/update.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -euo pipefail + +scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) + +"$scriptDir"/../nbxplorer/util/update-common.sh btcpayserver "$scriptDir"/deps.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d1b7065ed8..b1a97067fc9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24377,6 +24377,8 @@ in }; btc1d = btc1.override { withGui = false; }; + btcpayserver = callPackage ../applications/blockchains/btcpayserver { }; + cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { }; dashpay = callPackage ../applications/blockchains/dashpay.nix { }; From 9be28ee3615d8c26e01b29103390a25634b0845e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 5 Sep 2020 15:50:54 +0200 Subject: [PATCH 19/69] libxsmm: 1.15 -> 1.16.1, improve derivation The following changes are made to the derivation besides the version bump: - Move all buildInputs to nativeBuildInputs. - Switch from Python 2 to Python 3. - Build a dynamic library by default. - Use gfortran version corresponding to gcc version. - Enable parallel building. --- .../development/libraries/libxsmm/default.nix | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/libxsmm/default.nix b/pkgs/development/libraries/libxsmm/default.nix index 25c85948608..394347277f6 100644 --- a/pkgs/development/libraries/libxsmm/default.nix +++ b/pkgs/development/libraries/libxsmm/default.nix @@ -1,9 +1,11 @@ -{ stdenv, fetchFromGitHub, coreutils, gfortran7, gnused -, python27, utillinux, which, bash +{ stdenv, fetchFromGitHub, coreutils, gfortran, gnused +, python3, utillinux, which + +, enableStatic ? false }: let - version = "1.15"; + version = "1.16.1"; in stdenv.mkDerivation { pname = "libxsmm"; inherit version; @@ -11,31 +13,40 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "hfp"; repo = "libxsmm"; - rev = "refs/tags/${version}"; - sha256 = "1406qk7k2k4qfqy4psqk55iihsrx91w8kjgsa82jxj50nl9nw5nj"; + rev = version; + sha256 = "1c1qj6hcdfx11bvilnly92vgk1niisd2bjw1s8vfyi2f7ws1wnp0"; }; - buildInputs = [ + nativeBuildInputs = [ coreutils - gfortran7 + gfortran gnused - python27 + python3 utillinux which ]; + enableParallelBuilding = true; + + dontConfigure = true; + + makeFlags = let + static = if enableStatic then "1" else "0"; + in [ + "OMP=1" + "PREFIX=$(out)" + "STATIC=${static}" + ]; + prePatch = '' patchShebangs . ''; - makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { description = "Library targeting Intel Architecture for specialized dense and sparse matrix operations, and deep learning primitives"; license = licenses.bsd3; homepage = "https://github.com/hfp/libxsmm"; platforms = platforms.linux; maintainers = with stdenv.lib.maintainers; [ chessai ]; - inherit version; }; } From 8cb1e75e3b6766322067bd6d6e933eb66c702f9f Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sun, 13 Sep 2020 16:57:05 +0300 Subject: [PATCH 20/69] wordgrinder: fix build --- pkgs/applications/office/wordgrinder/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index c2ccbabe2f1..6438bed4828 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" "LUA_INCLUDE=${lua52Packages.lua}/include" "LUA_LIB=${lua52Packages.lua}/lib/liblua.so" + "OBJDIR=$TMP/wg-build" ]; preBuild = stdenv.lib.optionalString stdenv.isLinux '' From 19b5ef48fc8d3a4ea00a993ea888479647538537 Mon Sep 17 00:00:00 2001 From: Andrei Lapshin Date: Mon, 14 Sep 2020 14:51:35 +0300 Subject: [PATCH 21/69] nixos/plasma5: Fix build with config.services.colord.enable = true Fix build with enabled colord service after https://github.com/NixOS/nixpkgs/pull/97456 --- nixos/modules/services/x11/desktop-managers/plasma5.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 205410852f6..049515c969a 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -309,7 +309,7 @@ in ++ lib.optional config.networking.networkmanager.enable plasma-nm ++ lib.optional config.hardware.pulseaudio.enable plasma-pa ++ lib.optional config.powerManagement.enable powerdevil - ++ lib.optional config.services.colord.enable colord-kde + ++ lib.optional config.services.colord.enable pkgs.colord-kde ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ] ++ lib.optional config.services.xserver.wacom.enable wacomtablet; From 88363a870400d0978266469405f818b77a86df6f Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 15 Sep 2020 02:33:30 +0200 Subject: [PATCH 22/69] matomo: 3.14.0 -> 3.14.1 --- pkgs/servers/web-apps/matomo/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 22b1bf200ed..eca43dc6f13 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -3,16 +3,16 @@ let versions = { matomo = { - version = "3.14.0"; - sha256 = "05ycc4k4w01212pklzgxrbwpzp572jmj8i9ija6s7c01071yjjzv"; + version = "3.14.1"; + sha256 = "0gp6v797118z703nh0p77zvsizvdg0c2jkn26996d4sqw5pa78v3"; }; matomo-beta = { - version = "3.14.0"; + version = "3.14.1"; # `beta` examples: "b1", "rc1", null # TOOD when updating: use null if stable version is >= latest beta or release candidate beta = null; - sha256 = "05ycc4k4w01212pklzgxrbwpzp572jmj8i9ija6s7c01071yjjzv"; + sha256 = "0gp6v797118z703nh0p77zvsizvdg0c2jkn26996d4sqw5pa78v3"; }; }; common = pname: { version, sha256, beta ? null }: From 43d588b0afd4223f0d6b724d29d59ff81587eda2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 15 Sep 2020 11:01:19 -0700 Subject: [PATCH 23/69] python3Packages.ihatemoney: disable sandbox unfriendly tests, fix passthru --- .../python-modules/ihatemoney/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ihatemoney/default.nix b/pkgs/development/python-modules/ihatemoney/default.nix index bcca68600e9..3e36b4dd8e2 100644 --- a/pkgs/development/python-modules/ihatemoney/default.nix +++ b/pkgs/development/python-modules/ihatemoney/default.nix @@ -30,6 +30,7 @@ , wtforms , psycopg2 # optional, for postgresql support , flask_testing +, pytestCheckHook }: # ihatemoney is not really a library. It will only ever be imported @@ -113,12 +114,19 @@ buildPythonPackage rec { ]; checkInputs = [ - flask_testing + flask_testing pytestCheckHook + ]; + + pytestFlagsArray = [ "--pyargs ihatemoney.tests.tests" ]; + disabledTests = [ + "test_notifications" # requires running service. + "test_invite" # requires running service. ]; passthru.tests = { - inherit (nixosTests) ihatemoney; + inherit (nixosTests.ihatemoney) ihatemoney-postgresql ihatemoney-sqlite; }; + meta = with lib; { homepage = "https://ihatemoney.org"; description = "A simple shared budget manager web application"; From 07660b28bc74f2d0422731b60174cc16920a82a7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 15 Sep 2020 11:19:26 -0700 Subject: [PATCH 24/69] streamlit: fix build --- .../science/machine-learning/streamlit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/machine-learning/streamlit/default.nix b/pkgs/applications/science/machine-learning/streamlit/default.nix index 3856b8ec841..26b241ff0ad 100644 --- a/pkgs/applications/science/machine-learning/streamlit/default.nix +++ b/pkgs/applications/science/machine-learning/streamlit/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonApplication, fetchPypi , altair, astor, base58, blinker, boto3, botocore, click, enum-compat - , future, pillow, protobuf, requests, toml, tornado, tzlocal, validators, watchdog + , future, pillow, protobuf, requests, toml, tornado_5, tzlocal, validators, watchdog , jinja2, setuptools }: @@ -16,7 +16,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ altair astor base58 blinker boto3 botocore click enum-compat - future pillow protobuf requests toml tornado tzlocal validators watchdog + future pillow protobuf requests toml tornado_5 tzlocal validators watchdog jinja2 setuptools ]; From 21779aece5848870fd47b7dbfb55823e7355f6a8 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 16 Sep 2020 15:45:37 +0200 Subject: [PATCH 25/69] matrix-synapse: 1.19.1 -> 1.19.2 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index f788057e386..3758505edba 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -9,11 +9,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.19.1"; + version = "1.19.2"; src = fetchPypi { inherit pname version; - sha256 = "0ddn3g3q0nkxpmw0xpjhnl0m1g3lrlp89abqbal9k6n689h6kfly"; + sha256 = "0q2w3aid6xsn1ibpsl3wf6m7vl0znngz8n717rx1jndz4s6014nj"; }; patches = [ From d39013b183b27809bd1b3e32a8c81088ec32cb65 Mon Sep 17 00:00:00 2001 From: Titouan Date: Wed, 16 Sep 2020 16:30:52 +0200 Subject: [PATCH 26/69] micro: 2.0.5 -> 2.0.7 --- pkgs/applications/editors/micro/default.nix | 4 ++-- pkgs/applications/editors/micro/deps.nix | 17 +++++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix index 4a8c176f575..ffef5d5fdde 100644 --- a/pkgs/applications/editors/micro/default.nix +++ b/pkgs/applications/editors/micro/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "micro"; - version = "2.0.5"; + version = "2.0.7"; goPackagePath = "github.com/zyedidia/micro"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "zyedidia"; repo = pname; rev = "v${version}"; - sha256 = "12fyyax1mr0n82s5yhmk90iyyzbh32rppkkpj37c25pal73czdhc"; + sha256 = "07ck1a9arklic3p0z50wcg608cvpba1kljvlfb4fljr6jhv5cmkb"; fetchSubmodules = true; }; diff --git a/pkgs/applications/editors/micro/deps.nix b/pkgs/applications/editors/micro/deps.nix index c274ce80ada..d1cb91c2959 100644 --- a/pkgs/applications/editors/micro/deps.nix +++ b/pkgs/applications/editors/micro/deps.nix @@ -189,6 +189,15 @@ sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; }; } + { + goPackagePath = "github.com/xo/terminfo"; + fetch = { + type = "git"; + url = "https://github.com/xo/terminfo"; + rev = "454e5b68f9e8"; + sha256 = "0xvjb09nwbanp7ja4560pwb6b2xr9h0axyr7f5clgncca2k4f1pd"; + }; + } { goPackagePath = "github.com/yuin/gopher-lua"; fetch = { @@ -203,8 +212,8 @@ fetch = { type = "git"; url = "https://github.com/zyedidia/clipboard"; - rev = "7c45b8673834"; - sha256 = "0ag36wd3830d4s6fvpj05v6f662c5rymgdydsj2gq8aaqplfb0v4"; + rev = "v1.0.3"; + sha256 = "134vnx0r51f08b37yaymlxlfl14qv6r8yzgqz7dxxn1zw9197b3q"; }; } { @@ -257,8 +266,8 @@ fetch = { type = "git"; url = "https://github.com/zyedidia/tcell"; - rev = "v1.4.7"; - sha256 = "1ddaznp0haz35mxfjjh2fmamdrlk1igqg65fz22l5r6vvhcdsfxa"; + rev = "v2.0.2"; + sha256 = "0fr7zm6zcir2bjll5ycdxy9m98gjr3ins7mzmqpd46b3njzbl75z"; }; } { From 70399cc1ce0e182a96e823ebfb0521f5f45d5901 Mon Sep 17 00:00:00 2001 From: Felix Tenley Date: Tue, 8 Sep 2020 23:38:24 +0200 Subject: [PATCH 27/69] maintainers: add felschr --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d4131829314..c6c14b438eb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2805,6 +2805,16 @@ githubId = 541748; name = "Felipe Espinoza"; }; + felschr = { + email = "dev@felschr.com"; + github = "felschr"; + githubId = 3314323; + name = "Felix Tenley"; + keys = [{ + longkeyid = "ed25519/0x910ACB9F6BD26F58"; + fingerprint = "6AB3 7A28 5420 9A41 82D9 0068 910A CB9F 6BD2 6F58"; + }]; + }; ffinkdevs = { email = "fink@h0st.space"; github = "ffinkdevs"; From b1423ee641f16d2470fd4744dc48cf71ed5ae3f3 Mon Sep 17 00:00:00 2001 From: Felix Tenley Date: Tue, 8 Sep 2020 23:51:57 +0200 Subject: [PATCH 28/69] filebot: init at 4.9.1 --- pkgs/applications/video/filebot/default.nix | 54 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/applications/video/filebot/default.nix diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix new file mode 100644 index 00000000000..cdd70b4c894 --- /dev/null +++ b/pkgs/applications/video/filebot/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchurl, openjdk11, makeWrapper, autoPatchelfHook +, zlib, libzen, libmediainfo, curl, libmms, glib +}: + +let + # FileBot requires libcurl-gnutls.so to build + curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; }; + +in + +stdenv.mkDerivation rec { + pname = "filebot"; + version = "4.9.1"; + + src = fetchurl { + url = "https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz"; + sha256 = "0l496cz703mjymjhgmyrkqbfld1bz53pdsbkx00h9a267j22fkms"; + }; + + unpackPhase = "tar xvf $src"; + + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; + + buildInputs = [ zlib libzen libmediainfo curlWithGnuTls libmms glib ]; + + dontBuild = true; + installPhase = '' + mkdir -p $out/opt $out/bin + # Since FileBot has dependencies on relative paths between files, all required files are copied to the same location as is. + cp -r filebot.sh lib/ jar/ $out/opt/ + # Filebot writes to $APP_DATA, which fails due to read-only filesystem. Using current user .local directory instead. + substituteInPlace $out/opt/filebot.sh \ + --replace 'APP_DATA="$FILEBOT_HOME/data/$USER"' 'APP_DATA=''${XDG_DATA_HOME:-$HOME/.local/share}/filebot/data' \ + --replace '$FILEBOT_HOME/data/.license' '$APP_DATA/.license' + wrapProgram $out/opt/filebot.sh \ + --prefix PATH : ${stdenv.lib.makeBinPath [ openjdk11 ]} + # Expose the binary in bin to make runnable. + ln -s $out/opt/filebot.sh $out/bin/filebot + ''; + + meta = with stdenv.lib; { + description = "The ultimate TV and Movie Renamer"; + longDescription = '' + FileBot is the ultimate tool for organizing and renaming your Movies, TV + Shows and Anime as well as fetching subtitles and artwork. It's smart and + just works. + ''; + homepage = "https://filebot.net"; + changelog = "https://www.filebot.net/forums/viewforum.php?f=7"; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ gleber felschr ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c027cfbeca5..27cb10ff727 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1945,6 +1945,8 @@ in filebench = callPackage ../tools/misc/filebench { }; + filebot = callPackage ../applications/video/filebot { }; + fileshare = callPackage ../servers/fileshare {}; fileshelter = callPackage ../servers/web-apps/fileshelter { }; From 9839c0b292a35f77aefe8c1ff319a455ba6dcbee Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Wed, 16 Sep 2020 08:40:01 -0700 Subject: [PATCH 29/69] verilator: 4.040 -> 4.100 Signed-off-by: Pamplemousse --- pkgs/applications/science/electronics/verilator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 9c59ad3a394..ce8ebe42ea8 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "verilator"; - version = "4.040"; + version = "4.100"; src = fetchurl { url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; - sha256 = "1qy0wllsmxva3c838spxwmacxx36r3njxwhgp172m4l3829785bf"; + sha256 = "0vg1gk1hqlnz74gfpf57588758myxvhqzi37yl4vqjcq40r83nr2"; }; enableParallelBuilding = true; From b6b616bbe59dc4ad0afe521c874b0a8f0b019dd0 Mon Sep 17 00:00:00 2001 From: meutraa Date: Wed, 16 Sep 2020 15:49:33 +0100 Subject: [PATCH 30/69] androidStudioPackages.beta: 4.1.0.17 -> 4.1.0.18 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index c0b404c9285..964a1cd7ae1 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -14,9 +14,9 @@ let sha256Hash = "15vm7fvi8c286wx9f28z6ysvm8wqqda759qql0zy9simwx22gy7j"; }; betaVersion = { - version = "4.1.0.17"; # "Android Studio 4.1 RC 2" - build = "201.6776251"; - sha256Hash = "sha256-3W+eUcffRk7lZxbvf3X/Np4hkwAUqU51sQ061XR7Ddc="; + version = "4.1.0.18"; # "Android Studio 4.1 RC 3" + build = "201.6823847"; + sha256Hash = "sha256-qbxmR9g8DSKzcP09bJuc+am79BSXWG39UQxFEb1bZ88="; }; latestVersion = { # canary & dev version = "4.2.0.10"; # "Android Studio 4.2 Canary 10" From 6a8415c93fd5045f3c640fad025b1f8068d1aefa Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 16 Sep 2020 18:04:08 +0200 Subject: [PATCH 31/69] python3Packages.google_api_python_client: 1.11.0 -> 1.12.1 --- .../python-modules/google-api-python-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 492a0519d18..14a9c7841a8 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.11.0"; + version = "1.12.1"; src = fetchPypi { inherit pname version; - sha256 = "0yxrz897kpjypfqzcy0ry90hc34w47q4fzqidp81h6pg01c03x6a"; + sha256 = "ddadc243ce627512c2a27e11d369f5ddf658ef80dbffb247787499486ef1ea98"; }; # No tests included in archive From 99ae3e932bb0d8ba203be162d15ecd3dfd5558dd Mon Sep 17 00:00:00 2001 From: Titouan Date: Wed, 16 Sep 2020 18:55:51 +0200 Subject: [PATCH 32/69] mkvtoolnix: 48.0.0 -> 50.0.0 --- pkgs/applications/video/mkvtoolnix/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 9b2c8f83577..fa68c58f5af 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv, drake , ruby, docbook_xsl, file, xdg_utils, gettext, expat, boost, libebml, zlib -, fmt, libmatroska, libogg, libvorbis, flac, libxslt, cmark +, fmt, libmatroska, libogg, libvorbis, flac, libxslt, cmark, pcre2 , withGUI ? true , qtbase ? null , qtmultimedia ? null @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "48.0.0"; + version = "50.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "0lbl3w2m12blymda3m00afl9racgahvl0z4b2clwbawhvypc5vfc"; + sha256 = "001i206lwxjyrp406svv4zpb1pliac3f4k5zhzgkjbk2dzj85pyd"; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat file xdg_utils boost libebml zlib fmt - libmatroska libogg libvorbis flac cmark + libmatroska libogg libvorbis flac cmark pcre2 ] ++ optional stdenv.isDarwin libiconv ++ optionals withGUI [ qtbase qtmultimedia wrapQtAppsHook ]; From 5e8db8802bda69a09b58a66c7af0dcb57b77d6f5 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 16 Sep 2020 20:12:46 +0200 Subject: [PATCH 33/69] transcribe: drop --- .../applications/audio/transcribe/default.nix | 73 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 75 deletions(-) delete mode 100644 pkgs/applications/audio/transcribe/default.nix diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix deleted file mode 100644 index d9469fa4b7a..00000000000 --- a/pkgs/applications/audio/transcribe/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv, fetchzip, wrapGAppsHook, alsaLib, atk, cairo, gdk-pixbuf -, glib, gst_all_1, gtk3, libSM, libX11, libpng12, pango, zlib }: - -stdenv.mkDerivation rec { - pname = "transcribe"; - version = "8.72"; - - src = if stdenv.hostPlatform.system == "i686-linux" then - fetchzip { - url = "https://www.seventhstring.com/xscribe/downlinux32/xscsetup.tar.gz"; - sha256 = "1h5l7ry9c9awpxfnd29b0wm973ifrhj17xl5d2fdsclw2swsickb"; - } - else if stdenv.hostPlatform.system == "x86_64-linux" then - fetchzip { - url = "https://www.seventhstring.com/xscribe/downlinux64/xsc64setup.tar.gz"; - sha256 = "1rpd3ppnx5i5yrnfbjrx7h7dk48kwl99i9lnpa75ap7nxvbiznm0"; - } - else throw "Platform not supported"; - - nativeBuildInputs = [ wrapGAppsHook ]; - - buildInputs = with gst_all_1; [ gst-plugins-base gst-plugins-good - gst-plugins-bad gst-plugins-ugly ]; - - dontPatchELF = true; - - libPath = with gst_all_1; stdenv.lib.makeLibraryPath [ - stdenv.cc.cc glib gtk3 atk pango cairo gdk-pixbuf alsaLib - libX11 libSM libpng12 gstreamer gst-plugins-base zlib - ]; - - installPhase = '' - mkdir -p $out/bin $out/libexec $out/share/doc - cp transcribe $out/libexec - cp xschelp.htb readme_gtk.html $out/share/doc - cp -r gtkicons $out/share/icons - - ln -s $out/share/doc/xschelp.htb $out/libexec - - patchelf \ - --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ - $out/libexec/transcribe - ''; - - preFixup = '' - gappsWrapperArgs+=( - --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH_1_0" - --prefix LD_LIBRARY_PATH : "${libPath}" - ) - ''; - - postFixup = '' - ln -s $out/libexec/transcribe $out/bin/ - ''; - - meta = with stdenv.lib; { - description = "Software to help transcribe recorded music"; - longDescription = '' - The Transcribe! application is an assistant for people who want - to work out a piece of music from a recording, in order to write - it out, or play it themselves, or both. It doesn't do the - transcribing for you, but it is essentially a specialised player - program which is optimised for the purpose of transcription. It - has many transcription-specific features not found on - conventional music players. - ''; - homepage = "https://www.seventhstring.com/xscribe/"; - license = licenses.unfree; - platforms = platforms.linux; - maintainers = with maintainers; [ michalrus ]; - broken = true; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0f21c24af67..006903efdc5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -601,6 +601,7 @@ mapAliases ({ torch-repl = throw "torch-repl has been removed, as the upstream project has been abandoned"; # added 2020-03-28 torchPackages = throw "torchPackages has been removed, as the upstream project has been abandoned"; # added 2020-03-28 trang = jing-trang; # added 2018-04-25 + transcribe = throw "transcribe has been removed after being marked a broken for over a year"; # added 2020-09-16 transmission_gtk = transmission-gtk; # added 2018-01-06 transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb345817569..179e9303783 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23520,8 +23520,6 @@ in transcode = callPackage ../applications/audio/transcode { }; - transcribe = callPackage ../applications/audio/transcribe { }; - transmission = callPackage ../applications/networking/p2p/transmission { }; transmission-gtk = transmission.override { enableGTK3 = true; }; transmission-qt = transmission.override { enableQt = true; }; From a4e50bb197f032ec447a13f56910ff035b32017f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Sep 2020 20:29:23 +0200 Subject: [PATCH 34/69] Revert "qutebrowser: use qt515 (#97586)" We are not going to add parameters to `python-packages.nix`. The proper way to do this is override Python, and pass in a custom `pkgs`. This reverts commit c1a0dfadea3c0f56d5213a677dbbd7b3e89ee98f. --- pkgs/top-level/all-packages.nix | 7 +------ pkgs/top-level/python-packages.nix | 7 +++++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1259c07e445..79a134c2d36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22829,12 +22829,7 @@ in quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; }; - qutebrowser = libsForQt515.callPackage ../applications/networking/browsers/qutebrowser { - python3Packages = python3Packages.override { - qt5 = qt515; - libsForQt5 = libsForQt515; - }; - }; + qutebrowser = libsForQt514.callPackage ../applications/networking/browsers/qutebrowser { }; rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 09d9f1f53a0..312527a39b5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9,13 +9,16 @@ { pkgs , stdenv , python -, qt5 -, libsForQt5 , overrides ? (self: super: {}) }: with pkgs.lib; +let + qt5 = pkgs.qt514; + libsForQt5 = pkgs.libsForQt514; +in + let packages = ( self: From c88f3adb1793cd3b007baff0292cf1fa8d0ab1e6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Sep 2020 20:54:28 +0200 Subject: [PATCH 35/69] pythonPackages: set qt version by overriding pkgs --- pkgs/top-level/all-packages.nix | 8 +++++++- pkgs/top-level/python-packages.nix | 31 +++++++++++++----------------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79a134c2d36..127bf01abd4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10158,7 +10158,13 @@ in python2Packages = python2.pkgs; python3Packages = python3.pkgs; - pythonInterpreters = callPackage ./../development/interpreters/python {}; + pythonInterpreters = callPackage ./../development/interpreters/python { + # Overrides that apply to all Python interpreters + pkgs = pkgs // { + qt5 = pkgs.qt514; + libsForQt5 = pkgs.libsForQt514; + }; + }; inherit (pythonInterpreters) python27 python36 python37 python38 python39 python3Minimal pypy27 pypy36; # Python package sets. diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 312527a39b5..b0bf49fe103 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14,11 +14,6 @@ with pkgs.lib; -let - qt5 = pkgs.qt514; - libsForQt5 = pkgs.libsForQt514; -in - let packages = ( self: @@ -3598,7 +3593,7 @@ in { maya = callPackage ../development/python-modules/maya { }; - mayavi = libsForQt5.callPackage ../development/python-modules/mayavi { + mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi { inherit buildPythonPackage isPy27 fetchPypi; inherit (self) pyface pygments numpy vtk traitsui envisage apptools pyqt5; }; @@ -4188,7 +4183,7 @@ in { ovh = callPackage ../development/python-modules/ovh { }; - ovito = toPythonModule (libsForQt5.callPackage ../development/python-modules/ovito { pythonPackages = self; }); + ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { pythonPackages = self; }); owslib = callPackage ../development/python-modules/owslib { }; @@ -4440,8 +4435,8 @@ in { pipx = callPackage ../development/python-modules/pipx { }; pivy = callPackage ../development/python-modules/pivy { - inherit (qt5) qtbase qmake; - inherit (libsForQt5) soqt; + inherit (pkgs.qt5) qtbase qmake; + inherit (pkgs.libsForQt5) soqt; }; pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkgconfig; }; @@ -4513,8 +4508,8 @@ in { pooch = callPackage ../development/python-modules/pooch { }; poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { - inherit (qt5) qtbase; - inherit (libsForQt5) poppler; + inherit (pkgs.qt5) qtbase; + inherit (pkgs.libsForQt5) poppler; inherit (pkgs) pkgconfig; }; @@ -5219,7 +5214,7 @@ in { pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkgconfig; }; - pyqt5 = libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; + pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; }; @@ -5232,7 +5227,7 @@ in { pyqtgraph = callPackage ../development/python-modules/pyqtgraph { }; - pyqtwebengine = libsForQt5.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; }; + pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; }; pyquery = callPackage ../development/python-modules/pyquery { }; @@ -5338,9 +5333,9 @@ in { pyshp = callPackage ../development/python-modules/pyshp { }; pyside2-tools = - toPythonModule (callPackage ../development/python-modules/pyside2-tools { inherit (pkgs) cmake; inherit qt5; }); + toPythonModule (callPackage ../development/python-modules/pyside2-tools { inherit (pkgs) cmake qt5; }); - pyside2 = toPythonModule (callPackage ../development/python-modules/pyside2 { inherit (pkgs) cmake ninja; inherit qt5; }); + pyside2 = toPythonModule (callPackage ../development/python-modules/pyside2 { inherit (pkgs) cmake ninja qt5; }); pyside = callPackage ../development/python-modules/pyside { inherit (pkgs) mesa; }; @@ -5941,7 +5936,7 @@ in { qscintilla-qt4 = callPackage ../development/python-modules/qscintilla { }; - qscintilla-qt5 = libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; }; + qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; }; qscintilla = self.qscintilla-qt4; @@ -6122,7 +6117,7 @@ in { roboschool = callPackage ../development/python-modules/roboschool { inherit (pkgs) pkgconfig; # use normal pkgconfig, not the python package - inherit (qt5) qtbase; + inherit (pkgs.qt5) qtbase; }; robot-detection = callPackage ../development/python-modules/robot-detection { }; @@ -6408,7 +6403,7 @@ in { shellingham = callPackage ../development/python-modules/shellingham { }; shiboken2 = - toPythonModule (callPackage ../development/python-modules/shiboken2 { inherit (pkgs) cmake llvmPackages; inherit qt5; }); + toPythonModule (callPackage ../development/python-modules/shiboken2 { inherit (pkgs) cmake llvmPackages qt5; }); shippai = callPackage ../development/python-modules/shippai { }; From 2daf5702c6d059976e203f2eab7ccb539dd9274d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Sep 2020 21:00:04 +0200 Subject: [PATCH 36/69] qutebrowser: use qt 5.15 Follow-up to a4e50bb197f032ec447a13f56910ff035b32017f. --- .../networking/browsers/qutebrowser/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 0e3e7205e1f..69ca08e990c 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchzip, python3Packages +{ stdenv, lib, fetchurl, fetchzip, python3 , mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, glib-networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , libxslt, gst_all_1 ? null @@ -10,6 +10,7 @@ assert withMediaPlayback -> gst_all_1 != null; let + python3Packages = python3.pkgs; pdfjs = let version = "2.4.456"; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 127bf01abd4..e0b3f75d76e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22835,7 +22835,20 @@ in quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; }; - qutebrowser = libsForQt514.callPackage ../applications/networking/browsers/qutebrowser { }; + qutebrowser = let + libsForQt5 = qt515; + qt5 = qt515; + python = python3.override { + packageOverrides = self: super: { + pkgs = pkgs // { + inherit libsForQt5 qt5; + }; + }; + self = python3; + }; + in libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { + python3 = python; + }; rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; From 00f16b7e0c7f4330567e781df17bbd48abf23c1b Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 16 Sep 2020 11:01:26 +0100 Subject: [PATCH 37/69] pythonPackages.pyslurm: mark as broken --- pkgs/development/python-modules/pyslurm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index f5169b68393..a113314aa40 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -22,5 +22,6 @@ buildPythonPackage rec { description = "Python bindings to Slurm"; license = licenses.gpl2; maintainers = with maintainers; [ bhipple ]; + broken = true; # still needs slurm-19.05, but nixpkgs has slurm-20+ now }; } From bfa35d8d119e9e5d7b2a9b927a5c608eb6bba5d5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Sep 2020 21:21:33 +0200 Subject: [PATCH 38/69] qutebrowser: fixup to 2daf5702c6d059976e203f2eab7ccb539dd9274d --- 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 e0b3f75d76e..8c81983742b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22836,7 +22836,7 @@ in quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; }; qutebrowser = let - libsForQt5 = qt515; + libsForQt5 = libsForQt515; qt5 = qt515; python = python3.override { packageOverrides = self: super: { From 5a6ec92badcbaf3405edb99ea197f4d036bcb96d Mon Sep 17 00:00:00 2001 From: Diego Rodriguez Date: Wed, 16 Sep 2020 14:34:36 -0600 Subject: [PATCH 39/69] eksctl: 0.26.0 -> 0.27.0 --- pkgs/tools/admin/eksctl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 7c240aa4131..74cc3f3f171 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "1av5w32ia68j2xrw4m16mzm9jn6xlap93kwi8iqw0s6wgihzadds"; + sha256 = "1yclffhr76jd5rzqi37bpdj524lmywmgcfr9r0ahacfkp1hxdn3v"; }; - vendorSha256 = "13sc4yrzgx2sm98whibfy2kjia3yy9cdvibvhbvg2lz2spprjb9v"; + vendorSha256 = "133g2d7l1szmpxjdg28yjm3pw6galwq8948rvalnh932kxngkxys"; doCheck = false; @@ -36,6 +36,6 @@ buildGoModule rec { description = "A CLI for Amazon EKS"; homepage = "https://github.com/weaveworks/eksctl"; license = licenses.asl20; - maintainers = with maintainers; [ xrelkd ]; + maintainers = with maintainers; [ xrelkd Chili-Man ]; }; } From e77d4ecac28f14f79eb0df3261e98ad70500eea4 Mon Sep 17 00:00:00 2001 From: Demyan Rogozhin Date: Wed, 16 Sep 2020 22:45:09 +0200 Subject: [PATCH 40/69] react-native-debugger: fix build --- pkgs/development/tools/react-native-debugger/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index f4cf500c2f9..ff1b669a253 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -71,7 +71,7 @@ in stdenv.mkDerivation rec { exec = "React\\ Native\\ Debugger"; desktopName = "React Native Debugger"; genericName = "React Native Debugger"; - categories = "Development;Tools;"; + categories = "Development;Debugger;"; }; meta = with stdenv.lib; { From 9dfcba812aa0f4dc374acfe0600d591885f4e274 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 16 Sep 2020 23:20:16 +0200 Subject: [PATCH 41/69] jwt-cli: 3.1.0 -> 3.2.1 --- pkgs/tools/security/jwt-cli/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix index 23c25accc93..728ea0a92da 100644 --- a/pkgs/tools/security/jwt-cli/default.nix +++ b/pkgs/tools/security/jwt-cli/default.nix @@ -2,27 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "jwt-cli"; - version = "3.1.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "mike-engel"; repo = pname; rev = version; - sha256 = "0pmxis3m3madwnmswz9hn0i8fz6a9bg11slgrrwql7mx23ijqf6y"; + sha256 = "07mnkr7hi29fyyyn7llb30p4ndiqz4gf1lnhm44qm09alaxmfvws"; }; - cargoSha256 = "165g1v0c8jxs8ddm8ld0hh7k8mvk3566ig43pf99hnw009fg1yc2"; - - patches = [ - # to fix `cargo test -- --test-threads $NIX_BUILD_CORES` - (fetchpatch { - url = "https://github.com/mike-engel/jwt-cli/commit/df87111f3084abdecce5d58ad031edb6e7fef94a.patch"; - sha256 = "1vjk7wy8ddkz9wjkiayag61gklrq59m7bwlaiyinjp4n15gx0j1k"; - }) - ]; + cargoSha256 = "0jkzy7ssg9v9phhlldq6s4rfs3sn17y2r1k0jr10g9j15lzixa04"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + doInstallCheck = true; + installCheckPhase = "$out/bin/jwt --version"; + meta = with stdenv.lib; { description = "Super fast CLI tool to decode and encode JWTs"; homepage = "https://github.com/mike-engel/jwt-cli"; From c603f6262868d7ea4893b83ad7ddd3e38714470b Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Wed, 16 Sep 2020 09:37:02 -0700 Subject: [PATCH 42/69] topydo: Don't fail build on tests Signed-off-by: Pamplemousse --- pkgs/applications/misc/topydo/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix index eb3894c7b47..6db651ff392 100644 --- a/pkgs/applications/misc/topydo/default.nix +++ b/pkgs/applications/misc/topydo/default.nix @@ -22,7 +22,14 @@ buildPythonApplication rec { watchdog ]; - checkInputs = [ mock freezegun coverage green pylint ]; + checkInputs = [ mock freezegun pylint ]; + + # Skip test that has been reported multiple times upstream without result: + # bram85/topydo#271, bram85/topydo#274. + checkPhase = '' + substituteInPlace test/test_revert_command.py --replace 'test_revert_ls' 'dont_test_revert_ls' + python -m unittest discover + ''; LC_ALL="en_US.UTF-8"; From 0561fdef057c93767d680a338bbf7f94064af9fe Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 16 Sep 2020 18:00:00 -0500 Subject: [PATCH 43/69] xonsh: 0.9.21 -> 0.9.22 https://github.com/xonsh/xonsh/releases/tag/0.9.22 --- pkgs/shells/xonsh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 751dd00efc7..e775ab04dc1 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.9.21"; + version = "0.9.22"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; rev = version; - sha256 = "16k8506fk54krpkls374cn3vm1dp9ixi0byh5xvi3m5a4bnbvrs0"; + sha256 = "04yd8y4lksmxbgl6v6bw1k32r8v5mia3sm8y9v39cgfzjbkvys1p"; }; LC_ALL = "en_US.UTF-8"; From 35593698d5dd49117d9d082174add68389f96e08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Thu, 17 Sep 2020 03:17:49 +0200 Subject: [PATCH 44/69] ntfy: Switch to python3. Also fixes test failure. Fixes test error: AttributeError: 'module' object has no attribute 'test_prowl' --- pkgs/tools/misc/ntfy/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/ntfy/default.nix b/pkgs/tools/misc/ntfy/default.nix index a3cf6ad07d5..593a8cfc637 100644 --- a/pkgs/tools/misc/ntfy/default.nix +++ b/pkgs/tools/misc/ntfy/default.nix @@ -1,6 +1,6 @@ -{ stdenv, pythonPackages, fetchFromGitHub }: +{ stdenv, python3Packages, fetchFromGitHub }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "ntfy"; version = "2.7.0"; @@ -11,11 +11,11 @@ pythonPackages.buildPythonApplication rec { sha256 = "09f02cn4i1l2aksb3azwfb70axqhn7d0d0vl2r6640hqr74nc1cv"; }; - checkInputs = with pythonPackages; [ + checkInputs = with python3Packages; [ mock ]; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ requests ruamel_yaml appdirs sleekxmpp dns emoji @@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec { ]; checkPhase = '' - HOME=$(mktemp -d) ${pythonPackages.python.interpreter} setup.py test + HOME=$(mktemp -d) ${python3Packages.python.interpreter} setup.py test ''; meta = with stdenv.lib; { From a2f450984ab3d5b02eb8cfa74de48668c4e83bff Mon Sep 17 00:00:00 2001 From: midchildan Date: Thu, 17 Sep 2020 10:48:11 +0900 Subject: [PATCH 45/69] maintainers.midchildan: update info --- maintainers/maintainer-list.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c6c14b438eb..d4adf05d883 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5552,10 +5552,14 @@ name = "Michael Mercier"; }; midchildan = { - email = "midchildan+nix@gmail.com"; + email = "git@midchildan.org"; github = "midchildan"; githubId = 7343721; name = "midchildan"; + keys = [{ + longkeyid = "rsa4096/0x186A1EDAC5C63F83"; + fingerprint = "FEF0 AE2D 5449 3482 5F06 40AA 186A 1EDA C5C6 3F83"; + }]; }; mikefaille = { email = "michael@faille.io"; From bc3d459cebb536122f0214779cc82432008d4041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Thu, 10 Sep 2020 00:21:43 +0200 Subject: [PATCH 46/69] release-notes: mention cinnamon --- nixos/doc/manual/release-notes/rl-2009.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 8bc51c906ae..009e2532a31 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -26,6 +26,12 @@ GNOME desktop environment was upgraded to 3.36, see its release notes. + + + The Cinnamon desktop environment (v4.6) has been added. services.xserver.desktopManager.cinnamon.enable = true; to try it out! + Remember that, with any new feature it's possible you could run into issues, so please send all support requests to github.com/NixOS/nixpkgs to notify the maintainers. + + maxx package removed along with services.xserver.desktopManager.maxx module. From eaf667bbf0060b93387fc1f57e028cf976f37bf1 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 17 Sep 2020 09:24:46 +0300 Subject: [PATCH 47/69] all-packages.nix: Remove trailing space for qutebrowser --- 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 8c81983742b..4c12a1104bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22846,7 +22846,7 @@ in }; self = python3; }; - in libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { + in libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { python3 = python; }; From ce0a59cb9fee380765455d7ef6802e6e0a28514e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Povi=C5=A1er?= Date: Thu, 17 Sep 2020 09:08:54 +0200 Subject: [PATCH 48/69] python3.pkgs.libiio: fix build Add missing setuptools dependency. --- pkgs/development/libraries/libiio/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index c4136428035..3c3ccf27884 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -7,6 +7,7 @@ , python , libusb1 , runtimeShell +, lib }: stdenv.mkDerivation rec { @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { python libxml2 libusb1 - ]; + ] ++ lib.optional python.isPy3k python.pkgs.setuptools; cmakeFlags = [ "-DUDEV_RULES_INSTALL_DIR=${placeholder "out"}/lib/udev/rules.d" From ec63faba640fd446a3111d89b3bc85d520478e01 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 17 Sep 2020 06:05:20 +1000 Subject: [PATCH 49/69] gitAndTools.gh: 0.12.0 -> 1.0.0 https://github.com/cli/cli/releases/tag/v1.0.0 --- .../version-management/git-and-tools/gh/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 09d50d5a11c..13fe6cf4ef8 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,20 +2,21 @@ buildGoModule rec { pname = "gh"; - version = "0.12.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "1nwpqwr8sqqpndj7qsk935i1675f4qdbl31x60a038l9iiwc28x1"; + sha256 = "10ixjrb56ddqxla7mfxqnf74zissjx66akcyvgl9xfmww0bvg64x"; }; - vendorSha256 = "1m5ahzh5sfla3p6hllr7wjigvrnccdvrsdjpxd2hy0rl7jsrp85m"; + vendorSha256 = "079zbm57xfcskwhsfj1x0c0lg6ip6c6dbk8hfwrzkpy8gfs2ysmr"; nativeBuildInputs = [ installShellFiles ]; buildPhase = '' + export GO_LDFLAGS="-s -w" make GH_VERSION=${version} bin/gh manpages ''; From 1e8324291e5cf93a63a9159855071a032725e0ce Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Tue, 15 Sep 2020 09:04:44 +0200 Subject: [PATCH 50/69] cri-o: 1.18.3 -> 1.19.0 Signed-off-by: Sascha Grunert --- pkgs/applications/virtualization/cri-o/default.nix | 8 ++------ pkgs/applications/virtualization/cri-o/wrapper.nix | 2 -- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index d0c8938e6de..54ffb036f3c 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.18.3"; + version = "1.19.0"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "1csdbyypqwxkfc061pdv7nj52a52b9xxzb6qgxcznd82w7wgfb3g"; + sha256 = "1lrr8y0k6609z4gb8cg277rq58sh0bqd2b4mzjlynyjdgp3xskfq"; }; vendorSha256 = null; @@ -41,10 +41,6 @@ buildGoModule rec { BUILDTAGS = "apparmor seccomp selinux containers_image_openpgp containers_image_ostree_stub"; buildPhase = '' - patchShebangs . - - sed -i '/version.buildDate/d' Makefile - make binaries docs BUILDTAGS="$BUILDTAGS" ''; diff --git a/pkgs/applications/virtualization/cri-o/wrapper.nix b/pkgs/applications/virtualization/cri-o/wrapper.nix index 298bec6550e..6d72623d86c 100644 --- a/pkgs/applications/virtualization/cri-o/wrapper.nix +++ b/pkgs/applications/virtualization/cri-o/wrapper.nix @@ -10,7 +10,6 @@ , utillinux # nsenter , cni-plugins # not added to path , iptables -, socat }: let @@ -22,7 +21,6 @@ let conmon utillinux iptables - socat ] ++ extraPackages); in runCommand cri-o.name { From e363aef498d9bb3f22ab758de8ba5ad971e4ceee Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Tue, 15 Sep 2020 09:43:47 +0200 Subject: [PATCH 51/69] nixos/cri-o: remove deprecated manage_ns_lifecycle option Signed-off-by: Sascha Grunert --- nixos/modules/virtualisation/cri-o.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index aa2fb73533a..70e7c8794d4 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -99,7 +99,6 @@ in [crio.runtime] cgroup_manager = "systemd" log_level = "${cfg.logLevel}" - manage_ns_lifecycle = true pinns_path = "${cfg.package}/bin/pinns" hooks_dir = [] From eb6e2ac2c033a86afa6a606753aab0dbde8bddda Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 17 Sep 2020 03:21:22 -0500 Subject: [PATCH 52/69] terraform_0_13: 0.13.2 -> 0.13.3 (#98137) https://github.com/hashicorp/terraform/releases/tag/v0.13.3 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index f29508ffe38..a6d9278f58b 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -132,8 +132,8 @@ in rec { }); terraform_0_13 = pluggable (generic { - version = "0.13.2"; - sha256 = "04pm57l29j3ai6dvh2343q4yhskkxqj8ayr2hdw2qqjch52p8mrw"; + version = "0.13.3"; + sha256 = "1bjgsabkyh3xf4gdp41mwhw6bpmjg45bnq2hk522glk02n2xngpw"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); From 3f1a356b8179956eddf36cd573749a29911731b3 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 17 Sep 2020 11:39:07 +0300 Subject: [PATCH 53/69] gnomeExtensions.gsconnect: 39 -> 41 Update patch so it'll apply on v41. --- .../gnome-3/extensions/gsconnect/default.nix | 4 +-- .../extensions/gsconnect/fix-paths.patch | 34 +++++++++++-------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index 53f8d9e79a0..98827fd3f6a 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-gsconnect"; - version = "39"; + version = "41"; src = fetchFromGitHub { owner = "andyholmes"; repo = "gnome-shell-extension-gsconnect"; rev = "v${version}"; - sha256 = "0d2wypf36p95v756arf06gfilpb48gp55i1xbqnqvcd10n3q4zc2"; + sha256 = "0lcj7k16jki54bsyh01j4ss4hhfddnahcw02zlmlkl637qdv1b5j"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch b/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch index 629d34b6f68..58c02a92eb2 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch @@ -1,5 +1,7 @@ ---- a/data/org.gnome.Shell.Extensions.GSConnect.desktop -+++ b/data/org.gnome.Shell.Extensions.GSConnect.desktop +diff --git i/data/org.gnome.Shell.Extensions.GSConnect.desktop.in w/data/org.gnome.Shell.Extensions.GSConnect.desktop.in +index ffb23342..b405c73b 100644 +--- i/data/org.gnome.Shell.Extensions.GSConnect.desktop.in ++++ w/data/org.gnome.Shell.Extensions.GSConnect.desktop.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application @@ -9,18 +11,22 @@ Terminal=false NoDisplay=true Icon=org.gnome.Shell.Extensions.GSConnect ---- a/src/extension.js -+++ b/src/extension.js -@@ -1,5 +1,7 @@ - 'use strict'; - -+'@typelibPath@'.split(':').forEach(path => imports.gi.GIRepository.Repository.prepend_search_path(path)); -+ - const Gio = imports.gi.Gio; - const GLib = imports.gi.GLib; - const Gtk = imports.gi.Gtk; ---- a/src/prefs.js -+++ b/src/prefs.js +diff --git i/src/extension.js w/src/extension.js +index 5f32aa68..872c0c61 100644 +--- i/src/extension.js ++++ w/src/extension.js +@@ -1,5 +1,7 @@ + 'use strict'; + ++'@typelibPath@'.split(':').forEach(path => imports.gi.GIRepository.Repository.prepend_search_path(path)); ++ + const Gio = imports.gi.Gio; + const GObject = imports.gi.GObject; + const Gtk = imports.gi.Gtk; +diff --git i/src/prefs.js w/src/prefs.js +index 07e93099..1c166710 100644 +--- i/src/prefs.js ++++ w/src/prefs.js @@ -1,5 +1,7 @@ 'use strict'; From af92611103e43319842972e82c9fc3e51a3e84ad Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 17 Sep 2020 11:35:38 +0200 Subject: [PATCH 54/69] Revert "python: gsd: 1.7.0 -> 1.9.3" Incorrect update. Should not update the Python 2 version. This reverts commit d1a46d4ff3bd3db14e06fc0d01420e37b39b0fb1. --- pkgs/development/python-modules/gsd/1.7.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gsd/1.7.nix b/pkgs/development/python-modules/gsd/1.7.nix index c9b3078cd46..6e6f0504aa7 100644 --- a/pkgs/development/python-modules/gsd/1.7.nix +++ b/pkgs/development/python-modules/gsd/1.7.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.9.3"; + version = "1.7.0"; pname = "gsd"; src = fetchPypi { inherit pname version; - sha256 = "c6b37344e69020f69fda2b8d97f894cb41fd720840abeda682edd680d1cff838"; + sha256 = "0fpk69wachyydpk9cbs901m7hkwrrvq24ykxsrz62km9ql8lr2vp"; }; propagatedBuildInputs = [ numpy ]; From 4560d7ed7029408bbbc940aabbbfea10d32e62ac Mon Sep 17 00:00:00 2001 From: Sebastian Zivota Date: Fri, 15 May 2020 17:53:07 +0200 Subject: [PATCH 55/69] nixos/calibre-server: Allow multiple libraries Also add options for group and user. --- .../modules/services/misc/calibre-server.nix | 49 ++++++++++++++----- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/misc/calibre-server.nix b/nixos/modules/services/misc/calibre-server.nix index 84c04f403d3..2467d34b524 100644 --- a/nixos/modules/services/misc/calibre-server.nix +++ b/nixos/modules/services/misc/calibre-server.nix @@ -9,24 +9,42 @@ let in { + imports = [ + (mkChangedOptionModule [ "services" "calibre-server" "libraryDir" ] [ "services" "calibre-server" "libraries" ] + (config: + let libraryDir = getAttrFromPath [ "services" "calibre-server" "libraryDir" ] config; + in [ libraryDir ] + ) + ) + ]; ###### interface options = { - services.calibre-server = { enable = mkEnableOption "calibre-server"; - libraryDir = mkOption { + libraries = mkOption { description = '' - The directory where the Calibre library to serve is. - ''; - type = types.path; + The directories of the libraries to serve. They must be readable for the user under which the server runs. + ''; + type = types.listOf types.path; + }; + + user = mkOption { + description = "The user under which calibre-server runs."; + type = types.str; + default = "calibre-server"; + }; + + group = mkOption { + description = "The group under which calibre-server runs."; + type = types.str; + default = "calibre-server"; }; }; - }; @@ -34,29 +52,34 @@ in config = mkIf cfg.enable { - systemd.services.calibre-server = - { + systemd.services.calibre-server = { description = "Calibre Server"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - User = "calibre-server"; + User = cfg.user; Restart = "always"; - ExecStart = "${pkgs.calibre}/bin/calibre-server ${cfg.libraryDir}"; + ExecStart = "${pkgs.calibre}/bin/calibre-server ${lib.concatStringsSep " " cfg.libraries}"; }; }; environment.systemPackages = [ pkgs.calibre ]; - users.users.calibre-server = { + users.users = optionalAttrs (cfg.user == "calibre-server") { + calibre-server = { + home = "/var/lib/calibre-server"; + createHome = true; uid = config.ids.uids.calibre-server; - group = "calibre-server"; + group = cfg.group; }; + }; - users.groups.calibre-server = { + users.groups = optionalAttrs (cfg.group == "calibre-server") { + calibre-server = { gid = config.ids.gids.calibre-server; }; + }; }; From 114ad1a7c51fcdf8a67016ba9ed2e76bcb3cba14 Mon Sep 17 00:00:00 2001 From: Demyan Rogozhin Date: Thu, 17 Sep 2020 12:57:02 +0200 Subject: [PATCH 56/69] react-native-debugger: 0.9.10 -> 0.11.4 --- .../tools/react-native-debugger/default.nix | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index ff1b669a253..bba41f08595 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome2, atk, gtk2, glib -, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem +{ stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome3, atk, at_spi2_atk, at-spi2-core +, gtk3, glib, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem }: let @@ -10,7 +10,7 @@ let fontconfig pango atk - gtk2 + gtk3 glib freetype dbus @@ -20,8 +20,8 @@ let cups expat udev - - gnome2.GConf + at_spi2_atk + at-spi2-core xorg.libX11 xorg.libXcursor @@ -38,11 +38,10 @@ let ]; in stdenv.mkDerivation rec { pname = "react-native-debugger"; - version = "0.9.10"; - + version = "0.11.4"; src = fetchurl { url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip"; - sha256 = "158275sp37smc8lnrcbj56lp7aa6fj9gzb6fzjgz9r980qgzhia6"; + sha256 = "1dnlxdqcn90r509ff5003fibkrprdr0ydpnwg5p0xzs6rz3k8698"; }; buildInputs = [ unzip ]; @@ -52,15 +51,15 @@ in stdenv.mkDerivation rec { unzip $src -d $out mkdir $out/{lib,bin,share} - mv $out/lib{node,ffmpeg}.so $out/lib + mv $out/{libEGL,libGLESv2,libvk_swiftshader,libffmpeg}.so $out/lib mv $out/!(lib|share|bin) $out/share patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath ${rpath}:$out/lib \ - $out/share/React\ Native\ Debugger + $out/share/react-native-debugger - ln -s $out/share/React\ Native\ Debugger $out/bin/React\ Native\ Debugger + ln -s $out/share/react-native-debugger $out/bin/react-native-debugger install -Dm644 "${desktopItem}/share/applications/"* \ -t $out/share/applications/ @@ -68,7 +67,7 @@ in stdenv.mkDerivation rec { desktopItem = makeDesktopItem { name = "rndebugger"; - exec = "React\\ Native\\ Debugger"; + exec = "react-native-debugger"; desktopName = "React Native Debugger"; genericName = "React Native Debugger"; categories = "Development;Debugger;"; From 501eaab47a08ff336fbd8017125a5f73787fa4ca Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 17 Sep 2020 13:39:01 +0200 Subject: [PATCH 57/69] react-native-debugger: fix eval --- pkgs/development/tools/react-native-debugger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index bba41f08595..3cb5ae2b930 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome3, atk, at_spi2_atk, at-spi2-core +{ stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome3, atk, at-spi2-atk, at-spi2-core , gtk3, glib, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem }: @@ -20,7 +20,7 @@ let cups expat udev - at_spi2_atk + at-spi2-atk at-spi2-core xorg.libX11 From 3df04beafcadefb4c129bd6ddbe7729538c06439 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Wed, 16 Sep 2020 18:52:22 -0300 Subject: [PATCH 58/69] signal-desktop: ringrtc depends on libpulseaudio voice/video calls should now work, fixing #98082 --- .../networking/instant-messengers/signal-desktop/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index dc8fc81d35e..881d7458c09 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -4,7 +4,7 @@ , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib , cups, expat, libuuid, at-spi2-core, libappindicator-gtk3 # Runtime dependencies: -, systemd, libnotify, libdbusmenu +, systemd, libnotify, libdbusmenu, libpulseaudio # Unfortunately this also overwrites the UI language (not just the spell # checking language!): , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" @@ -122,6 +122,7 @@ in stdenv.mkDerivation rec { --replace /opt/Signal/signal-desktop $out/bin/signal-desktop autoPatchelf --no-recurse -- $out/lib/Signal/ + patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/Signal/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc.node ''; # Tests if the application launches and waits for "Link your phone to Signal Desktop": From 8263d6e68bad2069973932d8283abe41fcf47f99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 7 Sep 2020 21:20:00 +0200 Subject: [PATCH 59/69] dnscontrol: 3.2.0 -> 3.3.0 --- pkgs/applications/networking/dnscontrol/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 70e107c063f..0beba63597f 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -1,19 +1,17 @@ -{ stdenv, fetchFromGitHub, buildGoPackage}: +{ stdenv, fetchFromGitHub, buildGoModule }: -buildGoPackage rec { +buildGoModule rec { pname = "dnscontrol"; - version = "3.2.0"; - - goPackagePath = "github.com/StackExchange/dnscontrol"; + version = "3.3.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "1lrn1whmx9zkyvs505zxrsmnr5s6kpj3kjkr6rblfwdlnadkgfj7"; + sha256 = "0lldkx906imwm8mxcfafpanbgaqh0sdm3zdkwkn7j0nmngyncx9p"; }; - subPackages = [ "." ]; + vendorSha256 = "16cc6hb2iwh1zwrrnb7s4dqxqhaj67gq3gfr5xvh5kqafd685hvx"; meta = with stdenv.lib; { description = "Synchronize your DNS to multiple providers from a simple DSL"; From 5cd3b2d62ab1eb7aac935744a768466db00a07e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 16 Sep 2020 22:27:22 +0200 Subject: [PATCH 60/69] dnscontrol: replace stdenv.lib with lib --- pkgs/applications/networking/dnscontrol/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 0beba63597f..59d7c58466e 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "dnscontrol"; @@ -13,7 +13,9 @@ buildGoModule rec { vendorSha256 = "16cc6hb2iwh1zwrrnb7s4dqxqhaj67gq3gfr5xvh5kqafd685hvx"; - meta = with stdenv.lib; { + subPackages = [ "." ]; + + meta = with lib; { description = "Synchronize your DNS to multiple providers from a simple DSL"; homepage = "https://stackexchange.github.io/dnscontrol/"; license = licenses.mit; From 139143cabf74db27e5d4ac1cabd1e380570ed4a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 16 Sep 2020 22:27:38 +0200 Subject: [PATCH 61/69] dnscontrol: add SuperSandro2000 as maintainer --- pkgs/applications/networking/dnscontrol/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 59d7c58466e..8fb14ae3b14 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -19,6 +19,6 @@ buildGoModule rec { description = "Synchronize your DNS to multiple providers from a simple DSL"; homepage = "https://stackexchange.github.io/dnscontrol/"; license = licenses.mit; - maintainers = with maintainers; [ mmahut ]; + maintainers = with maintainers; [ mmahut SuperSandro2000 ]; }; } From cb4b908d127d34b60519269c1492352b2f573ead Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 17 Sep 2020 09:55:56 -0400 Subject: [PATCH 62/69] linux: 4.19.145 -> 4.19.146 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index c57e8a21e0a..d50535e5d32 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.145"; + version = "4.19.146"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1dzn7x5lz808r1sxxdrylh8k3c5n8ffqnz6anx2ywnpiz17q7g0p"; + sha256 = "0jl17yk3fpz0sx203l9l1fj5bly3jgsyr8hy5qa6py99fbk0qnim"; }; } // (args.argsOverride or {})) From e8121e56865d675469832a760433f2f9cc1ce62d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 17 Sep 2020 09:56:09 -0400 Subject: [PATCH 63/69] linux: 5.4.65 -> 5.4.66 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index a3423707bbb..90f191c3681 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.65"; + version = "5.4.66"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0sdcdjhzvz7hksv74dgj0ck9adxzhph47r1ng1kf37fh2x28657m"; + sha256 = "1cnsrz21kcf0h7krpv9p1a7n59mybr5ii0jdi3yc3x3lcwvk06gz"; }; } // (args.argsOverride or {})) From fa60ed8f8d4dc3cc7ae9ef3deea8224e418b3d19 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 17 Sep 2020 09:56:18 -0400 Subject: [PATCH 64/69] linux: 5.8.9 -> 5.8.10 --- pkgs/os-specific/linux/kernel/linux-5.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.8.nix b/pkgs/os-specific/linux/kernel/linux-5.8.nix index bb690cca278..14abb483eee 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.8.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.8.9"; + version = "5.8.10"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0pz1jfgmds5xc63jfvlykqap4dqf9jpr8jmgz5wpszgih8dvrn4r"; + sha256 = "1wjsdc93xilag0pk205m2q0ixmpp93ql5qj0fm3qlqddgxm14vlx"; }; } // (args.argsOverride or {})) From 19f22514cb40bef8febef448e3ac9bb039118436 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Thu, 17 Sep 2020 16:23:16 +0200 Subject: [PATCH 65/69] pythonPackages.grpcio-tools: add setuptools dependency (#98157) --- pkgs/development/python-modules/grpcio-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 94a440bb4f1..c60acb2d1f1 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, protobuf, grpcio }: +{ stdenv, buildPythonPackage, fetchPypi, protobuf, grpcio, setuptools }: buildPythonPackage rec { pname = "grpcio-tools"; @@ -11,7 +11,7 @@ buildPythonPackage rec { enableParallelBuilding = true; - propagatedBuildInputs = [ protobuf grpcio ]; + propagatedBuildInputs = [ protobuf grpcio setuptools ]; # no tests in the package doCheck = false; From 9c73e34d1810ca72379d9c53254e32f46b9a074d Mon Sep 17 00:00:00 2001 From: Hannes Weisbach Date: Wed, 16 Sep 2020 17:12:11 +0200 Subject: [PATCH 66/69] kicad: remove gettext from buildInputs, add to nativeBuildInputs The i18n "library" does not link against gettext. It only requires the msgfmt utility from gettext, hence gettext should be a nativeBuildInput --- pkgs/applications/science/electronics/kicad/libraries.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/libraries.nix b/pkgs/applications/science/electronics/kicad/libraries.nix index 91ce30de5f0..057bc15bf5f 100644 --- a/pkgs/applications/science/electronics/kicad/libraries.nix +++ b/pkgs/applications/science/electronics/kicad/libraries.nix @@ -62,8 +62,7 @@ in inherit name; } // (libSources.${name} or { }) ); - buildInputs = [ gettext ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake gettext ]; meta = { license = licenses.gpl2; # https://github.com/KiCad/kicad-i18n/issues/3 platforms = stdenv.lib.platforms.all; From 3584644092391b342b77705bba4786b9d919f9f3 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 17 Sep 2020 20:35:42 +0200 Subject: [PATCH 67/69] cloc: 1.86 -> 1.88 --- pkgs/tools/misc/cloc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index e35d5283256..2b9cbfe1030 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cloc"; - version = "1.86"; + version = "1.88"; src = fetchFromGitHub { owner = "AlDanial"; repo = "cloc"; rev = version; - sha256 = "082gj2b3x11bilz8c572dd60vn6n0fhld5zhi7wk7g1wy9wlgm9w"; + sha256 = "1ixgswzbzv63bl50gb2kgaqr0jcicjz6w610hi9fal1i7744zraw"; }; setSourceRoot = '' From d347b85c020f0de83bd737e9f060a79fd7e225c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 17 Sep 2020 22:29:25 +0200 Subject: [PATCH 68/69] linuxPackages.exfat-nofuse: lazier assertion (/cc #97577) I'm not sure what happens exactly. I suspect some construct like mkIf pushing into boot.kernelPackages contents and tripping on the assertion. --- pkgs/os-specific/linux/exfat/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix index a92754bba7d..5e212825bab 100644 --- a/pkgs/os-specific/linux/exfat/default.nix +++ b/pkgs/os-specific/linux/exfat/default.nix @@ -3,10 +3,13 @@ # Upstream build for kernel 4.1 is broken, 3.12 and below seems to be working assert lib.versionAtLeast kernel.version "4.2" || lib.versionOlder kernel.version "4.0"; -# linux kernel above 5.7 comes with its own exfat implementation https://github.com/arter97/exfat-linux/issues/27 -assert lib.versionOlder kernel.version "5.8"; stdenv.mkDerivation rec { + # linux kernel above 5.7 comes with its own exfat implementation https://github.com/arter97/exfat-linux/issues/27 + # Assertion moved here due to some tests unintenionally triggering it, + # e.g. nixosTests.kernel-latest; it's unclear how/why so far. + assertion = assert lib.versionOlder kernel.version "5.8"; null; + name = "exfat-nofuse-${version}-${kernel.version}"; version = "2020-04-15"; From 72b9660dc18ba347f7cd41a9504fc181a6d87dc3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 17 Sep 2020 19:00:53 -0500 Subject: [PATCH 69/69] _3270font: 2.0.4 -> 2.1.0 (#98156) https://github.com/rbanffy/3270font/releases/tag/v.2.1.0 --- pkgs/data/fonts/3270font/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/3270font/default.nix b/pkgs/data/fonts/3270font/default.nix index 3338b778415..a972bd7c3d8 100644 --- a/pkgs/data/fonts/3270font/default.nix +++ b/pkgs/data/fonts/3270font/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "2.0.4"; + version = "2.1.0"; in -fetchzip rec { +fetchzip { name = "3270font-${version}"; - url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_ece94f6.zip"; + url = "https://github.com/rbanffy/3270font/releases/download/v.${version}/3270_fonts_fba25eb.zip"; - sha256 = "04q7dnrlq5hm30iibh3jafb33m5lwsgb3g9n9i188sg02ydkrsl9"; + sha256 = "04xqgiznd6d3c1rdbbdmd87rjy9bnhh00lm8xzmal1zidcr2g0n9"; postFetch = '' mkdir -p $out/share/fonts/