From 7555467383a7c053ab8a3fe52d237a582b527204 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 26 Jan 2020 08:21:30 +0000 Subject: [PATCH 001/546] mopidy-musicbox-webclient: 2.3.0 -> 2.4.0 --- pkgs/applications/audio/mopidy/musicbox-webclient.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy/musicbox-webclient.nix b/pkgs/applications/audio/mopidy/musicbox-webclient.nix index b0abefd7a1f..d628e5894a2 100644 --- a/pkgs/applications/audio/mopidy/musicbox-webclient.nix +++ b/pkgs/applications/audio/mopidy/musicbox-webclient.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy-musicbox-webclient"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "pimusicbox"; repo = "mopidy-musicbox-webclient"; rev = "v${version}"; - sha256 = "1jcfrwsi7axiph3jplqzmcqia9pc46xb2yf13d8h6lnh3h49rwvz"; + sha256 = "0784s32pap9rbki3f0f7swaf6946sdv4xzidns13jmw9ilifk5z4"; }; propagatedBuildInputs = [ mopidy ]; From 5b0b5f5928a13faa2e86bdc796b3692677c86ad2 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Tue, 7 Apr 2020 17:47:10 +0200 Subject: [PATCH 002/546] rasm: remove -march=native from compilation flags --- pkgs/development/compilers/rasm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/rasm/default.nix b/pkgs/development/compilers/rasm/default.nix index ced0855597c..87dae128f73 100644 --- a/pkgs/development/compilers/rasm/default.nix +++ b/pkgs/development/compilers/rasm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildPhase = '' # according to official documentation - cc rasm_v*.c -O2 -lm -lrt -march=native -o rasm + cc rasm_v*.c -O2 -lm -lrt -o rasm ''; installPhase = '' From 209ef5716242ec85ba3c3acc8262dfdfb5f9ab4d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 8 May 2020 19:07:56 +0000 Subject: [PATCH 003/546] python27Packages.cma: 2.7.0 -> 3.0.3 --- pkgs/development/python-modules/cma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cma/default.nix b/pkgs/development/python-modules/cma/default.nix index 3d39392da6b..8937f78a7a6 100644 --- a/pkgs/development/python-modules/cma/default.nix +++ b/pkgs/development/python-modules/cma/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "cma"; - version = "2.7.0"; + version = "3.0.3"; src = fetchFromGitHub { owner = "CMA-ES"; repo = "pycma"; rev = "r${version}"; - sha256 = "0c26969pcqj047axksfffd9pj77n16k4r9h6pyid9q3ah5zk0xg3"; + sha256 = "00vv7imdkv0bqcs4b8dg9nggxcl2fkcnhdd46n22bcmnwy8rjxv6"; }; propagatedBuildInputs = [ From 51cc55330719be8918cff038b74f5b2c5612995a Mon Sep 17 00:00:00 2001 From: piegames Date: Mon, 29 Jun 2020 23:23:50 +0200 Subject: [PATCH 004/546] make-desktopitem: refactoring, documentation and improvement - New parameter `extraDesktopEntries` to easily add some less usual entries to the desktop file - Rewrite of the core logic. Instead of a key-value-list, use an attribute set with nullable values to make it overridable - Added some comments - Some cosmetic/readability code refactors - I didn't like the doubly nested strings around the `fileValidation` --- .../make-desktopitem/default.nix | 66 +++++++++++-------- 1 file changed, 37 insertions(+), 29 deletions(-) diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix index 8355a5ad29b..f5020c036aa 100644 --- a/pkgs/build-support/make-desktopitem/default.nix +++ b/pkgs/build-support/make-desktopitem/default.nix @@ -1,50 +1,58 @@ { lib, runCommandLocal, desktop-file-utils }: -{ name +# See https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html +{ name # The name of the desktop file , type ? "Application" , exec , icon ? null , comment ? null , terminal ? "false" -, desktopName +, desktopName # The name of the application , genericName ? null , mimeType ? null , categories ? null , startupNotify ? null -, extraEntries ? null +, extraDesktopEntries ? {} # Extra key-value pairs to add to the [Desktop Entry] section. This may override other values +, extraEntries ? "" # Extra configuration. Will be appended to the end of the file and may thus contain extra sections , fileValidation ? true # whether to validate resulting desktop file. }: let - optionalEntriesList = [{k="Icon"; v=icon;} - {k="Comment"; v=comment;} - {k="GenericName"; v=genericName;} - {k="MimeType"; v=mimeType;} - {k="Categories"; v=categories;} - {k="StartupNotify"; v=startupNotify;}]; + # like builtins.toString, but null -> null instead of null -> "" + nullableToString = value: if value == null then null else builtins.toString value; - valueNotNull = {k, v}: v != null; - entriesToKeep = builtins.filter valueNotNull optionalEntriesList; + # The [Desktop entry] section of the desktop file, as attribute set. + mainSection = { + "Type" = toString type; + "Exec" = (nullableToString exec); + "Icon" = (nullableToString icon); + "Comment" = (nullableToString comment); + "Terminal" = (nullableToString terminal); + "Name" = toString name; + "GenericName" = (nullableToString genericName); + "MimeType" = (nullableToString mimeType); + "Categories" = (nullableToString categories); + "StartupNotify" = (nullableToString startupNotify); + } // extraDesktopEntries; - mkEntry = {k, v}: k + "=" + v; - optionalEntriesString = lib.concatMapStringsSep "\n" mkEntry entriesToKeep; + # Map all entries to a list of lines + desktopFileStrings = + ["[Desktop Entry]"] + ++ builtins.filter + (v: v != null) + (lib.mapAttrsToList + (name: value: if value != null then "${name}=${value}" else null) + mainSection + ) + ++ (if extraEntries == "" then [] else ["${extraEntries}"]); in runCommandLocal "${name}.desktop" {} - '' + ('' mkdir -p "$out/share/applications" cat > "$out/share/applications/${name}.desktop" < Date: Thu, 2 Jul 2020 16:42:13 +0200 Subject: [PATCH 005/546] ipmiview: 2.16.0 -> 2.17.0 Also removes the Configuration category, as this failed to build: /nix/store/c312nyv9kfckpcf4k7vrxbg6yjk62awc-IPMIView.desktop/share/applications/IPMIView.desktop: error: value "Network;Configuration" for key "Categories" in group "Desktop Entry" contains an unregistered value "Configuration"; values extending the format should start with "X-" --- pkgs/applications/misc/ipmiview/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index e46df5d59e0..851022899d9 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { pname = "IPMIView"; - version = "2.16.0"; - buildVersion = "190815"; + version = "2.17.0"; + buildVersion = "200505"; src = fetchurl { url = "https://www.supermicro.com/wftp/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz"; - sha256 = "0qw9zfnj0cyvab7ndamlw2y0gpczjhh1jkz8340kl42r2xmhkvpl"; + sha256 = "0ba0694krj2q77zwdn22v2qzjdy52a7ryhgc3m51s7p17ahigz97"; }; nativeBuildInputs = [ patchelf makeWrapper ]; @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/libawt_xawt.so patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ freetype ]}" ./jre/lib/amd64/libfontmanager.so patchelf --set-rpath "${gcc-unwrapped.lib}/lib" ./libiKVM64.so + patchelf --set-rpath "${gcc-unwrapped.lib}/lib" ./libiKVM_v11_64.so patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./BMCSecurity/${stunnelBinary} ''; @@ -41,7 +42,7 @@ stdenv.mkDerivation rec { exec = "IPMIView"; desktopName = name; genericName = "Supermicro BMC manager"; - categories = "Network;Configuration"; + categories = "Network"; }; installPhase = '' @@ -60,7 +61,7 @@ stdenv.mkDerivation rec { --add-flags "-jar $out/IPMIView20.jar" \ --run 'WORK_DIR=''${XDG_DATA_HOME:-~/.local/share}/ipmiview mkdir -p $WORK_DIR - ln -snf '$out'/iKVM.jar '$out'/libiKVM* '$out'/libSharedLibrary* $WORK_DIR + ln -snf '$out'/iKVM.jar '$out'/iKVM_ssl.jar '$out'/libiKVM* '$out'/libSharedLibrary* $WORK_DIR cd $WORK_DIR' ''; From 2ada3b5d3e4d776fc1e5dcdc1c34a4b7bd884614 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Tue, 17 Dec 2019 14:26:28 +1100 Subject: [PATCH 006/546] samblaster: init 0.1.24 --- .../science/biology/samblaster/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/science/biology/samblaster/default.nix diff --git a/pkgs/applications/science/biology/samblaster/default.nix b/pkgs/applications/science/biology/samblaster/default.nix new file mode 100644 index 00000000000..7795ba23736 --- /dev/null +++ b/pkgs/applications/science/biology/samblaster/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "samblaster"; + version = "0.1.24"; + + src = fetchFromGitHub { + owner = "GregoryFaust"; + repo = "samblaster"; + rev = "v.${version}"; + sha256 = "0iv2ddfw8363vb2x8gr3p8g88whb6mb9m0pf71i2cqsbv6jghap7"; + }; + + installPhase = '' + mkdir -p $out/bin + cp samblaster $out/bin + ''; + + meta = with stdenv.lib; { + description = "Tool for marking duplicates and extracting discordant/split reads from SAM/BAM files"; + maintainers = with maintainers; [ jbedo ]; + license = licenses.mit; + homepage = "https://github.com/GregoryFaust/samblaster"; + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f635f7a81eb..f2225ac2430 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24919,6 +24919,8 @@ in mpi = true; }); + samblaster = callPackage ../applications/science/biology/samblaster { }; + samtools = callPackage ../applications/science/biology/samtools { }; samtools_0_1_19 = callPackage ../applications/science/biology/samtools/samtools_0_1_19.nix { stdenv = gccStdenv; From 617483d27a35247e1fbd8bcb9596a64d74fc4e28 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Wed, 18 Dec 2019 08:54:44 +1100 Subject: [PATCH 007/546] sambamba: init 0.7.1 --- .../science/biology/sambamba/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/science/biology/sambamba/default.nix diff --git a/pkgs/applications/science/biology/sambamba/default.nix b/pkgs/applications/science/biology/sambamba/default.nix new file mode 100644 index 00000000000..7e33a661218 --- /dev/null +++ b/pkgs/applications/science/biology/sambamba/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, python3, which, dmd, ldc, zlib }: + +stdenv.mkDerivation rec { + pname = "sambamba"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "biod"; + repo = "sambamba"; + rev = "v${version}"; + sha256 = "0k5wy06zrbsc40x6answgz7rz2phadyqwlhi9nqxbfqanbg9kq20"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ which python3 dmd ldc ]; + buildInputs = [ zlib ]; + + # Upstream's install target is broken; copy manually + installPhase = '' + mkdir -p $out/bin + cp bin/sambamba-${version} $out/bin/sambamba + ''; + + meta = with stdenv.lib; { + description = "SAM/BAM processing tool"; + homepage = "https://lomereiter.github.io/sambamba/"; + maintainers = with maintainers; [ jbedo ]; + license = with licenses; gpl2; + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2225ac2430..d1a0d7d384e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24919,6 +24919,8 @@ in mpi = true; }); + sambamba = callPackage ../applications/science/biology/sambamba { }; + samblaster = callPackage ../applications/science/biology/samblaster { }; samtools = callPackage ../applications/science/biology/samtools { }; From a3d6e7b4b4585c5bc5bd8c7e6c8f305daecdd03b Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Wed, 18 Dec 2019 09:37:39 +1100 Subject: [PATCH 008/546] lumpy: init 0.3.0 --- .../science/biology/lumpy/default.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/applications/science/biology/lumpy/default.nix diff --git a/pkgs/applications/science/biology/lumpy/default.nix b/pkgs/applications/science/biology/lumpy/default.nix new file mode 100644 index 00000000000..04512e8e372 --- /dev/null +++ b/pkgs/applications/science/biology/lumpy/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, htslib, zlib, curl, openssl, samblaster, sambamba +, samtools, hexdump, python2Packages, which }: + +let + python = + python2Packages.python.withPackages (pkgs: with pkgs; [ pysam numpy ]); + +in stdenv.mkDerivation rec { + pname = "lumpy"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "arq5x"; + repo = "lumpy-sv"; + rev = version; + sha256 = "0azhzvmh9az9jcq0xprlzdz6w16azgszv4kshb903bwbnqirmk18"; + }; + + nativeBuildInputs = [ which ]; + buildInputs = + [ htslib zlib curl openssl python samblaster sambamba samtools hexdump ]; + + preConfigure = '' + patchShebangs ./. + + # Use Nix htslib over bundled version + sed -i 's/lumpy_filter: htslib/lumpy_filter:/' Makefile + sed -i 's|../../lib/htslib/libhts.a|-lhts|' src/filter/Makefile + ''; + + # Upstream's makefile doesn't have an install target + installPhase = '' + mkdir -p $out + cp -r bin $out + cp -r scripts $out + sed -i 's|/build/source|'$out'|' $out/bin/lumpyexpress.config + ''; + + meta = with stdenv.lib; { + description = "Probabilistic structural variant caller"; + homepage = "https://github.com/arq5x/lumpy-sv"; + maintainers = with maintainers; [ jbedo ]; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1a0d7d384e..e0e54e1da95 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24845,6 +24845,8 @@ in last = callPackage ../applications/science/biology/last { }; + lumpy = callPackage ../applications/science/biology/lumpy { }; + macse = callPackage ../applications/science/biology/macse { }; migrate = callPackage ../applications/science/biology/migrate { }; From 962fa0207e1dda9ca3977af916664ca912fa515c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 5 Jul 2020 04:20:00 +0000 Subject: [PATCH 009/546] pythonPackages.tubeup: init at 0.0.19 --- .../python-modules/tubeup/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/tubeup/default.nix diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix new file mode 100644 index 00000000000..d25180948a3 --- /dev/null +++ b/pkgs/development/python-modules/tubeup/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, internetarchive +, fetchPypi +, youtube-dl +, docopt +, isPy27 +}: + +buildPythonPackage rec { + pname = "tubeup"; + version = "0.0.19"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "6e3ebbf677a43018bfd71070919187bd57120010b0d708c0494c0f17bb72e84e"; + }; + + postPatch = '' + substituteInPlace setup.py --replace "docopt==0.6.2" "docopt" + ''; + + propagatedBuildInputs = [ internetarchive docopt youtube-dl ]; + + pythonImportsCheck = [ "tubeup" ]; + + # Tests failing upstream + doCheck = false; + + meta = with lib; { + description = "Youtube (and other video site) to Internet Archive Uploader"; + homepage = "https://github.com/bibanon/tubeup"; + license = licenses.gpl3; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0d2e1aa1c4f..2c090944b9f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7206,6 +7206,8 @@ in { TurboCheetah = callPackage ../development/python-modules/TurboCheetah { }; + tubeup = callPackage ../development/python-modules/tubeup { }; + tvdb_api = callPackage ../development/python-modules/tvdb_api { }; tvnamer = callPackage ../development/python-modules/tvnamer { }; From 4b9a2e13a82ea293e0d1530e8d32ca07074996dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 18 Aug 2020 09:33:18 +0100 Subject: [PATCH 010/546] cloud-utils: split of smaller .guest output --- nixos/modules/system/boot/grow-partition.nix | 2 +- pkgs/tools/misc/cloud-utils/default.nix | 30 ++++++++++++++++---- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/nixos/modules/system/boot/grow-partition.nix b/nixos/modules/system/boot/grow-partition.nix index 71a86c74772..be70c4ad9c8 100644 --- a/nixos/modules/system/boot/grow-partition.nix +++ b/nixos/modules/system/boot/grow-partition.nix @@ -23,7 +23,7 @@ with lib; copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk copy_bin_and_libs ${pkgs.utillinux}/sbin/lsblk - substitute "${pkgs.cloud-utils}/bin/.growpart-wrapped" "$out/bin/growpart" \ + substitute "${pkgs.cloud-utils.guest}/bin/.growpart-wrapped" "$out/bin/growpart" \ --replace "${pkgs.bash}/bin/sh" "/bin/sh" \ --replace "awk" "gawk" \ --replace "sed" "gnused" diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix index d5c5b0ee783..afae939ef38 100644 --- a/pkgs/tools/misc/cloud-utils/default.nix +++ b/pkgs/tools/misc/cloud-utils/default.nix @@ -1,9 +1,18 @@ { stdenv, fetchurl, makeWrapper , gawk, gnused, utillinux, file , wget, python3, qemu-utils, euca2ools -, e2fsprogs, cdrkit }: +, e2fsprogs, cdrkit +, gptfdisk }: -stdenv.mkDerivation rec { +let + # according to https://packages.debian.org/sid/cloud-image-utils + https://packages.debian.org/sid/admin/cloud-guest-utils + guestDeps = [ + e2fsprogs gptfdisk gawk gnused utillinux + ]; + binDeps = guestDeps ++ [ + wget file qemu-utils cdrkit + ]; +in stdenv.mkDerivation rec { # NOTICE: if you bump this, make sure to run # $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops # growpart is needed in initrd in nixos/system/boot/grow-partition.nix @@ -17,15 +26,24 @@ stdenv.mkDerivation rec { buildInputs = [ python3 ]; installFlags = [ "LIBDIR=$(out)/lib" "BINDIR=$(out)/bin" "MANDIR=$(out)/man/man1" "DOCDIR=$(out)/doc" ]; - # according to https://packages.ubuntu.com/source/zesty/cloud-utils - binDeps = [ - wget e2fsprogs file gnused gawk utillinux qemu-utils euca2ools cdrkit - ]; + # $guest output contains all executables needed for cloud-init and $out the rest + $guest + # This is similar to debian's package split into cloud-image-utils and cloud-guest-utils + # The reason is to reduce the closure size + outputs = [ "out" "guest"]; postFixup = '' + moveToOutput bin/ec2metadata $guest + moveToOutput bin/growpart $guest + moveToOutput bin/vcs-run $guest + for i in $out/bin/*; do wrapProgram $i --prefix PATH : "${stdenv.lib.makeBinPath binDeps}:$out/bin" done + + for i in $guest/bin/*; do + wrapProgram $i --prefix PATH : "${stdenv.lib.makeBinPath guestDeps}:$guest/bin" + ln -s $i $out/bin + done ''; dontBuild = true; From 3ca2fd5520e288afd329e6274a5cc6c0524ec5a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 18 Aug 2020 09:33:47 +0100 Subject: [PATCH 011/546] cloud-init: 0.7.9 -> 20.2 --- nixos/tests/cloud-init.nix | 7 +- ...ort.patch => 0001-add-nixos-support.patch} | 46 +++++++--- .../virtualization/cloud-init/default.nix | 87 ++++++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 105 insertions(+), 37 deletions(-) rename pkgs/tools/virtualization/cloud-init/{add-nixos-support.patch => 0001-add-nixos-support.patch} (73%) diff --git a/nixos/tests/cloud-init.nix b/nixos/tests/cloud-init.nix index aafa6e24e84..8debb9e8ed9 100644 --- a/nixos/tests/cloud-init.nix +++ b/nixos/tests/cloud-init.nix @@ -24,7 +24,8 @@ let instance-id: iid-local01 local-hostname: "test" public-keys: - - "should be a key!" + ec2-keypair.us-east-1: + - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB5L7Xuh49VS5VQheFE7VDmXKH0BOnB1R0avAE91QgOB root@test EOF ${pkgs.cdrkit}/bin/genisoimage -volid cidata -joliet -rock -o $out/metadata.iso $out/iso ''; @@ -45,8 +46,6 @@ in makeTest { machine.wait_for_unit("cloud-init.service") machine.succeed("cat /tmp/cloudinit-write-file | grep -q 'cloudinit'") - machine.wait_until_succeeds( - "cat /root/.ssh/authorized_keys | grep -q 'should be a key!'" - ) + machine.wait_until_succeeds("cat /root/.ssh/authorized_keys | grep -q root@test") ''; } diff --git a/pkgs/tools/virtualization/cloud-init/add-nixos-support.patch b/pkgs/tools/virtualization/cloud-init/0001-add-nixos-support.patch similarity index 73% rename from pkgs/tools/virtualization/cloud-init/add-nixos-support.patch rename to pkgs/tools/virtualization/cloud-init/0001-add-nixos-support.patch index 00cb7d070c6..ef8f2b65ca0 100644 --- a/pkgs/tools/virtualization/cloud-init/add-nixos-support.patch +++ b/pkgs/tools/virtualization/cloud-init/0001-add-nixos-support.patch @@ -1,18 +1,36 @@ -diff -ruN cloud-init-0.7.6.orig/cloudinit/distros/__init__.py cloud-init-0.7.6/cloudinit/distros/__init__.py ---- cloud-init-0.7.6.orig/cloudinit/distros/__init__.py 2014-10-10 15:26:25.000000000 +0000 -+++ cloud-init-0.7.6/cloudinit/distros/__init__.py 2016-06-08 07:51:45.230357099 +0000 -@@ -43,6 +43,7 @@ +From 64a767136c16aad2b94b4d9a3268b0d4deba7272 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= +Date: Tue, 18 Aug 2020 10:22:36 +0100 +Subject: [PATCH] add nixos support +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jörg Thalheim +--- + cloudinit/distros/__init__.py | 1 + + cloudinit/distros/nixos.py | 103 ++++++++++++++++++++++++++++++++++ + 2 files changed, 104 insertions(+) + create mode 100644 cloudinit/distros/nixos.py + +diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py +index c7163e1c..c147e2b3 100755 +--- a/cloudinit/distros/__init__.py ++++ b/cloudinit/distros/__init__.py +@@ -46,6 +46,7 @@ OSFAMILIES = { 'freebsd': ['freebsd'], - 'suse': ['sles'], + 'suse': ['opensuse', 'sles'], 'arch': ['arch'], + 'nixos': ['nixos'], } LOG = logging.getLogger(__name__) -diff -ruN cloud-init-0.7.6.orig/cloudinit/distros/nixos.py cloud-init-0.7.6/cloudinit/distros/nixos.py ---- cloud-init-0.7.6.orig/cloudinit/distros/nixos.py 1970-01-01 00:00:00.000000000 +0000 -+++ cloud-init-0.7.6/cloudinit/distros/nixos.py 2016-06-08 07:50:58.602616595 +0000 -@@ -0,0 +1,98 @@ +diff --git a/cloudinit/distros/nixos.py b/cloudinit/distros/nixos.py +new file mode 100644 +index 00000000..d53d2a61 +--- /dev/null ++++ b/cloudinit/distros/nixos.py +@@ -0,0 +1,103 @@ +# vi: ts=4 expandtab +# +# Copyright (C) 2012 Canonical Ltd. @@ -35,10 +53,13 @@ diff -ruN cloud-init-0.7.6.orig/cloudinit/distros/nixos.py cloud-init-0.7.6/clou +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + ++import os ++ +from cloudinit import distros +from cloudinit import helpers +from cloudinit import log as logging +from cloudinit import util ++from cloudinit import atomic_helper + +from cloudinit.distros.parsers.hostname import HostnameConf + @@ -52,6 +73,8 @@ diff -ruN cloud-init-0.7.6.orig/cloudinit/distros/nixos.py cloud-init-0.7.6/clou + # calls from repeatly happening (when they + # should only happen say once per instance...) + self._runner = helpers.Runners(paths) ++ self.usr_lib_exec = os.path.join(os.path.dirname(__file__), ++ "../../../../../libexec") + self.osfamily = 'nixos' + + def _select_hostname(self, hostname, fqdn): @@ -72,7 +95,7 @@ diff -ruN cloud-init-0.7.6.orig/cloudinit/distros/nixos.py cloud-init-0.7.6/clou + if not conf: + conf = HostnameConf('') + conf.set_hostname(your_hostname) -+ util.write_file(out_fn, str(conf), 0644) ++ atomic_helper.write_file(out_fn, str(conf).encode("utf-8")) + + def _read_system_hostname(self): + sys_hostname = self._read_hostname(self.hostname_conf_fn) @@ -111,3 +134,6 @@ diff -ruN cloud-init-0.7.6.orig/cloudinit/distros/nixos.py cloud-init-0.7.6/clou + + def update_package_sources(self): + raise NotImplementedError() +-- +2.28.0 + diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index bf932ff1ad4..66ce16d985e 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -1,40 +1,83 @@ -{ lib, pythonPackages, fetchurl, cloud-utils }: +{ lib +, fetchFromGitHub +, buildPythonApplication +, jinja2 +, oauthlib +, configobj +, pyyaml +, requests +, jsonschema +, jsonpatch +, pytest +, httpretty +, dmidecode +, pytestCheckHook +, shadow +, cloud-utils +, openssh +}: -let version = "0.7.9"; +let version = "20.2"; -in pythonPackages.buildPythonApplication { +in buildPythonApplication { pname = "cloud-init"; inherit version; namePrefix = ""; - src = fetchurl { - url = "https://launchpad.net/cloud-init/trunk/${version}/+download/cloud-init-${version}.tar.gz"; - sha256 = "0wnl76pdcj754pl99wxx76hkir1s61x0bg0lh27sdgdxy45vivbn"; + src = fetchFromGitHub { + owner = "canonical"; + repo = "cloud-init"; + rev = version; + sha256 = "sha256-QeY/fdIIUSsp5oNxyRtZwpTB747Jf5KAJuYY9yiKUvc="; }; - patches = [ ./add-nixos-support.patch ]; + patches = [ ./0001-add-nixos-support.patch ]; prePatch = '' - patchShebangs ./tools + substituteInPlace setup.py --replace /lib/systemd $out/lib/systemd + ''; - substituteInPlace setup.py \ - --replace /usr $out \ - --replace /etc $out/etc \ - --replace /lib/systemd $out/lib/systemd \ - --replace 'self.init_system = ""' 'self.init_system = "systemd"' + postInstall = '' + install -D -m755 ./tools/write-ssh-key-fingerprints $out/libexec/write-ssh-key-fingerprints + for i in $out/libexec/*; do + wrapProgram $i --prefix PATH : "${lib.makeBinPath [ openssh ]}" + done + ''; - substituteInPlace cloudinit/config/cc_growpart.py \ - --replace 'util.subp(["growpart"' 'util.subp(["${cloud-utils}/bin/growpart"' + propagatedBuildInputs = [ + jinja2 + oauthlib + configobj + pyyaml + requests + jsonschema + jsonpatch + ]; - # Argparse is part of python stdlib - sed -i s/argparse// requirements.txt - ''; + checkInputs = [ + pytestCheckHook + httpretty + dmidecode + # needed for tests; at runtime we rather want the setuid wrapper + shadow + ]; - propagatedBuildInputs = with pythonPackages; [ cheetah jinja2 prettytable - oauthlib pyserial configobj pyyaml requests jsonpatch ]; + makeWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath [ + dmidecode cloud-utils.guest + ]}/bin" + ]; - checkInputs = with pythonPackages; [ contextlib2 httpretty mock unittest2 ]; + disabledTests = [ + # tries to create /var + "test_dhclient_run_with_tmpdir" + # clears path and fails because mkdir is not found + "test_path_env_gets_set_from_main" + ]; - doCheck = false; + preCheck = '' + # TestTempUtils.test_mkdtemp_default_non_root does not like TMPDIR=/build + export TMPDIR=/tmp + ''; meta = { homepage = "https://cloudinit.readthedocs.org"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41e7af4c09d..0ca018ee10b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1557,7 +1557,7 @@ in clog-cli = callPackage ../development/tools/clog-cli { }; - cloud-init = callPackage ../tools/virtualization/cloud-init { }; + cloud-init = python3.pkgs.callPackage ../tools/virtualization/cloud-init { }; cloudflared = callPackage ../applications/networking/cloudflared { }; From 45f96c910053ce7d8d021e1e0942de286de787c6 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Thu, 27 Aug 2020 22:24:00 +0530 Subject: [PATCH 012/546] libmesode: Add a patch from upstream to fix SSL verification --- pkgs/development/libraries/libmesode/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix index e8fab86f8fc..90016b09c73 100644 --- a/pkgs/development/libraries/libmesode/default.nix +++ b/pkgs/development/libraries/libmesode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libtool, openssl, expat, pkgconfig, check }: +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, libtool, openssl, expat, pkgconfig, check }: stdenv.mkDerivation rec { pname = "libmesode"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "0xzfg1xx88cn36352nnjlb1p7xyw32yqkhjzq10px88iaaqz1vv0"; }; + patches = [ + (fetchpatch { + name = "fix-ssl-certificate-verification.diff"; + url = "https://github.com/profanity-im/libmesode/commit/532ed1e9d3e71e5bea0752e03dbacd4139d750d1.diff"; + sha256 = "140jp7xzskik0sb6aqjsw7z477a124cxl7dkm80m2nyzjng4pzg5"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ openssl expat libtool check ]; From 7de6e5de40cfb47fc9fa609aca86541c17c03efd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 14 Sep 2020 11:20:52 +0200 Subject: [PATCH 013/546] knot-dns: doInstallCheck = true --- pkgs/servers/dns/knot-dns/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 3ebb31e20f2..81e93f94f5c 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { CFLAGS = [ "-O2" "-DNDEBUG" ]; doCheck = true; - doInstallCheck = false; # needs pykeymgr? + doInstallCheck = true; postInstall = '' rm -r "$out"/lib/*.la From 0a74834acf308fd4cb80c941c4b5cd3f46148bdd Mon Sep 17 00:00:00 2001 From: rht Date: Fri, 17 Jul 2020 02:51:06 -0400 Subject: [PATCH 014/546] julia: Remove version 0.7 --- pkgs/development/compilers/julia/0.7.nix | 9 --------- pkgs/top-level/all-packages.nix | 5 ----- 2 files changed, 14 deletions(-) delete mode 100644 pkgs/development/compilers/julia/0.7.nix diff --git a/pkgs/development/compilers/julia/0.7.nix b/pkgs/development/compilers/julia/0.7.nix deleted file mode 100644 index e0992d80003..00000000000 --- a/pkgs/development/compilers/julia/0.7.nix +++ /dev/null @@ -1,9 +0,0 @@ -import ./shared.nix { - majorVersion = "0"; - minorVersion = "7"; - maintenanceVersion = "0"; - src_sha256 = "1j57569qm2ii8ddzsp08hds2navpk7acdz83kh27dvk44axhwj6f"; - - libuvVersion = "ed3700c849289ed01fe04273a7bf865340b2bd7e"; - libuvSha256 = "137w666zsjw1p0ma3lf94d75hr1q45sgkfmbizkyji2qm57cnxjs"; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b91dfd4553..66c1fab3ffd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9277,11 +9277,6 @@ in javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; - julia_07 = callPackage ../development/compilers/julia/0.7.nix { - gmp = gmp6; - inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; - }; - julia_10 = callPackage ../development/compilers/julia/1.0.nix { gmp = gmp6; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; From a487f1a744852f06e540fe24700490553eb3c853 Mon Sep 17 00:00:00 2001 From: rht Date: Fri, 17 Jul 2020 22:36:09 -0400 Subject: [PATCH 015/546] julia: Remove version 1.1 --- pkgs/development/compilers/julia/1.1.nix | 9 --------- pkgs/top-level/all-packages.nix | 5 ----- 2 files changed, 14 deletions(-) delete mode 100644 pkgs/development/compilers/julia/1.1.nix diff --git a/pkgs/development/compilers/julia/1.1.nix b/pkgs/development/compilers/julia/1.1.nix deleted file mode 100644 index 5be34b4c4b4..00000000000 --- a/pkgs/development/compilers/julia/1.1.nix +++ /dev/null @@ -1,9 +0,0 @@ -import ./shared.nix { - majorVersion = "1"; - minorVersion = "1"; - maintenanceVersion = "1"; - src_sha256 = "1yqjd0n42xf9hzxpvc9vysyjj98p42by216jkdqakdy7dkjcmnhq"; - - libuvVersion = "2348256acf5759a544e5ca7935f638d2bc091d60"; - libuvSha256 = "1363f4vqayfcv5zqg07qmzjff56yhad74k16c22ian45lram8mv8"; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66c1fab3ffd..9796c6efef0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9282,11 +9282,6 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; - julia_11 = callPackage ../development/compilers/julia/1.1.nix { - gmp = gmp6; - inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; - }; - julia_13 = callPackage ../development/compilers/julia/1.3.nix { gmp = gmp6; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; From d36663c84ef4fb127e65ce145e88fd1adc85f524 Mon Sep 17 00:00:00 2001 From: rht Date: Tue, 15 Sep 2020 01:09:41 -0400 Subject: [PATCH 016/546] julia: Add alias for the deprecated 0.7 and 1.1 --- pkgs/top-level/aliases.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0f21c24af67..5845ecfb81d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -218,6 +218,8 @@ mapAliases ({ joseki = apache-jena-fuseki; # added 2016-02-28 json_glib = json-glib; # added 2018-02-25 kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16 + julia_07 = throw "deprecated in favor of julia_10 LTS"; # added 2020-09-15 + julia_11 = throw "deprecated in favor of latest Julia version"; # added 2020-09-15 kdiff3-qt5 = kdiff3; # added 2017-02-18 keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02 keepassx-community = keepassxc; # added 2017-11 From c66aaf1995cacafc123466496db6b8a74a934182 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 15 Sep 2020 19:48:10 +0200 Subject: [PATCH 017/546] =?UTF-8?q?scrypt:=201.3.0=20=E2=86=92=201.3.1,=20?= =?UTF-8?q?build=20library,=20enable=20tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * update scrypt * enable running of tests * build development library libscrypt-kdf, install to lib output, headers to dev * default output remains untouched: contains binary plus man pages --- pkgs/tools/security/scrypt/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix index 018bc44b144..d834e4acd9c 100644 --- a/pkgs/tools/security/scrypt/default.nix +++ b/pkgs/tools/security/scrypt/default.nix @@ -1,22 +1,32 @@ -{ stdenv, fetchurl, openssl }: +{ stdenv, fetchurl, openssl, utillinux }: stdenv.mkDerivation rec { pname = "scrypt"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "https://www.tarsnap.com/scrypt/${pname}-${version}.tgz"; - sha256 = "0j17yfrpi2bk5cawb4a4mzpv1vadqxh956hx0pa1gqfisknk8c16"; + sha256 = "1hnl0r6pmyxiy4dmafmqk1db7wpc0x9rqpzqcwr9d2cmghcj6byz"; }; + outputs = [ "out" "lib" "dev" ]; + + configureFlags = [ "--enable-libscrypt-kdf" ]; + buildInputs = [ openssl ]; patchPhase = '' - for f in Makefile.in autotools/Makefile.am libcperciva/cpusupport/Build/cpusupport.sh ; do + for f in Makefile.in autotools/Makefile.am libcperciva/cpusupport/Build/cpusupport.sh configure ; do substituteInPlace $f --replace "command -p " "" done + + patchShebangs tests/test_scrypt.sh ''; + doCheck = true; + checkTarget = "test"; + checkInputs = [ utillinux ]; + meta = with stdenv.lib; { description = "Encryption utility"; homepage = "https://www.tarsnap.com/scrypt.html"; From ac4d46972dfe2fca5308e262e019b7bdbb847bec Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 18 Sep 2020 11:17:00 +0200 Subject: [PATCH 018/546] scrypt: fix build of pkgsStatic.scrypt The getconf input defaults to the glibc one if it is being used and uses the netbsd version in all other cases. This fixes the build when building with musl, since it doesn't ship a version of getconf. --- pkgs/tools/security/scrypt/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix index d834e4acd9c..66b5afc9a9b 100644 --- a/pkgs/tools/security/scrypt/default.nix +++ b/pkgs/tools/security/scrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, utillinux }: +{ stdenv, fetchurl, openssl, utillinux, getconf }: stdenv.mkDerivation rec { pname = "scrypt"; @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; + nativeBuildInputs = [ getconf ]; + patchPhase = '' for f in Makefile.in autotools/Makefile.am libcperciva/cpusupport/Build/cpusupport.sh configure ; do substituteInPlace $f --replace "command -p " "" From 0a6df8a06627cab6e6c558d98eb89494e48c29a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=C3=A4llberg?= Date: Mon, 21 Sep 2020 19:01:14 +0200 Subject: [PATCH 019/546] wordnet: Fix darwin build --- pkgs/applications/misc/wordnet/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index 1f0414838ad..f681923978b 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, tcl, tk, xlibsWrapper, makeWrapper}: +{ stdenv, fetchurl, tcl, tk, Cocoa, xlibsWrapper, makeWrapper }: stdenv.mkDerivation rec { version = "3.0"; @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "08pgjvd2vvmqk3h641x63nxp7wqimb9r30889mkyfh2agc62sjbc"; }; - buildInputs = [tcl tk xlibsWrapper makeWrapper]; + buildInputs = [ tcl tk xlibsWrapper makeWrapper ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86a06d852b6..0c4c33216df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24047,7 +24047,9 @@ in wofi = callPackage ../applications/misc/wofi { }; - wordnet = callPackage ../applications/misc/wordnet { }; + wordnet = callPackage ../applications/misc/wordnet { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; wordgrinder = callPackage ../applications/office/wordgrinder { }; From 373d1dd03d25c0a55525577a831b6a1b4a1511cd Mon Sep 17 00:00:00 2001 From: devhell Date: Wed, 23 Sep 2020 20:36:53 +0100 Subject: [PATCH 020/546] profanity: Introduce OMEMO fix It looks like the entire 0.9-series has some OMEMO issues where messages will appear to be sent, but in reality they're not. This patch has been picked from the upstream repo and addresses the issue so that OMEMO is back in a usable state. My thanks to @aszlig for helping and testing this. --- .../networking/instant-messengers/profanity/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 52172bd8be7..4dfca92f39f 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, openssl , glibcLocales, expect, ncurses, libotr, curl, readline, libuuid -, cmocka, libmicrohttpd, expat, sqlite, libmesode +, cmocka, libmicrohttpd, expat, sqlite, libmesode, fetchpatch , autoconf-archive , autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { }; patches = [ + (fetchpatch { + url = "https://github.com/profanity-im/profanity/commit/54667c022f17bdb547c3b8b4eec1c2889c9d60f3.patch"; + sha256 = "0aqrq45im1qnq308hyhh7dqbggzmcqb0b868wr5v8v08pd94s45k"; + }) ./patches/packages-osx.patch ]; From abc0d91370b93bd29cbc0e09345b29e4e6d90c9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A2ju=20Mihai-Drosi?= Date: Tue, 28 Jul 2020 03:40:03 +0300 Subject: [PATCH 021/546] vulkan-headers: 1.2.131.1 -> 1.2.141.0 --- pkgs/development/libraries/vulkan-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index 33926940904..317a5059aec 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.2.131.1"; + version = "1.2.141.0"; nativeBuildInputs = [ cmake ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "sdk-${version}"; - sha256 = "1yf42c2cnhx1y4wkxsdl6g653xl2vvamhpkldz6jb4ca5wk03gxf"; + sha256 = "10nmx6y4llllfcczyfz76amd0vkqv09dj952d19zkzmmgcval7zq"; }; meta = with stdenv.lib; { From 4884f330b5278a3308af6bda5d29fff794f87fe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A2ju=20Mihai-Drosi?= Date: Tue, 28 Jul 2020 03:42:06 +0300 Subject: [PATCH 022/546] vulkan-loader: 1.2.131.2 -> 1.2.141.0 --- pkgs/development/libraries/vulkan-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index e650a28c61e..fdf1a725559 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "vulkan-loader"; - version = "1.2.131.2"; + version = "1.2.141.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "sdk-${version}"; - sha256 = "12n4mxc6db89258k8i47ql1zna7k94lkwv7lpxg39nm8ypa1ywrv"; + sha256 = "10fyg71dza6qakz5zdchccfn0zcr8b1zpfi2rqir6jpzcbi28kcj"; }; nativeBuildInputs = [ pkgconfig cmake ]; From 6c815406abbbdd1a7f520c1b08c8f472e8e6a8cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A2ju=20Mihai-Drosi?= Date: Tue, 28 Jul 2020 03:57:50 +0300 Subject: [PATCH 023/546] glslang: 8.13.3559 -> 8.13.3743 --- pkgs/development/compilers/glslang/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index b9d6866cc43..dee3f488ecc 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "glslang"; - version = "8.13.3559"; + version = "8.13.3743"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; rev = version; - sha256 = "0waamlh2vqh1k40m169294xdlm0iqjkx2vis4qyxfki0r0cnsmnk"; + sha256 = "0d20wfpp2fmbnz1hnsjr9xc62lxpj86ik2qyviqbni0pqj212cry"; }; # These get set at all-packages, keep onto them for child drvs diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c78db798c4d..8337ad3ddff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9099,16 +9099,16 @@ in src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "5c019b5923c1f6bf00a3ac28114ec4a7b1faa0e2"; - sha256 = "17a0kiyb7zjsg7ws12diip84vds1ajl98ni9c2wria6ymcvbvsvz"; + rev = "fd8e130510a6b002b28eee5885a9505040a9bdc9"; + sha256 = "00b7xgyrcb2qq63pp3cnw5q1xqx2d9rfn65lai6n6r89s1vh3vg6"; }; }); spirv-headers = spirv-headers.overrideAttrs (_: { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "204cd131c42b90d129073719f2766293ce35c081"; - sha256 = "1gp0mlbfccqnalaix97jxsa5i337xyzyr55wgssapy56p0q04wv2"; + rev = "f8bf11a0253a32375c32cad92c841237b96696c0"; + sha256 = "1znwjy02dl9rshqzl87rqsv9mfczw7gvwfhcirbl81idahgp4p6l"; }; }); }; From 42133cb6feb286568d65278198cc8a64931b7af7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A2ju=20Mihai-Drosi?= Date: Tue, 28 Jul 2020 04:29:42 +0300 Subject: [PATCH 024/546] spirv-headers: 1.5.1 -> 1.5.3 --- pkgs/development/libraries/spirv-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix index 86a7ab048fa..79b8e7c2dda 100644 --- a/pkgs/development/libraries/spirv-headers/default.nix +++ b/pkgs/development/libraries/spirv-headers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.5.1"; + version = "1.5.3"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; rev = version; - sha256 = "1fnd8qwss6pxcch5j9qi1pdz70828zxsg4m8apgrhyj0p9lm0rbg"; + sha256 = "069sivqajp7z4p44lmrz23lvf237xpkjxd4lzrg27836pwqcz9bj"; }; nativeBuildInputs = [ cmake ]; From 9efc9c8e2d040f04f27fb85ebb5fd3d11c53c231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A2ju=20Mihai-Drosi?= Date: Tue, 28 Jul 2020 04:31:05 +0300 Subject: [PATCH 025/546] spirv-tools: 2019.4 -> 2020.2 --- pkgs/development/tools/spirv-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index f6702229374..bac10d24442 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, python3, spirv-headers }: let # Update spirv-headers rev in lockstep according to DEPs file - version = "2019.4"; + version = "2020.2"; in stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "SPIRV-Tools"; rev = "v${version}"; - sha256 = "17bbvhk4p42x4jlvcr5p9903xiiryw57c8yyfxmqik10s8601an9"; + sha256 = "00b7xgyrcb2qq63pp3cnw5q1xqx2d9rfn65lai6n6r89s1vh3vg6"; }; enableParallelBuilding = true; From 926152f16bda1c5399bbe168315376f3477932cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A2ju=20Mihai-Drosi?= Date: Tue, 28 Jul 2020 04:07:19 +0300 Subject: [PATCH 026/546] vulkan-validation-layers: 1.2.131.2 -> 1.2.141.0 --- .../vulkan-validation-layers/default.nix | 28 +++++++++++++++---- pkgs/top-level/all-packages.nix | 12 ++++---- 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 06a1e4025e1..0d3c227291f 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -1,23 +1,39 @@ { stdenv, fetchFromGitHub, cmake, writeText, python3 -, vulkan-headers, vulkan-loader, glslang +, vulkan-headers, vulkan-loader, glslang, spirv-headers , pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }: stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.2.131.2"; + version = "1.2.141.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "sdk-${version}"; - sha256 = "1sz0388cr018ldx6ziplvk4v3zbg44pww77kv6kv5wxl69plwfcn"; + sha256 = "1yfas7q122kx74nbjk3wxlyacysgncvlvq081a5dp238m88vkmbj"; }; - nativeBuildInputs = [ pkgconfig cmake python3 ]; - buildInputs = [ vulkan-headers vulkan-loader libxcb libXrandr wayland ]; + nativeBuildInputs = [ + pkgconfig + cmake + python3 + ]; + + buildInputs = [ + glslang + spirv-headers + vulkan-headers + vulkan-loader + libxcb + libXrandr + wayland + ]; + enableParallelBuilding = true; - cmakeFlags = [ "-DGLSLANG_INSTALL_DIR=${glslang}" ]; + cmakeFlags = [ + "-DGLSLANG_INSTALL_DIR=${glslang}" + ]; # Help vulkan-loader find the validation layers setupHook = writeText "setup-hook" '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8337ad3ddff..f4b0ae7dc31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15824,24 +15824,24 @@ in src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "323a81fc5e30e43a04e5e22af4cba98ca2a161e6"; - sha256 = "1kwyh95l02w3v1ra55c836wayzw8d0m14ab7wf0ynhhyp3k2p9hv"; + rev = "e128ab0d624ce7beb08eb9656bb260c597a46d0a"; + sha256 = "0jj8zrl3dh9fq71jc8msx3f3ifb2vjcb37nl0w4sa8sdhfff74pv"; }; }); spirv-headers = spirv-tools.overrideAttrs (_: { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "204cd131c42b90d129073719f2766293ce35c081"; - sha256 = "1gp0mlbfccqnalaix97jxsa5i337xyzyr55wgssapy56p0q04wv2"; + rev = "ac638f1815425403e946d0ab78bac71d2bdbf3be"; + sha256 = "1lkhs7pxcrfkmiizcxl0w5ajx6swwjv7w3iq586ipgh571fc75gx"; }; }); }).overrideAttrs (_: { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "4fc7a33910fb8e40b970d160e1b38ab3f67fe0f3"; - sha256 = "1dghz8zl774dx2xpa4dv8xhxirbylgyn6kx18ib4qirna1njp0zg"; + rev = "e00d27c6d65b7d3e72506a311d7f053da4051295"; + sha256 = "00lzvzk613gpm1vsdxffmx52z3c52ijwvzk4sfhh95p71kdydhgv"; }; }); }; From fab03d3a39a7d552583b0ea4e546fc69c7d0b221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A2ju=20Mihai-Drosi?= Date: Tue, 28 Jul 2020 04:37:12 +0300 Subject: [PATCH 027/546] shaderc: 2019.1 -> 2020.2 --- pkgs/development/compilers/shaderc/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index e7308973d5c..6a0c7ded4b9 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -8,24 +8,24 @@ let glslang = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "3ed344dd784ecbbc5855e613786f3a1238823e56"; - sha256 = "00s2arfvw78d9k9fmangqlkvkmkpqzrin3g91vfab4wr8srb09dx"; + rev = "3ee5f2f1d3316e228916788b300d786bb574d337"; + sha256 = "1l5h9d92mzd35pgs0wibqfg7vbl771lwnvdlcsyhf6999khn5dzv"; }; spirv-tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "323a81fc5e30e43a04e5e22af4cba98ca2a161e6"; - sha256 = "1kwyh95l02w3v1ra55c836wayzw8d0m14ab7wf0ynhhyp3k2p9hv"; + rev = "b63f0e5ed3e818870968ebf6af73317127fd07b0"; + sha256 = "1chv30azfp76nha428ivg4ixrij6d8pxj5kn3jam87gmkmgc9zhm"; }; spirv-headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "204cd131c42b90d129073719f2766293ce35c081"; - sha256 = "1gp0mlbfccqnalaix97jxsa5i337xyzyr55wgssapy56p0q04wv2"; + rev = "979924c8bc839e4cb1b69d03d48398551f369ce7"; + sha256 = "07vyjlblpm4zhfds612h86lnz0qvrj5qqw5z2zzfa3m9fax7cm85"; }; in stdenv.mkDerivation rec { pname = "shaderc"; - version = "2019.1"; + version = "2020.2"; outputs = [ "out" "lib" "bin" "dev" "static" ]; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { owner = "google"; repo = "shaderc"; rev = "v${version}"; - sha256 = "0x514rpignnb4vvl7wmijfakqc59986knjw3dh1zx0ah42xa7x37"; + sha256 = "1sxz8872x3rdlrhmbn83r1vniq4j51jnk0ka3447fq68il4myf1w"; }; patchPhase = '' From bda92bfad0f9b16425978784ced74753044ac18e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A2ju=20Mihai-Drosi?= Date: Tue, 28 Jul 2020 04:40:48 +0300 Subject: [PATCH 028/546] vulkan-tools: 1.2.131.1 -> 1.2.141.0 --- pkgs/tools/graphics/vulkan-tools/default.nix | 21 +++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 71bcdc2e269..e320e4e6ef3 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -1,22 +1,33 @@ -{ stdenv, fetchFromGitHub, cmake, python3, vulkan-loader, vulkan-headers, - glslang, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }: +{ stdenv, lib, fetchFromGitHub, cmake, python3, vulkan-loader, + vulkan-headers, glslang, pkgconfig, xlibsWrapper, libxcb, + libXrandr, wayland }: stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.2.131.1"; + version = "1.2.141.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "sdk-${version}"; - sha256 = "0ws47ansrr8cq4qjf6k4q0ygm9wwd3w7mhwqcl1qxms8lh5vmhfq"; + sha256 = "1ch56ihm7rmilipfyc4i4ww7l6i20fb3qikkpm1ch43kzn42zjaw"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ python3 vulkan-headers vulkan-loader xlibsWrapper libxcb libXrandr wayland ]; enableParallelBuilding = true; - cmakeFlags = [ "-DBUILD_ICD=OFF" "-DGLSLANG_INSTALL_DIR=${glslang}" ]; + libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ]; + + dontPatchELF = true; + + cmakeFlags = [ + # Don't build the mock ICD as it may get used instead of other drivers, if installed + "-DBUILD_ICD=OFF" + "-DGLSLANG_INSTALL_DIR=${glslang}" + # vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH + "-DCMAKE_INSTALL_RPATH=${libraryPath}" + ]; meta = with stdenv.lib; { description = "LunarG Vulkan loader"; From d8d8f9390a623f88c548aa8dd9b2c3c50e817d57 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Wed, 30 Sep 2020 09:52:41 +1000 Subject: [PATCH 029/546] delly: 0.8.2 -> 0.8.5 --- .../science/biology/delly/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/science/biology/delly/default.nix b/pkgs/applications/science/biology/delly/default.nix index a6c45f8aa44..6acdc53544c 100644 --- a/pkgs/applications/science/biology/delly/default.nix +++ b/pkgs/applications/science/biology/delly/default.nix @@ -1,25 +1,16 @@ { stdenv, fetchpatch, fetchFromGitHub, htslib, zlib, bzip2, lzma, ncurses, boost }: -let - htslibPatch = fetchpatch { - url = "https://github.com/dellytools/delly/commit/0e5c710b0c5ea790bb39699d4cbd49cf4fb86f14.diff"; - sha256 = "09bz1qqvzhdzm99hf9zgrv80kq9jlr1m2mdvx96p2hk5lpnbdl7y"; - excludes = [ "src/htslib" ]; - }; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "delly"; - version = "0.8.2"; + version = "0.8.5"; src = fetchFromGitHub { owner = "dellytools"; repo = pname; rev = "v${version}"; - sha256 = "14bkmixz7737xj192ww96s3a20zc7xs7r04db8avw3ggi3i1s1cs"; + sha256 = "1af1y20hd8x2yvix0gjvx038w7chf4fiyr68ny5yvrx5b2gw0vbq"; }; - patches = [ htslibPatch ]; - buildInputs = [ zlib htslib bzip2 lzma ncurses boost ]; EBROOTHTSLIB = htslib; @@ -34,7 +25,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Structural variant caller for mapped DNA sequenced data"; - license = licenses.gpl3; + license = licenses.bsd3; maintainers = with maintainers; [ scalavision ]; platforms = platforms.linux; longDescription = '' From 94ce37ecef9f0b7825d4d3a660df39643f8d5cb0 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 1 Oct 2020 09:27:46 -0400 Subject: [PATCH 030/546] awscli: 1.18.138 -> 1.18.150 --- pkgs/tools/admin/awscli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 6bc32962891..79d6f42628f 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -19,11 +19,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.18.137"; # N.B: if you change this, change botocore to a matching version too + version = "1.18.150"; # N.B: if you change this, change botocore to a matching version too src = fetchPypi { inherit pname version; - sha256 = "0g745lvmi30di3bbpbca2bkqqzk7g6l3ssmbpi8pvgy0wrfhij69"; + sha256 = "0jrxzr4dx2s6ychmrz19yz8i4kqcwj7f8ly82ydwvrr0ff62374g"; }; postPatch = '' From 69d1582a4441ebe8b8aee181d2f73fa7aad358e2 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 1 Oct 2020 09:27:55 -0400 Subject: [PATCH 031/546] botocore: 1.17.60 -> 1.18.9 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 2593e3909e0..daa5897fefd 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.17.60"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.18.9"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "0n3a0mhx00i2i99mcwdkk7nbqdpd50zdfkg14mki0ydccqx1jgqr"; + sha256 = "0rb3in7n9hdhp3sklkw78l378103khgmhdfy13kxfbgb0646pc1m"; }; propagatedBuildInputs = [ From 57a4720a4af12a1f324c5ed9ebb9e28f46604ac3 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 1 Oct 2020 09:28:10 -0400 Subject: [PATCH 032/546] boto3: 1.14.60 -> 1.15.9 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index b7d599f5811..c1f1b180b70 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.14.60"; # N.B: if you change this, change botocore too + version = "1.15.9"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "05s2ysp90mwz5aydzfs9xm3hk9pz7s95zzpjg6g1msyy2gp2gjnq"; + sha256 = "0zrsrz7c8aqj3n06piybwf7vy026rflr0ky362q615rln6iggx82"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; From e635dccfdde9597e40bc3c11144bfbce85b41995 Mon Sep 17 00:00:00 2001 From: talyz Date: Fri, 2 Oct 2020 16:46:53 +0200 Subject: [PATCH 033/546] nomachine-client: 6.11.2 -> 6.12.3 --- pkgs/tools/admin/nomachine-client/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix index 4657c64d330..50083535a2d 100644 --- a/pkgs/tools/admin/nomachine-client/default.nix +++ b/pkgs/tools/admin/nomachine-client/default.nix @@ -1,10 +1,10 @@ { stdenv, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp, libpulseaudio }: let - versionMajor = "6.11"; - versionMinor = "2"; - versionBuild_x86_64 = "1"; - versionBuild_i686 = "1"; + versionMajor = "6.12"; + versionMinor = "3"; + versionBuild_x86_64 = "7"; + versionBuild_i686 = "8"; in stdenv.mkDerivation rec { pname = "nomachine-client"; @@ -17,7 +17,7 @@ in "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz" "https://web.archive.org/web/https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz" ]; - sha256 = "1b6r9bwkr8mhaljma19ikxpkmlx8iy5r1vf5hlv27bja2zz1r8xr"; + sha256 = "1dqsqwxbd77g6gc0hvjmmg4flm3vwwv5y98m8d9wxyybp37vkmgd"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { @@ -25,7 +25,7 @@ in "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz" "https://web.archive.org/web/https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz" ]; - sha256 = "0dl138ry9n1qh651zh0zvp88qhgxrs2kvvnq329jw0py5v70b9pm"; + sha256 = "1q14hxjy66s5cpq19rshscsm679csb6p16c5p2agh5zd64cr4am6"; } else throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}"; From 165595e92a0ea711a6625db0eafbe209c4e9c094 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 4 Oct 2020 05:05:06 +0200 Subject: [PATCH 034/546] python3Packages.zeroconf: enable tests --- .../python-modules/zeroconf/default.nix | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 9e8d0853ecf..2b5e3bc0252 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -1,11 +1,11 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi , ifaddr , typing , isPy27 , pythonOlder -, python +, pytestCheckHook }: buildPythonPackage rec { @@ -19,16 +19,21 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ ifaddr ] - ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; + ++ lib.optionals (pythonOlder "3.5") [ typing ]; - # tests not included with pypi release - doCheck = false; + checkInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "zeroconf/test.py" ]; + disabledTests = [ + # disable tests that expect some sort of networking in the build container + "test_launch_and_close" + "test_launch_and_close_v4_v6" + "test_launch_and_close_v6_only" + "test_integration_with_listener_ipv6" + ]; - checkPhase = '' - ${python.interpreter} test_zeroconf.py - ''; + pythonImportsCheck = [ "zeroconf" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A pure python implementation of multicast DNS service discovery"; homepage = "https://github.com/jstasiak/python-zeroconf"; license = licenses.lgpl21; From 16265f5641311a0b3184b30fbd3a98c11c138006 Mon Sep 17 00:00:00 2001 From: Vladimir Serov Date: Tue, 6 Oct 2020 23:54:04 +0300 Subject: [PATCH 035/546] super-slicer: 2.2.53.1 -> 2.2.54.0 --- pkgs/applications/misc/prusa-slicer/super-slicer.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index e2ef645e70a..da8cea8ab02 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -3,7 +3,7 @@ }: let appname = "SuperSlicer"; - version = "2.2.53.1"; + version = "2.2.54.0"; pname = "super-slicer"; description = "PrusaSlicer fork with more features and faster development cycle"; override = super: { @@ -12,7 +12,7 @@ let src = fetchFromGitHub { owner = "supermerill"; repo = "SuperSlicer"; - sha256 = "sha256-CAhwmQ63N/XJYToTnIV84lNnjDGNbkmYPzNKNL/wVxs="; + sha256 = "sha256-vvuUecysSdBvGBKOariQnsGJ9/Qccwp/lSq8WCED+Uk="; rev = version; }; @@ -23,8 +23,7 @@ let postInstall = '' mkdir -p "$out/share/pixmaps/" - # Change slic3r++ to SuperSlicer at the next release! - ln -s "$out/share/slic3r++/icons/Slic3r.png" "$out/share/pixmaps/${appname}.png" + ln -s "$out/share/SuperSlicer/icons/Slic3r.png" "$out/share/pixmaps/${appname}.png" mkdir -p "$out/share/applications" cp "$desktopItem"/share/applications/* "$out/share/applications/" ''; From 7a00fdf5cf269909f33af6dc3cc230f4557af42d Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 17 Sep 2020 21:08:23 -0400 Subject: [PATCH 036/546] nvidia_x11_beta: stable -> 455.23.04 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 7c37fcf231f..c963a93b46c 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -30,7 +30,12 @@ rec { else legacy_390; # No active beta right now - beta = stable; + beta = generic { + version = "455.23.04"; + sha256_64bit = "0rvbb9s4ijb0gyiscd93chbgim4lqmy4ksfy15b4abf078qk7q4g"; + settingsSha256 = "0l0lkmnm05gf5020qnjlhg11flh0kz79ak5ivzgya9fybjaixrc4"; + persistencedSha256 = "005dnxgqvari158xmh9ha58mlyz3ljzg4pbbiczib0ry73p6dimn"; + }; # Vulkan developer beta driver vulkan_beta = generic { From 1ea09a8d5eb779bf45351bcc811f170657be7276 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 1 Oct 2020 16:38:45 -0400 Subject: [PATCH 037/546] nvidia_x11: 450.66 -> 450.80.02 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index c963a93b46c..33423a6d83a 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -22,10 +22,10 @@ rec { # Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { - version = "450.66"; - sha256_64bit = "1a6va0gvbzpkyza693v2ml1is4xbv8wxasqk0zd5y7rxin94c1ms"; - settingsSha256 = "0mkgs91gx7xb7f24xkq9fl7i8d4l7s0wr9a44b1gm1vkw82fm7lj"; - persistencedSha256 = "02id8cg8fba7c1j4m6vj4gp2mv39lz2k557kdjw8lszcpw6f1fhh"; + version = "450.80.02"; + sha256_64bit = "1cwmmxxdcr42nc9prkhlxlhqi56rva962jhga1a6rm12z0cjynhg"; + settingsSha256 = "1yxh3mijwvsz1ra0flwkg9zzapwn57q1zx7s5s7m16vxq2ywpl5a"; + persistencedSha256 = "1y93hfb8s36d9hqmyrph9ifrzxzjfnh5w0n9q1ch996dqfvkgi1y"; } else legacy_390; From 0ce0f5e9c587fd11d69888ecc6c5686932ed3be5 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Wed, 7 Oct 2020 13:56:13 -0400 Subject: [PATCH 038/546] nvidia_x11: 450.80.02 -> 455.28 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 33423a6d83a..2505d8ab287 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -22,10 +22,10 @@ rec { # Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { - version = "450.80.02"; - sha256_64bit = "1cwmmxxdcr42nc9prkhlxlhqi56rva962jhga1a6rm12z0cjynhg"; - settingsSha256 = "1yxh3mijwvsz1ra0flwkg9zzapwn57q1zx7s5s7m16vxq2ywpl5a"; - persistencedSha256 = "1y93hfb8s36d9hqmyrph9ifrzxzjfnh5w0n9q1ch996dqfvkgi1y"; + version = "455.28"; + sha256_64bit = "03ysf61qrb272yqkn7bhn9d65lcfhmqc2c0dbh5prp5f2ndlkqg4"; + settingsSha256 = "0r9vclmh48yhcrnz9yrswfipj5450ga73jywdjg19gaq2s2aaf1f"; + persistencedSha256 = "04v9d2g1r0x5dgyy9hqqyp0p9a3qxy1kzl13vklfqrwswb8jw7z1"; } else legacy_390; From 3c92aba319e43e3495714c570d728d587c20b017 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Wed, 7 Oct 2020 13:56:26 -0400 Subject: [PATCH 039/546] nvidia_x11_beta: 455.23.04 -> nvidia_x11 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 2505d8ab287..75ce13da0d3 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -30,12 +30,7 @@ rec { else legacy_390; # No active beta right now - beta = generic { - version = "455.23.04"; - sha256_64bit = "0rvbb9s4ijb0gyiscd93chbgim4lqmy4ksfy15b4abf078qk7q4g"; - settingsSha256 = "0l0lkmnm05gf5020qnjlhg11flh0kz79ak5ivzgya9fybjaixrc4"; - persistencedSha256 = "005dnxgqvari158xmh9ha58mlyz3ljzg4pbbiczib0ry73p6dimn"; - }; + beta = stable; # Vulkan developer beta driver vulkan_beta = generic { From 99de53b79bb8642d1fc865b70a55bc4da9f0d669 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Mon, 27 Jul 2020 19:40:50 -0400 Subject: [PATCH 040/546] doas: add enablePAM option New option "withPAM" controls whether to build support for pluggable authetincation modules. Default value is "true", which correspond to existing behaviour. Futhermore, with default configuration, this change do not cause rebuild. --- pkgs/tools/security/doas/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/doas/default.nix b/pkgs/tools/security/doas/default.nix index baa2fc301a8..6aa9759affd 100644 --- a/pkgs/tools/security/doas/default.nix +++ b/pkgs/tools/security/doas/default.nix @@ -4,6 +4,7 @@ , bison , pam +, withPAM ? true , withTimestamp ? true }: @@ -23,6 +24,7 @@ stdenv.mkDerivation rec { configureFlags = [ (lib.optionalString withTimestamp "--with-timestamp") # to allow the "persist" setting + (lib.optionalString (!withPAM) "--without-pam") "--pamdir=${placeholder "out"}/etc/pam.d" ]; From 30a332c61352719317fe53057dd653c7044cf703 Mon Sep 17 00:00:00 2001 From: devhell Date: Fri, 9 Oct 2020 11:55:39 +0100 Subject: [PATCH 041/546] teams: 1.3.00.16851 -> 1.3.00.25560 --- .../networking/instant-messengers/teams/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index d58e27cc62b..f116bf1e86d 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "teams"; - version = "1.3.00.16851"; + version = "1.3.00.25560"; src = fetchurl { url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb"; - sha256 = "1mp4xq224nwv2ckb5zd7iv3yvkg3gv6mk9dvx3f60jgain7qr0r3"; + sha256 = "0kpcd9q6v2qh0dzddykisdbi3djbxj2rl70wchlzrb6bx95hkzmc"; }; nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook ]; From ef2eaa937346d9a7dedeff176671a7fcb5ed6efa Mon Sep 17 00:00:00 2001 From: Jappie Klooster Date: Fri, 9 Oct 2020 23:16:54 +0200 Subject: [PATCH 042/546] cut-the-crap: Mark unbroken I fixed this by adding c2hs to cabal as a built tool. --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index fe19ca322a3..c77ce2f8742 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -4235,7 +4235,6 @@ broken-packages: - curve25519 - curves - custom-prelude - - cut-the-crap - CV - cv-combinators - cypher From c29e980e455f28c024ed929c4bf21eda94421535 Mon Sep 17 00:00:00 2001 From: upkeep-bot Date: Sat, 10 Oct 2020 00:20:09 +0000 Subject: [PATCH 043/546] vscodium: 1.49.3 -> 1.50.0 --- pkgs/applications/editors/vscode/vscodium.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 4e640f04a4f..9b1c5d2104a 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "19y25yfkls53w4qlmipfvjig7zykgwx1010ny58k339fv181vdyq"; - x86_64-darwin = "1ak3pfvwdg51hcv2kyqpnhzkl7k23k5qk197sf6rv02kgwan7pxl"; + x86_64-linux = "0fhwqif9021sg22n8qqn3m2fml7sjb03ydgbakg1021i3y8zl599"; + x86_64-darwin = "1bsvkwymihkv0azf0mmy0f58zsxs6w13in6lfxzaz7s695csn9s0"; }.${system}; sourceRoot = { @@ -27,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.49.3"; + version = "1.50.0"; pname = "vscodium"; executableName = "codium"; From 698b39ff6c9c1041f6aa77213b5d1d000dfb1e28 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 10 Oct 2020 02:31:02 +0200 Subject: [PATCH 044/546] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-17-g25ee725 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/735a8cae16befcd0fae16a7b5a44243a690348cf. --- .../haskell-modules/hackage-packages.nix | 72 +++++++++++++------ 1 file changed, 52 insertions(+), 20 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c60cc882e98..5756be57663 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -54557,6 +54557,32 @@ self: { broken = true; }) {}; + "citeproc" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring + , case-insensitive, containers, data-default, Diff, directory + , file-embed, filepath, mtl, pandoc-types, pretty, rfc5051, safe + , scientific, text, timeit, transformers, uniplate, vector + , xml-conduit + }: + mkDerivation { + pname = "citeproc"; + version = "0.1"; + sha256 = "1j1jlarqgv0q8c4vvys62n8p6hsgw26xm7n83w66ab4m5wwrgn5g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring case-insensitive containers + data-default file-embed filepath pandoc-types rfc5051 safe + scientific text transformers uniplate vector xml-conduit + ]; + testHaskellDepends = [ + aeson base bytestring containers Diff directory filepath mtl pretty + text timeit transformers + ]; + description = "Generates citations and bibliography from CSL styles"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "citeproc-hs" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , hexpat, hs-bibutils, HTTP, json, mtl, network, network-uri @@ -67107,32 +67133,34 @@ self: { "cut-the-crap" = callPackage ({ mkDerivation, base, c2hs, exceptions, generic-lens, hspec - , hspec-core, lens, optparse-applicative, pocketsphinx, QuickCheck - , quickcheck-classes, regex-tdfa, shelly, sphinxbase - , system-filepath, temporary, text, time, unliftio-core + , hspec-core, lens, network-uri, optparse-applicative, pocketsphinx + , QuickCheck, quickcheck-classes, random, regex-tdfa, shelly + , sphinxbase, system-filepath, temporary, text, time, unliftio-core }: mkDerivation { pname = "cut-the-crap"; - version = "1.4.2"; - sha256 = "16l8ar38nl2sgsbwjslhxd8z2wyjmdgmi51sic3vvyv7n6b9mr51"; + version = "2.0.0"; + sha256 = "1a4qzn56pvfrn6g78ifb67qynr5ni74qmp43gdg7x84gn1633j0s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base exceptions generic-lens lens optparse-applicative regex-tdfa - shelly system-filepath temporary text time unliftio-core + base exceptions generic-lens lens network-uri optparse-applicative + random regex-tdfa shelly system-filepath temporary text time + unliftio-core ]; libraryPkgconfigDepends = [ pocketsphinx sphinxbase ]; libraryToolDepends = [ c2hs ]; executableHaskellDepends = [ - base exceptions generic-lens lens optparse-applicative regex-tdfa - shelly system-filepath temporary text time unliftio-core + base exceptions generic-lens lens network-uri optparse-applicative + random regex-tdfa shelly system-filepath temporary text time + unliftio-core ]; executablePkgconfigDepends = [ pocketsphinx sphinxbase ]; executableToolDepends = [ c2hs ]; testHaskellDepends = [ - base exceptions generic-lens hspec hspec-core lens - optparse-applicative QuickCheck quickcheck-classes regex-tdfa - shelly system-filepath temporary text time unliftio-core + base exceptions generic-lens hspec hspec-core lens network-uri + optparse-applicative QuickCheck quickcheck-classes random + regex-tdfa shelly system-filepath temporary text time unliftio-core ]; testPkgconfigDepends = [ pocketsphinx sphinxbase ]; testToolDepends = [ c2hs ]; @@ -265890,8 +265918,8 @@ self: { }: mkDerivation { pname = "uniqueness-periods-vector-properties"; - version = "0.5.2.0"; - sha256 = "04gg6mcfd27yv2305gmbw1bxcn480933h9cw16lir5swifymbzx5"; + version = "0.5.3.0"; + sha256 = "1k6rdw55myb1qi0idxk4rks9na2w36gh2pmdlx2qkr7iiqrp613g"; libraryHaskellDepends = [ base mmsyn6ukr mmsyn7s phonetic-languages-rhythmicity phonetic-languages-ukrainian uniqueness-periods-vector @@ -274236,12 +274264,16 @@ self: { }) {}; "web-plugins" = callPackage - ({ mkDerivation, base, containers, mtl, stm, text }: + ({ mkDerivation, base, binary, bytestring, containers, http-types + , mtl, stm, text + }: mkDerivation { pname = "web-plugins"; - version = "0.2.9.1"; - sha256 = "13wbfl8v5milx2s4lyiw4b44gk5syqbaaqwdxz5sclpxs2ilxvq2"; - libraryHaskellDepends = [ base containers mtl stm text ]; + version = "0.3.0"; + sha256 = "08qv5770nq5nivl03q0bdz6v0x3vvyg12q4mgxrj2kds5hkn23nd"; + libraryHaskellDepends = [ + base binary bytestring containers http-types mtl stm text + ]; description = "dynamic plugin system for web applications"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -276543,8 +276575,8 @@ self: { }: mkDerivation { pname = "wolf"; - version = "0.3.47"; - sha256 = "1p6d61zk0yr55f7mk7cv1fyjs23aximsy1ayjknvc3rwsijqx264"; + version = "0.3.48"; + sha256 = "1fg3wxhc37vl54rb2ikr2mpwdnhsmc3zw7111jignwq4q9nb8w5v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ From 2005dbf5a83bac383776c719c051266dd012580d Mon Sep 17 00:00:00 2001 From: Jappie Klooster Date: Sat, 10 Oct 2020 12:58:11 +0200 Subject: [PATCH 045/546] Add youtube-dl to path for version 2 --- pkgs/development/haskell-modules/configuration-nix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 9be62568373..ad9e33042a0 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -731,7 +731,7 @@ self: super: builtins.intersectAttrs super { primitive = dontCheck super.primitive; cut-the-crap = - let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg_3 ]; + let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg_3 pkgs.youtube-dl ]; in overrideCabal (addBuildTool super.cut-the-crap pkgs.makeWrapper) (_drv: { postInstall = '' wrapProgram $out/bin/cut-the-crap \ From 0756b8a7bf25e7a5b4fbfa578e95a28cb5ef6380 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 10 Oct 2020 16:01:57 +0200 Subject: [PATCH 046/546] haskell-language-server: Init wrapper for multiple ghc versions at 0.5.0 (#99519) * haskell-language-server: Init wrapper for multiple ghc versions at 0.5.0 * Fix closure size * docs: Add hls section to Haskell part of manual --- doc/languages-frameworks/haskell.section.md | 33 +++++++++++ .../haskell-language-server/withWrapper.nix | 58 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 93 insertions(+) create mode 100644 pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index cba4d0561b0..c2838c733c7 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -359,6 +359,39 @@ services.hoogle = { }; ``` +### How to install haskell-language-server + +In short: Install `pkgs.haskell-language-server` and use the +`haskell-language-server-wrapper` command to run it. See the [hls +README](https://github.com/haskell/haskell-language-server) on how to configure +your text editor to use hls and how to test your setup. + +Hls needs to be compiled with the ghc version of the project you use it on. + +`pkgs.haskell-language-server` provides `haskell-language-server-wrapper`, +`haskell-language-server`, `haskell-language-server-x.x` and +`haskell-language-server-x.x.x` binaries, where `x.x.x` is the ghc version for +which it is compiled. By default it includes binaries for all ghc versions +that are provided in the binary caches. You can override that list with e.g. + +```nix +pkgs.haskell-language-server.override { supportedGhcVersions = [ "884" "901" ]; } +``` + +When you run `haskell-language-server-wrapper` it will detect the ghc version +used by the project you are working on (by asking e.g. cabal or stack) and pick +the appropriate above mentioned binary from your path. + +Be careful when installing hls globally and using a pinned nixpkgs for a Haskell +project in a nix-shell. If the nixpkgs versions deviate to much (e.g. use +different `glibc` versions) hls might fail. It is recommended to then install hls +in the nix-shell from the nixpkgs version pinned in there. + +If you know, that you only use one ghc version, e.g. in a project specific +nix-shell You can either use an override as given above or simply install +`pkgs.haskellPackages.haskell-language-server` instead of the top-level +attribute `pkgs.haskell-language-server`. + ### How to build a Haskell project using Stack [Stack](http://haskellstack.org) is a popular build tool for Haskell projects. diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix new file mode 100644 index 00000000000..09cb60901e4 --- /dev/null +++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -0,0 +1,58 @@ +{ lib, supportedGhcVersions ? [ "865" "884" "8102" ], stdenv, haskellPackages +, haskell }: +# +# The recommended way to override this package is +# +# pkgs.haskell-language-server.override { supportedGhcVersions = [ "901" ]; } +# +# for example. Read more about this in the haskell-language-server section of the nixpkgs manual. +# +let + inherit (lib) concatStringsSep concatMapStringsSep take splitString; + getPackages = version: haskell.packages."ghc${version}"; + getMajorVersion = packages: + concatStringsSep "." (take 2 (splitString "." packages.ghc.version)); + tunedHls = hsPkgs: + haskell.lib.justStaticExecutables + (haskell.lib.overrideCabal hsPkgs.haskell-language-server (old: { + postInstall = '' + remove-references-to -t ${hsPkgs.ghc} $out/bin/haskell-language-server + remove-references-to -t ${hsPkgs.shake.data} $out/bin/haskell-language-server + remove-references-to -t ${hsPkgs.js-jquery.data} $out/bin/haskell-language-server + remove-references-to -t ${hsPkgs.js-dgtable.data} $out/bin/haskell-language-server + remove-references-to -t ${hsPkgs.js-flot.data} $out/bin/haskell-language-server + ''; + })); + targets = version: + let packages = getPackages version; + in [ + "haskell-language-server-${packages.ghc.version}" + "haskell-language-server-${getMajorVersion packages}" + ]; + makeSymlinks = version: + concatMapStringsSep "\n" (x: + "ln -s ${ + tunedHls (getPackages version) + }/bin/haskell-language-server $out/bin/${x}") (targets version); + pkg = tunedHls haskellPackages; +in stdenv.mkDerivation { + pname = "haskell-language-server"; + version = haskellPackages.haskell-language-server.version; + buildCommand = '' + mkdir -p $out/bin + ln -s ${pkg}/bin/haskell-language-server $out/bin/haskell-language-server + ln -s ${pkg}/bin/haskell-language-server-wrapper $out/bin/haskell-language-server-wrapper + ${concatMapStringsSep "\n" makeSymlinks supportedGhcVersions} + ''; + meta = haskellPackages.haskell-language-server.meta // { + maintainers = [ lib.maintainers.maralorn ]; + longDescription = '' + This package provides haskell-language-server, haskell-language-server-wrapper, ${ + concatMapStringsSep ", " (x: concatStringsSep ", " (targets x)) + supportedGhcVersions + }. + + You can override the list supportedGhcVersions. + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e71ec4fc23..afa6ffb40c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4340,6 +4340,8 @@ in hash-slinger = callPackage ../tools/security/hash-slinger { }; + haskell-language-server = callPackage ../development/tools/haskell/haskell-language-server/withWrapper.nix { }; + hasmail = callPackage ../applications/networking/mailreaders/hasmail { }; hal-flash = callPackage ../os-specific/linux/hal-flash { }; From a278023859b49f43e6907365a20cebd0501eb5ea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Oct 2020 02:30:26 +0200 Subject: [PATCH 047/546] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-17-g25ee725 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/75f7f39925d13a958d2d82903a18980908391b40. --- .../haskell-modules/hackage-packages.nix | 273 ++++++++++++++---- 1 file changed, 222 insertions(+), 51 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5756be57663..142286bab50 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1318,8 +1318,8 @@ self: { }: mkDerivation { pname = "BNFC"; - version = "2.8.3"; - sha256 = "00w8g0kn4sgjyiq4hykkz8k0kl5b5861v7d9g2021vca78gif6wl"; + version = "2.8.4"; + sha256 = "0z84qfpfm402fl0fpxcggr4jz2sn8cqgjy50r6xfx310g7xwdgnd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base ]; @@ -21941,8 +21941,8 @@ self: { }: mkDerivation { pname = "Z-IO"; - version = "0.1.3.0"; - sha256 = "0qcnpk2ps2m2s23fv3ydldicz93ad82xadh53wpnwi1m1dh6kjpm"; + version = "0.1.4.0"; + sha256 = "16a7bc8zm7ws3kmhrpjnvc284qq71v5y7r4x8yv268bay7q1bjga"; libraryHaskellDepends = [ base exceptions primitive stm time Z-Data ]; @@ -24515,8 +24515,8 @@ self: { }: mkDerivation { pname = "aeson-deriving"; - version = "0.1.1.1"; - sha256 = "1yqiw8imp30gv3jij4f724yi8mmf6w8fn84kmq9r7yjn7scfz4dj"; + version = "0.1.1.2"; + sha256 = "05mcsask5mhp6gqhch3nnxpcli1j6wax7x9ap1jaypyvq9bi0cxs"; libraryHaskellDepends = [ aeson base regex-tdfa text unordered-containers ]; @@ -46344,20 +46344,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bugsnag-hs_0_2_0_1" = callPackage - ({ mkDerivation, aeson, auto-update, base, bytestring, hedgehog - , http-client, stm, text, time, unordered-containers + "bugsnag-hs_0_2_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, hedgehog, http-client + , text, time, unordered-containers }: mkDerivation { pname = "bugsnag-hs"; - version = "0.2.0.1"; - sha256 = "12s3swamnm9hc3fkwc2qqzr0xz41i0hkgsjmphfsb544r07cfmjn"; + version = "0.2.0.2"; + sha256 = "0rai920g05g6gs8svi10av73ynd5m6kqc5428h55nb3hgb4hm6dh"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson auto-update base bytestring http-client stm text time - unordered-containers + aeson base bytestring http-client text time unordered-containers ]; - testHaskellDepends = [ aeson base bytestring hedgehog stm ]; + testHaskellDepends = [ aeson base bytestring hedgehog ]; description = "A Bugsnag client for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -56493,17 +56492,17 @@ self: { }) {inherit (pkgs) clutter; inherit (pkgs) pango;}; "cmaes" = callPackage - ({ mkDerivation, base, doctest, doctest-prop, mtl, process, random + ({ mkDerivation, base, doctest, mtl, process, QuickCheck, random , safe, strict, syb, vector }: mkDerivation { pname = "cmaes"; - version = "0.2.2.1"; - sha256 = "0r0z5rik19sd985hgdy7f00sfpqwlgzbsmkqsiywddi8nqg6qq7m"; + version = "0.2.3"; + sha256 = "1bgyrlqbbq8ff76d6lkig3ajzk2549a7wgvxsdxl76cp3ra323yf"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base mtl process safe strict syb ]; testHaskellDepends = [ - base doctest doctest-prop mtl process random syb vector + base doctest mtl process QuickCheck random syb vector ]; description = "CMA-ES wrapper in Haskell"; license = "unknown"; @@ -67166,8 +67165,6 @@ self: { testToolDepends = [ c2hs ]; description = "Cuts out uninteresting parts of videos by detecting silences"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) pocketsphinx; inherit (pkgs) sphinxbase;}; "cutter" = callPackage @@ -93152,6 +93149,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "formatting_7_0_0_1" = callPackage + ({ mkDerivation, array, base, bytestring, clock, double-conversion + , ghc-prim, hspec, integer-gmp, old-locale, scientific, text, time + , transformers + }: + mkDerivation { + pname = "formatting"; + version = "7.0.0.1"; + sha256 = "0vxp1xgg7py3s8lvs63c0961fca829b7mmvdbyhiwyqyyqy2wclg"; + libraryHaskellDepends = [ + array base bytestring clock double-conversion ghc-prim integer-gmp + old-locale scientific text time transformers + ]; + testHaskellDepends = [ + array base bytestring clock double-conversion ghc-prim hspec + integer-gmp old-locale scientific text time transformers + ]; + description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "forml" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, cereal , containers, directory, file-embed, ghc-prim, GraphSCC, hslogger @@ -120922,8 +120941,8 @@ self: { }: mkDerivation { pname = "hasql-dynamic-statements"; - version = "0.2.0.3"; - sha256 = "06xmqqakwji7qy26srys7i8y3mjbyg5qjgzhs56h64ccbs352i56"; + version = "0.3"; + sha256 = "13f0gkgjn7bcxarwz8vyzfdmrz1yqh9xnard6304v4y4zhqjfyjn"; libraryHaskellDepends = [ base bytestring containers hasql hasql-implicits ptr ]; @@ -133062,8 +133081,8 @@ self: { }: mkDerivation { pname = "hs-server-starter"; - version = "0.1.1.0"; - sha256 = "1cki3c6fl7yjw9vww4h9vd68dnci5q8f5c1i3ip8kyv53s9rgbi3"; + version = "0.1.2.0"; + sha256 = "05i1arpzs2mrzgbd87k3a6dwsvf5z7r4vwd3m0m34qps3rwlk78m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory network ]; @@ -141217,6 +141236,24 @@ self: { broken = true; }) {}; + "hwk" = callPackage + ({ mkDerivation, base, directory, extra, filepath, hint, process + , simple-cmd-args + }: + mkDerivation { + pname = "hwk"; + version = "0.2.0"; + sha256 = "1a83y1xgqcxkggbhbw0rpfnjwryl5h0fv6apw86h1ynq7dhf80rd"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + base directory extra filepath hint process simple-cmd-args + ]; + description = "A modern Haskell based AWK replacement"; + license = stdenv.lib.licenses.mit; + }) {}; + "hworker" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, hedis, hspec , hspec-contrib, HUnit, text, time, uuid @@ -144493,6 +144530,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "in-other-words" = callPackage + ({ mkDerivation, async, base, exceptions, hspec, hspec-discover + , monad-control, mtl, stm, transformers, transformers-base + }: + mkDerivation { + pname = "in-other-words"; + version = "0.1.0.0"; + sha256 = "06ipmkbgncsgcq5rfyn0v4plhbbrzrcx3r4xr1f3f6xv760pfyra"; + libraryHaskellDepends = [ + async base exceptions monad-control mtl stm transformers + transformers-base + ]; + testHaskellDepends = [ + async base exceptions hspec monad-control mtl stm transformers + transformers-base + ]; + testToolDepends = [ hspec-discover ]; + description = "A higher-order effect system where the sky's the limit"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "inc-ref" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -164553,6 +164611,37 @@ self: { broken = true; }) {}; + "longshot" = callPackage + ({ mkDerivation, base, base16-bytestring, blake2, blake3 + , bytestring, containers, cryptohash-sha256, cryptonite, deepseq + , docopt, memory, parallel, tasty, tasty-hunit, tasty-quickcheck + , template-haskell + }: + mkDerivation { + pname = "longshot"; + version = "0.1.0.2"; + sha256 = "19njqqd4il5gg0pg2q05scm4may9gmfflq65gdilfwcxf6jzxin6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base16-bytestring blake2 blake3 bytestring containers + cryptohash-sha256 cryptonite deepseq docopt memory parallel + template-haskell + ]; + executableHaskellDepends = [ + base base16-bytestring blake2 blake3 bytestring containers + cryptohash-sha256 cryptonite deepseq docopt memory parallel + template-haskell + ]; + testHaskellDepends = [ + base base16-bytestring blake2 blake3 bytestring containers + cryptohash-sha256 cryptonite deepseq docopt memory parallel tasty + tasty-hunit tasty-quickcheck template-haskell + ]; + description = "Fast Brute-force search using parallelism"; + license = stdenv.lib.licenses.mit; + }) {}; + "lookup-tables" = callPackage ({ mkDerivation, base, primitive, tasty, tasty-hunit , template-haskell @@ -165316,8 +165405,8 @@ self: { ({ mkDerivation, base, lucid }: mkDerivation { pname = "lucid-cdn"; - version = "0.2.0.1"; - sha256 = "1y1rszg00kb1qpwrccpjv6l0qkn8cpxawks7ylcw8sbs0h824l73"; + version = "0.2.1.0"; + sha256 = "09g98hnw1mf9wih7jpwkvy8iavas8zg672yqj406zwvg786088jf"; libraryHaskellDepends = [ base lucid ]; description = "Curated list of CDN imports for lucid"; license = stdenv.lib.licenses.mit; @@ -170891,8 +170980,8 @@ self: { }: mkDerivation { pname = "metro"; - version = "0.1.0.3"; - sha256 = "110zxqs79f8bcqx2w6c9h0snsqbzvkixpmzadmpdx13gqz32i73v"; + version = "0.1.0.4"; + sha256 = "1dnfc2nay0n51zkb9fx82yqdi5aj86lmix557w9dd5289v3r0ajb"; libraryHaskellDepends = [ base binary bytestring hashable hslogger mtl transformers unix-time unliftio unordered-containers @@ -171098,8 +171187,8 @@ self: { }: mkDerivation { pname = "micro-gateway"; - version = "1.1.0.0"; - sha256 = "1jb703vcqncxw12cmgmyg63rw6fmfa4mv1685z6vab3xzq7kvxv7"; + version = "1.1.0.1"; + sha256 = "0anph45wr8f9xkn67sssr2jm6dm2h58jzxzxxw2hfcpsqmpvm41z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185371,8 +185460,8 @@ self: { }: mkDerivation { pname = "nri-prelude"; - version = "0.1.0.2"; - sha256 = "08m3a4gk66rfzwphpcfkd3z7qbfdkrks0f2wjwz0d3mwj638gnbv"; + version = "0.1.0.3"; + sha256 = "19rbcdv21j327lffvj43jyp0wa2zbbljfs7zd842szfffzq59bkg"; libraryHaskellDepends = [ aeson ansi-terminal async auto-update base bytestring concurrent-output containers directory exceptions filepath hedgehog @@ -189039,6 +189128,24 @@ self: { broken = true; }) {}; + "oplang" = callPackage + ({ mkDerivation, base, directory, filepath, optparse-applicative + , parsec, process, text, text-builder, unordered-containers + }: + mkDerivation { + pname = "oplang"; + version = "0.1.0.0"; + sha256 = "09n4nq9wl4n3vfkh9av9i0z6gipsffsb5igs0rlcydii10hjcn89"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath optparse-applicative parsec process text + text-builder unordered-containers + ]; + description = "Compiler for OpLang, an esoteric programming language"; + license = stdenv.lib.licenses.mit; + }) {}; + "opml" = callPackage ({ mkDerivation, base, directory, xml }: mkDerivation { @@ -204377,8 +204484,8 @@ self: { }: mkDerivation { pname = "pretty-diff"; - version = "0.2.0.1"; - sha256 = "0g2n14jrmv994kd3wgyg2p52655s9fa5nibz64pdyj1dfkblg007"; + version = "0.2.0.2"; + sha256 = "0nz6shwyw6pkwd8n4rvix4fn0f5mvxx1xkc6q4k1xrg2ylg73ksv"; libraryHaskellDepends = [ base data-default Diff text ]; testHaskellDepends = [ base data-default Diff tasty tasty-hunit tasty-test-reporter text @@ -213813,7 +213920,7 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "reanimate_1_1_0_0" = callPackage + "reanimate_1_1_1_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, attoparsec, base , base64-bytestring, bytestring, cassava, cereal, colour , containers, cryptohash-sha256, cubicbezier, directory, filelock @@ -213828,8 +213935,8 @@ self: { }: mkDerivation { pname = "reanimate"; - version = "1.1.0.0"; - sha256 = "0cqmmdqpfzhqwvjwga2rj94drhrc5g95ji5iia92zzqicr51rfmf"; + version = "1.1.1.0"; + sha256 = "05illhid0nnypkl7znzkmc7b3wc7lmv8jn2sdcj39xr1yr8hji7f"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal array attoparsec base base64-bytestring @@ -213871,18 +213978,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "reanimate-svg_0_12_2_1" = callPackage + "reanimate-svg_0_13_0_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, Diff , directory, double-conversion, filepath, hashable, JuicyPixels , lens, linear, mtl, process, QuickCheck, scientific, tasty , tasty-expected-failure, tasty-golden, tasty-hunit , tasty-quickcheck, tasty-rerun, temporary, text, transformers - , vector, xml + , typed-process, vector, xml }: mkDerivation { pname = "reanimate-svg"; - version = "0.12.2.1"; - sha256 = "1rg9zz3qnbjxv1w03jzqs7a2qjkrjm5iz6x4j2j7kh2w8x5x1h24"; + version = "0.13.0.0"; + sha256 = "0fl3rb993zihwm9vyg615x4k17rrqimjfpc7k06mb5dlgkd39f7v"; libraryHaskellDepends = [ attoparsec base bytestring containers double-conversion hashable JuicyPixels lens linear mtl scientific text transformers vector xml @@ -213890,7 +213997,7 @@ self: { testHaskellDepends = [ base bytestring Diff directory filepath linear process QuickCheck tasty tasty-expected-failure tasty-golden tasty-hunit - tasty-quickcheck tasty-rerun temporary text vector + tasty-quickcheck tasty-rerun temporary text typed-process vector ]; description = "SVG file loader and serializer"; license = stdenv.lib.licenses.bsd3; @@ -228282,6 +228389,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "servant-docs-simple_0_3_0_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hspec + , hspec-core, ordered-containers, prettyprinter, raw-strings-qq + , servant, text, unordered-containers + }: + mkDerivation { + pname = "servant-docs-simple"; + version = "0.3.0.0"; + sha256 = "0nzlgb3ccycqm3v599hh7k7fk7f8wqj0r2c2ldy9fj1c55h9n8hb"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring ordered-containers prettyprinter + servant text unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring hspec hspec-core + ordered-containers prettyprinter raw-strings-qq servant text + unordered-containers + ]; + description = "Generate endpoints overview for Servant API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-ede" = callPackage ({ mkDerivation, aeson, base, bytestring, ede, either, filepath , http-media, http-types, semigroups, servant, servant-server, text @@ -251487,8 +251617,8 @@ self: { }: mkDerivation { pname = "tasty-test-reporter"; - version = "0.1.1.1"; - sha256 = "005sfxxgx4dkxw0bs6b5japx0qvzs95mzz3nvpa2ycy3v25qqaad"; + version = "0.1.1.2"; + sha256 = "1v6s3dd3ynzw0690hz1abi8l2j6zlpfj61g072w176n7is6x7p73"; libraryHaskellDepends = [ ansi-terminal base concurrent-output containers directory filepath junit-xml mtl safe-exceptions stm tagged tasty text @@ -263533,6 +263663,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "type-of-html_1_5_2_0" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, containers + , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim + , hspec, QuickCheck, random, text, weigh + }: + mkDerivation { + pname = "type-of-html"; + version = "1.5.2.0"; + sha256 = "0s53panifhmyg5xda78x509jvxpbcw2kqan7y4jxa4nysgz34qhc"; + libraryHaskellDepends = [ + base bytestring containers double-conversion ghc-prim text + ]; + testHaskellDepends = [ base bytestring hspec QuickCheck ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring criterion deepseq ghc ghc-paths random + text weigh + ]; + description = "High performance type driven html generation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "type-of-html-static" = callPackage ({ mkDerivation, base, template-haskell, type-of-html }: mkDerivation { @@ -265155,6 +265307,20 @@ self: { broken = true; }) {}; + "uncaught-exception" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "uncaught-exception"; + version = "0.1.0"; + sha256 = "176xnsfbj9xwha1s03ly7fpirgjkrp74smgrgx16v4wb0r4ifgxn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + description = "Customize uncaught exception handling"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "uncertain" = callPackage ({ mkDerivation, ad, base, base-compat, containers, free , mwc-random, primitive, transformers @@ -265868,10 +266034,15 @@ self: { }: mkDerivation { pname = "uniqueness-periods-vector-examples"; - version = "0.11.0.0"; - sha256 = "17ls9n8jdwp888xb5zd4m0f8l5xddc7962aa44wnxlc24gaim436"; - isLibrary = false; + version = "0.12.1.0"; + sha256 = "03gk3lrfpn6cn2c2sb22x3baqr45alycv1y6xm26szikc6wa4w6c"; + isLibrary = true; isExecutable = true; + libraryHaskellDepends = [ + base lists-flines uniqueness-periods-vector + uniqueness-periods-vector-common + uniqueness-periods-vector-properties + ]; executableHaskellDepends = [ base lists-flines mmsyn6ukr parallel phonetic-languages-ukrainian print-info uniqueness-periods-vector @@ -265918,8 +266089,8 @@ self: { }: mkDerivation { pname = "uniqueness-periods-vector-properties"; - version = "0.5.3.0"; - sha256 = "1k6rdw55myb1qi0idxk4rks9na2w36gh2pmdlx2qkr7iiqrp613g"; + version = "0.5.4.0"; + sha256 = "0qn8pqny73lmd9al3mlsfzs91rs2y52q1mzpc8xf3bvixhbxvmwa"; libraryHaskellDepends = [ base mmsyn6ukr mmsyn7s phonetic-languages-rhythmicity phonetic-languages-ukrainian uniqueness-periods-vector @@ -271541,8 +271712,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.6.8"; - sha256 = "1rrswgz7djm4zh6qx1f28lkspidip6r0mqkbk8gcfvv7vikz0vxz"; + version = "3.6.9"; + sha256 = "0h5b8sfd91yz09aws5dpwjz4vqcdsfkq4r7xk3jgc02v5f807iga"; libraryHaskellDepends = [ base bytestring transformers vector ]; librarySystemDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; From 81ef443d05db901e0105be0b4a91a883640b23ce Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 5 Oct 2020 14:44:06 +0700 Subject: [PATCH 048/546] tilem: init at 2.0 --- pkgs/misc/emulators/tilem/default.nix | 78 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 80 insertions(+) create mode 100644 pkgs/misc/emulators/tilem/default.nix diff --git a/pkgs/misc/emulators/tilem/default.nix b/pkgs/misc/emulators/tilem/default.nix new file mode 100644 index 00000000000..8a6c5075c9b --- /dev/null +++ b/pkgs/misc/emulators/tilem/default.nix @@ -0,0 +1,78 @@ +{ stdenv +, fetchurl +, lib +, libarchive +, autoreconfHook +, pkgconfig +, glib +, libusb1 +, darwin +, acl +, lzma +, bzip2 +, gnome2 +}: +let + libticonv = stdenv.mkDerivation rec { + pname = "libticonv"; + version = "1.1.5"; + src = fetchurl { + url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; + sha256 = "0y080v12bm81wgjm6fnw7q0yg7scphm8hhrls9njcszj7fkscv9i"; + }; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ glib ]; + configureFlags = [ "--enable-iconv" ]; + }; + libticables2 = stdenv.mkDerivation rec { + pname = "libticables2"; + version = "1.3.5"; + src = fetchurl { + url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; + sha256 = "08j5di0cgix9vcpdv7b8xhxdjkk9zz7fqfnv3l4apk3jdr8vcvqc"; + }; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ glib libusb1 ]; + configureFlags = [ "--enable-libusb10" ]; + }; + libticalcs2 = stdenv.mkDerivation rec { + pname = "libticalcs2"; + version = "1.1.9"; + src = fetchurl { + url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; + sha256 = "08c9wgrdnyqcs45mx1bjb8riqq81bzfkhgaijxzn96rhpj40fy3n"; + }; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ glib libticables2 libticonv libtifiles2 lzma bzip2 ] + ++ lib.optionals stdenv.isLinux [ acl ] + ++ lib.optionals stdenv.isDarwin [ darwin.libobjc ]; + }; + libtifiles2 = stdenv.mkDerivation rec { + pname = "libtifiles2"; + version = "1.1.7"; + src = fetchurl { + url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; + sha256 = "10n9mhlabmaw3ha5ckllxfy6fygs2pmlmj5v6w5v62bvx54kpils"; + }; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ glib libticonv libarchive lzma bzip2 ]; + }; +in +stdenv.mkDerivation rec { + pname = "tilem"; + version = "2.0"; + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; + sha256 = "1ba38xzhp3yf21ip3cgql6jzy49jc34sfnjsl4syxyrd81d269zw"; + }; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gnome2.gtk libticonv libtifiles2 libticables2 libticalcs2 ]; + NIX_CFLAGS_COMPILE = [ "-lm" ]; + meta = with stdenv.lib; { + homepage = "http://lpg.ticalc.org/prj_tilem/"; + description = "Emulator and debugger for Texas Instruments Z80-based graphing calculators"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 672c7e5a3da..03b3cea91f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7365,6 +7365,8 @@ in tiledb = callPackage ../development/libraries/tiledb { }; + tilem = callPackage ../misc/emulators/tilem { }; + timemachine = callPackage ../applications/audio/timemachine { }; timelapse-deflicker = callPackage ../applications/graphics/timelapse-deflicker { }; From 0b6c3228087b028d184323101ad87bc0d8301d97 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Sun, 11 Oct 2020 14:49:23 +0300 Subject: [PATCH 049/546] haskellPackages.stylish-haskell: unpin The reason of the pinning was fixed by the 0.12 release, now 0.12.2 is released. Currently, Haskell Language Server Nix env development environment does not work, so it is essentially impossible to develop HLS under NixOS, HLS requirements of environment coerce on the stylish-haskell>=0.12 and looks at haskellPackages.stylish-haskell. M pkgs/development/haskell-modules/configuration-common.nix --- pkgs/development/haskell-modules/configuration-common.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c85245255cd..f9d4ed7afce 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1464,14 +1464,6 @@ self: super: { pandoc-types = doDistribute self.pandoc-types_1_21; rfc5051 = doDistribute self.rfc5051_0_2; - # Upstream forgot to change the Cabal version bounds in the test suite. - # See: https://github.com/jaspervdj/stylish-haskell/pull/297 - # Will be fixed whenever they next bump the version number - stylish-haskell = appendPatch super.stylish-haskell (pkgs.fetchpatch { - url = "https://github.com/jaspervdj/stylish-haskell/commit/9550aa1cd177aa6fe271d075177109d66a79e67f.patch"; - sha256 = "1ffnbd2s4fx0ylnnlcyyag119yxb32p5r20b38l39lsa0jwv229f"; - }); - # The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox. domain-auth = dontCheck super.domain-auth; # INSERT NEW OVERRIDES ABOVE THIS LINE From d39865aa2945ff50db90a8e6bf140c2c09d722c8 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 11 Oct 2020 14:50:04 +0200 Subject: [PATCH 050/546] haskellPackages.neuron: Fix build --- .../haskell-modules/configuration-common.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f9d4ed7afce..92319cc27f0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1376,15 +1376,11 @@ self: super: { # https://github.com/jgm/commonmark-hs/issues/55 commonmark-extensions = dontCheck super.commonmark-extensions; - # Apply version-bump patch that is not contained in released version yet. - # Upstream PR: https://github.com/srid/neuron/pull/304 - neuron = appendPatch super.neuron (pkgs.fetchpatch { - url= "https://github.com/srid/neuron/commit/9ddcb7e9d63b8266d1372ef7c14c13b6b5277990.patch"; - sha256 = "01f9v3jnl05fnpd624wv3a0j5prcbnf62ysa16fbc0vabw19zv1b"; - excludes = [ "commonmark-hs/github.json" ]; - stripLen = 2; - extraPrefix = ""; - }); + + # 2020-10-11: reflex-dom-pandoc and neuron require skylighting >= 9, which we + # can‘t support, because there is no pandoc release compatible with this. + reflex-dom-pandoc = doJailbreak super.reflex-dom-pandoc; + neuron = doJailbreak super.neuron; # Testsuite trying to run `which haskeline-examples-Test` haskeline_0_8_1_0 = dontCheck super.haskeline_0_8_1_0; From 0fc9ac20fe78b0ab6529db83861fb55979e0cb84 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 17:32:19 +0200 Subject: [PATCH 051/546] phpExtensions.apcu: Move to separate directory --- pkgs/development/php-packages/apcu/default.nix | 17 +++++++++++++++++ pkgs/top-level/php-packages.nix | 16 +--------------- 2 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/php-packages/apcu/default.nix diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix new file mode 100644 index 00000000000..fab4f534d43 --- /dev/null +++ b/pkgs/development/php-packages/apcu/default.nix @@ -0,0 +1,17 @@ +{ buildPecl, lib, pcre' }: + +buildPecl { + pname = "apcu"; + + version = "5.1.18"; + sha256 = "0ayykd4hfvdzk7qnr5k6yq5scwf6rb2i05xscfv76q5dmkkynvfl"; + + buildInputs = [ pcre' ]; + doCheck = true; + checkTarget = "test"; + checkFlagsArray = [ "REPORT_EXIT_STATUS=1" "NO_INTERACTION=1" ]; + makeFlags = [ "phpincludedir=$(dev)/include" ]; + outputs = [ "out" "dev" ]; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index be440a31477..0627c6bbbdd 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -62,21 +62,7 @@ in # or php.withExtensions to extend the functionality of the PHP # interpreter. extensions = { - apcu = buildPecl { - version = "5.1.18"; - pname = "apcu"; - - sha256 = "0ayykd4hfvdzk7qnr5k6yq5scwf6rb2i05xscfv76q5dmkkynvfl"; - - buildInputs = [ pcre' ]; - doCheck = true; - checkTarget = "test"; - checkFlagsArray = ["REPORT_EXIT_STATUS=1" "NO_INTERACTION=1"]; - makeFlags = [ "phpincludedir=$(dev)/include" ]; - outputs = [ "out" "dev" ]; - - meta.maintainers = lib.teams.php.members; - }; + apcu = callPackage ../development/php-packages/apcu { }; apcu_bc = buildPecl { version = "1.0.5"; From bf5ca6bbf382d2dbb7f98ae5ba4238e5e5c884d9 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 17:33:23 +0200 Subject: [PATCH 052/546] phpExtensions.apcu_bc: Move to separate directory --- .../php-packages/apcu_bc/default.nix | 18 ++++++++++++++++++ pkgs/top-level/php-packages.nix | 19 +------------------ 2 files changed, 19 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/php-packages/apcu_bc/default.nix diff --git a/pkgs/development/php-packages/apcu_bc/default.nix b/pkgs/development/php-packages/apcu_bc/default.nix new file mode 100644 index 00000000000..132a25a2df4 --- /dev/null +++ b/pkgs/development/php-packages/apcu_bc/default.nix @@ -0,0 +1,18 @@ +{ buildPecl, lib, pcre', php }: + +buildPecl { + pname = "apcu_bc"; + + version = "1.0.5"; + sha256 = "0ma00syhk2ps9k9p02jz7rii6x3i2p986il23703zz5npd6y9n20"; + + peclDeps = [ php.extensions.apcu ]; + + buildInputs = [ pcre' ]; + + postInstall = '' + mv $out/lib/php/extensions/apc.so $out/lib/php/extensions/apcu_bc.so + ''; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 0627c6bbbdd..f0f0f60e4eb 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -64,24 +64,7 @@ in extensions = { apcu = callPackage ../development/php-packages/apcu { }; - apcu_bc = buildPecl { - version = "1.0.5"; - pname = "apcu_bc"; - - sha256 = "0ma00syhk2ps9k9p02jz7rii6x3i2p986il23703zz5npd6y9n20"; - - peclDeps = [ php.extensions.apcu ]; - - buildInputs = [ - pcre' - ]; - - postInstall = '' - mv $out/lib/php/extensions/apc.so $out/lib/php/extensions/apcu_bc.so - ''; - - meta.maintainers = lib.teams.php.members; - }; + apcu_bc = callPackage ../development/php-packages/apcu_bc { }; ast = buildPecl { version = "1.0.5"; From 021c6fee6707ba81ed2c6c034aad6b00a7bf4310 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 17:37:37 +0200 Subject: [PATCH 053/546] phpExtensions.ast: Move to separate directory --- pkgs/development/php-packages/ast/default.nix | 10 ++++++++++ pkgs/top-level/php-packages.nix | 9 +-------- 2 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/php-packages/ast/default.nix diff --git a/pkgs/development/php-packages/ast/default.nix b/pkgs/development/php-packages/ast/default.nix new file mode 100644 index 00000000000..9df099734aa --- /dev/null +++ b/pkgs/development/php-packages/ast/default.nix @@ -0,0 +1,10 @@ +{ buildPecl, lib }: + +buildPecl { + pname = "ast"; + + version = "1.0.5"; + sha256 = "16c5isldm4csjbcvz1qk2mmrhgvh24sxsp6w6f5a37xpa3vciawp"; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index f0f0f60e4eb..11012862206 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -66,14 +66,7 @@ in apcu_bc = callPackage ../development/php-packages/apcu_bc { }; - ast = buildPecl { - version = "1.0.5"; - pname = "ast"; - - sha256 = "16c5isldm4csjbcvz1qk2mmrhgvh24sxsp6w6f5a37xpa3vciawp"; - - meta.maintainers = lib.teams.php.members; - }; + ast = callPackage ../development/php-packages/ast { }; blackfire = pkgs.callPackage ../development/tools/misc/blackfire/php-probe.nix { inherit php; }; From 649fdcdc4a313161e1f4ad09ed2ccd32e435ba65 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 17:44:38 +0200 Subject: [PATCH 054/546] phpExtensions.couchbase: Move to separate directory --- .../php-packages/couchbase/default.nix | 48 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 48 +------------------ 2 files changed, 49 insertions(+), 47 deletions(-) create mode 100644 pkgs/development/php-packages/couchbase/default.nix diff --git a/pkgs/development/php-packages/couchbase/default.nix b/pkgs/development/php-packages/couchbase/default.nix new file mode 100644 index 00000000000..a46bbea817a --- /dev/null +++ b/pkgs/development/php-packages/couchbase/default.nix @@ -0,0 +1,48 @@ +{ buildPecl, lib, pkgs, php }: +let + pname = "couchbase"; + version = "2.6.1"; +in +buildPecl { + inherit pname version; + + src = pkgs.fetchFromGitHub { + owner = "couchbase"; + repo = "php-couchbase"; + rev = "v${version}"; + sha256 = "0jdzgcvab1vpxai23brmmvizjjq2d2dik9aklz6bzspfb512qjd6"; + }; + + configureFlags = [ "--with-couchbase" ]; + + buildInputs = with pkgs; [ libcouchbase zlib ]; + internalDeps = [ php.extensions.json ]; + peclDeps = [ php.extensions.igbinary ]; + + patches = [ + (pkgs.writeText "php-couchbase.patch" '' + --- a/config.m4 + +++ b/config.m4 + @@ -9,7 +9,7 @@ if test "$PHP_COUCHBASE" != "no"; then + LIBCOUCHBASE_DIR=$PHP_COUCHBASE + else + AC_MSG_CHECKING(for libcouchbase in default path) + - for i in /usr/local /usr; do + + for i in ${pkgs.libcouchbase}; do + if test -r $i/include/libcouchbase/couchbase.h; then + LIBCOUCHBASE_DIR=$i + AC_MSG_RESULT(found in $i) + @@ -154,6 +154,8 @@ COUCHBASE_FILES=" \ + igbinary_inc_path="$phpincludedir" + elif test -f "$phpincludedir/ext/igbinary/igbinary.h"; then + igbinary_inc_path="$phpincludedir" + + elif test -f "${php.extensions.igbinary.dev}/include/ext/igbinary/igbinary.h"; then + + igbinary_inc_path="${php.extensions.igbinary.dev}/include" + fi + if test "$igbinary_inc_path" = ""; then + AC_MSG_WARN([Cannot find igbinary.h]) + '') + ]; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 11012862206..22ff7df76ff 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -70,53 +70,7 @@ in blackfire = pkgs.callPackage ../development/tools/misc/blackfire/php-probe.nix { inherit php; }; - couchbase = buildPecl rec { - version = "2.6.1"; - pname = "couchbase"; - - src = pkgs.fetchFromGitHub { - owner = "couchbase"; - repo = "php-couchbase"; - rev = "v${version}"; - sha256 = "0jdzgcvab1vpxai23brmmvizjjq2d2dik9aklz6bzspfb512qjd6"; - }; - - configureFlags = [ "--with-couchbase" ]; - - buildInputs = [ - pkgs.libcouchbase - pkgs.zlib - ]; - internalDeps = [ php.extensions.json ]; - peclDeps = [ php.extensions.igbinary ]; - - patches = [ - (pkgs.writeText "php-couchbase.patch" '' - --- a/config.m4 - +++ b/config.m4 - @@ -9,7 +9,7 @@ if test "$PHP_COUCHBASE" != "no"; then - LIBCOUCHBASE_DIR=$PHP_COUCHBASE - else - AC_MSG_CHECKING(for libcouchbase in default path) - - for i in /usr/local /usr; do - + for i in ${pkgs.libcouchbase}; do - if test -r $i/include/libcouchbase/couchbase.h; then - LIBCOUCHBASE_DIR=$i - AC_MSG_RESULT(found in $i) - @@ -154,6 +154,8 @@ COUCHBASE_FILES=" \ - igbinary_inc_path="$phpincludedir" - elif test -f "$phpincludedir/ext/igbinary/igbinary.h"; then - igbinary_inc_path="$phpincludedir" - + elif test -f "${php.extensions.igbinary.dev}/include/ext/igbinary/igbinary.h"; then - + igbinary_inc_path="${php.extensions.igbinary.dev}/include" - fi - if test "$igbinary_inc_path" = ""; then - AC_MSG_WARN([Cannot find igbinary.h]) - '') - ]; - - meta.maintainers = lib.teams.php.members; - }; + couchbase = callPackage ../development/php-packages/couchbase { }; event = buildPecl { version = "2.5.3"; From ad0965029d72eefb15e9d313facf524ca5af7de3 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 17:51:35 +0200 Subject: [PATCH 055/546] phpExtensions.event: Move to separate directory --- .../php-packages/event/default.nix | 36 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 33 +---------------- 2 files changed, 37 insertions(+), 32 deletions(-) create mode 100644 pkgs/development/php-packages/event/default.nix diff --git a/pkgs/development/php-packages/event/default.nix b/pkgs/development/php-packages/event/default.nix new file mode 100644 index 00000000000..bf90d680c49 --- /dev/null +++ b/pkgs/development/php-packages/event/default.nix @@ -0,0 +1,36 @@ +{ buildPecl, lib, pkgs, php }: +let +in +buildPecl { + pname = "event"; + + version = "2.5.3"; + sha256 = "12liry5ldvgwp1v1a6zgfq8w6iyyxmsdj4c71bp157nnf58cb8hb"; + + configureFlags = [ + "--with-event-libevent-dir=${pkgs.libevent.dev}" + "--with-event-core" + "--with-event-extra" + "--with-event-pthreads" + ]; + + postPhpize = '' + substituteInPlace configure --replace \ + 'as_fn_error $? "Couldn'\'''t find $phpincludedir/sockets/php_sockets.h. Please check if sockets extension installed" "$LINENO" 5' \ + ':' + ''; + + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with pkgs; [ openssl libevent ]; + internalDeps = [ php.extensions.sockets ]; + + meta = with pkgs.lib; { + description = '' + This is an extension to efficiently schedule I/O, time and signal based + events using the best I/O notification mechanism available for specific platform. + ''; + license = licenses.php301; + homepage = "https://bitbucket.org/osmanov/pecl-event/"; + maintainers = teams.php.members; + }; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 22ff7df76ff..223bd1fff88 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -72,38 +72,7 @@ in couchbase = callPackage ../development/php-packages/couchbase { }; - event = buildPecl { - version = "2.5.3"; - pname = "event"; - - sha256 = "12liry5ldvgwp1v1a6zgfq8w6iyyxmsdj4c71bp157nnf58cb8hb"; - - configureFlags = [ - "--with-event-libevent-dir=${pkgs.libevent.dev}" - "--with-event-core" - "--with-event-extra" - "--with-event-pthreads" - ]; - - postPhpize = '' - substituteInPlace configure --replace 'as_fn_error $? "Couldn'\'''t find $phpincludedir/sockets/php_sockets.h. Please check if sockets extension installed" "$LINENO" 5' \ - ':' - ''; - - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = with pkgs; [ openssl libevent ]; - internalDeps = [ php.extensions.sockets ]; - - meta = with pkgs.lib; { - description = '' - This is an extension to efficiently schedule I/O, time and signal based - events using the best I/O notification mechanism available for specific platform. - ''; - license = licenses.php301; - homepage = "https://bitbucket.org/osmanov/pecl-event/"; - maintainers = teams.php.members; - }; - }; + event = callPackage ../development/php-packages/event { }; igbinary = buildPecl { version = "3.0.1"; From 6be3b07411553c1f0e6a39369e0cbc6bfd9b9f6b Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 17:56:33 +0200 Subject: [PATCH 056/546] phpExtensions.igbinary: Move to separate directory --- pkgs/development/php-packages/igbinary/default.nix | 14 ++++++++++++++ pkgs/top-level/php-packages.nix | 13 +------------ 2 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/php-packages/igbinary/default.nix diff --git a/pkgs/development/php-packages/igbinary/default.nix b/pkgs/development/php-packages/igbinary/default.nix new file mode 100644 index 00000000000..e9c6de2e5b0 --- /dev/null +++ b/pkgs/development/php-packages/igbinary/default.nix @@ -0,0 +1,14 @@ +{ buildPecl, lib }: + +buildPecl { + pname = "igbinary"; + + version = "3.0.1"; + sha256 = "1w8jmf1qpggdvq0ndfi86n7i7cqgh1s8q6hys2lijvi37rzn0nar"; + + configureFlags = [ "--enable-igbinary" ]; + makeFlags = [ "phpincludedir=$(dev)/include" ]; + outputs = [ "out" "dev" ]; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 223bd1fff88..113081686a9 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -74,18 +74,7 @@ in event = callPackage ../development/php-packages/event { }; - igbinary = buildPecl { - version = "3.0.1"; - pname = "igbinary"; - - sha256 = "1w8jmf1qpggdvq0ndfi86n7i7cqgh1s8q6hys2lijvi37rzn0nar"; - - configureFlags = [ "--enable-igbinary" ]; - makeFlags = [ "phpincludedir=$(dev)/include" ]; - outputs = [ "out" "dev" ]; - - meta.maintainers = lib.teams.php.members; - }; + igbinary = callPackage ../development/php-packages/igbinary { }; imagick = buildPecl { version = "3.4.4"; From ba173b438a21105a85fbf3f46e6ce67ec4ad6b4d Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 18:00:01 +0200 Subject: [PATCH 057/546] phpExtensions.imagick: Move to separate directory --- pkgs/development/php-packages/imagick/default.nix | 14 ++++++++++++++ pkgs/top-level/php-packages.nix | 13 +------------ 2 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/php-packages/imagick/default.nix diff --git a/pkgs/development/php-packages/imagick/default.nix b/pkgs/development/php-packages/imagick/default.nix new file mode 100644 index 00000000000..63524fb2d06 --- /dev/null +++ b/pkgs/development/php-packages/imagick/default.nix @@ -0,0 +1,14 @@ +{ buildPecl, lib, pkgs, pcre' }: + +buildPecl { + pname = "imagick"; + + version = "3.4.4"; + sha256 = "0xvhaqny1v796ywx83w7jyjyd0nrxkxf34w9zi8qc8aw8qbammcd"; + + configureFlags = [ "--with-imagick=${pkgs.imagemagick.dev}" ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = [ pcre' ]; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 113081686a9..7656ffe7deb 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -76,18 +76,7 @@ in igbinary = callPackage ../development/php-packages/igbinary { }; - imagick = buildPecl { - version = "3.4.4"; - pname = "imagick"; - - sha256 = "0xvhaqny1v796ywx83w7jyjyd0nrxkxf34w9zi8qc8aw8qbammcd"; - - configureFlags = [ "--with-imagick=${pkgs.imagemagick.dev}" ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = [ pcre' ]; - - meta.maintainers = lib.teams.php.members; - }; + imagick = callPackage ../development/php-packages/imagick { }; mailparse = buildPecl { version = "3.0.3"; From f8180fed9adebd7dac00f7764c3bb14f8c96bfe3 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:00:38 +0200 Subject: [PATCH 058/546] phpExtensions.mailparse: Move to separate directory --- .../php-packages/mailparse/default.nix | 15 +++++++++++++++ pkgs/top-level/php-packages.nix | 13 +------------ 2 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/php-packages/mailparse/default.nix diff --git a/pkgs/development/php-packages/mailparse/default.nix b/pkgs/development/php-packages/mailparse/default.nix new file mode 100644 index 00000000000..4ec6f77df45 --- /dev/null +++ b/pkgs/development/php-packages/mailparse/default.nix @@ -0,0 +1,15 @@ +{ buildPecl, lib, php }: + +buildPecl { + pname = "mailparse"; + + version = "3.0.3"; + sha256 = "00nk14jbdbln93mx3ag691avc11ff94hkadrcv5pn51c6ihsxbmz"; + + internalDeps = [ php.extensions.mbstring ]; + postConfigure = '' + echo "#define HAVE_MBSTRING 1" >> config.h + ''; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 7656ffe7deb..584a114c02f 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -78,18 +78,7 @@ in imagick = callPackage ../development/php-packages/imagick { }; - mailparse = buildPecl { - version = "3.0.3"; - pname = "mailparse"; - sha256 = "00nk14jbdbln93mx3ag691avc11ff94hkadrcv5pn51c6ihsxbmz"; - - internalDeps = [ php.extensions.mbstring ]; - postConfigure = '' - echo "#define HAVE_MBSTRING 1" >> config.h - ''; - - meta.maintainers = lib.teams.php.members; - }; + mailparse = callPackage ../development/php-packages/mailparse { }; maxminddb = buildPecl rec { pname = "maxminddb"; From df08b0fc00f38c95f1bce7cfa06299f948fecd0e Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:05:50 +0200 Subject: [PATCH 059/546] phpExtensions.maxminddb: Move to separate directory --- .../php-packages/maxminddb/default.nix | 24 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 21 +--------------- 2 files changed, 25 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/php-packages/maxminddb/default.nix diff --git a/pkgs/development/php-packages/maxminddb/default.nix b/pkgs/development/php-packages/maxminddb/default.nix new file mode 100644 index 00000000000..e3a9584db1c --- /dev/null +++ b/pkgs/development/php-packages/maxminddb/default.nix @@ -0,0 +1,24 @@ +{ buildPecl, lib, pkgs }: +let + pname = "maxminddb"; + version = "1.7.0"; +in +buildPecl { + inherit pname version; + + src = pkgs.fetchFromGitHub { + owner = "maxmind"; + repo = "MaxMind-DB-Reader-php"; + rev = "v${version}"; + sha256 = "16msc9s15y43lxw89kj51aldlkd57dc8gms199i51jc984b68ljc"; + }; + + buildInputs = [ pkgs.libmaxminddb ]; + sourceRoot = "source/ext"; + + meta = with pkgs.lib; { + description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ ajs124 das_j ] ++ teams.php.members; + }; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 584a114c02f..f213e300acb 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -80,26 +80,7 @@ in mailparse = callPackage ../development/php-packages/mailparse { }; - maxminddb = buildPecl rec { - pname = "maxminddb"; - version = "1.7.0"; - - src = pkgs.fetchFromGitHub { - owner = "maxmind"; - repo = "MaxMind-DB-Reader-php"; - rev = "v${version}"; - sha256 = "16msc9s15y43lxw89kj51aldlkd57dc8gms199i51jc984b68ljc"; - }; - - buildInputs = [ pkgs.libmaxminddb ]; - sourceRoot = "source/ext"; - - meta = with pkgs.lib; { - description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ ajs124 das_j ] ++ teams.php.members; - }; - }; + maxminddb = callPackage ../development/php-packages/maxminddb { }; memcached = buildPecl rec { version = "3.1.5"; From 77224fd8e7bea8598acfc758eec7756975380d45 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:10:24 +0200 Subject: [PATCH 060/546] phpExtensions.memcached: Move to separate directory --- .../php-packages/memcached/default.nix | 30 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 27 +---------------- 2 files changed, 31 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/php-packages/memcached/default.nix diff --git a/pkgs/development/php-packages/memcached/default.nix b/pkgs/development/php-packages/memcached/default.nix new file mode 100644 index 00000000000..b2d9333f294 --- /dev/null +++ b/pkgs/development/php-packages/memcached/default.nix @@ -0,0 +1,30 @@ +{ buildPecl, lib, fetchgit, php, pkgs }: +let + pname = "memcached"; + version = "3.1.5"; +in +buildPecl { + inherit pname version; + + src = fetchgit { + url = "https://github.com/php-memcached-dev/php-memcached"; + rev = "v${version}"; + sha256 = "01mbh2m3kfbdvih3c8g3g9h4vdd80r0i9g2z8b3lx3mi8mmcj380"; + }; + + internalDeps = [ + php.extensions.session + ] ++ lib.optionals (lib.versionOlder php.version "7.4") [ + php.extensions.hash + ]; + + configureFlags = [ + "--with-zlib-dir=${pkgs.zlib.dev}" + "--with-libmemcached-dir=${pkgs.libmemcached}" + ]; + + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with pkgs; [ cyrus_sasl zlib ]; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index f213e300acb..010c6f0a714 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -82,32 +82,7 @@ in maxminddb = callPackage ../development/php-packages/maxminddb { }; - memcached = buildPecl rec { - version = "3.1.5"; - pname = "memcached"; - - src = fetchgit { - url = "https://github.com/php-memcached-dev/php-memcached"; - rev = "v${version}"; - sha256 = "01mbh2m3kfbdvih3c8g3g9h4vdd80r0i9g2z8b3lx3mi8mmcj380"; - }; - - internalDeps = [ - php.extensions.session - ] ++ lib.optionals (lib.versionOlder php.version "7.4") [ - php.extensions.hash - ]; - - configureFlags = [ - "--with-zlib-dir=${pkgs.zlib.dev}" - "--with-libmemcached-dir=${pkgs.libmemcached}" - ]; - - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = with pkgs; [ cyrus_sasl zlib ]; - - meta.maintainers = lib.teams.php.members; - }; + memcached = callPackage ../development/php-packages/memcached { }; mongodb = buildPecl { pname = "mongodb"; From 4cae064b2c28e679c07d168b2474e11931bcb266 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:14:22 +0200 Subject: [PATCH 061/546] phpExtensions.mongodb: Move to separate directory --- .../php-packages/mongodb/default.nix | 20 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 19 +----------------- 2 files changed, 21 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/php-packages/mongodb/default.nix diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix new file mode 100644 index 00000000000..dd8fa9a6c2b --- /dev/null +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -0,0 +1,20 @@ +{ buildPecl, lib, pkgs, pcre' }: + +buildPecl { + pname = "mongodb"; + + version = "1.6.1"; + sha256 = "1j1w4n33347j9kwvxwsrix3gvjbiqcn1s5v59pp64s536cci8q0m"; + + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with pkgs; [ + cyrus_sasl + icu64 + openssl + snappy + zlib + pcre' + ] ++ lib.optional (pkgs.stdenv.isDarwin) pkgs.darwin.apple_sdk.frameworks.Security; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 010c6f0a714..7cf385cb6d7 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -84,24 +84,7 @@ in memcached = callPackage ../development/php-packages/memcached { }; - mongodb = buildPecl { - pname = "mongodb"; - version = "1.6.1"; - - sha256 = "1j1w4n33347j9kwvxwsrix3gvjbiqcn1s5v59pp64s536cci8q0m"; - - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = with pkgs; [ - cyrus_sasl - icu64 - openssl - snappy - zlib - pcre' - ] ++ lib.optional (pkgs.stdenv.isDarwin) pkgs.darwin.apple_sdk.frameworks.Security; - - meta.maintainers = lib.teams.php.members; - }; + mongodb = callPackage ../development/php-packages/mongodb { }; oci8 = buildPecl { version = "2.2.0"; From 1f00056a360dd87983bd27d5e91779ebcb15bd6c Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:16:59 +0200 Subject: [PATCH 062/546] phpExtensions.oci8: Move to separate directory --- pkgs/development/php-packages/oci8/default.nix | 17 +++++++++++++++++ pkgs/top-level/php-packages.nix | 15 +-------------- 2 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/php-packages/oci8/default.nix diff --git a/pkgs/development/php-packages/oci8/default.nix b/pkgs/development/php-packages/oci8/default.nix new file mode 100644 index 00000000000..ea699c2034e --- /dev/null +++ b/pkgs/development/php-packages/oci8/default.nix @@ -0,0 +1,17 @@ +{ buildPecl, lib, pkgs }: + +buildPecl { + pname = "oci8"; + + version = "2.2.0"; + sha256 = "0jhivxj1nkkza4h23z33y7xhffii60d7dr51h1czjk10qywl7pyd"; + + buildInputs = [ pkgs.oracle-instantclient ]; + configureFlags = [ "--with-oci8=shared,instantclient,${pkgs.oracle-instantclient.lib}/lib" ]; + + postPatch = '' + sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 + ''; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 7cf385cb6d7..3b8efa0f27d 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -86,20 +86,7 @@ in mongodb = callPackage ../development/php-packages/mongodb { }; - oci8 = buildPecl { - version = "2.2.0"; - pname = "oci8"; - - sha256 = "0jhivxj1nkkza4h23z33y7xhffii60d7dr51h1czjk10qywl7pyd"; - buildInputs = [ pkgs.oracle-instantclient ]; - configureFlags = [ "--with-oci8=shared,instantclient,${pkgs.oracle-instantclient.lib}/lib" ]; - - postPatch = '' - sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 - ''; - - meta.maintainers = lib.teams.php.members; - }; + oci8 = callPackage ../development/php-packages/oci8 { }; pcov = buildPecl { version = "1.0.6"; From 98bc2f4da68237945c7152faa504f7b98a33b0a9 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:19:01 +0200 Subject: [PATCH 063/546] phpExtensions.pcov: Move to separate directory --- pkgs/development/php-packages/pcov/default.nix | 12 ++++++++++++ pkgs/top-level/php-packages.nix | 11 +---------- 2 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/php-packages/pcov/default.nix diff --git a/pkgs/development/php-packages/pcov/default.nix b/pkgs/development/php-packages/pcov/default.nix new file mode 100644 index 00000000000..84fbc4f7a46 --- /dev/null +++ b/pkgs/development/php-packages/pcov/default.nix @@ -0,0 +1,12 @@ +{ buildPecl, lib, pcre' }: + +buildPecl { + pname = "pcov"; + + version = "1.0.6"; + sha256 = "1psfwscrc025z8mziq69pcx60k4fbkqa5g2ia8lplb94mmarj0v1"; + + buildInputs = [ pcre' ]; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 3b8efa0f27d..7db70aa1054 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -88,16 +88,7 @@ in oci8 = callPackage ../development/php-packages/oci8 { }; - pcov = buildPecl { - version = "1.0.6"; - pname = "pcov"; - - sha256 = "1psfwscrc025z8mziq69pcx60k4fbkqa5g2ia8lplb94mmarj0v1"; - - buildInputs = [ pcre' ]; - - meta.maintainers = lib.teams.php.members; - }; + pcov = callPackage ../development/php-packages/pcov { }; pcs = buildPecl { version = "1.3.3"; From fd6db7224b07e230c1354388c8c45a9d5e216905 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:24:04 +0200 Subject: [PATCH 064/546] phpExtensions.pdo_sqlsrv: Move to separate directory --- .../php-packages/pdo_sqlsrv/default.nix | 14 ++++++++++++++ pkgs/top-level/php-packages.nix | 13 +------------ 2 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/php-packages/pdo_sqlsrv/default.nix diff --git a/pkgs/development/php-packages/pdo_sqlsrv/default.nix b/pkgs/development/php-packages/pdo_sqlsrv/default.nix new file mode 100644 index 00000000000..46da3024809 --- /dev/null +++ b/pkgs/development/php-packages/pdo_sqlsrv/default.nix @@ -0,0 +1,14 @@ +{ buildPecl, lib, pkgs, php }: + +buildPecl { + pname = "pdo_sqlsrv"; + + version = "5.8.1"; + sha256 = "06ba4x34fgs092qq9w62y2afsm1nyasqiprirk4951ax9v5vcir0"; + + internalDeps = [ php.extensions.pdo ]; + + buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 7db70aa1054..ec8f61eb03a 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -120,18 +120,7 @@ in meta.maintainers = lib.teams.php.members; }; - pdo_sqlsrv = buildPecl { - version = "5.8.1"; - pname = "pdo_sqlsrv"; - - sha256 = "06ba4x34fgs092qq9w62y2afsm1nyasqiprirk4951ax9v5vcir0"; - - internalDeps = [ php.extensions.pdo ]; - - buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; - - meta.maintainers = lib.teams.php.members; - }; + pdo_sqlsrv = callPackage ../development/php-packages/pdo_sqlsrv { }; php_excel = buildPecl rec { version = "1.0.2"; From d5ea4254a4230391ccf30f862fda2dd1f7000a63 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:32:05 +0200 Subject: [PATCH 065/546] phpExtensions.php_excel: Move to separate directory --- .../php-packages/php_excel/default.nix | 24 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 17 +------------ 2 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/php-packages/php_excel/default.nix diff --git a/pkgs/development/php-packages/php_excel/default.nix b/pkgs/development/php-packages/php_excel/default.nix new file mode 100644 index 00000000000..ab6d193fcd4 --- /dev/null +++ b/pkgs/development/php-packages/php_excel/default.nix @@ -0,0 +1,24 @@ +{ buildPecl, fetchurl, lib, pkgs }: +let + pname = "php_excel"; + phpVersion = "php7"; + version = "1.0.2"; +in +buildPecl { + inherit pname version; + + src = fetchurl { + url = "https://github.com/iliaal/php_excel/releases/download/Excel-1.0.2-PHP7/excel-${version}-${phpVersion}.tgz"; + sha256 = "0dpvih9gpiyh1ml22zi7hi6kslkilzby00z1p8x248idylldzs2n"; + }; + + buildInputs = with pkgs; [ libxl ]; + + configureFlags = [ + "--with-excel" + "--with-libxl-incdir=${pkgs.libxl}/include_c" + "--with-libxl-libdir=${pkgs.libxl}/lib" + ]; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index ec8f61eb03a..43d2c966a4e 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -122,22 +122,7 @@ in pdo_sqlsrv = callPackage ../development/php-packages/pdo_sqlsrv { }; - php_excel = buildPecl rec { - version = "1.0.2"; - pname = "php_excel"; - phpVersion = "php7"; - - buildInputs = [ pkgs.libxl ]; - - src = pkgs.fetchurl { - url = "https://github.com/iliaal/php_excel/releases/download/Excel-1.0.2-PHP7/excel-${version}-${phpVersion}.tgz"; - sha256 = "0dpvih9gpiyh1ml22zi7hi6kslkilzby00z1p8x248idylldzs2n"; - }; - - configureFlags = [ "--with-excel" "--with-libxl-incdir=${pkgs.libxl}/include_c" "--with-libxl-libdir=${pkgs.libxl}/lib" ]; - - meta.maintainers = lib.teams.php.members; - }; + php_excel = callPackage ../development/php-packages/php_excel { }; pinba = let version = if isPhp73 then "1.1.2-dev" else "1.1.1"; From 58c1014f5ad90c1834d77fd154b842dda1c81572 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:36:24 +0200 Subject: [PATCH 066/546] phpExtensions.pinba: Move to separate directory --- .../php-packages/pinba/default.nix | 29 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 27 +---------------- 2 files changed, 30 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/php-packages/pinba/default.nix diff --git a/pkgs/development/php-packages/pinba/default.nix b/pkgs/development/php-packages/pinba/default.nix new file mode 100644 index 00000000000..b7d478eb39f --- /dev/null +++ b/pkgs/development/php-packages/pinba/default.nix @@ -0,0 +1,29 @@ +{ buildPecl, lib, fetchFromGitHub, isPhp73 }: +let + pname = "pinba"; + version = if isPhp73 then "1.1.2-dev" else "1.1.1"; + + src = fetchFromGitHub ({ + owner = "tony2001"; + repo = "pinba_extension"; + } // (if (isPhp73) then { + rev = "edbc313f1b4fb8407bf7d5acf63fbb0359c7fb2e"; + sha256 = "02sljqm6griw8ccqavl23f7w1hp2zflcv24lpf00k6pyrn9cwx80"; + } else { + rev = "RELEASE_1_1_1"; + sha256 = "1kdp7vav0y315695vhm3xifgsh6h6y6pny70xw3iai461n58khj5"; + })); +in +buildPecl { + inherit pname version src; + + meta = with lib; { + description = "PHP extension for Pinba"; + longDescription = '' + Pinba is a MySQL storage engine that acts as a realtime monitoring and + statistics server for PHP using MySQL as a read-only interface. + ''; + homepage = "http://pinba.org/"; + maintainers = teams.php.members; + }; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 43d2c966a4e..1f1c3b5c736 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -124,32 +124,7 @@ in php_excel = callPackage ../development/php-packages/php_excel { }; - pinba = let - version = if isPhp73 then "1.1.2-dev" else "1.1.1"; - src = pkgs.fetchFromGitHub ({ - owner = "tony2001"; - repo = "pinba_extension"; - } // (if (isPhp73) then { - rev = "edbc313f1b4fb8407bf7d5acf63fbb0359c7fb2e"; - sha256 = "02sljqm6griw8ccqavl23f7w1hp2zflcv24lpf00k6pyrn9cwx80"; - } else { - rev = "RELEASE_1_1_1"; - sha256 = "1kdp7vav0y315695vhm3xifgsh6h6y6pny70xw3iai461n58khj5"; - })); - in buildPecl { - pname = "pinba"; - inherit version src; - - meta = with pkgs.lib; { - description = "PHP extension for Pinba"; - longDescription = '' - Pinba is a MySQL storage engine that acts as a realtime monitoring and - statistics server for PHP using MySQL as a read-only interface. - ''; - homepage = "http://pinba.org/"; - maintainers = teams.php.members; - }; - }; + pinba = callPackage ../development/php-packages/pinba { }; protobuf = buildPecl { version = "3.11.2"; From 63e150560ba4eabe5d35f119a58d0a4b4685e05b Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:39:34 +0200 Subject: [PATCH 067/546] phpExtensions.protobuf: Move to separate directory --- .../php-packages/protobuf/default.nix | 19 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 18 +----------------- 2 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/php-packages/protobuf/default.nix diff --git a/pkgs/development/php-packages/protobuf/default.nix b/pkgs/development/php-packages/protobuf/default.nix new file mode 100644 index 00000000000..d577f848283 --- /dev/null +++ b/pkgs/development/php-packages/protobuf/default.nix @@ -0,0 +1,19 @@ +{ buildPecl, lib, pcre' }: + +buildPecl { + pname = "protobuf"; + + version = "3.11.2"; + sha256 = "0bhdykdyk58ywqj940zb7jyvrlgdr6hdb4s8kn79fz3p0i79l9hz"; + + buildInputs = [ pcre' ]; + + meta = with lib; { + description = '' + Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data. + ''; + license = licenses.bsd3; + homepage = "https://developers.google.com/protocol-buffers/"; + maintainers = teams.php.members; + }; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 1f1c3b5c736..7cca6ae5a78 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -126,23 +126,7 @@ in pinba = callPackage ../development/php-packages/pinba { }; - protobuf = buildPecl { - version = "3.11.2"; - pname = "protobuf"; - - sha256 = "0bhdykdyk58ywqj940zb7jyvrlgdr6hdb4s8kn79fz3p0i79l9hz"; - - buildInputs = with pkgs; [ pcre' ]; - - meta = with pkgs.lib; { - description = '' - Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data. - ''; - license = licenses.bsd3; - homepage = "https://developers.google.com/protocol-buffers/"; - maintainers = teams.php.members; - }; - }; + protobuf = callPackage ../development/php-packages/protobuf { }; pthreads = let version = "3.2.0"; From b27b297c5636e499200f394e3fbdd4700e810267 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:45:22 +0200 Subject: [PATCH 068/546] php73Extensions.pthreads: Move to separate directory --- .../php-packages/pthreads/default.nix | 24 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 21 +--------------- 2 files changed, 25 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/php-packages/pthreads/default.nix diff --git a/pkgs/development/php-packages/pthreads/default.nix b/pkgs/development/php-packages/pthreads/default.nix new file mode 100644 index 00000000000..60cd706e12c --- /dev/null +++ b/pkgs/development/php-packages/pthreads/default.nix @@ -0,0 +1,24 @@ +{ buildPecl, lib, fetchFromGitHub, isPhp73, isPhp74, pcre' }: +let + pname = "pthreads"; + version = if isPhp73 then "3.2.0-dev" else "3.2.0"; + + src = fetchFromGitHub ({ + owner = "krakjoe"; + repo = "pthreads"; + } // (if (isPhp73) then { + rev = "4d1c2483ceb459ea4284db4eb06646d5715e7154"; + sha256 = "07kdxypy0bgggrfav2h1ccbv67lllbvpa3s3zsaqci0gq4fyi830"; + } else { + rev = "v3.2.0"; + sha256 = "17hypm75d4w7lvz96jb7s0s87018yzmmap0l125d5fd7abnhzfvv"; + })); +in +buildPecl { + inherit pname version src; + + buildInputs = [ pcre'.dev ]; + + meta.broken = isPhp74; + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 7cca6ae5a78..d52fe38923e 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -128,26 +128,7 @@ in protobuf = callPackage ../development/php-packages/protobuf { }; - pthreads = let - version = "3.2.0"; - src = pkgs.fetchFromGitHub ({ - owner = "krakjoe"; - repo = "pthreads"; - } // (if (isPhp73) then { - rev = "4d1c2483ceb459ea4284db4eb06646d5715e7154"; - sha256 = "07kdxypy0bgggrfav2h1ccbv67lllbvpa3s3zsaqci0gq4fyi830"; - } else { - rev = "v3.2.0"; - sha256 = "17hypm75d4w7lvz96jb7s0s87018yzmmap0l125d5fd7abnhzfvv"; - })); - in buildPecl { - pname = "pthreads"; - inherit version src; - - buildInputs = [ pcre'.dev ]; - - meta.broken = isPhp74; - }; + pthreads = callPackage ../development/php-packages/pthreads { }; rdkafka = buildPecl { version = "4.0.3"; From 80ba7d0c87afb1e7f818b2044a97b900ecd0d341 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:49:28 +0200 Subject: [PATCH 069/546] phpExtensions.rdkafka: Move to separate directory --- .../php-packages/rdkafka/default.nix | 21 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 20 +----------------- 2 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/php-packages/rdkafka/default.nix diff --git a/pkgs/development/php-packages/rdkafka/default.nix b/pkgs/development/php-packages/rdkafka/default.nix new file mode 100644 index 00000000000..f96b1800769 --- /dev/null +++ b/pkgs/development/php-packages/rdkafka/default.nix @@ -0,0 +1,21 @@ +{ buildPecl, lib, pkgs, pcre' }: + +buildPecl { + pname = "rdkafka"; + + version = "4.0.3"; + sha256 = "1g00p911raxcc7n2w9pzadxaggw5c564md6hjvqfs9ip550y5x16"; + + buildInputs = [ pkgs.rdkafka pcre' ]; + + postPhpize = '' + substituteInPlace configure \ + --replace 'SEARCH_PATH="/usr/local /usr"' 'SEARCH_PATH=${pkgs.rdkafka}' + ''; + + meta = with lib; { + description = "Kafka client based on librdkafka"; + homepage = "https://github.com/arnaud-lb/php-rdkafka"; + maintainers = teams.php.members; + }; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index d52fe38923e..390466c0f6b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -130,25 +130,7 @@ in pthreads = callPackage ../development/php-packages/pthreads { }; - rdkafka = buildPecl { - version = "4.0.3"; - pname = "rdkafka"; - - sha256 = "1g00p911raxcc7n2w9pzadxaggw5c564md6hjvqfs9ip550y5x16"; - - buildInputs = with pkgs; [ rdkafka pcre' ]; - - postPhpize = '' - substituteInPlace configure \ - --replace 'SEARCH_PATH="/usr/local /usr"' 'SEARCH_PATH=${pkgs.rdkafka}' - ''; - - meta = { - description = "Kafka client based on librdkafka"; - homepage = "https://github.com/arnaud-lb/php-rdkafka"; - maintainers = lib.teams.php.members; - }; - }; + rdkafka = callPackage ../development/php-packages/rdkafka { }; redis = buildPecl { version = "5.1.1"; From f5a4a96fad517ecea87d0c767396df8521f44afb Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:53:07 +0200 Subject: [PATCH 070/546] phpExtensions.redis: Move to separate directory --- pkgs/development/php-packages/redis/default.nix | 17 +++++++++++++++++ pkgs/top-level/php-packages.nix | 15 +-------------- 2 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/php-packages/redis/default.nix diff --git a/pkgs/development/php-packages/redis/default.nix b/pkgs/development/php-packages/redis/default.nix new file mode 100644 index 00000000000..6e322aecf2b --- /dev/null +++ b/pkgs/development/php-packages/redis/default.nix @@ -0,0 +1,17 @@ +{ buildPecl, lib, php }: + +buildPecl { + pname = "redis"; + + version = "5.1.1"; + sha256 = "1041zv91fkda73w4c3pj6zdvwjgb3q7mxg6mwnq9gisl80mrs732"; + + internalDeps = with php.extensions; [ + json + session + ] ++ lib.optionals (lib.versionOlder php.version "7.4") [ + hash + ]; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 390466c0f6b..a4658928859 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -132,20 +132,7 @@ in rdkafka = callPackage ../development/php-packages/rdkafka { }; - redis = buildPecl { - version = "5.1.1"; - pname = "redis"; - - sha256 = "1041zv91fkda73w4c3pj6zdvwjgb3q7mxg6mwnq9gisl80mrs732"; - - internalDeps = with php.extensions; [ - json - session - ] ++ lib.optionals (lib.versionOlder php.version "7.4") [ - hash ]; - - meta.maintainers = lib.teams.php.members; - }; + redis = callPackage ../development/php-packages/redis { }; sqlsrv = buildPecl { version = "5.8.1"; From a004e2ca688ae66b2e7762f9907bfa50d1b191a9 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:55:31 +0200 Subject: [PATCH 071/546] phpExtensions.sqlsrv: Move to separate directory --- pkgs/development/php-packages/sqlsrv/default.nix | 16 ++++++++++++++++ pkgs/top-level/php-packages.nix | 11 +---------- 2 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/php-packages/sqlsrv/default.nix diff --git a/pkgs/development/php-packages/sqlsrv/default.nix b/pkgs/development/php-packages/sqlsrv/default.nix new file mode 100644 index 00000000000..341152277ca --- /dev/null +++ b/pkgs/development/php-packages/sqlsrv/default.nix @@ -0,0 +1,16 @@ +{ buildPecl, lib, pkgs }: + +buildPecl { + pname = "sqlsrv"; + + version = "5.8.1"; + sha256 = "0c9a6ghch2537vi0274vx0mn6nb1xg2qv7nprnf3xdfqi5ww1i9r"; + + buildInputs = [ + pkgs.unixODBC + ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ + pkgs.libiconv + ]; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index a4658928859..ab5d4234000 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -134,16 +134,7 @@ in redis = callPackage ../development/php-packages/redis { }; - sqlsrv = buildPecl { - version = "5.8.1"; - pname = "sqlsrv"; - - sha256 = "0c9a6ghch2537vi0274vx0mn6nb1xg2qv7nprnf3xdfqi5ww1i9r"; - - buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; - - meta.maintainers = lib.teams.php.members; - }; + sqlsrv = callPackage ../development/php-packages/sqlsrv { }; v8 = buildPecl { version = "0.2.2"; From e810b999eb377499d568ffc27cc2eaa72b5fae5e Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:58:03 +0200 Subject: [PATCH 072/546] phpExtensions.xdebug: Move to separate directory --- pkgs/development/php-packages/xdebug/default.nix | 15 +++++++++++++++ pkgs/top-level/php-packages.nix | 14 +------------- 2 files changed, 16 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/php-packages/xdebug/default.nix diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix new file mode 100644 index 00000000000..731e0bc0bae --- /dev/null +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -0,0 +1,15 @@ +{ buildPecl, lib }: + +buildPecl { + pname = "xdebug"; + + version = "2.8.1"; + sha256 = "080mwr7m72rf0jsig5074dgq2n86hhs7rdbfg6yvnm959sby72w3"; + + doCheck = true; + checkTarget = "test"; + + zendExtension = true; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index ab5d4234000..77d5c279fbe 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -162,19 +162,7 @@ in meta.broken = true; }; - xdebug = buildPecl { - version = "2.8.1"; - pname = "xdebug"; - - sha256 = "080mwr7m72rf0jsig5074dgq2n86hhs7rdbfg6yvnm959sby72w3"; - - doCheck = true; - checkTarget = "test"; - - zendExtension = true; - - meta.maintainers = lib.teams.php.members; - }; + xdebug = callPackage ../development/php-packages/xdebug { }; yaml = buildPecl { version = "2.0.4"; From 6d0abdd9c123b9f588eee6da56dadf6414e0ba1e Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 20:00:38 +0200 Subject: [PATCH 073/546] phpExtensions.yaml: Move to separate directory --- pkgs/development/php-packages/yaml/default.nix | 14 ++++++++++++++ pkgs/top-level/php-packages.nix | 15 +-------------- 2 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/php-packages/yaml/default.nix diff --git a/pkgs/development/php-packages/yaml/default.nix b/pkgs/development/php-packages/yaml/default.nix new file mode 100644 index 00000000000..8ce5c34757f --- /dev/null +++ b/pkgs/development/php-packages/yaml/default.nix @@ -0,0 +1,14 @@ +{ buildPecl, lib, pkgs }: + +buildPecl { + pname = "yaml"; + + version = "2.0.4"; + sha256 = "1036zhc5yskdfymyk8jhwc34kvkvsn5kaf50336153v4dqwb11lp"; + + configureFlags = [ "--with-yaml=${pkgs.libyaml}" ]; + + nativeBuildInputs = [ pkgs.pkgconfig ]; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 77d5c279fbe..dee3200391b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -164,20 +164,7 @@ in xdebug = callPackage ../development/php-packages/xdebug { }; - yaml = buildPecl { - version = "2.0.4"; - pname = "yaml"; - - sha256 = "1036zhc5yskdfymyk8jhwc34kvkvsn5kaf50336153v4dqwb11lp"; - - configureFlags = [ - "--with-yaml=${pkgs.libyaml}" - ]; - - nativeBuildInputs = [ pkgs.pkgconfig ]; - - meta.maintainers = lib.teams.php.members; - }; + yaml = callPackage ../development/php-packages/yaml { }; zmq = buildPecl { version = "1.1.3"; From 3d31818f1aaed19d5b2646f065ab4311bd5b46c3 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 20:10:58 +0200 Subject: [PATCH 074/546] php: Drop usage of isPhp73 and isPhp74 These variables have bad names that doesn't really make full sense --- pkgs/development/php-packages/phpmd/default.nix | 4 +++- pkgs/development/php-packages/pinba/default.nix | 5 ++++- pkgs/development/php-packages/pthreads/default.nix | 6 +++++- pkgs/top-level/php-packages.nix | 9 +++------ 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/development/php-packages/phpmd/default.nix b/pkgs/development/php-packages/phpmd/default.nix index ffdb877d76e..fd7390498ba 100644 --- a/pkgs/development/php-packages/phpmd/default.nix +++ b/pkgs/development/php-packages/phpmd/default.nix @@ -1,7 +1,9 @@ -{ mkDerivation, fetchurl, pkgs, lib, php, isPhp74 }: +{ mkDerivation, fetchurl, pkgs, lib, php }: let pname = "phpmd"; version = "2.8.2"; + + isPhp74 = lib.versionAtLeast php.version "7.4"; in mkDerivation { inherit pname version; diff --git a/pkgs/development/php-packages/pinba/default.nix b/pkgs/development/php-packages/pinba/default.nix index b7d478eb39f..0880c2a46e2 100644 --- a/pkgs/development/php-packages/pinba/default.nix +++ b/pkgs/development/php-packages/pinba/default.nix @@ -1,6 +1,9 @@ -{ buildPecl, lib, fetchFromGitHub, isPhp73 }: +{ buildPecl, lib, fetchFromGitHub, php }: let pname = "pinba"; + + isPhp73 = lib.versionAtLeast php.version "7.3"; + version = if isPhp73 then "1.1.2-dev" else "1.1.1"; src = fetchFromGitHub ({ diff --git a/pkgs/development/php-packages/pthreads/default.nix b/pkgs/development/php-packages/pthreads/default.nix index 60cd706e12c..31b32e82967 100644 --- a/pkgs/development/php-packages/pthreads/default.nix +++ b/pkgs/development/php-packages/pthreads/default.nix @@ -1,6 +1,10 @@ -{ buildPecl, lib, fetchFromGitHub, isPhp73, isPhp74, pcre' }: +{ buildPecl, lib, fetchFromGitHub, php, pcre' }: let pname = "pthreads"; + + isPhp73 = lib.versionAtLeast php.version "7.3"; + isPhp74 = lib.versionAtLeast php.version "7.4"; + version = if isPhp73 then "3.2.0-dev" else "3.2.0"; src = fetchFromGitHub ({ diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index dee3200391b..d4518b60d24 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -19,13 +19,10 @@ let pname = "php-${pname}"; }); - isPhp73 = pkgs.lib.versionAtLeast php.version "7.3"; - isPhp74 = pkgs.lib.versionAtLeast php.version "7.4"; - pcre' = if (lib.versionAtLeast php.version "7.3") then pcre2 else pcre; callPackage = pkgs.newScope { - inherit mkDerivation php isPhp73 isPhp74 buildPecl pcre'; + inherit mkDerivation php buildPecl pcre'; }; in { @@ -99,7 +96,7 @@ in internalDeps = [ php.extensions.tokenizer ]; meta.maintainers = lib.teams.php.members; - meta.broken = isPhp73; # Runtime failure on 7.3, build error on 7.4 + meta.broken = lib.versionAtLeast php.version "7.3"; # Runtime failure on 7.3, build error on 7.4 }; pdo_oci = buildPecl rec { @@ -179,7 +176,7 @@ in nativeBuildInputs = [ pkgs.pkgconfig ]; meta.maintainers = lib.teams.php.members; - meta.broken = isPhp73; + meta.broken = lib.versionAtLeast php.version "7.3"; }; } // (let # Function to build a single php extension based on the php version. From c82027ce59a134c6d5c54df56ce1b0ba0e905d34 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Oct 2020 02:30:27 +0200 Subject: [PATCH 075/546] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-17-g25ee725 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/8b3f65e1e5f8b0cd7b131867c096917a0d0484f7. --- .../haskell-modules/hackage-packages.nix | 285 +++++++++++++----- 1 file changed, 216 insertions(+), 69 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 142286bab50..559bd753798 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -24449,6 +24449,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-combinators_0_0_3_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, doctest, fail + , hspec, scientific, text, time, time-compat, unordered-containers + , utf8-string, uuid-types, vector, void + }: + mkDerivation { + pname = "aeson-combinators"; + version = "0.0.3.0"; + sha256 = "0x8bk7jxrg8j1zk5047sf5i6fy6hahjzrfnyzgwv1l443z4v445n"; + libraryHaskellDepends = [ + aeson base bytestring containers fail scientific text time + time-compat unordered-containers uuid-types vector void + ]; + testHaskellDepends = [ + aeson base bytestring doctest hspec text utf8-string + ]; + description = "Aeson combinators for dead simple JSON decoding"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-compat" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base , base-compat, base-orphans, bytestring, containers, exceptions @@ -32160,8 +32181,8 @@ self: { }: mkDerivation { pname = "arch-hs"; - version = "0.2.0.0"; - sha256 = "08pjfjmj21i1scf4hnhm872wjhkqw9jkk4pgri9yn77kgf76kyf8"; + version = "0.3.0.0"; + sha256 = "068si2cq7557rp86ni5psaig7z89vq38p56743l8yk92i1x1xz9j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54139,6 +54160,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "churros" = callPackage + ({ mkDerivation, async, base, containers, doctest, random, stm + , time + }: + mkDerivation { + pname = "churros"; + version = "0.1.0.2"; + sha256 = "0vqr16bwhi3rhj29s213y9xyzaankihf23m7gj6zhk7yqdqwibwv"; + libraryHaskellDepends = [ async base containers random stm time ]; + testHaskellDepends = [ + async base containers doctest random stm time + ]; + description = "Channel/Arrow based streaming computation library"; + license = stdenv.lib.licenses.mit; + }) {}; + "cielo" = callPackage ({ mkDerivation, aeson, base, bytestring, convertible, data-default , hspec, http-client, http-types, lens, mtl, pretty-show @@ -58473,21 +58510,16 @@ self: { }) {}; "commander-cli" = callPackage - ({ mkDerivation, base, bytestring, commandert, containers - , directory, mtl, process, text, unordered-containers + ({ mkDerivation, base, bytestring, commandert, containers, mtl + , text, unordered-containers }: mkDerivation { pname = "commander-cli"; - version = "0.10.1.1"; - sha256 = "04w8wlbxykp7jl5h76p9pgsg0h3qv94azalhma3f13r3zb5086x6"; - isLibrary = true; - isExecutable = true; + version = "0.10.1.2"; + sha256 = "0hkz657j9rpmda1rr4v7696216xxwjwpzgc5npg5ajhdk74w1vz0"; libraryHaskellDepends = [ base bytestring commandert containers mtl text unordered-containers ]; - executableHaskellDepends = [ - base commandert directory mtl process text - ]; testHaskellDepends = [ base commandert text unordered-containers ]; description = "A command line argument/option parser library"; license = stdenv.lib.licenses.mit; @@ -67138,8 +67170,8 @@ self: { }: mkDerivation { pname = "cut-the-crap"; - version = "2.0.0"; - sha256 = "1a4qzn56pvfrn6g78ifb67qynr5ni74qmp43gdg7x84gn1633j0s"; + version = "2.1.1"; + sha256 = "0w0ir436gmh3d9ycdcjyxkgblrah7ij5njqmm44lx1kyhih6bk2x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91365,6 +91397,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "flat-mcmc_1_5_2" = callPackage + ({ mkDerivation, base, formatting, mcmc-types, monad-par + , monad-par-extras, mwc-probability, pipes, primitive, text + , transformers, vector + }: + mkDerivation { + pname = "flat-mcmc"; + version = "1.5.2"; + sha256 = "13xdmiw96hb0iw87bzyks5bm58rgcv348aj09ax7gy2qjpq969iv"; + libraryHaskellDepends = [ + base formatting mcmc-types monad-par monad-par-extras + mwc-probability pipes primitive text transformers vector + ]; + testHaskellDepends = [ base vector ]; + description = "Painless general-purpose sampling"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "flat-tex" = callPackage ({ mkDerivation, base, directory, parsec }: mkDerivation { @@ -93149,22 +93200,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "formatting_7_0_0_1" = callPackage - ({ mkDerivation, array, base, bytestring, clock, double-conversion - , ghc-prim, hspec, integer-gmp, old-locale, scientific, text, time - , transformers + "formatting_7_0_0_2" = callPackage + ({ mkDerivation, base, clock, double-conversion, ghc-prim, hspec + , integer-gmp, old-locale, scientific, text, time, transformers }: mkDerivation { pname = "formatting"; - version = "7.0.0.1"; - sha256 = "0vxp1xgg7py3s8lvs63c0961fca829b7mmvdbyhiwyqyyqy2wclg"; + version = "7.0.0.2"; + sha256 = "1yam1lniqlmvdq2nsg7hmw9mzpfv37ldyg0izi8869iwl63j87gh"; libraryHaskellDepends = [ - array base bytestring clock double-conversion ghc-prim integer-gmp - old-locale scientific text time transformers + base clock double-conversion ghc-prim integer-gmp old-locale + scientific text time transformers ]; testHaskellDepends = [ - array base bytestring clock double-conversion ghc-prim hspec - integer-gmp old-locale scientific text time transformers + base clock double-conversion ghc-prim hspec integer-gmp old-locale + scientific text time transformers ]; description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; license = stdenv.lib.licenses.bsd3; @@ -123604,6 +123654,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedis_0_12_15" = callPackage + ({ mkDerivation, async, base, bytestring, bytestring-lexing + , deepseq, doctest, errors, exceptions, HTTP, HUnit, mtl, network + , network-uri, resource-pool, scanner, stm, test-framework + , test-framework-hunit, text, time, tls, unordered-containers + , vector + }: + mkDerivation { + pname = "hedis"; + version = "0.12.15"; + sha256 = "0zkavyx4nbdrwl5sywl2rn9lmakpfw2jgs8sjqzjsnnkbk62i33j"; + libraryHaskellDepends = [ + async base bytestring bytestring-lexing deepseq errors exceptions + HTTP mtl network network-uri resource-pool scanner stm text time + tls unordered-containers vector + ]; + testHaskellDepends = [ + async base bytestring doctest HUnit mtl stm test-framework + test-framework-hunit text time + ]; + benchmarkHaskellDepends = [ base mtl time ]; + description = "Client library for the Redis datastore: supports full command set, pipelining"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hedis-config" = callPackage ({ mkDerivation, aeson, base, bytestring, hedis, scientific, text , time @@ -124767,6 +124843,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "heterocephalus_1_0_5_4" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup, containers, dlist + , doctest, Glob, mtl, parsec, shakespeare, template-haskell, text + , transformers + }: + mkDerivation { + pname = "heterocephalus"; + version = "1.0.5.4"; + sha256 = "06fv3bhnj80cjli1v2drkpkmx76i81cpawlci7agcxxd8fd8zplc"; + libraryHaskellDepends = [ + base blaze-html blaze-markup containers dlist mtl parsec + shakespeare template-haskell text transformers + ]; + testHaskellDepends = [ base doctest Glob ]; + description = "A type-safe template engine for working with front end development tools"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "heterogeneous-list-literals" = callPackage ({ mkDerivation, base, Only }: mkDerivation { @@ -136793,20 +136888,21 @@ self: { }) {}; "hstar" = callPackage - ({ mkDerivation, archive-libarchive, archive-sig, base, brotli - , bytestring, bz2, cpphs, lz4-hs, lzlib, lzma, lzo - , optparse-applicative, zlib, zstd + ({ mkDerivation, base, brotli, bytestring, bz2, composition-prelude + , cpphs, dir-traverse, libarchive, lz4-hs, lzlib, lzma, lzo + , optparse-applicative, process, zlib, zstd }: mkDerivation { pname = "hstar"; - version = "0.1.0.4"; - sha256 = "1c28xbcg8lmh7zkpl8xpg30niv6adjk8zggwcxi72ylb9z2y3fqr"; + version = "0.1.0.5"; + sha256 = "1cp7g4c38psfb9nlq8481dqazl7shy8zswli7058mgyf2xbalw0y"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - archive-libarchive archive-sig base brotli bytestring bz2 lz4-hs - lzlib lzma lzo optparse-applicative zlib zstd + base brotli bytestring bz2 composition-prelude dir-traverse + libarchive lz4-hs lzlib lzma lzo optparse-applicative process zlib + zstd ]; executableToolDepends = [ cpphs ]; description = "Haskell version of tar CLI utility"; @@ -141237,20 +141333,20 @@ self: { }) {}; "hwk" = callPackage - ({ mkDerivation, base, directory, extra, filepath, hint, process + ({ mkDerivation, base, directory, extra, filepath, hint , simple-cmd-args }: mkDerivation { pname = "hwk"; - version = "0.2.0"; - sha256 = "1a83y1xgqcxkggbhbw0rpfnjwryl5h0fv6apw86h1ynq7dhf80rd"; + version = "0.3"; + sha256 = "16pi48bgxgh3qcbrhyjg6r477yn2qzyzx6gizwf8q6h0da4qzp8i"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base directory extra filepath hint process simple-cmd-args + base directory extra filepath hint simple-cmd-args ]; - description = "A modern Haskell based AWK replacement"; + description = "Simple Haskell-based awk-like tool"; license = stdenv.lib.licenses.mit; }) {}; @@ -145544,6 +145640,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "inline-c_0_9_1_3" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers + , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq + , regex-posix, split, template-haskell, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "inline-c"; + version = "0.9.1.3"; + sha256 = "1b2dcyg6b15q5n7k9k391y78wblqlvkrwxr8hbnp0y6x8h8l8ma8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base bytestring containers hashable mtl parsec + parsers template-haskell transformers unordered-containers vector + ]; + testHaskellDepends = [ + ansi-wl-pprint base containers hashable hspec parsers QuickCheck + raw-strings-qq regex-posix split template-haskell transformers + unordered-containers vector + ]; + description = "Write Haskell source files including C code inline. No FFI required."; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inline-c-cpp_0_1_0_0" = callPackage ({ mkDerivation, base, inline-c, template-haskell }: mkDerivation { @@ -164619,8 +164741,8 @@ self: { }: mkDerivation { pname = "longshot"; - version = "0.1.0.2"; - sha256 = "19njqqd4il5gg0pg2q05scm4may9gmfflq65gdilfwcxf6jzxin6"; + version = "0.1.0.3"; + sha256 = "1w3fkbz900aj6dwqnbg6miv1wv3vlka7ri94fny34gjyl1da30cl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191259,13 +191381,13 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_10_1" = callPackage + "pandoc_2_11" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring - , case-insensitive, commonmark, commonmark-extensions + , case-insensitive, citeproc, commonmark, commonmark-extensions , commonmark-pandoc, connection, containers, criterion , data-default, deepseq, Diff, directory, doclayout, doctemplates - , emojis, exceptions, executable-path, filepath, Glob + , emojis, exceptions, executable-path, file-embed, filepath, Glob , haddock-library, hslua, hslua-module-system, hslua-module-text , HsYAML, HTTP, http-client, http-client-tls, http-types, ipynb , jira-wiki-markup, JuicyPixels, mtl, network, network-uri @@ -191278,24 +191400,24 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.10.1"; - sha256 = "16i2sc5nf2gx5aykbd0jmbjcj2ivj5941bvkdj4dxlvy1adlr2lk"; + version = "2.11"; + sha256 = "1d0rywdwcr81h45ha53x35jjj8lyzwdc3wang395wxwxbl811l7w"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty attoparsec base base64-bytestring binary - blaze-html blaze-markup bytestring case-insensitive commonmark - commonmark-extensions commonmark-pandoc connection containers - data-default deepseq directory doclayout doctemplates emojis - exceptions filepath Glob haddock-library hslua hslua-module-system - hslua-module-text HsYAML HTTP http-client http-client-tls - http-types ipynb jira-wiki-markup JuicyPixels mtl network - network-uri pandoc-types parsec process random safe scientific SHA - skylighting skylighting-core split syb tagsoup temporary texmath - text text-conversions time unicode-transforms unix - unordered-containers xml zip-archive zlib + blaze-html blaze-markup bytestring case-insensitive citeproc + commonmark commonmark-extensions commonmark-pandoc connection + containers data-default deepseq directory doclayout doctemplates + emojis exceptions file-embed filepath Glob haddock-library hslua + hslua-module-system hslua-module-text HsYAML HTTP http-client + http-client-tls http-types ipynb jira-wiki-markup JuicyPixels mtl + network network-uri pandoc-types parsec process random safe + scientific SHA skylighting skylighting-core split syb tagsoup + temporary texmath text text-conversions time unicode-transforms + unix unordered-containers xml zip-archive zlib ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -191721,23 +191843,24 @@ self: { broken = true; }) {}; - "pandoc-plot_0_9_4_0" = callPackage + "pandoc-plot_1_0_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, criterion , data-default, directory, filepath, githash, hashable, hspec - , hspec-expectations, lifted-async, mtl, optparse-applicative - , pandoc, pandoc-types, shakespeare, tagsoup, tasty, tasty-hspec - , tasty-hunit, template-haskell, text, typed-process, yaml + , hspec-expectations, lifted-async, lifted-base, mtl + , optparse-applicative, pandoc, pandoc-types, shakespeare, tagsoup + , tasty, tasty-hspec, tasty-hunit, template-haskell, text + , typed-process, yaml }: mkDerivation { pname = "pandoc-plot"; - version = "0.9.4.0"; - sha256 = "0fa4aka5niydhm3jhiywjycj5hwhsy6nlg0nwy1n459pdr93ivyc"; + version = "1.0.0.0"; + sha256 = "1vls3xvj8zijl6sd698f8jljqslm4jnk07v8vzlm0s2gab2lcgmj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers data-default directory filepath hashable - lifted-async mtl pandoc pandoc-types shakespeare tagsoup text - typed-process yaml + lifted-async lifted-base mtl pandoc pandoc-types shakespeare + tagsoup text typed-process yaml ]; executableHaskellDepends = [ base containers directory filepath githash optparse-applicative @@ -194231,8 +194354,8 @@ self: { ({ mkDerivation, base, dhall, either, path, text }: mkDerivation { pname = "path-dhall-instance"; - version = "0.2.0.0"; - sha256 = "084vwqp8qmz0llwdfhls4sg9qbyn17mhbsxskjq4cpjk08xp10d5"; + version = "0.2.1.0"; + sha256 = "17igz9936lfivph9rr04075sp7ik5k8byljw2vj0zx8lnznjwn6a"; libraryHaskellDepends = [ base dhall either path text ]; description = "ToDhall and FromDhall instances for Path"; license = stdenv.lib.licenses.mit; @@ -206430,14 +206553,14 @@ self: { , optparse-applicative, parallel, parser-combinators, path-pieces , QuickCheck, quickcheck-instances, random, random-shuffle , resourcet, rset, scotty, semigroups, stm, stm-containers - , template-haskell, temporary, text, time, transformers, unix - , unordered-containers, uuid, vector, vector-binary-instances - , websockets, zlib + , template-haskell, temporary, text, text-manipulate, time + , transformers, unix, unordered-containers, uuid, vector + , vector-binary-instances, websockets, zlib }: mkDerivation { pname = "project-m36"; - version = "0.8"; - sha256 = "0rc5vixyaakh9avsn4xwf1phqm1298z8d81xwxllas0wq5cbyvl3"; + version = "0.8.1"; + sha256 = "10by97f23pbl7hdwgc0609qxfyl7fak28n0nvvzb51q282w7f22h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206451,8 +206574,8 @@ self: { MonadRandom mtl network-transport network-transport-tcp old-locale optparse-applicative parallel path-pieces QuickCheck quickcheck-instances random-shuffle resourcet rset semigroups stm - stm-containers temporary text time transformers unix - unordered-containers uuid vector vector-binary-instances zlib + stm-containers temporary text text-manipulate time transformers + unix unordered-containers uuid vector vector-binary-instances zlib ]; executableHaskellDepends = [ aeson attoparsec base base64-bytestring binary blaze-html @@ -263362,6 +263485,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "type-fun_0_1_2" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "type-fun"; + version = "0.1.2"; + sha256 = "1qb9h6x1npq1pc8h7n6ism5a6jccysn76czqym1f69x0qh1jjlay"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Collection of widely reimplemented type families"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "type-functions" = callPackage ({ mkDerivation, base, kinds }: mkDerivation { @@ -266755,6 +266891,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "unliftio-path" = callPackage + ({ mkDerivation, base, exceptions, path, time, unliftio }: + mkDerivation { + pname = "unliftio-path"; + version = "0.0.2.0"; + sha256 = "1ila58yyk2vfshaz6d5kp4vdcgjrlnwnqnrjm949qlcv36srvzg9"; + libraryHaskellDepends = [ base exceptions path time unliftio ]; + description = "UnliftIO using well-typed Paths"; + license = stdenv.lib.licenses.mit; + }) {}; + "unliftio-pool" = callPackage ({ mkDerivation, base, resource-pool, time, transformers , unliftio-core From 7557bf0ca7fc500d5b26a674702fcfb2f782a20b Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Mon, 12 Oct 2020 16:46:40 +0200 Subject: [PATCH 076/546] CODEOWNERS: Add php-packages path to PHP team --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 556dcd770ca..17777b05872 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -192,6 +192,7 @@ /nixos/tests/php @NixOS/php /pkgs/build-support/build-pecl.nix @NixOS/php /pkgs/development/interpreters/php @NixOS/php +/pkgs/development/php-packages @NixOS/php /pkgs/top-level/php-packages.nix @NixOS/php # Podman, CRI-O modules and related From 4eae3ac1ec586d3ea10bcf5c93af57ec97101cea Mon Sep 17 00:00:00 2001 From: Julius Marozas Date: Mon, 12 Oct 2020 19:41:33 +0300 Subject: [PATCH 077/546] virt-manager: 2.2.1 -> 3.1.0 --- pkgs/applications/virtualization/virt-manager/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 952a30b139c..9673e93d0cc 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -2,7 +2,7 @@ , wrapGAppsHook, gtk-vnc, vte, avahi, dconf , gobject-introspection, libvirt-glib, system-libvirt , gsettings-desktop-schemas, glib, libosinfo, gnome3 -, gtksourceview4 +, gtksourceview4, docutils , spiceSupport ? true, spice-gtk ? null , cpio, e2fsprogs, findutils, gzip }: @@ -11,16 +11,17 @@ with stdenv.lib; python3Packages.buildPythonApplication rec { pname = "virt-manager"; - version = "2.2.1"; + version = "3.1.0"; src = fetchurl { url = "http://virt-manager.org/download/sources/virt-manager/${pname}-${version}.tar.gz"; - sha256 = "06ws0agxlip6p6n3n43knsnjyd91gqhh2dadgc33wl9lx1k8vn6g"; + sha256 = "0al34lxlywqnj98hdm72a38zk8ns91wkqgrc3h1mhv1kikd8pjfc"; }; nativeBuildInputs = [ intltool file gobject-introspection # for setup hook populating GI_TYPELIB_PATH + docutils ]; buildInputs = [ From 98cbf7b90dc4f7b2dc565af54207fc1b4d815a3d Mon Sep 17 00:00:00 2001 From: davidak Date: Mon, 12 Oct 2020 20:39:03 +0200 Subject: [PATCH 078/546] limesurvey: 3.23.0+200813 -> 3.23.7+201006 --- pkgs/servers/limesurvey/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/limesurvey/default.nix b/pkgs/servers/limesurvey/default.nix index 5f5db310bf3..023e1bbd2cc 100644 --- a/pkgs/servers/limesurvey/default.nix +++ b/pkgs/servers/limesurvey/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "limesurvey"; - version = "3.23.0+200813"; + version = "3.23.7+201006"; src = fetchFromGitHub { owner = "LimeSurvey"; repo = "LimeSurvey"; rev = version; - sha256 = "0r260z40g6b2bsfzxgfwdffbs17bl784xsc67n7q8222rs601hxf"; + sha256 = "19p978p0flknsg3iqlrrbr76qsk5ha2a84nxywqsvjrjvqrh5jrc"; }; phpConfig = writeText "config.php" '' From 99a6e13929102b7bc0dd7da3e2624e1849cf4809 Mon Sep 17 00:00:00 2001 From: Sergey Makarov Date: Mon, 12 Oct 2020 19:05:55 +0300 Subject: [PATCH 079/546] fcft: 2.2.6 -> 2.3.1 --- pkgs/development/libraries/fcft/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix index 0c5d2b334ac..1ce09b63cbe 100644 --- a/pkgs/development/libraries/fcft/default.nix +++ b/pkgs/development/libraries/fcft/default.nix @@ -1,18 +1,18 @@ { stdenv, lib, fetchgit, pkg-config, meson, ninja, scdoc -,freetype, fontconfig, pixman, tllist, check }: +,freetype, fontconfig, harfbuzz, pixman, tllist, check }: stdenv.mkDerivation rec { pname = "fcft"; - version = "2.2.6"; + version = "2.3.1"; src = fetchgit { url = "https://codeberg.org/dnkl/fcft.git"; - rev = "${version}"; - sha256 = "06zywvvgrch9k4d07bir2sxddwsli2gzpvlvjfcwbrj3bw5x6j1b"; + rev = version; + sha256 = "sha256-FD3KfaQbSEA1XdmS6YxH+c5fSsra9Ro/KKslb7Brv7U="; }; nativeBuildInputs = [ pkg-config meson ninja scdoc ]; - buildInputs = [ freetype fontconfig pixman tllist ]; + buildInputs = [ freetype fontconfig pixman tllist harfbuzz ]; checkInputs = [ check ]; mesonFlags = [ "--buildtype=release" ]; From 445e34a2681c7cacacdb779c52ede1a5928e47ba Mon Sep 17 00:00:00 2001 From: Sergey Makarov Date: Mon, 12 Oct 2020 19:11:31 +0300 Subject: [PATCH 080/546] tllist: 1.0.2 -> 1.0.4 --- pkgs/development/libraries/tllist/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/tllist/default.nix b/pkgs/development/libraries/tllist/default.nix index a17b3e415d5..9134ade0e18 100644 --- a/pkgs/development/libraries/tllist/default.nix +++ b/pkgs/development/libraries/tllist/default.nix @@ -2,18 +2,20 @@ stdenv.mkDerivation rec { pname = "tllist"; - version = "1.0.2"; + version = "1.0.4"; src = fetchgit { url = "https://codeberg.org/dnkl/tllist.git"; - rev = "${version}"; - sha256 = "095wly66z9n2r6h318rackgl4g1w9l1vj96367ngcw7rpva9yppl"; + rev = version; + sha256 = "sha256-+u8p/VmI61SGRhZHaJBwgcVNetNOrYzg2NVQehbfRqg="; }; nativeBuildInputs = [ meson ninja ]; + doCheck = true; + meta = with lib; { homepage = "https://codeberg.org/dnkl/tllist"; description = "C header file only implementation of a typed linked list"; From e1678bf1b6351c909fcf6aee41cafef02900ee42 Mon Sep 17 00:00:00 2001 From: Sergey Makarov Date: Mon, 12 Oct 2020 19:12:34 +0300 Subject: [PATCH 081/546] foot: 1.4.4 -> 1.5.1 Co-authored-by: sternenseemann --- pkgs/applications/misc/foot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/foot/default.nix b/pkgs/applications/misc/foot/default.nix index 02909ee1f2f..3d95f7c5772 100644 --- a/pkgs/applications/misc/foot/default.nix +++ b/pkgs/applications/misc/foot/default.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { pname = "foot"; - version = "1.4.4"; + version = "1.5.1"; src = fetchgit { url = "https://codeberg.org/dnkl/foot.git"; - rev = "${version}"; - sha256 = "1cr4sz075v18clh8nlvgyxlbvfkhbsg0qrqgnclip5rwa24ry1lg"; + rev = version; + sha256 = "sha256-GAk2qkrgCNILJOeRcn1NT4t3w+R6WFTZ1goOhBEwKwc="; }; nativeBuildInputs = [ From 1331d642e0af8b58a97ce752dc2dde630e1e2d00 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 12 Oct 2020 16:27:13 -0300 Subject: [PATCH 082/546] zegrapher: init at 3.1.1 --- .../science/math/zegrapher/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/science/math/zegrapher/default.nix diff --git a/pkgs/applications/science/math/zegrapher/default.nix b/pkgs/applications/science/math/zegrapher/default.nix new file mode 100644 index 00000000000..c9eb72cca43 --- /dev/null +++ b/pkgs/applications/science/math/zegrapher/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, fetchFromGitHub +, qmake +, wrapQtAppsHook +, boost }: + +stdenv.mkDerivation rec { + pname = "zegrapher"; + version = "3.1.1"; + + src = fetchFromGitHub { + owner = "AdelKS"; + repo = "ZeGrapher"; + rev = "v${version}"; + sha256 = "sha256-OSQXm0gDI1zM2MBM4iiY43dthJcAZJkprklolsNMEvk="; + }; + + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; + buildInputs = [ + boost + ]; + + meta = with stdenv.lib; { + homepage = "https://zegrapher.com/"; + description = "An open source math plotter"; + longDescription = '' + An open source, free and easy to use math plotter. It can plot functions, + sequences, parametric equations and data on the plane. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78dd1302380..22cde008142 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26330,6 +26330,8 @@ in cmake = cmakeCurses; }); + zegrapher = libsForQt5.callPackage ../applications/science/math/zegrapher { }; + ### SCIENCE/MEDICINE aliza = callPackage ../applications/science/medicine/aliza { }; From 73825def0a5fcf8ee840bef4eefef929d15123d9 Mon Sep 17 00:00:00 2001 From: "Pedro R. de Oliveira" Date: Mon, 12 Oct 2020 17:26:26 -0600 Subject: [PATCH 083/546] upwork: 5.3.3-883 -> 5.4.7.1 --- pkgs/applications/misc/upwork/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index 3757c8ce3bb..025ddd3725f 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -6,16 +6,16 @@ stdenv.mkDerivation rec { pname = "upwork"; - version = "5.3.3-883"; + version = "5.4.7.1"; src = fetchurl { - url = "https://updates-desktopapp.upwork.com/binaries/v5_3_3_883_1f817bc1fefd44e7/upwork_5.3.3.883_amd64.deb"; - sha256 = "072zns79w4h46bvbj23rvr8i12sf2l378ry0z3hchwcimkrph9wx"; + url = "https://updates-desktopapp.upwork.com/binaries/v5_4_7_1_81f361962c74427d/${pname}_5.4.7.1_amd64.deb"; + sha256 = "c443724d37bca942ca126b8b207846a5adb94a92ff9490370f2fe055feee347b"; }; dontWrapGApps = true; - nativeBuildInputs = [ + nativeBuildInputs = [ dpkg wrapGAppsHook autoPatchelfHook @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ zakkor ]; }; -} \ No newline at end of file +} From ffc76b348572d6e2cf6b93f9afbd8125abdb6bab Mon Sep 17 00:00:00 2001 From: "Pedro R. de Oliveira" Date: Mon, 12 Oct 2020 17:27:16 -0600 Subject: [PATCH 084/546] maintainers: add wolfangaukang --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/applications/misc/upwork/default.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d11e0c0dba2..481eac76fe1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9248,6 +9248,12 @@ githubId = 1322287; name = "William O'Hanley"; }; + wolfangaukang = { + email = "liquid.query960@4wrd.cc"; + github = "wolfangaukang"; + githubId = 8378365; + name = "P. R. d. O."; + }; womfoo = { email = "kranium@gikos.net"; github = "womfoo"; diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index 025ddd3725f..5d4247f3869 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { description = "Online freelancing platform desktop application for time tracking"; homepage = "https://www.upwork.com/ab/downloads/"; license = licenses.unfree; - maintainers = with maintainers; [ zakkor ]; + maintainers = with maintainers; [ zakkor wolfangaukang ]; }; } From 8c5302f58d73bb76f1137cda8f3ff7a2f89efd9a Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Sun, 4 Oct 2020 22:37:55 -0400 Subject: [PATCH 085/546] Unbreak haskellPackages.hpack-dhall --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ .../haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 92319cc27f0..4fb510efed0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -137,6 +137,14 @@ self: super: { then addBuildDepend super.halive pkgs.darwin.apple_sdk.frameworks.AppKit else super.halive; + # Test suite fails due golden tests checking text representation + # of normalized dhall expressions, and newer dhall versions format + # differently. + hpack-dhall = + if pkgs.lib.versionOlder "0.5.2" super.hpack-dhall.version + then throw "Drop dontCheck override for hpack-dhall > 0.5.2" + else dontCheck super.hpack-dhall; + barbly = addBuildDepend super.barbly pkgs.darwin.apple_sdk.frameworks.AppKit; # Hakyll's tests are broken on Darwin (3 failures); and they require util-linux diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index c77ce2f8742..59258182b99 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -6357,7 +6357,6 @@ broken-packages: - hp2any-graph - hp2any-manager - hpack-convert - - hpack-dhall - hpaco - hpaco-lib - hpage From 61b301b3268cbb8c121a81e51d29809bbc18d1ef Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 13 Oct 2020 10:34:31 +0200 Subject: [PATCH 086/546] jamin: Put version into variable, use variable interpolation Signed-off-by: Matthias Beyer --- pkgs/applications/audio/jamin/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix index a9b423320a0..57caf4672d3 100644 --- a/pkgs/applications/audio/jamin/default.nix +++ b/pkgs/applications/audio/jamin/default.nix @@ -2,11 +2,12 @@ , makeWrapper, pkgconfig, perlPackages }: -stdenv.mkDerivation { - name = "jamin-0.95.0"; +stdenv.mkDerivation rec { + version = "0.95.0"; + name = "jamin-${version}"; src = fetchurl { - url = "mirror://sourceforge/jamin/jamin-0.95.0.tar.gz"; + url = "mirror://sourceforge/jamin/jamin-${version}.tar.gz"; sha256 = "0g5v74cm0q3p3pzl6xmnp4rqayaymfli7c6z8s78h9rgd24fwbvn"; }; From 861d9d73416c3c76411cae9801d36721d4959338 Mon Sep 17 00:00:00 2001 From: Andreas Wiese Date: Tue, 13 Oct 2020 11:24:14 +0200 Subject: [PATCH 087/546] bpytop: 1.0.25 -> 1.0.42 --- pkgs/tools/system/bpytop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/bpytop/default.nix b/pkgs/tools/system/bpytop/default.nix index a4505360b5b..677a2459945 100644 --- a/pkgs/tools/system/bpytop/default.nix +++ b/pkgs/tools/system/bpytop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bpytop"; - version = "1.0.25"; + version = "1.0.42"; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - sha256 = "0sxwrckv2j1283h888pyyxply2g93x6jn6cghqh207igmcg4iaj3"; + sha256 = "04xbzczrd85icld7azvwzw785kmb2c2q22ly21pbi7d89wkys9kh"; }; buildInputs = [ makeWrapper ]; From bb6c9fbb3c5945cf14c9c9610a6ab0007d7d3dda Mon Sep 17 00:00:00 2001 From: JesusMtnez Date: Tue, 13 Oct 2020 11:49:20 +0200 Subject: [PATCH 088/546] joplin-desktop: 1.1.4 -> 1.2.6 --- pkgs/applications/misc/joplin-desktop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 8d161b1d4e4..be103f3543a 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "1.1.4"; + version = "1.2.6"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -16,8 +16,8 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; sha256 = { - x86_64-linux = "1jgmjwjl2y3nrywnwidpk6p31sypy3gjghmzzqkrgjpf77ccbssm"; - x86_64-darwin = "1v06k4qrk3n1ncgpmnqp4axmn7gvs3mgbvf8n6ldhgjhj3hq9day"; + x86_64-linux = "14svzfhszb0pnsajbydsic0rdc64zp6csqjp6k2p2i20jf0c0im6"; + x86_64-darwin = "1wdv8idnvn5567xdmsaa3f7skv48i9q6jqd4pgv8pz1zkhiqj0wi"; }.${system} or throwSystem; }; From b621f1b5410bf517c25e91e9c2b6b22e414aaa10 Mon Sep 17 00:00:00 2001 From: Evax Software Date: Tue, 13 Oct 2020 10:01:01 +0200 Subject: [PATCH 089/546] vuescan: init at 9.7 --- maintainers/maintainer-list.nix | 6 + .../applications/graphics/vuescan/default.nix | 107 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 115 insertions(+) create mode 100644 pkgs/applications/graphics/vuescan/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d11e0c0dba2..7d7d719f528 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2729,6 +2729,12 @@ githubId = 1847524; name = "Evan Stoll"; }; + evax = { + email = "nixos@evax.fr"; + github = "evax"; + githubId = 599997; + name = "evax"; + }; evck = { email = "eric@evenchick.com"; github = "ericevenchick"; diff --git a/pkgs/applications/graphics/vuescan/default.nix b/pkgs/applications/graphics/vuescan/default.nix new file mode 100644 index 00000000000..142e8f0b69f --- /dev/null +++ b/pkgs/applications/graphics/vuescan/default.nix @@ -0,0 +1,107 @@ +{ stdenv +, fetchurl +, gnutar +, autoPatchelfHook +, glibc +, gtk2 +, xorg +, libgudev +, undmg +}: + +let + inherit (stdenv.hostPlatform) system; + throwSystem = throw "Unsupported system: ${system}"; + + pname = "vuescan"; + + # Minor versions are released using the same file name + version = "9.7"; + versionString = builtins.replaceStrings ["."] [""] version; + + src = let + base = "https://www.hamrick.com/files/"; + in { + x86_64-darwin = fetchurl { + url = "${base}/vuex64${versionString}.dmg"; + sha256 = "045ihd2pj0zmzjfwn2qmv5114yvs9vf6mw6sf4x3hwcdmpk40sfh"; + }; + i686-darwin = fetchurl { + url = "${base}/vuex32${versionString}.dmg"; + sha256 = "0nny1jm3s1nr7xm03mcy3zgxvslznnvc8a5gn93gjww6gwg9rcn6"; + }; + x86_64-linux = fetchurl { + url = "${base}/vuex64${versionString}.tgz"; + sha256 = "0jkj92w3y66dcxwq3kkg7vhqxljwf9dqs563xbkh1r7piyjfwycm"; + }; + i686-linux = fetchurl { + url = "${base}/vuex32${versionString}.tgz"; + sha256 = "03qac9c0sg21jwz91nzzwk3ml8byv06ay9wiq00dl62nmhs20r5m"; + }; + aarch64-linux = fetchurl { + url = "${base}/vuea64${versionString}.tgz"; + sha256 = "17viy7kcb78j0p3ik99psabmkgpwpmgvk96wjhn9aar48gpyr1wj"; + }; + armv6l-linux = fetchurl { + url = "${base}/vuea32${versionString}.tgz"; + sha256 = "0m7sp18bdf2l2yf3q3z6c3i0bm4mq2h4ndm6qfvyknip0h11gv7i"; + }; + }.${system} or throwSystem; + + meta = with stdenv.lib; { + description = "Scanner software supporting a wide range of devices"; + homepage = "https://hamrick.com/"; + license = licenses.unfree; + maintainers = with maintainers; [ evax ]; + platforms = [ + "x86_64-darwin" "i686-darwin" + "x86_64-linux" "i686-linux" + "aarch64-linux" "armv6l-linux" + ]; + }; + + linux = stdenv.mkDerivation rec { + inherit pname version src meta; + + # Stripping the binary breaks the license form + dontStrip = true; + + nativeBuildInputs = [ + gnutar + autoPatchelfHook + ]; + + buildInputs = [ + glibc + gtk2 + xorg.libSM + libgudev + ]; + + unpackPhase = '' + tar xfz $src + ''; + + installPhase = '' + install -m755 -D VueScan/vuescan $out/bin/vuescan + ''; + }; + + darwin = stdenv.mkDerivation { + inherit pname version src meta; + + nativeBuildInputs = [ undmg ]; + + sourceRoot = { + x86_64-darwin = "vuex64${versionString}.dmg"; + i686-darwin = "vuex32${versionString}.dmg"; + }.${system} or throwSystem; + + installPhase = '' + mkdir -p $out/Applications/VueScan.app + cp -R . $out/Applications/VueScan.app + ''; + }; +in if stdenv.isDarwin + then darwin + else linux diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23fffdf3591..6ab42b0ab13 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23888,6 +23888,8 @@ in inherit (gnome2) libgnomeui; }; + vuescan = callPackage ../applications/graphics/vuescan { }; + vim = callPackage ../applications/editors/vim { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; From ef2791a2c9ef7497935d8c2c9117da41c4a5f7cb Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 13 Oct 2020 13:36:10 +0200 Subject: [PATCH 090/546] mamba: 1.5 -> 1.6 --- pkgs/applications/audio/mamba/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/mamba/default.nix b/pkgs/applications/audio/mamba/default.nix index 6229cb3a80d..23a94668ded 100644 --- a/pkgs/applications/audio/mamba/default.nix +++ b/pkgs/applications/audio/mamba/default.nix @@ -5,6 +5,7 @@ , fluidsynth , libX11 , libjack2 +, alsaLib , liblo , libsigcxx , libsmf @@ -12,18 +13,18 @@ stdenv.mkDerivation rec { pname = "mamba"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "brummer10"; repo = "Mamba"; rev = "v${version}"; - sha256 = "1l74ckqqrccgsdy430pfsbv4fbzny7zivx399bi2jk1lv06p4h9a"; + sha256 = "02w47347cbfqxybh908ww5ifd9jcns8v0msycq59y9q7x0a2h6fh"; fetchSubmodules = true; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ cairo fluidsynth libX11 libjack2 liblo libsigcxx libsmf ]; + buildInputs = [ cairo fluidsynth libX11 libjack2 alsaLib liblo libsigcxx libsmf ]; makeFlags = [ "PREFIX=$(out)" ]; From 52dcd5b211e434a7fa032e82ab09c6c73a980a3a Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 13 Oct 2020 21:13:22 +0900 Subject: [PATCH 091/546] flashplayer: 32.0.0.433 -> 32.0.0.445 --- .../networking/browsers/chromium/plugins.nix | 4 ++-- .../browsers/mozilla-plugins/flashplayer/default.nix | 10 +++++----- .../mozilla-plugins/flashplayer/standalone.nix | 6 +++--- .../networking/browsers/ungoogled-chromium/plugins.nix | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 530a4c8a4ae..c725f87d3a2 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -44,11 +44,11 @@ let flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; - version = "32.0.0.433"; + version = "32.0.0.445"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "1wfwnmai6wnwi6cfxwqix6n471jjyl6nc7p67sa7cfqwg16b53kx"; + sha256 = "1r9vd210d2qp501q40pjx60mzah08rg0f8jk5rpp52ddajwggalv"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 247b2457b5a..3affcba863c 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -74,7 +74,7 @@ let in stdenv.mkDerivation rec { pname = "flashplayer"; - version = "32.0.0.433"; + version = "32.0.0.445"; src = fetchurl { url = @@ -85,14 +85,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "18hr026743swpdjjk7cg3hnpw2ws3q246xnkb326lyvv90wqlfni" + "0jn1g8k8fkikhi0xlcsx5a43lxrj6ynwbxn55b17wacsqw20b9ii" else - "1yhyirii6rmnk420imaa160r9akarb3jrrlyas5a8d2y65gya71g" + "104af8sy0qq45agg3lpjwn1cp8lhpcjiim6gqn4cymcfp8d7ngg0" else if arch == "x86_64" then - "0k80i98zkpf6r46y1aw2zg1dsgbirg6rc8q21vycpvln395jq0pf" + "1dd52nhnl3f1d7r82gq28scna5qr39gpfqkgrhzd6cxd2vnhnhjn" else - "1qw6hjwv9y7qr333k4nlpd7fwyzbsk833sx2slfgjfhsbipr7p3r"; + "09ayb637cyf5x06xmhvad2znss7ak7r4n8z3wq7qmn0pmjdsa5a3"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 996d298df58..75c97cdd341 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { pname = "flashplayer-standalone"; - version = "32.0.0.433"; + version = "32.0.0.445"; src = fetchurl { url = @@ -60,9 +60,9 @@ stdenv.mkDerivation { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "1ys523wwhvj96jph435lnyp07qzg9f70j349l7ggwgg96rflalpf" + "0iqmdd222mjsf3rdbcm4z974i5q9y4i5agnhn039k0hpydi4zdcr" else - "1ycw2amis7yvidc6q87gls6rb305p89pr7mhzknc10v0nh34781m"; + "07vz17zhwh31phccpbmwgfa3fdb2f7bnc3sf66ipsw1xcqgncpsx"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix index 530a4c8a4ae..c725f87d3a2 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix @@ -44,11 +44,11 @@ let flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; - version = "32.0.0.433"; + version = "32.0.0.445"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "1wfwnmai6wnwi6cfxwqix6n471jjyl6nc7p67sa7cfqwg16b53kx"; + sha256 = "1r9vd210d2qp501q40pjx60mzah08rg0f8jk5rpp52ddajwggalv"; stripRoot = false; }; From 0c32ddda71f3fbbbeb3fd87b09cdc91bb9b5c201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 13 Oct 2020 09:27:00 -0300 Subject: [PATCH 092/546] arc-theme: 20200819 -> 20201013 --- pkgs/data/themes/arc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index 66be070bdf4..317b5d87cba 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "arc-theme"; - version = "20200819"; + version = "20201013"; src = fetchFromGitHub { owner = "jnsh"; repo = pname; rev = version; - sha256 = "1l5sc4r5jp3526r4p32fszny0cw6pkb45cp424hq0s0k344z9px6"; + sha256 = "1x2l1mwjx68dwf3jb1i90c1q8nqsl1wf2zggcn8im6590k5yv39s"; }; nativeBuildInputs = [ From b31577aea8ecb0a3a39cc1b01d39622403dee3cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 13 Oct 2020 09:27:35 -0300 Subject: [PATCH 093/546] arc-theme: use pkg-config instead of the alias pkgconfig --- pkgs/data/themes/arc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index 317b5d87cba..79812a217ff 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , sassc , autoreconfHook -, pkgconfig +, pkg-config , gtk3 , gnome3 , gtk-engine-murrine @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config sassc optipng inkscape From 71db2669e83dfb53bd1d77ba8404a1f1a9c249c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 13 Oct 2020 09:33:15 -0300 Subject: [PATCH 094/546] arc-theme: fix license --- pkgs/data/themes/arc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index 79812a217ff..bbbfbe7fe5c 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Flat theme with transparent elements for GTK 3, GTK 2 and Gnome Shell"; homepage = "https://github.com/jnsh/arc-theme"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ simonvandel romildo ]; }; From 70f033e97beb2d3b254781f4e54cb9aaa396d842 Mon Sep 17 00:00:00 2001 From: eyjhb Date: Tue, 13 Oct 2020 14:36:37 +0200 Subject: [PATCH 095/546] imgur-screenshot: 1.7.4 -> 2.0.0 --- pkgs/tools/graphics/imgur-screenshot/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/pkgs/tools/graphics/imgur-screenshot/default.nix index c994ee02811..1a211ebd857 100644 --- a/pkgs/tools/graphics/imgur-screenshot/default.nix +++ b/pkgs/tools/graphics/imgur-screenshot/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchFromGitHub, makeWrapper, curl, gnugrep, libnotify, scrot, which, xclip }: +{ stdenv, fetchFromGitHub, makeWrapper, curl, jq, gnugrep, libnotify, scrot, which, xclip }: -let deps = stdenv.lib.makeBinPath [ curl gnugrep libnotify scrot which xclip ]; +let deps = stdenv.lib.makeBinPath [ curl jq gnugrep libnotify scrot which xclip ]; in stdenv.mkDerivation rec { - version = "1.7.4"; + version = "2.0.0"; pname = "imgur-screenshot"; src = fetchFromGitHub { owner = "jomo"; repo = "imgur-screenshot"; rev = "v${version}"; - sha256 = "1bhi9sk8v7szh2fj13qwvdwzy5dw2w4kml86sy1ns1rn0xin0cgr"; + sha256 = "0fkhvfraijbrw806pgij41bn1hc3r7l7l3snkicmshxj83lmsd5k"; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' - install -Dm755 imgur-screenshot.sh $out/bin/imgur-screenshot + install -Dm755 imgur-screenshot $out/bin/imgur-screenshot wrapProgram $out/bin/imgur-screenshot --prefix PATH ':' ${deps} ''; From 05b955a133dfdc639dcd163376a1e8562ec49236 Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 13 Oct 2020 03:12:54 +0900 Subject: [PATCH 096/546] firefox: 81.0 -> 81.0.2 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index daed3c150b6..7213443a541 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "81.0"; + ffversion = "81.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "1dnxn754vb99mccqrj3wr3pg2scjy42rvs5xc6bw022gh6n8kgipx9pbkapwfivkglynxmmbw1k11ak34zhr1g6p31m3550ad6azq19"; + sha512 = "1szsj7rwpn7ggiavvnc38a75ip0r3p5bgr2kvy2hq7519abzmr3z49jg4alpsy1ndkfylvh28zjw9h5xys0bvs40f33ps90j60z8gla"; }; patches = [ From 68a9d42e0dfe109db7fd708eebb608ab5904c9ba Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 13 Oct 2020 22:15:12 +0900 Subject: [PATCH 097/546] firefox-bin: 81.0 -> 81.0.2 --- .../browsers/firefox-bin/release_sources.nix | 770 +++++++++--------- 1 file changed, 385 insertions(+), 385 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 403ef9bea1f..57d1b54937e 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "81.0"; + version = "81.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ach/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ach/firefox-81.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "7ff2b7ec6f3f55fccfb7988d7a42bc9cbe572af6edc64ac9b42ea15aaed9cd4c"; + sha256 = "2027512d879c1606c68adc4705936273ae7416125e0da24e31fb6381884c8bc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/af/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/af/firefox-81.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "c1a29b1473583d28f87c764c8ccf67f7cba874fd85e5820f968230c9ce29670b"; + sha256 = "17afbd113ef486b0d584cdf40dfa602a0a489e6674e9e326b311f8adc0537951"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/an/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/an/firefox-81.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "bddab1deeaf3c6474586beb41ad9c720ed6e84f9e999a856b17bb4e7c9d97991"; + sha256 = "d3d6217063881911fb42aaceae4faf51c0a7d5fdad1c79c97238bb05a1498d25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ar/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ar/firefox-81.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "3c4e339627fc94df273ba7e1e1c150188033331def09678b2e0abb54e52f2120"; + sha256 = "d47411a35c37b4ade51e83b5e222b6b8e776fc1b7c4be025310a8fc34ce9c357"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ast/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ast/firefox-81.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "e421c32fefef657287ad52dc11f2f3166e549ef9d54065099f84e5f35c8a52af"; + sha256 = "43ab6cc595bdb0d821c0a94c5e7d099f7be598c98dc96b1a3b5df5e7403ef7a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/az/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/az/firefox-81.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "e1099ab7b028d8124446a21056e55dc4b87d1f20972dea60125347b1b099e35d"; + sha256 = "b326bf5956c540bbfd6e03498cde99462b04a5833b56b9246fdfa48b49737056"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/be/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/be/firefox-81.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "a216a2cd652905d946aff1cb3a0fc8738a1e3d5746d080dd863d34be244a2a50"; + sha256 = "6bcb3e79504c685a440768eae2b07cdd5c6bae488c272e5990229ad942eb56dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/bg/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/bg/firefox-81.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "68a8a4ec3d0c1fb8a174a7466abbfb6c806bb8a263ab852b15dfdd15c35487aa"; + sha256 = "9182efef254942eb23ed1d5eb18babd6ea10f3c7998307e4f86847bce6141088"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/bn/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/bn/firefox-81.0.2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "3eaae9060b690391cbc63aacdb1d833b2895c7aaf6da36c32cb117e7994d94d2"; + sha256 = "a1619499d5d994dfc23af432a68722230a7342a06af35fa1af14ac441134a8ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/br/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/br/firefox-81.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "806b366419eb6edab57c8f3af9f0465d3547e3e28047983af7cb2f08ad822a8d"; + sha256 = "ee6efdf5347fee8faaf007b13d442cd848b23d14ddfff0d089d4ac47b679aba9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/bs/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/bs/firefox-81.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "025a79c350f35f8bba1a5fdd894d0eb237d22be8ee5825e6a657f18b0c99bd87"; + sha256 = "08f44244b8d29551af6ac20b8b3e046ea39d3f0bd69a43533e8c4779488fcb86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ca-valencia/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ca-valencia/firefox-81.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "806f26efe0a6317cb5dd1b631f8b96bceeaa6e8fced624d15ac334d0d2d78dc8"; + sha256 = "b6c44812577fc2f295732aaf33ebb68f3b588bec85fe9d54310bebb80ae821e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ca/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ca/firefox-81.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "dfa651a556e024d2d27a27d97eec87750d8f4e692345a0f4e12c7a3480ac1d20"; + sha256 = "6ef86ef2e82bb3ff74b68239681b804fdb8f5f3e89894b9e0860973d7cc85ea8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/cak/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/cak/firefox-81.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "7225d8cf7a529d8688aa7386fe14e50e4e208d55732523d5407690f63b6ab775"; + sha256 = "b468e0390aac3751a25cb8d2d130242a39e58c50dcdac2e8eb61e5a421d15bf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/cs/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/cs/firefox-81.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "17d22031176a4604d498743eea242fe257c74620ac8ab88f8f197d57f8615663"; + sha256 = "7d8a3069e54914cf46b990377a0b192969aadfd214e9fd01e0d6bad711b4ea03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/cy/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/cy/firefox-81.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "82581e54dc72e188a5d4976bed58bcb8ba4153e72854fc439d3a903a5f60e6e9"; + sha256 = "c0b8ccb2471594187ef865cea477c364299314672dbd332f795044e988545c52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/da/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/da/firefox-81.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "87a600d73b3fb74ff8aaf26e1d915afa52692501ce67f13e308a7c9af63e6853"; + sha256 = "c7620a8177276045ddaecd4ee6223ce06f8dea52f6a1f530c3e69d8d90e2a794"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/de/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/de/firefox-81.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "a15fdfafe598fe5e2d5c5854755e316844518eb1b4634aad6cbe99fefc3e5986"; + sha256 = "6ef5723267a6e5668b49111756b6b3f1435f765c4a69fe84e5e5a9a91160188c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/dsb/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/dsb/firefox-81.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "abb71f8df0de953ab2c27e50c9b49a69c012fbe52a0d6eb66744b03754d494ba"; + sha256 = "d92e94a8a8a9b91b273b1be46690b9bf1100d05dc66be4a7148bcd1561079ffe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/el/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/el/firefox-81.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "ed3782c6e619f9e0e59b2eb1f36e5c94a92e2f7b617b2ef87e0a2da0c4e65032"; + sha256 = "5db2868fde7014b576f77afe3a2a003bc877ef1cb223f152f6a938e56e1d56c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/en-CA/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/en-CA/firefox-81.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "5c5ae0e8345f13c346e2b756a57f465776e8d5a1ea62dd00dc6fe5a3b7c904fc"; + sha256 = "38d64b0a790ce2d8b64ea2b4a4968010c265fbf138ab22e78abb332204b78808"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/en-GB/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/en-GB/firefox-81.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "3ed2a11824c00fd157b9b3d02dcde95ae8347b6add687f4bbc3284601360c1a2"; + sha256 = "a87201313bcf05887515ef8895fdf12824be3f60202e33cd033da4e68f3f88be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/en-US/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/en-US/firefox-81.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "689d75035303b47266a3819e8aa3bb9026559b819aec2f6e95faa67b86888ce0"; + sha256 = "fbe58e217adf35f454684658321c3d49287ba9161308615e0e76e479d60ac176"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/eo/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/eo/firefox-81.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "cbebf5a97e5b2fb58c187553c8fcfd6474dae4a911c97cd8730977b8bee6c6cc"; + sha256 = "f8dad4e491ed00e28fb2a923e0e8507e16eceb8ae111661e73ba59625d292c12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/es-AR/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/es-AR/firefox-81.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "e664214c7b2809919b672426c5d35e467eadf69fcbf43d20e00f379e5ab6f558"; + sha256 = "e34f82a15a91d2aa1f70eb7b2792fcb4eb31fa86c320aeab906b3a80b93822df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/es-CL/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/es-CL/firefox-81.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "10b07cafb315ef4497d9b2caaac0a83c86701506adab2f0e154a7873f39b3066"; + sha256 = "a2edffed71f6fc8c6ddb4064db344b8f0f913f4aa9ee7533eb9b3632179c24ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/es-ES/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/es-ES/firefox-81.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "aeb7d0af26b7fa4be27eb0b82da4051ab57ee1406eb20d3b5d12ec5d32d0104b"; + sha256 = "590014aa1950faa1ce3a56ce1bd3e3ea3debbe9c7fce54ac3ae58065a90442b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/es-MX/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/es-MX/firefox-81.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "c515c089afe6e4ef46df7ace24260118ed464a62146f59cce064ca465bb7affe"; + sha256 = "8cc10d2ac6f11c4b23a1645d4f17be6b756278e8c488c227bb112d33659115a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/et/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/et/firefox-81.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "930c174be085acb50b18b4ee5b20b158c9a790ca19232cc25a1e34628a7b4346"; + sha256 = "802ee1e69296b55021fd061f626aca173adb2db01b488911ac1faf7dd54b6ccb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/eu/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/eu/firefox-81.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "2f0e39cece971b12f6f5c325277e77e5a3f053ab57cdc2a2905d9f7f3e739fe8"; + sha256 = "90c201828df686d66a0450a44d4b85f6da2d09b56c7a51272b4e6708d6cc01c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/fa/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/fa/firefox-81.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "98029d664de21403cb54276a30d650a124e5b5250939c7e315a0435ebcc2bf26"; + sha256 = "d4bab27a1f97cc51f43ea990e215cefc360a4af4dc47e95c109817d98d44b8f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ff/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ff/firefox-81.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "097747294c73df707c7652c239330c106c69f77868fad65d490d1b896f90e689"; + sha256 = "64b0dedb6508f5e3d30534a0a3c626d85de2dd261a8a9dda9408dac5d127e63a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/fi/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/fi/firefox-81.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "c915afc5e73f837e1e09ac0d14510271602ef5527ebf270b399be880c183b5a5"; + sha256 = "48052f288e1416b7e144cbe75f5a1b082410476223d8e786b82a0b97775622d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/fr/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/fr/firefox-81.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "775fee38f2033be70e4d68d985602bce3df69f9106d1c427a06b3f8233e7c30f"; + sha256 = "0113b83bdfc3524e492f42ff8b07f3f8c9c2c195b876f5fb4f085de19e9a74eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/fy-NL/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/fy-NL/firefox-81.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "49efc463dfe6b7b7a8dc0bf351cc903160bef3e1886c8faee6f11cca3abd3e90"; + sha256 = "eb18e773b946808e72b0608d6907b4b98abd6daafeed39d7e156f3252f53724b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ga-IE/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ga-IE/firefox-81.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "6dcf0be88e5fad96c79ccd4b6a612d721b792099d9f1bc029ff5b592c4004922"; + sha256 = "4bf3dfc73fd8d62f2b9d56bf14695103498df2979f35b4fa6d41f98b5d447529"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/gd/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/gd/firefox-81.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "924d9190a1d5dc85abcb1f23aacffb98c0116c5cbd430ec04c5275317639772e"; + sha256 = "c91b4c60e138fe63da554959d025b0aa593c09bdcb3e88fd55790016fd54bbf8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/gl/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/gl/firefox-81.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "256c1b81294bc262770c655e2fdb5e36684286f4eb1857d6d38b87beba2b3d3d"; + sha256 = "540131786aa643a3e23021df03d67457793a43d8c03a3e27eb082736975b1277"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/gn/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/gn/firefox-81.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "2d9d55f4755f372e18a7d07786d64f09a4b4f76e6a80d8904e06188bc6edff41"; + sha256 = "4d9de3289b2135a37fa2dfa456263ba5da657207ff188812c08161af0af9c13c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/gu-IN/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/gu-IN/firefox-81.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "86a64d446efcaa014fbbb05787223a025d99947ae4aa8e704661f1236c08bbcd"; + sha256 = "57ede429790fad8bfa2898e432534b87e60add0303efe5bd903aefdf9234d1a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/he/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/he/firefox-81.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "64b1fcd9c454d1248eb1f2d02877f964e50dce38ffbdd93ca4c367246121eed2"; + sha256 = "7c8bf0cf1aadb37683b8da0cfb7f7e70729837daec5276dba5a2aa0fc4ce32b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/hi-IN/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/hi-IN/firefox-81.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "5d5f52e34c735df3ec5571e03e834919001fe3417a4190515f86f1e479690ace"; + sha256 = "9485b287fcfc2253b0caa052566f56f16b25cc2c9e425e679236c5d60c73a037"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/hr/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/hr/firefox-81.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "e6085effe2607a416e80a310ace23381fcdd752bba8e58ad7611f05885e01e11"; + sha256 = "414b5d06a4477f35719f91e8a987298dbe01127b4deb1563ecad894d64cf312a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/hsb/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/hsb/firefox-81.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "6a35c1657d78cfa843a24bea346fd98aeae041fdeb65297693f89b012f0c3786"; + sha256 = "9c2d4430888b79365069371792904eca41304e1ddcb933c27f7a0e65791f97b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/hu/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/hu/firefox-81.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "3717f43d3d771cbf4dee43889e0bfac3eb60dff8989c06496cbf14ace5753ca3"; + sha256 = "1d71a42ed1b367fbfa2a055dd0c92d87851a82099f6238829425d4804a9dfd12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/hy-AM/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/hy-AM/firefox-81.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c376e1f35c8067b41415175bcb597c331b5f5352d4262f5a38d08296a307343d"; + sha256 = "05502981476151c5d3ee598d983e6256b9ff1cd6a6485c98f3e35916ebe5c7f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ia/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ia/firefox-81.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "99e0aafd820a965cd85fe9094b7465d700f8e62cbba86ef9746a44445e5bba2d"; + sha256 = "7dc8287a954368e4c1e210ebc73ea1a76655112e2eb574782a8e9d64e8282656"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/id/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/id/firefox-81.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "ada432c2d6a04fe928416980b0f3575e2a42668c7298f68c32071ae2c4f5bb8d"; + sha256 = "c598207fe42804f6fe91390773622478f4a1f7b5aca97024d30e4125600d28d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/is/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/is/firefox-81.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "df304bee0b2235222c97e49e0ad8bc0e3fe1cbe3ec0ffbf1b996902a6817d863"; + sha256 = "19cc1e787f2d04661c93cd70631e450bf47882132aa2faeb8a976b41742351df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/it/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/it/firefox-81.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "8c35e143b73d3019b284a006501f93aa2550b32688d7d3285e56f92703df959d"; + sha256 = "0aae5bedd2b9c1d3466102c9430ea9539c25488d762927b4dce567806add95c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ja/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ja/firefox-81.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "39c23321100cee799e7024ac27d547a6cd7672485f07125d02c75dcd8e38f268"; + sha256 = "569062d4b226d31bf241ebaa54713f0b1fa6d79bf8f386f6a2484b30d6e75516"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ka/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ka/firefox-81.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "b40137c85d1783ee9a8a11fbd72e33bb9a2d3baa4bc2cc9f31a0c0bf020c2233"; + sha256 = "86b364cdb8369746dea055f199c61a673f2e87ed64b3b93d41aa1fa5e1f31ef9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/kab/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/kab/firefox-81.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "61dab84674aef3fd91db859900de4709744816f621fecdb3df46a63f4426289b"; + sha256 = "9d493ef56f9cb7ba6c3b92c255351eefb77744733bae0b09434bee06078802f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/kk/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/kk/firefox-81.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "a9e8e32cd7441a4b78c5c7b9ea7943c756f5b362a9e6a9028e20dfcb461bb056"; + sha256 = "7a2b9e691cd72b6079c08e35f8b8c01f505e1a7907b92fc0aa1d282987efa0c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/km/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/km/firefox-81.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "f003c7a5eab166f29c37aaaf2c5cc4669d90fff33854d43e157130f606011820"; + sha256 = "62e7f5edbe74712387a591bb89e1e0244beb70e4e00bcc8fc661ef11c48cbdc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/kn/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/kn/firefox-81.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "f23a998f16c3a93c210b7f08337bb3e739311ada223e85ac4599819b89bf7110"; + sha256 = "8b17779e67706e4284d8417124e2c05aad6b5f1a27db671aabcfaaddc644b141"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ko/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ko/firefox-81.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "b6748a4a86fe9864a3378e32357c0fbc542846308ae8ac8005460d40f4f869b9"; + sha256 = "f63b5fd71b0808d21f344c67d7b7967d1b952f2530dd4c98e522ae85abbbe724"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/lij/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/lij/firefox-81.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "267633fa63849ae002ebffd892ea3f520d59bace0a7dafe1f92dcbbfcaa7cf00"; + sha256 = "ff791a959cc134be0a1d9d3c6e275610fe21e4e83fd0d4bfc0629569aa4f235a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/lt/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/lt/firefox-81.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "a985da29e6d91efed407bc9d898e8bd8f68d42cd4673b6ea163b99d8bb9cd642"; + sha256 = "fab08be7d08b6cb42a81743da797d7f89c6c6f7977c2140bd332c836ed83c78d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/lv/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/lv/firefox-81.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "05a05361cd3b5772c30c2a8cef03e8753311245caea3ee94e03fbb3b5b6ae9ed"; + sha256 = "2872affb0559ff68f1755b025da984e2b1edafed0a081a2f2aaebeb42a98394e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/mk/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/mk/firefox-81.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "0433579dfaa3dff715129cc45e72d83f93b7dc3a928b65744dece0a5b5687916"; + sha256 = "5515928977539457db6a0e619486eaec66866b3b5bdd92731e7df2671cbcf437"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/mr/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/mr/firefox-81.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "38177842df2df76fda10791eaa518d30b92f03016705eb555630fa356992416f"; + sha256 = "67de1cae2a3238a2ba62bb0186abaa866b138274f5a6ece030c0f94a2c33110f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ms/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ms/firefox-81.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "34b724fc82f330d897b1073fd4383f5fbfaec9d312cc7991f395d37d98416da1"; + sha256 = "33437a4835939be05d051a5403b5496abcd8dea764db4d1ade11b2451aed8524"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/my/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/my/firefox-81.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "a527914488954bdf8aea31a6ab406791cc723b88c11a5a27f161aef970e00d6b"; + sha256 = "ec709e861cf45bbacdd9a69df2b5a22b4c4653969539b5359befa4073212a504"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/nb-NO/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/nb-NO/firefox-81.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "ccfa39917b8b0c2704a011bd41b0cfe4e890b0c1bc14bbbf641b7add2bf0750b"; + sha256 = "af41f350b8442f3618fdfb997ea40482f6a5d4b6e0c4cf59e397d37f52f3df0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ne-NP/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ne-NP/firefox-81.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "a3deb02b843fa9ff7a12590ad86195a9deb1be1eae055b493c34614fb361edf9"; + sha256 = "49b42f070ef75a92583a2b74d8bedfd1fd3bdb721f0330504cf1d3e3a1e06ec2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/nl/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/nl/firefox-81.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "864ab1ee8d70e0968570fabc1e110bd97c86d27ce5d8106a70a31c6843e16db3"; + sha256 = "356fde435cf8c114ef3d5bb16a5e24123d7898bb1de1539ef38d589ac9292489"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/nn-NO/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/nn-NO/firefox-81.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "46d109379dba5dd3e5c9c413e54ff2578117960ac3c85ca937b48baf08bcdb76"; + sha256 = "c6f403be62dcd65eac4b26349ed8bf4b44e5b43b1d6cd82b15fc327a85c5b18e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/oc/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/oc/firefox-81.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "71638cc84a7eccb4a563b7640c84557bc203cbb91114e433e1400554a16b2c1d"; + sha256 = "d6200285fcb916467b1b05e85e595dfa5e94f0f0a20d71824ecefdf12b215790"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/pa-IN/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/pa-IN/firefox-81.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "8fb76633497115f927ce2be5064f6c6bb70d552c53491ccd6558df163941ef52"; + sha256 = "7e22a7d4815012a58de31322a532205d0d8276629a3ffa5d8d2066ef3ca2ef64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/pl/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/pl/firefox-81.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "e6d38535433cc0a0c4aa07ab9aa33bad4d019041d4a2b30ccfc5553a10579a8e"; + sha256 = "35385afc9b365042b498bb30ff330a8ff5556f8cc3c0195f485022f9306cdc8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/pt-BR/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/pt-BR/firefox-81.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "399ef81afd3b05dbcb43553cdd36a2fd95e681296a21e7476cfa0c64c0c13ae4"; + sha256 = "ad117ed17bee468026d03bc0311ca8298f62f94eaa7a15f1dea58d9cac16f439"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/pt-PT/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/pt-PT/firefox-81.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "d6d87228f6a46237583ad8520c6758fd53d778e1905d019978a8da5fe0819cfc"; + sha256 = "8f609c2fe5ffda723275405a938ab8329b30ca33850246c9d2410db08af66b1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/rm/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/rm/firefox-81.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "46dd4f4ddc69d82964289463baf67c05eab92a4500ad17f691a06fa0ea72830e"; + sha256 = "8130961cacbb7c1139b978cafd29bf1f281a94284f37afb66243a0ee65622eaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ro/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ro/firefox-81.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "8720bf2abd57615d098360e7ddb384c0d570d4422f18d509c8b2b7759dd84550"; + sha256 = "8c4c45960a7ba85ae70f205f91035bab549ea5074f884477d7eb30ca8af5e4ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ru/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ru/firefox-81.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "6a8db970a3be16e8a0524c2bb576e4c368d33f8bd874ae201d000d112f86282f"; + sha256 = "1706cd12f77a650e7ea7ed6d377ca4e772ae3fb7330a81673a39731853ae0b1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/si/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/si/firefox-81.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "1ee0f867be47f5a7884577caf08778152d8ee08d8fd1b25440a69fe8bb0d1174"; + sha256 = "cd400af9646bbb08e54069f9748fbec82242c4f9ae973c974bc3499be76a7074"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/sk/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/sk/firefox-81.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "97bc401f7c3c48b62fb66b3b5ea759345641874a46eb001ec1570ce53b610764"; + sha256 = "6ecdf6b3b1ce634cd048452de8e5e6128cb3d474199dfbd5fe1f66a40825c05d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/sl/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/sl/firefox-81.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "5b5dbd25fc83048de4fdeaef13126701b01e070740345838c29b8aeba65934e6"; + sha256 = "a77a56f8b35ac4bfaf81ed9c3846ee392b4a9198b469320e9978fb5c1243db0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/son/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/son/firefox-81.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "99a2c222c6e14f511dda1f5cbbef2effd2aec7d169893024e25f2dc8f4900e39"; + sha256 = "0c04af05d6ec3f2423fc18a2315708a64db5e39008aa8f50c487b3e54193dbe5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/sq/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/sq/firefox-81.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "7ff0ec6837ed3536f73aacc8295b5439aa0e18cdd80f2882bf2b644f5e7a1637"; + sha256 = "479e7da75628821986e3840848a739666830fa37e692b53245bf164357a76528"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/sr/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/sr/firefox-81.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "274b86c7dbdffcd11453e8103feeaf6e98931c7224ca2336d231cf885c809f21"; + sha256 = "5a272d8ab250abc196c244af90e566039d7a351ce1b8503a8b69a6b804526544"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/sv-SE/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/sv-SE/firefox-81.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "0fc7edddf1a3aa812664e08e94cf5967c69a5f4821616400a8144c3bdda9860b"; + sha256 = "5c48c2eb6b737df23f16e761c2db7a344ef0898b05fc16ac73d9430a8d7b4350"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ta/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ta/firefox-81.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "20121341b05c91142bd8fb4a0a2195693e78a89691b02651f6d6c3ac9f848a4f"; + sha256 = "d54572f034c437c1fb3ea3148488574b32bb66e6cd0f0d83fdb0565c2876569c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/te/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/te/firefox-81.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "bc306272b6bd53e312dfab3f404f1f92199945be9f74e1d87d19b58e7ae2ee95"; + sha256 = "7672b53550f83100a247bfccd4905675e6572e5fc09fc9d3caa97998cc9ea65c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/th/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/th/firefox-81.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "52c8825f27f78624a81271a01c3b522cf6617030046a38734611ee741215658d"; + sha256 = "8c5cfbed931ac2777742f34563a873090d4dd14cd512641c2ae2d1acac440bef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/tl/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/tl/firefox-81.0.2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "c87f99419608a06d79bec67f54bafec6650dbcbed7fb52bda058bfe68d0ea102"; + sha256 = "1b1b5cc2e47bf3d5940f7ce16f732f449856a3b98ed728a655db6835ec8d1f31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/tr/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/tr/firefox-81.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "a030a15ce1424717b8fd0787f1a0d13ad8e050f0f5b4cd679d6c2686fe81e0c7"; + sha256 = "b71b7a3d25446cba4404d8310996e23f32c6801a60e9e427eac586e3ce09cff3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/trs/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/trs/firefox-81.0.2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "762f7e33307811f6ec18c198b4f524526a085828af2621885b276ecd8bac6dd9"; + sha256 = "b71df436eda4dd757de7b044b333fadfdbfeb180990c45fc3ad310c2a325f851"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/uk/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/uk/firefox-81.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "a698aa0d0599b97c7e9791547573d0afdc5e1bf0e5e644069752686d50644564"; + sha256 = "5fbea5aab96db69ebcc01040e86205bc212b7a0c8e539620001e2f95fdd4c060"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ur/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ur/firefox-81.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "7d1759bd2f0b746be76471ebc3c0da2fa224f4550a787e72ebe52b6356fb9370"; + sha256 = "de3de8a70d155283f68baaceda50309312a2737acdae1c306604203a587a047e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/uz/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/uz/firefox-81.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "51c21a2cf377633a46c35b2bf9096b97f5acab1bf7f8014122c96668d14c6d95"; + sha256 = "faf6887af27095f12e9927226cb1d82a76caac0d61a6515e96ee2e6a4cda54b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/vi/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/vi/firefox-81.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "e1f3cc7866b19e60b8c368b0633bb0603d7176a87ebc910fe4c4a7575a98be7c"; + sha256 = "010d1032acd48a36048ab1c90c854a1f617fd58b0e039fbcb510c13f9e8f6497"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/xh/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/xh/firefox-81.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "cce6577abd88d3b34ad3e83577bbb82b6df8754679fc4cdd8a34c9ec9d59acae"; + sha256 = "de6b89dd029b4636bb660cc0bb5f64dc6430f93e2321ea3fa8f6a309ca70b0da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/zh-CN/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/zh-CN/firefox-81.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "e042d66ae743d1889d6d8ce13ef3510644098efa0943d332656b7e361b976da3"; + sha256 = "a9d53780dc73f7bb435ed4d32d2322401fb6038756a0a0dcea5bbb1815c74cda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/zh-TW/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/zh-TW/firefox-81.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "07c6ac6268b54caefc44654bbc68d19dbe8e6e15fb768c921a8030e179ec8ef4"; + sha256 = "d7a24a82720421a691e3bbdd69353d3159b5e6f1b78d056802a19e1bff892096"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ach/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ach/firefox-81.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "bdd0995ca7d73be587ef1a9bd0395b869ec4f7f90a93ec854a5bbd1c18060ea0"; + sha256 = "92bcb64a683b40a136f62210c328f679b3d1a4672826121d60aada840721aa75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/af/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/af/firefox-81.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "f662391298377d8d7f38f90c31b90bf705e61b1c3df5e1a7ed7e6c705ac700e6"; + sha256 = "83d5bc7fcdd6ec58c62ed59a724e30ff0b1efa52efe2284b5fc4c81f94a95b4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/an/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/an/firefox-81.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "46ca1495a74861429af6cf33eb791738abcfb5fa29c23060c7b9d307fc6a1b5c"; + sha256 = "1a1164b4cd7a14475e3542940369cd3d539d006425f8ad2695245e8a5ac76f07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ar/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ar/firefox-81.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "1b781b56560f0bad0d67f155d68da1b5b759051434c76095c8ff884837595866"; + sha256 = "ae16a97f8372cfe86aadceeaf06a5ef89f6fec141e4490fc93201a63e139a372"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ast/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ast/firefox-81.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "eae1a5378babbeb88c6b000dc6500bfccbbe8337eeb32d7bfdc9bab67448d8ae"; + sha256 = "ff011971da1d18eaeeca9925ad10c30c82199cde00fc34904a058285ee8ec4fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/az/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/az/firefox-81.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "4ba58be6ffb171c843ac5d267e97bf8ad219b4d1058a96b18f08ac4dd83c6b0c"; + sha256 = "c858bc1382ba22fb8874f5e409c2571389f0f582df61c228791c0e4524fc2d9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/be/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/be/firefox-81.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "b7cbd330b3b261e8b57134c27a291348219105cbd8cc685917ccf8e03099f2e7"; + sha256 = "e6372d667659c032f27b5cedf4304b72cde1d56b90ca2f69cbf1871efe1b5053"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/bg/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/bg/firefox-81.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "e6354feae56c656365fc4604bf394c4038399ea3a7ee503fd38610e1525d6539"; + sha256 = "522be0fd41e182cacf8370ce55e3d4081ebe65b5697232bd37b0e3969d59ecf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/bn/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/bn/firefox-81.0.2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "280d01e9dbfb09a08264e36c01b5fecef97831fc2c9d99e2f5e0ed498bbf427a"; + sha256 = "a96512ca0ae0e850e4db268adfa89dff04b9ad4132e45d62cf2e479482c6ab74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/br/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/br/firefox-81.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "a223fec4d16418befd75ce455f470cdc831afcecb6fb4c36139fd2f7c2588337"; + sha256 = "4c2c91fa2b05d6c0fa8c123121654b4a860bfa3c14cbfe0c7a72437aaecd0a02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/bs/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/bs/firefox-81.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "ed7910663750af303d197ab3919f54d2a108ed691e016696e4c9a6254fe74003"; + sha256 = "02aa8954d864744069f99a434731b7d5b848657eb9ae3c88f7b7593896dc6a33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ca-valencia/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ca-valencia/firefox-81.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "19d4244b6711d3378835fd00715d7db17052de0345dd9b33b013169920f388c7"; + sha256 = "d29036dd836772f12b01bde9c9183455241951ecd37dbb1737a3a6a411329ec0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ca/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ca/firefox-81.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "bcfa0b1785d3aeec8e5ea25b472da288c3ebced8661a70c21db08741e9ed5c67"; + sha256 = "e0a79f1fffcc321dc5cc25df1eef7f2ec789b50ccdaf9abe2cfae45c4bfb1c28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/cak/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/cak/firefox-81.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "cbf0745604bd3f757851cb4772eaac212d16288c7279634d470610ea280b7884"; + sha256 = "49afbe55a259abccd5d90645d54b756033570b0db0e897b61a6bad096e173c5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/cs/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/cs/firefox-81.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "1e91a12e484a2a41d87de5e60c0b3f455f81669025ceaec0c7adbb447446c367"; + sha256 = "c24226556fab58ed16374fde899aae586e06fa8d258c68cd29100dd4febe406a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/cy/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/cy/firefox-81.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "c48491eadec23c78f071f4bedd23ac02235ef090375dd0bcb190e0b1d94fe94a"; + sha256 = "bbc097cbef8995f847988ca8d5280c10b8486a2622845b3df59c8bfcf6ad89fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/da/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/da/firefox-81.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "81a1fc46b7f92b2375edb20d3464c4d7facb493a07aa4471947f8b8b84cc3054"; + sha256 = "90d4acb222bc315ab5912ef5b084a9b90680eeff582efea5400805b7bd09b79f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/de/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/de/firefox-81.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "719db056506ca0b908d121cd3e7785b1d8739610c7728723e650ca35b99ce26f"; + sha256 = "a38be4018216205b8a6ddfdc3308803dc177bbfc70eb3564f32a379ba44174be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/dsb/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/dsb/firefox-81.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "1ef45291cecb8727951808d20df4469c1f0d731b0d3442283fa1f45f39c0e3c4"; + sha256 = "cfd51d887a50b857040d788c15155aff6b70ec7dfb587c7f57d6373d34ad85c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/el/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/el/firefox-81.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "b0cbd8c13a40116779b1dca51191fcc0a8b203327b568f8467f6864e4f5db9ad"; + sha256 = "3a612c94e13e1a3b374921faa1be57b1a61cb50dfc6437e4798615c6a4a80389"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/en-CA/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/en-CA/firefox-81.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "4e4e204fb9ed3ed167fb9e3a9af2727384d09e37f1d5262bba05e296a8cb4a16"; + sha256 = "4804e454ca39369d6d8d067a3eb3e3351aa5cf84742c1e9b76bb895cbcc516ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/en-GB/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/en-GB/firefox-81.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "7533f99bc58783e5779b4fbbfc77b96a6c04958c0e752d71b1f57387824faa74"; + sha256 = "273d14182a3b1e912977c002c9eaf760389f8b90bd08c538920fbf551e16d30b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/en-US/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/en-US/firefox-81.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "68bebc780f225d5694506c4cdc6a7c31c779d2f1feffa792e599f99d0b2e58cd"; + sha256 = "d12c5d96d5883a9f0dc0ecca65b771bdee61c4994366474d61228d7005d78365"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/eo/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/eo/firefox-81.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "ab08e50d0a5e5d6d02a8daf1c6a428ce9ae19b3a343bf0838739adc9a4170bb5"; + sha256 = "9169838db0397ec2d35d76ec7ab96bad4a6072dac5272ba13661ac2588ad6358"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/es-AR/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/es-AR/firefox-81.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "837f5cff13186af4f38c0c21410f20c57f28a3b5293ec986a449fdcb3358ddc6"; + sha256 = "a6d14c7062bb00b1aaf6d4118c07fa46d05b8bf39de914fdeaa5a6ce97c781fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/es-CL/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/es-CL/firefox-81.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "1f73cb2ab7eb1b7cd8198113941fc71c17972227365edfd5cad73680d30a9c6a"; + sha256 = "1927ed60ccadba49b0d7ec1a49f78b565249eb1c9ea3c89da88074fd8f16c685"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/es-ES/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/es-ES/firefox-81.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "1e95337b4607808c3c3b319343e253d575a07fbe48f7ae8d8346f92a3d9c70e0"; + sha256 = "f69768413a153852ce77cd71ad332598a6b63ba779d7fd19f1b4a5bbf9d6d390"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/es-MX/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/es-MX/firefox-81.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "cefb685c2da73fe485ff0817901a19c609a73befbb82fec151765e889e4c2d91"; + sha256 = "3beecb997cd5e37a7460c4a9c73ec398b14d249af43588ce00eebd9677575c3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/et/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/et/firefox-81.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "95dbe912beb0ee6196e3bbd169093388c22fb1ed0981a7827fee4bbdbb774316"; + sha256 = "ace910037d8aac53cb62c0a815ca63ae99c041fa33401b32190c483fdde4285c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/eu/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/eu/firefox-81.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "44047e7f01fb086c099db0ddda6e1d6641e33e038a4e658b3a57ce331ce61523"; + sha256 = "8dd80e914dab07934140847f0d28e6c3b2c42153843bac891a3d1fce977bcda1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/fa/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/fa/firefox-81.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "252f1e06b2faac3c3f94d1a1f9f52f566c84efffca8a3147c32ee6f109feaad2"; + sha256 = "5ff9612d84d88e53eb130baa87e31472f8c1dfd17fb9b5456dcd559f8449c256"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ff/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ff/firefox-81.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "1bd050b8d4840a17d12f042a27295b71a4a62ebdac4153ffec843230b1cc0b25"; + sha256 = "23cff8a74feead954a55111e7a09d43b33baea6b5c74625dd1a34986f7ecbb89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/fi/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/fi/firefox-81.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "6582223e393876a91ab0250c976b1aeac0559722b17e198e05925863e53d81d1"; + sha256 = "02bad588cc7b4d79e763f02e8cef17704d1137d94a22f2de61c7ae2b1f74b9d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/fr/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/fr/firefox-81.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "b96dc92220680f3c87d6c7cfe79f071382f8183856967133b6fcb6783a60ae6a"; + sha256 = "f33ee5fa5744b01ee7ea86645b3b70636cc3df1101572a5a7e19522df575ea70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/fy-NL/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/fy-NL/firefox-81.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "4a90cf75ab890ebef3517db701bcdd065e42c2fd8055121ea9b97897be299543"; + sha256 = "5b32c0bdd3d697f2d0b01d41cb235fb92a422c96e0f2fde1eec1879971a1f7ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ga-IE/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ga-IE/firefox-81.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "56491146a39eae10e9f8fb4ef1fe303a6bead300b680571427e6a410766d0069"; + sha256 = "bd9b2707e1f5ebcc299582e3ebf770dd5393a1c0e577bcb907d569ecde712ca6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/gd/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/gd/firefox-81.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "0d9f9ad6563e31fd0ead7ec35e594e033f7f1ad0b4c94f0a5cc01cf515fea5ab"; + sha256 = "c1c9a076dd1a92f13a099caf13682ec2ad120b8db9ea401bf45bf59d4a2e90f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/gl/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/gl/firefox-81.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "8100b774f3bb3a1c3551b9f2c4751ee9e184b04c61489652dbdc81b1fc0b6bcd"; + sha256 = "ecf0f9769e011b85c6b4e4d3e639a1e8fa0953eb7b9c8e86910047d23383dd6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/gn/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/gn/firefox-81.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "a0002b17f1133194c9f0a0b2b3c56c6ae0d4cd981d5325193a2c96d4b5ec78b2"; + sha256 = "ac05412736fa6067ad7c038f1721708eae224a4e1538ec4b8132cc647a32c91e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/gu-IN/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/gu-IN/firefox-81.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "6ef49394aec077569251eed4dc7631130be41991022672f477989f5202ac4d1e"; + sha256 = "885a2d79e09f74302a5312ef96420f35453340253e8e998ab37db1f6cef37921"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/he/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/he/firefox-81.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "07e11a9d1a4ef6e3c87e09227d070f75098697a89e057946bb71c1336429d9bb"; + sha256 = "0b5fdb4085809abd26687e265a7f0296c4ac9d77d7701741ff05055cca793946"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/hi-IN/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/hi-IN/firefox-81.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "39e6c7eab9945a7b9e8d500d8e0dfd416a7a915498683a4966732d8e09183e2c"; + sha256 = "d920fddfd6c92c190ae9625b6dc27decf6678d5083a9ffccb16eeadc918d42d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/hr/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/hr/firefox-81.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "8946ba5a92d73500cee5c379a796e18cf1b50fe0df4c1867040794850ba0df04"; + sha256 = "382eb132cc009b6616d1bd437b552cd138b9cc9f138c316166b032becd938cc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/hsb/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/hsb/firefox-81.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "9d87edfdb5498c16a279f0f262855c4e6f822760cf6d90281cf6c38e65c325f1"; + sha256 = "f33a2bd9be104af88cab4445f8767bbf507166135a3ce7b7d890ff0ab08bc4bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/hu/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/hu/firefox-81.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "9f515b6b8267b97efec1046c0c2329c5871337b95d7a3b4fdee310699c63b265"; + sha256 = "01163f584fcb6a30c736d0d7178760465444a2575ab0844613bc735828b29827"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/hy-AM/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/hy-AM/firefox-81.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "1de03462f87b629033b99bb014042d774a52404e279b625f20448809399af44d"; + sha256 = "56c1537bbcfef3d8ad97e0b7da1e1043e19970cfab7e07a885227ec49ba59dd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ia/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ia/firefox-81.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "fdcbf5cc522e20587cbac0b4979d77589532ba683ca811e27a7b499f37fe1841"; + sha256 = "dd883589df0819fc306357547cae94fd34c1ef7e9339fdd5376504c20974cf36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/id/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/id/firefox-81.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "e3cafaff6d65ca2da4513d27949b85b2fb8a1ab154d736e980df0ba8caf898be"; + sha256 = "ab9f57b1e501ddc8d5c4fe024cca69ce15f90b3229b9e76b75ee1cb7be8c5e90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/is/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/is/firefox-81.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "21fba4796f2ee43a3662c3f493879d4d656ec710e46369f6da92f757e24ee706"; + sha256 = "bde7a8f240f19a66cd7ccb26fce683e5c24311e9bb2fc41997a21b5ee5e7657f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/it/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/it/firefox-81.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "c8775280055d5b8eb251253e72465149da165b7295cb4c8f400a5286a16168bb"; + sha256 = "a87a6924935472bca4d64944e7a5fd3545051a5dc00fe7a5e0d6fb2a92c79500"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ja/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ja/firefox-81.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "8870d59360577f8247be0fa51ad33afcc7ebaa2b7d6c8cd5bc100199c5436399"; + sha256 = "871fe1476cf80f47725fc12a9bbd83dc9d13b7b4de87760c222053ba5a19f110"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ka/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ka/firefox-81.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "394edc1246d9cb08587a67069b27dfe3fb1a92f4ff4a58d314b55128c39d2bd9"; + sha256 = "bed625be2113058fff0584e90ea89121420e08da234a93c5b57cc652d262fab2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/kab/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/kab/firefox-81.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "e30a08d4427fe896b528beb93b08b1bdc96a38a0817739faa63cd15c2f3014b4"; + sha256 = "0b591ee502c5cf52099891727b22a8f356663e941db796884e91f821e4d7925e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/kk/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/kk/firefox-81.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "f1b807647ea9deaf7d44e9bfb56403b9a27205c19c3b9f07ba4cfa174b6532c1"; + sha256 = "dfbbe55d2e73cc42a83bcacaa35b83ffd2e2ff89cd26790e1b608e1980f8f7b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/km/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/km/firefox-81.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "650ad04c9b0c4d461ba28fab7e591453aaf75fe5bddce3c6b8993389814be589"; + sha256 = "f782024da8726a8869f34eb36d0a4a7401b9d9c2ec28a3c6906a9b21f4f32c3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/kn/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/kn/firefox-81.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "459ec332671ff0e51e110ebb0e8b10e67743fb4b717e5fa165b5dae80054ffe1"; + sha256 = "59276eaab00aea65992c316d258a68a3ff7bf6091fc3ab177b7e4f606b0bb78f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ko/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ko/firefox-81.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "266849f41f7aa820ba459740becfbbbcb4a551140bf8e76b1eaafc63a6f9d2da"; + sha256 = "b19e167a77285fcf700bf37d5299c0a9e925ec12b6e60d2810ea40acdbd025ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/lij/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/lij/firefox-81.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "b429ef6b085822fd3ea0fb14fd501a894b96a3f4af8fc34944fdc9ed1c82853b"; + sha256 = "5db02844a49ffe997b47ed5bbccc43d2ccc9a4b4840c2df5ddd1d393995b820a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/lt/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/lt/firefox-81.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "7b3c089719e901d12c8ad9153a582d229958db035badd4b94b5b496a2ab545d1"; + sha256 = "cd72be1796eb92d61eab18adf1825fd319c5960b503f6e7fcf67dbbe02cc8c14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/lv/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/lv/firefox-81.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "3efd9d52bc61076208cedef303396c066ec260f7aa5fcccec5b072f2935d89de"; + sha256 = "87f8d21918c1bf73940ee4ff095a454144421cbbdc78004677bd8d0b8b72c667"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/mk/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/mk/firefox-81.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "f0b1dd701cd7e068d938ec4771fba8f4c3f04e906f575e64dca1dee640fdce22"; + sha256 = "63a6f39666c18417b34b48109b5a618aca896f48c3538b03495f56bed3769d5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/mr/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/mr/firefox-81.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "bd5adc1fa68f82a9d2fa54b74b74bdc170f4ead9bed5a79ec1ebf1bd12781a07"; + sha256 = "7dd84ad66b3b35a9c492456195d438b4f2c242df11df1820fdc5ddb4ff4cd082"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ms/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ms/firefox-81.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "dd106a1944d8ac9e49df16b3c67a86010be1ee62e3a780ad9c725f2335779131"; + sha256 = "bfbd38c3cf2c611a7f7237bdf0a5a47bec27eb1e1ca160d5068e75c00a76180e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/my/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/my/firefox-81.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "86e45fb6f490ad0cd66564a36e40c6d23169d69d1875022027aed09a1cad3d50"; + sha256 = "b91368c19dea8b6d7b363e119d80254275a1d52b9e09519a04d65098e60a5258"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/nb-NO/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/nb-NO/firefox-81.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "ef6d5320470da9619f5668e13edae553038a53f80593b5d8392b3678dd8c1d5b"; + sha256 = "bc78d4ad99fb475d99e4cab0d6a8821c40ee830346db8ded300b69b8a1265e02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ne-NP/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ne-NP/firefox-81.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "8607d4c024fb1d71068b73fb528bfbe42ee69bb12f9703343deb6a7e340c29f2"; + sha256 = "607ec769d3454f4a4affc32d71105e7b8d900bdb7371a975760197e188d291dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/nl/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/nl/firefox-81.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "a3ea133034cd0014f34c186d9c2fafc902bd51b5314429bb9b7c06e77447fd22"; + sha256 = "4735ccd0cb2992d41fdd5e7280749db2027bb3d55b6aa9ebce2c1e9dc43af056"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/nn-NO/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/nn-NO/firefox-81.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "09bff657619d23af40014b2e3bc845e6901abee241dfd28f4b5ef8f90c211c30"; + sha256 = "e95f876e30ba2e97f1567b085c47a960463c7c07bf2921f3f463f8fbd7bb05d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/oc/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/oc/firefox-81.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "6eb63b7f50acf894e33fe9ea98c11b4133b7fb521e23e2fdd6bf9788570b4c78"; + sha256 = "730084b39df6915a98f5357973f7ceeca59761bcf29c909c6585f9199eb6191f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/pa-IN/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/pa-IN/firefox-81.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "df15da9ff35e192b587ffdaea4d47d368a054148061117bb8f4222e5da6c82a2"; + sha256 = "7d068491ecece10331c56b5679fe5de69bdb7acce62f4d3292271202804a354d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/pl/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/pl/firefox-81.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "b12bd00b3de180f77f80e80622a8631ff37c32b45362856a64122ad54abf07d2"; + sha256 = "ab6da3187d8f87cdb9ed42796ffb9d14c5d2710690694592c64e1eb249a995d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/pt-BR/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/pt-BR/firefox-81.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "0296501261b2c55e9acd14fff125f40f8a84fe0508004ea9fda03d2ff69f238c"; + sha256 = "34bed98380ea05205e5a83801004f694463bd505e400c596ff9183c89070b2fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/pt-PT/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/pt-PT/firefox-81.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "6a5a8328dcd10ad2da9bd45658bd43fca9ae58cc331546305594ce5d84f35017"; + sha256 = "d1bcf96d674d52828baf8452dc620aeeaa5c5ad04b8f26fa74da3a2dd6d778ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/rm/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/rm/firefox-81.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "41b5bd2e52f0d57475179c46c089ce36c3e1441b5751c670f6fbb6406853aab8"; + sha256 = "25796de47983159ba7f95847b66d6f382492f8b00f0e7bc16476712daada071f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ro/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ro/firefox-81.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "40a2e53b6b7dcdbd9380d3ede3e425178b670db2205b5a5066d0c4e93a3297c3"; + sha256 = "6a454aa97f70e4ec91755caad76fc4f21f13d66faf26190404cc2a2ef8b837a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ru/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ru/firefox-81.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "b8f7ecf4a5d8f034e57672d19254cda671f213ce04914995260f6b5f97181edc"; + sha256 = "2e1f6b8ea95b4a98d9880bdb1f61ccad792e4fe3517dd780a52c5eed5b72adad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/si/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/si/firefox-81.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "19d29defd33580089317b72bc6209749727a53978d48294950feba3226839135"; + sha256 = "c75763f6d6bca7f86be911039a9efd686d8fb011bfcccdac056e2a12243947f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/sk/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/sk/firefox-81.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "4e57b3bdba217d1550fa1ec847b825d66e2d5211d6d0f5342c50ccbab33bf464"; + sha256 = "0968c66cde907b5e61ce70b1dc1244687069dfde28921a9043d0ccd55182aca7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/sl/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/sl/firefox-81.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "cf89ee419f552622fb9eccf8a28c15f6647afd06de27af0635ab74bfd9aa9619"; + sha256 = "cc585166dbbf6baf0dbe2b9ceda53671738436c43d2af55a0672c37eb942add6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/son/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/son/firefox-81.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "64e7605b287432c38798e029ab2b02f136d7df876a9c8b3689ca603db0a736cc"; + sha256 = "911d5fe53e9aa4937f3a697ee1e57b53b87e1ed92a6231086653e03ffd864411"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/sq/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/sq/firefox-81.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "9b56875e2f5505f7fef3c41d4ed7fd8801df8e981f9c8f7cf665104a40e255ba"; + sha256 = "d7ba2423fc741867add3d76c5b13768f0415f001f8f947c664610c06cd7736b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/sr/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/sr/firefox-81.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "489a2d092f626f39a8e466c269486be8ae455d233e0e26d0c94953039668a57a"; + sha256 = "456e1cdc8d8c0a0fdf39730ff2a812f8bd7a2b61d94312494fadf1d4957bd593"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/sv-SE/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/sv-SE/firefox-81.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "9e45e9a0c79f9cb3c0c34fb2a26e608afb544716aa16843d53b3e6fd390e2685"; + sha256 = "040f71f4cf9ca2d01c1c0dfe4a44389f41da0e2a595a827fe88e36a0013cc979"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ta/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ta/firefox-81.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "2843290d4b90b057c6caa437514df0fa61a0cb901809c93690ac8247ff5b1233"; + sha256 = "488cf25e731096c5ee1458f11adbe0c4b3cf3a665437827f2b27d79e5ca805dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/te/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/te/firefox-81.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "fc9f7e9312fd1430cbbf0d92d8f001077d0af89ccef6c7edb3eff504772ddb79"; + sha256 = "c79f19c5c2ec4e48a257bb98d4121fd95f284f97f7af4212adbb2663964b1c53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/th/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/th/firefox-81.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "622105aa85a0a5874c62f62afd77ffcdb1f4b2d329c255c56c7154a4bbfcb481"; + sha256 = "4e27f5646e4d62ad70ebfc93a9603c3527ef570307ec4a8408f03bc9f72c662a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/tl/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/tl/firefox-81.0.2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "998b966b13dc0b1eaf9ffac1788cc354049c43834d3678b51e946f907e42bd9d"; + sha256 = "71c81c3b5f77364367aad6e004d4d455b01e7d3bbb21cd9c3e5fd7dfdb661f36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/tr/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/tr/firefox-81.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "3dacf51f059f7b974e18d0cf4437bba48a0cf246014ed8ec38d06e2e09cb76f6"; + sha256 = "3257a340958e658be49f4f2982e8feb8e932532a251e98b236406d370d873275"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/trs/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/trs/firefox-81.0.2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "e9ce3a2591c8a9b7c5cccc20c2b56ff47ff22947d2393f5e7b010f1242ba1982"; + sha256 = "914af864af7d51d31abdbec4a1112828d51ffd83ee6a39bbf9f5ec0223ae4ef9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/uk/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/uk/firefox-81.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "a8f78984d01fb54b7475e980aa5775fe7c298e1796cf603446e7cb9baa371bdc"; + sha256 = "7cff7f0f3d6b586c19d9370e78e6e0ab50a99af62b40de7a44318f5ca929db59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ur/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ur/firefox-81.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "0b56702343d7495b752246a9d03e4a5571be05394cebefd1ccd2ca822180259d"; + sha256 = "b1d17f6434fb7b44576c29e6d1b2c2b3944e27fc8b3aaecf9739c4a653ecd865"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/uz/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/uz/firefox-81.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "46a98ce354b40d64690c0aaf1c553b1d1e5ce51494291ff93ae0e54a82d897d4"; + sha256 = "3cdd2f764c88fe4a85bd32728f4ff47eb452e14c506f38f891added89fd45a0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/vi/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/vi/firefox-81.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "fcbaf1dbab64bbc8983d444b1601721591c164bb8ff50ae09d2b7925fa41185a"; + sha256 = "ce2a5cac99bb86adc793ac6c980432a3c1c1bd6150df856088b0cc49cd8b618c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xh/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/xh/firefox-81.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "af8ff1f66472bbe39724ca714993246f02b0e9025b537ac7e52e65be29db4534"; + sha256 = "a943db84bba8823112738999cb31dafd20d076de62bc44ac9e2b8f2a793ab283"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/zh-CN/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/zh-CN/firefox-81.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "147a51431333da2333e4ecb0b307d4c74b3d66a626340b6bc25ded8c22c1acf5"; + sha256 = "23a2662b2844e45cacb038f8fcc1a2647d1b03df6d7ff346c8600c08f6772dcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/zh-TW/firefox-81.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/zh-TW/firefox-81.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "e8d577aca0ac90285e9db278c2fc9eec1318407b830e4c231082b139320a4216"; + sha256 = "dfb5d0725fe50346dc551c407d38574a696e8f10373de73d47252ec283d1b256"; } ]; } From 560cc80818be1897ac533b5a3babcd071499e226 Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 13 Oct 2020 22:15:43 +0900 Subject: [PATCH 098/546] firefox-esr: 78.3.0esr -> 78.3.1esr --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 7213443a541..115588c226f 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -36,10 +36,10 @@ rec { firefox-esr-78 = common rec { pname = "firefox-esr"; - ffversion = "78.3.0esr"; + ffversion = "78.3.1esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "3rg4rjmigir2wsvzdl5dkh74hahjv36yvd04rhq0rszw6xz9wyig64nxhkrpf416z6iy3y1qavk7x9j6j02sc2f545pd6cx8abjgqc9"; + sha512 = "10a7xfp396n81aj17fbl1b1jr8gbn5ild2ig5cfz6r5ff3wfbjs3x0iqrlwqnjfdqq2pw19k2yrv91iwymd8jwjj4p35xsfivgn0a0n"; }; patches = [ From 559d6b895cdaf5198b13cd02d8530bad6c34d5c8 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Tue, 13 Oct 2020 10:29:22 -0400 Subject: [PATCH 099/546] mtail: 3.0.0-rc36 -> 3.0.0-rc38 --- pkgs/servers/monitoring/mtail/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix index 8bd222ddbeb..4c5da36f00e 100644 --- a/pkgs/servers/monitoring/mtail/default.nix +++ b/pkgs/servers/monitoring/mtail/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mtail"; - version = "3.0.0-rc36"; + version = "3.0.0-rc38"; src = fetchFromGitHub { owner = "google"; repo = "mtail"; rev = "v${version}"; - sha256 = "1xdpjzcr143f7430wl9l6zzq9yhbkirr3fbfw60f10zpglrcx8a4"; + sha256 = "0a9xwv8c4ivpyh1hm3nzssnqpr4c6br0qb27mz3sy6fp2p46c0ms"; }; - vendorSha256 = "02fnvy897cygmipc5snza556qihjwrp1lf9qi9f5dzarphd6d0pw"; + vendorSha256 = "03hicp3h4jrq7ihirpcmgkk5siiny3w2wnwhibaf36j9xllmf57f"; doCheck = false; From 4d76f56f9550e0f472c9837339157ecc5477f257 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 13 Oct 2020 10:47:09 -0400 Subject: [PATCH 100/546] biber: add patch for upstream bug 329 --- pkgs/tools/typesetting/biber/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index 449208e9d5d..0c472947c0a 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -10,6 +10,14 @@ perlPackages.buildPerlModule { src = "${biberSource}/source/bibtex/biber/biblatex-biber.tar.gz"; + patches = [ + # Fix for https://github.com/plk/biber/issues/329 + (fetchpatch { + url = "https://github.com/plk/biber/commit/fa312ce402fe581ba7cc0890c83a1d47c2610e26.diff"; + sha256 = "1j87mdwvx368z9b5x6b72s753hwvrldf2pb42p6hflq5hzkicy50"; + }) + ]; + buildInputs = with perlPackages; [ autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K From f0cd4058273c8b29d384a9f2fc63f7257e3aeca0 Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Tue, 13 Oct 2020 14:13:10 +0100 Subject: [PATCH 101/546] libayatana-appindicator: 0.5.4 -> 0.5.5, generate typelibs for gobject-introspection libayatana-indicator: 0.6.3 -> 0.8.2 --- .../libraries/ayatana-ido/default.nix | 10 +++++----- .../libayatana-appindicator/default.nix | 19 ++++++++++--------- .../libayatana-indicator/default.nix | 12 ++++++------ 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/ayatana-ido/default.nix b/pkgs/development/libraries/ayatana-ido/default.nix index 66ead87daa0..7b24f08822b 100644 --- a/pkgs/development/libraries/ayatana-ido/default.nix +++ b/pkgs/development/libraries/ayatana-ido/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, pkgconfig, autoreconfHook +, pkg-config, autoreconfHook , gtk3, gobject-introspection, gtk-doc, vala }: @@ -14,16 +14,16 @@ stdenv.mkDerivation rec { sha256 = "1jmdvvgrgicpnpnygc24qcisqb9y026541gb6lw6fwapvc9aj73p"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc vala ]; + nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc vala gobject-introspection ]; - buildInputs = [ gtk3 gobject-introspection ]; + buildInputs = [ gtk3 ]; meta = with stdenv.lib; { description = "Ayatana Display Indicator Objects"; homepage = "https://github.com/AyatanaIndicators/ayatana-ido"; changelog = "https://github.com/AyatanaIndicators/ayatana-ido/blob/${version}/ChangeLog"; - license = [ licenses.gpl3 licenses.lgpl21 ]; + license = [ licenses.lgpl3Plus licenses.lgpl21Plus ]; maintainers = [ maintainers.nickhu ]; - platforms = platforms.x86_64; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libayatana-appindicator/default.nix b/pkgs/development/libraries/libayatana-appindicator/default.nix index 84ecbc81ca5..248c33f7e0e 100644 --- a/pkgs/development/libraries/libayatana-appindicator/default.nix +++ b/pkgs/development/libraries/libayatana-appindicator/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, lib -, pkgconfig, autoreconfHook , gtk-doc +, pkg-config, autoreconfHook , gtk-doc +, gobject-introspection , gtkVersion ? "3" , gtk2, libayatana-indicator-gtk2, libdbusmenu-gtk2 , gtk3, libayatana-indicator-gtk3, libdbusmenu-gtk3 @@ -8,24 +9,24 @@ stdenv.mkDerivation rec { pname = "libayatana-appindicator-gtk${gtkVersion}"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "libayatana-appindicator"; rev = version; - sha256 = "0bqjqb7gabdk7mifk8azi630qw39z978f973fx2ylgdgr4a66j1v"; + sha256 = "1sba0w455rdkadkhxrx4fr63m0d9blsbb1q1hcshxw1k1z2nh1gk"; }; - patchPhase = '' + prePatch = '' substituteInPlace configure.ac \ --replace "codegendir pygtk-2.0" "codegendir pygobject-2.0" ''; - nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc ]; + nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection python2 python2Packages.pygtk dbus-glib ]; - buildInputs = [ dbus-glib python2 python2Packages.pygtk ] - ++ lib.lists.optional (gtkVersion == "2") libayatana-indicator-gtk2 + buildInputs = + lib.lists.optional (gtkVersion == "2") libayatana-indicator-gtk2 ++ lib.lists.optional (gtkVersion == "3") libayatana-indicator-gtk3; propagatedBuildInputs = @@ -42,8 +43,8 @@ stdenv.mkDerivation rec { description = "Ayatana Application Indicators Shared Library"; homepage = "https://github.com/AyatanaIndicators/libayatana-appindicator"; changelog = "https://github.com/AyatanaIndicators/libayatana-appindicator/blob/${version}/ChangeLog"; - license = [ licenses.gpl3 licenses.lgpl21 ]; + license = [ licenses.lgpl3Plus licenses.lgpl21Plus ]; maintainers = [ maintainers.nickhu ]; - platforms = platforms.x86_64; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libayatana-indicator/default.nix b/pkgs/development/libraries/libayatana-indicator/default.nix index 778e06aa95c..dd9bc616944 100644 --- a/pkgs/development/libraries/libayatana-indicator/default.nix +++ b/pkgs/development/libraries/libayatana-indicator/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, lib -, pkgconfig, autoreconfHook +, pkg-config, autoreconfHook , gtkVersion ? "3" , gtk2 , gtk3 @@ -8,16 +8,16 @@ stdenv.mkDerivation rec { pname = "libayatana-indicator-gtk${gtkVersion}"; - version = "0.6.3"; + version = "0.8.2"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "libayatana-indicator"; rev = version; - sha256 = "1q9wmaw6pckwyrv0s7wkqzm1yrk031pbz4xbr8cwn75ixqyfcb28"; + sha256 = "1wlqm3pj12vgz587a72widbg0vcmm1klsd2lh3mpzfy20m3vjxhj"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ ayatana-ido ] ++ lib.lists.optionals (gtkVersion == "2") [ gtk2 ] @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { description = "Ayatana Indicators Shared Library"; homepage = "https://github.com/AyatanaIndicators/libayatana-indicator"; changelog = "https://github.com/AyatanaIndicators/libayatana-indicator/blob/${version}/ChangeLog"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = [ maintainers.nickhu ]; - platforms = platforms.x86_64; + platforms = platforms.linux; }; } From 5a18f69bf6467452edf3789e60304316e3b0ac4b Mon Sep 17 00:00:00 2001 From: Masanori Ogino <167209+omasanori@users.noreply.github.com> Date: Wed, 14 Oct 2020 01:34:16 +0900 Subject: [PATCH 102/546] ansifilter: 2.16 -> 2.17 `nix-shell -p nixpkgs-review --run "nixpkgs-review wip"` succeeded on non-NixOS x86_64-linux. Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com> --- pkgs/tools/text/ansifilter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/tools/text/ansifilter/default.nix index 00c8c075ed6..8d79317ce34 100644 --- a/pkgs/tools/text/ansifilter/default.nix +++ b/pkgs/tools/text/ansifilter/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ansifilter"; - version = "2.16"; + version = "2.17"; src = fetchurl { url = "http://www.andre-simon.de/zip/ansifilter-${version}.tar.bz2"; - sha256 = "1wmszcykhaipxa7kxj4ml0lkmd5z7i9ryaachg9jpkhbaaijzkbz"; + sha256 = "0by4rhy30l7jgxvq6mwf8p43s1472q96l3g7n2skq2lnkjrvx1ar"; }; nativeBuildInputs = [ pkgconfig ]; From 4317adce91f9fc3638612dc22c06e316a9bc4d33 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 13 Oct 2020 17:40:26 +0100 Subject: [PATCH 103/546] starboard: 0.4.0 -> 0.5.0 --- pkgs/applications/networking/cluster/starboard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/applications/networking/cluster/starboard/default.nix index 78d25a4a958..20861769d8c 100644 --- a/pkgs/applications/networking/cluster/starboard/default.nix +++ b/pkgs/applications/networking/cluster/starboard/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "starboard"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "0jvr8lf3wdg6svsfi3fdknqw543495gysznbqhl42w7d3r5krcyw"; + sha256 = "12vfxnny3giirdf1xhacy24dvy5zm7iil6h019s0l63876vingnc"; }; - vendorSha256 = "0p5svprhbnb7mfln1mhaq55w8xnj8v3sinwkysxjzh1g8p36mglp"; + vendorSha256 = "0hj7h58j0v98plrqfldq59d084j76aiy82mfm8zi0vcqg6gxf4pb"; doCheck = false; From 762224af5f69da3191eee3736fef4a2ccfc49d20 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Tue, 13 Oct 2020 13:36:57 -0400 Subject: [PATCH 104/546] kopia: 0.7.2 -> 0.7.3 --- pkgs/tools/backup/kopia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index 8ca6112244a..056f523a2ca 100644 --- a/pkgs/tools/backup/kopia/default.nix +++ b/pkgs/tools/backup/kopia/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kopia"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1vri2xlih7xg0vl4dndjrwf2l5g28bld6kg7adk9v974zxq1h57g"; + sha256 = "1dnk764y71c9k9nghn9q06f2zz9igsvm4z826azil2d58h5d06j6"; }; vendorSha256 = "1mnhq6kn0pn67l55a9k6irmjlprr295218nms3klsk2720syzdwq"; From 35e0d351136e98a935cca2340fe547cfc960b7f1 Mon Sep 17 00:00:00 2001 From: Nikita Uvarov Date: Mon, 5 Oct 2020 23:45:13 +0200 Subject: [PATCH 105/546] caffeine-ng: add missing dependencies, fix bin paths --- pkgs/tools/X11/caffeine-ng/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/X11/caffeine-ng/default.nix b/pkgs/tools/X11/caffeine-ng/default.nix index c161a7c7737..4f709ee9db0 100644 --- a/pkgs/tools/X11/caffeine-ng/default.nix +++ b/pkgs/tools/X11/caffeine-ng/default.nix @@ -1,5 +1,5 @@ { gdk-pixbuf, glib, gobject-introspection, gtk3, lib, libnotify, - python3Packages, wrapGAppsHook + procps, xset, xautolock, xscreensaver, python3Packages, wrapGAppsHook }: python3Packages.buildPythonApplication rec { @@ -12,17 +12,25 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ wrapGAppsHook glib ]; - buildInputs = [ - gdk-pixbuf gobject-introspection libnotify gtk3 + buildInputs = [ + gdk-pixbuf gobject-introspection libnotify gtk3 python3Packages.setuptools_scm ]; pythonPath = with python3Packages; [ dbus-python docopt ewmh pygobject3 pyxdg - setproctitle + setproctitle ]; doCheck = false; # There are no tests. + postPatch = '' + substituteInPlace caffeine/inhibitors.py \ + --replace 'os.system("xset' 'os.system("${xset}/bin/xset' \ + --replace 'os.system("xautolock' 'os.system("${xautolock}/bin/xautolock' \ + --replace 'os.system("pgrep' 'os.system("${procps}/bin/pgrep' \ + --replace 'os.system("xscreensaver-command' 'os.system("${xscreensaver}/bin/xscreensaver-command' + ''; + postInstall = '' mkdir -p $out/share cp -r share $out/ From 7e757502e95a2a22522151f9036da7db161f0ef9 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 13 Oct 2020 21:51:54 +0300 Subject: [PATCH 106/546] josm: 17013 -> 17084 --- pkgs/applications/misc/josm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 72095cee1c3..ea7672abf6e 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }: let pname = "josm"; - version = "17013"; + version = "17084"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "0dgfiqk5bcbs03llkffm6h96zcqa19azbanac883g26f6z6j9b8j"; + sha256 = "0avzpzmvv371jpbph9xpq0ia2nikha2aib9v10hr2f9q7vka9zx4"; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macosx-${version}.zip"; - sha256 = "1mzaxcswmxah0gc9cifgaazwisr5cbanf4bspv1ra8xwzj5mdss6"; + sha256 = "1vd2r4sshjpd6ic460cdil75skrm6f6q48lm6n3g1ywkn4mx63p1"; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; From a9eecc65aeec82f9884d97e58e93f1140bb119cc Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 13 Oct 2020 22:12:52 +0300 Subject: [PATCH 107/546] googler: 4.2 -> 4.3.1 --- pkgs/applications/misc/googler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix index de93dc6f43e..1eca26d7be0 100644 --- a/pkgs/applications/misc/googler/default.nix +++ b/pkgs/applications/misc/googler/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "googler"; - version = "4.2"; + version = "4.3.1"; src = fetchFromGitHub { owner = "jarun"; repo = pname; rev = "v${version}"; - sha256 = "0c480wzc7q4pks1f6mnayr580c73jhzshliz4hgznzc7zwcdf41w"; + sha256 = "04wa0mlbfjnzwham2dpd9lch7800js4vp3ikgjl4qnwilvr1lw74"; }; buildInputs = [ python ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://github.com/jarun/googler"; description = "Google Search, Google Site Search, Google News from the terminal"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ koral filalex77 ]; platforms = python.meta.platforms; }; From d8f10c76f4e002f7bb6a60616f2e5110c3de9c5a Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Tue, 13 Oct 2020 21:51:54 +0200 Subject: [PATCH 108/546] wtf: 0.32.0 -> 0.33.0 --- pkgs/applications/misc/wtf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 657d54f732c..ad8e261cf68 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "1055shnf716ga46wwcaffdpgc1glr8vrqrbs2sqbkr3wjan6n0nw"; + sha256 = "0dszc3igfvlb6dgf5whyhw72id39lqqmgpd42kyqx5yjf5dw2wg7"; }; - vendorSha256 = "0l1q29mdb13ir7n1x65jfnrmy1lamlsa6hm2jagf6yjbm6wf1kw4"; + vendorSha256 = "1wcqk8lfv3jq7dfaj9dj8bzsmq2qislzs1m38gx1hh4jwg1rn2cn"; doCheck = false; From b199005979cafd9d279a6ca034fc36ffc038a31f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 13 Oct 2020 22:38:15 +0200 Subject: [PATCH 109/546] nixos/tests/systemd-networkd-vrf: fix eval The `Metric`-values of routes defined via `networkd` must be integers. --- nixos/tests/systemd-networkd-vrf.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/systemd-networkd-vrf.nix b/nixos/tests/systemd-networkd-vrf.nix index bd4751f8e43..9f09d801f77 100644 --- a/nixos/tests/systemd-networkd-vrf.nix +++ b/nixos/tests/systemd-networkd-vrf.nix @@ -38,14 +38,14 @@ in { matchConfig.Name = "vrf1"; networkConfig.IPForward = "yes"; routes = [ - { routeConfig = { Destination = "192.168.1.2"; Metric = "100"; }; } + { routeConfig = { Destination = "192.168.1.2"; Metric = 100; }; } ]; }; networks."10-vrf2" = { matchConfig.Name = "vrf2"; networkConfig.IPForward = "yes"; routes = [ - { routeConfig = { Destination = "192.168.2.3"; Metric = "100"; }; } + { routeConfig = { Destination = "192.168.2.3"; Metric = 100; }; } ]; }; From f528dd170f40f20669b36093a14832f07df34a15 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 13 Oct 2020 23:00:46 +0100 Subject: [PATCH 110/546] open-policy-agent: only build opa Was building: * generate-man * genopacapabilities * genopawasm * opa * wasm-rego-testgen --- pkgs/development/tools/open-policy-agent/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index d3fd81a0f94..50d80ef32f0 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -12,6 +12,8 @@ buildGoPackage rec { sha256 = "18hpanfrzg6xnq1g0yws6g0lw4y191pnrqphccv13j6kqk3k10ps"; }; + subPackages = [ "." ]; + buildFlagsArray = '' -ldflags= -X ${goPackagePath}/version.Version=${version} From e2743be9346ca510b78f6cd7ed28f0965c389acb Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 13 Oct 2020 23:02:10 +0100 Subject: [PATCH 111/546] open-policy-agent: 0.23.2 -> 0.24.0 --- pkgs/development/tools/open-policy-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 50d80ef32f0..d6dbbcc493d 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "open-policy-agent"; - version = "0.23.2"; + version = "0.24.0"; goPackagePath = "github.com/open-policy-agent/opa"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "18hpanfrzg6xnq1g0yws6g0lw4y191pnrqphccv13j6kqk3k10ps"; + sha256 = "0fv2rq8a01hapcpgfqp71v113iyyzs5w1sam14h9clyr1vqrbcf2"; }; subPackages = [ "." ]; From f85e2e1eeb442c0b0a8afb8e224f8a6a039b5664 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20H=C3=BCrlimann?= Date: Tue, 13 Oct 2020 23:12:09 +0200 Subject: [PATCH 112/546] trigger: 0.6.6 -> 0.6.6.1 fix linker flag for trigger added tinyxml-2 as dependency as it's not shipped anymore improved description --- pkgs/games/trigger/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix index c6f31922bb6..e5a299052dd 100644 --- a/pkgs/games/trigger/default.nix +++ b/pkgs/games/trigger/default.nix @@ -1,20 +1,23 @@ -{ fetchurl, stdenv, runtimeShell -, SDL2, freealut, SDL2_image, openal, physfs, zlib, libGLU, libGL, glew }: +{ fetchurl, stdenv, runtimeShell, SDL2, freealut, SDL2_image, openal, physfs +, zlib, libGLU, libGL, glew, tinyxml-2 }: stdenv.mkDerivation rec { - name = "trigger-rally-0.6.6"; + name = "trigger-rally-0.6.6.1"; src = fetchurl { url = "mirror://sourceforge/trigger-rally/${name}.tar.gz"; - sha256 = "08qa2f2s8zyn42ff6jb1gsi64d916020ixkzvl16kbb88rabqra8"; + sha256 = "016bc2hczqscfmngacim870hjcsmwl8r3aq8x03vpf22s49nw23z"; }; - buildInputs = [ SDL2 freealut SDL2_image openal physfs zlib libGLU libGL glew ]; + buildInputs = + [ SDL2 freealut SDL2_image openal physfs zlib libGLU libGL glew tinyxml-2 ]; preConfigure = '' sed s,/usr/local,$out, -i bin/*defs cd src + + sed s,lSDL2main,lSDL2, -i GNUmakefile export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL2.dev}/include/SDL2" export makeFlags="$makeFlags prefix=$out" ''; @@ -31,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Rally"; + description = "A fast-paced single-player racing game"; homepage = "http://trigger-rally.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; From 3a76d4caea59cecf377016a68d70b8c5d057412a Mon Sep 17 00:00:00 2001 From: piegames Date: Wed, 14 Oct 2020 01:19:43 +0200 Subject: [PATCH 113/546] make-desktopitem: minor fixes and code style --- .../make-desktopitem/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix index f5020c036aa..fd46e298513 100644 --- a/pkgs/build-support/make-desktopitem/default.nix +++ b/pkgs/build-support/make-desktopitem/default.nix @@ -6,7 +6,7 @@ , exec , icon ? null , comment ? null -, terminal ? "false" +, terminal ? false , desktopName # The name of the application , genericName ? null , mimeType ? null @@ -19,20 +19,22 @@ let # like builtins.toString, but null -> null instead of null -> "" - nullableToString = value: if value == null then null else builtins.toString value; + nullableToString = value: if value == null then null + else if builtins.isBool value then lib.boolToString value + else builtins.toString value; # The [Desktop entry] section of the desktop file, as attribute set. mainSection = { "Type" = toString type; - "Exec" = (nullableToString exec); - "Icon" = (nullableToString icon); - "Comment" = (nullableToString comment); - "Terminal" = (nullableToString terminal); + "Exec" = nullableToString exec; + "Icon" = nullableToString icon; + "Comment" = nullableToString comment; + "Terminal" = nullableToString terminal; "Name" = toString name; - "GenericName" = (nullableToString genericName); - "MimeType" = (nullableToString mimeType); - "Categories" = (nullableToString categories); - "StartupNotify" = (nullableToString startupNotify); + "GenericName" = nullableToString genericName; + "MimeType" = nullableToString mimeType; + "Categories" = nullableToString categories; + "StartupNotify" = nullableToString startupNotify; } // extraDesktopEntries; # Map all entries to a list of lines From 74d875206a825007e27abaa7c590f4c1db35ad31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Wed, 14 Oct 2020 01:27:10 +0200 Subject: [PATCH 114/546] zope_filerepresentation: fix test --- .../python-modules/zope_filerepresentation/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_filerepresentation/default.nix b/pkgs/development/python-modules/zope_filerepresentation/default.nix index 82a981402eb..635727a1173 100644 --- a/pkgs/development/python-modules/zope_filerepresentation/default.nix +++ b/pkgs/development/python-modules/zope_filerepresentation/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , zope_schema +, zope_interface }: buildPythonPackage rec { @@ -10,10 +11,14 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "3fbca4730c871d8e37b9730763c42b69ba44117cf6d0848014495bb301cae2d6"; + sha256 = "1mp2r80v6ns92j089l7ngh8l9fk95g2661vkp4vqw7c71irs9g1z"; }; - propagatedBuildInputs = [ zope_schema ]; + propagatedBuildInputs = [ zope_interface zope_schema ]; + + checkPhase = '' + cd src/zope/filerepresentation && python -m unittest + ''; meta = with stdenv.lib; { homepage = "https://zopefilerepresentation.readthedocs.io/"; From 54b4b470c3a7149a7c459d92859a51c2e7a04cf7 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 1 Oct 2020 17:51:46 -0400 Subject: [PATCH 115/546] makeRustPlatform: Put back in it's own file. We expose it on the top level, but I don't think it makes sense to pull it from a specific version of the rust tools when it is in fact version agnostic. This reverts a tiny portion of 912dca193aee9da77a4d429285db53729d81aa3d. --- pkgs/development/compilers/rust/1_44.nix | 1 + pkgs/development/compilers/rust/1_45.nix | 1 + pkgs/development/compilers/rust/default.nix | 19 +---------------- .../compilers/rust/make-rust-platform.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++- 5 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/compilers/rust/make-rust-platform.nix diff --git a/pkgs/development/compilers/rust/1_44.nix b/pkgs/development/compilers/rust/1_44.nix index 9fc268d152b..17b93cf88eb 100644 --- a/pkgs/development/compilers/rust/1_44.nix +++ b/pkgs/development/compilers/rust/1_44.nix @@ -13,6 +13,7 @@ , CoreFoundation, Security , llvmPackages_5 , pkgsBuildTarget, pkgsBuildBuild +, makeRustPlatform } @ args: import ./default.nix { diff --git a/pkgs/development/compilers/rust/1_45.nix b/pkgs/development/compilers/rust/1_45.nix index 1a634d3f51e..05db4520f65 100644 --- a/pkgs/development/compilers/rust/1_45.nix +++ b/pkgs/development/compilers/rust/1_45.nix @@ -13,6 +13,7 @@ , CoreFoundation, Security , llvmPackages_5 , pkgsBuildTarget, pkgsBuildBuild +, makeRustPlatform } @ args: import ./default.nix { diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index d08b63dd643..c4aef566f8b 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -12,6 +12,7 @@ , CoreFoundation, Security , llvmPackages_5 , pkgsBuildTarget, pkgsBuildBuild +, makeRustPlatform }: rec { toRustTarget = platform: with platform.parsed; let cpu_ = { @@ -22,24 +23,6 @@ in platform.rustc.config or "${cpu_}-${vendor.name}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}"; - makeRustPlatform = { rustc, cargo, ... }: rec { - rust = { - inherit rustc cargo; - }; - - fetchCargoTarball = buildPackages.callPackage ../../../build-support/rust/fetchCargoTarball.nix { - inherit cargo; - }; - - buildRustPackage = callPackage ../../../build-support/rust { - inherit rustc cargo fetchCargoTarball; - }; - - rustcSrc = callPackage ./rust-src.nix { - inherit rustc; - }; - }; - # This just contains tools for now. But it would conceivably contain # libraries too, say if we picked some default/recommended versions from # `cratesIO` to build by Hydra and/or try to prefer/bias in Cargo.lock for diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix new file mode 100644 index 00000000000..6a827cff9a1 --- /dev/null +++ b/pkgs/development/compilers/rust/make-rust-platform.nix @@ -0,0 +1,21 @@ +{ buildPackages, callPackage }: + +{ rustc, cargo, ... }: + +rec { + rust = { + inherit rustc cargo; + }; + + fetchCargoTarball = buildPackages.callPackage ../../../build-support/rust/fetchCargoTarball.nix { + inherit cargo; + }; + + buildRustPackage = callPackage ../../../build-support/rust { + inherit rustc cargo fetchCargoTarball; + }; + + rustcSrc = callPackage ./rust-src.nix { + inherit rustc; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11b24dfc3f7..fd38e0126d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9659,7 +9659,8 @@ in rustPackages = rustPackages_1_45; inherit (rustPackages) cargo clippy rustc rustPlatform; - inherit (rust) makeRustPlatform; + + makeRustPlatform = callPackage ../development/compilers/rust/make-rust-platform.nix {}; buildRustCrate = callPackage ../build-support/rust/build-rust-crate { }; buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; From 20a938ab9033006e7055966fcf44848c6331a9c5 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Tue, 13 Oct 2020 18:28:17 -0700 Subject: [PATCH 116/546] vscode: chmod +x update-vscode.sh --- pkgs/applications/editors/vscode/update-vscode.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 pkgs/applications/editors/vscode/update-vscode.sh diff --git a/pkgs/applications/editors/vscode/update-vscode.sh b/pkgs/applications/editors/vscode/update-vscode.sh old mode 100644 new mode 100755 From 87056f5fa18af3253c739ce89f64a72c3a982832 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 13 Oct 2020 21:33:37 -0300 Subject: [PATCH 117/546] unqlite: init at 1.1.9 --- .../development/libraries/unqlite/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/libraries/unqlite/default.nix diff --git a/pkgs/development/libraries/unqlite/default.nix b/pkgs/development/libraries/unqlite/default.nix new file mode 100644 index 00000000000..9d0ab386856 --- /dev/null +++ b/pkgs/development/libraries/unqlite/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, fetchFromGitHub +, cmake }: + +stdenv.mkDerivation rec { + pname = "unqlite"; + version = "1.1.9"; + + src = fetchFromGitHub { + owner = "symisc"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-WLsyGEt7Xe6ZrOGMO7+3TU2sBgDTSmfD1WzD70pcDjo="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + homepage = "https://unqlite.org/"; + description = "Self-contained, serverless, zero-conf, transactional NoSQL DB library"; + longDescription = '' + UnQLite is a in-process software library which implements a + self-contained, serverless, zero-configuration, transactional NoSQL + database engine. UnQLite is a document store database similar to MongoDB, + Redis, CouchDB etc. as well a standard Key/Value store similar to + BerkeleyDB, LevelDB, etc. + + UnQLite is an embedded NoSQL (Key/Value store and Document-store) database + engine. Unlike most other NoSQL databases, UnQLite does not have a + separate server process. UnQLite reads and writes directly to ordinary + disk files. A complete database with multiple collections, is contained in + a single disk file. The database file format is cross-platform, you can + freely copy a database between 32-bit and 64-bit systems or between + big-endian and little-endian architectures. + ''; + maintainers = with maintainers; [ AndersonTorres ]; + license = licenses.bsd2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78dd1302380..2168e52f4be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15548,6 +15548,8 @@ in sqlite = lowPrio (callPackage ../development/libraries/sqlite { }); + unqlite = lowPrio (callPackage ../development/libraries/unqlite { }); + inherit (callPackage ../development/libraries/sqlite/tools.nix { inherit (darwin.apple_sdk.frameworks) Foundation; }) sqlite-analyzer sqldiff; From 906d77af8b314d15dd14a73c83479568f4fed37b Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 12 Oct 2020 20:55:42 -0700 Subject: [PATCH 118/546] python3Packages.google-cloud-access-context-manager: init at 0.1.2 --- .../default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/google-cloud-access-context-manager/default.nix diff --git a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix new file mode 100644 index 00000000000..01f7bc9ce33 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder, google_api_core }: + +buildPythonPackage rec { + pname = "google-cloud-access-context-manager"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1qy7wv1xn7g3x5z0vvv0pwmxhin4hw2m9fs9iklnghy00vg37v0b"; + }; + + disabled = pythonOlder "3.5"; + + propagatedBuildInputs = [ google_api_core ]; + + # No tests in repo + doCheck = false; + + pythonImportsCheck = [ "google.identity.accesscontextmanager" ]; + + meta = with lib; { + description = "Protobufs for Google Access Context Manager."; + homepage = "https://github.com/googleapis/python-access-context-manager"; + license = licenses.asl20; + maintainers = with maintainers; [ austinbutler ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0d2e1aa1c4f..929869ee8e9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2422,6 +2422,8 @@ in { google-auth-oauthlib = callPackage ../development/python-modules/google-auth-oauthlib { }; + google-cloud-access-context-manager = callPackage ../development/python-modules/google-cloud-access-context-manager { }; + google_cloud_asset = callPackage ../development/python-modules/google_cloud_asset { }; google_cloud_automl = callPackage ../development/python-modules/google_cloud_automl { }; From c9c4730f1118c50649a505ac23f4732ff321be50 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 12 Oct 2020 20:56:31 -0700 Subject: [PATCH 119/546] python3Packages.google-cloud-org-policy: init at 0.1.2 --- .../google-cloud-org-policy/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/google-cloud-org-policy/default.nix diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix new file mode 100644 index 00000000000..39cc0dc9c24 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder, google_api_core }: + +buildPythonPackage rec { + pname = "google-cloud-org-policy"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ncgcnbvmgqph54yh2pjx2hh82gnkhsrw5yirp4wlf7jclh6j9xh"; + }; + + disabled = pythonOlder "3.5"; + + propagatedBuildInputs = [ google_api_core ]; + + # No tests in repo + doCheck = false; + + pythonImportsCheck = [ "google.cloud.orgpolicy" ]; + + meta = with lib; { + description = "Protobufs for Google Cloud Organization Policy."; + homepage = "https://github.com/googleapis/python-org-policy"; + license = licenses.asl20; + maintainers = with maintainers; [ austinbutler ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 929869ee8e9..91cdcdad619 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2460,6 +2460,8 @@ in { google_cloud_monitoring = callPackage ../development/python-modules/google_cloud_monitoring { }; + google-cloud-org-policy = callPackage ../development/python-modules/google-cloud-org-policy { }; + google_cloud_pubsub = callPackage ../development/python-modules/google_cloud_pubsub { }; google_cloud_redis = callPackage ../development/python-modules/google_cloud_redis { }; From 80b03e4045ae3cf3c438d4eb3758424f44050b96 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 12 Oct 2020 20:59:45 -0700 Subject: [PATCH 120/546] python3Packages.libcst: 0.3.12 -> 0.3.13 --- .../python-modules/libcst/default.nix | 55 +++++++++++-------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index 5f4fec2612a..e0ea0e332af 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -1,36 +1,43 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, typing-inspect -, pyyaml -, isPy3k -}: +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, black, isort +, pytestCheckHook, pyyaml, typing-extensions, typing-inspect }: buildPythonPackage rec { pname = "libcst"; - version = "0.3.12"; + version = "0.3.13"; - src = fetchPypi { - inherit pname version; - sha256 = "1zgwxdbhz2ljl0yzbrn1f4f464rjphx0j6r4qq0csax3m4wp50x1"; + # Some files for tests missing from PyPi + # https://github.com/Instagram/LibCST/issues/331 + src = fetchFromGitHub { + owner = "instagram"; + repo = pname; + rev = "v${version}"; + sha256 = "0pbddjrsqj641mr6zijk2phfn15dampbx268zcws4bhhhnrxlj65"; }; - # The library uses type annotation syntax. - disabled = !isPy3k; + disabled = pythonOlder "3.6"; - propagatedBuildInputs = [ typing-inspect pyyaml ]; + propagatedBuildInputs = [ pyyaml typing-inspect ]; + + checkInputs = [ black isort pytestCheckHook ]; + + # https://github.com/Instagram/LibCST/issues/346 + # https://github.com/Instagram/LibCST/issues/347 + preCheck = '' + python -m libcst.codegen.generate visitors + python -m libcst.codegen.generate return_types + rm libcst/tests/test_fuzz.py + rm libcst/tests/test_pyre_integration.py + rm libcst/metadata/tests/test_full_repo_manager.py + rm libcst/metadata/tests/test_type_inference_provider.py + ''; - # Test fails with ValueError: No data_provider tests were created for - # test_type_availability! Please double check your data. - # The tests appear to be doing some dynamic introspection, not sure what is - # going on there. - doCheck = false; pythonImportsCheck = [ "libcst" ]; - meta = with stdenv.lib; { - description = "A concrete syntax tree parser and serializer library for Python that preserves many aspects of Python's abstract syntax tree"; - homepage = "https://libcst.readthedocs.io/en/latest/"; - license = with licenses; [mit asl20 psfl]; - maintainers = [ maintainers.ruuda ]; + meta = with lib; { + description = + "A Concrete Syntax Tree (CST) parser and serializer library for Python."; + homepage = "https://github.com/Instagram/libcst"; + license = with licenses; [ mit asl20 psfl ]; + maintainers = with maintainers; [ maintainers.ruuda ]; }; } From 326a5f7132de5f6c90c266b8d1b5892559407a22 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 12 Oct 2020 21:02:29 -0700 Subject: [PATCH 121/546] python3Packages.google_cloud_asset: fix build, 2.0.0 -> 2.1.0 --- .../google_cloud_asset/default.nix | 39 +++++++++++-------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_asset/default.nix b/pkgs/development/python-modules/google_cloud_asset/default.nix index 927ad94e78f..b1366c0d35c 100644 --- a/pkgs/development/python-modules/google_cloud_asset/default.nix +++ b/pkgs/development/python-modules/google_cloud_asset/default.nix @@ -1,32 +1,37 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, enum34 -, grpc_google_iam_v1 -, google_api_core -, pytest -, mock -}: +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, grpc_google_iam_v1 +, google_api_core, google-cloud-access-context-manager, google-cloud-org-policy +, libcst, proto-plus, pytest, pytest-asyncio, pytestCheckHook, mock }: buildPythonPackage rec { pname = "google-cloud-asset"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "fd4c0f7f61a8a1c5907cd6cc27a028b16236bf3d982ff412df0d2c981cef5ae5"; + sha256 = "14r77bcxy7bmqhmz2hzcf3km2y4vivf5sfzgqjwlyynaydhn4f6j"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ]; + disabled = pythonOlder "3.6"; - checkPhase = '' - pytest tests/unit + checkInputs = [ mock pytest-asyncio pytestCheckHook ]; + disabledTests = [ "asset_service_transport_auth_adc" ]; + propagatedBuildInputs = [ + grpc_google_iam_v1 + google_api_core + google-cloud-access-context-manager + google-cloud-org-policy + libcst + proto-plus + ]; + + # Remove tests intended to be run in VPC + preCheck = '' + rm -rf tests/system ''; meta = with stdenv.lib; { - description = "Cloud Asset API API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + description = "Python Client for Google Cloud Asset API"; + homepage = "https://github.com/googleapis/python-asset"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; From 0bdf19cf682d50d2f38349117bc78aaec92bda52 Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Tue, 13 Oct 2020 21:55:01 -0400 Subject: [PATCH 122/546] gnucash: 3.10 -> 4.2 New version available: https://www.gnucash.org/news.phtml#n-200927-4.2.news --- .../office/gnucash/cmake_check_symbol_exists.patch | 12 ------------ pkgs/applications/office/gnucash/default.nix | 6 ++---- 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 pkgs/applications/office/gnucash/cmake_check_symbol_exists.patch diff --git a/pkgs/applications/office/gnucash/cmake_check_symbol_exists.patch b/pkgs/applications/office/gnucash/cmake_check_symbol_exists.patch deleted file mode 100644 index 5e0ae68e17c..00000000000 --- a/pkgs/applications/office/gnucash/cmake_check_symbol_exists.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: gnucash-3.6/gnucash/register/register-gnome/CMakeLists.txt -=================================================================== ---- gnucash-3.6.orig/gnucash/register/register-gnome/CMakeLists.txt -+++ gnucash-3.6/gnucash/register/register-gnome/CMakeLists.txt -@@ -1,6 +1,7 @@ - add_subdirectory(test) - - #GTK before 3.14 didn't have GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK -+include(CheckSymbolExists) - check_symbol_exists(GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK gdk/gdktypes.h have_mod_mask) - if (NOT have_mod_mask) - if (MAC_INTEGRATION) diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 641d400886f..29a96aac5c4 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -25,11 +25,11 @@ in stdenv.mkDerivation rec { pname = "gnucash"; - version = "3.10"; + version = "4.2"; src = fetchurl { url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2"; - sha256 = "05kgg7mhizndwn7icnarqk3c19xrzfawf90y9nb3jdm6fv1741xn"; + sha256 = "020k1mm909dcgs52ls4v7xx3yn8gqazi9awyr81l6y7pkq1spn2n"; }; nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ]; @@ -46,8 +46,6 @@ stdenv.mkDerivation rec { # glib-2.62 deprecations NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; - patches = [ ./cmake_check_symbol_exists.patch ]; - postPatch = '' patchShebangs . ''; From 68b81403d886c157edd0993d6b1a2f44114fed67 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sun, 4 Oct 2020 21:10:55 -0400 Subject: [PATCH 123/546] vscode-extensions.ms-python.python: 2020.9.111407 -> 2020.9.114305 --- pkgs/misc/vscode-extensions/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index 3a085b98a92..1d86f82d278 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -41,13 +41,13 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2020.9.111407"; + version = "2020.9.114305"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/microsoft/vscode-python/releases/download/${mktplcRef.version}/ms-python-release.vsix"; - sha256 = "0li68k0saj3v8w44jdmrkacf4jib4hkw0fca2rgv9cf18zswir1f"; + sha256 = "1vh0wvfvzszc58lw7dbl60knpm5l6rrsghfchhn5dvwyadx4a33h"; }; buildInputs = [ From b55da6e0935b23997b0a378a1972c99416e6d5c1 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sun, 11 Oct 2020 21:18:59 -0400 Subject: [PATCH 124/546] vscode-extensions.WakaTime.vscode-wakatime: 4.0.8 -> 4.0.9 --- pkgs/misc/vscode-extensions/wakatime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/misc/vscode-extensions/wakatime/default.nix index cec0448c346..b1c7142c591 100644 --- a/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/pkgs/misc/vscode-extensions/wakatime/default.nix @@ -8,8 +8,8 @@ in mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "4.0.8"; - sha256 = "1yma86x5g8fip388afgg20k3sxpkf8bfn98d3850jg6b3zjlw19r"; + version = "4.0.9"; + sha256 = "0sm2fr9zbk1759r52dpnz9r7xbvxladlpinlf2i0hyaa06bhp3b1"; }; postPatch = '' From ddc51f4db346b277ae780c90f9b1c5cd4136bb5f Mon Sep 17 00:00:00 2001 From: Nicolas Martin Date: Wed, 14 Oct 2020 04:49:39 +0200 Subject: [PATCH 125/546] glow: 1.0.1 -> 1.0.2 --- pkgs/applications/editors/glow/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix index 7af1287d8c1..0bb8b4eb18a 100644 --- a/pkgs/applications/editors/glow/default.nix +++ b/pkgs/applications/editors/glow/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glow"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "glow"; rev = "v${version}"; - sha256 = "05scgdivb0hf0lfznikn20b6pgb479jhs24hgf5f5i60v37v930y"; + sha256 ="0jyl5ln7c2naawmw7bljzrldr96xyb5rbis6y6blmyghr0vx07zb"; }; - vendorSha256 = "180g6d9w3lfmxj4843kqvq4ikg8lwmwprgfxdgz1lzvjmbfjj3g9"; + vendorSha256 = "0z3r8fvpy36ybgb18sr0lril1sg8z7s99xv1a6g1v3zdnj3zimav"; doCheck = false; From c652646390d7fd42b8a09db691448231b1eab39e Mon Sep 17 00:00:00 2001 From: oxalica Date: Tue, 13 Oct 2020 03:39:06 +0800 Subject: [PATCH 126/546] rust-analyzer: 2020-10-05 -> 2020-10-12 --- .../tools/rust/rust-analyzer/default.nix | 6 +- .../tools/rust/rust-analyzer/generic.nix | 11 +- .../no-match-unsizing-in-const-fn.patch | 30 +++++ .../rust/rust-analyzer/no-track_env_var.patch | 120 ++++++++++++++++++ 4 files changed, 159 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/tools/rust/rust-analyzer/no-match-unsizing-in-const-fn.patch create mode 100644 pkgs/development/tools/rust/rust-analyzer/no-track_env_var.patch diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 22152b52ff8..77a0328fc37 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2020-10-05"; + rev = "2020-10-12"; version = "unstable-${rev}"; - sha256 = "1vj5xwqif2ipzlb8ngpq3ymgqvv65d0700ihq7hx81k0i2m2awa6"; - cargoSha256 = "14n7nk64qq27a7ygqm0bly2bby3bmsav6nvsap3bkbkppyr5gyrg"; + sha256 = "194xax87pwdh3p8zx46igvqwznlpnl4jp8lj987616gyldfgall0"; + cargoSha256 = "1rvf3a2fpqpf4q52pi676qzq7h0xfqlcbp15sc5vqc8nbbs7c7vw"; }; rust-analyzer = callPackage ./wrapper.nix {} { diff --git a/pkgs/development/tools/rust/rust-analyzer/generic.nix b/pkgs/development/tools/rust/rust-analyzer/generic.nix index 20fb38b66b7..b25f74b90f6 100644 --- a/pkgs/development/tools/rust/rust-analyzer/generic.nix +++ b/pkgs/development/tools/rust/rust-analyzer/generic.nix @@ -16,15 +16,16 @@ rustPlatform.buildRustPackage { inherit rev sha256; }; - # FIXME: Temporary fix for our rust 1.45.0 since rust-analyzer requires 1.46.0 + # FIXME: Temporary fixes for our rust 1.45.0 cargoPatches = [ - ./downgrade-smol_str.patch + ./downgrade-smol_str.patch # Requires rustc 1.46.0 ]; patches = [ - # FIXME: Temporary fix for our rust 1.45.0 since rust-analyzer requires 1.46.0 - ./no-loop-in-const-fn.patch - ./no-option-zip.patch + ./no-track_env_var.patch # Requires rustc 1.47.0 + ./no-match-unsizing-in-const-fn.patch # Requires rustc 1.46.0 + ./no-loop-in-const-fn.patch # Requires rustc 1.46.0 + ./no-option-zip.patch # Requires rustc 1.46.0 ]; buildAndTestSubdir = "crates/rust-analyzer"; diff --git a/pkgs/development/tools/rust/rust-analyzer/no-match-unsizing-in-const-fn.patch b/pkgs/development/tools/rust/rust-analyzer/no-match-unsizing-in-const-fn.patch new file mode 100644 index 00000000000..3bdd4c8a727 --- /dev/null +++ b/pkgs/development/tools/rust/rust-analyzer/no-match-unsizing-in-const-fn.patch @@ -0,0 +1,30 @@ +diff --git a/crates/assists/src/handlers/convert_integer_literal.rs b/crates/assists/src/handlers/convert_integer_literal.rs +index ea35e833a..4df80a3c0 100644 +--- a/crates/assists/src/handlers/convert_integer_literal.rs ++++ b/crates/assists/src/handlers/convert_integer_literal.rs +@@ -105,7 +105,7 @@ impl IntegerLiteralBase { + } + } + +- const fn base(&self) -> u32 { ++ fn base(&self) -> u32 { + match self { + Self::Binary => 2, + Self::Octal => 8, +@@ -114,14 +114,14 @@ impl IntegerLiteralBase { + } + } + +- const fn prefix_len(&self) -> usize { ++ fn prefix_len(&self) -> usize { + match self { + Self::Decimal => 0, + _ => 2, + } + } + +- const fn bases() -> &'static [IntegerLiteralBase] { ++ fn bases() -> &'static [IntegerLiteralBase] { + &[ + IntegerLiteralBase::Binary, + IntegerLiteralBase::Octal, diff --git a/pkgs/development/tools/rust/rust-analyzer/no-track_env_var.patch b/pkgs/development/tools/rust/rust-analyzer/no-track_env_var.patch new file mode 100644 index 00000000000..f5173c4bacb --- /dev/null +++ b/pkgs/development/tools/rust/rust-analyzer/no-track_env_var.patch @@ -0,0 +1,120 @@ +This patch revert 3d169bd3f4cdc2dc3dd09eadbbc17c19214d69f3 (Add track_env_var to the proc macro server). + +diff --git a/crates/proc_macro_srv/src/proc_macro/bridge/client.rs b/crates/proc_macro_srv/src/proc_macro/bridge/client.rs +index 55d6330cc..cb4b3bdb0 100644 +--- a/crates/proc_macro_srv/src/proc_macro/bridge/client.rs ++++ b/crates/proc_macro_srv/src/proc_macro/bridge/client.rs +@@ -160,7 +160,6 @@ macro_rules! define_handles { + } + define_handles! { + 'owned: +- FreeFunctions, + TokenStream, + TokenStreamBuilder, + TokenStreamIter, +diff --git a/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs b/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs +index b97886eb9..aeb05aad4 100644 +--- a/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs ++++ b/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs +@@ -57,10 +57,6 @@ use std::thread; + macro_rules! with_api { + ($S:ident, $self:ident, $m:ident) => { + $m! { +- FreeFunctions { +- fn drop($self: $S::FreeFunctions); +- fn track_env_var(var: &str, value: Option<&str>); +- }, + TokenStream { + fn drop($self: $S::TokenStream); + fn clone($self: &$S::TokenStream) -> $S::TokenStream; +diff --git a/crates/proc_macro_srv/src/proc_macro/bridge/server.rs b/crates/proc_macro_srv/src/proc_macro/bridge/server.rs +index 3acb239af..45d41ac02 100644 +--- a/crates/proc_macro_srv/src/proc_macro/bridge/server.rs ++++ b/crates/proc_macro_srv/src/proc_macro/bridge/server.rs +@@ -11,8 +11,6 @@ use super::client::HandleStore; + /// Declare an associated item of one of the traits below, optionally + /// adjusting it (i.e., adding bounds to types and default bodies to methods). + macro_rules! associated_item { +- (type FreeFunctions) => +- (type FreeFunctions: 'static;); + (type TokenStream) => + (type TokenStream: 'static + Clone;); + (type TokenStreamBuilder) => +diff --git a/crates/proc_macro_srv/src/proc_macro/mod.rs b/crates/proc_macro_srv/src/proc_macro/mod.rs +index fc6e7344f..ee0dc9722 100644 +--- a/crates/proc_macro_srv/src/proc_macro/mod.rs ++++ b/crates/proc_macro_srv/src/proc_macro/mod.rs +@@ -924,25 +924,3 @@ impl fmt::Debug for Literal { + self.0.fmt(f) + } + } +- +-pub mod tracked_env { +- use std::env::{self, VarError}; +- use std::ffi::OsStr; +- +- /// Retrieve an environment variable and add it to build dependency info. +- /// Build system executing the compiler will know that the variable was accessed during +- /// compilation, and will be able to rerun the build when the value of that variable changes. +- /// Besides the dependency tracking this function should be equivalent to `env::var` from the +- /// standard library, except that the argument must be UTF-8. +- pub fn var + AsRef>(key: K) -> Result { +- use std::ops::Deref; +- +- let key: &str = key.as_ref(); +- let value = env::var(key); +- super::bridge::client::FreeFunctions::track_env_var( +- key, +- value.as_ref().map(|t| t.deref()).ok(), +- ); +- value +- } +-} +diff --git a/crates/proc_macro_srv/src/rustc_server.rs b/crates/proc_macro_srv/src/rustc_server.rs +index c5fe3591e..7d1695c86 100644 +--- a/crates/proc_macro_srv/src/rustc_server.rs ++++ b/crates/proc_macro_srv/src/rustc_server.rs +@@ -242,8 +242,6 @@ impl TokenStreamBuilder { + } + } + +-pub struct FreeFunctions; +- + #[derive(Clone)] + pub struct TokenStreamIter { + trees: IntoIter, +@@ -256,7 +254,6 @@ pub struct Rustc { + } + + impl server::Types for Rustc { +- type FreeFunctions = FreeFunctions; + type TokenStream = TokenStream; + type TokenStreamBuilder = TokenStreamBuilder; + type TokenStreamIter = TokenStreamIter; +@@ -270,13 +267,6 @@ impl server::Types for Rustc { + type MultiSpan = Vec; + } + +-impl server::FreeFunctions for Rustc { +- fn track_env_var(&mut self, _var: &str, _value: Option<&str>) { +- // FIXME: track env var accesses +- // https://github.com/rust-lang/rust/pull/71858 +- } +-} +- + impl server::TokenStream for Rustc { + fn new(&mut self) -> Self::TokenStream { + Self::TokenStream::new() +diff --git a/xtask/src/install.rs b/xtask/src/install.rs +index fcc4f05e4..d829790d7 100644 +--- a/xtask/src/install.rs ++++ b/xtask/src/install.rs +@@ -7,7 +7,7 @@ use anyhow::{bail, format_err, Context, Result}; + use crate::not_bash::{pushd, run}; + + // Latest stable, feel free to send a PR if this lags behind. +-const REQUIRED_RUST_VERSION: u32 = 47; ++const REQUIRED_RUST_VERSION: u32 = 46; + + pub struct InstallCmd { + pub client: Option, From 31106c85cb1dc50755f9dd41244575332b6b64c2 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Tue, 13 Oct 2020 23:50:53 -0400 Subject: [PATCH 127/546] powerline-go: 1.17.0 -> 1.18.0 --- pkgs/tools/misc/powerline-go/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix index 9ec7c0a32bf..16734e3dd3a 100644 --- a/pkgs/tools/misc/powerline-go/default.nix +++ b/pkgs/tools/misc/powerline-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "powerline-go"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "justjanne"; repo = pname; rev = "v${version}"; - sha256 = "135j18d53nhg6adjd2hax067c5f1py9fyprzfcr3plsxnaki2hrx"; + sha256 = "0dni842xzc8r6wbdfax25940jvxp69zk8xklczkjmyxqawvsxnjh"; }; vendorSha256 = "0dkgp9vlb76la0j439w0rb548qg5v8648zryk3rqgfhd4qywlk11"; From ab8f1f32f3cc373fa98067b5b547a4379030b38c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 14 Oct 2020 04:20:00 +0000 Subject: [PATCH 128/546] resvg: init at 0.11.0 --- pkgs/tools/graphics/resvg/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/graphics/resvg/default.nix diff --git a/pkgs/tools/graphics/resvg/default.nix b/pkgs/tools/graphics/resvg/default.nix new file mode 100644 index 00000000000..ea6a75eb3a5 --- /dev/null +++ b/pkgs/tools/graphics/resvg/default.nix @@ -0,0 +1,24 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "resvg"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "RazrFalcon"; + repo = pname; + rev = "v${version}"; + sha256 = "1qaca8wqwi2wqqx1yladjb4clgqdzsm8b7qsiaw0qascddjw1mcc"; + }; + + cargoSha256 = "1y10xzdf5kxbi9930qfsmryrbrkx1wmc5b216l9wcxq6cd77hxy2"; + + doCheck = false; + + meta = with lib; { + description = "An SVG rendering library"; + homepage = "https://github.com/RazrFalcon/resvg"; + license = licenses.mpl20; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81af27e78bb..629c9c17be1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6672,6 +6672,8 @@ in replace = callPackage ../tools/text/replace { }; + resvg = callPackage ../tools/graphics/resvg { }; + reckon = callPackage ../tools/text/reckon { }; recoverjpeg = callPackage ../tools/misc/recoverjpeg { }; From b3910a583c01a137b6337cb919777386d191b1ac Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 7 Oct 2020 06:57:15 +0200 Subject: [PATCH 129/546] ocamlPackages.gsl: init at 1.24.3 --- .../development/ocaml-modules/gsl/default.nix | 24 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 4 ++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/ocaml-modules/gsl/default.nix diff --git a/pkgs/development/ocaml-modules/gsl/default.nix b/pkgs/development/ocaml-modules/gsl/default.nix new file mode 100644 index 00000000000..c292c3d6ab5 --- /dev/null +++ b/pkgs/development/ocaml-modules/gsl/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchurl, buildDunePackage, pkg-config, gsl +, dune-configurator +}: + +buildDunePackage rec { + pname = "gsl"; + version = "1.24.3"; + + minimumOCamlVersion = "4.08"; + + src = fetchurl { + url = "https://github.com/mmottl/gsl-ocaml/releases/download/${version}/gsl-${version}.tbz"; + sha256 = "1mpzcgbrha2l8iikqbmn32668v2mnnsykxg5n5jgs0qnskn2nvrn"; + }; + + buildInputs = [ dune-configurator gsl pkg-config ]; + + meta = { + homepage = "https://mmottl.github.io/gsl-ocaml/"; + description = "OCaml bindings to the GNU Scientific Library"; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 95c1bb300af..865e1c9bd24 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -322,6 +322,10 @@ let inherit (pkgs) gnuplot; }; + gsl = callPackage ../development/ocaml-modules/gsl { + inherit (pkgs) gsl; + }; + hacl_x25519 = callPackage ../development/ocaml-modules/hacl_x25519 { }; herelib = callPackage ../development/ocaml-modules/herelib { }; From c0ab50b7412b3d480a79130c379fe1a0cb14395d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 7 Oct 2020 06:57:19 +0200 Subject: [PATCH 130/546] =?UTF-8?q?orpie:=201.5.2=20=E2=86=92=201.6.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/orpie/default.nix | 33 +++++++++++++++--------- pkgs/top-level/all-packages.nix | 5 +--- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/misc/orpie/default.nix b/pkgs/applications/misc/orpie/default.nix index d869b093955..2bf102fee25 100644 --- a/pkgs/applications/misc/orpie/default.nix +++ b/pkgs/applications/misc/orpie/default.nix @@ -1,21 +1,30 @@ -{ stdenv, fetchurl, ocamlPackages, ncurses, gsl }: +{ lib, fetchFromGitHub, ocamlPackages }: -stdenv.mkDerivation rec { +ocamlPackages.buildDunePackage rec { pname = "orpie"; - version = "1.5.2"; + version = "1.6.1"; - src = fetchurl { - url = "http://pessimization.com/software/orpie/${pname}-${version}.tar.gz"; - sha256 = "0v9xgpcf186ni55rkmx008msyszw0ypd6rd98hgwpih8yv3pymfy"; + src = fetchFromGitHub { + owner = "pelzlpj"; + repo = pname; + rev = "release-${version}"; + sha256 = "1rx2nl6cdv609pfymnbq53pi3ql5fr4kda8x10ycd9xq2gc4f21g"; }; - buildInputs = [ ncurses gsl ] ++ (with ocamlPackages; [ ocaml camlp4 ]); + preConfigure = '' + patchShebangs scripts + substituteInPlace scripts/compute_prefix \ + --replace '"topfind"' \ + '"${ocamlPackages.findlib}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/topfind"' + export PREFIX=$out + ''; + + buildInputs = with ocamlPackages; [ curses camlp5 num gsl ]; meta = { - homepage = "https://github.com/pelzlpj/orpie"; - description = "A fullscreen RPN calculator for the console"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ obadz ]; + inherit (src.meta) homepage; + description = "A Curses-based RPN calculator"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ obadz ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f8570899b2..260095a1979 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22671,10 +22671,7 @@ in opusTools = callPackage ../applications/audio/opus-tools { }; - orpie = callPackage ../applications/misc/orpie { - gsl = gsl_1; - ocamlPackages = ocaml-ng.ocamlPackages_4_02; - }; + orpie = callPackage ../applications/misc/orpie { }; osmo = callPackage ../applications/office/osmo { }; From 5a12d2797c43b19688fb9283c8db9f2bd378c438 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 14 Oct 2020 07:41:30 +0200 Subject: [PATCH 131/546] php: Fix pear path --- pkgs/development/interpreters/php/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 8286de744ed..dd296eb10d8 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -177,7 +177,7 @@ let ++ lib.optional (!cgiSupport) "--disable-cgi" ++ lib.optional (!cliSupport) "--disable-cli" ++ lib.optional fpmSupport "--enable-fpm" - ++ lib.optional pearSupport [ "--with-pear=$(out)/lib/php/pear" "--enable-xml" "--with-libxml" ] + ++ lib.optional pearSupport [ "--with-pear" "--enable-xml" "--with-libxml" ] ++ lib.optionals (pearSupport && (lib.versionOlder version "7.4")) [ "--enable-libxml" "--with-libxml-dir=${libxml2.dev}" From 9eb0c32118a0eb28917a5a130321ee983d579de3 Mon Sep 17 00:00:00 2001 From: Diego Rodriguez Date: Wed, 14 Oct 2020 00:30:40 -0600 Subject: [PATCH 132/546] minikube: 1.13.1 -> 1.14.0 --- pkgs/applications/networking/cluster/minikube/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 9a661263062..ff6e152a5ff 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -11,9 +11,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.13.1"; + version = "1.14.0"; - vendorSha256 = "09bcp7pqbs9j06z1glpad70dqlsnrf69vn75l00bdjknbrvbzrb9"; + vendorSha256 = "03imagmsfj9rv5g2sybpdx9y7vdwag3mrsjibgsbq3jhf7r1ib3g"; doCheck = false; @@ -21,7 +21,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "1x4x40nwcdshxzpg22v8nlzaprz1c6sizam47mwvqmb53p9qv90q"; + sha256 = "1nwpgfgw3vg8zy3mvjja13vdj12mys4crdm8cfimv9g3ka08dqpx"; }; nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; From a92c678c3f8a94eb892acf5cc3fd005fc86b92d6 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 14 Oct 2020 09:15:43 +0200 Subject: [PATCH 133/546] tremc: 0.9.1 -> 0.9.2 --- pkgs/applications/networking/p2p/tremc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/p2p/tremc/default.nix b/pkgs/applications/networking/p2p/tremc/default.nix index 37f2a3584ee..0cb8b228e26 100644 --- a/pkgs/applications/networking/p2p/tremc/default.nix +++ b/pkgs/applications/networking/p2p/tremc/default.nix @@ -10,15 +10,15 @@ let optional stdenv.isDarwin pbcopy ); in -python3Packages.buildPythonPackage rec { - version = "0.9.1"; +python3Packages.buildPythonApplication rec { pname = "tremc"; + version = "0.9.2"; src = fetchFromGitHub { owner = "tremc"; repo = pname; - rev = "0.9.1"; - sha256 = "1yhwvlcyv1s830p5a7q5x3mkb3mbvr5cn5nh7y62l5b6iyyynlvm"; + rev = version; + sha256 = "1fqspp2ckafplahgba54xmx0sjidx1pdzyjaqjhz0ivh98dkx2n5"; }; buildInputs = with python3Packages; [ From b42a421e47e9128df831c039df3bf80d02be8675 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 14 Oct 2020 09:25:09 +0200 Subject: [PATCH 134/546] transmission-remote-cli: remove This finally stopped working after transmission upgraded the API protocol to v3.0. --- .../p2p/transmission-remote-cli/default.nix | 26 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/applications/networking/p2p/transmission-remote-cli/default.nix diff --git a/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix b/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix deleted file mode 100644 index 7c6e35752a0..00000000000 --- a/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, pythonPackages }: - -stdenv.mkDerivation rec { - pname = "transmission-remote-cli"; - version = "1.7.1"; - - src = fetchurl { - url = "https://github.com/fagga/transmission-remote-cli/archive/v${version}.tar.gz"; - sha256 = "1y0hkpcjf6jw9xig8yf484hbhy63nip0pkchx401yxj81m25l4z9"; - }; - - buildInputs = with pythonPackages; [ python wrapPython ]; - - installPhase = '' - install -D transmission-remote-cli $out/bin/transmission-remote-cli - install -D transmission-remote-cli.1 $out/share/man/man1/transmission-remote-cli.1 - wrapPythonPrograms - ''; - - meta = { - description = "Curses interface for the Transmission BitTorrent daemon"; - homepage = "https://github.com/fagga/transmission-remote-cli"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9ae210ea051..130191d00b3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -612,6 +612,7 @@ mapAliases ({ 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 + transmission-remote-cli = "transmission-remote-cli has been removed, as the upstream project has been abandoned. Please use tremc instead"; # added 2020-10-14 transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned."; trilium = throw "trilium has been removed. Please use trilium-desktop instead."; # added 2020-04-29 truecrypt = veracrypt; # added 2018-10-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9a5665f52c..08e30f4792b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23791,7 +23791,6 @@ in transmission-gtk = transmission.override { enableGTK3 = true; }; transmission-qt = transmission.override { enableQt = true; }; - transmission-remote-cli = callPackage ../applications/networking/p2p/transmission-remote-cli {}; transmission-remote-gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk {}; transgui = callPackage ../applications/networking/p2p/transgui { }; From c3e6fbe81e9c5bf3b3cad5a7d4ad6d71914215dd Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 14 Oct 2020 09:28:34 +0200 Subject: [PATCH 135/546] tremc: set license to GPL 3+ --- pkgs/applications/networking/p2p/tremc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/tremc/default.nix b/pkgs/applications/networking/p2p/tremc/default.nix index 0cb8b228e26..485366afe93 100644 --- a/pkgs/applications/networking/p2p/tremc/default.nix +++ b/pkgs/applications/networking/p2p/tremc/default.nix @@ -44,6 +44,6 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Curses interface for transmission"; homepage = "https://github.com/tremc/tremc"; - license = licenses.gpl3; + license = licenses.gpl3Plus; }; } From 72e85c222357c14024a679326ea5f3603a56f175 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 14 Oct 2020 10:11:37 +0200 Subject: [PATCH 136/546] sentencepiece: 0.1.91 -> 0.1.93 Changelogs: https://github.com/google/sentencepiece/releases/tag/v0.1.92 https://github.com/google/sentencepiece/releases/tag/v0.1.93 The upstream release notes state that Python 2 is not supported anymore. However, this version still builds with Python 2 and tests pass without any issues. Therefore, this change does not disable Python 2 support yet. --- pkgs/development/libraries/sentencepiece/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/development/libraries/sentencepiece/default.nix index 41226865421..9b699035bf9 100644 --- a/pkgs/development/libraries/sentencepiece/default.nix +++ b/pkgs/development/libraries/sentencepiece/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentencepiece"; - version = "0.1.91"; + version = "0.1.93"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "1yg55h240iigjaii0k70mjb4sh3mgg54rp2sz8bx5glnsjwys5s3"; + sha256 = "0h9c1xs0sab23labh8m3ar6kvzfldv2id2f17icja61ihyw06nrd"; }; nativeBuildInputs = [ cmake ] ++ lib.optional withGPerfTools gperftools; From ffde8a8e1ed76caa1d213c3209dee7f75b57a20d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 14 Oct 2020 02:09:21 -0700 Subject: [PATCH 137/546] seabios: 1.13.0 -> 1.14.0 (#96616) --- pkgs/applications/virtualization/seabios/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/applications/virtualization/seabios/default.nix index d95f759783d..cd03759045a 100644 --- a/pkgs/applications/virtualization/seabios/default.nix +++ b/pkgs/applications/virtualization/seabios/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "seabios"; - version = "1.13.0"; + version = "1.14.0"; src = fetchurl { url = "https://www.seabios.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "00z7vdahpxa37irlf8ld350dp6z9qfyfb56vbfqr319hsv13srrp"; + sha256 = "1zc1brgafbbf5hmdr1qc1p859cabpz73l8sklq83xa4sn9icqw7b"; }; buildInputs = [ iasl python ]; From e37ee61a68d161ba97da162e6be42e00d81aa047 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 13 Oct 2020 13:38:56 +0200 Subject: [PATCH 138/546] xtuner: init at 1.0 --- pkgs/applications/audio/xtuner/default.nix | 39 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/audio/xtuner/default.nix diff --git a/pkgs/applications/audio/xtuner/default.nix b/pkgs/applications/audio/xtuner/default.nix new file mode 100644 index 00000000000..57ce3ab1511 --- /dev/null +++ b/pkgs/applications/audio/xtuner/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, fetchFromGitHub +, pkg-config +, cairo +, libX11 +, libjack2 +, liblo +, libsigcxx +, zita-resampler +, fftwFloat +}: + +stdenv.mkDerivation rec { + pname = "xtuner"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "brummer10"; + repo = "XTuner"; + rev = "v${version}"; + sha256 = "1i5chfnf3hcivwzni9z6cn9pb68qmwsx8bf4z7d29a5vig8kbhrv"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ cairo libX11 libjack2 liblo libsigcxx zita-resampler fftwFloat ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/brummer10/XTuner"; + description = "Tuner for Jack Audio Connection Kit"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89f6c752169..1653d1d976e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24581,6 +24581,8 @@ in xtruss = callPackage ../tools/X11/xtruss { }; + xtuner = callPackage ../applications/audio/xtuner { }; + xmacro = callPackage ../tools/X11/xmacro { }; xmenu = callPackage ../applications/misc/xmenu { }; From 2a7b1638716268f87bf37e0e7aee22dc4f002246 Mon Sep 17 00:00:00 2001 From: Nikita Uvarov Date: Wed, 14 Oct 2020 11:52:10 +0200 Subject: [PATCH 139/546] pythonPackages.titlecase: fix missing dependencies --- pkgs/development/python-modules/titlecase/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/titlecase/default.nix b/pkgs/development/python-modules/titlecase/default.nix index c1de2454e4b..acc8b9c5670 100644 --- a/pkgs/development/python-modules/titlecase/default.nix +++ b/pkgs/development/python-modules/titlecase/default.nix @@ -1,4 +1,4 @@ -{buildPythonPackage, lib, nose, fetchPypi}: +{ buildPythonPackage, lib, nose, fetchPypi, regex }: buildPythonPackage rec { pname = "titlecase"; @@ -9,6 +9,8 @@ buildPythonPackage rec { sha256 = "16e279edf085293bc9c44a68ce959c7d6cd5c653e6b5669a3a3640015cb63eb6"; }; + propagatedBuildInputs = [ regex ]; + checkInputs = [ nose ]; meta = { @@ -17,4 +19,3 @@ buildPythonPackage rec { license = lib.licenses.mit; }; } - From 7980473d7b376ab76c15a3aebc959d9516e695e6 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 14 Oct 2020 11:41:53 +0200 Subject: [PATCH 140/546] zam-plugins: 3.12 -> 3.13 --- pkgs/applications/audio/zam-plugins/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index a34773513d9..edcc70f9912 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchgit , boost, libX11, libGL, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }: +{ stdenv, fetchFromGitHub, boost, libX11, libGL, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "zam-plugins"; - version = "3.12"; + version = "3.13"; - src = fetchgit { - url = "https://github.com/zamaudio/zam-plugins.git"; - deepClone = true; - rev = "87fdee6e87dbee75c1088e2327ea59c1ab1522e4"; - sha256 = "0kz0xygff3ca1v9nqi0dvrzy9whbzqxrls5b7hydi808d795893n"; + src = fetchFromGitHub { + owner = "zamaudio"; + repo = pname; + rev = version; + sha256 = "02blg0iqich4vx5z1ahj6avkh83yqszdiq83p9jd5qwm0i4llqjq"; + fetchSubmodules = true; }; nativeBuildInputs = [ pkgconfig ]; From d9c98899072d72b37dd6325f8f69ebcd6889e97c Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 14 Oct 2020 11:22:17 +0200 Subject: [PATCH 141/546] padthv1: 0.9.16 -> 0.9.17 --- pkgs/applications/audio/padthv1/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index c5d20d965b9..29ef027f2f2 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftw, mkDerivation }: +{ stdenv, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftwFloat, mkDerivation }: mkDerivation rec { pname = "padthv1"; - version = "0.9.16"; + version = "0.9.17"; src = fetchurl { url = "mirror://sourceforge/padthv1/${pname}-${version}.tar.gz"; - sha256 = "1f2v60dpja0rnml60g463fjiz0f84v32yjwpvr56z79h1i6fssmv"; + sha256 = "098fk8fwcgssnfr1gilqg8g17zvch62lrn3rqsswpzbr3an5adb3"; }; - buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ]; + buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftwFloat ]; nativeBuildInputs = [ pkgconfig ]; From fcfd2a3d8860a374cb9f6acccc4822308900a799 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 14 Oct 2020 11:27:13 +0200 Subject: [PATCH 142/546] qmidinet: 0.6.2 -> 0.6.3 --- pkgs/applications/audio/qmidinet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix index 479a8a2bb04..9b9b84850dc 100644 --- a/pkgs/applications/audio/qmidinet/default.nix +++ b/pkgs/applications/audio/qmidinet/default.nix @@ -1,12 +1,12 @@ { mkDerivation, lib, fetchurl, pkgconfig, qtbase, qttools, alsaLib, libjack2 }: mkDerivation rec { - version = "0.6.2"; + version = "0.6.3"; pname = "qmidinet"; src = fetchurl { url = "mirror://sourceforge/qmidinet/${pname}-${version}.tar.gz"; - sha256 = "0siqzyhwg3l9av7jbca3bqdww7xspjlpi9ya4mkj211xc3a3a1d6"; + sha256 = "04jbvnf6yp9l0bhl1ym6zqkmaz8c2az3flq7qgflaxzj3isns1p1"; }; hardeningDisable = [ "format" ]; From e9bfa9a1a100edcb414274f4d84faba273aa07dd Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 14 Oct 2020 11:34:58 +0200 Subject: [PATCH 143/546] spectmorph: 0.5.1 -> 0.5.2 --- pkgs/applications/audio/spectmorph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spectmorph/default.nix b/pkgs/applications/audio/spectmorph/default.nix index d8209dad02d..ece6689a9d0 100644 --- a/pkgs/applications/audio/spectmorph/default.nix +++ b/pkgs/applications/audio/spectmorph/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "spectmorph"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { url = "http://spectmorph.org/files/releases/${pname}-${version}.tar.bz2"; - sha256 = "06jrfx5g9c56swxn78lix0gyrjkhi21l9wqs56knp8iqcgfi3m0s"; + sha256 = "0yrq7mknhk096wfsx0q3b6wwa2w5la0rxa113di26rrrw136xl1f"; }; buildInputs = [ libjack2 lv2 glib qt5.qtbase libao cairo libsndfile fftwFloat ]; From b38784b671c1ff8ed49b2382e93558ca4e1010b4 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 14 Oct 2020 11:38:06 +0200 Subject: [PATCH 144/546] wolf-shaper: 0.1.7 -> 0.1.8 --- pkgs/applications/audio/wolf-shaper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/wolf-shaper/default.nix b/pkgs/applications/audio/wolf-shaper/default.nix index 7d42a3c4e7b..ca16d60bea8 100644 --- a/pkgs/applications/audio/wolf-shaper/default.nix +++ b/pkgs/applications/audio/wolf-shaper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wolf-shaper"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "pdesaulniers"; repo = "wolf-shaper"; rev = "v${version}"; - sha256 = "0lllgcbnnh1m95bp29hh17x170hl7170zizjrvy892qfkn36830d"; + sha256 = "1j9xmh1nkf45ay1c5dz2g165qvrwlanzcq6mvb3nfxar265drd9q"; fetchSubmodules = true; }; From f8d78b9f67bdd3b6b12dbe1b6a2377ec0eef8050 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Mon, 28 Sep 2020 13:27:47 +0200 Subject: [PATCH 145/546] confinement: fix assert for serviceConfig.ProtectSystem serviceConfig.ProtectSystem is usually a string so if set, the assert itself would error out leaving no useable trace: # nixos-rebuild switch --show-trace building Nix... building the system configuration... error: while evaluating the attribute 'config.system.build.toplevel' at /nix/var/nix/profiles/per-user/root/channels/nixos/nixos/modules/system/activation/top-level.nix:293:5: while evaluating 'foldr' at /nix/var/nix/profiles/per-user/root/channels/nixos/lib/lists.nix:52:20, called from /nix/var/nix/profiles/per-user/root/channels/nixos/nixos/modules/system/activation/top-level.nix:128:12: while evaluating 'fold'' at /nix/var/nix/profiles/per-user/root/channels/nixos/lib/lists.nix:55:15, called from /nix/var/nix/profiles/per-user/root/channels/nixos/lib/lists.nix:59:8: while evaluating anonymous function at /nix/var/nix/profiles/per-user/root/channels/nixos/nixos/modules/system/activation/top-level.nix:121:50, called from undefined position: while evaluating the attribute 'assertion' at /nix/var/nix/profiles/per-user/root/channels/nixos/nixos/modules/security/systemd-confinement.nix:163:7: value is a string while a Boolean was expected Fix the check to give a sensible assert message instead; the attribute should either be not set or false bool to pass. Closes: #99000 --- nixos/modules/security/systemd-confinement.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/systemd-confinement.nix b/nixos/modules/security/systemd-confinement.nix index 2927d424a8a..afb81a2b56b 100644 --- a/nixos/modules/security/systemd-confinement.nix +++ b/nixos/modules/security/systemd-confinement.nix @@ -160,7 +160,7 @@ in { + " the 'users.users' option instead as this combination is" + " currently not supported."; } - { assertion = !cfg.serviceConfig.ProtectSystem or false; + { assertion = cfg.serviceConfig ? ProtectSystem -> cfg.serviceConfig.ProtectSystem == false; message = "${whatOpt "ProtectSystem"}. ProtectSystem is not compatible" + " with service confinement as it fails to remount /usr within" + " our chroot. Please disable the option."; From b77e30043e2ef90359b6a32269ace848073f7c0d Mon Sep 17 00:00:00 2001 From: Thomas Droxler Date: Mon, 12 Oct 2020 09:15:12 +0200 Subject: [PATCH 146/546] perlPackages.AppPackager: init at 1.430.1 --- pkgs/top-level/perl-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c9b6f783649..e8315d2d58d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -597,6 +597,19 @@ let }; }; + AppPackager = buildPerlPackage { + pname = "App-Packager"; + version = "1.430.1"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JV/JV/App-Packager-1.430.1.tar.gz"; + sha256 = "57f4d014458387f9e2ed2dfd8615d1e2545b8a6504b10af22486578d8be374a3"; + }; + meta = { + description = "Abstraction for Packagers"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Appperlbrew = buildPerlModule { pname = "App-perlbrew"; version = "0.88"; From f6037690c176acafd4493e25c49c3df9d1523c94 Mon Sep 17 00:00:00 2001 From: Thomas Droxler Date: Mon, 12 Oct 2020 09:15:31 +0200 Subject: [PATCH 147/546] perlPackages.FileLoadLines: init at 0.02 --- pkgs/top-level/perl-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e8315d2d58d..4d963cc4a06 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7815,6 +7815,19 @@ let propagatedBuildInputs = [ HTTPDate ]; }; + FileLoadLines = buildPerlPackage { + pname = "File-LoadLines"; + version = "0.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JV/JV/File-LoadLines-0.02.tar.gz"; + sha256 = "ab0c1c31cf7b694dd3c9a0707098f7483763d46b60799a7f496ea0588be46b7b"; + }; + meta = { + description = "Load lines from file"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + FileMimeInfo = buildPerlPackage { pname = "File-MimeInfo"; version = "0.29"; From 19935694da047c3b8c049ee38fbfeb580c7db173 Mon Sep 17 00:00:00 2001 From: Thomas Droxler Date: Mon, 12 Oct 2020 09:15:52 +0200 Subject: [PATCH 148/546] perlPackages.StringInterpolateNamed: init at 1.00 --- pkgs/top-level/perl-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4d963cc4a06..fda891379a6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18260,6 +18260,19 @@ let propagatedBuildInputs = [ PadWalker SafeHole ]; }; + StringInterpolateNamed = buildPerlPackage { + pname = "String-Interpolate-Named"; + version = "1.00"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JV/JV/String-Interpolate-Named-1.00.tar.gz"; + sha256 = "727299fa69258b604770e059ec4da906bfde71861fdd1e3e89e30677371c5a80"; + }; + meta = { + description = "Interpolated named arguments in string"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + StringMkPasswd = buildPerlPackage { pname = "String-MkPasswd"; version = "0.05"; From f5ac538395cbe4f41a2e754408bb61757a0cdfe9 Mon Sep 17 00:00:00 2001 From: Thomas Droxler Date: Wed, 14 Oct 2020 07:18:46 +0200 Subject: [PATCH 149/546] perlPackages.TextLayout: init at 0.019 --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fda891379a6..f62cdfec564 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20995,6 +20995,20 @@ let buildInputs = [ FileFindRule TestPod TestPodCoverage ]; }; + TextLayout = buildPerlPackage { + pname = "Text-Layout"; + version = "0.019"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JV/JV/Text-Layout-0.019.tar.gz"; + sha256 = "a043f2a89e113b29c523a9efa71fa8398ed75edd482193901b38d08dd4a4108e"; + }; + buildInputs = [ PDFAPI2 ]; + meta = { + description = "Pango style markup formatting"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TextLorem = buildPerlModule { pname = "Text-Lorem"; version = "0.3"; From f37f5381b106fb1ce68ce3d5c4b5773bc5088c2b Mon Sep 17 00:00:00 2001 From: Thomas Droxler Date: Mon, 12 Oct 2020 09:16:00 +0200 Subject: [PATCH 150/546] perlPackages.AppMusicChordPro: init at 0.977 --- pkgs/top-level/perl-packages.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f62cdfec564..bb4f8bad3fc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -597,6 +597,28 @@ let }; }; + AppMusicChordPro = buildPerlPackage { + pname = "App-Music-ChordPro"; + version = "0.977"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JV/JV/App-Music-ChordPro-0.977.tar.gz"; + sha256 = "0ggip43cddi5f6rylb07f56dhkfhbcbm621lvcnjfadnn9lrbwqh"; + }; + buildInputs = [ PodParser ]; + propagatedBuildInputs = [ AppPackager FileLoadLines IOString ImageInfo PDFAPI2 StringInterpolateNamed TextLayout ] + ++ stdenv.lib.optional (!stdenv.isDarwin) [ Wx ]; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/chordpro + rm $out/bin/wxchordpro # Wx not supported on darwin + ''; + meta = { + homepage = "http://www.chordpro.org"; + description = "A lyrics and chords formatting program"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + AppPackager = buildPerlPackage { pname = "App-Packager"; version = "1.430.1"; From 8928358521fd9b0c966981619076d0364c9f68d2 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Wed, 14 Oct 2020 20:02:26 +0900 Subject: [PATCH 151/546] nushell 0.20.0 -> 0.21.0 --- pkgs/shells/nushell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 628c61db329..c3e6c5b6753 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "038c61605b92a97h84hlifwks0q6miv6rn7spr5h6h2nwvaqlyk6"; + sha256 = "19bpxx9pi3cl5y7h5qg4a2pmvwqavm1vciyvsq96kxkc7rq2xwvl"; }; - cargoSha256 = "1vr0pqcv9gm4cwlkd06672jzz9rbm77c6j5r05waypc1lv4ln2cg"; + cargoSha256 = "1ghbzahz8lbk11sjy2kis12w22rjr92aaw451rmc86pk2lsxn0dx"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; From 96a2008d09c8cd6337cb93e0765e418386edd681 Mon Sep 17 00:00:00 2001 From: Nikita Uvarov Date: Wed, 14 Oct 2020 13:36:03 +0200 Subject: [PATCH 152/546] pythonPackages.pyatv: 0.7.2 -> 0.7.4 Also fixes build by switching to github since base_versions.txt is missing in pypi. --- .../python-modules/pyatv/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 8d6da02e5f1..68549e5cabd 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage , aiohttp , aiozeroconf , asynctest @@ -11,15 +11,20 @@ , pytest-asyncio , pytestrunner , srptools +, zeroconf +, fetchFromGitHub +, pytestCheckHook }: buildPythonPackage rec { pname = "pyatv"; - version = "0.7.2"; + version = "v0.7.4"; - src = fetchPypi { - inherit pname version; - sha256 = "83d86fac517d33a1e3063a547ee2a520fde74c74a1b95cb5a6f20afccfd59843"; + src = fetchFromGitHub { + owner = "postlund"; + repo = pname; + rev = version; + sha256 = "17gsamn4aibsx4w50r9dwr5kr9anc7dd0f0dvmdl717rkgh13zyi"; }; nativeBuildInputs = [ pytestrunner]; @@ -31,6 +36,8 @@ buildPythonPackage rec { protobuf cryptography netifaces + zeroconf + pytestCheckHook ]; checkInputs = [ @@ -40,11 +47,6 @@ buildPythonPackage rec { pytest-asyncio ]; - # just run vanilla pytest to avoid inclusion of coverage reports and xdist - checkPhase = '' - pytest - ''; - meta = with stdenv.lib; { description = "A python client library for the Apple TV"; homepage = "https://github.com/postlund/pyatv"; From 706fdae2861a1ea42cb9b1d36d4d503665d09b46 Mon Sep 17 00:00:00 2001 From: leenaars Date: Wed, 14 Oct 2020 14:39:30 +0200 Subject: [PATCH 153/546] Sylk: 2.9.0 -> 2.9.1 (#100490) --- pkgs/applications/networking/Sylk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/applications/networking/Sylk/default.nix index 818ec5d2a6a..164e2b1ea79 100644 --- a/pkgs/applications/networking/Sylk/default.nix +++ b/pkgs/applications/networking/Sylk/default.nix @@ -2,7 +2,7 @@ let pname = "Sylk"; - version = "2.9.0"; + version = "2.9.1"; in appimageTools.wrapType2 rec { @@ -10,7 +10,7 @@ appimageTools.wrapType2 rec { src = fetchurl { url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage"; - hash = "sha256-vhLZkU4MNAlITsJD+xYPDxeimGw6nHn/Rb5nu35uOfQ="; + hash = "sha256-Y1FR1tYZTxhMFn6NL578otitmOsngMJBPK/9cpCqE/Q="; }; profile = '' From 2c9ffab4e28345244c7a8440be1ae48651d7c859 Mon Sep 17 00:00:00 2001 From: Jason Felice Date: Tue, 13 Oct 2020 16:27:53 -0400 Subject: [PATCH 154/546] rep: init at 0.2.1 --- pkgs/development/tools/rep/default.nix | 30 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/tools/rep/default.nix diff --git a/pkgs/development/tools/rep/default.nix b/pkgs/development/tools/rep/default.nix new file mode 100644 index 00000000000..d24056f1d02 --- /dev/null +++ b/pkgs/development/tools/rep/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, asciidoc-full }: + +stdenv.mkDerivation rec { + pname = "rep"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "eraserhd"; + repo = pname; + rev = "v${version}"; + sha256 = "1p0dbaj7f4irzzw1m44x3b3j3jjij9i4rs83wkrpiamlq61077di"; + }; + + nativeBuildInputs = [ + asciidoc-full + ]; + + postPatch = '' + substituteInPlace rc/rep.kak --replace '$(rep' '$('"$out/bin/rep" + ''; + makeFlags = [ "prefix=$(out)" ]; + + meta = with stdenv.lib; { + description = "Single-shot nREPL client"; + homepage = "https://github.com/eraserhd/rep"; + license = licenses.epl10; + platforms = platforms.all; + maintainers = [ maintainers.eraserhd ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78dd1302380..ff631006db3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6609,6 +6609,8 @@ in redsocks = callPackage ../tools/networking/redsocks { }; + rep = callPackage ../development/tools/rep { }; + reredirect = callPackage ../tools/misc/reredirect { }; retext = libsForQt5.callPackage ../applications/editors/retext { }; From 1de9229825a484ec2621dafe63acf59b6856de52 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 14 Oct 2020 08:46:41 -0400 Subject: [PATCH 155/546] linux: Remove 5.7 I forgot to remove a file in 6d174dd5e0650073971a75efec218c79cbce951f --- pkgs/os-specific/linux/kernel/linux-5.7.nix | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-5.7.nix diff --git a/pkgs/os-specific/linux/kernel/linux-5.7.nix b/pkgs/os-specific/linux/kernel/linux-5.7.nix deleted file mode 100644 index 4f721d8b0e4..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-5.7.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: - -with stdenv.lib; - -buildLinux (args // rec { - version = "5.7.19"; - - # 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; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1rwzp51ddlkdzanj6i8jqj5yh0njpzn7ly4r8nnzwkdfp5465721"; - }; -} // (args.argsOverride or {})) From deae249afdb20cb413fc5f1e49d49a5458f0ff85 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 14 Oct 2020 08:47:58 -0400 Subject: [PATCH 156/546] linux/hardened/patches/5.7: remove --- pkgs/os-specific/linux/kernel/hardened/patches.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index d3d678ebf43..66462c1a0b8 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -14,11 +14,6 @@ "sha256": "19g7yp4dip92bh54vd8vbn7cd4p691yvb52nz76p74fdksfa71m5", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.70.a/linux-hardened-5.4.70.a.patch" }, - "5.7": { - "name": "linux-hardened-5.7.19.a.patch", - "sha256": "1lydlh499aj3ck5cnv8q2271y4klvp17zm7j7qni16am14bld936", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.19.a/linux-hardened-5.7.19.a.patch" - }, "5.8": { "name": "linux-hardened-5.8.14.a.patch", "sha256": "08w3w0w5sw7lgm6zpsy55fz1h42s2aqcznfgxi31yv9qski31lbz", From cd85afd0eb4d967dbdad3c203b9a45570cdbd1a1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 14 Oct 2020 08:48:17 -0400 Subject: [PATCH 157/546] linux: 4.14.200 -> 4.14.201 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 5e99e74fbe6..dd0d2c2a627 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.200"; + version = "4.14.201"; # 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 = "0f4sd4fqgm1wbhmrsib04ry5aza84mlc8747y5wm6jx34h14lh2x"; + sha256 = "0nr3w5m7dz28v7qfhp99ih4c369qrhq751wfikbz8ga3di0dqa72"; }; } // (args.argsOverride or {})) From 6f4ad8b16c07c6f1be3089404b5191b8786e345f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 14 Oct 2020 08:48:24 -0400 Subject: [PATCH 158/546] linux: 4.19.150 -> 4.19.151 --- 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 c862a50b3e3..d4e72cb3cbd 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.150"; + version = "4.19.151"; # 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 = "1kmsrinhy67vh34m6z3xinwg3v6z8jm7v1asq6rqqkba13phkxzj"; + sha256 = "0vm3nsi9la3azxrsvndbd6fpz79pch7309f2144xyxszsk339cf7"; }; } // (args.argsOverride or {})) From 3b4fa12966092dd2867abd025db3bb4d5fea580f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 14 Oct 2020 08:48:30 -0400 Subject: [PATCH 159/546] linux: 4.4.238 -> 4.4.239 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index b8e71531876..49591f63479 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.238"; + version = "4.4.239"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0r1kb7p0zf0nkavvf9nr9hs7bdjym43cqv87hkp7vrqpbh1i8y06"; + sha256 = "03myd9ngmjmnddh4iqqsgcfg9rd11vyvwym38yh4m1p08j1zbg0k"; }; } // (args.argsOverride or {})) From 3406c0937470908317261cb814b936df66751c5a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 14 Oct 2020 08:48:36 -0400 Subject: [PATCH 160/546] linux: 4.9.238 -> 4.9.239 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index c6ab9134e9d..114629bad57 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.238"; + version = "4.9.239"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0gsa2g5yjc7459ja107nla700ma32sg57dyj8q2xzi0yfw5zdsmi"; + sha256 = "0lfbn5amykvwz1svvxayzhsz1dvm4mgzsnq1g0wqffclxm148hr3"; }; } // (args.argsOverride or {})) From 46e2758200d69f26b6fe39e91f6ad55b8a524d1c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 14 Oct 2020 08:48:46 -0400 Subject: [PATCH 161/546] linux: 5.4.70 -> 5.4.71 --- 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 32d4106bfe5..35025efb657 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.70"; + version = "5.4.71"; # 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 = "01shqhibrxirl9bik8jwiag70n9n0l7782xh73gkb8jvbh4dicy0"; + sha256 = "1ivcimngj5h7lxslkrdljpfw9hfvdhrm8wrp7gp4d3gk7kpljw3k"; }; } // (args.argsOverride or {})) From bf540edc5dd4f5b0962bace7dfc145de41d0c05c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 14 Oct 2020 08:48:54 -0400 Subject: [PATCH 162/546] linux: 5.8.14 -> 5.8.15 --- 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 744b547e2bc..3e13d9eb9ce 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.14"; + version = "5.8.15"; # 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 = "1bzh82jpwcxsdzp6p1r8qlq9v5x79flhnzyimkcll8wdh28pjxpf"; + sha256 = "0hfnq4n902pws8sjxd1lsdxxa0v45g988imp73xnqfqv2d71r0bj"; }; } // (args.argsOverride or {})) From 722a480c884cb15331e991a87becf3b4c2a59808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 7 Oct 2020 18:11:21 -0300 Subject: [PATCH 163/546] marwaita-ubuntu: init at 1.5 --- pkgs/data/themes/marwaita-ubuntu/default.nix | 46 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/data/themes/marwaita-ubuntu/default.nix diff --git a/pkgs/data/themes/marwaita-ubuntu/default.nix b/pkgs/data/themes/marwaita-ubuntu/default.nix new file mode 100644 index 00000000000..0241748bc43 --- /dev/null +++ b/pkgs/data/themes/marwaita-ubuntu/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, fetchFromGitHub +, gdk-pixbuf +, gtk-engine-murrine +, gtk_engines +, librsvg +}: + +stdenv.mkDerivation rec { + pname = "marwaita-ubuntu"; + version = "1.5"; + + src = fetchFromGitHub { + owner = "darkomarko42"; + repo = pname; + rev = version; + sha256 = "0mld78s6gl5kfsdaqa7xs5mvfng9600pd2d9sp2b2q5axx7wjay5"; + }; + + buildInputs = [ + gdk-pixbuf + gtk_engines + librsvg + ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + cp -a Marwaita* $out/share/themes + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Ubuntu Style of Marwaita GTK theme"; + homepage = "https://www.pling.com/p/1352833/"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94112767683..ca4cb686486 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19212,6 +19212,8 @@ in marwaita-pop_os = callPackage ../data/themes/marwaita-pop_os { }; + marwaita-ubuntu = callPackage ../data/themes/marwaita-ubuntu { }; + matcha-gtk-theme = callPackage ../data/themes/matcha { }; materia-theme = callPackage ../data/themes/materia-theme { }; From b7b62de54d7d747db98a7a858e9c57f2e0a14d73 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 14 Oct 2020 16:12:26 +0200 Subject: [PATCH 164/546] tree-sitter: 0.16.9 -> 0.17.1 --- pkgs/development/tools/parsing/tree-sitter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 7f48a6ad97d..63082f60ac2 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -11,9 +11,9 @@ let # 1) change all these hashes # 2) nix-build -A tree-sitter.updater.update-all-grammars # 3) run the ./result script that is output by that (it updates ./grammars) - version = "0.16.9"; - sha256 = "sha256-e5Ft+jEpExLgBBFmiswW0VFrsKume4gmUiOiF4ODhhQ="; - cargoSha256 = "sha256-XbPLQEvf4JX517ddpx18eweiPrztS5E/X2pejkqmlCU="; + version = "0.17.1"; + sha256 = "sha256-k61actAEyao/Ea8aw9PCm252U+1I0d43MAYC68/lui4="; + cargoSha256 = "sha256-Jp/Fl20ZZfaIdWinOOujNVH5JjJNtyUYHfyTrmeeoRg="; src = fetchFromGitHub { owner = "tree-sitter"; From 29e5f73fa8eb6cda0306df484fd54ceffcc7296d Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 14 Oct 2020 16:14:00 +0200 Subject: [PATCH 165/546] tree-sitter.grammars.lua: init --- .../tools/parsing/tree-sitter/grammars/default.nix | 1 + .../parsing/tree-sitter/grammars/tree-sitter-lua.json | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 5898997dd6e..083dc61a96f 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -8,6 +8,7 @@ javascript = (builtins.fromJSON (builtins.readFile ./tree-sitter-javascript.json)); jsdoc = (builtins.fromJSON (builtins.readFile ./tree-sitter-jsdoc.json)); json = (builtins.fromJSON (builtins.readFile ./tree-sitter-json.json)); + lua = (builtins.fromJSON (builtins.readFile ./tree-sitter-lua.json)); php = (builtins.fromJSON (builtins.readFile ./tree-sitter-php.json)); python = (builtins.fromJSON (builtins.readFile ./tree-sitter-python.json)); ruby = (builtins.fromJSON (builtins.readFile ./tree-sitter-ruby.json)); diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json new file mode 100644 index 00000000000..267d25a52a0 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json @@ -0,0 +1,10 @@ +{ + "url": "https://github.com/nvim-treesitter/tree-sitter-lua", + "rev": "278b0ea1f1f3d86afc86faaca0cbbf6c01182a54", + "date": "2020-09-08T18:29:23+02:00", + "path": "/nix/store/xkaqsw030bf6zd6pivrzrg3d50j1ka1k-tree-sitter-lua", + "sha256": "0i8jdp0bbl02h58hfhpild4v3rvy8yk5r5l90navvfxw4ad4f6f3", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} From 00daf410b5aba389849b8e01147da7c0c1683d89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 14 Oct 2020 17:31:21 +0200 Subject: [PATCH 166/546] _1password-gui: 0.8.9 -> 0.8.10 Changelog: https://releases.1password.com/linux/0.8/#1password-for-linux-0.8.10 --- pkgs/tools/security/1password-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix index 94549c2e774..3def4bfd21f 100644 --- a/pkgs/tools/security/1password-gui/default.nix +++ b/pkgs/tools/security/1password-gui/default.nix @@ -13,11 +13,11 @@ in stdenv.mkDerivation rec { pname = "1password"; - version = "0.8.9"; + version = "0.8.10"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - sha256 = "0gmflx7psyajxx6g82lrhmfwnh306sixwd1hykrn2xl3ncw65ydr"; + sha256 = "0jxq7gc1m2flv3wr055bkwhfh73c2cdpspg437dv4yvfvjqsk7mm"; }; nativeBuildInputs = [ makeWrapper ]; From 258ebb540e43b614d4ff206b3d445de9de570ecf Mon Sep 17 00:00:00 2001 From: Nicolas Berbiche Date: Wed, 14 Oct 2020 12:10:30 -0400 Subject: [PATCH 167/546] ytop: remove Upstream has archived the repository and recommends bottom --- pkgs/tools/system/ytop/default.nix | 27 --------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 pkgs/tools/system/ytop/default.nix diff --git a/pkgs/tools/system/ytop/default.nix b/pkgs/tools/system/ytop/default.nix deleted file mode 100644 index 64c3bf93aaa..00000000000 --- a/pkgs/tools/system/ytop/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, rustPlatform, fetchFromGitHub, IOKit }: - -assert stdenv.isDarwin -> IOKit != null; - -rustPlatform.buildRustPackage rec { - pname = "ytop"; - version = "0.6.2"; - - src = fetchFromGitHub { - owner = "cjbassi"; - repo = pname; - rev = version; - sha256 = "02cpn5257yrmbakx3mlqs97kfambbn9ljb60jbqr1b9w24kd6zgf"; - }; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; - - cargoSha256 = "0alqzy9gbj9m4l7xj1jsrnl09pv6z7c73gq787cqwn0gj93aaj19"; - - meta = with stdenv.lib; { - description = "A TUI system monitor written in Rust"; - homepage = "https://github.com/cjbassi/ytop"; - license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9ae210ea051..44f279e8b7b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -661,6 +661,7 @@ mapAliases ({ xpraGtk3 = xpra; # added 2018-09-13 xv = xxv; # added 2020-02-22 youtubeDL = youtube-dl; # added 2014-10-26 + ytop = throw "Abandoned by upstream. Consider switching to bottom instead"; zdfmediathk = mediathekview; # added 2019-01-19 gnome_user_docs = gnome-user-docs; # added 2019-11-20 # spidermonkey is not ABI upwards-ompatible, so only allow this for nix-shell diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06a0c8f559b..45ce777aa0c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8228,10 +8228,6 @@ in yeshup = callPackage ../tools/system/yeshup { }; - ytop = callPackage ../tools/system/ytop { - inherit (darwin.apple_sdk.frameworks) IOKit; - }; - ytree = callPackage ../tools/misc/ytree { }; yggdrasil = callPackage ../tools/networking/yggdrasil { }; From 03ce325365c54841dcffacb7069dff408d04c14a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 14 Oct 2020 17:59:50 +0200 Subject: [PATCH 168/546] nixos/doc: Fix one command to build the NixOS manual This one occurrence wasn't updated: $ git grep "nix-build nixos/release.nix -A manual" nixos/doc/manual/README: nix-build nixos/release.nix -A manual.x86_64-linux nixos/doc/manual/development/meta-attributes.xml:$ nix-build nixos/release.nix -A manual nixos/doc/manual/development/writing-documentation.xml:nix-build nixos/release.nix -A manual.x86_64-linux --- nixos/doc/manual/development/meta-attributes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/development/meta-attributes.xml b/nixos/doc/manual/development/meta-attributes.xml index c626ef30e9d..c40be0a50c3 100644 --- a/nixos/doc/manual/development/meta-attributes.xml +++ b/nixos/doc/manual/development/meta-attributes.xml @@ -57,7 +57,7 @@ linkend="ch-configuration"/>. Changes to a module documentation have to be checked to not break building the NixOS manual: -$ nix-build nixos/release.nix -A manual +$ nix-build nixos/release.nix -A manual.x86_64-linux From 5aaf8968ea89fb070c21166bff38dd2b41e6cf0b Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 14 Oct 2020 18:20:11 +0200 Subject: [PATCH 169/546] phpExtensions.rdkafka: 4.0.3 -> 4.0.4 --- pkgs/development/php-packages/rdkafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/rdkafka/default.nix b/pkgs/development/php-packages/rdkafka/default.nix index f96b1800769..98944d3bab6 100644 --- a/pkgs/development/php-packages/rdkafka/default.nix +++ b/pkgs/development/php-packages/rdkafka/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "rdkafka"; - version = "4.0.3"; - sha256 = "1g00p911raxcc7n2w9pzadxaggw5c564md6hjvqfs9ip550y5x16"; + version = "4.0.4"; + sha256 = "18a8p43i2g93fv7qzvk2hk66z5iv0mk1rqn097x49bjigliv60mn"; buildInputs = [ pkgs.rdkafka pcre' ]; From e004a8bee53dbc270196f5901e97db43f5273315 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 14 Oct 2020 18:21:31 +0200 Subject: [PATCH 170/546] phpExtensions.maxminddb: 1.7.0 -> 1.8.0 --- pkgs/development/php-packages/maxminddb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/maxminddb/default.nix b/pkgs/development/php-packages/maxminddb/default.nix index e3a9584db1c..9244bcbc109 100644 --- a/pkgs/development/php-packages/maxminddb/default.nix +++ b/pkgs/development/php-packages/maxminddb/default.nix @@ -1,7 +1,7 @@ { buildPecl, lib, pkgs }: let pname = "maxminddb"; - version = "1.7.0"; + version = "1.8.0"; in buildPecl { inherit pname version; @@ -10,7 +10,7 @@ buildPecl { owner = "maxmind"; repo = "MaxMind-DB-Reader-php"; rev = "v${version}"; - sha256 = "16msc9s15y43lxw89kj51aldlkd57dc8gms199i51jc984b68ljc"; + sha256 = "0cpd8d1xnkxsrf28z25xzgkkf3wc13ia99v8f7hbl7csvnggs7nn"; }; buildInputs = [ pkgs.libmaxminddb ]; From 395314da5bc136c6ab2ed7af5a8995f6660402c3 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 14 Oct 2020 18:23:55 +0200 Subject: [PATCH 171/546] phpExtensions.apcu: 5.1.18 -> 5.1.19 --- pkgs/development/php-packages/apcu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix index fab4f534d43..04b611fd598 100644 --- a/pkgs/development/php-packages/apcu/default.nix +++ b/pkgs/development/php-packages/apcu/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "apcu"; - version = "5.1.18"; - sha256 = "0ayykd4hfvdzk7qnr5k6yq5scwf6rb2i05xscfv76q5dmkkynvfl"; + version = "5.1.19"; + sha256 = "1q3c4y9jqh1yz5vps2iiz2x04vn0y1g5ibxg1x8zp7n7sncvqzw3"; buildInputs = [ pcre' ]; doCheck = true; From 796984be065ba3cb67182467884eb512df46af7a Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 14 Oct 2020 18:27:41 +0200 Subject: [PATCH 172/546] phpPackages.phpstan: 0.12.48 -> 0.12.49 --- pkgs/development/php-packages/phpstan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 2e4b55a58f9..870f716a78c 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "phpstan"; - version = "0.12.48"; + version = "0.12.49"; in mkDerivation { inherit pname version; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "170yzz23lyipyckv8y2x9masv5qdmbskwwlbfc8750xb3g2q7pzl"; + sha256 = "140r07c3vxkyrfzg2m97ndnxh8vlkhv0dy06yw0lxgg63hv9lhma"; }; phases = [ "installPhase" ]; From cffb7cfbf755e5166a3a41594978e838942ef17f Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Wed, 7 Oct 2020 23:29:47 +0200 Subject: [PATCH 173/546] llvmPackages_11: 11.0.0rc5 -> 11.0.0 https://lists.llvm.org/pipermail/release-testers/2020-October/001377.html https://lists.llvm.org/pipermail/llvm-announce/2020-October/000089.html Fixes: - builds on Darwin - builds `libcxx` on Linux --- .../compilers/llvm/11/clang/default.nix | 2 +- .../compilers/llvm/11/compiler-rt.nix | 6 ++++- .../development/compilers/llvm/11/default.nix | 7 +++--- .../compilers/llvm/11/libc++/default.nix | 22 +++++++++---------- .../compilers/llvm/11/libc++abi.nix | 9 ++++---- .../compilers/llvm/11/libunwind.nix | 2 +- pkgs/development/compilers/llvm/11/lld.nix | 2 +- pkgs/development/compilers/llvm/11/lldb.nix | 2 +- pkgs/development/compilers/llvm/11/llvm.nix | 6 ++--- pkgs/development/compilers/llvm/11/openmp.nix | 2 +- 10 files changed, 31 insertions(+), 29 deletions(-) diff --git a/pkgs/development/compilers/llvm/11/clang/default.nix b/pkgs/development/compilers/llvm/11/clang/default.nix index 53292ef844b..2aefc884d48 100644 --- a/pkgs/development/compilers/llvm/11/clang/default.nix +++ b/pkgs/development/compilers/llvm/11/clang/default.nix @@ -8,7 +8,7 @@ let pname = "clang"; inherit version; - src = fetch "clang" "1p64l5a3x55118nyms1805qbk3r9w37nz1rb7xvbgc9fmyzaffay"; + src = fetch "clang" "02ajkij85966vd150iy246mv16dsaph1kfi0y8wnncp8w6nar5hg"; inherit clang-tools-extra_src; unpackPhase = '' diff --git a/pkgs/development/compilers/llvm/11/compiler-rt.nix b/pkgs/development/compilers/llvm/11/compiler-rt.nix index e0cb712fe61..417c610586e 100644 --- a/pkgs/development/compilers/llvm/11/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/11/compiler-rt.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { pname = "compiler-rt"; inherit version; - src = fetch pname "0cpyi5g0wlwyb7gvy47k5rjiipnlhrr3ks4q4rlrlyax6w9dx98n"; + src = fetch pname "0d5j5l8phwqjjscmk8rmqn0i2i0abl537gdbkagl8fjpzy1gyjip"; nativeBuildInputs = [ cmake python3 llvm ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" + ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ + "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON" ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" @@ -60,6 +62,8 @@ stdenv.mkDerivation rec { substituteInPlace cmake/builtin-config-ix.cmake \ --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' '' + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(ARM64 arm64 arm64e)' 'set(ARM64)' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' '' + stdenv.lib.optionalString (useLLVM) '' diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index eb2349f0acd..0b091c60973 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -6,16 +6,15 @@ let release_version = "11.0.0"; - candidate = "rc5"; - version = "${release_version}${candidate}"; # differentiating these (variables) is important for RCs + version = "${release_version}"; # differentiating these (variables) is important for RCs targetConfig = stdenv.targetPlatform.config; fetch = name: sha256: fetchurl { - url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}-${candidate}/${name}-${version}.src.tar.xz"; + url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz"; inherit sha256; }; - clang-tools-extra_src = fetch "clang-tools-extra" "0slqx5430pc699idabqnq34s9n0y2fq6q8z8hn5wakbi93dal71r"; + clang-tools-extra_src = fetch "clang-tools-extra" "02bcwwn54661madhq4nxc069s7p7pj5gpqi8ww50w3anbpviilzy"; tools = stdenv.lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); diff --git a/pkgs/development/compilers/llvm/11/libc++/default.nix b/pkgs/development/compilers/llvm/11/libc++/default.nix index 7a7cf06600b..1ce879cccb6 100644 --- a/pkgs/development/compilers/llvm/11/libc++/default.nix +++ b/pkgs/development/compilers/llvm/11/libc++/default.nix @@ -1,33 +1,31 @@ -{ lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version +{ lib, stdenv, fetch, cmake, python3, libcxxabi, llvm, fixDarwinDylibNames, version , enableShared ? true }: stdenv.mkDerivation { pname = "libc++"; inherit version; - src = fetch "libcxx" "1rlp8hx0nmqpx0gxq8hh9kqbkkzfpadx9chm47c38d4lahdksr1v"; + src = fetch "libcxx" "0ylbkcd38zrrz9xmkq9na3d9s8d96hc286dwfwd73wi205lyc7kc"; postUnpack = '' unpackFile ${libcxxabi.src} - export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" + mv libcxxabi-* libcxxabi + unpackFile ${llvm.src} + mv llvm-* llvm ''; patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch; - preConfigure = '' - # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package - cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR") - '' + lib.optionalString stdenv.hostPlatform.isMusl '' + preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py ''; - nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3; - buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ cmake python3 ] + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + + buildInputs = [ libcxxabi ]; cmakeFlags = [ - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" - "-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_CXX_ABI=libcxxabi" ] ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" diff --git a/pkgs/development/compilers/llvm/11/libc++abi.nix b/pkgs/development/compilers/llvm/11/libc++abi.nix index ba3b7fd9d92..edf83197d2c 100644 --- a/pkgs/development/compilers/llvm/11/libc++abi.nix +++ b/pkgs/development/compilers/llvm/11/libc++abi.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "libc++abi"; inherit version; - src = fetch "libcxxabi" "0214sl9m80hb8v0mdkrwl8l4ca3dvapis23mkld85bnxa8zq2c1q"; + src = fetch "libcxxabi" "05ac7rkjbla03bc0lf92f901dfjgxdvp8cr9fpn59a5p4x27ssaq"; nativeBuildInputs = [ cmake ]; buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; @@ -24,14 +24,15 @@ stdenv.mkDerivation { postUnpack = '' unpackFile ${libcxx.src} + mv libcxx-* libcxx unpackFile ${llvm.src} - cmakeFlags+=" -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)" + mv llvm-* llvm '' + stdenv.lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} + patch -p1 -d libcxx -i ${../libcxx-0001-musl-hacks.patch} '' + stdenv.lib.optionalString stdenv.hostPlatform.isWasm '' - patch -p1 -d $(ls -d llvm-*) -i ${./libcxxabi-wasm.patch} + patch -p1 -d llvm -i ${./libcxxabi-wasm.patch} ''; installPhase = if stdenv.isDarwin diff --git a/pkgs/development/compilers/llvm/11/libunwind.nix b/pkgs/development/compilers/llvm/11/libunwind.nix index 0fc3fcabb33..5a4492e803f 100644 --- a/pkgs/development/compilers/llvm/11/libunwind.nix +++ b/pkgs/development/compilers/llvm/11/libunwind.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "libunwind"; inherit version; - src = fetch pname "1xw8y6agnix7qlwh676gm1kbkzh9c1nz7l3vhxjpazbk70biz9mq"; + src = fetch pname "0bwjd2xf51r2apn8p0f9shb6nc8hnqzq1n9gggjvyjmi6cf02mc4"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/llvm/11/lld.nix b/pkgs/development/compilers/llvm/11/lld.nix index 364fdb727d0..20eb87c548f 100644 --- a/pkgs/development/compilers/llvm/11/lld.nix +++ b/pkgs/development/compilers/llvm/11/lld.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "lld"; inherit version; - src = fetch pname "1ibyahcxxckdfwh95f1dzxgcf1fsd0r9rpanm3dnn6nb99mn0is4"; + src = fetch pname "077xyh7sij6mhp4dc4kdcmp9whrpz332fa12rwxnzp3wgd5bxrzg"; nativeBuildInputs = [ cmake ]; buildInputs = [ llvm libxml2 ]; diff --git a/pkgs/development/compilers/llvm/11/lldb.nix b/pkgs/development/compilers/llvm/11/lldb.nix index b7949692145..865232a6ac2 100644 --- a/pkgs/development/compilers/llvm/11/lldb.nix +++ b/pkgs/development/compilers/llvm/11/lldb.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (rec { pname = "lldb"; inherit version; - src = fetch pname "1v8nvw6rxmi7w3ayjcjan4plb5ryhizc41sras7fza2l7n3cz8iz"; + src = fetch pname "0wic9lyb2la9bkzdc13szkm4f793w1mddp50xvh237iraygw0w45"; patches = [ ./lldb-procfs.patch ]; diff --git a/pkgs/development/compilers/llvm/11/llvm.nix b/pkgs/development/compilers/llvm/11/llvm.nix index b55ec1f0a10..3f37cac078f 100644 --- a/pkgs/development/compilers/llvm/11/llvm.nix +++ b/pkgs/development/compilers/llvm/11/llvm.nix @@ -32,8 +32,8 @@ in stdenv.mkDerivation (rec { pname = "llvm"; inherit version; - src = fetch pname "1k7i2syqdm29l10di3ws64i02snh9jhd1s2jzgh8565b0vg25wlc"; - polly_src = fetch "polly" "0l0n09f6sy30x825w85v8n7pvya0ciq89r0abv66n8ggwmrk3rnw"; + src = fetch pname "0s94lwil98w7zb7cjrbnxli0z7gklb312pkw74xs1d6zk346hgwi"; + polly_src = fetch "polly" "0h442ivcslr3dv3q3g1nw5avh77f8cxsp6zild1hgspj266xpynw"; unpackPhase = '' unpackFile $src @@ -96,7 +96,7 @@ in stdenv.mkDerivation (rec { ''; # E.g. mesa.drivers use the build-id as a cache key (see #93946): - LDFLAGS = optionalString enableSharedLibraries "-Wl,--build-id=sha1"; + LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; cmakeFlags = with stdenv; [ "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" diff --git a/pkgs/development/compilers/llvm/11/openmp.nix b/pkgs/development/compilers/llvm/11/openmp.nix index 3cc19ad711d..5fd6c62840d 100644 --- a/pkgs/development/compilers/llvm/11/openmp.nix +++ b/pkgs/development/compilers/llvm/11/openmp.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "openmp"; inherit version; - src = fetch pname "1yq7m0kwnlgq8ni719g9fny0x5wrvm8szp11b3q8zz39rqqyphsz"; + src = fetch pname "0k389d0g9zlfyzh1kpb3i5jdawzpn0hrdxzbjinpvdv7rbw4sw1d"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; From 06e6d55b450a6066f82619fa19cb93e879ac0bbf Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Thu, 15 Oct 2020 05:04:23 +0900 Subject: [PATCH 174/546] cargo-update: 4.1.1 -> 4.1.2 --- ...te-lockfile-for-cargo-update-v4.1.2.patch} | 80 +++++++++---------- .../cargo-update/default.nix | 8 +- 2 files changed, 44 insertions(+), 44 deletions(-) rename pkgs/tools/package-management/cargo-update/{0001-Generate-lockfile-for-cargo-update-v4.1.1.patch => 0001-Generate-lockfile-for-cargo-update-v4.1.2.patch} (88%) diff --git a/pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v4.1.1.patch b/pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v4.1.2.patch similarity index 88% rename from pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v4.1.1.patch rename to pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v4.1.2.patch index 9aa7d8b1cc9..a261045e80c 100644 --- a/pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v4.1.1.patch +++ b/pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v4.1.2.patch @@ -1,6 +1,6 @@ diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 000000000..8d77f4824 +index 000000000..ada9574aa --- /dev/null +++ b/Cargo.lock @@ -0,0 +1,641 @@ @@ -8,9 +8,9 @@ index 000000000..8d77f4824 +# It is not intended for manual editing. +[[package]] +name = "aho-corasick" -+version = "0.7.13" ++version = "0.7.14" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" ++checksum = "b476ce7103678b0c6d3d395dbbae31d48ff910bd28be979ba5d48c6351131d0d" +dependencies = [ + "memchr", +] @@ -55,15 +55,15 @@ index 000000000..8d77f4824 + +[[package]] +name = "autocfg" -+version = "1.0.0" ++version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" ++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + +[[package]] +name = "base64" -+version = "0.11.0" ++version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" ++checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" + +[[package]] +name = "bitflags" @@ -84,7 +84,7 @@ index 000000000..8d77f4824 + +[[package]] +name = "cargo-update" -+version = "4.1.1" ++version = "4.1.2" +dependencies = [ + "array_tool", + "clap", @@ -107,9 +107,9 @@ index 000000000..8d77f4824 + +[[package]] +name = "cc" -+version = "1.0.59" ++version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381" ++checksum = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d" +dependencies = [ + "jobserver", +] @@ -185,9 +185,9 @@ index 000000000..8d77f4824 + +[[package]] +name = "getrandom" -+version = "0.1.14" ++version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" ++checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" +dependencies = [ + "cfg-if", + "libc", @@ -211,9 +211,9 @@ index 000000000..8d77f4824 + +[[package]] +name = "hermit-abi" -+version = "0.1.15" ++version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" ++checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" +dependencies = [ + "libc", +] @@ -264,9 +264,9 @@ index 000000000..8d77f4824 + +[[package]] +name = "libc" -+version = "0.2.75" ++version = "0.2.79" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "55821a41348652c211bf26f6453cb9397af531fc358a33752c864a4f5bccc20e" ++checksum = "2448f6066e80e3bfc792e9c98bf705b4b0fc6e8ef5b43e5889aff0eaa9c58743" + +[[package]] +name = "libgit2-sys" @@ -298,9 +298,9 @@ index 000000000..8d77f4824 + +[[package]] +name = "libz-sys" -+version = "1.1.0" ++version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "af67924b8dd885cccea261866c8ce5b74d239d272e154053ff927dae839f5ae9" ++checksum = "602113192b08db8f38796c4e85c39e960c145965140e918018bcde1952429655" +dependencies = [ + "cc", + "libc", @@ -343,9 +343,9 @@ index 000000000..8d77f4824 + +[[package]] +name = "openssl-src" -+version = "111.10.2+1.1.1g" ++version = "111.12.0+1.1.1h" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a287fdb22e32b5b60624d4a5a7a02dbe82777f730ec0dbc42a0554326fef5a70" ++checksum = "858a4132194f8570a7ee9eb8629e85b23cbc4565f2d4a162e87556e5956abf61" +dependencies = [ + "cc", +] @@ -372,15 +372,15 @@ index 000000000..8d77f4824 + +[[package]] +name = "pkg-config" -+version = "0.3.18" ++version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" ++checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" + +[[package]] +name = "proc-macro2" -+version = "1.0.19" ++version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12" ++checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +dependencies = [ + "unicode-xid", +] @@ -402,9 +402,9 @@ index 000000000..8d77f4824 + +[[package]] +name = "redox_users" -+version = "0.3.4" ++version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" ++checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" +dependencies = [ + "getrandom", + "redox_syscall", @@ -413,9 +413,9 @@ index 000000000..8d77f4824 + +[[package]] +name = "regex" -+version = "1.3.9" ++version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" ++checksum = "8963b85b8ce3074fecffde43b4b0dded83ce2f367dc8d363afc56679f3ee820b" +dependencies = [ + "aho-corasick", + "memchr", @@ -425,15 +425,15 @@ index 000000000..8d77f4824 + +[[package]] +name = "regex-syntax" -+version = "0.6.18" ++version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" ++checksum = "8cab7a364d15cde1e505267766a2d3c4e22a843e1a601f0fa7564c0f82ced11c" + +[[package]] +name = "rust-argon2" -+version = "0.7.0" ++version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" ++checksum = "9dab61250775933275e84053ac235621dfb739556d5c54a2f2e9313b7cf43a19" +dependencies = [ + "base64", + "blake2b_simd", @@ -459,15 +459,15 @@ index 000000000..8d77f4824 + +[[package]] +name = "serde" -+version = "1.0.115" ++version = "1.0.116" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e54c9a88f2da7238af84b5101443f0c0d0a3bbdc455e34a5c9497b1903ed55d5" ++checksum = "96fe57af81d28386a513cbc6858332abc6117cfdb5999647c6444b8f43a370a5" + +[[package]] +name = "serde_derive" -+version = "1.0.115" ++version = "1.0.116" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "609feed1d0a73cc36a0182a840a9b37b4a82f0b1150369f0536a9e3f2a31dc48" ++checksum = "f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8" +dependencies = [ + "proc-macro2", + "quote", @@ -491,9 +491,9 @@ index 000000000..8d77f4824 + +[[package]] +name = "syn" -+version = "1.0.38" ++version = "1.0.44" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e69abc24912995b3038597a7a593be5053eb0fb44f3cc5beec0deb421790c1f4" ++checksum = "e03e57e4fcbfe7749842d53e24ccb9aa12b7252dbe5e91d2acad31834c8b8fdd" +dependencies = [ + "proc-macro2", + "quote", @@ -529,9 +529,9 @@ index 000000000..8d77f4824 + +[[package]] +name = "toml" -+version = "0.5.6" ++version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" ++checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645" +dependencies = [ + "serde", +] diff --git a/pkgs/tools/package-management/cargo-update/default.nix b/pkgs/tools/package-management/cargo-update/default.nix index 62f73565b94..9a3cc23c05a 100644 --- a/pkgs/tools/package-management/cargo-update/default.nix +++ b/pkgs/tools/package-management/cargo-update/default.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-update"; - version = "4.1.1"; + version = "4.1.2"; src = fetchFromGitHub { owner = "nabijaczleweli"; repo = pname; rev = "v${version}"; - sha256 = "03yfn6jq33mykk2cicx54cpddilp62pb5ah75n96k1mwy7c46r6g"; + sha256 = "0bpl4y5p0acn1clxgwn2sifx6ggpq9jqw5zrmva7asjf8p8dx3v5"; }; - cargoPatches = [ ./0001-Generate-lockfile-for-cargo-update-v4.1.1.patch ]; - cargoSha256 = "1yaawp015gdnlfqkdmqsf95gszz0h5j1vpfjh763y7kk0bp7zswl"; + cargoPatches = [ ./0001-Generate-lockfile-for-cargo-update-v4.1.2.patch ]; + cargoSha256 = "150fpb7wyyxi40z4wai6c94mn84g700c2228316g6y8i07c8ix0d"; nativeBuildInputs = [ cmake installShellFiles pkg-config ronn ]; From a4b405cebdd3c654d4dce586bd9d02fc152f5033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 14 Oct 2020 22:58:33 +0200 Subject: [PATCH 175/546] dnscontrol: 3.3.0 -> 3.4.2 --- pkgs/applications/networking/dnscontrol/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 8fb14ae3b14..4d27ad5361f 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.3.0"; + version = "3.4.2"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "0lldkx906imwm8mxcfafpanbgaqh0sdm3zdkwkn7j0nmngyncx9p"; + sha256 = "0bvvh68k2xjmmwafwdsijf3yb4ff9wbsl2ibad627l1y4js5615z"; }; - vendorSha256 = "16cc6hb2iwh1zwrrnb7s4dqxqhaj67gq3gfr5xvh5kqafd685hvx"; + vendorSha256 = "05nwfxqgkpbv5i0365wpsnnaq528a7srycd1dsdlssz1cy7i0d31"; subPackages = [ "." ]; From 00946dc283ad0b3018490331802b77e16731a1f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A2ju=20Mihai-Drosi?= Date: Wed, 14 Oct 2020 15:47:10 +0300 Subject: [PATCH 176/546] Move glslang and vulkan-validation-layers overrides out of all-packages --- .../development/compilers/glslang/default.nix | 38 +++++++++++-- .../vulkan-validation-layers/default.nix | 57 +++++++++++++++++-- pkgs/top-level/all-packages.nix | 47 +-------------- 3 files changed, 87 insertions(+), 55 deletions(-) diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index dee3f488ecc..b3364b185da 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -5,7 +5,36 @@ , python3 , spirv-headers , spirv-tools +, argSpirv-tools ? null +, argSpirv-headers ? null }: +# glslang requires custom versions of spirv-tools and spirb-headers. +# The exact versions are taken from: +# https://github.com/KhronosGroup/glslang/blob/master/known_good.json + +let + localSpirv-tools = if argSpirv-tools == null + then spirv-tools.overrideAttrs (_: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Tools"; + rev = "fd8e130510a6b002b28eee5885a9505040a9bdc9"; + sha256 = "00b7xgyrcb2qq63pp3cnw5q1xqx2d9rfn65lai6n6r89s1vh3vg6"; + }; + }) + else argSpirv-tools; + + localSpirv-headers = if argSpirv-headers == null + then spirv-headers.overrideAttrs (_: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Headers"; + rev = "f8bf11a0253a32375c32cad92c841237b96696c0"; + sha256 = "1znwjy02dl9rshqzl87rqsv9mfczw7gvwfhcirbl81idahgp4p6l"; + }; + }) + else argSpirv-headers; +in stdenv.mkDerivation rec { pname = "glslang"; @@ -20,22 +49,23 @@ stdenv.mkDerivation rec { # These get set at all-packages, keep onto them for child drvs passthru = { - inherit spirv-tools spirv-headers; + spirv-tools = localSpirv-tools; + spirv-headers = localSpirv-headers; }; nativeBuildInputs = [ cmake python3 bison jq ]; enableParallelBuilding = true; postPatch = '' - cp --no-preserve=mode -r "${spirv-tools.src}" External/spirv-tools - ln -s "${spirv-headers.src}" External/spirv-tools/external/spirv-headers + cp --no-preserve=mode -r "${localSpirv-tools.src}" External/spirv-tools + ln -s "${localSpirv-headers.src}" External/spirv-tools/external/spirv-headers ''; # Ensure spirv-headers and spirv-tools match exactly to what is expected preConfigure = '' HEADERS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools/external/spirv-headers"))[0].commit') TOOLS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools"))[0].commit') - if [ "$HEADERS_COMMIT" != "${spirv-headers.src.rev}" ] || [ "$TOOLS_COMMIT" != "${spirv-tools.src.rev}" ]; then + if [ "$HEADERS_COMMIT" != "${localSpirv-headers.src.rev}" ] || [ "$TOOLS_COMMIT" != "${localSpirv-tools.src.rev}" ]; then echo "ERROR: spirv-tools commits do not match expected versions: expected tools at $TOOLS_COMMIT, headers at $HEADERS_COMMIT"; exit 1; fi diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 0d3c227291f..ec696339fdc 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -1,6 +1,51 @@ -{ stdenv, fetchFromGitHub, cmake, writeText, python3 -, vulkan-headers, vulkan-loader, glslang, spirv-headers -, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }: +{ stdenv +, fetchFromGitHub +, cmake +, writeText +, python3 +, spirv-headers +, spirv-tools +, vulkan-headers +, vulkan-loader +, glslang +, pkgconfig +, xlibsWrapper +, libxcb +, libXrandr +, wayland +}: +# vulkan-validation-layers requires a custom glslang version, while glslang requires +# custom versions for spirv-tools and spirv-headers. The git hashes required for all +# of these deps is documented upstream here: +# https://github.com/KhronosGroup/Vulkan-ValidationLayers/blob/master/scripts/known_good.json + +let + localGlslang = (glslang.override { + argSpirv-tools = spirv-tools.overrideAttrs (_: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Tools"; + rev = "e128ab0d624ce7beb08eb9656bb260c597a46d0a"; + sha256 = "0jj8zrl3dh9fq71jc8msx3f3ifb2vjcb37nl0w4sa8sdhfff74pv"; + }; + }); + argSpirv-headers = spirv-headers.overrideAttrs (_: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Headers"; + rev = "ac638f1815425403e946d0ab78bac71d2bdbf3be"; + sha256 = "1lkhs7pxcrfkmiizcxl0w5ajx6swwjv7w3iq586ipgh571fc75gx"; + }; + }); + }).overrideAttrs (_: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "glslang"; + rev = "e00d27c6d65b7d3e72506a311d7f053da4051295"; + sha256 = "00lzvzk613gpm1vsdxffmx52z3c52ijwvzk4sfhh95p71kdydhgv"; + }; + }); +in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; @@ -20,8 +65,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - glslang - spirv-headers + localGlslang + localGlslang.spirv-headers vulkan-headers vulkan-loader libxcb @@ -32,7 +77,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; cmakeFlags = [ - "-DGLSLANG_INSTALL_DIR=${glslang}" + "-DGLSLANG_INSTALL_DIR=${localGlslang}" ]; # Help vulkan-loader find the validation layers diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4b0ae7dc31..7ee745abe9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9094,24 +9094,7 @@ in dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {}); - glslang = callPackage ../development/compilers/glslang { - spirv-tools = spirv-tools.overrideAttrs (_: { - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "SPIRV-Tools"; - rev = "fd8e130510a6b002b28eee5885a9505040a9bdc9"; - sha256 = "00b7xgyrcb2qq63pp3cnw5q1xqx2d9rfn65lai6n6r89s1vh3vg6"; - }; - }); - spirv-headers = spirv-headers.overrideAttrs (_: { - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "SPIRV-Headers"; - rev = "f8bf11a0253a32375c32cad92c841237b96696c0"; - sha256 = "1znwjy02dl9rshqzl87rqsv9mfczw7gvwfhcirbl81idahgp4p6l"; - }; - }); - }; + glslang = callPackage ../development/compilers/glslang { }; go_bootstrap = if stdenv.isAarch64 then srcOnly { @@ -15818,33 +15801,7 @@ in vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; vulkan-loader = callPackage ../development/libraries/vulkan-loader { }; vulkan-tools = callPackage ../tools/graphics/vulkan-tools { }; - vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { - glslang = (glslang.override { - spirv-tools = spirv-tools.overrideAttrs (_: { - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "SPIRV-Tools"; - rev = "e128ab0d624ce7beb08eb9656bb260c597a46d0a"; - sha256 = "0jj8zrl3dh9fq71jc8msx3f3ifb2vjcb37nl0w4sa8sdhfff74pv"; - }; - }); - spirv-headers = spirv-tools.overrideAttrs (_: { - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "SPIRV-Headers"; - rev = "ac638f1815425403e946d0ab78bac71d2bdbf3be"; - sha256 = "1lkhs7pxcrfkmiizcxl0w5ajx6swwjv7w3iq586ipgh571fc75gx"; - }; - }); - }).overrideAttrs (_: { - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "glslang"; - rev = "e00d27c6d65b7d3e72506a311d7f053da4051295"; - sha256 = "00lzvzk613gpm1vsdxffmx52z3c52ijwvzk4sfhh95p71kdydhgv"; - }; - }); - }; + vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { }; vtkWithQt5 = vtk.override { qtLib = qt514; }; From 00347e9537d6e6ddef599094429a1ac5392d6f28 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 18 Jan 2020 01:09:49 +0100 Subject: [PATCH 177/546] nixos/cloud-init: actually test ssh'ing, also, with cloud-init-created user --- nixos/tests/cloud-init.nix | 49 ++++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/nixos/tests/cloud-init.nix b/nixos/tests/cloud-init.nix index 8debb9e8ed9..d23e9c64b37 100644 --- a/nixos/tests/cloud-init.nix +++ b/nixos/tests/cloud-init.nix @@ -7,6 +7,9 @@ with import ../lib/testing-python.nix { inherit system pkgs; }; with pkgs.lib; let + inherit (import ./ssh-keys.nix pkgs) + snakeOilPrivateKey snakeOilPublicKey; + metadataDrive = pkgs.stdenv.mkDerivation { name = "metadata"; buildCommand = '' @@ -18,14 +21,19 @@ let - content: | cloudinit path: /tmp/cloudinit-write-file + + users: + - default + - name: nixos + ssh_authorized_keys: + - "${snakeOilPublicKey}" EOF cat << EOF > $out/iso/meta-data instance-id: iid-local01 local-hostname: "test" public-keys: - ec2-keypair.us-east-1: - - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB5L7Xuh49VS5VQheFE7VDmXKH0BOnB1R0avAE91QgOB root@test + - "${snakeOilPublicKey}" EOF ${pkgs.cdrkit}/bin/genisoimage -volid cidata -joliet -rock -o $out/metadata.iso $out/iso ''; @@ -35,17 +43,32 @@ in makeTest { meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ lewo ]; }; - machine = - { ... }: - { - virtualisation.qemu.options = [ "-cdrom" "${metadataDrive}/metadata.iso" ]; - services.cloud-init.enable = true; - }; - testScript = '' - machine.start() - machine.wait_for_unit("cloud-init.service") - machine.succeed("cat /tmp/cloudinit-write-file | grep -q 'cloudinit'") + machine = { ... }: + { + virtualisation.qemu.options = [ "-cdrom" "${metadataDrive}/metadata.iso" ]; + services.cloud-init.enable = true; + services.openssh.enable = true; - machine.wait_until_succeeds("cat /root/.ssh/authorized_keys | grep -q root@test") + }; + testScript = '' + machine.wait_for_unit("cloud-init.service") + machine.succeed("cat /tmp/cloudinit-write-file | grep -q 'cloudinit'") + + # install snakeoil ssh key and provision .ssh/config file + machine.succeed("mkdir -p ~/.ssh") + machine.succeed( + "cat ${snakeOilPrivateKey} > ~/.ssh/id_snakeoil" + ) + machine.succeed("chmod 600 ~/.ssh/id_snakeoil") + + machine.wait_for_unit("sshd.service") + + # we should be able to log in as the root user, as well as the created nixos user + machine.succeed( + "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentityFile=~/.ssh/id_snakeoil root@localhost 'true'" + ) + machine.succeed( + "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentityFile=~/.ssh/id_snakeoil nixos@localhost 'true'" + ) ''; } From 873497f94f7726de67f2159b3861cce6fb477868 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Oct 2020 00:33:36 +0200 Subject: [PATCH 178/546] linuxPackages_latest: update to linuxPackages_5_9 The linux 5.9 package set was introduced in 0a614d2fb559115a63cd8ad66ed916f9d6c14ec7 but the linuxPackages_latest packageset alias wasn't updated. --- 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 6f75ab62977..bb7ce3906cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18107,7 +18107,7 @@ in # Update this when adding the newest kernel major version! # And update linux_latest_for_hardened below if the patches are already available - linuxPackages_latest = linuxPackages_5_8; + linuxPackages_latest = linuxPackages_5_9; linux_latest = linuxPackages_latest.kernel; # Realtime kernel packages. From 1e6a9608aab4ed6f646eda805951efbe3d35989f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 14 Oct 2020 18:37:43 -0400 Subject: [PATCH 179/546] oh-my-zsh: 2020-10-13 -> 2020-10-14 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index a8b5e442cd5..e317a851bbc 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,15 +4,15 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2020-10-13"; + version = "2020-10-14"; pname = "oh-my-zsh"; - rev = "a39bee8d11aca960651403dddbb7dba38b00183e"; + rev = "53cbd658f5ae6874af0d804cee6748dfba69e786"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "0ak03r58sds1q3wrm2fszwc2i1pyl7lqxnaawbfndbn3ynbaw2xd"; + sha256 = "llWUdN/4pCM5x8uJu6y8pIUzuY4nyGu6e+m53khcZB4="; }; installPhase = '' From d0908c6133f38ffa90d422a9264dcb5954af189a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Thu, 15 Oct 2020 00:49:59 +0200 Subject: [PATCH 180/546] pythonPackages.pytest-cram: 0.2.0 -> 0.2.2 --- pkgs/development/python-modules/pytest-cram/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pytest-cram/default.nix b/pkgs/development/python-modules/pytest-cram/default.nix index 237e5ee7355..55ee719cd20 100644 --- a/pkgs/development/python-modules/pytest-cram/default.nix +++ b/pkgs/development/python-modules/pytest-cram/default.nix @@ -1,7 +1,7 @@ -{lib, buildPythonPackage, fetchPypi, pytest, cram, bash}: +{ lib, buildPythonPackage, fetchPypi, pytest, cram, bash }: buildPythonPackage rec { - version = "0.2.0"; + version = "0.2.2"; pname = "pytest-cram"; checkInputs = [ pytest ]; @@ -9,8 +9,8 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "006p5dr3q794sbwwmxmdls3nwq0fvnyrxxmc03pgq8n74chl71qn"; - extension = "zip"; + sha256 = "0405ymmrsv6ii2qhq35nxfjkb402sdb6d13xnk53jql3ybgmiqq0"; + extension = "tar.gz"; }; postPatch = '' From 37943b40031b191704aeefa5e0197e17227196d3 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Thu, 15 Oct 2020 00:57:12 +0200 Subject: [PATCH 181/546] osrm-backend: 5.22.0 -> 5.23.0 --- pkgs/servers/osrm-backend/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index fe3e3c06285..54c0da642b7 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "osrm-backend"; - version = "5.22.0"; + version = "5.23.0"; src = fetchFromGitHub { - rev = "v${version}"; owner = "Project-OSRM"; repo = "osrm-backend"; - sha256 = "1m4hf26mgfvvx9z37qww8v8w4mhzyfl554ymdnzl99pr5ild093s"; + rev = "v${version}"; + sha256 = "sha256-FWfrdnpdx4YPa9l7bPc6QNyqyNvrikdeADSZIixX5vE="; }; NIX_CFLAGS_COMPILE = [ "-Wno-error=pessimizing-move" "-Wno-error=redundant-move" ]; From 27143f8e022cbc9e0a480c3b89d757920aef55f6 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 14 Oct 2020 18:00:00 -0500 Subject: [PATCH 182/546] nodejs-12_x: 12.18.4 -> 12.19.0 --- pkgs/development/web/nodejs/v12.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 0e836226833..83ba9f5d56f 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -1,13 +1,13 @@ { callPackage, openssl, icu, python2, enableNpm ? true }: let - buildNodejs = callPackage ./nodejs.nix { + buildNodejs = callPackage ./nodejs.nix { inherit openssl icu; python = python2; }; in buildNodejs { inherit enableNpm; - version = "12.18.4"; - sha256 = "02gncjrrjqdwf9ydmg96yn9ldsw539q9w88cknax1djkisqkrw15"; + version = "12.19.0"; + sha256 = "1qainpkakkl3xip9xz2wbs74g95gvc6125cc05z6vyckqi2iqrrv"; } From a62b1fb6e5e424d120e40195ff4f6da6206349e3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 14 Oct 2020 18:01:00 -0500 Subject: [PATCH 183/546] nodejs-14_x: 14.12.0 -> 14.13.1 --- pkgs/development/web/nodejs/v14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index a5f800339c8..079736b5e4e 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "14.12.0"; - sha256 = "0c2mv208akyk10pmjfilxbdpi2gpb5zlb4h903lgqmr229kmnd3c"; + version = "14.13.1"; + sha256 = "1xhmdhzsk3pfl4k8l0ipd9a1v5z807sl65mwkw51y7lc44gbsqb0"; } From a299fc23515d50d8161027af87b649eca27662d8 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 15 Oct 2020 00:24:39 +0200 Subject: [PATCH 184/546] nixosTests.cloud-init: test changing hostname actually works --- nixos/tests/cloud-init.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/tests/cloud-init.nix b/nixos/tests/cloud-init.nix index d23e9c64b37..a127be6dd85 100644 --- a/nixos/tests/cloud-init.nix +++ b/nixos/tests/cloud-init.nix @@ -48,7 +48,7 @@ in makeTest { virtualisation.qemu.options = [ "-cdrom" "${metadataDrive}/metadata.iso" ]; services.cloud-init.enable = true; services.openssh.enable = true; - + networking.hostName = ""; }; testScript = '' machine.wait_for_unit("cloud-init.service") @@ -70,5 +70,13 @@ in makeTest { machine.succeed( "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentityFile=~/.ssh/id_snakeoil nixos@localhost 'true'" ) + + # test changing hostname via cloud-init worked + assert ( + machine.succeed( + "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentityFile=~/.ssh/id_snakeoil nixos@localhost 'hostname'" + ).strip() + == "test" + ) ''; } From 831067656061d820fea82f76df76c970366c2191 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 15 Oct 2020 01:09:00 +0200 Subject: [PATCH 185/546] cloud-init: 20.2 -> 20.3 required rebasing the patch, disabling some tests. I also changed the hash to be in conventional format - the hash mismatch in fixed-output derivation '/nix/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-source': wanted: sha256:yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy got: sha256:zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz doesn't propose SRI syntax. --- .../cloud-init/0001-add-nixos-support.patch | 10 +++++----- pkgs/tools/virtualization/cloud-init/default.nix | 6 ++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/virtualization/cloud-init/0001-add-nixos-support.patch b/pkgs/tools/virtualization/cloud-init/0001-add-nixos-support.patch index ef8f2b65ca0..997d28aaecb 100644 --- a/pkgs/tools/virtualization/cloud-init/0001-add-nixos-support.patch +++ b/pkgs/tools/virtualization/cloud-init/0001-add-nixos-support.patch @@ -1,4 +1,4 @@ -From 64a767136c16aad2b94b4d9a3268b0d4deba7272 Mon Sep 17 00:00:00 2001 +From 269cc4c9558549f340ec186d9246654564b2f633 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 18 Aug 2020 10:22:36 +0100 Subject: [PATCH] add nixos support @@ -14,13 +14,13 @@ Signed-off-by: Jörg Thalheim create mode 100644 cloudinit/distros/nixos.py diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py -index c7163e1c..c147e2b3 100755 +index 2537608f..c533b585 100755 --- a/cloudinit/distros/__init__.py +++ b/cloudinit/distros/__init__.py -@@ -46,6 +46,7 @@ OSFAMILIES = { - 'freebsd': ['freebsd'], +@@ -47,6 +47,7 @@ OSFAMILIES = { + 'gentoo': ['gentoo'], + 'redhat': ['amazon', 'centos', 'fedora', 'rhel'], 'suse': ['opensuse', 'sles'], - 'arch': ['arch'], + 'nixos': ['nixos'], } diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 66ce16d985e..24ecb7f99c3 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -17,7 +17,7 @@ , openssh }: -let version = "20.2"; +let version = "20.3"; in buildPythonApplication { pname = "cloud-init"; @@ -28,7 +28,7 @@ in buildPythonApplication { owner = "canonical"; repo = "cloud-init"; rev = version; - sha256 = "sha256-QeY/fdIIUSsp5oNxyRtZwpTB747Jf5KAJuYY9yiKUvc="; + sha256 = "1fmckxf4q4sxjqs758vw7ca0rnhl9hyq67cqpqzz2v3s1gqzjhm4"; }; patches = [ ./0001-add-nixos-support.patch ]; @@ -72,6 +72,8 @@ in buildPythonApplication { "test_dhclient_run_with_tmpdir" # clears path and fails because mkdir is not found "test_path_env_gets_set_from_main" + # tries to read from /etc/ca-certificates.conf while inside the sandbox + "test_handler_ca_certs" ]; preCheck = '' From efb6a987505ec8958d091f77bf00bcd6cb93c023 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 03:43:45 +0000 Subject: [PATCH 186/546] tmuxp: 1.5.5 -> 1.5.6 --- pkgs/tools/misc/tmuxp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 5a14981ef26..a118195d470 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -4,11 +4,11 @@ with python.pkgs; buildPythonApplication rec { pname = "tmuxp"; - version = "1.5.5"; + version = "1.5.6"; src = fetchPypi { inherit pname version; - sha256 = "1jbziyqggbfd5m884lg00h0zi99c6cvjxkl4jzr34c4affr295yd"; + sha256 = "c305fc45bbf1093561e03cdcd37b2ab1f2efb9e208e74b2dc294cf414859bd8a"; }; postPatch = '' From ebd3fc7fd30181b21089c6b7e180b835b4d1379c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 03:49:26 +0000 Subject: [PATCH 187/546] vimwiki-markdown: 0.3.0 -> 0.3.1 --- pkgs/tools/misc/vimwiki-markdown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vimwiki-markdown/default.nix b/pkgs/tools/misc/vimwiki-markdown/default.nix index b85bb087660..58fc991beb3 100644 --- a/pkgs/tools/misc/vimwiki-markdown/default.nix +++ b/pkgs/tools/misc/vimwiki-markdown/default.nix @@ -6,12 +6,12 @@ }: buildPythonApplication rec { - version = "0.3.0"; + version = "0.3.1"; pname = "vimwiki-markdown"; src = fetchPypi { inherit version pname; - sha256 = "1icfnc623f9pyn59wgb76g0fnsx41s87q69x354qy17gw23bxabx"; + sha256 = "50032c62947422c8afbc1733e50526818df7d885d1cc41a27ff65fc26cd3c1c5"; }; propagatedBuildInputs= [ From 35943384eaf4d74022e79f981c668c3adf4e1693 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Sun, 30 Aug 2020 18:06:17 -0400 Subject: [PATCH 188/546] snooze: init at 0.4 --- pkgs/tools/system/snooze/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/tools/system/snooze/default.nix diff --git a/pkgs/tools/system/snooze/default.nix b/pkgs/tools/system/snooze/default.nix new file mode 100644 index 00000000000..a82db1dbd42 --- /dev/null +++ b/pkgs/tools/system/snooze/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchFromGitHub }: +stdenv.mkDerivation rec { + pname = "snooze"; + version = "0.4"; + src = fetchFromGitHub { + owner = "leahneukirchen"; + repo = "snooze"; + rev = "v${version}"; + sha256 = "0a114brvvjf6vl7grviv0gd6gmikr447m8kq1wilp4yj51sfyxa9"; + }; + makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" ]; + + meta = with stdenv.lib; { + description = + "Tool for waiting until a particular time and then running a command."; + maintainers = with maintainers; [ kaction ]; + license = licenses.cc0; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 694516f80a2..1639f3f736e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2899,6 +2899,8 @@ in cron = callPackage ../tools/system/cron { }; + snooze = callPackage ../tools/system/snooze { }; + cudaPackages = recurseIntoAttrs (callPackage ../development/compilers/cudatoolkit {}); inherit (cudaPackages) cudatoolkit_6 From 0ecb2f6705192f04435c1b8ea02b5b261ff70e3e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 04:05:30 +0000 Subject: [PATCH 189/546] swiftclient: 3.9.0 -> 3.10.1 --- pkgs/tools/admin/swiftclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/swiftclient/default.nix b/pkgs/tools/admin/swiftclient/default.nix index 91860d2df08..82480d38d17 100644 --- a/pkgs/tools/admin/swiftclient/default.nix +++ b/pkgs/tools/admin/swiftclient/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "python-swiftclient"; - version = "3.9.0"; + version = "3.10.1"; src = fetchPypi { inherit pname version; - sha256 = "0xx3v5kk8jp352rydy3jxndy1b9kl2zmkj1gi14fjxjc5r4rf82g"; + sha256 = "0176b17aa14cc2ef82a327dc70b66af670bdb39dcf836896f81269db376932ea"; }; propagatedBuildInputs = [ requests six pbr setuptools ]; From 69af0c4c356a14b3ddf801d87b705f1cb3adc8e5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 04:39:41 +0000 Subject: [PATCH 190/546] tzupdate: 2.0.0 -> 2.1.0 --- pkgs/applications/misc/tzupdate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/applications/misc/tzupdate/default.nix index 5c2b1312faf..8a18948da24 100644 --- a/pkgs/applications/misc/tzupdate/default.nix +++ b/pkgs/applications/misc/tzupdate/default.nix @@ -5,11 +5,11 @@ let in buildPythonApplication rec { pname = "tzupdate"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "12jvyza9pfhazkzq94nizacknnp32lf7kalrjmpz1z2bqqxhx0fm"; + sha256 = "5b55795c390e4ccc90e649c8cc387447daaf30a21d68f7196b49824cbcba8adc"; }; propagatedBuildInputs = [ requests ]; From af82dfa80889ac9c1371823ed10506d908571d51 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 05:05:52 +0000 Subject: [PATCH 191/546] mavproxy: 1.8.19 -> 1.8.22 --- pkgs/applications/science/robotics/mavproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index c354dad8042..9c7166afc2a 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.19"; + version = "1.8.22"; src = fetchPypi { inherit pname version; - sha256 = "1rbq2nm01212rp5xbl8p8kjl2mpgfppkwjsq3lnfw1v6g0m4359h"; + sha256 = "87d7f9c0b8f4f1db3ce3521f67cd244fe3b89ffead797e92f35a7f71bbe8b958"; }; propagatedBuildInputs = [ From 2a4607f44222a92b8a44e6e1dac715e7eca04239 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 15 Oct 2020 07:28:10 +0200 Subject: [PATCH 192/546] Revert "nixos/display-managers: install sessionData.desktops" This reverts commit 3cd2b59b8c261e927977b99c382a2c3067449883. It created infinite recursion when using LXQt, since lxqt module uses `config.system.path` in `services.xserver.desktopManager.session`. `config.system.path` is a `buildEnv` that depends on `environment.systemPackages`. --- nixos/modules/services/x11/display-managers/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index ed9c652fc4c..568aeaceef7 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -474,13 +474,6 @@ in ) [dms wms] ); - - # Make xsessions and wayland sessions installed at - # /run/current-system/sw/share as some programs - # have behavior that depends on them being installed - environment.systemPackages = [ - cfg.displayManager.sessionData.desktops - ]; }; imports = [ From 866ce944021d37335a819c85a6eeab4900e4f1b2 Mon Sep 17 00:00:00 2001 From: Antonio Yang Date: Tue, 8 Sep 2020 00:00:09 +0800 Subject: [PATCH 193/546] gitui: 0.9.1 -> 0.10.1 - add python3 for nativeBuildInputs - add xorg.libxcb for buildInputs Co-authored-by: Jon --- .../git-and-tools/gitui/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 25985ef0a23..6aad5b78fb6 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -1,24 +1,26 @@ -{ stdenv, rustPlatform, fetchFromGitHub, libiconv, Security }: - +{ stdenv, rustPlatform, fetchFromGitHub, libiconv, xorg, python3, Security }: rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.9.1"; + version = "0.10.1"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "0lxpdwpxizc4bczh5cl2x2xbbdam3fakvgcbbrdh43czgjwb4ds1"; + sha256 = "1ifwbi6nydh66z6cprjmz2qvy9z52rj9jg2xf054i249gy955hah"; }; - cargoSha256 = "14x0m3pq4gapgqaljxdwmr5pk9h209ls95an9xgrq0dj6apyimgx"; + cargoSha256 = "1454dn7k1fc4yxhbcmx0z3hj9d9srnlc2k1qp707h1vq46ib1rsf"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + nativeBuildInputs = [ python3 ]; + buildInputs = [ ] + ++ stdenv.lib.optional stdenv.isLinux xorg.libxcb + ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; meta = with stdenv.lib; { description = "Blazing fast terminal-ui for git written in rust"; homepage = "https://github.com/extrawurst/gitui"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ filalex77 yanganto ]; }; } From 85e0d375cfe3c9cd354e312df99a7c3df114a3e7 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Thu, 15 Oct 2020 16:03:04 +0900 Subject: [PATCH 194/546] nix: build with default stdenv This was required for Nix v2.2.2 which did not build with libcxx 7. This is no longer required for any current version of Nix. --- pkgs/tools/package-management/nix/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 2acf5d194e0..e843e655300 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -3,7 +3,6 @@ , stateDir ? "/nix/var" , confDir ? "/etc" , boehmgc -, stdenv, llvmPackages_6 }: let @@ -190,8 +189,6 @@ in rec { }; inherit storeDir stateDir confDir boehmgc; - } // stdenv.lib.optionalAttrs stdenv.cc.isClang { - stdenv = llvmPackages_6.stdenv; }); nixUnstable = lib.lowPrio (callPackage common rec { From 32b2d0d50b866293cf778209cf987feb0cb87949 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 07:20:50 +0000 Subject: [PATCH 195/546] agda-pkg: 0.1.50 -> 0.1.51 --- pkgs/development/tools/agda-pkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/agda-pkg/default.nix b/pkgs/development/tools/agda-pkg/default.nix index 0d93694b50f..7c4ddb8a688 100644 --- a/pkgs/development/tools/agda-pkg/default.nix +++ b/pkgs/development/tools/agda-pkg/default.nix @@ -4,13 +4,13 @@ with python3Packages; buildPythonApplication rec { pname = "agda-pkg"; - version = "0.1.50"; + version = "0.1.51"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0wpw90kw3danw91m3jzfdn7zmclimmiz74f77mpij9b1w6wvhm11"; + sha256 = "ee370889a1558caf45930d9f898dbe248048078e1e7e3ee17382bf574dc795f2"; }; # Checks need internet access, so we just check the program executes From 77a694db29f63c621b433b3779aba8045cbe8d85 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 07:51:57 +0000 Subject: [PATCH 196/546] dt-schema: 2020.6 -> 2020.8.1 --- pkgs/development/tools/dt-schema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/dt-schema/default.nix b/pkgs/development/tools/dt-schema/default.nix index 5cba13b6689..776a3b06143 100644 --- a/pkgs/development/tools/dt-schema/default.nix +++ b/pkgs/development/tools/dt-schema/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "dtschema"; - version = "2020.6"; + version = "2020.8.1"; src = fetchPypi { inherit pname version; - sha256 = "1zdm0zbn1dfk02yqghfvd0nb26hmzivb6mln6bvxjfdcv6n7pdqf"; + sha256 = "5c98202abb4977aac6a2995a7f4ed2f7e51739db6fd72861d29681f865c27c1b"; }; nativeBuildInputs = [ setuptools_scm git ]; From de1a1ca07309be774e5f697cf0bcc1a465572012 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 14 Oct 2020 21:41:10 +0200 Subject: [PATCH 197/546] haskellPackages.optparse-applicative: Fix for compgen error --- .../development/haskell-modules/configuration-common.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4fb510efed0..e17a1217d46 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -77,6 +77,15 @@ self: super: { hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify; }; + # Backport fix for bash: compgen: command not found + # which happens in nix-shell when a non-interactive bash is on PATH + # PR to master: https://github.com/pcapriotti/optparse-applicative/pull/408 + optparse-applicative = appendPatch super.optparse-applicative (pkgs.fetchpatch { + name = "optparse-applicative-0.15.1-hercules-ci-compgen.diff"; + url = "https://github.com/hercules-ci/optparse-applicative/compare/0.15.1...hercules-ci:0.15.1-nixpkgs-compgen.diff"; + sha256 = "1bcp6b7gvc8pqbn1n1ybhizkkl5if7hk9ipgl746vk08v0d3xxql"; + }); + # Fix test trying to access /home directory shell-conduit = overrideCabal super.shell-conduit (drv: { postPatch = "sed -i s/home/tmp/ test/Spec.hs"; From bc9f464723fa34aef5f1382534448a814506be27 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 08:28:21 +0000 Subject: [PATCH 198/546] python37Packages.jupyterlab-git: 0.20.0 -> 0.22.1 --- pkgs/development/python-modules/jupyterlab-git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix index 91ae426147c..aeeb75b4c52 100644 --- a/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyterlab_git"; - version = "0.20.0"; + version = "0.22.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0qs3wrcils07xlz698xr7giqf9v63n2qb338mlh7wql93rmjg45i"; + sha256 = "e0fe2503d08dc00cda781b1ff89eb10c0decb45b5f8983b4970525b8f108dc02"; }; propagatedBuildInputs = [ notebook nbdime git ]; From 6bb95a443a0fdfa8dd9b83542ecabcad7432b698 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 08:48:54 +0000 Subject: [PATCH 199/546] python37Packages.trimesh: 3.8.10 -> 3.8.11 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 484fee26dac..ed9e1e06e3f 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.8.10"; + version = "3.8.11"; src = fetchPypi { inherit pname version; - sha256 = "24fb0f7f8b8745e181b215a294eb1b22acd3e739d757892394d4c32f74e5c069"; + sha256 = "790b4804227825a985189e0788cf57dbfcf1ee39f30f767176722ad572da27de"; }; propagatedBuildInputs = [ numpy ]; From 17bcc043f0ad9e7e8a0025bfc816e84126ff2d97 Mon Sep 17 00:00:00 2001 From: Alvar <8402811+oxzi@users.noreply.github.com> Date: Thu, 15 Oct 2020 10:55:16 +0200 Subject: [PATCH 200/546] nixos/vim: configurable vim package (#100132) --- nixos/modules/programs/vim.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/nixos/modules/programs/vim.nix b/nixos/modules/programs/vim.nix index fe0e7f2c6d6..9f46dff2a29 100644 --- a/nixos/modules/programs/vim.nix +++ b/nixos/modules/programs/vim.nix @@ -14,10 +14,20 @@ in { using the EDITOR environment variable. ''; }; + + package = mkOption { + type = types.package; + default = pkgs.vim; + defaultText = "pkgs.vim"; + example = "pkgs.vimHugeX"; + description = '' + vim package to use. + ''; + }; }; config = mkIf cfg.defaultEditor { - environment.systemPackages = [ pkgs.vim ]; - environment.variables = { EDITOR = mkOverride 900 "vim"; }; + environment.systemPackages = [ cfg.package ]; + environment.variables = { EDITOR = mkOverride 900 "vim"; }; }; } From 4f282b19bdfbc110ccd3613731b58b834e96caf4 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 15 Oct 2020 08:18:14 +1000 Subject: [PATCH 201/546] go_1_14: 1.14.9 -> 1.14.10 --- pkgs/development/compilers/go/1.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index 9c7d70e63e4..e9adb0522c8 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -36,11 +36,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.14.9"; + version = "1.14.10"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0m2581pi1iid39dd0k81r6zypasr8byc6d75nprapg09ri4ci1y6"; + sha256 = "0rfnjl582cm5klv8c2qyyvn26807zn89m5mk282gkc7awfkrjxmk"; }; # perl is used for testing go vet From 6084c2e8749717c481a627ae76fc5871c2320ece Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 15 Oct 2020 08:17:16 +1000 Subject: [PATCH 202/546] go_1_15: 1.15.2 -> 1.15.3 --- pkgs/development/compilers/go/1.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix index ca08ee190c2..8e692dca1e0 100644 --- a/pkgs/development/compilers/go/1.15.nix +++ b/pkgs/development/compilers/go/1.15.nix @@ -36,11 +36,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.15.2"; + version = "1.15.3"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0kabkmc3759g5hpsdwh3l8p1fywibnha8c72m8f02lg2rl5rvgr8"; + sha256 = "1228nv4vyzbqv768dl0bimsic47x9yyqld61qbgqqk75f0jn0sl9"; }; # perl is used for testing go vet From 81975c891c94fc50bb3db5670fa2208f53d23473 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 15 Oct 2020 11:31:02 +0200 Subject: [PATCH 203/546] =?UTF-8?q?licensee:=209.14.0=20=E2=86=92=209.14.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/package-management/licensee/Gemfile.lock | 8 ++++---- pkgs/tools/package-management/licensee/gemset.nix | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/package-management/licensee/Gemfile.lock b/pkgs/tools/package-management/licensee/Gemfile.lock index 00d62361e69..9f1a24337b8 100644 --- a/pkgs/tools/package-management/licensee/Gemfile.lock +++ b/pkgs/tools/package-management/licensee/Gemfile.lock @@ -6,11 +6,11 @@ GEM dotenv (2.7.6) faraday (1.0.1) multipart-post (>= 1.2, < 3) - licensee (9.14.0) + licensee (9.14.1) dotenv (~> 2.0) octokit (~> 4.17) reverse_markdown (~> 1.0) - rugged (~> 0.24) + rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) mini_portile2 (2.4.0) multipart-post (2.1.1) @@ -19,10 +19,10 @@ GEM octokit (4.18.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - public_suffix (4.0.5) + public_suffix (4.0.6) reverse_markdown (1.4.0) nokogiri - rugged (0.99.0) + rugged (1.1.0) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) diff --git a/pkgs/tools/package-management/licensee/gemset.nix b/pkgs/tools/package-management/licensee/gemset.nix index b3b326f6b31..2ec00c621ca 100644 --- a/pkgs/tools/package-management/licensee/gemset.nix +++ b/pkgs/tools/package-management/licensee/gemset.nix @@ -37,10 +37,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mv7khv080p81x6indb5akr2a1x84l2xy96a6bziw207291lxx7p"; + sha256 = "0c551j4qy773d79hgypjaz43h5wjn08mnxnxy9s2vdjc40qm95k5"; type = "gem"; }; - version = "9.14.0"; + version = "9.14.1"; }; mini_portile2 = { groups = ["default"]; @@ -89,10 +89,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vywld400fzi17cszwrchrzcqys4qm6sshbv73wy5mwcixmrgg7g"; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; type = "gem"; }; - version = "4.0.5"; + version = "4.0.6"; }; reverse_markdown = { dependencies = ["nokogiri"]; @@ -110,10 +110,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04rkxwzaa6897da3mnm70g720gpxwyh71krfn6ag1dkk80x8a8yz"; + sha256 = "04aq913plcxjw71l5r62qgz3bx3466p0wvgyfqahg5n3nybmcwqy"; type = "gem"; }; - version = "0.99.0"; + version = "1.1.0"; }; sawyer = { dependencies = ["addressable" "faraday"]; From bbd0e25d64eab9319ff6569f7c292928fe034133 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 8 Oct 2020 20:39:50 +0200 Subject: [PATCH 204/546] =?UTF-8?q?ocamlPackages.secp256k1:=200.4.0=20?= =?UTF-8?q?=E2=86=92=200.4.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/secp256k1/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/secp256k1/default.nix b/pkgs/development/ocaml-modules/secp256k1/default.nix index ed60cb96273..aab98a9cc6b 100644 --- a/pkgs/development/ocaml-modules/secp256k1/default.nix +++ b/pkgs/development/ocaml-modules/secp256k1/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, base, stdio, configurator, secp256k1 }: +{ stdenv, fetchFromGitHub, buildDunePackage, base, stdio, dune-configurator, secp256k1 }: -buildDunePackage { +buildDunePackage rec { pname = "secp256k1"; - version = "0.4.0"; + version = "0.4.1"; + + useDune2 = true; src = fetchFromGitHub { owner = "dakk"; repo = "secp256k1-ml"; - rev = "42c04c93e2ed9596f6378676e944c8cfabfa69d7"; - sha256 = "1zw2kgg181a9lj1m8z0ybijs8gw9w1kk990avh1bp9x8kc1asffg"; + rev = version; + sha256 = "0jkd7mc5kynhg0b76dfk70pww97qsq2jbd991634i16xf8qja9fj"; }; - buildInputs = [ base stdio configurator secp256k1 ]; + buildInputs = [ base stdio dune-configurator secp256k1 ]; meta = with stdenv.lib; { homepage = "https://github.com/dakk/secp256k1-ml"; From a65c4739a3560430f38c6194842f8e304b91c1f7 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 15 Oct 2020 12:39:24 +0200 Subject: [PATCH 205/546] perlPackages.PerlCriticMoose: init at 1.05 --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 086ba6c77f6..c816d229d2f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15978,6 +15978,20 @@ let }; }; + PerlCriticMoose = buildPerlPackage rec { + pname = "Perl-Critic-Moose"; + version = "1.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Perl-Critic-Moose-${version}.tar.gz"; + sha256 = "0092z583c3q3gqry693ck3ibkzby04a1g8lpw9zz2hr6qhi8xssj"; + }; + propagatedBuildInputs = [ PerlCritic Readonly namespaceautoclean ]; + meta = { + description = "Policies for Perl::Critic concerned with using Moose"; + license = stdenv.lib.licenses.artistic1; + }; + }; + PerlDestructLevel = buildPerlPackage { pname = "Perl-Destruct-Level"; version = "0.02"; From 3d5ecbd83e10a0cd156536c4ed4978bd51863e25 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Oct 2020 13:01:10 +0200 Subject: [PATCH 206/546] homeassistant: 0.116.2 -> 0.116.3 The project description changed a while ago, so let's update it. --- pkgs/servers/home-assistant/component-packages.nix | 4 ++-- pkgs/servers/home-assistant/default.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 8e7533dbfb9..74290fb6aea 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.116.2"; + version = "0.116.3"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ ]; # missing inputs: accuweather @@ -36,7 +36,7 @@ "apcupsd" = ps: with ps; [ ]; # missing inputs: apcaccess "api" = ps: with ps; [ aiohttp-cors ]; "apns" = ps: with ps; [ ]; # missing inputs: apns2 - "apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv zeroconf ]; + "apple_tv" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: pyatv "apprise" = ps: with ps; [ apprise ]; "aprs" = ps: with ps; [ ]; # missing inputs: aprslib geopy "aqualogic" = ps: with ps; [ ]; # missing inputs: aqualogic diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 90b76ef3984..b00a90ee81a 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -67,7 +67,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.116.2"; + hassVersion = "0.116.3"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -83,7 +83,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "0q4yqcikkph05mkvg160664lyf0f1qkpm7yc6kh9hgigambxi0yp"; + sha256 = "010a229cjgk3sy8amdavd54ysyrhnfrhrbskj0pg092cfj6jv85l"; }; patches = [ @@ -198,7 +198,7 @@ in with py.pkgs; buildPythonApplication rec { meta = with lib; { homepage = "https://home-assistant.io/"; - description = "Open-source home automation platform running on Python 3"; + description = "Open source home automation that puts local control and privacy first"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda globin mic92 hexa ]; }; From 6fca526aa98410df72ca20410b323ac004e21e5c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 12:22:58 +0000 Subject: [PATCH 207/546] python37Packages.pytest-warnings: 0.3.0 -> 0.3.1 --- pkgs/development/python-modules/pytest-warnings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-warnings/default.nix b/pkgs/development/python-modules/pytest-warnings/default.nix index 7f9de5b5eca..600ffbfdc7f 100644 --- a/pkgs/development/python-modules/pytest-warnings/default.nix +++ b/pkgs/development/python-modules/pytest-warnings/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-warnings"; - version = "0.3.0"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "18yxh153icmndaw8fkl1va0bk0mwzrbpaa6wxd29w3iwxym5zn2a"; + sha256 = "5939f76fe04ad18297e53af0c9fb38aca1ec74db807bd40ad72733603adbbc7d"; }; propagatedBuildInputs = [ pytest ]; From f275b320d9721cc49f0aec1c7918483c2ae6f568 Mon Sep 17 00:00:00 2001 From: Leon Vack Date: Thu, 15 Oct 2020 14:24:23 +0200 Subject: [PATCH 208/546] make-desktopitem: name was being used instead of desktopName Name should be used as filename and desktopName for the name attribute of the desktop entry (according to docs). --- pkgs/build-support/make-desktopitem/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix index fd46e298513..8e51dc1b848 100644 --- a/pkgs/build-support/make-desktopitem/default.nix +++ b/pkgs/build-support/make-desktopitem/default.nix @@ -30,7 +30,7 @@ let "Icon" = nullableToString icon; "Comment" = nullableToString comment; "Terminal" = nullableToString terminal; - "Name" = toString name; + "Name" = toString desktopName; "GenericName" = nullableToString genericName; "MimeType" = nullableToString mimeType; "Categories" = nullableToString categories; From 015c5a2be650acf9db46c3c25012e5023319625b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 14 Oct 2020 12:17:07 +0200 Subject: [PATCH 209/546] chromium: Drop the libwebp include patch Chromium 86.0.4240.75 builds fine without this patch. And since WEBP_MAX_DIMENSION is the same in the system libwebp this patch should not be required anymore (it was introduced in 06ec2a9f196, apparently to fix the build). --- .../networking/browsers/chromium/common.nix | 1 - .../chromium/patches/remove-webp-include-69.patch | 11 ----------- 2 files changed, 12 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-69.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 7de238dae8e..f8318839b91 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -154,7 +154,6 @@ let ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ]; patches = [ - ./patches/remove-webp-include-69.patch ./patches/no-build-timestamps.patch ./patches/widevine-79.patch # Unfortunately, chromium regularly breaks on major updates and diff --git a/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-69.patch b/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-69.patch deleted file mode 100644 index 07572cf7ee9..00000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-69.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc -+++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc -@@ -13,7 +13,7 @@ - - #include "jpeglib.h" // for JPEG_MAX_DIMENSION - --#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION -+#define WEBP_MAX_DIMENSION 16383 - - namespace blink { - From 178ca67f931ddf6ab77f83d1c5ce2d9348aba110 Mon Sep 17 00:00:00 2001 From: yoctocell Date: Thu, 15 Oct 2020 15:00:50 +0200 Subject: [PATCH 210/546] tor-browser-bundle-bin: 10.0 -> 10.0.1 --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index d8a2e042993..52f2d51fb69 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -91,23 +91,22 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "10.0"; + version = "10.0.1"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "1l2rfknffnh6hsi16dzps1wav5s723vyk57fzv9y5vjmbcbf7l2l"; + sha256 = "0c71dl1afl9dwpry2vshlf87pl1gfb7wrccxgqxf7mlkcir8xjcq"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "0x80w02ckb6mznrm1gjdpkxk9yf2rdcl16ljjglivq358a309cl2"; + sha256 = "1cf9z2li4ip0xpfn892icq4415dvp60ncdwfkfpih82jlvyxnhi1"; }; }; in - stdenv.mkDerivation rec { pname = "tor-browser-bundle-bin"; inherit version; From 7a30df9225e3c47080744535ccbb0a1202b36a3a Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Thu, 15 Oct 2020 14:59:07 +0200 Subject: [PATCH 211/546] clang_11: forward-port #91293 --- pkgs/development/compilers/llvm/11/clang/default.nix | 2 -- pkgs/development/compilers/llvm/11/default.nix | 10 ++++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/llvm/11/clang/default.nix b/pkgs/development/compilers/llvm/11/clang/default.nix index 2aefc884d48..4f5e20cfe77 100644 --- a/pkgs/development/compilers/llvm/11/clang/default.nix +++ b/pkgs/development/compilers/llvm/11/clang/default.nix @@ -86,8 +86,6 @@ let passthru = { isClang = true; inherit llvm; - } // stdenv.lib.optionalAttrs (stdenv.targetPlatform.isLinux || (stdenv.cc.isGNU && stdenv.cc.cc ? gcc)) { - gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; }; meta = { diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index 0b091c60973..a404d160695 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -1,5 +1,6 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake +{ lowPrio, newScope, pkgs, stdenv, cmake, gccForLibs , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith +, buildPackages , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: @@ -25,8 +26,8 @@ let ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && tools.clang-unwrapped ? gcc && !(stdenv.targetPlatform.useLLVM or false)) '' - echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags + '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' + echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags ''; in { @@ -60,7 +61,8 @@ let libstdcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; - libcxx = null; # libstdcxx is smuggled in with clang.gcc + # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. + libcxx = null; extraPackages = [ targetLlvmLibraries.compiler-rt ]; From c4dc5dec60b04ed92f2c11ff42a492b1e78a8b7b Mon Sep 17 00:00:00 2001 From: Mrinal Date: Thu, 15 Oct 2020 18:48:30 +0530 Subject: [PATCH 212/546] google-cloud-sdk: 313.0.1 -> 314.0.0 (#100570) --- pkgs/tools/admin/google-cloud-sdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 052638cea9c..e13cb0842de 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,18 +21,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "0p2csa7155phwc59rgxa5jnj13ansln4bpz161v9g2nmy0cp7i1y"; + sha256 = "0pvw0mbrx2i3v46lhjnka962gcl4ym0b9hp0xw56hpdd2abc58f6"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "1zykpv849wh8qzjvcynbkj0593870rs6s7b2mwyqrjabl7w702zv"; + sha256 = "0p5vbg5s3xsi3y7x4s3v3mxcw87x349h6bz6w7xgc141l4g08vh3"; }; }.${system}; in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "313.0.1"; + version = "314.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); From 24b4b78b18558b8a3b501adf06d580d01650a292 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 13:25:20 +0000 Subject: [PATCH 213/546] python37Packages.torchgpipe: 0.0.5 -> 0.0.7 --- pkgs/development/python-modules/torchgpipe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torchgpipe/default.nix b/pkgs/development/python-modules/torchgpipe/default.nix index e7aa53360ed..6e621ee8b68 100644 --- a/pkgs/development/python-modules/torchgpipe/default.nix +++ b/pkgs/development/python-modules/torchgpipe/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "torchgpipe"; - version = "0.0.5"; + version = "0.0.7"; disabled = isPy27; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "kakaobrain"; repo = pname; rev = "v${version}"; - sha256 = "0mqdavnqb8a320li2r7xw11w2lg03l59xxyg2fxpg4z57v0rbasi"; + sha256 = "0ki0njhmz1i3pkpr3y6h6ac7p5qh1kih06mknc2s18mfw34f2l55"; }; propagatedBuildInputs = [ pytorch ]; From 7c4c5e75f8dbfee6b2ea66cd338dc8b6c1fcb2e6 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 15 Oct 2020 09:32:56 -0400 Subject: [PATCH 214/546] linux-rt_5_4: 5.4.69-rt39 -> 5.4.70-rt40 --- pkgs/os-specific/linux/kernel/linux-rt-5.4.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index 144eed65aca..b1f40ac1c96 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.69-rt39"; # updated by ./update-rt.sh + version = "5.4.70-rt40"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "19vxsbwvfwyz1w6m7sp38d504w98zwjxaap4hfhh6wrrddqivcx8"; + sha256 = "01shqhibrxirl9bik8jwiag70n9n0l7782xh73gkb8jvbh4dicy0"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0y01m4mx4wl0w6nnmb1h5r87i11zx6ndwk8p8d7pp7vykq79x6rn"; + sha256 = "19px04cmv1v65ad7dr3y0bjr9xviawhb26iijvnxiwyjvm0054kw"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; From 098d951e4d824eb66339442a2bb938a594e47413 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Thu, 15 Oct 2020 15:34:29 +0200 Subject: [PATCH 215/546] perlPackages.Mojolicious: 8.58 -> 8.63 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c816d229d2f..f719600c9e5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13105,10 +13105,10 @@ let Mojolicious = buildPerlPackage { pname = "Mojolicious"; - version = "8.58"; + version = "8.63"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.58.tar.gz"; - sha256 = "0543m2g1pjm06b0yr4cffw70ki76762ria65zvrjccc2zk69pwvy"; + url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.63.tar.gz"; + sha256 = "1nw500wi6kdyawc2aq37lnx6zfkpby3sczflh5pjz623i8nw4b66"; }; meta = { homepage = "https://mojolicious.org"; From e2da1219d4582f8db93f04536bd9ce97eaffbe8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 15 Oct 2020 16:16:33 +0200 Subject: [PATCH 216/546] nixos/icingaweb2: Fix php packages --- nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix index d9ad7e9e3d3..eea49bda283 100644 --- a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix +++ b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix @@ -167,8 +167,8 @@ in { services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") { ${poolName} = { user = "icingaweb2"; + phpPackage = pkgs.php.withExtensions ({ enabled, all }: [ all.imagick ] ++ enabled); phpOptions = '' - extension = ${pkgs.phpPackages.imagick}/lib/php/extensions/imagick.so date.timezone = "${cfg.timezone}" ''; settings = mapAttrs (name: mkDefault) { From 8c6fe8eb61dbeb4636ac670c2cbfd9ce774a7641 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Thu, 15 Oct 2020 17:19:36 +0200 Subject: [PATCH 217/546] swiProlog: 8.1.15 -> 8.1.26 --- pkgs/development/compilers/swi-prolog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index 0140bb40111..ab211e39ed5 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -9,7 +9,7 @@ }: let - version = "8.1.15"; + version = "8.1.26"; packInstall = swiplPath: pack: ''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/pack\"), silent(true), interactive(false)])." -t "halt." ''; @@ -22,7 +22,7 @@ stdenv.mkDerivation { owner = "SWI-Prolog"; repo = "swipl-devel"; rev = "V${version}"; - sha256 = "0czbrscx2s4079nmwvipp9cnwfny16m3fpnp823llm7wyljchgvq"; + sha256 = "001bd8n9sn1pwvsyd87r0vwvipidpdx0rb5f6xpqmn24sq8hcjwa"; fetchSubmodules = true; }; From e58b0f15d19ab55163a3abde009217d1f52d355e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 14:30:36 +0000 Subject: [PATCH 218/546] python37Packages.google_cloud_dns: 0.32.0 -> 0.32.1 --- pkgs/development/python-modules/google_cloud_dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_dns/default.nix b/pkgs/development/python-modules/google_cloud_dns/default.nix index 833dfed4d6b..d488b7ad563 100644 --- a/pkgs/development/python-modules/google_cloud_dns/default.nix +++ b/pkgs/development/python-modules/google_cloud_dns/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-dns"; - version = "0.32.0"; + version = "0.32.1"; src = fetchPypi { inherit pname version; - sha256 = "1shaj1x9ccwz1ad41f8hkldibpg313raqlhwky7wij4gn2nix22i"; + sha256 = "7264e58067b55535ee859e124bd3da29337698ef6bb293da667d0316ddbe8606"; }; checkInputs = [ pytest mock ]; From 3091fb7b4460ced04208699e8ea3742d42cb1425 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 12:54:40 +0000 Subject: [PATCH 219/546] python37Packages.enamlx: 0.4.1 -> 0.4.3 --- pkgs/development/python-modules/enamlx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/enamlx/default.nix b/pkgs/development/python-modules/enamlx/default.nix index dbf54aac40e..a9cfafa020e 100644 --- a/pkgs/development/python-modules/enamlx/default.nix +++ b/pkgs/development/python-modules/enamlx/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "enamlx"; - version = "0.4.1"; + version = "0.4.3"; src = fetchFromGitHub { owner = "frmdstryr"; repo = pname; rev = "v${version}"; - sha256 = "0yh7bw9ibk758bym5w2wk7sifghf1hkxa8sd719q8nsz279cpfc0"; + sha256 = "1rlrx3cw6h1zl9svnqbzwdfy8469qa1y7w6576lbhdwpfhpipscy"; }; propagatedBuildInputs = [ From 959b818a89916211200218216c756353717550e9 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Thu, 15 Oct 2020 17:25:55 +0200 Subject: [PATCH 220/546] swiProlog: 8.1.26 -> 8.3.9 --- pkgs/development/compilers/swi-prolog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index ab211e39ed5..dadf374d5b6 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -9,7 +9,7 @@ }: let - version = "8.1.26"; + version = "8.3.9"; packInstall = swiplPath: pack: ''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/pack\"), silent(true), interactive(false)])." -t "halt." ''; @@ -22,7 +22,7 @@ stdenv.mkDerivation { owner = "SWI-Prolog"; repo = "swipl-devel"; rev = "V${version}"; - sha256 = "001bd8n9sn1pwvsyd87r0vwvipidpdx0rb5f6xpqmn24sq8hcjwa"; + sha256 = "0ixb8pc5s7q8q0njs8is1clpvik6jhhdcwnys7m9rpwdzgi10sjz"; fetchSubmodules = true; }; From 3ee53c19e2f9d876923a925a21833e248a150436 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 15:26:32 +0000 Subject: [PATCH 221/546] python37Packages.mocket: 3.9.1 -> 3.9.2 --- pkgs/development/python-modules/mocket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index 1a705ab21bc..ab9be69e58e 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.9.1"; + version = "3.9.2"; src = fetchPypi { inherit pname version; - sha256 = "1bp6642qh8fkjqgvp1vif2zbzpappbbq3sgs7vfr87inn4frc2cz"; + sha256 = "25aba0b343784b27b1d77e731ed868a728d5209911f9f4728f33088582e491c9"; }; patchPhase = '' From 8886cb63e2078d852090af7d94283a5f046f386b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 15 Oct 2020 17:59:46 +0200 Subject: [PATCH 222/546] matrix-synapse: 1.21.0 -> 1.21.2 https://github.com/matrix-org/synapse/releases/tag/v1.21.1 [1] https://github.com/matrix-org/synapse/releases/tag/v1.21.2 [1] Not really relevant for as since only a bug in the Debian packaging was fixed. --- 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 8b119994ad9..f18c6f83ffc 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.21.0"; + version = "1.21.2"; src = fetchPypi { inherit pname version; - sha256 = "0iip311xbzc984gzpmri5fabpb3b2ck1ywv5378pk90m02yybgi5"; + sha256 = "061b2mpdzqxyks1kj3p7xmw8i4akqfd2s9vb7v8w27k2qpcw7528"; }; patches = [ From 9eac601f774992b2645669461c172dca3e8b8cf3 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 15 Oct 2020 19:11:41 +0300 Subject: [PATCH 223/546] tectonic: add @doronbehar to maintainers --- pkgs/tools/typesetting/tectonic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 34060ffb053..41aadad1ff1 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -25,6 +25,6 @@ rustPlatform.buildRustPackage rec { description = "Modernized, complete, self-contained TeX/LaTeX engine, powered by XeTeX and TeXLive"; homepage = "https://tectonic-typesetting.github.io/"; license = with licenses; [ mit ]; - maintainers = [ maintainers.lluchs ]; + maintainers = [ maintainers.lluchs maintainers.doronbehar ]; }; } From 90bf48b2a34b7ea428a5116c381701798a8ca623 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 15 Oct 2020 19:14:28 +0300 Subject: [PATCH 224/546] tectonic: 0.1.16 -> 0.1.17 --- pkgs/tools/typesetting/tectonic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 41aadad1ff1..db976e90225 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "tectonic"; - version = "0.1.16"; + version = "0.1.17"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "tectonic@${version}"; - sha256 = "0dzqf67y4ci1vsl3zhmjkzfnf22w2bbk5w5qj2gryzrhp1q9ajyr"; + sha256 = "VHhvdIBFPE5CkWVQ4tzMionUnAkZTucVXl5zp5prgok="; }; - cargoSha256 = "1p0wzylkw1gxaff0m47il7qa0dfflxdyshvkvdirvjidg5cam9bk"; + cargoSha256 = "/f/suiI5XzI0+lCscsqLZTWU6slHdXgR+5epYpxyU1w="; nativeBuildInputs = [ pkgconfig ]; From 0ff57286ee3118a8f4e315b0827506b6836786f1 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Thu, 15 Oct 2020 17:03:04 +0200 Subject: [PATCH 225/546] qutebrowser: 1.13.1 -> 1.14.0 --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 69ca08e990c..524f3e7ca63 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -31,12 +31,12 @@ let in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.13.1"; + version = "1.14.0"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1n72dvrv4dch4i07lsis76p7g16a039fwx8rk7w8q9f60wgqb5i8"; + sha256 = "0jip413yvyhdaywz0iadc32aaanjnhbx1d1vwzx3z1xbgc4i9svn"; }; # Needs tox From 71504af486517f6bf1da1dda9047f91d9dd1004c Mon Sep 17 00:00:00 2001 From: Anton Arapov Date: Wed, 14 Oct 2020 13:53:51 +0200 Subject: [PATCH 226/546] uboot: 2020.07 -> 2020.10 update to recent upstream release Signed-off-by: Anton Arapov --- pkgs/misc/uboot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 59f73b42439..d3ce3e59876 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -18,10 +18,10 @@ }: let - defaultVersion = "2020.07"; + defaultVersion = "2020.10"; defaultSrc = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - sha256 = "0sjzy262x93aaqd6z24ziaq19xjjjk5f577ivf768vmvwsgbzxf1"; + sha256 = "08m6f1bh4pdcqbxf983qdb66ccd5vak5cbzc114yf3jwq2yinj0d"; }; buildUBoot = { version ? null From 617b980961f4ec6572226a468d3b96d26fde3528 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 15 Oct 2020 12:49:47 -0400 Subject: [PATCH 227/546] linux_latest-libre: 17718 -> 17724 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index a51545171f8..4e308d657ac 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "17718"; - sha256 = "1sgfh1mbgfxf2vcmjs5dbfn8ihkq7xf72m3lmdfxy1skmvwh1mk5"; + rev = "17724"; + sha256 = "0aqg8il35a1mda4icqprvriham81vvnsa04rjc86b6x7khxdhiq2"; } , ... }: From c78dc9cf5be4fbabf57de65853c2a66305ccdb21 Mon Sep 17 00:00:00 2001 From: Ryan Orendorff <12442942+ryanorendorff@users.noreply.github.com> Date: Tue, 13 Oct 2020 20:30:20 -0600 Subject: [PATCH 228/546] agda-packages: add fla library at v0.1 Adds the functional-linear-algebra library to the agda package set. --- .../functional-linear-algebra/default.nix | 26 +++++++++++++++++++ pkgs/top-level/agda-packages.nix | 3 +++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/agda/functional-linear-algebra/default.nix diff --git a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix new file mode 100644 index 00000000000..dbcdaac532e --- /dev/null +++ b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix @@ -0,0 +1,26 @@ +{ fetchFromGitHub, lib, stdenv, mkDerivation, standard-library }: + +mkDerivation rec { + version = "0.1"; + pname = "functional-linear-algebra"; + + buildInputs = [ standard-library ]; + + src = fetchFromGitHub { + repo = "functional-linear-algebra"; + owner = "ryanorendorff"; + rev = "v${version}"; + sha256 = "09ri3jmgp9jjwi1mzv4c3w6rvcmyx6spa2qxpwlcn0f4bmfva6wm"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/ryanorendorff/functional-linear-algebra"; + description = '' + Formalizing linear algebra in Agda by representing matrices as functions + from one vector space to another. + ''; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ ryanorendorff ]; + }; +} diff --git a/pkgs/top-level/agda-packages.nix b/pkgs/top-level/agda-packages.nix index 3209aff9496..601ab6d42b9 100644 --- a/pkgs/top-level/agda-packages.nix +++ b/pkgs/top-level/agda-packages.nix @@ -25,6 +25,9 @@ let cubical = callPackage ../development/libraries/agda/cubical { }; + functional-linear-algebra = callPackage + ../development/libraries/agda/functional-linear-algebra { }; + generic = callPackage ../development/libraries/agda/generic { }; }; in mkAgdaPackages Agda From e5a84155af014359da8c519e156e1f5fb2b3c0e6 Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Sun, 24 Feb 2019 22:38:02 +0000 Subject: [PATCH 229/546] perlPackages.TestUNIXSock: init at 0.4 --- pkgs/top-level/perl-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f719600c9e5..f14288a64d5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20536,6 +20536,21 @@ let buildInputs = [ TestSharedFork ]; }; + TestUNIXSock = buildPerlModule rec { + pname = "Test-UNIXSock"; + version = "0.4"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FU/FUJIWARA/${pname}-${version}.tar.gz"; + sha256 = "0gwgd2w16dsppmf1r6yc17ipvs8b62ybsiz2dyzwy4il236b8c1p"; + }; + meta = { + description = "Testing UNIX domain socket program"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + buildInputs = [ ModuleBuildTiny ]; + propagatedBuildInputs = [ TestSharedFork TestTCP ]; + }; + TestTime = buildPerlPackage { pname = "Test-Time"; version = "0.08"; From b156dd9fda45d0ac3816fde8026f2df9a00f6cf8 Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Sat, 23 Feb 2019 22:31:42 +0000 Subject: [PATCH 230/546] perlPackages.NetServerSSPrefork: init at 0.06pre This package hasn't seen a release in about 9 years, and there are important features on master (namely, Unix socket support), so we'll get our version from Github. --- pkgs/top-level/perl-packages.nix | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f14288a64d5..3afabe1d2af 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14970,6 +14970,24 @@ let }; }; + NetServerSSPrefork = buildPerlPackage { + pname = "Net-Server-SS-PreFork"; + version = "0.06pre"; + src = fetchFromGitHub { + owner = "kazuho"; + repo = "p5-Net-Server-SS-PreFork"; + rev = "5fccc0c270e25c65ef634304630af74b48807d21"; + sha256 = "0z02labw0dd76sdf301bhrmgnsjds0ddsg22138g8ys4az49bxx6"; + }; + checkInputs = [ HTTPMessage LWP TestSharedFork HTTPServerSimple TestTCP TestUNIXSock ]; + buildInputs = [ ModuleInstall ]; + propagatedBuildInputs = [ NetServer ServerStarter ]; + meta = { + description = "A hot-deployable variant of Net::Server::PreFork"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + NetSMTPSSL = buildPerlPackage { pname = "Net-SMTP-SSL"; version = "1.04"; @@ -17987,7 +18005,7 @@ let }; buildInputs = [ LWP ModuleBuildTiny TestRequires TestTCP ]; nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; - propagatedBuildInputs = [ DataDump HTTPParserXS NetServer Plack ]; + propagatedBuildInputs = [ DataDump HTTPParserXS NetServer Plack NetServerSSPrefork ]; postInstall = stdenv.lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/starman ''; From c55a67dcf0429ef3bce1b6d3ac551f334df00898 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 15 Oct 2020 20:09:29 +0200 Subject: [PATCH 231/546] ffmpeg-full: Build without rav1e The build of rav1e is currently broken, see #100029. --- 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 5f1da20ae6e..db255b00c62 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12410,7 +12410,7 @@ in openal = if stdenv.isDarwin then null else openal; libmfx = if stdenv.isDarwin then null else intel-media-sdk; libpulseaudio = if stdenv.isDarwin then null else libpulseaudio; - rav1e = if stdenv.isDarwin then null else rav1e; + rav1e = null; samba = if stdenv.isDarwin then null else samba; vid-stab = if stdenv.isDarwin then null else vid-stab; x265 = if stdenv.isDarwin then null else x265; From bda9a7a431675763516f171cca7d85f62246db63 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 15 Oct 2020 20:04:17 +0200 Subject: [PATCH 232/546] cargo-c: 0.6.13 -> 0.6.15 --- pkgs/development/tools/rust/cargo-c/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix index ce01fc1f00c..41c03923ec0 100644 --- a/pkgs/development/tools/rust/cargo-c/default.nix +++ b/pkgs/development/tools/rust/cargo-c/default.nix @@ -5,7 +5,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-c"; - version = "0.6.13"; + version = "0.6.15"; src = stdenv.mkDerivation rec { name = "${pname}-source-${version}"; @@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec { owner = "lu-zero"; repo = pname; rev = "v${version}"; - sha256 = "0ks2w3gclahidv6r6i0d0d6sli7r8wabxzgmhq03czy5w7kr0x56"; + sha256 = "04hrk3vy8294vxcsggdpcs8hg3ykzj2564ifsqc4zwz4b4wd1p8l"; }; cargoLock = fetchurl { url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock"; - sha256 = "0czy5q8hkjqyn53p7cjxnxfgwygx2a6casjb4nj5gxss2x3haih6"; + sha256 = "0rqb6ssqsdlm8zbshbxkwxlyy7j7p2gyficavzz33cw9g6fpmzbd"; }; installPhase = '' @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "0jjkcawcz6wacx22zir9ay1qsi5ffk7c4gwa6jpky4a94zr1h690"; + cargoSha256 = "1q2s28nqd6l9qmhmdksdjjlypxry5ff18i2pgwmgiilcry51mj4b"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] From ffd70e88a4f2e7ce0ba2ea2d34331611a9bf343d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 14:42:46 +0000 Subject: [PATCH 233/546] python37Packages.django_classytags: 1.0.0 -> 2.0.0 --- pkgs/development/python-modules/django_classytags/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_classytags/default.nix b/pkgs/development/python-modules/django_classytags/default.nix index 9cef46173de..102e2e7cf93 100644 --- a/pkgs/development/python-modules/django_classytags/default.nix +++ b/pkgs/development/python-modules/django_classytags/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-classy-tags"; - version = "1.0.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1cayqddvxd5prhybqi77lif2z4j7mmfmxgc61pq9i82q5gy2asmd"; + sha256 = "d59d98bdf96a764dcf7a2929a86439d023b283a9152492811c7e44fc47555bc9"; }; propagatedBuildInputs = [ django six ]; From 50715567605402fa89aaeb7111ff49d7c365d4f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Wed, 14 Oct 2020 22:57:02 +0200 Subject: [PATCH 234/546] python{2,3}Package.pytest-bdd: upgrade and fix test --- pkgs/development/python-modules/pytest-bdd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytest-bdd/default.nix b/pkgs/development/python-modules/pytest-bdd/default.nix index 0ad4392bee9..ccde881d383 100644 --- a/pkgs/development/python-modules/pytest-bdd/default.nix +++ b/pkgs/development/python-modules/pytest-bdd/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pytest-bdd"; - version = "3.2.1"; + version = "4.0.1"; # tests are not included in pypi tarball src = fetchFromGitHub { owner = "pytest-dev"; repo = pname; rev = version; - sha256 = "02y28l5h1m9grj54p681qvv7nrhd7ly9jkqdchyw4p0lnmcmnsrd"; + sha256 = "1yqzz44as4pxffmg4hk9lijvnvlc2chg1maq1fbj5i4k4jpagvjz"; }; propagatedBuildInputs = [ glob2 Mako parse parse-type py pytest six ]; @@ -27,7 +27,7 @@ buildPythonPackage rec { # Tests require extra dependencies checkInputs = [ execnet mock pytest ]; checkPhase = '' - pytest + PATH=$PATH:$out/bin pytest ''; meta = with stdenv.lib; { From a667bc7ae11fa88aaca70a084ac769f1876b52a6 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 15 Oct 2020 20:34:10 +0200 Subject: [PATCH 235/546] chromiumBeta: M86 -> M87 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 9ea7182b96d..3e2c1904e3b 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -5,13 +5,13 @@ "sha256bin64": "17isxkd80rccqim6izzl08vw4yr52qsk6djp1rmhhijzg9rsvghz" }, "beta": { - "version": "86.0.4240.75", - "sha256": "1ddw4p9zfdzhi5hrd8x14k4w326znljzprnpfi2f917rlpnl2ynx", - "sha256bin64": "16snxdka5bkbvybx6x0dzgfbfaifv0jcc1dcny6vlqqp2fmb2v39" + "version": "87.0.4280.20", + "sha256": "1lqdxy6pm72h8ym5ij713rp055csqn19agy3sp6wnmp3pj688ic8", + "sha256bin64": "0r9wk2kgn7z0jjzpppr799jp5izxvh1ig4mv12iadz4y7dl47kaw" }, "dev": { - "version": "87.0.4278.0", - "sha256": "1ywmv4iwn2as7vk2n0pslnmr300fl5y809ynxiw5xqcx9j6i8w85", - "sha256bin64": "15dvwvk6l6n7l04085hr48hlvsijypasyk7d8iq3s6cxai3wx4cl" + "version": "87.0.4280.20", + "sha256": "1lqdxy6pm72h8ym5ij713rp055csqn19agy3sp6wnmp3pj688ic8", + "sha256bin64": "1i625i4kb8bgz2qp88l5kyc1nr4cghfh6038sllng5hfimsn0vwg" } } From 1c0f102220df0b5ed01b28712579e7f76435063e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 15 Oct 2020 20:53:57 +0200 Subject: [PATCH 236/546] pyocr: Use tesseract without alias --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d900784e0a1..809a54de673 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5215,7 +5215,7 @@ in { throw "pyobjc can only be built on Mac OS"; pyocr = callPackage ../development/python-modules/pyocr { - tesseract = pkgs.tesseract_4; + tesseract = pkgs.tesseract4; }; pyodbc = callPackage ../development/python-modules/pyodbc { }; From 9c9418151de91b6c0d9c4d83b26f9711a53b0875 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 15 Oct 2020 12:10:08 -0700 Subject: [PATCH 237/546] update-python-libraries: allow for top-level attrs to be updated with github fetcher --- .../update-python-libraries/update-python-libraries.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py index f822cea64da..9054195ab7e 100755 --- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py @@ -193,9 +193,12 @@ def _get_latest_version_github(package, extension, current_version, target): matches = re.findall(r"^([^0-9]*)", string) return next(iter(matches), "") + # when invoked as an updateScript, UPDATE_NIX_ATTR_PATH will be set + # this allows us to work with packages which live outside of python-modules + attr_path = os.environ.get("UPDATE_NIX_ATTR_PATH", f"python3Packages.{package}") try: homepage = subprocess.check_output( - ["nix", "eval", "-f", f"{NIXPGKS_ROOT}/default.nix", "--raw", f"python3Packages.{package}.src.meta.homepage"])\ + ["nix", "eval", "-f", f"{NIXPGKS_ROOT}/default.nix", "--raw", f"{attr_path}.src.meta.homepage"])\ .decode('utf-8') except Exception as e: raise ValueError(f"Unable to determine homepage: {e}") From 95b55f6e7c034ee2e7845a7829793376c109062d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 17:54:13 +0000 Subject: [PATCH 238/546] python37Packages.hdmedians: 0.13 -> 0.14.1 --- pkgs/development/python-modules/hdmedians/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hdmedians/default.nix b/pkgs/development/python-modules/hdmedians/default.nix index 691e17a5a41..80e287d376f 100644 --- a/pkgs/development/python-modules/hdmedians/default.nix +++ b/pkgs/development/python-modules/hdmedians/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "0.13"; + version = "0.14.1"; pname = "hdmedians"; src = fetchPypi { inherit pname version; - sha256 = "230f80e064d905c49a1941af1b7e806e2f22b3c9a90ad5c21fd17d72636ea277"; + sha256 = "ccefaae26302afd843c941b3b662f1119d5a36dec118077310f811a7a1ed8871"; }; # nose was specified in setup.py as a build dependency... From dbacc193bdfbeb73643d5a18c4b3703ce05d7e46 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 15:07:16 +0000 Subject: [PATCH 239/546] python37Packages.azure-keyvault-keys: 4.2.0 -> 4.3.0 --- .../python-modules/azure-keyvault-keys/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/pkgs/development/python-modules/azure-keyvault-keys/default.nix index 25ce0fd67db..46bd196a3d8 100644 --- a/pkgs/development/python-modules/azure-keyvault-keys/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-keys/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "azure-keyvault-keys"; - version = "4.2.0"; + version = "4.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e47b76ca5d99b12436c64ce4431271cd6744fba017f282991b84ce303e0b9eaa"; + sha256 = "064a98791fe447a0e57850bb5ec1ec43e7d5fd39266319b5acc44a9704a3b966"; }; propagatedBuildInputs = [ From 1d68c7c77bd794506d91b05df6ef14b5dd430e22 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 19:30:03 +0000 Subject: [PATCH 240/546] python37Packages.plone-testing: 8.0.1 -> 8.0.2 --- pkgs/development/python-modules/plone-testing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plone-testing/default.nix b/pkgs/development/python-modules/plone-testing/default.nix index 825fcc86dc0..c951800454d 100644 --- a/pkgs/development/python-modules/plone-testing/default.nix +++ b/pkgs/development/python-modules/plone-testing/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "plone.testing"; - version = "8.0.1"; + version = "8.0.2"; src = fetchPypi { inherit pname version; - sha256 = "e079c87f821cf2e411826940e65577a88e08827cf9a2b771070f2917a439b642"; + sha256 = "082b03aebe81d0bdcc44a917a795ae60d3add2c2abbee11e7c335fb13d5e7ca7"; }; propagatedBuildInputs = [ six setuptools zope_testing ]; From e801617e8cbaff7ff073050a39e7ab9b42017463 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 20:06:05 +0000 Subject: [PATCH 241/546] python37Packages.zarr: 2.4.0 -> 2.5.0 --- pkgs/development/python-modules/zarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index c51694c6306..e12ce586091 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.4.0"; + version = "2.5.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "53aa21b989a47ddc5e916eaff6115b824c0864444b1c6f3aaf4f6cf9a51ed608"; + sha256 = "d54f060739208392494c3dbcbfdf41c8df9fa23d9a32b91aea0549b4c5e2b77f"; }; nativeBuildInputs = [ From a1aac19fd6d771adac65b960178a986a2bbc5fd5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 19:43:58 +0000 Subject: [PATCH 242/546] python37Packages.google_cloud_bigtable: 1.4.0 -> 1.5.1 --- .../python-modules/google_cloud_bigtable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_bigtable/default.nix b/pkgs/development/python-modules/google_cloud_bigtable/default.nix index 91c3109e91a..310663df350 100644 --- a/pkgs/development/python-modules/google_cloud_bigtable/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigtable/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "1.4.0"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "e777333cbe85888f888c034d32880bb6a602ad83d8c81a95edca7c522cf430d8"; + sha256 = "25b869bb20ad6ee9f6e7fc3c95d973011ade8176af9197468686335e216c088e"; }; checkInputs = [ pytest mock ]; From e70989d0804185dddb4132041a277ec2644212f0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 21:04:12 +0000 Subject: [PATCH 243/546] python37Packages.datamodeldict: 0.9.6 -> 0.9.7 --- pkgs/development/python-modules/datamodeldict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datamodeldict/default.nix b/pkgs/development/python-modules/datamodeldict/default.nix index 1a77c22104c..e4c10d8c22c 100644 --- a/pkgs/development/python-modules/datamodeldict/default.nix +++ b/pkgs/development/python-modules/datamodeldict/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.9.6"; + version = "0.9.7"; pname = "DataModelDict"; src = fetchPypi { inherit pname version; - sha256 = "857d4bf33f0b26ca718bd821fda7502dd6fb15aa09201b1fbdfaf4dfc85b8f6c"; + sha256 = "b1be7573cb4401aa250fd00f2e6392543f6f2498f8e02f6313595aa220e5c99e"; }; propagatedBuildInputs = [ xmltodict ]; From c465d653863c835697ddc7ffc9ee76ee86c5ed94 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 19:01:33 +0000 Subject: [PATCH 244/546] python37Packages.vertica-python: 0.11.0 -> 1.0.0 --- pkgs/development/python-modules/vertica-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix index 7247e079467..5e704cdcb25 100644 --- a/pkgs/development/python-modules/vertica-python/default.nix +++ b/pkgs/development/python-modules/vertica-python/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "vertica-python"; - version = "0.11.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "cceb39d081b8d1628956205642e740a9fabcfd2c6ecd982c51134fba8215d0bd"; + sha256 = "f042cf60ddd69eeb17c9f1586bae25da5b7282ca53d9afe0be30b943b4194d52"; }; propagatedBuildInputs = [ future dateutil six ]; From bbb2a3ad1b28e527711d1ddaae5b98e96b7f3778 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 18:43:22 +0000 Subject: [PATCH 245/546] python37Packages.cmd2: 1.3.10 -> 1.3.11 --- pkgs/development/python-modules/cmd2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 4a646060136..335649c6be9 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "1.3.10"; + version = "1.3.11"; src = fetchPypi { inherit pname version; - sha256 = "960d8288c8e3a093d04975e3dd8461ce2e43c1d0c70e54873f622f8f0b77d6f5"; + sha256 = "826a288ee6d9c4ec1184e64e9566c09d3b73be8f4283c1898fa4332f1daf8dbf"; }; LC_ALL="en_US.UTF-8"; From 70163b8b3ec377a4ef3513629a988be339ac45c0 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 15 Oct 2020 18:22:21 +0200 Subject: [PATCH 246/546] python3.pkgs.authlib: 0.14.3 -> 0.15.1 --- pkgs/development/python-modules/authlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/authlib/default.nix b/pkgs/development/python-modules/authlib/default.nix index bf82d106598..94fc7215c34 100644 --- a/pkgs/development/python-modules/authlib/default.nix +++ b/pkgs/development/python-modules/authlib/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { - version = "0.14.3"; + version = "0.15.1"; pname = "authlib"; src = fetchFromGitHub { owner = "lepture"; repo = "authlib"; rev = "v${version}"; - sha256 = "0ph97j94i40jj7nc5ya8pfq0ccx023zbqpcs5hrxmib53g64k5xy"; + sha256 = "0jh4kdi5spzhmgvq3ffz2q467hjycz3wg97f7n53rffiwd86jrh5"; }; propagatedBuildInputs = [ cryptography requests ]; From 8abe47eab60f89f363b240008eb8453f8193e59f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 21:11:26 +0000 Subject: [PATCH 247/546] python37Packages.sharedmem: 0.3.7 -> 0.3.8 --- pkgs/development/python-modules/sharedmem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sharedmem/default.nix b/pkgs/development/python-modules/sharedmem/default.nix index 9111fd971ca..942e272229a 100644 --- a/pkgs/development/python-modules/sharedmem/default.nix +++ b/pkgs/development/python-modules/sharedmem/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "sharedmem"; - version = "0.3.7"; + version = "0.3.8"; src = fetchPypi { inherit pname version; - sha256 = "483e414b8c5d03093a02baf548449f1d8426a88855556fa42102bba82b86b2a8"; + sha256 = "c654a6bee2e2f35c82e6cc8b6c262fcabd378f5ba11ac9ef71530f8dabb8e2f7"; }; propagatedBuildInputs = [ numpy ]; From 8ff4da09f3072bb6a2c71e70962adc5bcf99f72b Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Thu, 15 Oct 2020 23:09:17 +0200 Subject: [PATCH 248/546] haskellPackages.pandoc: Update to 2.11 --- .../haskell-modules/configuration-common.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e17a1217d46..6ecb4e01689 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1393,12 +1393,6 @@ self: super: { # https://github.com/jgm/commonmark-hs/issues/55 commonmark-extensions = dontCheck super.commonmark-extensions; - - # 2020-10-11: reflex-dom-pandoc and neuron require skylighting >= 9, which we - # can‘t support, because there is no pandoc release compatible with this. - reflex-dom-pandoc = doJailbreak super.reflex-dom-pandoc; - neuron = doJailbreak super.neuron; - # Testsuite trying to run `which haskeline-examples-Test` haskeline_0_8_1_0 = dontCheck super.haskeline_0_8_1_0; @@ -1470,11 +1464,14 @@ self: super: { cryptonite = doDistribute self.cryptonite_0_27; # We want the latest version of Pandoc. + skylighting = doDistribute super.skylighting_0_10_0_2; + skylighting-core = doDistribute super.skylighting-core_0_10_0_2; hslua = doDistribute self.hslua_1_1_2; jira-wiki-markup = doDistribute self.jira-wiki-markup_1_3_2; - pandoc = doDistribute self.pandoc_2_10_1; - pandoc-citeproc = doDistribute self.pandoc-citeproc_0_17_0_2; - pandoc-types = doDistribute self.pandoc-types_1_21; + pandoc = doDistribute self.pandoc_2_11; + # jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc + pandoc-citeproc = doJailbreak (doDistribute self.pandoc-citeproc_0_17_0_2); + pandoc-types = doDistribute self.pandoc-types_1_22; rfc5051 = doDistribute self.rfc5051_0_2; # The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox. From e785aee75e0236f8dd8f548037339300bcc892cd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 21:58:44 +0000 Subject: [PATCH 249/546] python37Packages.islpy: 2020.2 -> 2020.2.2 --- pkgs/development/python-modules/islpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index 1d32291dff1..736588aa450 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "islpy"; - version = "2020.2"; + version = "2020.2.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "ee797e1284bffe897568f9cc1f063f1a6fac8d7b87596308b7467e9b870a90ef"; + sha256 = "7eb7dfa41d6a67d9ee4ea4bb9f08bdbcbee42b364502136b7882cfd80ff427e0"; }; postConfigure = '' From bff6c1025854210bb6ad43f4b8e3a51a8ae3bb43 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Fri, 16 Oct 2020 05:46:10 +0800 Subject: [PATCH 250/546] maintainers: add zakame --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 52262d6e3ab..144ff0611a5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9508,6 +9508,12 @@ githubId = 568532; name = "Christian Zagrodnick"; }; + zakame = { + email = "zakame@zakame.net"; + github = "zakame"; + githubId = 110625; + name = "Zak B. Elep"; + }; zalakain = { email = "ping@umazalakain.info"; github = "umazalakain"; From aba0b946ade58dd9da6ce58e72ecdd78b706c05c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 21:45:51 +0000 Subject: [PATCH 251/546] python37Packages.python-igraph: 0.8.2 -> 0.8.3 --- pkgs/development/python-modules/python-igraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-igraph/default.nix b/pkgs/development/python-modules/python-igraph/default.nix index d67ec59f3ac..51d544eb5f8 100644 --- a/pkgs/development/python-modules/python-igraph/default.nix +++ b/pkgs/development/python-modules/python-igraph/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "python-igraph"; - version = "0.8.2"; + version = "0.8.3"; disabled = !isPy3k; # fails to build nativeBuildInputs = [ pkgconfig ]; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "4601638d7d22eae7608cdf793efac75e6c039770ec4bd2cecf76378c84ce7d72"; + sha256 = "e1f27622eddeb2bd5fdcbadb41ef048e884790bb050f9627c086dc609d0f1236"; }; # NB: We want to use our igraph, not vendored igraph, but even with From ef6578f44c4a4cae9bd99caf07912f62f9304247 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 15 Oct 2020 12:00:25 +0200 Subject: [PATCH 252/546] =?UTF-8?q?pythonPackages.afdko:=203.5.0=20?= =?UTF-8?q?=E2=86=92=203.5.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../python-modules/afdko/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index 5d960b5e92e..f1e3bf0cd56 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -1,22 +1,32 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, python +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, python , fonttools, defcon, lxml, fs, unicodedata2, zopfli, brotlipy, fontpens , brotli, fontmath, mutatormath, booleanoperations -, ufoprocessor, ufonormalizer, psautohint +, ufoprocessor, ufonormalizer, psautohint, tqdm , setuptools_scm , pytest }: buildPythonPackage rec { pname = "afdko"; - version = "3.5.0"; + version = "3.5.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0wid4l70bxm297xgayyrgw5glhp6n92gh4sz1nd4rncgf1ziz8ck"; + sha256 = "1qg7dgl81yq0sp50pkhgvmf8az1svx20zmpkfa68ka9d0ssh1wjw"; }; + # Skip date-dependent test. See + # https://github.com/adobe-type-tools/afdko/pull/1232 + # https://github.com/NixOS/nixpkgs/pull/98158#issuecomment-704321117 + patches = [ + (fetchpatch { + url = "https://github.com/adobe-type-tools/afdko/commit/2c36ad10f9d964759f643e8ed7b0972a27aa26bd.patch"; + sha256 = "0p6a485mmzrbfldfbhgfghsypfiad3cabcw7qlw2rh993ivpnibf"; + }) + ]; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ @@ -35,6 +45,7 @@ buildPythonPackage rec { ufoprocessor ufonormalizer psautohint + tqdm ]; # tests are broken on non x86_64 From 2eaf3206e9bf6082d50672347ac33c7bba395d0e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 22:44:06 +0000 Subject: [PATCH 253/546] python37Packages.entrypoint2: 0.2.1 -> 0.2.3 --- pkgs/development/python-modules/entrypoint2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/entrypoint2/default.nix b/pkgs/development/python-modules/entrypoint2/default.nix index 301de3e278f..d62361e7be0 100644 --- a/pkgs/development/python-modules/entrypoint2/default.nix +++ b/pkgs/development/python-modules/entrypoint2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "entrypoint2"; - version = "0.2.1"; + version = "0.2.3"; src = fetchPypi { inherit pname version; - sha256 = "15dya04884armqjdyqz1jgachkqgh9dc3p25lvyz9afvg73k2qav"; + sha256 = "4ac1a8f08477d93282c422faa90875ce5edaa941e1f3fd410b95cb31d9f473a7"; }; propagatedBuildInputs = [ ]; From 83a1ce3d2b25f1ed855d844a20647197fe24c265 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Thu, 15 Oct 2020 19:12:18 -0400 Subject: [PATCH 254/546] itk: remove -march=corei7 and -mtune=native flags from cmake build files - probable cause of build failure on Hydra on branch release-20.09 --- pkgs/development/libraries/itk/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 1288242faf2..65e41a58a47 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -12,6 +12,12 @@ stdenv.mkDerivation rec { sha256 = "1z7rmqrhgl7hfb3d0077kvp8vpi05r2zk3qyqzmv7bzbal5sqqhv"; }; + postPatch = '' + substituteInPlace CMake/ITKSetStandardCompilerFlags.cmake \ + --replace "-march=corei7" "" \ + --replace "-mtune=native" "" + ''; + cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" "-DBUILD_SHARED_LIBS=ON" From 9ad89f4e3253630a4116544b0c5d8d60ad46a863 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 23:18:59 +0000 Subject: [PATCH 255/546] python37Packages.distributed: 2.23.0 -> 2.30.0 --- pkgs/development/python-modules/distributed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 91f6f06f6d9..0267e959e5b 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -28,12 +28,12 @@ buildPythonPackage rec { pname = "distributed"; - version = "2.23.0"; + version = "2.30.0"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "469e505fd7ce75f600188bdb69a95641899d5b372f74246c8f308376b6929e9c"; + sha256 = "3eb8e4173625cea6ebda2f0a079b813eeabbffd1b24584855cf063ed1cca60b3"; }; disabled = pythonOlder "3.6"; From 0ee591e246e78398b57e9cc7769d8e11d601970d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Oct 2020 01:21:41 +0200 Subject: [PATCH 256/546] homeassistant: 0.116.3 -> 0.116.4 --- pkgs/servers/home-assistant/component-packages.nix | 4 ++-- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 74290fb6aea..cbcc650111e 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.116.3"; + version = "0.116.4"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ ]; # missing inputs: accuweather @@ -570,7 +570,7 @@ "onboarding" = ps: with ps; [ aiohttp-cors pillow ]; # missing inputs: home-assistant-frontend "onewire" = ps: with ps; [ ]; # missing inputs: pyownet "onkyo" = ps: with ps; [ onkyo-eiscp ]; - "onvif" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: WSDiscovery onvif-zeep-async + "onvif" = ps: with ps; [ ha-ffmpeg zeep ]; # missing inputs: WSDiscovery onvif-zeep-async "openalpr_cloud" = ps: with ps; [ ]; "openalpr_local" = ps: with ps; [ ]; "opencv" = ps: with ps; [ numpy ]; # missing inputs: opencv-python-headless diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index b00a90ee81a..e2a7df26efe 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -67,7 +67,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.116.3"; + hassVersion = "0.116.4"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -83,7 +83,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "010a229cjgk3sy8amdavd54ysyrhnfrhrbskj0pg092cfj6jv85l"; + sha256 = "1wcr2afvq1l6xlws3jgzfyh4kx61i0x9n985fiq3ls29w9lpshk4"; }; patches = [ From d63ddacf9355e754d9dc9c1d2b4646fe78aa5cca Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 15 Oct 2020 19:34:49 -0400 Subject: [PATCH 257/546] bash: Use nix-shell in update script The script assumed that `wget` was available in the environment along with common CA certificates. Replaced the detection of GPG, which is not necessary anymore. Added pulling the public key bash releases and patches are signed with, without which we cannot verify signatures. --- pkgs/shells/bash/update-patch-set.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/shells/bash/update-patch-set.sh b/pkgs/shells/bash/update-patch-set.sh index 003c7a26d20..cb4f372f543 100755 --- a/pkgs/shells/bash/update-patch-set.sh +++ b/pkgs/shells/bash/update-patch-set.sh @@ -1,4 +1,5 @@ -#!/bin/sh +#!/usr/bin/env nix-shell +#!nix-shell --pure -i bash -p wget -p gnupg -p cacert # Update patch set for GNU Bash or Readline. @@ -14,8 +15,6 @@ fi PROJECT="$1" VERSION="$2" VERSION_CONDENSED="$(echo $VERSION | sed -es/\\.//g)" - -GPG="$(if $(type -P gpg2 > /dev/null); then echo gpg2; else echo gpg; fi)" PATCH_LIST="$PROJECT-$VERSION-patches.nix" set -e @@ -25,6 +24,12 @@ end=100 # must be > 99 for correct padding rm -vf "$PATCH_LIST" +wget "https://tiswww.case.edu/php/chet/gpgkey.asc" +echo "4ef5051ce7200241e65d29c11eb57df8 gpgkey.asc" > gpgkey.asc.md5 +md5sum -c gpgkey.asc.md5 +gpg --import ./gpgkey.asc +rm gpgkey.asc{,.md5} + ( echo "# Automatically generated by \`$(basename $0)'; do not edit." ; \ echo "" ; \ echo "patch: [" ) \ @@ -34,7 +39,7 @@ for i in `seq -w $start $end` do wget ftp.gnu.org/gnu/$PROJECT/$PROJECT-$VERSION-patches/$PROJECT$VERSION_CONDENSED-$i || break wget ftp.gnu.org/gnu/$PROJECT/$PROJECT-$VERSION-patches/$PROJECT$VERSION_CONDENSED-$i.sig - "$GPG" --verify $PROJECT$VERSION_CONDENSED-$i.sig + gpg --verify $PROJECT$VERSION_CONDENSED-$i.sig echo "(patch \"$i\" \"$(nix-hash --flat --type sha256 --base32 $PROJECT$VERSION_CONDENSED-$i)\")" \ >> "$PATCH_LIST" From 3333139f4ddb67470963ca3e757c775c503514ad Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 15 Oct 2020 19:40:53 -0400 Subject: [PATCH 258/546] bash: 5.0p17 -> 5.0p18 --- pkgs/shells/bash/bash-5.0-patches.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/shells/bash/bash-5.0-patches.nix b/pkgs/shells/bash/bash-5.0-patches.nix index ca7361b8a1f..4315191d193 100644 --- a/pkgs/shells/bash/bash-5.0-patches.nix +++ b/pkgs/shells/bash/bash-5.0-patches.nix @@ -18,4 +18,5 @@ patch: [ (patch "015" "0pm0px758w4i23s55wajcv6lqfiym7zgxvq0pxf6vclkv8nxy5x5") (patch "016" "0vdha332km2iwx8g2ld15jy7d24cbplzgr1531dpzylr9ajxglgz") (patch "017" "0cfw5lz3fcvq9h1fxihxvw940fjk68015jazvl8x8rlazgxbkwsc") +(patch "018" "1lw1vv0aj6x254hgx4klbz8qkvwxif0g6i7dx116cnhhb8vlwcbw") ] From c6843cc858b6c0b64f6dddbc6da392eef843b2bc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Oct 2020 02:30:27 +0200 Subject: [PATCH 259/546] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-17-g25ee725 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/bf92981c5ae231d05d4942efee77c9fb073d0019. --- .../haskell-modules/hackage-packages.nix | 1016 +++++++++++++---- 1 file changed, 778 insertions(+), 238 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 559bd753798..8112e540e61 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -21914,15 +21914,15 @@ self: { ({ mkDerivation, base, case-insensitive, deepseq, ghc-prim , hashable, hspec, hspec-discover, HUnit, integer-gmp, primitive , QuickCheck, quickcheck-instances, scientific, tagged - , template-haskell, time, unordered-containers, word8 + , template-haskell, unordered-containers, word8 }: mkDerivation { pname = "Z-Data"; - version = "0.1.6.0"; - sha256 = "1mj36swz2fqqch2m08pzy222ml49qvb2nr75sj6v8cmxwis07a5q"; + version = "0.1.7.0"; + sha256 = "1n34zck9z53yga1yak4k8chva6kilfbkaghzkxwif112k1qxgv4a"; libraryHaskellDepends = [ base case-insensitive deepseq ghc-prim hashable integer-gmp - primitive QuickCheck scientific tagged template-haskell time + primitive QuickCheck scientific tagged template-haskell unordered-containers ]; libraryToolDepends = [ hspec-discover ]; @@ -21941,8 +21941,8 @@ self: { }: mkDerivation { pname = "Z-IO"; - version = "0.1.4.0"; - sha256 = "16a7bc8zm7ws3kmhrpjnvc284qq71v5y7r4x8yv268bay7q1bjga"; + version = "0.1.5.2"; + sha256 = "05dkfbnj1kry6c32xdiv1fdlxd2a2z7ma4zk5gisnx5kmshyw75p"; libraryHaskellDepends = [ base exceptions primitive stm time Z-Data ]; @@ -23878,6 +23878,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ad_4_4_1" = callPackage + ({ mkDerivation, array, base, Cabal, cabal-doctest, comonad + , containers, criterion, data-reify, directory, doctest, erf + , filepath, free, nats, reflection, semigroups, transformers + }: + mkDerivation { + pname = "ad"; + version = "4.4.1"; + sha256 = "1afpqk0my4n50xvq9f0rhcs8kzy3w1xxjql462xc0mvvhsgp6s6g"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array base comonad containers data-reify erf free nats reflection + semigroups transformers + ]; + testHaskellDepends = [ base directory doctest filepath ]; + benchmarkHaskellDepends = [ base criterion erf ]; + description = "Automatic Differentiation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "adaptive-containers" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -24470,6 +24491,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aeson-commit" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, containers, hspec, mtl + , some, tasty, tasty-hspec, text, transformers + }: + mkDerivation { + pname = "aeson-commit"; + version = "1.1"; + sha256 = "09rshnxziav4kwvalq2p059bgv9q2lqdac6f4ks8s7lxgmsmyh3z"; + libraryHaskellDepends = [ aeson base mtl text ]; + testHaskellDepends = [ + aeson aeson-qq base containers hspec mtl some tasty tasty-hspec + text transformers + ]; + description = "Parse Aeson data with commitment"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aeson-compat" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base , base-compat, base-orphans, bytestring, containers, exceptions @@ -37508,8 +37546,8 @@ self: { ({ mkDerivation, barbies, base, split, template-haskell }: mkDerivation { pname = "barbies-th"; - version = "0.1.4"; - sha256 = "0pzlak3fdbqjs8q5wr11sra3gkjsp2z22b6yy38pmrlzs1phln91"; + version = "0.1.5"; + sha256 = "0bjbvamihrwh4l5zs8fnk2iq98fd1d2xkfbsvp6spfcp1ynqlj6k"; libraryHaskellDepends = [ barbies base split template-haskell ]; testHaskellDepends = [ barbies base ]; description = "Create strippable HKD via TH"; @@ -45671,8 +45709,8 @@ self: { pname = "broadcast-chan"; version = "0.2.1.1"; sha256 = "01r57v2ghfkv37cwh64zs1lrz1rd7is3pa5k7y8h16ws1ddglirg"; - revision = "1"; - editedCabalFile = "1kmnsnyb4gz70bka30l35lgm5k131d8lc1hm4b23aml2yskx3m54"; + revision = "2"; + editedCabalFile = "0zpbfdgxs3b7wx2qgvrs5y01z8lzvww2b7bmyrg5cj6p5xznllk1"; libraryHaskellDepends = [ base transformers unliftio-core ]; benchmarkHaskellDepends = [ async base criterion deepseq stm ]; description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks"; @@ -45687,6 +45725,8 @@ self: { pname = "broadcast-chan-conduit"; version = "0.2.1.1"; sha256 = "0w0f4skprhnm1x4vzchkgjgjljzqizpb678251jgj65jsg1mnyfc"; + revision = "1"; + editedCabalFile = "0pk09frf24jg2id13l1nx47wwvf2z4qjqv17y7ji036iwp9xk6nw"; libraryHaskellDepends = [ base broadcast-chan conduit resourcet transformers unliftio-core ]; @@ -45705,6 +45745,8 @@ self: { pname = "broadcast-chan-pipes"; version = "0.2.1"; sha256 = "0yifpd97cihagflmh0xs0wcl541k89hick4h9hh8zrah72g71fqr"; + revision = "1"; + editedCabalFile = "0zz05sc0ny5czzyw71c1fdzlfawjwhznbr8z683bf83821ra5fcv"; libraryHaskellDepends = [ base broadcast-chan pipes pipes-safe ]; testHaskellDepends = [ base broadcast-chan-tests containers foldl pipes pipes-safe @@ -45723,6 +45765,8 @@ self: { pname = "broadcast-chan-tests"; version = "0.2.1.1"; sha256 = "0qx8j9sfky5qvrxrn4is9sja4qh6jh7jahq3zkyyq3a54jkwc8d3"; + revision = "2"; + editedCabalFile = "0dc7drwischhs0k95hjrlssxlqdg3ickrbbrki7wjslmk8k00bki"; libraryHaskellDepends = [ async base broadcast-chan clock containers optparse-applicative paramtree stm tagged tasty tasty-golden tasty-hunit tasty-travis @@ -46365,14 +46409,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bugsnag-hs_0_2_0_2" = callPackage + "bugsnag-hs_0_2_0_3" = callPackage ({ mkDerivation, aeson, base, bytestring, hedgehog, http-client , text, time, unordered-containers }: mkDerivation { pname = "bugsnag-hs"; - version = "0.2.0.2"; - sha256 = "0rai920g05g6gs8svi10av73ynd5m6kqc5428h55nb3hgb4hm6dh"; + version = "0.2.0.3"; + sha256 = "0jxanklslf0gjw4gb01yz03p2haxmnrmr5wry451lff17azxwlg5"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring http-client text time unordered-containers @@ -47185,11 +47229,11 @@ self: { }: mkDerivation { pname = "byteslice"; - version = "0.2.3.0"; - sha256 = "1xbsnlryx9ggvp46kv6m0f4hf9vs0bc2ia13jym9aji5rd7qvyfp"; + version = "0.2.4.0"; + sha256 = "0f2dw5kf9gg41ns5hb0aarrv24yqv9cdzgl9hgdcf8jj5j3qj6di"; libraryHaskellDepends = [ - base primitive primitive-addr primitive-unlifted run-st tuples - vector + base bytestring primitive primitive-addr primitive-unlifted run-st + tuples vector ]; testHaskellDepends = [ base bytestring primitive quickcheck-classes tasty tasty-hunit @@ -49941,8 +49985,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.20.1"; - sha256 = "0nh9x2w8xrmbrkadawq0ab6pvp4v14pr49x18sq9qhi0m922b0p0"; + version = "0.1.21.0"; + sha256 = "0hh3kfcs2wjmkz8ggzshb1535rz13nl1d9yaa73rm2arn73jfsi1"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra containers data-default-class data-flags deepseq deque df1 di-core di-polysemy @@ -50523,8 +50567,8 @@ self: { }: mkDerivation { pname = "capnp"; - version = "0.6.0.2"; - sha256 = "15dgnrwwsjkf8kis4yknmk6bcxwsyxhabik5j3s0mx4fniabdymc"; + version = "0.6.0.3"; + sha256 = "0zrga41zk41881kr79grdwzl5caawv3khnvpbkhmhfzq3snmnhgd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54162,15 +54206,17 @@ self: { "churros" = callPackage ({ mkDerivation, async, base, containers, doctest, random, stm - , time + , time, unagi-chan }: mkDerivation { pname = "churros"; - version = "0.1.0.2"; - sha256 = "0vqr16bwhi3rhj29s213y9xyzaankihf23m7gj6zhk7yqdqwibwv"; - libraryHaskellDepends = [ async base containers random stm time ]; + version = "0.1.2.0"; + sha256 = "0djfcvr81gl6lcz8pb3v0432jh49v8phwp513ca1fz1i75a2nx43"; + libraryHaskellDepends = [ + async base containers random stm time unagi-chan + ]; testHaskellDepends = [ - async base containers doctest random stm time + async base containers doctest random stm time unagi-chan ]; description = "Channel/Arrow based streaming computation library"; license = stdenv.lib.licenses.mit; @@ -54602,8 +54648,8 @@ self: { }: mkDerivation { pname = "citeproc"; - version = "0.1"; - sha256 = "1j1jlarqgv0q8c4vvys62n8p6hsgw26xm7n83w66ab4m5wwrgn5g"; + version = "0.1.0.2"; + sha256 = "184d633d186sa9rshh8im6xxars0x26623sym9pw2h2h709xsg4n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55348,24 +55394,24 @@ self: { , blaze-html, bytestring, cereal, containers, directory, filepath , happstack-authenticate, happstack-hsp, happstack-jmacro , happstack-server, happstack-server-tls, hsp, hsx-jmacro, hsx2hs - , ixset, jmacro, lens, mtl, network, network-uri, old-locale - , openssl, process, random, reform, reform-happstack, reform-hsp - , safecopy, stm, text, time, time-locale-compat + , http-types, ixset, jmacro, lens, mtl, network, network-uri + , old-locale, openssl, process, random, reform, reform-happstack + , reform-hsp, safecopy, stm, text, time, time-locale-compat , unordered-containers, userid, utf8-string, uuid-orphans , uuid-types, vector, web-plugins, web-routes, web-routes-happstack , web-routes-hsp, web-routes-th, xss-sanitize }: mkDerivation { pname = "clckwrks"; - version = "0.26.1"; - sha256 = "1n37gllcgq05wgvq4f10vwz7lll6q8an1gak69m50n6fwx8zpb5i"; + version = "0.26.2.2"; + sha256 = "1m6a043y72da9nyr8x35v5lrh12is49rwarj5dlrm8clp8n987dp"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring cereal containers directory filepath happstack-authenticate happstack-hsp happstack-jmacro happstack-server - happstack-server-tls hsp hsx-jmacro hsx2hs ixset jmacro lens mtl - network network-uri old-locale process random reform + happstack-server-tls hsp hsx-jmacro hsx2hs http-types ixset jmacro + lens mtl network network-uri old-locale process random reform reform-happstack reform-hsp safecopy stm text time time-locale-compat unordered-containers userid utf8-string uuid-orphans uuid-types vector web-plugins web-routes @@ -55513,8 +55559,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-media"; - version = "0.6.16.9"; - sha256 = "025zxvb3qynqsl39rnsvfyr7wrpfymmhc120nspd46sv4pvqmgvb"; + version = "0.6.17"; + sha256 = "1yaga5g4r9rngc4f8hz4mndrjd6xnksw2vs916ccx2b5dn6i871c"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state attoparsec base blaze-html cereal clckwrks containers @@ -55538,8 +55584,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-page"; - version = "0.4.3.22"; - sha256 = "00ad6ricd8jrjs7l5l2pg3k87x1cjm0x5zlgppzknns4xzjldips"; + version = "0.4.3.23"; + sha256 = "0mk6vz98l2xxhk8w457mbgbcjslnbv34swjrwfjjqk9jhmcnmxss"; libraryHaskellDepends = [ acid-state aeson attoparsec base clckwrks containers directory filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl @@ -55561,8 +55607,8 @@ self: { }: mkDerivation { pname = "clckwrks-theme-bootstrap"; - version = "0.4.2.3"; - sha256 = "1a00rrb49m358ds408wzm40f6g98w1lnd70rhp4jpkirj94bmaz4"; + version = "0.4.2.4"; + sha256 = "0ay3rb6vfzvb43mwhjzgdf3cp7dcya0l9sl7msns0niak4xmnz1l"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro @@ -57035,6 +57081,29 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "co-log-polysemy-formatting" = callPackage + ({ mkDerivation, ansi-terminal, base, co-log, co-log-core + , co-log-polysemy, formatting, polysemy, polysemy-plugin, text + , time + }: + mkDerivation { + pname = "co-log-polysemy-formatting"; + version = "0.1.0.0"; + sha256 = "17dajk3d23xa1fj8qs896szs00vvwpdgcgjibvkw9mm160yvrlxi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base co-log co-log-core co-log-polysemy formatting + polysemy text time + ]; + executableHaskellDepends = [ + ansi-terminal base co-log co-log-core co-log-polysemy formatting + polysemy polysemy-plugin text time + ]; + description = "A Polysemy logging effect for high quality (unstructured) logs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "co-log-sys" = callPackage ({ mkDerivation, aeson, base, co-log-core, fmt, microlens , monad-control, mtl, network, universum, unix @@ -57110,8 +57179,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.3.6"; - sha256 = "0ry01h9vkr5zyiwp60vqb8mp2lfg3yhfbaz0c7jammk034dszkf1"; + version = "0.1.3.7"; + sha256 = "04861j2g4pa05p788inkyvgwqjn1c6jsalkrlmin8j3nd0gw2ggq"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack deepseq http-conduit hyraxAbif lens linear mtl split text vector @@ -57439,6 +57508,8 @@ self: { pname = "coercible-subtypes"; version = "0.1.0.0"; sha256 = "1z5fmdgv52x410x2z4gxyac18f98226dymzdvhcvkx7mw2k9q44x"; + revision = "1"; + editedCabalFile = "05bd9lp5jp31ac039vq0p58kr03g5ai3cyymc4ikhbnl3x44hx4d"; libraryHaskellDepends = [ base profunctors ]; description = "Coercible but only in one direction"; license = stdenv.lib.licenses.bsd3; @@ -69343,6 +69414,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-reify_0_6_3" = callPackage + ({ mkDerivation, base, base-compat, containers, hashable, hspec + , hspec-discover, unordered-containers + }: + mkDerivation { + pname = "data-reify"; + version = "0.6.3"; + sha256 = "1sacbil9xn1n2085wpa0dq7ikf1wvh2kkddnvmwsp22ssx059h55"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers hashable unordered-containers + ]; + testHaskellDepends = [ base base-compat hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Reify a recursive data structure into an explicit graph"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-reify-cse" = callPackage ({ mkDerivation, base, containers, data-reify }: mkDerivation { @@ -71533,6 +71624,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "deferred-folds_0_9_11" = callPackage + ({ mkDerivation, base, bytestring, containers, foldl, hashable + , primitive, QuickCheck, quickcheck-instances, rerebase, tasty + , tasty-hunit, tasty-quickcheck, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "deferred-folds"; + version = "0.9.11"; + sha256 = "02j1akzjdi73l7adlhv49sln5saq2j53pziqwzw6zw0bsf53q00k"; + libraryHaskellDepends = [ + base bytestring containers foldl hashable primitive transformers + unordered-containers vector + ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + description = "Abstractions over deferred folds"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "definitive-base" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , ghc-prim, GLURaw, OpenGL, OpenGLRaw, primitive, vector @@ -79165,8 +79279,8 @@ self: { pname = "dual-game"; version = "0.1.0.1"; sha256 = "1w69d7d2xbpi82n41gq08qdmldh834ka7qwvy159vsac556wwcfg"; - revision = "6"; - editedCabalFile = "10hj6snshirfx6apbrdb2jm45xsgvsis0c7i5a33wwl0lnklxwj2"; + revision = "7"; + editedCabalFile = "04hi455i82y7nf30chnkbvgfz5fzn050nb3r916abr7s205jfzkq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -80979,8 +81093,8 @@ self: { }: mkDerivation { pname = "effet"; - version = "0.2.0.0"; - sha256 = "1fh6pyjalrns01sg1rnz2h462xgcmnj6xfg6xg61cdb4zh5i9gpp"; + version = "0.3.0.1"; + sha256 = "18cmgap4a3qnglmysh2l8pmag0vx8nqrrzx52zn9zrb54l1ldgm2"; libraryHaskellDepends = [ base containers monad-control template-haskell transformers transformers-base @@ -81039,6 +81153,42 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "egison_4_1_0" = callPackage + ({ mkDerivation, array, base, containers, criterion, directory + , exceptions, filepath, ghc, ghc-paths, Glob, hashable, haskeline + , HUnit, megaparsec, mtl, optparse-applicative, parsec + , parser-combinators, prettyprinter, process, random, regex-tdfa + , split, sweet-egison, test-framework, test-framework-hunit, text + , transformers, unicode-show, unordered-containers, vector + }: + mkDerivation { + pname = "egison"; + version = "4.1.0"; + sha256 = "0qhan5mlb9pvdwbjk0pl59z8y6dn2kbcl21k7rnzhqwf5a5l556d"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base containers directory ghc ghc-paths hashable haskeline + megaparsec mtl optparse-applicative parsec parser-combinators + prettyprinter process random regex-tdfa split sweet-egison text + transformers unicode-show unordered-containers vector + ]; + executableHaskellDepends = [ + array base containers directory exceptions filepath ghc ghc-paths + haskeline mtl optparse-applicative parsec prettyprinter process + regex-tdfa split text transformers unordered-containers vector + ]; + testHaskellDepends = [ + base filepath Glob HUnit mtl test-framework test-framework-hunit + transformers + ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Programming language with non-linear pattern-matching against non-free data"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "egison-pattern-src" = callPackage ({ mkDerivation, base, containers, free, megaparsec, mtl , parser-combinators, prettyprinter, recursion-schemes, tasty @@ -83570,6 +83720,26 @@ self: { broken = true; }) {}; + "epi-sim" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava, hspec + , mwc-random, primitive, statistics, trifecta, vector + }: + mkDerivation { + pname = "epi-sim"; + version = "0.2.2.0"; + sha256 = "17pri7fynx5zi6hacglv2xww41837nrq0d355pv7rkvmqz5f8y3a"; + libraryHaskellDepends = [ + aeson base bytestring cassava hspec mwc-random primitive statistics + trifecta vector + ]; + testHaskellDepends = [ + aeson base bytestring cassava hspec mwc-random primitive statistics + trifecta vector + ]; + description = "A library for simulating epidemics as birth-death processes"; + license = stdenv.lib.licenses.mit; + }) {}; + "epic" = callPackage ({ mkDerivation, array, base, Cabal, directory, mtl, process }: mkDerivation { @@ -87649,6 +87819,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fakedata-quickcheck" = callPackage + ({ mkDerivation, base, fakedata, hspec, hspec-core, QuickCheck + , random, regex-tdfa, text + }: + mkDerivation { + pname = "fakedata-quickcheck"; + version = "0.1.0"; + sha256 = "0al5brin9bs0553rrw073za4jzw2whrf05yj6h34lmx4kxzciv6s"; + libraryHaskellDepends = [ base fakedata QuickCheck random ]; + testHaskellDepends = [ + base fakedata hspec hspec-core QuickCheck random regex-tdfa text + ]; + description = "Fake a -> Gen a"; + license = stdenv.lib.licenses.mit; + }) {}; + "fakefs" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, mtl , QuickCheck @@ -91338,6 +91524,34 @@ self: { broken = true; }) {}; + "flashblast" = callPackage + ({ mkDerivation, attoparsec, base, composite-base, dhall + , formatting, lucid, megaparsec, path, path-dhall-instance + , path-utils, polysemy, polysemy-video, replace-megaparsec, rio + , semialign, subtitleParser, these, turtle, unliftio-path, vinyl + }: + mkDerivation { + pname = "flashblast"; + version = "0.0.1.1"; + sha256 = "0syqfjg373sq3326nxqaq4zipb342df8av78cm63j78mnl7xjq0x"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base composite-base dhall formatting lucid megaparsec + path path-dhall-instance path-utils polysemy polysemy-video + replace-megaparsec rio semialign subtitleParser these turtle + unliftio-path vinyl + ]; + executableHaskellDepends = [ + attoparsec base composite-base dhall formatting lucid megaparsec + path path-dhall-instance path-utils polysemy polysemy-video + replace-megaparsec rio semialign subtitleParser these turtle + unliftio-path vinyl + ]; + description = "Generate language learning flashcards from video"; + license = stdenv.lib.licenses.mit; + }) {}; + "flat" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , dlist, filepath, ghc-prim, hashable, mono-traversable, pretty @@ -93200,14 +93414,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "formatting_7_0_0_2" = callPackage + "formatting_7_1_1" = callPackage ({ mkDerivation, base, clock, double-conversion, ghc-prim, hspec , integer-gmp, old-locale, scientific, text, time, transformers }: mkDerivation { pname = "formatting"; - version = "7.0.0.2"; - sha256 = "1yam1lniqlmvdq2nsg7hmw9mzpfv37ldyg0izi8869iwl63j87gh"; + version = "7.1.1"; + sha256 = "1abqyd2k46vrr8xxk6sgcjfm8h7x3d2hk11p8kypi85zplab4rsp"; libraryHaskellDepends = [ base clock double-conversion ghc-prim integer-gmp old-locale scientific text time transformers @@ -93536,8 +93750,8 @@ self: { }: mkDerivation { pname = "fourmolu"; - version = "0.2.0.0"; - sha256 = "1jak0xgd6gcbw7icyrblvqnvzjyyakpw2zfnqj1z958qyg763v52"; + version = "0.3.0.0"; + sha256 = "0v89dvcr8l0swj23kkakc39q6lyxjz90rqgwy7m6a5p6iv3h2wms"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -102202,6 +102416,30 @@ self: { broken = true; }) {gtk-mac-integration-gtk3 = null;}; + "gi-gtksheet" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-cairo, gi-gdk, gi-glib, gi-gobject, gi-gtk, gi-pango, gtksheet + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-gtksheet"; + version = "4.0.1"; + sha256 = "19fyjymh5b1q1ln0nnqwwwf0zsdjy0bfn5nhi133q9j195bhb7l9"; + setupHaskellDepends = [ + base Cabal gi-atk gi-cairo gi-gdk gi-glib gi-gobject gi-gtk + gi-pango haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-cairo gi-gdk gi-glib + gi-gobject gi-gtk gi-pango haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gtksheet ]; + description = "GtkSheet bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {gtksheet = null;}; + "gi-gtksource" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject @@ -102982,8 +103220,8 @@ self: { }: mkDerivation { pname = "git-brunch"; - version = "1.4.1.0"; - sha256 = "0jq2i115djl5skkjzxxqdkp2rnw6871xn4aj4ryx9mgfnsd6dfgi"; + version = "1.4.2.0"; + sha256 = "0zbbd3hga2qh043xw6igsjk14wh0d3hq5naxich88wg1ig4w28j5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -103202,8 +103440,8 @@ self: { }: mkDerivation { pname = "git-mediate"; - version = "1.0.8"; - sha256 = "0g81v358vqlfsz5bx8arnzjn0bnjd9k835mn8z0kp4d341z0y8l1"; + version = "1.0.8.1"; + sha256 = "0ry437v01vc3d462zgg0jn113l24lcry5lgdv2y0rmyy6wfq8i7f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -119407,8 +119645,8 @@ self: { }: mkDerivation { pname = "haskellish"; - version = "0.2.3"; - sha256 = "188sfmb9rcp0k75x94ld0jv91kxbyfqkk7hnw5wyw8ln5y0fmr3w"; + version = "0.2.3.1"; + sha256 = "0285mk3s1gl0xxwcqd22v800pcg75ml676nzs5pb96ybfniqksl0"; libraryHaskellDepends = [ base containers haskell-src-exts mtl template-haskell ]; @@ -120991,8 +121229,8 @@ self: { }: mkDerivation { pname = "hasql-dynamic-statements"; - version = "0.3"; - sha256 = "13f0gkgjn7bcxarwz8vyzfdmrz1yqh9xnard6304v4y4zhqjfyjn"; + version = "0.3.1"; + sha256 = "1fs5bfxk0yd2j4iygc8m0nx9hwfmvsxyhdanclass0dxr40pqyhc"; libraryHaskellDepends = [ base bytestring containers hasql hasql-implicits ptr ]; @@ -128495,8 +128733,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "3.2"; - sha256 = "0g3ay30dwr2v22bybapryl0ykjyqs5ym1i1p7jfky7lp20ri9x1z"; + version = "3.2.1"; + sha256 = "16r2s65238yaqkiqhc31zwgv5r9743d5qrdwkahn9zpwj0x0sp5f"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -131475,8 +131713,6 @@ self: { ]; description = "hpack's dhalling"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hpaco" = callPackage @@ -135915,6 +136151,8 @@ self: { pname = "hspec-hedgehog"; version = "0.0.1.2"; sha256 = "17gbr4ssnzjk7nvpsnh47av6vd9wz27ax92xvr4jwyw0z7h2wn13"; + revision = "1"; + editedCabalFile = "1qv2gap0775d2zg8wbd3kq4ypziz05qlz5jfisvl3jfd6jzcf2ad"; libraryHaskellDepends = [ base hedgehog hspec hspec-core HUnit QuickCheck splitmix ]; @@ -138467,18 +138705,16 @@ self: { }) {}; "http-conduit-downloader" = callPackage - ({ mkDerivation, base, bytestring, conduit, connection - , data-default, HsOpenSSL, http-client, http-conduit, http-types - , mtl, network, network-uri, resourcet, text, time, zlib + ({ mkDerivation, base, bytestring, data-default, HsOpenSSL + , http-client, http-types, network, network-uri, text, time, zlib }: mkDerivation { pname = "http-conduit-downloader"; - version = "1.0.33"; - sha256 = "07pn2p143rfmvax3zx53hlgh0rfynn60g0z6cw6vazrxap4v3pr3"; + version = "1.1.2"; + sha256 = "188rhadf1dya2iyvcvfp1xvnhjmhkf06i606mrkrlmzbds2kb8hh"; libraryHaskellDepends = [ - base bytestring conduit connection data-default HsOpenSSL - http-client http-conduit http-types mtl network network-uri - resourcet text time zlib + base bytestring data-default HsOpenSSL http-client http-types + network network-uri text time zlib ]; description = "HTTP downloader tailored for web-crawler needs"; license = stdenv.lib.licenses.bsd3; @@ -139916,20 +140152,22 @@ self: { "hurl" = callPackage ({ mkDerivation, async, base, base64-bytestring, bytestring - , connection, containers, directory, filepath, http-client - , http-client-tls, http-types, network-uri, process, text + , containers, directory, filepath, HsOpenSSL, http-client + , http-client-openssl, http-types, io-streams, network-uri + , openssl-streams, process, regex, regex-tdfa, text, time , xml-conduit, zlib }: mkDerivation { pname = "hurl"; - version = "1.4.1.1"; - sha256 = "0h4fzkdpsjsph6685sg78kwvajf7615y8dbcn9n88jwdq6j8j522"; + version = "1.4.2.0"; + sha256 = "19qf4akwx7aazzy86zhkm5z60342hz07msqxir6ism98dd33fpwl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base base64-bytestring bytestring connection containers - directory filepath http-client http-client-tls http-types - network-uri process text xml-conduit zlib + async base base64-bytestring bytestring containers directory + filepath HsOpenSSL http-client http-client-openssl http-types + io-streams network-uri openssl-streams process regex regex-tdfa + text time xml-conduit zlib ]; executableHaskellDepends = [ base directory network-uri ]; description = "Haskell URL resolver"; @@ -141338,15 +141576,15 @@ self: { }: mkDerivation { pname = "hwk"; - version = "0.3"; - sha256 = "16pi48bgxgh3qcbrhyjg6r477yn2qzyzx6gizwf8q6h0da4qzp8i"; + version = "0.5"; + sha256 = "1nn8021nf7pwr8r0ffvsr3yjvjgv4f15l7j8s9pisi4n280lv8h0"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ base directory extra filepath hint simple-cmd-args ]; - description = "Simple Haskell-based awk-like tool"; + description = "Commandline text processing with Haskell functions"; license = stdenv.lib.licenses.mit; }) {}; @@ -143113,8 +143351,8 @@ self: { pname = "identicon-style-squares"; version = "0.1.0.1"; sha256 = "1x456v7fb211f7ciipp2bfn9fvh5w4i34bl5mjw7bkn7hgsaa3x6"; - revision = "2"; - editedCabalFile = "1bi5sn62z23j9n7bxlaz5qiwk52v7sfr70bk0by9vk6nlylli8r1"; + revision = "3"; + editedCabalFile = "0jri78n8xggipikhp6p4l4i2zwjn4fdydbv730w01linfg1h6w68"; libraryHaskellDepends = [ base identicon JuicyPixels polyvariadic ]; @@ -144185,38 +144423,41 @@ self: { }) {}; "imm" = callPackage - ({ mkDerivation, aeson, async, atom-conduit, avro, base-noprelude - , binary, blaze-html, blaze-markup, bytestring, conduit, containers - , dhall, directory, fast-logger, filepath, hashable, microlens - , mime-mail, monad-time, opml-conduit, optparse-applicative, pipes - , pipes-bytestring, prettyprinter, prettyprinter-ansi-terminal - , refined, relude, rss-conduit, safe, safe-exceptions, stm - , stm-chans, text, time, timerep, typed-process, uri-bytestring + ({ mkDerivation, aeson, aeson-pretty, async, atom-conduit + , base-noprelude, beam-core, beam-sqlite, blaze-html, blaze-markup + , bytestring, chronos, co-log, conduit, containers, dhall + , directory, filepath, http-client, http-types, microlens + , mime-mail, monad-time, optparse-applicative, parsec, parsers + , pipes, pipes-bytestring, pipes-http, prettyprinter + , prettyprinter-ansi-terminal, refined, relude, rss-conduit, safe + , safe-exceptions, sqlite-simple, stm, stm-chans, streamly, text + , time, timerep, typed-process, typerep-map, uri-bytestring , xml-conduit, xml-types }: mkDerivation { pname = "imm"; - version = "1.10.0.0"; - sha256 = "0kjh6j1lw4ixgz5jkmaqfxi4rmmd5k2nq4wdr4c0yw26kwvgv003"; + version = "2.0.0.0"; + sha256 = "1qkq80iiv1yql59a8vly1nv36isnh2wkdzxgawjh22xqn9xn0csd"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson async atom-conduit avro base-noprelude binary conduit - containers dhall directory filepath hashable microlens monad-time - pipes pipes-bytestring prettyprinter prettyprinter-ansi-terminal - refined relude rss-conduit safe-exceptions text time timerep + aeson aeson-pretty atom-conduit base-noprelude conduit containers + dhall directory filepath http-client microlens parsec parsers pipes + pipes-bytestring prettyprinter prettyprinter-ansi-terminal refined + relude rss-conduit safe safe-exceptions text time timerep typed-process uri-bytestring xml-conduit xml-types ]; executableHaskellDepends = [ - aeson async atom-conduit avro base-noprelude blaze-html - blaze-markup bytestring conduit containers dhall directory - fast-logger filepath mime-mail opml-conduit optparse-applicative - pipes pipes-bytestring prettyprinter prettyprinter-ansi-terminal - refined relude rss-conduit safe safe-exceptions stm stm-chans text - time typed-process uri-bytestring xml-conduit xml-types + aeson async base-noprelude beam-core beam-sqlite blaze-html + blaze-markup bytestring chronos co-log conduit containers dhall + directory filepath http-types microlens mime-mail monad-time + optparse-applicative pipes pipes-bytestring pipes-http + prettyprinter prettyprinter-ansi-terminal refined relude safe + safe-exceptions sqlite-simple stm stm-chans streamly text time + typed-process typerep-map uri-bytestring xml-conduit xml-types ]; - description = "Execute arbitrary callbacks for each element of RSS/Atom feeds"; + description = "Execute arbitrary actions for each item from RSS/Atom feeds"; license = stdenv.lib.licenses.cc0; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -144403,8 +144644,8 @@ self: { }: mkDerivation { pname = "implicit-hie"; - version = "0.1.1.0"; - sha256 = "048y1wbwcp1vs4shgfzvcmbgg8fnm0pw2i7a8488b5kshfzf9syb"; + version = "0.1.2.0"; + sha256 = "0scg27iz2yhkfrsj5hw11qi1gdivgnskmcl4v4111zlvyy14lhc9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -149223,10 +149464,8 @@ self: { }: mkDerivation { pname = "j"; - version = "0.1.0.0"; - sha256 = "1jscbh7riqkfks72xfgqmf04zhr0l8mncnmxmxv53l8v4ymigmvl"; - revision = "1"; - editedCabalFile = "1hx5gz8l12q8kswy59pwyp49a226nxvbg8jkwj746l8wgxp692sy"; + version = "0.1.1.0"; + sha256 = "0a3xl4sr5s7436z8fnjg6vknk7wi202b8ryvswxrv1ks49h2zg8s"; libraryHaskellDepends = [ base bytestring repa unix ]; testHaskellDepends = [ base bytestring repa tasty tasty-hunit ]; description = "J in Haskell"; @@ -151493,6 +151732,24 @@ self: { broken = true; }) {}; + "jsonifier" = callPackage + ({ mkDerivation, aeson, base, bytestring, gauge, hedgehog + , numeric-limits, ptr-poker, rerebase, scientific, text + , text-builder + }: + mkDerivation { + pname = "jsonifier"; + version = "0.1.0.2"; + sha256 = "1vm7qp38wkv2l3wi32kv2hcbzpzk7yf9xffh09ani395dggw94hx"; + libraryHaskellDepends = [ + base bytestring ptr-poker scientific text + ]; + testHaskellDepends = [ aeson hedgehog numeric-limits rerebase ]; + benchmarkHaskellDepends = [ aeson gauge rerebase text-builder ]; + description = "Fast and simple JSON encoding toolkit"; + license = stdenv.lib.licenses.mit; + }) {}; + "jsonpath" = callPackage ({ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring , file-embed, hspec, hspec-attoparsec, hspec-discover, text @@ -152581,8 +152838,8 @@ self: { }: mkDerivation { pname = "katip-datadog"; - version = "0.1.0.0"; - sha256 = "04gj1svwlndid1j0c14q82y42gad40l0wn2mr5mbhc9b921mncsl"; + version = "0.2.0.0"; + sha256 = "0qcbg2nvm2ig02x05invjzdrrdgxcq06gask28vzg6g72qc48ar3"; libraryHaskellDepends = [ aeson base binary bytestring connection katip network resource-pool retry safe-exceptions text time @@ -152607,8 +152864,8 @@ self: { }: mkDerivation { pname = "katip-elasticsearch"; - version = "0.6.0.0"; - sha256 = "05pvmx2p2h34qig392z6k0ar3dk6cc3vgzsvxhijwp5xfja52ha4"; + version = "0.7.0.0"; + sha256 = "0m0snqxnaaqy33vbfyrcnbpc6vls3p8jby69z3wcyb2d5lxwm8d9"; libraryHaskellDepends = [ aeson async base bloodhound bytestring exceptions http-client http-types katip retry safe-exceptions scientific semigroups stm @@ -157474,8 +157731,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "2.0.1"; - sha256 = "19jp9809jrh3swvsji5zgbqg4qg5gayv6bj0svq00wyzaisns3dd"; + version = "2.0.2"; + sha256 = "01c42wyjvnd1wp665p2khjsm1apc9kw3gw6mnlwbdgsimhj8v4z0"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring bytestring-conversion clock containers cryptohash exceptions extra @@ -162815,17 +163072,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "little-rio_0_2_1" = callPackage - ({ mkDerivation, base, exceptions, microlens, microlens-mtl, mtl - , primitive, resourcet, unliftio-core + "little-rio_0_2_2" = callPackage + ({ mkDerivation, base, deepseq, exceptions, microlens + , microlens-mtl, mtl, primitive, resourcet, unliftio-core }: mkDerivation { pname = "little-rio"; - version = "0.2.1"; - sha256 = "1fywk5nva88365p9qv866mf1j4jksarv7d9i39m5xxi764wwpzjp"; + version = "0.2.2"; + sha256 = "1cbadsbhhgls6p46gga4l32b0fhmvp6r9mycaj2srsfdcnwkydr9"; libraryHaskellDepends = [ - base exceptions microlens microlens-mtl mtl primitive resourcet - unliftio-core + base deepseq exceptions microlens microlens-mtl mtl primitive + resourcet unliftio-core ]; description = "When you need just the RIO monad"; license = stdenv.lib.licenses.bsd3; @@ -164741,8 +164998,8 @@ self: { }: mkDerivation { pname = "longshot"; - version = "0.1.0.3"; - sha256 = "1w3fkbz900aj6dwqnbg6miv1wv3vlka7ri94fny34gjyl1da30cl"; + version = "0.1.0.5"; + sha256 = "1xgdkfykiwzscq91z7xg1dgsh9ma6bg03d82f58r297c7fzivvak"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165215,6 +165472,36 @@ self: { broken = true; }) {}; + "lsp" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , containers, data-default, dependent-map, directory, filepath + , hashable, hslogger, hspec, hspec-discover, lens, lsp-types, mtl + , network-uri, QuickCheck, quickcheck-instances, random + , rope-utf16-splay, scientific, sorted-list, stm, text, time + , transformers, unliftio-core, unordered-containers, uuid + }: + mkDerivation { + pname = "lsp"; + version = "1.0.0.0"; + sha256 = "05m9kxcf7g2xb4bhbn08bfbf09b8vvvw3nvpcfldpx180yz3n02r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring containers data-default + dependent-map directory filepath hashable hslogger lens lsp-types + mtl network-uri random scientific sorted-list stm text time + transformers unliftio-core unordered-containers uuid + ]; + testHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hashable hspec lens network-uri QuickCheck quickcheck-instances + rope-utf16-splay sorted-list stm text unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell library for the Microsoft Language Server Protocol"; + license = stdenv.lib.licenses.mit; + }) {}; + "lsp-test" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default @@ -165268,6 +165555,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lsp-types" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, containers + , data-default, deepseq, dependent-sum-template, directory + , filepath, hashable, hslogger, lens, network-uri, rope-utf16-splay + , scientific, some, template-haskell, temporary, text + , unordered-containers + }: + mkDerivation { + pname = "lsp-types"; + version = "1.0.0.0"; + sha256 = "1cf07hdzgh5inskabdyli3zg95grc3qlw9d5xiqf1hwlspsyxis9"; + libraryHaskellDepends = [ + aeson base binary bytestring containers data-default deepseq + dependent-sum-template directory filepath hashable hslogger lens + network-uri rope-utf16-splay scientific some template-haskell + temporary text unordered-containers + ]; + description = "Haskell library for the Microsoft Language Server Protocol, data types"; + license = stdenv.lib.licenses.mit; + }) {}; + "lss" = callPackage ({ mkDerivation, attoparsec, base, containers, directory, filepath , hspec2, language-css, language-css-attoparsec, text, xmlhtml @@ -168506,8 +168814,8 @@ self: { }: mkDerivation { pname = "matchable-th"; - version = "0.1.1.0"; - sha256 = "0hmdy38k1il2b0j6bkr3m4f1c8d8rvw21k3rlrd0q345xjx8y8p1"; + version = "0.1.1.1"; + sha256 = "0q6bvdfmdil68van4cmhy6kj2w0x1kf2kgs2f3wzz6m723ach30v"; libraryHaskellDepends = [ base matchable template-haskell th-abstraction ]; @@ -169038,21 +169346,20 @@ self: { , config-ini, connection, containers, data-clist, directory , filepath, gitrev, hashable, Hclip, mattermost-api , mattermost-api-qc, microlens-platform, mtl, network-uri, process - , quickcheck-text, random, semigroups, skylighting-core, split, stm - , stm-delay, strict, string-conversions, tasty, tasty-hunit - , tasty-quickcheck, temporary, text, text-zipper, time - , timezone-olson, timezone-series, transformers, Unique, unix - , unordered-containers, utf8-string, uuid, vector, vty, word-wrap - , xdg-basedir + , random, semigroups, skylighting-core, split, stm, stm-delay + , strict, tasty, tasty-hunit, tasty-quickcheck, temporary, text + , text-zipper, time, timezone-olson, timezone-series, transformers + , Unique, unix, unordered-containers, utf8-string, uuid, vector + , vty, word-wrap, xdg-basedir }: mkDerivation { pname = "matterhorn"; - version = "50200.10.2"; - sha256 = "1yla2wjhv093l3pngbk1ph0sl3ib7qmns2i0c1k8kgxrz4yj2gfb"; - isLibrary = false; + version = "50200.11.0"; + sha256 = "0wvw3wbv2sii1bjc8nmwyb1k0hzixfkfvpkmlkwa2my564vvmgz8"; + isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; - executableHaskellDepends = [ + libraryHaskellDepends = [ aeson aspell-pipe async base base-compat brick brick-skylighting bytestring cheapskate config-ini connection containers data-clist directory filepath gitrev hashable Hclip mattermost-api @@ -169062,14 +169369,11 @@ self: { unordered-containers utf8-string uuid vector vty word-wrap xdg-basedir ]; + executableHaskellDepends = [ base text ]; testHaskellDepends = [ - base base-compat brick bytestring cheapskate checkers config-ini - connection containers directory filepath hashable Hclip - mattermost-api mattermost-api-qc microlens-platform mtl process - quickcheck-text semigroups stm strict string-conversions tasty - tasty-hunit tasty-quickcheck text text-zipper time timezone-olson - timezone-series transformers Unique unordered-containers uuid - vector vty xdg-basedir + base bytestring cheapskate checkers containers mattermost-api + mattermost-api-qc tasty tasty-hunit tasty-quickcheck text time + Unique uuid ]; description = "Terminal client for the Mattermost chat system"; license = stdenv.lib.licenses.bsd3; @@ -169086,8 +169390,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "50200.8.0"; - sha256 = "1x1wrf7yvwhwfn10207qv5ljpa1jwfm1ck67bwjzh3pcgq0d6x5w"; + version = "50200.9.0"; + sha256 = "08whhlkr3ayimn66lwinvv0ci8zbhk5i7sz1fk5r1dp7mg2jzgig"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169111,8 +169415,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "50200.8.0"; - sha256 = "17d914dirzvpg3l4qly56y8y5yv18pc6qxngvi8sl410xnbx5p31"; + version = "50200.9.0"; + sha256 = "0rcbsf5hrp2fd9jqmcr07gg2y0xg4ksasrqfxrc7n4mgw0a409i6"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -173325,8 +173629,8 @@ self: { ({ mkDerivation, base, vector }: mkDerivation { pname = "mmsyn2"; - version = "0.1.8.0"; - sha256 = "1qdbf89i5yx6ag9k4a9scc6wbm765b8zhq0gi12zx0bq75jjz3qz"; + version = "0.2.0.0"; + sha256 = "1lxfl6gr42x9rhy4jpig9hwl0bnbidrv65i8f4fr39ifrx43fgxw"; libraryHaskellDepends = [ base vector ]; description = "The library that can be used for multiple (Ord a) => a -> b transformations"; license = stdenv.lib.licenses.mit; @@ -177698,18 +178002,19 @@ self: { "mu-avro" = callPackage ({ mkDerivation, aeson, avro, base, bytestring, containers, deepseq , language-avro, mu-rpc, mu-schema, sop-core, tagged - , template-haskell, text, time, unordered-containers, uuid, vector + , template-haskell, text, time, transformers, unordered-containers + , uuid, vector }: mkDerivation { pname = "mu-avro"; - version = "0.3.0.0"; - sha256 = "0p5j3pzx2b8hj7zn7gdj7xg2n99yhzvbkhbr5cv6jwcd5gpz3pkn"; + version = "0.4.0.0"; + sha256 = "08hkw54llgyc7gmr3srx0im6im3x23cc0fkgmfv541ak6sq7by3h"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson avro base bytestring containers deepseq language-avro mu-rpc - mu-schema sop-core tagged template-haskell text time + mu-schema sop-core tagged template-haskell text time transformers unordered-containers uuid vector ]; executableHaskellDepends = [ avro base bytestring mu-schema ]; @@ -177721,7 +178026,7 @@ self: { "mu-graphql" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring - , conduit, graphql-parser, http-types, list-t, mtl, mu-rpc + , conduit, foldl, graphql-parser, http-types, list-t, mtl, mu-rpc , mu-schema, parsers, regex-tdfa, scientific, sop-core, stm , stm-chans, stm-conduit, stm-containers, template-haskell, text , unordered-containers, uuid, wai, wai-extra, wai-websockets, warp @@ -177729,13 +178034,13 @@ self: { }: mkDerivation { pname = "mu-graphql"; - version = "0.3.0.0"; - sha256 = "1371h6w3v10qcmp8zp3mjxfhvknk39qgcn9laslssci4yrrr5a09"; + version = "0.4.0.0"; + sha256 = "0vww6kv76sfi4931265gmbmyd67qlijxwiyl2z0lbcj1gs95j6x2"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson async attoparsec base bytestring conduit graphql-parser + aeson async attoparsec base bytestring conduit foldl graphql-parser http-types list-t mtl mu-rpc mu-schema parsers scientific sop-core stm stm-chans stm-conduit stm-containers template-haskell text unordered-containers uuid wai wai-websockets warp warp-tls @@ -177755,17 +178060,17 @@ self: { , http2-client, http2-client-grpc, http2-grpc-types, mu-grpc-common , mu-optics, mu-protobuf, mu-rpc, mu-schema, optics-core, sop-core , stm, stm-chans, stm-conduit, template-haskell, text - , th-abstraction + , th-abstraction, tracing }: mkDerivation { pname = "mu-grpc-client"; - version = "0.3.0.0"; - sha256 = "08z92rm1dcr02qwmd92inplzb1hgari0bsmw19xlmkdlsjldj5v0"; + version = "0.4.0.0"; + sha256 = "0j1dn2c95rzm8h6yzw5h5r3yhk5p1i51kx4px668hb3m9wss5qdr"; libraryHaskellDepends = [ async avro base bytestring conduit http2 http2-client http2-client-grpc http2-grpc-types mu-grpc-common mu-optics mu-protobuf mu-rpc mu-schema optics-core sop-core stm stm-chans - stm-conduit template-haskell text th-abstraction + stm-conduit template-haskell text th-abstraction tracing ]; description = "gRPC clients from Mu definitions"; license = stdenv.lib.licenses.asl20; @@ -177780,8 +178085,8 @@ self: { }: mkDerivation { pname = "mu-grpc-common"; - version = "0.3.0.0"; - sha256 = "1ipqzg799lfy2apl3galhgnqqpf5z9nr0dvb9gp9cmv0y9bn3iv6"; + version = "0.4.0.0"; + sha256 = "0rn0gkvxfd8j6ayzixapm3nagjszf50xjr8d59v7vfqh61kwrx83"; libraryHaskellDepends = [ avro base binary bytestring http2-grpc-proto3-wire http2-grpc-types mu-avro mu-protobuf mu-rpc mu-schema @@ -177800,8 +178105,8 @@ self: { }: mkDerivation { pname = "mu-grpc-server"; - version = "0.3.0.0"; - sha256 = "1z8mhychrr5y6zrxg3xx398x221cwyyw7yss8gfn0f5c7j64r693"; + version = "0.4.0.0"; + sha256 = "0wnqalcsj7j2ny999nw818ncy292f3kmmbwc2ci14d43zgrjdi3v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177838,6 +178143,21 @@ self: { broken = true; }) {}; + "mu-lens" = callPackage + ({ mkDerivation, base, containers, generic-lens, lens, mu-rpc + , mu-schema, sop-core, text + }: + mkDerivation { + pname = "mu-lens"; + version = "0.3.0.0"; + sha256 = "02awv7xm361wcag5ghv103fa6qid4kfqn5zjw14wcmqvanwy19f4"; + libraryHaskellDepends = [ + base containers generic-lens lens mu-rpc mu-schema sop-core text + ]; + description = "Lenses for @mu-schema@ terms"; + license = stdenv.lib.licenses.asl20; + }) {}; + "mu-optics" = callPackage ({ mkDerivation, base, containers, mu-schema, optics-core, sop-core }: @@ -177867,6 +178187,22 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "mu-prometheus" = callPackage + ({ mkDerivation, base, lifted-base, monad-control, mu-rpc + , prometheus-client, text, wai, wai-middleware-prometheus + }: + mkDerivation { + pname = "mu-prometheus"; + version = "0.4.0.0"; + sha256 = "060fx3svjiwzyfifmwrzcvm23xp332yb91fb4hh7whcmi2q415c8"; + libraryHaskellDepends = [ + base lifted-base monad-control mu-rpc prometheus-client text wai + wai-middleware-prometheus + ]; + description = "Metrics support for Mu using Prometheus"; + license = stdenv.lib.licenses.asl20; + }) {}; + "mu-protobuf" = callPackage ({ mkDerivation, base, bytestring, compendium-client, http-client , http2-grpc-proto3-wire, language-protobuf, mu-rpc, mu-schema @@ -177875,8 +178211,8 @@ self: { }: mkDerivation { pname = "mu-protobuf"; - version = "0.3.0.0"; - sha256 = "02wk2bhx6lflgri9fm4dq09yz07xsm82fbxgm130zs7s6015chxf"; + version = "0.4.0.0"; + sha256 = "13323mk6maj4fn1vg98nkb80k1975mqaszbj67a4mr5n2s9vrlz2"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -177895,15 +178231,16 @@ self: { }) {}; "mu-rpc" = callPackage - ({ mkDerivation, base, conduit, mtl, mu-schema, sop-core - , template-haskell, text + ({ mkDerivation, aeson, base, conduit, http-types, mtl, mu-schema + , sop-core, template-haskell, text, wai }: mkDerivation { pname = "mu-rpc"; - version = "0.3.0.0"; - sha256 = "02m19ddp8q3khp8j6cgax24srf6dlpakq2wkjpqsa31vawn06a9g"; + version = "0.4.0.0"; + sha256 = "06aly31vqf4i96p62i7pjp9xr9rwvnrmg31qpvirjzgn6jq5dyk3"; libraryHaskellDepends = [ - base conduit mtl mu-schema sop-core template-haskell text + aeson base conduit http-types mtl mu-schema sop-core + template-haskell text wai ]; description = "Protocol-independent declaration of services and servers"; license = stdenv.lib.licenses.asl20; @@ -177912,20 +178249,56 @@ self: { "mu-schema" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, sop-core , template-haskell, text, th-abstraction, unordered-containers - , vector + , uuid, vector }: mkDerivation { pname = "mu-schema"; - version = "0.3.0.0"; - sha256 = "0b943w2mfrgrc2cgq4vjg1wgyb5ijdqfq9argv0k6i6b3hj97kqg"; + version = "0.3.1.0"; + sha256 = "1kl62ask8cvjimjcb9f3y3vpvk544m3zlzp4jn1yrvbmzn3px0d1"; libraryHaskellDepends = [ aeson base bytestring containers sop-core template-haskell text - th-abstraction unordered-containers vector + th-abstraction unordered-containers uuid vector ]; description = "Format-independent schemas for serialization"; license = stdenv.lib.licenses.asl20; }) {}; + "mu-servant-server" = callPackage + ({ mkDerivation, aeson, async, base, conduit, generic-aeson + , ghc-prim, mtl, mu-rpc, mu-schema, servant, servant-server + , servant-swagger, stm, swagger2, text, utf8-string, warp + }: + mkDerivation { + pname = "mu-servant-server"; + version = "0.4.0.0"; + sha256 = "0iwcrqbldfvjg9g7pq1r9gw8avhrl4m9fxjcr7gbci2fwalx7901"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base conduit generic-aeson ghc-prim mtl mu-rpc + mu-schema servant servant-server servant-swagger stm swagger2 + utf8-string + ]; + executableHaskellDepends = [ + aeson base conduit mu-rpc mu-schema servant-server text warp + ]; + description = "Servant servers for Mu definitions"; + license = stdenv.lib.licenses.asl20; + }) {}; + + "mu-tracing" = callPackage + ({ mkDerivation, base, containers, mu-rpc, text, tracing-control }: + mkDerivation { + pname = "mu-tracing"; + version = "0.4.0.0"; + sha256 = "0bc6xxhnaswq0pyq9qjhrig978gb25a0gxkhlah7iim5y09fxmaw"; + libraryHaskellDepends = [ + base containers mu-rpc text tracing-control + ]; + description = "Tracing support for Mu"; + license = stdenv.lib.licenses.asl20; + }) {}; + "mucipher" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -185582,8 +185955,8 @@ self: { }: mkDerivation { pname = "nri-prelude"; - version = "0.1.0.3"; - sha256 = "19rbcdv21j327lffvj43jyp0wa2zbbljfs7zd842szfffzq59bkg"; + version = "0.1.0.4"; + sha256 = "0x8jvrp2kcj9a23g370fj9v6mmp3c3vi05dg3arq1ri5in4y6psa"; libraryHaskellDepends = [ aeson ansi-terminal async auto-update base bytestring concurrent-output containers directory exceptions filepath hedgehog @@ -186141,6 +186514,22 @@ self: { broken = true; }) {}; + "numhask-free" = callPackage + ({ mkDerivation, attoparsec, base, containers, doctest, free + , numhask, text + }: + mkDerivation { + pname = "numhask-free"; + version = "0.0.1"; + sha256 = "1n786zg3sbc9zjr4972b837p459qx8yc1jqh0qlq1yw50yd9ic79"; + libraryHaskellDepends = [ + attoparsec base containers free numhask text + ]; + testHaskellDepends = [ base doctest numhask ]; + description = "See readme.md"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "numhask-hedgehog" = callPackage ({ mkDerivation, base, hedgehog, numhask, numhask-prelude , numhask-space @@ -191381,7 +191770,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_11" = callPackage + "pandoc_2_11_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions @@ -191400,8 +191789,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.11"; - sha256 = "1d0rywdwcr81h45ha53x35jjj8lyzwdc3wang395wxwxbl811l7w"; + version = "2.11.0.1"; + sha256 = "195g1y1i4n11qfk2mmgfnhvdcraf937ipvb7swb6fvyv5qlwj4w9"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -191538,8 +191927,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.8.1"; - sha256 = "15h484xq015jy65mzaqjqyi4ppnqfrdvvj1llmp8k00vb2xcrzrr"; + version = "0.3.8.2"; + sha256 = "15rvyxn05wq7k06v3k4z0wbl85id7vmjkyy92zdp8vcvqbayjm3a"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -193067,8 +193456,8 @@ self: { pname = "paramtree"; version = "0.1.1.1"; sha256 = "0ls9wzmz5lk7gyl8lx9cjs49zpwhrv955fs5q6ypv7bpbvjbchs1"; - revision = "1"; - editedCabalFile = "0p7zb0xvx88i72garnlihp2q1x5lpsr73jp2qh8lgasy12gy7g0q"; + revision = "2"; + editedCabalFile = "17wyi6q6azm2s04pm1alc183yp01a8qbvj1nymjxdzvrl2dkk2g6"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base bytestring tasty tasty-golden tasty-hunit temporary @@ -201576,6 +201965,8 @@ self: { pname = "polyvariadic"; version = "0.3.0.4"; sha256 = "17895458cfciv5lkcd26b5a96d9mwklish8xjhn14bd2himyczx0"; + revision = "1"; + editedCabalFile = "1z4wg7cb4akanch7cdmmvr8ibrv7il63gi2mchq8pasqad6150f0"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base ]; description = "Creation and application of polyvariadic functions"; @@ -206679,6 +207070,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "prolens" = callPackage + ({ mkDerivation, base, doctest, hedgehog, hspec, hspec-hedgehog + , inspection-testing + }: + mkDerivation { + pname = "prolens"; + version = "0.0.0.0"; + sha256 = "1p4cl83knkvfa11ijw9qb2akz9n8lv9ixawgxwynypygg7vdg9j2"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest hedgehog hspec hspec-hedgehog inspection-testing + ]; + description = "Profunctor-based lightweight implementation of optics"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "prolog" = callPackage ({ mkDerivation, base, containers, mtl, parsec, syb , template-haskell, th-lift, transformers @@ -206762,8 +207169,8 @@ self: { }: mkDerivation { pname = "prolude"; - version = "0.0.0.1"; - sha256 = "1qk9i362z5mw5agxqvlpz2yvl5cq485nbfkl1kxanp36bkxigz6c"; + version = "0.0.0.2"; + sha256 = "01md9n18kwsm2myr1wfv16z404c4d92iz4g7nhixrkl6dvgq8fyc"; libraryHaskellDepends = [ aeson base bytestring mongoDB safe-exceptions scientific text time vector @@ -208052,6 +208459,21 @@ self: { broken = true; }) {}; + "ptr-poker" = callPackage + ({ mkDerivation, base, bytestring, gauge, hedgehog, numeric-limits + , rerebase, scientific, text + }: + mkDerivation { + pname = "ptr-poker"; + version = "0.1.1"; + sha256 = "09dklmyarwn4s3lp2l2i1641cs57r6jamqkbyn6qb91nl0f46z52"; + libraryHaskellDepends = [ base bytestring scientific text ]; + testHaskellDepends = [ hedgehog numeric-limits rerebase ]; + benchmarkHaskellDepends = [ gauge rerebase ]; + description = "Pointer poking action construction and composition toolkit"; + license = stdenv.lib.licenses.mit; + }) {}; + "pub" = callPackage ({ mkDerivation, base, bytestring, hedis, optparse-generic, pipes , pipes-bytestring, text @@ -218474,24 +218896,27 @@ self: { , doctest, exceptions, ghc, Glob, hlint, hspec, hspec-core , hspec-expectations, lens-aeson, mtl, QuickCheck , quickcheck-instances, rio, tasty, tasty-hspec, tasty-hunit - , tasty-rerun, tasty-smallcheck, text, transformers, world-peace - , yaml + , tasty-rerun, tasty-smallcheck, text, transformers + , transformers-base, world-peace, yaml }: mkDerivation { pname = "rescue"; - version = "0.2.1"; - sha256 = "1rb7apdlpm69695hcpimmyjn5ar8lld8q1hgag86jsww5dfn2mp7"; + version = "0.3.0"; + sha256 = "0lfvd5x845m2by8n67lgcybp22ppf7yxgglcqzwwfmmpa9qnchq2"; libraryHaskellDepends = [ - base exceptions ghc mtl text transformers world-peace + base exceptions ghc mtl text transformers transformers-base + world-peace ]; testHaskellDepends = [ base directory directory-tree doctest exceptions ghc Glob hlint hspec hspec-core hspec-expectations lens-aeson mtl QuickCheck quickcheck-instances rio tasty tasty-hspec tasty-hunit tasty-rerun - tasty-smallcheck text transformers world-peace yaml + tasty-smallcheck text transformers transformers-base world-peace + yaml ]; benchmarkHaskellDepends = [ - base criterion exceptions ghc mtl text transformers world-peace + base criterion exceptions ghc mtl text transformers + transformers-base world-peace ]; description = "More understandable exceptions"; license = stdenv.lib.licenses.asl20; @@ -241602,8 +242027,8 @@ self: { }: mkDerivation { pname = "stack"; - version = "2.3.3"; - sha256 = "1j2z8cgb9c56g39dh5ff2sri3r3vxddy6ymznkywn6d7c1z4j7qs"; + version = "2.5.1"; + sha256 = "1ffbgs5wgdcvvwbg3pkpgih5dqcbw8mpjj2p49fd8f79cfxmjq20"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -243767,6 +244192,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stm-incremental" = callPackage + ({ mkDerivation, base, hspec, stm }: + mkDerivation { + pname = "stm-incremental"; + version = "0.1.0.2"; + sha256 = "0fynnynx395r9mgm40w2nsb661vy9yaj7wxwfz206yrbpwrvd9vz"; + libraryHaskellDepends = [ base stm ]; + testHaskellDepends = [ base hspec stm ]; + description = "A library for constructing incremental computations"; + license = stdenv.lib.licenses.mit; + }) {}; + "stm-io-hooks" = callPackage ({ mkDerivation, array, base, mtl, stm }: mkDerivation { @@ -244701,6 +245138,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "streaming-bytestring_0_1_7" = callPackage + ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl + , resourcet, smallcheck, streaming, tasty, tasty-hunit + , tasty-smallcheck, transformers, transformers-base + }: + mkDerivation { + pname = "streaming-bytestring"; + version = "0.1.7"; + sha256 = "12fd0aqd6vxm8c6ccgqd99m1hh3z3nb155hairnddzix0v3r8zvd"; + libraryHaskellDepends = [ + base bytestring deepseq exceptions mmorph mtl resourcet streaming + transformers transformers-base + ]; + testHaskellDepends = [ + base bytestring resourcet smallcheck streaming tasty tasty-hunit + tasty-smallcheck transformers + ]; + description = "Fast, effectful byte streams"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "streaming-cassava" = callPackage ({ mkDerivation, base, bytestring, cassava, hspec, mtl, QuickCheck , quickcheck-instances, streaming, streaming-bytestring, text @@ -251085,6 +251544,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tasty-ant-xml_1_1_7" = callPackage + ({ mkDerivation, base, containers, directory, filepath + , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers + , xml + }: + mkDerivation { + pname = "tasty-ant-xml"; + version = "1.1.7"; + sha256 = "01br1jqmin3kislw59rdsgl4pggdf8miwddifj654dllfgg148vg"; + libraryHaskellDepends = [ + base containers directory filepath generic-deriving ghc-prim mtl + stm tagged tasty transformers xml + ]; + description = "Render tasty output to XML for Jenkins"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-auto" = callPackage ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec , tasty-hunit, tasty-quickcheck, tasty-smallcheck @@ -251802,8 +252279,8 @@ self: { pname = "tasty-travis"; version = "0.2.0.2"; sha256 = "0g1qwmr11rgpvm964367mskgrjzbi34lbxzf9c0knx5ij9565gfg"; - revision = "2"; - editedCabalFile = "0m8h9r1cv38sva9k5aws1l4py4xzzmlfwik2avhm8avdr0hl71dk"; + revision = "4"; + editedCabalFile = "10kvalx02kyx2dx6shw00s689hb1qgllpagwy6nxvah6cky438ks"; libraryHaskellDepends = [ base tasty ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Fancy Travis CI output for tasty tests"; @@ -253403,8 +253880,8 @@ self: { }: mkDerivation { pname = "termonad"; - version = "4.0.1.0"; - sha256 = "1658xnsb59hpjj692zkd3rc72x10m83sk5irgiryy0b4yqp7s3hg"; + version = "4.0.1.1"; + sha256 = "1vjxq903jws85n6aihmgif1s168afg2v9ixdxri98mzjkww10sgl"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -255779,8 +256256,8 @@ self: { }: mkDerivation { pname = "th-lego"; - version = "0.1.0.3"; - sha256 = "1gzvvxxy77pz9hxgc3hmz87w17kpiwvzzb5d3ncn13zsyc5j1mcx"; + version = "0.1.0.4"; + sha256 = "16pls283c6r4rx9aiyqacfrq5cy8d1q964fnzzk62517nicb9xyv"; libraryHaskellDepends = [ base template-haskell template-haskell-compat-v0208 text ]; @@ -257235,19 +257712,20 @@ self: { broken = true; }) {}; - "time_1_10" = callPackage - ({ mkDerivation, base, deepseq, QuickCheck, random, tasty - , tasty-hunit, tasty-quickcheck, unix + "time_1_11" = callPackage + ({ mkDerivation, base, criterion, deepseq, QuickCheck, random + , tasty, tasty-hunit, tasty-quickcheck, unix }: mkDerivation { pname = "time"; - version = "1.10"; - sha256 = "1000fhgcvqagvyhm587zf6y9g2ffj517w0hsvvpbzj1sggyjc93s"; + version = "1.11"; + sha256 = "16kmc754gz73plwb7lnk206r9v99va8y4ilbm347h6xmi5z7avp9"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck unix ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; description = "A time library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -262069,8 +262547,8 @@ self: { }: mkDerivation { pname = "ttn"; - version = "0.1.0.0"; - sha256 = "1jk9jhhf2if199il0brwqzrkf7l1p9rszqk9c717wqhh5niy9aip"; + version = "0.2.0.0"; + sha256 = "1bi8ksidpvncs82s02m7314znj876acz0ia61gxgk7yzm2c7nwq0"; libraryHaskellDepends = [ aeson base bytestring text time timerep ]; @@ -262083,24 +262561,21 @@ self: { }) {}; "ttn-client" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring - , cayene-lpp, config-ini, directory, filepath, monad-logger - , mqtt-hs, pretty-simple, stm, text, ttn + ({ mkDerivation, async, base, base64-bytestring, binary, bytestring + , cayene-lpp, config-ini, directory, filepath, net-mqtt + , network-uri, stm, text, time, ttn }: mkDerivation { pname = "ttn-client"; - version = "0.1.0.1"; - sha256 = "1xyk1amfrsyflkrhb3xhdmszi3gcc9srw9d5zcnbdacgkzm3yn1j"; + version = "0.2.0.0"; + sha256 = "1rvnn57hr2yqj383rknnnpy4k073r8i8cjx6fg4xb1ywwk9v3i86"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base base64-bytestring binary bytestring config-ini directory - filepath monad-logger mqtt-hs pretty-simple stm text ttn - ]; - executableHaskellDepends = [ - aeson base binary bytestring cayene-lpp mqtt-hs pretty-simple stm - text ttn + async base base64-bytestring binary bytestring cayene-lpp + config-ini directory filepath net-mqtt network-uri stm text ttn ]; + executableHaskellDepends = [ base text time ttn ]; description = "TheThingsNetwork client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -265820,6 +266295,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unicode-transforms_0_3_7_1" = callPackage + ({ mkDerivation, base, bytestring, deepseq, filepath, gauge + , getopt-generics, ghc-prim, hspec, path, path-io, QuickCheck + , split, text + }: + mkDerivation { + pname = "unicode-transforms"; + version = "0.3.7.1"; + sha256 = "1010sahi4mjzqmxqlj3w73rlymbl2370x5vizjqbx7mb86kxzx4f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring ghc-prim text ]; + testHaskellDepends = [ + base deepseq getopt-generics hspec QuickCheck split text + ]; + benchmarkHaskellDepends = [ + base deepseq filepath gauge path path-io text + ]; + description = "Unicode normalization"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unicode-tricks" = callPackage ({ mkDerivation, base, data-default, hspec, hspec-discover , QuickCheck, text @@ -266141,8 +266639,8 @@ self: { ({ mkDerivation, base, vector }: mkDerivation { pname = "uniqueness-periods-vector"; - version = "0.3.0.0"; - sha256 = "139xs292irnsw7574nsrpw5dqsg0g7j71p2jvq6h2bl9wnndsi8b"; + version = "0.3.1.1"; + sha256 = "0nl6rpxsmjw4zsw5x550wlifhrhy4pzkvjxhklb0183n9pl8nkkd"; libraryHaskellDepends = [ base vector ]; description = "Generalization of the uniqueness-periods and uniqueness-periods-general packages functionality"; license = stdenv.lib.licenses.mit; @@ -266152,8 +266650,8 @@ self: { ({ mkDerivation, base, vector }: mkDerivation { pname = "uniqueness-periods-vector-common"; - version = "0.5.0.0"; - sha256 = "1xq5ikwfljbgxh09dp4z3hydz37zqigms9n11bqrmxhq3b6kzk0y"; + version = "0.5.1.1"; + sha256 = "1h7xv3g7rpa2bj7mlydvfn9g14j911jrarpl7665h3rfb6fdq4zq"; libraryHaskellDepends = [ base vector ]; description = "Generalization of the dobutokO-poetry-general package functionality"; license = stdenv.lib.licenses.mit; @@ -266170,14 +266668,14 @@ self: { }: mkDerivation { pname = "uniqueness-periods-vector-examples"; - version = "0.12.1.0"; - sha256 = "03gk3lrfpn6cn2c2sb22x3baqr45alycv1y6xm26szikc6wa4w6c"; + version = "0.12.3.1"; + sha256 = "18k9my22zn2x6nf2adnwf340jnixzdkyyx2j24nqvcryxx9kagsi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base lists-flines uniqueness-periods-vector uniqueness-periods-vector-common - uniqueness-periods-vector-properties + uniqueness-periods-vector-properties vector ]; executableHaskellDepends = [ base lists-flines mmsyn6ukr parallel phonetic-languages-ukrainian @@ -266208,8 +266706,8 @@ self: { }: mkDerivation { pname = "uniqueness-periods-vector-general"; - version = "0.5.0.0"; - sha256 = "1rxv50s8fwvhlz0264ylg8lph4ifdm3gc2by5v8ry8xqclgaxf7l"; + version = "0.5.1.0"; + sha256 = "1abqcxrlchhi5jag6rvaar48ip356p9r1zcndbja72z4dxg9b9q0"; libraryHaskellDepends = [ base print-info uniqueness-periods-vector-common vector ]; @@ -266225,8 +266723,8 @@ self: { }: mkDerivation { pname = "uniqueness-periods-vector-properties"; - version = "0.5.4.0"; - sha256 = "0qn8pqny73lmd9al3mlsfzs91rs2y52q1mzpc8xf3bvixhbxvmwa"; + version = "0.5.5.0"; + sha256 = "08pzazvgg0nldybbj1558xvipn3wafqm9491fk2xcrf4na5pc42l"; libraryHaskellDepends = [ base mmsyn6ukr mmsyn7s phonetic-languages-rhythmicity phonetic-languages-ukrainian uniqueness-periods-vector @@ -269156,8 +269654,8 @@ self: { pname = "validated-literals"; version = "0.3.0"; sha256 = "1k77jp19kl7h4v9hl2jhsmbq8dhzl8z9sgkw1jxx1rblm3fszjx1"; - revision = "1"; - editedCabalFile = "1l6b488pnarmx4a1cysbx0lpcx0kvrs4x3bc4sinpnzv0r5az4z4"; + revision = "3"; + editedCabalFile = "0m7iggm5676nayzkj0ip866qg8d4ld6gv38krl02z020m96zax5b"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base bytestring deepseq tasty tasty-hunit tasty-travis @@ -271859,8 +272357,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.6.9"; - sha256 = "0h5b8sfd91yz09aws5dpwjz4vqcdsfkq4r7xk3jgc02v5f807iga"; + version = "3.6.10"; + sha256 = "028c6n6f62nnwszb4px5mhg2spqb2z4psm06fbc2r1qw6vpqhxn6"; libraryHaskellDepends = [ base bytestring transformers vector ]; librarySystemDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; @@ -274587,8 +275085,8 @@ self: { }: mkDerivation { pname = "web-plugins"; - version = "0.3.0"; - sha256 = "08qv5770nq5nivl03q0bdz6v0x3vvyg12q4mgxrj2kds5hkn23nd"; + version = "0.4.0"; + sha256 = "1r3bvwlr7p5vfvibw2ghj7nxw4hgapqqpsrhr55ni8ivlrprs9fh"; libraryHaskellDepends = [ base binary bytestring containers http-types mtl stm text ]; @@ -280170,6 +280668,20 @@ self: { broken = true; }) {}; + "xmonad-dbus" = callPackage + ({ mkDerivation, base, dbus, utf8-string }: + mkDerivation { + pname = "xmonad-dbus"; + version = "0.1.0.0"; + sha256 = "18phy3wxags8cmgs9bdkhwb4gy8fr72j25b18nk44q8956a3060p"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base dbus utf8-string ]; + executableHaskellDepends = [ base dbus utf8-string ]; + testHaskellDepends = [ base dbus utf8-string ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "xmonad-entryhelper" = callPackage ({ mkDerivation, base, directory, extensible-exceptions, filepath , mtl, process, unix, X11, xmonad, xmonad-contrib @@ -281435,6 +281947,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yamlparse-applicative_0_1_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers + , genvalidity-aeson, genvalidity-containers, genvalidity-hspec + , genvalidity-scientific, genvalidity-text + , genvalidity-unordered-containers, hspec, optparse-applicative + , path, path-io, prettyprinter, QuickCheck, scientific, text + , unordered-containers, validity, validity-text, vector, yaml + }: + mkDerivation { + pname = "yamlparse-applicative"; + version = "0.1.0.2"; + sha256 = "1bzf3kbhccxzg88amyk3ys3bwfi99fhmfa843sxn53nrbgphdw09"; + libraryHaskellDepends = [ + aeson base bytestring containers optparse-applicative path path-io + prettyprinter scientific text unordered-containers validity + validity-text vector yaml + ]; + testHaskellDepends = [ + aeson base containers genvalidity-aeson genvalidity-containers + genvalidity-hspec genvalidity-scientific genvalidity-text + genvalidity-unordered-containers hspec QuickCheck scientific text + unordered-containers + ]; + description = "Declaritive configuration parsing with free docs"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yampa-canvas" = callPackage ({ mkDerivation, base, blank-canvas, stm, time, Yampa }: mkDerivation { From 90befeaf49af734944def97488a4a6849d8ed951 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 15 Oct 2020 19:50:00 -0500 Subject: [PATCH 260/546] nodejs-14_x: 14.13.1 -> 14.14.0 https://github.com/nodejs/node/releases/tag/v14.14.0 --- pkgs/development/web/nodejs/v14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 079736b5e4e..6c0d445476b 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "14.13.1"; - sha256 = "1xhmdhzsk3pfl4k8l0ipd9a1v5z807sl65mwkw51y7lc44gbsqb0"; + version = "14.14.0"; + sha256 = "1rphkl3lqg0rzgg0r58bfv1hjw3rg96qvqcilk2927kbpps3bs84"; } From 0339b205e1b19285c071afb2949f4f94d02a06c9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 03:07:53 +0000 Subject: [PATCH 261/546] python37Packages.blessed: 1.17.10 -> 1.17.11 --- pkgs/development/python-modules/blessed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix index e2963eb51b1..b55e2939982 100644 --- a/pkgs/development/python-modules/blessed/default.nix +++ b/pkgs/development/python-modules/blessed/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "blessed"; - version = "1.17.10"; + version = "1.17.11"; src = fetchPypi { inherit pname version; - sha256 = "09kcz6w87x34a3h4r142z3zgw0av19cxn9jrbz52wkpm1534dfaq"; + sha256 = "7d4914079a6e8e14fbe080dcaf14dee596a088057cdc598561080e3266123b48"; }; checkInputs = [ pytest mock glibcLocales ]; From 917b1a2775b7de3dab059a3be6dbe6aa0121558e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 22:10:06 +0000 Subject: [PATCH 262/546] python37Packages.limnoria: 2020.08.30 -> 2020.10.10 --- pkgs/development/python-modules/limnoria/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 60fe4d86efa..a94391890b4 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2020.08.30"; + version = "2020.10.10"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "44d81682cdf246a0324638707a2ef0819aae8c84fc0e69daaaa57cbc3f9e18e1"; + sha256 = "546fdfad14c645ebb56e20a83ce34259b91a6db5c50cf14df741771b28ac2e19"; }; patchPhase = '' From 400d1c9e28c484f89d0a637294f9f47e7c445392 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 23:10:04 +0000 Subject: [PATCH 263/546] python37Packages.auth0-python: 3.12.0 -> 3.13.0 --- pkgs/development/python-modules/auth0-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index 1b50e70aaee..2af445b48c5 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "3.12.0"; + version = "3.13.0"; src = fetchPypi { inherit pname version; - sha256 = "fbc54a231ca787ae0917223028269582abbd963cfa9d53ba822a601dd9cd2215"; + sha256 = "2e968d01364c8c94fbe85154ab77ebe9e51a3f8282405bb33748071452063004"; }; propagatedBuildInputs = [ From cc54d5332e07f9c20dce2ac78c33c70d1b21c22d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 15 Oct 2020 14:55:55 -0700 Subject: [PATCH 264/546] hdf4: 4.2.14 -> 4.2.15, fix build --- pkgs/tools/misc/hdf4/default.nix | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index d5b8291d78e..5e5154111dc 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -9,30 +9,17 @@ stdenv.mkDerivation rec { pname = "hdf"; - version = "4.2.14"; + version = "4.2.15"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF/releases/HDF${version}/src/hdf-${version}.tar.bz2"; - sha256 = "0n29klrrbwan9307np0d9hr128dlpc4nnlf57a140080ll3jmp8l"; + sha256 = "04nbgfxyj5jg4d6sr28162cxbfwqgv0sa7vz1ayzvm8wbbpkbq5x"; }; - patches = let - # The Debian patch revision to fetch from; this may differ from our package - # version, but older patches should still apply. - patchRev = "4.2.13-4"; - getPatch = name: sha256: fetchpatch { - inherit sha256; - url = "https://salsa.debian.org/debian-gis-team/hdf4/raw/debian/${patchRev}/debian/patches/${name}"; - }; - - in [ - (getPatch "64bit" "1xqk9zpch4m6ipa0f3x2cm8rwaz4p0ppp1vqglvz18j6q91p8b5y") - (getPatch "hdfi.h" "01fr9csylnvk9jd9jn9y23bvxy192s07p32pr76mm3gwhgs9h7r4") - (getPatch "hdf-4.2.10-aarch64.patch" "1hl0xw5pd9xhpq49xpwgg7c4z6vv5p19x6qayixw0myvgwj1r4zn") - (getPatch "reproducible-builds.patch" "02j639w26xkxpxx3pdhbi18ywz8w3qmjpqjb83n47gq29y4g13hc") + nativeBuildInputs = [ + cmake ]; buildInputs = [ - cmake libjpeg szip zlib From 5cfbcb45076cde9a5f461677eb7d55e0d61a1c22 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 21:32:51 +0000 Subject: [PATCH 265/546] python37Packages.pyshp: 2.1.0 -> 2.1.2 --- pkgs/development/python-modules/pyshp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix index 185465bb640..33ebe945b23 100644 --- a/pkgs/development/python-modules/pyshp/default.nix +++ b/pkgs/development/python-modules/pyshp/default.nix @@ -2,12 +2,12 @@ , setuptools }: buildPythonPackage rec { - version = "2.1.0"; + version = "2.1.2"; pname = "pyshp"; src = fetchPypi { inherit pname version; - sha256 = "1h75a5fisqqj48m6wq7jhdxv6arjg3mvnr5q404pvfbjscj7yp76"; + sha256 = "a0aa668cd0fc09b873f10facfe96971c0496b7fe4f795684d96cc7306ac5841c"; }; buildInputs = [ setuptools ]; From 6156a92857e7c73a7aae48ce46716d658430f74c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 02:18:58 +0000 Subject: [PATCH 266/546] python37Packages.genanki: 0.8.0 -> 0.8.1 --- pkgs/development/python-modules/genanki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix index b9209ba78c2..658ea3baee7 100644 --- a/pkgs/development/python-modules/genanki/default.nix +++ b/pkgs/development/python-modules/genanki/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "genanki"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "c7c6c276f182a63a807b52a95f197df12794ff014f48dd287cb51ca2dcbe1b34"; + sha256 = "08eddb4a203e36e4fc3b66f85e00252070379867dbbc04fd8902ddc14fb352c6"; }; propagatedBuildInputs = [ From 5e5700c9ae757c30aec4971d53bd3c6d48eeb504 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 02:40:35 +0000 Subject: [PATCH 267/546] python37Packages.bacpypes: 0.18.0 -> 0.18.1 --- pkgs/development/python-modules/bacpypes/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bacpypes/default.nix b/pkgs/development/python-modules/bacpypes/default.nix index 141dbf241f2..3999efd12b6 100644 --- a/pkgs/development/python-modules/bacpypes/default.nix +++ b/pkgs/development/python-modules/bacpypes/default.nix @@ -2,14 +2,14 @@ , wheel, pytestCheckHook, pytestrunner }: buildPythonPackage rec { - version = "0.18.0"; + version = "0.18.1"; pname = "bacpypes"; src = fetchFromGitHub { owner = "JoelBender"; repo = "bacpypes"; - rev = "${version}"; - sha256 = "1nz0qi46z6n455mw2ppxgz091qh0irizlxpvkx7iw1l7f6mmgj0x"; + rev = version; + sha256 = "1fxrh57z3fjl95db8jh71grkv5id8qk65g6k5jqcs9v3dgkg8jkl"; }; propagatedBuildInputs = [ wheel ]; From 9c5dc7180189e62291e405564154a3d78ea0f821 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 05:41:18 +0000 Subject: [PATCH 268/546] python37Packages.bayesian-optimization: 1.1.0 -> 1.2.0 --- .../python-modules/bayesian-optimization/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bayesian-optimization/default.nix b/pkgs/development/python-modules/bayesian-optimization/default.nix index 9174b25f6b3..a1739bf4773 100644 --- a/pkgs/development/python-modules/bayesian-optimization/default.nix +++ b/pkgs/development/python-modules/bayesian-optimization/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "bayesian-optimization"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "fmfn"; repo = "BayesianOptimization"; - rev = "v${version}"; - sha256 = "0ylip9xdi0cjzmdayxxpazdfaa9dl0sdcl2qsfn3p0cipj59bdvd"; + rev = version; + sha256 = "01mg9npiqh1qmq5ldnbpjmr8qkiw827msiv3crpkhbj4bdzasbfm"; }; propagatedBuildInputs = [ From 4d7af8c638fe8aa55179d2b4c46c57af1520f562 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 02:26:53 +0000 Subject: [PATCH 269/546] python37Packages.trytond: 5.6.5 -> 5.6.7 --- pkgs/development/python-modules/trytond/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 54eae801dfe..38b7346896c 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -25,12 +25,12 @@ with stdenv.lib; buildPythonApplication rec { pname = "trytond"; - version = "5.6.5"; + version = "5.6.7"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "a373d73b141d71f8e30d728dd8380955bc0f33daaa097201fa9a952e3663e6d8"; + sha256 = "aca005639931835f4f0eaa92ae48ffebb94551af91649a96018694ea448ca0ae"; }; # Tells the tests which database to use From f8ca1bebdf8d6f6df2d32ce18e210489398a8994 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 2 Oct 2020 17:50:52 +0700 Subject: [PATCH 270/546] knightos-mktiupgrade: init at 1.1.6 --- .../tools/knightos/mktiupgrade/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/tools/knightos/mktiupgrade/default.nix diff --git a/pkgs/development/tools/knightos/mktiupgrade/default.nix b/pkgs/development/tools/knightos/mktiupgrade/default.nix new file mode 100644 index 00000000000..171c1671b33 --- /dev/null +++ b/pkgs/development/tools/knightos/mktiupgrade/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, cmake, asciidoc }: + +stdenv.mkDerivation rec { + pname = "mktiupgrade"; + version = "1.1.6"; + + src = fetchFromGitHub { + owner = "KnightOS"; + repo = "mktiupgrade"; + rev = version; + sha256 = "15y3rxvv7ipgc80wrvrpksxzdyqr21ywysc9hg6s7d3w8lqdq8dm"; + }; + + nativeBuildInputs = [ asciidoc cmake ]; + + hardeningDisable = [ "format" ]; + + meta = with stdenv.lib; { + homepage = "https://knightos.org/"; + description = "Makes TI calculator upgrade files from ROM dumps"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97b0a366867..fd5982bbf09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9357,6 +9357,10 @@ in knightos-patchrom = callPackage ../development/tools/knightos/patchrom { }; + knightos-mktiupgrade = callPackage ../development/tools/knightos/mktiupgrade { + asciidoc = asciidoc-full; + }; + knightos-scas = callPackage ../development/tools/knightos/scas { }; kotlin = callPackage ../development/compilers/kotlin { }; From eb9697691ddcaee730dc7695b0f28b7613a285c5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 03:00:52 +0000 Subject: [PATCH 271/546] python37Packages.pycuda: 2019.1.2 -> 2020.1 --- pkgs/development/python-modules/pycuda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index b9a75734b8e..3876485dd96 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -21,11 +21,11 @@ let in buildPythonPackage rec { pname = "pycuda"; - version = "2019.1.2"; + version = "2020.1"; src = fetchPypi { inherit pname version; - sha256 = "ada56ce98a41f9f95fe18809f38afbae473a5c62d346cfa126a2d5477f24cc8a"; + sha256 = "effa3b99b55af67f3afba9b0d1b64b4a0add4dd6a33bdd6786df1aa4cc8761a5"; }; preConfigure = with stdenv.lib.versions; '' From f02c2501383768ab4f3c3e65dfd7919cb138bd71 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 03:38:28 +0000 Subject: [PATCH 272/546] python37Packages.smart_open: 2.1.1 -> 3.0.0 --- pkgs/development/python-modules/smart_open/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index 6dff98a09b4..d5177dfd2e9 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "smart_open"; - version = "2.1.1"; + version = "3.0.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "51b05acd85ec007e1d4dcdbf2bbf917218a45026f37d559559401114bb5e5840"; + sha256 = "7f4e85b71df5a3618f5447d0b417b7a3576308c839690a24a70338b8993684c3"; }; # nixpkgs version of moto is >=1.2.0, remove version pin to fix build From c2a380e251ffa3d177eca7b1f0e1a3784f1cdebe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 01:16:16 +0000 Subject: [PATCH 273/546] python37Packages.accupy: 0.3.2 -> 0.3.3 --- pkgs/development/python-modules/accupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/accupy/default.nix b/pkgs/development/python-modules/accupy/default.nix index f36e12b365a..0d2cd2239b5 100644 --- a/pkgs/development/python-modules/accupy/default.nix +++ b/pkgs/development/python-modules/accupy/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "accupy"; - version = "0.3.2"; + version = "0.3.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "be5c8c9ef2f83c9eeddac85463879957c87a93b257a6202a76ad6b43080b32f9"; + sha256 = "a234c9897a683a6ade44f0bafa71196f122a61e3ebeacb5b813e7d139d54f3c7"; }; buildInputs = [ From c3b21da82d964ee7a09608fd7061c2d2289d618b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 05:03:44 +0000 Subject: [PATCH 274/546] python37Packages.azure-mgmt-web: 0.47.0 -> 0.48.0 --- pkgs/development/python-modules/azure-mgmt-web/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix index 727311cc09a..a99dd764c1a 100644 --- a/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "0.47.0"; + version = "0.48.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1s6c477q2kpyiqkisw6l70ydyjkv3ay6zjjj4jl4ipv05a7356kq"; + sha256 = "da0f9e3b57528c72a7bc92e3515413a4a4fdbc9626c26ac04b7551a7739a81ec"; }; propagatedBuildInputs = [ From 0fb7e3ff29a7b9453859c993868e25260158be93 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 04:34:49 +0000 Subject: [PATCH 275/546] python37Packages.dropbox: 10.4.1 -> 10.6.0 --- pkgs/development/python-modules/dropbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 754fe962b5a..1898be45f82 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dropbox"; - version = "10.4.1"; + version = "10.6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-INA50DD3wfVPItGCgywZCe5bViatUkaaGdJ0vwcEHgY="; + sha256 = "8a7c80eb70ec677a149173154a98cf1fa461c6b0e1a1d833c90e40a735eda2cd"; }; # Set DROPBOX_TOKEN environment variable to a valid token. From 7e274c9b10dcee9e0a8d51def84267172c3e314e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 05:12:16 +0000 Subject: [PATCH 276/546] python37Packages.pymavlink: 2.4.9 -> 2.4.11 --- pkgs/development/python-modules/pymavlink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index 0522e0791fc..b401f1f90b1 100644 --- a/pkgs/development/python-modules/pymavlink/default.nix +++ b/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.9"; + version = "2.4.11"; src = fetchPypi { inherit pname version; - sha256 = "6049f270aa0a1013c7dcd32b9f4756d79b6a2ccf73babeca2c46b9e391e644fe"; + sha256 = "0b1265b169f809c6ca94911ad2d7649b8e087a7cc573a0a6ea62ade9bea7ca5c"; }; propagatedBuildInputs = [ future lxml ]; From 2db0f4a24b8d7591b195d8b7e74b040de355b931 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 01:31:24 +0000 Subject: [PATCH 277/546] python37Packages.mac_alias: 2.0.7 -> 2.1.0 --- pkgs/development/python-modules/mac_alias/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mac_alias/default.nix b/pkgs/development/python-modules/mac_alias/default.nix index bd2a1f62390..79fd0796c24 100644 --- a/pkgs/development/python-modules/mac_alias/default.nix +++ b/pkgs/development/python-modules/mac_alias/default.nix @@ -2,12 +2,12 @@ }: buildPythonPackage rec { - version = "2.0.7"; + version = "2.1.0"; pname = "mac_alias"; src = fetchPypi { inherit pname version; - sha256 = "08z2i68mk5j0vfy8jqihjm9m6njp1lpjh1m91b60h0k0kpmy71f4"; + sha256 = "9f07926e9befcc4ab35212d19541fe0e4e4abd67a7641aa75252a3ffd8deae94"; }; # pypi package does not include tests; From 6b7221fbb4c7ed35ed44cf00ffed69150c141715 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 01:41:27 +0000 Subject: [PATCH 278/546] python37Packages.pyowm: 3.0.0 -> 3.1.1 --- pkgs/development/python-modules/pyowm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix index 04e683ee6e0..423d38ab25d 100644 --- a/pkgs/development/python-modules/pyowm/default.nix +++ b/pkgs/development/python-modules/pyowm/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyowm"; - version = "3.0.0"; + version = "3.1.1"; disabled = pythonOlder "3.3"; src = fetchPypi { inherit pname version; - sha256 = "f06ac5f2356f0964f088b1f840a6d382499054bd18539ffb1e7c84f29c2c39b6"; + sha256 = "a7b18297a9189dbe5f6b454b12d61a407e35c7eb9ca75bcabfe5e1c83245290d"; }; propagatedBuildInputs = [ requests geojson ]; From 194ced81e90b8988004dbe3b0cc447faf694bcbf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 13:01:49 +0000 Subject: [PATCH 279/546] python37Packages.oyaml: 0.9 -> 1.0 --- pkgs/development/python-modules/oyaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oyaml/default.nix b/pkgs/development/python-modules/oyaml/default.nix index e445086d0c7..9ea527e06f1 100644 --- a/pkgs/development/python-modules/oyaml/default.nix +++ b/pkgs/development/python-modules/oyaml/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "oyaml"; - version = "0.9"; + version = "1.0"; src = fetchFromGitHub { owner = "wimglenn"; repo = "oyaml"; rev = "v${version}"; - sha256 = "13xjdym0p0jh9bvyjsbhi4yznlp68bamy3xi4w5wpcrzlcq6cfh9"; + sha256 = "0qkj8g87drvjqiqqmz36gyqiczdfcfv8zk96kkifzk4f9dl5f02j"; }; propagatedBuildInputs = [ From 9f854078649230562a6474ad4950d1f93ccc4b9e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 12:44:09 +0000 Subject: [PATCH 280/546] python37Packages.can: 3.3.3 -> 3.3.4 --- pkgs/development/python-modules/can/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index 0a7e58ac800..ea49c9b4a77 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "python-can"; - version = "3.3.3"; + version = "3.3.4"; src = fetchPypi { inherit pname version; - sha256 = "ecd69cf6b2f0235345ebe607a15325cf1384c85b24ffbe1d68c3754357f87488"; + sha256 = "2d3c223b7adc4dd46ce258d4a33b7e0dbb6c339e002faa40ee4a69d5fdce9449"; }; propagatedBuildInputs = [ wrapt pyserial aenum ] ++ lib.optional (pythonOlder "3.5") typing; From a26c84609547c69d7fc0e37fbb49744042aeea4e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 11:25:08 +0000 Subject: [PATCH 281/546] python37Packages.chalice: 1.18.1 -> 1.21.1 --- pkgs/development/python-modules/chalice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index fb2af329ea7..f586e92f951 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "chalice"; - version = "1.18.1"; + version = "1.21.1"; src = fetchPypi { inherit pname version; - sha256 = "0zb4xk9b553pnfzh8s909cixfdplqnc3nda0fjwjrryi2nxjxd6a"; + sha256 = "562218c5d257607fba3440e0a1d09bdac81a11536c432ad2af1e2d46f1735df4"; }; checkInputs = [ watchdog pytest hypothesis mock ]; From c7129fbe8e1482616bae8ae79efc7f1f7710c004 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Oct 2020 01:48:59 +0200 Subject: [PATCH 282/546] pythonPackages.flake8-future-import: fix build Was broken after python3.8 upgraded to 3.8.6 due to this change: bpo-41314: Changed the release when from future import annotations becomes the default from 4.0 to 3.10 (following a change in PEP 563). --- .../python-modules/flake8-future-import/default.nix | 5 +++-- .../fix-annotations-version.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/flake8-future-import/fix-annotations-version.patch diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix index e819422c572..661b7c71c33 100644 --- a/pkgs/development/python-modules/flake8-future-import/default.nix +++ b/pkgs/development/python-modules/flake8-future-import/default.nix @@ -1,4 +1,4 @@ -{ lib, isPy27, fetchFromGitHub, buildPythonPackage, pythonOlder, fetchpatch, flake8, importlib-metadata, six }: +{ lib, isPy27, isPy38, fetchFromGitHub, buildPythonPackage, pythonOlder, fetchpatch, flake8, importlib-metadata, six }: buildPythonPackage rec { pname = "flake8-future-import"; @@ -20,7 +20,8 @@ buildPythonPackage rec { # Upstream disables this test case naturally on python 3, but it also fails # inside NixPkgs for python 2. Since it's going to be deleted, we just skip it # on py2 as well. - patches = lib.optionals isPy27 [ ./skip-test.patch ]; + patches = lib.optionals isPy38 [ ./fix-annotations-version.patch ] + ++ lib.optionals isPy27 [ ./skip-test.patch ]; meta = with lib; { description = "A flake8 extension to check for the imported __future__ modules to make it easier to have a consistent code base"; diff --git a/pkgs/development/python-modules/flake8-future-import/fix-annotations-version.patch b/pkgs/development/python-modules/flake8-future-import/fix-annotations-version.patch new file mode 100644 index 00000000000..2e3062c8ac4 --- /dev/null +++ b/pkgs/development/python-modules/flake8-future-import/fix-annotations-version.patch @@ -0,0 +1,13 @@ +diff --git a/flake8_future_import.py b/flake8_future_import.py +index 92c3fda..27a1a66 100755 +--- a/flake8_future_import.py ++++ b/flake8_future_import.py +@@ -76,7 +76,7 @@ UNICODE_LITERALS = Feature(4, 'unicode_literals', (2, 6, 0), (3, 0, 0)) + GENERATOR_STOP = Feature(5, 'generator_stop', (3, 5, 0), (3, 7, 0)) + NESTED_SCOPES = Feature(6, 'nested_scopes', (2, 1, 0), (2, 2, 0)) + GENERATORS = Feature(7, 'generators', (2, 2, 0), (2, 3, 0)) +-ANNOTATIONS = Feature(8, 'annotations', (3, 7, 0), (4, 0, 0)) ++ANNOTATIONS = Feature(8, 'annotations', (3, 7, 0), (3, 10, 0)) + + + # Order important as it defines the error code From 41ba16ba71917c66258a89783492f22b857e6809 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 12:02:36 +0000 Subject: [PATCH 283/546] python37Packages.google_cloud_storage: 1.30.0 -> 1.31.2 --- .../python-modules/google_cloud_storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/pkgs/development/python-modules/google_cloud_storage/default.nix index db113962336..91e7beeb127 100644 --- a/pkgs/development/python-modules/google_cloud_storage/default.nix +++ b/pkgs/development/python-modules/google_cloud_storage/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.30.0"; + version = "1.31.2"; src = fetchPypi { inherit pname version; - sha256 = "0634addb7576d48861d9963312fc82a0436042b8f282414ed58ca76d73edee54"; + sha256 = "74bbb5b2d0b249de4a52f561435d0c3570ddc19b249653ae588ec0abcc3c81e6"; }; propagatedBuildInputs = [ From 324bce22a7f72f97cbe16bbe497aacb77d96f4d1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 14:14:20 +0000 Subject: [PATCH 284/546] python37Packages.pq: 1.8.2 -> 1.9.0 --- pkgs/development/python-modules/pq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pq/default.nix b/pkgs/development/python-modules/pq/default.nix index cfc5419bd23..ff1433725fc 100644 --- a/pkgs/development/python-modules/pq/default.nix +++ b/pkgs/development/python-modules/pq/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pq"; - version = "1.8.2"; + version = "1.9.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f54143844e73f4182532e68548dee447dd78dd00310a087e8cdee756d476a173"; + sha256 = "c664ee3a9a25efcb583e3d1d797588fb7c2fb5096220689eec78a7946b01b5ff"; }; # tests require running postgresql cluster @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "PQ is a transactional queue for PostgreSQL"; - homepage = https://github.com/malthe/pq/; + homepage = "https://github.com/malthe/pq/"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; From 2ccf97402851e4283b6b6cd76c43cd3830748389 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 18:04:17 +0000 Subject: [PATCH 285/546] python37Packages.cheetah3: 3.2.5 -> 3.2.6 --- pkgs/development/python-modules/cheetah3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix index 1c133917cb2..e4fd549445a 100644 --- a/pkgs/development/python-modules/cheetah3/default.nix +++ b/pkgs/development/python-modules/cheetah3/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Cheetah3"; - version = "3.2.5"; + version = "3.2.6"; src = fetchPypi { inherit pname version; - sha256 = "ececc9ca7c58b9a86ce71eb95594c4619949e2a058d2a1af74c7ae8222515eb1"; + sha256 = "f1c2b693cdcac2ded2823d363f8459ae785261e61c128d68464c8781dba0466b"; }; doCheck = false; # Circular dependency From 7d63ed3f4757ddcf9395f15684deb0848e71124c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 13:54:48 +0000 Subject: [PATCH 286/546] python37Packages.cytoolz: 0.10.1 -> 0.11.0 --- pkgs/development/python-modules/cytoolz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix index 512e26023c0..156cd0f5a4c 100644 --- a/pkgs/development/python-modules/cytoolz/default.nix +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "cytoolz"; - version = "0.10.1"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "0p4a9nadsy1337gy2cnb5yanbn03j3zm6d9adyqad9bk3nlbpxc2"; + sha256 = "c64f3590c3eb40e1548f0d3c6b2ccde70493d0b8dc6cc7f9f3fec0bb3dcd4222"; }; # Extension types From ee8db0e84fb1c7c8d77f5bd12e30bf94187e192a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 15 Oct 2020 23:54:52 -0700 Subject: [PATCH 287/546] python2Packages.cytoolz: disable no longer compatibled with python2 ``` File "cytoolz/itertoolz.pyx", line 15, in init cytoolz.itertoolz from itertools import chain, islice, zip_longest ImportError: cannot import name zip_longest ``` --- pkgs/development/python-modules/cytoolz/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix index 156cd0f5a4c..0e72ecaa825 100644 --- a/pkgs/development/python-modules/cytoolz/default.nix +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -6,20 +6,19 @@ , toolz , python , fetchpatch +, isPy27 }: buildPythonPackage rec { pname = "cytoolz"; version = "0.11.0"; + disabled = isPy27 || isPyPy; src = fetchPypi { inherit pname version; sha256 = "c64f3590c3eb40e1548f0d3c6b2ccde70493d0b8dc6cc7f9f3fec0bb3dcd4222"; }; - # Extension types - disabled = isPyPy; - checkInputs = [ nose ]; propagatedBuildInputs = [ toolz ]; From 105d500c1274ab2103e224526d7085abdc5d036e Mon Sep 17 00:00:00 2001 From: Nikita Uvarov Date: Wed, 14 Oct 2020 12:55:45 +0200 Subject: [PATCH 288/546] pythonPackages.umap-learn: 0.3.10 -> 0.4.5 --- .../python-modules/umap-learn/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix index 9979183c497..f471fbef4c8 100644 --- a/pkgs/development/python-modules/umap-learn/default.nix +++ b/pkgs/development/python-modules/umap-learn/default.nix @@ -6,21 +6,23 @@ , scikitlearn , scipy , numba +, pytestCheckHook }: buildPythonPackage rec { pname = "umap-learn"; - version = "0.3.10"; + version = "0.4.5"; src = fetchFromGitHub { owner = "lmcinnes"; repo = "umap"; rev = version; - sha256 = "0nck5va5km7qkbrhn15dsn0p2mms9kc641lcypy7l8haqgm44h8x"; + sha256 = "080by8h4rxr5ijx8vp8kn952chiqz029j26c04k4js4g9s7201bq"; }; checkInputs = [ nose + pytestCheckHook ]; propagatedBuildInputs = [ @@ -30,15 +32,15 @@ buildPythonPackage rec { numba ]; - postConfigure = '' - substituteInPlace umap/tests/test_umap.py \ - --replace "def test_umap_transform_on_iris()" "@SkipTest -def test_umap_transform_on_iris()" - ''; + disabledTests = [ + # Plot functionality requires additional packages. + # These test also fail with 'RuntimeError: cannot cache function' error. + "test_umap_plot_testability" + "test_plot_runs_at_all" - checkPhase = '' - nosetests -s umap - ''; + # Flaky test. Fails with AssertionError sometimes. + "test_sparse_hellinger" + ]; meta = with lib; { description = "Uniform Manifold Approximation and Projection"; From dbceedca9674fd639cc045e8f1c8e886d1143c46 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 09:59:55 +0000 Subject: [PATCH 289/546] python37Packages.pylast: 3.3.0 -> 4.0.0 --- pkgs/development/python-modules/pylast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix index 10449717ea4..12fac476f63 100644 --- a/pkgs/development/python-modules/pylast/default.nix +++ b/pkgs/development/python-modules/pylast/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "pylast"; - version = "3.3.0"; + version = "4.0.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1wqd23bbk5si2mcmswsi486zqnydjjf8g7924gcz6cc1x036lasd"; + sha256 = "8ec555d6c4c1b474e9b3c96c3786abd38303a1a5716d928b0f3cfdcb4499b093"; }; nativeBuildInputs = [ setuptools_scm ]; From 3a57ec474497a3c7117427c719b7c936643582b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Wed, 14 Oct 2020 00:32:18 +0200 Subject: [PATCH 290/546] devpi-server: fix tests Tests relied on a function that has no order guarantee. A fix was merged to devpi master [1]. We point the package to this commit which should fix the failing tests on hydra. [1] https://github.com/devpi/devpi/pull/821 --- pkgs/development/tools/devpi-server/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index 4b5499b87bc..53950d08f76 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -1,18 +1,22 @@ -{ stdenv, python3Packages, nginx }: +{ stdenv, fetchFromGitHub, python3Packages, nginx }: python3Packages.buildPythonApplication rec { pname = "devpi-server"; - version = "5.5.0"; + version = "6.0.0.dev0"; - src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "0lily4a0k13bygx07x2f2q4nkwny0fj34hpac9i6mc70ysdn1hhi"; + src = fetchFromGitHub { + owner = "devpi"; + repo = "devpi"; + rev = "68ee291ef29a93f6d921d4927aec8d13919b4a4c"; + sha256 = "1ivd5dy9f2gq07w8n2gywa0n0d9wv8644l53ni9fz7i69jf8q2fm"; }; + sourceRoot = "source/server"; propagatedBuildInputs = with python3Packages; [ py appdirs devpi-common + defusedxml execnet itsdangerous repoze_lru From 0c323896620511ffcb415f3beab8c05257dc3321 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 05:57:43 +0000 Subject: [PATCH 291/546] python37Packages.numcodecs: 0.6.4 -> 0.7.2 --- pkgs/development/python-modules/numcodecs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index 92d049dbe6c..a28a951b32f 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "numcodecs"; - version = "0.6.4"; + version = "0.7.2"; src = fetchPypi { inherit pname version; - sha256 = "ef4843d5db4d074e607e9b85156835c10d006afc10e175bda62ff5412fca6e4d"; + sha256 = "4a038064d5604e6181a64db668d7b700d9ae87e4041984c04cbf0042469664b0"; }; nativeBuildInputs = [ From 20191e3f6b0a6e296b9aed41e8f060a11ee901d8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 16 Oct 2020 00:12:21 -0700 Subject: [PATCH 292/546] python2Packages.numcodes: disable for python2 setup.py no longer compatible with python2 ``` File "setup.py", line 48 print('[numcodecs]', *msg, **kwargs) ^ SyntaxError: invalid syntax ``` --- pkgs/development/python-modules/numcodecs/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index a28a951b32f..3857e80bbd3 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, isPy27 , setuptools_scm , cython , numpy @@ -13,6 +14,7 @@ buildPythonPackage rec { pname = "numcodecs"; version = "0.7.2"; + disabled = isPy27; src = fetchPypi { inherit pname version; From 1de639c4ca6e2236789372a4801c918d3a91d018 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 06:58:21 +0000 Subject: [PATCH 293/546] python37Packages.eve: 1.1.2 -> 1.1.3 --- pkgs/development/python-modules/eve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index 9f1fd621b8f..aca87297506 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "Eve"; - version = "1.1.2"; + version = "1.1.3"; src = fetchPypi { inherit pname version; - sha256 = "a8a1216ef1d3f1a4c4fc5a7bd315eca5a3ef7dfc6b78807cdf19ddfeecafcc3e"; + sha256 = "ef335d13b798bc901636643f11455bab8b8698ddfe3a0b67bc251af1fd809b21"; }; propagatedBuildInputs = [ From 2676ec199f7ffece38bb4783e576193f7d72395d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 07:08:19 +0000 Subject: [PATCH 294/546] python37Packages.azure-mgmt-keyvault: 7.0.0 -> 8.0.0 --- .../python-modules/azure-mgmt-keyvault/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index 5b9ea536dff..6ad96d60bc9 100644 --- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "azure-mgmt-keyvault"; - version = "7.0.0"; + version = "8.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "128c1424373aabab5ffcfa74a3ee73cf8bda0a9259229ce2c1d09a8bc9f7370a"; + sha256 = "2c974c6114d8d27152642c82a975812790a5e86ccf609bf370a476d9ea0d2e7d"; }; propagatedBuildInputs = [ From 726d6eda4a5486aeb7889edc484f8392706ad36c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 09:04:51 +0000 Subject: [PATCH 295/546] python37Packages.django-cleanup: 5.0.0 -> 5.1.0 --- pkgs/development/python-modules/django-cleanup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-cleanup/default.nix b/pkgs/development/python-modules/django-cleanup/default.nix index bb933fd0343..66d202304ee 100644 --- a/pkgs/development/python-modules/django-cleanup/default.nix +++ b/pkgs/development/python-modules/django-cleanup/default.nix @@ -4,10 +4,10 @@ buildPythonPackage rec { pname = "django-cleanup"; - version = "5.0.0"; + version = "5.1.0"; src = fetchPypi { inherit pname version; - sha256 = "84f0c0e0a74545adae4c944a76ccf8fb0c195dddccf3b7195c59267abb7763dd"; + sha256 = "8976aec12a22913afb3d1fcb541b1aedde2f5ec243e4260c5ff78bb6aa75a089"; }; checkInputs = [ django ]; From d9254eec91c0bc84f52ace29f776ac9b7b5478b1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 09:32:25 +0000 Subject: [PATCH 296/546] python37Packages.bellows: 0.18.1 -> 0.20.3 --- pkgs/development/python-modules/bellows/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 4b5cabbbde4..b0c899cdd3b 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -5,14 +5,14 @@ let pname = "bellows"; - version = "0.18.1"; + version = "0.20.3"; in buildPythonPackage rec { inherit pname version; src = fetchPypi { inherit pname version; - sha256 = "6a2e323c2be6f10a8e99fffccb5670bc77bbddb7b5bd9253b69021120f2ab9d7"; + sha256 = "9342b6b9423c818f99f7c6d9086fbb5e27d5c2efbb1f2a08f6f5a917c4991f86"; }; propagatedBuildInputs = [ From 40252390a9869728fc538fcdf3f261f769f995d9 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Fri, 16 Oct 2020 01:32:35 +0200 Subject: [PATCH 297/546] python3.pkgs.osmpythontools: 0.2.6 -> 0.2.8 --- .../python-modules/osmpythontools/default.nix | 6 ++--- .../remove-unused-dependency.patch | 22 ------------------- 2 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 pkgs/development/python-modules/osmpythontools/remove-unused-dependency.patch diff --git a/pkgs/development/python-modules/osmpythontools/default.nix b/pkgs/development/python-modules/osmpythontools/default.nix index 1c80dd6fe55..981feb38808 100644 --- a/pkgs/development/python-modules/osmpythontools/default.nix +++ b/pkgs/development/python-modules/osmpythontools/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "osmpythontools"; - version = "0.2.6"; + version = "0.2.8"; src = fetchPypi { pname = "OSMPythonTools"; inherit version; - sha256 = "efc72e3963971c6c7fd94bd374704a5b78eb6c07397a4ffb5f9176c1e4aee096"; + sha256 = "8a33adbd266127e342d12da755075fae08f398032a6f0909b5e86bef13960a85"; }; propagatedBuildInputs = [ @@ -32,8 +32,6 @@ buildPythonPackage rec { xarray ]; - patches = [ ./remove-unused-dependency.patch ]; - # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/osmpythontools/remove-unused-dependency.patch b/pkgs/development/python-modules/osmpythontools/remove-unused-dependency.patch deleted file mode 100644 index bac80e9bd8c..00000000000 --- a/pkgs/development/python-modules/osmpythontools/remove-unused-dependency.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/OSMPythonTools.egg-info/requires.txt b/OSMPythonTools.egg-info/requires.txt -index 16a5019..e58155c 100644 ---- a/OSMPythonTools.egg-info/requires.txt -+++ b/OSMPythonTools.egg-info/requires.txt -@@ -1,5 +1,4 @@ - beautifulsoup4 --datetime - geojson - lxml - matplotlib -diff --git a/setup.py b/setup.py -index 08e9455..1a6435e 100644 ---- a/setup.py -+++ b/setup.py -@@ -14,7 +14,6 @@ setup( - packages = ['OSMPythonTools', 'OSMPythonTools.internal'], - install_requires = [ - 'beautifulsoup4', -- 'datetime', - 'geojson', - 'lxml', - 'matplotlib', From 3205223f3b7dbb0f66f0cb61c16ba38eb7500bbd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 05:31:09 +0000 Subject: [PATCH 298/546] python37Packages.pysmb: 1.2.2 -> 1.2.4 --- pkgs/development/python-modules/pysmb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysmb/default.nix b/pkgs/development/python-modules/pysmb/default.nix index 33bff0e3946..ad59da259e5 100644 --- a/pkgs/development/python-modules/pysmb/default.nix +++ b/pkgs/development/python-modules/pysmb/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pysmb"; - version = "1.2.2"; + version = "1.2.4"; src = fetchPypi { inherit pname version; format = "setuptools"; extension = "zip"; - sha256 = "59ccd07537fb2a630b0d8cccd78e80180bcca72150d7322c318e1bdae927e125"; + sha256 = "0937cb44936805d403e8e678d7042feb6d85da950a7019e8ae6842a0720fb00c"; }; propagatedBuildInputs = [ From 5be21fe5e9141d8c09cf6d1d4fdeca168c3c9663 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 05:21:22 +0000 Subject: [PATCH 299/546] python37Packages.pybullet: 2.8.7 -> 3.0.6 --- pkgs/development/python-modules/pybullet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix index 9d889214e34..8cc9d173e0f 100644 --- a/pkgs/development/python-modules/pybullet/default.nix +++ b/pkgs/development/python-modules/pybullet/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pybullet"; - version = "2.8.7"; + version = "3.0.6"; src = fetchPypi { inherit pname version; - sha256 = "9d3a8bdc9b4acce086c485ba719aabee33de7a867d84a058b182b139c789ad55"; + sha256 = "db4eea782c4d4808ef73b305a729d94f89035f7ad1b84032432e9dd101f689e4"; }; buildInputs = [ From 00f0b1d721f459a9b67d071746ca583316e0d70d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 05:13:43 +0000 Subject: [PATCH 300/546] nbstripout: 0.3.7 -> 0.3.9 --- pkgs/applications/version-management/nbstripout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index 07f9b442a74..3bea6d89334 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -2,7 +2,7 @@ with python.pkgs; buildPythonApplication rec { - version = "0.3.7"; + version = "0.3.9"; pname = "nbstripout"; # Mercurial should be added as a build input but because it's a Python @@ -14,7 +14,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "13w2zhw8vrfv6637bw5ygygj1dky55fvvncz11hq0abwkkzb3wb2"; + sha256 = "b46dddbf78b8b137176bc72729124e378242ef9ce93af63f6e0a8c4850c972e7"; }; # for some reason, darwin uses /bin/sh echo native instead of echo binary, so From 2d405382cc3ed55603bd35ba0b3384fac64d5ff6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 06:15:22 +0000 Subject: [PATCH 301/546] rdbtools: 0.1.14 -> 0.1.15 --- pkgs/development/tools/rdbtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rdbtools/default.nix b/pkgs/development/tools/rdbtools/default.nix index 050c4ff04a2..624434101d9 100644 --- a/pkgs/development/tools/rdbtools/default.nix +++ b/pkgs/development/tools/rdbtools/default.nix @@ -4,11 +4,11 @@ with python.pkgs; buildPythonApplication rec { pname = "rdbtools"; - version = "0.1.14"; + version = "0.1.15"; src = fetchPypi { inherit pname version; - sha256 = "03vdwwkqz8py6c3wfgx402rn8pjjfn44w3gbxzr60lbkx27m63yj"; + sha256 = "689e57e42f43bdc73ea4e893d9676819980d17968696826b69fbd951f59772de"; }; propagatedBuildInputs = [ redis python-lzf ]; From a3dca9576bceed5ef43bc67c931d336dc8306718 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 04:59:21 +0000 Subject: [PATCH 302/546] deeptools: 3.4.1 -> 3.5.0 --- pkgs/applications/science/biology/deeptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/deeptools/default.nix b/pkgs/applications/science/biology/deeptools/default.nix index 8787c96e5b0..efa246a277f 100644 --- a/pkgs/applications/science/biology/deeptools/default.nix +++ b/pkgs/applications/science/biology/deeptools/default.nix @@ -4,11 +4,11 @@ with python.pkgs; buildPythonApplication rec { pname = "deepTools"; - version = "3.4.1"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "05zw9gk17hz08hns5lnhn7l13idg9jdz4gdba6m6gbr84yz149gs"; + sha256 = "1a14a29e60be13eac11bd204dab9aef73cd72fe56a94c587333f21087584c0d8"; }; propagatedBuildInputs = [ From b8fdd08e260f24bfab1928c906b8b7251dab3449 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 3 Oct 2020 08:23:12 +0000 Subject: [PATCH 303/546] python27Packages.qtconsole: 4.7.6 -> 4.7.7 --- pkgs/development/python-modules/qtconsole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index a1bf4d53018..4d1123aaa78 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "4.7.6"; + version = "4.7.7"; src = fetchPypi { inherit pname version; - sha256 = "6c24397c19a49a5cf69582c931db4b0f6b00a78530a2bfd122936f2ebfae2fef"; + sha256 = "f236ead8711dba0702507dd8fad473c7216a86eefa6098eff8ec4b54f57d7804"; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; From 8b4db57358c57873a3baa6fe5ebfe1cb7b6ccc03 Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Fri, 16 Oct 2020 04:13:12 -0400 Subject: [PATCH 304/546] vscx/ms-vsliveshare-vsliveshare: Init at 1.0.2902 (#100583) --- pkgs/misc/vscode-extensions/default.nix | 2 + .../ms-vsliveshare-vsliveshare/default.nix | 138 ++++++++++++++++++ .../ms-vsliveshare-vsliveshare/noop-syslog.c | 1 + 3 files changed, 141 insertions(+) create mode 100644 pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix create mode 100644 pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/noop-syslog.c diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 90ab030263c..70c68abe313 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -194,6 +194,8 @@ in lldb = llvmPackages_latest.lldb; }; + ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare-vsliveshare {}; + vscodevim.vim = buildVscodeMarketplaceExtension { mktplcRef = { name = "vim"; diff --git a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix b/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix new file mode 100644 index 00000000000..446fedeffec --- /dev/null +++ b/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix @@ -0,0 +1,138 @@ +# Baseed on previous attempts: +# - +# - +{ lib, gccStdenv, vscode-utils, autoPatchelfHook, bash, file, makeWrapper, dotnet-sdk_3 +, curl, gcc, icu, libkrb5, libsecret, libunwind, libX11, lttng-ust, openssl, utillinux, zlib +, desktop-file-utils, xprop +}: + +with lib; + +let + # https://docs.microsoft.com/en-us/visualstudio/liveshare/reference/linux#install-prerequisites-manually + libs = [ + # .NET Core + openssl + libkrb5 + zlib + icu + + # Credential Storage + libsecret + + # NodeJS + libX11 + + # https://github.com/flathub/com.visualstudio.code.oss/issues/11#issuecomment-392709170 + libunwind + lttng-ust + curl + + # General + gcc.cc.lib + utillinux # libuuid + ]; + +in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vsliveshare"; + publisher = "ms-vsliveshare"; + version = "1.0.2902"; + sha256 = "0fx2vi0wxamcwqcgcx7wpg8hi7f1c2pibrmd2qy2whilpsv3gzmb"; + }; +}).overrideAttrs(attrs: { + buildInputs = attrs.buildInputs ++ libs ++ [ autoPatchelfHook bash file makeWrapper ]; + + # Using a patch file won't work, because the file changes too often, causing the patch to fail on most updates. + # Rather than patching the calls to functions, we modify the functions to return what we want, + # which is less likely to break in the future. + postPatch = '' + sed -i \ + -e 's/updateExecutablePermissionsAsync() {/& return;/' \ + -e 's/isInstallCorrupt(traceSource, manifest) {/& return false;/' \ + out/prod/extension-prod.js + + declare ext_unique_id + ext_unique_id="$(basename "$out")" + + # Fix extension attempting to write to 'modifiedInternalSettings.json'. + # Move this write to the tmp directory indexed by the nix store basename. + sed -i \ + -E -e $'s/path\.resolve\(constants_1\.EXTENSION_ROOT_PATH, \'\.\/modifiedInternalSettings\.json\'\)/path.join\(os.tmpdir(), "'$ext_unique_id'" + "-modifiedInternalSettings.json"\)/g' \ + out/prod/extension-prod.js + + # Fix extension attempting to write to 'vsls-agent.lock'. + # Move this write to the tmp directory indexed by the nix store basename. + sed -i \ + -E -e $'s/(Agent_1.getAgentPath\(\) \+ \'.lock\')/path.join\(os.tmpdir(), "'$ext_unique_id'" + "-vsls-agent.lock"\)/g' \ + out/prod/extension-prod.js + + # TODO: Under 'node_modules/@vsliveshare/vscode-launcher-linux' need to hardcode path to 'desktop-file-install' + # 'update-desktop-database' and 'xprop'. Might want to wrap the script instead. + ''; + + # Support for the `postInstall` hook was added only in nixos-20.03, + # so for backwards compatibility reasons lets not use it yet. + installPhase = attrs.installPhase + '' + # Support both the new and old directory structure of vscode extensions. + if [[ -d $out/ms-vsliveshare.vsliveshare ]]; then + cd $out/ms-vsliveshare.vsliveshare + elif [[ -d $out/share/vscode/extensions/ms-vsliveshare.vsliveshare ]]; then + cd $out/share/vscode/extensions/ms-vsliveshare.vsliveshare + else + echo "Could not find extension directory 'ms-vsliveshare.vsliveshare'." >&2 + exit 1 + fi + + bash -s < Date: Thu, 15 Oct 2020 16:10:18 +0200 Subject: [PATCH 305/546] nodePackages: init multiple packages This commit combines several individual PRs which would have resulted in merge conflicts in the generated JSON files. Instead, the "generate.sh" script is only ran once. Due to "makam" not building on MacOS in the form it was originally added in the PR I made some adjustments to this diff. List of added packages: - nodePackages.clubhouse-cli: init at 2.1.0 - nodePackages.makam: init at 0.7.17 - nodePackages.inliner: init at 1.13.1 - nodePackages.sass: init at 1.27.0 - nodePackages.undollar: init at 1.0.0 Co-authoring is used to preserve contributions. Co-authored-by: Changlin Li Co-authored-by: Pasquale Co-authored-by: Teodoro Freund Co-authored-by: Tobias Mayer Co-authored-by: vladki --- pkgs/development/node-packages/default.nix | 12 + .../node-packages/node-packages.json | 5 + .../node-packages/node-packages.nix | 5473 +++++++++++------ 3 files changed, 3543 insertions(+), 1947 deletions(-) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 4ef3de0bb4e..d7482e7c6b8 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -73,6 +73,18 @@ let nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.psc-package self.pulp ]; }); + makam = super.makam.override { + buildInputs = [ pkgs.nodejs pkgs.makeWrapper ]; + postFixup = '' + wrapProgram "$out/bin/makam" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nodejs ]} + ${ + if stdenv.isLinux + then "patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \"$out/lib/node_modules/makam/makam-bin-linux64\"" + else "" + } + ''; + }; + mirakurun = super.mirakurun.override rec { nativeBuildInputs = with pkgs; [ makeWrapper ]; postInstall = let diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 77b398caeec..6e98f2f1e52 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -18,6 +18,7 @@ , "browserify" , "castnow" , "clean-css-cli" +, "clubhouse-cli" , "coc-css" , "coc-emmet" , "coc-eslint" @@ -82,6 +83,7 @@ , "gitmoji-cli" , "graphql-cli" , "grunt-cli" +, "makam" , "gtop" , "gulp" , "gulp-cli" @@ -90,6 +92,7 @@ , "htmlhint" , "http-server" , "hueadm" +, "inliner" , "imapnotify" , "indium" , "insect" @@ -161,6 +164,7 @@ , "rollup" , { "rust-analyzer-build-deps": "../../misc/vscode-extensions/rust-analyzer/build-deps" } , "s3http" +, "sass" , "semver" , "serve" , "serverless" @@ -201,6 +205,7 @@ , "typescript" , "typescript-language-server" , "uglify-js" +, "undollar" , "ungit" , "vega-cli" , "vega-lite" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index fb747f7e8af..db3af84e3e9 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -22,13 +22,13 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.1001.4" = { + "@angular-devkit/architect-0.1001.7" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1001.4"; + version = "0.1001.7"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1001.4.tgz"; - sha512 = "0U/w+61vWxnEe9Ln/hNOH6O27FVcU+s/sbJAuPREbP875R4bQzK2PX0eYRlISzkDtQyw16GzlsikLWOoJ3vjTA=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1001.7.tgz"; + sha512 = "uFYIvMdewU44GbIyRfsUHNMLkx+C0kokpnj7eH5NbJfbyFpCfd3ijBHh+voPdPsDRWs9lLgjbxfHpswSPj4D8w=="; }; }; "@angular-devkit/core-10.0.7" = { @@ -40,13 +40,13 @@ let sha512 = "pXaZgsQ8LHpRx4QGAUYDE8GwBQLAtoqPh6oUCwRJwBExm5rl13OGPTBWewHiq0ysV/SnFXvOjxwAaHQvC1AgZw=="; }; }; - "@angular-devkit/core-10.1.4" = { + "@angular-devkit/core-10.1.7" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "10.1.4"; + version = "10.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.1.4.tgz"; - sha512 = "B1cwVcfChBvmEacydE2uqZ1UC2ez1G+KY0GyVnCQKpAb/DdfDgtaYjTx9JLvGQjE/BlVklEj8YCKDjVV0WPE5g=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.1.7.tgz"; + sha512 = "RRyDkN2FByA+nlnRx/MzUMK1FXwj7+SsrzJcvZfWx4yA5rfKmJiJryXQEzL44GL1aoaXSuvOYu3H72wxZADN8Q=="; }; }; "@angular-devkit/core-9.1.12" = { @@ -67,13 +67,13 @@ let sha512 = "eyyYPgpjtr3h7WbnNbkDubJ/p+8TgKU6abWd+NmBfTvyeHrpVFUYZabNRcdXwUDSVzfTQKdmLynIkESj/KROrg=="; }; }; - "@angular-devkit/schematics-10.1.4" = { + "@angular-devkit/schematics-10.1.7" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "10.1.4"; + version = "10.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.1.4.tgz"; - sha512 = "NIueJQYZ8OY3Yr3TGfxcGgP9ZGGsbtM7sa7sf9hSqxEAXdiGQdDJk5nChhtGtoGxUImterwqR8OiGmLcK5lg5g=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.1.7.tgz"; + sha512 = "nk9RXA09b+7uq59HS/gyztNzUGHH/eQAUQhWHdDYSCG6v1lhJVCKx1HgDPELVxmeq9f+HArkAW7Y7c+ccdNQ7A=="; }; }; "@angular-devkit/schematics-9.1.12" = { @@ -319,22 +319,22 @@ let sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g=="; }; }; - "@babel/compat-data-7.11.0" = { + "@babel/compat-data-7.12.0" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.11.0"; + version = "7.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz"; - sha512 = "TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.0.tgz"; + sha512 = "jAbCtMANC9ptXxbSVXIqV/3H0bkh7iyyv6JS5lu10av45bcc2QmDNJXkASZCFwbBt75Q0AEq/BB+bNa3x1QgYQ=="; }; }; - "@babel/core-7.11.6" = { + "@babel/core-7.12.0" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.11.6"; + version = "7.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.11.6.tgz"; - sha512 = "Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.12.0.tgz"; + sha512 = "iV7Gwg0DePKvdDZZWRTkj4MW+6/AbVWd4ZCg+zk8H1RVt5xBpUZS6vLQWwb3pyLg4BFTaGiQCPoJ4Ibmbne4fA=="; }; }; "@babel/core-7.9.0" = { @@ -355,6 +355,15 @@ let sha512 = "DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA=="; }; }; + "@babel/generator-7.12.0" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.0.tgz"; + sha512 = "8lnf4QcyiQMf5XQp47BltuMTocsOh6P0z/vueEh8GzhmWWlDbdvOoI5Ziddg0XYhmnx35HyByUW51/9NprF8cA=="; + }; + }; "@babel/helper-annotate-as-pure-7.10.4" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; @@ -382,40 +391,40 @@ let sha512 = "5nPcIZ7+KKDxT1427oBivl9V9YTal7qk0diccnh7RrcgrT/pGFOjgGw1dgryyx1GvHEpXVfoDF6Ak3rTiWh8Rg=="; }; }; - "@babel/helper-builder-react-jsx-experimental-7.11.5" = { + "@babel/helper-builder-react-jsx-experimental-7.12.0" = { name = "_at_babel_slash_helper-builder-react-jsx-experimental"; packageName = "@babel/helper-builder-react-jsx-experimental"; - version = "7.11.5"; + version = "7.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.11.5.tgz"; - sha512 = "Vc4aPJnRZKWfzeCBsqTBnzulVNjABVdahSPhtdMD3Vs80ykx4a87jTHtF/VR+alSrDmNvat7l13yrRHauGcHVw=="; + url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.0.tgz"; + sha512 = "AFzu6ib4i56olCtulkbIifcTay0O5tv8ZVK8hZMzrpu+YjsIDEcesF1DMqqTzV65clu3X61aE7qeHcJsY/gmnA=="; }; }; - "@babel/helper-compilation-targets-7.10.4" = { + "@babel/helper-compilation-targets-7.12.0" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.10.4"; + version = "7.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz"; - sha512 = "a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.0.tgz"; + sha512 = "NbDFJNjDgxE7IkrHp5gq2+Tr8bEdCLKYN90YDQEjMiTMUAFAcShNkaH8kydcmU0mEQTiQY0Ydy/+1xfS2OCEnw=="; }; }; - "@babel/helper-create-class-features-plugin-7.10.5" = { + "@babel/helper-create-class-features-plugin-7.12.0" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.10.5"; + version = "7.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz"; - sha512 = "0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.0.tgz"; + sha512 = "9tD1r9RK928vxvxcoNK8/7uwT7Q2DJZP1dnJmyMAJPwOF0yr8PPwqdpyw33lUpCfrJ765bOs5XNa4KSfUDWFSw=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.10.4" = { + "@babel/helper-create-regexp-features-plugin-7.12.0" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.10.4"; + version = "7.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz"; - sha512 = "2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.0.tgz"; + sha512 = "YBqH+3wLcom+tko8/JLgRcG8DMqORgmjqNRNI751gTioJSZHWFybO1mRoLtJtWIlYSHY+zT9LqqnbbK1c3KIVQ=="; }; }; "@babel/helper-define-map-7.10.5" = { @@ -463,13 +472,13 @@ let sha512 = "wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA=="; }; }; - "@babel/helper-member-expression-to-functions-7.11.0" = { + "@babel/helper-member-expression-to-functions-7.12.0" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.11.0"; + version = "7.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz"; - sha512 = "JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.0.tgz"; + sha512 = "I0d/bgzgzgLsJMk7UZ0TN2KV3OGjC/t/9Saz8PKb9jrcEAXhgjGysOgp4PDKydIKjUv/gj2St4ae+ov8l+T9Xg=="; }; }; "@babel/helper-module-imports-7.10.4" = { @@ -481,13 +490,13 @@ let sha512 = "nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw=="; }; }; - "@babel/helper-module-transforms-7.11.0" = { + "@babel/helper-module-transforms-7.12.0" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.11.0"; + version = "7.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz"; - sha512 = "02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.0.tgz"; + sha512 = "1ZTMoCiLSzTJLbq7mSaTHki4oIrBIf/dUbzdhwTrvtMU3ZNVKwQmGae3gSiqppo7G8HAgnXmc43rfEaD8yYLLQ=="; }; }; "@babel/helper-optimise-call-expression-7.10.4" = { @@ -526,13 +535,13 @@ let sha512 = "tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA=="; }; }; - "@babel/helper-replace-supers-7.10.4" = { + "@babel/helper-replace-supers-7.12.0" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.10.4"; + version = "7.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz"; - sha512 = "sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.0.tgz"; + sha512 = "9kycFdq2c9e7PXZOr2z/ZqTFF9OzFu287iFwYS+CiDVPuoTCfY8hoTsIqNQNetQjlqoRsRyJFrMG1uhGAR4EEw=="; }; }; "@babel/helper-simple-access-7.10.4" = { @@ -571,6 +580,15 @@ let sha512 = "3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw=="; }; }; + "@babel/helper-validator-option-7.12.0" = { + name = "_at_babel_slash_helper-validator-option"; + packageName = "@babel/helper-validator-option"; + version = "7.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.0.tgz"; + sha512 = "NRfKaAQw/JCMsTFUdJI6cp4MoJGGVBRQTRSiW1nwlGldNqzjB9jqWI0SZqQksC724dJoKqwG+QqfS9ib7SoVsw=="; + }; + }; "@babel/helper-wrap-function-7.10.4" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; @@ -598,13 +616,13 @@ let sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; }; }; - "@babel/parser-7.11.5" = { + "@babel/parser-7.12.0" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.11.5"; + version = "7.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz"; - sha512 = "X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.0.tgz"; + sha512 = "dYmySMYnlus2jwl7JnnajAj11obRStZoW9cG04wh4ZuhozDn11tDUrhHcUZ9iuNHqALAhh60XqNaYXpvuuE/Gg=="; }; }; "@babel/plugin-external-helpers-7.8.3" = { @@ -652,13 +670,13 @@ let sha512 = "G1l00VvDZ7Yk2yRlC5D8Ybvu3gmeHS3rCHoUYdjrqGYUtdeOBoRypnvDZ5KQqxyaiiGHWnVDeSEzA5F9ozItig=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.10.4" = { + "@babel/plugin-proposal-export-namespace-from-7.12.0" = { name = "_at_babel_slash_plugin-proposal-export-namespace-from"; packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.10.4"; + version = "7.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz"; - sha512 = "aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.0.tgz"; + sha512 = "ao43U2ptSe+mIZAQo2nBV5Wx2Ie3i2XbLt8jCXZpv+bvLY1Twv0lak4YZ1Ps5OwbeLMAl3iOVScgGMOImBae1g=="; }; }; "@babel/plugin-proposal-json-strings-7.10.4" = { @@ -670,31 +688,31 @@ let sha512 = "fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.11.0" = { + "@babel/plugin-proposal-logical-assignment-operators-7.12.0" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.11.0"; + version = "7.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz"; - sha512 = "/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.0.tgz"; + sha512 = "dssjXHzdMQal4q6GCSwDTVPEbyBLdd9+7aSlzAkQbrGEKq5xG8pvhQ7u2ktUrCLRmzQphZnSzILBL5ta4xSRlA=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.12.0" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.10.4"; + version = "7.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz"; - sha512 = "wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.0.tgz"; + sha512 = "JpNWix2VP2ue31r72fKytTE13nPX1fxl1mudfTaTwcDhl3iExz5NZjQBq012b/BQ6URWoc/onI73pZdYlAfihg=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.10.4" = { + "@babel/plugin-proposal-numeric-separator-7.12.0" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.10.4"; + version = "7.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz"; - sha512 = "73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.0.tgz"; + sha512 = "iON65YmIy/IpEgteYJ4HfO2q30SLdIxiyjNNlsSjSl0tUxLhSH9PljE5r6sczwdW64ZZzznYNcezdcROB+rDDw=="; }; }; "@babel/plugin-proposal-object-rest-spread-7.11.0" = { @@ -715,13 +733,13 @@ let sha512 = "LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.11.0" = { + "@babel/plugin-proposal-optional-chaining-7.12.0" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.11.0"; + version = "7.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz"; - sha512 = "v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.0.tgz"; + sha512 = "CXu9aw32FH/MksqdKvhpiH8pSvxnXJ33E7I7BGNE9VzNRpWgpNzvPpds/tW9E0pjmX9+D1zAHRyHbtyeTboo2g=="; }; }; "@babel/plugin-proposal-private-methods-7.10.4" = { @@ -1057,13 +1075,13 @@ let sha512 = "Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.10.5" = { + "@babel/plugin-transform-modules-systemjs-7.12.0" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.10.5"; + version = "7.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz"; - sha512 = "f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.0.tgz"; + sha512 = "h2fDMnwRwBiNMmTGAWqUo404Z3oLbrPE6hyATecyIbsEsrbM5gjLbfKQLb6hjiouMlGHH+yliYBbc4NPgWKE/g=="; }; }; "@babel/plugin-transform-modules-umd-7.10.4" = { @@ -1174,13 +1192,13 @@ let sha512 = "hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ=="; }; }; - "@babel/plugin-transform-runtime-7.11.5" = { + "@babel/plugin-transform-runtime-7.12.0" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.11.5"; + version = "7.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.11.5.tgz"; - sha512 = "9aIoee+EhjySZ6vY5hnLjigHzunBlscx9ANKutkeWTJTx6m5Rbq6Ic01tLvO54lSusR+BxV7u4UDdCmXv5aagg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.0.tgz"; + sha512 = "BC8wiTo+0kEG8M6wuEBeuG7AIazTan02/Bh4dgi+wdDBE+p2iv5AXO8OUjrwD100223S/2WbALSqj7c290XTKg=="; }; }; "@babel/plugin-transform-shorthand-properties-7.10.4" = { @@ -1228,13 +1246,13 @@ let sha512 = "QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA=="; }; }; - "@babel/plugin-transform-typescript-7.11.0" = { + "@babel/plugin-transform-typescript-7.12.0" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.11.0"; + version = "7.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.11.0.tgz"; - sha512 = "edJsNzTtvb3MaXQwj8403B7mZoGu9ElDJQZOKjGUnvilquxBA3IQoEIOvkX/1O8xfAsnHS/oQhe2w/IXrr+w0w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.0.tgz"; + sha512 = "gahRNAWgE76hjI3TZPVEfV7vGjOCJi5ACd4eSoAItk/ErC114i2UHnk+1ScS2dOour0p6J6kB99hNFX2vzL2Ww=="; }; }; "@babel/plugin-transform-unicode-escapes-7.10.4" = { @@ -1264,13 +1282,13 @@ let sha512 = "FunXnE0Sgpd61pKSj2OSOs1D44rKTD3pGOfGilZ6LGrrIH0QEtJlTjqOqdF8Bs98JmjfGhni2BBkTfv9KcKJ9g=="; }; }; - "@babel/preset-env-7.11.5" = { + "@babel/preset-env-7.12.0" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.11.5"; + version = "7.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.5.tgz"; - sha512 = "kXqmW1jVcnB2cdueV+fyBM8estd5mlNfaQi6lwLgRwCby4edpavgbFhiBNjmWA3JpB/yZGSISa7Srf+TwxDQoA=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.0.tgz"; + sha512 = "jSIHvHSuF+hBUIrvA2/61yIzhH+ceLOXGLTH1nwPvQlso/lNxXsoE/nvrCzY5M77KRzhKegB1CvdhWPZmYDZ5A=="; }; }; "@babel/preset-flow-7.10.4" = { @@ -1300,22 +1318,22 @@ let sha512 = "dStnEQgejNYIHFNACdDCigK4BF7wgW6Zahv9Dc2un7rGjbeVtZhBfR3sy0I7ZJOhBexkFxVdMZ5hqmll7BFShw=="; }; }; - "@babel/preset-typescript-7.10.4" = { + "@babel/preset-typescript-7.12.0" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.10.4"; + version = "7.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.10.4.tgz"; - sha512 = "SdYnvGPv+bLlwkF2VkJnaX/ni1sMNetcGI1+nThF1gyv6Ph8Qucc4ZZAjM5yZcE/AKRXIOTZz7eSRDWOEjPyRQ=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.12.0.tgz"; + sha512 = "2XVy4sy/zkP4gqmXW0TzSh/QwOniN2Cy3srhsD0TRBlMTOmjaYnWCWA6aWopwpcwfYkEKD6jKLLjYMq15zDNWg=="; }; }; - "@babel/register-7.11.5" = { + "@babel/register-7.12.0" = { name = "_at_babel_slash_register"; packageName = "@babel/register"; - version = "7.11.5"; + version = "7.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.11.5.tgz"; - sha512 = "CAml0ioKX+kOAvBQDHa/+t1fgOt3qkTIz0TrRtRAT6XY0m5qYZXR85k6/sLCNPMGhYDlCFHCYuU0ybTJbvlC6w=="; + url = "https://registry.npmjs.org/@babel/register/-/register-7.12.0.tgz"; + sha512 = "2F2v0qYSAwrGyK9mZ8lIoUluHRzLTgkJ2oRXlLV9GVe/ze/sTFBiOocLRMSJYDB2lLiABlVC+pZHlZ8qihO1Xg=="; }; }; "@babel/runtime-7.11.2" = { @@ -1327,6 +1345,15 @@ let sha512 = "TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw=="; }; }; + "@babel/runtime-7.12.0" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.0.tgz"; + sha512 = "lS4QLXQ2Vbw2ubfQjeQcn+BZgZ5+ROHW9f+DWjEp5Y+NHYmkRGKqHSJ1tuhbUauKu2nhZNTBIvsIQ8dXfY5Gjw=="; + }; + }; "@babel/runtime-7.9.0" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; @@ -1345,13 +1372,13 @@ let sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA=="; }; }; - "@babel/traverse-7.11.5" = { + "@babel/traverse-7.12.0" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.11.5"; + version = "7.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz"; - sha512 = "EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.0.tgz"; + sha512 = "ZU9e79xpOukCNPkQ1UzR4gJKCruGckr6edd8v8lmKpSk8iakgUIvb+5ZtaKKV9f7O+x5r+xbMDDIbzVpUoiIuw=="; }; }; "@babel/types-7.10.4" = { @@ -1363,13 +1390,13 @@ let sha512 = "UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg=="; }; }; - "@babel/types-7.11.5" = { + "@babel/types-7.12.0" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.11.5"; + version = "7.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz"; - sha512 = "bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.12.0.tgz"; + sha512 = "ggIyFmT2zMaYRheOfPDQ4gz7QqV3B+t2rjqjbttDJxMcb7/LukvWCmlIl1sWcOxrvwpTDd+z0OytzqsbGeb3/g=="; }; }; "@bugsnag/browser-7.4.0" = { @@ -1678,13 +1705,13 @@ let sha512 = "EI552lf0aG2nOV8NnZpTxNo2PcXKPmDbF9K8eCBFQdIZwHNGN/mi815fxtmUMa2wTa1yndotICIDt/V0vpEx2w=="; }; }; - "@exodus/schemasafe-1.0.0-rc.2" = { + "@exodus/schemasafe-1.0.0-rc.3" = { name = "_at_exodus_slash_schemasafe"; packageName = "@exodus/schemasafe"; - version = "1.0.0-rc.2"; + version = "1.0.0-rc.3"; src = fetchurl { - url = "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.0.0-rc.2.tgz"; - sha512 = "W98NvvOe/Med3o66xTO03pd7a2omZebH79PV64gSE+ceDdU8uxQhFTa7ISiD1kseyqyOrMyW5/MNdsGEU02i3Q=="; + url = "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.0.0-rc.3.tgz"; + sha512 = "GoXw0U2Qaa33m3eUcxuHnHpNvHjNlLo0gtV091XBpaRINaB4X6FGCG5XKxSFNFiPpugUDqNruHzaqpTdDm4AOg=="; }; }; "@expo/babel-preset-cli-0.2.18" = { @@ -1705,13 +1732,13 @@ let sha512 = "fQRc4+RG+rEw1IdjFx/5t2AvOlJT8ktv2dfObD3aW838ohZxCx1QvFUY/Gdx5JA1JY/KrHRGuEqQLH9ayiexyg=="; }; }; - "@expo/config-3.3.9" = { + "@expo/config-3.3.10" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "3.3.9"; + version = "3.3.10"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-3.3.9.tgz"; - sha512 = "AeM7CNUsvG0tN4vKwdcqQjl0x8nyYS2Xcao+9HWQf30+V2Kt2qAy5RjZUElR/H7sWapluudRjiyLQ7/ThgXTuQ=="; + url = "https://registry.npmjs.org/@expo/config/-/config-3.3.10.tgz"; + sha512 = "+ZBOWaIgBhrNKds93pGFQzXAHxu7uqCYyIZsg7EBKFc1gV2TRxwHUKnuespdEQANx6PrshNVzfC95Kbd4jIBPA=="; }; }; "@expo/config-types-40.0.0-beta.1" = { @@ -1732,31 +1759,31 @@ let sha512 = "6n7ji1WKDCdLe2Mto4u4W72kTLhAbhXhC7ydVk1HxDYCcbewNLfgiwhchPtPGyUMnSDizVWph5aDoiKxqVHqNQ=="; }; }; - "@expo/dev-server-0.1.34" = { + "@expo/dev-server-0.1.35" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.34"; + version = "0.1.35"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.34.tgz"; - sha512 = "tBvir/IZ2Zhvz6WZpDEhEHGg3p6fwG4eB+b46e1wtJX6YkZ5mReaWlJOnorfOmm80RgugLZEqHAy+YJOYPP+1Q=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.35.tgz"; + sha512 = "QiOKOQf7IrgXjQPISO0wwncHSLwrtwGg5FC5ewfHbrJSV7KdZXNZT30uWinOVz5by5BB4z0lKXy5E8jIfonc5w=="; }; }; - "@expo/dev-tools-0.13.52" = { + "@expo/dev-tools-0.13.53" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.52"; + version = "0.13.53"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.52.tgz"; - sha512 = "SicYMGGsHIEpvC6yy8lj+wvtOiDrAwQQwW1rKz+9cJi27Z1CmTM7Ke5I82J4h/dmRE17kiEpb7gnBBubLxlqUQ=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.53.tgz"; + sha512 = "vDEnu4cy6pxq6ra7UsB2+Qa8s1M3eF+jUFuvlTcdqJL3tlxbh3WXn63+ZKZWv9TjUdzc0vFx50N/ywBn9S9DoQ=="; }; }; - "@expo/eas-build-job-0.1.0" = { + "@expo/eas-build-job-0.1.1" = { name = "_at_expo_slash_eas-build-job"; packageName = "@expo/eas-build-job"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-0.1.0.tgz"; - sha512 = "yoJhhpc1GSP7l65pIIY9kc/IlvJKgQJ9SyUHl0QCu96DCHqCp51OEKaTBy0J+wxQ/7UKbQ8YvHbtYxwKrUR7nw=="; + url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-0.1.1.tgz"; + sha512 = "V5zrRdz6qa45Aflh84CmsEyNcNHG95O7dyzQqpzEI73phB+Jr7ffM+AP0f3+POjy6mwNXIKHgbzH8VG3excPpA=="; }; }; "@expo/image-utils-0.3.7" = { @@ -1777,13 +1804,13 @@ let sha512 = "i34lfcMVt5Wv2Cf5apZUj3o9JlFt8WOPSZjrECryunBQ9/BsQQYY5NHgGjhhZnnRE+6JFf0CPQTjXdoQ1w3w0w=="; }; }; - "@expo/metro-config-0.1.34" = { + "@expo/metro-config-0.1.35" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.1.34"; + version = "0.1.35"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.34.tgz"; - sha512 = "jmUb0UVM53hu17PqSmayCFEuq3R6X2/inlXiUO9v+9jlcmusaJqe9Nh/M6SYgmy+hDlx6cwgR9MNlpvWfIE1kw=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.35.tgz"; + sha512 = "aGAVNXtCMOEVVytOvE0WiuxXT491v0NV+tcZ2+WZC2DBmulor+G+n61Er+4OL0Ke7uXfMk6CLXJA76ZYkBvW/w=="; }; }; "@expo/ngrok-2.4.3" = { @@ -1984,22 +2011,22 @@ let sha512 = "YaFAYYOOxImYNx9s6X3tY6fC1y6rka0KXstrs2zrS+vHyyBD8IOhNtIUvybHScM3jUL+qukgKElAb+7gzlF6Eg=="; }; }; - "@expo/webpack-config-0.12.38" = { + "@expo/webpack-config-0.12.39" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.12.38"; + version = "0.12.39"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.38.tgz"; - sha512 = "WUuzeubJPcHW/Qs7Ano8k2ZDqoe8h13IosWywGlyVPqMMgzT75qK2SStqhsPV3nUnnZ5owWhFSYQey8nNrFKFg=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.39.tgz"; + sha512 = "I2mqVwjjXR8/DAfqzSYwwIrDfnzTEok6dqsJa3D19Du8S0sPv6MjHrbS/U+UCUnR+ccu8j8lb/ovN3RZzUIwVw=="; }; }; - "@expo/xdl-58.0.13" = { + "@expo/xdl-58.0.14" = { name = "_at_expo_slash_xdl"; packageName = "@expo/xdl"; - version = "58.0.13"; + version = "58.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/xdl/-/xdl-58.0.13.tgz"; - sha512 = "ToCCTrj8NeupX0e9tpBtbZsESHlIEKbpRNU5IUy/2IKD9No5DXGxHG/FDsbEz595gawDzTv4isdzbOOulCoUcQ=="; + url = "https://registry.npmjs.org/@expo/xdl/-/xdl-58.0.14.tgz"; + sha512 = "CCVg/+Ys8ZI42oESDD2I2KNQWw35+qjltQaY1AyVSV7ZQRbqfViy+vjpDlBuKLre+iUFmHMI5cP1HvS7dc7NPg=="; }; }; "@fluentui/date-time-utilities-7.9.0" = { @@ -2029,22 +2056,22 @@ let sha512 = "t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ=="; }; }; - "@fluentui/react-7.145.0" = { + "@fluentui/react-7.146.2" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.145.0"; + version = "7.146.2"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.145.0.tgz"; - sha512 = "RNYTWwRQhIFKoMHmDkMLF48KcH91brHV/WXCEboIxsmtHm4HyYVG4Zpjib6UG2XOS1zk9sBefHao/zTx3pdG8Q=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.146.2.tgz"; + sha512 = "Xwf+946dC5bhexmStIrSeLSimcEmhmIMrKF/C1bw701j2OwJTW+NbJO2PYPuUCbykOBKE6igNFbYKlFydjnLYw=="; }; }; - "@fluentui/react-focus-7.16.10" = { + "@fluentui/react-focus-7.16.12" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "7.16.10"; + version = "7.16.12"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.10.tgz"; - sha512 = "+4aP36KjD2RrijRBr6aPYNiBm9M9+33DOHpAdcE0K93TToLIlQ/WIwZGDNbM/6dPFD6vgUj+ya5rvfy6sbibjw=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.12.tgz"; + sha512 = "i8UYrysWU6T3mVqYdGyjpNpZ9OXNKu8+hyRHie29d3r1HKmt01Sy7wBbOlGqqkozuVAC5XcqPbXhgrQabc1ZtA=="; }; }; "@fluentui/react-window-provider-0.3.3" = { @@ -2056,13 +2083,13 @@ let sha512 = "MVPf2hqOQ17LAZsuvGcr3oOHksAskUm+fCYdXFhbVoAgsCDVTIuH6i8XgHFd6YjBtzjZmI4+k/3NTQfDqBX8EQ=="; }; }; - "@fluentui/theme-1.3.0" = { + "@fluentui/theme-1.5.0" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "1.3.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.3.0.tgz"; - sha512 = "OVN3yPdJShOGhTakalI5DC9+8myOhLPKzY/ZlICnNoKhh7cbPVrvdCnv2fLcDyZYMQg0CnB3oAaghBHiIW3jmA=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.5.0.tgz"; + sha512 = "44/1JAnFxuXt8ZfVa3VXdDOvzcdXYA0DbGrRLDMFa8ZiQMhcN6/Y5mUwBRPEuE3sLkGHL39hQ0Vw3EVeH7TYlg=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -3280,13 +3307,13 @@ let sha512 = "RibeMnDPvlL8bFYW5C8cs4mbI3AHfQef73tnJCQ/SgrXZHehmHnsyWUiE7qDQCAo+B1RfTapvSyFF69iPj326A=="; }; }; - "@microsoft/load-themed-styles-1.10.108" = { + "@microsoft/load-themed-styles-1.10.113" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.108"; + version = "1.10.113"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.108.tgz"; - sha512 = "ETEADhZJwttKGPABitB7lDD/22ULL8AG1SKrn9uhYxjF1w1IaS6YS/yCPlDVALeh20zF8LJEEZ2MGb7DgVVYUw=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.113.tgz"; + sha512 = "33AgF552U+tpwavHsMEY6E196p4kBopTRLndctbO0jxbAC0qU43qYPt7kMqVSBPSZjEA1dGveHNKUhoIFfZqwQ=="; }; }; "@mrmlnc/readdir-enhanced-2.2.1" = { @@ -3325,13 +3352,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-4.8.3" = { + "@netlify/build-5.0.1" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "4.8.3"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-4.8.3.tgz"; - sha512 = "5n/AF34wJIvDLjceB6mlviooF6l3ptgw/h5Y1MTpvmpW5bLv9DiVkPC0pyjlBC5EThmd4gwNmjwybATs24b61w=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-5.0.1.tgz"; + sha512 = "k6Lo9HkYXFSi3iZxSjPa7LJvF9Pb52R3+nZE83X8nhIiATdg8y08XOlvqfNGzS48eL6w2iDECUTi+nNfpSJdyw=="; }; }; "@netlify/cache-utils-1.0.3" = { @@ -3352,13 +3379,13 @@ let sha512 = "Z7yzbx5qCX2I5RLlNyo0MMQ6GKJc8o5Nej9yspCavjqgYlUS7VJfbeE67WNxC26FXwDUqq00zJ0MrCS0Un1YOw=="; }; }; - "@netlify/config-2.3.2" = { + "@netlify/config-2.3.3" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-2.3.2.tgz"; - sha512 = "Y0ClAW+EgtbyMae/D1v2JZSIfWMniA7oRgrjkYULYPWdZnLwVsp+3akJ15b6fp79p0vPBZAzHdwJzo8QMuzD8g=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-2.3.3.tgz"; + sha512 = "ir04B74xZZ8knthHk8nUfRbJaBNC0p7uuiHmWNOJejlhn43p0rCxZ1+NRrO+Nrt0cIuhnUjrmmNn9U/69eUZ4A=="; }; }; "@netlify/functions-utils-1.2.9" = { @@ -3370,22 +3397,22 @@ let sha512 = "1iMgfIMDy38ip7hAZd644BJ7he641xeGyG7MkPZtuxESfYfS6IrWiPNMu1NcVsNytXFLIFVg4m8LD6IBSiz1EQ=="; }; }; - "@netlify/git-utils-1.0.2" = { + "@netlify/git-utils-1.0.3" = { name = "_at_netlify_slash_git-utils"; packageName = "@netlify/git-utils"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-1.0.2.tgz"; - sha512 = "rqaCUHlJFYwvcCL8l+wp/YMhGkuXo2ceEf9fpHCN8GFOlU3kSu0NLRlKFohIFk1pdrymG1D3M7Pt+s62EKLjwA=="; + url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-1.0.3.tgz"; + sha512 = "DVrYCGQnqUc7hpeuWgdXgbgrNZjcuT22X6ymhMFYmwO9NS2RI8zWCiEpvA7IsTx38adyJUErH6KXkBomDB0tGg=="; }; }; - "@netlify/open-api-0.18.0" = { + "@netlify/open-api-0.18.1" = { name = "_at_netlify_slash_open-api"; packageName = "@netlify/open-api"; - version = "0.18.0"; + version = "0.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-0.18.0.tgz"; - sha512 = "2pgw9SngxtxNcg0g4OJzhHRWmXE/sGpjBn0KfeyKH6kyrY4a3XcKwIZLKuxVLuHxgkpdoBbsFlJBTlsj61g8Dw=="; + url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-0.18.1.tgz"; + sha512 = "kkRCzA71HugJxmPOcWv2B4ArHhSMKjs2ArGBr10ndocVLdAHwCYoJm0X4Xt8IYaOcGD9Lm4fbLjpXDLDRGDzPw=="; }; }; "@netlify/plugin-edge-handlers-1.8.0" = { @@ -3397,13 +3424,13 @@ let sha512 = "eOU3P8GgRSMKXZWBxMeLZYX3UUwq/w5Hn6BiUyroJ57UkxHFzMsIcsIryt/KW5vKEiLo/pvYZyU0S4WVcbHbWA=="; }; }; - "@netlify/run-utils-1.0.1" = { + "@netlify/run-utils-1.0.2" = { name = "_at_netlify_slash_run-utils"; packageName = "@netlify/run-utils"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/run-utils/-/run-utils-1.0.1.tgz"; - sha512 = "fx0A9xVgFQXjZ/uZCa4XtlaO7mPgwhanVHwQAcBDGOwps8fhuaVITCcPy/kPv+igOimvqWzOD3x/F0OrsXGpBw=="; + url = "https://registry.npmjs.org/@netlify/run-utils/-/run-utils-1.0.2.tgz"; + sha512 = "L3WKcTIYUilmRSMW+kFQDlo1kIa5fkLVbrmXAjqmCHpHSdY442vbdDwOnrRcJ0tqeR4QIw/ePVyE48Mk4E86Eg=="; }; }; "@netlify/zip-it-and-ship-it-1.3.12" = { @@ -3415,58 +3442,58 @@ let sha512 = "FQM/59HXMAKp9k4z6rXDA/FBKFSUaU3n5SFpF2/jScmpCmHBpF+pYIWZmVB4fY17cvq3KIcuSfzf9PqD1B73XQ=="; }; }; - "@node-red/editor-api-1.1.3" = { + "@node-red/editor-api-1.2.0" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.1.3.tgz"; - sha512 = "NejrCeQSPwvIaxxEiwOnU25Ylnu4ZEtumIIy2mWLd0IojE6HXDBGhAqfxtksIyg6TnrqKsID/JxK0mLgTs/npQ=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.0.tgz"; + sha512 = "UXod74Sz08F02LufFacZbomj9MoxeurmUTMm3gHuoob3d06lI4pwnK8y9Med6I6ZeKypA+rWxyyzS47iau8BTw=="; }; }; - "@node-red/editor-client-1.1.3" = { + "@node-red/editor-client-1.2.0" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.1.3.tgz"; - sha512 = "oMVij+p/+RyRVOBSfvv2nt4pmurOOGH+KQglWVN3jiWs2D4mUXgsBfg/mbHn4wtvEBYtKFOQacXL7N22WES02g=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.0.tgz"; + sha512 = "hB8MEwQ9+/NP92Tw40eoZBxB7YSWnKJieh4vLsBS++NP740soenEGAZCFN1xVKWtvRStqEQpF8sXzD4v+Lw85Q=="; }; }; - "@node-red/nodes-1.1.3" = { + "@node-red/nodes-1.2.0" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.1.3.tgz"; - sha512 = "XAMSiQrBPqpG7/XZqquZ5V1F/ibaDr/e96BrforFfkVGdzeb/5I+/MI2bSl3s/pJiuj4CuKSkQ7gWKbNwa4mvQ=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.0.tgz"; + sha512 = "bIPavHnIWeaZhJ9GCR3xH+K51jj0IyMvfsQrk1A3F1y6LO3x8/t+7oMcXuJIlqgnsbb7ZEC316+YvHAwEM8R7Q=="; }; }; - "@node-red/registry-1.1.3" = { + "@node-red/registry-1.2.0" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.1.3.tgz"; - sha512 = "ULvrgC7fpClTHluiQcc4EptaYRPEoKdqfozSxL6XJW5x1BRNU9Iv7+5txhKoumcy7a54bavol32VA7/JRyewjg=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.0.tgz"; + sha512 = "hTJTdU7Zk9nQe2jCDr3eEv9u0g+er2t7fk2eiMmWTwWwrX+xDZuWYvzbXyCx0d/WPrrT8zS2gINZdlfnSIUaBQ=="; }; }; - "@node-red/runtime-1.1.3" = { + "@node-red/runtime-1.2.0" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.1.3.tgz"; - sha512 = "tJWPDPCFmp2sB+YZaLtPHOuuwNXQdQ15tizz1vL9i0S+0VVXE8SX2WhBzbsBxSitpNxQ6zTfq8bK28Zh75HCVg=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.0.tgz"; + sha512 = "1GgqSrGOa2RNArRPwmT9G1OIwfySGfiAgUadu8EEEO/TMWycmcPMYTEcKt3BlfS4MTZd13yxwPyXrjsV4VGUug=="; }; }; - "@node-red/util-1.1.3" = { + "@node-red/util-1.2.0" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-1.1.3.tgz"; - sha512 = "Wa/L2bFRK9dR8K1zGlhp3Z9tqZgHsKaSK329YQGRIvAApbH5G//58V1oJdj3+9Gg8xza5YXx4Cw9hHs2m1du6A=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.0.tgz"; + sha512 = "cREGi9XT9sLdsPZ1Ncflk5+RfAb0BUeplIlAZSyjO9MDG/IPky5hPupKglo/efez090vSfvSsu8YGkHS4lUBZQ=="; }; }; "@nodelib/fs.scandir-2.1.3" = { @@ -3667,6 +3694,15 @@ let sha512 = "sq31nJk/n5pH5qGDioj2Z9x6MlRUrc/kkQrfCYKRPbQM80qewSP4RcPK3/gDvDSOAWD3wLAK9oMbDQO9lqImMA=="; }; }; + "@oclif/plugin-plugins-1.9.1" = { + name = "_at_oclif_slash_plugin-plugins"; + packageName = "@oclif/plugin-plugins"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/plugin-plugins/-/plugin-plugins-1.9.1.tgz"; + sha512 = "/lE644CeLZ9ZNpDzHTKSadUtHjo86CbKZBazJiBEeH3LAzf90AeiX447slVByGIAHOglvPgWLKaTUGuWdF/iwQ=="; + }; + }; "@oclif/plugin-warn-if-update-available-1.7.0" = { name = "_at_oclif_slash_plugin-warn-if-update-available"; packageName = "@oclif/plugin-warn-if-update-available"; @@ -4162,13 +4198,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-10.1.4" = { + "@schematics/angular-10.1.7" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "10.1.4"; + version = "10.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.1.4.tgz"; - sha512 = "MWxyrKEiXqNCZ0Uh3zM/iWouQTOWalGy2gFn6Fx6UBgm7nPYgeXoX7wYiCAKIryoehaOFfs/Pw3zfCGgp/gUOw=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.1.7.tgz"; + sha512 = "jcyLWDSbpgHvB/BNVSsV4uLJpC2qRx9Z5+rcQpBB1BerqIPS/1cTQg7TViHZtcqnZqWvzHR3jfqzDUSOCZpuJQ=="; }; }; "@schematics/schematics-0.1000.7" = { @@ -4180,13 +4216,13 @@ let sha512 = "mucBf5EkhME9O0TvxPeiUTEuudRvEOSjhF/YFHEp/9NZB1JH9lXtBQ60IN6xtCLEbxJmAzhZSns9QPPrHaZRrw=="; }; }; - "@schematics/update-0.1001.4" = { + "@schematics/update-0.1001.7" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.1001.4"; + version = "0.1001.7"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.1001.4.tgz"; - sha512 = "E2xIPWQoHgv+CRAYWV0LSNoa8JmOcgyxlrQvn44f6A80ySNDyrfcRP8VNzpk1UnGkBcjwEVhYeLuY+F0aguC3g=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.1001.7.tgz"; + sha512 = "q7g/9YaAiqyWxYmUXiSWxB9xwc30xL5iUWY3Rp2LXSH6ihaRsLabmNr743R2YQmMj2Ss+9OhILHmj7nMmqODgw=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -4216,13 +4252,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.2.1" = { + "@serverless/components-3.2.2" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.2.1.tgz"; - sha512 = "ZINkDIPxW2PTKzNUpB4pqYafZ5j4X7Ijn3PAKDEeguQ91tkz2YDxzbqlws/Yld/87Bpi1iLxEk5mct8QXtbEJQ=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.2.2.tgz"; + sha512 = "425Oq3GvbmyJGRGdAn8ylbBYuIQbLZdV5R+aXAN4zBUPTnKp9YgEp8o3F7rxa4M/G8pFAgKpOZxml2fZunCYdA=="; }; }; "@serverless/core-1.1.2" = { @@ -4234,13 +4270,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-4.0.4" = { + "@serverless/enterprise-plugin-4.1.0" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "4.0.4"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.0.4.tgz"; - sha512 = "B+I1tZWWJN2Ziwp34FZ9umbu6cZ5Pv8lHA6iOtYzMqq6r22xF/9rwxY3fCdguo+Szd6t7RFb0zIW2RuBRgktVA=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.1.0.tgz"; + sha512 = "Embav2Ml3gCGgP24AnrvzKsIS1drLWC6p0VEcMo/TQ51x3+GXL/Kadxj8rsQL5kz3+YaLzVKM5KtiDmPdO4Lww=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -4261,13 +4297,22 @@ let sha512 = "fOBden8RBdu4Ms0jAAk3QKU3h5O34B+GjjfKUKVO8wUMR+oV3bDb2ovICxQkppn+Gzp8iM8z1T6Tv5dSd+ebRg=="; }; }; - "@serverless/platform-client-china-2.0.0" = { + "@serverless/platform-client-3.1.2" = { + name = "_at_serverless_slash_platform-client"; + packageName = "@serverless/platform-client"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-3.1.2.tgz"; + sha512 = "zTJBhzjWtDBogLFnzoz6NYiQ6CThsxuvHQxSbBLcNK4+VQPIkrZOxaQ+dNCNLeLN1Tb3NnZDPNGkoThvgGwq3Q=="; + }; + }; + "@serverless/platform-client-china-2.0.3" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "2.0.0"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.0.0.tgz"; - sha512 = "9COIKr8TPUM/d8zWgNKYhZWzrL5W56cGJubLii+0Uh+4UzSpZpHdSWpg1TFgG1Gmlqwbfg2OMD8sl8a4EBxjZg=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.0.3.tgz"; + sha512 = "QTgZTDmnWI++GHtJfpjrfsXvsqMmIDcvXM4lDLEiu5FqvA/oZ+QlhGfZab8Dd6MGsKIgByMwATK7w6Or3Da3dQ=="; }; }; "@serverless/platform-sdk-2.3.2" = { @@ -4306,13 +4351,13 @@ let sha512 = "yZQT2f8LIZZlH2ibAIvK4C/Ks72Y8CIWmGz04XGCLPHa/ANA6KqlXTKV6zWg/n1PDy2yj2zgX+m509VpIZuDeQ=="; }; }; - "@serverless/utils-china-1.0.2" = { + "@serverless/utils-china-1.0.3" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.0.2.tgz"; - sha512 = "XDrn76CUNd+GPrfD4O02XDbXHz+X+XZ9fLfksJzTTQ6OahUhxfBqbvkHTJQGgW3yRKrnoO+cjI3zKkDjePB9xw=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.0.3.tgz"; + sha512 = "UnbC436+hpJHTLEbbcxZvURUKIu9E8fNDIELzbgxYruYrLEvun/Np3Lmnhdhu6ucDh3ulNkm2A7GLgnASzyPtg=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -4423,13 +4468,13 @@ let sha512 = "h3MMhjVm3BuIruwpDBqnMowKOG9viwr3TJHdIxTHulWKWSsPTTW1AAP3/RaK+UBp1y/Ua9yzeHncKIrzBdT5Nw=="; }; }; - "@snyk/docker-registry-v2-client-1.13.5" = { + "@snyk/docker-registry-v2-client-1.13.6" = { name = "_at_snyk_slash_docker-registry-v2-client"; packageName = "@snyk/docker-registry-v2-client"; - version = "1.13.5"; + version = "1.13.6"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-1.13.5.tgz"; - sha512 = "lgJiC071abCpFVLp47OnykU8MMrhdQe386Wt6QaDmjI0s2DQn/S58NfdLrPU7s6l4zoGT7UwRW9+7paozRgFTA=="; + url = "https://registry.npmjs.org/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-1.13.6.tgz"; + sha512 = "upbnvJOIDuoRgDhG9xBVM3QmyE/NRwlTTHMj1T5Tlfr1nrasVWTVqKmgXEc9RSfL1zlLmyUudGK2fVNgi2wdEg=="; }; }; "@snyk/gemfile-1.2.0" = { @@ -4450,13 +4495,22 @@ let sha512 = "bHbBR7NKCxLPxlsSdJ2pn2gBSfguBr9SAdo/2re9bEvHO/0hTefQiS0h/EJ4OpMCJbPyUN1BW4eaFq00MzgMtA=="; }; }; - "@snyk/rpm-parser-2.0.0" = { + "@snyk/java-call-graph-builder-1.16.1" = { + name = "_at_snyk_slash_java-call-graph-builder"; + packageName = "@snyk/java-call-graph-builder"; + version = "1.16.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.16.1.tgz"; + sha512 = "rxvSS9sz5h6fNjvUG6NhqYpUI8eok+xLTzLShfnSuDllI3JLxPMc/f7EKv5mv3GLlh1sVCCVXYeyIw3RAg5xQg=="; + }; + }; + "@snyk/rpm-parser-2.2.0" = { name = "_at_snyk_slash_rpm-parser"; packageName = "@snyk/rpm-parser"; - version = "2.0.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/rpm-parser/-/rpm-parser-2.0.0.tgz"; - sha512 = "bWjQY5Xk3TcfVpeo8M5BhhSUEdPr2P19AWW13CHPu6sFZkckLWEcjQycnBsVD6RBmxGXecJ1YNui8dq6soHoYQ=="; + url = "https://registry.npmjs.org/@snyk/rpm-parser/-/rpm-parser-2.2.0.tgz"; + sha512 = "aAZaMgmmXZ4hzSRwrpUA2nkAokU+R4ZmaUvVSL4lCyKvt1Bf08b6OLBhJ/z1iJHNsk9IPmzcHr56GUlJX0KeTA=="; }; }; "@snyk/snyk-cocoapods-plugin-2.5.1" = { @@ -4612,13 +4666,13 @@ let sha512 = "PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ=="; }; }; - "@tencent-sdk/capi-1.1.4" = { + "@tencent-sdk/capi-1.1.5" = { name = "_at_tencent-sdk_slash_capi"; packageName = "@tencent-sdk/capi"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@tencent-sdk/capi/-/capi-1.1.4.tgz"; - sha512 = "hFOtXQ8R4vsJkdmavzFwzaD9bbTOmfBJtc48zOQjmHW72E5FilFxhhuGMk45lr9lwEyXd/kYTk8hJDLz+aHCKA=="; + url = "https://registry.npmjs.org/@tencent-sdk/capi/-/capi-1.1.5.tgz"; + sha512 = "cHkoMY/1L5VxeiKv51uKxbFK8lZ7pZbY3CukzOHro8YKT6dETKYzTGO/F8jDhH7r8vKWxuA+ZcALzxYuVlmwsg=="; }; }; "@textlint/ast-node-types-4.3.4" = { @@ -4918,13 +4972,13 @@ let sha512 = "P1bffQfhD3O4LW0ioENXUhZ9OIa0Zn+P7M+pWgkCKaT53wVLSq0mrKksCID/FGHpFhRSxRGhgrQmfhRuzwtKdg=="; }; }; - "@types/cookiejar-2.1.1" = { + "@types/cookiejar-2.1.2" = { name = "_at_types_slash_cookiejar"; packageName = "@types/cookiejar"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.1.tgz"; - sha512 = "aRnpPa7ysx3aNW60hTiCtLHlQaIFsXFCgQlpakNgDNVFzbtusSY8PwjAQgRWfSk0ekNoBjO51eQRB6upA9uuyw=="; + url = "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.2.tgz"; + sha512 = "t73xJJrvdTjXrn4jLS9VSGRbz0nUY3cl2DMGDU48lKl+HR9dbbjW2A9r3g40VA++mQpy6uuHg33gy7du2BKpog=="; }; }; "@types/cookies-0.7.4" = { @@ -4999,6 +5053,24 @@ let sha512 = "98rXVukLD6/ozrQ2O80NAlWDGA4INg+tqsEReWJldqyi2fulC9V7Use/n28SWgROXKm6003ycWV4gZHoF8GA6w=="; }; }; + "@types/eslint-7.2.4" = { + name = "_at_types_slash_eslint"; + packageName = "@types/eslint"; + version = "7.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.4.tgz"; + sha512 = "YCY4kzHMsHoyKspQH+nwSe+70Kep7Vjt2X+dZe5Vs2vkRudqtoFoUIv1RlJmZB8Hbp7McneupoZij4PadxsK5Q=="; + }; + }; + "@types/eslint-scope-3.7.0" = { + name = "_at_types_slash_eslint-scope"; + packageName = "@types/eslint-scope"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.0.tgz"; + sha512 = "O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw=="; + }; + }; "@types/eslint-visitor-keys-1.0.0" = { name = "_at_types_slash_eslint-visitor-keys"; packageName = "@types/eslint-visitor-keys"; @@ -5251,13 +5323,13 @@ let sha512 = "P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw=="; }; }; - "@types/jquery-3.5.2" = { + "@types/jquery-3.5.3" = { name = "_at_types_slash_jquery"; packageName = "@types/jquery"; - version = "3.5.2"; + version = "3.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.2.tgz"; - sha512 = "+MFOdKF5Zr41t3y2wfzJvK1PrUK0KtPLAFwYownp/0nCoMIANDDu5aFSpWfb8S0ZajCSNeaBnMrBGxksXK5yeg=="; + url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.3.tgz"; + sha512 = "IENpHTjGksr2wQS6ZO8eMIE0tIB22Ywg+n3/yAWCa56VSZ26phcwAbFdh9+VNUWk7e83qB27QLax3Rf4G92Y9A=="; }; }; "@types/js-yaml-3.12.5" = { @@ -5323,13 +5395,13 @@ let sha512 = "MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw=="; }; }; - "@types/koa-2.11.4" = { + "@types/koa-2.11.5" = { name = "_at_types_slash_koa"; packageName = "@types/koa"; - version = "2.11.4"; + version = "2.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.4.tgz"; - sha512 = "Etqs0kdqbuAsNr5k6mlZQelpZKVwMu9WPRHVVTLnceZlhr0pYmblRNJbCgoCMzKWWePldydU0AYEOX4Q9fnGUQ=="; + url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.5.tgz"; + sha512 = "egP+ceD3+v9PnFW+DLTFO8mt6wa5sDqfGOBIwOAZ61Wzsq4bGZc5kMpJgcCwq7ARGIBfHBY+KkK/1RsMftV/qQ=="; }; }; "@types/koa-compose-3.2.5" = { @@ -5350,13 +5422,13 @@ let sha512 = "InCEXJNTv/59yO4VSfuvNrZHt7eeNtWQEgnieIA+mIC+MOWM9arOWG2eQ8Vhk6NbOre6/BidiXhkZYeDY9U35w=="; }; }; - "@types/lodash-4.14.161" = { + "@types/lodash-4.14.162" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.161"; + version = "4.14.162"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.161.tgz"; - sha512 = "EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.162.tgz"; + sha512 = "alvcho1kRUnnD1Gcl4J+hK0eencvzq9rmzvFPRmP5rPHx9VVsJj6bKLTATPVf9ktgv4ujzh7T+XWKp+jhuODig=="; }; }; "@types/long-4.0.1" = { @@ -5458,13 +5530,13 @@ let sha512 = "1GJnq7RwuFPRicMHdT53vza5v39nep9OKIbozxNUpFXP04CydcdWrqpZQ+MlVdlLFCisWnnt09xughajjWpFsw=="; }; }; - "@types/node-10.17.37" = { + "@types/node-10.17.39" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.37"; + version = "10.17.39"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.37.tgz"; - sha512 = "4c38N7p9k9yqdcANh/WExTahkBgOTmggCyrTvVcbE8ByqO3g8evt/407v/I4X/gdfUkIyZBSQh/Rc3tvuwlVGw=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.39.tgz"; + sha512 = "dJLCxrpQmgyxYGcl0Ae9MTsQgI22qHHcGFj/8VKu7McJA5zQpnuGjoksnxbo1JxSjW/Nahnl13W8MYZf01CZHA=="; }; }; "@types/node-12.7.12" = { @@ -5476,13 +5548,13 @@ let sha512 = "KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ=="; }; }; - "@types/node-13.13.23" = { + "@types/node-13.13.25" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.23"; + version = "13.13.25"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.23.tgz"; - sha512 = "L31WmMJYKb15PDqFWutn8HNwrNK6CE6bkWgSB0dO1XpNoHrszVKV1Clcnfgd6c/oG54TVF8XQEvY2gQrW8K6Mw=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.25.tgz"; + sha512 = "6ZMK4xRcF2XrPdKmPYQxZkdHKV18xKgUFVvhIgw2iwaaO6weleLPHLBGPZmLhjo+m1N+MZXRAoBEBCCVqgO2zQ=="; }; }; "@types/node-14.0.26" = { @@ -5494,13 +5566,13 @@ let sha512 = "W+fpe5s91FBGE0pEa0lnqGLL4USgpLgs4nokw16SrBBco/gQxuua7KnArSEOd5iaMqbbSHV10vUDkJYJJqpXKA=="; }; }; - "@types/node-14.11.5" = { + "@types/node-14.11.8" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.11.5"; + version = "14.11.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.11.5.tgz"; - sha512 = "jVFzDV6NTbrLMxm4xDSIW/gKnk8rQLF9wAzLWIOg+5nU6ACrIMndeBdXci0FGtqJbP9tQvm6V39eshc96TO2wQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.11.8.tgz"; + sha512 = "KPcKqKm5UKDkaYPTuXSx8wEP7vE9GnuaXIZKijwRYcePpZFDVuy2a57LarFKiORbHOuTOOwYzxVxcUzsh2P2Pw=="; }; }; "@types/node-6.14.12" = { @@ -5836,13 +5908,13 @@ let sha512 = "GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw=="; }; }; - "@types/vscode-1.49.0" = { + "@types/vscode-1.50.0" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.49.0"; + version = "1.50.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.49.0.tgz"; - sha512 = "wfNQmLmm1VdMBr6iuNdprWmC1YdrgZ9dQzadv+l2eSjJlElOdJw8OTm4RU4oGTBcfvG6RZI2jOcppkdSS18mZw=="; + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.50.0.tgz"; + sha512 = "QnIeyi4L2DiD9M2bAQKRzT/EQvc80qP9UL6JD5TiLlNRL1khIDg4ej4mDSRbtFrDAsRntFI1RhMvdomUThMsqg=="; }; }; "@types/webpack-4.41.21" = { @@ -5899,13 +5971,13 @@ let sha512 = "NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ=="; }; }; - "@types/yargs-15.0.7" = { + "@types/yargs-15.0.8" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; - version = "15.0.7"; + version = "15.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.7.tgz"; - sha512 = "Gf4u3EjaPNcC9cTu4/j2oN14nSVhr8PQ+BvBcBQHAhDZfl0bVIiLgvnRXv/dn58XhTm9UXvBpvJpDlwV65QxOA=="; + url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.8.tgz"; + sha512 = "b0BYzFUzBpOhPjpl1wtAHU994jBeKF4TKVlT7ssFv44T617XNcPdRoG4AzHLVshLzlrF7i3lTelH7UbuNYV58Q=="; }; }; "@types/yargs-parser-15.0.0" = { @@ -6007,22 +6079,22 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@uifabric/foundation-7.9.10" = { + "@uifabric/foundation-7.9.13" = { name = "_at_uifabric_slash_foundation"; packageName = "@uifabric/foundation"; - version = "7.9.10"; + version = "7.9.13"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.10.tgz"; - sha512 = "DeKN+beoqn6HsMW+Ezici1umj7j8aaNykOhLjqg11XRevJh7ifKQOrpePXM+m13B2VAdm2nPyfO3d7eYFvu7Zw=="; + url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.13.tgz"; + sha512 = "XVIniUkMAomET81VI1QCMHbtIzD/w2DTv3IspwTKpuvD1rswtRF07yMinyCLcd2of2crYAC1V5vWsz90QqAKjg=="; }; }; - "@uifabric/icons-7.5.9" = { + "@uifabric/icons-7.5.11" = { name = "_at_uifabric_slash_icons"; packageName = "@uifabric/icons"; - version = "7.5.9"; + version = "7.5.11"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.9.tgz"; - sha512 = "kiFw2hm2++OwcVT8ZkHm/UIsyA+4CXBgttmtMaEXMB6/VSt6mfAc+3gs0ehnfXbrBTLUIM9omxXUrrtULSWLTw=="; + url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.11.tgz"; + sha512 = "htUsBpAsE2AoC1I/ijBVnpHZXAmFl12o4I0WILOONNK6ruhHERu/eg/0eCBv6T0hvcoa13vuTLiuj8RBrDFh2g=="; }; }; "@uifabric/merge-styles-7.19.1" = { @@ -6052,13 +6124,13 @@ let sha512 = "9E+YKtnH2kyMKnK9XZZsqyM8OCxEJIIfxtaThTlQpYOzrWAGJxQADFbZ7+Usi0U2xHnWNPFROjq+B9ocEzhqMA=="; }; }; - "@uifabric/styling-7.16.10" = { + "@uifabric/styling-7.16.12" = { name = "_at_uifabric_slash_styling"; packageName = "@uifabric/styling"; - version = "7.16.10"; + version = "7.16.12"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.10.tgz"; - sha512 = "qhTJME41VM63paw690xp9SxD3NJP7a4YGUQTifLU0q2GM0e7AMQVDPQ+Cd8Fv9YBS1lJKHi069hVRwSfBejlwg=="; + url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.12.tgz"; + sha512 = "0TH6nz4ozJte7mp/rDlKI9IjDf5riFe6aKuDg3DDLshyCihBmn6VRF2geVhD7basxk/py/COKJROHZkP4T9ioQ=="; }; }; "@uifabric/utilities-7.32.4" = { @@ -6637,6 +6709,60 @@ let sha512 = "tDV8V15wm7mmbAH6XvQRU1X+oPGmeOzYsd6h7hlRLz6QpV4Ec/KKxM8OpLtFmQPLCreGxTp+HuxtH4pRIZyL9w=="; }; }; + "@webpack-cli/generators-1.0.1" = { + name = "_at_webpack-cli_slash_generators"; + packageName = "@webpack-cli/generators"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webpack-cli/generators/-/generators-1.0.1.tgz"; + sha512 = "MPaOezICviBfgYc+r8WBTkyM8gOe3qBR5t32roPqyhL4SJmN4f82ZYvVomLEx+YFBQ5uksCauSHAGoJNXinymg=="; + }; + }; + "@webpack-cli/info-1.0.1" = { + name = "_at_webpack-cli_slash_info"; + packageName = "@webpack-cli/info"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.0.1.tgz"; + sha512 = "C6OJTxTLgTjBuNKLlseQ2HHjgEGTcgIFcrJd67K3pM2LcYJNWT6VFaPzk9Go0yTZ9km9awm8sq2hW3Hm32NBeQ=="; + }; + }; + "@webpack-cli/init-1.0.1" = { + name = "_at_webpack-cli_slash_init"; + packageName = "@webpack-cli/init"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webpack-cli/init/-/init-1.0.1.tgz"; + sha512 = "OmhDC1jjhhX13mNt+emTPR7u18nrAWKOk/nIAg8XRFdZU2VUBPJbOK3/6xmqXnWKByZVJClvaeUjvgVQBnQmZw=="; + }; + }; + "@webpack-cli/serve-1.0.1" = { + name = "_at_webpack-cli_slash_serve"; + packageName = "@webpack-cli/serve"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.0.1.tgz"; + sha512 = "WGMaTMTK6NOe29Hw1WBEok9vGLfKg5C6jWzNOS/6HH1YadR+RL+TRWRcSyc81Dzulljhk/Ree9mrDM4Np9GGOQ=="; + }; + }; + "@webpack-cli/utils-1.0.1" = { + name = "_at_webpack-cli_slash_utils"; + packageName = "@webpack-cli/utils"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webpack-cli/utils/-/utils-1.0.1.tgz"; + sha512 = "G8UKA+B85/5X+pM85P0Knx43vwFS1W9WDseeif/15jbtDTib8jaNC+rD9SBvFcllmnqdfFXpkcrmWMW4A744dg=="; + }; + }; + "@webpack-cli/webpack-scaffold-1.0.1" = { + name = "_at_webpack-cli_slash_webpack-scaffold"; + packageName = "@webpack-cli/webpack-scaffold"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webpack-cli/webpack-scaffold/-/webpack-scaffold-1.0.1.tgz"; + sha512 = "AfnpwDJv2hxwpaM6Ljz0eNa7ayHVviPNWN/76RjlFxMGfT0K7O6IWw2oDvikqko227DClV4xO/5CL1/tz0LGhw=="; + }; + }; "@wry/context-0.4.4" = { name = "_at_wry_slash_context"; packageName = "@wry/context"; @@ -6934,6 +7060,15 @@ let sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; + "acorn-8.0.4" = { + name = "acorn"; + packageName = "acorn"; + version = "8.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-8.0.4.tgz"; + sha512 = "XNP0PqF1XD19ZlLKvB7cMmnZswW4C/03pRHgirB30uSJTaS3A3V1/P4sS3HPvFmjoriPCJQs+JDSbm4bL1TxGQ=="; + }; + }; "acorn-globals-1.0.9" = { name = "acorn-globals"; packageName = "acorn-globals"; @@ -7285,6 +7420,15 @@ let sha512 = "lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag=="; }; }; + "ajv-6.12.6" = { + name = "ajv"; + packageName = "ajv"; + version = "6.12.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"; + sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; + }; + }; "ajv-6.5.3" = { name = "ajv"; packageName = "ajv"; @@ -8419,6 +8563,15 @@ let sha512 = "TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q=="; }; }; + "array-back-4.0.1" = { + name = "array-back"; + packageName = "array-back"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-back/-/array-back-4.0.1.tgz"; + sha512 = "Z/JnaVEXv+A9xabHzN43FiiiWEE7gPCRXMrVmRm00tWbjZRul1iHm7ECzlyNq1p4a4ATXz+G9FJ3GqGOkOV3fg=="; + }; + }; "array-differ-1.0.0" = { name = "array-differ"; packageName = "array-differ"; @@ -8923,13 +9076,13 @@ let sha512 = "XTZ7xGML849LkQP86sWdQzfhwbt3YwIO6MqbX9mUNYY98VKaaVZP7YNNm70IpwecbkkxmfC5IYAzOQ/2p29zRA=="; }; }; - "ast-types-0.14.1" = { + "ast-types-0.13.4" = { name = "ast-types"; packageName = "ast-types"; - version = "0.14.1"; + version = "0.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.14.1.tgz"; - sha512 = "pfSiukbt23P1qMhNnsozLzhMLBs7EEeXqPyvPmnuZM+RMfwfqwDbSVKYflgGuVI7/VehR4oMks0igzdNAg4VeQ=="; + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz"; + sha512 = "x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w=="; }; }; "ast-types-0.14.2" = { @@ -9121,6 +9274,15 @@ let sha512 = "zVWTmAnxxHaeB2B1te84oecI8zTDJ/8G49aVBblRX6be0oq6pAybNcUSxwfgVOmOjSCvN4aYZAqwtyNI8e1YGw=="; }; }; + "async-mutex-0.2.4" = { + name = "async-mutex"; + packageName = "async-mutex"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/async-mutex/-/async-mutex-0.2.4.tgz"; + sha512 = "fcQKOXUKMQc57JlmjBCHtkKNrfGpHyR7vu18RfuLfeTAf4hK9PgOadPR5cDrBQ682zasrLUhJFe7EKAHJOduDg=="; + }; + }; "async-retry-1.3.1" = { name = "async-retry"; packageName = "async-retry"; @@ -9319,13 +9481,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.769.0" = { + "aws-sdk-2.771.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.769.0"; + version = "2.771.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.769.0.tgz"; - sha512 = "FZZrxgchLE0VXrd/uhIw2Tmlf82xOYuPK6batUUYz7UoAOL7q1UYUdI8ISNfeCEoN2MuMWAgfTIQiLx/9+NiEw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.771.0.tgz"; + sha512 = "fqNGusCwkdemx3yFqvQbU1+xq/PB2wGq7EQIrrTZx/zxfXUp+7+PnrHzXtViCRghN0tylLghBfWYD4VcVcqi7g=="; }; }; "aws-sign2-0.6.0" = { @@ -10507,6 +10669,15 @@ let sha512 = "pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww=="; }; }; + "bl-2.2.1" = { + name = "bl"; + packageName = "bl"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-2.2.1.tgz"; + sha512 = "6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g=="; + }; + }; "bl-4.0.3" = { name = "bl"; packageName = "bl"; @@ -11407,6 +11578,15 @@ let sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; }; }; + "buffermaker-1.2.1" = { + name = "buffermaker"; + packageName = "buffermaker"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffermaker/-/buffermaker-1.2.1.tgz"; + sha512 = "IdnyU2jDHU65U63JuVQNTHiWjPRH0CS3aYd/WPaEwyX84rFdukhOduAVb1jwUScmb5X0JWPw8NZOrhoLMiyAHQ=="; + }; + }; "buffers-0.1.1" = { name = "buffers"; packageName = "buffers"; @@ -11686,6 +11866,15 @@ let sha512 = "7YKEapH+2Uikde8hySyfobXBqPKULDyHNl/lhKm7cKf/GJFdG/tU/WpLrOg2y9aUrQrWUilYqawFIiGJPS6gDA=="; }; }; + "cacheable-lookup-2.0.1" = { + name = "cacheable-lookup"; + packageName = "cacheable-lookup"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-2.0.1.tgz"; + sha512 = "EMMbsiOTcdngM/K6gV/OxF2x0t07+vMOWxZNSCRQMjO2MY2nhZQ6OYhOOpyQrbhqsgtvKGI7hcq6xjnA92USjg=="; + }; + }; "cacheable-lookup-5.0.3" = { name = "cacheable-lookup"; packageName = "cacheable-lookup"; @@ -11947,13 +12136,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001144" = { + "caniuse-lite-1.0.30001148" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001144"; + version = "1.0.30001148"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001144.tgz"; - sha512 = "4GQTEWNMnVZVOFG3BK0xvGeaDAtiPAbG2N8yuMXuXzx/c2Vd4XoMPO8+E918zeXn5IF0FRVtGShBfkfQea2wHQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001148.tgz"; + sha512 = "E66qcd0KMKZHNJQt9hiLZGE3J4zuTqE1OnU53miEVtylFbwOEmeA5OsRu90noZful+XGSQOni1aT2tiqu/9yYw=="; }; }; "canvas-2.6.1" = { @@ -12361,6 +12550,15 @@ let sha1 = "fa5ae42cc60121133d296d0b46d983215f7268ea"; }; }; + "cheerio-0.19.0" = { + name = "cheerio"; + packageName = "cheerio"; + version = "0.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz"; + sha1 = "772e7015f2ee29965096d71ea4175b75ab354925"; + }; + }; "cheerio-0.20.0" = { name = "cheerio"; packageName = "cheerio"; @@ -12487,6 +12685,15 @@ let sha512 = "IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A=="; }; }; + "chokidar-3.4.3" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz"; + sha512 = "DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ=="; + }; + }; "chownr-0.0.2" = { name = "chownr"; packageName = "chownr"; @@ -12676,6 +12883,15 @@ let sha512 = "UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A=="; }; }; + "clap-1.2.3" = { + name = "clap"; + packageName = "clap"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz"; + sha512 = "4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA=="; + }; + }; "clarinet-0.11.0" = { name = "clarinet"; packageName = "clarinet"; @@ -12892,13 +13108,13 @@ let sha512 = "1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg=="; }; }; - "cli-spinners-2.4.0" = { + "cli-spinners-2.5.0" = { name = "cli-spinners"; packageName = "cli-spinners"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.4.0.tgz"; - sha512 = "sJAofoarcm76ZGpuooaO0eDy8saEy+YoZBLjC4h8srt4jeBnkYeOgqxgsJQTpyt2LjI5PTfLJHSL+41Yu4fEJA=="; + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.5.0.tgz"; + sha512 = "PC+AmIuK04E6aeSs/pUccSujsTzBhu4HzC2dL+CfJB/Jcc2qTRbEwZQDfIUpt2Xl8BodYBEq8w4fc0kU2I9DjQ=="; }; }; "cli-table-0.3.1" = { @@ -13126,13 +13342,13 @@ let sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="; }; }; - "cliui-7.0.1" = { + "cliui-7.0.2" = { name = "cliui"; packageName = "cliui"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-7.0.1.tgz"; - sha512 = "rcvHOWyGyid6I1WjT/3NatKj2kDt9OdSHSXpyLXaMWFbKpGACNW8pRhhdPUq9MWUOdwn8Rz9AVETjF4105rZZQ=="; + url = "https://registry.npmjs.org/cliui/-/cliui-7.0.2.tgz"; + sha512 = "lhpKkuUj67j5JgZIPZxLe7nSa4MQoojzRVWQyzMqBp2hBg6gwRjUDAwC1YDeBaC3APDBKNnjWbv2mlDF4XgOSA=="; }; }; "clivas-0.1.4" = { @@ -13279,6 +13495,15 @@ let sha512 = "6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA=="; }; }; + "clubhouse-lib-0.10.0" = { + name = "clubhouse-lib"; + packageName = "clubhouse-lib"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clubhouse-lib/-/clubhouse-lib-0.10.0.tgz"; + sha512 = "ZZjKqOeNgXtz40seJmSYbfAsIGJVzDIAn30w0QRmnyXHFrjEXhW/K8ZgRw5FtsezYFQEuZXSp93S0UkKJHuhKg=="; + }; + }; "cmd-shim-3.0.3" = { name = "cmd-shim"; packageName = "cmd-shim"; @@ -13360,6 +13585,15 @@ let sha1 = "f81b3eb8a86675fec51e3d883a7f564e873c9389"; }; }; + "coa-1.0.4" = { + name = "coa"; + packageName = "coa"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz"; + sha1 = "a9ef153660d6a86a8bdec0289a5c684d217432fd"; + }; + }; "coa-2.0.2" = { name = "coa"; packageName = "coa"; @@ -13486,13 +13720,13 @@ let sha512 = "jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w=="; }; }; - "color-3.1.2" = { + "color-3.1.3" = { name = "color"; packageName = "color"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/color/-/color-3.1.2.tgz"; - sha512 = "vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg=="; + url = "https://registry.npmjs.org/color/-/color-3.1.3.tgz"; + sha512 = "xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ=="; }; }; "color-convert-1.9.3" = { @@ -13531,13 +13765,13 @@ let sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; }; - "color-string-1.5.3" = { + "color-string-1.5.4" = { name = "color-string"; packageName = "color-string"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz"; - sha512 = "dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw=="; + url = "https://registry.npmjs.org/color-string/-/color-string-1.5.4.tgz"; + sha512 = "57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw=="; }; }; "color-support-1.1.3" = { @@ -13594,6 +13828,15 @@ let sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; }; }; + "colors-1.1.2" = { + name = "colors"; + packageName = "colors"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"; + sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; + }; + }; "colors-1.3.3" = { name = "colors"; packageName = "colors"; @@ -13711,6 +13954,15 @@ let sha512 = "MxS8Ad995KpdAC0Jopo/ovGIroV/m0KHwzKfXxKag6FHOkGsH8/lv5yjgablcRxCJJC0oJeUMuO/gmaq+Wq46g=="; }; }; + "command-line-usage-6.1.0" = { + name = "command-line-usage"; + packageName = "command-line-usage"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/command-line-usage/-/command-line-usage-6.1.0.tgz"; + sha512 = "Ew1clU4pkUeo6AFVDFxCbnN7GIZfXl48HIOQeFQnkO3oOqvpI7wdqtLRwv9iOCZ/7A+z4csVZeiDdEcj8g6Wiw=="; + }; + }; "commander-0.6.1" = { name = "commander"; packageName = "commander"; @@ -14170,6 +14422,15 @@ let sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA=="; }; }; + "configstore-1.4.0" = { + name = "configstore"; + packageName = "configstore"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/configstore/-/configstore-1.4.0.tgz"; + sha1 = "c35781d0501d268c25c54b8b17f6240e8a4fb021"; + }; + }; "configstore-3.1.5" = { name = "configstore"; packageName = "configstore"; @@ -15314,6 +15575,15 @@ let sha1 = "6963b752aaf59babbd3fea3ec0da5d44e9122efb"; }; }; + "css-select-1.0.0" = { + name = "css-select"; + packageName = "css-select"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz"; + sha1 = "b1121ca51848dd264e2244d058cee254deeb44b0"; + }; + }; "css-select-1.2.0" = { name = "css-select"; packageName = "css-select"; @@ -15377,6 +15647,15 @@ let sha512 = "7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA=="; }; }; + "css-what-1.0.0" = { + name = "css-what"; + packageName = "css-what"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz"; + sha1 = "d7cc2df45180666f99d2b14462639469e00f736c"; + }; + }; "css-what-2.1.3" = { name = "css-what"; packageName = "css-what"; @@ -15386,13 +15665,13 @@ let sha512 = "a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg=="; }; }; - "css-what-3.4.1" = { + "css-what-3.4.2" = { name = "css-what"; packageName = "css-what"; - version = "3.4.1"; + version = "3.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/css-what/-/css-what-3.4.1.tgz"; - sha512 = "wHOppVDKl4vTAOWzJt5Ek37Sgd9qq1Bmj/T1OjvicWbU5W7ru7Pqbn0Jdqii3Drx/h+dixHKXNhZYx7blthL7g=="; + url = "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz"; + sha512 = "ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ=="; }; }; "cssauron-1.4.0" = { @@ -15476,6 +15755,15 @@ let sha512 = "WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q=="; }; }; + "csso-2.0.0" = { + name = "csso"; + packageName = "csso"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/csso/-/csso-2.0.0.tgz"; + sha1 = "178b43a44621221c27756086f531e02f42900ee8"; + }; + }; "csso-4.0.3" = { name = "csso"; packageName = "csso"; @@ -16034,6 +16322,15 @@ let sha512 = "vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ=="; }; }; + "data-uri-to-buffer-3.0.1" = { + name = "data-uri-to-buffer"; + packageName = "data-uri-to-buffer"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz"; + sha512 = "WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og=="; + }; + }; "data-urls-1.1.0" = { name = "data-urls"; packageName = "data-urls"; @@ -16124,13 +16421,13 @@ let sha512 = "3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw=="; }; }; - "dayjs-1.9.1" = { + "dayjs-1.9.3" = { name = "dayjs"; packageName = "dayjs"; - version = "1.9.1"; + version = "1.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.9.1.tgz"; - sha512 = "01NCTBg8cuMJG1OQc6PR7T66+AFYiPwgDvdJmvJBn29NGzIG+DIFxPLNjHzwz3cpFIvG+NcwIjP9hSaPVoOaDg=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.9.3.tgz"; + sha512 = "V+1SyIvkS+HmNbN1G7A9+ERbFTV9KTXu6Oor98v2xHmzzpp52OIJhQuJSTywWuBY5pyAEmlwbCi1Me87n/SLOw=="; }; }; "deasync-0.1.15" = { @@ -16376,6 +16673,15 @@ let sha512 = "jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw=="; }; }; + "decompress-response-5.0.0" = { + name = "decompress-response"; + packageName = "decompress-response"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-response/-/decompress-response-5.0.0.tgz"; + sha512 = "TLZWWybuxWgoW7Lykv+gq9xvzOsUjQ9tF09Tj6NSTYGMTCHNXzrPnD6Hi+TgZq19PyTAGH4Ll/NIM/eTGglnMw=="; + }; + }; "decompress-response-6.0.0" = { name = "decompress-response"; packageName = "decompress-response"; @@ -16763,6 +17069,15 @@ let sha1 = "fcf490a37ece266464d9cc431ab98c5819ced095"; }; }; + "degenerator-2.2.0" = { + name = "degenerator"; + packageName = "degenerator"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/degenerator/-/degenerator-2.2.0.tgz"; + sha512 = "aiQcQowF01RxFI4ZLFMpzyotbQonhNpBao6dkI8JPk5a+hmSjR5ErHp2CQySmQe8os3VBqLCIh87nDBgZXvsmg=="; + }; + }; "del-4.1.1" = { name = "del"; packageName = "del"; @@ -18257,13 +18572,13 @@ let sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w=="; }; }; - "electron-to-chromium-1.3.578" = { + "electron-to-chromium-1.3.580" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.578"; + version = "1.3.580"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.578.tgz"; - sha512 = "z4gU6dA1CbBJsAErW5swTGAaU2TBzc2mPAonJb00zqW1rOraDo2zfBMDRvaz9cVic+0JEZiYbHWPw/fTaZlG2Q=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.580.tgz"; + sha512 = "5flHTbRpptO6h3lQUG4zdSAxryAS3PrZOkLpLS0DL5/y2LBf+l9HJ8X6UBorNs1QRBrMR7u/QvkdK+GlekW1kQ=="; }; }; "elegant-spinner-1.0.1" = { @@ -18618,6 +18933,15 @@ let sha512 = "3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ=="; }; }; + "enhanced-resolve-5.2.0" = { + name = "enhanced-resolve"; + packageName = "enhanced-resolve"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.2.0.tgz"; + sha512 = "NZlGLl8DxmZoq0uqPPtJfsCAir68uR047+Udsh1FH4+5ydGQdMurn/A430A1BtxASVmMEuS7/XiJ5OxJ9apAzQ=="; + }; + }; "enquirer-2.3.6" = { name = "enquirer"; packageName = "enquirer"; @@ -19023,13 +19347,13 @@ let sha512 = "VHDcDg9AwFoeQU9ULPCJCw6P95gr9Er65M+bccefEVD/OOb+WMyQIYw58rpm0F+zcfRJNf394I+BMH8JeU97Hw=="; }; }; - "escalade-3.1.0" = { + "escalade-3.1.1" = { name = "escalade"; packageName = "escalade"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/escalade/-/escalade-3.1.0.tgz"; - sha512 = "mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig=="; + url = "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"; + sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; }; }; "escape-goat-2.1.1" = { @@ -19185,13 +19509,13 @@ let sha512 = "K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig=="; }; }; - "eslint-7.10.0" = { + "eslint-7.11.0" = { name = "eslint"; packageName = "eslint"; - version = "7.10.0"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.10.0.tgz"; - sha512 = "BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.11.0.tgz"; + sha512 = "G9+qtYVCHaDi1ZuWzBsOWo2wSwd70TXnU6UHA3cTYHp7gCTXZcpggWFoUVAMRarg68qtPoNfFbzPh+VdOgmwmw=="; }; }; "eslint-7.9.0" = { @@ -19374,6 +19698,15 @@ let sha1 = "609ac5c2667eae5433b41eb9ecece2331b41498f"; }; }; + "esprima-2.7.3" = { + name = "esprima"; + packageName = "esprima"; + version = "2.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz"; + sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581"; + }; + }; "esprima-3.1.3" = { name = "esprima"; packageName = "esprima"; @@ -19977,13 +20310,13 @@ let sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; }; }; - "expo-pwa-0.0.44" = { + "expo-pwa-0.0.45" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.44"; + version = "0.0.45"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.44.tgz"; - sha512 = "GB5HKftWXh3G43kftpD/ZhuHIKSukW+7eA1UdxkIKkNVqHy2Co3CNrVQFogDl5H3XY744rJKXJj5Jnz/jMxOtg=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.45.tgz"; + sha512 = "1q0t+5L4JEb8iCAaN0ME6/P/h83HVrOXBU8AzDRtrTXPWC0R0IvHr9cm1DCnzWTHtBcy6kA+H0rIvxledllaBQ=="; }; }; "express-2.5.11" = { @@ -20652,6 +20985,15 @@ let sha512 = "aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg=="; }; }; + "fetch-everywhere-1.0.5" = { + name = "fetch-everywhere"; + packageName = "fetch-everywhere"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/fetch-everywhere/-/fetch-everywhere-1.0.5.tgz"; + sha1 = "b2497f47a57d9026b3907c09756acf5f4bd34e8b"; + }; + }; "fields-0.1.24" = { name = "fields"; packageName = "fields"; @@ -20841,6 +21183,15 @@ let sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; }; }; + "file-uri-to-path-2.0.0" = { + name = "file-uri-to-path"; + packageName = "file-uri-to-path"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz"; + sha512 = "hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg=="; + }; + }; "filelist-1.0.1" = { name = "filelist"; packageName = "filelist"; @@ -21129,6 +21480,15 @@ let sha512 = "YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg=="; }; }; + "findup-sync-4.0.0" = { + name = "findup-sync"; + packageName = "findup-sync"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/findup-sync/-/findup-sync-4.0.0.tgz"; + sha512 = "6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ=="; + }; + }; "fined-1.2.0" = { name = "fined"; packageName = "fined"; @@ -21201,13 +21561,13 @@ let sha512 = "lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q=="; }; }; - "flat-4.1.0" = { + "flat-4.1.1" = { name = "flat"; packageName = "flat"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz"; - sha512 = "Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw=="; + url = "https://registry.npmjs.org/flat/-/flat-4.1.1.tgz"; + sha512 = "FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA=="; }; }; "flat-5.0.2" = { @@ -21723,13 +22083,13 @@ let sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; }; }; - "fp-ts-2.8.3" = { + "fp-ts-2.8.4" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.8.3"; + version = "2.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.8.3.tgz"; - sha512 = "oGD3BTSzFCPs9alaI/2gh0SCNKyhPXkpeIBvkXNvnoczHfDAUd2HHtotCdLO0hOTTTTx8VKA0mhhR7LUNo+cKg=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.8.4.tgz"; + sha512 = "J+kwce5SysU0YKuZ3aCnFk+dyezZD1mij6u26w1fCVfuLYgJR4eeXmVfJiUjthpZ+4yCRkRfcwMI5SkGw52oFA=="; }; }; "fragment-cache-0.2.1" = { @@ -22515,6 +22875,15 @@ let sha512 = "v7LT/s8kVjs+Tx0ykk1I+H/rbpzkHvuIq87LmeXptcf5sNWm9uQiwjNAt94SJPA1zOlCntmnOlJvVWKmzsxG8Q=="; }; }; + "get-uri-3.0.2" = { + name = "get-uri"; + packageName = "get-uri"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/get-uri/-/get-uri-3.0.2.tgz"; + sha512 = "+5s0SJbGoyiJTZZ2JTpFPLMPSch72KEqGOTvQsBqg0RBWvwhWUSYZFAtz3TPW0GXJuLBJPts1E241iHg+VRfhg=="; + }; + }; "get-value-2.0.6" = { name = "get-value"; packageName = "get-value"; @@ -22569,13 +22938,13 @@ let sha1 = "ee95be37106fd8748a96f8d1db4baea89e1bfa8a"; }; }; - "gh-release-fetch-1.0.4" = { + "gh-release-fetch-1.1.0" = { name = "gh-release-fetch"; packageName = "gh-release-fetch"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/gh-release-fetch/-/gh-release-fetch-1.0.4.tgz"; - sha512 = "uL2T1vCOr5HAuY1Cbtj+h1AOTWZ0Qvubi1s7KCRqKOiytVlTDHLYoPJ9TIJLEmNYbmuCtZVOtYsojf3REAAgbQ=="; + url = "https://registry.npmjs.org/gh-release-fetch/-/gh-release-fetch-1.1.0.tgz"; + sha512 = "c8Vb2g6yzTItFGooCH2yppiwu8BwoWheMAWHl/qor95XcuDjFgqMYw8QUtvR/da+ZII5EYDPonZTypvI2anm4Q=="; }; }; "git-apply-delta-0.0.7" = { @@ -22911,6 +23280,15 @@ let sha1 = "8c5a1494d2066c570cc3bfe4496175acc4d502ab"; }; }; + "glob-to-regexp-0.4.1" = { + name = "glob-to-regexp"; + packageName = "glob-to-regexp"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"; + sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="; + }; + }; "glob-watcher-5.0.5" = { name = "glob-watcher"; packageName = "glob-watcher"; @@ -23254,6 +23632,15 @@ let sha1 = "d9430ba32f6a30218243884418767340aafc0400"; }; }; + "got-10.7.0" = { + name = "got"; + packageName = "got"; + version = "10.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-10.7.0.tgz"; + sha512 = "aWTDeNw9g+XqEZNcTjMMZSy7B7yE9toWOFYip7ofFTLleJhvZwUxxTxkTpKvF+p1SAA4VHmuEy7PiHTHyq8tJg=="; + }; + }; "got-11.4.0" = { name = "got"; packageName = "got"; @@ -23281,6 +23668,15 @@ let sha512 = "7en2XwH2MEqOsrK0xaKhbWibBoZqy+f1RSUoIeF1BLcnf+pyQdDsljWMfmOh+QKJwuvDIiKx38GtPh5wFdGGjg=="; }; }; + "got-3.3.1" = { + name = "got"; + packageName = "got"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-3.3.1.tgz"; + sha1 = "e5d0ed4af55fc3eef4d56007769d98192bcb2eca"; + }; + }; "got-6.7.1" = { name = "got"; packageName = "got"; @@ -24055,13 +24451,13 @@ let sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1"; }; }; - "hasha-5.2.1" = { + "hasha-5.2.2" = { name = "hasha"; packageName = "hasha"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/hasha/-/hasha-5.2.1.tgz"; - sha512 = "x15jnRSHTi3VmH+oHtVb9kgU/HuKOK8mjK8iCL3dPQXh4YJlUb9YSI8ZLiiqLAIvY2wuDIlZYZppy8vB2XISkQ=="; + url = "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz"; + sha512 = "Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ=="; }; }; "hasher-1.2.0" = { @@ -24199,6 +24595,15 @@ let sha512 = "WlztFuK+Lrvi3EggsqOkQ52rKbxkXL3RwB6t5lwoa8QLMemoWfBuL43eDrwOamJyR7uKQKdmKYaBH1NZBiIRrQ=="; }; }; + "hasurl-1.0.0" = { + name = "hasurl"; + packageName = "hasurl"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hasurl/-/hasurl-1.0.0.tgz"; + sha512 = "43ypUd3DbwyCT01UYpA99AEZxZ4aKtRxWGBHEIbjcOsUghd9YUON0C+JF6isNjaiwC/UF5neaUudy6JS9jZPZQ=="; + }; + }; "hat-0.0.3" = { name = "hat"; packageName = "hat"; @@ -24442,13 +24847,13 @@ let sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="; }; }; - "hosted-git-info-3.0.5" = { + "hosted-git-info-3.0.6" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.5.tgz"; - sha512 = "i4dpK6xj9BIpVOTboXIlKG9+8HMKggcrMX7WA24xZtKwX0TPelq/rbaS5rCKeNX8sJXZJGdSxpnEGtta+wismQ=="; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.6.tgz"; + sha512 = "VRvqVD5T6t9HdmNDWTwbi8H/EC722MemAhOSP5QvYAXpDAY0Nhu2I/i+bXsktu4sU5LVHSh/wmXtVU8bDtjedQ=="; }; }; "hot-shots-6.8.7" = { @@ -24821,13 +25226,13 @@ let sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q=="; }; }; - "http-proxy-middleware-1.0.5" = { + "http-proxy-middleware-1.0.6" = { name = "http-proxy-middleware"; packageName = "http-proxy-middleware"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.0.5.tgz"; - sha512 = "CKzML7u4RdGob8wuKI//H8Ein6wNTEQR7yjVEzPbhBLGdOfkfvgTnp2HLnniKBDP9QW4eG10/724iTWLBeER3g=="; + url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.0.6.tgz"; + sha512 = "NyL6ZB6cVni7pl+/IT2W0ni5ME00xR0sN27AQZZrpKn1b+qRh+mLbBxIq9Cq1oGfmTc7BUq4HB77mxwCaxAYNg=="; }; }; "http-signature-0.11.0" = { @@ -25316,13 +25721,13 @@ let sha512 = "O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg=="; }; }; - "import-cwd-2.1.0" = { + "import-cwd-3.0.0" = { name = "import-cwd"; packageName = "import-cwd"; - version = "2.1.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz"; - sha1 = "aa6cf36e722761285cb371ec6519f53e2435b0a9"; + url = "https://registry.npmjs.org/import-cwd/-/import-cwd-3.0.0.tgz"; + sha512 = "4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg=="; }; }; "import-fresh-2.0.0" = { @@ -25343,15 +25748,6 @@ let sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ=="; }; }; - "import-from-2.1.0" = { - name = "import-from"; - packageName = "import-from"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz"; - sha1 = "335db7f2a7affd53aaa471d4b8021dee36b7f3b1"; - }; - }; "import-from-3.0.0" = { name = "import-from"; packageName = "import-from"; @@ -25415,6 +25811,15 @@ let sha512 = "b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ=="; }; }; + "import-local-3.0.2" = { + name = "import-local"; + packageName = "import-local"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz"; + sha512 = "vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA=="; + }; + }; "imurmurhash-0.1.4" = { name = "imurmurhash"; packageName = "imurmurhash"; @@ -25496,6 +25901,15 @@ let sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; }; }; + "infinity-agent-2.0.3" = { + name = "infinity-agent"; + packageName = "infinity-agent"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/infinity-agent/-/infinity-agent-2.0.3.tgz"; + sha1 = "45e0e2ff7a9eb030b27d62b74b3744b7a7ac4216"; + }; + }; "inflected-2.1.0" = { name = "inflected"; packageName = "inflected"; @@ -25730,13 +26144,13 @@ let sha512 = "t8A0gFq0mOKGz8wmGBPh+M/AC8KSMMcn7dnHXzLWyKvLiRYWswQ6rg7d938hoR5tVP1GpHVmHOR6YP8G5dYhhQ=="; }; }; - "insert-module-globals-7.2.0" = { + "insert-module-globals-7.2.1" = { name = "insert-module-globals"; packageName = "insert-module-globals"; - version = "7.2.0"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.0.tgz"; - sha512 = "VE6NlW+WGn2/AeOMd496AHFYmE7eLKkUY6Ty31k4og5vmA3Fjuwe9v6ifH6Xx/Hz27QvdoMoviw1/pqWRB09Sw=="; + url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.1.tgz"; + sha512 = "ufS5Qq9RZN+Bu899eA9QCAYThY+gGW7oRkmb0vC93Vlyu/CFGcH0OYPEjVkDXA5FEbTt1+VWzdoOD3Ny9N+8tg=="; }; }; "insight-0.10.3" = { @@ -25865,6 +26279,15 @@ let sha512 = "agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="; }; }; + "interpret-2.2.0" = { + name = "interpret"; + packageName = "interpret"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz"; + sha512 = "Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw=="; + }; + }; "intersect-1.0.1" = { name = "intersect"; packageName = "intersect"; @@ -26531,6 +26954,15 @@ let sha512 = "lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ=="; }; }; + "is-generator-function-1.0.7" = { + name = "is-generator-function"; + packageName = "is-generator-function"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.7.tgz"; + sha512 = "YZc5EwyO4f2kWCax7oegfuSr9mFz1ZvieNYBEjmukLxgXfBUbxAWGVF7GZf0zidYtoBl3WvC07YK0wT76a+Rtw=="; + }; + }; "is-glob-2.0.1" = { name = "is-glob"; packageName = "is-glob"; @@ -28016,6 +28448,15 @@ let sha1 = "102790f265d986fe95a4d0f2a792e7a7bd886eec"; }; }; + "js-yaml-3.6.1" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz"; + sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"; + }; + }; "js2xmlparser-4.0.1" = { name = "js2xmlparser"; packageName = "js2xmlparser"; @@ -28043,6 +28484,15 @@ let sha1 = "b01307cb29b618a1ed26ec79e911f803c4da0040"; }; }; + "jschardet-1.6.0" = { + name = "jschardet"; + packageName = "jschardet"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jschardet/-/jschardet-1.6.0.tgz"; + sha512 = "xYuhvQ7I9PDJIGBWev9xm0+SMSed3ZDBAmvVjbFR1ZRLAF+vlXcQu6cRI9uAlj81rzikElRVteehwV7DuX2ZmQ=="; + }; + }; "jscodeshift-0.10.0" = { name = "jscodeshift"; packageName = "jscodeshift"; @@ -28052,6 +28502,15 @@ let sha512 = "xpH2FVSEepXoNr6+cPlPHzPzBY1W9bPulufhCHOShzk8+CTCzAOQKytuOXT0b/9PvmO4biRi0g/ZIylVew815w=="; }; }; + "jscodeshift-0.7.1" = { + name = "jscodeshift"; + packageName = "jscodeshift"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.7.1.tgz"; + sha512 = "YMkZSyoc8zg5woZL23cmWlnFLPH/mHilonGA7Qbzs7H6M4v4PH0Qsn4jeDyw+CHhVoAnm9UxQyB0Yw1OT+mktA=="; + }; + }; "jsdom-11.12.0" = { name = "jsdom"; packageName = "jsdom"; @@ -28818,6 +29277,15 @@ let sha1 = "83cb748496ac491c7135104cbe56b88ca7392477"; }; }; + "kafka-node-5.0.0" = { + name = "kafka-node"; + packageName = "kafka-node"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kafka-node/-/kafka-node-5.0.0.tgz"; + sha512 = "dD2ga5gLcQhsq1yNoQdy1MU4x4z7YnXM5bcG9SdQuiNr5KKuAmXixH1Mggwdah5o7EfholFbcNDPSVA6BIfaug=="; + }; + }; "katex-0.12.0" = { name = "katex"; packageName = "katex"; @@ -29097,13 +29565,13 @@ let sha512 = "Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw=="; }; }; - "lambda-local-1.7.3" = { + "lambda-local-1.7.4" = { name = "lambda-local"; packageName = "lambda-local"; - version = "1.7.3"; + version = "1.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/lambda-local/-/lambda-local-1.7.3.tgz"; - sha512 = "T+iwIkuQT0JvTQhvNBTikLhpEJk3ovNoC33niE4QNmYOUrCOdo86PcPkgppOZl+NJXXHebdPHDJ40zqBJ9VMzg=="; + url = "https://registry.npmjs.org/lambda-local/-/lambda-local-1.7.4.tgz"; + sha512 = "uLrFPGj2//glOgJGLZn8hNTNlhU+eGx0WFRLZxIoC39nfjLRZ1fncHcPK2t5gA2GcvgtGUT2dnw60M8vJAOIkQ=="; }; }; "last-call-webpack-plugin-3.0.0" = { @@ -29142,6 +29610,15 @@ let sha1 = "ea47eb8f4b2bb0cf91716efaa896c2e16237587b"; }; }; + "latest-version-1.0.1" = { + name = "latest-version"; + packageName = "latest-version"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/latest-version/-/latest-version-1.0.1.tgz"; + sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb"; + }; + }; "latest-version-3.1.0" = { name = "latest-version"; packageName = "latest-version"; @@ -29547,15 +30024,6 @@ let sha512 = "qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="; }; }; - "levenary-1.1.1" = { - name = "levenary"; - packageName = "levenary"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz"; - sha512 = "mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ=="; - }; - }; "levenshtein-1.0.5" = { name = "levenshtein"; packageName = "levenshtein"; @@ -29853,6 +30321,15 @@ let sha512 = "Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw=="; }; }; + "loader-runner-4.1.0" = { + name = "loader-runner"; + packageName = "loader-runner"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-runner/-/loader-runner-4.1.0.tgz"; + sha512 = "oR4lB4WvwFoC70ocraKhn5nkKSs23t57h9udUgw8o0iH8hMXeEoRuUgfcvgUwAJ1ZpRqBvcou4N2SMvM1DwMrA=="; + }; + }; "loader-utils-1.2.3" = { name = "loader-utils"; packageName = "loader-utils"; @@ -30060,6 +30537,15 @@ let sha1 = "baf48934e543a1b5d6346f8c84698b1a8c803896"; }; }; + "lodash._arrayeach-3.0.0" = { + name = "lodash._arrayeach"; + packageName = "lodash._arrayeach"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz"; + sha1 = "bab156b2a90d3f1bbd5c653403349e5e5933ef9e"; + }; + }; "lodash._arraypool-2.4.1" = { name = "lodash._arraypool"; packageName = "lodash._arraypool"; @@ -30132,6 +30618,15 @@ let sha1 = "4d31f2e7de7e134fbf2803762b8150b32519666f"; }; }; + "lodash._baseeach-3.0.4" = { + name = "lodash._baseeach"; + packageName = "lodash._baseeach"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseeach/-/lodash._baseeach-3.0.4.tgz"; + sha1 = "cf8706572ca144e8d9d75227c990da982f932af3"; + }; + }; "lodash._baseiteratee-4.7.0" = { name = "lodash._baseiteratee"; packageName = "lodash._baseiteratee"; @@ -30456,6 +30951,15 @@ let sha1 = "ddb1bbb3ef07458c0177ba07de14422cb033ff9b"; }; }; + "lodash.defaults-3.1.2" = { + name = "lodash.defaults"; + packageName = "lodash.defaults"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-3.1.2.tgz"; + sha1 = "c7308b18dbf8bc9372d701a73493c61192bd2e2c"; + }; + }; "lodash.defaults-4.2.0" = { name = "lodash.defaults"; packageName = "lodash.defaults"; @@ -30537,6 +31041,15 @@ let sha1 = "fe3fc3a34c86c94cab6f9522560282741e016309"; }; }; + "lodash.foreach-3.0.3" = { + name = "lodash.foreach"; + packageName = "lodash.foreach"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-3.0.3.tgz"; + sha1 = "6fd7efb79691aecd67fdeac2761c98e701d6c39a"; + }; + }; "lodash.foreach-4.5.0" = { name = "lodash.foreach"; packageName = "lodash.foreach"; @@ -31266,6 +31779,15 @@ let sha1 = "2a7f8066ec3ab40bef28ca384842e75340183bf0"; }; }; + "long-1.1.2" = { + name = "long"; + packageName = "long"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/long/-/long-1.1.2.tgz"; + sha1 = "eaef5951ca7551d96926b82da242db9d6b28fb53"; + }; + }; "long-2.4.0" = { name = "long"; packageName = "long"; @@ -31734,13 +32256,13 @@ let sha512 = "07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag=="; }; }; - "make-fetch-happen-8.0.9" = { + "make-fetch-happen-8.0.10" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "8.0.9"; + version = "8.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.9.tgz"; - sha512 = "uHa4gv/NIdm9cUvfOhYb57nxrCY08iyMRXru0jbpaH57Q3NCge/ypY7fOvgCr8tPyucKrGbVndKhjXE0IX0VfQ=="; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.10.tgz"; + sha512 = "jPLPKQjBmDLK5r1BdyDyNKBytmkv2AsDWm2CxHJh+fqhSmC9Pmb7RQxwOq8xQig9+AWIS49+51k4f6vDQ3VnrQ=="; }; }; "make-iterator-1.0.1" = { @@ -33786,22 +34308,22 @@ let sha512 = "NOeCoW6AYc3hLi30npe7uzbD9b4FQZKH40YKABUCCvaKKL5agj6YzvHoNx8jQpDMNPgIa5bvSZQbQpWBAVD0Kw=="; }; }; - "mqtt-2.18.8" = { + "mqtt-4.2.1" = { name = "mqtt"; packageName = "mqtt"; - version = "2.18.8"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-2.18.8.tgz"; - sha512 = "3h6oHlPY/yWwtC2J3geraYRtVVoRM6wdI+uchF4nvSSafXPZnaKqF8xnX+S22SU/FcgEAgockVIlOaAX3fkMpA=="; + url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.1.tgz"; + sha512 = "Iv893r+jWlo5GkNcPOfCGwW8M49IixwHiKLFFYTociEymSibUVCORVEjPXWPGzSxhn7BdlUeHicbRmWiv0Crkg=="; }; }; - "mqtt-packet-5.6.1" = { + "mqtt-packet-6.6.0" = { name = "mqtt-packet"; packageName = "mqtt-packet"; - version = "5.6.1"; + version = "6.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.6.1.tgz"; - sha512 = "eaF9rO2uFrIYEHomJxziuKTDkbWW5psLBaIGCazQSKqYsTaB3n4SpvJ1PexKaDBiPnMLPIFWBIiTYT3IfEJfww=="; + url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.6.0.tgz"; + sha512 = "LvghnKMFC70hKWMVykmhJarlO5e7lT3t9s9A2qPCUx+lazL3Mq55U+eCV0eLi7/nRRQYvEUWo/2tTo89EjnCJQ=="; }; }; "ms-0.7.1" = { @@ -34155,13 +34677,13 @@ let sha512 = "nU7mOEuaXiQIB/EgTIjYZJ7g8KqMm2D8l4qp+DqA4jxWOb/tnb1KEoqp+tlbdQIDIAiC1i7j7X/3yHDFXLxr9g=="; }; }; - "muxrpc-6.5.0" = { + "muxrpc-6.5.1" = { name = "muxrpc"; packageName = "muxrpc"; - version = "6.5.0"; + version = "6.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/muxrpc/-/muxrpc-6.5.0.tgz"; - sha512 = "8kCo33LTYPYWAJGi2Ag2ukcluoNqJIe6Ay9QtGf7EXAUlTuMSA0HqR7jCbXt7DQPR4Alu/T3/mOguuERpDMGcw=="; + url = "https://registry.npmjs.org/muxrpc/-/muxrpc-6.5.1.tgz"; + sha512 = "QTHNncZlsEcBOOYqpCx/QeVLJYaov6Y1LCEDun0xu81zAJGKymiMd5TB/qzA+dm9o1K3axwdGOqPR3fzrDyGRw=="; }; }; "muxrpc-usage-2.1.0" = { @@ -34263,6 +34785,15 @@ let sha512 = "isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw=="; }; }; + "nan-2.14.2" = { + name = "nan"; + packageName = "nan"; + version = "2.14.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz"; + sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="; + }; + }; "nan-2.3.5" = { name = "nan"; packageName = "nan"; @@ -34660,6 +35191,15 @@ let sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; }; }; + "nested-error-stacks-1.0.2" = { + name = "nested-error-stacks"; + packageName = "nested-error-stacks"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz"; + sha1 = "19f619591519f096769a5ba9a86e6eeec823c3cf"; + }; + }; "nested-error-stacks-2.1.0" = { name = "nested-error-stacks"; packageName = "nested-error-stacks"; @@ -34669,13 +35209,13 @@ let sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug=="; }; }; - "netlify-4.7.0" = { + "netlify-4.8.0" = { name = "netlify"; packageName = "netlify"; - version = "4.7.0"; + version = "4.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/netlify/-/netlify-4.7.0.tgz"; - sha512 = "ylGfihIjzVrimuLo6Pl/pGwIIZ9IHxHEemtUu2YBv8fnZzj5rDTHZCNNLaYLDMGo6Oe0o83yR7fnd0pnBHf2Aw=="; + url = "https://registry.npmjs.org/netlify/-/netlify-4.8.0.tgz"; + sha512 = "6eaIvlTIwnh1zzFJ0RBMDAE6/GcZ3Y9JIR4cFNZdgINO+zRgWL/vNbjRs2hIerLpOS1eqt6Ye1P9RTqHEQNXUg=="; }; }; "netlify-redirect-parser-2.5.0" = { @@ -35084,13 +35624,13 @@ let sha512 = "WH0WKGi+a4i4DUt2mHnvocex/xPLp9pYt5R6M2JdFB7pJ7Z34hveZ4nDTGTiLXCkitA9T8HFZjhinBCiVHYcWw=="; }; }; - "node-gyp-7.1.0" = { + "node-gyp-7.1.1" = { name = "node-gyp"; packageName = "node-gyp"; - version = "7.1.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.0.tgz"; - sha512 = "rjlHQlnl1dqiDZxZYiKqQdrjias7V+81OVR5PTzZioCBtWkNdrKy06M05HLKxy/pcKikKRCabeDRoZaEc6nIjw=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.1.tgz"; + sha512 = "+7TqukzQVlne5EcLrw0Cdm8S26OC4H2mTb5wji4HlsocgB6a9aYHgqlKLKxRMlH/PWNyVQjyRjFhiet7+QZefA=="; }; }; "node-gyp-build-3.7.0" = { @@ -35291,13 +35831,13 @@ let sha512 = "j1g/VtSCI2tBrBnCD+u8iSo9tH0nvn70k1O1SxkHk3+qx7tHUyOKQc7wNc4rUs9J1PkGngUC3qEDd5cL7Z/klg=="; }; }; - "node-releases-1.1.61" = { + "node-releases-1.1.63" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.61"; + version = "1.1.63"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.61.tgz"; - sha512 = "DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.63.tgz"; + sha512 = "ukW3iCfQaoxJkSPN+iK7KznTeqDGVJatAEuXsJERYHa9tn/KaT5lBdIyxQjLEVTzSkyjJEuQ17/vaEjrOauDkg=="; }; }; "node-source-walk-4.2.0" = { @@ -35714,6 +36254,15 @@ let sha512 = "/h5Fm6a/exByzFSTm7jAyHbgOqErl9qSNJDQF32Si/ZzgwT2TERVxRxn3Jurw1wflgyVVAxnFR4fRHPM7y1ClQ=="; }; }; + "npm-package-arg-8.1.0" = { + name = "npm-package-arg"; + packageName = "npm-package-arg"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.0.tgz"; + sha512 = "/ep6QDxBkm9HvOhOg0heitSd7JHA1U7y1qhhlRlteYYAi9Pdb/ZV7FW5aHpkrpM8+P+4p/jjR8zCyKPBMBjSig=="; + }; + }; "npm-packlist-1.4.8" = { name = "npm-packlist"; packageName = "npm-packlist"; @@ -35786,13 +36335,13 @@ let sha512 = "cny9v0+Mq6Tjz+e0erFAB+RYJ/AVGzkjnISiobqP8OWj9c9FLoZZu8/SPSKJWE17F1tk4018wfjV+ZbIbqC7fQ=="; }; }; - "npm-registry-fetch-8.1.4" = { + "npm-registry-fetch-8.1.5" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "8.1.4"; + version = "8.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-8.1.4.tgz"; - sha512 = "UaLGFQP7VCuyBsb7S5P5od3av/Zy9JW6K5gbMigjZCYnEpIkWWRiLQTKVpxM4QocfPcsjm+xtyrDNm4jdqwNEg=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-8.1.5.tgz"; + sha512 = "yZPNoJK9clx1jhSXU54kU6Aj1SV2p7mXUs1W/6OjQvek3wb1RrjDCrt4iY1+VX9eBQvvSGEpzNmYkRUaTL8rqg=="; }; }; "npm-run-path-2.0.2" = { @@ -35966,22 +36515,22 @@ let sha512 = "pJTS2+T0oGIwgjGpw7sIRU8RQMcUoKCDWFLdBqKB2BNmGpbBMH2sdqAaOXUg8OzonZHU0L7vfJu1mJFEiYDWOQ=="; }; }; - "oas-linter-3.2.0" = { + "oas-linter-3.2.1" = { name = "oas-linter"; packageName = "oas-linter"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/oas-linter/-/oas-linter-3.2.0.tgz"; - sha512 = "LP5F1dhjULEJV5oGRg6ROztH2FddzttrrUEwq5J2GB2Zy938mg0vwt1+Rthn/qqDHtj4Qgq21duNGHh+Ew1wUg=="; + url = "https://registry.npmjs.org/oas-linter/-/oas-linter-3.2.1.tgz"; + sha512 = "e5G6bbq3Nrfxm+SDPR5AiZ6n2smVUmhLA1OgI2/Bl8e2ywfWsKw/yuqrwiXXiNHb1wdM/GyPMX6QjCGJODlaaA=="; }; }; - "oas-resolver-2.5.1" = { + "oas-resolver-2.5.2" = { name = "oas-resolver"; packageName = "oas-resolver"; - version = "2.5.1"; + version = "2.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.5.1.tgz"; - sha512 = "MdMY8YAnCdFTAt5+CTC/aYEOSIFt+ICOWxQvKKxsIHjc0/0tG6V4DzbkHW9SWWqUmDPiHDxJsi79kjsE/1PJ5g=="; + url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.5.2.tgz"; + sha512 = "dEuG5nE9IMl0FQNQuROsoriP4/944PajSBKAoZMyp9b2eXfmPv9ZKeHRCKjf5RWLm0GezaPKcdCLbB0/Xiqtdw=="; }; }; "oas-schema-walker-1.1.5" = { @@ -36002,13 +36551,13 @@ let sha512 = "l/SxykuACi2U51osSsBXTxdsFc8Fw41xI7AsZkzgVgWJAzoEFaaNptt35WgY9C3757RUclsm6ye5GvSyYoozLQ=="; }; }; - "oas-validator-5.0.2" = { + "oas-validator-5.0.3" = { name = "oas-validator"; packageName = "oas-validator"; - version = "5.0.2"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/oas-validator/-/oas-validator-5.0.2.tgz"; - sha512 = "KVyNNWtZut1sZVBy4mBt1Iq6vQt0km+vJvaPanx4xV33ylpWpuQnMsb9UNQ6MuZVmOzBLl9SbNyvlNjzicty9Q=="; + url = "https://registry.npmjs.org/oas-validator/-/oas-validator-5.0.3.tgz"; + sha512 = "PYhenXnQr/T+MmrzBT+cTnyOcIZ4wVzvjS/gvbZZNexnhl1Gu/UiCg6rsEmBetE9CfthoxG0gfGTUSYPRmUlWA=="; }; }; "oauth-0.9.15" = { @@ -36201,13 +36750,13 @@ let sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; }; }; - "object-path-0.11.4" = { + "object-path-0.11.5" = { name = "object-path"; packageName = "object-path"; - version = "0.11.4"; + version = "0.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/object-path/-/object-path-0.11.4.tgz"; - sha1 = "370ae752fbf37de3ea70a861c23bba8915691949"; + url = "https://registry.npmjs.org/object-path/-/object-path-0.11.5.tgz"; + sha512 = "jgSbThcoR/s+XumvGMTMf81QVBmah+/Q7K7YduKeKVWL7N111unR2d6pZZarSk6kY/caeNxUDyxOvMWyzoU2eg=="; }; }; "object-to-arguments-0.0.8" = { @@ -36399,13 +36948,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.145.0" = { + "office-ui-fabric-react-7.146.2" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.145.0"; + version = "7.146.2"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.145.0.tgz"; - sha512 = "+eAo/bZpnTXmirwsPZxIbPhjQk+C34f0W/8tAHYWYASrRio9DWWDB0PRsSGUNrn1QubWxjudW294fovkewPeAQ=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.146.2.tgz"; + sha512 = "CRpojV9BK4gbYmfkFaoAxyzQdt0t7v/TRLuGlfPcZkjY7+5m7Jx4LHj80SArPkr1hqWSGQMB9dWBF08OeQVVJw=="; }; }; "omggif-1.0.10" = { @@ -36678,13 +37227,13 @@ let sha512 = "TbgwwOnlatb+xSYh/XALQjrVO3dirVNXuONR6CLQHVI/i1e+nq/ubW8I5i6rlGpnFLZNZKXZ0gF7RMvjLBk8ow=="; }; }; - "openapi-framework-7.0.1" = { + "openapi-framework-7.0.2" = { name = "openapi-framework"; packageName = "openapi-framework"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.0.1.tgz"; - sha512 = "ENQHf+tEqeGp6vykUYiw0uHvMEM3Oqi0SaBs8JlciEuo/fhhqrPmNzNa45xPFYWKYRJ5KpdFWcDlOIYf9gRkog=="; + url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.0.2.tgz"; + sha512 = "62gOWK5iq75HJVS0KWKuLXR7CYynjrbvgxLrTc0Tr0fTcI9ZiJV61KDmz9bz37rHhk/uQIVSMMuTjTC8bmyQtA=="; }; }; "openapi-jsonschema-parameters-1.2.0" = { @@ -36696,13 +37245,13 @@ let sha512 = "i2vBBFiRbOwYSvt5OG9hayJ7WUe/nl9Y151Ki1QtHb8M0zdYs2wkDhywVJnapq4/gPlrD1vmSVsYDrAjcBRJTQ=="; }; }; - "openapi-jsonschema-parameters-7.0.1" = { + "openapi-jsonschema-parameters-7.0.2" = { name = "openapi-jsonschema-parameters"; packageName = "openapi-jsonschema-parameters"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-7.0.1.tgz"; - sha512 = "PuzKYEILBg4mu9uyoHn7wUGPrx3ds9YJr8t0yvOhAkNITWmXCjuh/HgfoOi+6MUu2Rapj+6tk6lYfeVPcgqi3g=="; + url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-7.0.2.tgz"; + sha512 = "hCC8wsWu9qU/pWCUClAYmUyXRhAeXSZUCRV7NVlj/8+3fWrtTBwk8GKI2dRa5Up0yZ3pstGi3Ewzzuixbmh8sw=="; }; }; "openapi-request-coercer-2.4.0" = { @@ -36732,13 +37281,13 @@ let sha512 = "ukdX4T8heEI2GudiqDkk8hwfZhZP7zAz8zwngTyHtI0ZRUuU76+Zix8LVfrvSTZ2RpsPClKmYU2kDU4YZqdRHg=="; }; }; - "openapi-request-validator-7.0.1" = { + "openapi-request-validator-7.0.2" = { name = "openapi-request-validator"; packageName = "openapi-request-validator"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-7.0.1.tgz"; - sha512 = "qQBI3iiQ2JFokg3tdIOLo38ny7xRNzJZgcMwAS13WFSrUE9kcA6JAHI2cC5x3Q0EPpOtxWnzOaXwiZUJJ7MDOQ=="; + url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-7.0.2.tgz"; + sha512 = "0JV3gdHNqJgcHwgojPj2f6RqUI02uHI5yUBcKAtLhvQ9tkrgcVTAHdengPyfoLT35NDRWhhQuc8VhS/mUtFI0g=="; }; }; "openapi-response-validator-4.0.0" = { @@ -36975,6 +37524,15 @@ let sha512 = "wqd6FdI2a5/FdoiCNNkEvLeA//lHHfG24Ln2Xm2qqdIk4aOlsR18jwpyOihqQ8849W3qu2DX8fOYxpvTMj+93A=="; }; }; + "optional-0.1.4" = { + name = "optional"; + packageName = "optional"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/optional/-/optional-0.1.4.tgz"; + sha512 = "gtvrrCfkE08wKcgXaVwQVgwEQ8vel2dc5DDBn9RLQZ3YtmtkBss6A2HY6BnJH4N/4Ku97Ri/SF8sNWE2225WJw=="; + }; + }; "optionator-0.3.0" = { name = "optionator"; packageName = "optionator"; @@ -37308,6 +37866,15 @@ let sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; }; }; + "p-each-series-2.1.0" = { + name = "p-each-series"; + packageName = "p-each-series"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz"; + sha512 = "ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ=="; + }; + }; "p-event-2.3.1" = { name = "p-event"; packageName = "p-event"; @@ -37488,13 +38055,13 @@ let sha512 = "3cRXXn3/O0o3+eVmUroJPSj/esxoEFIm0ZOno/T+NzG/VZgPOqQ8WKmlNqubSEpZmCIngEy34unkHGg83ZIBmg=="; }; }; - "p-queue-6.6.1" = { + "p-queue-6.6.2" = { name = "p-queue"; packageName = "p-queue"; - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/p-queue/-/p-queue-6.6.1.tgz"; - sha512 = "miQiSxLYPYBxGkrldecZC18OTLjdUqnlRebGzPRiVxB8mco7usCmm7hFuxiTvp93K18JnLtE4KMMycjAu/cQQg=="; + url = "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz"; + sha512 = "RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ=="; }; }; "p-reduce-1.0.0" = { @@ -37623,6 +38190,15 @@ let sha512 = "44DUg21G/liUZ48dJpUSjZnFfZro/0K5JTyFYLBcmh9+T6Ooi4/i4efwUiEy0+4oQusCBqWdhv16XohIj1GqnQ=="; }; }; + "pac-proxy-agent-4.1.0" = { + name = "pac-proxy-agent"; + packageName = "pac-proxy-agent"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-4.1.0.tgz"; + sha512 = "ejNgYm2HTXSIYX9eFlkvqFp8hyJ374uDf0Zq5YUAifiSh1D6fo+iBivQZirGvVv8dCYUsLhmLBRhlAYvBKI5+Q=="; + }; + }; "pac-resolver-3.0.0" = { name = "pac-resolver"; packageName = "pac-resolver"; @@ -37632,6 +38208,24 @@ let sha512 = "tcc38bsjuE3XZ5+4vP96OfhOugrX+JcnpUbhfuc4LuXBLQhoTthOstZeoQJBDnQUDYzYmdImKsbz0xSl1/9qeA=="; }; }; + "pac-resolver-4.1.0" = { + name = "pac-resolver"; + packageName = "pac-resolver"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pac-resolver/-/pac-resolver-4.1.0.tgz"; + sha512 = "d6lf2IrZJJ7ooVHr7BfwSjRO1yKSJMaiiWYSHcrxSIUtZrCa4KKGwcztdkZ/E9LFleJfjoi1yl+XLR7AX24nbQ=="; + }; + }; + "package-json-1.2.0" = { + name = "package-json"; + packageName = "package-json"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json/-/package-json-1.2.0.tgz"; + sha1 = "c8ecac094227cdf76a316874ed05e27cc939a0e0"; + }; + }; "package-json-4.0.1" = { name = "package-json"; packageName = "package-json"; @@ -37875,13 +38469,13 @@ let sha512 = "bjnliEOmGv3y1aMEfREMBJ9tfL3WR0i0CKPj61DnSLaoxWR3nLrsQrEbCId/8rF4NyRF0cCqisSVXyQYWM+mCQ=="; }; }; - "parse-english-4.1.3" = { + "parse-english-4.2.0" = { name = "parse-english"; packageName = "parse-english"; - version = "4.1.3"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/parse-english/-/parse-english-4.1.3.tgz"; - sha512 = "IQl1v/ik9gw437T8083coohMihae0rozpc7JYC/9h6hi9xKBSxFwh5HWRpzVC2ZhEs2nUlze2aAktpNBJXdJKA=="; + url = "https://registry.npmjs.org/parse-english/-/parse-english-4.2.0.tgz"; + sha512 = "jw5N6wZUZViIw3VLG/FUSeL3vDhfw5Q2g4E3nYC69Mm5ANbh9ZWd+eligQbeUoyObZM8neynTn3l14e09pjEWg=="; }; }; "parse-entities-1.2.2" = { @@ -38019,13 +38613,13 @@ let sha512 = "+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ=="; }; }; - "parse-latin-4.2.1" = { + "parse-latin-4.3.0" = { name = "parse-latin"; packageName = "parse-latin"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/parse-latin/-/parse-latin-4.2.1.tgz"; - sha512 = "7T9g6mIsFFpLlo0Zzb2jLWdCt+H9Qtf/hRmMYFi/Mq6Ovi+YKo+AyDFX3OhFfu0vXX5Nid9FKJGKSSzNcTkWiA=="; + url = "https://registry.npmjs.org/parse-latin/-/parse-latin-4.3.0.tgz"; + sha512 = "TYKL+K98dcAWoCw/Ac1yrPviU8Trk+/gmjQVaoWEFDZmVD4KRg6c/80xKqNNFQObo2mTONgF8trzAf2UTwKafw=="; }; }; "parse-link-header-1.0.1" = { @@ -38451,6 +39045,15 @@ let sha512 = "BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="; }; }; + "path-browserify-1.0.1" = { + name = "path-browserify"; + packageName = "path-browserify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz"; + sha512 = "b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g=="; + }; + }; "path-case-3.0.3" = { name = "path-case"; packageName = "path-case"; @@ -39523,13 +40126,13 @@ let sha512 = "7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA=="; }; }; - "postcss-load-config-2.1.2" = { + "postcss-load-config-3.0.0" = { name = "postcss-load-config"; packageName = "postcss-load-config"; - version = "2.1.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz"; - sha512 = "/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw=="; + url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.0.0.tgz"; + sha512 = "lErrN8imuEF1cSiHBV8MiR7HeuzlDpCGNtaMyYHlOBuJHHOGw6S4xOMZp8BbXPr7AGQp14L6PZDlIOpfFJ6f7w=="; }; }; "postcss-media-query-parser-0.2.3" = { @@ -39991,13 +40594,13 @@ let sha512 = "C2hrAPzmRdpuL3iH0TDdQ6XCc9M7Dcc3zEW5BLerY65G4tWWszwv6nG/ksi6ul5i2mx22ubdljgktXCtNkydkw=="; }; }; - "posthtml-0.13.3" = { + "posthtml-0.13.4" = { name = "posthtml"; packageName = "posthtml"; - version = "0.13.3"; + version = "0.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/posthtml/-/posthtml-0.13.3.tgz"; - sha512 = "5NL2bBc4ihAyoYnY0EAQrFQbJNE1UdvgC1wjYts0hph7jYeU2fa5ki3/9U45ce9V6M1vLMEgUX2NXe/bYL+bCQ=="; + url = "https://registry.npmjs.org/posthtml/-/posthtml-0.13.4.tgz"; + sha512 = "i2oTo/+dwXGC6zaAQSF6WZEQSbEqu10hsvg01DWzGAfZmy31Iiy9ktPh9nnXDfZiYytjxTIvxoK4TI0uk4QWpw=="; }; }; "posthtml-parser-0.4.2" = { @@ -40027,6 +40630,15 @@ let sha512 = "rGGayND//VwTlsYKNqdILsA7U/XP0WJa6SMcdAEoqc2WRM5QExplGg/h9qbTuHz7mc2PvaXU+6iNxItvr5aHMg=="; }; }; + "prebuild-install-5.3.0" = { + name = "prebuild-install"; + packageName = "prebuild-install"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.0.tgz"; + sha512 = "aaLVANlj4HgZweKttFNUVNRxDukytuIuxeK2boIMHjagNJCiVKWFsKF4tCE3ql3GbrD2tExPQ7/pwtEJcHNZeg=="; + }; + }; "prebuild-install-5.3.3" = { name = "prebuild-install"; packageName = "prebuild-install"; @@ -40333,13 +40945,13 @@ let sha512 = "dG2w7WtovUa4SiYTdWn9H8Bd4JNdei2djtkP/Bk9fXq81j5Q15ZPHYSwhUVvBRbp5zMkGtu0Yk62HuMcly0pRw=="; }; }; - "prismjs-1.21.0" = { + "prismjs-1.22.0" = { name = "prismjs"; packageName = "prismjs"; - version = "1.21.0"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/prismjs/-/prismjs-1.21.0.tgz"; - sha512 = "uGdSIu1nk3kej2iZsLyDoJ7e9bnPzIgY0naW/HdknGj61zScaprVEVGHrPoXqI+M9sP0NDnTK2jpkvmldpuqDw=="; + url = "https://registry.npmjs.org/prismjs/-/prismjs-1.22.0.tgz"; + sha512 = "lLJ/Wt9yy0AiSYBf212kK3mM5L8ycwlyTlSxHBAneXLR0nzFMlZ5y7riFPF3E33zXOF2IH95xdY5jIyZbM9z/w=="; }; }; "private-0.1.8" = { @@ -40666,13 +41278,13 @@ let sha1 = "159fb06193d32003f4b3691dd2ec1a634aa80d1d"; }; }; - "property-information-5.5.0" = { + "property-information-5.6.0" = { name = "property-information"; packageName = "property-information"; - version = "5.5.0"; + version = "5.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/property-information/-/property-information-5.5.0.tgz"; - sha512 = "RgEbCx2HLa1chNgvChcx+rrCWD0ctBmGSE0M7lVm1yyv4UbvbrWoXp/BkVLZefzjrRBGW8/Js6uh/BnlHXFyjA=="; + url = "https://registry.npmjs.org/property-information/-/property-information-5.6.0.tgz"; + sha512 = "YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA=="; }; }; "proto-list-1.2.4" = { @@ -40756,6 +41368,15 @@ let sha512 = "WudaR0eTsDx33O3EJE16PjBRZWcX8GqCEeERw1W3hZJgH/F2a46g7jty6UGty6NeJ4CKQy8ds2CJPMiyeqaTvw=="; }; }; + "proxy-agent-4.0.0" = { + name = "proxy-agent"; + packageName = "proxy-agent"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-4.0.0.tgz"; + sha512 = "8P0Y2SkwvKjiGU1IkEfYuTteioMIDFxPL4/j49zzt5Mz3pG1KO+mIrDG1qH0PQUHTTczjwGcYl+EzfXiFj5vUQ=="; + }; + }; "proxy-from-env-1.1.0" = { name = "proxy-from-env"; packageName = "proxy-from-env"; @@ -41800,6 +42421,15 @@ let sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw=="; }; }; + "query-string-6.13.5" = { + name = "query-string"; + packageName = "query-string"; + version = "6.13.5"; + src = fetchurl { + url = "https://registry.npmjs.org/query-string/-/query-string-6.13.5.tgz"; + sha512 = "svk3xg9qHR39P3JlHuD7g3nRnyay5mHbrPctEBDUxUkHRifPHXJDhBUycdCC0NBjXoDf44Gb+IsOZL1Uwn8M/Q=="; + }; + }; "querystring-0.2.0" = { name = "querystring"; packageName = "querystring"; @@ -42187,13 +42817,13 @@ let sha512 = "C0SIXdXDSus2yqqvV7qifnb4NoWP7mEBXJq3axci301mXHCZb8Djwm4hrEZo4UeXRaEnfjH98uQ8EBppk2oNWA=="; }; }; - "react-16.13.1" = { + "react-16.14.0" = { name = "react"; packageName = "react"; - version = "16.13.1"; + version = "16.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/react/-/react-16.13.1.tgz"; - sha512 = "YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w=="; + url = "https://registry.npmjs.org/react/-/react-16.14.0.tgz"; + sha512 = "0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g=="; }; }; "react-dev-utils-10.2.1" = { @@ -42214,13 +42844,13 @@ let sha512 = "3Lv3nI8FPAwKqUco35oOlgf+4j8mgYNnIcDv2QTfxEqg2G69q17ZJ8ScU9aBnymS28YC1OW+kTxLmdIQeTN8yg=="; }; }; - "react-dom-16.13.1" = { + "react-dom-16.14.0" = { name = "react-dom"; packageName = "react-dom"; - version = "16.13.1"; + version = "16.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/react-dom/-/react-dom-16.13.1.tgz"; - sha512 = "81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag=="; + url = "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz"; + sha512 = "1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw=="; }; }; "react-dropdown-1.9.0" = { @@ -42313,6 +42943,15 @@ let sha1 = "b3da19bd052431a97671d44a42634adf710b40c4"; }; }; + "read-all-stream-3.1.0" = { + name = "read-all-stream"; + packageName = "read-all-stream"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz"; + sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa"; + }; + }; "read-cache-1.0.0" = { name = "read-cache"; packageName = "read-cache"; @@ -42601,6 +43240,15 @@ let sha512 = "0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ=="; }; }; + "readdirp-3.5.0" = { + name = "readdirp"; + packageName = "readdirp"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz"; + sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ=="; + }; + }; "readline-1.3.0" = { name = "readline"; packageName = "readline"; @@ -42664,13 +43312,13 @@ let sha512 = "XNvYvkfdAN9QewbrxeTOjgINkdY/odTgTS56ZNEWL9Ml0weT4T3sFtvnTuF+Gxyu46ANcRm1ntrF6F5LAJPAaQ=="; }; }; - "recast-0.20.3" = { + "recast-0.20.4" = { name = "recast"; packageName = "recast"; - version = "0.20.3"; + version = "0.20.4"; src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.20.3.tgz"; - sha512 = "jrEPzRV5B7wfRiN0UYMtjgIx1Hp8MRHdLcMYqMNd0DoOe1CB5JmPL/04I7WPuuApCs7LCSisYK/FfKnPEaJrzw=="; + url = "https://registry.npmjs.org/recast/-/recast-0.20.4.tgz"; + sha512 = "6qLIBGGRcwjrTZGIiBpJVC/NeuXpogXNyRQpqU1zWPUigCphvApoCs9KIwDYh1eDuJ6dAFlQoi/QUyE5KQ6RBQ=="; }; }; "rechoir-0.6.2" = { @@ -42682,6 +43330,15 @@ let sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; }; }; + "rechoir-0.7.0" = { + name = "rechoir"; + packageName = "rechoir"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz"; + sha512 = "ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q=="; + }; + }; "record-cache-1.1.0" = { name = "record-cache"; packageName = "record-cache"; @@ -42772,6 +43429,15 @@ let sha1 = "258c78efd153ddf93cb561237f61184f3696e327"; }; }; + "reduce-flatten-2.0.0" = { + name = "reduce-flatten"; + packageName = "reduce-flatten"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-2.0.0.tgz"; + sha512 = "EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w=="; + }; + }; "redux-3.7.2" = { name = "redux"; packageName = "redux"; @@ -43294,6 +43960,15 @@ let sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; }; }; + "repeating-1.1.3" = { + name = "repeating"; + packageName = "repeating"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz"; + sha1 = "3d4114218877537494f97f77f9785fab810fa4ac"; + }; + }; "repeating-2.0.1" = { name = "repeating"; packageName = "repeating"; @@ -43582,6 +44257,15 @@ let sha1 = "00a9f7387556e27038eae232caa372a6a59b665a"; }; }; + "resolve-cwd-3.0.0" = { + name = "resolve-cwd"; + packageName = "resolve-cwd"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz"; + sha512 = "OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg=="; + }; + }; "resolve-dir-1.0.1" = { name = "resolve-dir"; packageName = "resolve-dir"; @@ -44032,13 +44716,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.28.2" = { + "rollup-2.30.0" = { name = "rollup"; packageName = "rollup"; - version = "2.28.2"; + version = "2.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.28.2.tgz"; - sha512 = "8txbsFBFLmm9Xdt4ByTOGa9Muonmc8MfNjnGAR8U8scJlF1ZW7AgNZa7aqBXaKtlvnYP/ab++fQIq9dB9NWUbg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.30.0.tgz"; + sha512 = "j4K1hUZfgFM03DUpayd3c7kZW+2wDbI6rj7ssQxpCpL1vsGpaM0vSorxBuePFwQDFq9O2DI6AOQbm174Awsq4w=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -44527,13 +45211,13 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-1.26.12" = { + "sass-1.27.0" = { name = "sass"; packageName = "sass"; - version = "1.26.12"; + version = "1.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.26.12.tgz"; - sha512 = "hmSwtBOWoS9zwe0yAS+QmaseVCUELiGV22gXHDR7+9stEsVuEuxfY1GhC8XmUpC+Ir3Hwq7NxSUNbnmkznnF7g=="; + url = "https://registry.npmjs.org/sass/-/sass-1.27.0.tgz"; + sha512 = "0gcrER56OkzotK/GGwgg4fPrKuiFlPNitO7eUJ18Bs+/NBlofJfMxmxqpqJxjae9vu0Wq8TZzrSyxZal00WDig=="; }; }; "sass-formatter-0.4.15" = { @@ -44644,6 +45328,15 @@ let sha512 = "SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg=="; }; }; + "schema-utils-3.0.0" = { + name = "schema-utils"; + packageName = "schema-utils"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz"; + sha512 = "6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA=="; + }; + }; "scoped-regex-1.0.0" = { name = "scoped-regex"; packageName = "scoped-regex"; @@ -45877,13 +46570,13 @@ let sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; }; }; - "slug-3.3.5" = { + "slug-3.5.1" = { name = "slug"; packageName = "slug"; - version = "3.3.5"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/slug/-/slug-3.3.5.tgz"; - sha512 = "d/9yTbJDtSIhJThaNRP/U5uxwCl0mWIlV42JmKSfvg8t7DiVt69G8rAWTc0FWhaQOier0fiNAWVs7ctvVhK1RA=="; + url = "https://registry.npmjs.org/slug/-/slug-3.5.1.tgz"; + sha512 = "ei0JnJzg8HKhLunZy+vpNlILRRradfaAQ+p2YEI4b4r8yX/5TlFi1JSwcYQCg7INZxdTC43BT68rHMkRxzn7Xg=="; }; }; "slugid-1.1.0" = { @@ -45985,6 +46678,15 @@ let sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="; }; }; + "snappy-6.3.5" = { + name = "snappy"; + packageName = "snappy"; + version = "6.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/snappy/-/snappy-6.3.5.tgz"; + sha512 = "lonrUtdp1b1uDn1dbwgQbBsb5BbaiLeKq+AGwOk2No+en+VvJThwmtztwulEQsLinRF681pBqib0NUZaizKLIA=="; + }; + }; "snapsvg-0.5.1" = { name = "snapsvg"; packageName = "snapsvg"; @@ -46057,13 +46759,13 @@ let sha512 = "FAM56z3bl1iuxeqkCEA/jyZ2hpwkQK8xQxQbhR+QppEK5lole7w1PQyWYgZAJ9oRY/BU32zdRAJwGuZbhk7G2Q=="; }; }; - "snyk-gradle-plugin-3.9.0" = { + "snyk-gradle-plugin-3.10.0" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "3.9.0"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.9.0.tgz"; - sha512 = "oux2M/GhnfyZW3ngs3BO/uKlZTVLErGBY83j6ctGti3d54Ax8GZvS6iHjXd3FNrTd+9o5mfFzZyUHq/ujiakMw=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.10.0.tgz"; + sha512 = "G33nwUIVALII7mHqKuIxLh1Qj2qsOFd6vbnu4d6lPISVCH9TRBTvirPaVnybWgrO2TWvzZ+jXsZHhG++8kLpXQ=="; }; }; "snyk-module-1.9.1" = { @@ -46093,13 +46795,13 @@ let sha512 = "HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw=="; }; }; - "snyk-mvn-plugin-2.22.0" = { + "snyk-mvn-plugin-2.23.0" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.22.0"; + version = "2.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.22.0.tgz"; - sha512 = "5gs9SPN3niqJWktfsZFw31bqAAQ85MfJWrTurdGjjn2RHtdOfirc68VrJNY4gFJdFrlkWzxKm2kEzJIs5MCsdQ=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.23.0.tgz"; + sha512 = "aCmXPRvK89bcRNKjtU6mCqe6tnKaSR++/Co3V1XjqfJSRDiZ+c7A0LdtpTkRF/HbVdzZVHJ8glOn67yO/VGKhQ=="; }; }; "snyk-nodejs-lockfile-parser-1.28.1" = { @@ -46903,6 +47605,15 @@ let sha512 = "gaIdhbqxkB5/VflPXsJwZvEzh/kdwiRPF9iqpkxX4us+lzB8INedFwjCyo6vwuz5x2Ddlnav2zh270CEjCG8mA=="; }; }; + "split-on-first-1.1.0" = { + name = "split-on-first"; + packageName = "split-on-first"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz"; + sha512 = "43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw=="; + }; + }; "split-skip-0.0.1" = { name = "split-skip"; packageName = "split-skip"; @@ -47173,13 +47884,13 @@ let sha512 = "FPeyYU/3LpxcagnbmVWE+Q/qzg6keqeOBPbD7sEH9UKixUASeufPKiORDgh8nVX7J9Z+0vUaHt/WG999kGjvVQ=="; }; }; - "ssb-links-3.0.9" = { + "ssb-links-3.0.10" = { name = "ssb-links"; packageName = "ssb-links"; - version = "3.0.9"; + version = "3.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-links/-/ssb-links-3.0.9.tgz"; - sha512 = "jb1wqknz+AMqD9CxpjfDhII5Vz5JRVY9MakTrgKCrBFqLIPhqHq9bScei0zY0IBWjpSflI0juqOhpki38pWBHA=="; + url = "https://registry.npmjs.org/ssb-links/-/ssb-links-3.0.10.tgz"; + sha512 = "p6rH5dcwebRnwGRBfBpkOV49ZLLApGX+hppHwJtBsWKTXIKZFu4+9pGuRHmC1UNa+B5A2wELjo4Ru1AMQdYGwA=="; }; }; "ssb-local-1.0.0" = { @@ -47722,6 +48433,15 @@ let sha512 = "nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg=="; }; }; + "stream-browserify-3.0.0" = { + name = "stream-browserify"; + packageName = "stream-browserify"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz"; + sha512 = "H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA=="; + }; + }; "stream-buffers-2.2.0" = { name = "stream-buffers"; packageName = "stream-buffers"; @@ -47956,6 +48676,15 @@ let sha1 = "279b225df1d582b1f54e65addd4352e18faa0713"; }; }; + "strict-uri-encode-2.0.0" = { + name = "strict-uri-encode"; + packageName = "strict-uri-encode"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz"; + sha1 = "b9c7330c7042862f6b142dc274bbcc5866ce3546"; + }; + }; "string-1.6.1" = { name = "string"; packageName = "string"; @@ -48010,6 +48739,15 @@ let sha512 = "lJyXXoptFpgOXL9cWZXtf45jxdbP5qYtaGZsmtFm4CZy9q6wwzvRzQcJiFeLx8I/0RpzBao9WCOGpbyfW2CMWA=="; }; }; + "string-length-1.0.1" = { + name = "string-length"; + packageName = "string-length"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz"; + sha1 = "56970fb1c38558e9e70b728bf3de269ac45adfac"; + }; + }; "string-length-2.0.0" = { name = "string-length"; packageName = "string-length"; @@ -48766,13 +49504,13 @@ let sha512 = "FT3QLMasz0YyCd4uIi5HNe+3t/onxMyEho7C3PSqmti3Twgy2rXT4fmkTz6wRL6bTF4uzPcfkUCa8u4JWHw8Ag=="; }; }; - "superagent-proxy-2.0.0" = { + "superagent-proxy-2.1.0" = { name = "superagent-proxy"; packageName = "superagent-proxy"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-2.0.0.tgz"; - sha512 = "TktJma5jPdiH1BNN+reF/RMW3b8aBTCV7KlLFV0uYcREgNf3pvo7Rdt564OcFHwkGb3mYEhHuWPBhSbOwiNaYw=="; + url = "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-2.1.0.tgz"; + sha512 = "DnarpKN6Xn8e3pYlFV4Yvsj9yxLY4q5FIsUe5JvN7vjzP+YCfzXv03dTkZSD2yzrSadsNYHf0IgOUJwKjX457A=="; }; }; "supports-color-0.2.0" = { @@ -48901,6 +49639,15 @@ let sha1 = "58f71cee3bd519b59d4b2a843b6c7de64ac04764"; }; }; + "svgo-0.6.6" = { + name = "svgo"; + packageName = "svgo"; + version = "0.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/svgo/-/svgo-0.6.6.tgz"; + sha1 = "b340889036f20f9b447543077d0f5573ed044c08"; + }; + }; "svgo-1.3.2" = { name = "svgo"; packageName = "svgo"; @@ -49000,13 +49747,13 @@ let sha512 = "hAu/ig5N8i0trXXbrC7rwbXV4DhpEAsZhYXDs1305OjmDgjGC0thINbb0197idy3Pp+B6w7u426SUM43GAP7qw=="; }; }; - "swagger-ui-dist-3.35.0" = { + "swagger-ui-dist-3.35.1" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.35.0"; + version = "3.35.1"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.35.0.tgz"; - sha512 = "VdjOd7Lpj3LU6V/SG9BHZHTJ5cTk+uoyHBrGAeEP70SYf7GflLYqw7USUNxoraEx72vIA1wqogMv4GiRqMr8lA=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.35.1.tgz"; + sha512 = "ltrCX8+YWsqDBvCdLJwnO6VsgjV/uzLm+cTEUe0DZ1fAXIxUnNjvE/aAjXiRfNppUnCbUgZvJK1LYPAjF7W1XA=="; }; }; "swagger2openapi-5.4.0" = { @@ -49018,13 +49765,13 @@ let sha512 = "f5QqfXawiVijhjMtYqWZ55ESHPZFqrPC8L9idhIiuSX8O2qsa1i4MVGtCM3TQF+Smzr/6WfT/7zBuzG3aTgPAA=="; }; }; - "swagger2openapi-7.0.2" = { + "swagger2openapi-7.0.3" = { name = "swagger2openapi"; packageName = "swagger2openapi"; - version = "7.0.2"; + version = "7.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/swagger2openapi/-/swagger2openapi-7.0.2.tgz"; - sha512 = "EG9h+hq+mX4S6mh0IHf/K4Bd8cLFVvRFxt6YiuoQCKycbCoa8Cjr8hbzy1oDNpGYwjT29js/PrHffgJDuDlgQw=="; + url = "https://registry.npmjs.org/swagger2openapi/-/swagger2openapi-7.0.3.tgz"; + sha512 = "JSFUmXSR7Qx9WwSKCEqaL4oQfhLLCU2r8Zgf30g15FdSkihItZ6fKFnqSsfqQ6MsmnLlcBf8+OhnQHbi1R0ydg=="; }; }; "sway-1.0.0" = { @@ -49081,6 +49828,15 @@ let sha512 = "e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="; }; }; + "symbol-observable-2.0.3" = { + name = "symbol-observable"; + packageName = "symbol-observable"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-2.0.3.tgz"; + sha512 = "sQV7phh2WCYAn81oAkakC5qjq2Ml0g8ozqz03wOGnx9dDlG1de6yrF+0RAzSJD8fPUow3PTSMf2SAbOGxb93BA=="; + }; + }; "symbol-tree-3.2.4" = { name = "symbol-tree"; packageName = "symbol-tree"; @@ -49099,13 +49855,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.27.7" = { + "systeminformation-4.27.9" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.27.7"; + version = "4.27.9"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.27.7.tgz"; - sha512 = "3ozUwGSf5jmrhGgOXlX/O6hk1KQ28XPb7d3NiPZX267QmimuDq3TuIgnkw+vICUrGJGKWPLKmXVASnuJ3w07nw=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.27.9.tgz"; + sha512 = "vgyFkDaskUAtheTchR65G08rWZFSHos3Hr15JOGEpHvx+GOmUDy7Xurrq3sWhWuPFjq6mBmzlE1kvkKkDytWOQ=="; }; }; "syswide-cas-5.3.0" = { @@ -49171,6 +49927,15 @@ let sha512 = "zTvf0mcggrGeTe/2jJ6ECkJHAQPIYEwDoqsiqBjI24mvRmQbInK5jq33fyypaCBxX08hMkfmdOqj6haT33EqWw=="; }; }; + "table-layout-1.0.1" = { + name = "table-layout"; + packageName = "table-layout"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/table-layout/-/table-layout-1.0.1.tgz"; + sha512 = "dEquqYNJiGwY7iPfZ3wbXDI944iqanTSchrACLL2nOB+1r+h1Nzu2eH+DuPPvWvm5Ry7iAPeFlgEtP5bIp5U7Q=="; + }; + }; "tabtab-1.3.2" = { name = "tabtab"; packageName = "tabtab"; @@ -49253,6 +50018,15 @@ let sha512 = "4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="; }; }; + "tapable-2.0.0" = { + name = "tapable"; + packageName = "tapable"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tapable/-/tapable-2.0.0.tgz"; + sha512 = "bjzn0C0RWoffnNdTzNi7rNDhs1Zlwk2tRXgk8EiHKAOX1Mag3d6T0Y5zNa7l9CJ+EoUne/0UHdwS8tMbkh9zDg=="; + }; + }; "tape-2.3.3" = { name = "tape"; packageName = "tape"; @@ -49325,6 +50099,15 @@ let sha512 = "0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg=="; }; }; + "tar-fs-1.16.3" = { + name = "tar-fs"; + packageName = "tar-fs"; + version = "1.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.3.tgz"; + sha512 = "NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw=="; + }; + }; "tar-fs-2.1.0" = { name = "tar-fs"; packageName = "tar-fs"; @@ -49577,13 +50360,13 @@ let sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; }; }; - "terser-5.3.4" = { + "terser-5.3.5" = { name = "terser"; packageName = "terser"; - version = "5.3.4"; + version = "5.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.3.4.tgz"; - sha512 = "dxuB8KQo8Gt6OVOeLg/rxfcxdNZI/V1G6ze1czFUzPeCFWZRtvZMgSzlZZ5OYBZ4HoG607F6pFPNLekJyV+yVw=="; + url = "https://registry.npmjs.org/terser/-/terser-5.3.5.tgz"; + sha512 = "Qw3CZAMmmfU824AoGKalx+riwocSI5Cs0PoGp9RdSLfmxkmJgyBxqLBP/isDNtFyhHnitikvRMZzyVgeq+U+Tg=="; }; }; "terser-webpack-plugin-1.4.5" = { @@ -49613,6 +50396,15 @@ let sha512 = "cjdZte66fYkZ65rQ2oJfrdCAkkhJA7YLYk5eGOcGCSGlq0ieZupRdjedSQXYknMPo2IveQL+tPdrxUkERENCFA=="; }; }; + "terser-webpack-plugin-4.2.3" = { + name = "terser-webpack-plugin"; + packageName = "terser-webpack-plugin"; + version = "4.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz"; + sha512 = "jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ=="; + }; + }; "test-exclude-6.0.0" = { name = "test-exclude"; packageName = "test-exclude"; @@ -49928,6 +50720,15 @@ let sha1 = "99c5bf55958966af6d06d83bdf3800dc82faec5d"; }; }; + "timed-out-2.0.0" = { + name = "timed-out"; + packageName = "timed-out"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz"; + sha1 = "f38b0ae81d3747d628001f41dafc652ace671c0a"; + }; + }; "timed-out-4.0.1" = { name = "timed-out"; packageName = "timed-out"; @@ -50846,13 +51647,13 @@ let sha512 = "aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA=="; }; }; - "tslib-1.14.0" = { + "tslib-1.14.1" = { name = "tslib"; packageName = "tslib"; - version = "1.14.0"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.14.0.tgz"; - sha512 = "+Zw5lu0D9tvBMjGP8LpvMb0u2WW2QV3y+D8mO6J+cNzCYIN4sVy43Bf9vl92nqFahutN0I8zHa7cc4vihIshnw=="; + url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"; + sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; "tslib-1.9.3" = { @@ -50873,6 +51674,15 @@ let sha512 = "wAH28hcEKwna96/UacuWaVspVLkg4x1aDM9JlzqaQTOFczCktkVAb5fmXChgandR1EraDPs2w8P+ozM+oafwxg=="; }; }; + "tslib-2.0.3" = { + name = "tslib"; + packageName = "tslib"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz"; + sha512 = "uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="; + }; + }; "tslint-5.20.1" = { name = "tslint"; packageName = "tslint"; @@ -51134,6 +51944,15 @@ let sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="; }; }; + "type-fest-0.10.0" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.10.0.tgz"; + sha512 = "EUV9jo4sffrwlg8s0zDhP0T2WD3pru5Xi0+HTE3zTUmBaZNhfkite9PdSJwdXLwPVW0jnAHT56pZHIOYckPEiw=="; + }; + }; "type-fest-0.11.0" = { name = "type-fest"; packageName = "type-fest"; @@ -51341,6 +52160,15 @@ let sha1 = "5c080e5d661cbbe38259d2e70a3c7253e873881d"; }; }; + "typical-5.2.0" = { + name = "typical"; + packageName = "typical"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz"; + sha512 = "dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg=="; + }; + }; "typo-geom-0.8.4" = { name = "typo-geom"; packageName = "typo-geom"; @@ -51386,22 +52214,13 @@ let sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; - "uglify-js-3.10.0" = { + "uglify-js-3.11.2" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.10.0"; + version = "3.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.0.tgz"; - sha512 = "Esj5HG5WAyrLIdYU74Z3JdG2PxdIusvj6IWHMtlyESxc7kcDz7zYlYjpnSokn1UbpV0d/QX9fan7gkCNd/9BQA=="; - }; - }; - "uglify-js-3.11.1" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "3.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.1.tgz"; - sha512 = "OApPSuJcxcnewwjSGGfWOjx3oix5XpmrK9Z2j0fTRlHGoZ49IU6kExfZTM0++fCArOOCet+vIfWwFHbvWqwp6g=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.2.tgz"; + sha512 = "G440NU6fewtnQftSgqRV1r2A5ChKbU1gqFCJ7I8S7MPpY/eZZfLGefaY6gUZYiWebMaO+txgiQ1ZyLDuNWJulg=="; }; }; "uglify-js-3.4.10" = { @@ -52016,6 +52835,15 @@ let sha512 = "TOA6W9QLil+BrHqIZNR4o6IA5QwGOveMbnQxnWYq+7EFORx9vz/CHrtzF36zWrW61E2UKw7sM1KPtIgeceVwXw=="; }; }; + "unist-util-modify-children-2.0.0" = { + name = "unist-util-modify-children"; + packageName = "unist-util-modify-children"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-2.0.0.tgz"; + sha512 = "HGrj7JQo9DwZt8XFsX8UD4gGqOsIlCih9opG6Y+N11XqkBGKzHo8cvDi+MfQQgiZ7zXRUiQREYHhjOBHERTMdg=="; + }; + }; "unist-util-position-3.1.0" = { name = "unist-util-position"; packageName = "unist-util-position"; @@ -52115,6 +52943,15 @@ let sha512 = "lgMIH7XBI6OgYn1woDEmxhGdj8yDefMKg7GkWdeATAlQZFrMrNyxSkpDzY57iY0/6fdlzTbBV03OawvvzG+q7A=="; }; }; + "universal-url-2.0.0" = { + name = "universal-url"; + packageName = "universal-url"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/universal-url/-/universal-url-2.0.0.tgz"; + sha512 = "3DLtXdm/G1LQMCnPj+Aw7uDoleQttNHp2g5FnNQKR6cP6taNWS1b/Ehjjx4PVyvejKi3TJyu8iBraKM4q3JQPg=="; + }; + }; "universal-user-agent-4.0.1" = { name = "universal-user-agent"; packageName = "universal-user-agent"; @@ -52331,6 +53168,15 @@ let sha512 = "6KLU4/dd0Tg/l0xwL+f9V7kEIPSL1vOIbnNnhSLiRDlj4AVG6Ks9Zoc9Jgt9kIgWFPZ/wp2AHgmG7xNf15TJOA=="; }; }; + "update-notifier-0.5.0" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.5.0.tgz"; + sha1 = "07b5dc2066b3627ab3b4f530130f7eddda07a4cc"; + }; + }; "update-notifier-2.5.0" = { name = "update-notifier"; packageName = "update-notifier"; @@ -52520,13 +53366,13 @@ let sha512 = "jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA=="; }; }; - "url-loader-4.1.0" = { + "url-loader-4.1.1" = { name = "url-loader"; packageName = "url-loader"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/url-loader/-/url-loader-4.1.0.tgz"; - sha512 = "IzgAAIC8wRrg6NYkFIJY09vtktQcsvU8V6HhtQj9PTefbYImzLB1hufqo4m+RyM5N3mLx5BqJKccgxJS+W3kqw=="; + url = "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz"; + sha512 = "3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA=="; }; }; "url-parse-1.4.7" = { @@ -52619,13 +53465,13 @@ let sha512 = "D98YM9dKGHzNFUuqLHLV1vXqbHNfyvTx/rADtvF9P6D1HYV/0JuArlpnQIHhOuWXQGUVyR5XJGRVLKbeNu0o5A=="; }; }; - "ut_pex-2.0.0" = { + "ut_pex-2.0.1" = { name = "ut_pex"; packageName = "ut_pex"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ut_pex/-/ut_pex-2.0.0.tgz"; - sha512 = "Uc0IxXGlES1DfeG+ITUISAvCF4Uldj7tt/n7s3TBt0KyXqDViOO26X5WfwXtUpEwn8fyZyerzf/YOK4rIZ2S3Q=="; + url = "https://registry.npmjs.org/ut_pex/-/ut_pex-2.0.1.tgz"; + sha512 = "kI1/y1IhbuTqjyVqekSZCd3afPQTpdIRCrON1WXc9jGdcIAaze3FAoZ1ssYJmGBuJbdg7LQO42daJGCaoRXl+A=="; }; }; "utf-8-validate-1.2.2" = { @@ -52718,6 +53564,15 @@ let sha512 = "HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ=="; }; }; + "util-0.12.3" = { + name = "util"; + packageName = "util"; + version = "0.12.3"; + src = fetchurl { + url = "https://registry.npmjs.org/util/-/util-0.12.3.tgz"; + sha512 = "I8XkoQwE+fPQEhy9v012V+TSdH2kp9ts29i20TaaDUXsg7x/onePbhFJUExBfv/2ay1ZOp/Vsm3nDlmnFGSAog=="; + }; + }; "util-0.4.9" = { name = "util"; packageName = "util"; @@ -53348,15 +54203,6 @@ let sha512 = "OSyNYwMJ8FayTTNU/gohprbt1EFQBpoiMPP9p2vqo1O9z45XVnotQ92jYHAhraI6gWiMIIfo4OjPbSe/GX7etg=="; }; }; - "vega-util-1.15.3" = { - name = "vega-util"; - packageName = "vega-util"; - version = "1.15.3"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-util/-/vega-util-1.15.3.tgz"; - sha512 = "NCbfCPMVgdP4geLrFtCDN9PTEXrgZgJBBLvpyos7HGv2xSe9bGjDCysv6qcueHrc1myEeCQzrHDFaShny6wXDg=="; - }; - }; "vega-util-1.16.0" = { name = "vega-util"; packageName = "vega-util"; @@ -53780,13 +54626,13 @@ let sha512 = "b2b+0oHvPmBHygDtOXX3xBvpQCa6eIQSvXnGDNSDmIC1894ZTJ2yX10vjplOO/PvV7mwhyvGPwHyY4X2HGxtKw=="; }; }; - "vscode-css-languageservice-4.3.4" = { + "vscode-css-languageservice-4.3.5" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; - version = "4.3.4"; + version = "4.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.3.4.tgz"; - sha512 = "/0HCaxiSL0Rmm3sJ+iyZekljKEYKo1UHSzX4UFOo5VDLgRhKomJf7g1p8glcbCHXB/70IcH8IhKnwlTznf8RPQ=="; + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.3.5.tgz"; + sha512 = "g9Pjxt9T32jhY0nTOo7WRFm0As27IfdaAxcFa8c7Rml1ZqBn3XXbkExjzxY7sBWYm7I1Tp4dK6UHXHoUQHGwig=="; }; }; "vscode-debugadapter-testsupport-1.42.0" = { @@ -53816,13 +54662,13 @@ let sha512 = "X4pzcrJ8dE7M3ArFuySF5fgipKDd/EauXkiJwtjBIVRWpVNq0tF9+lNCyuC7iDUwP3Oq7ow/TGssD3GdG96Jow=="; }; }; - "vscode-emmet-helper-2.0.0" = { + "vscode-emmet-helper-2.0.4" = { name = "vscode-emmet-helper"; packageName = "vscode-emmet-helper"; - version = "2.0.0"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-2.0.0.tgz"; - sha512 = "ytR+Ajxs6zeYI0b4bPsl+nPU8xm852piJUtIwO1ajp1Pw7lwn3VeR+f4ynmxOl9IjfOdF2kW9T/qIkeFbKLwYw=="; + url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-2.0.4.tgz"; + sha512 = "g5yf6RnhGsCymg2YOK2HoK5hyBphB6b5bCEqF/3YwLTMO+9epZnSa6qSzAzz3U68y7IOlmW7ssFP5kOjybcA9g=="; }; }; "vscode-html-languageservice-2.1.12" = { @@ -53834,13 +54680,13 @@ let sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w=="; }; }; - "vscode-json-languageservice-3.9.0" = { + "vscode-json-languageservice-3.9.1" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "3.9.0"; + version = "3.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.9.0.tgz"; - sha512 = "J+2rbntYRLNL9wk0D2iovWo1df3JwYM+5VvWl1omNUgw+XbgpNBwpFZ/TsC1pTCdmpu5RMatXooplXZ8l/Irsg=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.9.1.tgz"; + sha512 = "oJkknkdCVitQ5XPSRa0weHjUxt8eSCptaL+MBQQlRsa6Nb8XnEY0S5wYnLUFHzEvKzwt01/LKk8LdOixWEXkNA=="; }; }; "vscode-jsonrpc-3.5.0" = { @@ -54275,13 +55121,13 @@ let sha512 = "Bvjlx7rH1Ulvus56KHeLXOjEi3JMOYTa1GAqZr9lBQhd8weK8mV7U7V2l85yokBZEWHJQjLn6X3nosY8TzkOKg=="; }; }; - "vue-eslint-parser-7.1.0" = { + "vue-eslint-parser-7.1.1" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; - version = "7.1.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.1.0.tgz"; - sha512 = "Kr21uPfthDc63nDl27AGQEhtt9VrZ9nkYk/NTftJ2ws9XiJwzJJCnCr3AITQ2jpRMA0XPGDECxYH8E027qMK9Q=="; + url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.1.1.tgz"; + sha512 = "8FdXi0gieEwh1IprIBafpiJWcApwrU+l2FEj8c1HtHFdNXMd0+2jUSjBVmcQYohf/E72irwAXEXLga6TQcB3FA=="; }; }; "vue-onsenui-helper-json-1.0.2" = { @@ -54374,6 +55220,15 @@ let sha512 = "aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg=="; }; }; + "watchpack-2.0.0" = { + name = "watchpack"; + packageName = "watchpack"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/watchpack/-/watchpack-2.0.0.tgz"; + sha512 = "xSdCxxYZWNk3VK13bZRYhsQpfa8Vg63zXG+3pyU8ouqSLRCv4IGXIp9Kr226q6GBkGRlZrST2wwKtjfKz2m7Cg=="; + }; + }; "watchpack-chokidar2-2.0.0" = { name = "watchpack-chokidar2"; packageName = "watchpack-chokidar2"; @@ -54581,6 +55436,15 @@ let sha512 = "9S6YyKKKh/Oz/eryM1RyLVDVmy3NSPV0JXMRhZ18fJsq+AwGxUY34X54VNwkzYcEmEkDwNxuEOboCZEebJXBAQ=="; }; }; + "webpack-merge-4.2.2" = { + name = "webpack-merge"; + packageName = "webpack-merge"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz"; + sha512 = "TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g=="; + }; + }; "webpack-node-externals-2.5.1" = { name = "webpack-node-externals"; packageName = "webpack-node-externals"; @@ -54599,6 +55463,15 @@ let sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; }; }; + "webpack-sources-2.0.1" = { + name = "webpack-sources"; + packageName = "webpack-sources"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.0.1.tgz"; + sha512 = "A9oYz7ANQBK5EN19rUXbvNgfdfZf5U2gP0769OXsj9CvYkCR6OHOsd6OKyEy4H38GGxpsQPKIL83NC64QY6Xmw=="; + }; + }; "webpack-stream-5.2.1" = { name = "webpack-stream"; packageName = "webpack-stream"; @@ -54653,15 +55526,6 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "websocket-stream-5.5.2" = { - name = "websocket-stream"; - packageName = "websocket-stream"; - version = "5.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.5.2.tgz"; - sha512 = "8z49MKIHbGk3C4HtuHWDtYX8mYej1wWabjthC/RupM9ngeukU4IWoM46dgth1UOS/T4/IqgEdCDJuMe2039OQQ=="; - }; - }; "webtorrent-0.108.6" = { name = "webtorrent"; packageName = "webtorrent"; @@ -54689,6 +55553,15 @@ let sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw=="; }; }; + "whatwg-fetch-3.4.1" = { + name = "whatwg-fetch"; + packageName = "whatwg-fetch"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.4.1.tgz"; + sha512 = "sofZVzE1wKwO+EYPbWfiwzaKovWiZXf4coEzjGP9b2GBVgQRLQUZ2QcuPpQExGDAW5GItpEm6Tl4OU5mywnAoQ=="; + }; + }; "whatwg-mimetype-2.3.0" = { name = "whatwg-mimetype"; packageName = "whatwg-mimetype"; @@ -54752,6 +55625,15 @@ let sha1 = "c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82"; }; }; + "whet.extend-0.9.9" = { + name = "whet.extend"; + packageName = "whet.extend"; + version = "0.9.9"; + src = fetchurl { + url = "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz"; + sha1 = "f877d5bf648c97e5aa542fadc16d6a259b9c11a1"; + }; + }; "which-1.2.4" = { name = "which"; packageName = "which"; @@ -55112,6 +55994,15 @@ let sha512 = "mO8XtqyPvykVCsrwj5MlOVWvSnCdT+C+QVbm6blradR7JExAhbkZ7hZ9A+9NUtwzSqrlUo9a67ws0EiILrvRpw=="; }; }; + "wordwrapjs-4.0.0" = { + name = "wordwrapjs"; + packageName = "wordwrapjs"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-4.0.0.tgz"; + sha512 = "Svqw723a3R34KvsMgpjFBYCgNOSdcW3mQFK4wIfhGQhtaFVOJmdYoXgi63ne3dTlWgatVcUc7t4HtQ/+bUVIzQ=="; + }; + }; "workbox-background-sync-3.6.3" = { name = "workbox-background-sync"; packageName = "workbox-background-sync"; @@ -55373,6 +56264,15 @@ let sha512 = "/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig=="; }; }; + "write-file-atomic-1.3.4" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz"; + sha1 = "f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"; + }; + }; "write-file-atomic-2.4.3" = { name = "write-file-atomic"; packageName = "write-file-atomic"; @@ -55950,13 +56850,13 @@ let sha512 = "3MgPdaXV8rfQ/pNn16Eio6VXYPTkqwa0vc7GkiymmY/DqR1SE/7VPAAVZz1GJsJFrllMYO3RHfEaiUGjab6TNw=="; }; }; - "xstream-11.13.0" = { + "xstream-11.14.0" = { name = "xstream"; packageName = "xstream"; - version = "11.13.0"; + version = "11.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/xstream/-/xstream-11.13.0.tgz"; - sha512 = "IiTO53rJ+Y5Jj7qMq0f3nwWU1KsajkJkzudTXJa/f3DQ1ifw5O6z/IFZuYF4osfPKhU85jyGaSfY3zqdiMNTVw=="; + url = "https://registry.npmjs.org/xstream/-/xstream-11.14.0.tgz"; + sha512 = "1bLb+kKKtKPbgTK6i/BaoAn03g47PpFstlbe1BA+y3pNS/LfvcaghS5BFf9+EE1J+KwSQsEpfJvFN5GqFtiNmw=="; }; }; "xtend-2.0.6" = { @@ -56301,13 +57201,13 @@ let sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4"; }; }; - "yargs-parser-20.2.1" = { + "yargs-parser-20.2.2" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "20.2.1"; + version = "20.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.1.tgz"; - sha512 = "yYsjuSkjbLMBp16eaOt7/siKTjNVjMm3SoJnIg3sEh/JsvqVVDyjRKmaJV4cl+lNIgq6QEco2i3gDebJl7/vLA=="; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.2.tgz"; + sha512 = "XmrpXaTl6noDsf1dKpBuUNCOHqjs0g3jRMXf/ztRxdOmb+er8kE5z5b55Lz3p5u2T8KJ59ENBnASS8/iapVJ5g=="; }; }; "yargs-parser-4.2.1" = { @@ -56577,17 +57477,17 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "10.1.4"; + version = "10.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-10.1.4.tgz"; - sha512 = "Q61cqx3qMAtMugE28aWAtAaj+c31pRjGlq7xSH2LhQSmaGyoAq7v6qah6gqH1Ik8nlpF9T7jBIozKyqX9aXysg=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-10.1.7.tgz"; + sha512 = "0tbeHnPIzSV/z+KlZT7N2J1yMnwQi4xIxvbsANrLjoAxNssse84i9BDdMZYsPoV8wbzcDhFOtt5KmfTO0GIeYQ=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1001.4" - sources."@angular-devkit/core-10.1.4" - sources."@angular-devkit/schematics-10.1.4" - sources."@schematics/angular-10.1.4" - sources."@schematics/update-0.1001.4" + sources."@angular-devkit/architect-0.1001.7" + sources."@angular-devkit/core-10.1.7" + sources."@angular-devkit/schematics-10.1.7" + sources."@schematics/angular-10.1.7" + sources."@schematics/update-0.1001.7" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" sources."agent-base-4.3.0" @@ -56622,7 +57522,7 @@ in sources."chardet-0.7.0" sources."chownr-1.1.4" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.4.0" + sources."cli-spinners-2.5.0" sources."cli-width-3.0.0" sources."clone-1.0.4" sources."color-convert-2.0.1" @@ -56684,7 +57584,7 @@ in sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-symbols-1.0.1" - sources."hosted-git-info-3.0.5" + sources."hosted-git-info-3.0.6" sources."http-cache-semantics-3.8.1" (sources."http-proxy-agent-2.1.0" // { dependencies = [ @@ -56893,7 +57793,7 @@ in sources."through2-2.0.5" sources."tmp-0.0.33" sources."tough-cookie-2.5.0" - sources."tslib-1.14.0" + sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-fest-0.11.0" @@ -57261,7 +58161,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.11.1" + sources."uglify-js-3.11.2" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -57312,7 +58212,7 @@ in sources."acorn-globals-4.3.4" sources."acorn-walk-6.2.0" sources."agent-base-5.1.1" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -57435,7 +58335,7 @@ in sources."tmp-0.0.33" sources."tough-cookie-2.5.0" sources."tr46-1.0.1" - sources."tslib-1.14.0" + sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" @@ -57503,7 +58403,7 @@ in sources."@types/anymatch-1.3.1" sources."@types/json-schema-7.0.6" sources."@types/json5-0.0.29" - sources."@types/node-14.11.5" + sources."@types/node-14.11.8" sources."@types/parse-json-4.0.0" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" @@ -57639,7 +58539,7 @@ in ]; }) sources."cli-cursor-3.1.0" - sources."cli-spinners-2.4.0" + sources."cli-spinners-2.5.0" (sources."cli-table3-0.5.1" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -57916,7 +58816,7 @@ in }) sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nan-2.14.1" + sources."nan-2.14.2" sources."nanomatch-1.2.13" sources."neo-async-2.6.2" sources."nice-try-1.0.5" @@ -58138,7 +59038,7 @@ in sources."chalk-2.4.2" ]; }) - sources."tslib-1.14.0" + sources."tslib-1.14.1" sources."tty-browserify-0.0.0" sources."type-fest-0.11.0" sources."typedarray-0.0.6" @@ -58238,7 +59138,7 @@ in sources."@apollo/federation-0.20.2" (sources."@apollo/protobufjs-1.0.5" // { dependencies = [ - sources."@types/node-10.17.37" + sources."@types/node-10.17.39" ]; }) sources."@apollographql/apollo-tools-0.4.8" @@ -58248,83 +59148,85 @@ in sources."@apollographql/graphql-language-service-utils-2.0.2" sources."@apollographql/graphql-playground-html-1.6.26" sources."@babel/code-frame-7.10.4" - (sources."@babel/compat-data-7.11.0" // { + sources."@babel/compat-data-7.12.0" + (sources."@babel/core-7.12.0" // { dependencies = [ - sources."semver-5.7.1" - ]; - }) - (sources."@babel/core-7.11.6" // { - dependencies = [ - sources."@babel/types-7.11.5" + sources."@babel/generator-7.12.0" + sources."@babel/types-7.12.0" sources."semver-5.7.1" ]; }) (sources."@babel/generator-7.11.6" // { dependencies = [ - sources."@babel/types-7.11.5" + sources."@babel/types-7.12.0" ]; }) sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - (sources."@babel/helper-compilation-targets-7.10.4" // { + (sources."@babel/helper-compilation-targets-7.12.0" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/helper-create-class-features-plugin-7.10.5" - sources."@babel/helper-create-regexp-features-plugin-7.10.4" + sources."@babel/helper-create-class-features-plugin-7.12.0" + sources."@babel/helper-create-regexp-features-plugin-7.12.0" (sources."@babel/helper-define-map-7.10.5" // { dependencies = [ - sources."@babel/types-7.11.5" + sources."@babel/types-7.12.0" ]; }) sources."@babel/helper-explode-assignable-expression-7.11.4" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" - (sources."@babel/helper-member-expression-to-functions-7.11.0" // { + (sources."@babel/helper-member-expression-to-functions-7.12.0" // { dependencies = [ - sources."@babel/types-7.11.5" + sources."@babel/types-7.12.0" ]; }) sources."@babel/helper-module-imports-7.10.4" - (sources."@babel/helper-module-transforms-7.11.0" // { + (sources."@babel/helper-module-transforms-7.12.0" // { dependencies = [ - sources."@babel/types-7.11.5" + sources."@babel/types-7.12.0" ]; }) sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-regex-7.10.5" sources."@babel/helper-remap-async-to-generator-7.11.4" - sources."@babel/helper-replace-supers-7.10.4" + (sources."@babel/helper-replace-supers-7.12.0" // { + dependencies = [ + sources."@babel/types-7.12.0" + ]; + }) sources."@babel/helper-simple-access-7.10.4" (sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" // { dependencies = [ - sources."@babel/types-7.11.5" + sources."@babel/types-7.12.0" ]; }) (sources."@babel/helper-split-export-declaration-7.11.0" // { dependencies = [ - sources."@babel/types-7.11.5" + sources."@babel/types-7.12.0" ]; }) sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/helper-validator-option-7.12.0" sources."@babel/helper-wrap-function-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.5" + sources."@babel/parser-7.12.0" sources."@babel/plugin-proposal-async-generator-functions-7.10.5" sources."@babel/plugin-proposal-class-properties-7.10.4" sources."@babel/plugin-proposal-dynamic-import-7.10.4" - sources."@babel/plugin-proposal-export-namespace-from-7.10.4" + sources."@babel/plugin-proposal-export-namespace-from-7.12.0" sources."@babel/plugin-proposal-json-strings-7.10.4" - sources."@babel/plugin-proposal-logical-assignment-operators-7.11.0" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" - sources."@babel/plugin-proposal-numeric-separator-7.10.4" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.0" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.0" + sources."@babel/plugin-proposal-numeric-separator-7.12.0" sources."@babel/plugin-proposal-object-rest-spread-7.11.0" sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" - sources."@babel/plugin-proposal-optional-chaining-7.11.0" + sources."@babel/plugin-proposal-optional-chaining-7.12.0" sources."@babel/plugin-proposal-private-methods-7.10.4" sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" sources."@babel/plugin-syntax-async-generators-7.8.4" @@ -58358,7 +59260,7 @@ in sources."@babel/plugin-transform-member-expression-literals-7.10.4" sources."@babel/plugin-transform-modules-amd-7.10.5" sources."@babel/plugin-transform-modules-commonjs-7.10.4" - sources."@babel/plugin-transform-modules-systemjs-7.10.5" + sources."@babel/plugin-transform-modules-systemjs-7.12.0" sources."@babel/plugin-transform-modules-umd-7.10.4" sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.4" sources."@babel/plugin-transform-new-target-7.10.4" @@ -58372,30 +59274,31 @@ in sources."@babel/plugin-transform-sticky-regex-7.10.4" sources."@babel/plugin-transform-template-literals-7.10.5" sources."@babel/plugin-transform-typeof-symbol-7.10.4" - sources."@babel/plugin-transform-typescript-7.11.0" + sources."@babel/plugin-transform-typescript-7.12.0" sources."@babel/plugin-transform-unicode-escapes-7.10.4" sources."@babel/plugin-transform-unicode-regex-7.10.4" - (sources."@babel/preset-env-7.11.5" // { + (sources."@babel/preset-env-7.12.0" // { dependencies = [ - sources."@babel/types-7.11.5" + sources."@babel/types-7.12.0" sources."semver-5.7.1" ]; }) sources."@babel/preset-flow-7.10.4" sources."@babel/preset-modules-0.1.4" - sources."@babel/preset-typescript-7.10.4" - (sources."@babel/register-7.11.5" // { + sources."@babel/preset-typescript-7.12.0" + (sources."@babel/register-7.12.0" // { dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.11.2" + sources."@babel/runtime-7.12.0" sources."@babel/template-7.10.4" - (sources."@babel/traverse-7.11.5" // { + (sources."@babel/traverse-7.12.0" // { dependencies = [ - sources."@babel/types-7.11.5" + sources."@babel/generator-7.12.0" + sources."@babel/types-7.12.0" ]; }) sources."@babel/types-7.10.4" @@ -58433,7 +59336,7 @@ in dependencies = [ sources."globby-11.0.1" sources."is-wsl-2.2.0" - sources."tslib-2.0.2" + sources."tslib-2.0.3" ]; }) (sources."@oclif/errors-1.3.3" // { @@ -58478,7 +59381,7 @@ in sources."npm-run-path-3.1.0" sources."path-key-3.1.1" sources."semver-7.3.2" - sources."tslib-2.0.2" + sources."tslib-2.0.3" ]; }) (sources."@oclif/plugin-warn-if-update-available-1.7.0" // { @@ -58526,12 +59429,12 @@ in ]; }) sources."@types/keygrip-1.0.2" - sources."@types/koa-2.11.4" + sources."@types/koa-2.11.5" sources."@types/koa-compose-3.2.5" sources."@types/long-4.0.1" sources."@types/mime-2.0.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.11.5" + sources."@types/node-14.11.8" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.0" @@ -58554,14 +59457,14 @@ in sources."@vue/cli-ui-addon-widgets-4.5.7" (sources."@vue/compiler-core-3.0.0" // { dependencies = [ - sources."@babel/types-7.11.5" + sources."@babel/types-7.12.0" sources."source-map-0.6.1" ]; }) sources."@vue/compiler-dom-3.0.0" (sources."@vue/compiler-sfc-3.0.0" // { dependencies = [ - sources."@babel/types-7.11.5" + sources."@babel/types-7.12.0" sources."source-map-0.6.1" ]; }) @@ -58575,7 +59478,7 @@ in sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" - sources."ajv-6.12.5" + sources."ajv-6.12.6" (sources."ansi-align-2.0.0" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -58625,13 +59528,9 @@ in sources."apollo-client-2.6.10" (sources."apollo-codegen-core-0.38.0" // { dependencies = [ - (sources."recast-0.20.3" // { - dependencies = [ - sources."ast-types-0.14.1" - ]; - }) + sources."recast-0.20.4" sources."source-map-0.6.1" - sources."tslib-2.0.2" + sources."tslib-2.0.3" ]; }) sources."apollo-codegen-flow-0.36.0" @@ -58685,7 +59584,7 @@ in sources."assign-symbols-1.0.0" (sources."ast-types-0.14.2" // { dependencies = [ - sources."tslib-2.0.2" + sources."tslib-2.0.3" ]; }) sources."astral-regex-1.0.0" @@ -58775,7 +59674,7 @@ in sources."callsites-2.0.0" sources."camel-case-4.1.1" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001144" + sources."caniuse-lite-1.0.30001148" sources."capital-case-1.0.3" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" @@ -58820,7 +59719,7 @@ in sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" sources."cli-progress-3.8.2" - sources."cli-spinners-2.4.0" + sources."cli-spinners-2.5.0" (sources."cli-truncate-0.2.1" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -58845,7 +59744,7 @@ in sources."semver-7.3.2" sources."supports-color-7.2.0" sources."supports-hyperlinks-2.1.0" - sources."tslib-2.0.2" + sources."tslib-2.0.3" sources."type-fest-0.11.0" ]; }) @@ -58983,7 +59882,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.578" + sources."electron-to-chromium-1.3.580" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -58995,7 +59894,7 @@ in sources."error-ex-1.3.2" sources."es-abstract-1.17.7" sources."es-to-primitive-1.2.1" - sources."escalade-3.1.0" + sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."esm-3.2.25" @@ -59249,7 +60148,6 @@ in }) sources."interpret-1.4.0" sources."into-stream-2.0.1" - sources."invariant-2.2.4" sources."ipaddr.js-1.9.1" sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" @@ -59337,7 +60235,6 @@ in sources."latest-version-3.1.0" sources."launch-editor-2.2.1" sources."leven-3.1.0" - sources."levenary-1.1.1" sources."lines-and-columns-1.1.6" sources."listr-0.14.3" sources."listr-silent-renderer-1.1.1" @@ -59395,7 +60292,6 @@ in }) sources."loglevel-1.7.0" sources."long-4.0.0" - sources."loose-envify-1.4.0" sources."lowdb-1.0.0" sources."lower-case-2.0.1" sources."lowercase-keys-1.0.1" @@ -59438,7 +60334,7 @@ in sources."moment-2.28.0" sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nan-2.14.1" + sources."nan-2.14.2" sources."nanoid-2.1.11" (sources."nanomatch-1.2.13" // { dependencies = [ @@ -59466,7 +60362,7 @@ in sources."is-wsl-2.2.0" ]; }) - sources."node-releases-1.1.61" + sources."node-releases-1.1.63" (sources."nodemon-1.19.4" // { dependencies = [ sources."debug-3.2.6" @@ -59502,7 +60398,7 @@ in }) sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object-path-0.11.4" + sources."object-path-0.11.5" sources."object-treeify-1.1.28" sources."object-visit-1.0.1" (sources."object.assign-4.1.1" // { @@ -59593,7 +60489,7 @@ in sources."postcss-selector-parser-6.0.4" sources."postcss-value-parser-4.1.0" sources."prepend-http-1.0.4" - sources."prismjs-1.21.0" + sources."prismjs-1.22.0" sources."private-0.1.8" sources."process-exists-3.1.0" sources."process-nextick-args-2.0.1" @@ -59905,7 +60801,7 @@ in sources."trim-repeated-1.0.0" sources."ts-invariant-0.4.4" sources."ts-node-8.10.2" - sources."tslib-1.14.0" + sources."tslib-1.14.1" sources."tty-1.0.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -60177,12 +61073,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/generator-7.11.6" + sources."@babel/generator-7.12.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.5" + sources."@babel/parser-7.12.0" sources."@babel/template-7.10.4" - sources."@babel/types-7.11.5" + sources."@babel/types-7.12.0" sources."@webassemblyjs/ast-1.9.1" sources."@webassemblyjs/floating-point-hex-parser-1.9.1" sources."@webassemblyjs/helper-api-error-1.9.1" @@ -60262,32 +61158,32 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - (sources."@babel/core-7.11.6" // { + (sources."@babel/core-7.12.0" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.11.6" // { + (sources."@babel/generator-7.12.0" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.11.0" + sources."@babel/helper-member-expression-to-functions-7.12.0" sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.11.0" + sources."@babel/helper-module-transforms-7.12.0" sources."@babel/helper-optimise-call-expression-7.10.4" - sources."@babel/helper-replace-supers-7.10.4" + sources."@babel/helper-replace-supers-7.12.0" sources."@babel/helper-simple-access-7.10.4" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.5" + sources."@babel/parser-7.12.0" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.5" - sources."@babel/types-7.11.5" + sources."@babel/traverse-7.12.0" + sources."@babel/types-7.12.0" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -60388,7 +61284,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.11.5" + sources."@types/node-14.11.8" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -60430,7 +61326,7 @@ in ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."array-equal-1.0.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -60704,16 +61600,17 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "16.5.2"; + version = "17.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-16.5.2.tgz"; - sha512 = "TkOR1cQGdmXU9zW4YukWzWVSJwrxmNdADFbqbE3HFgQWe5wqZmOawqZ7J/8MPCwk/W8yY7Y0h+7mOtcZxLP23g=="; + url = "https://registry.npmjs.org/browserify/-/browserify-17.0.0.tgz"; + sha512 = "SaHqzhku9v/j6XsQMRxPyBrSP3gnwmE27gLJYZgMT2GeK3J0+0toN+MnuNYDfHwVGQfLiMZ7KSNSIXHemy905w=="; }; dependencies = [ sources."JSONStream-1.3.5" sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" + sources."array-filter-1.0.0" (sources."asn1.js-5.4.1" // { dependencies = [ sources."bn.js-4.11.9" @@ -60725,6 +61622,7 @@ in sources."util-0.10.3" ]; }) + sources."available-typed-arrays-1.0.2" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" sources."bn.js-5.1.3" @@ -60768,6 +61666,7 @@ in sources."create-hmac-1.1.7" sources."crypto-browserify-3.12.0" sources."dash-ast-1.0.0" + sources."define-properties-1.1.3" sources."defined-1.0.0" sources."deps-sort-2.0.1" sources."des.js-1.0.1" @@ -60784,14 +61683,18 @@ in sources."bn.js-4.11.9" ]; }) - sources."events-2.1.0" + sources."es-abstract-1.17.7" + sources."es-to-primitive-1.2.1" + sources."events-3.2.0" sources."evp_bytestokey-1.0.3" sources."fast-safe-stringify-2.0.7" + sources."foreach-2.0.5" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-assigned-identifiers-1.2.0" sources."glob-7.1.6" sources."has-1.0.3" + sources."has-symbols-1.0.1" (sources."hash-base-3.1.0" // { dependencies = [ sources."readable-stream-3.6.0" @@ -60805,11 +61708,17 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."inline-source-map-0.6.2" - sources."insert-module-globals-7.2.0" + sources."insert-module-globals-7.2.1" + sources."is-arguments-1.0.4" sources."is-buffer-1.1.6" + sources."is-callable-1.2.2" + sources."is-date-object-1.0.2" + sources."is-generator-function-1.0.7" + sources."is-negative-zero-2.0.0" + sources."is-regex-1.1.1" + sources."is-symbol-1.0.3" + sources."is-typed-array-1.1.3" sources."isarray-1.0.0" - sources."json-stable-stringify-0.0.1" - sources."jsonify-0.0.0" sources."jsonparse-1.3.1" sources."labeled-stream-splicer-2.0.2" sources."lodash.memoize-3.0.4" @@ -60826,12 +61735,19 @@ in sources."mkdirp-classic-0.5.3" sources."module-deps-6.2.3" sources."object-assign-4.1.1" + sources."object-inspect-1.8.0" + sources."object-keys-1.1.1" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) sources."once-1.4.0" sources."os-browserify-0.3.0" sources."pako-1.0.11" sources."parents-1.0.1" sources."parse-asn1-5.1.6" - sources."path-browserify-0.0.1" + sources."path-browserify-1.0.1" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" sources."path-platform-0.11.15" @@ -60860,12 +61776,15 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sha.js-2.4.11" - sources."shasum-1.0.2" sources."shasum-object-1.0.0" sources."shell-quote-1.7.2" sources."simple-concat-1.0.1" sources."source-map-0.5.7" - sources."stream-browserify-2.0.2" + (sources."stream-browserify-3.0.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."stream-combiner2-1.1.1" (sources."stream-http-3.1.1" // { dependencies = [ @@ -60873,6 +61792,8 @@ in ]; }) sources."stream-splicer-2.0.1" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimstart-1.0.1" sources."string_decoder-1.3.0" sources."subarg-1.0.0" sources."syntax-error-1.4.0" @@ -60888,13 +61809,10 @@ in sources."punycode-1.3.2" ]; }) - (sources."util-0.10.4" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) + sources."util-0.12.3" sources."util-deprecate-1.0.2" sources."vm-browserify-1.1.2" + sources."which-typed-array-1.1.2" sources."wrappy-1.0.2" sources."xtend-4.0.2" ]; @@ -60928,10 +61846,10 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.23" + sources."@types/node-13.13.25" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ansi-regex-1.1.1" sources."ansi-styles-2.2.1" sources."append-0.1.1" @@ -61360,6 +62278,92 @@ in bypassCache = true; reconstructLock = true; }; + clubhouse-cli = nodeEnv.buildNodePackage { + name = "clubhouse-cli"; + packageName = "clubhouse-cli"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clubhouse-cli/-/clubhouse-cli-2.7.0.tgz"; + sha512 = "Vu0ZPruo16+CbH/kCEALHV3lQ4WnRoaqTb+HPy2fY9ywtdOxPCiT//3WSxv8YN5qFwMbI2Fu931mmU9sR/O0ZA=="; + }; + dependencies = [ + sources."ansi-styles-3.2.1" + sources."async-0.9.2" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."chalk-2.4.2" + sources."cli-spinner-0.2.10" + sources."clubhouse-lib-0.10.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."colors-1.4.0" + sources."commander-2.20.3" + sources."concat-map-0.0.1" + sources."cycle-1.0.3" + sources."debug-4.3.0" + sources."decode-uri-component-0.2.0" + sources."deep-equal-0.2.2" + sources."encoding-0.1.13" + sources."escape-string-regexp-1.0.5" + sources."eyes-0.1.8" + sources."fetch-everywhere-1.0.5" + sources."fs.realpath-1.0.0" + sources."glob-7.1.6" + sources."has-flag-3.0.0" + sources."hasurl-1.0.0" + sources."i-0.3.6" + sources."iconv-lite-0.6.2" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-stream-1.1.0" + sources."isstream-0.1.2" + sources."lodash.sortby-4.7.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."mkdirp-0.5.5" + sources."ms-2.1.2" + sources."mute-stream-0.0.8" + sources."ncp-1.0.1" + sources."node-fetch-1.7.3" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."pkginfo-0.4.1" + sources."prompt-1.0.0" + sources."punycode-2.1.1" + sources."query-string-6.13.5" + sources."read-1.0.7" + sources."revalidator-0.1.8" + sources."rimraf-2.7.1" + sources."safer-buffer-2.1.2" + sources."split-on-first-1.1.0" + sources."stack-trace-0.0.10" + sources."strict-uri-encode-2.0.0" + sources."supports-color-5.5.0" + sources."tr46-1.0.1" + sources."universal-url-2.0.0" + sources."utile-0.3.0" + sources."webidl-conversions-4.0.2" + sources."whatwg-fetch-3.4.1" + sources."whatwg-url-7.1.0" + (sources."winston-2.1.1" // { + dependencies = [ + sources."async-1.0.0" + sources."colors-1.0.3" + sources."pkginfo-0.3.1" + ]; + }) + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A command line tool for viewing, creating and updating clubhouse.io stories"; + homepage = "https://github.com/andjosh/clubhouse-cli#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; coc-css = nodeEnv.buildNodePackage { name = "coc-css"; packageName = "coc-css"; @@ -61403,10 +62407,10 @@ in coc-eslint = nodeEnv.buildNodePackage { name = "coc-eslint"; packageName = "coc-eslint"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.3.1.tgz"; - sha512 = "yiWUByuOtIHs1GnXspO59F5K0QtGYxMmpt8ZC2VvvB3DZZhEbhmBNrcoU66JaJP9y8tCZWTRh1eyobCRBL0pTA=="; + url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.3.2.tgz"; + sha512 = "4eKNFSYkwo2elYrtxRdQbe9HuSLVBYk5uBVHt7VPvEjysAGAZZJ8sUha8gl32mWbSrbbbrbIP1SfOomVJPQeNQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -61446,7 +62450,7 @@ in dependencies = [ sources."isexe-2.0.0" sources."node-fetch-2.6.1" - sources."tslib-2.0.2" + sources."tslib-2.0.3" sources."vscode-uri-2.1.2" sources."which-2.0.2" ]; @@ -61637,7 +62641,7 @@ in sources."fb-watchman-2.0.1" sources."flatted-2.0.2" sources."follow-redirects-1.13.0" - sources."fp-ts-2.8.3" + sources."fp-ts-2.8.4" sources."fs-extra-8.1.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" @@ -61740,7 +62744,7 @@ in sources."strip-json-comments-2.0.1" sources."tar-6.0.5" sources."traverse-0.3.9" - sources."tslib-2.0.2" + sources."tslib-2.0.3" sources."universalify-0.1.2" sources."unzipper-0.10.11" sources."util-deprecate-1.0.2" @@ -61804,7 +62808,7 @@ in sources."@typescript-eslint/visitor-keys-3.10.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" (sources."ansi-align-2.0.0" // { dependencies = [ @@ -61864,7 +62868,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001144" + sources."caniuse-lite-1.0.30001148" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -61961,7 +62965,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.578" + sources."electron-to-chromium-1.3.580" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -62642,7 +63646,7 @@ in sources."trim-newlines-1.0.0" sources."trim-trailing-lines-1.1.3" sources."trough-1.0.5" - sources."tslib-1.14.0" + sources."tslib-1.14.1" (sources."tslint-5.20.1" // { dependencies = [ sources."semver-5.7.1" @@ -62688,7 +63692,7 @@ in sources."vfile-2.3.0" sources."vfile-location-2.0.6" sources."vfile-message-1.1.1" - sources."vue-eslint-parser-7.1.0" + sources."vue-eslint-parser-7.1.1" sources."which-1.3.1" sources."which-module-2.0.0" (sources."widest-line-2.0.1" // { @@ -62878,15 +63882,15 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/core-7.11.6" - sources."@babel/generator-7.11.6" + sources."@babel/core-7.12.0" + sources."@babel/generator-7.12.0" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.11.0" + sources."@babel/helper-member-expression-to-functions-7.12.0" sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.11.0" + sources."@babel/helper-module-transforms-7.12.0" sources."@babel/helper-optimise-call-expression-7.10.4" - sources."@babel/helper-replace-supers-7.10.4" + sources."@babel/helper-replace-supers-7.12.0" sources."@babel/helper-simple-access-7.10.4" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" @@ -62896,10 +63900,10 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.11.5" + sources."@babel/parser-7.12.0" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.5" - sources."@babel/types-7.11.5" + sources."@babel/traverse-7.12.0" + sources."@babel/types-7.12.0" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -62909,7 +63913,7 @@ in sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/unist-2.0.3" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -62924,7 +63928,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001144" + sources."caniuse-lite-1.0.30001148" sources."ccount-1.0.5" (sources."chalk-4.1.0" // { dependencies = [ @@ -62965,11 +63969,11 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.578" + sources."electron-to-chromium-1.3.580" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" - sources."escalade-3.1.0" + sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."execall-2.0.0" sources."extend-3.0.2" @@ -63060,7 +64064,7 @@ in }) sources."mkdirp-0.5.5" sources."ms-2.1.2" - sources."node-releases-1.1.61" + sources."node-releases-1.1.63" sources."normalize-package-data-2.5.0" sources."normalize-range-0.1.2" sources."normalize-selector-0.2.0" @@ -63266,7 +64270,7 @@ in sources."semver-5.7.1" sources."sprintf-js-1.0.3" sources."supports-color-5.5.0" - sources."tslib-1.14.0" + sources."tslib-1.14.1" sources."tslint-5.20.1" sources."tsutils-2.29.0" sources."typescript-3.9.7" @@ -63391,13 +64395,17 @@ in sources."@types/json-schema-7.0.6" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.11.5" + sources."@types/node-14.11.8" sources."@types/normalize-package-data-2.4.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" sources."@typescript-eslint/experimental-utils-3.10.1" - sources."@typescript-eslint/parser-3.10.1" + (sources."@typescript-eslint/parser-3.10.1" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) sources."@typescript-eslint/types-3.10.1" (sources."@typescript-eslint/typescript-estree-3.10.1" // { dependencies = [ @@ -63405,7 +64413,11 @@ in sources."semver-7.3.2" ]; }) - sources."@typescript-eslint/visitor-keys-3.10.1" + (sources."@typescript-eslint/visitor-keys-3.10.1" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) sources."abbrev-1.1.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" @@ -63414,7 +64426,7 @@ in sources."indent-string-4.0.0" ]; }) - sources."ajv-6.12.5" + sources."ajv-6.12.6" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -63617,7 +64629,7 @@ in sources."enquirer-2.3.6" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.10.0" // { + (sources."eslint-7.11.0" // { dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -63644,9 +64656,17 @@ in ]; }) sources."eslint-scope-5.1.1" - sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.3.0" - sources."espree-7.3.0" + (sources."eslint-utils-2.1.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) + sources."eslint-visitor-keys-2.0.0" + (sources."espree-7.3.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ @@ -64010,6 +65030,7 @@ in sources."debug-4.3.0" sources."eslint-6.8.0" sources."eslint-utils-1.4.3" + sources."eslint-visitor-keys-1.3.0" sources."espree-6.2.1" sources."ignore-4.0.6" sources."indent-string-4.0.0" @@ -64028,7 +65049,7 @@ in sources."pretty-format-23.6.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" - sources."property-information-5.5.0" + sources."property-information-5.6.0" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" sources."pug-error-2.0.0" @@ -64056,7 +65077,7 @@ in ]; }) sources."readable-stream-2.3.7" - sources."readdirp-3.4.0" + sources."readdirp-3.5.0" sources."redent-2.0.0" sources."regex-not-1.0.2" sources."regexpp-3.1.0" @@ -64251,7 +65272,7 @@ in sources."trim-newlines-2.0.0" sources."trim-trailing-lines-1.1.3" sources."trough-1.0.5" - sources."tslib-1.14.0" + sources."tslib-1.14.1" (sources."tslint-5.20.1" // { dependencies = [ sources."tsutils-2.29.0" @@ -64338,7 +65359,7 @@ in sources."vscode-languageserver-types-3.16.0-next.2" ]; }) - (sources."vscode-emmet-helper-2.0.0" // { + (sources."vscode-emmet-helper-2.0.4" // { dependencies = [ sources."vscode-languageserver-types-3.15.1" ]; @@ -64351,9 +65372,10 @@ in sources."vscode-nls-4.1.2" sources."vscode-uri-2.1.2" sources."vscode-web-custom-data-0.3.1" - (sources."vue-eslint-parser-7.1.0" // { + (sources."vue-eslint-parser-7.1.1" // { dependencies = [ sources."debug-4.3.0" + sources."eslint-visitor-keys-1.3.0" sources."espree-6.2.1" ]; }) @@ -64455,7 +65477,7 @@ in sources."prettier-2.0.5" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - (sources."vscode-json-languageservice-3.9.0" // { + (sources."vscode-json-languageservice-3.9.1" // { dependencies = [ sources."vscode-languageserver-types-3.16.0-next.2" sources."vscode-nls-5.0.0" @@ -64584,7 +65606,7 @@ in sources."color-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.5.3" + sources."color-string-1.5.4" sources."colornames-1.1.1" sources."colors-1.4.0" sources."colorspace-1.1.2" @@ -64657,7 +65679,7 @@ in sources."@szmarczak/http-timer-1.1.2" sources."abbrev-1.1.1" sources."accepts-1.3.7" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ansi-0.3.1" (sources."ansi-align-3.0.0" // { dependencies = [ @@ -64825,7 +65847,7 @@ in sources."har-validator-5.1.5" sources."has-flag-4.0.0" sources."has-yarn-2.1.0" - sources."hosted-git-info-3.0.5" + sources."hosted-git-info-3.0.6" sources."http-cache-semantics-4.1.0" (sources."http-errors-1.7.2" // { dependencies = [ @@ -64942,7 +65964,7 @@ in }) sources."normalize-url-4.5.0" sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-8.0.1" + sources."npm-package-arg-8.1.0" sources."npm-run-path-4.0.1" sources."oauth-sign-0.9.0" sources."objectorarray-1.0.4" @@ -65066,7 +66088,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."systeminformation-4.27.7" + sources."systeminformation-4.27.9" sources."term-size-2.2.0" sources."through-2.3.8" sources."tmp-0.2.1" @@ -65074,7 +66096,7 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tough-cookie-3.0.1" - sources."tslib-1.14.0" + sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-fest-0.8.1" @@ -65153,7 +66175,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.11.5" + sources."@types/node-14.11.8" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -65520,8 +66542,8 @@ in }) sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" - sources."@types/cookiejar-2.1.1" - sources."@types/node-14.11.5" + sources."@types/cookiejar-2.1.2" + sources."@types/node-14.11.8" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -65549,6 +66571,7 @@ in sources."cycle-onionify-4.0.0" sources."d-1.0.1" sources."debug-3.2.6" + sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" sources."es5-ext-0.10.53" sources."es6-iterator-2.0.3" @@ -65571,6 +66594,7 @@ in sources."figures-2.0.0" sources."form-data-2.5.1" sources."formidable-1.2.2" + sources."globalthis-1.0.1" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."iconv-lite-0.4.24" @@ -65603,6 +66627,7 @@ in sources."mute-stream-0.0.7" sources."next-tick-1.0.0" sources."object-assign-4.1.1" + sources."object-keys-1.1.1" sources."onetime-2.0.1" sources."os-tmpdir-1.0.2" sources."performance-now-2.1.0" @@ -65635,7 +66660,7 @@ in sources."strip-ansi-3.0.1" sources."superagent-3.8.3" sources."supports-color-2.0.0" - sources."symbol-observable-1.2.0" + sources."symbol-observable-2.0.3" sources."through-2.3.8" sources."tmp-0.0.33" sources."type-1.2.0" @@ -65646,7 +66671,7 @@ in ]; }) sources."which-1.3.1" - sources."xstream-11.13.0" + sources."xstream-11.14.0" sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; @@ -65773,7 +66798,7 @@ in ]; }) sources."tmp-0.1.0" - sources."tslib-1.14.0" + sources."tslib-1.14.1" sources."type-fest-0.11.0" sources."uid-number-0.0.6" sources."universalify-0.1.2" @@ -65843,7 +66868,7 @@ in }; dependencies = [ sources."abstract-random-access-1.1.2" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ansi-align-2.0.0" sources."ansi-diff-1.1.1" sources."ansi-regex-3.0.0" @@ -66198,7 +67223,7 @@ in sources."multistream-2.1.1" sources."mute-stream-0.0.8" sources."mutexify-1.3.1" - sources."nan-2.14.1" + sources."nan-2.14.2" sources."nanoassert-1.1.0" sources."nanobus-4.4.0" sources."nanoguard-1.3.0" @@ -66573,7 +67598,7 @@ in sources."temp-dir-2.0.0" sources."tempy-0.7.1" sources."to-regex-range-5.0.1" - sources."tslib-1.14.0" + sources."tslib-1.14.1" sources."type-fest-0.16.0" sources."unique-string-2.0.0" sources."vscode-jsonrpc-5.0.1" @@ -66635,12 +67660,12 @@ in }; dependencies = [ sources."JSONStream-1.3.5" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.769.0" + sources."aws-sdk-2.771.0" sources."aws-sign2-0.7.0" sources."aws4-1.10.1" sources."base64-js-1.3.1" @@ -66694,7 +67719,7 @@ in sources."minimist-1.2.5" sources."oauth-sign-0.9.0" sources."p-finally-1.0.0" - sources."p-queue-6.6.1" + sources."p-queue-6.6.2" sources."p-timeout-3.2.0" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" @@ -66784,25 +67809,25 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/core-7.11.6" - sources."@babel/generator-7.11.6" + sources."@babel/core-7.12.0" + sources."@babel/generator-7.12.0" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-react-jsx-7.10.4" - sources."@babel/helper-builder-react-jsx-experimental-7.11.5" + sources."@babel/helper-builder-react-jsx-experimental-7.12.0" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.11.0" + sources."@babel/helper-member-expression-to-functions-7.12.0" sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.11.0" + sources."@babel/helper-module-transforms-7.12.0" sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-replace-supers-7.10.4" + sources."@babel/helper-replace-supers-7.12.0" sources."@babel/helper-simple-access-7.10.4" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.5" + sources."@babel/parser-7.12.0" sources."@babel/plugin-proposal-object-rest-spread-7.11.0" sources."@babel/plugin-syntax-jsx-7.10.4" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -66810,19 +67835,19 @@ in sources."@babel/plugin-transform-parameters-7.10.5" sources."@babel/plugin-transform-react-jsx-7.10.4" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.5" - sources."@babel/types-7.11.5" + sources."@babel/traverse-7.12.0" + sources."@babel/types-7.12.0" sources."@sindresorhus/is-3.1.2" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.0" - sources."@types/node-14.11.5" + sources."@types/node-14.11.8" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" - sources."ajv-6.12.5" + sources."ajv-6.12.6" (sources."ansi-escapes-4.3.1" // { dependencies = [ sources."type-fest-0.11.0" @@ -67013,7 +68038,7 @@ in sources."pump-3.0.0" sources."punycode-2.1.1" sources."quick-lru-5.1.1" - sources."react-16.13.1" + sources."react-16.14.0" sources."react-devtools-core-4.8.2" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" @@ -67134,10 +68159,10 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.145.0" - sources."@fluentui/react-focus-7.16.10" + sources."@fluentui/react-7.146.2" + sources."@fluentui/react-focus-7.16.12" sources."@fluentui/react-window-provider-0.3.3" - sources."@fluentui/theme-1.3.0" + sources."@fluentui/theme-1.5.0" (sources."@gulp-sourcemaps/identity-map-1.0.2" // { dependencies = [ sources."normalize-path-2.1.1" @@ -67149,7 +68174,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.108" + sources."@microsoft/load-themed-styles-1.10.113" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -67190,12 +68215,12 @@ in sources."@types/sqlite3-3.1.6" sources."@types/tough-cookie-4.0.0" sources."@types/url-join-4.0.0" - sources."@uifabric/foundation-7.9.10" - sources."@uifabric/icons-7.5.9" + sources."@uifabric/foundation-7.9.13" + sources."@uifabric/icons-7.5.11" sources."@uifabric/merge-styles-7.19.1" sources."@uifabric/react-hooks-7.13.6" sources."@uifabric/set-version-7.0.23" - sources."@uifabric/styling-7.16.10" + sources."@uifabric/styling-7.16.12" sources."@uifabric/utilities-7.32.4" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -67222,7 +68247,7 @@ in sources."acorn-5.7.4" sources."after-0.8.2" sources."aggregate-error-3.1.0" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" sources."ansi-colors-1.1.0" @@ -68039,7 +69064,7 @@ in sources."mute-stdout-1.0.1" sources."mute-stream-0.0.7" sources."mysql-2.18.1" - sources."nan-2.14.1" + sources."nan-2.14.2" sources."nanomatch-1.2.13" (sources."needle-2.5.2" // { dependencies = [ @@ -68112,7 +69137,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.145.0" + sources."office-ui-fabric-react-7.146.2" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -68122,12 +69147,12 @@ in sources."openapi-types-7.0.1" ]; }) - (sources."openapi-framework-7.0.1" // { + (sources."openapi-framework-7.0.2" // { dependencies = [ sources."openapi-types-7.0.1" ]; }) - (sources."openapi-jsonschema-parameters-7.0.1" // { + (sources."openapi-jsonschema-parameters-7.0.2" // { dependencies = [ sources."openapi-types-7.0.1" ]; @@ -68137,7 +69162,7 @@ in sources."openapi-types-7.0.1" ]; }) - (sources."openapi-request-validator-7.0.1" // { + (sources."openapi-request-validator-7.0.2" // { dependencies = [ sources."openapi-types-7.0.1" ]; @@ -68264,8 +69289,8 @@ in sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" - sources."react-16.13.1" - sources."react-dom-16.13.1" + sources."react-16.14.0" + sources."react-dom-16.14.0" sources."react-is-16.13.1" (sources."read-pkg-1.1.0" // { dependencies = [ @@ -68323,7 +69348,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sass-1.26.12" + sources."sass-1.27.0" sources."sax-1.2.4" sources."scheduler-0.19.1" sources."schema-utils-2.7.1" @@ -68523,7 +69548,7 @@ in ]; }) sources."ts-log-2.2.3" - sources."tslib-1.14.0" + sources."tslib-1.14.1" (sources."tslint-6.1.2" // { dependencies = [ sources."mkdirp-0.5.5" @@ -68594,10 +69619,10 @@ in dependencies = [ sources."anymatch-3.1.1" sources."binary-extensions-2.1.0" - sources."chokidar-3.4.2" + sources."chokidar-3.4.3" sources."fsevents-2.1.3" sources."is-binary-path-2.1.0" - sources."readdirp-3.4.0" + sources."readdirp-3.5.0" ]; }) sources."watchpack-chokidar2-2.0.0" @@ -68690,10 +69715,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "7.10.0"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.10.0.tgz"; - sha512 = "BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.11.0.tgz"; + sha512 = "G9+qtYVCHaDi1ZuWzBsOWo2wSwd70TXnU6UHA3cTYHp7gCTXZcpggWFoUVAMRarg68qtPoNfFbzPh+VdOgmwmw=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -68706,7 +69731,7 @@ in sources."@eslint/eslintrc-0.1.3" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -68735,9 +69760,17 @@ in sources."enquirer-2.3.6" sources."escape-string-regexp-1.0.5" sources."eslint-scope-5.1.1" - sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.3.0" - sources."espree-7.3.0" + (sources."eslint-utils-2.1.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) + sources."eslint-visitor-keys-2.0.0" + (sources."espree-7.3.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ @@ -68848,7 +69881,7 @@ in sources."@eslint/eslintrc-0.1.3" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -68877,11 +69910,19 @@ in sources."emoji-regex-7.0.3" sources."enquirer-2.3.6" sources."escape-string-regexp-1.0.5" - sources."eslint-7.10.0" + sources."eslint-7.11.0" sources."eslint-scope-5.1.1" - sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.3.0" - sources."espree-7.3.0" + (sources."eslint-utils-2.1.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) + sources."eslint-visitor-keys-2.0.0" + (sources."espree-7.3.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ @@ -68977,23 +70018,23 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "3.27.14"; + version = "3.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-3.27.14.tgz"; - sha512 = "1/avJnfrvOEM31Bfu/8wSGnSxscxKJ+MusqjTgy7q/LEes8M0VqtdMWb8ZPXJ8weaIEV6o98EGoomkYayJTyJw=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-3.28.0.tgz"; + sha512 = "1fz44bGoM3jfit1gPYW1JuShX2DQva6SHZT1Rnx06UOeWJeofHO0ki/4J3InI8tob+XnktXo3cYW0HEXpJwVGg=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.11.0" + sources."@babel/compat-data-7.12.0" sources."@babel/core-7.9.0" - sources."@babel/generator-7.11.6" + sources."@babel/generator-7.12.0" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" sources."@babel/helper-builder-react-jsx-7.10.4" - sources."@babel/helper-builder-react-jsx-experimental-7.11.5" - sources."@babel/helper-compilation-targets-7.10.4" - sources."@babel/helper-create-class-features-plugin-7.10.5" - sources."@babel/helper-create-regexp-features-plugin-7.10.4" + sources."@babel/helper-builder-react-jsx-experimental-7.12.0" + sources."@babel/helper-compilation-targets-7.12.0" + sources."@babel/helper-create-class-features-plugin-7.12.0" + sources."@babel/helper-create-regexp-features-plugin-7.12.0" (sources."@babel/helper-define-map-7.10.5" // { dependencies = [ sources."lodash-4.17.20" @@ -69003,9 +70044,9 @@ in sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.11.0" + sources."@babel/helper-member-expression-to-functions-7.12.0" sources."@babel/helper-module-imports-7.10.4" - (sources."@babel/helper-module-transforms-7.11.0" // { + (sources."@babel/helper-module-transforms-7.12.0" // { dependencies = [ sources."lodash-4.17.20" ]; @@ -69018,11 +70059,12 @@ in ]; }) sources."@babel/helper-remap-async-to-generator-7.11.4" - sources."@babel/helper-replace-supers-7.10.4" + sources."@babel/helper-replace-supers-7.12.0" sources."@babel/helper-simple-access-7.10.4" sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/helper-validator-option-7.12.0" sources."@babel/helper-wrap-function-7.10.4" sources."@babel/helpers-7.10.4" (sources."@babel/highlight-7.10.4" // { @@ -69030,19 +70072,19 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.11.5" + sources."@babel/parser-7.12.0" sources."@babel/plugin-proposal-async-generator-functions-7.10.5" sources."@babel/plugin-proposal-class-properties-7.10.4" sources."@babel/plugin-proposal-dynamic-import-7.10.4" sources."@babel/plugin-proposal-export-default-from-7.10.4" - sources."@babel/plugin-proposal-export-namespace-from-7.10.4" + sources."@babel/plugin-proposal-export-namespace-from-7.12.0" sources."@babel/plugin-proposal-json-strings-7.10.4" - sources."@babel/plugin-proposal-logical-assignment-operators-7.11.0" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" - sources."@babel/plugin-proposal-numeric-separator-7.10.4" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.0" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.0" + sources."@babel/plugin-proposal-numeric-separator-7.12.0" sources."@babel/plugin-proposal-object-rest-spread-7.11.0" sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" - sources."@babel/plugin-proposal-optional-chaining-7.11.0" + sources."@babel/plugin-proposal-optional-chaining-7.12.0" sources."@babel/plugin-proposal-private-methods-7.10.4" sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" sources."@babel/plugin-syntax-async-generators-7.8.4" @@ -69078,7 +70120,7 @@ in sources."@babel/plugin-transform-member-expression-literals-7.10.4" sources."@babel/plugin-transform-modules-amd-7.10.5" sources."@babel/plugin-transform-modules-commonjs-7.10.4" - sources."@babel/plugin-transform-modules-systemjs-7.10.5" + sources."@babel/plugin-transform-modules-systemjs-7.12.0" sources."@babel/plugin-transform-modules-umd-7.10.4" sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.4" sources."@babel/plugin-transform-new-target-7.10.4" @@ -69091,7 +70133,7 @@ in sources."@babel/plugin-transform-react-jsx-source-7.10.5" sources."@babel/plugin-transform-regenerator-7.10.4" sources."@babel/plugin-transform-reserved-words-7.10.4" - (sources."@babel/plugin-transform-runtime-7.11.5" // { + (sources."@babel/plugin-transform-runtime-7.12.0" // { dependencies = [ sources."semver-5.7.1" ]; @@ -69101,20 +70143,20 @@ in sources."@babel/plugin-transform-sticky-regex-7.10.4" sources."@babel/plugin-transform-template-literals-7.10.5" sources."@babel/plugin-transform-typeof-symbol-7.10.4" - sources."@babel/plugin-transform-typescript-7.11.0" + sources."@babel/plugin-transform-typescript-7.12.0" sources."@babel/plugin-transform-unicode-escapes-7.10.4" sources."@babel/plugin-transform-unicode-regex-7.10.4" - sources."@babel/preset-env-7.11.5" + sources."@babel/preset-env-7.12.0" sources."@babel/preset-modules-0.1.4" - sources."@babel/preset-typescript-7.10.4" - sources."@babel/runtime-7.11.2" + sources."@babel/preset-typescript-7.12.0" + sources."@babel/runtime-7.12.0" sources."@babel/template-7.10.4" - (sources."@babel/traverse-7.11.5" // { + (sources."@babel/traverse-7.12.0" // { dependencies = [ sources."lodash-4.17.20" ]; }) - (sources."@babel/types-7.11.5" // { + (sources."@babel/types-7.12.0" // { dependencies = [ sources."lodash-4.17.20" ]; @@ -69125,7 +70167,7 @@ in sources."uuid-3.4.0" ]; }) - (sources."@expo/config-3.3.9" // { + (sources."@expo/config-3.3.10" // { dependencies = [ sources."semver-7.3.2" sources."uuid-3.4.0" @@ -69139,7 +70181,7 @@ in sources."pngjs-5.0.0" ]; }) - (sources."@expo/dev-server-0.1.34" // { + (sources."@expo/dev-server-0.1.35" // { dependencies = [ sources."body-parser-1.19.0" sources."bytes-3.1.0" @@ -69155,8 +70197,8 @@ in sources."statuses-1.5.0" ]; }) - sources."@expo/dev-tools-0.13.52" - sources."@expo/eas-build-job-0.1.0" + sources."@expo/dev-tools-0.13.53" + sources."@expo/eas-build-job-0.1.1" (sources."@expo/image-utils-0.3.7" // { dependencies = [ sources."semver-6.1.1" @@ -69167,7 +70209,7 @@ in sources."json5-1.0.1" ]; }) - sources."@expo/metro-config-0.1.34" + sources."@expo/metro-config-0.1.35" (sources."@expo/ngrok-2.4.3" // { dependencies = [ sources."uuid-3.4.0" @@ -69215,14 +70257,14 @@ in sources."@expo/spawn-async-1.5.0" sources."@expo/traveling-fastlane-darwin-1.15.1" sources."@expo/traveling-fastlane-linux-1.15.1" - (sources."@expo/webpack-config-0.12.38" // { + (sources."@expo/webpack-config-0.12.39" // { dependencies = [ sources."@babel/runtime-7.9.0" sources."is-wsl-2.2.0" sources."react-refresh-0.8.3" ]; }) - (sources."@expo/xdl-58.0.13" // { + (sources."@expo/xdl-58.0.14" // { dependencies = [ sources."chownr-1.1.4" sources."es6-error-4.1.1" @@ -69239,7 +70281,7 @@ in ]; }) sources."mkdirp-1.0.4" - (sources."npm-package-arg-8.0.1" // { + (sources."npm-package-arg-8.1.0" // { dependencies = [ sources."semver-7.3.2" ]; @@ -69397,7 +70439,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.6" sources."@types/keyv-3.1.1" - sources."@types/lodash-4.14.161" + sources."@types/lodash-4.14.162" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" sources."@types/node-9.6.59" @@ -69424,7 +70466,7 @@ in sources."source-map-0.7.3" ]; }) - sources."@types/yargs-15.0.7" + sources."@types/yargs-15.0.8" sources."@types/yargs-parser-15.0.0" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -69454,7 +70496,7 @@ in sources."agent-base-6.0.1" sources."agentkeepalive-4.1.3" sources."aggregate-error-3.1.0" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" sources."alphanum-sort-1.0.2" @@ -69664,7 +70706,7 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001144" + sources."caniuse-lite-1.0.30001148" sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" (sources."chalk-4.1.0" // { @@ -69678,7 +70720,7 @@ in }) sources."chardet-0.4.2" sources."charenc-0.0.2" - sources."chokidar-3.4.2" + sources."chokidar-3.4.3" sources."chownr-2.0.0" sources."chrome-trace-event-1.0.2" sources."ci-info-1.6.0" @@ -69709,7 +70751,7 @@ in sources."clean-webpack-plugin-3.0.0" sources."cli-boxes-2.2.1" sources."cli-cursor-2.1.0" - sources."cli-spinners-2.4.0" + sources."cli-spinners-2.5.0" sources."cli-table3-0.6.0" sources."cli-width-2.2.1" (sources."clipboardy-2.3.0" // { @@ -69728,10 +70770,10 @@ in }) sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" - sources."color-3.1.2" + sources."color-3.1.3" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.5.3" + sources."color-string-1.5.4" sources."colorette-1.2.1" sources."colors-1.4.0" sources."combined-stream-1.0.8" @@ -69849,7 +70891,7 @@ in sources."cyclist-1.0.1" sources."dashdash-1.14.1" sources."dateformat-3.0.3" - sources."dayjs-1.9.1" + sources."dayjs-1.9.3" sources."debug-4.3.0" sources."debuglog-1.0.1" sources."decache-4.4.0" @@ -69918,7 +70960,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.578" + sources."electron-to-chromium-1.3.580" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -69960,7 +71002,7 @@ in }) sources."es-to-primitive-1.2.1" sources."es6-error-3.2.0" - sources."escalade-3.1.0" + sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."eslint-scope-4.0.3" @@ -70001,7 +71043,7 @@ in sources."ms-2.0.0" ]; }) - (sources."expo-pwa-0.0.44" // { + (sources."expo-pwa-0.0.45" // { dependencies = [ sources."commander-2.20.0" ]; @@ -70187,7 +71229,7 @@ in sources."hex-color-regex-1.1.0" sources."hmac-drbg-1.0.1" sources."hoek-4.2.1" - sources."hosted-git-info-3.0.5" + sources."hosted-git-info-3.0.6" sources."hpack.js-2.1.6" sources."hsl-regex-1.0.0" sources."hsla-regex-1.0.0" @@ -70377,7 +71419,6 @@ in sources."last-call-webpack-plugin-3.0.0" sources."latest-version-5.1.0" sources."leven-3.1.0" - sources."levenary-1.1.1" (sources."load-bmfont-1.4.1" // { dependencies = [ sources."mime-1.6.0" @@ -70422,7 +71463,7 @@ in sources."semver-5.7.1" ]; }) - (sources."make-fetch-happen-8.0.9" // { + (sources."make-fetch-happen-8.0.10" // { dependencies = [ sources."minipass-3.1.3" ]; @@ -70526,7 +71567,7 @@ in sources."mute-stream-0.0.7" sources."mv-2.1.1" sources."mz-2.7.0" - sources."nan-2.14.1" + sources."nan-2.14.2" sources."nanomatch-1.2.13" sources."native-url-0.2.6" sources."ncp-2.0.0" @@ -70537,9 +71578,9 @@ in sources."no-case-3.0.3" sources."node-fetch-2.6.1" sources."node-forge-0.7.6" - (sources."node-gyp-7.1.0" // { + (sources."node-gyp-7.1.1" // { dependencies = [ - sources."rimraf-2.7.1" + sources."rimraf-3.0.2" sources."semver-7.3.2" sources."which-2.0.2" ]; @@ -70553,8 +71594,8 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.61" - sources."nopt-4.0.3" + sources."node-releases-1.1.63" + sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."npm-bundled-1.1.1" @@ -70572,14 +71613,14 @@ in sources."npm-packlist-2.1.2" (sources."npm-pick-manifest-6.1.0" // { dependencies = [ - sources."npm-package-arg-8.0.1" + sources."npm-package-arg-8.1.0" sources."semver-7.3.2" ]; }) - (sources."npm-registry-fetch-8.1.4" // { + (sources."npm-registry-fetch-8.1.5" // { dependencies = [ sources."minipass-3.1.3" - sources."npm-package-arg-8.0.1" + sources."npm-package-arg-8.1.0" sources."semver-7.3.2" ]; }) @@ -70678,7 +71719,7 @@ in dependencies = [ sources."minipass-3.1.3" sources."mkdirp-1.0.4" - sources."npm-package-arg-8.0.1" + sources."npm-package-arg-8.1.0" sources."rimraf-3.0.2" sources."semver-7.3.2" ]; @@ -70997,7 +72038,7 @@ in ]; }) sources."readdir-scoped-modules-1.1.0" - sources."readdirp-3.4.0" + sources."readdirp-3.5.0" sources."recursive-readdir-2.2.2" sources."regenerate-1.4.1" sources."regenerate-unicode-properties-8.2.0" @@ -71289,7 +72330,7 @@ in dependencies = [ sources."chalk-2.4.2" sources."css-select-2.1.0" - sources."css-what-3.4.1" + sources."css-what-3.4.2" (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.0.2" @@ -71360,7 +72401,7 @@ in sources."tree-kill-1.2.2" sources."ts-invariant-0.4.4" sources."ts-pnp-1.2.0" - sources."tslib-1.14.0" + sources."tslib-1.14.1" sources."tty-browserify-0.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -71406,9 +72447,10 @@ in ]; }) sources."url-join-4.0.0" - (sources."url-loader-4.1.0" // { + (sources."url-loader-4.1.1" // { dependencies = [ sources."loader-utils-2.0.0" + sources."schema-utils-3.0.0" ]; }) sources."url-parse-1.4.7" @@ -71699,7 +72741,7 @@ in sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010"; }; dependencies = [ - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ansi-escapes-1.4.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -72048,7 +73090,7 @@ in sources."through-2.3.8" sources."tmp-0.0.33" sources."trim-newlines-3.0.0" - sources."tslib-1.14.0" + sources."tslib-1.14.1" sources."type-fest-0.11.0" sources."validate-npm-package-license-3.0.4" sources."which-2.0.2" @@ -72269,7 +73311,7 @@ in }) sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nan-2.14.1" + sources."nan-2.14.2" sources."nanomatch-1.2.13" sources."nconf-0.10.0" sources."ncp-0.4.2" @@ -72591,7 +73633,7 @@ in sources."multiserver-3.6.0" sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" - sources."muxrpc-6.5.0" + sources."muxrpc-6.5.1" sources."nearley-2.19.7" sources."node-gyp-build-4.2.3" sources."node-polyglot-1.0.0" @@ -72762,7 +73804,7 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@types/minimist-1.2.0" sources."@types/normalize-package-data-2.4.0" - sources."ajv-6.12.5" + sources."ajv-6.12.6" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -72795,7 +73837,7 @@ in sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.4.0" + sources."cli-spinners-2.5.0" sources."cli-width-3.0.0" sources."clone-1.0.4" sources."clone-response-1.0.2" @@ -72982,7 +74024,7 @@ in sources."tmp-0.0.33" sources."to-readable-stream-1.0.0" sources."trim-newlines-3.0.0" - sources."tslib-1.14.0" + sources."tslib-1.14.1" sources."type-fest-0.11.0" sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" @@ -73034,7 +74076,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@exodus/schemasafe-1.0.0-rc.2" + sources."@exodus/schemasafe-1.0.0-rc.3" sources."@graphql-cli/common-4.1.0" sources."@graphql-cli/init-4.1.0" sources."@graphql-tools/delegate-6.2.4" @@ -73054,11 +74096,11 @@ in sources."@nodelib/fs.walk-1.2.4" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.11.5" + sources."@types/node-14.11.8" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.1" sources."aggregate-error-3.1.0" - sources."ajv-6.12.5" + sources."ajv-6.12.6" (sources."ansi-escapes-4.3.1" // { dependencies = [ sources."type-fest-0.11.0" @@ -73093,7 +74135,7 @@ in sources."callsites-3.1.0" (sources."camel-case-4.1.1" // { dependencies = [ - sources."tslib-1.14.0" + sources."tslib-1.14.1" ]; }) sources."camelcase-5.3.1" @@ -73103,7 +74145,7 @@ in sources."chownr-2.0.0" sources."clean-stack-2.2.0" sources."cli-cursor-2.1.0" - sources."cli-spinners-2.4.0" + sources."cli-spinners-2.5.0" sources."cli-width-3.0.0" (sources."cliui-6.0.0" // { dependencies = [ @@ -73161,7 +74203,7 @@ in sources."es6-iterator-2.0.3" sources."es6-promise-3.3.1" sources."es6-symbol-3.1.3" - sources."escalade-3.1.0" + sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."eventemitter3-3.1.2" @@ -73311,7 +74353,7 @@ in }) (sources."lower-case-2.0.1" // { dependencies = [ - sources."tslib-1.14.0" + sources."tslib-1.14.1" ]; }) sources."lowercase-keys-1.0.1" @@ -73338,7 +74380,7 @@ in sources."nice-try-1.0.5" (sources."no-case-3.0.3" // { dependencies = [ - sources."tslib-1.14.0" + sources."tslib-1.14.1" ]; }) sources."node-emoji-1.10.0" @@ -73350,14 +74392,14 @@ in sources."normalize-url-4.5.0" sources."npm-run-path-2.0.2" sources."oas-kit-common-1.0.8" - sources."oas-linter-3.2.0" - (sources."oas-resolver-2.5.1" // { + sources."oas-linter-3.2.1" + (sources."oas-resolver-2.5.2" // { dependencies = [ sources."yargs-15.4.1" ]; }) sources."oas-schema-walker-1.1.5" - sources."oas-validator-5.0.2" + sources."oas-validator-5.0.3" sources."oauth-sign-0.9.0" sources."object-inspect-1.8.0" sources."object-is-1.1.3" @@ -73402,7 +74444,7 @@ in sources."parse-json-5.1.0" (sources."pascal-case-3.1.1" // { dependencies = [ - sources."tslib-1.14.0" + sources."tslib-1.14.1" ]; }) sources."passwd-user-3.0.0" @@ -73440,7 +74482,7 @@ in sources."run-parallel-1.1.9" (sources."rxjs-6.6.3" // { dependencies = [ - sources."tslib-1.14.0" + sources."tslib-1.14.1" ]; }) sources."safe-buffer-5.2.1" @@ -73483,7 +74525,7 @@ in sources."strip-json-comments-2.0.1" sources."subscriptions-transport-ws-0.9.18" sources."supports-color-7.2.0" - (sources."swagger2openapi-7.0.2" // { + (sources."swagger2openapi-7.0.3" // { dependencies = [ sources."yargs-15.4.1" ]; @@ -73540,11 +74582,11 @@ in (sources."yargs-16.0.3" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."cliui-7.0.1" + sources."cliui-7.0.2" sources."strip-ansi-6.0.0" sources."wrap-ansi-7.0.0" sources."y18n-5.0.2" - sources."yargs-parser-20.2.1" + sources."yargs-parser-20.2.2" ]; }) sources."yargs-parser-18.1.3" @@ -73825,6 +74867,24 @@ in bypassCache = true; reconstructLock = true; }; + makam = nodeEnv.buildNodePackage { + name = "makam"; + packageName = "makam"; + version = "0.7.37"; + src = fetchurl { + url = "https://registry.npmjs.org/makam/-/makam-0.7.37.tgz"; + sha512 = "6DGx7FnmgAf+dYXrptwmgC6WDR0+emgM1jMscY/3yitXP3IYq0BvFE2UKq66P16nkHcQHmENK6xTt8M3Z+rdBw=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "The Makam metalanguage -- a tool for rapid language prototyping"; + homepage = http://astampoulis.github.io/makam/; + license = "GPL-3.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; gtop = nodeEnv.buildNodePackage { name = "gtop"; packageName = "gtop"; @@ -73897,7 +74957,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-4.27.7" + sources."systeminformation-4.27.9" sources."term-canvas-0.0.5" sources."type-fest-0.11.0" sources."wordwrap-0.0.3" @@ -74184,7 +75244,7 @@ in }) sources."ms-2.0.0" sources."mute-stdout-1.0.1" - sources."nan-2.14.1" + sources."nan-2.14.2" sources."nanomatch-1.2.13" sources."next-tick-1.0.0" sources."normalize-package-data-2.5.0" @@ -74804,7 +75864,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.11.1" + sources."uglify-js-3.11.2" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -74826,7 +75886,7 @@ in sha512 = "VWKrljlwF8tEKH48YPfC30zYKhrsMqm70d7vXswivEqd3DSva8ZlIzfeCa3YWFEFRIIhiXKgKurlqEpCtYMCAA=="; }; dependencies = [ - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ansi-styles-4.3.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -75009,6 +76069,222 @@ in bypassCache = true; reconstructLock = true; }; + inliner = nodeEnv.buildNodePackage { + name = "inliner"; + packageName = "inliner"; + version = "1.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inliner/-/inliner-1.13.1.tgz"; + sha1 = "e5002981ebf50e9d9f313711481cff122d4f3fcb"; + }; + dependencies = [ + sources."ajv-6.12.6" + sources."align-text-0.1.4" + sources."ansi-escapes-1.4.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."argparse-1.0.10" + sources."asap-2.0.6" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.10.1" + sources."bcrypt-pbkdf-1.0.2" + sources."boolbase-1.0.0" + sources."camelcase-1.2.1" + sources."caseless-0.12.0" + sources."center-align-0.1.3" + sources."chalk-1.1.3" + sources."charset-1.0.1" + sources."cheerio-0.19.0" + sources."clap-1.2.3" + sources."cliui-2.1.0" + sources."coa-1.0.4" + sources."colors-1.1.2" + sources."combined-stream-1.0.8" + (sources."configstore-1.4.0" // { + dependencies = [ + sources."uuid-2.0.3" + ]; + }) + sources."core-util-is-1.0.2" + sources."css-select-1.0.0" + sources."css-what-1.0.0" + sources."csso-2.0.0" + sources."dashdash-1.14.1" + sources."debug-2.6.9" + sources."decamelize-1.2.0" + sources."deep-extend-0.6.0" + sources."delayed-stream-1.0.0" + sources."dom-serializer-0.1.1" + sources."domelementtype-1.3.1" + sources."domhandler-2.3.0" + sources."domutils-1.4.3" + (sources."duplexify-3.7.1" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) + sources."ecc-jsbn-0.1.2" + sources."end-of-stream-1.4.4" + sources."entities-1.1.2" + sources."es6-promise-2.3.0" + sources."escape-string-regexp-1.0.5" + sources."esprima-2.7.3" + sources."extend-3.0.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.3" + sources."fast-json-stable-stringify-2.1.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."getpass-0.1.7" + (sources."got-3.3.1" // { + dependencies = [ + sources."object-assign-3.0.0" + ]; + }) + sources."graceful-fs-4.2.4" + sources."har-schema-2.0.0" + sources."har-validator-5.1.5" + sources."has-ansi-2.0.0" + (sources."htmlparser2-3.8.3" // { + dependencies = [ + sources."domutils-1.5.1" + sources."entities-1.0.0" + ]; + }) + sources."http-signature-1.2.0" + sources."iconv-lite-0.4.24" + sources."imurmurhash-0.1.4" + sources."infinity-agent-2.0.3" + sources."inherits-2.0.4" + sources."ini-1.3.5" + sources."is-buffer-1.1.6" + sources."is-finite-1.1.0" + sources."is-npm-1.0.0" + sources."is-redirect-1.0.0" + sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" + sources."isarray-0.0.1" + sources."isstream-0.1.2" + sources."js-yaml-3.6.1" + sources."jsbn-0.1.1" + sources."jschardet-1.6.0" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.1" + sources."kind-of-3.2.2" + sources."latest-version-1.0.1" + sources."lazy-cache-1.0.4" + sources."lodash-3.10.1" + sources."lodash._arrayeach-3.0.0" + sources."lodash._baseassign-3.2.0" + sources."lodash._basecopy-3.0.1" + sources."lodash._baseeach-3.0.4" + sources."lodash._bindcallback-3.0.1" + sources."lodash._createassigner-3.1.1" + sources."lodash._getnative-3.9.1" + sources."lodash._isiterateecall-3.0.9" + sources."lodash.assign-3.2.0" + sources."lodash.defaults-3.1.2" + sources."lodash.foreach-3.0.3" + sources."lodash.isarguments-3.1.0" + sources."lodash.isarray-3.0.4" + sources."lodash.keys-3.1.2" + sources."lodash.restparam-3.6.1" + sources."longest-1.0.1" + sources."lowercase-keys-1.0.1" + sources."mime-1.6.0" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" + sources."minimist-1.2.5" + sources."mkdirp-0.5.5" + sources."ms-2.0.0" + sources."nested-error-stacks-1.0.2" + sources."nth-check-1.0.2" + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."package-json-1.2.0" + sources."performance-now-2.1.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."prepend-http-1.0.4" + sources."process-nextick-args-2.0.1" + sources."promise-7.3.1" + sources."psl-1.8.0" + sources."punycode-2.1.1" + sources."q-1.5.1" + sources."qs-6.5.2" + sources."rc-1.2.8" + (sources."read-all-stream-3.1.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) + sources."readable-stream-1.1.14" + sources."registry-url-3.1.0" + sources."repeat-string-1.6.1" + sources."repeating-1.1.3" + sources."request-2.88.2" + sources."right-align-0.1.3" + sources."safe-buffer-5.2.1" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."semver-5.7.1" + sources."semver-diff-2.1.0" + sources."slide-1.1.6" + sources."source-map-0.5.7" + sources."sprintf-js-1.0.3" + sources."sshpk-1.16.1" + sources."stream-shift-1.0.1" + sources."string-length-1.0.1" + sources."string_decoder-0.10.31" + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" + sources."supports-color-2.0.0" + sources."svgo-0.6.6" + sources."then-fs-2.0.0" + sources."timed-out-2.0.0" + sources."tough-cookie-2.5.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."uglify-js-2.8.29" + sources."uglify-to-browserify-1.0.2" + sources."update-notifier-0.5.0" + sources."uri-js-4.4.0" + sources."util-deprecate-1.0.2" + sources."uuid-3.4.0" + sources."verror-1.10.0" + sources."whet.extend-0.9.9" + sources."window-size-0.1.0" + sources."wordwrap-0.0.2" + sources."wrappy-1.0.2" + sources."write-file-atomic-1.3.4" + sources."xdg-basedir-2.0.0" + sources."yargs-3.10.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Utility to inline images, CSS and JavaScript for a web page - useful for mobile sites"; + homepage = http://github.com/remy/inliner; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; imapnotify = nodeEnv.buildNodePackage { name = "imapnotify"; packageName = "imapnotify"; @@ -75043,7 +76319,7 @@ in }) sources."moment-2.29.1" sources."mv-2.1.1" - sources."nan-2.14.1" + sources."nan-2.14.2" sources."ncp-2.0.0" sources."once-1.4.0" sources."optimist-0.6.1" @@ -75108,7 +76384,7 @@ in sha512 = "Oac190s8AGYOYDvAP7PLNFm3gA+dtSoHl5yYGf9sgvMB+I8bRPfSNI6q4kra1QubpN5+/ARfGjGjAFUu10QsIg=="; }; dependencies = [ - sources."@types/jquery-3.5.2" + sources."@types/jquery-3.5.3" sources."@types/sizzle-2.3.2" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" @@ -75135,7 +76411,7 @@ in sources."once-1.4.0" sources."os-homedir-1.0.2" sources."path-is-absolute-1.0.1" - sources."prismjs-1.21.0" + sources."prismjs-1.22.0" sources."rimraf-2.7.1" sources."select-1.1.2" sources."tiny-emitter-2.1.0" @@ -75173,13 +76449,14 @@ in sources."@ionic/utils-stream-2.0.5" sources."@ionic/utils-subprocess-1.0.13" sources."@ionic/utils-terminal-1.1.2" - sources."agent-base-4.3.0" + sources."@tootallnate/once-1.1.2" + sources."agent-base-6.0.1" sources."ansi-escapes-3.2.0" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" - (sources."ast-types-0.14.2" // { + (sources."ast-types-0.13.4" // { dependencies = [ - sources."tslib-2.0.2" + sources."tslib-2.0.3" ]; }) sources."astral-regex-2.0.0" @@ -75198,7 +76475,6 @@ in sources."chownr-1.1.4" sources."cli-cursor-2.1.0" sources."cli-width-3.0.0" - sources."co-4.6.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.8" @@ -75207,10 +76483,10 @@ in sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" - sources."data-uri-to-buffer-1.2.0" + sources."data-uri-to-buffer-3.0.1" sources."debug-4.3.0" sources."deep-is-0.1.3" - sources."degenerator-1.0.4" + sources."degenerator-2.2.0" sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."diff-4.0.2" @@ -75224,15 +76500,9 @@ in sources."elementtree-0.1.7" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" - sources."es6-promise-4.2.8" - sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - (sources."escodegen-1.14.3" // { - dependencies = [ - sources."esprima-4.0.1" - ]; - }) - sources."esprima-3.1.3" + sources."escodegen-1.14.3" + sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" (sources."execa-1.0.0" // { @@ -75245,11 +76515,10 @@ in sources."which-1.3.1" ]; }) - sources."extend-3.0.2" sources."external-editor-3.1.0" sources."fast-levenshtein-2.0.6" sources."figures-3.2.0" - sources."file-uri-to-path-1.0.0" + sources."file-uri-to-path-2.0.0" sources."form-data-2.5.1" sources."formidable-1.2.2" sources."fs-extra-8.1.0" @@ -75263,30 +76532,13 @@ in ]; }) sources."get-stream-4.1.0" - (sources."get-uri-2.0.4" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."get-uri-3.0.2" sources."glob-7.1.6" sources."graceful-fs-4.2.4" sources."has-flag-4.0.0" sources."http-errors-1.7.3" - (sources."http-proxy-agent-2.1.0" // { - dependencies = [ - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) - (sources."https-proxy-agent-3.0.1" // { - dependencies = [ - sources."debug-3.2.6" - ]; - }) + sources."http-proxy-agent-4.0.1" + sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" @@ -75367,13 +76619,13 @@ in sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" - sources."pac-proxy-agent-3.0.1" - sources."pac-resolver-3.0.0" + sources."pac-proxy-agent-4.1.0" + sources."pac-resolver-4.1.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" - sources."proxy-agent-3.1.1" + sources."proxy-agent-4.0.0" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" sources."qs-6.9.4" @@ -75401,12 +76653,8 @@ in ]; }) sources."smart-buffer-4.1.0" - sources."socks-2.3.3" - (sources."socks-proxy-agent-4.0.2" // { - dependencies = [ - sources."agent-base-4.2.1" - ]; - }) + sources."socks-2.4.4" + sources."socks-proxy-agent-5.0.0" sources."source-map-0.6.1" sources."split2-3.2.2" sources."ssh-config-1.1.6" @@ -75432,7 +76680,7 @@ in }) sources."strip-eof-1.0.0" sources."superagent-4.1.0" - (sources."superagent-proxy-2.0.0" // { + (sources."superagent-proxy-2.1.0" // { dependencies = [ sources."debug-3.2.6" ]; @@ -75441,11 +76689,10 @@ in sources."tar-4.4.13" sources."through-2.3.8" sources."through2-3.0.2" - sources."thunkify-2.1.2" sources."tmp-0.0.33" sources."toidentifier-1.0.0" sources."tree-kill-1.2.2" - sources."tslib-1.14.0" + sources."tslib-1.14.1" sources."type-check-0.3.2" sources."type-fest-0.11.0" sources."typedarray-to-buffer-3.1.5" @@ -75490,7 +76737,7 @@ in sources."@josh-brown/vector-3.4.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."amdefine-1.0.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -75645,7 +76892,7 @@ in sources."minizlib-1.3.3" sources."mkdirp-1.0.4" sources."ms-2.0.0" - sources."nan-2.14.1" + sources."nan-2.14.2" (sources."node-gyp-4.0.0" // { dependencies = [ sources."mkdirp-0.5.5" @@ -75775,7 +77022,7 @@ in sources."tough-cookie-2.5.0" sources."traverse-0.3.9" sources."ts-process-promises-1.0.2" - sources."tslib-1.14.0" + sources."tslib-1.14.1" sources."ttf2woff-2.0.2" sources."ttf2woff2-3.0.0" sources."tunnel-agent-0.6.0" @@ -75799,7 +77046,7 @@ in sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."supports-color-7.2.0" - sources."tslib-2.0.2" + sources."tslib-2.0.3" ]; }) sources."verror-1.10.0" @@ -75959,10 +77206,10 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-1.2.2.tgz"; - sha512 = "cJ5dFzh620xT02z0nW5T9YTA4cIrvLOPoths3hHaazhBCpm4m+GIV9YdwKZsb+QQ4+Wrsh4T39X3O6ncwL4RmQ=="; + url = "https://registry.npmjs.org/joplin/-/joplin-1.2.3.tgz"; + sha512 = "oXopPtdqjEGhjeDjhULGbgZ47+auGaZIhWwgKSnYmrw47scWgXIlNztwFaH4xyTRsm+mCJ/WwPTruloNfTMQhw=="; }; dependencies = [ sources."@cronvel/get-pixels-3.4.0" @@ -75976,7 +77223,7 @@ in ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.12.5" + sources."ajv-6.12.6" (sources."ansi-escape-sequences-4.1.0" // { dependencies = [ sources."array-back-3.1.0" @@ -76011,7 +77258,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.769.0" // { + (sources."aws-sdk-2.771.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -76078,10 +77325,10 @@ in sources."cliss-0.0.2" sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" - sources."color-3.1.2" + sources."color-3.1.3" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.5.3" + sources."color-string-1.5.4" sources."combined-stream-1.0.8" sources."command-line-usage-4.1.0" sources."commander-2.17.1" @@ -76584,7 +77831,7 @@ in sources."is-fullwidth-code-point-2.0.0" ]; }) - sources."slug-3.3.5" + sources."slug-3.5.1" (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -76873,7 +78120,7 @@ in sha512 = "znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ=="; }; dependencies = [ - sources."@babel/parser-7.11.5" + sources."@babel/parser-7.12.0" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.8.11" @@ -77348,7 +78595,7 @@ in sources."bytes-3.1.0" sources."callsite-1.0.0" sources."camelcase-5.3.1" - sources."chokidar-3.4.2" + sources."chokidar-3.4.3" sources."cliui-6.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -77450,7 +78697,7 @@ in sources."qs-6.7.0" sources."range-parser-1.2.1" sources."raw-body-2.4.0" - sources."readdirp-3.4.0" + sources."readdirp-3.5.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."requires-port-1.0.0" @@ -77652,7 +78899,7 @@ in sources."abab-1.0.4" sources."acorn-2.7.0" sources."acorn-globals-1.0.9" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."asn1-0.2.4" @@ -78039,14 +79286,14 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.11.5" + sources."@types/node-14.11.8" sources."@types/normalize-package-data-2.4.0" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."agent-base-4.3.0" sources."agentkeepalive-3.5.2" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" @@ -78842,12 +80089,12 @@ in sources."tr46-1.0.1" sources."trim-newlines-3.0.0" sources."trim-off-newlines-1.0.1" - sources."tslib-1.14.0" + sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."uglify-js-3.11.1" + sources."uglify-js-3.11.2" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."union-value-1.0.1" @@ -78945,7 +80192,7 @@ in sources."prr-1.0.1" sources."semver-5.7.1" sources."source-map-0.6.1" - sources."tslib-1.14.0" + sources."tslib-1.14.1" ]; buildInputs = globalBuildInputs; meta = { @@ -79149,7 +80396,7 @@ in sources."mixin-deep-1.3.2" sources."morgan-1.10.0" sources."ms-2.0.0" - sources."nan-2.14.1" + sources."nan-2.14.2" sources."nanomatch-1.2.13" sources."negotiator-0.6.2" sources."normalize-path-3.0.0" @@ -79323,7 +80570,7 @@ in dependencies = [ sources."accepts-1.3.7" sources."after-0.8.2" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."anymatch-1.3.2" sources."argparse-1.0.10" sources."arr-diff-2.0.0" @@ -79556,7 +80803,7 @@ in ]; }) sources."ms-2.0.0" - sources."nan-2.14.1" + sources."nan-2.14.2" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -79832,31 +81079,32 @@ in src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.11.0" - sources."@babel/core-7.11.6" - sources."@babel/generator-7.11.6" + sources."@babel/compat-data-7.12.0" + sources."@babel/core-7.12.0" + sources."@babel/generator-7.12.0" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - sources."@babel/helper-compilation-targets-7.10.4" - sources."@babel/helper-create-class-features-plugin-7.10.5" - sources."@babel/helper-create-regexp-features-plugin-7.10.4" + sources."@babel/helper-compilation-targets-7.12.0" + sources."@babel/helper-create-class-features-plugin-7.12.0" + sources."@babel/helper-create-regexp-features-plugin-7.12.0" sources."@babel/helper-define-map-7.10.5" sources."@babel/helper-explode-assignable-expression-7.11.4" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.11.0" + sources."@babel/helper-member-expression-to-functions-7.12.0" sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.11.0" + sources."@babel/helper-module-transforms-7.12.0" sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-regex-7.10.5" sources."@babel/helper-remap-async-to-generator-7.11.4" - sources."@babel/helper-replace-supers-7.10.4" + sources."@babel/helper-replace-supers-7.12.0" sources."@babel/helper-simple-access-7.10.4" sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/helper-validator-option-7.12.0" sources."@babel/helper-wrap-function-7.10.4" sources."@babel/helpers-7.10.4" (sources."@babel/highlight-7.10.4" // { @@ -79864,19 +81112,19 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.11.5" + sources."@babel/parser-7.12.0" sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.10.5" sources."@babel/plugin-proposal-class-properties-7.10.4" sources."@babel/plugin-proposal-dynamic-import-7.10.4" - sources."@babel/plugin-proposal-export-namespace-from-7.10.4" + sources."@babel/plugin-proposal-export-namespace-from-7.12.0" sources."@babel/plugin-proposal-json-strings-7.10.4" - sources."@babel/plugin-proposal-logical-assignment-operators-7.11.0" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" - sources."@babel/plugin-proposal-numeric-separator-7.10.4" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.0" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.0" + sources."@babel/plugin-proposal-numeric-separator-7.12.0" sources."@babel/plugin-proposal-object-rest-spread-7.11.0" sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" - sources."@babel/plugin-proposal-optional-chaining-7.11.0" + sources."@babel/plugin-proposal-optional-chaining-7.12.0" sources."@babel/plugin-proposal-private-methods-7.10.4" sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" sources."@babel/plugin-syntax-async-generators-7.8.4" @@ -79909,7 +81157,7 @@ in sources."@babel/plugin-transform-member-expression-literals-7.10.4" sources."@babel/plugin-transform-modules-amd-7.10.5" sources."@babel/plugin-transform-modules-commonjs-7.10.4" - sources."@babel/plugin-transform-modules-systemjs-7.10.5" + sources."@babel/plugin-transform-modules-systemjs-7.12.0" sources."@babel/plugin-transform-modules-umd-7.10.4" sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.4" sources."@babel/plugin-transform-new-target-7.10.4" @@ -79918,7 +81166,7 @@ in sources."@babel/plugin-transform-property-literals-7.10.4" sources."@babel/plugin-transform-regenerator-7.10.4" sources."@babel/plugin-transform-reserved-words-7.10.4" - sources."@babel/plugin-transform-runtime-7.11.5" + sources."@babel/plugin-transform-runtime-7.12.0" sources."@babel/plugin-transform-shorthand-properties-7.10.4" sources."@babel/plugin-transform-spread-7.11.0" sources."@babel/plugin-transform-sticky-regex-7.10.4" @@ -79926,13 +81174,13 @@ in sources."@babel/plugin-transform-typeof-symbol-7.10.4" sources."@babel/plugin-transform-unicode-escapes-7.10.4" sources."@babel/plugin-transform-unicode-regex-7.10.4" - sources."@babel/preset-env-7.11.5" + sources."@babel/preset-env-7.12.0" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.11.2" + sources."@babel/runtime-7.12.0" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.5" - sources."@babel/types-7.11.5" + sources."@babel/traverse-7.12.0" + sources."@babel/types-7.12.0" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -79953,10 +81201,10 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.6" - sources."@types/node-14.11.5" + sources."@types/node-14.11.8" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" - sources."@types/yargs-15.0.7" + sources."@types/yargs-15.0.8" sources."@types/yargs-parser-15.0.0" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -79983,7 +81231,7 @@ in sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" sources."amdefine-1.0.1" @@ -80130,7 +81378,7 @@ in sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001144" + sources."caniuse-lite-1.0.30001148" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -80142,7 +81390,7 @@ in sources."supports-color-7.2.0" ]; }) - (sources."chokidar-3.4.2" // { + (sources."chokidar-3.4.3" // { dependencies = [ sources."braces-3.0.2" sources."fill-range-7.0.1" @@ -80252,7 +81500,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.578" + sources."electron-to-chromium-1.3.580" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -80270,7 +81518,7 @@ in sources."error-ex-1.3.2" sources."es-abstract-1.18.0-next.1" sources."es-to-primitive-1.2.1" - sources."escalade-3.1.0" + sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."eslint-scope-4.0.3" sources."eslint-visitor-keys-1.3.0" @@ -80417,9 +81665,8 @@ in sources."inherits-2.0.4" sources."ini-1.3.5" sources."inline-source-map-0.6.2" - sources."insert-module-globals-7.2.0" + sources."insert-module-globals-7.2.1" sources."interpret-1.4.0" - sources."invariant-2.2.4" sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" @@ -80487,8 +81734,6 @@ in sources."jszip-2.6.1" sources."kind-of-6.0.3" sources."labeled-stream-splicer-2.0.2" - sources."leven-3.1.0" - sources."levenary-1.1.1" sources."lines-and-columns-1.1.6" sources."loader-runner-2.4.0" (sources."loader-utils-1.4.0" // { @@ -80499,7 +81744,6 @@ in sources."locate-path-5.0.0" sources."lodash-4.17.20" sources."lodash.memoize-3.0.4" - sources."loose-envify-1.4.0" sources."lru-cache-5.1.1" sources."magic-string-0.25.7" (sources."make-dir-3.1.0" // { @@ -80547,7 +81791,7 @@ in ]; }) sources."ms-2.1.2" - sources."nan-2.14.1" + sources."nan-2.14.2" sources."nanomatch-1.2.13" sources."ncp-2.0.0" sources."neo-async-2.6.2" @@ -80567,7 +81811,7 @@ in ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.61" + sources."node-releases-1.1.63" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."npm-run-path-2.0.2" @@ -80661,7 +81905,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."readdirp-3.4.0" + sources."readdirp-3.5.0" sources."realpath-native-2.0.0" sources."regenerate-1.4.1" sources."regenerate-unicode-properties-8.2.0" @@ -80865,7 +82109,7 @@ in sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" sources."tough-cookie-2.5.0" - sources."tslib-1.14.0" + sources."tslib-1.14.1" sources."tty-browserify-0.0.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -81032,7 +82276,7 @@ in sha512 = "Q9LTCwBjWcQR9dd6LNMXg9GFewkRiVEaU/+Y2ZcCbOb0lVqIfeJworWYGakG7bFj8HJQILBTRnAnEK9DDKfdPA=="; }; dependencies = [ - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ansi-styles-4.3.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -81242,7 +82486,7 @@ in sources."har-schema-2.0.0" (sources."har-validator-5.1.5" // { dependencies = [ - sources."ajv-6.12.5" + sources."ajv-6.12.6" ]; }) sources."has-ansi-2.0.0" @@ -81462,7 +82706,7 @@ in sha512 = "cESM33+QjLuHUcMk9B2qpsplx4h+97adwI/P0/2SvFwFlhVsFfi82a53vV1638hIBLac+RxGG2aT+Fq8YYHHRQ=="; }; dependencies = [ - sources."@types/node-14.11.5" + sources."@types/node-14.11.8" sources."@types/yauzl-2.9.1" sources."agent-base-5.1.1" sources."ansi-styles-4.3.0" @@ -81545,22 +82789,22 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.145.0" - sources."@fluentui/react-focus-7.16.10" + sources."@fluentui/react-7.146.2" + sources."@fluentui/react-focus-7.16.12" sources."@fluentui/react-window-provider-0.3.3" - sources."@fluentui/theme-1.3.0" - sources."@microsoft/load-themed-styles-1.10.108" + sources."@fluentui/theme-1.5.0" + sources."@microsoft/load-themed-styles-1.10.113" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@uifabric/foundation-7.9.10" - sources."@uifabric/icons-7.5.9" + sources."@uifabric/foundation-7.9.13" + sources."@uifabric/icons-7.5.11" sources."@uifabric/merge-styles-7.19.1" sources."@uifabric/react-hooks-7.13.6" sources."@uifabric/set-version-7.0.23" - sources."@uifabric/styling-7.16.10" + sources."@uifabric/styling-7.16.12" sources."@uifabric/utilities-7.32.4" sources."accepts-1.3.7" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ansi-escapes-1.4.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -81684,7 +82928,7 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.145.0" + sources."office-ui-fabric-react-7.146.2" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -81735,8 +82979,8 @@ in sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" - sources."react-16.13.1" - sources."react-dom-16.13.1" + sources."react-16.14.0" + sources."react-dom-16.14.0" sources."react-is-16.13.1" sources."readable-stream-3.6.0" sources."regenerator-runtime-0.10.5" @@ -81783,14 +83027,14 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.35.0" + sources."swagger-ui-dist-3.35.1" sources."tail-2.0.4" sources."through-2.3.8" sources."tmp-0.0.33" sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.0" sources."ts-log-2.2.3" - sources."tslib-1.14.0" + sources."tslib-1.14.1" sources."type-is-1.6.18" sources."unpipe-1.0.0" sources."uri-js-4.4.0" @@ -81862,7 +83106,7 @@ in sources."esprima-4.0.1" sources."fill-range-7.0.1" sources."find-up-5.0.0" - sources."flat-4.1.0" + sources."flat-4.1.1" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" sources."function-bind-1.1.1" @@ -82056,7 +83300,7 @@ in sources."color-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.5.3" + sources."color-string-1.5.4" sources."colornames-1.1.1" sources."colors-1.4.0" sources."colorspace-1.1.2" @@ -82109,65 +83353,62 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "2.65.1"; + version = "2.65.6"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.65.1.tgz"; - sha512 = "JdcOuoz6LCNmw9BgDqFgOsQrKP1F4TeUNgX3h81DxKr7apJeXJxZwXJfR8l+5BM9zn3l907DYO2zQ46hh8WQlg=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.65.6.tgz"; + sha512 = "0e3B0qQV2JRQ7fzkyaQ8XiszK0r6DyWTuZ+7r2OdUo0pPfQ/qZowfSjt/8WcKUZjX97ITPCxtKYTBVb7GJvgZA=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" - (sources."@babel/compat-data-7.11.0" // { + sources."@babel/compat-data-7.12.0" + (sources."@babel/core-7.12.0" // { dependencies = [ sources."semver-5.7.1" ]; }) - (sources."@babel/core-7.11.6" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."@babel/generator-7.11.6" + sources."@babel/generator-7.12.0" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - (sources."@babel/helper-compilation-targets-7.10.4" // { + (sources."@babel/helper-compilation-targets-7.12.0" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/helper-create-class-features-plugin-7.10.5" - sources."@babel/helper-create-regexp-features-plugin-7.10.4" + sources."@babel/helper-create-class-features-plugin-7.12.0" + sources."@babel/helper-create-regexp-features-plugin-7.12.0" sources."@babel/helper-define-map-7.10.5" sources."@babel/helper-explode-assignable-expression-7.11.4" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.11.0" + sources."@babel/helper-member-expression-to-functions-7.12.0" sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.11.0" + sources."@babel/helper-module-transforms-7.12.0" sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-regex-7.10.5" sources."@babel/helper-remap-async-to-generator-7.11.4" - sources."@babel/helper-replace-supers-7.10.4" + sources."@babel/helper-replace-supers-7.12.0" sources."@babel/helper-simple-access-7.10.4" sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/helper-validator-option-7.12.0" sources."@babel/helper-wrap-function-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.5" + sources."@babel/parser-7.12.0" sources."@babel/plugin-proposal-async-generator-functions-7.10.5" sources."@babel/plugin-proposal-class-properties-7.10.4" sources."@babel/plugin-proposal-dynamic-import-7.10.4" - sources."@babel/plugin-proposal-export-namespace-from-7.10.4" + sources."@babel/plugin-proposal-export-namespace-from-7.12.0" sources."@babel/plugin-proposal-json-strings-7.10.4" - sources."@babel/plugin-proposal-logical-assignment-operators-7.11.0" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" - sources."@babel/plugin-proposal-numeric-separator-7.10.4" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.0" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.0" + sources."@babel/plugin-proposal-numeric-separator-7.12.0" sources."@babel/plugin-proposal-object-rest-spread-7.11.0" sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" - sources."@babel/plugin-proposal-optional-chaining-7.11.0" + sources."@babel/plugin-proposal-optional-chaining-7.12.0" sources."@babel/plugin-proposal-private-methods-7.10.4" sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" sources."@babel/plugin-syntax-async-generators-7.8.4" @@ -82198,7 +83439,7 @@ in sources."@babel/plugin-transform-member-expression-literals-7.10.4" sources."@babel/plugin-transform-modules-amd-7.10.5" sources."@babel/plugin-transform-modules-commonjs-7.10.4" - sources."@babel/plugin-transform-modules-systemjs-7.10.5" + sources."@babel/plugin-transform-modules-systemjs-7.12.0" sources."@babel/plugin-transform-modules-umd-7.10.4" sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.4" sources."@babel/plugin-transform-new-target-7.10.4" @@ -82214,16 +83455,16 @@ in sources."@babel/plugin-transform-typeof-symbol-7.10.4" sources."@babel/plugin-transform-unicode-escapes-7.10.4" sources."@babel/plugin-transform-unicode-regex-7.10.4" - (sources."@babel/preset-env-7.11.5" // { + (sources."@babel/preset-env-7.12.0" // { dependencies = [ sources."semver-5.7.1" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.11.2" + sources."@babel/runtime-7.12.0" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.5" - sources."@babel/types-7.11.5" + sources."@babel/traverse-7.12.0" + sources."@babel/types-7.12.0" sources."@bugsnag/browser-7.4.0" sources."@bugsnag/core-7.3.5" sources."@bugsnag/cuid-3.0.0" @@ -82233,20 +83474,20 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-4.8.3" // { + (sources."@netlify/build-5.0.1" // { dependencies = [ sources."chalk-3.0.0" sources."resolve-2.0.0-next.1" ]; }) sources."@netlify/cache-utils-1.0.3" - (sources."@netlify/config-2.3.2" // { + (sources."@netlify/config-2.3.3" // { dependencies = [ sources."chalk-3.0.0" ]; }) sources."@netlify/functions-utils-1.2.9" - (sources."@netlify/git-utils-1.0.2" // { + (sources."@netlify/git-utils-1.0.3" // { dependencies = [ sources."braces-3.0.2" sources."fill-range-7.0.1" @@ -82255,9 +83496,9 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@netlify/open-api-0.18.0" + sources."@netlify/open-api-0.18.1" sources."@netlify/plugin-edge-handlers-1.8.0" - sources."@netlify/run-utils-1.0.1" + sources."@netlify/run-utils-1.0.2" (sources."@netlify/zip-it-and-ship-it-1.3.12" // { dependencies = [ sources."resolve-2.0.0-next.1" @@ -82312,13 +83553,12 @@ in sources."micromatch-4.0.2" sources."slash-3.0.0" sources."to-regex-range-5.0.1" - sources."tslib-2.0.2" + sources."tslib-2.0.3" ]; }) (sources."@oclif/errors-1.3.3" // { dependencies = [ sources."clean-stack-3.0.0" - sources."fs-extra-9.0.1" sources."wrap-ansi-7.0.0" ]; }) @@ -82361,14 +83601,11 @@ in sources."universalify-0.1.2" ]; }) - (sources."@oclif/plugin-plugins-1.9.0" // { + (sources."@oclif/plugin-plugins-1.9.1" // { dependencies = [ - sources."fs-extra-7.0.1" - sources."jsonfile-4.0.0" - sources."npm-run-path-3.1.0" + sources."npm-run-path-4.0.1" sources."path-key-3.1.1" - sources."tslib-2.0.2" - sources."universalify-0.1.2" + sources."tslib-2.0.3" ]; }) sources."@oclif/screen-1.0.4" @@ -82433,7 +83670,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" - sources."@types/node-14.11.5" + sources."@types/node-14.11.8" sources."@types/node-fetch-2.5.7" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-1.17.1" @@ -82502,7 +83739,7 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.769.0" // { + (sources."aws-sdk-2.771.0" // { dependencies = [ sources."buffer-4.9.2" sources."uuid-3.3.2" @@ -82582,7 +83819,7 @@ in sources."cachedir-2.3.0" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001144" + sources."caniuse-lite-1.0.30001148" sources."cardinal-2.1.1" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -82594,7 +83831,7 @@ in ]; }) sources."chardet-0.7.0" - (sources."chokidar-3.4.2" // { + (sources."chokidar-3.4.3" // { dependencies = [ sources."braces-3.0.2" sources."fill-range-7.0.1" @@ -82627,16 +83864,15 @@ in sources."cli-boxes-2.2.1" sources."cli-cursor-2.1.0" sources."cli-progress-3.8.2" - sources."cli-spinners-2.4.0" + sources."cli-spinners-2.5.0" (sources."cli-ux-5.5.0" // { dependencies = [ sources."ansi-escapes-4.3.1" sources."chalk-4.1.0" sources."clean-stack-3.0.0" sources."extract-stack-2.0.0" - sources."fs-extra-9.0.1" sources."supports-hyperlinks-2.1.0" - sources."tslib-2.0.2" + sources."tslib-2.0.3" sources."type-fest-0.11.0" ]; }) @@ -82648,7 +83884,7 @@ in sources."color-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.5.3" + sources."color-string-1.5.4" sources."colors-1.4.0" sources."colorspace-1.1.2" sources."combined-stream-1.0.8" @@ -82829,7 +84065,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.578" + sources."electron-to-chromium-1.3.580" sources."elf-tools-1.1.2" (sources."elliptic-6.5.3" // { dependencies = [ @@ -82846,7 +84082,7 @@ in sources."error-stack-parser-2.0.6" sources."es-abstract-1.18.0-next.1" sources."es-to-primitive-1.2.1" - sources."escalade-3.1.0" + sources."escalade-3.1.1" sources."escape-goat-2.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-4.0.0" @@ -82969,12 +84205,7 @@ in sources."from2-2.3.0" sources."from2-array-0.0.4" sources."fs-constants-1.0.0" - (sources."fs-extra-8.1.0" // { - dependencies = [ - sources."jsonfile-4.0.0" - sources."universalify-0.1.2" - ]; - }) + sources."fs-extra-9.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" sources."function-bind-1.1.1" @@ -82993,7 +84224,7 @@ in sources."get-proxy-2.1.0" sources."get-stream-5.2.0" sources."get-value-2.0.6" - (sources."gh-release-fetch-1.0.4" // { + (sources."gh-release-fetch-1.1.0" // { dependencies = [ sources."semver-5.7.1" ]; @@ -83062,7 +84293,7 @@ in ]; }) sources."hash.js-1.1.7" - (sources."hasha-5.2.1" // { + (sources."hasha-5.2.2" // { dependencies = [ sources."is-stream-2.0.0" ]; @@ -83082,7 +84313,7 @@ in ]; }) sources."http-proxy-1.18.1" - (sources."http-proxy-middleware-1.0.5" // { + (sources."http-proxy-middleware-1.0.6" // { dependencies = [ sources."braces-3.0.2" sources."fill-range-7.0.1" @@ -83132,7 +84363,6 @@ in ]; }) sources."into-stream-3.1.0" - sources."invariant-2.2.4" sources."ipaddr.js-1.9.1" sources."is-0.2.7" sources."is-accessor-descriptor-1.0.0" @@ -83205,9 +84435,9 @@ in sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."kuler-2.0.0" - (sources."lambda-local-1.7.3" // { + (sources."lambda-local-1.7.4" // { dependencies = [ - sources."commander-5.1.0" + sources."commander-6.1.0" ]; }) sources."latest-version-5.1.0" @@ -83250,7 +84480,6 @@ in ]; }) sources."leven-3.1.0" - sources."levenary-1.1.1" sources."levn-0.3.0" sources."lines-and-columns-1.1.6" (sources."load-json-file-5.3.0" // { @@ -83297,7 +84526,6 @@ in sources."ms-2.1.2" ]; }) - sources."loose-envify-1.4.0" sources."lowercase-keys-1.0.1" sources."ltgt-2.2.1" sources."macos-release-2.4.1" @@ -83373,7 +84601,7 @@ in sources."natural-orderby-2.0.3" sources."negotiator-0.6.2" sources."nested-error-stacks-2.1.0" - (sources."netlify-4.7.0" // { + (sources."netlify-4.8.0" // { dependencies = [ sources."qs-6.9.4" ]; @@ -83387,7 +84615,7 @@ in sources."netlify-redirector-0.2.0" sources."nice-try-1.0.5" sources."node-fetch-2.6.1" - sources."node-releases-1.1.61" + sources."node-releases-1.1.63" sources."node-source-walk-4.2.0" sources."noop2-2.0.0" (sources."normalize-package-data-2.5.0" // { @@ -83565,7 +84793,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."readdirp-3.4.0" + sources."readdirp-3.5.0" sources."redeyed-2.1.1" sources."regenerate-1.4.1" sources."regenerate-unicode-properties-8.2.0" @@ -83601,7 +84829,7 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."ripemd160-2.0.2" - sources."rollup-2.28.2" + sources."rollup-2.30.0" sources."rollup-plugin-node-builtins-2.1.2" sources."rollup-plugin-terser-7.0.2" sources."run-async-2.4.1" @@ -83792,7 +85020,7 @@ in ]; }) sources."term-size-2.2.0" - (sources."terser-5.3.4" // { + (sources."terser-5.3.5" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -83838,7 +85066,7 @@ in ]; }) sources."triple-beam-1.3.0" - sources."tslib-1.14.0" + sources."tslib-1.14.1" sources."tsutils-3.17.1" sources."tunnel-agent-0.6.0" sources."type-check-0.3.2" @@ -83976,14 +85204,14 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "7.1.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.0.tgz"; - sha512 = "rjlHQlnl1dqiDZxZYiKqQdrjias7V+81OVR5PTzZioCBtWkNdrKy06M05HLKxy/pcKikKRCabeDRoZaEc6nIjw=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.1.tgz"; + sha512 = "+7TqukzQVlne5EcLrw0Cdm8S26OC4H2mTb5wji4HlsocgB6a9aYHgqlKLKxRMlH/PWNyVQjyRjFhiet7+QZefA=="; }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -84041,15 +85269,12 @@ in sources."minipass-3.1.3" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" - sources."nopt-4.0.3" + sources."nopt-5.0.0" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."once-1.4.0" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" @@ -84058,7 +85283,7 @@ in sources."qs-6.5.2" sources."readable-stream-2.3.7" sources."request-2.88.2" - sources."rimraf-2.7.1" + sources."rimraf-3.0.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-7.3.2" @@ -84252,7 +85477,7 @@ in sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.0.0" - sources."nan-2.14.1" + sources."nan-2.14.2" sources."negotiator-0.6.2" (sources."node-pre-gyp-0.6.39" // { dependencies = [ @@ -84492,16 +85717,16 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-1.1.3.tgz"; - sha512 = "U+bxzyjB66dwIm0DZwvCqy34A6CJICro8xNNbMqA8GWnNrY6/ZGuUrmNuApsH3n8stkOPB4CozdR9JpEXTqbtw=="; + url = "https://registry.npmjs.org/node-red/-/node-red-1.2.0.tgz"; + sha512 = "Rnajn8Kb0Q0tBxR8uTrynoe0hcdcZdeJ9A2t/1XZ91IUm0HDFpv2yBWAjiQVb7maFBDpUs/PrEt1ugGpY2tFcw=="; }; dependencies = [ - sources."@babel/runtime-7.11.2" - sources."@node-red/editor-api-1.1.3" - sources."@node-red/editor-client-1.1.3" - (sources."@node-red/nodes-1.1.3" // { + sources."@babel/runtime-7.12.0" + sources."@node-red/editor-api-1.2.0" + sources."@node-red/editor-client-1.2.0" + (sources."@node-red/nodes-1.2.0" // { dependencies = [ sources."cookie-0.4.1" sources."http-errors-1.7.3" @@ -84515,9 +85740,9 @@ in }) ]; }) - sources."@node-red/registry-1.1.3" - sources."@node-red/runtime-1.1.3" - sources."@node-red/util-1.1.3" + sources."@node-red/registry-1.2.0" + sources."@node-red/runtime-1.2.0" + sources."@node-red/util-1.2.0" sources."abbrev-1.1.1" sources."accepts-1.3.7" (sources."agent-base-6.0.1" // { @@ -84526,12 +85751,13 @@ in sources."ms-2.1.2" ]; }) - sources."ajv-6.12.3" + sources."ajv-6.12.6" sources."ansi-regex-2.1.1" sources."append-field-1.0.0" sources."aproba-1.2.0" (sources."are-we-there-yet-1.1.5" // { dependencies = [ + sources."isarray-1.0.0" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" @@ -84543,11 +85769,13 @@ in sources."assert-plus-1.0.0" sources."async-0.1.22" sources."async-limiter-1.0.1" + sources."async-mutex-0.2.4" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.10.1" sources."axios-0.19.2" sources."balanced-match-1.0.0" + sources."base64-js-1.3.1" (sources."basic-auth-2.0.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -84555,49 +85783,38 @@ in }) (sources."bcrypt-3.0.6" // { dependencies = [ + sources."chownr-1.1.4" + sources."fs-minipass-1.2.7" + sources."minipass-2.9.0" + sources."minizlib-1.3.3" sources."nan-2.13.2" sources."node-pre-gyp-0.12.0" + sources."nopt-4.0.3" sources."semver-5.7.1" + sources."tar-4.4.13" + sources."yallist-3.1.1" ]; }) sources."bcrypt-pbkdf-1.0.2" sources."bcryptjs-2.4.3" - (sources."bl-1.2.3" // { + (sources."bl-4.0.3" // { dependencies = [ - (sources."readable-stream-2.3.7" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - (sources."string_decoder-1.1.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."inherits-2.0.4" + sources."readable-stream-3.6.0" + sources."string_decoder-1.3.0" ]; }) sources."body-parser-1.19.0" sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" + sources."buffer-5.6.0" sources."buffer-from-1.1.1" - (sources."busboy-0.2.14" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) + sources."busboy-0.2.14" sources."bytes-3.1.0" - (sources."callback-stream-1.1.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."callback-stream-1.1.0" sources."caseless-0.12.0" sources."cheerio-0.22.0" - sources."chownr-1.1.4" + sources."chownr-2.0.0" sources."cli-table-0.3.1" sources."clone-2.1.2" sources."code-point-at-1.1.0" @@ -84607,6 +85824,7 @@ in sources."concat-map-0.0.1" (sources."concat-stream-1.6.2" // { dependencies = [ + sources."isarray-1.0.0" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" @@ -84637,19 +85855,14 @@ in sources."depd-1.1.2" sources."destroy-1.0.4" sources."detect-libc-1.0.3" - (sources."dicer-0.2.5" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) + sources."dicer-0.2.5" sources."dom-serializer-0.1.1" sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.5.1" (sources."duplexify-3.7.1" // { dependencies = [ + sources."isarray-1.0.0" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" @@ -84703,7 +85916,7 @@ in sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs-extra-8.1.0" - sources."fs-minipass-1.2.7" + sources."fs-minipass-2.1.0" sources."fs.notify-0.0.4" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" @@ -84712,6 +85925,7 @@ in sources."glob-parent-3.1.0" (sources."glob-stream-6.1.0" // { dependencies = [ + sources."isarray-1.0.0" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" @@ -84723,7 +85937,12 @@ in sources."has-unicode-2.0.1" sources."hash-sum-2.0.0" sources."help-me-1.1.0" - sources."htmlparser2-3.10.1" + (sources."htmlparser2-3.10.1" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."string_decoder-1.3.0" + ]; + }) sources."http-errors-1.7.2" sources."http-signature-1.2.0" (sources."https-proxy-agent-5.0.0" // { @@ -84734,6 +85953,7 @@ in }) sources."i18next-15.1.2" sources."iconv-lite-0.4.24" + sources."ieee754-1.1.13" sources."ignore-walk-3.0.3" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -84749,7 +85969,7 @@ in sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" - sources."isarray-1.0.0" + sources."isarray-0.0.1" sources."isstream-0.1.2" sources."js-yaml-3.14.0" sources."jsbn-0.1.1" @@ -84788,23 +86008,36 @@ in sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-1.2.5" - (sources."minipass-2.9.0" // { + (sources."minipass-3.1.3" // { dependencies = [ - sources."yallist-3.1.1" + sources."yallist-4.0.0" + ]; + }) + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."yallist-4.0.0" ]; }) - sources."minizlib-1.3.3" sources."mkdirp-0.5.5" sources."moment-2.29.1" sources."moment-timezone-0.5.31" - (sources."mqtt-2.18.8" // { + (sources."mqtt-4.2.1" // { dependencies = [ + sources."debug-4.3.0" + sources."isarray-1.0.0" + sources."ms-2.1.2" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" + sources."ws-7.3.1" + ]; + }) + (sources."mqtt-packet-6.6.0" // { + dependencies = [ + sources."debug-4.3.0" + sources."ms-2.1.2" ]; }) - sources."mqtt-packet-5.6.1" sources."ms-2.0.0" sources."multer-1.4.2" sources."mustache-4.0.1" @@ -84820,7 +86053,14 @@ in sources."next-tick-1.0.0" (sources."node-pre-gyp-0.14.0" // { dependencies = [ + sources."chownr-1.1.4" + sources."fs-minipass-1.2.7" + sources."minipass-2.9.0" + sources."minizlib-1.3.3" + sources."nopt-4.0.3" sources."semver-5.7.1" + sources."tar-4.4.13" + sources."yallist-3.1.1" ]; }) (sources."node-red-admin-0.2.6" // { @@ -84830,7 +86070,7 @@ in }) sources."node-red-node-rbe-0.2.9" sources."node-red-node-tail-0.1.1" - sources."nopt-4.0.3" + sources."nopt-5.0.0" sources."npm-bundled-1.1.1" sources."npm-normalize-package-bin-1.0.1" sources."npm-packlist-1.4.8" @@ -84845,6 +86085,7 @@ in sources."once-1.4.0" (sources."ordered-read-streams-1.0.1" // { dependencies = [ + sources."isarray-1.0.0" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" @@ -84880,7 +86121,7 @@ in sources."raw-body-2.4.0" sources."rc-1.2.8" sources."read-1.0.7" - sources."readable-stream-3.6.0" + sources."readable-stream-1.1.14" sources."regenerator-runtime-0.13.7" sources."reinterval-1.1.0" sources."remove-trailing-separator-1.1.0" @@ -84905,24 +86146,31 @@ in sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."signal-exit-3.0.3" - sources."split2-2.2.0" + (sources."split2-3.2.2" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."string_decoder-1.3.0" + ]; + }) sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" sources."statuses-1.5.0" sources."stream-shift-1.0.1" sources."streamsearch-0.1.2" sources."string-width-1.0.2" - sources."string_decoder-1.3.0" + sources."string_decoder-0.10.31" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."tail-2.0.4" - (sources."tar-4.4.13" // { + (sources."tar-6.0.5" // { dependencies = [ - sources."yallist-3.1.1" + sources."mkdirp-1.0.4" + sources."yallist-4.0.0" ]; }) (sources."through2-2.0.5" // { dependencies = [ + sources."isarray-1.0.0" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" @@ -84936,15 +86184,15 @@ in sources."punycode-1.4.1" ]; }) + sources."tslib-2.0.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-1.2.0" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.10.0" + sources."uglify-js-3.11.2" sources."uid-safe-2.1.5" sources."uid2-0.0.3" - sources."ultron-1.1.1" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -84955,25 +86203,6 @@ in sources."uuid-3.4.0" sources."vary-1.1.2" sources."verror-1.10.0" - (sources."websocket-stream-5.5.2" // { - dependencies = [ - (sources."readable-stream-2.3.7" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - (sources."string_decoder-1.1.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - (sources."ws-3.3.3" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - ]; - }) sources."when-3.7.8" sources."wide-align-1.1.3" sources."wrappy-1.0.2" @@ -85003,7 +86232,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -85186,10 +86415,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.4.tgz"; - sha512 = "Ltced+hIfTmaS28Zjv1BM552oQ3dbwPqI4+zI0SLgq+wpJhSyqgYude/aZa/3i31VCQWMfXJVxvu86abcam3uQ=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.5.tgz"; + sha512 = "6/jqtZvJdk092pVnD2AIH19KQ9GQZAKOZVy/yT1ueL6aoV+Ix7a1lVZStXzvEh0fP4zE41DDWlkVoHjR6WlozA=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -85221,7 +86450,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."chokidar-3.4.2" + sources."chokidar-3.4.3" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" sources."clone-response-1.0.2" @@ -85294,7 +86523,7 @@ in sources."pump-3.0.0" sources."pupa-2.0.1" sources."rc-1.2.8" - sources."readdirp-3.4.0" + sources."readdirp-3.5.0" sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" sources."responselike-1.0.2" @@ -85367,10 +86596,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "9.0.4"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-9.0.4.tgz"; - sha512 = "kqevC9RXRsaosPZHg4Pm5CNwnOAG2ymvhU7Q3QIX01SDUID4fpoSAQIuXQH9V3Nnu96kSUz5bDPzQSku33Mz0A=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-9.1.0.tgz"; + sha512 = "sx/hbKWAMPgflMffQLZXYt9uZeOK7Rnd6DLoL+8n2Sxe5yn5MMD4kXtkH5NXqJ3OxVA4JgnVbL7rvXhJKGMZrg=="; }; dependencies = [ sources."@npmcli/ci-detect-1.3.0" @@ -85387,7 +86616,7 @@ in sources."agent-base-6.0.1" sources."agentkeepalive-4.1.3" sources."aggregate-error-3.1.0" - sources."ajv-6.12.5" + sources."ajv-6.12.6" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -85492,7 +86721,7 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."has-yarn-2.1.0" - sources."hosted-git-info-3.0.5" + sources."hosted-git-info-3.0.6" sources."http-cache-semantics-4.1.0" sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" @@ -85554,7 +86783,7 @@ in sources."semver-6.3.0" ]; }) - sources."make-fetch-happen-8.0.9" + sources."make-fetch-happen-8.0.10" sources."mime-db-1.44.0" sources."mime-types-2.1.27" sources."mimic-response-1.0.1" @@ -85570,28 +86799,21 @@ in sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.2" - (sources."node-gyp-7.1.0" // { - dependencies = [ - sources."rimraf-2.7.1" - ]; - }) - sources."nopt-4.0.3" + sources."node-gyp-7.1.1" + sources."nopt-5.0.0" sources."normalize-url-4.5.0" sources."npm-bundled-1.1.1" sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-8.0.1" + sources."npm-package-arg-8.1.0" sources."npm-packlist-2.1.2" sources."npm-pick-manifest-6.1.0" - sources."npm-registry-fetch-8.1.4" + sources."npm-registry-fetch-8.1.5" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."once-1.4.0" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" sources."p-cancelable-1.1.0" sources."p-limit-3.0.2" sources."p-locate-5.0.0" @@ -85710,7 +86932,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -85924,14 +87146,14 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.11.0" - (sources."@babel/core-7.11.6" // { + sources."@babel/compat-data-7.12.0" + (sources."@babel/core-7.12.0" // { dependencies = [ sources."json5-2.1.3" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.11.6" // { + (sources."@babel/generator-7.12.0" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -85939,42 +87161,43 @@ in sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" sources."@babel/helper-builder-react-jsx-7.10.4" - sources."@babel/helper-builder-react-jsx-experimental-7.11.5" - sources."@babel/helper-compilation-targets-7.10.4" - sources."@babel/helper-create-class-features-plugin-7.10.5" - sources."@babel/helper-create-regexp-features-plugin-7.10.4" + sources."@babel/helper-builder-react-jsx-experimental-7.12.0" + sources."@babel/helper-compilation-targets-7.12.0" + sources."@babel/helper-create-class-features-plugin-7.12.0" + sources."@babel/helper-create-regexp-features-plugin-7.12.0" sources."@babel/helper-define-map-7.10.5" sources."@babel/helper-explode-assignable-expression-7.11.4" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.11.0" + sources."@babel/helper-member-expression-to-functions-7.12.0" sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.11.0" + sources."@babel/helper-module-transforms-7.12.0" sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-regex-7.10.5" sources."@babel/helper-remap-async-to-generator-7.11.4" - sources."@babel/helper-replace-supers-7.10.4" + sources."@babel/helper-replace-supers-7.12.0" sources."@babel/helper-simple-access-7.10.4" sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/helper-validator-option-7.12.0" sources."@babel/helper-wrap-function-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.5" + sources."@babel/parser-7.12.0" sources."@babel/plugin-proposal-async-generator-functions-7.10.5" sources."@babel/plugin-proposal-class-properties-7.10.4" sources."@babel/plugin-proposal-dynamic-import-7.10.4" - sources."@babel/plugin-proposal-export-namespace-from-7.10.4" + sources."@babel/plugin-proposal-export-namespace-from-7.12.0" sources."@babel/plugin-proposal-json-strings-7.10.4" - sources."@babel/plugin-proposal-logical-assignment-operators-7.11.0" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" - sources."@babel/plugin-proposal-numeric-separator-7.10.4" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.0" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.0" + sources."@babel/plugin-proposal-numeric-separator-7.12.0" sources."@babel/plugin-proposal-object-rest-spread-7.11.0" sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" - sources."@babel/plugin-proposal-optional-chaining-7.11.0" + sources."@babel/plugin-proposal-optional-chaining-7.12.0" sources."@babel/plugin-proposal-private-methods-7.10.4" sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" sources."@babel/plugin-syntax-async-generators-7.8.4" @@ -86008,7 +87231,7 @@ in sources."@babel/plugin-transform-member-expression-literals-7.10.4" sources."@babel/plugin-transform-modules-amd-7.10.5" sources."@babel/plugin-transform-modules-commonjs-7.10.4" - sources."@babel/plugin-transform-modules-systemjs-7.10.5" + sources."@babel/plugin-transform-modules-systemjs-7.12.0" sources."@babel/plugin-transform-modules-umd-7.10.4" sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.4" sources."@babel/plugin-transform-new-target-7.10.4" @@ -86025,12 +87248,12 @@ in sources."@babel/plugin-transform-typeof-symbol-7.10.4" sources."@babel/plugin-transform-unicode-escapes-7.10.4" sources."@babel/plugin-transform-unicode-regex-7.10.4" - sources."@babel/preset-env-7.11.5" + sources."@babel/preset-env-7.12.0" sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.11.2" + sources."@babel/runtime-7.12.0" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.5" - sources."@babel/types-7.11.5" + sources."@babel/traverse-7.12.0" + sources."@babel/types-7.12.0" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -86048,7 +87271,7 @@ in ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."alphanum-sort-1.0.2" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -86148,7 +87371,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001144" + sources."caniuse-lite-1.0.30001148" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -86159,10 +87382,10 @@ in sources."clone-2.1.2" sources."coa-2.0.2" sources."collection-visit-1.0.0" - sources."color-3.1.2" + sources."color-3.1.3" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.5.3" + sources."color-string-1.5.4" sources."combined-stream-1.0.8" sources."command-exists-1.2.9" sources."commander-2.20.3" @@ -86212,7 +87435,7 @@ in sources."css-select-base-adapter-0.1.1" sources."css-selector-tokenizer-0.7.3" sources."css-tree-1.0.0-alpha.37" - sources."css-what-3.4.1" + sources."css-what-3.4.2" sources."cssesc-3.0.0" sources."cssnano-4.1.10" sources."cssnano-preset-default-4.0.7" @@ -86282,7 +87505,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.578" + sources."electron-to-chromium-1.3.580" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -86294,7 +87517,7 @@ in sources."error-ex-1.3.2" sources."es-abstract-1.18.0-next.1" sources."es-to-primitive-1.2.1" - sources."escalade-3.1.0" + sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."escodegen-1.9.1" @@ -86382,7 +87605,7 @@ in sources."html-tags-1.2.0" (sources."htmlnano-0.2.6" // { dependencies = [ - sources."posthtml-0.13.3" + sources."posthtml-0.13.4" sources."posthtml-parser-0.5.0" sources."terser-4.8.0" ]; @@ -86402,7 +87625,6 @@ in sources."indexes-of-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."invariant-2.2.4" sources."is-absolute-url-2.1.0" (sources."is-accessor-descriptor-1.0.0" // { dependencies = [ @@ -86469,8 +87691,6 @@ in sources."json5-1.0.1" sources."jsprim-1.4.1" sources."kind-of-3.2.2" - sources."leven-3.1.0" - sources."levenary-1.1.1" sources."levn-0.3.0" sources."lodash-4.17.20" sources."lodash.clone-4.5.0" @@ -86478,7 +87698,6 @@ in sources."lodash.sortby-4.7.0" sources."lodash.uniq-4.5.0" sources."log-symbols-2.2.0" - sources."loose-envify-1.4.0" sources."magic-string-0.22.5" sources."map-cache-0.2.2" sources."map-visit-1.0.0" @@ -86518,7 +87737,7 @@ in }) sources."mkdirp-0.5.5" sources."ms-2.1.2" - sources."nan-2.14.1" + sources."nan-2.14.2" (sources."nanomatch-1.2.13" // { dependencies = [ sources."define-property-2.0.2" @@ -86535,7 +87754,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.61" + sources."node-releases-1.1.63" sources."normalize-html-whitespace-1.0.0" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" @@ -86922,7 +88141,7 @@ in sources."negotiator-0.6.2" ]; }) - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -87075,7 +88294,7 @@ in sources."ms-2.0.0" sources."msgpack5-3.6.0" sources."mv-2.1.1" - sources."nan-2.14.1" + sources."nan-2.14.2" sources."ncp-2.0.0" sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" sources."neo-async-2.6.2" @@ -87170,7 +88389,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.11.1" + sources."uglify-js-3.11.2" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.4.0" @@ -87817,7 +89036,7 @@ in sources."accepts-1.3.7" sources."addr-to-ip-port-1.5.1" sources."after-0.8.2" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."archiver-3.1.1" (sources."archiver-utils-2.1.0" // { dependencies = [ @@ -88272,7 +89491,7 @@ in sources."bytes-3.1.0" sources."chalk-3.0.0" sources."charm-0.1.2" - sources."chokidar-3.4.2" + sources."chokidar-3.4.3" sources."cli-tableau-2.0.1" sources."co-4.6.0" sources."color-convert-2.0.1" @@ -88409,7 +89628,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."readdirp-3.4.0" + sources."readdirp-3.5.0" sources."require-in-the-middle-5.0.3" sources."resolve-1.17.0" sources."run-series-1.1.8" @@ -88433,11 +89652,11 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-4.27.7" + sources."systeminformation-4.27.9" sources."thunkify-2.1.2" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" - sources."tslib-2.0.2" + sources."tslib-2.0.3" sources."tv4-1.3.0" sources."type-check-0.3.2" sources."unpipe-1.0.0" @@ -88468,10 +89687,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.8.0"; + version = "5.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.8.0.tgz"; - sha512 = "J2rAxEXnohwcDkR4KNI6UsYhDs9hJ/tje/BahHpXawi406pmxd6caJUXfRxZPbKvKdyVqfBRKhlX1vyhYbM8lQ=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.9.3.tgz"; + sha512 = "MyN/jR/WfM7SPnnrkaEoQ2+cOhoSAnhzJ2sDOF7yZKyjh0sYuvGcijeZYbyWJ0r5C0vtBPV5SRtiLaHvwYWZBg=="; }; buildInputs = globalBuildInputs; meta = { @@ -88486,39 +89705,49 @@ in postcss-cli = nodeEnv.buildNodePackage { name = "postcss-cli"; packageName = "postcss-cli"; - version = "8.0.0"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-8.0.0.tgz"; - sha512 = "WgQIz1tc8htjob2DULE6dTssDzItuBh3UbscdrAlvid7M6X2WBZUrHCaLMtIuFkHFijAnimIq3nkpXV6FdDTSg=="; + url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-8.1.0.tgz"; + sha512 = "FYuV5zyYX53X5RywInxjWLqHZ4oCBC3nDwrHYU3Z75mFqUo5IHfbeY593heWSagG90nPnXq3tXCck8+2CUl8EA=="; }; dependencies = [ + sources."@babel/code-frame-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + (sources."@babel/highlight-7.10.4" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" + sources."@types/parse-json-4.0.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."anymatch-3.1.1" - sources."argparse-1.0.10" sources."array-union-2.1.0" sources."at-least-node-1.0.0" sources."binary-extensions-2.1.0" sources."braces-3.0.2" - sources."caller-callsite-2.0.0" - sources."caller-path-2.0.0" - sources."callsites-2.0.0" + sources."callsites-3.1.0" sources."chalk-4.1.0" - sources."chokidar-3.4.2" - sources."cliui-7.0.1" + sources."chokidar-3.4.3" + sources."cliui-7.0.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."colorette-1.2.1" - sources."cosmiconfig-5.2.1" + sources."cosmiconfig-7.0.0" sources."dependency-graph-0.9.0" sources."dir-glob-3.0.1" sources."emoji-regex-8.0.0" sources."error-ex-1.3.2" - sources."escalade-3.1.0" - sources."esprima-4.0.1" + sources."escalade-3.1.1" + sources."escape-string-regexp-1.0.5" sources."fast-glob-3.2.4" sources."fastq-1.8.0" sources."fill-range-7.0.1" @@ -88531,19 +89760,23 @@ in sources."graceful-fs-4.2.4" sources."has-flag-4.0.0" sources."ignore-5.1.8" - sources."import-cwd-2.1.0" - sources."import-fresh-2.0.0" - sources."import-from-2.1.0" + sources."import-cwd-3.0.0" + sources."import-fresh-3.2.1" + (sources."import-from-3.0.0" // { + dependencies = [ + sources."resolve-from-5.0.0" + ]; + }) sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" - sources."is-directory-0.3.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-number-7.0.0" - sources."js-yaml-3.14.0" - sources."json-parse-better-errors-1.0.2" + sources."js-tokens-4.0.0" + sources."json-parse-even-better-errors-2.3.1" sources."jsonfile-6.0.1" + sources."lines-and-columns-1.1.6" sources."lodash.difference-4.5.0" sources."lodash.forown-4.4.0" sources."lodash.get-4.4.2" @@ -88553,21 +89786,21 @@ in sources."merge2-1.4.1" sources."micromatch-4.0.2" sources."normalize-path-3.0.0" - sources."parse-json-4.0.0" + sources."parent-module-1.0.1" + sources."parse-json-5.1.0" sources."path-type-4.0.0" sources."picomatch-2.2.2" sources."pify-2.3.0" - sources."postcss-load-config-2.1.2" + sources."postcss-load-config-3.0.0" sources."postcss-reporter-7.0.1" sources."pretty-hrtime-1.0.3" sources."read-cache-1.0.0" - sources."readdirp-3.4.0" + sources."readdirp-3.5.0" sources."require-directory-2.1.1" - sources."resolve-from-3.0.0" + sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."run-parallel-1.1.9" sources."slash-3.0.0" - sources."sprintf-js-1.0.3" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" @@ -88575,8 +89808,9 @@ in sources."universalify-1.0.0" sources."wrap-ansi-7.0.0" sources."y18n-5.0.2" + sources."yaml-1.10.0" sources."yargs-16.0.3" - sources."yargs-parser-20.2.1" + sources."yargs-parser-20.2.2" ]; buildInputs = globalBuildInputs; meta = { @@ -88770,7 +90004,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."inline-source-map-0.6.2" - (sources."insert-module-globals-7.2.0" // { + (sources."insert-module-globals-7.2.1" // { dependencies = [ sources."concat-stream-1.6.2" ]; @@ -88980,10 +90214,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.78"; + version = "1.1.79"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.78.tgz"; - sha512 = "sKh6AbVIysi0CzgL3M8iaKBy/2yopDxyB0VptIYTIGpGcGKJce0KrsJ7OSR3bgx3S4MYMWKF004ws0tosJy+kA=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.79.tgz"; + sha512 = "WriY7VGjg9CzhxMUfDf8bIBRfXWeVj/kgiAAJ783wiQuUwy5IwMlZgR4ZyAGYBztMH+uRdiG4HCgt30ELYeeNg=="; }; buildInputs = globalBuildInputs; meta = { @@ -89182,7 +90416,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - (sources."@babel/generator-7.11.6" // { + (sources."@babel/generator-7.12.0" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -89194,16 +90428,16 @@ in sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.5" - sources."@babel/runtime-7.11.2" + sources."@babel/parser-7.12.0" + sources."@babel/runtime-7.12.0" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.5" - sources."@babel/types-7.11.5" + sources."@babel/traverse-7.12.0" + sources."@babel/types-7.12.0" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" sources."@emotion/unitless-0.7.5" - sources."@exodus/schemasafe-1.0.0-rc.2" + sources."@exodus/schemasafe-1.0.0-rc.3" sources."ajv-5.5.2" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -89254,7 +90488,7 @@ in sources."camelcase-5.3.1" sources."camelize-1.0.0" sources."chalk-2.4.2" - sources."chokidar-3.4.2" + sources."chokidar-3.4.3" sources."cipher-base-1.0.4" sources."classnames-2.2.6" sources."clipboard-2.0.6" @@ -89397,8 +90631,8 @@ in sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" sources."oas-kit-common-1.0.8" - sources."oas-linter-3.2.0" - sources."oas-resolver-2.5.1" + sources."oas-linter-3.2.1" + sources."oas-resolver-2.5.2" sources."oas-schema-walker-1.1.5" sources."oas-validator-3.4.0" sources."object-assign-4.1.1" @@ -89423,7 +90657,7 @@ in sources."picomatch-2.2.2" sources."polished-3.6.7" sources."postcss-value-parser-4.1.0" - sources."prismjs-1.21.0" + sources."prismjs-1.22.0" sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."prop-types-15.7.2" @@ -89438,8 +90672,8 @@ in sources."querystring-es3-0.2.1" sources."randombytes-2.1.0" sources."randomfill-1.0.4" - sources."react-16.13.1" - sources."react-dom-16.13.1" + sources."react-16.14.0" + sources."react-dom-16.14.0" sources."react-dropdown-1.9.0" (sources."react-hot-loader-4.13.0" // { dependencies = [ @@ -89457,10 +90691,10 @@ in sources."string_decoder-1.1.1" ]; }) - sources."readdirp-3.4.0" + sources."readdirp-3.5.0" (sources."redoc-2.0.0-rc.8-1" // { dependencies = [ - sources."tslib-1.14.0" + sources."tslib-1.14.1" ]; }) sources."reftools-1.1.6" @@ -89512,9 +90746,9 @@ in sources."to-arraybuffer-1.0.1" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" - sources."tslib-2.0.2" + sources."tslib-2.0.3" sources."tty-browserify-0.0.0" - sources."uglify-js-3.11.1" + sources."uglify-js-3.11.2" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" @@ -89576,10 +90810,10 @@ in "reveal.js" = nodeEnv.buildNodePackage { name = "reveal.js"; packageName = "reveal.js"; - version = "4.0.2"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/reveal.js/-/reveal.js-4.0.2.tgz"; - sha512 = "LWZSUenufF1gpD7npxJ7KfoQQFKgc1D6XrLTFgKlwWNP1BQ74hT48KONFWMAw+8R/QUeaScCLCLrBVHDfFIEiw=="; + url = "https://registry.npmjs.org/reveal.js/-/reveal.js-4.1.0.tgz"; + sha512 = "lYOMhxSWgq5jtgspF7eRL0d2rBnHO/VGZ4/qp46yu+eGoWqJkYHEuepEXzx71M8MI6Rf8HBYWaTnKi5uHWcU1Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -89594,10 +90828,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.28.2"; + version = "2.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.28.2.tgz"; - sha512 = "8txbsFBFLmm9Xdt4ByTOGa9Muonmc8MfNjnGAR8U8scJlF1ZW7AgNZa7aqBXaKtlvnYP/ab++fQIq9dB9NWUbg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.30.0.tgz"; + sha512 = "j4K1hUZfgFM03DUpayd3c7kZW+2wDbI6rj7ssQxpCpL1vsGpaM0vSorxBuePFwQDFq9O2DI6AOQbm174Awsq4w=="; }; dependencies = [ sources."fsevents-2.1.3" @@ -89638,7 +90872,7 @@ in sources."@types/node-12.7.12" sources."@types/node-fetch-2.5.7" sources."@types/resolve-1.17.1" - sources."@types/vscode-1.49.0" + sources."@types/vscode-1.50.0" (sources."@typescript-eslint/eslint-plugin-3.10.1" // { dependencies = [ sources."semver-7.3.2" @@ -89656,7 +90890,7 @@ in sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" sources."agent-base-4.3.0" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -89737,8 +90971,9 @@ in sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.10.0" // { + (sources."eslint-7.11.0" // { dependencies = [ + sources."eslint-visitor-keys-2.0.0" sources."semver-7.3.2" ]; }) @@ -89767,7 +91002,7 @@ in sources."file-entry-cache-5.0.1" sources."fill-range-7.0.1" sources."find-up-5.0.0" - sources."flat-4.1.0" + sources."flat-4.1.1" sources."flat-cache-2.0.1" sources."flatted-2.0.2" sources."form-data-3.0.0" @@ -89902,7 +91137,7 @@ in sources."resolve-1.17.0" sources."resolve-from-4.0.0" sources."rimraf-2.6.3" - sources."rollup-2.28.2" + sources."rollup-2.30.0" sources."safe-buffer-5.2.1" sources."semver-6.3.0" sources."serialize-javascript-4.0.0" @@ -89929,10 +91164,10 @@ in sources."text-table-0.2.0" sources."tmp-0.0.29" sources."to-regex-range-5.0.1" - sources."tslib-2.0.2" + sources."tslib-2.0.3" (sources."tsutils-3.17.1" // { dependencies = [ - sources."tslib-1.14.0" + sources."tslib-1.14.1" ]; }) sources."tunnel-0.0.4" @@ -90020,7 +91255,7 @@ in sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198"; }; dependencies = [ - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" @@ -90143,6 +91378,41 @@ in bypassCache = true; reconstructLock = true; }; + sass = nodeEnv.buildNodePackage { + name = "sass"; + packageName = "sass"; + version = "1.27.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sass/-/sass-1.27.0.tgz"; + sha512 = "0gcrER56OkzotK/GGwgg4fPrKuiFlPNitO7eUJ18Bs+/NBlofJfMxmxqpqJxjae9vu0Wq8TZzrSyxZal00WDig=="; + }; + dependencies = [ + sources."anymatch-3.1.1" + sources."binary-extensions-2.1.0" + sources."braces-3.0.2" + sources."chokidar-3.4.3" + sources."fill-range-7.0.1" + sources."fsevents-2.1.3" + sources."glob-parent-5.1.1" + sources."is-binary-path-2.1.0" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."normalize-path-3.0.0" + sources."picomatch-2.2.2" + sources."readdirp-3.5.0" + sources."to-regex-range-5.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A pure JavaScript implementation of Sass."; + homepage = https://github.com/sass/dart-sass; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; semver = nodeEnv.buildNodePackage { name = "semver"; packageName = "semver"; @@ -90270,10 +91540,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.5.0"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.5.0.tgz"; - sha512 = "2JxwILnVqCY9mSw+QcPSKh2OJXsCmL5BZ9xHXYAOaKbI8G/TlxwooeCmw9LT91kdtM8Wh69rJsxRzzpP4MhWyQ=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.7.0.tgz"; + sha512 = "hDSRapUjJvoBW0Q+loru7o6R2xbaBKTRmmqJjc7dEaePf/7fN19upJ0mZjjPKHuJOAv8JXmSYgkDnKeHyxgkXg=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -90305,7 +91575,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.2.1" // { + (sources."@serverless/components-3.2.2" // { dependencies = [ sources."@sindresorhus/is-3.1.2" sources."@szmarczak/http-timer-4.0.5" @@ -90331,10 +91601,14 @@ in sources."semver-6.3.0" ]; }) - sources."@serverless/enterprise-plugin-4.0.4" + (sources."@serverless/enterprise-plugin-4.1.0" // { + dependencies = [ + sources."@serverless/platform-client-2.1.0" + ]; + }) sources."@serverless/event-mocks-1.1.1" - sources."@serverless/platform-client-2.1.0" - sources."@serverless/platform-client-china-2.0.0" + sources."@serverless/platform-client-3.1.2" + sources."@serverless/platform-client-china-2.0.3" (sources."@serverless/platform-sdk-2.3.2" // { dependencies = [ sources."chalk-2.4.2" @@ -90353,17 +91627,17 @@ in sources."write-file-atomic-3.0.3" ]; }) - sources."@serverless/utils-china-1.0.2" + sources."@serverless/utils-china-1.0.3" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@tencent-sdk/capi-1.1.4" + sources."@tencent-sdk/capi-1.1.5" sources."@types/cacheable-request-6.0.1" sources."@types/caseless-0.12.2" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/lodash-4.14.161" + sources."@types/lodash-4.14.162" sources."@types/long-4.0.1" - sources."@types/node-14.11.5" + sources."@types/node-14.11.8" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" sources."@types/responselike-1.0.0" @@ -90371,7 +91645,7 @@ in sources."adm-zip-0.4.16" sources."after-0.8.2" sources."agent-base-5.1.1" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" (sources."ansi-align-3.0.0" // { dependencies = [ @@ -90384,6 +91658,7 @@ in sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" + sources."aproba-1.2.0" (sources."archive-type-4.0.0" // { dependencies = [ sources."file-type-4.4.0" @@ -90392,11 +91667,19 @@ in (sources."archiver-5.0.2" // { dependencies = [ sources."async-3.2.0" + sources."bl-4.0.3" + sources."tar-stream-2.1.4" ]; }) (sources."archiver-utils-2.1.0" // { dependencies = [ - sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) + (sources."are-we-there-yet-1.1.5" // { + dependencies = [ sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" @@ -90411,10 +91694,9 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.769.0" // { + (sources."aws-sdk-2.771.0" // { dependencies = [ sources."buffer-4.9.2" - sources."isarray-1.0.0" sources."uuid-3.3.2" ]; }) @@ -90426,17 +91708,36 @@ in sources."base64-arraybuffer-0.1.4" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" + sources."binary-0.3.0" sources."binary-extensions-2.1.0" - sources."bl-4.0.3" + sources."bindings-1.5.0" + (sources."bl-2.2.1" // { + dependencies = [ + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + ]; + }) sources."blob-0.0.5" sources."bluebird-3.7.2" (sources."boxen-4.2.0" // { dependencies = [ + sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."chalk-3.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" sources."type-fest-0.8.1" ]; @@ -90449,6 +91750,8 @@ in sources."buffer-crc32-0.2.13" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" + sources."buffermaker-1.2.1" + sources."buffers-0.1.1" sources."builtin-modules-3.1.0" sources."cacheable-lookup-5.0.3" (sources."cacheable-request-6.1.0" // { @@ -90460,6 +91763,11 @@ in sources."cachedir-2.3.0" sources."camelcase-5.3.1" sources."caseless-0.12.0" + (sources."chainsaw-0.1.0" // { + dependencies = [ + sources."traverse-0.3.9" + ]; + }) (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -90471,7 +91779,8 @@ in }) sources."chardet-0.7.0" sources."child-process-ext-2.1.1" - sources."chokidar-3.4.2" + sources."chokidar-3.4.3" + sources."chownr-1.1.4" sources."cli-boxes-2.2.1" (sources."cli-color-2.0.0" // { dependencies = [ @@ -90481,10 +91790,11 @@ in sources."cli-cursor-3.1.0" sources."cli-width-3.0.0" sources."clone-response-1.0.2" + sources."code-point-at-1.1.0" sources."color-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.5.3" + sources."color-string-1.5.4" sources."colornames-1.1.1" sources."colors-1.3.3" sources."colorspace-1.1.2" @@ -90495,6 +91805,7 @@ in sources."component-inherit-0.0.3" sources."compress-commons-4.0.1" sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" (sources."content-disposition-0.5.3" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -90515,21 +91826,12 @@ in ]; }) sources."dashdash-1.14.1" - sources."dayjs-1.9.1" + sources."dayjs-1.9.3" sources."debug-3.1.0" sources."decode-uri-component-0.2.0" sources."decompress-4.2.1" sources."decompress-response-3.3.0" - (sources."decompress-tar-4.1.1" // { - dependencies = [ - sources."bl-1.2.3" - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - sources."tar-stream-1.6.2" - ]; - }) + sources."decompress-tar-4.1.1" (sources."decompress-tarbz2-4.1.1" // { dependencies = [ sources."file-type-6.2.0" @@ -90546,6 +91848,9 @@ in sources."defer-to-connect-1.1.3" sources."deferred-0.7.11" sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."denque-1.4.1" + sources."detect-libc-1.0.3" sources."diagnostics-1.1.1" sources."dijkstrajs-1.0.1" sources."dir-glob-3.0.1" @@ -90607,6 +91912,7 @@ in sources."essentials-1.1.1" sources."event-emitter-0.3.5" sources."events-1.1.1" + sources."expand-template-2.0.3" sources."ext-1.4.0" sources."ext-list-2.2.2" sources."ext-name-5.0.0" @@ -90623,6 +91929,7 @@ in sources."fecha-4.2.0" sources."figures-3.2.0" sources."file-type-5.2.0" + sources."file-uri-to-path-1.0.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-3.0.0" sources."filesize-6.1.0" @@ -90641,7 +91948,6 @@ in sources."formidable-1.2.2" (sources."from2-2.3.0" // { dependencies = [ - sources."isarray-1.0.0" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" @@ -90657,9 +91963,16 @@ in sources."fs.realpath-1.0.0" sources."fs2-0.3.8" sources."fsevents-2.1.3" + (sources."gauge-2.7.4" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."strip-ansi-3.0.1" + ]; + }) sources."get-stdin-8.0.0" sources."get-stream-4.1.0" sources."getpass-0.1.7" + sources."github-from-package-0.0.0" sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."globby-11.0.1" @@ -90668,11 +91981,16 @@ in sources."graphlib-2.1.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - sources."has-binary2-1.0.3" + (sources."has-binary2-1.0.3" // { + dependencies = [ + sources."isarray-2.0.1" + ]; + }) sources."has-cors-1.1.0" sources."has-flag-3.0.0" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" + sources."has-unicode-2.0.1" sources."http-cache-semantics-4.1.0" sources."http-signature-1.2.0" sources."http2-wrapper-1.0.0-beta.5.2" @@ -90695,6 +92013,8 @@ in (sources."inquirer-7.3.3" // { dependencies = [ sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" sources."strip-ansi-6.0.0" ]; }) @@ -90704,7 +92024,7 @@ in sources."is-binary-path-2.1.0" sources."is-docker-2.1.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" + sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.1" sources."is-natural-number-4.0.1" sources."is-number-7.0.0" @@ -90715,7 +92035,7 @@ in sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-wsl-2.2.0" - sources."isarray-2.0.1" + sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isomorphic-ws-4.0.1" sources."isstream-0.1.2" @@ -90737,18 +92057,22 @@ in sources."jsprim-1.4.1" (sources."jszip-3.5.0" // { dependencies = [ - sources."isarray-1.0.0" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) sources."jwt-decode-2.2.0" + (sources."kafka-node-5.0.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."uuid-3.4.0" + ]; + }) sources."keyv-3.1.0" sources."kuler-1.0.1" (sources."lazystream-1.0.0" // { dependencies = [ - sources."isarray-1.0.0" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" @@ -90771,7 +92095,7 @@ in sources."ms-2.1.2" ]; }) - sources."long-4.0.0" + sources."long-1.1.2" sources."lowercase-keys-1.0.1" sources."lru-queue-0.1.0" (sources."make-dir-1.3.0" // { @@ -90794,15 +92118,26 @@ in sources."moment-2.29.1" sources."ms-2.0.0" sources."mute-stream-0.0.8" + sources."nan-2.14.2" sources."nanoid-2.1.11" + sources."napi-build-utils-1.0.2" sources."native-promise-only-0.8.1" sources."ncjsm-4.1.0" + sources."nested-error-stacks-2.1.0" sources."next-tick-1.0.0" sources."nice-try-1.0.5" + (sources."node-abi-2.19.1" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."node-dir-0.1.17" sources."node-fetch-2.6.1" + sources."noop-logger-0.1.1" sources."normalize-path-3.0.0" sources."normalize-url-4.5.0" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."object-hash-2.0.3" @@ -90815,6 +92150,8 @@ in sources."is-wsl-1.1.0" ]; }) + sources."optional-0.1.4" + sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-event-2.3.1" @@ -90841,13 +92178,19 @@ in sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" + (sources."prebuild-install-5.3.0" // { + dependencies = [ + sources."pump-2.0.1" + ]; + }) sources."prepend-http-2.0.0" sources."prettyoutput-1.2.0" sources."process-nextick-args-2.0.1" sources."promise-queue-2.2.5" (sources."protobufjs-6.10.1" // { dependencies = [ - sources."@types/node-13.13.23" + sources."@types/node-13.13.25" + sources."long-4.0.0" ]; }) sources."psl-1.8.0" @@ -90861,7 +92204,7 @@ in sources."rc-1.2.8" sources."readable-stream-3.6.0" sources."readdir-glob-1.1.1" - sources."readdirp-3.4.0" + sources."readdirp-3.5.0" sources."regenerator-runtime-0.13.7" sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" @@ -90877,6 +92220,7 @@ in sources."resolve-alpn-1.0.0" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" + sources."retry-0.10.1" sources."reusify-1.0.4" sources."run-async-2.4.1" sources."run-parallel-1.1.9" @@ -90886,11 +92230,14 @@ in sources."sax-1.2.1" sources."seek-bzip-1.0.6" sources."semver-7.3.2" + sources."set-blocking-2.0.0" sources."set-immediate-shim-1.0.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shortid-2.2.15" sources."signal-exit-3.0.3" + sources."simple-concat-1.0.1" + sources."simple-get-2.8.1" (sources."simple-git-2.21.0" // { dependencies = [ sources."debug-4.3.0" @@ -90899,8 +92246,13 @@ in }) sources."simple-swizzle-0.2.2" sources."slash-3.0.0" + sources."snappy-6.3.5" sources."socket.io-client-2.3.1" - sources."socket.io-parser-3.3.1" + (sources."socket.io-parser-3.3.1" // { + dependencies = [ + sources."isarray-2.0.1" + ]; + }) sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" sources."source-map-0.6.1" @@ -90914,10 +92266,10 @@ in sources."stream-promise-3.2.0" sources."stream-shift-1.0.1" sources."strict-uri-encode-1.1.0" - (sources."string-width-4.2.0" // { + (sources."string-width-1.0.2" // { dependencies = [ - sources."ansi-regex-5.0.0" - sources."strip-ansi-6.0.0" + sources."ansi-regex-2.1.1" + sources."strip-ansi-3.0.1" ]; }) sources."string_decoder-1.3.0" @@ -90927,7 +92279,6 @@ in sources."strip-outer-1.0.1" (sources."superagent-3.8.3" // { dependencies = [ - sources."isarray-1.0.0" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" @@ -90955,7 +92306,19 @@ in sources."untildify-3.0.3" ]; }) - sources."tar-stream-2.1.4" + (sources."tar-fs-1.16.3" // { + dependencies = [ + sources."pump-1.0.3" + ]; + }) + (sources."tar-stream-1.6.2" // { + dependencies = [ + sources."bl-1.2.3" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) sources."term-size-2.2.0" sources."text-hex-1.0.0" sources."through-2.3.8" @@ -90970,7 +92333,7 @@ in sources."traverse-0.6.6" sources."trim-repeated-1.0.0" sources."triple-beam-1.3.0" - sources."tslib-1.14.0" + sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-2.1.0" @@ -90992,11 +92355,19 @@ in sources."uuid-8.3.1" sources."verror-1.10.0" sources."which-1.3.1" - sources."widest-line-3.1.0" + sources."which-pm-runs-1.0.0" + sources."wide-align-1.1.3" + (sources."widest-line-3.1.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + ]; + }) sources."winston-3.2.1" (sources."winston-transport-4.4.0" // { dependencies = [ - sources."isarray-1.0.0" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" @@ -91011,7 +92382,7 @@ in sources."xtend-4.0.2" sources."yaml-ast-parser-0.0.43" sources."yamljs-0.3.0" - sources."yargs-parser-20.2.1" + sources."yargs-parser-20.2.2" sources."yauzl-2.10.0" sources."yeast-0.1.2" sources."zip-stream-4.0.2" @@ -91039,7 +92410,7 @@ in sources."CSSwhat-0.4.7" sources."accepts-1.3.7" sources."after-0.8.1" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."array-flatten-1.1.1" sources."arraybuffer.slice-0.0.6" sources."asn1-0.2.4" @@ -91556,7 +92927,7 @@ in sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."mv-2.1.1" - sources."nan-2.14.1" + sources."nan-2.14.2" sources."ncp-2.0.0" sources."negotiator-0.5.3" sources."node-uuid-1.4.8" @@ -91653,10 +93024,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.410.3"; + version = "1.413.5"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.410.3.tgz"; - sha512 = "BZ2w1uPCDyjgM2Y6XW071ZlVa1RAVU0xEe7oFY93cdf6ccjCZLyfDqsnbf0ahxAZJp8BZOrq/HsFAfEhm3P8hg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.413.5.tgz"; + sha512 = "dM2DMf7Q4yBoIo+cp0gnsNr3xjKIp3m1l3ywlTMonwmm/LU/L5+naK7+rCXapOPgteecMpku6zH0jisM4H5NQw=="; }; dependencies = [ sources."@sindresorhus/is-2.1.1" @@ -91664,13 +93035,13 @@ in sources."@snyk/cocoapods-lockfile-parser-3.5.2" sources."@snyk/composer-lockfile-parser-1.4.1" sources."@snyk/dep-graph-1.19.4" - sources."@snyk/docker-registry-v2-client-1.13.5" + sources."@snyk/docker-registry-v2-client-1.13.6" sources."@snyk/gemfile-1.2.0" sources."@snyk/java-call-graph-builder-1.16.0" - sources."@snyk/rpm-parser-2.0.0" + sources."@snyk/rpm-parser-2.2.0" (sources."@snyk/snyk-cocoapods-plugin-2.5.1" // { dependencies = [ - sources."tslib-2.0.2" + sources."tslib-2.0.3" ]; }) (sources."@snyk/snyk-docker-pull-3.2.0" // { @@ -91686,7 +93057,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/js-yaml-3.12.5" sources."@types/keyv-3.1.1" - sources."@types/node-14.11.5" + sources."@types/node-14.11.8" sources."@types/responselike-1.0.0" sources."@types/semver-5.5.0" sources."@yarnpkg/lockfile-1.1.0" @@ -91709,7 +93080,7 @@ in sources."asn1-0.2.4" (sources."ast-types-0.14.2" // { dependencies = [ - sources."tslib-2.0.2" + sources."tslib-2.0.3" ]; }) sources."async-1.5.2" @@ -91848,7 +93219,7 @@ in sources."gunzip-maybe-1.4.2" sources."has-flag-3.0.0" sources."has-yarn-2.1.0" - (sources."hosted-git-info-3.0.5" // { + (sources."hosted-git-info-3.0.6" // { dependencies = [ sources."lru-cache-6.0.0" sources."yallist-4.0.0" @@ -92046,7 +93417,7 @@ in sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."supports-color-7.2.0" - sources."tslib-2.0.2" + sources."tslib-2.0.3" ]; }) (sources."snyk-docker-plugin-3.26.2" // { @@ -92064,11 +93435,11 @@ in sources."tmp-0.2.1" ]; }) - (sources."snyk-gradle-plugin-3.9.0" // { + (sources."snyk-gradle-plugin-3.10.0" // { dependencies = [ (sources."@snyk/cli-interface-2.9.1" // { dependencies = [ - sources."tslib-1.14.0" + sources."tslib-1.14.1" ]; }) sources."ansi-styles-4.3.0" @@ -92079,13 +93450,14 @@ in sources."rimraf-3.0.2" sources."supports-color-7.2.0" sources."tmp-0.2.1" - sources."tslib-2.0.2" + sources."tslib-2.0.3" ]; }) sources."snyk-module-3.1.0" - (sources."snyk-mvn-plugin-2.22.0" // { + (sources."snyk-mvn-plugin-2.23.0" // { dependencies = [ sources."@snyk/cli-interface-2.9.1" + sources."@snyk/java-call-graph-builder-1.16.1" sources."tmp-0.1.0" sources."tslib-1.11.1" ]; @@ -92196,7 +93568,7 @@ in sources."toidentifier-1.0.0" sources."toml-3.0.0" sources."tree-kill-1.2.2" - sources."tslib-1.14.0" + sources."tslib-1.14.1" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."type-fest-0.11.0" @@ -92358,7 +93730,7 @@ in sources."ci-info-1.6.0" sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" - sources."cli-spinners-2.4.0" + sources."cli-spinners-2.5.0" sources."clone-1.0.4" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -92886,7 +94258,7 @@ in sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" sources."mutexify-1.3.1" - sources."muxrpc-6.5.0" + sources."muxrpc-6.5.1" sources."muxrpc-usage-2.1.0" sources."muxrpc-validation-3.0.2" sources."muxrpcli-3.1.2" @@ -92895,7 +94267,7 @@ in sources."rimraf-2.4.5" ]; }) - sources."nan-2.14.1" + sources."nan-2.14.2" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -93207,7 +94579,7 @@ in ]; }) sources."ssb-keys-7.2.2" - sources."ssb-links-3.0.9" + sources."ssb-links-3.0.10" sources."ssb-local-1.0.0" sources."ssb-logging-1.0.0" sources."ssb-master-1.0.3" @@ -93421,7 +94793,7 @@ in sources."semver-5.0.3" ]; }) - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."align-text-0.1.4" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -93438,7 +94810,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.769.0" // { + (sources."aws-sdk-2.771.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -93565,7 +94937,7 @@ in sources."drange-1.1.1" (sources."dtrace-provider-0.8.8" // { dependencies = [ - sources."nan-2.14.1" + sources."nan-2.14.2" ]; }) sources."ecc-jsbn-0.1.2" @@ -94229,7 +95601,7 @@ in sources."css-select-2.1.0" sources."css-select-base-adapter-0.1.1" sources."css-tree-1.0.0-alpha.37" - sources."css-what-3.4.1" + sources."css-what-3.4.2" (sources."csso-4.0.3" // { dependencies = [ sources."css-tree-1.0.0-alpha.39" @@ -94642,7 +96014,7 @@ in sources."ms-2.0.0" sources."multer-1.4.2" sources."mute-stream-0.0.5" - sources."nan-2.14.1" + sources."nan-2.14.2" sources."nanomatch-1.2.13" sources."native-promise-only-0.8.1" sources."neo-async-2.6.2" @@ -94865,7 +96237,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.11.1" + sources."uglify-js-3.11.2" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -94932,7 +96304,7 @@ in sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b"; }; dependencies = [ - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -95628,10 +97000,10 @@ in sources."semver-6.3.0" ]; }) - sources."parse-english-4.1.3" + sources."parse-english-4.2.0" sources."parse-entities-2.0.0" sources."parse-json-5.1.0" - sources."parse-latin-4.2.1" + sources."parse-latin-4.3.0" sources."parse5-6.0.1" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" @@ -95640,7 +97012,7 @@ in sources."pluralize-8.0.0" sources."prepend-http-2.0.0" sources."process-nextick-args-1.0.7" - sources."property-information-5.5.0" + sources."property-information-5.6.0" sources."pump-1.0.3" sources."pump-chain-1.0.0" sources."pupa-2.0.1" @@ -95773,7 +97145,7 @@ in sources."unique-string-2.0.0" sources."unist-util-inspect-5.0.1" sources."unist-util-is-4.0.2" - sources."unist-util-modify-children-1.1.6" + sources."unist-util-modify-children-2.0.0" sources."unist-util-position-3.1.0" sources."unist-util-remove-position-2.0.1" sources."unist-util-stringify-position-2.0.3" @@ -96224,7 +97596,7 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.11.5" + sources."@types/node-14.11.8" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.0" @@ -96236,7 +97608,7 @@ in sources."ms-2.1.2" ]; }) - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ansi-regex-2.1.1" sources."ansi-styles-4.3.0" sources."aproba-1.2.0" @@ -96701,7 +98073,7 @@ in }; dependencies = [ sources."adm-zip-0.4.13" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.3" @@ -96898,7 +98270,7 @@ in sources."mooremachine-2.3.0" sources."mute-stream-0.0.8" sources."mv-2.1.1" - sources."nan-2.14.1" + sources."nan-2.14.2" sources."ncp-2.0.0" sources."once-1.3.2" sources."path-is-absolute-1.0.1" @@ -97052,7 +98424,7 @@ in sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" sources."temp-0.8.4" - sources."tslib-1.14.0" + sources."tslib-1.14.1" sources."wordwrap-0.0.3" sources."wrappy-1.0.2" ]; @@ -97146,10 +98518,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.11.1"; + version = "3.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.1.tgz"; - sha512 = "OApPSuJcxcnewwjSGGfWOjx3oix5XpmrK9Z2j0fTRlHGoZ49IU6kExfZTM0++fCArOOCet+vIfWwFHbvWqwp6g=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.2.tgz"; + sha512 = "G440NU6fewtnQftSgqRV1r2A5ChKbU1gqFCJ7I8S7MPpY/eZZfLGefaY6gUZYiWebMaO+txgiQ1ZyLDuNWJulg=="; }; buildInputs = globalBuildInputs; meta = { @@ -97161,6 +98533,24 @@ in bypassCache = true; reconstructLock = true; }; + undollar = nodeEnv.buildNodePackage { + name = "undollar"; + packageName = "undollar"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/undollar/-/undollar-1.0.0.tgz"; + sha512 = "nV0/O+9yV/We9a0ZwH8LTXW9Aqit2em7zMpHetUk/kXxw6ongHs4D8PyPPryYGx5/w8iHqu6dJ+qJjHtA7SfUw=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "undollar strips the dollar sign from the beginning of the terminal command you just copied from StackOverflow when you were searching for what arguments to pass to `tar` (`xzf`? `xvfJ`? Or was it `xvf`? You never seem to remember)."; + homepage = "https://github.com/ImFeelingDucky/undollar#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; @@ -97174,7 +98564,7 @@ in sources."@primer/octicons-11.0.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.11.5" + sources."@types/node-14.11.8" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -97207,13 +98597,13 @@ in ]; }) sources."callsite-1.0.0" - sources."cliui-7.0.1" + sources."cliui-7.0.2" sources."clone-2.1.2" sources."clone-response-1.0.2" sources."color-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.5.3" + sources."color-string-1.5.4" sources."colors-1.4.0" sources."colorspace-1.1.2" sources."component-bind-1.0.0" @@ -97259,7 +98649,7 @@ in ]; }) sources."engine.io-parser-2.2.1" - sources."escalade-3.1.0" + sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."etag-1.8.1" sources."eve-0.5.4" @@ -97465,7 +98855,7 @@ in sources."y18n-5.0.2" sources."yallist-2.1.2" sources."yargs-16.0.3" - sources."yargs-parser-20.2.1" + sources."yargs-parser-20.2.2" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; @@ -97496,7 +98886,7 @@ in sources."brace-expansion-1.1.11" sources."canvas-2.6.1" sources."chownr-1.1.4" - (sources."cliui-7.0.1" // { + (sources."cliui-7.0.2" // { dependencies = [ sources."ansi-regex-5.0.0" sources."is-fullwidth-code-point-3.0.0" @@ -97536,7 +98926,7 @@ in sources."delegates-1.0.0" sources."detect-libc-1.0.3" sources."emoji-regex-8.0.0" - sources."escalade-3.1.0" + sources."escalade-3.1.1" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" @@ -97557,7 +98947,7 @@ in sources."minizlib-1.3.3" sources."mkdirp-0.5.5" sources."ms-2.1.2" - sources."nan-2.14.1" + sources."nan-2.14.2" sources."needle-2.5.2" sources."node-fetch-2.6.1" sources."node-pre-gyp-0.11.0" @@ -97646,7 +99036,7 @@ in sources."strip-ansi-6.0.0" ]; }) - sources."yargs-parser-20.2.1" + sources."yargs-parser-20.2.2" ]; buildInputs = globalBuildInputs; meta = { @@ -97661,10 +99051,10 @@ in vega-lite = nodeEnv.buildNodePackage { name = "vega-lite"; packageName = "vega-lite"; - version = "4.16.8"; + version = "4.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-lite/-/vega-lite-4.16.8.tgz"; - sha512 = "WB9OOHbFyIaLvx5k9m8XGEaB2p0sTC9Srtsm9ETQ6EoOksdLQtVesxCalgT+cGaUVtHAiqBNmLh/nQGxZXml7w=="; + url = "https://registry.npmjs.org/vega-lite/-/vega-lite-4.17.0.tgz"; + sha512 = "MO2XsaVZqx6iWWmVA5vwYFamvhRUsKfVp7n0pNlkZ2/21cuxelSl92EePZ2YGmzL6z4/3K7r/45zaG8p+qNHeg=="; }; dependencies = [ sources."@types/clone-2.1.0" @@ -97672,12 +99062,12 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."array-flat-polyfill-1.0.1" - sources."cliui-7.0.1" + sources."cliui-7.0.2" sources."clone-2.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."emoji-regex-8.0.0" - sources."escalade-3.1.0" + sources."escalade-3.1.1" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."get-caller-file-2.0.5" @@ -97686,14 +99076,14 @@ in sources."require-directory-2.1.1" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" - sources."tslib-2.0.2" + sources."tslib-2.0.3" sources."vega-event-selector-2.0.6" sources."vega-expression-3.0.0" - sources."vega-util-1.15.3" + sources."vega-util-1.16.0" sources."wrap-ansi-7.0.0" sources."y18n-5.0.2" sources."yargs-16.0.3" - sources."yargs-parser-20.2.1" + sources."yargs-parser-20.2.2" ]; buildInputs = globalBuildInputs; meta = { @@ -97811,7 +99201,7 @@ in sources."vscode-nls-4.1.2" ]; }) - (sources."vscode-json-languageservice-3.9.0" // { + (sources."vscode-json-languageservice-3.9.1" // { dependencies = [ sources."jsonc-parser-2.3.1" sources."vscode-nls-5.0.0" @@ -97849,7 +99239,7 @@ in sources."@types/json5-0.0.30" sources."@types/mocha-7.0.2" sources."@types/node-8.10.64" - sources."@types/vscode-1.49.0" + sources."@types/vscode-1.50.0" sources."@types/yauzl-2.9.1" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -97872,7 +99262,7 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."acorn-6.4.2" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" sources."ansi-colors-3.2.3" @@ -98123,7 +99513,7 @@ in sources."to-regex-range-2.1.1" ]; }) - sources."flat-4.1.0" + sources."flat-4.1.1" (sources."flush-write-stream-1.1.1" // { dependencies = [ sources."isarray-1.0.0" @@ -98277,7 +99667,7 @@ in sources."move-concurrently-1.0.1" sources."ms-2.1.1" sources."mute-stream-0.0.8" - sources."nan-2.14.1" + sources."nan-2.14.2" sources."nanomatch-1.2.13" sources."neo-async-2.6.2" sources."nice-try-1.0.5" @@ -98521,7 +99911,7 @@ in sources."semver-6.3.0" ]; }) - sources."tslib-1.14.0" + sources."tslib-1.14.1" sources."tty-browserify-0.0.0" sources."tunnel-0.0.4" sources."typed-rest-client-1.2.0" @@ -98566,8 +99956,8 @@ in sources."vscode-debugprotocol-1.42.0" (sources."watchpack-1.7.4" // { dependencies = [ - sources."chokidar-3.4.2" - sources."readdirp-3.4.0" + sources."chokidar-3.4.3" + sources."readdirp-3.5.0" ]; }) (sources."watchpack-chokidar2-2.0.0" // { @@ -98670,7 +100060,7 @@ in }; dependencies = [ sources."absolute-0.0.1" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ansi-escapes-3.2.0" sources."ansi-red-0.1.1" sources."ansi-regex-3.0.0" @@ -98910,10 +100300,10 @@ in sources."toml-2.3.6" sources."tough-cookie-2.5.0" sources."trim-repeated-1.0.0" - sources."tslib-1.14.0" + sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.11.1" + sources."uglify-js-3.11.2" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -98972,14 +100362,14 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.11.5" + sources."@types/node-14.11.8" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" sources."abbrev-1.1.1" sources."acorn-6.4.2" sources."acorn-jsx-5.3.1" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ajv-keywords-2.1.1" (sources."ansi-align-3.0.0" // { dependencies = [ @@ -99172,7 +100562,7 @@ in sources."debug-4.3.0" sources."eslint-scope-5.1.1" sources."espree-6.2.1" - sources."vue-eslint-parser-7.1.0" + sources."vue-eslint-parser-7.1.1" ]; }) sources."eslint-scope-4.0.3" @@ -99542,7 +100932,7 @@ in sources."pretty-format-23.6.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" - sources."property-information-5.5.0" + sources."property-information-5.6.0" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" sources."pump-3.0.0" @@ -99560,7 +100950,7 @@ in ]; }) sources."readable-stream-2.3.7" - sources."readdirp-3.4.0" + sources."readdirp-3.5.0" sources."redent-2.0.0" sources."regenerator-runtime-0.11.1" sources."regex-not-1.0.2" @@ -99756,7 +101146,7 @@ in sources."trim-newlines-2.0.0" sources."trim-trailing-lines-1.1.3" sources."trough-1.0.5" - sources."tslib-1.14.0" + sources."tslib-1.14.1" sources."tslint-5.20.1" sources."tsutils-2.29.0" sources."type-check-0.3.2" @@ -99837,7 +101227,7 @@ in }) sources."vfile-sort-2.2.2" sources."vfile-statistics-1.1.4" - (sources."vscode-css-languageservice-4.3.4" // { + (sources."vscode-css-languageservice-4.3.5" // { dependencies = [ sources."vscode-languageserver-types-3.16.0-next.2" sources."vscode-uri-2.1.2" @@ -99935,7 +101325,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.11.5" + sources."@types/node-14.11.8" sources."JSONSelect-0.2.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" @@ -100026,7 +101416,7 @@ in sources."caseless-0.12.0" sources."chalk-4.1.0" sources."cheerio-1.0.0-rc.3" - sources."chokidar-3.4.2" + sources."chokidar-3.4.3" (sources."chrome-launcher-0.13.4" // { dependencies = [ sources."mkdirp-0.5.5" @@ -100442,7 +101832,7 @@ in ]; }) sources."mz-2.7.0" - sources."nan-2.14.1" + sources."nan-2.14.2" sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" @@ -100544,7 +101934,7 @@ in }) sources."readable-stream-3.6.0" sources."readdir-glob-1.1.1" - sources."readdirp-3.4.0" + sources."readdirp-3.5.0" sources."regenerator-runtime-0.13.7" sources."regex-not-1.0.2" (sources."regexp.prototype.flags-1.3.0" // { @@ -100850,12 +102240,18 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.44.2"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz"; - sha512 = "6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.1.0.tgz"; + sha512 = "ZJDq7dpVs479C6zCSF/CwOVsqqobjCusa+BgbXCEROZMS0RcBzQzDgc+hB2YXye8Y/JOvcFwJIqsVtTyHW7t8A=="; }; dependencies = [ + sources."@npmcli/move-file-1.0.1" + sources."@types/eslint-7.2.4" + sources."@types/eslint-scope-3.7.0" + sources."@types/estree-0.0.45" + sources."@types/json-schema-7.0.6" + sources."@types/node-14.11.8" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -100876,143 +102272,26 @@ in sources."@webassemblyjs/wast-printer-1.9.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-6.4.2" - sources."ajv-6.12.5" - sources."ajv-errors-1.0.1" + sources."acorn-8.0.4" + sources."aggregate-error-3.1.0" + sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."anymatch-3.1.1" - sources."aproba-1.2.0" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" - sources."array-unique-0.3.2" - (sources."asn1.js-5.4.1" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) - (sources."assert-1.5.0" // { - dependencies = [ - sources."inherits-2.0.1" - sources."util-0.10.3" - ]; - }) - sources."assign-symbols-1.0.0" - sources."async-each-1.0.3" - sources."atob-2.1.2" sources."balanced-match-1.0.0" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - sources."base64-js-1.3.1" - sources."big.js-5.2.2" - sources."binary-extensions-2.1.0" - sources."bindings-1.5.0" - sources."bluebird-3.7.2" - sources."bn.js-5.1.3" sources."brace-expansion-1.1.11" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."brorand-1.1.0" - sources."browserify-aes-1.2.0" - sources."browserify-cipher-1.0.1" - sources."browserify-des-1.0.2" - (sources."browserify-rsa-4.0.1" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) - (sources."browserify-sign-4.2.1" // { - dependencies = [ - sources."readable-stream-3.6.0" - sources."safe-buffer-5.2.1" - ]; - }) - sources."browserify-zlib-0.2.0" - sources."buffer-4.9.2" + sources."browserslist-4.14.5" sources."buffer-from-1.1.1" - sources."buffer-xor-1.0.3" - sources."builtin-status-codes-3.0.0" - sources."cacache-12.0.4" - sources."cache-base-1.0.1" - (sources."chokidar-3.4.2" // { - dependencies = [ - sources."braces-3.0.2" - sources."fill-range-7.0.1" - sources."is-number-7.0.0" - sources."to-regex-range-5.0.1" - ]; - }) - sources."chownr-1.1.4" + sources."cacache-15.0.5" + sources."caniuse-lite-1.0.30001148" + sources."chownr-2.0.0" sources."chrome-trace-event-1.0.2" - sources."cipher-base-1.0.4" - (sources."class-utils-0.3.6" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - sources."collection-visit-1.0.0" + sources."clean-stack-2.2.0" sources."commander-2.20.3" sources."commondir-1.0.1" - sources."component-emitter-1.3.0" sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - sources."console-browserify-1.2.0" - sources."constants-browserify-1.0.0" - sources."copy-concurrently-1.0.5" - sources."copy-descriptor-0.1.1" - sources."core-util-is-1.0.2" - (sources."create-ecdh-4.0.4" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) - sources."create-hash-1.2.0" - sources."create-hmac-1.1.7" - sources."crypto-browserify-3.12.0" - sources."cyclist-1.0.1" - sources."debug-2.6.9" - sources."decode-uri-component-0.2.0" - sources."define-property-2.0.2" - sources."des.js-1.0.1" - (sources."diffie-hellman-5.0.3" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) - sources."domain-browser-1.2.0" - sources."duplexify-3.7.1" - (sources."elliptic-6.5.3" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) - sources."emojis-list-3.0.0" - sources."end-of-stream-1.4.4" - (sources."enhanced-resolve-4.3.0" // { - dependencies = [ - sources."memory-fs-0.5.0" - ]; - }) - sources."errno-0.1.7" - sources."eslint-scope-4.0.3" + sources."electron-to-chromium-1.3.580" + sources."enhanced-resolve-5.2.0" + sources."escalade-3.1.1" + sources."eslint-scope-5.1.1" (sources."esrecurse-4.3.0" // { dependencies = [ sources."estraverse-5.2.0" @@ -101020,354 +102299,82 @@ in }) sources."estraverse-4.3.0" sources."events-3.2.0" - sources."evp_bytestokey-1.0.3" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - sources."figgy-pudding-3.5.2" - sources."file-uri-to-path-1.0.0" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."find-cache-dir-2.1.0" - sources."find-up-3.0.0" - sources."flush-write-stream-1.1.1" - sources."for-in-1.0.2" - sources."fragment-cache-0.2.1" - sources."from2-2.3.0" - sources."fs-write-stream-atomic-1.0.10" + sources."find-cache-dir-3.3.1" + sources."find-up-4.1.0" + sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" - sources."get-value-2.0.6" sources."glob-7.1.6" - sources."glob-parent-5.1.1" + sources."glob-to-regexp-0.4.1" sources."graceful-fs-4.2.4" - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) - (sources."hash-base-3.1.0" // { - dependencies = [ - sources."readable-stream-3.6.0" - sources."safe-buffer-5.2.1" - ]; - }) - sources."hash.js-1.1.7" - sources."hmac-drbg-1.0.1" - sources."https-browserify-1.0.0" - sources."ieee754-1.1.13" - sources."iferr-0.1.5" + sources."has-flag-4.0.0" sources."imurmurhash-0.1.4" + sources."indent-string-4.0.0" sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-accessor-descriptor-1.0.0" - sources."is-binary-path-2.1.0" - sources."is-buffer-1.1.6" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" - sources."is-extendable-0.1.1" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.1" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-plain-object-2.0.4" - sources."is-windows-1.0.2" - sources."is-wsl-1.1.0" - sources."isarray-1.0.0" - sources."isobject-3.0.1" + sources."jest-worker-26.5.0" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" - sources."json5-1.0.1" - sources."kind-of-6.0.3" - sources."loader-runner-2.4.0" - sources."loader-utils-1.4.0" - sources."locate-path-3.0.0" - sources."lru-cache-5.1.1" - sources."make-dir-2.1.0" - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" - sources."md5.js-1.3.5" - sources."memory-fs-0.4.1" - sources."micromatch-3.1.10" - (sources."miller-rabin-4.0.1" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) - sources."minimalistic-assert-1.0.1" - sources."minimalistic-crypto-utils-1.0.1" + sources."loader-runner-4.1.0" + sources."locate-path-5.0.0" + sources."lru-cache-6.0.0" + sources."make-dir-3.1.0" + sources."merge-stream-2.0.0" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mississippi-3.0.0" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."mkdirp-0.5.5" - sources."move-concurrently-1.0.1" - sources."ms-2.0.0" - sources."nan-2.14.1" - sources."nanomatch-1.2.13" + sources."minipass-3.1.3" + sources."minipass-collect-1.0.2" + sources."minipass-flush-1.0.5" + sources."minipass-pipeline-1.2.4" + sources."minizlib-2.1.2" + sources."mkdirp-1.0.4" sources."neo-async-2.6.2" - (sources."node-libs-browser-2.2.1" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."normalize-path-3.0.0" - sources."object-assign-4.1.1" - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" - ]; - }) - sources."object-visit-1.0.1" - sources."object.pick-1.3.0" + sources."node-releases-1.1.63" sources."once-1.4.0" - sources."os-browserify-0.3.0" sources."p-limit-2.3.0" - sources."p-locate-3.0.0" + sources."p-locate-4.1.0" + sources."p-map-4.0.0" sources."p-try-2.2.0" - sources."pako-1.0.11" - sources."parallel-transform-1.2.0" - sources."parse-asn1-5.1.6" - sources."pascalcase-0.1.1" - sources."path-browserify-0.0.1" - sources."path-dirname-1.0.2" - sources."path-exists-3.0.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" - sources."pbkdf2-3.1.1" - sources."picomatch-2.2.2" - sources."pify-4.0.1" - sources."pkg-dir-3.0.0" - sources."posix-character-classes-0.1.1" - sources."process-0.11.10" - sources."process-nextick-args-2.0.1" + sources."pkg-dir-4.2.0" sources."promise-inflight-1.0.1" - sources."prr-1.0.1" - (sources."public-encrypt-4.0.3" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) - sources."pump-3.0.0" - (sources."pumpify-1.5.1" // { - dependencies = [ - sources."pump-2.0.1" - ]; - }) sources."punycode-2.1.1" - sources."querystring-0.2.0" - sources."querystring-es3-0.2.1" sources."randombytes-2.1.0" - sources."randomfill-1.0.4" - sources."readable-stream-2.3.7" - sources."readdirp-3.4.0" - sources."regex-not-1.0.2" - sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.3" - sources."repeat-string-1.6.1" - sources."resolve-url-0.2.1" - sources."ret-0.1.15" - sources."rimraf-2.7.1" - sources."ripemd160-2.0.2" - sources."run-queue-1.0.3" - sources."safe-buffer-5.1.2" - sources."safe-regex-1.1.0" - sources."safer-buffer-2.1.2" - sources."schema-utils-1.0.0" - sources."semver-5.7.1" - sources."serialize-javascript-4.0.0" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."setimmediate-1.0.5" - sources."sha.js-2.4.11" - (sources."snapdragon-0.8.2" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."rimraf-3.0.2" + sources."safe-buffer-5.2.1" + sources."schema-utils-3.0.0" + sources."semver-6.3.0" + sources."serialize-javascript-5.0.1" sources."source-list-map-2.0.1" - sources."source-map-0.5.7" - sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.19" // { + sources."source-map-0.6.1" + sources."source-map-support-0.5.19" + sources."ssri-8.0.0" + sources."supports-color-7.2.0" + sources."tapable-2.0.0" + sources."tar-6.0.5" + (sources."terser-5.3.5" // { dependencies = [ - sources."source-map-0.6.1" + sources."source-map-0.7.3" ]; }) - sources."source-map-url-0.4.0" - sources."split-string-3.1.0" - sources."ssri-6.0.1" - (sources."static-extend-0.1.2" // { + (sources."terser-webpack-plugin-4.2.3" // { dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."p-limit-3.0.2" + sources."webpack-sources-1.4.3" ]; }) - sources."stream-browserify-2.0.2" - sources."stream-each-1.2.3" - sources."stream-http-2.8.3" - sources."stream-shift-1.0.1" - sources."string_decoder-1.1.1" - sources."tapable-1.1.3" - (sources."terser-4.8.0" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - (sources."terser-webpack-plugin-1.4.5" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."through2-2.0.5" - sources."timers-browserify-2.0.11" - sources."to-arraybuffer-1.0.1" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-3.0.2" - sources."to-regex-range-2.1.1" - sources."tslib-1.14.0" - sources."tty-browserify-0.0.0" - sources."typedarray-0.0.6" - sources."union-value-1.0.1" + sources."tslib-1.14.1" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - ]; - }) - sources."upath-1.2.0" sources."uri-js-4.4.0" - sources."urix-0.1.0" - (sources."url-0.11.0" // { - dependencies = [ - sources."punycode-1.3.2" - ]; - }) - sources."use-3.1.1" - (sources."util-0.11.1" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) - sources."util-deprecate-1.0.2" - sources."vm-browserify-1.1.2" - sources."watchpack-1.7.4" - (sources."watchpack-chokidar2-2.0.0" // { - dependencies = [ - sources."anymatch-2.0.0" - sources."binary-extensions-1.13.1" - sources."chokidar-2.1.8" - sources."fsevents-1.2.13" - sources."glob-parent-3.1.0" - sources."is-binary-path-1.0.1" - sources."is-glob-3.1.0" - sources."normalize-path-2.1.1" - sources."readdirp-2.2.1" - ]; - }) - (sources."webpack-sources-1.4.3" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."worker-farm-1.7.0" + sources."watchpack-2.0.0" + sources."webpack-sources-2.0.1" sources."wrappy-1.0.2" - sources."xtend-4.0.2" - sources."y18n-4.0.0" - sources."yallist-3.1.1" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -101382,38 +102389,208 @@ in webpack-cli = nodeEnv.buildNodePackage { name = "webpack-cli"; packageName = "webpack-cli"; - version = "3.3.12"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.12.tgz"; - sha512 = "NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.0.0.tgz"; + sha512 = "c5NOm8jDp3qWa+Q4pDZTcT5IwPcPXdjU1ejN9e7LojHQN02sjNr4tzLrt5pwkY+zN8pQL40m14JsbC2Dh+ZJ/w=="; }; dependencies = [ - sources."ansi-regex-4.1.0" + sources."@babel/code-frame-7.10.4" + sources."@babel/compat-data-7.12.0" + sources."@babel/core-7.12.0" + sources."@babel/generator-7.12.0" + sources."@babel/helper-annotate-as-pure-7.10.4" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" + sources."@babel/helper-compilation-targets-7.12.0" + sources."@babel/helper-create-class-features-plugin-7.12.0" + sources."@babel/helper-create-regexp-features-plugin-7.12.0" + sources."@babel/helper-define-map-7.10.5" + sources."@babel/helper-explode-assignable-expression-7.11.4" + sources."@babel/helper-function-name-7.10.4" + sources."@babel/helper-get-function-arity-7.10.4" + sources."@babel/helper-hoist-variables-7.10.4" + sources."@babel/helper-member-expression-to-functions-7.12.0" + sources."@babel/helper-module-imports-7.10.4" + sources."@babel/helper-module-transforms-7.12.0" + sources."@babel/helper-optimise-call-expression-7.10.4" + sources."@babel/helper-plugin-utils-7.10.4" + sources."@babel/helper-regex-7.10.5" + sources."@babel/helper-remap-async-to-generator-7.11.4" + sources."@babel/helper-replace-supers-7.12.0" + sources."@babel/helper-simple-access-7.10.4" + sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" + sources."@babel/helper-split-export-declaration-7.11.0" + sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/helper-validator-option-7.12.0" + sources."@babel/helper-wrap-function-7.10.4" + sources."@babel/helpers-7.10.4" + sources."@babel/highlight-7.10.4" + sources."@babel/parser-7.12.0" + sources."@babel/plugin-proposal-async-generator-functions-7.10.5" + sources."@babel/plugin-proposal-class-properties-7.10.4" + sources."@babel/plugin-proposal-dynamic-import-7.10.4" + sources."@babel/plugin-proposal-export-namespace-from-7.12.0" + sources."@babel/plugin-proposal-json-strings-7.10.4" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.0" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.0" + sources."@babel/plugin-proposal-numeric-separator-7.12.0" + sources."@babel/plugin-proposal-object-rest-spread-7.11.0" + sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" + sources."@babel/plugin-proposal-optional-chaining-7.12.0" + sources."@babel/plugin-proposal-private-methods-7.10.4" + sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" + sources."@babel/plugin-syntax-async-generators-7.8.4" + sources."@babel/plugin-syntax-class-properties-7.10.4" + sources."@babel/plugin-syntax-dynamic-import-7.8.3" + sources."@babel/plugin-syntax-export-namespace-from-7.8.3" + sources."@babel/plugin-syntax-flow-7.10.4" + sources."@babel/plugin-syntax-json-strings-7.8.3" + sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" + sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" + sources."@babel/plugin-syntax-numeric-separator-7.10.4" + sources."@babel/plugin-syntax-object-rest-spread-7.8.3" + sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" + sources."@babel/plugin-syntax-optional-chaining-7.8.3" + sources."@babel/plugin-syntax-top-level-await-7.10.4" + sources."@babel/plugin-syntax-typescript-7.10.4" + sources."@babel/plugin-transform-arrow-functions-7.10.4" + sources."@babel/plugin-transform-async-to-generator-7.10.4" + sources."@babel/plugin-transform-block-scoped-functions-7.10.4" + sources."@babel/plugin-transform-block-scoping-7.11.1" + sources."@babel/plugin-transform-classes-7.10.4" + sources."@babel/plugin-transform-computed-properties-7.10.4" + sources."@babel/plugin-transform-destructuring-7.10.4" + sources."@babel/plugin-transform-dotall-regex-7.10.4" + sources."@babel/plugin-transform-duplicate-keys-7.10.4" + sources."@babel/plugin-transform-exponentiation-operator-7.10.4" + sources."@babel/plugin-transform-flow-strip-types-7.10.4" + sources."@babel/plugin-transform-for-of-7.10.4" + sources."@babel/plugin-transform-function-name-7.10.4" + sources."@babel/plugin-transform-literals-7.10.4" + sources."@babel/plugin-transform-member-expression-literals-7.10.4" + sources."@babel/plugin-transform-modules-amd-7.10.5" + sources."@babel/plugin-transform-modules-commonjs-7.10.4" + sources."@babel/plugin-transform-modules-systemjs-7.12.0" + sources."@babel/plugin-transform-modules-umd-7.10.4" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.4" + sources."@babel/plugin-transform-new-target-7.10.4" + sources."@babel/plugin-transform-object-super-7.10.4" + sources."@babel/plugin-transform-parameters-7.10.5" + sources."@babel/plugin-transform-property-literals-7.10.4" + sources."@babel/plugin-transform-regenerator-7.10.4" + sources."@babel/plugin-transform-reserved-words-7.10.4" + sources."@babel/plugin-transform-shorthand-properties-7.10.4" + sources."@babel/plugin-transform-spread-7.11.0" + sources."@babel/plugin-transform-sticky-regex-7.10.4" + sources."@babel/plugin-transform-template-literals-7.10.5" + sources."@babel/plugin-transform-typeof-symbol-7.10.4" + sources."@babel/plugin-transform-typescript-7.12.0" + sources."@babel/plugin-transform-unicode-escapes-7.10.4" + sources."@babel/plugin-transform-unicode-regex-7.10.4" + sources."@babel/preset-env-7.12.0" + sources."@babel/preset-flow-7.10.4" + sources."@babel/preset-modules-0.1.4" + sources."@babel/preset-typescript-7.12.0" + sources."@babel/register-7.12.0" + sources."@babel/runtime-7.12.0" + sources."@babel/template-7.10.4" + sources."@babel/traverse-7.12.0" + sources."@babel/types-7.12.0" + sources."@mrmlnc/readdir-enhanced-2.2.1" + sources."@nodelib/fs.stat-1.1.3" + sources."@sindresorhus/is-2.1.1" + sources."@szmarczak/http-timer-4.0.5" + sources."@types/cacheable-request-6.0.1" + sources."@types/glob-7.1.3" + sources."@types/http-cache-semantics-4.0.0" + sources."@types/keyv-3.1.1" + sources."@types/minimatch-3.0.3" + sources."@types/node-14.11.8" + sources."@types/normalize-package-data-2.4.0" + sources."@types/responselike-1.0.0" + sources."@webpack-cli/generators-1.0.1" + sources."@webpack-cli/info-1.0.1" + sources."@webpack-cli/init-1.0.1" + sources."@webpack-cli/serve-1.0.1" + (sources."@webpack-cli/utils-1.0.1" // { + dependencies = [ + sources."cross-spawn-7.0.3" + sources."get-stream-5.2.0" + sources."got-10.7.0" + sources."lowercase-keys-2.0.0" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."type-fest-0.10.0" + sources."which-2.0.2" + ]; + }) + sources."@webpack-cli/webpack-scaffold-1.0.1" + sources."JSONStream-1.3.5" + sources."ajv-6.12.6" + sources."ansi-colors-4.1.1" + (sources."ansi-escapes-4.3.1" // { + dependencies = [ + sources."type-fest-0.11.0" + ]; + }) + sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" + sources."array-back-4.0.1" + sources."array-differ-3.0.0" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" sources."array-unique-0.3.2" + sources."arrify-2.0.1" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" + sources."ast-types-0.13.3" + sources."async-2.6.3" + sources."asynckit-0.4.0" sources."atob-2.1.2" + sources."aws-sign2-0.7.0" + sources."aws4-1.10.1" + (sources."axios-0.18.1" // { + dependencies = [ + sources."is-buffer-2.0.4" + ]; + }) + sources."babel-core-7.0.0-bridge.0" + sources."babel-plugin-dynamic-import-node-2.3.3" + sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ sources."define-property-1.0.0" ]; }) - sources."big.js-5.2.2" + sources."bcrypt-pbkdf-1.0.2" + sources."binaryextensions-2.3.0" + sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ sources."extend-shallow-2.0.1" ]; }) + sources."browserslist-4.14.5" + sources."buffer-from-1.1.1" sources."cache-base-1.0.1" - sources."camelcase-5.3.1" - (sources."chalk-2.4.2" // { + sources."cacheable-lookup-2.0.1" + (sources."cacheable-request-7.0.1" // { dependencies = [ - sources."supports-color-5.5.0" + sources."get-stream-5.2.0" + sources."lowercase-keys-2.0.0" ]; }) + sources."call-me-maybe-1.0.1" + sources."caniuse-lite-1.0.30001148" + sources."capture-stack-trace-1.0.1" + sources."caseless-0.12.0" + sources."chalk-2.4.2" + sources."chardet-0.7.0" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -101431,26 +102608,95 @@ in sources."kind-of-5.1.0" ]; }) - sources."cliui-5.0.0" + sources."cli-cursor-3.1.0" + (sources."cli-table-0.3.1" // { + dependencies = [ + sources."colors-1.0.3" + ]; + }) + sources."cli-width-3.0.0" + sources."clone-2.1.2" + sources."clone-buffer-1.0.0" + sources."clone-deep-4.0.1" + (sources."clone-response-1.0.2" // { + dependencies = [ + sources."mimic-response-1.0.1" + ]; + }) + sources."clone-stats-1.0.0" + sources."cloneable-readable-1.1.3" sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."colorette-1.2.1" + sources."colors-1.4.0" + sources."combined-stream-1.0.8" + sources."command-line-usage-6.1.0" + sources."commander-6.1.0" + sources."commondir-1.0.1" sources."component-emitter-1.3.0" + sources."concat-map-0.0.1" + sources."convert-source-map-1.7.0" sources."copy-descriptor-0.1.1" + (sources."core-js-compat-3.6.5" // { + dependencies = [ + sources."semver-7.0.0" + ]; + }) sources."core-util-is-1.0.2" + sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" - sources."debug-2.6.9" - sources."decamelize-1.2.0" + sources."dargs-6.1.0" + sources."dashdash-1.14.1" + sources."dateformat-3.0.3" + sources."debug-4.3.0" sources."decode-uri-component-0.2.0" + sources."decompress-response-5.0.0" + sources."deep-extend-0.6.0" + sources."defer-to-connect-2.0.0" + sources."define-properties-1.1.3" sources."define-property-2.0.2" + sources."delayed-stream-1.0.0" sources."detect-file-1.0.0" - sources."emoji-regex-7.0.3" - sources."emojis-list-3.0.0" - sources."enhanced-resolve-4.3.0" - sources."errno-0.1.7" + sources."diff-4.0.2" + sources."dir-glob-2.2.2" + sources."download-stats-0.3.4" + sources."duplexer3-0.1.4" + sources."ecc-jsbn-0.1.2" + (sources."editions-2.3.1" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."ejs-3.1.5" + sources."electron-to-chromium-1.3.580" + sources."emoji-regex-8.0.0" + sources."end-of-stream-1.4.4" + sources."enquirer-2.3.6" + sources."envinfo-7.7.3" + sources."errlop-2.2.0" + sources."error-7.2.1" + sources."error-ex-1.3.2" + sources."es-abstract-1.18.0-next.1" + sources."es-to-primitive-1.2.1" + sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.1" + sources."esutils-2.0.3" + (sources."execa-4.0.3" // { + dependencies = [ + sources."cross-spawn-7.0.3" + sources."get-stream-5.2.0" + sources."is-stream-2.0.0" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + ]; + }) (sources."expand-brackets-2.1.4" // { dependencies = [ + sources."debug-2.6.9" sources."define-property-0.2.5" sources."extend-shallow-2.0.1" (sources."is-accessor-descriptor-0.1.6" // { @@ -101465,39 +102711,88 @@ in }) sources."is-descriptor-0.1.6" sources."kind-of-5.1.0" + sources."ms-2.0.0" ]; }) sources."expand-tilde-2.0.2" + sources."extend-3.0.2" (sources."extend-shallow-3.0.2" // { dependencies = [ sources."is-extendable-1.0.1" ]; }) + sources."external-editor-3.1.0" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" sources."extend-shallow-2.0.1" ]; }) + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.3" + sources."fast-glob-2.2.7" + sources."fast-json-stable-stringify-2.1.0" + sources."figures-3.2.0" + sources."filelist-1.0.1" (sources."fill-range-4.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" ]; }) + sources."find-cache-dir-2.1.0" sources."find-up-3.0.0" - sources."findup-sync-3.0.0" + (sources."findup-sync-4.0.0" // { + dependencies = [ + sources."braces-3.0.2" + sources."fill-range-7.0.1" + sources."is-number-7.0.0" + sources."micromatch-4.0.2" + sources."to-regex-range-5.0.1" + ]; + }) + sources."first-chunk-stream-2.0.0" + sources."flow-parser-0.135.0" + (sources."follow-redirects-1.5.10" // { + dependencies = [ + sources."debug-3.1.0" + sources."ms-2.0.0" + ]; + }) sources."for-in-1.0.2" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" sources."fragment-cache-0.2.1" - sources."get-caller-file-2.0.5" + sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" + sources."gensync-1.0.0-beta.1" + sources."get-stream-3.0.0" sources."get-value-2.0.6" + sources."getpass-0.1.7" + sources."gh-got-5.0.0" + sources."github-username-3.0.0" + sources."glob-7.1.6" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + sources."glob-to-regexp-0.3.0" (sources."global-modules-2.0.0" // { dependencies = [ sources."global-prefix-3.0.0" ]; }) sources."global-prefix-1.0.2" + sources."globals-11.12.0" + sources."globby-9.2.0" + sources."got-6.7.1" sources."graceful-fs-4.2.4" + sources."grouped-queue-1.1.0" + sources."har-schema-2.0.0" + sources."har-validator-5.1.5" + sources."has-1.0.3" sources."has-flag-3.0.0" + sources."has-symbols-1.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -101505,45 +102800,152 @@ in ]; }) sources."homedir-polyfill-1.0.3" - sources."import-local-2.0.0" + sources."hosted-git-info-2.8.8" + sources."http-cache-semantics-4.1.0" + sources."http-signature-1.2.0" + sources."human-signals-1.1.1" + sources."iconv-lite-0.4.24" + sources."ignore-4.0.6" + (sources."import-local-3.0.2" // { + dependencies = [ + sources."find-up-4.1.0" + sources."locate-path-5.0.0" + sources."p-locate-4.1.0" + sources."path-exists-4.0.0" + sources."pkg-dir-4.2.0" + ]; + }) + sources."imurmurhash-0.1.4" + sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."interpret-1.4.0" + (sources."inquirer-7.3.3" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."strip-ansi-6.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."interpret-2.2.0" sources."is-accessor-descriptor-1.0.0" + sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" + sources."is-callable-1.2.2" sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" + sources."is-negative-zero-2.0.0" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" ]; }) + sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" + sources."is-redirect-1.0.0" + sources."is-regex-1.1.1" + sources."is-retry-allowed-1.2.0" + sources."is-scoped-1.0.0" + sources."is-stream-1.1.0" + sources."is-symbol-1.0.3" + sources."is-typedarray-1.0.0" + sources."is-utf8-0.2.1" sources."is-windows-1.0.2" sources."isarray-1.0.0" + sources."isbinaryfile-4.0.6" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."json5-1.0.1" + sources."isstream-0.1.2" + sources."istextorbinary-2.6.0" + (sources."jake-10.8.2" // { + dependencies = [ + sources."async-0.9.2" + ]; + }) + sources."js-tokens-4.0.0" + sources."jsbn-0.1.1" + sources."jscodeshift-0.7.1" + sources."jsesc-2.5.2" + sources."json-buffer-3.0.1" + sources."json-parse-even-better-errors-2.3.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + sources."json5-2.1.3" + sources."jsonparse-1.3.1" + sources."jsprim-1.4.1" + sources."keyv-4.0.3" sources."kind-of-6.0.3" - sources."loader-utils-1.4.0" + sources."lazy-cache-2.0.2" + sources."lines-and-columns-1.1.6" sources."locate-path-3.0.0" + sources."lodash-4.17.20" + (sources."log-symbols-4.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."lowercase-keys-1.0.1" + sources."make-dir-2.1.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."memory-fs-0.5.0" + sources."mem-fs-1.2.0" + (sources."mem-fs-editor-7.0.1" // { + dependencies = [ + sources."rimraf-3.0.2" + ]; + }) + sources."merge-stream-2.0.0" + sources."merge2-1.4.1" sources."micromatch-3.1.10" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" + sources."mimic-fn-2.1.0" + sources."mimic-response-2.1.0" + sources."minimatch-3.0.4" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" ]; }) - sources."ms-2.0.0" + sources."mkdirp-1.0.4" + sources."moment-2.29.1" + sources."ms-2.1.2" + (sources."multimatch-4.0.0" // { + dependencies = [ + sources."array-union-2.1.0" + ]; + }) + sources."mute-stream-0.0.8" sources."nanomatch-1.2.13" + sources."neo-async-2.6.2" sources."nice-try-1.0.5" + sources."node-dir-0.1.17" + sources."node-modules-regexp-1.0.0" + sources."node-releases-1.1.63" + sources."normalize-package-data-2.5.0" + sources."normalize-url-4.5.0" + sources."npm-api-1.0.0" + (sources."npm-run-path-4.0.1" // { + dependencies = [ + sources."path-key-3.1.1" + ]; + }) + sources."oauth-sign-0.9.0" (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" @@ -101557,47 +102959,123 @@ in sources."kind-of-3.2.2" ]; }) + sources."object-inspect-1.8.0" + sources."object-keys-1.1.1" sources."object-visit-1.0.1" + sources."object.assign-4.1.1" sources."object.pick-1.3.0" + sources."once-1.4.0" + sources."onetime-5.1.2" + sources."os-tmpdir-1.0.2" + sources."p-cancelable-2.0.0" + sources."p-each-series-2.1.0" + sources."p-event-4.2.0" + sources."p-finally-1.0.0" sources."p-limit-2.3.0" sources."p-locate-3.0.0" + sources."p-timeout-3.2.0" sources."p-try-2.2.0" + sources."paged-request-2.0.1" + sources."parse-json-5.1.0" sources."parse-passwd-1.0.0" sources."pascalcase-0.1.1" + sources."path-dirname-1.0.2" sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" + sources."path-parse-1.0.6" + (sources."path-type-3.0.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."performance-now-2.1.0" + sources."picomatch-2.2.2" + sources."pify-4.0.1" + sources."pirates-4.0.1" sources."pkg-dir-3.0.0" sources."posix-character-classes-0.1.1" + sources."prepend-http-1.0.4" + sources."pretty-bytes-5.4.1" + sources."prettyjson-1.2.1" + sources."private-0.1.8" sources."process-nextick-args-2.0.1" - sources."prr-1.0.1" + sources."psl-1.8.0" + sources."pump-3.0.0" + sources."punycode-2.1.1" + sources."qs-6.5.2" + sources."read-chunk-3.2.0" + sources."read-pkg-5.2.0" + sources."read-pkg-up-5.0.0" sources."readable-stream-2.3.7" + (sources."recast-0.18.10" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."rechoir-0.7.0" + sources."reduce-flatten-2.0.0" + sources."regenerate-1.4.1" + sources."regenerate-unicode-properties-8.2.0" + sources."regenerator-runtime-0.13.7" + sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" + sources."regexpu-core-4.7.1" + sources."regjsgen-0.5.2" + (sources."regjsparser-0.6.4" // { + dependencies = [ + sources."jsesc-0.5.0" + ]; + }) + sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" - sources."resolve-cwd-2.0.0" + sources."replace-ext-1.0.1" + sources."request-2.88.2" + sources."resolve-1.17.0" + sources."resolve-cwd-3.0.0" (sources."resolve-dir-1.0.1" // { dependencies = [ sources."global-modules-1.0.0" ]; }) - sources."resolve-from-3.0.0" + sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" + (sources."responselike-2.0.0" // { + dependencies = [ + sources."lowercase-keys-2.0.0" + ]; + }) + sources."restore-cursor-3.1.0" sources."ret-0.1.15" + sources."rimraf-2.6.3" + sources."run-async-2.4.1" + sources."rxjs-6.6.3" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."scoped-regex-1.0.0" sources."semver-5.7.1" - sources."set-blocking-2.0.0" + sources."set-getter-0.1.0" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" ]; }) + sources."shallow-clone-3.0.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" + (sources."shelljs-0.8.4" // { + dependencies = [ + sources."interpret-1.4.0" + sources."rechoir-0.6.2" + ]; + }) + sources."signal-exit-3.0.3" + sources."slash-2.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ + sources."debug-2.6.9" sources."define-property-0.2.5" sources."extend-shallow-2.0.1" (sources."is-accessor-descriptor-0.1.6" // { @@ -101612,6 +103090,7 @@ in }) sources."is-descriptor-0.1.6" sources."kind-of-5.1.0" + sources."ms-2.0.0" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -101626,8 +103105,18 @@ in }) sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" + (sources."source-map-support-0.5.19" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) sources."source-map-url-0.4.0" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.6" sources."split-string-3.1.0" + sources."sshpk-1.16.1" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" @@ -101645,18 +103134,60 @@ in sources."kind-of-5.1.0" ]; }) - sources."string-width-3.1.0" + sources."string-template-0.2.1" + (sources."string-width-4.2.0" // { + dependencies = [ + sources."strip-ansi-6.0.0" + ]; + }) + (sources."string.prototype.trimend-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.7" + ]; + }) + (sources."string.prototype.trimstart-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.7" + ]; + }) sources."string_decoder-1.1.1" - sources."strip-ansi-5.2.0" - sources."supports-color-6.1.0" - sources."tapable-1.1.3" + (sources."strip-ansi-4.0.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + ]; + }) + sources."strip-bom-2.0.0" + sources."strip-bom-buf-1.0.0" + sources."strip-bom-stream-2.0.0" + sources."strip-final-newline-2.0.0" + sources."supports-color-5.5.0" + sources."table-layout-1.0.1" + sources."temp-0.8.4" + sources."text-table-0.2.0" + sources."textextensions-2.6.0" + sources."through-2.3.8" + sources."through2-3.0.2" + sources."timed-out-4.0.1" + sources."tmp-0.0.33" + sources."to-fast-properties-2.0.0" (sources."to-object-path-0.3.0" // { dependencies = [ sources."kind-of-3.2.2" ]; }) + sources."to-readable-stream-2.1.0" sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" + sources."tough-cookie-2.5.0" + sources."tslib-1.14.1" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-fest-0.6.0" + sources."typical-5.2.0" + sources."unicode-canonical-property-names-ecmascript-1.0.4" + sources."unicode-match-property-ecmascript-1.0.4" + sources."unicode-match-property-value-ecmascript-1.2.0" + sources."unicode-property-aliases-ecmascript-1.1.0" sources."union-value-1.0.1" (sources."unset-value-1.0.0" // { dependencies = [ @@ -101668,16 +103199,64 @@ in sources."has-values-0.1.4" ]; }) + sources."untildify-3.0.3" + sources."unzip-response-2.0.1" + sources."uri-js-4.4.0" sources."urix-0.1.0" + sources."url-parse-lax-1.0.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" + sources."uuid-3.4.0" sources."v8-compile-cache-2.1.1" + sources."validate-npm-package-license-3.0.4" + sources."verror-1.10.0" + sources."vinyl-2.2.1" + (sources."vinyl-file-3.0.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) + sources."webpack-merge-4.2.2" sources."which-1.3.1" - sources."which-module-2.0.0" - sources."wrap-ansi-5.1.0" - sources."y18n-4.0.0" - sources."yargs-13.3.2" - sources."yargs-parser-13.1.2" + sources."with-open-file-0.1.7" + sources."wordwrapjs-4.0.0" + sources."wrappy-1.0.2" + sources."write-file-atomic-2.4.3" + (sources."yeoman-environment-2.10.3" // { + dependencies = [ + sources."arrify-1.0.1" + sources."debug-3.2.6" + sources."diff-3.5.0" + sources."dir-glob-2.0.0" + sources."ejs-2.7.4" + sources."globby-8.0.2" + sources."ignore-3.3.10" + sources."log-symbols-2.2.0" + (sources."mem-fs-editor-6.0.0" // { + dependencies = [ + sources."dir-glob-2.2.2" + sources."globby-9.2.0" + sources."ignore-4.0.6" + sources."pify-4.0.1" + sources."slash-2.0.0" + ]; + }) + sources."mkdirp-0.5.5" + sources."pify-3.0.0" + sources."semver-7.3.2" + sources."slash-1.0.0" + ]; + }) + (sources."yeoman-generator-4.12.0" // { + dependencies = [ + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."semver-7.3.2" + ]; + }) ]; buildInputs = globalBuildInputs; meta = { @@ -101700,9 +103279,9 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.11.5" + sources."@types/node-14.11.8" sources."accepts-1.3.7" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" sources."ansi-colors-3.2.4" @@ -101993,7 +103572,7 @@ in sources."ms-2.0.0" sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" - sources."nan-2.14.1" + sources."nan-2.14.2" sources."nanomatch-1.2.13" sources."negotiator-0.6.2" sources."nice-try-1.0.5" @@ -102292,10 +103871,10 @@ in copy-webpack-plugin = nodeEnv.buildNodePackage { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.2.0.tgz"; - sha512 = "1s/VbhIX73FBFBYF4D0KdeBLkjEnAlCQn0Ufo2a/IyJ41jHpQ9ZzM4JAfbE7yTOhbmwRFkARErJ/XIiLceja6Q=="; + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.2.1.tgz"; + sha512 = "VH2ZTMIBsx4p++Lmpg77adZ0KUyM5gFR/9cuTrbneNnJlcQXUFvsNariPqq2dq2kV3F2skHiDGPQCyKWy1+U0Q=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.3" @@ -102304,7 +103883,7 @@ in sources."@npmcli/move-file-1.0.1" sources."@types/json-schema-7.0.6" sources."aggregate-error-3.1.0" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."array-union-2.1.0" sources."balanced-match-1.0.0" @@ -102377,7 +103956,7 @@ in sources."rimraf-3.0.2" sources."run-parallel-1.1.9" sources."safe-buffer-5.2.1" - sources."schema-utils-2.7.1" + sources."schema-utils-3.0.0" sources."semver-6.3.0" sources."serialize-javascript-5.0.1" sources."slash-3.0.0" @@ -102423,7 +104002,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.23" + sources."@types/node-13.13.25" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -102672,7 +104251,7 @@ in sources."ms-2.1.2" ]; }) - sources."ut_pex-2.0.0" + sources."ut_pex-2.0.1" sources."utf-8-validate-5.0.2" sources."util-deprecate-1.0.2" sources."videostream-3.2.1" @@ -102771,7 +104350,7 @@ in sources."prettier-2.0.5" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - (sources."vscode-json-languageservice-3.9.0" // { + (sources."vscode-json-languageservice-3.9.1" // { dependencies = [ sources."vscode-languageserver-types-3.16.0-next.2" sources."vscode-nls-5.0.0" @@ -102834,17 +104413,17 @@ in sources."@babel/code-frame-7.10.4" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/runtime-7.11.2" + sources."@babel/runtime-7.12.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.11.5" + sources."@types/node-14.11.8" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" sources."aggregate-error-3.1.0" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ansi-0.3.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" @@ -103607,7 +105186,7 @@ in sources."to-regex-range-2.1.1" sources."tough-cookie-3.0.1" sources."trim-newlines-1.0.0" - sources."tslib-1.14.0" + sources."tslib-1.14.1" sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" From 2701804b0644bd556b2c0aa4621ecb12fb239eb0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 08:56:32 +0000 Subject: [PATCH 306/546] python37Packages.yfinance: 0.1.54 -> 0.1.55 --- pkgs/development/python-modules/yfinance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 55068d3d5e6..7ae56cacbb6 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.1.54"; + version = "0.1.55"; # GitHub source releases aren't tagged src = fetchPypi { inherit pname version; - sha256 = "cee223cbd31e14955869f7978bcf83776d644345c7dea31ba5d41c309bfb0d3d"; + sha256 = "65d39bccf16bef35f6a08bf0df33650c0515b5ce8ea3c53924601f5fe00590cb"; }; propagatedBuildInputs = [ From ffb7a61905b381279ecaa6d995c6dde749390126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Thu, 15 Oct 2020 19:29:46 +0200 Subject: [PATCH 307/546] vscode, vscodium: 1.50.0 -> 1.50.1 --- pkgs/applications/editors/vscode/vscode.nix | 6 +++--- pkgs/applications/editors/vscode/vscodium.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 6d87551a453..528a0496d91 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "12nrv037an4f6h8hrbmysc0lk5wm492hywa7lp64n4d308zg5567"; - x86_64-darwin = "1z22hn2ngx2x5l9h6zsblpyzr85lyjzv2ayplscbgaa9ff52l429"; + x86_64-linux = "0mpb4641icr3z89y2rlh5anli40p1f48sl5xagr7h3nb5c84k10x"; + x86_64-darwin = "1azmc79zf72007qc1xndp9wdkd078mvqgv35hf231q7kdi6wzxcp"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +21,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.50.0"; + version = "1.50.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 9b1c5d2104a..650e88a260b 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0fhwqif9021sg22n8qqn3m2fml7sjb03ydgbakg1021i3y8zl599"; - x86_64-darwin = "1bsvkwymihkv0azf0mmy0f58zsxs6w13in6lfxzaz7s695csn9s0"; + x86_64-linux = "1sarih1yah69ympp12bmgyb0y9ybrxasppb47l58w05iz1wpn6v0"; + x86_64-darwin = "1pj041kccj2i77v223i86xxqj9bg88k0sfbshm7qiynwyj9p05ji"; }.${system}; sourceRoot = { @@ -27,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.50.0"; + version = "1.50.1"; pname = "vscodium"; executableName = "codium"; From 40c84bd3929baec5486e50d0956821cf96660523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Fri, 16 Oct 2020 09:28:17 +0200 Subject: [PATCH 308/546] vscode, vscodium: Document update scripts --- pkgs/applications/editors/vscode/update-vscode.sh | 5 +++++ pkgs/applications/editors/vscode/update-vscodium.sh | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/pkgs/applications/editors/vscode/update-vscode.sh b/pkgs/applications/editors/vscode/update-vscode.sh index 5066a8e4182..4974eb7e436 100755 --- a/pkgs/applications/editors/vscode/update-vscode.sh +++ b/pkgs/applications/editors/vscode/update-vscode.sh @@ -1,6 +1,11 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep gnused gawk +# Update script for the vscode versions and hashes. +# Usually doesn't need to be called by hand, +# but is called by a bot: https://github.com/samuela/nixpkgs-upkeep/actions +# Call it by hand if the bot fails to automatically update the versions. + set -eou pipefail ROOT="$(dirname "$(readlink -f "$0")")" diff --git a/pkgs/applications/editors/vscode/update-vscodium.sh b/pkgs/applications/editors/vscode/update-vscodium.sh index 0e8ce6da5a0..0ddab6063ca 100755 --- a/pkgs/applications/editors/vscode/update-vscodium.sh +++ b/pkgs/applications/editors/vscode/update-vscodium.sh @@ -1,6 +1,11 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep gnused gawk +# Update script for the vscode versions and hashes. +# Usually doesn't need to be called by hand, +# but is called by a bot: https://github.com/samuela/nixpkgs-upkeep/actions +# Call it by hand if the bot fails to automatically update the versions. + set -eou pipefail ROOT="$(dirname "$(readlink -f "$0")")" From 5c07a011657a75033f6fafd407abeae7d0f898d2 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 16 Oct 2020 11:36:38 +0200 Subject: [PATCH 309/546] haskellPackages.pandoc: Fix eval again --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6ecb4e01689..4a7b13b5320 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1468,7 +1468,7 @@ self: super: { skylighting-core = doDistribute super.skylighting-core_0_10_0_2; hslua = doDistribute self.hslua_1_1_2; jira-wiki-markup = doDistribute self.jira-wiki-markup_1_3_2; - pandoc = doDistribute self.pandoc_2_11; + pandoc = doDistribute self.pandoc_2_11_0_1; # jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc pandoc-citeproc = doJailbreak (doDistribute self.pandoc-citeproc_0_17_0_2); pandoc-types = doDistribute self.pandoc-types_1_22; From aee3076ba7c3c33941e23a2fe632cdeeb7e8e22f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 16 Oct 2020 11:43:42 +0200 Subject: [PATCH 310/546] chromiumDev: M87 -> M88 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 3e2c1904e3b..7523a6653f2 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -10,8 +10,8 @@ "sha256bin64": "0r9wk2kgn7z0jjzpppr799jp5izxvh1ig4mv12iadz4y7dl47kaw" }, "dev": { - "version": "87.0.4280.20", - "sha256": "1lqdxy6pm72h8ym5ij713rp055csqn19agy3sp6wnmp3pj688ic8", - "sha256bin64": "1i625i4kb8bgz2qp88l5kyc1nr4cghfh6038sllng5hfimsn0vwg" + "version": "88.0.4292.2", + "sha256": "0b8ihgbvdqpbcgw9p9sak8nz599pah94jmysqigs4phl9slvir5d", + "sha256bin64": "13bx19r56m2r1yjy3b84phv96kkckf87n88kpscf867lgwbrc4fc" } } From 461a5d331914cc73b5733dedbb2a398e175ce316 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 10:02:58 +0000 Subject: [PATCH 311/546] python37Packages.vispy: 0.6.4 -> 0.6.5 --- pkgs/development/python-modules/vispy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index 029132933a9..efe444fa8d7 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "vispy"; - version = "0.6.4"; + version = "0.6.5"; src = fetchPypi { inherit pname version; - sha256 = "07sb4qww6mgzm66qsrr3pd66yz39r6jj4ibb3qmfg1kwnxs6ayv2"; + sha256 = "90cc76e79ee16c839bca05753e0c5f9f1c1c57963f2d3b248e4afac0fd75df75"; }; patches = [ From db33f99343e219ed7eafdd0859ded595d4044659 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 16 Oct 2020 12:02:54 +0200 Subject: [PATCH 312/546] signal-desktop: 1.36.3 -> 1.37.1 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 85f71fd0ebc..69b3357b7d4 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.36.3"; # Please backport all updates to the stable channel. + version = "1.37.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1b75b5li0im2mwskkf1xsa6sjprl56isvcz2iy1gc48bambc72pc"; + sha256 = "0zj068wkgb0k7iq4ld0lb06vk2zlsvv5pf0csr4zkzkq0hgzx33s"; }; nativeBuildInputs = [ From 1d3b373443e9e364a46c8385365868610ef32f90 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 9 Oct 2020 22:15:33 +0200 Subject: [PATCH 313/546] camlPackages.io-page: remove unused parameter --- pkgs/development/ocaml-modules/io-page/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix index 06bd01fefac..31ae0cfc19e 100644 --- a/pkgs/development/ocaml-modules/io-page/default.nix +++ b/pkgs/development/ocaml-modules/io-page/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildDunePackage, configurator, cstruct, bigarray-compat, ounit }: +{ stdenv, fetchurl, buildDunePackage, cstruct, bigarray-compat, ounit }: buildDunePackage rec { pname = "io-page"; From 0385e6094f4cfad912c011d4a10f99afde0aef71 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 9 Oct 2020 22:15:39 +0200 Subject: [PATCH 314/546] =?UTF-8?q?ocamlPackages.camlimages:=205.0.1=20?= =?UTF-8?q?=E2=86=92=205.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/camlimages/default.nix | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix index 1ea3e78a06b..5874e7a52d3 100644 --- a/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -1,21 +1,27 @@ -{ lib, fetchzip, buildDunePackage, configurator, cppo, lablgtk }: +{ lib, fetchFromGitLab, buildDunePackage, dune-configurator, cppo, lablgtk, stdio }: buildDunePackage rec { pname = "camlimages"; - version = "5.0.1"; + version = "5.0.3"; - src = fetchzip { - url = "https://bitbucket.org/camlspotter/${pname}/get/${version}.tar.gz"; - sha256 = "1figrgzsdrrxzfza0bhz0225g1rwawdf5x2m9lw2kzrdb815khs5"; + useDune2 = true; + + minimumOCamlVersion = "4.07"; + + src = fetchFromGitLab { + owner = "camlspotter"; + repo = pname; + rev = version; + sha256 = "1ng9pkvrzlibfyf97iqvmbsqcykz8v1ln106xhq9nigih5i68zyd"; }; - buildInputs = [ configurator cppo lablgtk ]; + buildInputs = [ dune-configurator cppo lablgtk stdio ]; meta = with lib; { branch = "5.0"; - homepage = "https://bitbucket.org/camlspotter/camlimages"; + inherit (src.meta) homepage; description = "OCaml image processing library"; - license = licenses.gpl2; + license = licenses.lgpl2; maintainers = [ maintainers.vbgl maintainers.mt-caret ]; }; } From 6742cc76600bbc73a5e3d5d667cb07d0858b9052 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 9 Oct 2020 22:22:50 +0200 Subject: [PATCH 315/546] ocamlPackages.camlimages: remove at 4.1.2 --- .../ocaml-modules/camlimages/4.1.nix | 42 ------------------- pkgs/top-level/ocaml-packages.nix | 8 +--- 2 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/camlimages/4.1.nix diff --git a/pkgs/development/ocaml-modules/camlimages/4.1.nix b/pkgs/development/ocaml-modules/camlimages/4.1.nix deleted file mode 100644 index d2d626acbfe..00000000000 --- a/pkgs/development/ocaml-modules/camlimages/4.1.nix +++ /dev/null @@ -1,42 +0,0 @@ -{stdenv, fetchurl, omake, ocaml, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }: - -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; - -if stdenv.lib.versionAtLeast ocaml.version "4.06" -then throw "camlimages-4.1.2 is not available for OCaml ${ocaml.version}" -else - -let - pname = "camlimages"; - version = "4.1.2"; -in - -stdenv.mkDerivation { - name = "${pname}-${version}"; - - src = fetchurl { - url = "https://bitbucket.org/camlspotter/camlimages/get/${version}.tar.bz2"; - sha256 = "1ppddhfknpirj1vilm5dxgyp82kf7ahpvjmh7z75a1fnaqv3kpki"; - }; - - buildInputs = [ ocaml omake findlib graphicsmagick ghostscript ]; - - propagatedBuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ]; - - createFindlibDestdir = true; - - buildPhase = '' - omake - ''; - - installPhase = '' - omake install - ''; - - meta = with stdenv.lib; { - homepage = "https://bitbucket.org/camlspotter/camlimages"; - description = "OCaml image processing library"; - license = licenses.lgpl2; - maintainers = [ maintainers.vbgl ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 865e1c9bd24..6af78e8f30d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -101,13 +101,7 @@ let libpng = pkgs.libpng12; giflib = pkgs.giflib_4_1; }; - camlimages_4_1 = callPackage ../development/ocaml-modules/camlimages/4.1.nix { - giflib = pkgs.giflib_4_1; - }; - camlimages = - if lib.versionOlder "4.06" ocaml.version - then callPackage ../development/ocaml-modules/camlimages { } - else camlimages_4_1; + camlimages = callPackage ../development/ocaml-modules/camlimages { }; benchmark = callPackage ../development/ocaml-modules/benchmark { }; From 762ca640c4a5ce18a63a2341f40be7c00a6506b8 Mon Sep 17 00:00:00 2001 From: Dustin Frisch Date: Fri, 16 Oct 2020 12:46:24 +0200 Subject: [PATCH 316/546] nixos/nginx: Do not remove headers while proxying Removing the `Accept-Encoding` header breaks applications which may produce already compressed content. Removing this header is staded in the nginx docs but is ment as an example, not as an recomendation. --- nixos/modules/services/web-servers/nginx/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 39bcb14e5af..6d2ddea927e 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -34,7 +34,6 @@ let proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Server $host; - proxy_set_header Accept-Encoding ""; ''; upstreamConfig = toString (flip mapAttrsToList cfg.upstreams (name: upstream: '' From 1ccea4f8a0d9e5f095c69bbc2837a58828c4310e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 11:35:37 +0000 Subject: [PATCH 317/546] python37Packages.aria2p: 0.7.0 -> 0.9.1 --- pkgs/development/python-modules/aria2p/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix index 9126969c22d..a7d8221d78e 100644 --- a/pkgs/development/python-modules/aria2p/default.nix +++ b/pkgs/development/python-modules/aria2p/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "aria2p"; - version = "0.7.0"; + version = "0.9.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "pawamoy"; repo = pname; rev = "v${version}"; - sha256 = "1inak3y2win58zbzykfzy6xp00f276sqsz69h2nfsd93mpr74wf6"; + sha256 = "1s4kad6jnfz9p64gkqclkfq2x2bn8dbc0hyr86d1545bgn7pz672"; }; nativeBuildInputs = [ poetry ]; From 04715a1f0b3b01cf80027882c5e0845a0c41b30e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Oct 2020 13:38:53 +0200 Subject: [PATCH 318/546] LTS Haskell 16.18 --- .../configuration-hackage2nix.yaml | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 59258182b99..55b4c896ca6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -72,7 +72,7 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # LTS Haskell 16.17 + # LTS Haskell 16.18 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -378,14 +378,14 @@ default-package-overrides: - bytestring-mmap ==0.2.2 - bytestring-strict-builder ==0.4.5.3 - bytestring-to-vector ==0.3.0.1 - - bytestring-tree-builder ==0.2.7.4 + - bytestring-tree-builder ==0.2.7.5 - bz2 ==1.0.0.1 - bzlib-conduit ==0.3.0.2 - c2hs ==0.28.6 - cabal-appimage ==0.3.0.0 - cabal-debian ==5.0.3 - cabal-doctest ==1.0.8 - - cabal-rpm ==2.0.6 + - cabal-rpm ==2.0.7 - cache ==0.1.3.0 - cacophony ==0.10.1 - calendar-recycling ==0.0.0.1 @@ -803,7 +803,7 @@ default-package-overrides: - flac-picture ==0.1.2 - flags-applicative ==0.1.0.2 - flat ==0.4.4 - - flat-mcmc ==1.5.1 + - flat-mcmc ==1.5.2 - FloatingHex ==0.4 - floatshow ==0.2.4 - flow ==1.0.21 @@ -1011,7 +1011,7 @@ default-package-overrides: - hasql-pool ==0.5.2 - hasql-transaction ==1.0.0.1 - hasty-hamiltonian ==1.3.3 - - HaTeX ==3.22.2.0 + - HaTeX ==3.22.3.0 - HaXml ==1.25.5 - haxr ==3000.11.4.1 - HCodecs ==0.5.2 @@ -1092,7 +1092,7 @@ default-package-overrides: - hslua-module-doclayout ==0.1.0 - hslua-module-system ==0.2.2 - hslua-module-text ==0.2.1 - - HsOpenSSL ==0.11.4.19 + - HsOpenSSL ==0.11.4.20 - hsp ==0.10.0 - hspec ==2.7.4 - hspec-attoparsec ==0.1.0.2 @@ -1138,7 +1138,7 @@ default-package-overrides: - http-client-tls ==0.3.5.3 - http-common ==0.8.2.1 - http-conduit ==2.3.7.3 - - http-date ==0.0.9 + - http-date ==0.0.10 - http-directory ==0.1.8 - http-download ==0.2.0.0 - httpd-shed ==0.4.1.1 @@ -1153,7 +1153,7 @@ default-package-overrides: - hunit-dejafu ==2.0.0.4 - hvect ==0.4.0.0 - hvega ==0.9.1.0 - - hw-balancedparens ==0.4.1.0 + - hw-balancedparens ==0.4.1.1 - hw-bits ==0.7.2.1 - hw-conduit ==0.2.1.0 - hw-conduit-merges ==0.2.1.0 @@ -1244,7 +1244,7 @@ default-package-overrides: - ipynb ==0.1.0.1 - ipython-kernel ==0.10.2.1 - irc ==0.6.1.0 - - irc-client ==1.1.1.1 + - irc-client ==1.1.2.0 - irc-conduit ==0.3.0.4 - irc-ctcp ==0.1.3.0 - isbn ==1.0.0.0 @@ -1954,7 +1954,6 @@ default-package-overrides: - serialise ==0.2.3.0 - servant ==0.16.2 - servant-auth ==0.3.2.0 - - servant-auth-docs ==0.2.10.0 - servant-auth-server ==0.4.5.1 - servant-auth-swagger ==0.2.10.0 - servant-blaze ==0.9 @@ -2010,7 +2009,7 @@ default-package-overrides: - signal ==0.1.0.4 - silently ==1.2.5.1 - simple-affine-space ==0.1.1 - - simple-cabal ==0.1.2 + - simple-cabal ==0.1.3 - simple-cmd ==0.2.2 - simple-cmd-args ==0.1.6 - simple-log ==0.9.12 @@ -2162,7 +2161,7 @@ default-package-overrides: - tasty ==1.2.3 - tasty-ant-xml ==1.1.6 - tasty-dejafu ==2.0.0.6 - - tasty-discover ==4.2.1 + - tasty-discover ==4.2.2 - tasty-expected-failure ==0.11.1.2 - tasty-golden ==2.3.3.2 - tasty-hedgehog ==1.0.0.2 @@ -2224,8 +2223,8 @@ default-package-overrides: - th-desugar ==1.10 - th-env ==0.1.0.2 - these ==1.1.1.1 - - these-lens ==1.0.0.1 - - these-optics ==1 + - these-lens ==1.0.1.1 + - these-optics ==1.0.1.1 - th-expand-syns ==0.4.6.0 - th-extras ==0.0.0.4 - th-lift ==0.8.2 @@ -2309,7 +2308,7 @@ default-package-overrides: - type-map ==0.1.6.0 - type-natural ==0.8.3.1 - typenums ==0.1.2.1 - - type-of-html ==1.5.1.0 + - type-of-html ==1.5.2.0 - type-of-html-static ==0.1.0.2 - type-operators ==0.2.0.0 - typerep-map ==0.3.3.0 From 00a4f58ac2ae821b16436140d789d656288423a9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Oct 2020 13:40:38 +0200 Subject: [PATCH 319/546] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-20-g9bb4291 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/7c472f7b257e413dbc9ec8866a205f7f04f8ca66. --- .../haskell-modules/hackage-packages.nix | 368 ++++-------------- 1 file changed, 86 insertions(+), 282 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8112e540e61..62d8e927c0d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -9705,26 +9705,6 @@ self: { }) {}; "HaTeX" = callPackage - ({ mkDerivation, base, bibtex, bytestring, containers, hashable - , matrix, parsec, prettyprinter, QuickCheck, tasty - , tasty-quickcheck, text, transformers - }: - mkDerivation { - pname = "HaTeX"; - version = "3.22.2.0"; - sha256 = "0l2csqvyxl399p6jmp8nkabsn8bh4k94wblh7qbn13q8zrmzmmzp"; - libraryHaskellDepends = [ - base bibtex bytestring containers hashable matrix parsec - prettyprinter QuickCheck text transformers - ]; - testHaskellDepends = [ - base parsec QuickCheck tasty tasty-quickcheck text - ]; - description = "The Haskell LaTeX library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "HaTeX_3_22_3_0" = callPackage ({ mkDerivation, base, bibtex, bytestring, containers, hashable , matrix, parsec, prettyprinter, QuickCheck, tasty , tasty-quickcheck, text, transformers @@ -9742,7 +9722,6 @@ self: { ]; description = "The Haskell LaTeX library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HaTeX-meta" = callPackage @@ -10852,20 +10831,6 @@ self: { }) {Judy = null;}; "HsOpenSSL" = callPackage - ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: - mkDerivation { - pname = "HsOpenSSL"; - version = "0.11.4.19"; - sha256 = "0iy3qrir13kp1c7a0xwj2ngfwhqxqbc5j0vj5mi0w3arv7w0x6ds"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ base bytestring network time ]; - librarySystemDepends = [ openssl ]; - testHaskellDepends = [ base bytestring ]; - description = "Partial OpenSSL binding for Haskell"; - license = stdenv.lib.licenses.publicDomain; - }) {inherit (pkgs) openssl;}; - - "HsOpenSSL_0_11_4_20" = callPackage ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; @@ -10877,7 +10842,6 @@ self: { testHaskellDepends = [ base bytestring ]; description = "Partial OpenSSL binding for Haskell"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; "HsOpenSSL-x509-system" = callPackage @@ -24497,8 +24461,8 @@ self: { }: mkDerivation { pname = "aeson-commit"; - version = "1.1"; - sha256 = "09rshnxziav4kwvalq2p059bgv9q2lqdac6f4ks8s7lxgmsmyh3z"; + version = "1.2"; + sha256 = "09h0gjq9kg1krfsxsy1x697ndi6rajsyqk6j4kkcrq48ynq9vfxr"; libraryHaskellDepends = [ aeson base mtl text ]; testHaskellDepends = [ aeson aeson-qq base containers hspec mtl some tasty tasty-hspec @@ -39482,6 +39446,22 @@ self: { broken = true; }) {}; + "benchpress_0_2_2_15" = callPackage + ({ mkDerivation, base, bytestring, mtl, time }: + mkDerivation { + pname = "benchpress"; + version = "0.2.2.15"; + sha256 = "0bffchlwcyqgbnviqvm01lyj7zldvd3yj9yqnc8150lgxr29kvf9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl time ]; + executableHaskellDepends = [ base bytestring time ]; + description = "Micro-benchmarking with detailed statistics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "bencode" = callPackage ({ mkDerivation, base, binary, bytestring, containers, hspec , parsec, QuickCheck, transformers, transformers-compat @@ -47675,29 +47655,6 @@ self: { }) {}; "bytestring-tree-builder" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, criterion, deepseq - , QuickCheck, quickcheck-instances, semigroups, tasty, tasty-hunit - , tasty-quickcheck, text - }: - mkDerivation { - pname = "bytestring-tree-builder"; - version = "0.2.7.4"; - sha256 = "1j0jr2xnbqwnl6zwsi07hx9nbw9643xmamp7y3maqhha78h7x4mh"; - libraryHaskellDepends = [ - base base-prelude bytestring semigroups text - ]; - testHaskellDepends = [ - base-prelude bytestring QuickCheck quickcheck-instances tasty - tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base-prelude bytestring criterion deepseq - ]; - description = "A very efficient ByteString builder implementation based on the binary tree"; - license = stdenv.lib.licenses.mit; - }) {}; - - "bytestring-tree-builder_0_2_7_5" = callPackage ({ mkDerivation, base, base-prelude, bytestring, criterion, deepseq , QuickCheck, quickcheck-instances, tasty, tasty-hunit , tasty-quickcheck, text @@ -47716,7 +47673,6 @@ self: { ]; description = "A very efficient ByteString builder implementation based on the binary tree"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-trie" = callPackage @@ -48989,27 +48945,6 @@ self: { }) {}; "cabal-rpm" = callPackage - ({ mkDerivation, base, bytestring, Cabal, directory, extra - , filepath, http-client, http-client-tls, http-conduit - , optparse-applicative, process, simple-cabal, simple-cmd - , simple-cmd-args, time, unix - }: - mkDerivation { - pname = "cabal-rpm"; - version = "2.0.6"; - sha256 = "1f27arazgv65ripbcjirs4hl5ywr7a7s0vcr5s7jd7176h8dr35b"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring Cabal directory extra filepath http-client - http-client-tls http-conduit optparse-applicative process - simple-cabal simple-cmd simple-cmd-args time unix - ]; - description = "RPM packaging tool for Haskell Cabal-based packages"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "cabal-rpm_2_0_7" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, extra , filepath, http-client, http-client-tls, http-conduit , optparse-applicative, process, simple-cabal, simple-cmd @@ -49028,7 +48963,6 @@ self: { ]; description = "RPM packaging tool for Haskell Cabal-based packages"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-scripts" = callPackage @@ -60583,6 +60517,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit_1_3_3" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , exceptions, filepath, gauge, hspec, kan-extensions + , mono-traversable, mtl, mwc-random, primitive, QuickCheck + , resourcet, safe, silently, split, text, transformers, unix + , unliftio, unliftio-core, vector + }: + mkDerivation { + pname = "conduit"; + version = "1.3.3"; + sha256 = "0jv3j1dc7iswi3kljn9y3jq7rn2aiq9d1vkn2xdpirc519ckxfnl"; + libraryHaskellDepends = [ + base bytestring directory exceptions filepath mono-traversable mtl + primitive resourcet text transformers unix unliftio-core vector + ]; + testHaskellDepends = [ + base bytestring containers directory exceptions filepath hspec + mono-traversable mtl QuickCheck resourcet safe silently split text + transformers unliftio vector + ]; + benchmarkHaskellDepends = [ + base containers deepseq gauge hspec kan-extensions mwc-random + transformers vector + ]; + description = "Streaming data processing library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-algorithms" = callPackage ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit , conduit-combinators, conduit-extra, conduit-zstd, containers @@ -81153,7 +81116,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "egison_4_1_0" = callPackage + "egison_4_1_1" = callPackage ({ mkDerivation, array, base, containers, criterion, directory , exceptions, filepath, ghc, ghc-paths, Glob, hashable, haskeline , HUnit, megaparsec, mtl, optparse-applicative, parsec @@ -81163,8 +81126,8 @@ self: { }: mkDerivation { pname = "egison"; - version = "4.1.0"; - sha256 = "0qhan5mlb9pvdwbjk0pl59z8y6dn2kbcl21k7rnzhqwf5a5l556d"; + version = "4.1.1"; + sha256 = "16z2zp3gjm3gwp884ab86g0vhkxkkfxma0p9h1as5fyc6kvnsdbn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -91594,24 +91557,6 @@ self: { }) {}; "flat-mcmc" = callPackage - ({ mkDerivation, base, formatting, mcmc-types, monad-par - , monad-par-extras, mwc-probability, pipes, primitive, text - , transformers, vector - }: - mkDerivation { - pname = "flat-mcmc"; - version = "1.5.1"; - sha256 = "1fi18hx6mz7qskhnnjviaghqz0vsbrvglyk16xzj3kywx70hakpb"; - libraryHaskellDepends = [ - base formatting mcmc-types monad-par monad-par-extras - mwc-probability pipes primitive text transformers vector - ]; - testHaskellDepends = [ base vector ]; - description = "Painless general-purpose sampling"; - license = stdenv.lib.licenses.mit; - }) {}; - - "flat-mcmc_1_5_2" = callPackage ({ mkDerivation, base, formatting, mcmc-types, monad-par , monad-par-extras, mwc-probability, pipes, primitive, text , transformers, vector @@ -91627,7 +91572,6 @@ self: { testHaskellDepends = [ base vector ]; description = "Painless general-purpose sampling"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flat-tex" = callPackage @@ -114168,6 +114112,17 @@ self: { broken = true; }) {}; + "hakyll-process" = callPackage + ({ mkDerivation, base, bytestring, hakyll, typed-process }: + mkDerivation { + pname = "hakyll-process"; + version = "0.0.1.0"; + sha256 = "00fiqlxj581gf5y0jva22kmssx6c152s8i7a9csb3hlssmbqmhj7"; + libraryHaskellDepends = [ base bytestring hakyll typed-process ]; + description = "Hakyll compiler for arbitrary external processes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hakyll-sass" = callPackage ({ mkDerivation, aeson-pretty, base, data-default-class, filepath , hakyll, hsass @@ -138721,24 +138676,6 @@ self: { }) {}; "http-date" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, doctest - , hspec, old-locale, time - }: - mkDerivation { - pname = "http-date"; - version = "0.0.9"; - sha256 = "0dxrlwaqdimgxr8nziyzgqsrg44dl9gxa060cg0k7ndpnlpcbjwa"; - revision = "1"; - editedCabalFile = "0pmmbxcqamyrg71vyfjqi0cvzv8wvnx12mw3yxw7fnqg55fmagy4"; - libraryHaskellDepends = [ array attoparsec base bytestring time ]; - testHaskellDepends = [ - base bytestring doctest hspec old-locale time - ]; - description = "HTTP Date parser/formatter"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http-date_0_0_10" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, doctest , hspec, old-locale, time }: @@ -138752,7 +138689,6 @@ self: { ]; description = "HTTP Date parser/formatter"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-directory" = callPackage @@ -140421,46 +140357,6 @@ self: { }) {}; "hw-balancedparens" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq, directory - , doctest, doctest-discover, generic-lens, hedgehog, hspec - , hspec-discover, hw-bits, hw-excess, hw-fingertree - , hw-hspec-hedgehog, hw-int, hw-prim, hw-rankselect-base, lens - , mmap, optparse-applicative, transformers, vector - }: - mkDerivation { - pname = "hw-balancedparens"; - version = "0.4.1.0"; - sha256 = "1ddxg00pwjvlrd4zdx9b9y7hm8rgxsxkvzzvwc34p2y75rivp21l"; - revision = "1"; - editedCabalFile = "0mc9lmjc3xrad4jlc9v66078362a791hnrrg9bclg1nq7jicfxgx"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base deepseq hedgehog hspec hw-bits hw-excess hw-fingertree hw-int - hw-prim hw-rankselect-base vector - ]; - executableHaskellDepends = [ - base bytestring generic-lens hw-bits hw-prim lens mmap - optparse-applicative vector - ]; - testHaskellDepends = [ - base directory doctest doctest-discover hedgehog hspec hw-bits - hw-hspec-hedgehog hw-int hw-prim hw-rankselect-base transformers - vector - ]; - testToolDepends = [ doctest-discover hspec-discover ]; - benchmarkHaskellDepends = [ - base criterion deepseq directory generic-lens hedgehog hw-bits - hw-prim lens vector - ]; - doHaddock = false; - description = "Balanced parentheses"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "hw-balancedparens_0_4_1_1" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, directory , doctest, doctest-discover, generic-lens, hedgehog, hspec , hspec-discover, hw-bits, hw-excess, hw-fingertree @@ -148043,26 +147939,6 @@ self: { }) {}; "irc-client" = callPackage - ({ mkDerivation, base, bytestring, conduit, connection, containers - , contravariant, exceptions, irc-conduit, irc-ctcp, mtl - , network-conduit-tls, old-locale, profunctors, stm, stm-chans - , text, time, tls, transformers, x509, x509-store, x509-validation - }: - mkDerivation { - pname = "irc-client"; - version = "1.1.1.1"; - sha256 = "08s1qb9dc6icz9fxfp5swcx817685vj833l8ijpf1gdgyzw6wfdq"; - libraryHaskellDepends = [ - base bytestring conduit connection containers contravariant - exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale - profunctors stm stm-chans text time tls transformers x509 - x509-store x509-validation - ]; - description = "An IRC client library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "irc-client_1_1_2_0" = callPackage ({ mkDerivation, base, bytestring, conduit, connection, containers , contravariant, exceptions, irc-conduit, irc-ctcp, mtl , network-conduit-tls, old-locale, profunctors, stm, stm-chans @@ -148080,7 +147956,6 @@ self: { ]; description = "An IRC client library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-colors" = callPackage @@ -191770,7 +191645,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_11_0_1" = callPackage + "pandoc_2_11_0_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions @@ -191789,8 +191664,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.11.0.1"; - sha256 = "195g1y1i4n11qfk2mmgfnhvdcraf937ipvb7swb6fvyv5qlwj4w9"; + version = "2.11.0.2"; + sha256 = "0lnzypad3jfix7h78gk4fvyl0x3n7f77i8bn6dn2lzdsf6wasy8x"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -191929,6 +191804,8 @@ self: { pname = "pandoc-crossref"; version = "0.3.8.2"; sha256 = "15rvyxn05wq7k06v3k4z0wbl85id7vmjkyy92zdp8vcvqbayjm3a"; + revision = "1"; + editedCabalFile = "0r0cj58yn4mkzpq8inzlwp86kmwgz11b2iindcf10rrdqx5c5vrf"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -211878,6 +211755,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "radius_0_7_1_0" = callPackage + ({ mkDerivation, base, binary, bytestring, cryptonite, iproute + , lens, memory + }: + mkDerivation { + pname = "radius"; + version = "0.7.1.0"; + sha256 = "1q7dz40n97z5kajn60fszdhq7yb5m33dbd34j94218iqshz844ql"; + libraryHaskellDepends = [ + base binary bytestring cryptonite iproute lens memory + ]; + description = "Remote Authentication Dial In User Service (RADIUS)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "radix" = callPackage ({ mkDerivation, base, filepath }: mkDerivation { @@ -215517,8 +215410,8 @@ self: { }: mkDerivation { pname = "refinery"; - version = "0.2.0.0"; - sha256 = "0nsfmb5y8y0hanh3h03v0n8wa5frgj85gz8ycl8h5z045j2kk3wq"; + version = "0.3.0.0"; + sha256 = "1bsbnxf75prw153c3k02jk84h3sravdi1c1sl75c7sx4xq81qhlp"; libraryHaskellDepends = [ base exceptions logict mmorph mtl ]; testHaskellDepends = [ base checkers exceptions hspec logict mmorph mtl QuickCheck @@ -234080,19 +233973,6 @@ self: { }) {}; "simple-cabal" = callPackage - ({ mkDerivation, base, bytestring, Cabal, directory, filepath }: - mkDerivation { - pname = "simple-cabal"; - version = "0.1.2"; - sha256 = "1a834zrj58m7nqvwiwfvqi696dib7h69qlb96vh93zqjn9ndv6hz"; - libraryHaskellDepends = [ - base bytestring Cabal directory filepath - ]; - description = "Cabal file wrapper library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "simple-cabal_0_1_3" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath }: mkDerivation { pname = "simple-cabal"; @@ -234103,7 +233983,6 @@ self: { ]; description = "Cabal file wrapper library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-cmd" = callPackage @@ -248509,8 +248388,8 @@ self: { }: mkDerivation { pname = "sweet-egison"; - version = "0.1.1.0"; - sha256 = "1zd1l2gbg7dp53d4jzki6k8jqxdvqgy5gl6jdy325hx1fycrixql"; + version = "0.1.1.2"; + sha256 = "0cf4wq7lmp5y40niwvlmj5l2bvjl16vbv2dx03m86mg1n16jb30y"; libraryHaskellDepends = [ backtracking base egison-pattern-src egison-pattern-src-th-mode haskell-src-exts haskell-src-meta logict template-haskell @@ -251623,32 +251502,6 @@ self: { }) {}; "tasty-discover" = callPackage - ({ mkDerivation, base, containers, directory, filepath, Glob - , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit - , tasty-quickcheck, tasty-smallcheck - }: - mkDerivation { - pname = "tasty-discover"; - version = "4.2.1"; - sha256 = "0ghxrjkqp4w6i47pvdsd25zs6sj10rw4ybkf0pxr598l8qw5nv5y"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers directory filepath Glob - ]; - executableHaskellDepends = [ - base containers directory filepath Glob - ]; - testHaskellDepends = [ - base containers directory filepath Glob hedgehog tasty - tasty-hedgehog tasty-hspec tasty-hunit tasty-quickcheck - tasty-smallcheck - ]; - description = "Test discovery for the tasty framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty-discover_4_2_2" = callPackage ({ mkDerivation, base, containers, directory, filepath, Glob , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit , tasty-quickcheck, tasty-smallcheck @@ -251672,7 +251525,6 @@ self: { ]; description = "Test discovery for the tasty framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-expected-failure" = callPackage @@ -256723,17 +256575,6 @@ self: { }) {}; "these-lens" = callPackage - ({ mkDerivation, base, lens, these }: - mkDerivation { - pname = "these-lens"; - version = "1.0.0.1"; - sha256 = "15c05lgmlfm1pijsa3gfvmrsgmbfl5f7mpzzqasm72ip7y8la696"; - libraryHaskellDepends = [ base lens these ]; - description = "Lenses for These"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "these-lens_1_0_1_1" = callPackage ({ mkDerivation, base, lens, these }: mkDerivation { pname = "these-lens"; @@ -256742,23 +256583,9 @@ self: { libraryHaskellDepends = [ base lens these ]; description = "Lenses for These"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "these-optics" = callPackage - ({ mkDerivation, base, optics-core, these }: - mkDerivation { - pname = "these-optics"; - version = "1"; - sha256 = "0gmsykzcjx5h6dbfny4dw3jrm33ykcw6rpngf5awwdpg3a4cfgi7"; - revision = "4"; - editedCabalFile = "1wdh7l300ckmx72ky0qjgmfv075rnzj78zv5hlgna0f9df7ib3yw"; - libraryHaskellDepends = [ base optics-core these ]; - description = "Optics for These"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "these-optics_1_0_1_1" = callPackage ({ mkDerivation, base, optics-core, these }: mkDerivation { pname = "these-optics"; @@ -256767,7 +256594,6 @@ self: { libraryHaskellDepends = [ base optics-core these ]; description = "Optics for These"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "these-skinny" = callPackage @@ -264254,27 +264080,6 @@ self: { }) {}; "type-of-html" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, containers - , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim - , hspec, QuickCheck, random, text, weigh - }: - mkDerivation { - pname = "type-of-html"; - version = "1.5.1.0"; - sha256 = "14bz0gjf6rfnrisffp9lvvyzdimdhdcg5mwy5n9mrzlg4nv5pi2c"; - libraryHaskellDepends = [ - base bytestring containers double-conversion ghc-prim text - ]; - testHaskellDepends = [ base bytestring hspec QuickCheck ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring criterion deepseq ghc ghc-paths random - text weigh - ]; - description = "High performance type driven html generation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "type-of-html_1_5_2_0" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim , hspec, QuickCheck, random, text, weigh @@ -264293,7 +264098,6 @@ self: { ]; description = "High performance type driven html generation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-of-html-static" = callPackage From 8f038f237045db5fff401a5241736c05e328cfba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Oct 2020 13:45:18 +0200 Subject: [PATCH 320/546] haskell-pandoc: update override for the latest version --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4a7b13b5320..79e0c1e220a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1468,7 +1468,7 @@ self: super: { skylighting-core = doDistribute super.skylighting-core_0_10_0_2; hslua = doDistribute self.hslua_1_1_2; jira-wiki-markup = doDistribute self.jira-wiki-markup_1_3_2; - pandoc = doDistribute self.pandoc_2_11_0_1; + pandoc = doDistribute self.pandoc_2_11_0_2; # jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc pandoc-citeproc = doJailbreak (doDistribute self.pandoc-citeproc_0_17_0_2); pandoc-types = doDistribute self.pandoc-types_1_22; From 4a0857e650243455c0e414c500935f09e889faa1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Oct 2020 13:48:15 +0200 Subject: [PATCH 321/546] hackage2nix: disable failing builds to fix evaluation --- .../haskell-modules/configuration-hackage2nix.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 55b4c896ca6..f1bb7a2fbc5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3905,6 +3905,7 @@ broken-packages: - cmv - cnc-spec-compiler - co-log + - co-log-polysemy-formatting - co-log-sys - Coadjute - coalpit @@ -5688,6 +5689,7 @@ broken-packages: - hakyll-filestore - hakyll-images - hakyll-ogmarkup + - hakyll-process - hakyll-R - hakyll-sass - hakyll-series @@ -7495,6 +7497,7 @@ broken-packages: - lol-typing - loli - longboi + - longshot - lookup-tables - loop-effin - loop-while @@ -7932,6 +7935,7 @@ broken-packages: - mu-grpc-server - mu-kafka - mu-protobuf + - mu-servant-server - MuCheck - MuCheck-Hspec - MuCheck-HUnit From 0e580ae2469727bdd4ac15e9391d0ff8618251b3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Oct 2020 13:49:04 +0200 Subject: [PATCH 322/546] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-20-g9bb4291 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/7c472f7b257e413dbc9ec8866a205f7f04f8ca66. --- pkgs/development/haskell-modules/hackage-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 62d8e927c0d..ab357a276d5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -57036,6 +57036,8 @@ self: { ]; description = "A Polysemy logging effect for high quality (unstructured) logs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "co-log-sys" = callPackage @@ -114121,6 +114123,8 @@ self: { libraryHaskellDepends = [ base bytestring hakyll typed-process ]; description = "Hakyll compiler for arbitrary external processes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-sass" = callPackage @@ -164894,6 +164898,8 @@ self: { ]; description = "Fast Brute-force search using parallelism"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lookup-tables" = callPackage @@ -178159,6 +178165,8 @@ self: { ]; description = "Servant servers for Mu definitions"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mu-tracing" = callPackage From 72f0938597477c92d1389c257cd23e65f0d5b99d Mon Sep 17 00:00:00 2001 From: Emmanuel Rosa Date: Fri, 16 Oct 2020 17:06:26 +0700 Subject: [PATCH 323/546] pdfjs: 2.4.456 -> 2.6.347 --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 524f3e7ca63..84a6f7b92fa 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -12,12 +12,12 @@ assert withMediaPlayback -> gst_all_1 != null; let python3Packages = python3.pkgs; pdfjs = let - version = "2.4.456"; + version = "2.6.347"; in fetchzip rec { name = "pdfjs-${version}"; url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip"; - sha256 = "02hpy96pi06gdq2s7n56ycm34d6d3gf8ly22y366np5vpwmc29rx"; + sha256 = "0d016fyg81cq464li01xlkf9rxrb3rpsvmk5gh9m4d5yzmcakkfm"; stripRoot = false; }; From 6948875e73a855b8a0c665301576dcd9653b9e15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20W=C3=BCnsche?= Date: Fri, 16 Oct 2020 14:35:22 +0200 Subject: [PATCH 324/546] llvmPackages_11.compiler-rt: enable support for i486 i586 i686 compiler-rt (and as a result clang) can't be build for i686 (as noticed here: #99984). The patch adds the required variables and should result in the same behavior as in the nixpkgs-llvm10. It essentially forces to use i386 buildins when using i486, i586 or i686, which are not supported. Fixes #100392 --- .../compiler-rt-X86-support-extension.patch | 23 +++++++++++++++++++ .../compilers/llvm/11/compiler-rt.nix | 1 + 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/compilers/llvm/11/compiler-rt-X86-support-extension.patch diff --git a/pkgs/development/compilers/llvm/11/compiler-rt-X86-support-extension.patch b/pkgs/development/compilers/llvm/11/compiler-rt-X86-support-extension.patch new file mode 100644 index 00000000000..f6f9336ad5a --- /dev/null +++ b/pkgs/development/compilers/llvm/11/compiler-rt-X86-support-extension.patch @@ -0,0 +1,23 @@ +diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt +index 3a66dd9c3fb..7efc85d9f9f 100644 +--- a/lib/builtins/CMakeLists.txt ++++ b/lib/builtins/CMakeLists.txt +@@ -301,6 +301,10 @@ if (NOT MSVC) + i386/umoddi3.S + ) + ++ set(i486_SOURCES ${i386_SOURCES}) ++ set(i586_SOURCES ${i386_SOURCES}) ++ set(i686_SOURCES ${i386_SOURCES}) ++ + if (WIN32) + set(i386_SOURCES + ${i386_SOURCES} +@@ -608,6 +612,7 @@ else () + endif() + + foreach (arch ${BUILTIN_SUPPORTED_ARCH}) ++ message("arch: ${arch}") + if (CAN_TARGET_${arch}) + # For ARM archs, exclude any VFP builtins if VFP is not supported + if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") diff --git a/pkgs/development/compilers/llvm/11/compiler-rt.nix b/pkgs/development/compilers/llvm/11/compiler-rt.nix index e0cb712fe61..db1f93f86ab 100644 --- a/pkgs/development/compilers/llvm/11/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/11/compiler-rt.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory + ./compiler-rt-X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; From 86e486a890f27ed752674040a4495fbaa2dcad4a Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Fri, 16 Oct 2020 04:58:32 +0800 Subject: [PATCH 325/546] perlPackages.FutureAsyncAwait: init at 0.44 dependencies: perlPackages.XSParseSublike: init at 0.10 --- pkgs/top-level/perl-packages.nix | 33 ++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f719600c9e5..666b2121d60 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8300,6 +8300,23 @@ let }; }; + FutureAsyncAwait = buildPerlModule { + pname = "Future-AsyncAwait"; + version = "0.44"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-0.44.tar.gz"; + sha256 = "131825164614ede6a49df4566e730c4cc22e3129796039b9360fa551701413fe"; + }; + buildInputs = [ TestRefcount ]; + propagatedBuildInputs = [ Future XSParseSublike ]; + perlPreHook = stdenv.lib.optionalString stdenv.isDarwin "export LD=$CC"; + meta = { + description = "Deferred subroutine syntax for futures"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.zakame ]; + }; + }; + GamesSolitaireVerify = buildPerlModule { pname = "Games-Solitaire-Verify"; version = "0.2403"; @@ -22848,6 +22865,22 @@ let }; }; + XSParseSublike = buildPerlModule { + pname = "XS-Parse-Sublike"; + version = "0.10"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Sublike-0.10.tar.gz"; + sha256 = "99a1bdda3ffa67514adb6aa189c902fa78dca41d778a42ae7079f604a045ac43"; + }; + buildInputs = [ TestFatal ]; + perlPreHook = stdenv.lib.optionalString stdenv.isDarwin "export LD=$CC"; + meta = { + description = "XS functions to assist in parsing sub-like syntax"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.zakame ]; + }; + }; + XXX = buildPerlPackage { pname = "XXX"; version = "0.35"; From a3cae625e4dcfb0e8d28d0fd9d968664563da440 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 16 Oct 2020 09:29:36 -0400 Subject: [PATCH 326/546] oh-my-zsh: 2020-10-14 -> 2020-10-15 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index e317a851bbc..73fd6ceeb06 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,15 +4,15 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2020-10-14"; + version = "2020-10-15"; pname = "oh-my-zsh"; - rev = "53cbd658f5ae6874af0d804cee6748dfba69e786"; + rev = "5b717ab3e4bfb627a936d7c04367a39867734d63"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "llWUdN/4pCM5x8uJu6y8pIUzuY4nyGu6e+m53khcZB4="; + sha256 = "0qm0mdvcvf5s6ypbq7z1x286sdv6ii2yfqvv1dss7zqjbg5j08gz"; }; installPhase = '' From 4c59c0b1dacacf0272958880eaa50612397511b0 Mon Sep 17 00:00:00 2001 From: oxalica Date: Fri, 16 Oct 2020 21:41:07 +0800 Subject: [PATCH 327/546] tdesktop: 2.3.0 -> 2.4.3 and enable webrtc (#100450) Enables WebRTC by packaging tg_owt. --- .../telegram/tdesktop/default.nix | 17 +- .../telegram/tdesktop/tg_owt-install.patch | 159 ++++++++++++++++++ .../telegram/tdesktop/tg_owt.nix | 26 +++ 3 files changed, 197 insertions(+), 5 deletions(-) create mode 100644 pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt-install.patch create mode 100644 pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 7e932d74abc..fff4400e0a4 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, fetchsvn +{ mkDerivation, lib, fetchurl, callPackage , pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 @@ -17,14 +17,17 @@ with lib; # - https://git.alpinelinux.org/aports/tree/testing/telegram-desktop/APKBUILD # - https://github.com/void-linux/void-packages/blob/master/srcpkgs/telegram-desktop/template -mkDerivation rec { +let + tg_owt = callPackage ./tg_owt.nix {}; + +in mkDerivation rec { pname = "telegram-desktop"; - version = "2.3.0"; + version = "2.4.3"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "0yga4p36jrc5m3d8q2y2g0505c2v540w5hgcscapl4xj9hyb21dw"; + sha256 = "15a8pnz4wf3464n8dvfzr9ck0vmhlx16ya1y889y3crjagm4ipjn"; }; postPatch = '' @@ -44,6 +47,7 @@ mkDerivation rec { qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 tl-expected hunspell + tg_owt # TODO: Shouldn't be required: pcre xorg.libpthreadstubs xorg.libXdmcp utillinux libselinux libsepol epoxy at-spi2-core libXtst ]; @@ -60,7 +64,6 @@ mkDerivation rec { "-DDESKTOP_APP_USE_PACKAGED_GSL=OFF" "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON" "-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF" - "-DDESKTOP_APP_DISABLE_WEBRTC_INTEGRATION=ON" #"-DDESKTOP_APP_SPECIAL_TARGET=\"\"" # TODO: Error when set to "": Bad special target '""' "-DTDESKTOP_LAUNCHER_BASENAME=telegramdesktop" # Note: This is the default ]; @@ -82,6 +85,10 @@ mkDerivation rec { # TODO: Package mapbox-variant postFixup = '' + # Nuke refs to `tg_owt` which is introduced by `__FILE__` in headers. + sed -E "s|($NIX_STORE/)[a-z0-9]{32}(-${tg_owt.name})|\1eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee\2|g" \ + --in-place $out/bin/telegram-desktop + # This is necessary to run Telegram in a pure environment. # We also use gappsWrapperArgs from wrapGAppsHook. wrapProgram $out/bin/telegram-desktop \ diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt-install.patch b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt-install.patch new file mode 100644 index 00000000000..bc8a23eb31e --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt-install.patch @@ -0,0 +1,159 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6fbc0da..6cbff3c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1856,3 +1856,41 @@ configure_file( + "${CMAKE_CURRENT_BINARY_DIR}/tg_owtConfig.cmake" + COPYONLY + ) ++ ++install( ++TARGETS ++ tg_owt ++ libabsl ++ libopenh264 ++ libpffft ++ librnnoise ++ libsrtp ++ libusrsctp ++ libvpx ++ ${vpx_export} ++ libwebrtcbuild ++ libyuv ++ ${platform_export} ++EXPORT tg_owtTargets ++RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ++) ++ ++install( ++ DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/src/ ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ++ FILES_MATCHING PATTERN "*.h" ++) ++ ++install( ++ EXPORT tg_owtTargets ++ NAMESPACE tg_owt:: ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/tg_owt ++) ++ ++install( ++ FILES ${CMAKE_CURRENT_BINARY_DIR}/tg_owtConfig.cmake ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/tg_owt ++) +diff --git a/cmake/libabsl.cmake b/cmake/libabsl.cmake +index 2fb3b8c..4a4f85b 100644 +--- a/cmake/libabsl.cmake ++++ b/cmake/libabsl.cmake +@@ -123,5 +123,6 @@ PRIVATE + + target_include_directories(libabsl + PUBLIC +- ${libabsl_loc} ++ $ ++ $ + ) +diff --git a/cmake/libpffft.cmake b/cmake/libpffft.cmake +index a6ceb3e..435d3a3 100644 +--- a/cmake/libpffft.cmake ++++ b/cmake/libpffft.cmake +@@ -24,5 +24,6 @@ endif() + + target_include_directories(libpffft + PUBLIC +- ${libpffft_loc} ++ $ ++ $ + ) +diff --git a/cmake/libsrtp.cmake b/cmake/libsrtp.cmake +index 57c54b5..26b3466 100644 +--- a/cmake/libsrtp.cmake ++++ b/cmake/libsrtp.cmake +@@ -30,6 +30,8 @@ PRIVATE + + target_include_directories(libsrtp + PUBLIC +- ${libsrtp_loc}/include +- ${libsrtp_loc}/crypto/include ++ $ ++ $ ++ $ ++ $ + ) +diff --git a/cmake/libusrsctp.cmake b/cmake/libusrsctp.cmake +index caa0529..38d2ef6 100644 +--- a/cmake/libusrsctp.cmake ++++ b/cmake/libusrsctp.cmake +@@ -67,6 +67,8 @@ endif() + + target_include_directories(libusrsctp + PUBLIC +- ${third_party_loc}/usrsctp/usrsctplib +- ${libusrsctp_loc} ++ $ ++ $ ++ $ ++ $ + ) +diff --git a/cmake/libvpx.cmake b/cmake/libvpx.cmake +index e192e7e..78cf25b 100644 +--- a/cmake/libvpx.cmake ++++ b/cmake/libvpx.cmake +@@ -68,6 +68,11 @@ else() + set(ASM_SUFFIX ".asm.S") + endif() + ++foreach(dir ${include_directories}) ++ string(REPLACE ${libvpx_loc} include/third_party/libvpx install_include_dir ${dir}) ++ list(APPEND install_include_directories ${install_include_dir}) ++endforeach() ++ + function(add_sublibrary postfix) + add_library(libvpx_${postfix} OBJECT) + init_feature_target(libvpx_${postfix} ${postfix}) +@@ -75,6 +80,8 @@ function(add_sublibrary postfix) + target_include_directories(libvpx_${postfix} + PRIVATE + ${include_directories} ++ "$" ++ "$" + ) + set(sources_list ${ARGV}) + list(REMOVE_AT sources_list 0) +@@ -725,5 +732,6 @@ endif() + + target_include_directories(libvpx + PUBLIC +- ${include_directories} ++ "$" ++ "$" + ) +diff --git a/cmake/libwebrtcbuild.cmake b/cmake/libwebrtcbuild.cmake +index c3520b8..9b4b543 100644 +--- a/cmake/libwebrtcbuild.cmake ++++ b/cmake/libwebrtcbuild.cmake +@@ -44,5 +44,6 @@ endif() + + target_include_directories(libwebrtcbuild + INTERFACE +- ${webrtc_loc} ++ $ ++ $ + ) +diff --git a/cmake/libyuv.cmake b/cmake/libyuv.cmake +index ebfc6f0..18e70ef 100644 +--- a/cmake/libyuv.cmake ++++ b/cmake/libyuv.cmake +@@ -126,7 +126,8 @@ endif() + + target_include_directories(libyuv + PUBLIC +- ${libyuv_loc}/include ++ $ ++ $ + ) + + target_compile_definitions(libyuv diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix new file mode 100644 index 00000000000..47e9b6787e3 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, cmake, ninja, yasm +, pkg-config, libjpeg, openssl, libopus, ffmpeg, alsaLib, libpulseaudio +}: + +let + rev = "c73a4718cbff7048373a63db32068482e5fd11ef"; + sha256 = "0nr20mvvmmg8ii8f2rljd7iv2szplcfjn40rpy6llkmf705mwr1k"; + +in stdenv.mkDerivation { + pname = "tg_owt"; + version = "git-${rev}"; + + src = fetchFromGitHub { + owner = "desktop-app"; + repo = "tg_owt"; + inherit rev sha256; + }; + + patches = [ ./tg_owt-install.patch ]; + + nativeBuildInputs = [ pkg-config cmake ninja yasm ]; + + buildInputs = [ libjpeg openssl libopus ffmpeg alsaLib libpulseaudio ]; + + meta.license = lib.licenses.bsd3; +} From f214a2cda5b124f5436fa0eac60db87d5f7c0c0c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 16 Oct 2020 15:50:08 +0200 Subject: [PATCH 328/546] gotify-server: 2.0.18 -> 2.0.20 https://github.com/gotify/server/releases/tag/v2.0.19 https://github.com/gotify/server/releases/tag/v2.0.20 --- pkgs/servers/gotify/source-sha.nix | 2 +- pkgs/servers/gotify/vendor-sha.nix | 2 +- pkgs/servers/gotify/version.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/gotify/source-sha.nix b/pkgs/servers/gotify/source-sha.nix index 8f20c05407c..5e3531497d4 100644 --- a/pkgs/servers/gotify/source-sha.nix +++ b/pkgs/servers/gotify/source-sha.nix @@ -1 +1 @@ -"1v123j9d4psbg7pnqnc7bc9li2qyahapjbimmf0qpfxacx968gm9" +"0d82girrhw9k68f5kcy8d0bl0bnsq651l4bb60xmqrilylp7qgmp" diff --git a/pkgs/servers/gotify/vendor-sha.nix b/pkgs/servers/gotify/vendor-sha.nix index f9e648a957e..4536d51be0c 100644 --- a/pkgs/servers/gotify/vendor-sha.nix +++ b/pkgs/servers/gotify/vendor-sha.nix @@ -1 +1 @@ -"1in4gzmrgb6z7p5fnz33f88g5l0vki2xlxlllk5wy9icp4h3h9sd" +"15y5migjf68fwv21ihkcj3r7mm4cgjbghvwvb9l7mhysnc8kdk8j" diff --git a/pkgs/servers/gotify/version.nix b/pkgs/servers/gotify/version.nix index 0018815632b..5783e8bd78f 100644 --- a/pkgs/servers/gotify/version.nix +++ b/pkgs/servers/gotify/version.nix @@ -1 +1 @@ -"2.0.18" +"2.0.20" From bb99a0d9a8f764996b0b719f842ea4af44591d17 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 16 Oct 2020 16:01:37 +0200 Subject: [PATCH 329/546] nim: 1.2.6 -> 1.4.0 --- pkgs/development/compilers/nim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 0ec259b6608..72eee7ac811 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -4,10 +4,10 @@ , boehmgc, sqlite, nim-unwrapped, nim }: let - version = "1.2.6"; + version = "1.4.0"; src = fetchurl { url = "https://nim-lang.org/download/nim-${version}.tar.xz"; - sha256 = "0zk5qzxayqjw7kq6p92j4008g9bbyilyymhdc5xq9sln5rqym26z"; + sha256 = "0rmisiipi7dxl7xc631jlp18bakz3dglhp9bygl2awf21c6b0cq0"; }; meta = with lib; { From 7ca4469122ec00a16821b60131ef9e41fa0f6872 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 16 Oct 2020 15:49:25 +0200 Subject: [PATCH 330/546] tdesktop: Drop unused CMake variables and passthru tg_owt Before this change: > CMake Warning: > Manually-specified variables were not used by the project: > > BUILD_TESTING > CMAKE_EXPORT_NO_PACKAGE_REGISTRY > CMAKE_POLICY_DEFAULT_CMP0025 > DESKTOP_APP_USE_PACKAGED_GSL > DESKTOP_APP_USE_PACKAGED_RLOTTIE > DESKTOP_APP_USE_PACKAGED_VARIANT > TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME > TDESKTOP_USE_PACKAGED_TGVOIP --- .../instant-messengers/telegram/tdesktop/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index fff4400e0a4..a1a1103b4fd 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -59,11 +59,6 @@ in mkDerivation rec { # We're allowed to used the API ID of the Snap package: "-DTDESKTOP_API_ID=611335" "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" - "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF" - "-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF" - "-DDESKTOP_APP_USE_PACKAGED_GSL=OFF" - "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON" - "-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF" #"-DDESKTOP_APP_SPECIAL_TARGET=\"\"" # TODO: Error when set to "": Bad special target '""' "-DTDESKTOP_LAUNCHER_BASENAME=telegramdesktop" # Note: This is the default ]; @@ -100,6 +95,10 @@ in mkDerivation rec { -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\"," ''; + passthru = { + inherit tg_owt; + }; + meta = { description = "Telegram Desktop messaging app"; longDescription = '' From 5fd1bffa3bbc2f30b1cbcbcc8244c3b8d4ff79b0 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Fri, 16 Oct 2020 16:21:36 +0200 Subject: [PATCH 331/546] borgbackup: update description While it is true borg started as a fork of Attic, this is ancient history. 'attic fork' confused me, suggesting this was some custom fork of borgbackup instead of the regular version. --- pkgs/tools/backup/borg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 84da9c3fb57..7bfb9e57392 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -62,7 +62,7 @@ python3.pkgs.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - description = "A deduplicating backup program (attic fork)"; + description = "Deduplicating archiver with compression and encryption"; homepage = "https://www.borgbackup.org"; license = licenses.bsd3; platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage From bf21b814cbeaa6437cc908d02244a8ac8095a003 Mon Sep 17 00:00:00 2001 From: Bouke van der Bijl Date: Fri, 16 Oct 2020 17:17:32 +0200 Subject: [PATCH 332/546] gopls: 0.5.0 -> 0.5.1 (#100719) --- pkgs/development/tools/gopls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix index 1e750a2dec5..66582969714 100644 --- a/pkgs/development/tools/gopls/default.nix +++ b/pkgs/development/tools/gopls/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gopls"; - version = "0.5.0"; + version = "0.5.1"; src = fetchgit { rev = "gopls/v${version}"; url = "https://go.googlesource.com/tools"; - sha256 = "150jg1qmdszfvh1x5fagawgc24xy19xjg9y1hq3drwy7lfdnahmq"; + sha256 = "1vnidc8kaisdyprylsibddpdksm84c6qr528768yvi93crdmddls"; }; modRoot = "gopls"; - vendorSha256 = "1s3d4hnbw0mab7njck79qmgkjn87vs4ffk44zk2qdrzqjjlqq5iv"; + vendorSha256 = "048qs6ygav8al3sz9vwf6fqaahkr8wr3dj1yd2jhr7c5h30n4rs2"; doCheck = false; From b5e37e1ea54700eb4b6b8ce0f663dd00218bad41 Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Fri, 16 Oct 2020 16:18:01 +0100 Subject: [PATCH 333/546] terragrunt: 0.23.40 -> 0.25.4 (#100727) * terragrunt: use buildFlagsArray * terragrunt: 0.23.40 -> 0.25.4 --- .../networking/cluster/terragrunt/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index e8b602b8a80..8cf4ba749f0 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.23.40"; + version = "0.25.4"; - src = fetchFromGitHub { + src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "0gd2g1nl8dgj24mzk4qymcwnp6prbi3qxj863rkpi3k32zy2iw4k"; + sha256 = "1c8rfx7sks8j74f3jjsl5azkhi7jvcfp8lmd9z553nal4fy8ksb6"; }; vendorSha256 = "0f466qn5vp74mwx9s4rcbw1x793w8hr5dcf2c12sgshya1bxs4nl"; @@ -17,9 +17,7 @@ buildGoModule rec { buildInputs = [ makeWrapper ]; - preBuild = '' - buildFlagsArray+=("-ldflags" "-X main.VERSION=v${version}") - ''; + buildFlagsArray = [ "-ldflags=" "-X main.VERSION=v${version}" ]; postInstall = '' wrapProgram $out/bin/terragrunt \ From 0a2acd4762e8c8595fdb60823ae9f07fbebc6189 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 09:33:12 +0000 Subject: [PATCH 334/546] python37Packages.kafka-python: 2.0.1 -> 2.0.2 --- pkgs/development/python-modules/kafka-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix index 1c85fbd29af..8069632c170 100644 --- a/pkgs/development/python-modules/kafka-python/default.nix +++ b/pkgs/development/python-modules/kafka-python/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }: buildPythonPackage rec { - version = "2.0.1"; + version = "2.0.2"; pname = "kafka-python"; src = fetchPypi { inherit pname version; - sha256 = "1y7ny81rihnhc8lj921d76ir4kf4aj5iy35szgim8zccxhnx96p5"; + sha256 = "04dfe7fea2b63726cd6f3e79a2d86e709d608d74406638c5da33a01d45a9d7e3"; }; checkInputs = [ pytest six mock ]; From 2d8939e6a6ce71ba2fb023a9f13084d7a3f24c9b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 08:49:22 +0000 Subject: [PATCH 335/546] python27Packages.jsbeautifier: 1.12.0 -> 1.13.0 --- pkgs/development/python-modules/jsbeautifier/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index f3eb0a173db..a5468fa273b 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -2,14 +2,14 @@ buildPythonApplication rec { pname = "jsbeautifier"; - version = "1.12.0"; + version = "1.13.0"; propagatedBuildInputs = [ six editorconfig ]; checkInputs = [ pytest ]; src = fetchPypi { inherit pname version; - sha256 = "65dea76bf2f551d7f1686111d2794506e07b6c7c477feca2124596376feb8713"; + sha256 = "f5565fbcd95f79945e124324815e586ae0d2e43df5af82a4400390e6ea789e8b"; }; meta = with lib; { From b59a36311bcbccf2a1d9f2bd83b384eb12a15d39 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 10:25:33 +0000 Subject: [PATCH 336/546] python37Packages.plexwebsocket: 0.0.6 -> 0.0.12 --- pkgs/development/python-modules/plexwebsocket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plexwebsocket/default.nix b/pkgs/development/python-modules/plexwebsocket/default.nix index 383a37cee3f..47e7778fc0f 100644 --- a/pkgs/development/python-modules/plexwebsocket/default.nix +++ b/pkgs/development/python-modules/plexwebsocket/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "plexwebsocket"; - version = "0.0.6"; + version = "0.0.12"; disabled = isPy27; src = fetchFromGitHub { owner = "jjlawren"; repo = "python-plexwebsocket"; rev = "v${version}"; - sha256 = "1sy9khxksimcmdvghg1ksk65mkiihjvhi7m7ms2kzmy7mrg3s3i7"; + sha256 = "1xdzb268c71yb25a5mk4g2jrbq4dv8bynfirs7p4n8a51p030dz6"; }; propagatedBuildInputs = [ aiohttp ]; From 9402b040fb2b85ffb78b4217ab6a76a972eb131c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 11:21:22 +0000 Subject: [PATCH 337/546] python37Packages.pympler: 0.8 -> 0.9 --- pkgs/development/python-modules/pympler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pympler/default.nix b/pkgs/development/python-modules/pympler/default.nix index 0fc04942655..f80c91e8f2d 100644 --- a/pkgs/development/python-modules/pympler/default.nix +++ b/pkgs/development/python-modules/pympler/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Pympler"; - version = "0.8"; + version = "0.9"; src = fetchPypi { inherit pname version; - sha256 = "08mrpnb6cv2nvfncvr8a9a8bpwhnasa924anapnjvnaw5jcd4k7p"; + sha256 = "f2cbe7df622117af890249f2dea884eb702108a12d729d264b7c5983a6e06e47"; }; postPatch = '' From 71d5366c015990681e30d701160dba253fd1b25c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 12:06:37 +0000 Subject: [PATCH 338/546] python37Packages.google_cloud_videointelligence: 1.15.0 -> 1.16.0 --- .../python-modules/google_cloud_videointelligence/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix b/pkgs/development/python-modules/google_cloud_videointelligence/default.nix index a8da09dec64..d097132a347 100644 --- a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix +++ b/pkgs/development/python-modules/google_cloud_videointelligence/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "1.15.0"; + version = "1.16.0"; src = fetchPypi { inherit pname version; - sha256 = "c2b4b3579196c0bb7301fbe1de7008ac5081f88afc0599a10ee79a5ade385922"; + sha256 = "de6fe53bdaf66aa8e2c1f34b26af24c479a876619b5c667d009fbd9700dd89f7"; }; checkInputs = [ pytest mock ]; From 9b285bd534d27b487128eb47fab1da3978458108 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 12:12:54 +0000 Subject: [PATCH 339/546] python37Packages.ipydatawidgets: 4.0.1 -> 4.1.0 --- pkgs/development/python-modules/ipydatawidgets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipydatawidgets/default.nix b/pkgs/development/python-modules/ipydatawidgets/default.nix index 5134ffb2d6d..e6e1e605cca 100644 --- a/pkgs/development/python-modules/ipydatawidgets/default.nix +++ b/pkgs/development/python-modules/ipydatawidgets/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "ipydatawidgets"; - version = "4.0.1"; + version = "4.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1h7cppy959q6x5rvkdjhzxhqh57s37i2xsish5rfavcqbp2xgk4g"; + sha256 = "d9f94828c11e3b40350fb14a02e027f42670a7c372bcb30db18d552dcfab7c01"; }; propagatedBuildInputs = [ From 89f6328b149956d71411a0ac6e6e93ff104d5f72 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 12:30:59 +0000 Subject: [PATCH 340/546] python37Packages.langcodes: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/langcodes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix index f5686c1afb4..f9d90e42686 100644 --- a/pkgs/development/python-modules/langcodes/default.nix +++ b/pkgs/development/python-modules/langcodes/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "langcodes"; - version = "2.0.0"; + version = "2.1.0"; disabled = pythonOlder "3.3"; src = fetchPypi { inherit pname version; - sha256 = "0xszgmydymzhb0dhx5qvdn3x5z477ld0paw17lwwhlrxffkq5jxz"; + sha256 = "75bcaca8825e1a321965b136815dee53083c63314975e024ad0ccff8545e681f"; }; propagatedBuildInputs = [ marisa-trie ]; From d6cc1bb13545e37e0985f4dd6497efe254d208f8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 12:40:10 +0000 Subject: [PATCH 341/546] python37Packages.shodan: 1.23.1 -> 1.24.0 --- pkgs/development/python-modules/shodan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix index ecc18c5c526..f361659d9ac 100644 --- a/pkgs/development/python-modules/shodan/default.nix +++ b/pkgs/development/python-modules/shodan/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.23.1"; + version = "1.24.0"; src = fetchPypi { inherit pname version; - sha256 = "d2d37d47dd084747df672e6d981f6d72d5d03f4ee12f0ce2170e618147578349"; + sha256 = "0b5ec40c954cd48c4e3234e81ad92afdc68438f82ad392fed35b7097eb77b6dd"; }; propagatedBuildInputs = [ From 6f94f55540304210c7ffa27ef8bfc43ffba013f4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 14:43:16 +0000 Subject: [PATCH 342/546] python37Packages.casbin: 0.8.3 -> 0.9.0 --- pkgs/development/python-modules/casbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 2fb670e418a..117b6374f91 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "0.8.3"; + version = "0.9.0"; disabled = isPy27; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "1s89m62933m4wprsknwhabgg7irykrcimv80hh2zkyyslz5vbq71"; + sha256 = "16bqa2f5l2cns2izc4siy8jw23q9vrqm9wnyp696fj83y77nkp75"; }; propagatedBuildInputs = [ From 253418be119d59900054e8b71190679b8d186843 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 11:46:26 +0000 Subject: [PATCH 343/546] python37Packages.aioftp: 0.18.0 -> 0.18.1 --- pkgs/development/python-modules/aioftp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix index c009ac4bdd5..e3ca13859ac 100644 --- a/pkgs/development/python-modules/aioftp/default.nix +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "aioftp"; - version = "0.18.0"; + version = "0.18.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "6f9d5b5ac910987daca4f7ad4a017530751e2107d2471c9f92a3e09b507cb2dc"; + sha256 = "b5a412c748722dd679c4c2e30dd40d70a7c8879636f6eb4489fdbca72965b125"; }; checkInputs = [ From 2b99e4f62974f026de1f8ec0f9db9059d55edc86 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 15:36:15 +0000 Subject: [PATCH 344/546] python37Packages.bpython: 0.19 -> 0.20 --- pkgs/development/python-modules/bpython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index ad7322cbf66..bbdca0a0097 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "bpython"; - version = "0.19"; + version = "0.20"; src = fetchPypi { inherit pname version; - sha256 = "1764ikgj24jjq46s50apwkydqvy5a13adb2nbszk8kbci6df0v27"; + sha256 = "fec7d97be9912a50d8f5b34ca10d70715c99a33f0cd0b9e4977c1b0f617fa913"; }; patches = [ (substituteAll { From 40f6b5b66a0441f0b8f911bb22e5608bea83d6a1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 15:13:55 +0000 Subject: [PATCH 345/546] python37Packages.posix_ipc: 1.0.4 -> 1.0.5 --- pkgs/development/python-modules/posix_ipc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/posix_ipc/default.nix b/pkgs/development/python-modules/posix_ipc/default.nix index adde770bbc4..2be2a89cc6d 100644 --- a/pkgs/development/python-modules/posix_ipc/default.nix +++ b/pkgs/development/python-modules/posix_ipc/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "posix_ipc"; - version = "1.0.4"; + version = "1.0.5"; src = fetchPypi { inherit pname version; - sha256 = "ff6c9077633fc62a491d6997c43b094d885bb45a7ca1f36c9a0d647c54b74b14"; + sha256 = "6cddb1ce2cf4aae383f2a0079c26c69bee257fe2720f372201ef047f8ceb8b97"; }; meta = with stdenv.lib; { From 8711da60baaf588460000f90fb110fd9669387d7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 11:28:53 +0000 Subject: [PATCH 346/546] python37Packages.aioconsole: 0.2.1 -> 0.3.0 --- pkgs/development/python-modules/aioconsole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index 5ee7b329512..ca16b7d7fea 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -10,11 +10,11 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.2.1"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1l61zv6qq94ybqz7s8ag3h08dsh7jds6n2mgd43s7m8gbiy00ggn"; + sha256 = "b84724e6b93d1306a909974864df377236cf4bab8e0594096fed7936207205c5"; }; # hardcodes a test dependency on an old version of pytest-asyncio From 6de03472f4322c26798669b96ef3109c5f8d9679 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 16 Oct 2020 09:38:01 -0700 Subject: [PATCH 347/546] python2Packages.aioconsole: disable ``` Processing ./aioconsole-0.3.0-py2-none-any.whl ERROR: Package 'aioconsole' requires a different Python: 2.7.18 not in '>=3.6' ``` --- pkgs/development/python-modules/aioconsole/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index ca16b7d7fea..3090c3cb1f6 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder }: # This package provides a binary "apython" which sometimes invokes # [sys.executable, '-m', 'aioconsole'] as a subprocess. If apython is @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "aioconsole"; version = "0.3.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; From 2142fb3fee54cc01d51783669c8d723499767ce0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 15:23:12 +0000 Subject: [PATCH 348/546] python37Packages.pytest_6: 6.0.1 -> 6.1.1 --- pkgs/development/python-modules/pytest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index ce742d65ba2..29def3082a4 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -21,14 +21,14 @@ }: buildPythonPackage rec { - version = "6.0.1"; + version = "6.1.1"; pname = "pytest"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "85228d75db9f45e06e57ef9bf4429267f81ac7c0d742cc9ed63d09886a9fe6f4"; + sha256 = "8f593023c1a0f916110285b6efd7f99db07d59546e3d8c36fc60e2ab05d3be92"; }; checkInputs = [ hypothesis pygments ]; From 871cd876a1bf607391be0c4f41123033085dbd13 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 16 Oct 2020 09:50:21 -0700 Subject: [PATCH 349/546] python3Packages.pytest_xdist_2: fix tests with latest pytest6 --- pkgs/development/python-modules/pytest-xdist/2.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-xdist/2.nix b/pkgs/development/python-modules/pytest-xdist/2.nix index ea4741cab60..cc58c5ab6bd 100644 --- a/pkgs/development/python-modules/pytest-xdist/2.nix +++ b/pkgs/development/python-modules/pytest-xdist/2.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "82d938f1a24186520e2d9d3a64ef7d9ac7ecdf1a0659e095d18e596b8cbd0672"; + sha256 = "0wh6pn66nncfs6ay0n863bgyriwsgppn8flx5l7551j1lbqkinc2"; }; nativeBuildInputs = [ setuptools_scm pytest_6 ]; @@ -16,10 +16,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ execnet pytest-forked psutil six ]; # pytest6 doesn't allow for new lines + # capture_deprecated not compatible with latest pytest6 checkPhase = '' # Excluded tests access file system export HOME=$TMPDIR - pytest -n $NIX_BUILD_CORES -k "not (distribution_rsyncdirs_example or rsync)" + pytest -n $NIX_BUILD_CORES \ + -k "not (distribution_rsyncdirs_example or rsync or warning_captured_deprecated_in_pytest_6)" ''; meta = with stdenv.lib; { From 2f4b07712f4e57598dca69a83be03507838765bb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 08:33:56 +0000 Subject: [PATCH 350/546] python37Packages.mongoengine: 0.18.2 -> 0.20.0 --- pkgs/development/python-modules/mongoengine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix index c1c69598cd0..f4b5b38f10c 100644 --- a/pkgs/development/python-modules/mongoengine/default.nix +++ b/pkgs/development/python-modules/mongoengine/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "mongoengine"; - version = "0.18.2"; + version = "0.20.0"; src = fetchFromGitHub { owner = "MongoEngine"; repo = pname; rev = "v${version}"; - sha256 = "0gx091h9rcykdj233srrl3dfc0ly52p6r4qc9ah6z0f694kmqj1v"; + sha256 = "0wc0cvjanlszn09n61jj38pq9wdlphkjgrp3c8hvd16754is3n7f"; }; propagatedBuildInputs = [ From a643f8350fd8e0de6318bc55b0db67e883278b4f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 16 Oct 2020 08:49:12 -0700 Subject: [PATCH 351/546] python2Packages.mongoengine: disable ``` Processing ./mongoengine-0.20.0-py2-none-any.whl ERROR: Package 'mongoengine' requires a different Python: 2.7.18 not in '>=3.5' ``` --- pkgs/development/python-modules/mongoengine/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix index f4b5b38f10c..a47438d5a70 100644 --- a/pkgs/development/python-modules/mongoengine/default.nix +++ b/pkgs/development/python-modules/mongoengine/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pymongo +, isPy27 , six , blinker , nose @@ -12,6 +13,7 @@ buildPythonPackage rec { pname = "mongoengine"; version = "0.20.0"; + disabled = isPy27; src = fetchFromGitHub { owner = "MongoEngine"; From cd2cea1b99b54ea2dc252543ba8fe95c3c0644d6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 17:00:45 +0000 Subject: [PATCH 352/546] python37Packages.gphoto2: 2.2.2 -> 2.2.3 --- pkgs/development/python-modules/gphoto2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix index c1008a4c8af..d5ad49f349b 100644 --- a/pkgs/development/python-modules/gphoto2/default.nix +++ b/pkgs/development/python-modules/gphoto2/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "gphoto2"; - version = "2.2.2"; + version = "2.2.3"; src = fetchPypi { inherit pname version; - sha256 = "0sd3w0gpnb58hg8mv20nfqf4g1plr9rkn51h088xdsd6i97r9x99"; + sha256 = "35d3ae97a9f13526746fb506de627a73328328528b436a51567fcb7e640883e9"; }; nativeBuildInputs = [ pkgconfig ]; From 138b7ade59e377537adcf3081df9c85efa1c19ff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 17:08:18 +0000 Subject: [PATCH 353/546] python37Packages.django-filter: 2.3.0 -> 2.4.0 --- pkgs/development/python-modules/django-filter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-filter/default.nix b/pkgs/development/python-modules/django-filter/default.nix index 2079d336737..93f3f20f305 100644 --- a/pkgs/development/python-modules/django-filter/default.nix +++ b/pkgs/development/python-modules/django-filter/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-filter"; - version = "2.3.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "11e63dd759835d9ba7a763926ffb2662cf8a6dcb4c7971a95064de34dbc7e5af"; + sha256 = "84e9d5bb93f237e451db814ed422a3a625751cbc9968b484ecc74964a8696b06"; }; propagatedBuildInputs = [ django ]; From efe922aaee21f3b770519fe4cb26ea3ee546ebb2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 16:04:58 +0000 Subject: [PATCH 354/546] python37Packages.python-json-logger: 0.1.11 -> 2.0.1 --- .../development/python-modules/python-json-logger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-json-logger/default.nix b/pkgs/development/python-modules/python-json-logger/default.nix index 26ab4c118ce..0657434d9d1 100644 --- a/pkgs/development/python-modules/python-json-logger/default.nix +++ b/pkgs/development/python-modules/python-json-logger/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.1.11"; + version = "2.0.1"; pname = "python-json-logger"; src = fetchPypi { inherit pname version; - sha256 = "b7a31162f2a01965a5efb94453ce69230ed208468b0bbc7fdfc56e6d8df2e281"; + sha256 = "f26eea7898db40609563bed0a7ca11af12e2a79858632706d835a0f961b7d398"; }; checkInputs = [ nose ]; From 175fe4992da7adcf5369b3eb07e87e754d4363be Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 16 Oct 2020 10:26:43 -0700 Subject: [PATCH 355/546] python2Packages.python-json-logger: disable python2 --- pkgs/development/python-modules/python-json-logger/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/python-json-logger/default.nix b/pkgs/development/python-modules/python-json-logger/default.nix index 0657434d9d1..d21e1dfccc9 100644 --- a/pkgs/development/python-modules/python-json-logger/default.nix +++ b/pkgs/development/python-modules/python-json-logger/default.nix @@ -1,12 +1,14 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 , nose }: buildPythonPackage rec { version = "2.0.1"; pname = "python-json-logger"; + disabled = isPy27; src = fetchPypi { inherit pname version; From c557c27ac37f0e820eff82dc28b83cf9d366d869 Mon Sep 17 00:00:00 2001 From: conferno Date: Fri, 16 Oct 2020 17:37:28 +0000 Subject: [PATCH 356/546] chromium: fix build on i686 (#100512) ld.gold runs out of memory on i686. --- pkgs/applications/networking/browsers/chromium/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index f8318839b91..ed5a8a71556 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -243,7 +243,7 @@ let gnFlags = mkGnFlags ({ use_lld = false; - use_gold = true; + use_gold = stdenv.buildPlatform.is64bit; # ld.gold outs-of-memory on i686 gold_path = "${stdenv.cc}/bin"; is_debug = false; From 970e7e15f357daadda1e9aaa1f92241cc48713a5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 22:29:49 +0000 Subject: [PATCH 357/546] python37Packages.pysam: 0.15.4 -> 0.16.0.1 --- pkgs/development/python-modules/pysam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix index 38b55c4563d..6c7a44f2649 100644 --- a/pkgs/development/python-modules/pysam/default.nix +++ b/pkgs/development/python-modules/pysam/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pysam"; - version = "0.15.4"; + version = "0.16.0.1"; # Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is # missing some files which cause test failures. @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pysam-developers"; repo = "pysam"; rev = "v${version}"; - sha256 = "04w6h6mv6lsr74hj9gy4r2laifcbhgl2bjcr4r1l9r73xdd45mdy"; + sha256 = "168bwwm8c2k22m7paip8q0yajyl7xdxgnik0bgjl7rhqg0majz0f"; }; nativeBuildInputs = [ samtools ]; From 35f62abdf86b408daaa6512afea7ae51c13ac298 Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Fri, 16 Oct 2020 19:42:37 +0200 Subject: [PATCH 358/546] lldb_{10, 11}: polish the cmakeFlags (#100070) disable RTTI in a more idiomatic way --- pkgs/development/compilers/llvm/10/lldb.nix | 8 ++++---- pkgs/development/compilers/llvm/11/lldb.nix | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/llvm/10/lldb.nix b/pkgs/development/compilers/llvm/10/lldb.nix index 47215caa53e..c728efeb2a9 100644 --- a/pkgs/development/compilers/llvm/10/lldb.nix +++ b/pkgs/development/compilers/llvm/10/lldb.nix @@ -43,21 +43,21 @@ stdenv.mkDerivation (rec { darwin.apple_sdk.frameworks.Cocoa ]; - CXXFLAGS = "-fno-rtti"; hardeningDisable = [ "format" ]; cmakeFlags = [ - "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic + "-DLLVM_ENABLE_RTTI=OFF" "-DClang_DIR=${clang-unwrapped}/lib/cmake" "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" ] ++ stdenv.lib.optionals stdenv.isDarwin [ "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" + ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic ] ++ stdenv.lib.optionals enableManpages [ "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" - ] -; + ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/11/lldb.nix b/pkgs/development/compilers/llvm/11/lldb.nix index 865232a6ac2..0ae55d45349 100644 --- a/pkgs/development/compilers/llvm/11/lldb.nix +++ b/pkgs/development/compilers/llvm/11/lldb.nix @@ -43,21 +43,21 @@ stdenv.mkDerivation (rec { darwin.apple_sdk.frameworks.Cocoa ]; - CXXFLAGS = "-fno-rtti"; hardeningDisable = [ "format" ]; cmakeFlags = [ - "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic + "-DLLVM_ENABLE_RTTI=OFF" "-DClang_DIR=${clang-unwrapped}/lib/cmake" "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" ] ++ stdenv.lib.optionals stdenv.isDarwin [ "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" + ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic ] ++ stdenv.lib.optionals enableManpages [ "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" - ] -; + ]; enableParallelBuilding = true; From eca97e3a980d449fc3db8129d235db6d6f8ca9cc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Oct 2020 20:58:12 +0200 Subject: [PATCH 359/546] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-20-g9bb4291 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/888f7caec360792719c839f83dccf0a5f354987b. --- .../haskell-modules/hackage-packages.nix | 144 ++++++++++++------ 1 file changed, 96 insertions(+), 48 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ab357a276d5..bc446d912bc 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -21882,8 +21882,8 @@ self: { }: mkDerivation { pname = "Z-Data"; - version = "0.1.7.0"; - sha256 = "1n34zck9z53yga1yak4k8chva6kilfbkaghzkxwif112k1qxgv4a"; + version = "0.1.7.1"; + sha256 = "1yz2bh7mvhc8v4rjzx5wc89x10xnhp0hn40y8n9id982c256vfgm"; libraryHaskellDepends = [ base case-insensitive deepseq ghc-prim hashable integer-gmp primitive QuickCheck scientific tagged template-haskell @@ -82427,8 +82427,8 @@ self: { }: mkDerivation { pname = "elynx"; - version = "0.4.0"; - sha256 = "0qhq3h1va7pfcz58mkdw690v88jr3ynk2rrwl0s5qdz8xxvs5n3a"; + version = "0.4.1"; + sha256 = "0pz4s53mn1511hda16qi7l28whq05fcyrf1s8ywq42a3mbayw964"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -82448,8 +82448,8 @@ self: { }: mkDerivation { pname = "elynx-markov"; - version = "0.4.0"; - sha256 = "0ikk9xk71xyn1fmhzx59lfyk9skjkvhg19xb2afhcylnbg41f3wz"; + version = "0.4.1"; + sha256 = "1qzyfxzg6qq7ajm7b3v62qqychhzh4ms2677acvzjgvc51syk1fq"; libraryHaskellDepends = [ async attoparsec base bytestring containers elynx-seq hmatrix integration math-functions mwc-random parallel primitive statistics @@ -82468,8 +82468,8 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, hspec }: mkDerivation { pname = "elynx-nexus"; - version = "0.4.0"; - sha256 = "02g67w8xracbasnkha383vz0ls1haxr78ia27k292lx572l17dvv"; + version = "0.4.1"; + sha256 = "0p2kww6fqmfv3bmd5z0c3n8s0rhfbm480jqh16s794xndbbxd15i"; libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ base hspec ]; description = "Import and export Nexus files"; @@ -82485,8 +82485,8 @@ self: { }: mkDerivation { pname = "elynx-seq"; - version = "0.4.0"; - sha256 = "03dh4rjdgn580niljgrl0cfw5h2mah8q1252jq3jx8349jxgpcmh"; + version = "0.4.1"; + sha256 = "1mdl7fzzax4dn68paxivms96jfxriladbkwkbq6hff1z5xdwvj2h"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers matrices mwc-random parallel primitive vector vector-th-unbox word8 @@ -82509,8 +82509,8 @@ self: { }: mkDerivation { pname = "elynx-tools"; - version = "0.4.0"; - sha256 = "0n8rf7y4qxhx35fhbhj4yc541ydsx8qvy66d11sl5a836gmsv0rr"; + version = "0.4.1"; + sha256 = "0dxhwmpaf9r8kr67sa2kn1i7w06skcl1hvxkcranw0xvijwm8g5r"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring cryptohash-sha256 deepseq directory fast-logger hmatrix @@ -82527,23 +82527,23 @@ self: { "elynx-tree" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad , containers, criterion, deepseq, double-conversion, elynx-nexus - , elynx-tools, hspec, math-functions, mwc-random, primitive - , QuickCheck, statistics + , elynx-tools, hspec, math-functions, mwc-random, parallel + , primitive, QuickCheck, statistics }: mkDerivation { pname = "elynx-tree"; - version = "0.4.0"; - sha256 = "1j22gkg1971wrih4gs4bxzkghvd3ddj85s6s5mcqhrfxmdnpsn2c"; + version = "0.4.1"; + sha256 = "1yd2gk0y55vjaw6b2m6cm25qidmznmvhrb3ypr4rb3bg4yck5ydh"; libraryHaskellDepends = [ aeson attoparsec base bytestring comonad containers deepseq - double-conversion elynx-nexus math-functions mwc-random primitive - statistics + double-conversion elynx-nexus math-functions mwc-random parallel + primitive statistics ]; testHaskellDepends = [ attoparsec base bytestring containers elynx-tools hspec QuickCheck ]; benchmarkHaskellDepends = [ - base bytestring criterion elynx-tools + base bytestring criterion deepseq elynx-tools mwc-random parallel ]; description = "Handle phylogenetic trees"; license = stdenv.lib.licenses.gpl3Plus; @@ -114118,8 +114118,8 @@ self: { ({ mkDerivation, base, bytestring, hakyll, typed-process }: mkDerivation { pname = "hakyll-process"; - version = "0.0.1.0"; - sha256 = "00fiqlxj581gf5y0jva22kmssx6c152s8i7a9csb3hlssmbqmhj7"; + version = "0.0.2.0"; + sha256 = "03s51ql10g6vjsrzwxa2jwff4wckp7vf3sg9r6hdsbh30l4720il"; libraryHaskellDepends = [ base bytestring hakyll typed-process ]; description = "Hakyll compiler for arbitrary external processes"; license = stdenv.lib.licenses.bsd3; @@ -135313,15 +135313,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) lua5_3;}; - "hslua_1_2_0" = callPackage + "hslua_1_3_0" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, lua5_3 , mtl, QuickCheck, quickcheck-instances, tasty, tasty-hunit , tasty-quickcheck, text }: mkDerivation { pname = "hslua"; - version = "1.2.0"; - sha256 = "0a295zqpbrv8a2hw7msz5p7brlswag16sg08dyz399ij6b7q5x0h"; + version = "1.3.0"; + sha256 = "1dfh1jax6yrk5sf9q8qnq1qgr541xkwwnz9y3q6r8wflvwlj7cal"; configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; libraryHaskellDepends = [ base bytestring containers exceptions mtl text @@ -135408,6 +135408,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hslua-module-system_0_2_2_1" = callPackage + ({ mkDerivation, base, containers, directory, exceptions, hslua + , tasty, tasty-hunit, tasty-lua, temporary, text + }: + mkDerivation { + pname = "hslua-module-system"; + version = "0.2.2.1"; + sha256 = "0hk2splyasbplnggknjhlb423axc5b32xq8aq8zal4vvwlqhzvf1"; + libraryHaskellDepends = [ + base containers directory exceptions hslua temporary + ]; + testHaskellDepends = [ + base hslua tasty tasty-hunit tasty-lua text + ]; + description = "Lua module wrapper around Haskell's System module"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hslua-module-text" = callPackage ({ mkDerivation, base, bytestring, hslua, tasty, tasty-hunit, text }: @@ -135421,14 +135440,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hslua-module-text_0_3_0" = callPackage + "hslua-module-text_0_3_0_1" = callPackage ({ mkDerivation, base, bytestring, hslua, tasty, tasty-hunit , tasty-lua, text }: mkDerivation { pname = "hslua-module-text"; - version = "0.3.0"; - sha256 = "1y15b38r0xiwcwpzsdr8x8i4y8all2jd3z0j7fvny6lsbna2hf7r"; + version = "0.3.0.1"; + sha256 = "1vmd15n905i2pcsx748hz3h9kv5nnv74y663rj57q8mp0b40cbfl"; libraryHaskellDepends = [ base bytestring hslua text ]; testHaskellDepends = [ base hslua tasty tasty-hunit tasty-lua text @@ -165716,8 +165735,8 @@ self: { ({ mkDerivation, base, lucid }: mkDerivation { pname = "lucid-cdn"; - version = "0.2.1.0"; - sha256 = "09g98hnw1mf9wih7jpwkvy8iavas8zg672yqj406zwvg786088jf"; + version = "0.2.2.0"; + sha256 = "119d92xc047r98pw0phxplm57nc2jdjz6smkas9hr95mck0d16db"; libraryHaskellDepends = [ base lucid ]; description = "Curated list of CDN imports for lucid"; license = stdenv.lib.licenses.mit; @@ -169627,8 +169646,8 @@ self: { }: mkDerivation { pname = "mcmc"; - version = "0.2.3"; - sha256 = "14xf8l3ka7s34sa4rs4xsy7h5jxpl3fhsn959dvf17nsv252s6p8"; + version = "0.2.4"; + sha256 = "17ahxp7p1klg1j416gvs76a3x1hii5j0fv80rxfrw0w076gn3yy1"; libraryHaskellDepends = [ aeson base bytestring containers data-default directory double-conversion log-domain microlens mwc-random statistics time @@ -191810,10 +191829,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.8.2"; - sha256 = "15rvyxn05wq7k06v3k4z0wbl85id7vmjkyy92zdp8vcvqbayjm3a"; - revision = "1"; - editedCabalFile = "0r0cj58yn4mkzpq8inzlwp86kmwgz11b2iindcf10rrdqx5c5vrf"; + version = "0.3.8.3"; + sha256 = "0x6l3318g2x3q69drbnk2dkzn8l6c5m0msfnmwzbq6g6952gnsam"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -209288,15 +209305,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pusher-http-haskell_2_0_0_1" = callPackage + "pusher-http-haskell_2_0_0_2" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , cryptonite, hashable, hspec, http-client, http-client-tls , http-types, memory, QuickCheck, text, time, unordered-containers }: mkDerivation { pname = "pusher-http-haskell"; - version = "2.0.0.1"; - sha256 = "05f4p4rnx2gy1f17d83sfpnxrfniq710pyai97gwi4ks3f4avk5a"; + version = "2.0.0.2"; + sha256 = "0ci2wg0y3762n1in8jyw1dpjljdynhl4bfp9506kfkc6ym9j2q1a"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite hashable http-client http-client-tls http-types memory text time @@ -226377,24 +226394,25 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) secp256k1;}; - "secp256k1-haskell_0_4_0" = callPackage + "secp256k1-haskell_0_5_0" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, cereal , deepseq, entropy, hashable, hspec, hspec-discover, HUnit , monad-par, mtl, QuickCheck, secp256k1, string-conversions - , unliftio + , unliftio-core }: mkDerivation { pname = "secp256k1-haskell"; - version = "0.4.0"; - sha256 = "07hgfrr98g42sia5bssch7lrajx7y6fz98f13ly5rjkm5brw0zba"; + version = "0.5.0"; + sha256 = "18mp6ljqwrymvk5gl7v09xq0r7c2fhkvjfs8gdlzwgql35di5g7d"; libraryHaskellDepends = [ base base16-bytestring bytestring cereal deepseq entropy hashable - QuickCheck string-conversions unliftio + QuickCheck string-conversions unliftio-core ]; libraryPkgconfigDepends = [ secp256k1 ]; testHaskellDepends = [ base base16-bytestring bytestring cereal deepseq entropy hashable - hspec HUnit monad-par mtl QuickCheck string-conversions unliftio + hspec HUnit monad-par mtl QuickCheck string-conversions + unliftio-core ]; testToolDepends = [ hspec-discover ]; description = "Bindings for secp256k1"; @@ -236392,8 +236410,8 @@ self: { }: mkDerivation { pname = "slynx"; - version = "0.4.0"; - sha256 = "10a6nqpr422c80vmzjx1r2wgbhkc2kjn7kvmavc0cx1752wn79kc"; + version = "0.4.1"; + sha256 = "1cmbk2ynyd5il0jlci5jbc2mn4vhwgrbr7041vgivnqg3p5mb1lx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -247096,6 +247114,17 @@ self: { broken = true; }) {}; + "subG" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "subG"; + version = "0.1.1.1"; + sha256 = "0726w12aqjmbdvqp8lpv68dh4h98bzv13ng41831ljdr76c3lrsy"; + libraryHaskellDepends = [ base ]; + description = "Some extension to the Foldable and Monoid classes"; + license = stdenv.lib.licenses.mit; + }) {}; + "subcategories" = callPackage ({ mkDerivation, base, bytestring, containers, data-default, foldl , hashable, inspection-testing, mono-traversable, pointed @@ -251911,6 +251940,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-lua_0_2_3_1" = callPackage + ({ mkDerivation, base, bytestring, directory, file-embed, filepath + , hslua, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "tasty-lua"; + version = "0.2.3.1"; + sha256 = "1dw9wbwhyklc2lkpvhj12kdq7kyq6lv9w2586szx3yr5qbpwaggm"; + libraryHaskellDepends = [ + base bytestring file-embed hslua tasty text + ]; + testHaskellDepends = [ + base directory filepath hslua tasty tasty-hunit + ]; + description = "Write tests in Lua, integrate into tasty"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-mgolden" = callPackage ({ mkDerivation, ansi-terminal, base, Diff, filepath, hlint, tasty , tasty-expected-failure, tasty-hunit, text, typed-process @@ -258920,8 +258968,8 @@ self: { }: mkDerivation { pname = "tlynx"; - version = "0.4.0"; - sha256 = "1gsyyw8bvlc15z6hy7cd9w6v6wgjg9ra19w9vp6kajlyzyw5j1kw"; + version = "0.4.1"; + sha256 = "07fql189rm0xc7vx3ch86n5xrhd57zn2h80gxwmr9qaqc5p9b2qp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ From 9c9a8bd877e119bc70899b625ca639fa9217fa1c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Oct 2020 20:57:28 +0200 Subject: [PATCH 360/546] hackag2nix: constrain fourmulu and refinery to older versions --- .../development/haskell-modules/configuration-hackage2nix.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index f1bb7a2fbc5..2082da20618 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -72,6 +72,9 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 + # haskell-language-server 0.5.0.0 doesn't accept newer versions + - fourmolu ==0.2.* + - refinery ==0.2.* # LTS Haskell 16.18 - abstract-deque ==0.3 - abstract-par ==0.3.3 From 84022e0b1508f506a52671134032a8db111eb696 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Oct 2020 21:00:13 +0200 Subject: [PATCH 361/546] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-20-g9bb4291 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/888f7caec360792719c839f83dccf0a5f354987b. --- .../haskell-modules/hackage-packages.nix | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index bc446d912bc..74c6e3b92f9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -93689,6 +93689,34 @@ self: { }) {}; "fourmolu" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec + , hspec-discover, HsYAML, HsYAML-aeson, mtl, optparse-applicative + , path, path-io, syb, text + }: + mkDerivation { + pname = "fourmolu"; + version = "0.2.0.0"; + sha256 = "1jak0xgd6gcbw7icyrblvqnvzjyyakpw2zfnqj1z958qyg763v52"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory dlist exceptions + filepath ghc-lib-parser HsYAML HsYAML-aeson mtl syb text + ]; + executableHaskellDepends = [ + base directory ghc-lib-parser gitrev optparse-applicative text + ]; + testHaskellDepends = [ + base containers filepath hspec path path-io text + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "fourmolu_0_3_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec , hspec-discover, HsYAML, HsYAML-aeson, mtl, optparse-applicative @@ -93714,6 +93742,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fpco-api" = callPackage @@ -215430,6 +215459,22 @@ self: { }) {}; "refinery" = callPackage + ({ mkDerivation, base, checkers, exceptions, hspec, logict, mmorph + , mtl, QuickCheck + }: + mkDerivation { + pname = "refinery"; + version = "0.2.0.0"; + sha256 = "0nsfmb5y8y0hanh3h03v0n8wa5frgj85gz8ycl8h5z045j2kk3wq"; + libraryHaskellDepends = [ base exceptions logict mmorph mtl ]; + testHaskellDepends = [ + base checkers exceptions hspec logict mmorph mtl QuickCheck + ]; + description = "Toolkit for building proof automation systems"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "refinery_0_3_0_0" = callPackage ({ mkDerivation, base, checkers, exceptions, hspec, logict, mmorph , mtl, QuickCheck }: @@ -215443,6 +215488,7 @@ self: { ]; description = "Toolkit for building proof automation systems"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reflection" = callPackage From ee44940ee5c0f3d50e096ab00ae5d0064e098558 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Oct 2020 21:31:53 +0200 Subject: [PATCH 362/546] stack: override pantry to the latest version to fix the build --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ pkgs/development/haskell-modules/configuration-nix.nix | 1 + 2 files changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 79e0c1e220a..43753f147de 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1478,6 +1478,10 @@ self: super: { domain-auth = dontCheck super.domain-auth; # INSERT NEW OVERRIDES ABOVE THIS LINE + # stack-2.5.1 needs a more current version of pantry to compile + pantry = self.pantry_0_5_1_3; + + # haskell-language-server needs a more current version of pantry to compile } // (let inherit (self) hls-ghcide hls-brittany; hlsScopeOverride = self: super: { diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 68fb1165702..2158386629a 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -645,6 +645,7 @@ self: super: builtins.intersectAttrs super { # Tests require internet http-download = dontCheck super.http-download; pantry = dontCheck super.pantry; + pantry_0_5_1_3 = dontCheck super.pantry_0_5_1_3; # gtk2hs-buildtools is listed in setupHaskellDepends, but we # need it during the build itself, too. From 4ec5eee6240d8214bdf65a2f0f75b7a28b977f28 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Oct 2020 21:36:20 +0200 Subject: [PATCH 363/546] stylish-haskell: jailbreak build with ghc-8.10.x to support Cabal-3.2.x --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 5b476882943..71680074b74 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -129,4 +129,7 @@ self: super: { executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ]; })); + # Break out of "Cabal < 3.2" constraint. + stylish-haskell = doJailbreak super.stylish-haskell; + } From 0da7593dce2c503bab0ba42dd8849b0de8b835d3 Mon Sep 17 00:00:00 2001 From: tnias Date: Fri, 16 Oct 2020 23:04:06 +0200 Subject: [PATCH 364/546] nixos/chromium: update link in docs (#93794) --- nixos/modules/programs/chromium.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/chromium.nix b/nixos/modules/programs/chromium.nix index 3f042913619..b727f850a94 100644 --- a/nixos/modules/programs/chromium.nix +++ b/nixos/modules/programs/chromium.nix @@ -29,7 +29,7 @@ in page. To install a chromium extension not included in the chrome web store, append to the extension id a semicolon ";" followed by a URL pointing to an Update Manifest XML file. See - ExtensionInstallForcelist + ExtensionInstallForcelist for additional details. ''; default = []; From dac3c1be259afdceb5ffadd384f51a41b5c242e7 Mon Sep 17 00:00:00 2001 From: David Birks Date: Fri, 16 Oct 2020 17:49:42 -0400 Subject: [PATCH 365/546] eksctl: 0.27.0 -> 0.30.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 74cc3f3f171..271034fa889 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.27.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "1yclffhr76jd5rzqi37bpdj524lmywmgcfr9r0ahacfkp1hxdn3v"; + sha256 = "0kg966czixkmaaznl7xm751jpx4252nkm99vaigg1iwhlx2yczh9"; }; - vendorSha256 = "133g2d7l1szmpxjdg28yjm3pw6galwq8948rvalnh932kxngkxys"; + vendorSha256 = "1lhs1h0x3ryq0bd5w9ny7i2j9d0x2904br1vlxy677w2xsa9213p"; doCheck = false; From daa8f666484593bdadc252f7403f912451d83c39 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 16 Oct 2020 23:57:23 +0200 Subject: [PATCH 366/546] nodePackages: update --- .../node-packages/node-packages.nix | 2352 ++++++++--------- 1 file changed, 1164 insertions(+), 1188 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index db3af84e3e9..3fbd984eb1c 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -319,22 +319,22 @@ let sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g=="; }; }; - "@babel/compat-data-7.12.0" = { + "@babel/compat-data-7.12.1" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.12.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.0.tgz"; - sha512 = "jAbCtMANC9ptXxbSVXIqV/3H0bkh7iyyv6JS5lu10av45bcc2QmDNJXkASZCFwbBt75Q0AEq/BB+bNa3x1QgYQ=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.1.tgz"; + sha512 = "725AQupWJZ8ba0jbKceeFblZTY90McUBWMwHhkFQ9q1zKPJ95GUktljFcgcsIVwRnTnRKlcYzfiNImg5G9m6ZQ=="; }; }; - "@babel/core-7.12.0" = { + "@babel/core-7.12.1" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.12.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.12.0.tgz"; - sha512 = "iV7Gwg0DePKvdDZZWRTkj4MW+6/AbVWd4ZCg+zk8H1RVt5xBpUZS6vLQWwb3pyLg4BFTaGiQCPoJ4Ibmbne4fA=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.12.1.tgz"; + sha512 = "6bGmltqzIJrinwRRdczQsMhruSi9Sqty9Te+/5hudn4Izx/JYRhW1QELpR+CIL0gC/c9A7WroH6FmkDGxmWx3w=="; }; }; "@babel/core-7.9.0" = { @@ -355,13 +355,13 @@ let sha512 = "DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA=="; }; }; - "@babel/generator-7.12.0" = { + "@babel/generator-7.12.1" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.12.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.0.tgz"; - sha512 = "8lnf4QcyiQMf5XQp47BltuMTocsOh6P0z/vueEh8GzhmWWlDbdvOoI5Ziddg0XYhmnx35HyByUW51/9NprF8cA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz"; + sha512 = "DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg=="; }; }; "@babel/helper-annotate-as-pure-7.10.4" = { @@ -391,40 +391,40 @@ let sha512 = "5nPcIZ7+KKDxT1427oBivl9V9YTal7qk0diccnh7RrcgrT/pGFOjgGw1dgryyx1GvHEpXVfoDF6Ak3rTiWh8Rg=="; }; }; - "@babel/helper-builder-react-jsx-experimental-7.12.0" = { + "@babel/helper-builder-react-jsx-experimental-7.12.1" = { name = "_at_babel_slash_helper-builder-react-jsx-experimental"; packageName = "@babel/helper-builder-react-jsx-experimental"; - version = "7.12.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.0.tgz"; - sha512 = "AFzu6ib4i56olCtulkbIifcTay0O5tv8ZVK8hZMzrpu+YjsIDEcesF1DMqqTzV65clu3X61aE7qeHcJsY/gmnA=="; + url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.1.tgz"; + sha512 = "82to8lR7TofZWbTd3IEZT1xNHfeU/Ef4rDm/GLXddzqDh+yQ19QuGSzqww51aNxVH8rwfRIzL0EUQsvODVhtyw=="; }; }; - "@babel/helper-compilation-targets-7.12.0" = { + "@babel/helper-compilation-targets-7.12.1" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.12.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.0.tgz"; - sha512 = "NbDFJNjDgxE7IkrHp5gq2+Tr8bEdCLKYN90YDQEjMiTMUAFAcShNkaH8kydcmU0mEQTiQY0Ydy/+1xfS2OCEnw=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.1.tgz"; + sha512 = "jtBEif7jsPwP27GPHs06v4WBV0KrE8a/P7n0N0sSvHn2hwUCYnolP/CLmz51IzAW4NlN+HuoBtb9QcwnRo9F/g=="; }; }; - "@babel/helper-create-class-features-plugin-7.12.0" = { + "@babel/helper-create-class-features-plugin-7.12.1" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.12.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.0.tgz"; - sha512 = "9tD1r9RK928vxvxcoNK8/7uwT7Q2DJZP1dnJmyMAJPwOF0yr8PPwqdpyw33lUpCfrJ765bOs5XNa4KSfUDWFSw=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz"; + sha512 = "hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.12.0" = { + "@babel/helper-create-regexp-features-plugin-7.12.1" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.12.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.0.tgz"; - sha512 = "YBqH+3wLcom+tko8/JLgRcG8DMqORgmjqNRNI751gTioJSZHWFybO1mRoLtJtWIlYSHY+zT9LqqnbbK1c3KIVQ=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz"; + sha512 = "rsZ4LGvFTZnzdNZR5HZdmJVuXK8834R5QkF3WvcnBhrlVtF0HSIUC6zbreL9MgjTywhKokn8RIYRiq99+DLAxA=="; }; }; "@babel/helper-define-map-7.10.5" = { @@ -436,13 +436,13 @@ let sha512 = "fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ=="; }; }; - "@babel/helper-explode-assignable-expression-7.11.4" = { + "@babel/helper-explode-assignable-expression-7.12.1" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.11.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz"; - sha512 = "ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz"; + sha512 = "dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA=="; }; }; "@babel/helper-function-name-7.10.4" = { @@ -472,31 +472,31 @@ let sha512 = "wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA=="; }; }; - "@babel/helper-member-expression-to-functions-7.12.0" = { + "@babel/helper-member-expression-to-functions-7.12.1" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.12.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.0.tgz"; - sha512 = "I0d/bgzgzgLsJMk7UZ0TN2KV3OGjC/t/9Saz8PKb9jrcEAXhgjGysOgp4PDKydIKjUv/gj2St4ae+ov8l+T9Xg=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz"; + sha512 = "k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ=="; }; }; - "@babel/helper-module-imports-7.10.4" = { + "@babel/helper-module-imports-7.12.1" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz"; - sha512 = "nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.1.tgz"; + sha512 = "ZeC1TlMSvikvJNy1v/wPIazCu3NdOwgYZLIkmIyAsGhqkNpiDoQQRmaCK8YP4Pq3GPTLPV9WXaPCJKvx06JxKA=="; }; }; - "@babel/helper-module-transforms-7.12.0" = { + "@babel/helper-module-transforms-7.12.1" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.12.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.0.tgz"; - sha512 = "1ZTMoCiLSzTJLbq7mSaTHki4oIrBIf/dUbzdhwTrvtMU3ZNVKwQmGae3gSiqppo7G8HAgnXmc43rfEaD8yYLLQ=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz"; + sha512 = "QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w=="; }; }; "@babel/helper-optimise-call-expression-7.10.4" = { @@ -526,40 +526,40 @@ let sha512 = "68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg=="; }; }; - "@babel/helper-remap-async-to-generator-7.11.4" = { + "@babel/helper-remap-async-to-generator-7.12.1" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.11.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz"; - sha512 = "tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz"; + sha512 = "9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A=="; }; }; - "@babel/helper-replace-supers-7.12.0" = { + "@babel/helper-replace-supers-7.12.1" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.12.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.0.tgz"; - sha512 = "9kycFdq2c9e7PXZOr2z/ZqTFF9OzFu287iFwYS+CiDVPuoTCfY8hoTsIqNQNetQjlqoRsRyJFrMG1uhGAR4EEw=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.1.tgz"; + sha512 = "zJjTvtNJnCFsCXVi5rUInstLd/EIVNmIKA1Q9ynESmMBWPWd+7sdR+G4/wdu+Mppfep0XLyG2m7EBPvjCeFyrw=="; }; }; - "@babel/helper-simple-access-7.10.4" = { + "@babel/helper-simple-access-7.12.1" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz"; - sha512 = "0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz"; + sha512 = "OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA=="; }; }; - "@babel/helper-skip-transparent-expression-wrappers-7.11.0" = { + "@babel/helper-skip-transparent-expression-wrappers-7.12.1" = { name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; packageName = "@babel/helper-skip-transparent-expression-wrappers"; - version = "7.11.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz"; - sha512 = "0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q=="; + url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz"; + sha512 = "Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA=="; }; }; "@babel/helper-split-export-declaration-7.11.0" = { @@ -580,13 +580,13 @@ let sha512 = "3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw=="; }; }; - "@babel/helper-validator-option-7.12.0" = { + "@babel/helper-validator-option-7.12.1" = { name = "_at_babel_slash_helper-validator-option"; packageName = "@babel/helper-validator-option"; - version = "7.12.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.0.tgz"; - sha512 = "NRfKaAQw/JCMsTFUdJI6cp4MoJGGVBRQTRSiW1nwlGldNqzjB9jqWI0SZqQksC724dJoKqwG+QqfS9ib7SoVsw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz"; + sha512 = "YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A=="; }; }; "@babel/helper-wrap-function-7.10.4" = { @@ -598,13 +598,13 @@ let sha512 = "6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug=="; }; }; - "@babel/helpers-7.10.4" = { + "@babel/helpers-7.12.1" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz"; - sha512 = "L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.1.tgz"; + sha512 = "9JoDSBGoWtmbay98efmT2+mySkwjzeFeAL9BuWNoVQpkPFQF8SIIFUfY5os9u8wVzglzoiPRSW7cuJmBDUt43g=="; }; }; "@babel/highlight-7.10.4" = { @@ -616,13 +616,13 @@ let sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; }; }; - "@babel/parser-7.12.0" = { + "@babel/parser-7.12.2" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.12.0"; + version = "7.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.0.tgz"; - sha512 = "dYmySMYnlus2jwl7JnnajAj11obRStZoW9cG04wh4ZuhozDn11tDUrhHcUZ9iuNHqALAhh60XqNaYXpvuuE/Gg=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.2.tgz"; + sha512 = "LMN+SqTiZEonUw4hQA0A3zG8DnN0E1F4K107LbDDUnC+0chML1rvWgsHloC9weB4RmZweE0uhFq0eGX7Nr/PBQ=="; }; }; "@babel/plugin-external-helpers-7.8.3" = { @@ -634,130 +634,130 @@ let sha512 = "mx0WXDDiIl5DwzMtzWGRSPugXi9BxROS05GQrhLNbEamhBiicgn994ibwkyiBH+6png7bm/yA7AUsvHyCXi4Vw=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.10.5" = { + "@babel/plugin-proposal-async-generator-functions-7.12.1" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.10.5"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz"; - sha512 = "cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz"; + sha512 = "d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A=="; }; }; - "@babel/plugin-proposal-class-properties-7.10.4" = { + "@babel/plugin-proposal-class-properties-7.12.1" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz"; - sha512 = "vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz"; + sha512 = "cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w=="; }; }; - "@babel/plugin-proposal-dynamic-import-7.10.4" = { + "@babel/plugin-proposal-dynamic-import-7.12.1" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz"; - sha512 = "up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz"; + sha512 = "a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ=="; }; }; - "@babel/plugin-proposal-export-default-from-7.10.4" = { + "@babel/plugin-proposal-export-default-from-7.12.1" = { name = "_at_babel_slash_plugin-proposal-export-default-from"; packageName = "@babel/plugin-proposal-export-default-from"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.10.4.tgz"; - sha512 = "G1l00VvDZ7Yk2yRlC5D8Ybvu3gmeHS3rCHoUYdjrqGYUtdeOBoRypnvDZ5KQqxyaiiGHWnVDeSEzA5F9ozItig=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.12.1.tgz"; + sha512 = "z5Q4Ke7j0AexQRfgUvnD+BdCSgpTEKnqQ3kskk2jWtOBulxICzd1X9BGt7kmWftxZ2W3++OZdt5gtmC8KLxdRQ=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.12.0" = { + "@babel/plugin-proposal-export-namespace-from-7.12.1" = { name = "_at_babel_slash_plugin-proposal-export-namespace-from"; packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.12.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.0.tgz"; - sha512 = "ao43U2ptSe+mIZAQo2nBV5Wx2Ie3i2XbLt8jCXZpv+bvLY1Twv0lak4YZ1Ps5OwbeLMAl3iOVScgGMOImBae1g=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz"; + sha512 = "6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw=="; }; }; - "@babel/plugin-proposal-json-strings-7.10.4" = { + "@babel/plugin-proposal-json-strings-7.12.1" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz"; - sha512 = "fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz"; + sha512 = "GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.12.0" = { + "@babel/plugin-proposal-logical-assignment-operators-7.12.1" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.12.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.0.tgz"; - sha512 = "dssjXHzdMQal4q6GCSwDTVPEbyBLdd9+7aSlzAkQbrGEKq5xG8pvhQ7u2ktUrCLRmzQphZnSzILBL5ta4xSRlA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz"; + sha512 = "k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.12.0" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.12.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.0.tgz"; - sha512 = "JpNWix2VP2ue31r72fKytTE13nPX1fxl1mudfTaTwcDhl3iExz5NZjQBq012b/BQ6URWoc/onI73pZdYlAfihg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz"; + sha512 = "nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.12.0" = { + "@babel/plugin-proposal-numeric-separator-7.12.1" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.12.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.0.tgz"; - sha512 = "iON65YmIy/IpEgteYJ4HfO2q30SLdIxiyjNNlsSjSl0tUxLhSH9PljE5r6sczwdW64ZZzznYNcezdcROB+rDDw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.1.tgz"; + sha512 = "MR7Ok+Af3OhNTCxYVjJZHS0t97ydnJZt/DbR4WISO39iDnhiD8XHrY12xuSJ90FFEGjir0Fzyyn7g/zY6hxbxA=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.11.0" = { + "@babel/plugin-proposal-object-rest-spread-7.12.1" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.11.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz"; - sha512 = "wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz"; + sha512 = "s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.10.4" = { + "@babel/plugin-proposal-optional-catch-binding-7.12.1" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz"; - sha512 = "LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz"; + sha512 = "hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.12.0" = { + "@babel/plugin-proposal-optional-chaining-7.12.1" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.12.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.0.tgz"; - sha512 = "CXu9aw32FH/MksqdKvhpiH8pSvxnXJ33E7I7BGNE9VzNRpWgpNzvPpds/tW9E0pjmX9+D1zAHRyHbtyeTboo2g=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz"; + sha512 = "c2uRpY6WzaVDzynVY9liyykS+kVU+WRZPMPYpkelXH8KBt1oXoI89kPbZKKG/jDT5UK92FTW2fZkZaJhdiBabw=="; }; }; - "@babel/plugin-proposal-private-methods-7.10.4" = { + "@babel/plugin-proposal-private-methods-7.12.1" = { name = "_at_babel_slash_plugin-proposal-private-methods"; packageName = "@babel/plugin-proposal-private-methods"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz"; - sha512 = "wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz"; + sha512 = "mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.10.4" = { + "@babel/plugin-proposal-unicode-property-regex-7.12.1" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz"; - sha512 = "H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz"; + sha512 = "MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -778,13 +778,13 @@ let sha512 = "wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg=="; }; }; - "@babel/plugin-syntax-class-properties-7.10.4" = { + "@babel/plugin-syntax-class-properties-7.12.1" = { name = "_at_babel_slash_plugin-syntax-class-properties"; packageName = "@babel/plugin-syntax-class-properties"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz"; - sha512 = "GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz"; + sha512 = "U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA=="; }; }; "@babel/plugin-syntax-dynamic-import-7.8.3" = { @@ -796,13 +796,13 @@ let sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; }; }; - "@babel/plugin-syntax-export-default-from-7.10.4" = { + "@babel/plugin-syntax-export-default-from-7.12.1" = { name = "_at_babel_slash_plugin-syntax-export-default-from"; packageName = "@babel/plugin-syntax-export-default-from"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.10.4.tgz"; - sha512 = "79V6r6Pgudz0RnuMGp5xidu6Z+bPFugh8/Q9eDHonmLp4wKFAZDwygJwYgCzuDu8lFA/sYyT+mc5y2wkd7bTXA=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.12.1.tgz"; + sha512 = "dP5eGg6tHEkhnRD2/vRG/KJKRSg8gtxu2i+P/8/yFPJn/CfPU5G0/7Gks2i3M6IOVAPQekmsLN9LPsmXFFL4Uw=="; }; }; "@babel/plugin-syntax-export-namespace-from-7.8.3" = { @@ -814,13 +814,13 @@ let sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; }; }; - "@babel/plugin-syntax-flow-7.10.4" = { + "@babel/plugin-syntax-flow-7.12.1" = { name = "_at_babel_slash_plugin-syntax-flow"; packageName = "@babel/plugin-syntax-flow"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.10.4.tgz"; - sha512 = "yxQsX1dJixF4qEEdzVbst3SZQ58Nrooz8NV9Z9GL4byTE25BvJgl5lf0RECUf0fh28rZBb/RYTWn/eeKwCMrZQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.1.tgz"; + sha512 = "1lBLLmtxrwpm4VKmtVFselI/P3pX+G63fAtUUt6b2Nzgao77KNDwyuRt90Mj2/9pKobtt68FdvjfqohZjg/FCA=="; }; }; "@babel/plugin-syntax-import-meta-7.10.4" = { @@ -841,13 +841,13 @@ let sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; }; }; - "@babel/plugin-syntax-jsx-7.10.4" = { + "@babel/plugin-syntax-jsx-7.12.1" = { name = "_at_babel_slash_plugin-syntax-jsx"; packageName = "@babel/plugin-syntax-jsx"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.4.tgz"; - sha512 = "KCg9mio9jwiARCB7WAcQ7Y1q+qicILjoK8LP/VkPkEKaf5dkaZZK1EcTe91a3JJlZ3qy6L5s9X52boEYi8DM9g=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz"; + sha512 = "1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg=="; }; }; "@babel/plugin-syntax-logical-assignment-operators-7.10.4" = { @@ -904,373 +904,373 @@ let sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; }; }; - "@babel/plugin-syntax-top-level-await-7.10.4" = { + "@babel/plugin-syntax-top-level-await-7.12.1" = { name = "_at_babel_slash_plugin-syntax-top-level-await"; packageName = "@babel/plugin-syntax-top-level-await"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz"; - sha512 = "ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz"; + sha512 = "i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A=="; }; }; - "@babel/plugin-syntax-typescript-7.10.4" = { + "@babel/plugin-syntax-typescript-7.12.1" = { name = "_at_babel_slash_plugin-syntax-typescript"; packageName = "@babel/plugin-syntax-typescript"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.10.4.tgz"; - sha512 = "oSAEz1YkBCAKr5Yiq8/BNtvSAPwkp/IyUnwZogd8p+F0RuYQQrLeRUzIQhueQTTBy/F+a40uS7OFKxnkRvmvFQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.1.tgz"; + sha512 = "UZNEcCY+4Dp9yYRCAHrHDU+9ZXLYaY9MgBXSRLkB9WjYFRR6quJBumfVrEkUxrePPBwFcpWfNKXqVRQQtm7mMA=="; }; }; - "@babel/plugin-transform-arrow-functions-7.10.4" = { + "@babel/plugin-transform-arrow-functions-7.12.1" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz"; - sha512 = "9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz"; + sha512 = "5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A=="; }; }; - "@babel/plugin-transform-async-to-generator-7.10.4" = { + "@babel/plugin-transform-async-to-generator-7.12.1" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz"; - sha512 = "F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz"; + sha512 = "SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.10.4" = { + "@babel/plugin-transform-block-scoped-functions-7.12.1" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz"; - sha512 = "WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz"; + sha512 = "5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA=="; }; }; - "@babel/plugin-transform-block-scoping-7.11.1" = { + "@babel/plugin-transform-block-scoping-7.12.1" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.11.1"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz"; - sha512 = "00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz"; + sha512 = "zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w=="; }; }; - "@babel/plugin-transform-classes-7.10.4" = { + "@babel/plugin-transform-classes-7.12.1" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz"; - sha512 = "2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz"; + sha512 = "/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog=="; }; }; - "@babel/plugin-transform-computed-properties-7.10.4" = { + "@babel/plugin-transform-computed-properties-7.12.1" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz"; - sha512 = "JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz"; + sha512 = "vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg=="; }; }; - "@babel/plugin-transform-destructuring-7.10.4" = { + "@babel/plugin-transform-destructuring-7.12.1" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz"; - sha512 = "+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz"; + sha512 = "fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw=="; }; }; - "@babel/plugin-transform-dotall-regex-7.10.4" = { + "@babel/plugin-transform-dotall-regex-7.12.1" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz"; - sha512 = "ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz"; + sha512 = "B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.10.4" = { + "@babel/plugin-transform-duplicate-keys-7.12.1" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz"; - sha512 = "GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz"; + sha512 = "iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.10.4" = { + "@babel/plugin-transform-exponentiation-operator-7.12.1" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz"; - sha512 = "S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz"; + sha512 = "7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug=="; }; }; - "@babel/plugin-transform-flow-strip-types-7.10.4" = { + "@babel/plugin-transform-flow-strip-types-7.12.1" = { name = "_at_babel_slash_plugin-transform-flow-strip-types"; packageName = "@babel/plugin-transform-flow-strip-types"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.10.4.tgz"; - sha512 = "XTadyuqNst88UWBTdLjM+wEY7BFnY2sYtPyAidfC7M/QaZnSuIZpMvLxqGT7phAcnGyWh/XQFLKcGf04CnvxSQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.12.1.tgz"; + sha512 = "8hAtkmsQb36yMmEtk2JZ9JnVyDSnDOdlB+0nEGzIDLuK4yR3JcEjfuFPYkdEPSh8Id+rAMeBEn+X0iVEyho6Hg=="; }; }; - "@babel/plugin-transform-for-of-7.10.4" = { + "@babel/plugin-transform-for-of-7.12.1" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz"; - sha512 = "ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz"; + sha512 = "Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg=="; }; }; - "@babel/plugin-transform-function-name-7.10.4" = { + "@babel/plugin-transform-function-name-7.12.1" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz"; - sha512 = "OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz"; + sha512 = "JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw=="; }; }; - "@babel/plugin-transform-literals-7.10.4" = { + "@babel/plugin-transform-literals-7.12.1" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz"; - sha512 = "Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz"; + sha512 = "+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.10.4" = { + "@babel/plugin-transform-member-expression-literals-7.12.1" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz"; - sha512 = "0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz"; + sha512 = "1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg=="; }; }; - "@babel/plugin-transform-modules-amd-7.10.5" = { + "@babel/plugin-transform-modules-amd-7.12.1" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.10.5"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz"; - sha512 = "elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz"; + sha512 = "tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.10.4" = { + "@babel/plugin-transform-modules-commonjs-7.12.1" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz"; - sha512 = "Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz"; + sha512 = "dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.12.0" = { + "@babel/plugin-transform-modules-systemjs-7.12.1" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.12.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.0.tgz"; - sha512 = "h2fDMnwRwBiNMmTGAWqUo404Z3oLbrPE6hyATecyIbsEsrbM5gjLbfKQLb6hjiouMlGHH+yliYBbc4NPgWKE/g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz"; + sha512 = "Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q=="; }; }; - "@babel/plugin-transform-modules-umd-7.10.4" = { + "@babel/plugin-transform-modules-umd-7.12.1" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz"; - sha512 = "mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz"; + sha512 = "aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.10.4" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.12.1" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz"; - sha512 = "V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz"; + sha512 = "tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q=="; }; }; - "@babel/plugin-transform-new-target-7.10.4" = { + "@babel/plugin-transform-new-target-7.12.1" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz"; - sha512 = "YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz"; + sha512 = "+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw=="; }; }; - "@babel/plugin-transform-object-assign-7.10.4" = { + "@babel/plugin-transform-object-assign-7.12.1" = { name = "_at_babel_slash_plugin-transform-object-assign"; packageName = "@babel/plugin-transform-object-assign"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.10.4.tgz"; - sha512 = "6zccDhYEICfMeQqIjuY5G09/yhKzG30DKHJeYBQUHIsJH7c2jXSGvgwRalufLAXAq432OSlsEfAOLlzEsQzxVw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.12.1.tgz"; + sha512 = "geUHn4XwHznRAFiuROTy0Hr7bKbpijJCmr1Svt/VNGhpxmp0OrdxURNpWbOAf94nUbL+xj6gbxRVPHWIbRpRoA=="; }; }; - "@babel/plugin-transform-object-super-7.10.4" = { + "@babel/plugin-transform-object-super-7.12.1" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz"; - sha512 = "5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz"; + sha512 = "AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw=="; }; }; - "@babel/plugin-transform-parameters-7.10.5" = { + "@babel/plugin-transform-parameters-7.12.1" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.10.5"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz"; - sha512 = "xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz"; + sha512 = "xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg=="; }; }; - "@babel/plugin-transform-property-literals-7.10.4" = { + "@babel/plugin-transform-property-literals-7.12.1" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz"; - sha512 = "ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz"; + sha512 = "6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ=="; }; }; - "@babel/plugin-transform-react-display-name-7.10.4" = { + "@babel/plugin-transform-react-display-name-7.12.1" = { name = "_at_babel_slash_plugin-transform-react-display-name"; packageName = "@babel/plugin-transform-react-display-name"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.10.4.tgz"; - sha512 = "Zd4X54Mu9SBfPGnEcaGcOrVAYOtjT2on8QZkLKEq1S/tHexG39d9XXGZv19VfRrDjPJzFmPfTAqOQS1pfFOujw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.1.tgz"; + sha512 = "cAzB+UzBIrekfYxyLlFqf/OagTvHLcVBb5vpouzkYkBclRPraiygVnafvAoipErZLI8ANv8Ecn6E/m5qPXD26w=="; }; }; - "@babel/plugin-transform-react-jsx-7.10.4" = { + "@babel/plugin-transform-react-jsx-7.12.1" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.4.tgz"; - sha512 = "L+MfRhWjX0eI7Js093MM6MacKU4M6dnCRa/QPDwYMxjljzSCzzlzKzj9Pk4P3OtrPcxr2N3znR419nr3Xw+65A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.1.tgz"; + sha512 = "RmKejwnT0T0QzQUzcbP5p1VWlpnP8QHtdhEtLG55ZDQnJNalbF3eeDyu3dnGKvGzFIQiBzFhBYTwvv435p9Xpw=="; }; }; - "@babel/plugin-transform-react-jsx-source-7.10.5" = { + "@babel/plugin-transform-react-jsx-source-7.12.1" = { name = "_at_babel_slash_plugin-transform-react-jsx-source"; packageName = "@babel/plugin-transform-react-jsx-source"; - version = "7.10.5"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.5.tgz"; - sha512 = "wTeqHVkN1lfPLubRiZH3o73f4rfon42HpgxUSs86Nc+8QIcm/B9s8NNVXu/gwGcOyd7yDib9ikxoDLxJP0UiDA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.1.tgz"; + sha512 = "keQ5kBfjJNRc6zZN1/nVHCd6LLIHq4aUKcVnvE/2l+ZZROSbqoiGFRtT5t3Is89XJxBQaP7NLZX2jgGHdZvvFQ=="; }; }; - "@babel/plugin-transform-regenerator-7.10.4" = { + "@babel/plugin-transform-regenerator-7.12.1" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz"; - sha512 = "3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz"; + sha512 = "gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng=="; }; }; - "@babel/plugin-transform-reserved-words-7.10.4" = { + "@babel/plugin-transform-reserved-words-7.12.1" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz"; - sha512 = "hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz"; + sha512 = "pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A=="; }; }; - "@babel/plugin-transform-runtime-7.12.0" = { + "@babel/plugin-transform-runtime-7.12.1" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.12.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.0.tgz"; - sha512 = "BC8wiTo+0kEG8M6wuEBeuG7AIazTan02/Bh4dgi+wdDBE+p2iv5AXO8OUjrwD100223S/2WbALSqj7c290XTKg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.1.tgz"; + sha512 = "Ac/H6G9FEIkS2tXsZjL4RAdS3L3WHxci0usAnz7laPWUmFiGtj7tIASChqKZMHTSQTQY6xDbOq+V1/vIq3QrWg=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.10.4" = { + "@babel/plugin-transform-shorthand-properties-7.12.1" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz"; - sha512 = "AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz"; + sha512 = "GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw=="; }; }; - "@babel/plugin-transform-spread-7.11.0" = { + "@babel/plugin-transform-spread-7.12.1" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.11.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz"; - sha512 = "UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz"; + sha512 = "vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng=="; }; }; - "@babel/plugin-transform-sticky-regex-7.10.4" = { + "@babel/plugin-transform-sticky-regex-7.12.1" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz"; - sha512 = "Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz"; + sha512 = "CiUgKQ3AGVk7kveIaPEET1jNDhZZEl1RPMWdTBE1799bdz++SwqDHStmxfCtDfBhQgCl38YRiSnrMuUMZIWSUQ=="; }; }; - "@babel/plugin-transform-template-literals-7.10.5" = { + "@babel/plugin-transform-template-literals-7.12.1" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.10.5"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz"; - sha512 = "V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz"; + sha512 = "b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.10.4" = { + "@babel/plugin-transform-typeof-symbol-7.12.1" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz"; - sha512 = "QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz"; + sha512 = "EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q=="; }; }; - "@babel/plugin-transform-typescript-7.12.0" = { + "@babel/plugin-transform-typescript-7.12.1" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.12.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.0.tgz"; - sha512 = "gahRNAWgE76hjI3TZPVEfV7vGjOCJi5ACd4eSoAItk/ErC114i2UHnk+1ScS2dOour0p6J6kB99hNFX2vzL2Ww=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.1.tgz"; + sha512 = "VrsBByqAIntM+EYMqSm59SiMEf7qkmI9dqMt6RbD/wlwueWmYcI0FFK5Fj47pP6DRZm+3teXjosKlwcZJ5lIMw=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.10.4" = { + "@babel/plugin-transform-unicode-escapes-7.12.1" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz"; - sha512 = "y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz"; + sha512 = "I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q=="; }; }; - "@babel/plugin-transform-unicode-regex-7.10.4" = { + "@babel/plugin-transform-unicode-regex-7.12.1" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz"; - sha512 = "wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz"; + sha512 = "SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg=="; }; }; "@babel/polyfill-7.11.5" = { @@ -1282,22 +1282,22 @@ let sha512 = "FunXnE0Sgpd61pKSj2OSOs1D44rKTD3pGOfGilZ6LGrrIH0QEtJlTjqOqdF8Bs98JmjfGhni2BBkTfv9KcKJ9g=="; }; }; - "@babel/preset-env-7.12.0" = { + "@babel/preset-env-7.12.1" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.12.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.0.tgz"; - sha512 = "jSIHvHSuF+hBUIrvA2/61yIzhH+ceLOXGLTH1nwPvQlso/lNxXsoE/nvrCzY5M77KRzhKegB1CvdhWPZmYDZ5A=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.1.tgz"; + sha512 = "H8kxXmtPaAGT7TyBvSSkoSTUK6RHh61So05SyEbpmr0MCZrsNYn7mGMzzeYoOUCdHzww61k8XBft2TaES+xPLg=="; }; }; - "@babel/preset-flow-7.10.4" = { + "@babel/preset-flow-7.12.1" = { name = "_at_babel_slash_preset-flow"; packageName = "@babel/preset-flow"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.10.4.tgz"; - sha512 = "XI6l1CptQCOBv+ZKYwynyswhtOKwpZZp5n0LG1QKCo8erRhqjoQV6nvx61Eg30JHpysWQSBwA2AWRU3pBbSY5g=="; + url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.12.1.tgz"; + sha512 = "UAoyMdioAhM6H99qPoKvpHMzxmNVXno8GYU/7vZmGaHk6/KqfDYL1W0NxszVbJ2EP271b7e6Ox+Vk2A9QsB3Sw=="; }; }; "@babel/preset-modules-0.1.4" = { @@ -1318,22 +1318,22 @@ let sha512 = "dStnEQgejNYIHFNACdDCigK4BF7wgW6Zahv9Dc2un7rGjbeVtZhBfR3sy0I7ZJOhBexkFxVdMZ5hqmll7BFShw=="; }; }; - "@babel/preset-typescript-7.12.0" = { + "@babel/preset-typescript-7.12.1" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.12.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.12.0.tgz"; - sha512 = "2XVy4sy/zkP4gqmXW0TzSh/QwOniN2Cy3srhsD0TRBlMTOmjaYnWCWA6aWopwpcwfYkEKD6jKLLjYMq15zDNWg=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.12.1.tgz"; + sha512 = "hNK/DhmoJPsksdHuI/RVrcEws7GN5eamhi28JkO52MqIxU8Z0QpmiSOQxZHWOHV7I3P4UjHV97ay4TcamMA6Kw=="; }; }; - "@babel/register-7.12.0" = { + "@babel/register-7.12.1" = { name = "_at_babel_slash_register"; packageName = "@babel/register"; - version = "7.12.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.12.0.tgz"; - sha512 = "2F2v0qYSAwrGyK9mZ8lIoUluHRzLTgkJ2oRXlLV9GVe/ze/sTFBiOocLRMSJYDB2lLiABlVC+pZHlZ8qihO1Xg=="; + url = "https://registry.npmjs.org/@babel/register/-/register-7.12.1.tgz"; + sha512 = "XWcmseMIncOjoydKZnWvWi0/5CUCD+ZYKhRwgYlWOrA8fGZ/FjuLRpqtIhLOVD/fvR1b9DQHtZPn68VvhpYf+Q=="; }; }; "@babel/runtime-7.11.2" = { @@ -1345,13 +1345,13 @@ let sha512 = "TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw=="; }; }; - "@babel/runtime-7.12.0" = { + "@babel/runtime-7.12.1" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.12.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.0.tgz"; - sha512 = "lS4QLXQ2Vbw2ubfQjeQcn+BZgZ5+ROHW9f+DWjEp5Y+NHYmkRGKqHSJ1tuhbUauKu2nhZNTBIvsIQ8dXfY5Gjw=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.1.tgz"; + sha512 = "J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA=="; }; }; "@babel/runtime-7.9.0" = { @@ -1372,13 +1372,13 @@ let sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA=="; }; }; - "@babel/traverse-7.12.0" = { + "@babel/traverse-7.12.1" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.12.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.0.tgz"; - sha512 = "ZU9e79xpOukCNPkQ1UzR4gJKCruGckr6edd8v8lmKpSk8iakgUIvb+5ZtaKKV9f7O+x5r+xbMDDIbzVpUoiIuw=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.1.tgz"; + sha512 = "MA3WPoRt1ZHo2ZmoGKNqi20YnPt0B1S0GTZEPhhd+hw2KGUzBlHuVunj6K4sNuK+reEvyiPwtp0cpaqLzJDmAw=="; }; }; "@babel/types-7.10.4" = { @@ -1390,13 +1390,13 @@ let sha512 = "UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg=="; }; }; - "@babel/types-7.12.0" = { + "@babel/types-7.12.1" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.12.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.12.0.tgz"; - sha512 = "ggIyFmT2zMaYRheOfPDQ4gz7QqV3B+t2rjqjbttDJxMcb7/LukvWCmlIl1sWcOxrvwpTDd+z0OytzqsbGeb3/g=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz"; + sha512 = "BzSY3NJBKM4kyatSOWh3D/JJ2O3CVzBybHWxtgxnggaxEuaSTTDqeiSb/xk9lrkw2Tbqyivw5ZU4rT+EfznQsA=="; }; }; "@bugsnag/browser-7.4.0" = { @@ -2056,13 +2056,13 @@ let sha512 = "t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ=="; }; }; - "@fluentui/react-7.146.2" = { + "@fluentui/react-7.147.0" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.146.2"; + version = "7.147.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.146.2.tgz"; - sha512 = "Xwf+946dC5bhexmStIrSeLSimcEmhmIMrKF/C1bw701j2OwJTW+NbJO2PYPuUCbykOBKE6igNFbYKlFydjnLYw=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.147.0.tgz"; + sha512 = "i7rUpUytr/futFBiSXtpg2bPRX60AYcudRx/KpQ3dKkboR+OVdSzETMtS4ljUt4DzU/DuBo981CzJKWPj9khig=="; }; }; "@fluentui/react-focus-7.16.12" = { @@ -3442,58 +3442,58 @@ let sha512 = "FQM/59HXMAKp9k4z6rXDA/FBKFSUaU3n5SFpF2/jScmpCmHBpF+pYIWZmVB4fY17cvq3KIcuSfzf9PqD1B73XQ=="; }; }; - "@node-red/editor-api-1.2.0" = { + "@node-red/editor-api-1.2.1" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.0.tgz"; - sha512 = "UXod74Sz08F02LufFacZbomj9MoxeurmUTMm3gHuoob3d06lI4pwnK8y9Med6I6ZeKypA+rWxyyzS47iau8BTw=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.1.tgz"; + sha512 = "Jhf56SKXafBKdnf0HIegmTC3bu23OD1NvIVfWln38DBLMnAptjGGgqEDnB/sv13MJ8CrcNgvoH3XZtQ5FvBqcw=="; }; }; - "@node-red/editor-client-1.2.0" = { + "@node-red/editor-client-1.2.1" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.0.tgz"; - sha512 = "hB8MEwQ9+/NP92Tw40eoZBxB7YSWnKJieh4vLsBS++NP740soenEGAZCFN1xVKWtvRStqEQpF8sXzD4v+Lw85Q=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.1.tgz"; + sha512 = "KO67cvvORLJY1eI2LqcjcZ92jKYmXmkFDcuYnItdQYu1h3g8RcIQwqqU9ZPo16QcjQLdIh1OMEOUxilY404o9w=="; }; }; - "@node-red/nodes-1.2.0" = { + "@node-red/nodes-1.2.1" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.0.tgz"; - sha512 = "bIPavHnIWeaZhJ9GCR3xH+K51jj0IyMvfsQrk1A3F1y6LO3x8/t+7oMcXuJIlqgnsbb7ZEC316+YvHAwEM8R7Q=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.1.tgz"; + sha512 = "YHYuxeIiy1v5aBrmHpbiYH2763satuH6DEGYn7hpLgwR+PCcks4AaXAQFPTAwYJ+2r224m9WHkyHGgcvU59QhA=="; }; }; - "@node-red/registry-1.2.0" = { + "@node-red/registry-1.2.1" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.0.tgz"; - sha512 = "hTJTdU7Zk9nQe2jCDr3eEv9u0g+er2t7fk2eiMmWTwWwrX+xDZuWYvzbXyCx0d/WPrrT8zS2gINZdlfnSIUaBQ=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.1.tgz"; + sha512 = "2lm60rATnuWNgvMVh+dHS0T6xIJzwuESrMZjowhzdDr5MvUrYcqVq6NEbPWsjCaqjoQyLGJNKPcdJVySRvdvmw=="; }; }; - "@node-red/runtime-1.2.0" = { + "@node-red/runtime-1.2.1" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.0.tgz"; - sha512 = "1GgqSrGOa2RNArRPwmT9G1OIwfySGfiAgUadu8EEEO/TMWycmcPMYTEcKt3BlfS4MTZd13yxwPyXrjsV4VGUug=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.1.tgz"; + sha512 = "iUJTNFIdmpJ8nh+bkd4h3eO6tS8Kmg9EiAgfWVdnRVftBc0RlYsX/d36QPGE05vq9WZlPhzjfwSUbHXkciU0bw=="; }; }; - "@node-red/util-1.2.0" = { + "@node-red/util-1.2.1" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.0.tgz"; - sha512 = "cREGi9XT9sLdsPZ1Ncflk5+RfAb0BUeplIlAZSyjO9MDG/IPky5hPupKglo/efez090vSfvSsu8YGkHS4lUBZQ=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.1.tgz"; + sha512 = "BQZeeUbkleDh2KG4NMiByHS2FuJXefR9/mMXh1FrF6R1f73VjR6YSifF/knaq5ZR8HAZmFnY0ACep3pb9blUmg=="; }; }; "@nodelib/fs.scandir-2.1.3" = { @@ -4252,13 +4252,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.2.2" = { + "@serverless/components-3.2.3" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.2.2.tgz"; - sha512 = "425Oq3GvbmyJGRGdAn8ylbBYuIQbLZdV5R+aXAN4zBUPTnKp9YgEp8o3F7rxa4M/G8pFAgKpOZxml2fZunCYdA=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.2.3.tgz"; + sha512 = "QY+vI/pNkuJeNnCLX258xCO4urJ/q3EXQk844VPXhaNPSogoioBzm+hFyOMydGBVLDy8+tVWbD8BDPSpdWJ9IA=="; }; }; "@serverless/core-1.1.2" = { @@ -4270,13 +4270,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-4.1.0" = { + "@serverless/enterprise-plugin-4.1.1" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.1.0.tgz"; - sha512 = "Embav2Ml3gCGgP24AnrvzKsIS1drLWC6p0VEcMo/TQ51x3+GXL/Kadxj8rsQL5kz3+YaLzVKM5KtiDmPdO4Lww=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.1.1.tgz"; + sha512 = "ga9g/bRyA6LCckYPU8jvx63Q9+Po/yZxbdbYb2KiCZ+0S1YcQQsjDJwsOTAAgQ6AEp95TtrQkn3BycYTSGEm7A=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -4288,15 +4288,6 @@ let sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A=="; }; }; - "@serverless/platform-client-2.1.0" = { - name = "_at_serverless_slash_platform-client"; - packageName = "@serverless/platform-client"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-2.1.0.tgz"; - sha512 = "fOBden8RBdu4Ms0jAAk3QKU3h5O34B+GjjfKUKVO8wUMR+oV3bDb2ovICxQkppn+Gzp8iM8z1T6Tv5dSd+ebRg=="; - }; - }; "@serverless/platform-client-3.1.2" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; @@ -4351,13 +4342,13 @@ let sha512 = "yZQT2f8LIZZlH2ibAIvK4C/Ks72Y8CIWmGz04XGCLPHa/ANA6KqlXTKV6zWg/n1PDy2yj2zgX+m509VpIZuDeQ=="; }; }; - "@serverless/utils-china-1.0.3" = { + "@serverless/utils-china-1.0.7" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "1.0.3"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.0.3.tgz"; - sha512 = "UnbC436+hpJHTLEbbcxZvURUKIu9E8fNDIELzbgxYruYrLEvun/Np3Lmnhdhu6ucDh3ulNkm2A7GLgnASzyPtg=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.0.7.tgz"; + sha512 = "qE6vzzMbbJc7/ywIUK3ufcZhLlkmjv0yB2rQJkyPnEoauYGa+v1PiGdPOt3u7wty6duTDBUjlR7VgU5HSvTtEA=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -5530,13 +5521,13 @@ let sha512 = "1GJnq7RwuFPRicMHdT53vza5v39nep9OKIbozxNUpFXP04CydcdWrqpZQ+MlVdlLFCisWnnt09xughajjWpFsw=="; }; }; - "@types/node-10.17.39" = { + "@types/node-10.17.40" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.39"; + version = "10.17.40"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.39.tgz"; - sha512 = "dJLCxrpQmgyxYGcl0Ae9MTsQgI22qHHcGFj/8VKu7McJA5zQpnuGjoksnxbo1JxSjW/Nahnl13W8MYZf01CZHA=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.40.tgz"; + sha512 = "3hZT2z2/531A5pc8hYhn1gU5Qb1SIRSgMLQ6zuHA5xtt16lWAxUGprtr8lJuc9zNJMXEIIBWfSnzqBP/4mglpA=="; }; }; "@types/node-12.7.12" = { @@ -5548,13 +5539,13 @@ let sha512 = "KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ=="; }; }; - "@types/node-13.13.25" = { + "@types/node-13.13.26" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.25"; + version = "13.13.26"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.25.tgz"; - sha512 = "6ZMK4xRcF2XrPdKmPYQxZkdHKV18xKgUFVvhIgw2iwaaO6weleLPHLBGPZmLhjo+m1N+MZXRAoBEBCCVqgO2zQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.26.tgz"; + sha512 = "+48LLqolaKj/WnIY1crfLseaGQMIDISBy3PTXVOZ7w/PBaRUv+H8t94++atzfoBAvorbUYz6Xq9vh1fHrg33ig=="; }; }; "@types/node-14.0.26" = { @@ -5566,40 +5557,40 @@ let sha512 = "W+fpe5s91FBGE0pEa0lnqGLL4USgpLgs4nokw16SrBBco/gQxuua7KnArSEOd5iaMqbbSHV10vUDkJYJJqpXKA=="; }; }; - "@types/node-14.11.8" = { + "@types/node-14.11.10" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.11.8"; + version = "14.11.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.11.8.tgz"; - sha512 = "KPcKqKm5UKDkaYPTuXSx8wEP7vE9GnuaXIZKijwRYcePpZFDVuy2a57LarFKiORbHOuTOOwYzxVxcUzsh2P2Pw=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.11.10.tgz"; + sha512 = "yV1nWZPlMFpoXyoknm4S56y2nlTAuFYaJuQtYRAOU7xA/FJ9RY0Xm7QOkaYMMmr8ESdHIuUb6oQgR/0+2NqlyA=="; }; }; - "@types/node-6.14.12" = { + "@types/node-6.14.13" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "6.14.12"; + version = "6.14.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-6.14.12.tgz"; - sha512 = "7iPCCv/SOqeGvz3CcBBnhG+3vBMntO3SMVcyUHmrJq6Lzdbi4dtSxk3JkIUm+JDGnT26mtxlNQHmTKlvDnjFwg=="; + url = "https://registry.npmjs.org/@types/node/-/node-6.14.13.tgz"; + sha512 = "J1F0XJ/9zxlZel5ZlbeSuHW2OpabrUAqpFuC2sm2I3by8sERQ8+KCjNKUcq8QHuzpGMWiJpo9ZxeHrqrP2KzQw=="; }; }; - "@types/node-8.10.64" = { + "@types/node-8.10.65" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.64"; + version = "8.10.65"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.64.tgz"; - sha512 = "/EwBIb+imu8Qi/A3NF9sJ9iuKo7yV+pryqjmeRqaU0C4wBAOhas5mdvoYeJ5PCKrh6thRSJHdoasFqh3BQGILA=="; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.65.tgz"; + sha512 = "xdcqtQl1g3p/49kmcj7ZixPWOcNHA1tYNz+uN0PJEcgtN6zywK74aacTnd3eFGPuBpD7kK8vowmMRkUt6jHU/Q=="; }; }; - "@types/node-9.6.59" = { + "@types/node-9.6.60" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "9.6.59"; + version = "9.6.60"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-9.6.59.tgz"; - sha512 = "TX/dHK9lFrXoMFtHdF3oyEw6EpfYfu+8AZ1zP6Oj3rOiQGbit2rgQlJzvBRx712b9ReaCfkSNPRXYzZDYI4YSw=="; + url = "https://registry.npmjs.org/@types/node/-/node-9.6.60.tgz"; + sha512 = "yoi9MNxtIwaN23LlUnqFiEjS13gg8tgYMCBR8AV34haAFuLswIdCpaYmOcoKLmhhOPwngbs0ZQG7I0EqWTsaRA=="; }; }; "@types/node-fetch-2.5.7" = { @@ -5971,13 +5962,13 @@ let sha512 = "NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ=="; }; }; - "@types/yargs-15.0.8" = { + "@types/yargs-15.0.9" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; - version = "15.0.8"; + version = "15.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.8.tgz"; - sha512 = "b0BYzFUzBpOhPjpl1wtAHU994jBeKF4TKVlT7ssFv44T617XNcPdRoG4AzHLVshLzlrF7i3lTelH7UbuNYV58Q=="; + url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.9.tgz"; + sha512 = "HmU8SeIRhZCWcnRskCs36Q1Q00KBV6Cqh/ora8WN1+22dY07AZdn6Gel8QZ3t26XYPImtcL8WV/eqjhVmMEw4g=="; }; }; "@types/yargs-parser-15.0.0" = { @@ -6187,76 +6178,76 @@ let sha512 = "9EyKQKj/KhRcReWHa8G4j5d6YG/+dUppHo1IjeTbAhRdFmPgVJ3B51y+epK136s8KqS9p/bcsXXuIs8gZIxcjw=="; }; }; - "@vue/compiler-core-3.0.0" = { + "@vue/compiler-core-3.0.1" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.0.tgz"; - sha512 = "XqPC7vdv4rFE77S71oCHmT1K4Ks3WE2Gi6Lr4B5wn0Idmp+NyQQBUHsCNieMDRiEpgtJrw+yOHslrsV0AfAsfQ=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.1.tgz"; + sha512 = "BbQQj9YVNaNWEPnP4PiFKgW8QSGB3dcPSKCtekx1586m4VA1z8hHNLQnzeygtV8BM4oU6yriiWmOIYghbJHwFw=="; }; }; - "@vue/compiler-dom-3.0.0" = { + "@vue/compiler-dom-3.0.1" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.0.tgz"; - sha512 = "ukDEGOP8P7lCPyStuM3F2iD5w2QPgUu2xwCW2XNeqPjFKIlR2xMsWjy4raI/cLjN6W16GtlMFaZdK8tLj5PRog=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.1.tgz"; + sha512 = "8cjgswVU2YmV35H9ARZmSlDr1P9VZxUihRwefkrk6Vrsb7kui5C3d/WQ2/su34FSDpyMU1aacUOiL2CV/vdX6w=="; }; }; - "@vue/compiler-sfc-3.0.0" = { + "@vue/compiler-sfc-3.0.1" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.0.tgz"; - sha512 = "1Bn4L5jNRm6tlb79YwqYUGGe+Yc9PRoRSJi67NJX6icdhf84+tRMtESbx1zCLL9QixQXu2+7aLkXHxvh4RpqAA=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.1.tgz"; + sha512 = "VO5gJ7SyHw0hf1rkKXRlxjXI9+Q4ngcuUWYnyjOSDch7Wtt2IdOEiC82KFWIkfWMpHqA5HPzL2nDmys3y9d19w=="; }; }; - "@vue/compiler-ssr-3.0.0" = { + "@vue/compiler-ssr-3.0.1" = { name = "_at_vue_slash_compiler-ssr"; packageName = "@vue/compiler-ssr"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.0.tgz"; - sha512 = "Er41F9ZFyKB3YnNbE6JSTIGCVWve3NAQimgDOk4uP42OnckxBYKGBTutDeFNeqUZBMu/9vRHYrxlGFC9Z5jBVQ=="; + url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.1.tgz"; + sha512 = "U0Vb7BOniw9rY0/YvXNw5EuIuO0dCoZd3XhnDjAKL9A5pSBxTlx6fPJeQ53gV0XH40M5z8q4yXukFqSVTXC6hQ=="; }; }; - "@vue/reactivity-3.0.0" = { + "@vue/reactivity-3.0.1" = { name = "_at_vue_slash_reactivity"; packageName = "@vue/reactivity"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.0.tgz"; - sha512 = "mEGkztGQrAPZRhV7C6PorrpT3+NtuA4dY2QjMzzrW31noKhssWTajRZTwpLF39NBRrF5UU6cp9+1I0FfavMgEQ=="; + url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.1.tgz"; + sha512 = "XWeqNTbvcAq8BmtR5M+XU6mfIhzi1NTcrQho7nI03I+Zf6QW1hHl/ri+iNfCNCasukQI/tzpkqJYPfyZxCRKyg=="; }; }; - "@vue/runtime-core-3.0.0" = { + "@vue/runtime-core-3.0.1" = { name = "_at_vue_slash_runtime-core"; packageName = "@vue/runtime-core"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.0.tgz"; - sha512 = "3ABMLeA0ZbeVNLbGGLXr+pNUwqXILOqz8WCVGfDWwQb+jW114Cm8djOHVVDoqdvRETQvDf8yHSUmpKHZpQuTkA=="; + url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.1.tgz"; + sha512 = "HporlL3cbD0/79U0a7mDIMEn5XoxstVXrOx0TDTi2O2CUv6yjteUQdxhmMOa8m7pnqU4DL/ZuVntBWFaf4ccaw=="; }; }; - "@vue/runtime-dom-3.0.0" = { + "@vue/runtime-dom-3.0.1" = { name = "_at_vue_slash_runtime-dom"; packageName = "@vue/runtime-dom"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.0.tgz"; - sha512 = "f312n5w9gK6mVvkDSj6/Xnot1XjlKXzFBYybmoy6ahAVC8ExbQ+LOWti1IZM/adU8VMNdKaw7Q53Hxz3y5jX8g=="; + url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.1.tgz"; + sha512 = "ijb2qTRU8OzllzYQ6BSymuu9KHFDyjzn4m6jcLGlNeazdk1/YA01lFtGkl6oAErdiWPglloUJzIz0ilv0laPwA=="; }; }; - "@vue/shared-3.0.0" = { + "@vue/shared-3.0.1" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.0.tgz"; - sha512 = "4XWL/avABGxU2E2ZF1eZq3Tj7fvksCMssDZUHOykBIMmh5d+KcAnQMC5XHMhtnA0NAvktYsA2YpdsVwVmhWzvA=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.1.tgz"; + sha512 = "/X6AUbTFCyD2BcJnBoacUct8qcv1A5uk1+N+3tbzDVuhGPRmoYrTSnNUuF53C/GIsTkChrEiXaJh2kyo/0tRvw=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -9481,13 +9472,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.771.0" = { + "aws-sdk-2.773.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.771.0"; + version = "2.773.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.771.0.tgz"; - sha512 = "fqNGusCwkdemx3yFqvQbU1+xq/PB2wGq7EQIrrTZx/zxfXUp+7+PnrHzXtViCRghN0tylLghBfWYD4VcVcqi7g=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.773.0.tgz"; + sha512 = "bwqEm/x3HMUd/xfcUeTjCQFi904oSNcwl2ZNz3mwAdEIqt3sQ9aE3GYoZQxKXw/XHQlF7hPiKO07GDGmS6x4AQ=="; }; }; "aws-sign2-0.6.0" = { @@ -13342,13 +13333,13 @@ let sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="; }; }; - "cliui-7.0.2" = { + "cliui-7.0.3" = { name = "cliui"; packageName = "cliui"; - version = "7.0.2"; + version = "7.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-7.0.2.tgz"; - sha512 = "lhpKkuUj67j5JgZIPZxLe7nSa4MQoojzRVWQyzMqBp2hBg6gwRjUDAwC1YDeBaC3APDBKNnjWbv2mlDF4XgOSA=="; + url = "https://registry.npmjs.org/cliui/-/cliui-7.0.3.tgz"; + sha512 = "Gj3QHTkVMPKqwP3f7B4KPkBZRMR9r4rfi5bXFpg1a+Svvj8l7q5CnkBkVQzfxT5DFSsGk2+PascOgL0JYkL2kw=="; }; }; "clivas-0.1.4" = { @@ -18572,13 +18563,13 @@ let sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w=="; }; }; - "electron-to-chromium-1.3.580" = { + "electron-to-chromium-1.3.582" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.580"; + version = "1.3.582"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.580.tgz"; - sha512 = "5flHTbRpptO6h3lQUG4zdSAxryAS3PrZOkLpLS0DL5/y2LBf+l9HJ8X6UBorNs1QRBrMR7u/QvkdK+GlekW1kQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.582.tgz"; + sha512 = "0nCJ7cSqnkMC+kUuPs0YgklFHraWGl/xHqtZWWtOeVtyi+YqkoAOMGuZQad43DscXCQI/yizcTa3u6B5r+BLww=="; }; }; "elegant-spinner-1.0.1" = { @@ -21669,13 +21660,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.135.0" = { + "flow-parser-0.136.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.135.0"; + version = "0.136.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.135.0.tgz"; - sha512 = "ev8SvmG+XU9D6WgHVezP4kY3Myr1tJvTUTEi7mbhhj+rn889K7YXdakte6oqXNLIJYJ2f5Fuw18zXTVa1NO8Kw=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.136.0.tgz"; + sha512 = "PB2vYAqmz+dRikpx8TpNgRtBsyemP+7oQa0BcPZWnGABlJlB2WgJc/Lx0HeEPOUxDO/TxBbPaIHsffEIL9M6BQ=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -24847,13 +24838,13 @@ let sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="; }; }; - "hosted-git-info-3.0.6" = { + "hosted-git-info-3.0.7" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.6.tgz"; - sha512 = "VRvqVD5T6t9HdmNDWTwbi8H/EC722MemAhOSP5QvYAXpDAY0Nhu2I/i+bXsktu4sU5LVHSh/wmXtVU8bDtjedQ=="; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.7.tgz"; + sha512 = "fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ=="; }; }; "hot-shots-6.8.7" = { @@ -27692,13 +27683,13 @@ let sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; }; }; - "is-valid-domain-0.0.15" = { + "is-valid-domain-0.0.16" = { name = "is-valid-domain"; packageName = "is-valid-domain"; - version = "0.0.15"; + version = "0.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.0.15.tgz"; - sha512 = "Mcq4a6oLR+ugNyUlZ8WbuJBCm6hB50B6bgZcr0z7qm4mjbmw+WuqLAxR0eV+jnmtRcSSd++21wD4aQJZb7YZZg=="; + url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.0.16.tgz"; + sha512 = "3IUxXDOLh9HBmfyHx9ySK4ZZuN8qU2Z1GPT2jNSmY/H7p8nhEXYX36WYpAQYAulupTgA5WnSYXWiWuLYp3Fw1Q=="; }; }; "is-valid-glob-1.0.0" = { @@ -35434,13 +35425,13 @@ let sha512 = "ASCL5U13as7HhOExbT6OlWJJUV/lLzL2voOSP1UVehpRD8FbSrSDjfScK/KwAvVTI5AS6r4VwbOMlIqtvRidnA=="; }; }; - "node-appc-1.1.1" = { + "node-appc-1.1.2" = { name = "node-appc"; packageName = "node-appc"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-appc/-/node-appc-1.1.1.tgz"; - sha512 = "QYOmRUq9B0LfVZ5MWQlbv8tHa4pzQ+YbagjUUvMIx6lVjhCjG9pPMRyPFK7/HXiQ+WrsiuydSbJgsBZt1p18Rg=="; + url = "https://registry.npmjs.org/node-appc/-/node-appc-1.1.2.tgz"; + sha512 = "TBf8vh0NTD9DxG3oXQ1j/DCiREqDUI2khzJScZyq9w5AiYb+682WSjhl1f9Z1BJEjwWY7GFHQIpxxFVJ53OMfw=="; }; }; "node-bitmap-0.0.1" = { @@ -36948,13 +36939,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.146.2" = { + "office-ui-fabric-react-7.147.0" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.146.2"; + version = "7.147.0"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.146.2.tgz"; - sha512 = "CRpojV9BK4gbYmfkFaoAxyzQdt0t7v/TRLuGlfPcZkjY7+5m7Jx4LHj80SArPkr1hqWSGQMB9dWBF08OeQVVJw=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.147.0.tgz"; + sha512 = "hCdHsBLAcq+Uj2SQ+P35gp/O7TRvf/Q0LQ46uklAPS+71WrsMIu/0jzj/e7dSzuLySE2TtiozwFKfD2Byf7bZw=="; }; }; "omggif-1.0.10" = { @@ -44716,13 +44707,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.30.0" = { + "rollup-2.32.0" = { name = "rollup"; packageName = "rollup"; - version = "2.30.0"; + version = "2.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.30.0.tgz"; - sha512 = "j4K1hUZfgFM03DUpayd3c7kZW+2wDbI6rj7ssQxpCpL1vsGpaM0vSorxBuePFwQDFq9O2DI6AOQbm174Awsq4w=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.32.0.tgz"; + sha512 = "0FIG1jY88uhCP2yP4CfvtKEqPDRmsUwfY1kEOOM+DH/KOGATgaIFd/is1+fQOxsvh62ELzcFfKonwKWnHhrqmw=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -46732,13 +46723,13 @@ let sha512 = "/xcDy8H5wxhk+4E9e8zDDGfcNo5g+zpwy585sCDkH5KpHdZHmguPi0GmZ9ZCBTuGIodeTIqsDqkBiA1WXSH7+w=="; }; }; - "snyk-docker-plugin-3.26.2" = { + "snyk-docker-plugin-4.1.1" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "3.26.2"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.26.2.tgz"; - sha512 = "66t+KkAbaHcJJUDUXj5TBeiFkId9SfdChrsYiI7srRLWNU3PG20V3JrjNx7hjEqJpCJCsucnUjTwouZWg39eUg=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.1.1.tgz"; + sha512 = "2N8um3cU+qWAVut0Pm/jTM1Hcjyk4kQLKd5nX/Fl/DOhxi62pVpIQ6qGE2LKxYTShEpeC0YS70D9J4ke7ra8Dw=="; }; }; "snyk-go-parser-1.4.1" = { @@ -46813,13 +46804,13 @@ let sha512 = "0zbmtidYLI2ia/DQD4rZm2YKrhfHLvHlVBdF2cMAGPwhOoKW5ovG9eBO4wNQdvjxNi7b4VeUyAj8SfuhjDraDQ=="; }; }; - "snyk-nodejs-lockfile-parser-1.29.0" = { + "snyk-nodejs-lockfile-parser-1.30.0" = { name = "snyk-nodejs-lockfile-parser"; packageName = "snyk-nodejs-lockfile-parser"; - version = "1.29.0"; + version = "1.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.29.0.tgz"; - sha512 = "pQL5fe0lypifou0QAvirTsj0Ez7zHjwBUUq9U5ManMfPqFt89nwIK/5/xW0o3OiFM56Iu3uLUQXM/BhYqBokzQ=="; + url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.30.0.tgz"; + sha512 = "OmrLyV9oZ2ItH0oNoRs5BjTlvS+lSsYuBw8PryvsdmcNK6VzfMoJ7RuevTau201gVvMz1imTi7LlTxcSoCCzJg=="; }; }; "snyk-nuget-plugin-1.19.3" = { @@ -49747,13 +49738,13 @@ let sha512 = "hAu/ig5N8i0trXXbrC7rwbXV4DhpEAsZhYXDs1305OjmDgjGC0thINbb0197idy3Pp+B6w7u426SUM43GAP7qw=="; }; }; - "swagger-ui-dist-3.35.1" = { + "swagger-ui-dist-3.35.2" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.35.1"; + version = "3.35.2"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.35.1.tgz"; - sha512 = "ltrCX8+YWsqDBvCdLJwnO6VsgjV/uzLm+cTEUe0DZ1fAXIxUnNjvE/aAjXiRfNppUnCbUgZvJK1LYPAjF7W1XA=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.35.2.tgz"; + sha512 = "19oRW6ZVCTY7JnaMFnIUoxkqI+xhBOGzSFVQTMLDB9KTNASP82v/0SkNpY2T4zbjwZF2Y5bcty9E6rhLGAj0Gg=="; }; }; "swagger2openapi-5.4.0" = { @@ -49855,13 +49846,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.27.9" = { + "systeminformation-4.27.10" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.27.9"; + version = "4.27.10"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.27.9.tgz"; - sha512 = "vgyFkDaskUAtheTchR65G08rWZFSHos3Hr15JOGEpHvx+GOmUDy7Xurrq3sWhWuPFjq6mBmzlE1kvkKkDytWOQ=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.27.10.tgz"; + sha512 = "qXuJaa+3A1bLkFNr/rn3H9Uw8UGodSbq+1QjxDbXua9iexfw4UIdAZZTyu9kE5OkXG1Lt6u0z4aZfxYRVL68EA=="; }; }; "syswide-cas-5.3.0" = { @@ -50396,13 +50387,13 @@ let sha512 = "cjdZte66fYkZ65rQ2oJfrdCAkkhJA7YLYk5eGOcGCSGlq0ieZupRdjedSQXYknMPo2IveQL+tPdrxUkERENCFA=="; }; }; - "terser-webpack-plugin-4.2.3" = { + "terser-webpack-plugin-5.0.0" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; - version = "4.2.3"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz"; - sha512 = "jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ=="; + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.0.0.tgz"; + sha512 = "rf7l5a9xamIVX3enQeTl0MY2MNeZClo5yPX/tVPy22oY0nzu0b45h7JqyFi/bygqKWtzXMnml0u12mArhQPsBQ=="; }; }; "test-exclude-6.0.0" = { @@ -54662,13 +54653,13 @@ let sha512 = "X4pzcrJ8dE7M3ArFuySF5fgipKDd/EauXkiJwtjBIVRWpVNq0tF9+lNCyuC7iDUwP3Oq7ow/TGssD3GdG96Jow=="; }; }; - "vscode-emmet-helper-2.0.4" = { + "vscode-emmet-helper-2.0.5" = { name = "vscode-emmet-helper"; packageName = "vscode-emmet-helper"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-2.0.4.tgz"; - sha512 = "g5yf6RnhGsCymg2YOK2HoK5hyBphB6b5bCEqF/3YwLTMO+9epZnSa6qSzAzz3U68y7IOlmW7ssFP5kOjybcA9g=="; + url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-2.0.5.tgz"; + sha512 = "lDP+soFnJgEkUrdAWqdUYRFfXRFnmXhjzyzca+fy9vCUorr3lp32IKIys8mYwnlAUencmyXmF5JwN0VikUXj/Q=="; }; }; "vscode-html-languageservice-2.1.12" = { @@ -55076,13 +55067,13 @@ let sha512 = "uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="; }; }; - "vue-3.0.0" = { + "vue-3.0.1" = { name = "vue"; packageName = "vue"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-3.0.0.tgz"; - sha512 = "ZMrAARZ32sGIaYKr7Fk2GZEBh/VhulSrGxcGBiAvbN4fhjl3tuJyNFbbbLFqGjndbLoBW66I2ECq8ICdvkKdJw=="; + url = "https://registry.npmjs.org/vue/-/vue-3.0.1.tgz"; + sha512 = "WBTgaQMJIWQuhlzMV6C0qvVrxyQSpx3gKwflYC0sqGKEZSxMIOYRnrIlHUN4ivUVvP7mUMxcnFTt7P+akdOkQA=="; }; }; "vue-cli-plugin-apollo-0.21.3" = { @@ -56922,13 +56913,13 @@ let sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; }; }; - "y18n-5.0.2" = { + "y18n-5.0.4" = { name = "y18n"; packageName = "y18n"; - version = "5.0.2"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-5.0.2.tgz"; - sha512 = "CkwaeZw6dQgqgPGeTWKMXCRmMcBgETFlTml1+ZOO+q7kGst8NREJ+eWwFNPVUQ4QGdAaklbqCZHH6Zuep1RjiA=="; + url = "https://registry.npmjs.org/y18n/-/y18n-5.0.4.tgz"; + sha512 = "deLOfD+RvFgrpAmSZgfGdWYE+OKyHcVHaRQ7NphG/63scpRvTHHeQMAxGGvaLVGJ+HYVcCXlzcTK0ZehFf+eHQ=="; }; }; "yaeti-0.0.6" = { @@ -57102,6 +57093,15 @@ let sha512 = "6+nLw8xa9uK1BOEOykaiYAJVh6/CjxWXK/q9b5FpRgNslt8s22F2xMBqVIKgCRjNgGvGPBy8Vog7WN7yh4amtA=="; }; }; + "yargs-16.1.0" = { + name = "yargs"; + packageName = "yargs"; + version = "16.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-16.1.0.tgz"; + sha512 = "upWFJOmDdHN0syLuESuvXDmrRcWd1QafJolHskzaw79uZa7/x53gxQKiR07W59GWY1tFhhU/Th9DrtSfpS782g=="; + }; + }; "yargs-3.10.0" = { name = "yargs"; packageName = "yargs"; @@ -57201,13 +57201,13 @@ let sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4"; }; }; - "yargs-parser-20.2.2" = { + "yargs-parser-20.2.3" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "20.2.2"; + version = "20.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.2.tgz"; - sha512 = "XmrpXaTl6noDsf1dKpBuUNCOHqjs0g3jRMXf/ztRxdOmb+er8kE5z5b55Lz3p5u2T8KJ59ENBnASS8/iapVJ5g=="; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.3.tgz"; + sha512 = "emOFRT9WVHw03QSvN5qor9QQT9+sw5vwxfYweivSMHTcAXPefwVae2FjO7JJjj8hCE4CzPOPeFM83VwT29HCww=="; }; }; "yargs-parser-4.2.1" = { @@ -57584,7 +57584,7 @@ in sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-symbols-1.0.1" - sources."hosted-git-info-3.0.6" + sources."hosted-git-info-3.0.7" sources."http-cache-semantics-3.8.1" (sources."http-proxy-agent-2.1.0" // { dependencies = [ @@ -58403,7 +58403,7 @@ in sources."@types/anymatch-1.3.1" sources."@types/json-schema-7.0.6" sources."@types/json5-0.0.29" - sources."@types/node-14.11.8" + sources."@types/node-14.11.10" sources."@types/parse-json-4.0.0" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" @@ -59138,7 +59138,7 @@ in sources."@apollo/federation-0.20.2" (sources."@apollo/protobufjs-1.0.5" // { dependencies = [ - sources."@types/node-10.17.39" + sources."@types/node-10.17.40" ]; }) sources."@apollographql/apollo-tools-0.4.8" @@ -59148,92 +59148,112 @@ in sources."@apollographql/graphql-language-service-utils-2.0.2" sources."@apollographql/graphql-playground-html-1.6.26" sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.12.0" - (sources."@babel/core-7.12.0" // { + sources."@babel/compat-data-7.12.1" + (sources."@babel/core-7.12.1" // { dependencies = [ - sources."@babel/generator-7.12.0" - sources."@babel/types-7.12.0" + sources."@babel/generator-7.12.1" + sources."@babel/types-7.12.1" sources."semver-5.7.1" ]; }) (sources."@babel/generator-7.11.6" // { dependencies = [ - sources."@babel/types-7.12.0" + sources."@babel/types-7.12.1" ]; }) sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - (sources."@babel/helper-compilation-targets-7.12.0" // { + (sources."@babel/helper-compilation-targets-7.12.1" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/helper-create-class-features-plugin-7.12.0" - sources."@babel/helper-create-regexp-features-plugin-7.12.0" + sources."@babel/helper-create-class-features-plugin-7.12.1" + sources."@babel/helper-create-regexp-features-plugin-7.12.1" (sources."@babel/helper-define-map-7.10.5" // { dependencies = [ - sources."@babel/types-7.12.0" + sources."@babel/types-7.12.1" + ]; + }) + (sources."@babel/helper-explode-assignable-expression-7.12.1" // { + dependencies = [ + sources."@babel/types-7.12.1" ]; }) - sources."@babel/helper-explode-assignable-expression-7.11.4" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" - (sources."@babel/helper-member-expression-to-functions-7.12.0" // { + (sources."@babel/helper-member-expression-to-functions-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.0" + sources."@babel/types-7.12.1" ]; }) - sources."@babel/helper-module-imports-7.10.4" - (sources."@babel/helper-module-transforms-7.12.0" // { + (sources."@babel/helper-module-imports-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.0" + sources."@babel/types-7.12.1" + ]; + }) + (sources."@babel/helper-module-transforms-7.12.1" // { + dependencies = [ + sources."@babel/types-7.12.1" ]; }) sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-regex-7.10.5" - sources."@babel/helper-remap-async-to-generator-7.11.4" - (sources."@babel/helper-replace-supers-7.12.0" // { + (sources."@babel/helper-remap-async-to-generator-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.0" + sources."@babel/types-7.12.1" ]; }) - sources."@babel/helper-simple-access-7.10.4" - (sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" // { + (sources."@babel/helper-replace-supers-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.0" + sources."@babel/types-7.12.1" + ]; + }) + (sources."@babel/helper-simple-access-7.12.1" // { + dependencies = [ + sources."@babel/types-7.12.1" + ]; + }) + (sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" // { + dependencies = [ + sources."@babel/types-7.12.1" ]; }) (sources."@babel/helper-split-export-declaration-7.11.0" // { dependencies = [ - sources."@babel/types-7.12.0" + sources."@babel/types-7.12.1" ]; }) sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/helper-validator-option-7.12.0" + sources."@babel/helper-validator-option-7.12.1" sources."@babel/helper-wrap-function-7.10.4" - sources."@babel/helpers-7.10.4" + (sources."@babel/helpers-7.12.1" // { + dependencies = [ + sources."@babel/types-7.12.1" + ]; + }) sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.0" - sources."@babel/plugin-proposal-async-generator-functions-7.10.5" - sources."@babel/plugin-proposal-class-properties-7.10.4" - sources."@babel/plugin-proposal-dynamic-import-7.10.4" - sources."@babel/plugin-proposal-export-namespace-from-7.12.0" - sources."@babel/plugin-proposal-json-strings-7.10.4" - sources."@babel/plugin-proposal-logical-assignment-operators-7.12.0" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.0" - sources."@babel/plugin-proposal-numeric-separator-7.12.0" - sources."@babel/plugin-proposal-object-rest-spread-7.11.0" - sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" - sources."@babel/plugin-proposal-optional-chaining-7.12.0" - sources."@babel/plugin-proposal-private-methods-7.10.4" - sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" + sources."@babel/parser-7.12.2" + sources."@babel/plugin-proposal-async-generator-functions-7.12.1" + sources."@babel/plugin-proposal-class-properties-7.12.1" + sources."@babel/plugin-proposal-dynamic-import-7.12.1" + sources."@babel/plugin-proposal-export-namespace-from-7.12.1" + sources."@babel/plugin-proposal-json-strings-7.12.1" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" + sources."@babel/plugin-proposal-numeric-separator-7.12.1" + sources."@babel/plugin-proposal-object-rest-spread-7.12.1" + sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" + sources."@babel/plugin-proposal-optional-chaining-7.12.1" + sources."@babel/plugin-proposal-private-methods-7.12.1" + sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.10.4" + sources."@babel/plugin-syntax-class-properties-7.12.1" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.10.4" + sources."@babel/plugin-syntax-flow-7.12.1" sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" @@ -59241,64 +59261,64 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.10.4" - sources."@babel/plugin-syntax-typescript-7.10.4" - sources."@babel/plugin-transform-arrow-functions-7.10.4" - sources."@babel/plugin-transform-async-to-generator-7.10.4" - sources."@babel/plugin-transform-block-scoped-functions-7.10.4" - sources."@babel/plugin-transform-block-scoping-7.11.1" - sources."@babel/plugin-transform-classes-7.10.4" - sources."@babel/plugin-transform-computed-properties-7.10.4" - sources."@babel/plugin-transform-destructuring-7.10.4" - sources."@babel/plugin-transform-dotall-regex-7.10.4" - sources."@babel/plugin-transform-duplicate-keys-7.10.4" - sources."@babel/plugin-transform-exponentiation-operator-7.10.4" - sources."@babel/plugin-transform-flow-strip-types-7.10.4" - sources."@babel/plugin-transform-for-of-7.10.4" - sources."@babel/plugin-transform-function-name-7.10.4" - sources."@babel/plugin-transform-literals-7.10.4" - sources."@babel/plugin-transform-member-expression-literals-7.10.4" - sources."@babel/plugin-transform-modules-amd-7.10.5" - sources."@babel/plugin-transform-modules-commonjs-7.10.4" - sources."@babel/plugin-transform-modules-systemjs-7.12.0" - sources."@babel/plugin-transform-modules-umd-7.10.4" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.4" - sources."@babel/plugin-transform-new-target-7.10.4" - sources."@babel/plugin-transform-object-super-7.10.4" - sources."@babel/plugin-transform-parameters-7.10.5" - sources."@babel/plugin-transform-property-literals-7.10.4" - sources."@babel/plugin-transform-regenerator-7.10.4" - sources."@babel/plugin-transform-reserved-words-7.10.4" - sources."@babel/plugin-transform-shorthand-properties-7.10.4" - sources."@babel/plugin-transform-spread-7.11.0" - sources."@babel/plugin-transform-sticky-regex-7.10.4" - sources."@babel/plugin-transform-template-literals-7.10.5" - sources."@babel/plugin-transform-typeof-symbol-7.10.4" - sources."@babel/plugin-transform-typescript-7.12.0" - sources."@babel/plugin-transform-unicode-escapes-7.10.4" - sources."@babel/plugin-transform-unicode-regex-7.10.4" - (sources."@babel/preset-env-7.12.0" // { + sources."@babel/plugin-syntax-top-level-await-7.12.1" + sources."@babel/plugin-syntax-typescript-7.12.1" + sources."@babel/plugin-transform-arrow-functions-7.12.1" + sources."@babel/plugin-transform-async-to-generator-7.12.1" + sources."@babel/plugin-transform-block-scoped-functions-7.12.1" + sources."@babel/plugin-transform-block-scoping-7.12.1" + sources."@babel/plugin-transform-classes-7.12.1" + sources."@babel/plugin-transform-computed-properties-7.12.1" + sources."@babel/plugin-transform-destructuring-7.12.1" + sources."@babel/plugin-transform-dotall-regex-7.12.1" + sources."@babel/plugin-transform-duplicate-keys-7.12.1" + sources."@babel/plugin-transform-exponentiation-operator-7.12.1" + sources."@babel/plugin-transform-flow-strip-types-7.12.1" + sources."@babel/plugin-transform-for-of-7.12.1" + sources."@babel/plugin-transform-function-name-7.12.1" + sources."@babel/plugin-transform-literals-7.12.1" + sources."@babel/plugin-transform-member-expression-literals-7.12.1" + sources."@babel/plugin-transform-modules-amd-7.12.1" + sources."@babel/plugin-transform-modules-commonjs-7.12.1" + sources."@babel/plugin-transform-modules-systemjs-7.12.1" + sources."@babel/plugin-transform-modules-umd-7.12.1" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1" + sources."@babel/plugin-transform-new-target-7.12.1" + sources."@babel/plugin-transform-object-super-7.12.1" + sources."@babel/plugin-transform-parameters-7.12.1" + sources."@babel/plugin-transform-property-literals-7.12.1" + sources."@babel/plugin-transform-regenerator-7.12.1" + sources."@babel/plugin-transform-reserved-words-7.12.1" + sources."@babel/plugin-transform-shorthand-properties-7.12.1" + sources."@babel/plugin-transform-spread-7.12.1" + sources."@babel/plugin-transform-sticky-regex-7.12.1" + sources."@babel/plugin-transform-template-literals-7.12.1" + sources."@babel/plugin-transform-typeof-symbol-7.12.1" + sources."@babel/plugin-transform-typescript-7.12.1" + sources."@babel/plugin-transform-unicode-escapes-7.12.1" + sources."@babel/plugin-transform-unicode-regex-7.12.1" + (sources."@babel/preset-env-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.0" + sources."@babel/types-7.12.1" sources."semver-5.7.1" ]; }) - sources."@babel/preset-flow-7.10.4" + sources."@babel/preset-flow-7.12.1" sources."@babel/preset-modules-0.1.4" - sources."@babel/preset-typescript-7.12.0" - (sources."@babel/register-7.12.0" // { + sources."@babel/preset-typescript-7.12.1" + (sources."@babel/register-7.12.1" // { dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.12.0" + sources."@babel/runtime-7.12.1" sources."@babel/template-7.10.4" - (sources."@babel/traverse-7.12.0" // { + (sources."@babel/traverse-7.12.1" // { dependencies = [ - sources."@babel/generator-7.12.0" - sources."@babel/types-7.12.0" + sources."@babel/generator-7.12.1" + sources."@babel/types-7.12.1" ]; }) sources."@babel/types-7.10.4" @@ -59434,7 +59454,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-2.0.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.11.8" + sources."@types/node-14.11.10" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.0" @@ -59455,24 +59475,24 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.7" sources."@vue/cli-ui-addon-widgets-4.5.7" - (sources."@vue/compiler-core-3.0.0" // { + (sources."@vue/compiler-core-3.0.1" // { dependencies = [ - sources."@babel/types-7.12.0" + sources."@babel/types-7.12.1" sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.0.0" - (sources."@vue/compiler-sfc-3.0.0" // { + sources."@vue/compiler-dom-3.0.1" + (sources."@vue/compiler-sfc-3.0.1" // { dependencies = [ - sources."@babel/types-7.12.0" + sources."@babel/types-7.12.1" sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-ssr-3.0.0" - sources."@vue/reactivity-3.0.0" - sources."@vue/runtime-core-3.0.0" - sources."@vue/runtime-dom-3.0.0" - sources."@vue/shared-3.0.0" + sources."@vue/compiler-ssr-3.0.1" + sources."@vue/reactivity-3.0.1" + sources."@vue/runtime-core-3.0.1" + sources."@vue/runtime-dom-3.0.1" + sources."@vue/shared-3.0.1" sources."@wry/context-0.4.4" sources."@wry/equality-0.1.11" sources."abbrev-1.1.1" @@ -59882,7 +59902,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.580" + sources."electron-to-chromium-1.3.582" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -59973,7 +59993,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.135.0" + sources."flow-parser-0.136.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -60888,7 +60908,7 @@ in (sources."vue-codemod-0.0.4" // { dependencies = [ sources."globby-10.0.2" - sources."vue-3.0.0" + sources."vue-3.0.1" ]; }) sources."watch-1.0.2" @@ -61073,12 +61093,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/generator-7.12.0" + sources."@babel/generator-7.12.1" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.0" + sources."@babel/parser-7.12.2" sources."@babel/template-7.10.4" - sources."@babel/types-7.12.0" + sources."@babel/types-7.12.1" sources."@webassemblyjs/ast-1.9.1" sources."@webassemblyjs/floating-point-hex-parser-1.9.1" sources."@webassemblyjs/helper-api-error-1.9.1" @@ -61158,32 +61178,32 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - (sources."@babel/core-7.12.0" // { + (sources."@babel/core-7.12.1" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.12.0" // { + (sources."@babel/generator-7.12.1" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.0" - sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.12.0" + sources."@babel/helper-member-expression-to-functions-7.12.1" + sources."@babel/helper-module-imports-7.12.1" + sources."@babel/helper-module-transforms-7.12.1" sources."@babel/helper-optimise-call-expression-7.10.4" - sources."@babel/helper-replace-supers-7.12.0" - sources."@babel/helper-simple-access-7.10.4" + sources."@babel/helper-replace-supers-7.12.1" + sources."@babel/helper-simple-access-7.12.1" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/helpers-7.10.4" + sources."@babel/helpers-7.12.1" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.0" + sources."@babel/parser-7.12.2" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.12.0" - sources."@babel/types-7.12.0" + sources."@babel/traverse-7.12.1" + sources."@babel/types-7.12.1" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -61284,7 +61304,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.11.8" + sources."@types/node-14.11.10" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -61846,7 +61866,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.25" + sources."@types/node-13.13.26" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -62965,7 +62985,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.580" + sources."electron-to-chromium-1.3.582" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -63882,28 +63902,28 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/core-7.12.0" - sources."@babel/generator-7.12.0" + sources."@babel/core-7.12.1" + sources."@babel/generator-7.12.1" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.0" - sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.12.0" + sources."@babel/helper-member-expression-to-functions-7.12.1" + sources."@babel/helper-module-imports-7.12.1" + sources."@babel/helper-module-transforms-7.12.1" sources."@babel/helper-optimise-call-expression-7.10.4" - sources."@babel/helper-replace-supers-7.12.0" - sources."@babel/helper-simple-access-7.10.4" + sources."@babel/helper-replace-supers-7.12.1" + sources."@babel/helper-simple-access-7.12.1" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/helpers-7.10.4" + sources."@babel/helpers-7.12.1" (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.0" + sources."@babel/parser-7.12.2" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.12.0" - sources."@babel/types-7.12.0" + sources."@babel/traverse-7.12.1" + sources."@babel/types-7.12.1" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -63969,7 +63989,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.580" + sources."electron-to-chromium-1.3.582" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -64395,7 +64415,7 @@ in sources."@types/json-schema-7.0.6" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.11.8" + sources."@types/node-14.11.10" sources."@types/normalize-package-data-2.4.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" @@ -65359,7 +65379,7 @@ in sources."vscode-languageserver-types-3.16.0-next.2" ]; }) - (sources."vscode-emmet-helper-2.0.4" // { + (sources."vscode-emmet-helper-2.0.5" // { dependencies = [ sources."vscode-languageserver-types-3.15.1" ]; @@ -65847,7 +65867,7 @@ in sources."har-validator-5.1.5" sources."has-flag-4.0.0" sources."has-yarn-2.1.0" - sources."hosted-git-info-3.0.6" + sources."hosted-git-info-3.0.7" sources."http-cache-semantics-4.1.0" (sources."http-errors-1.7.2" // { dependencies = [ @@ -66088,7 +66108,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."systeminformation-4.27.9" + sources."systeminformation-4.27.10" sources."term-size-2.2.0" sources."through-2.3.8" sources."tmp-0.2.1" @@ -66175,7 +66195,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.11.8" + sources."@types/node-14.11.10" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -66543,7 +66563,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-14.11.8" + sources."@types/node-14.11.10" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -67665,7 +67685,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.771.0" + sources."aws-sdk-2.773.0" sources."aws-sign2-0.7.0" sources."aws4-1.10.1" sources."base64-js-1.3.1" @@ -67809,41 +67829,41 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/core-7.12.0" - sources."@babel/generator-7.12.0" + sources."@babel/core-7.12.1" + sources."@babel/generator-7.12.1" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-react-jsx-7.10.4" - sources."@babel/helper-builder-react-jsx-experimental-7.12.0" + sources."@babel/helper-builder-react-jsx-experimental-7.12.1" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.0" - sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.12.0" + sources."@babel/helper-member-expression-to-functions-7.12.1" + sources."@babel/helper-module-imports-7.12.1" + sources."@babel/helper-module-transforms-7.12.1" sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-replace-supers-7.12.0" - sources."@babel/helper-simple-access-7.10.4" + sources."@babel/helper-replace-supers-7.12.1" + sources."@babel/helper-simple-access-7.12.1" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/helpers-7.10.4" + sources."@babel/helpers-7.12.1" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.0" - sources."@babel/plugin-proposal-object-rest-spread-7.11.0" - sources."@babel/plugin-syntax-jsx-7.10.4" + sources."@babel/parser-7.12.2" + sources."@babel/plugin-proposal-object-rest-spread-7.12.1" + sources."@babel/plugin-syntax-jsx-7.12.1" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-transform-destructuring-7.10.4" - sources."@babel/plugin-transform-parameters-7.10.5" - sources."@babel/plugin-transform-react-jsx-7.10.4" + sources."@babel/plugin-transform-destructuring-7.12.1" + sources."@babel/plugin-transform-parameters-7.12.1" + sources."@babel/plugin-transform-react-jsx-7.12.1" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.12.0" - sources."@babel/types-7.12.0" + sources."@babel/traverse-7.12.1" + sources."@babel/types-7.12.1" sources."@sindresorhus/is-3.1.2" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.0" - sources."@types/node-14.11.8" + sources."@types/node-14.11.10" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -68159,7 +68179,7 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.146.2" + sources."@fluentui/react-7.147.0" sources."@fluentui/react-focus-7.16.12" sources."@fluentui/react-window-provider-0.3.3" sources."@fluentui/theme-1.5.0" @@ -69137,7 +69157,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.146.2" + sources."office-ui-fabric-react-7.147.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -70025,28 +70045,28 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.12.0" + sources."@babel/compat-data-7.12.1" sources."@babel/core-7.9.0" - sources."@babel/generator-7.12.0" + sources."@babel/generator-7.12.1" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" sources."@babel/helper-builder-react-jsx-7.10.4" - sources."@babel/helper-builder-react-jsx-experimental-7.12.0" - sources."@babel/helper-compilation-targets-7.12.0" - sources."@babel/helper-create-class-features-plugin-7.12.0" - sources."@babel/helper-create-regexp-features-plugin-7.12.0" + sources."@babel/helper-builder-react-jsx-experimental-7.12.1" + sources."@babel/helper-compilation-targets-7.12.1" + sources."@babel/helper-create-class-features-plugin-7.12.1" + sources."@babel/helper-create-regexp-features-plugin-7.12.1" (sources."@babel/helper-define-map-7.10.5" // { dependencies = [ sources."lodash-4.17.20" ]; }) - sources."@babel/helper-explode-assignable-expression-7.11.4" + sources."@babel/helper-explode-assignable-expression-7.12.1" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.0" - sources."@babel/helper-module-imports-7.10.4" - (sources."@babel/helper-module-transforms-7.12.0" // { + sources."@babel/helper-member-expression-to-functions-7.12.1" + sources."@babel/helper-module-imports-7.12.1" + (sources."@babel/helper-module-transforms-7.12.1" // { dependencies = [ sources."lodash-4.17.20" ]; @@ -70058,105 +70078,105 @@ in sources."lodash-4.17.20" ]; }) - sources."@babel/helper-remap-async-to-generator-7.11.4" - sources."@babel/helper-replace-supers-7.12.0" - sources."@babel/helper-simple-access-7.10.4" - sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" + sources."@babel/helper-remap-async-to-generator-7.12.1" + sources."@babel/helper-replace-supers-7.12.1" + sources."@babel/helper-simple-access-7.12.1" + sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/helper-validator-option-7.12.0" + sources."@babel/helper-validator-option-7.12.1" sources."@babel/helper-wrap-function-7.10.4" - sources."@babel/helpers-7.10.4" + sources."@babel/helpers-7.12.1" (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.0" - sources."@babel/plugin-proposal-async-generator-functions-7.10.5" - sources."@babel/plugin-proposal-class-properties-7.10.4" - sources."@babel/plugin-proposal-dynamic-import-7.10.4" - sources."@babel/plugin-proposal-export-default-from-7.10.4" - sources."@babel/plugin-proposal-export-namespace-from-7.12.0" - sources."@babel/plugin-proposal-json-strings-7.10.4" - sources."@babel/plugin-proposal-logical-assignment-operators-7.12.0" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.0" - sources."@babel/plugin-proposal-numeric-separator-7.12.0" - sources."@babel/plugin-proposal-object-rest-spread-7.11.0" - sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" - sources."@babel/plugin-proposal-optional-chaining-7.12.0" - sources."@babel/plugin-proposal-private-methods-7.10.4" - sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" + sources."@babel/parser-7.12.2" + sources."@babel/plugin-proposal-async-generator-functions-7.12.1" + sources."@babel/plugin-proposal-class-properties-7.12.1" + sources."@babel/plugin-proposal-dynamic-import-7.12.1" + sources."@babel/plugin-proposal-export-default-from-7.12.1" + sources."@babel/plugin-proposal-export-namespace-from-7.12.1" + sources."@babel/plugin-proposal-json-strings-7.12.1" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" + sources."@babel/plugin-proposal-numeric-separator-7.12.1" + sources."@babel/plugin-proposal-object-rest-spread-7.12.1" + sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" + sources."@babel/plugin-proposal-optional-chaining-7.12.1" + sources."@babel/plugin-proposal-private-methods-7.12.1" + sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.10.4" + sources."@babel/plugin-syntax-class-properties-7.12.1" sources."@babel/plugin-syntax-dynamic-import-7.8.3" - sources."@babel/plugin-syntax-export-default-from-7.10.4" + sources."@babel/plugin-syntax-export-default-from-7.12.1" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.10.4" + sources."@babel/plugin-syntax-flow-7.12.1" sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.10.4" + sources."@babel/plugin-syntax-jsx-7.12.1" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-syntax-numeric-separator-7.10.4" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.10.4" - sources."@babel/plugin-syntax-typescript-7.10.4" - sources."@babel/plugin-transform-arrow-functions-7.10.4" - sources."@babel/plugin-transform-async-to-generator-7.10.4" - sources."@babel/plugin-transform-block-scoped-functions-7.10.4" - sources."@babel/plugin-transform-block-scoping-7.11.1" - sources."@babel/plugin-transform-classes-7.10.4" - sources."@babel/plugin-transform-computed-properties-7.10.4" - sources."@babel/plugin-transform-destructuring-7.10.4" - sources."@babel/plugin-transform-dotall-regex-7.10.4" - sources."@babel/plugin-transform-duplicate-keys-7.10.4" - sources."@babel/plugin-transform-exponentiation-operator-7.10.4" - sources."@babel/plugin-transform-flow-strip-types-7.10.4" - sources."@babel/plugin-transform-for-of-7.10.4" - sources."@babel/plugin-transform-function-name-7.10.4" - sources."@babel/plugin-transform-literals-7.10.4" - sources."@babel/plugin-transform-member-expression-literals-7.10.4" - sources."@babel/plugin-transform-modules-amd-7.10.5" - sources."@babel/plugin-transform-modules-commonjs-7.10.4" - sources."@babel/plugin-transform-modules-systemjs-7.12.0" - sources."@babel/plugin-transform-modules-umd-7.10.4" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.4" - sources."@babel/plugin-transform-new-target-7.10.4" - sources."@babel/plugin-transform-object-assign-7.10.4" - sources."@babel/plugin-transform-object-super-7.10.4" - sources."@babel/plugin-transform-parameters-7.10.5" - sources."@babel/plugin-transform-property-literals-7.10.4" - sources."@babel/plugin-transform-react-display-name-7.10.4" - sources."@babel/plugin-transform-react-jsx-7.10.4" - sources."@babel/plugin-transform-react-jsx-source-7.10.5" - sources."@babel/plugin-transform-regenerator-7.10.4" - sources."@babel/plugin-transform-reserved-words-7.10.4" - (sources."@babel/plugin-transform-runtime-7.12.0" // { + sources."@babel/plugin-syntax-top-level-await-7.12.1" + sources."@babel/plugin-syntax-typescript-7.12.1" + sources."@babel/plugin-transform-arrow-functions-7.12.1" + sources."@babel/plugin-transform-async-to-generator-7.12.1" + sources."@babel/plugin-transform-block-scoped-functions-7.12.1" + sources."@babel/plugin-transform-block-scoping-7.12.1" + sources."@babel/plugin-transform-classes-7.12.1" + sources."@babel/plugin-transform-computed-properties-7.12.1" + sources."@babel/plugin-transform-destructuring-7.12.1" + sources."@babel/plugin-transform-dotall-regex-7.12.1" + sources."@babel/plugin-transform-duplicate-keys-7.12.1" + sources."@babel/plugin-transform-exponentiation-operator-7.12.1" + sources."@babel/plugin-transform-flow-strip-types-7.12.1" + sources."@babel/plugin-transform-for-of-7.12.1" + sources."@babel/plugin-transform-function-name-7.12.1" + sources."@babel/plugin-transform-literals-7.12.1" + sources."@babel/plugin-transform-member-expression-literals-7.12.1" + sources."@babel/plugin-transform-modules-amd-7.12.1" + sources."@babel/plugin-transform-modules-commonjs-7.12.1" + sources."@babel/plugin-transform-modules-systemjs-7.12.1" + sources."@babel/plugin-transform-modules-umd-7.12.1" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1" + sources."@babel/plugin-transform-new-target-7.12.1" + sources."@babel/plugin-transform-object-assign-7.12.1" + sources."@babel/plugin-transform-object-super-7.12.1" + sources."@babel/plugin-transform-parameters-7.12.1" + sources."@babel/plugin-transform-property-literals-7.12.1" + sources."@babel/plugin-transform-react-display-name-7.12.1" + sources."@babel/plugin-transform-react-jsx-7.12.1" + sources."@babel/plugin-transform-react-jsx-source-7.12.1" + sources."@babel/plugin-transform-regenerator-7.12.1" + sources."@babel/plugin-transform-reserved-words-7.12.1" + (sources."@babel/plugin-transform-runtime-7.12.1" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/plugin-transform-shorthand-properties-7.10.4" - sources."@babel/plugin-transform-spread-7.11.0" - sources."@babel/plugin-transform-sticky-regex-7.10.4" - sources."@babel/plugin-transform-template-literals-7.10.5" - sources."@babel/plugin-transform-typeof-symbol-7.10.4" - sources."@babel/plugin-transform-typescript-7.12.0" - sources."@babel/plugin-transform-unicode-escapes-7.10.4" - sources."@babel/plugin-transform-unicode-regex-7.10.4" - sources."@babel/preset-env-7.12.0" + sources."@babel/plugin-transform-shorthand-properties-7.12.1" + sources."@babel/plugin-transform-spread-7.12.1" + sources."@babel/plugin-transform-sticky-regex-7.12.1" + sources."@babel/plugin-transform-template-literals-7.12.1" + sources."@babel/plugin-transform-typeof-symbol-7.12.1" + sources."@babel/plugin-transform-typescript-7.12.1" + sources."@babel/plugin-transform-unicode-escapes-7.12.1" + sources."@babel/plugin-transform-unicode-regex-7.12.1" + sources."@babel/preset-env-7.12.1" sources."@babel/preset-modules-0.1.4" - sources."@babel/preset-typescript-7.12.0" - sources."@babel/runtime-7.12.0" + sources."@babel/preset-typescript-7.12.1" + sources."@babel/runtime-7.12.1" sources."@babel/template-7.10.4" - (sources."@babel/traverse-7.12.0" // { + (sources."@babel/traverse-7.12.1" // { dependencies = [ sources."lodash-4.17.20" ]; }) - (sources."@babel/types-7.12.0" // { + (sources."@babel/types-7.12.1" // { dependencies = [ sources."lodash-4.17.20" ]; @@ -70442,7 +70462,7 @@ in sources."@types/lodash-4.14.162" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" - sources."@types/node-9.6.59" + sources."@types/node-9.6.60" sources."@types/q-1.5.4" sources."@types/responselike-1.0.0" sources."@types/retry-0.12.0" @@ -70466,7 +70486,7 @@ in sources."source-map-0.7.3" ]; }) - sources."@types/yargs-15.0.8" + sources."@types/yargs-15.0.9" sources."@types/yargs-parser-15.0.0" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -70930,7 +70950,7 @@ in (sources."devcert-1.1.3" // { dependencies = [ sources."@types/glob-5.0.36" - sources."@types/node-8.10.64" + sources."@types/node-8.10.65" sources."debug-3.2.6" sources."rimraf-2.7.1" sources."sudo-prompt-8.2.5" @@ -70960,7 +70980,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.580" + sources."electron-to-chromium-1.3.582" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -71229,7 +71249,7 @@ in sources."hex-color-regex-1.1.0" sources."hmac-drbg-1.0.1" sources."hoek-4.2.1" - sources."hosted-git-info-3.0.6" + sources."hosted-git-info-3.0.7" sources."hpack.js-2.1.6" sources."hsl-regex-1.0.0" sources."hsla-regex-1.0.0" @@ -73612,7 +73632,7 @@ in sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.5" sources."is-property-1.0.2" - sources."is-valid-domain-0.0.15" + sources."is-valid-domain-0.0.16" sources."json-buffer-2.0.11" sources."jsonpointer-4.1.0" sources."kvgraph-0.1.0" @@ -74096,7 +74116,7 @@ in sources."@nodelib/fs.walk-1.2.4" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.11.8" + sources."@types/node-14.11.10" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.1" sources."aggregate-error-3.1.0" @@ -74582,11 +74602,11 @@ in (sources."yargs-16.0.3" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."cliui-7.0.2" + sources."cliui-7.0.3" sources."strip-ansi-6.0.0" sources."wrap-ansi-7.0.0" - sources."y18n-5.0.2" - sources."yargs-parser-20.2.2" + sources."y18n-5.0.4" + sources."yargs-parser-20.2.3" ]; }) sources."yargs-parser-18.1.3" @@ -74957,7 +74977,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-4.27.9" + sources."systeminformation-4.27.10" sources."term-canvas-0.0.5" sources."type-fest-0.11.0" sources."wordwrap-0.0.3" @@ -77258,7 +77278,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.771.0" // { + (sources."aws-sdk-2.773.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -78120,7 +78140,7 @@ in sha512 = "znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ=="; }; dependencies = [ - sources."@babel/parser-7.12.0" + sources."@babel/parser-7.12.2" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.8.11" @@ -79286,7 +79306,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.11.8" + sources."@types/node-14.11.10" sources."@types/normalize-package-data-2.4.0" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" @@ -81079,57 +81099,57 @@ in src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.12.0" - sources."@babel/core-7.12.0" - sources."@babel/generator-7.12.0" + sources."@babel/compat-data-7.12.1" + sources."@babel/core-7.12.1" + sources."@babel/generator-7.12.1" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - sources."@babel/helper-compilation-targets-7.12.0" - sources."@babel/helper-create-class-features-plugin-7.12.0" - sources."@babel/helper-create-regexp-features-plugin-7.12.0" + sources."@babel/helper-compilation-targets-7.12.1" + sources."@babel/helper-create-class-features-plugin-7.12.1" + sources."@babel/helper-create-regexp-features-plugin-7.12.1" sources."@babel/helper-define-map-7.10.5" - sources."@babel/helper-explode-assignable-expression-7.11.4" + sources."@babel/helper-explode-assignable-expression-7.12.1" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.0" - sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.12.0" + sources."@babel/helper-member-expression-to-functions-7.12.1" + sources."@babel/helper-module-imports-7.12.1" + sources."@babel/helper-module-transforms-7.12.1" sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-regex-7.10.5" - sources."@babel/helper-remap-async-to-generator-7.11.4" - sources."@babel/helper-replace-supers-7.12.0" - sources."@babel/helper-simple-access-7.10.4" - sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" + sources."@babel/helper-remap-async-to-generator-7.12.1" + sources."@babel/helper-replace-supers-7.12.1" + sources."@babel/helper-simple-access-7.12.1" + sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/helper-validator-option-7.12.0" + sources."@babel/helper-validator-option-7.12.1" sources."@babel/helper-wrap-function-7.10.4" - sources."@babel/helpers-7.10.4" + sources."@babel/helpers-7.12.1" (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.0" + sources."@babel/parser-7.12.2" sources."@babel/plugin-external-helpers-7.8.3" - sources."@babel/plugin-proposal-async-generator-functions-7.10.5" - sources."@babel/plugin-proposal-class-properties-7.10.4" - sources."@babel/plugin-proposal-dynamic-import-7.10.4" - sources."@babel/plugin-proposal-export-namespace-from-7.12.0" - sources."@babel/plugin-proposal-json-strings-7.10.4" - sources."@babel/plugin-proposal-logical-assignment-operators-7.12.0" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.0" - sources."@babel/plugin-proposal-numeric-separator-7.12.0" - sources."@babel/plugin-proposal-object-rest-spread-7.11.0" - sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" - sources."@babel/plugin-proposal-optional-chaining-7.12.0" - sources."@babel/plugin-proposal-private-methods-7.10.4" - sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" + sources."@babel/plugin-proposal-async-generator-functions-7.12.1" + sources."@babel/plugin-proposal-class-properties-7.12.1" + sources."@babel/plugin-proposal-dynamic-import-7.12.1" + sources."@babel/plugin-proposal-export-namespace-from-7.12.1" + sources."@babel/plugin-proposal-json-strings-7.12.1" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" + sources."@babel/plugin-proposal-numeric-separator-7.12.1" + sources."@babel/plugin-proposal-object-rest-spread-7.12.1" + sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" + sources."@babel/plugin-proposal-optional-chaining-7.12.1" + sources."@babel/plugin-proposal-private-methods-7.12.1" + sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" - sources."@babel/plugin-syntax-class-properties-7.10.4" + sources."@babel/plugin-syntax-class-properties-7.12.1" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-import-meta-7.10.4" @@ -81140,47 +81160,47 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.10.4" - sources."@babel/plugin-transform-arrow-functions-7.10.4" - sources."@babel/plugin-transform-async-to-generator-7.10.4" - sources."@babel/plugin-transform-block-scoped-functions-7.10.4" - sources."@babel/plugin-transform-block-scoping-7.11.1" - sources."@babel/plugin-transform-classes-7.10.4" - sources."@babel/plugin-transform-computed-properties-7.10.4" - sources."@babel/plugin-transform-destructuring-7.10.4" - sources."@babel/plugin-transform-dotall-regex-7.10.4" - sources."@babel/plugin-transform-duplicate-keys-7.10.4" - sources."@babel/plugin-transform-exponentiation-operator-7.10.4" - sources."@babel/plugin-transform-for-of-7.10.4" - sources."@babel/plugin-transform-function-name-7.10.4" - sources."@babel/plugin-transform-literals-7.10.4" - sources."@babel/plugin-transform-member-expression-literals-7.10.4" - sources."@babel/plugin-transform-modules-amd-7.10.5" - sources."@babel/plugin-transform-modules-commonjs-7.10.4" - sources."@babel/plugin-transform-modules-systemjs-7.12.0" - sources."@babel/plugin-transform-modules-umd-7.10.4" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.4" - sources."@babel/plugin-transform-new-target-7.10.4" - sources."@babel/plugin-transform-object-super-7.10.4" - sources."@babel/plugin-transform-parameters-7.10.5" - sources."@babel/plugin-transform-property-literals-7.10.4" - sources."@babel/plugin-transform-regenerator-7.10.4" - sources."@babel/plugin-transform-reserved-words-7.10.4" - sources."@babel/plugin-transform-runtime-7.12.0" - sources."@babel/plugin-transform-shorthand-properties-7.10.4" - sources."@babel/plugin-transform-spread-7.11.0" - sources."@babel/plugin-transform-sticky-regex-7.10.4" - sources."@babel/plugin-transform-template-literals-7.10.5" - sources."@babel/plugin-transform-typeof-symbol-7.10.4" - sources."@babel/plugin-transform-unicode-escapes-7.10.4" - sources."@babel/plugin-transform-unicode-regex-7.10.4" - sources."@babel/preset-env-7.12.0" + sources."@babel/plugin-syntax-top-level-await-7.12.1" + sources."@babel/plugin-transform-arrow-functions-7.12.1" + sources."@babel/plugin-transform-async-to-generator-7.12.1" + sources."@babel/plugin-transform-block-scoped-functions-7.12.1" + sources."@babel/plugin-transform-block-scoping-7.12.1" + sources."@babel/plugin-transform-classes-7.12.1" + sources."@babel/plugin-transform-computed-properties-7.12.1" + sources."@babel/plugin-transform-destructuring-7.12.1" + sources."@babel/plugin-transform-dotall-regex-7.12.1" + sources."@babel/plugin-transform-duplicate-keys-7.12.1" + sources."@babel/plugin-transform-exponentiation-operator-7.12.1" + sources."@babel/plugin-transform-for-of-7.12.1" + sources."@babel/plugin-transform-function-name-7.12.1" + sources."@babel/plugin-transform-literals-7.12.1" + sources."@babel/plugin-transform-member-expression-literals-7.12.1" + sources."@babel/plugin-transform-modules-amd-7.12.1" + sources."@babel/plugin-transform-modules-commonjs-7.12.1" + sources."@babel/plugin-transform-modules-systemjs-7.12.1" + sources."@babel/plugin-transform-modules-umd-7.12.1" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1" + sources."@babel/plugin-transform-new-target-7.12.1" + sources."@babel/plugin-transform-object-super-7.12.1" + sources."@babel/plugin-transform-parameters-7.12.1" + sources."@babel/plugin-transform-property-literals-7.12.1" + sources."@babel/plugin-transform-regenerator-7.12.1" + sources."@babel/plugin-transform-reserved-words-7.12.1" + sources."@babel/plugin-transform-runtime-7.12.1" + sources."@babel/plugin-transform-shorthand-properties-7.12.1" + sources."@babel/plugin-transform-spread-7.12.1" + sources."@babel/plugin-transform-sticky-regex-7.12.1" + sources."@babel/plugin-transform-template-literals-7.12.1" + sources."@babel/plugin-transform-typeof-symbol-7.12.1" + sources."@babel/plugin-transform-unicode-escapes-7.12.1" + sources."@babel/plugin-transform-unicode-regex-7.12.1" + sources."@babel/preset-env-7.12.1" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.12.0" + sources."@babel/runtime-7.12.1" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.12.0" - sources."@babel/types-7.12.0" + sources."@babel/traverse-7.12.1" + sources."@babel/types-7.12.1" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -81201,10 +81221,10 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.6" - sources."@types/node-14.11.8" + sources."@types/node-14.11.10" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" - sources."@types/yargs-15.0.8" + sources."@types/yargs-15.0.9" sources."@types/yargs-parser-15.0.0" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -81500,7 +81520,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.580" + sources."electron-to-chromium-1.3.582" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -82706,7 +82726,7 @@ in sha512 = "cESM33+QjLuHUcMk9B2qpsplx4h+97adwI/P0/2SvFwFlhVsFfi82a53vV1638hIBLac+RxGG2aT+Fq8YYHHRQ=="; }; dependencies = [ - sources."@types/node-14.11.8" + sources."@types/node-14.11.10" sources."@types/yauzl-2.9.1" sources."agent-base-5.1.1" sources."ansi-styles-4.3.0" @@ -82789,7 +82809,7 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.146.2" + sources."@fluentui/react-7.147.0" sources."@fluentui/react-focus-7.16.12" sources."@fluentui/react-window-provider-0.3.3" sources."@fluentui/theme-1.5.0" @@ -82928,7 +82948,7 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.146.2" + sources."office-ui-fabric-react-7.147.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -83027,7 +83047,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.35.1" + sources."swagger-ui-dist-3.35.2" sources."tail-2.0.4" sources."through-2.3.8" sources."tmp-0.0.33" @@ -83360,59 +83380,59 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.12.0" - (sources."@babel/core-7.12.0" // { + sources."@babel/compat-data-7.12.1" + (sources."@babel/core-7.12.1" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.12.0" + sources."@babel/generator-7.12.1" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - (sources."@babel/helper-compilation-targets-7.12.0" // { + (sources."@babel/helper-compilation-targets-7.12.1" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/helper-create-class-features-plugin-7.12.0" - sources."@babel/helper-create-regexp-features-plugin-7.12.0" + sources."@babel/helper-create-class-features-plugin-7.12.1" + sources."@babel/helper-create-regexp-features-plugin-7.12.1" sources."@babel/helper-define-map-7.10.5" - sources."@babel/helper-explode-assignable-expression-7.11.4" + sources."@babel/helper-explode-assignable-expression-7.12.1" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.0" - sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.12.0" + sources."@babel/helper-member-expression-to-functions-7.12.1" + sources."@babel/helper-module-imports-7.12.1" + sources."@babel/helper-module-transforms-7.12.1" sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-regex-7.10.5" - sources."@babel/helper-remap-async-to-generator-7.11.4" - sources."@babel/helper-replace-supers-7.12.0" - sources."@babel/helper-simple-access-7.10.4" - sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" + sources."@babel/helper-remap-async-to-generator-7.12.1" + sources."@babel/helper-replace-supers-7.12.1" + sources."@babel/helper-simple-access-7.12.1" + sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/helper-validator-option-7.12.0" + sources."@babel/helper-validator-option-7.12.1" sources."@babel/helper-wrap-function-7.10.4" - sources."@babel/helpers-7.10.4" + sources."@babel/helpers-7.12.1" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.0" - sources."@babel/plugin-proposal-async-generator-functions-7.10.5" - sources."@babel/plugin-proposal-class-properties-7.10.4" - sources."@babel/plugin-proposal-dynamic-import-7.10.4" - sources."@babel/plugin-proposal-export-namespace-from-7.12.0" - sources."@babel/plugin-proposal-json-strings-7.10.4" - sources."@babel/plugin-proposal-logical-assignment-operators-7.12.0" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.0" - sources."@babel/plugin-proposal-numeric-separator-7.12.0" - sources."@babel/plugin-proposal-object-rest-spread-7.11.0" - sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" - sources."@babel/plugin-proposal-optional-chaining-7.12.0" - sources."@babel/plugin-proposal-private-methods-7.10.4" - sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" + sources."@babel/parser-7.12.2" + sources."@babel/plugin-proposal-async-generator-functions-7.12.1" + sources."@babel/plugin-proposal-class-properties-7.12.1" + sources."@babel/plugin-proposal-dynamic-import-7.12.1" + sources."@babel/plugin-proposal-export-namespace-from-7.12.1" + sources."@babel/plugin-proposal-json-strings-7.12.1" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" + sources."@babel/plugin-proposal-numeric-separator-7.12.1" + sources."@babel/plugin-proposal-object-rest-spread-7.12.1" + sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" + sources."@babel/plugin-proposal-optional-chaining-7.12.1" + sources."@babel/plugin-proposal-private-methods-7.12.1" + sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.10.4" + sources."@babel/plugin-syntax-class-properties-7.12.1" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-json-strings-7.8.3" @@ -83422,49 +83442,49 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.10.4" - sources."@babel/plugin-transform-arrow-functions-7.10.4" - sources."@babel/plugin-transform-async-to-generator-7.10.4" - sources."@babel/plugin-transform-block-scoped-functions-7.10.4" - sources."@babel/plugin-transform-block-scoping-7.11.1" - sources."@babel/plugin-transform-classes-7.10.4" - sources."@babel/plugin-transform-computed-properties-7.10.4" - sources."@babel/plugin-transform-destructuring-7.10.4" - sources."@babel/plugin-transform-dotall-regex-7.10.4" - sources."@babel/plugin-transform-duplicate-keys-7.10.4" - sources."@babel/plugin-transform-exponentiation-operator-7.10.4" - sources."@babel/plugin-transform-for-of-7.10.4" - sources."@babel/plugin-transform-function-name-7.10.4" - sources."@babel/plugin-transform-literals-7.10.4" - sources."@babel/plugin-transform-member-expression-literals-7.10.4" - sources."@babel/plugin-transform-modules-amd-7.10.5" - sources."@babel/plugin-transform-modules-commonjs-7.10.4" - sources."@babel/plugin-transform-modules-systemjs-7.12.0" - sources."@babel/plugin-transform-modules-umd-7.10.4" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.4" - sources."@babel/plugin-transform-new-target-7.10.4" - sources."@babel/plugin-transform-object-super-7.10.4" - sources."@babel/plugin-transform-parameters-7.10.5" - sources."@babel/plugin-transform-property-literals-7.10.4" - sources."@babel/plugin-transform-regenerator-7.10.4" - sources."@babel/plugin-transform-reserved-words-7.10.4" - sources."@babel/plugin-transform-shorthand-properties-7.10.4" - sources."@babel/plugin-transform-spread-7.11.0" - sources."@babel/plugin-transform-sticky-regex-7.10.4" - sources."@babel/plugin-transform-template-literals-7.10.5" - sources."@babel/plugin-transform-typeof-symbol-7.10.4" - sources."@babel/plugin-transform-unicode-escapes-7.10.4" - sources."@babel/plugin-transform-unicode-regex-7.10.4" - (sources."@babel/preset-env-7.12.0" // { + sources."@babel/plugin-syntax-top-level-await-7.12.1" + sources."@babel/plugin-transform-arrow-functions-7.12.1" + sources."@babel/plugin-transform-async-to-generator-7.12.1" + sources."@babel/plugin-transform-block-scoped-functions-7.12.1" + sources."@babel/plugin-transform-block-scoping-7.12.1" + sources."@babel/plugin-transform-classes-7.12.1" + sources."@babel/plugin-transform-computed-properties-7.12.1" + sources."@babel/plugin-transform-destructuring-7.12.1" + sources."@babel/plugin-transform-dotall-regex-7.12.1" + sources."@babel/plugin-transform-duplicate-keys-7.12.1" + sources."@babel/plugin-transform-exponentiation-operator-7.12.1" + sources."@babel/plugin-transform-for-of-7.12.1" + sources."@babel/plugin-transform-function-name-7.12.1" + sources."@babel/plugin-transform-literals-7.12.1" + sources."@babel/plugin-transform-member-expression-literals-7.12.1" + sources."@babel/plugin-transform-modules-amd-7.12.1" + sources."@babel/plugin-transform-modules-commonjs-7.12.1" + sources."@babel/plugin-transform-modules-systemjs-7.12.1" + sources."@babel/plugin-transform-modules-umd-7.12.1" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1" + sources."@babel/plugin-transform-new-target-7.12.1" + sources."@babel/plugin-transform-object-super-7.12.1" + sources."@babel/plugin-transform-parameters-7.12.1" + sources."@babel/plugin-transform-property-literals-7.12.1" + sources."@babel/plugin-transform-regenerator-7.12.1" + sources."@babel/plugin-transform-reserved-words-7.12.1" + sources."@babel/plugin-transform-shorthand-properties-7.12.1" + sources."@babel/plugin-transform-spread-7.12.1" + sources."@babel/plugin-transform-sticky-regex-7.12.1" + sources."@babel/plugin-transform-template-literals-7.12.1" + sources."@babel/plugin-transform-typeof-symbol-7.12.1" + sources."@babel/plugin-transform-unicode-escapes-7.12.1" + sources."@babel/plugin-transform-unicode-regex-7.12.1" + (sources."@babel/preset-env-7.12.1" // { dependencies = [ sources."semver-5.7.1" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.12.0" + sources."@babel/runtime-7.12.1" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.12.0" - sources."@babel/types-7.12.0" + sources."@babel/traverse-7.12.1" + sources."@babel/types-7.12.1" sources."@bugsnag/browser-7.4.0" sources."@bugsnag/core-7.3.5" sources."@bugsnag/cuid-3.0.0" @@ -83670,7 +83690,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" - sources."@types/node-14.11.8" + sources."@types/node-14.11.10" sources."@types/node-fetch-2.5.7" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-1.17.1" @@ -83739,7 +83759,7 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.771.0" // { + (sources."aws-sdk-2.773.0" // { dependencies = [ sources."buffer-4.9.2" sources."uuid-3.3.2" @@ -84065,7 +84085,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.580" + sources."electron-to-chromium-1.3.582" sources."elf-tools-1.1.2" (sources."elliptic-6.5.3" // { dependencies = [ @@ -84829,7 +84849,7 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."ripemd160-2.0.2" - sources."rollup-2.30.0" + sources."rollup-2.32.0" sources."rollup-plugin-node-builtins-2.1.2" sources."rollup-plugin-terser-7.0.2" sources."run-async-2.4.1" @@ -85717,16 +85737,16 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-1.2.0.tgz"; - sha512 = "Rnajn8Kb0Q0tBxR8uTrynoe0hcdcZdeJ9A2t/1XZ91IUm0HDFpv2yBWAjiQVb7maFBDpUs/PrEt1ugGpY2tFcw=="; + url = "https://registry.npmjs.org/node-red/-/node-red-1.2.1.tgz"; + sha512 = "ZgxnaEMp2bJbsludpt3elaw/5yMznqjYklZE7eBwGErbNUVT3SmiSd0wNBO5j1QPiaqtGdSzqT2e45qzDzyiOg=="; }; dependencies = [ - sources."@babel/runtime-7.12.0" - sources."@node-red/editor-api-1.2.0" - sources."@node-red/editor-client-1.2.0" - (sources."@node-red/nodes-1.2.0" // { + sources."@babel/runtime-7.12.1" + sources."@node-red/editor-api-1.2.1" + sources."@node-red/editor-client-1.2.1" + (sources."@node-red/nodes-1.2.1" // { dependencies = [ sources."cookie-0.4.1" sources."http-errors-1.7.3" @@ -85740,9 +85760,9 @@ in }) ]; }) - sources."@node-red/registry-1.2.0" - sources."@node-red/runtime-1.2.0" - sources."@node-red/util-1.2.0" + sources."@node-red/registry-1.2.1" + sources."@node-red/runtime-1.2.1" + sources."@node-red/util-1.2.1" sources."abbrev-1.1.1" sources."accepts-1.3.7" (sources."agent-base-6.0.1" // { @@ -86721,7 +86741,7 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."has-yarn-2.1.0" - sources."hosted-git-info-3.0.6" + sources."hosted-git-info-3.0.7" sources."http-cache-semantics-4.1.0" sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" @@ -87146,14 +87166,14 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.12.0" - (sources."@babel/core-7.12.0" // { + sources."@babel/compat-data-7.12.1" + (sources."@babel/core-7.12.1" // { dependencies = [ sources."json5-2.1.3" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.12.0" // { + (sources."@babel/generator-7.12.1" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -87161,99 +87181,99 @@ in sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" sources."@babel/helper-builder-react-jsx-7.10.4" - sources."@babel/helper-builder-react-jsx-experimental-7.12.0" - sources."@babel/helper-compilation-targets-7.12.0" - sources."@babel/helper-create-class-features-plugin-7.12.0" - sources."@babel/helper-create-regexp-features-plugin-7.12.0" + sources."@babel/helper-builder-react-jsx-experimental-7.12.1" + sources."@babel/helper-compilation-targets-7.12.1" + sources."@babel/helper-create-class-features-plugin-7.12.1" + sources."@babel/helper-create-regexp-features-plugin-7.12.1" sources."@babel/helper-define-map-7.10.5" - sources."@babel/helper-explode-assignable-expression-7.11.4" + sources."@babel/helper-explode-assignable-expression-7.12.1" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.0" - sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.12.0" + sources."@babel/helper-member-expression-to-functions-7.12.1" + sources."@babel/helper-module-imports-7.12.1" + sources."@babel/helper-module-transforms-7.12.1" sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-regex-7.10.5" - sources."@babel/helper-remap-async-to-generator-7.11.4" - sources."@babel/helper-replace-supers-7.12.0" - sources."@babel/helper-simple-access-7.10.4" - sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" + sources."@babel/helper-remap-async-to-generator-7.12.1" + sources."@babel/helper-replace-supers-7.12.1" + sources."@babel/helper-simple-access-7.12.1" + sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/helper-validator-option-7.12.0" + sources."@babel/helper-validator-option-7.12.1" sources."@babel/helper-wrap-function-7.10.4" - sources."@babel/helpers-7.10.4" + sources."@babel/helpers-7.12.1" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.0" - sources."@babel/plugin-proposal-async-generator-functions-7.10.5" - sources."@babel/plugin-proposal-class-properties-7.10.4" - sources."@babel/plugin-proposal-dynamic-import-7.10.4" - sources."@babel/plugin-proposal-export-namespace-from-7.12.0" - sources."@babel/plugin-proposal-json-strings-7.10.4" - sources."@babel/plugin-proposal-logical-assignment-operators-7.12.0" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.0" - sources."@babel/plugin-proposal-numeric-separator-7.12.0" - sources."@babel/plugin-proposal-object-rest-spread-7.11.0" - sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" - sources."@babel/plugin-proposal-optional-chaining-7.12.0" - sources."@babel/plugin-proposal-private-methods-7.10.4" - sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" + sources."@babel/parser-7.12.2" + sources."@babel/plugin-proposal-async-generator-functions-7.12.1" + sources."@babel/plugin-proposal-class-properties-7.12.1" + sources."@babel/plugin-proposal-dynamic-import-7.12.1" + sources."@babel/plugin-proposal-export-namespace-from-7.12.1" + sources."@babel/plugin-proposal-json-strings-7.12.1" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" + sources."@babel/plugin-proposal-numeric-separator-7.12.1" + sources."@babel/plugin-proposal-object-rest-spread-7.12.1" + sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" + sources."@babel/plugin-proposal-optional-chaining-7.12.1" + sources."@babel/plugin-proposal-private-methods-7.12.1" + sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.10.4" + sources."@babel/plugin-syntax-class-properties-7.12.1" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.10.4" + sources."@babel/plugin-syntax-flow-7.12.1" sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.10.4" + sources."@babel/plugin-syntax-jsx-7.12.1" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-syntax-numeric-separator-7.10.4" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.10.4" - sources."@babel/plugin-transform-arrow-functions-7.10.4" - sources."@babel/plugin-transform-async-to-generator-7.10.4" - sources."@babel/plugin-transform-block-scoped-functions-7.10.4" - sources."@babel/plugin-transform-block-scoping-7.11.1" - sources."@babel/plugin-transform-classes-7.10.4" - sources."@babel/plugin-transform-computed-properties-7.10.4" - sources."@babel/plugin-transform-destructuring-7.10.4" - sources."@babel/plugin-transform-dotall-regex-7.10.4" - sources."@babel/plugin-transform-duplicate-keys-7.10.4" - sources."@babel/plugin-transform-exponentiation-operator-7.10.4" - sources."@babel/plugin-transform-flow-strip-types-7.10.4" - sources."@babel/plugin-transform-for-of-7.10.4" - sources."@babel/plugin-transform-function-name-7.10.4" - sources."@babel/plugin-transform-literals-7.10.4" - sources."@babel/plugin-transform-member-expression-literals-7.10.4" - sources."@babel/plugin-transform-modules-amd-7.10.5" - sources."@babel/plugin-transform-modules-commonjs-7.10.4" - sources."@babel/plugin-transform-modules-systemjs-7.12.0" - sources."@babel/plugin-transform-modules-umd-7.10.4" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.4" - sources."@babel/plugin-transform-new-target-7.10.4" - sources."@babel/plugin-transform-object-super-7.10.4" - sources."@babel/plugin-transform-parameters-7.10.5" - sources."@babel/plugin-transform-property-literals-7.10.4" - sources."@babel/plugin-transform-react-jsx-7.10.4" - sources."@babel/plugin-transform-regenerator-7.10.4" - sources."@babel/plugin-transform-reserved-words-7.10.4" - sources."@babel/plugin-transform-shorthand-properties-7.10.4" - sources."@babel/plugin-transform-spread-7.11.0" - sources."@babel/plugin-transform-sticky-regex-7.10.4" - sources."@babel/plugin-transform-template-literals-7.10.5" - sources."@babel/plugin-transform-typeof-symbol-7.10.4" - sources."@babel/plugin-transform-unicode-escapes-7.10.4" - sources."@babel/plugin-transform-unicode-regex-7.10.4" - sources."@babel/preset-env-7.12.0" + sources."@babel/plugin-syntax-top-level-await-7.12.1" + sources."@babel/plugin-transform-arrow-functions-7.12.1" + sources."@babel/plugin-transform-async-to-generator-7.12.1" + sources."@babel/plugin-transform-block-scoped-functions-7.12.1" + sources."@babel/plugin-transform-block-scoping-7.12.1" + sources."@babel/plugin-transform-classes-7.12.1" + sources."@babel/plugin-transform-computed-properties-7.12.1" + sources."@babel/plugin-transform-destructuring-7.12.1" + sources."@babel/plugin-transform-dotall-regex-7.12.1" + sources."@babel/plugin-transform-duplicate-keys-7.12.1" + sources."@babel/plugin-transform-exponentiation-operator-7.12.1" + sources."@babel/plugin-transform-flow-strip-types-7.12.1" + sources."@babel/plugin-transform-for-of-7.12.1" + sources."@babel/plugin-transform-function-name-7.12.1" + sources."@babel/plugin-transform-literals-7.12.1" + sources."@babel/plugin-transform-member-expression-literals-7.12.1" + sources."@babel/plugin-transform-modules-amd-7.12.1" + sources."@babel/plugin-transform-modules-commonjs-7.12.1" + sources."@babel/plugin-transform-modules-systemjs-7.12.1" + sources."@babel/plugin-transform-modules-umd-7.12.1" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1" + sources."@babel/plugin-transform-new-target-7.12.1" + sources."@babel/plugin-transform-object-super-7.12.1" + sources."@babel/plugin-transform-parameters-7.12.1" + sources."@babel/plugin-transform-property-literals-7.12.1" + sources."@babel/plugin-transform-react-jsx-7.12.1" + sources."@babel/plugin-transform-regenerator-7.12.1" + sources."@babel/plugin-transform-reserved-words-7.12.1" + sources."@babel/plugin-transform-shorthand-properties-7.12.1" + sources."@babel/plugin-transform-spread-7.12.1" + sources."@babel/plugin-transform-sticky-regex-7.12.1" + sources."@babel/plugin-transform-template-literals-7.12.1" + sources."@babel/plugin-transform-typeof-symbol-7.12.1" + sources."@babel/plugin-transform-unicode-escapes-7.12.1" + sources."@babel/plugin-transform-unicode-regex-7.12.1" + sources."@babel/preset-env-7.12.1" sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.12.0" + sources."@babel/runtime-7.12.1" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.12.0" - sources."@babel/types-7.12.0" + sources."@babel/traverse-7.12.1" + sources."@babel/types-7.12.1" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -87505,7 +87525,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.580" + sources."electron-to-chromium-1.3.582" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -89652,7 +89672,7 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-4.27.9" + sources."systeminformation-4.27.10" sources."thunkify-2.1.2" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" @@ -89737,7 +89757,7 @@ in sources."callsites-3.1.0" sources."chalk-4.1.0" sources."chokidar-3.4.3" - sources."cliui-7.0.2" + sources."cliui-7.0.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."colorette-1.2.1" @@ -89807,10 +89827,10 @@ in sources."to-regex-range-5.0.1" sources."universalify-1.0.0" sources."wrap-ansi-7.0.0" - sources."y18n-5.0.2" + sources."y18n-5.0.4" sources."yaml-1.10.0" - sources."yargs-16.0.3" - sources."yargs-parser-20.2.2" + sources."yargs-16.1.0" + sources."yargs-parser-20.2.3" ]; buildInputs = globalBuildInputs; meta = { @@ -90416,7 +90436,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - (sources."@babel/generator-7.12.0" // { + (sources."@babel/generator-7.12.1" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -90424,15 +90444,15 @@ in sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" - sources."@babel/helper-module-imports-7.10.4" + sources."@babel/helper-module-imports-7.12.1" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.0" - sources."@babel/runtime-7.12.0" + sources."@babel/parser-7.12.2" + sources."@babel/runtime-7.12.1" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.12.0" - sources."@babel/types-7.12.0" + sources."@babel/traverse-7.12.1" + sources."@babel/types-7.12.1" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" @@ -90828,10 +90848,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.30.0"; + version = "2.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.30.0.tgz"; - sha512 = "j4K1hUZfgFM03DUpayd3c7kZW+2wDbI6rj7ssQxpCpL1vsGpaM0vSorxBuePFwQDFq9O2DI6AOQbm174Awsq4w=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.32.0.tgz"; + sha512 = "0FIG1jY88uhCP2yP4CfvtKEqPDRmsUwfY1kEOOM+DH/KOGATgaIFd/is1+fQOxsvh62ELzcFfKonwKWnHhrqmw=="; }; dependencies = [ sources."fsevents-2.1.3" @@ -91137,7 +91157,7 @@ in sources."resolve-1.17.0" sources."resolve-from-4.0.0" sources."rimraf-2.6.3" - sources."rollup-2.30.0" + sources."rollup-2.32.0" sources."safe-buffer-5.2.1" sources."semver-6.3.0" sources."serialize-javascript-4.0.0" @@ -91540,10 +91560,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.7.0"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.7.0.tgz"; - sha512 = "hDSRapUjJvoBW0Q+loru7o6R2xbaBKTRmmqJjc7dEaePf/7fN19upJ0mZjjPKHuJOAv8JXmSYgkDnKeHyxgkXg=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.8.0.tgz"; + sha512 = "5yG+t5SHX4vxMmllLEj6DPkP0QTuMwmYfQw7mqq8H2WPr6MOUTuksskgNhljpgEASLAeZa5HdaRQq+s+/pq17w=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -91575,7 +91595,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.2.2" // { + (sources."@serverless/components-3.2.3" // { dependencies = [ sources."@sindresorhus/is-3.1.2" sources."@szmarczak/http-timer-4.0.5" @@ -91601,11 +91621,7 @@ in sources."semver-6.3.0" ]; }) - (sources."@serverless/enterprise-plugin-4.1.0" // { - dependencies = [ - sources."@serverless/platform-client-2.1.0" - ]; - }) + sources."@serverless/enterprise-plugin-4.1.1" sources."@serverless/event-mocks-1.1.1" sources."@serverless/platform-client-3.1.2" sources."@serverless/platform-client-china-2.0.3" @@ -91627,7 +91643,7 @@ in sources."write-file-atomic-3.0.3" ]; }) - sources."@serverless/utils-china-1.0.3" + sources."@serverless/utils-china-1.0.7" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tencent-sdk/capi-1.1.5" @@ -91637,7 +91653,7 @@ in sources."@types/keyv-3.1.1" sources."@types/lodash-4.14.162" sources."@types/long-4.0.1" - sources."@types/node-14.11.8" + sources."@types/node-14.11.10" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" sources."@types/responselike-1.0.0" @@ -91694,7 +91710,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.771.0" // { + (sources."aws-sdk-2.773.0" // { dependencies = [ sources."buffer-4.9.2" sources."uuid-3.3.2" @@ -92189,7 +92205,7 @@ in sources."promise-queue-2.2.5" (sources."protobufjs-6.10.1" // { dependencies = [ - sources."@types/node-13.13.25" + sources."@types/node-13.13.26" sources."long-4.0.0" ]; }) @@ -92382,7 +92398,7 @@ in sources."xtend-4.0.2" sources."yaml-ast-parser-0.0.43" sources."yamljs-0.3.0" - sources."yargs-parser-20.2.2" + sources."yargs-parser-20.2.3" sources."yauzl-2.10.0" sources."yeast-0.1.2" sources."zip-stream-4.0.2" @@ -93024,10 +93040,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.413.5"; + version = "1.414.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.413.5.tgz"; - sha512 = "dM2DMf7Q4yBoIo+cp0gnsNr3xjKIp3m1l3ywlTMonwmm/LU/L5+naK7+rCXapOPgteecMpku6zH0jisM4H5NQw=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.414.1.tgz"; + sha512 = "e04W+CPOqFTiny0VYDk8CfMn04BOcNbKve5KjWWIz8a5Ccw80yRVdboMjh5rHRSKU+bMvECQX5Nr9wtqfvOwcQ=="; }; dependencies = [ sources."@sindresorhus/is-2.1.1" @@ -93057,7 +93073,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/js-yaml-3.12.5" sources."@types/keyv-3.1.1" - sources."@types/node-14.11.8" + sources."@types/node-14.11.10" sources."@types/responselike-1.0.0" sources."@types/semver-5.5.0" sources."@yarnpkg/lockfile-1.1.0" @@ -93219,7 +93235,7 @@ in sources."gunzip-maybe-1.4.2" sources."has-flag-3.0.0" sources."has-yarn-2.1.0" - (sources."hosted-git-info-3.0.6" // { + (sources."hosted-git-info-3.0.7" // { dependencies = [ sources."lru-cache-6.0.0" sources."yallist-4.0.0" @@ -93420,10 +93436,10 @@ in sources."tslib-2.0.3" ]; }) - (sources."snyk-docker-plugin-3.26.2" // { + (sources."snyk-docker-plugin-4.1.1" // { dependencies = [ sources."rimraf-3.0.2" - sources."snyk-nodejs-lockfile-parser-1.29.0" + sources."snyk-nodejs-lockfile-parser-1.30.0" sources."tmp-0.2.1" sources."uuid-8.3.1" ]; @@ -93477,7 +93493,7 @@ in }) (sources."snyk-policy-1.14.1" // { dependencies = [ - sources."@types/node-6.14.12" + sources."@types/node-6.14.13" sources."hosted-git-info-2.8.8" (sources."snyk-module-2.1.0" // { dependencies = [ @@ -93494,7 +93510,7 @@ in }) (sources."snyk-resolve-deps-4.4.0" // { dependencies = [ - sources."@types/node-6.14.12" + sources."@types/node-6.14.13" sources."debug-3.2.6" sources."hosted-git-info-2.8.8" sources."lru-cache-4.1.5" @@ -94191,7 +94207,7 @@ in ]; }) sources."is-typedarray-1.0.0" - sources."is-valid-domain-0.0.15" + sources."is-valid-domain-0.0.16" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."is-windows-1.0.2" @@ -94810,7 +94826,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.771.0" // { + (sources."aws-sdk-2.773.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -97596,7 +97612,7 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.11.8" + sources."@types/node-14.11.10" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.0" @@ -98132,7 +98148,7 @@ in sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."moment-2.29.1" - (sources."node-appc-1.1.1" // { + (sources."node-appc-1.1.2" // { dependencies = [ sources."async-3.2.0" sources."colors-1.4.0" @@ -98398,7 +98414,7 @@ in sha512 = "N8E1X543CWEjg0/A70ZnA/kfAfAY/uogILsIuWBhHGxzv9kaJaj7/JCSwDiBH86CPEy37chSgW86KxVeYKsswQ=="; }; dependencies = [ - sources."@types/node-6.14.12" + sources."@types/node-6.14.13" sources."ansi-0.3.1" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -98564,7 +98580,7 @@ in sources."@primer/octicons-11.0.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.11.8" + sources."@types/node-14.11.10" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -98597,7 +98613,7 @@ in ]; }) sources."callsite-1.0.0" - sources."cliui-7.0.2" + sources."cliui-7.0.3" sources."clone-2.1.2" sources."clone-response-1.0.2" sources."color-3.0.0" @@ -98852,10 +98868,10 @@ in sources."wrappy-1.0.2" sources."ws-7.3.1" sources."xmlhttprequest-ssl-1.5.5" - sources."y18n-5.0.2" + sources."y18n-5.0.4" sources."yallist-2.1.2" sources."yargs-16.0.3" - sources."yargs-parser-20.2.2" + sources."yargs-parser-20.2.3" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; @@ -98886,7 +98902,7 @@ in sources."brace-expansion-1.1.11" sources."canvas-2.6.1" sources."chownr-1.1.4" - (sources."cliui-7.0.2" // { + (sources."cliui-7.0.3" // { dependencies = [ sources."ansi-regex-5.0.0" sources."is-fullwidth-code-point-3.0.0" @@ -99026,9 +99042,9 @@ in ]; }) sources."wrappy-1.0.2" - sources."y18n-5.0.2" + sources."y18n-5.0.4" sources."yallist-3.1.1" - (sources."yargs-16.0.3" // { + (sources."yargs-16.1.0" // { dependencies = [ sources."ansi-regex-5.0.0" sources."is-fullwidth-code-point-3.0.0" @@ -99036,7 +99052,7 @@ in sources."strip-ansi-6.0.0" ]; }) - sources."yargs-parser-20.2.2" + sources."yargs-parser-20.2.3" ]; buildInputs = globalBuildInputs; meta = { @@ -99062,7 +99078,7 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."array-flat-polyfill-1.0.1" - sources."cliui-7.0.2" + sources."cliui-7.0.3" sources."clone-2.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -99081,9 +99097,9 @@ in sources."vega-expression-3.0.0" sources."vega-util-1.16.0" sources."wrap-ansi-7.0.0" - sources."y18n-5.0.2" + sources."y18n-5.0.4" sources."yargs-16.0.3" - sources."yargs-parser-20.2.2" + sources."yargs-parser-20.2.3" ]; buildInputs = globalBuildInputs; meta = { @@ -99238,7 +99254,7 @@ in dependencies = [ sources."@types/json5-0.0.30" sources."@types/mocha-7.0.2" - sources."@types/node-8.10.64" + sources."@types/node-8.10.65" sources."@types/vscode-1.50.0" sources."@types/yauzl-2.9.1" sources."@webassemblyjs/ast-1.9.0" @@ -100362,7 +100378,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.11.8" + sources."@types/node-14.11.10" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -101325,7 +101341,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.11.8" + sources."@types/node-14.11.10" sources."JSONSelect-0.2.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" @@ -102240,18 +102256,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.1.0"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.1.0.tgz"; - sha512 = "ZJDq7dpVs479C6zCSF/CwOVsqqobjCusa+BgbXCEROZMS0RcBzQzDgc+hB2YXye8Y/JOvcFwJIqsVtTyHW7t8A=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.1.3.tgz"; + sha512 = "bNBF5EOpt5a6NeCBFu0+8KJtG61cVmOb2b/a5tPNRLz3OWgDpHMbmnDkaSm3nf/UQ6ufw4PWYGVsVOAi8UfL2A=="; }; dependencies = [ - sources."@npmcli/move-file-1.0.1" sources."@types/eslint-7.2.4" sources."@types/eslint-scope-3.7.0" sources."@types/estree-0.0.45" sources."@types/json-schema-7.0.6" - sources."@types/node-14.11.8" + sources."@types/node-14.11.10" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -102273,22 +102288,14 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."acorn-8.0.4" - sources."aggregate-error-3.1.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.11" sources."browserslist-4.14.5" sources."buffer-from-1.1.1" - sources."cacache-15.0.5" sources."caniuse-lite-1.0.30001148" - sources."chownr-2.0.0" sources."chrome-trace-event-1.0.2" - sources."clean-stack-2.2.0" sources."commander-2.20.3" - sources."commondir-1.0.1" - sources."concat-map-0.0.1" - sources."electron-to-chromium-1.3.580" + sources."electron-to-chromium-1.3.582" sources."enhanced-resolve-5.2.0" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" @@ -102301,80 +102308,49 @@ in sources."events-3.2.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - sources."find-cache-dir-3.3.1" sources."find-up-4.1.0" - sources."fs-minipass-2.1.0" - sources."fs.realpath-1.0.0" - sources."glob-7.1.6" sources."glob-to-regexp-0.4.1" sources."graceful-fs-4.2.4" sources."has-flag-4.0.0" - sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" - sources."infer-owner-1.0.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" sources."jest-worker-26.5.0" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."loader-runner-4.1.0" sources."locate-path-5.0.0" - sources."lru-cache-6.0.0" - sources."make-dir-3.1.0" sources."merge-stream-2.0.0" sources."mime-db-1.44.0" sources."mime-types-2.1.27" - sources."minimatch-3.0.4" - sources."minipass-3.1.3" - sources."minipass-collect-1.0.2" - sources."minipass-flush-1.0.5" - sources."minipass-pipeline-1.2.4" - sources."minizlib-2.1.2" - sources."mkdirp-1.0.4" sources."neo-async-2.6.2" sources."node-releases-1.1.63" - sources."once-1.4.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" - sources."p-map-4.0.0" sources."p-try-2.2.0" sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" sources."pkg-dir-4.2.0" - sources."promise-inflight-1.0.1" sources."punycode-2.1.1" sources."randombytes-2.1.0" - sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" sources."schema-utils-3.0.0" - sources."semver-6.3.0" sources."serialize-javascript-5.0.1" sources."source-list-map-2.0.1" sources."source-map-0.6.1" sources."source-map-support-0.5.19" - sources."ssri-8.0.0" sources."supports-color-7.2.0" sources."tapable-2.0.0" - sources."tar-6.0.5" (sources."terser-5.3.5" // { dependencies = [ sources."source-map-0.7.3" ]; }) - (sources."terser-webpack-plugin-4.2.3" // { + (sources."terser-webpack-plugin-5.0.0" // { dependencies = [ sources."p-limit-3.0.2" - sources."webpack-sources-1.4.3" ]; }) sources."tslib-1.14.1" - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" sources."uri-js-4.4.0" sources."watchpack-2.0.0" sources."webpack-sources-2.0.1" - sources."wrappy-1.0.2" - sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -102396,54 +102372,54 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.12.0" - sources."@babel/core-7.12.0" - sources."@babel/generator-7.12.0" + sources."@babel/compat-data-7.12.1" + sources."@babel/core-7.12.1" + sources."@babel/generator-7.12.1" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - sources."@babel/helper-compilation-targets-7.12.0" - sources."@babel/helper-create-class-features-plugin-7.12.0" - sources."@babel/helper-create-regexp-features-plugin-7.12.0" + sources."@babel/helper-compilation-targets-7.12.1" + sources."@babel/helper-create-class-features-plugin-7.12.1" + sources."@babel/helper-create-regexp-features-plugin-7.12.1" sources."@babel/helper-define-map-7.10.5" - sources."@babel/helper-explode-assignable-expression-7.11.4" + sources."@babel/helper-explode-assignable-expression-7.12.1" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.0" - sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.12.0" + sources."@babel/helper-member-expression-to-functions-7.12.1" + sources."@babel/helper-module-imports-7.12.1" + sources."@babel/helper-module-transforms-7.12.1" sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-regex-7.10.5" - sources."@babel/helper-remap-async-to-generator-7.11.4" - sources."@babel/helper-replace-supers-7.12.0" - sources."@babel/helper-simple-access-7.10.4" - sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" + sources."@babel/helper-remap-async-to-generator-7.12.1" + sources."@babel/helper-replace-supers-7.12.1" + sources."@babel/helper-simple-access-7.12.1" + sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/helper-validator-option-7.12.0" + sources."@babel/helper-validator-option-7.12.1" sources."@babel/helper-wrap-function-7.10.4" - sources."@babel/helpers-7.10.4" + sources."@babel/helpers-7.12.1" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.0" - sources."@babel/plugin-proposal-async-generator-functions-7.10.5" - sources."@babel/plugin-proposal-class-properties-7.10.4" - sources."@babel/plugin-proposal-dynamic-import-7.10.4" - sources."@babel/plugin-proposal-export-namespace-from-7.12.0" - sources."@babel/plugin-proposal-json-strings-7.10.4" - sources."@babel/plugin-proposal-logical-assignment-operators-7.12.0" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.0" - sources."@babel/plugin-proposal-numeric-separator-7.12.0" - sources."@babel/plugin-proposal-object-rest-spread-7.11.0" - sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" - sources."@babel/plugin-proposal-optional-chaining-7.12.0" - sources."@babel/plugin-proposal-private-methods-7.10.4" - sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" + sources."@babel/parser-7.12.2" + sources."@babel/plugin-proposal-async-generator-functions-7.12.1" + sources."@babel/plugin-proposal-class-properties-7.12.1" + sources."@babel/plugin-proposal-dynamic-import-7.12.1" + sources."@babel/plugin-proposal-export-namespace-from-7.12.1" + sources."@babel/plugin-proposal-json-strings-7.12.1" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" + sources."@babel/plugin-proposal-numeric-separator-7.12.1" + sources."@babel/plugin-proposal-object-rest-spread-7.12.1" + sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" + sources."@babel/plugin-proposal-optional-chaining-7.12.1" + sources."@babel/plugin-proposal-private-methods-7.12.1" + sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.10.4" + sources."@babel/plugin-syntax-class-properties-7.12.1" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.10.4" + sources."@babel/plugin-syntax-flow-7.12.1" sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" @@ -102451,51 +102427,51 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.10.4" - sources."@babel/plugin-syntax-typescript-7.10.4" - sources."@babel/plugin-transform-arrow-functions-7.10.4" - sources."@babel/plugin-transform-async-to-generator-7.10.4" - sources."@babel/plugin-transform-block-scoped-functions-7.10.4" - sources."@babel/plugin-transform-block-scoping-7.11.1" - sources."@babel/plugin-transform-classes-7.10.4" - sources."@babel/plugin-transform-computed-properties-7.10.4" - sources."@babel/plugin-transform-destructuring-7.10.4" - sources."@babel/plugin-transform-dotall-regex-7.10.4" - sources."@babel/plugin-transform-duplicate-keys-7.10.4" - sources."@babel/plugin-transform-exponentiation-operator-7.10.4" - sources."@babel/plugin-transform-flow-strip-types-7.10.4" - sources."@babel/plugin-transform-for-of-7.10.4" - sources."@babel/plugin-transform-function-name-7.10.4" - sources."@babel/plugin-transform-literals-7.10.4" - sources."@babel/plugin-transform-member-expression-literals-7.10.4" - sources."@babel/plugin-transform-modules-amd-7.10.5" - sources."@babel/plugin-transform-modules-commonjs-7.10.4" - sources."@babel/plugin-transform-modules-systemjs-7.12.0" - sources."@babel/plugin-transform-modules-umd-7.10.4" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.4" - sources."@babel/plugin-transform-new-target-7.10.4" - sources."@babel/plugin-transform-object-super-7.10.4" - sources."@babel/plugin-transform-parameters-7.10.5" - sources."@babel/plugin-transform-property-literals-7.10.4" - sources."@babel/plugin-transform-regenerator-7.10.4" - sources."@babel/plugin-transform-reserved-words-7.10.4" - sources."@babel/plugin-transform-shorthand-properties-7.10.4" - sources."@babel/plugin-transform-spread-7.11.0" - sources."@babel/plugin-transform-sticky-regex-7.10.4" - sources."@babel/plugin-transform-template-literals-7.10.5" - sources."@babel/plugin-transform-typeof-symbol-7.10.4" - sources."@babel/plugin-transform-typescript-7.12.0" - sources."@babel/plugin-transform-unicode-escapes-7.10.4" - sources."@babel/plugin-transform-unicode-regex-7.10.4" - sources."@babel/preset-env-7.12.0" - sources."@babel/preset-flow-7.10.4" + sources."@babel/plugin-syntax-top-level-await-7.12.1" + sources."@babel/plugin-syntax-typescript-7.12.1" + sources."@babel/plugin-transform-arrow-functions-7.12.1" + sources."@babel/plugin-transform-async-to-generator-7.12.1" + sources."@babel/plugin-transform-block-scoped-functions-7.12.1" + sources."@babel/plugin-transform-block-scoping-7.12.1" + sources."@babel/plugin-transform-classes-7.12.1" + sources."@babel/plugin-transform-computed-properties-7.12.1" + sources."@babel/plugin-transform-destructuring-7.12.1" + sources."@babel/plugin-transform-dotall-regex-7.12.1" + sources."@babel/plugin-transform-duplicate-keys-7.12.1" + sources."@babel/plugin-transform-exponentiation-operator-7.12.1" + sources."@babel/plugin-transform-flow-strip-types-7.12.1" + sources."@babel/plugin-transform-for-of-7.12.1" + sources."@babel/plugin-transform-function-name-7.12.1" + sources."@babel/plugin-transform-literals-7.12.1" + sources."@babel/plugin-transform-member-expression-literals-7.12.1" + sources."@babel/plugin-transform-modules-amd-7.12.1" + sources."@babel/plugin-transform-modules-commonjs-7.12.1" + sources."@babel/plugin-transform-modules-systemjs-7.12.1" + sources."@babel/plugin-transform-modules-umd-7.12.1" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1" + sources."@babel/plugin-transform-new-target-7.12.1" + sources."@babel/plugin-transform-object-super-7.12.1" + sources."@babel/plugin-transform-parameters-7.12.1" + sources."@babel/plugin-transform-property-literals-7.12.1" + sources."@babel/plugin-transform-regenerator-7.12.1" + sources."@babel/plugin-transform-reserved-words-7.12.1" + sources."@babel/plugin-transform-shorthand-properties-7.12.1" + sources."@babel/plugin-transform-spread-7.12.1" + sources."@babel/plugin-transform-sticky-regex-7.12.1" + sources."@babel/plugin-transform-template-literals-7.12.1" + sources."@babel/plugin-transform-typeof-symbol-7.12.1" + sources."@babel/plugin-transform-typescript-7.12.1" + sources."@babel/plugin-transform-unicode-escapes-7.12.1" + sources."@babel/plugin-transform-unicode-regex-7.12.1" + sources."@babel/preset-env-7.12.1" + sources."@babel/preset-flow-7.12.1" sources."@babel/preset-modules-0.1.4" - sources."@babel/preset-typescript-7.12.0" - sources."@babel/register-7.12.0" - sources."@babel/runtime-7.12.0" + sources."@babel/preset-typescript-7.12.1" + sources."@babel/register-7.12.1" + sources."@babel/runtime-7.12.1" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.12.0" - sources."@babel/types-7.12.0" + sources."@babel/traverse-7.12.1" + sources."@babel/types-7.12.1" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-2.1.1" @@ -102505,7 +102481,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.11.8" + sources."@types/node-14.11.10" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@webpack-cli/generators-1.0.1" @@ -102669,7 +102645,7 @@ in ]; }) sources."ejs-3.1.5" - sources."electron-to-chromium-1.3.580" + sources."electron-to-chromium-1.3.582" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -102751,7 +102727,7 @@ in ]; }) sources."first-chunk-stream-2.0.0" - sources."flow-parser-0.135.0" + sources."flow-parser-0.136.0" (sources."follow-redirects-1.5.10" // { dependencies = [ sources."debug-3.1.0" @@ -103279,7 +103255,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.11.8" + sources."@types/node-14.11.10" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -104002,7 +103978,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.25" + sources."@types/node-13.13.26" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -104413,13 +104389,13 @@ in sources."@babel/code-frame-7.10.4" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/runtime-7.12.0" + sources."@babel/runtime-7.12.1" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.11.8" + sources."@types/node-14.11.10" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" sources."aggregate-error-3.1.0" From cbd37d0128e2647893705708a514d03cbe1873ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Sat, 17 Oct 2020 00:10:59 +0200 Subject: [PATCH 367/546] python{2,3}Packages.galario: 1.2.1 -> 1.2.2 Upgrading fixes the tests --- pkgs/development/libraries/galario/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/galario/default.nix b/pkgs/development/libraries/galario/default.nix index 08450e56983..84594b8dbeb 100644 --- a/pkgs/development/libraries/galario/default.nix +++ b/pkgs/development/libraries/galario/default.nix @@ -18,20 +18,20 @@ let in stdenv.mkDerivation rec { pname = "galario"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "mtazzari"; repo = pname; rev = "v${version}"; - sha256 = "1akz7md7ly16a89zr880c265habakqdg9sj8iil90klqa0i21w6g"; + sha256 = "0dw88ga50x3jwyfgcarn4azlhiarggvdg262hilm7rbrvlpyvha0"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ fftw fftwFloat ] - ++ stdenv.lib.optional enablePython pythonPackages.python - ++ stdenv.lib.optional stdenv.isDarwin llvmPackages.openmp + ++ stdenv.lib.optional enablePython pythonPackages.python + ++ stdenv.lib.optional stdenv.isDarwin llvmPackages.openmp ; propagatedBuildInputs = stdenv.lib.optional enablePython [ @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { pythonPackages.pytest ]; - checkInputs = stdenv.lib.optional enablePython pythonPackages.scipy; + checkInputs = stdenv.lib.optional enablePython [ pythonPackages.scipy pythonPackages.pytestcov ]; preConfigure = '' mkdir -p build/external/src From 4425eab960b0ee436815ec7d6c9f670ba1c42798 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 16 Oct 2020 15:39:14 -0700 Subject: [PATCH 368/546] linux/hardened/patches/4.14: 4.14.200.a -> 4.14.201.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 66462c1a0b8..b7fdedc5c6f 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,8 +1,8 @@ { "4.14": { - "name": "linux-hardened-4.14.200.a.patch", - "sha256": "0z38nm0m97d8m0q34fbnlz7l0rjbf76qrvbc6kljjg7gang3cby8", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.200.a/linux-hardened-4.14.200.a.patch" + "name": "linux-hardened-4.14.201.a.patch", + "sha256": "16jkhib0fc8l96a092srqpg850wh0n49pa0yghpviz29rlids6vs", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.201.a/linux-hardened-4.14.201.a.patch" }, "4.19": { "name": "linux-hardened-4.19.150.a.patch", From a1a49092a4b3a2bdf1a7714b4c0104d8e8430920 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 16 Oct 2020 15:39:16 -0700 Subject: [PATCH 369/546] linux/hardened/patches/4.19: 4.19.150.a -> 4.19.151.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index b7fdedc5c6f..c220ab5b27a 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -5,9 +5,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.201.a/linux-hardened-4.14.201.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.150.a.patch", - "sha256": "1gx09a6rm7r7ggg9ikkzj2fh22qbr2jnlfkphkq27l4fx8241lig", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.150.a/linux-hardened-4.19.150.a.patch" + "name": "linux-hardened-4.19.151.a.patch", + "sha256": "12sh1zvc72p7kkbgpm4cjppv1vlqbywsqfsva76pjx1mw0wsj7sj", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.151.a/linux-hardened-4.19.151.a.patch" }, "5.4": { "name": "linux-hardened-5.4.70.a.patch", From 99f9bedbde061d62d1fc1bad5826fc1bead583ca Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 16 Oct 2020 15:39:18 -0700 Subject: [PATCH 370/546] linux/hardened/patches/5.4: 5.4.70.a -> 5.4.71.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c220ab5b27a..a5f2784e9dd 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -10,9 +10,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.151.a/linux-hardened-4.19.151.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.70.a.patch", - "sha256": "19g7yp4dip92bh54vd8vbn7cd4p691yvb52nz76p74fdksfa71m5", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.70.a/linux-hardened-5.4.70.a.patch" + "name": "linux-hardened-5.4.71.a.patch", + "sha256": "1w4sfkx4qj9vx47z06bkf4biaiz58z2qp536g7dss26zdbx1im26", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.71.a/linux-hardened-5.4.71.a.patch" }, "5.8": { "name": "linux-hardened-5.8.14.a.patch", From d7674bc3361e703123f28e2ce931298e664f59d5 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 16 Oct 2020 15:39:19 -0700 Subject: [PATCH 371/546] linux/hardened/patches/5.8: 5.8.14.a -> 5.8.15.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index a5f2784e9dd..036cc44ecea 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -15,8 +15,8 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.71.a/linux-hardened-5.4.71.a.patch" }, "5.8": { - "name": "linux-hardened-5.8.14.a.patch", - "sha256": "08w3w0w5sw7lgm6zpsy55fz1h42s2aqcznfgxi31yv9qski31lbz", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.14.a/linux-hardened-5.8.14.a.patch" + "name": "linux-hardened-5.8.15.a.patch", + "sha256": "0b7bfzknz2am9pfypazqzky9bcd6659sakcdx2a7p1i3bj6zxnn1", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.15.a/linux-hardened-5.8.15.a.patch" } } From 8133b9cb5f7c00d4fe31c8c2c4b525bc2650bfc0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 20:44:37 +0000 Subject: [PATCH 372/546] python37Packages.uncompyle6: 3.7.3 -> 3.7.4 --- pkgs/development/python-modules/uncompyle6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index 9e793ec3fb3..5d1a32a2965 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "uncompyle6"; - version = "3.7.3"; + version = "3.7.4"; src = fetchPypi { inherit pname version; - sha256 = "a45f98f40edb47c2a0e2786ffe7d68fc2cb4ad05b2efcb50e95c337f6ecae353"; + sha256 = "af8330861bf940e7a3ae0f06d129b8e645191a36bf73ca15ff51997a837d41f8"; }; checkInputs = [ nose pytest hypothesis six ]; From 1cfad6db6e49e450f6ad1d69d9f9654bd07b410a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 23:44:31 +0000 Subject: [PATCH 373/546] python37Packages.bravia-tv: 1.0.6 -> 1.0.7 --- pkgs/development/python-modules/bravia-tv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bravia-tv/default.nix b/pkgs/development/python-modules/bravia-tv/default.nix index 00d554ef14b..cfb30a926d5 100644 --- a/pkgs/development/python-modules/bravia-tv/default.nix +++ b/pkgs/development/python-modules/bravia-tv/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "bravia-tv"; - version = "1.0.6"; + version = "1.0.7"; disabled = isPy27; src = fetchFromGitHub { owner = "dcnielsen90"; repo = "python-bravia-tv"; rev = "v${version}"; - sha256 = "07i1j3y04w2jwylff8w1aimmy4fj1g42wq8iz83an7dl4cz3rap9"; + sha256 = "0bg33nilybh46s6yz3x7a7x8biwbvy5scqdrl4didhn7vjd4w5fn"; }; propagatedBuildInputs = [ requests ]; From 47f47a27ed50d1364a618543628662c3fb206ebb Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 17 Oct 2020 11:18:32 +1000 Subject: [PATCH 374/546] .editorconfig: cleanup, drop indent_size excludes --- .editorconfig | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.editorconfig b/.editorconfig index 66a23a20577..d8a320e495c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -65,9 +65,7 @@ trim_trailing_whitespace = unset [gemset.nix] insert_final_newline = unset -[node-{composition,packages}.nix] -insert_final_newline = unset -[node-packages-generated.nix] +[node-{composition,packages,packages-generated}.nix] insert_final_newline = unset [nixos/modules/services/networking/ircd-hybrid/*.{conf,in}] @@ -76,9 +74,6 @@ trim_trailing_whitespace = unset [nixos/tests/systemd-networkd-vrf.nix] trim_trailing_whitespace = unset -[pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json] -indent_size = unset - [pkgs/build-support/dotnetenv/Wrapper/**] end_of_line = unset insert_final_newline = unset @@ -91,12 +86,8 @@ trim_trailing_whitespace = unset end_of_line = unset insert_final_newline = unset -[pkgs/development/lisp-modules/quicklisp-to-nix.nix] -indent_size = unset - [pkgs/development/haskell-modules/hackage-packages.nix] indent_style = unset -indent_size = unset trim_trailing_whitespace = unset [pkgs/development/mobile/androidenv/generated/{addons,packages}.nix] @@ -106,7 +97,6 @@ trim_trailing_whitespace = unset insert_final_newline = unset [pkgs/servers/dict/wordnet_structures.py] -indent_size = unset trim_trailing_whitespace = unset [pkgs/tools/misc/timidity/timidity.cfg] @@ -118,6 +108,3 @@ trim_trailing_whitespace = unset [pkgs/top-level/emscripten-packages.nix] trim_trailing_whitespace = unset - -[pkgs/top-level/perl-packages.nix] -indent_size = unset From bcbc44c71770c2738bedfaf3b2cd97dd65e3e329 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Oct 2020 00:15:04 +0000 Subject: [PATCH 375/546] python37Packages.pyexcel-io: 0.5.20 -> 0.6.3 https://github.com/pyexcel/pyexcel-io/compare/0.5.20...v0.6.3 --- pkgs/development/python-modules/pyexcel-io/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyexcel-io/default.nix b/pkgs/development/python-modules/pyexcel-io/default.nix index 8a788402b49..6fe2245385a 100644 --- a/pkgs/development/python-modules/pyexcel-io/default.nix +++ b/pkgs/development/python-modules/pyexcel-io/default.nix @@ -2,15 +2,18 @@ , buildPythonPackage , fetchPypi , lml +, isPy3k }: buildPythonPackage rec { pname = "pyexcel-io"; - version = "0.5.20"; + version = "0.6.3"; + + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "CN/jlVO5ljWbFD3j2exD4ZbxE41HyrtzrwShaCG4TXk="; + sha256 = "8fb7a201eb3e5763bb8f9d6e096ceed9e5f1baecd784c9fadbe0fb3d59174c0e"; }; propagatedBuildInputs = [ From bfc403d9d7fb5beed87827a6b0f4eebf607c1c71 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Oct 2020 01:16:21 +0000 Subject: [PATCH 376/546] =?UTF-8?q?python37Packages.pyexcel:=200.6.4=20?= =?UTF-8?q?=E2=86=92=200.6.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/pyexcel/pyexcel/compare/v0.6.4...v0.6.5 --- pkgs/development/python-modules/pyexcel/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyexcel/default.nix b/pkgs/development/python-modules/pyexcel/default.nix index 71219c32ae5..d62302c9c23 100644 --- a/pkgs/development/python-modules/pyexcel/default.nix +++ b/pkgs/development/python-modules/pyexcel/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, isPy3k , lml , pyexcel-io , texttable @@ -10,12 +10,13 @@ buildPythonPackage rec { pname = "pyexcel"; - version = "0.6.4"; - disabled = isPy27; + version = "0.6.5"; + + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "pPNYnimHhW7SL6X6OLwagZoadTD7IdUSbO7vAqQPQu8="; + sha256 = "36588573ccb1c86e1a8869e1e9f6b31975a38c13803f015a197c18efd2e685ad"; }; propagatedBuildInputs = [ From 2ddb83c76d7b398cf00d0aead2fd83bc0ea92aa3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Oct 2020 01:16:31 +0000 Subject: [PATCH 377/546] =?UTF-8?q?python37Packages.pyexcel-ods:=200.5.6?= =?UTF-8?q?=20=E2=86=92=200.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/pyexcel/pyexcel-ods/compare/v0.5.6...v0.6.0 --- pkgs/development/python-modules/pyexcel-ods/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyexcel-ods/default.nix b/pkgs/development/python-modules/pyexcel-ods/default.nix index 9e5b32ea867..b923932ec57 100644 --- a/pkgs/development/python-modules/pyexcel-ods/default.nix +++ b/pkgs/development/python-modules/pyexcel-ods/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyexcel-ods"; - version = "0.5.6"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "O+Uv2KrdvYvJKG9+sUj0VT1MlyUtaVw6nse5XmZmoiM="; + sha256 = "f61b56515fd4ccd4687f0a112422f74ce8535247ad2da49db90038d7e3ed397c"; }; propagatedBuildInputs = [ From 6287e697725cb79631ca38c123df4c9068e14d88 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Oct 2020 01:16:41 +0000 Subject: [PATCH 378/546] =?UTF-8?q?python37Packages.pyexcel-xls:=200.5.9?= =?UTF-8?q?=20=E2=86=92=200.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/pyexcel/pyexcel-xls/compare/v0.5.9...v0.6.0 --- pkgs/development/python-modules/pyexcel-xls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyexcel-xls/default.nix b/pkgs/development/python-modules/pyexcel-xls/default.nix index 2dd4533c2a9..418dfbf42f8 100644 --- a/pkgs/development/python-modules/pyexcel-xls/default.nix +++ b/pkgs/development/python-modules/pyexcel-xls/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyexcel-xls"; - version = "0.5.9"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1Wyt6gpmBoRFaXbZgFJVTTu+KnivxfmpHIaR9iZghVU="; + sha256 = "64bac180274c52efe970c664d3e8bb12402c9d10e0734d9fe87655646a876c45"; }; propagatedBuildInputs = [ From 5648cc5863982a2ffc51f9de59fba83c25271666 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 01:57:16 +0000 Subject: [PATCH 379/546] python37Packages.cx_oracle: 8.0.0 -> 8.0.1 --- pkgs/development/python-modules/cx_oracle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix index cecb41c3d88..440e43cf81c 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "cx_Oracle"; - version = "8.0.0"; + version = "8.0.1"; buildInputs = [ odpic ]; src = fetchPypi { inherit pname version; - sha256 = "cddc298301789c724de5817611f7bd38b4859b371928e2e85a9c37af222f73c8"; + sha256 = "f10ada7f821a325c6befdd6fef1cac44ebc830736d0b75dda7b8ac9f851087b2"; }; preConfigure = '' From 7b583214f0eee483d88b803d751dad38e0af2f13 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 02:12:00 +0000 Subject: [PATCH 380/546] python37Packages.phonenumbers: 8.12.10 -> 8.12.11 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 8693901c93e..e4cb59f5b93 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.10"; + version = "8.12.11"; src = fetchPypi { inherit pname version; - sha256 = "d6e108352e7113c55cf0d92f8aede876a379580e46a3b9c2e779dc3601f11863"; + sha256 = "17f39f06c1e0e20eabe69ff735b1c08e4547d12a12595da3d835fd3256a9ee0c"; }; meta = { From 52b903b3c4bbdba141f0402774ab0f69f29dbfee Mon Sep 17 00:00:00 2001 From: Antonio Yang Date: Fri, 9 Oct 2020 23:32:58 +0800 Subject: [PATCH 381/546] hime: fix enable hime, remove hime-all package - fix inputMethod.enable hime by adding module list - rm hime-all package, because chewing, anthy modules does not work well --- nixos/modules/i18n/input-method/default.xml | 4 +-- nixos/modules/i18n/input-method/hime.nix | 18 ++----------- nixos/modules/module-list.nix | 1 + pkgs/tools/inputmethods/hime/default.nix | 28 ++++++++------------- pkgs/top-level/all-packages.nix | 9 ++----- 5 files changed, 18 insertions(+), 42 deletions(-) diff --git a/nixos/modules/i18n/input-method/default.xml b/nixos/modules/i18n/input-method/default.xml index e15f6669081..73911059f8a 100644 --- a/nixos/modules/i18n/input-method/default.xml +++ b/nixos/modules/i18n/input-method/default.xml @@ -252,8 +252,8 @@ i18n.inputMethod = { Hime is an extremely easy-to-use input method framework. It is lightweight, stable, powerful and supports many commonly used input methods, including - Cangjie, Zhuyin, Dayi, Rank, Shrimp, Greek, Japanese Anthy, Korean Pinyin, - Latin Alphabet, Rancang hunting birds, cool music, etc... + Cangjie, Zhuyin, Dayi, Rank, Shrimp, Greek, Korean Pinyin, Latin Alphabet, + etc... diff --git a/nixos/modules/i18n/input-method/hime.nix b/nixos/modules/i18n/input-method/hime.nix index a1b346a0f84..8482130db3e 100644 --- a/nixos/modules/i18n/input-method/hime.nix +++ b/nixos/modules/i18n/input-method/hime.nix @@ -1,23 +1,9 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: with lib; { - options = { - i18n.inputMethod.hime = { - enableChewing = mkOption { - type = with types; nullOr bool; - default = null; - description = "enable chewing input method"; - }; - enableAnthy = mkOption { - type = with types; nullOr bool; - default = null; - description = "enable anthy input method"; - }; - }; - }; - config = mkIf (config.i18n.inputMethod.enabled == "hime") { + i18n.inputMethod.package = pkgs.hime; environment.variables = { GTK_IM_MODULE = "hime"; QT_IM_MODULE = "hime"; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 39f28773eab..0958e561243 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -79,6 +79,7 @@ ./hardware/xpadneo.nix ./i18n/input-method/default.nix ./i18n/input-method/fcitx.nix + ./i18n/input-method/hime.nix ./i18n/input-method/ibus.nix ./i18n/input-method/nabi.nix ./i18n/input-method/uim.nix diff --git a/pkgs/tools/inputmethods/hime/default.nix b/pkgs/tools/inputmethods/hime/default.nix index cce1ec49515..4d2b44456ae 100644 --- a/pkgs/tools/inputmethods/hime/default.nix +++ b/pkgs/tools/inputmethods/hime/default.nix @@ -1,9 +1,10 @@ { stdenv, fetchFromGitHub, pkgconfig, which, gtk2, gtk3, qt4, qt5, libXtst, lib, -enableChewing ? true, libchewing, -enableAnthy ? true, anthy, }: +# chewing and anthy do not work well +# so we do not enable these input method at this moment + stdenv.mkDerivation { name = "hime"; version = "unstable-2020-06-27"; @@ -16,25 +17,18 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ which pkgconfig ]; - buildInputs = [ libXtst gtk2 gtk3 qt4 qt5.qtbase ] - ++ lib.optional enableChewing libchewing - ++ lib.optional enableAnthy anthy; + buildInputs = [ libXtst gtk2 gtk3 qt4 qt5.qtbase ]; - patchPhase = '' - patchShebangs configure - ''; - - # The configure script already auto-detect libchewing and anthy, - # so we do not need additional flags for libchewing or anthy + preConfigure = "patchShebangs configure"; configureFlags = [ "--disable-lib64" "--disable-qt5-immodule" ]; meta = with stdenv.lib; { - homepage = "http://hime-ime.github.io/"; - downloadPage = "https://github.com/hime-ime/hime/downloads"; - description = "A useful input method engine for Asia region"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ yanganto ]; + homepage = "http://hime-ime.github.io/"; + downloadPage = "https://github.com/hime-ime/hime/downloads"; + description = "A useful input method engine for Asia region"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ yanganto ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97b0a366867..20d1ecf2edb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1104,6 +1104,8 @@ in google-amber = callPackage ../tools/graphics/amber { }; + hime = callPackage ../tools/inputmethods/hime {}; + hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { }; http2tcp = callPackage ../tools/networking/http2tcp { }; @@ -5595,13 +5597,6 @@ in nabi = callPackage ../tools/inputmethods/nabi { }; - hime = callPackage ../tools/inputmethods/hime {}; - - hime-all = callPackage ../tools/inputmethods/hime { - enableChewing = true; - enableAnthy = true; - }; - nahid-fonts = callPackage ../data/fonts/nahid-fonts { }; namazu = callPackage ../tools/text/namazu { }; From 78d9b5fb1a668f202e167ef44c8e125c53b1e88d Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Wed, 7 Oct 2020 02:00:23 -0400 Subject: [PATCH 382/546] psftools: init at 1.0.13 --- pkgs/os-specific/linux/psftools/default.nix | 24 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 25 insertions(+) create mode 100644 pkgs/os-specific/linux/psftools/default.nix diff --git a/pkgs/os-specific/linux/psftools/default.nix b/pkgs/os-specific/linux/psftools/default.nix new file mode 100644 index 00000000000..a71e7ef0dcc --- /dev/null +++ b/pkgs/os-specific/linux/psftools/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: +stdenv.mkDerivation rec { + pname = "psftools"; + version = "1.0.13"; + src = fetchurl { + url = "https://www.seasip.info/Unix/PSF/${pname}-${version}.tar.gz"; + sha256 = "0rgg1lhryqi6sgm4afhw0z6pjivdw4hyhpxanj8rabyabn4fcqcw"; + }; + outputs = ["out" "man" "dev" "lib"]; + + meta = with stdenv.lib; { + homepage = "https://www.seasip.info/Unix/PSF"; + description = "Conversion tools for .PSF fonts"; + longDescription = '' + The PSFTOOLS are designed to manipulate fixed-width bitmap fonts, + such as DOS or Linux console fonts. Both the PSF1 (8 pixels wide) + and PSF2 (any width) formats are supported; the default output + format is PSF2. + ''; + platforms = platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4412c0f0919..3a15e49b650 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28308,4 +28308,5 @@ in cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix {}; + psftools = callPackage ../os-specific/linux/psftools {}; } From c004bcab9ca439418fe2fc605d2b1f3eec4e5535 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Mon, 17 Aug 2020 07:04:03 -0400 Subject: [PATCH 383/546] git-vanity-hash: init at 2020-02-26 --- .../git-and-tools/default.nix | 2 ++ .../git-and-tools/git-vanity-hash/default.nix | 27 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 130ace63b4b..e5d2f9f85d8 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -239,6 +239,8 @@ let transcrypt = callPackage ./transcrypt { }; + git-vanity-hash = callPackage ./git-vanity-hash { }; + ydiff = pkgs.python3.pkgs.toPythonApplication pkgs.python3.pkgs.ydiff; } // lib.optionalAttrs (config.allowAliases or true) (with self; { diff --git a/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix b/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix new file mode 100644 index 00000000000..839acc5cca5 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "git-vanity-hash"; + version = "2020-02-26-unstable"; + + src = fetchFromGitHub { + owner = "prasmussen"; + repo = "git-vanity-hash"; + rev = "000004122124005af8d118a3f379bfc6ecc1e7c7"; + sha256 = "1wf342zawbphlzvji0yba0qg4f6v67h81nhxqcsir132jv397ma7"; + }; + + cargoSha256 = "0mbdis1kxmgj3wlgznr9bqf5yv0jwlj2f63gr5c99ja0ijccp99h"; + + postInstall = '' + mkdir -p $out/share/doc/git-vanity-hash + cp README.md $out/share/doc/git-vanity-hash + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/prasmussen/git-vanity-hash"; + description = "Tool for creating commit hashes with a specific prefix"; + license = [ licenses.mit ]; + maintainers = [ maintainers.kaction ]; + }; +} From 1f319ea6ad58ab9377f729598eedfd6c9bb8e763 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 17 Oct 2020 04:20:00 +0000 Subject: [PATCH 384/546] rbw: 0.4.6 -> 0.5.0 --- pkgs/tools/security/rbw/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/tools/security/rbw/default.nix index dd7d96c361a..c8a55e3c25e 100644 --- a/pkgs/tools/security/rbw/default.nix +++ b/pkgs/tools/security/rbw/default.nix @@ -20,15 +20,15 @@ rustPlatform.buildRustPackage rec { pname = "rbw"; - version = "0.4.6"; + version = "0.5.0"; src = fetchCrate { inherit version; crateName = "${pname}"; - sha256 = "0vq7cwk3i57fvn54q2rgln74j4p9vqm5zyhap94s73swjywicwk0"; + sha256 = "0p37kwkp153mkns4bh7k7gnksk6c31214wlw3faf42daav32mmgw"; }; - cargoSha256 = "1h253ncick2v9aki5rf1bdrg5rj3h4nrvx5q01gw03cgwnqvyiiy"; + cargoSha256 = "1vkgh0995xx0hr96mnzmdgd15gs6da7ynywqcjgcw5kr48bf1063"; nativeBuildInputs = [ pkgconfig @@ -74,6 +74,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://crates.io/crates/rbw"; license = licenses.mit; maintainers = with maintainers; [ albakham luc65r ]; - platforms = platforms.all; }; } From e2591b03fb1e09ae76446dffc33e8938a757e1c4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 17 Oct 2020 04:20:00 +0000 Subject: [PATCH 385/546] rbw: add marsam to maintainers --- pkgs/tools/security/rbw/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/tools/security/rbw/default.nix index c8a55e3c25e..9e778a636c1 100644 --- a/pkgs/tools/security/rbw/default.nix +++ b/pkgs/tools/security/rbw/default.nix @@ -73,6 +73,6 @@ rustPlatform.buildRustPackage rec { description = "Unofficial command line client for Bitwarden"; homepage = "https://crates.io/crates/rbw"; license = licenses.mit; - maintainers = with maintainers; [ albakham luc65r ]; + maintainers = with maintainers; [ albakham luc65r marsam ]; }; } From 74bdceca077751f705dc3df19b6a87a50959c90f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 17 Oct 2020 04:20:00 +0000 Subject: [PATCH 386/546] vale: 2.3.4 -> 2.4.3 --- pkgs/tools/text/vale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 8a63d82eacb..e2fb6b71ead 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.3.4"; + version = "2.4.3"; subPackages = [ "." ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "0vk7kk2a2891vm46lss8q2893n2zdirlicac2f3xfkrbb5lhkicd"; + sha256 = "1qjsrwabqg9brr5q46dl0zrhy5m5qqp68m5v0kskwkykd3r97qwn"; }; vendorSha256 = null; From e3b407e555da9300d9e217cf7473f83c8f0effe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 17 Oct 2020 07:35:52 +0200 Subject: [PATCH 387/546] Revert "softmaker-office: remove /bin/ls intercept" This reverts commit e883c6578c5550fd577c53eaa7d27f7c464377cc. --- .../applications/office/softmaker/generic.nix | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix index c1e25ecb00e..c7803fa3d1d 100644 --- a/pkgs/applications/office/softmaker/generic.nix +++ b/pkgs/applications/office/softmaker/generic.nix @@ -5,7 +5,7 @@ # For fixing up execution of /bin/ls, which is necessary for # product unlocking. -, coreutils +, coreutils, libredirect , pname, version, edition, suiteName, src, archive @@ -52,7 +52,22 @@ in stdenv.mkDerivation { runHook postUnpack ''; - installPhase = '' + installPhase = let + # SoftMaker/FreeOffice collects some system information upon + # unlocking the product. But in doing so, it attempts to execute + # /bin/ls. If the execve syscall fails, the whole unlock + # procedure fails. This works around that by rewriting /bin/ls + # to the proper path. + # + # SoftMaker Office restarts itself upon some operations, such + # changing the theme and unlocking. Unfortunately, we do not + # have control over its environment then and it will fail + # with an error. + lsIntercept = '' + --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ + --set NIX_REDIRECTS "/bin/ls=${coreutils}/bin/ls" + ''; + in '' runHook preInstall mkdir -p $out/share @@ -61,9 +76,12 @@ in stdenv.mkDerivation { # Wrap rather than symlinking, so that the programs can determine # their resource path. mkdir -p $out/bin - makeWrapper $out/share/${pname}${edition}/planmaker $out/bin/${pname}-planmaker - makeWrapper $out/share/${pname}${edition}/presentations $out/bin/${pname}-presentations - makeWrapper $out/share/${pname}${edition}/textmaker $out/bin/${pname}-textmaker + makeWrapper $out/share/${pname}${edition}/planmaker $out/bin/${pname}-planmaker \ + ${lsIntercept} + makeWrapper $out/share/${pname}${edition}/presentations $out/bin/${pname}-presentations \ + ${lsIntercept} + makeWrapper $out/share/${pname}${edition}/textmaker $out/bin/${pname}-textmaker \ + ${lsIntercept} for size in 16 32 48 64 96 128 256 512 1024; do mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps From c342e5a6dc98049b9ae91026fd7801a552057090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 17 Oct 2020 08:12:23 +0200 Subject: [PATCH 388/546] softmaker-office: add additional programs to PATH These seem to be needed for the SoftMaker/FreeOffice unlock code. If they are not added to PATH, startup takes a very long time and reports many segmentation faults. Fixes #71228. --- pkgs/applications/office/softmaker/generic.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix index c7803fa3d1d..56f3cb74363 100644 --- a/pkgs/applications/office/softmaker/generic.nix +++ b/pkgs/applications/office/softmaker/generic.nix @@ -7,6 +7,9 @@ # product unlocking. , coreutils, libredirect + # Extra utilities used by the SoftMaker applications. +, gnugrep, utillinux, which + , pname, version, edition, suiteName, src, archive , ... @@ -59,13 +62,17 @@ in stdenv.mkDerivation { # procedure fails. This works around that by rewriting /bin/ls # to the proper path. # + # In addition, it expects some common utilities (which, whereis) + # to be in the path. + # # SoftMaker Office restarts itself upon some operations, such # changing the theme and unlocking. Unfortunately, we do not # have control over its environment then and it will fail # with an error. - lsIntercept = '' + extraWrapperArgs = '' --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ - --set NIX_REDIRECTS "/bin/ls=${coreutils}/bin/ls" + --set NIX_REDIRECTS "/bin/ls=${coreutils}/bin/ls" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ coreutils gnugrep utillinux which ]}" ''; in '' runHook preInstall @@ -77,11 +84,11 @@ in stdenv.mkDerivation { # their resource path. mkdir -p $out/bin makeWrapper $out/share/${pname}${edition}/planmaker $out/bin/${pname}-planmaker \ - ${lsIntercept} + ${extraWrapperArgs} makeWrapper $out/share/${pname}${edition}/presentations $out/bin/${pname}-presentations \ - ${lsIntercept} + ${extraWrapperArgs} makeWrapper $out/share/${pname}${edition}/textmaker $out/bin/${pname}-textmaker \ - ${lsIntercept} + ${extraWrapperArgs} for size in 16 32 48 64 96 128 256 512 1024; do mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps From e4aadc82b566fb52f9be2801770ed330e2711aaa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 07:14:58 +0000 Subject: [PATCH 389/546] python37Packages.holoviews: 1.13.3 -> 1.13.4 --- pkgs/development/python-modules/holoviews/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 796ddaace8b..287216cc949 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.13.3"; + version = "1.13.4"; src = fetchPypi { inherit pname version; - sha256 = "e6753651a8598f21fc2c20e8456865ecec276cfea1519182a76d957506727934"; + sha256 = "34dc09dfb557f79515a011a72b343daf31b5e5d67403a008dded59bab658267c"; }; propagatedBuildInputs = [ From c985bf793e6ab7d54a9182381b4b610fe0ae6936 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 03:07:45 +0000 Subject: [PATCH 390/546] python37Packages.debian: 0.1.37 -> 0.1.38 --- pkgs/development/python-modules/debian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/debian/default.nix b/pkgs/development/python-modules/debian/default.nix index dec6fc2dadd..9f5cb744e55 100644 --- a/pkgs/development/python-modules/debian/default.nix +++ b/pkgs/development/python-modules/debian/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "python-debian"; - version = "0.1.37"; + version = "0.1.38"; src = fetchPypi { inherit pname version; - sha256 = "ab04f535155810c46c8abf3f7d46364b67b034c49ff8690cdb510092eee56750"; + sha256 = "a352bb5f9ef19b0272078f516ee0ec42b05e90ac85651d87c10e7041550dcc1d"; }; propagatedBuildInputs = [ chardet six ]; From bd09a9e3864d4a482c3d6dca5731286914600e57 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 1 Oct 2020 22:26:44 +0700 Subject: [PATCH 391/546] knightos-z80e: init at 0.5.0 --- .../tools/knightos/z80e/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/tools/knightos/z80e/default.nix diff --git a/pkgs/development/tools/knightos/z80e/default.nix b/pkgs/development/tools/knightos/z80e/default.nix new file mode 100644 index 00000000000..6aad8f687e7 --- /dev/null +++ b/pkgs/development/tools/knightos/z80e/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, cmake, knightos-scas, readline, SDL2 }: + +stdenv.mkDerivation rec { + pname = "z80e"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "KnightOS"; + repo = "z80e"; + rev = version; + sha256 = "18nnip6nv1pq19bxgd07fv7ci3c5yj8d9cip97a4zsfab7bmbq6k"; + }; + + nativeBuildInputs = [ cmake knightos-scas ]; + + buildInputs = [ readline SDL2 ]; + + cmakeFlags = [ "-Denable-sdl=YES" ]; + + meta = with stdenv.lib; { + homepage = "https://knightos.org/"; + description = "A Z80 calculator emulator and debugger"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3b4ebdcb94..8862024fb8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9338,6 +9338,8 @@ in knightos-scas = callPackage ../development/tools/knightos/scas { }; + knightos-z80e = callPackage ../development/tools/knightos/z80e { }; + kotlin = callPackage ../development/compilers/kotlin { }; lazarus = callPackage ../development/compilers/fpc/lazarus.nix { From 3fbc76fc6764d7e34b25fb98baa1f2d001cab82d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 17 Oct 2020 10:34:49 +0200 Subject: [PATCH 392/546] broot: 1.0.0 -> 1.0.3 Changes: https://github.com/Canop/broot/releases/tag/v1.0.1 https://github.com/Canop/broot/releases/tag/v1.0.2 https://github.com/Canop/broot/releases/tag/v1.0.3 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 62ca179cfde..fb0868016d7 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.0.0"; + version = "1.0.3"; src = fetchCrate { inherit pname version; - sha256 = "1dc6lb6ihj4s0mcp1say16j9yr61jdbzhmayxxsm4ansngbzmw45"; + sha256 = "046yg270hnwzhap2rraihywpqjq5s3qxmyfcvfgfayz25216jmvc"; }; - cargoSha256 = "0nqmincayjv1snxz94i14fypc9dv69fxfqqdz3qbcvc2cs62zayg"; + cargoSha256 = "02l6cdfx2sglygsdgnm474vmpbmpm2a1s6srd9cy66k6hjm1m0bn"; nativeBuildInputs = [ makeWrapper From bf627ae0e04256274d07f36e9e3e441e22755c29 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 17 Oct 2020 11:18:15 +0200 Subject: [PATCH 393/546] monero: 0.17.0.1 -> 0.17.1.0 --- pkgs/applications/blockchains/monero/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 935040bc7bb..7d55a5f6f34 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -17,25 +17,18 @@ assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; stdenv.mkDerivation rec { pname = "monero"; - version = "0.17.0.1"; + version = "0.17.1.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "1v0phvg5ralli4dr09a60nq032xqlci5d6v4zfq8304vgrn1ffgp"; + sha256 = "1cngniv7sndy8r0fcfgk737640k53q3kwd36g891p5igcb985qdw"; fetchSubmodules = true; }; patches = [ ./use-system-libraries.patch - - # This fixes a bug in the monero-gui build system, - # remove it once the PR has been merged - (fetchpatch { - url = "https://github.com/monero-project/monero/pull/6867.patch"; - sha256 = "0nxa6861df1fadrm9bmhqf2g6mljgr4jndsbxqp7g501hv9z51j3"; - }) ]; postPatch = '' From 9bf0008d683fd9373826a7f079d8f0ab3fec6ff3 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 17 Oct 2020 11:18:43 +0200 Subject: [PATCH 394/546] monero-gui: 0.17.0.1 -> 0.17.1.0 --- pkgs/applications/blockchains/monero-gui/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 776d51ca6bd..43a35b1328b 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -27,13 +27,13 @@ in stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.17.0.1"; + version = "0.17.1.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "1i9a3ampppyzsl4sllbqlr3w43sjpb3fdfxhb1j4n49p8g0jzmf3"; + sha256 = "07r78ipv4g3i6z822kq380vi3qwlb958rccsy6lyybkhj9y0rx84"; }; nativeBuildInputs = [ @@ -65,9 +65,6 @@ stdenv.mkDerivation rec { substituteInPlace src/version.js.in \ --replace '@VERSION_TAG_GUI@' '${version}' - # remove this line on the next release - rm cmake/Version.cmake - # use monerod from the monero package substituteInPlace src/daemon/DaemonManager.cpp \ --replace 'QApplication::applicationDirPath() + "' '"${monero}/bin' From 101bb7814be92ec234f8ad860bda2b4656db08c1 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 17 Oct 2020 11:47:07 +0200 Subject: [PATCH 395/546] monero-gui: fix install path --- pkgs/applications/blockchains/monero-gui/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 43a35b1328b..c079fa88a70 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -75,10 +75,11 @@ stdenv.mkDerivation rec { 'add_subdirectory(monero EXCLUDE_FROM_ALL)' ''; - cmakeFlags = [ - "-DCMAKE_INSTALL_PREFIX=$out/bin" - "-DARCH=${arch}" - ]; + preConfigure = '' + # because $out needs to be expanded + cmakeFlagsArray+=("-DCMAKE_INSTALL_PREFIX=$out/bin") + cmakeFlagsArray+=("-DARCH=${arch}") + ''; desktopItem = makeDesktopItem { name = "monero-wallet-gui"; From 06deaadb706ad64b9f55ddf934686d1d689f291a Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Sat, 17 Oct 2020 20:05:19 +0800 Subject: [PATCH 396/546] perlPackages.IOAsyncSSL: init at 0.22 --- pkgs/top-level/perl-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6f6c45a27db..1b0e299fe04 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9956,6 +9956,22 @@ let }; }; + IOAsyncSSL = buildPerlModule { + pname = "IO-Async-SSL"; + version = "0.22"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-SSL-0.22.tar.gz"; + sha256 = "0c7363a7f1a08805bd1b2cf2b1a42a950ca71914c2aedbdd985970e011331a21"; + }; + buildInputs = [ TestIdentity ]; + propagatedBuildInputs = [ Future IOAsync IOSocketSSL ]; + meta = { + description = "Use SSL/TLS with IO::Async"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.zakame ]; + }; + }; + IOCapture = buildPerlPackage { pname = "IO-Capture"; version = "0.05"; From bce139db2b2709e2e4a4b34744c72d281b21df7b Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 17 Oct 2020 14:58:58 +0200 Subject: [PATCH 397/546] Revert "nim: 1.2.6 -> 1.4.0" Source tarball has changed. This reverts commit bb99a0d9a8f764996b0b719f842ea4af44591d17. --- pkgs/development/compilers/nim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 72eee7ac811..0ec259b6608 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -4,10 +4,10 @@ , boehmgc, sqlite, nim-unwrapped, nim }: let - version = "1.4.0"; + version = "1.2.6"; src = fetchurl { url = "https://nim-lang.org/download/nim-${version}.tar.xz"; - sha256 = "0rmisiipi7dxl7xc631jlp18bakz3dglhp9bygl2awf21c6b0cq0"; + sha256 = "0zk5qzxayqjw7kq6p92j4008g9bbyilyymhdc5xq9sln5rqym26z"; }; meta = with lib; { From 1efdcde428a4d91297ed0dd63584218ac2cdd898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 17 Oct 2020 14:06:13 +0200 Subject: [PATCH 398/546] libplacebo: remove patch that breaks building with shaderc 2020.2 --- pkgs/development/libraries/libplacebo/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix index dc3e5e30c74..0b36efa189b 100644 --- a/pkgs/development/libraries/libplacebo/default.nix +++ b/pkgs/development/libraries/libplacebo/default.nix @@ -31,10 +31,6 @@ stdenv.mkDerivation rec { url = "https://code.videolan.org/videolan/libplacebo/-/commit/523056828ab86c2f17ea65f432424d48b6fdd389.patch"; sha256 = "051vhd0l3yad1fzn5zayi08kqs9an9j8p7m63kgqyfv1ksnydpcs"; }) - (fetchpatch { - url = "https://code.videolan.org/videolan/libplacebo/-/commit/82e3be1839379791b58e98eb049415b42888d5b0.patch"; - sha256 = "0nklj9gfiwkbbj6wfm1ck33hphaxrvzb84c4h2nfj88bapnlm90l"; - }) ]; nativeBuildInputs = [ From d379080aa7e02fbdc8be54619a8bbc2a098f2e12 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 14:33:24 +0000 Subject: [PATCH 399/546] act: 0.2.15 -> 0.2.16 --- pkgs/development/tools/misc/act/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 358fdd03693..9456335d72a 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "act"; - version = "0.2.15"; + version = "0.2.16"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "17mh7nxzj597vn51c92ridnvfz17rq9sxynfpx9lj32hqw2r45ap"; + sha256 = "0zhn6av1adphkk9g13m5na63r8fqcjw8wibcja9v9mbw886zcc3p"; }; vendorSha256 = "0bcrw3hf92m7n58lrlm0vj1wiwwy82q2rl1a725q3d6xwvi5kh9h"; From 44516af3df948f9fbce64744b9e2502519f3d6a4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 14:45:08 +0000 Subject: [PATCH 400/546] alda: 1.4.2 -> 1.4.3 --- pkgs/development/interpreters/alda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/alda/default.nix b/pkgs/development/interpreters/alda/default.nix index 3e5273d6329..e04188426a1 100644 --- a/pkgs/development/interpreters/alda/default.nix +++ b/pkgs/development/interpreters/alda/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alda"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { url = "https://github.com/alda-lang/alda/releases/download/${version}/alda"; - sha256 = "1d0412jw37gh1y7i8cmaml8r4sn516i6pxmm8m16yprqmz6glx28"; + sha256 = "1c9rbwb3ga8w7zi0ndqq02hjr4drdw8s509qxxd3fh5vfy6x3qi2"; }; dontUnpack = true; From 6df2ff3df80b32de5b8b6a7115331f09c248c686 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Sat, 17 Oct 2020 23:22:05 +0800 Subject: [PATCH 401/546] ledger-live-desktop: 2.9.0 -> 2.14.0 --- .../applications/blockchains/ledger-live-desktop/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 323b9936af5..773c9080cff 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.9.0"; + version = "2.14.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "1ajpmsq4h37w3jzcxijg3myp3mvgbrjis6jrz1cl79m78ripb6cy"; + sha256 = "057g77nd8qxi8dw9sp7x068wsxmrpnsdfrca876f0bpw7lpb0bqq"; }; appimageContents = appimageTools.extractType2 { @@ -34,3 +34,4 @@ in appimageTools.wrapType2 rec { platforms = [ "x86_64-linux" ]; }; } + From 683a87dbeb5cbf7a97fc8093836d3691e79780a1 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 11 Oct 2020 12:55:05 +0700 Subject: [PATCH 402/546] treewide: remove periods from end of package descriptions --- .../audio/csound/csound-qt/default.nix | 2 +- pkgs/applications/audio/gspeech/default.nix | 2 +- .../audio/mellowplayer/default.nix | 2 +- pkgs/applications/audio/mopidy/tunein.nix | 2 +- pkgs/applications/audio/orca-c/default.nix | 2 +- pkgs/applications/audio/picoloop/default.nix | 4 +- pkgs/applications/audio/plexamp/default.nix | 2 +- .../audio/pulseaudio-ctl/default.nix | 2 +- .../editors/code-browser/default.nix | 2 +- .../applications/graphics/gnuclad/default.nix | 2 +- .../graphics/lightburn/default.nix | 2 +- .../applications/graphics/meshlab/default.nix | 2 +- .../graphics/write_stylus/default.nix | 2 +- pkgs/applications/misc/doing/default.nix | 2 +- pkgs/applications/misc/fslint/default.nix | 2 +- pkgs/applications/misc/gmtp/default.nix | 2 +- pkgs/applications/misc/hugo/default.nix | 2 +- pkgs/applications/misc/icesl/default.nix | 2 +- pkgs/applications/misc/marktext/default.nix | 2 +- pkgs/applications/misc/ola/default.nix | 2 +- pkgs/applications/misc/osm2xmap/default.nix | 2 +- .../plasma-applet-volumewin7mixer/default.nix | 2 +- pkgs/applications/misc/qlcplus/default.nix | 2 +- pkgs/applications/misc/xsuspender/default.nix | 2 +- pkgs/applications/misc/yarssr/default.nix | 2 +- pkgs/applications/networking/c14/default.nix | 2 +- .../cluster/docker-machine/default.nix | 2 +- .../cluster/docker-machine/hyperkit.nix | 2 +- .../networking/cluster/docker-machine/kvm.nix | 2 +- .../cluster/docker-machine/kvm2.nix | 2 +- .../cluster/docker-machine/xhyve.nix | 2 +- .../networking/cluster/jx/default.nix | 2 +- .../networking/cluster/k3s/default.nix | 6 +- .../networking/cluster/k9s/default.nix | 2 +- .../networking/cluster/linkerd/default.nix | 2 +- .../networking/cluster/terragrunt/default.nix | 2 +- .../feedreaders/rss2email/default.nix | 2 +- .../instant-messengers/mirage/default.nix | 2 +- .../pantalaimon/default.nix | 2 +- .../instant-messengers/spectral/default.nix | 2 +- .../evolution/evolution-ews/default.nix | 2 +- .../networking/omping/default.nix | 2 +- .../networking/p2p/magnetico/default.nix | 2 +- .../networking/p2p/opentracker/default.nix | 2 +- .../networking/protonvpn-gui/default.nix | 2 +- .../networking/super-productivity/default.nix | 2 +- .../applications/networking/tsung/default.nix | 2 +- pkgs/applications/office/grisbi/default.nix | 2 +- pkgs/applications/office/gtg/default.nix | 2 +- .../applications/office/portfolio/default.nix | 2 +- pkgs/applications/office/trilium/default.nix | 2 +- pkgs/applications/radio/noaa-apt/default.nix | 2 +- .../science/biology/bedtools/default.nix | 2 +- .../science/biology/mosdepth/default.nix | 2 +- .../science/biology/snpeff/default.nix | 2 +- .../science/electronics/flatcam/default.nix | 2 +- .../science/math/bliss/default.nix | 4 +- .../science/physics/elmerfem/default.nix | 2 +- .../science/programming/scyther/default.nix | 2 +- .../version-management/git-up/default.nix | 2 +- .../sparkleshare/default.nix | 2 +- pkgs/applications/video/mkclean/default.nix | 2 +- .../video/plex-mpv-shim/default.nix | 2 +- .../video/webtorrent_desktop/default.nix | 2 +- .../window-managers/i3/layout-manager.nix | 2 +- .../window-managers/i3/lock-fancy.nix | 2 +- pkgs/data/fonts/cozette/default.nix | 2 +- pkgs/data/fonts/eunomia/default.nix | 2 +- pkgs/data/fonts/f5_6/default.nix | 2 +- pkgs/data/fonts/ferrum/default.nix | 2 +- .../data/fonts/fixedsys-excelsior/default.nix | 2 +- pkgs/data/fonts/lmmath/default.nix | 2 +- pkgs/data/fonts/vegur/default.nix | 2 +- pkgs/data/misc/conway_polynomials/default.nix | 2 +- pkgs/desktops/lxde/core/lxrandr/default.nix | 2 +- pkgs/development/compilers/acme/default.nix | 2 +- .../compilers/bs-platform/default.nix | 2 +- pkgs/development/compilers/copper/default.nix | 2 +- .../development/compilers/inform7/default.nix | 2 +- pkgs/development/compilers/mozart/default.nix | 2 +- .../compilers/openjdk/openjfx/11.nix | 2 +- .../compilers/openjdk/openjfx/14.nix | 2 +- .../compilers/ponyc/pony-stable.nix | 2 +- .../compilers/scala/dotty-bare.nix | 2 +- .../development/compilers/shaderc/default.nix | 2 +- .../compilers/x11basic/default.nix | 2 +- .../development/interpreters/alda/default.nix | 2 +- .../interpreters/racket/minimal.nix | 2 +- .../libraries/flatbuffers/default.nix | 2 +- .../libraries/intel-media-sdk/default.nix | 2 +- pkgs/development/libraries/jcal/default.nix | 2 +- .../development/libraries/jsoncpp/default.nix | 2 +- .../development/libraries/libdynd/default.nix | 2 +- .../libraries/libipfix/default.nix | 2 +- .../libmysqlconnectorcpp/default.nix | 2 +- .../libraries/libnetfilter_acct/default.nix | 2 +- .../libraries/libroxml/default.nix | 2 +- pkgs/development/libraries/libui/default.nix | 2 +- .../libraries/muparserx/default.nix | 2 +- .../libraries/mypaint-brushes/1.0.nix | 2 +- .../libraries/mypaint-brushes/default.nix | 2 +- .../libraries/pangoxsl/default.nix | 2 +- pkgs/development/libraries/pdal/default.nix | 2 +- .../libraries/properties-cpp/default.nix | 2 +- .../libraries/python-qt/default.nix | 2 +- .../development/libraries/rlottie/default.nix | 2 +- .../libraries/science/math/itpp/default.nix | 2 +- .../libraries/serialdv/default.nix | 2 +- pkgs/development/libraries/taglib/default.nix | 2 +- .../development/libraries/vsqlite/default.nix | 2 +- pkgs/development/mobile/cocoapods/default.nix | 2 +- .../development/python-modules/jc/default.nix | 2 +- .../python-modules/pywal/default.nix | 2 +- .../development/python-modules/yq/default.nix | 2 +- .../garcosim/tracefilesim/default.nix | 2 +- .../tools/analysis/pev/default.nix | 6 +- .../tools/bazel-watcher/default.nix | 2 +- .../bazel/bazel-remote/default.nix | 2 +- .../bazel/buildtools/default.nix | 2 +- .../tools/build-managers/bloop/default.nix | 2 +- pkgs/development/tools/check/default.nix | 2 +- pkgs/development/tools/clj-kondo/default.nix | 2 +- .../drone-cli/default.nix | 2 +- pkgs/development/tools/corundum/default.nix | 2 +- pkgs/development/tools/deadcode/default.nix | 2 +- pkgs/development/tools/deis/default.nix | 2 +- pkgs/development/tools/deisctl/default.nix | 2 +- pkgs/development/tools/drm_info/default.nix | 2 +- pkgs/development/tools/ejson/default.nix | 2 +- pkgs/development/tools/errcheck/default.nix | 2 +- pkgs/development/tools/gdm/default.nix | 2 +- pkgs/development/tools/git-ftp/default.nix | 2 +- pkgs/development/tools/go-migrate/default.nix | 2 +- pkgs/development/tools/go-outline/default.nix | 2 +- pkgs/development/tools/go-symbols/default.nix | 2 +- pkgs/development/tools/goconvey/default.nix | 2 +- pkgs/development/tools/gocyclo/default.nix | 2 +- .../tools/gomodifytags/default.nix | 2 +- pkgs/development/tools/gopkgs/default.nix | 2 +- pkgs/development/tools/gore/default.nix | 2 +- pkgs/development/tools/gotests/default.nix | 2 +- pkgs/development/tools/impl/default.nix | 2 +- .../development/tools/ineffassign/default.nix | 2 +- pkgs/development/tools/interfacer/default.nix | 2 +- .../tools/irony-server/default.nix | 2 +- pkgs/development/tools/jsduck/default.nix | 2 +- .../tools/knightos/scas/default.nix | 2 +- pkgs/development/tools/kythe/default.nix | 2 +- .../tools/librarian-puppet-go/default.nix | 2 +- pkgs/development/tools/maligned/default.nix | 2 +- pkgs/development/tools/minizinc/default.nix | 2 +- .../tools/misc/bsdbuild/default.nix | 2 +- .../tools/misc/tockloader/default.nix | 2 +- pkgs/development/tools/mockgen/default.nix | 2 +- .../tools/operator-sdk/default.nix | 2 +- .../tools/parinfer-rust/default.nix | 2 +- pkgs/development/tools/pax-rs/default.nix | 2 +- pkgs/development/tools/richgo/default.nix | 2 +- .../tools/rust/bindgen/default.nix | 2 +- .../tools/rust/cargo-embed/default.nix | 2 +- .../tools/rust/cargo-flash/default.nix | 2 +- .../tools/rust/cargo-geiger/default.nix | 2 +- .../tools/setupcfg2nix/default.nix | 2 +- pkgs/development/tools/systemfd/default.nix | 2 +- pkgs/development/tools/toxiproxy/default.nix | 2 +- pkgs/development/tools/tracy/default.nix | 2 +- pkgs/development/tools/tychus/default.nix | 2 +- pkgs/development/tools/vogl/default.nix | 2 +- pkgs/development/tools/xqilla/default.nix | 2 +- pkgs/games/fltrator/default.nix | 2 +- pkgs/games/frotz/default.nix | 2 +- pkgs/games/gtetrinet/default.nix | 2 +- pkgs/games/opendungeons/default.nix | 2 +- pkgs/games/pacvim/default.nix | 2 +- pkgs/games/redeclipse/default.nix | 2 +- pkgs/games/t4kcommon/default.nix | 2 +- pkgs/games/xbill/default.nix | 2 +- .../misc/cups/drivers/cnijfilter2/default.nix | 2 +- .../cups/drivers/cnijfilter_4_00/default.nix | 2 +- .../documentation-highlighter/default.nix | 2 +- pkgs/misc/drivers/epkowa/default.nix | 109 +++++++++--------- pkgs/misc/emulators/np2kai/default.nix | 2 +- pkgs/misc/hdt/default.nix | 2 +- pkgs/misc/riscv-pk/default.nix | 2 +- .../screensavers/betterlockscreen/default.nix | 2 +- .../screensavers/i3lock-pixeled/default.nix | 2 +- pkgs/misc/screensavers/xautolock/default.nix | 2 +- pkgs/os-specific/darwin/osxsnarf/default.nix | 2 +- pkgs/os-specific/linux/cpuset/default.nix | 2 +- .../firmware/system76-firmware/default.nix | 2 +- .../linux/intel-compute-runtime/default.nix | 2 +- pkgs/os-specific/linux/libevdevc/default.nix | 2 +- .../os-specific/linux/libgestures/default.nix | 2 +- .../linux/lksctp-tools/default.nix | 2 +- pkgs/os-specific/linux/usbguard/default.nix | 2 +- .../linux/xf86-input-cmt/default.nix | 2 +- pkgs/os-specific/solo5/default.nix | 2 +- pkgs/servers/code-server/default.nix | 2 +- pkgs/servers/dante/default.nix | 2 +- pkgs/servers/http/tengine/default.nix | 2 +- pkgs/servers/http/unit/default.nix | 2 +- pkgs/servers/jackett/default.nix | 2 +- pkgs/servers/monitoring/plugins/default.nix | 2 +- .../monitoring/plugins/labs_consol_de.nix | 6 +- .../prometheus/keylight-exporter.nix | 2 +- .../prometheus/modemmanager-exporter.nix | 2 +- .../prometheus/nextcloud-exporter.nix | 2 +- .../prometheus/wireguard-exporter.nix | 2 +- pkgs/servers/monitoring/telegraf/default.nix | 2 +- pkgs/servers/openbgpd/default.nix | 2 +- pkgs/servers/pinnwand/default.nix | 2 +- pkgs/servers/pinnwand/steck.nix | 2 +- pkgs/servers/roon-server/default.nix | 2 +- pkgs/servers/sql/dolt/default.nix | 2 +- pkgs/servers/tang/default.nix | 2 +- pkgs/servers/tautulli/default.nix | 2 +- pkgs/servers/web-apps/jirafeau/default.nix | 2 +- .../web-apps/pgpkeyserver-lite/default.nix | 2 +- pkgs/shells/zsh/antigen/default.nix | 2 +- pkgs/shells/zsh/zsh-prezto/default.nix | 2 +- pkgs/tools/admin/daemontools/default.nix | 2 +- pkgs/tools/admin/lexicon/default.nix | 2 +- pkgs/tools/audio/picotts/default.nix | 2 +- pkgs/tools/compression/pbzx/default.nix | 2 +- pkgs/tools/filesystems/convoy/default.nix | 2 +- pkgs/tools/inputmethods/keyfuzz/default.nix | 2 +- pkgs/tools/misc/adafruit-ampy/default.nix | 2 +- .../tools/misc/asciinema-scenario/default.nix | 2 +- pkgs/tools/misc/chafa/default.nix | 2 +- pkgs/tools/misc/dijo/default.nix | 2 +- pkgs/tools/misc/dmg2img/default.nix | 2 +- pkgs/tools/misc/go.rice/default.nix | 2 +- pkgs/tools/misc/gotify-cli/default.nix | 2 +- pkgs/tools/misc/hacksaw/default.nix | 2 +- pkgs/tools/misc/ical2org/default.nix | 2 +- pkgs/tools/misc/kargo/default.nix | 2 +- pkgs/tools/misc/lice/default.nix | 2 +- pkgs/tools/misc/logtop/default.nix | 2 +- pkgs/tools/misc/lokalise2-cli/default.nix | 2 +- pkgs/tools/misc/noti/default.nix | 2 +- pkgs/tools/misc/nyancat/default.nix | 2 +- .../misc/pandoc-plantuml-filter/default.nix | 2 +- pkgs/tools/misc/shunit2/default.nix | 2 +- pkgs/tools/misc/silicon/default.nix | 2 +- pkgs/tools/misc/statserial/default.nix | 2 +- pkgs/tools/misc/td/default.nix | 2 +- pkgs/tools/misc/thefuck/default.nix | 2 +- pkgs/tools/misc/wootility/default.nix | 2 +- .../tools/misc/yubikey-manager-qt/default.nix | 2 +- pkgs/tools/misc/yubikey-manager/default.nix | 2 +- pkgs/tools/networking/dnstracer/default.nix | 2 +- pkgs/tools/networking/goreplay/default.nix | 2 +- pkgs/tools/networking/mcrcon/default.nix | 2 +- pkgs/tools/networking/ocserv/default.nix | 2 +- pkgs/tools/networking/persepolis/default.nix | 2 +- pkgs/tools/networking/quickserve/default.nix | 2 +- pkgs/tools/networking/radsecproxy/default.nix | 2 +- .../networking/tcptraceroute/default.nix | 2 +- pkgs/tools/networking/tendermint/default.nix | 2 +- pkgs/tools/nix/nix-script/default.nix | 2 +- .../elm-github-install/default.nix | 2 +- .../package-management/morph/default.nix | 2 +- .../mynewt-newt/default.nix | 2 +- pkgs/tools/security/acsccid/default.nix | 2 +- pkgs/tools/security/ecdsatool/default.nix | 2 +- pkgs/tools/security/fpm2/default.nix | 2 +- pkgs/tools/security/genpass/default.nix | 2 +- pkgs/tools/security/gopass/default.nix | 2 +- pkgs/tools/security/hashdeep/default.nix | 2 +- pkgs/tools/security/hologram/default.nix | 2 +- pkgs/tools/security/keybase/default.nix | 2 +- pkgs/tools/security/minica/default.nix | 2 +- pkgs/tools/security/zzuf/default.nix | 2 +- pkgs/tools/system/incron/default.nix | 2 +- pkgs/tools/system/jump/default.nix | 2 +- pkgs/tools/system/pcstat/default.nix | 2 +- pkgs/tools/text/miller/default.nix | 2 +- pkgs/tools/text/platinum-searcher/default.nix | 2 +- pkgs/tools/typesetting/docbookrx/default.nix | 2 +- .../typesetting/kramdown-asciidoc/default.nix | 2 +- .../virtualization/cloudmonkey/default.nix | 2 +- 281 files changed, 345 insertions(+), 340 deletions(-) diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/applications/audio/csound/csound-qt/default.nix index 895609d3c02..e6060c056cc 100644 --- a/pkgs/applications/audio/csound/csound-qt/default.nix +++ b/pkgs/applications/audio/csound/csound-qt/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "CsoundQt is a frontend for Csound with editor, integrated help, widgets and other features."; + description = "CsoundQt is a frontend for Csound with editor, integrated help, widgets and other features"; homepage = "https://csoundqt.github.io/"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/audio/gspeech/default.nix b/pkgs/applications/audio/gspeech/default.nix index 920c06038fe..21a4d6748be 100644 --- a/pkgs/applications/audio/gspeech/default.nix +++ b/pkgs/applications/audio/gspeech/default.nix @@ -63,7 +63,7 @@ python3.pkgs.buildPythonApplication rec { strictDeps = false; meta = with lib; { - description = "A minimal GUI for the Text To Speech 'Svox Pico'. Read clipboard or selected text in different languages and manage it : pause, stop, replay."; + description = "A minimal GUI for the Text To Speech 'Svox Pico'. Read clipboard or selected text in different languages and manage it : pause, stop, replay"; homepage = "https://github.com/mothsART/gSpeech"; maintainers = with maintainers; [ mothsart ]; license = licenses.gpl3; diff --git a/pkgs/applications/audio/mellowplayer/default.nix b/pkgs/applications/audio/mellowplayer/default.nix index a117611fdfa..26736ea3e8a 100644 --- a/pkgs/applications/audio/mellowplayer/default.nix +++ b/pkgs/applications/audio/mellowplayer/default.nix @@ -62,7 +62,7 @@ mkDerivation rec { meta = with lib; { inherit (qtbase.meta) platforms; - description = "Cloud music integration for your desktop."; + description = "Cloud music integration for your desktop"; homepage = "https://gitlab.com/ColinDuquesnoy/MellowPlayer"; license = licenses.gpl2; maintainers = with maintainers; [ kalbasit ]; diff --git a/pkgs/applications/audio/mopidy/tunein.nix b/pkgs/applications/audio/mopidy/tunein.nix index 569d08fb4a0..9ab03232052 100644 --- a/pkgs/applications/audio/mopidy/tunein.nix +++ b/pkgs/applications/audio/mopidy/tunein.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "mopidy_tunein.tunein" ]; meta = with stdenv.lib; { - description = "Mopidy extension for playing music from tunein."; + description = "Mopidy extension for playing music from tunein"; homepage = "https://github.com/kingosticks/mopidy-tunein"; license = licenses.asl20; maintainers = with maintainers; [ hexa ]; diff --git a/pkgs/applications/audio/orca-c/default.nix b/pkgs/applications/audio/orca-c/default.nix index 3a4f4b2ce2b..74c74578beb 100644 --- a/pkgs/applications/audio/orca-c/default.nix +++ b/pkgs/applications/audio/orca-c/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - description = "An esoteric programming language designed to quickly create procedural sequencers."; + description = "An esoteric programming language designed to quickly create procedural sequencers"; homepage = "https://github.com/hundredrabbits/Orca-c"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/applications/audio/picoloop/default.nix b/pkgs/applications/audio/picoloop/default.nix index 1dc9c70af87..7f6773f5e51 100644 --- a/pkgs/applications/audio/picoloop/default.nix +++ b/pkgs/applications/audio/picoloop/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { SDL2_image SDL2_ttf alsaLib - libjack2 + libjack2 ]; sourceRoot = "source/picoloop"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Picoloop is a synth and a stepsequencer (a clone of the famous nanoloop)."; + description = "Picoloop is a synth and a stepsequencer (a clone of the famous nanoloop)"; homepage = "https://github.com/yoyz/picoloop"; platforms = platforms.linux; license = licenses.bsd3; diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 36462aa28bc..27738245231 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -30,7 +30,7 @@ in appimageTools.wrapType2 { ''; meta = with lib; { - description = "A beautiful Plex music player for audiophiles, curators, and hipsters."; + description = "A beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; license = licenses.unfree; maintainers = with maintainers; [ killercup ]; diff --git a/pkgs/applications/audio/pulseaudio-ctl/default.nix b/pkgs/applications/audio/pulseaudio-ctl/default.nix index 125dafc132e..6cabdc6534d 100644 --- a/pkgs/applications/audio/pulseaudio-ctl/default.nix +++ b/pkgs/applications/audio/pulseaudio-ctl/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Control pulseaudio volume from the shell or mapped to keyboard shortcuts. No need for alsa-utils."; + description = "Control pulseaudio volume from the shell or mapped to keyboard shortcuts. No need for alsa-utils"; homepage = "https://bbs.archlinux.org/viewtopic.php?id=124513"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/applications/editors/code-browser/default.nix b/pkgs/applications/editors/code-browser/default.nix index 11476cae702..ed11298c621 100644 --- a/pkgs/applications/editors/code-browser/default.nix +++ b/pkgs/applications/editors/code-browser/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals withQt [ "UI=qt" ] ++ stdenv.lib.optionals withGtk [ "UI=gtk" ]; meta = with stdenv.lib; { - description = "Folding text editor, designed to hierarchically structure any kind of text file and especially source code."; + description = "Folding text editor, designed to hierarchically structure any kind of text file and especially source code"; homepage = "https://tibleiz.net/code-browser/"; license = licenses.gpl2; platforms = platforms.x86_64; diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix index fcb4bdb5374..d27c2636e25 100644 --- a/pkgs/applications/graphics/gnuclad/default.nix +++ b/pkgs/applications/graphics/gnuclad/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://launchpad.net/gnuclad"; - description = "gnuclad tries to help the environment by creating trees. It's primary use will be generating cladogram trees for the GNU/Linux distro timeline project."; + description = "gnuclad tries to help the environment by creating trees. It's primary use will be generating cladogram trees for the GNU/Linux distro timeline project"; license = licenses.gpl3Plus; maintainers = with maintainers; [ mog ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix index 7fcec93446d..a5a255338e8 100644 --- a/pkgs/applications/graphics/lightburn/default.nix +++ b/pkgs/applications/graphics/lightburn/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "LightBurn is layout, editing, and control software for your laser cutter."; + description = "LightBurn is layout, editing, and control software for your laser cutter"; homepage = "https://lightburnsoftware.com/"; license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [ q3k ]; diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 75940fdc45b..50962d54eb2 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -87,7 +87,7 @@ mkDerivation rec { enableParallelBuilding = true; meta = { - description = "A system for processing and editing 3D triangular meshes."; + description = "A system for processing and editing 3D triangular meshes"; homepage = "https://www.meshlab.net/"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ viric ]; diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix index 8396ce72e50..3c2ad8f4fab 100644 --- a/pkgs/applications/graphics/write_stylus/default.nix +++ b/pkgs/applications/graphics/write_stylus/default.nix @@ -53,7 +53,7 @@ mkDerivation rec { meta = with stdenv.lib; { homepage = "http://www.styluslabs.com/"; - description = "Write is a word processor for handwriting."; + description = "Write is a word processor for handwriting"; platforms = platforms.linux; license = stdenv.lib.licenses.unfree; maintainers = with maintainers; [ oyren ]; diff --git a/pkgs/applications/misc/doing/default.nix b/pkgs/applications/misc/doing/default.nix index 48e45328f67..e539cf3ae19 100644 --- a/pkgs/applications/misc/doing/default.nix +++ b/pkgs/applications/misc/doing/default.nix @@ -11,7 +11,7 @@ bundlerEnv { passthru.updateScript = bundlerUpdateScript "doing"; meta = with lib; { - description = "A command line tool for keeping track of what you’re doing and tracking what you’ve done."; + description = "A command line tool for keeping track of what you’re doing and tracking what you’ve done"; longDescription = '' doing is a basic CLI for adding and listing "what was I doing" reminders in a TaskPaper-formatted text file. It allows for multiple diff --git a/pkgs/applications/misc/fslint/default.nix b/pkgs/applications/misc/fslint/default.nix index f6e1071ac5e..1f2ec280549 100644 --- a/pkgs/applications/misc/fslint/default.nix +++ b/pkgs/applications/misc/fslint/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A utility to find and clean various forms of lint on a filesystem."; + description = "A utility to find and clean various forms of lint on a filesystem"; homepage = "https://www.pixelbeat.org/fslint/"; license = licenses.gpl2Plus; maintainers = [ maintainers.dasj19 ]; diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index 5ed69e7bc69..c568afac31e 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; meta = { - description = "A simple MP3 and Media player client for UNIX and UNIX like systems."; + description = "A simple MP3 and Media player client for UNIX and UNIX like systems"; homepage = "https://gmtp.sourceforge.io"; platforms = stdenv.lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 37965fd6e3e..486a9cefc7f 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { subPackages = [ "." ]; meta = with stdenv.lib; { - description = "A fast and modern static website engine."; + description = "A fast and modern static website engine"; homepage = "https://gohugo.io"; license = licenses.asl20; maintainers = with maintainers; [ schneefux filalex77 Frostman ]; diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix index 7b642dffa50..edcc5a58ad5 100644 --- a/pkgs/applications/misc/icesl/default.nix +++ b/pkgs/applications/misc/icesl/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "IceSL is a GPU-accelerated procedural modeler and slicer for 3D printing."; + description = "IceSL is a GPU-accelerated procedural modeler and slicer for 3D printing"; homepage = "http://shapeforge.loria.fr/icesl/index.html"; license = licenses.inria-icesl; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/misc/marktext/default.nix b/pkgs/applications/misc/marktext/default.nix index e7600752ce2..83a7aabaef7 100644 --- a/pkgs/applications/misc/marktext/default.nix +++ b/pkgs/applications/misc/marktext/default.nix @@ -32,7 +32,7 @@ appimageTools.wrapType2 rec { extraInstallCommands = "mv $out/bin/${name} $out/bin/${pname}"; meta = with lib; { - description = "A simple and elegant markdown editor, available for Linux, macOS and Windows."; + description = "A simple and elegant markdown editor, available for Linux, macOS and Windows"; homepage = "https://marktext.app"; license = licenses.mit; maintainers = with maintainers; [ nh2 ]; diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix index 7682b56e4d6..a9f12d572c8 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/pkgs/applications/misc/ola/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "A framework for controlling entertainment lighting equipment."; + description = "A framework for controlling entertainment lighting equipment"; homepage = "https://www.openlighting.org/ola/"; maintainers = with maintainers; [ globin ]; license = with licenses; [ lgpl21 gpl2Plus ]; diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix index e5838dc1bbe..1c893336498 100644 --- a/pkgs/applications/misc/osm2xmap/default.nix +++ b/pkgs/applications/misc/osm2xmap/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://github.com/sembruk/osm2xmap"; - description = "Converter from OpenStreetMap data format to OpenOrienteering Mapper format."; + description = "Converter from OpenStreetMap data format to OpenOrienteering Mapper format"; license = licenses.gpl3; maintainers = [ maintainers.mpickering ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix index 15dd7222b28..820048bdd6b 100644 --- a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix +++ b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ plasma-framework kwindowsystem plasma-pa ]; meta = with stdenv.lib; { - description = "A fork of the default volume plasmoid with a Windows 7 theme (vertical sliders)."; + description = "A fork of the default volume plasmoid with a Windows 7 theme (vertical sliders)"; homepage = "https://github.com/Zren/plasma-applet-volumewin7mixer"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index 77a24413bdd..b47d8feecf7 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -36,7 +36,7 @@ mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A free and cross-platform software to control DMX or analog lighting systems like moving heads, dimmers, scanners etc."; + description = "A free and cross-platform software to control DMX or analog lighting systems like moving heads, dimmers, scanners etc"; maintainers = [ maintainers.globin ]; license = licenses.asl20; platforms = platforms.all; diff --git a/pkgs/applications/misc/xsuspender/default.nix b/pkgs/applications/misc/xsuspender/default.nix index 55ecd358c6c..02559691f4d 100644 --- a/pkgs/applications/misc/xsuspender/default.nix +++ b/pkgs/applications/misc/xsuspender/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Auto-suspend inactive X11 applications."; + description = "Auto-suspend inactive X11 applications"; homepage = "https://kernc.github.io/xsuspender/"; license = licenses.wtfpl; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix index c5489b8b981..805c708ea00 100644 --- a/pkgs/applications/misc/yarssr/default.nix +++ b/pkgs/applications/misc/yarssr/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://github.com/tsyrogit/zxcvbn-c"; - description = "A fork of Yarssr (a RSS reader for the GNOME Tray) from http://yarssr.sf.net with various fixes."; + description = "A fork of Yarssr (a RSS reader for the GNOME Tray) from http://yarssr.sf.net with various fixes"; license = licenses.gpl1; platforms = platforms.linux; maintainers = with maintainers; [ xurei ]; diff --git a/pkgs/applications/networking/c14/default.nix b/pkgs/applications/networking/c14/default.nix index afd9aa53ac6..58d9d026f97 100644 --- a/pkgs/applications/networking/c14/default.nix +++ b/pkgs/applications/networking/c14/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - description = "C14 is designed for data archiving & long-term backups."; + description = "C14 is designed for data archiving & long-term backups"; homepage = "https://www.online.net/en/storage/c14-cold-storage"; license = licenses.mit; maintainers = with maintainers; [ apeyroux ]; diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix index a801a122374..93f5a85c33a 100644 --- a/pkgs/applications/networking/cluster/docker-machine/default.nix +++ b/pkgs/applications/networking/cluster/docker-machine/default.nix @@ -25,7 +25,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://docs.docker.com/machine/"; - description = "Docker Machine is a tool that lets you install Docker Engine on virtual hosts, and manage Docker Engine on the hosts."; + description = "Docker Machine is a tool that lets you install Docker Engine on virtual hosts, and manage Docker Engine on the hosts"; license = licenses.asl20; maintainers = with maintainers; [ offline tailhook ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix index a9cdbf79077..d05b34cd7de 100644 --- a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix +++ b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix @@ -15,7 +15,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://minikube.sigs.k8s.io/docs/drivers/hyperkit"; - description = "HyperKit driver for docker-machine."; + description = "HyperKit driver for docker-machine"; license = licenses.asl20; maintainers = with maintainers; [ atkinschang ]; platforms = platforms.darwin; diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/pkgs/applications/networking/cluster/docker-machine/kvm.nix index 9352ba69da8..024572ec3db 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm.nix @@ -20,7 +20,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/dhiltgen/docker-machine-kvm"; - description = "KVM driver for docker-machine."; + description = "KVM driver for docker-machine"; license = licenses.asl20; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix index 172370d25e9..9ef43bed2ee 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix @@ -19,7 +19,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://minikube.sigs.k8s.io/docs/drivers/kvm2"; - description = "KVM2 driver for docker-machine."; + description = "KVM2 driver for docker-machine"; license = licenses.asl20; maintainers = with maintainers; [ tadfisher atkinschang ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix index 8c63a70b6d6..a740d0486db 100644 --- a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix +++ b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix @@ -31,7 +31,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/machine-drivers/docker-machine-driver-xhyve"; - description = "Xhyve driver for docker-machine."; + description = "Xhyve driver for docker-machine"; license = licenses.bsd3; maintainers = with maintainers; [ periklis ]; platforms = platforms.darwin; diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index 5199bbfaf33..6fbec331802 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -35,7 +35,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "JX is a command line tool for installing and using Jenkins X."; + description = "JX is a command line tool for installing and using Jenkins X"; homepage = "https://jenkins-x.io"; longDescription = '' Jenkins X provides automated CI+CD for Kubernetes with Preview diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index aed60bbfe85..ca0da973f2c 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -150,7 +150,7 @@ let ''; meta = { - description = "The various binaries that get packaged into the final k3s binary."; + description = "The various binaries that get packaged into the final k3s binary"; license = licenses.asl20; homepage = "https://k3s.io"; maintainers = [ maintainers.euank ]; @@ -211,7 +211,7 @@ let ''; meta = { - description = "The k3s go binary which is used by the final wrapped output below."; + description = "The k3s go binary which is used by the final wrapped output below"; license = licenses.asl20; homepage = "https://k3s.io"; maintainers = [ maintainers.euank ]; @@ -257,7 +257,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A lightweight Kubernetes distribution."; + description = "A lightweight Kubernetes distribution"; license = licenses.asl20; homepage = "https://k3s.io"; maintainers = [ maintainers.euank ]; diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index c365bf1e7a9..575bc5a5062 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { doCheck = false; meta = with stdenv.lib; { - description = "Kubernetes CLI To Manage Your Clusters In Style."; + description = "Kubernetes CLI To Manage Your Clusters In Style"; homepage = "https://github.com/derailed/k9s"; license = licenses.asl20; maintainers = with maintainers; [ Gonzih markus1189 ]; diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 70aeb784159..63e4e59ff45 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -18,7 +18,7 @@ buildGoModule { subPackages = [ "cli/cmd" ]; meta = with stdenv.lib; { - description = "A service mesh for Kubernetes and beyond."; + description = "A service mesh for Kubernetes and beyond"; homepage = "https://linkerd.io/"; license = licenses.asl20; maintainers = with maintainers; [ Gonzih ]; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 8cf4ba749f0..0281a721136 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -25,7 +25,7 @@ buildGoModule rec { ''; meta = with stdenv.lib; { - description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices."; + description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices"; homepage = "https://github.com/gruntwork-io/terragrunt/"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix index 977b71ebc50..0a28f9e074c 100644 --- a/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -37,7 +37,7 @@ buildPythonApplication rec { ''; meta = with lib; { - description = "A tool that converts RSS/Atom newsfeeds to email."; + description = "A tool that converts RSS/Atom newsfeeds to email"; homepage = "https://pypi.python.org/pypi/rss2email"; license = licenses.gpl2; maintainers = with maintainers; [ jb55 Profpatsch ekleog ]; diff --git a/pkgs/applications/networking/instant-messengers/mirage/default.nix b/pkgs/applications/networking/instant-messengers/mirage/default.nix index 1101d6f9b06..0aa2dbf889b 100644 --- a/pkgs/applications/networking/instant-messengers/mirage/default.nix +++ b/pkgs/applications/networking/instant-messengers/mirage/default.nix @@ -47,7 +47,7 @@ mkDerivation rec { ''; meta = with lib; { - description = "A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client for encrypted and decentralized communication."; + description = "A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client for encrypted and decentralized communication"; homepage = "https://github.com/mirukana/mirage"; license = licenses.lgpl3; maintainers = with maintainers; [ colemickens ]; diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index a751501376f..3b1fb255b6e 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -56,7 +56,7 @@ buildPythonApplication rec { ''; meta = with lib; { - description = "An end-to-end encryption aware Matrix reverse proxy daemon."; + description = "An end-to-end encryption aware Matrix reverse proxy daemon"; homepage = "https://github.com/matrix-org/pantalaimon"; license = licenses.asl20; maintainers = with maintainers; [ valodim ]; diff --git a/pkgs/applications/networking/instant-messengers/spectral/default.nix b/pkgs/applications/networking/instant-messengers/spectral/default.nix index 23659e8a6c9..b0819ade4f3 100644 --- a/pkgs/applications/networking/instant-messengers/spectral/default.nix +++ b/pkgs/applications/networking/instant-messengers/spectral/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin qtmacextras; meta = with stdenv.lib; { - description = "A glossy cross-platform Matrix client."; + description = "A glossy cross-platform Matrix client"; homepage = "https://spectral.im"; license = licenses.gpl3; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 26d8fb1aab8..d3f5988b474 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = "Evolution connector for Microsoft Exchange Server protocols."; + description = "Evolution connector for Microsoft Exchange Server protocols"; homepage = "https://gitlab.gnome.org/GNOME/evolution-ews"; license = "LGPL-2.1-only OR LGPL-3.0-only"; # https://gitlab.gnome.org/GNOME/evolution-ews/issues/111 maintainers = [ maintainers.dasj19 ]; diff --git a/pkgs/applications/networking/omping/default.nix b/pkgs/applications/networking/omping/default.nix index dc52d767438..33d5a5f5111 100644 --- a/pkgs/applications/networking/omping/default.nix +++ b/pkgs/applications/networking/omping/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "Open Multicast Ping (omping) is a tool for testing IPv4/IPv6 multicast connectivity on a LAN."; + description = "Open Multicast Ping (omping) is a tool for testing IPv4/IPv6 multicast connectivity on a LAN"; license = licenses.mit; platforms = platforms.unix; inherit (src.meta) homepage; diff --git a/pkgs/applications/networking/p2p/magnetico/default.nix b/pkgs/applications/networking/p2p/magnetico/default.nix index b8c1991c88f..44084daf9c0 100644 --- a/pkgs/applications/networking/p2p/magnetico/default.nix +++ b/pkgs/applications/networking/p2p/magnetico/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "Autonomous (self-hosted) BitTorrent DHT search engine suite."; + description = "Autonomous (self-hosted) BitTorrent DHT search engine suite"; homepage = "https://github.com/boramalper/magnetico"; license = licenses.agpl3; badPlatforms = platforms.darwin; diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix index ed44ff24fec..82480b1ed21 100644 --- a/pkgs/applications/networking/p2p/opentracker/default.nix +++ b/pkgs/applications/networking/p2p/opentracker/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { homepage = "https://erdgeist.org/arts/software/opentracker/"; license = licenses.beerware; platforms = platforms.linux; - description = "Bittorrent tracker project which aims for minimal resource usage and is intended to run at your wlan router."; + description = "Bittorrent tracker project which aims for minimal resource usage and is intended to run at your wlan router"; maintainers = with maintainers; [ makefu ]; }; } diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index 38ffb42aaf8..c2d7fbd10b1 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -77,7 +77,7 @@ in python3Packages.buildPythonApplication rec { ''; meta = with lib; { - description = "Linux GUI for ProtonVPN, written in Python."; + description = "Linux GUI for ProtonVPN, written in Python"; homepage = "https://github.com/ProtonVPN/linux-gui"; maintainers = with maintainers; [ offline ]; license = licenses.gpl3; diff --git a/pkgs/applications/networking/super-productivity/default.nix b/pkgs/applications/networking/super-productivity/default.nix index 7a70375e42c..3c4c0f0df3c 100644 --- a/pkgs/applications/networking/super-productivity/default.nix +++ b/pkgs/applications/networking/super-productivity/default.nix @@ -97,7 +97,7 @@ in stdenv.mkDerivation { dontStrip = true; meta = with stdenv.lib; { - description = "To Do List / Time Tracker with Jira Integration."; + description = "To Do List / Time Tracker with Jira Integration"; homepage = "https://super-productivity.com"; license = licenses.mit; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/tsung/default.nix b/pkgs/applications/networking/tsung/default.nix index 6f5a3f3ec16..7b142249687 100644 --- a/pkgs/applications/networking/tsung/default.nix +++ b/pkgs/applications/networking/tsung/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://tsung.erlang-projects.org/"; - description = "A high-performance benchmark framework for various protocols including HTTP, XMPP, LDAP, etc."; + description = "A high-performance benchmark framework for various protocols including HTTP, XMPP, LDAP, etc"; longDescription = '' Tsung is a distributed load testing tool. It is protocol-independent and can currently be used to stress HTTP, WebDAV, SOAP, PostgreSQL, MySQL, diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index d4f08b141a6..812218d0a38 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "A personnal accounting application."; + description = "A personnal accounting application"; longDescription = '' Grisbi is an application written by French developers, so it perfectly respects French accounting rules. Grisbi can manage multiple accounts, diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/applications/office/gtg/default.nix index 9fccd574eb1..2cc3e8eb922 100644 --- a/pkgs/applications/office/gtg/default.nix +++ b/pkgs/applications/office/gtg/default.nix @@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec { checkPhase = "python3 ../run-tests"; meta = with stdenv.lib; { - description = " A personal tasks and TODO-list items organizer."; + description = " A personal tasks and TODO-list items organizer"; longDescription = '' "Getting Things GNOME" (GTG) is a personal tasks and ToDo list organizer inspired by the "Getting Things Done" (GTD) methodology. GTG is intended to help you track everything you need to do and need to know, from small tasks to large projects. diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index b3538dd2b71..bb02c89486b 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A simple tool to calculate the overall performance of an investment portfolio."; + description = "A simple tool to calculate the overall performance of an investment portfolio"; homepage = "https://www.portfolio-performance.info/"; license = licenses.epl10; maintainers = with maintainers; [ elohmeier oyren ]; diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 3d577a8852e..217f1fd85d6 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -1,7 +1,7 @@ { stdenv, nixosTests, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, wrapGAppsHook, zlib, libxkbfile }: let - description = "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases."; + description = "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases"; desktopItem = makeDesktopItem { name = "Trilium"; exec = "trilium"; diff --git a/pkgs/applications/radio/noaa-apt/default.nix b/pkgs/applications/radio/noaa-apt/default.nix index 55703ea44d6..5034d5fd93c 100644 --- a/pkgs/applications/radio/noaa-apt/default.nix +++ b/pkgs/applications/radio/noaa-apt/default.nix @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "NOAA APT image decoder."; + description = "NOAA APT image decoder"; homepage = "http://noaa-apt.mbernardi.com.ar/"; license = licenses.gpl3Only; maintainers = with maintainers; [ trepetti ]; diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/applications/science/biology/bedtools/default.nix index 332e06ea0cf..f92e912f680 100644 --- a/pkgs/applications/science/biology/bedtools/default.nix +++ b/pkgs/applications/science/biology/bedtools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installPhase = "make prefix=$out SHELL=${stdenv.shell} CXX=${cxx} CC=${cc} install"; meta = with stdenv.lib; { - description = "A powerful toolset for genome arithmetic."; + description = "A powerful toolset for genome arithmetic"; license = licenses.gpl2; homepage = "https://bedtools.readthedocs.io/en/latest/"; maintainers = with maintainers; [ jbedo ]; diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/pkgs/applications/science/biology/mosdepth/default.nix index 1ce6357d2e8..d0f98719fa1 100644 --- a/pkgs/applications/science/biology/mosdepth/default.nix +++ b/pkgs/applications/science/biology/mosdepth/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { installPhase = "install -Dt $out/bin mosdepth"; meta = with stdenv.lib; { - description = "fast BAM/CRAM depth calculation for WGS, exome, or targeted sequencing."; + description = "fast BAM/CRAM depth calculation for WGS, exome, or targeted sequencing"; license = licenses.mit; homepage = "https://github.com/brentp/mosdepth"; maintainers = with maintainers; [ jbedo ]; diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/applications/science/biology/snpeff/default.nix index c68fcfada33..941f107a580 100644 --- a/pkgs/applications/science/biology/snpeff/default.nix +++ b/pkgs/applications/science/biology/snpeff/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Genetic variant annotation and effect prediction toolbox."; + description = "Genetic variant annotation and effect prediction toolbox"; license = licenses.lgpl3; homepage = "http://snpeff.sourceforge.net/"; maintainers = with maintainers; [ jbedo ]; diff --git a/pkgs/applications/science/electronics/flatcam/default.nix b/pkgs/applications/science/electronics/flatcam/default.nix index 247f99485bb..360c6df7fe6 100644 --- a/pkgs/applications/science/electronics/flatcam/default.nix +++ b/pkgs/applications/science/electronics/flatcam/default.nix @@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with lib; { - description = "2-D post processing for PCB fabrication on CNC routers."; + description = "2-D post processing for PCB fabrication on CNC routers"; homepage = "https://bitbucket.org/jpcgt/flatcam"; license = licenses.mit; maintainers = with maintainers; [ trepetti ]; diff --git a/pkgs/applications/science/math/bliss/default.nix b/pkgs/applications/science/math/bliss/default.nix index 361b0884662..52b05646a70 100644 --- a/pkgs/applications/science/math/bliss/default.nix +++ b/pkgs/applications/science/math/bliss/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin $out/share/doc/bliss $out/lib $out/include/bliss - mv bliss $out/bin + mv bliss $out/bin mv html/* COPYING* $out/share/doc/bliss mv *.a $out/lib mv *.h *.hh $out/include/bliss ''; meta = with stdenv.lib; { - description = "bliss is an open source tool for computing automorphism groups and canonical forms of graphs. It has both a command line user interface as well as C++ and C programming language APIs."; + description = "bliss is an open source tool for computing automorphism groups and canonical forms of graphs. It has both a command line user interface as well as C++ and C programming language APIs"; homepage = "http://www.tcs.hut.fi/Software/bliss/"; license = licenses.lgpl3; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/science/physics/elmerfem/default.nix b/pkgs/applications/science/physics/elmerfem/default.nix index 46cc32fa168..a76fe3a7277 100644 --- a/pkgs/applications/science/physics/elmerfem/default.nix +++ b/pkgs/applications/science/physics/elmerfem/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://elmerfem.org/"; - description = "A finite element software for multiphysical problems."; + description = "A finite element software for multiphysical problems"; platforms = platforms.unix; maintainers = [ maintainers.wulfsta ]; license = licenses.lgpl21; diff --git a/pkgs/applications/science/programming/scyther/default.nix b/pkgs/applications/science/programming/scyther/default.nix index 5cfe081072a..d1e948fe187 100644 --- a/pkgs/applications/science/programming/scyther/default.nix +++ b/pkgs/applications/science/programming/scyther/default.nix @@ -13,7 +13,7 @@ let }; meta = with lib; { - description = "Scyther is a tool for the automatic verification of security protocols."; + description = "Scyther is a tool for the automatic verification of security protocols"; homepage = "https://www.cs.ox.ac.uk/people/cas.cremers/scyther/"; license = licenses.gpl2; maintainers = with maintainers; [ infinisil ]; diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix index faed3d25a8a..2a0a97771cb 100644 --- a/pkgs/applications/version-management/git-up/default.nix +++ b/pkgs/applications/version-management/git-up/default.nix @@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { homepage = "https://github.com/msiemens/PyGitUp"; - description = "A git pull replacement that rebases all local branches when pulling."; + description = "A git pull replacement that rebases all local branches when pulling"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/applications/version-management/sparkleshare/default.nix b/pkgs/applications/version-management/sparkleshare/default.nix index ef61d518a1e..8f77fdbe54c 100644 --- a/pkgs/applications/version-management/sparkleshare/default.nix +++ b/pkgs/applications/version-management/sparkleshare/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Share and collaborate by syncing with any Git repository instantly. Linux, macOS, and Windows."; + description = "Share and collaborate by syncing with any Git repository instantly. Linux, macOS, and Windows"; homepage = "https://sparkleshare.org"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ kevincox ]; diff --git a/pkgs/applications/video/mkclean/default.nix b/pkgs/applications/video/mkclean/default.nix index 4a3cbc81b35..6bb1bcc5d8a 100644 --- a/pkgs/applications/video/mkclean/default.nix +++ b/pkgs/applications/video/mkclean/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "mkclean is a command line tool to clean and optimize Matroska (.mkv / .mka / .mks / .mk3d) and WebM (.webm / .weba) files that have already been muxed."; + description = "mkclean is a command line tool to clean and optimize Matroska (.mkv / .mka / .mks / .mk3d) and WebM (.webm / .weba) files that have already been muxed"; homepage = "https://www.matroska.org"; license = licenses.bsdOriginal; maintainers = with maintainers; [ chrisaw ]; diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/applications/video/plex-mpv-shim/default.nix index 993bdd67b0d..16e6cd826ec 100644 --- a/pkgs/applications/video/plex-mpv-shim/default.nix +++ b/pkgs/applications/video/plex-mpv-shim/default.nix @@ -15,7 +15,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { homepage = "https://github.com/iwalton3/plex-mpv-shim"; - description = "Allows casting of videos to MPV via the Plex mobile and web app."; + description = "Allows casting of videos to MPV via the Plex mobile and web app"; license = licenses.mit; }; } diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix index ef50dad86bc..961cb403f13 100644 --- a/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/pkgs/applications/video/webtorrent_desktop/default.nix @@ -85,7 +85,7 @@ ''; meta = with stdenv.lib; { - description = "Streaming torrent app for Mac, Windows, and Linux."; + description = "Streaming torrent app for Mac, Windows, and Linux"; homepage = "https://webtorrent.io/desktop"; license = licenses.mit; maintainers = [ maintainers.flokli ]; diff --git a/pkgs/applications/window-managers/i3/layout-manager.nix b/pkgs/applications/window-managers/i3/layout-manager.nix index f4c2a53b7a2..c91b1d31b95 100644 --- a/pkgs/applications/window-managers/i3/layout-manager.nix +++ b/pkgs/applications/window-managers/i3/layout-manager.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://github.com/klaxalk/i3-layout-manager"; - description = "Saving, loading and managing layouts for i3wm."; + description = "Saving, loading and managing layouts for i3wm"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix index 9b9b2dea132..c71ed04e48d 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { cp icons/lock*.png $out/share/i3lock-fancy/icons ''; meta = with stdenv.lib; { - description = "i3lock is a bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text."; + description = "i3lock is a bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text"; homepage = "https://github.com/meskarune/i3lock-fancy"; maintainers = with maintainers; [ ]; license = licenses.mit; diff --git a/pkgs/data/fonts/cozette/default.nix b/pkgs/data/fonts/cozette/default.nix index a5bc752c4ca..3550facfc11 100644 --- a/pkgs/data/fonts/cozette/default.nix +++ b/pkgs/data/fonts/cozette/default.nix @@ -19,7 +19,7 @@ fetchzip rec { ''; meta = with lib; { - description = "A bitmap programming font optimized for coziness."; + description = "A bitmap programming font optimized for coziness"; homepage = "https://github.com/slavfox/cozette"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/data/fonts/eunomia/default.nix b/pkgs/data/fonts/eunomia/default.nix index e68f528ff38..272649582c3 100644 --- a/pkgs/data/fonts/eunomia/default.nix +++ b/pkgs/data/fonts/eunomia/default.nix @@ -19,7 +19,7 @@ fetchzip { meta = with lib; { homepage = "http://dotcolon.net/font/eunomia/"; - description = "A futuristic decorative font."; + description = "A futuristic decorative font"; platforms = platforms.all; maintainers = with maintainers; [ leenaars ]; license = licenses.ofl; diff --git a/pkgs/data/fonts/f5_6/default.nix b/pkgs/data/fonts/f5_6/default.nix index 175648198ce..112111faa3d 100644 --- a/pkgs/data/fonts/f5_6/default.nix +++ b/pkgs/data/fonts/f5_6/default.nix @@ -19,7 +19,7 @@ fetchzip { meta = with lib; { homepage = "http://dotcolon.net/font/${pname}/"; - description = "A weighted decorative font."; + description = "A weighted decorative font"; platforms = platforms.all; maintainers = with maintainers; [ leenaars ]; license = licenses.ofl; diff --git a/pkgs/data/fonts/ferrum/default.nix b/pkgs/data/fonts/ferrum/default.nix index fe40252ab23..3f122d22daf 100644 --- a/pkgs/data/fonts/ferrum/default.nix +++ b/pkgs/data/fonts/ferrum/default.nix @@ -19,7 +19,7 @@ fetchzip { meta = with lib; { homepage = "http://dotcolon.net/font/${pname}/"; - description = "A decorative font."; + description = "A decorative font"; platforms = platforms.all; maintainers = with maintainers; [ leenaars ]; license = licenses.cc0; diff --git a/pkgs/data/fonts/fixedsys-excelsior/default.nix b/pkgs/data/fonts/fixedsys-excelsior/default.nix index c8d2d1c2a9e..4222b802d55 100644 --- a/pkgs/data/fonts/fixedsys-excelsior/default.nix +++ b/pkgs/data/fonts/fixedsys-excelsior/default.nix @@ -21,7 +21,7 @@ in fetchurl rec { sha256 = "32d6f07f1ff08c764357f8478892b2ba5ade23427af99759f34a0ba24bcd2e37"; meta = { - description = "Pan-unicode version of Fixedsys, a classic DOS font."; + description = "Pan-unicode version of Fixedsys, a classic DOS font"; homepage = "http://www.fixedsysexcelsior.com/"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.publicDomain; diff --git a/pkgs/data/fonts/lmmath/default.nix b/pkgs/data/fonts/lmmath/default.nix index a66bd48c897..0530141317b 100644 --- a/pkgs/data/fonts/lmmath/default.nix +++ b/pkgs/data/fonts/lmmath/default.nix @@ -15,7 +15,7 @@ in fetchzip rec { sha256 = "05k145bxgxjh7i9gx1ahigxfpc2v2vwzsy2mc41jvvg51kjr8fnn"; meta = with lib; { - description = "The Latin Modern Math (LM Math) font completes the modernization of the Computer Modern family of typefaces designed and programmed by Donald E. Knuth."; + description = "The Latin Modern Math (LM Math) font completes the modernization of the Computer Modern family of typefaces designed and programmed by Donald E. Knuth"; homepage = "http://www.gust.org.pl/projects/e-foundry/lm-math"; # "The Latin Modern Math font is licensed under the GUST Font License (GFL), # which is a free license, legally equivalent to the LaTeX Project Public diff --git a/pkgs/data/fonts/vegur/default.nix b/pkgs/data/fonts/vegur/default.nix index af6c00e32c8..2f03dac3914 100644 --- a/pkgs/data/fonts/vegur/default.nix +++ b/pkgs/data/fonts/vegur/default.nix @@ -18,7 +18,7 @@ in fetchzip { meta = with lib; { homepage = "http://dotcolon.net/font/vegur/"; - description = "A humanist sans serif font."; + description = "A humanist sans serif font"; platforms = platforms.all; maintainers = [ maintainers.samueldr ]; license = licenses.cc0; diff --git a/pkgs/data/misc/conway_polynomials/default.nix b/pkgs/data/misc/conway_polynomials/default.nix index 48b538fe183..f51d2293a7e 100644 --- a/pkgs/data/misc/conway_polynomials/default.nix +++ b/pkgs/data/misc/conway_polynomials/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Contains a small database of Conway polynomials."; + description = "Contains a small database of Conway polynomials"; license = licenses.gpl2; platforms = platforms.all; maintainers = with maintainers; [ timokau ]; diff --git a/pkgs/desktops/lxde/core/lxrandr/default.nix b/pkgs/desktops/lxde/core/lxrandr/default.nix index 421c999ea2f..9df84b6b1e2 100644 --- a/pkgs/desktops/lxde/core/lxrandr/default.nix +++ b/pkgs/desktops/lxde/core/lxrandr/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 (if withGtk3 then gtk3 else gtk2) xrandr ]; meta = with stdenv.lib; { - description = "LXRandR is the standard screen manager of LXDE."; + description = "LXRandR is the standard screen manager of LXDE"; homepage = "https://lxde.org/"; license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ rawkode ]; diff --git a/pkgs/development/compilers/acme/default.nix b/pkgs/development/compilers/acme/default.nix index c5a997ad75b..89c5620f5fc 100644 --- a/pkgs/development/compilers/acme/default.nix +++ b/pkgs/development/compilers/acme/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A multi-platform cross assembler for 6502/6510/65816 CPUs."; + description = "A multi-platform cross assembler for 6502/6510/65816 CPUs"; homepage = "https://sourceforge.net/projects/acme-crossass/"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/development/compilers/bs-platform/default.nix b/pkgs/development/compilers/bs-platform/default.nix index 18436bca347..6eb7d50bfc8 100644 --- a/pkgs/development/compilers/bs-platform/default.nix +++ b/pkgs/development/compilers/bs-platform/default.nix @@ -18,7 +18,7 @@ in }; }).overrideAttrs (attrs: { meta = with stdenv.lib; { - description = "A JavaScript backend for OCaml focused on smooth integration and clean generated code."; + description = "A JavaScript backend for OCaml focused on smooth integration and clean generated code"; homepage = "https://bucklescript.github.io"; license = licenses.lgpl3; maintainers = with maintainers; [ turbomack gamb anmonteiro ]; diff --git a/pkgs/development/compilers/copper/default.nix b/pkgs/development/compilers/copper/default.nix index 4d24c78f25f..67bc786e669 100644 --- a/pkgs/development/compilers/copper/default.nix +++ b/pkgs/development/compilers/copper/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { make BACKEND=elf64 install prefix=$out ''; meta = with stdenv.lib; { - description = "Simple imperative language, statically typed with type inference and genericity."; + description = "Simple imperative language, statically typed with type inference and genericity"; homepage = "https://tibleiz.net/copper/"; license = licenses.bsd2; platforms = platforms.x86_64; diff --git a/pkgs/development/compilers/inform7/default.nix b/pkgs/development/compilers/inform7/default.nix index 62bd0142f32..8e5f02e792d 100644 --- a/pkgs/development/compilers/inform7/default.nix +++ b/pkgs/development/compilers/inform7/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - description = "A design system for interactive fiction."; + description = "A design system for interactive fiction"; homepage = "http://inform7.com/"; license = licenses.artistic2; maintainers = with maintainers; [ mbbx6spp ]; diff --git a/pkgs/development/compilers/mozart/default.nix b/pkgs/development/compilers/mozart/default.nix index 025652c7492..d9ab475880e 100644 --- a/pkgs/development/compilers/mozart/default.nix +++ b/pkgs/development/compilers/mozart/default.nix @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { ]; meta = { - description = "An open source implementation of Oz 3."; + description = "An open source implementation of Oz 3"; maintainers = [ lib.maintainers.layus ]; license = lib.licenses.bsd2; homepage = "https://mozart.github.io"; diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index adb564f7cfe..513f4d968f6 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -106,7 +106,7 @@ in makePackage { meta = with stdenv.lib; { homepage = "http://openjdk.java.net/projects/openjfx/"; license = licenses.gpl2; - description = "The next-generation Java client toolkit."; + description = "The next-generation Java client toolkit"; maintainers = with maintainers; [ abbradar ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/development/compilers/openjdk/openjfx/14.nix b/pkgs/development/compilers/openjdk/openjfx/14.nix index 22b5be7dc69..51512c5afca 100644 --- a/pkgs/development/compilers/openjdk/openjfx/14.nix +++ b/pkgs/development/compilers/openjdk/openjfx/14.nix @@ -108,7 +108,7 @@ in makePackage { meta = with stdenv.lib; { homepage = "http://openjdk.java.net/projects/openjfx/"; license = licenses.gpl2; - description = "The next-generation Java client toolkit."; + description = "The next-generation Java client toolkit"; maintainers = with maintainers; [ abbradar ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix index 0a526023902..3c1b2a0f91b 100644 --- a/pkgs/development/compilers/ponyc/pony-stable.nix +++ b/pkgs/development/compilers/ponyc/pony-stable.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installFlags = [ "prefix=${placeholder "out"}" "install" ]; meta = { - description = "A simple dependency manager for the Pony language."; + description = "A simple dependency manager for the Pony language"; homepage = "https://www.ponylang.org"; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ dipinhora kamilchm patternspandemic ]; diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix index 9b060227067..cefa4537c36 100644 --- a/pkgs/development/compilers/scala/dotty-bare.nix +++ b/pkgs/development/compilers/scala/dotty-bare.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Research platform for new language concepts and compiler technologies for Scala."; + description = "Research platform for new language concepts and compiler technologies for Scala"; longDescription = '' Dotty is a platform to try out new language concepts and compiler technologies for Scala. The focus is mainly on simplification. We remove extraneous syntax (e.g. no XML literals), diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index 6a0c7ded4b9..23532cc8446 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit (src.meta) homepage; - description = "A collection of tools, libraries and tests for shader compilation."; + description = "A collection of tools, libraries and tests for shader compilation"; license = [ licenses.asl20 ]; }; } diff --git a/pkgs/development/compilers/x11basic/default.nix b/pkgs/development/compilers/x11basic/default.nix index cc4788e3ce0..9bf6b3d2874 100644 --- a/pkgs/development/compilers/x11basic/default.nix +++ b/pkgs/development/compilers/x11basic/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://x11-basic.sourceforge.net/"; - description = "A Basic interpreter and compiler with graphics capabilities."; + description = "A Basic interpreter and compiler with graphics capabilities"; license = licenses.gpl2; maintainers = with maintainers; [ edwtjo ]; platforms = platforms.unix; diff --git a/pkgs/development/interpreters/alda/default.nix b/pkgs/development/interpreters/alda/default.nix index e04188426a1..b82b0b978f9 100644 --- a/pkgs/development/interpreters/alda/default.nix +++ b/pkgs/development/interpreters/alda/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A music programming language for musicians."; + description = "A music programming language for musicians"; homepage = "https://alda.io"; license = licenses.epl10; maintainers = [ maintainers.ericdallo ]; diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index 02aed6e8929..abff21c798a 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -9,7 +9,7 @@ racket.overrideAttrs (oldAttrs: rec { }; meta = oldAttrs.meta // { - description = "Racket without bundled packages, such as Dr. Racket."; + description = "Racket without bundled packages, such as Dr. Racket"; longDescription = ''The essential package racket-libs is included, as well as libraries that live in collections. In particular, raco and the pkg library are still bundled. diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index 0b0e0fd9e22..424aeb8637d 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; meta = { - description = "Memory Efficient Serialization Library."; + description = "Memory Efficient Serialization Library"; longDescription = '' FlatBuffers is an efficient cross platform serialization library for games and other memory constrained apps. It allows you to directly diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index 83d901780c5..90f6b4d49b8 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - description = "Intel Media SDK."; + description = "Intel Media SDK"; license = licenses.mit; maintainers = with maintainers; [ midchildan ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/libraries/jcal/default.nix b/pkgs/development/libraries/jcal/default.nix index 8e7818bf4e5..a40de74037a 100644 --- a/pkgs/development/libraries/jcal/default.nix +++ b/pkgs/development/libraries/jcal/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { preAutoreconf = "cd sources/"; meta = with stdenv.lib; { - description = "Jalali calendar is a small and portable free software library to manipulate date and time in Jalali calendar system."; + description = "Jalali calendar is a small and portable free software library to manipulate date and time in Jalali calendar system"; homepage = "http://nongnu.org/jcal/"; license = licenses.gpl3; maintainers = [ maintainers.linarcx ]; diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 8635c1fb40d..5e361a09d35 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit version; homepage = "https://github.com/open-source-parsers/jsoncpp"; - description = "A C++ library for interacting with JSON."; + description = "A C++ library for interacting with JSON"; maintainers = with maintainers; [ ttuegel cpages nand0p ]; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/development/libraries/libdynd/default.nix index eec982aeeb0..cc9018421fe 100644 --- a/pkgs/development/libraries/libdynd/default.nix +++ b/pkgs/development/libraries/libdynd/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { outputDoc = "dev"; meta = with stdenv.lib; { - description = "C++ dynamic ndarray library, with Python exposure."; + description = "C++ dynamic ndarray library, with Python exposure"; homepage = "http://libdynd.org"; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libipfix/default.nix b/pkgs/development/libraries/libipfix/default.nix index 1b8aef201af..69918b5d36c 100644 --- a/pkgs/development/libraries/libipfix/default.nix +++ b/pkgs/development/libraries/libipfix/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { homepage = "http://libipfix.sourceforge.net/"; - description = "The libipfix C-library implements the IPFIX protocol defined by the IP Flow Information Export working group of the IETF."; + description = "The libipfix C-library implements the IPFIX protocol defined by the IP Flow Information Export working group of the IETF"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = with maintainers; [ lewo ]; diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index ecec1e79492..6c4874112b7 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://dev.mysql.com/downloads/connector/cpp/"; - description = "C++ library for connecting to mysql servers."; + description = "C++ library for connecting to mysql servers"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libnetfilter_acct/default.nix b/pkgs/development/libraries/libnetfilter_acct/default.nix index d33782ad7e5..268da3813e7 100644 --- a/pkgs/development/libraries/libnetfilter_acct/default.nix +++ b/pkgs/development/libraries/libnetfilter_acct/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://www.netfilter.org/projects/libnetfilter_acct/"; - description = "Userspace library providing interface to extended accounting infrastructure."; + description = "Userspace library providing interface to extended accounting infrastructure"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libroxml/default.nix b/pkgs/development/libraries/libroxml/default.nix index 3993451e19f..b72ffb5b7ec 100644 --- a/pkgs/development/libraries/libroxml/default.nix +++ b/pkgs/development/libraries/libroxml/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { homepage = "http://www.libroxml.net/"; - description = "This library is minimum, easy-to-use, C implementation for xml file parsing."; + description = "This library is minimum, easy-to-use, C implementation for xml file parsing"; license = licenses.lgpl3; platforms = platforms.unix; maintainers = with maintainers; [ mpickering ]; diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index c009c786672..5cb19f863cc 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://github.com/andlabs/libui"; - description = "Simple and portable (but not inflexible) GUI library in C that uses the native GUI technologies of each platform it supports."; + description = "Simple and portable (but not inflexible) GUI library in C that uses the native GUI technologies of each platform it supports"; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/muparserx/default.nix b/pkgs/development/libraries/muparserx/default.nix index 2c5bde316b4..d7de5ff00f3 100644 --- a/pkgs/development/libraries/muparserx/default.nix +++ b/pkgs/development/libraries/muparserx/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A C++ Library for Parsing Expressions with Strings, Complex Numbers, Vectors, Matrices and more."; + description = "A C++ Library for Parsing Expressions with Strings, Complex Numbers, Vectors, Matrices and more"; homepage = "https://beltoforion.de/en/muparserx/"; license = licenses.bsd2; maintainers = with maintainers; [ drewrisinger ]; diff --git a/pkgs/development/libraries/mypaint-brushes/1.0.nix b/pkgs/development/libraries/mypaint-brushes/1.0.nix index c66329fa633..570588e22fb 100644 --- a/pkgs/development/libraries/mypaint-brushes/1.0.nix +++ b/pkgs/development/libraries/mypaint-brushes/1.0.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://mypaint.org/"; - description = "Brushes used by MyPaint and other software using libmypaint."; + description = "Brushes used by MyPaint and other software using libmypaint"; license = licenses.cc0; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/mypaint-brushes/default.nix b/pkgs/development/libraries/mypaint-brushes/default.nix index 20caf6e5775..d2fb8ed143a 100644 --- a/pkgs/development/libraries/mypaint-brushes/default.nix +++ b/pkgs/development/libraries/mypaint-brushes/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://mypaint.org/"; - description = "Brushes used by MyPaint and other software using libmypaint."; + description = "Brushes used by MyPaint and other software using libmypaint"; license = licenses.cc0; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/pangoxsl/default.nix b/pkgs/development/libraries/pangoxsl/default.nix index d316250411d..26d012e81e1 100644 --- a/pkgs/development/libraries/pangoxsl/default.nix +++ b/pkgs/development/libraries/pangoxsl/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { ]; meta = with stdenv.lib; { - description = "Implements several of the inline properties defined by XSL that are not currently implemented by Pango."; + description = "Implements several of the inline properties defined by XSL that are not currently implemented by Pango"; homepage = "https://sourceforge.net/projects/pangopdf"; platforms = platforms.unix; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/pdal/default.nix b/pkgs/development/libraries/pdal/default.nix index 2059b4db7fb..4fbf5df0774 100644 --- a/pkgs/development/libraries/pdal/default.nix +++ b/pkgs/development/libraries/pdal/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "PDAL is Point Data Abstraction Library. GDAL for point cloud data."; + description = "PDAL is Point Data Abstraction Library. GDAL for point cloud data"; homepage = "https://pdal.io"; license = licenses.bsd3; maintainers = with maintainers; [ nh2 ]; diff --git a/pkgs/development/libraries/properties-cpp/default.nix b/pkgs/development/libraries/properties-cpp/default.nix index ce56c464588..fb998169595 100644 --- a/pkgs/development/libraries/properties-cpp/default.nix +++ b/pkgs/development/libraries/properties-cpp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://launchpad.net/properties-cpp"; - description = "A very simple convenience library for handling properties and signals in C++11."; + description = "A very simple convenience library for handling properties and signals in C++11"; license = licenses.lgpl3; maintainers = with maintainers; [ edwtjo ]; }; diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix index a52b3608eb7..6f2550ca9ac 100644 --- a/pkgs/development/libraries/python-qt/default.nix +++ b/pkgs/development/libraries/python-qt/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "PythonQt is a dynamic Python binding for the Qt framework. It offers an easy way to embed the Python scripting language into your C++ Qt applications."; + description = "PythonQt is a dynamic Python binding for the Qt framework. It offers an easy way to embed the Python scripting language into your C++ Qt applications"; homepage = "http://pythonqt.sourceforge.net/"; license = licenses.lgpl21; platforms = platforms.all; diff --git a/pkgs/development/libraries/rlottie/default.nix b/pkgs/development/libraries/rlottie/default.nix index a77c851ebca..3713bcf1df7 100644 --- a/pkgs/development/libraries/rlottie/default.nix +++ b/pkgs/development/libraries/rlottie/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://github.com/Samsung/rlottie"; - description = "A platform independent standalone c++ library for rendering vector based animations and art in realtime."; + description = "A platform independent standalone c++ library for rendering vector based animations and art in realtime"; license = licenses.unfree; # Mixed, see https://github.com/Samsung/rlottie/blob/master/COPYING platforms = platforms.all; maintainers = with maintainers; [ CRTified ]; diff --git a/pkgs/development/libraries/science/math/itpp/default.nix b/pkgs/development/libraries/science/math/itpp/default.nix index d7fae9ae479..c74a7408e98 100644 --- a/pkgs/development/libraries/science/math/itpp/default.nix +++ b/pkgs/development/libraries/science/math/itpp/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "IT++ is a C++ library of mathematical, signal processing and communication classes and functions."; + description = "IT++ is a C++ library of mathematical, signal processing and communication classes and functions"; homepage = http://itpp.sourceforge.net/; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/serialdv/default.nix b/pkgs/development/libraries/serialdv/default.nix index d711cd9fc80..47d4e68f658 100644 --- a/pkgs/development/libraries/serialdv/default.nix +++ b/pkgs/development/libraries/serialdv/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { - description = "C++ Minimal interface to encode and decode audio with AMBE3000 based devices in packet mode over a serial link."; + description = "C++ Minimal interface to encode and decode audio with AMBE3000 based devices in packet mode over a serial link"; homepage = "https://github.com/f4exb/serialdv"; platforms = platforms.linux; maintainers = with maintainers; [ alkeryn ]; diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix index c553405878f..28373605a6b 100644 --- a/pkgs/development/libraries/taglib/default.nix +++ b/pkgs/development/libraries/taglib/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://taglib.org/"; repositories.git = "git://github.com/taglib/taglib.git"; - description = "A library for reading and editing audio file metadata."; + description = "A library for reading and editing audio file metadata"; longDescription = '' TagLib is a library for reading and editing the meta-data of several popular audio formats. Currently it supports both ID3v1 and ID3v2 for MP3 diff --git a/pkgs/development/libraries/vsqlite/default.nix b/pkgs/development/libraries/vsqlite/default.nix index e54a4a40af1..a4c9cb556b9 100644 --- a/pkgs/development/libraries/vsqlite/default.nix +++ b/pkgs/development/libraries/vsqlite/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://vsqlite.virtuosic-bytes.com/"; - description = "C++ wrapper library for sqlite."; + description = "C++ wrapper library for sqlite"; license = licenses.bsd3; platforms = platforms.unix; }; diff --git a/pkgs/development/mobile/cocoapods/default.nix b/pkgs/development/mobile/cocoapods/default.nix index f0d1a3b89d0..2ab285b1730 100644 --- a/pkgs/development/mobile/cocoapods/default.nix +++ b/pkgs/development/mobile/cocoapods/default.nix @@ -13,7 +13,7 @@ bundlerApp { passthru.updateScript = toString ./update; meta = with lib; { - description = "CocoaPods manages dependencies for your Xcode projects."; + description = "CocoaPods manages dependencies for your Xcode projects"; homepage = "https://github.com/CocoaPods/CocoaPods"; license = licenses.mit; platforms = platforms.darwin; diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index e37f5bc7e62..cc74076b6c7 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; meta = with stdenv.lib; { - description = "This tool serializes the output of popular command line tools and filetypes to structured JSON output."; + description = "This tool serializes the output of popular command line tools and filetypes to structured JSON output"; homepage = "https://github.com/kellyjonbrazil/jc"; license = licenses.mit; maintainers = with maintainers; [ atemu ]; diff --git a/pkgs/development/python-modules/pywal/default.nix b/pkgs/development/python-modules/pywal/default.nix index b565188ccea..ccc862f8aa4 100644 --- a/pkgs/development/python-modules/pywal/default.nix +++ b/pkgs/development/python-modules/pywal/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { ''; meta = with lib; { - description = "Generate and change colorschemes on the fly. A 'wal' rewrite in Python 3."; + description = "Generate and change colorschemes on the fly. A 'wal' rewrite in Python 3"; homepage = "https://github.com/dylanaraps/pywal"; license = licenses.mit; maintainers = with maintainers; [ Fresheyeball ]; diff --git a/pkgs/development/python-modules/yq/default.nix b/pkgs/development/python-modules/yq/default.nix index 05f608ff4e9..61087639265 100644 --- a/pkgs/development/python-modules/yq/default.nix +++ b/pkgs/development/python-modules/yq/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "yq" ]; meta = with lib; { - description = "Command-line YAML processor - jq wrapper for YAML documents."; + description = "Command-line YAML processor - jq wrapper for YAML documents"; homepage = "https://github.com/kislyuk/yq"; license = [ licenses.asl20 ]; maintainers = [ maintainers.womfoo ]; diff --git a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix index 7a6f3481d53..10f0d74c0dc 100644 --- a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix +++ b/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - description = "Ease the analysis of existing memory management techniques, as well as the prototyping of new memory management techniques."; + description = "Ease the analysis of existing memory management techniques, as well as the prototyping of new memory management techniques"; homepage = "https://github.com/GarCoSim"; maintainers = [ maintainers.cmcdragonkai ]; license = licenses.gpl2; diff --git a/pkgs/development/tools/analysis/pev/default.nix b/pkgs/development/tools/analysis/pev/default.nix index 8e8f438b5e1..cf09d249a9a 100644 --- a/pkgs/development/tools/analysis/pev/default.nix +++ b/pkgs/development/tools/analysis/pev/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "merces"; repo = "pev"; - rev = "aa4ef7f"; - sha256 = "00a3g486343lhqcsf4vrdy5xif6v3cgcf2y8yp5b96x15c0wid36"; + rev = "aa4ef7f"; + sha256 = "00a3g486343lhqcsf4vrdy5xif6v3cgcf2y8yp5b96x15c0wid36"; fetchSubmodules = true; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation { installFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { - description = "pev is a full-featured, open source, multiplatform command line toolkit to work with PE (Portable Executables) binaries."; + description = "pev is a full-featured, open source, multiplatform command line toolkit to work with PE (Portable Executables) binaries"; homepage = "http://pev.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index fae1310bd58..59a345faf29 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -73,7 +73,7 @@ buildBazelPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/bazelbuild/bazel-watcher"; - description = "Tools for building Bazel targets when source files change."; + description = "Tools for building Bazel targets when source files change"; license = licenses.asl20; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.all; diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index 9910256afc0..4cde308b835 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -82,7 +82,7 @@ buildBazelPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/buchgr/bazel-remote"; - description = "A remote HTTP/1.1 cache for Bazel."; + description = "A remote HTTP/1.1 cache for Bazel"; license = licenses.asl20; maintainers = [ maintainers.uri-canva ]; platforms = platforms.darwin ++ platforms.linux; diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index dd9bc4016f5..43a70c6a765 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { buildFlagsArray = [ "-ldflags=-s -w -X main.buildVersion=${version} -X main.buildScmRevision=${src.rev}" ]; meta = with stdenv.lib; { - description = "Tools for working with Google's bazel buildtool. Includes buildifier, buildozer, and unused_deps."; + description = "Tools for working with Google's bazel buildtool. Includes buildifier, buildozer, and unused_deps"; homepage = "https://github.com/bazelbuild/buildtools"; license = licenses.asl20; maintainers = with maintainers; [ elasticdog uri-canva marsam ]; diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index c3049edee64..45612182ed9 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://scalacenter.github.io/bloop/"; license = licenses.asl20; - description = "Bloop is a Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way."; + description = "Bloop is a Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way"; platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ tomahna ]; }; diff --git a/pkgs/development/tools/check/default.nix b/pkgs/development/tools/check/default.nix index 107b8b58024..a28124828f9 100644 --- a/pkgs/development/tools/check/default.nix +++ b/pkgs/development/tools/check/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with lib; { - description = "A set of utilities for checking Go sources."; + description = "A set of utilities for checking Go sources"; homepage = "https://gitlab.com/opennota/check"; license = licenses.gpl3; maintainers = with maintainers; [ kalbasit ]; diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index b7eec641b4b..f64041d1be8 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A linter for Clojure code that sparks joy."; + description = "A linter for Clojure code that sparks joy"; homepage = "https://github.com/borkdude/clj-kondo"; license = licenses.epl10; platforms = graalvm8.meta.platforms; diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix index 3df406eb560..66fb878aa26 100644 --- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -24,6 +24,6 @@ in buildGoModule rec { meta = with stdenv.lib; { maintainers = with maintainers; [ bricewge ]; license = licenses.asl20; - description = "Command line client for the Drone continuous integration server."; + description = "Command line client for the Drone continuous integration server"; }; } diff --git a/pkgs/development/tools/corundum/default.nix b/pkgs/development/tools/corundum/default.nix index 3497f709964..62d00cbc376 100644 --- a/pkgs/development/tools/corundum/default.nix +++ b/pkgs/development/tools/corundum/default.nix @@ -8,7 +8,7 @@ bundlerApp { passthru.updateScript = bundlerUpdateScript "corundum"; meta = with lib; { - description = "Tool and libraries for maintaining Ruby gems."; + description = "Tool and libraries for maintaining Ruby gems"; homepage = "https://github.com/nyarly/corundum"; license = licenses.mit; maintainers = with maintainers; [ nyarly nicknovitski ]; diff --git a/pkgs/development/tools/deadcode/default.nix b/pkgs/development/tools/deadcode/default.nix index 44c824b2c1e..516eeff2091 100644 --- a/pkgs/development/tools/deadcode/default.nix +++ b/pkgs/development/tools/deadcode/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { }; meta = with lib; { - description = "deadcode is a very simple utility which detects unused declarations in a Go package."; + description = "deadcode is a very simple utility which detects unused declarations in a Go package"; homepage = "https://github.com/remyoudompheng/go-misc/tree/master/deadcode"; license = licenses.bsd3; maintainers = with maintainers; [ kalbasit ]; diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix index 9e45d5988cc..4a07a05a636 100644 --- a/pkgs/development/tools/deis/default.nix +++ b/pkgs/development/tools/deis/default.nix @@ -27,7 +27,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://deis.io"; - description = "A command line utility used to interact with the Deis open source PaaS."; + description = "A command line utility used to interact with the Deis open source PaaS"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ diff --git a/pkgs/development/tools/deisctl/default.nix b/pkgs/development/tools/deisctl/default.nix index 057a8b87a0f..a245a06afe1 100644 --- a/pkgs/development/tools/deisctl/default.nix +++ b/pkgs/development/tools/deisctl/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://deis.io"; - description = "A command-line utility used to provision and operate a Deis cluster."; + description = "A command-line utility used to provision and operate a Deis cluster"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ diff --git a/pkgs/development/tools/drm_info/default.nix b/pkgs/development/tools/drm_info/default.nix index 9243bbb161b..c052db92e0c 100644 --- a/pkgs/development/tools/drm_info/default.nix +++ b/pkgs/development/tools/drm_info/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdrm json_c pciutils ]; meta = with stdenv.lib; { - description = "Small utility to dump info about DRM devices."; + description = "Small utility to dump info about DRM devices"; homepage = "https://github.com/ascent12/drm_info"; license = licenses.mit; maintainers = with maintainers; [ tadeokondrak ]; diff --git a/pkgs/development/tools/ejson/default.nix b/pkgs/development/tools/ejson/default.nix index 17e3f5f7be1..05deb05ed7e 100644 --- a/pkgs/development/tools/ejson/default.nix +++ b/pkgs/development/tools/ejson/default.nix @@ -35,7 +35,7 @@ in buildGoPackage rec { ''; meta = with lib; { - description = "A small library to manage encrypted secrets using asymmetric encryption."; + description = "A small library to manage encrypted secrets using asymmetric encryption"; license = licenses.mit; homepage = "https://github.com/Shopify/ejson"; platforms = platforms.unix; diff --git a/pkgs/development/tools/errcheck/default.nix b/pkgs/development/tools/errcheck/default.nix index d288ff4dfec..01dc924c811 100644 --- a/pkgs/development/tools/errcheck/default.nix +++ b/pkgs/development/tools/errcheck/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with lib; { - description = "errcheck is a program for checking for unchecked errors in go programs."; + description = "errcheck is a program for checking for unchecked errors in go programs"; homepage = "https://github.com/kisielk/errcheck"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; diff --git a/pkgs/development/tools/gdm/default.nix b/pkgs/development/tools/gdm/default.nix index 2217ea591ff..2f26a1c35f8 100644 --- a/pkgs/development/tools/gdm/default.nix +++ b/pkgs/development/tools/gdm/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - description = "Minimalist dependency manager for Go written in Go."; + description = "Minimalist dependency manager for Go written in Go"; homepage = "https://github.com/sparrc/gdm"; license = licenses.unlicense; maintainers = [ maintainers.mic92 ]; diff --git a/pkgs/development/tools/git-ftp/default.nix b/pkgs/development/tools/git-ftp/default.nix index 7e62a93d564..0c107ecc503 100644 --- a/pkgs/development/tools/git-ftp/default.nix +++ b/pkgs/development/tools/git-ftp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [pandoc man]; meta = with stdenv.lib; { - description = "Git powered FTP client written as shell script."; + description = "Git powered FTP client written as shell script"; homepage = "https://git-ftp.github.io/"; license = licenses.gpl3; maintainers = with maintainers; [ tweber ]; diff --git a/pkgs/development/tools/go-migrate/default.nix b/pkgs/development/tools/go-migrate/default.nix index ee942beb92c..96b66ebc0b5 100644 --- a/pkgs/development/tools/go-migrate/default.nix +++ b/pkgs/development/tools/go-migrate/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { meta = with stdenv.lib; { homepage = "https://github.com/golang-migrate/migrate"; - description = "Database migrations. CLI and Golang library."; + description = "Database migrations. CLI and Golang library"; maintainers = with maintainers; [ offline ]; license = licenses.mit; }; diff --git a/pkgs/development/tools/go-outline/default.nix b/pkgs/development/tools/go-outline/default.nix index 3df1d5cae25..f10ee426c08 100644 --- a/pkgs/development/tools/go-outline/default.nix +++ b/pkgs/development/tools/go-outline/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { }; meta = { - description = "Utility to extract JSON representation of declarations from a Go source file."; + description = "Utility to extract JSON representation of declarations from a Go source file"; homepage = "https://github.com/ramya-rao-a/go-outline"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/tools/go-symbols/default.nix b/pkgs/development/tools/go-symbols/default.nix index bdee5e4b25a..1e2b63ba154 100644 --- a/pkgs/development/tools/go-symbols/default.nix +++ b/pkgs/development/tools/go-symbols/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { }; meta = { - description = "A utility for extracting a JSON representation of the package symbols from a go source tree."; + description = "A utility for extracting a JSON representation of the package symbols from a go source tree"; homepage = "https://github.com/acroca/go-symbols"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/development/tools/goconvey/default.nix index 4c4d651ce60..173da3ff29d 100644 --- a/pkgs/development/tools/goconvey/default.nix +++ b/pkgs/development/tools/goconvey/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { }; meta = { - description = "Go testing in the browser. Integrates with `go test`. Write behavioral tests in Go."; + description = "Go testing in the browser. Integrates with `go test`. Write behavioral tests in Go"; homepage = "https://github.com/smartystreets/goconvey"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/tools/gocyclo/default.nix b/pkgs/development/tools/gocyclo/default.nix index 4ce97349fd7..d11cf609328 100644 --- a/pkgs/development/tools/gocyclo/default.nix +++ b/pkgs/development/tools/gocyclo/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { }; meta = with lib; { - description = "Calculate cyclomatic complexities of functions in Go source code."; + description = "Calculate cyclomatic complexities of functions in Go source code"; homepage = "https://github.com/alecthomas/gocyclo"; license = licenses.bsd3; maintainers = with maintainers; [ kalbasit ]; diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix index cf2c5a5b9a6..70bbc635cc1 100644 --- a/pkgs/development/tools/gomodifytags/default.nix +++ b/pkgs/development/tools/gomodifytags/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { }; meta = { - description = "Go tool to modify struct field tags."; + description = "Go tool to modify struct field tags"; homepage = "https://github.com/fatih/gomodifytags"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix index d112654ab43..8d26ca7eb44 100644 --- a/pkgs/development/tools/gopkgs/default.nix +++ b/pkgs/development/tools/gopkgs/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { doCheck = false; meta = { - description = "Tool to get list available Go packages."; + description = "Tool to get list available Go packages"; homepage = "https://github.com/uudashr/gopkgs"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/tools/gore/default.nix b/pkgs/development/tools/gore/default.nix index fbc3152cef1..ca9c8d9eec0 100644 --- a/pkgs/development/tools/gore/default.nix +++ b/pkgs/development/tools/gore/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { doCheck = false; meta = with stdenv.lib; { - description = "Yet another Go REPL that works nicely."; + description = "Yet another Go REPL that works nicely"; homepage = "https://github.com/motemen/gore"; license = licenses.mit; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/development/tools/gotests/default.nix b/pkgs/development/tools/gotests/default.nix index 13d3c700ce9..43f221bd324 100644 --- a/pkgs/development/tools/gotests/default.nix +++ b/pkgs/development/tools/gotests/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { }; meta = { - description = "Generate Go tests from your source code."; + description = "Generate Go tests from your source code"; homepage = "https://github.com/cweill/gotests"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.asl20; diff --git a/pkgs/development/tools/impl/default.nix b/pkgs/development/tools/impl/default.nix index 88b8abd842f..327226fe7a1 100644 --- a/pkgs/development/tools/impl/default.nix +++ b/pkgs/development/tools/impl/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with lib; { - description = "impl generates method stubs for implementing an interface."; + description = "impl generates method stubs for implementing an interface"; homepage = "https://github.com/josharian/impl"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; diff --git a/pkgs/development/tools/ineffassign/default.nix b/pkgs/development/tools/ineffassign/default.nix index 2be22301cdb..85c643537af 100644 --- a/pkgs/development/tools/ineffassign/default.nix +++ b/pkgs/development/tools/ineffassign/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { }; meta = with lib; { - description = "Detect ineffectual assignments in Go code."; + description = "Detect ineffectual assignments in Go code"; homepage = "https://github.com/gordonklaus/ineffassign"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; diff --git a/pkgs/development/tools/interfacer/default.nix b/pkgs/development/tools/interfacer/default.nix index ff59ce50482..b7f568f4d2b 100644 --- a/pkgs/development/tools/interfacer/default.nix +++ b/pkgs/development/tools/interfacer/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with lib; { - description = "A linter that suggests interface types."; + description = "A linter that suggests interface types"; homepage = "https://github.com/mvdan/interfacer"; license = licenses.bsd3; maintainers = with maintainers; [ kalbasit ]; diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix index 228a82f6008..cc56b27ca2d 100644 --- a/pkgs/development/tools/irony-server/default.nix +++ b/pkgs/development/tools/irony-server/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ]; meta = with stdenv.lib; { - description = "The server part of irony."; + description = "The server part of irony"; homepage = "https://melpa.org/#/irony"; maintainers = [ maintainers.deepfire ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/jsduck/default.nix b/pkgs/development/tools/jsduck/default.nix index 8748fb8e512..233b3933876 100644 --- a/pkgs/development/tools/jsduck/default.nix +++ b/pkgs/development/tools/jsduck/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { passthru.updateScript = bundlerUpdateScript "jsduck"; meta = with lib; { - description = "Simple JavaScript Duckumentation generator."; + description = "Simple JavaScript Duckumentation generator"; homepage = "https://github.com/senchalabs/jsduck"; license = with licenses; gpl3; maintainers = with maintainers; [ periklis nicknovitski ]; diff --git a/pkgs/development/tools/knightos/scas/default.nix b/pkgs/development/tools/knightos/scas/default.nix index ad21e68eed8..2269c3781a5 100644 --- a/pkgs/development/tools/knightos/scas/default.nix +++ b/pkgs/development/tools/knightos/scas/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://knightos.org/"; - description = "Assembler and linker for the Z80."; + description = "Assembler and linker for the Z80"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; }; diff --git a/pkgs/development/tools/kythe/default.nix b/pkgs/development/tools/kythe/default.nix index e9748d6e45e..601634b3184 100644 --- a/pkgs/development/tools/kythe/default.nix +++ b/pkgs/development/tools/kythe/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A pluggable, (mostly) language-agnostic ecosystem for building tools that work with code."; + description = "A pluggable, (mostly) language-agnostic ecosystem for building tools that work with code"; longDescription = '' The Kythe project was founded to provide and support tools and standards that encourage interoperability among programs that manipulate source diff --git a/pkgs/development/tools/librarian-puppet-go/default.nix b/pkgs/development/tools/librarian-puppet-go/default.nix index 7f40824c472..6144b533d6d 100644 --- a/pkgs/development/tools/librarian-puppet-go/default.nix +++ b/pkgs/development/tools/librarian-puppet-go/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with lib; { inherit (src.meta) homepage; - description = "librarian-puppet implementation in go."; + description = "librarian-puppet implementation in go"; license = licenses.mit; maintainers = with maintainers; [ womfoo ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/tools/maligned/default.nix b/pkgs/development/tools/maligned/default.nix index 15d14df3ff7..06cd23e40f4 100644 --- a/pkgs/development/tools/maligned/default.nix +++ b/pkgs/development/tools/maligned/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with lib; { - description = "Tool to detect Go structs that would take less memory if their fields were sorted."; + description = "Tool to detect Go structs that would take less memory if their fields were sorted"; homepage = "https://github.com/mdempsky/maligned"; license = licenses.bsd3; maintainers = with maintainers; [ kalbasit ]; diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index 8cd4fc9f7f4..bf182a1ae41 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://www.minizinc.org/"; - description = "MiniZinc is a medium-level constraint modelling language."; + description = "MiniZinc is a medium-level constraint modelling language"; longDescription = '' MiniZinc is a medium-level constraint modelling diff --git a/pkgs/development/tools/misc/bsdbuild/default.nix b/pkgs/development/tools/misc/bsdbuild/default.nix index 35406c48534..6ba8064c094 100644 --- a/pkgs/development/tools/misc/bsdbuild/default.nix +++ b/pkgs/development/tools/misc/bsdbuild/default.nix @@ -49,7 +49,7 @@ EOF meta = { homepage = "http://bsdbuild.hypertriton.com"; - description = "A cross-platform build system."; + description = "A cross-platform build system"; longDescription = '' BSDBuild is a cross-platform build system. Derived from the diff --git a/pkgs/development/tools/misc/tockloader/default.nix b/pkgs/development/tools/misc/tockloader/default.nix index 298e6f7c9d5..3aff6c6d36c 100644 --- a/pkgs/development/tools/misc/tockloader/default.nix +++ b/pkgs/development/tools/misc/tockloader/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/tock/tockloader"; license = licenses.mit; - description = "Tool for programming Tock onto hardware boards."; + description = "Tool for programming Tock onto hardware boards"; maintainers = with maintainers; [ hexa ]; }; } diff --git a/pkgs/development/tools/mockgen/default.nix b/pkgs/development/tools/mockgen/default.nix index def5e892e2f..104988eb213 100644 --- a/pkgs/development/tools/mockgen/default.nix +++ b/pkgs/development/tools/mockgen/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { subPackages = [ "mockgen" ]; meta = with lib; { - description = "GoMock is a mocking framework for the Go programming language."; + description = "GoMock is a mocking framework for the Go programming language"; homepage = "https://github.com/golang/mock"; license = licenses.asl20; maintainers = with maintainers; [ bouk ]; diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix index 79baecd74f5..c803207f88a 100644 --- a/pkgs/development/tools/operator-sdk/default.nix +++ b/pkgs/development/tools/operator-sdk/default.nix @@ -26,7 +26,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "SDK for building Kubernetes applications. Provides high level APIs, useful abstractions, and project scaffolding."; + description = "SDK for building Kubernetes applications. Provides high level APIs, useful abstractions, and project scaffolding"; homepage = "https://github.com/operator-framework/operator-sdk"; license = licenses.asl20; maintainers = with maintainers; [ arnarg ]; diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/development/tools/parinfer-rust/default.nix index f1627c7ed39..f697e00b56a 100644 --- a/pkgs/development/tools/parinfer-rust/default.nix +++ b/pkgs/development/tools/parinfer-rust/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with stdenv.lib; { - description = "Infer parentheses for Clojure, Lisp, and Scheme."; + description = "Infer parentheses for Clojure, Lisp, and Scheme"; homepage = "https://github.com/eraserhd/parinfer-rust"; license = licenses.isc; maintainers = with maintainers; [ eraserhd ]; diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix index 72516fb7d17..6aa38104bca 100644 --- a/pkgs/development/tools/pax-rs/default.nix +++ b/pkgs/development/tools/pax-rs/default.nix @@ -6,7 +6,7 @@ buildRustPackage rec { version = "0.4.0"; meta = with stdenv.lib; { - description = "The fastest JavaScript bundler in the galaxy."; + description = "The fastest JavaScript bundler in the galaxy"; longDescription = '' The fastest JavaScript bundler in the galaxy. Fully supports ECMAScript module syntax (import/export) in addition to CommonJS require(). ''; diff --git a/pkgs/development/tools/richgo/default.nix b/pkgs/development/tools/richgo/default.nix index e6478086f79..441c0d8bdf1 100644 --- a/pkgs/development/tools/richgo/default.nix +++ b/pkgs/development/tools/richgo/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { subPackages = [ "." ]; meta = with stdenv.lib; { - description = "Enrich `go test` outputs with text decorations."; + description = "Enrich `go test` outputs with text decorations"; homepage = "https://github.com/kyoh86/richgo"; license = licenses.mit; maintainers = with maintainers; [ rvolosatovs ]; diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index cc1bf1c7476..0c476a58e3d 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with stdenv.lib; { - description = "Automatically generates Rust FFI bindings to C (and some C++) libraries."; + description = "Automatically generates Rust FFI bindings to C (and some C++) libraries"; longDescription = '' Bindgen takes a c or c++ header file and turns them into rust ffi declarations. diff --git a/pkgs/development/tools/rust/cargo-embed/default.nix b/pkgs/development/tools/rust/cargo-embed/default.nix index dafcd1ded2f..a9c18b021bf 100644 --- a/pkgs/development/tools/rust/cargo-embed/default.nix +++ b/pkgs/development/tools/rust/cargo-embed/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libusb1 ]; meta = with lib; { - description = "A cargo extension for working with microcontrollers."; + description = "A cargo extension for working with microcontrollers"; homepage = "http://probe.rs/"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ fooker ]; diff --git a/pkgs/development/tools/rust/cargo-flash/default.nix b/pkgs/development/tools/rust/cargo-flash/default.nix index d4844de21a0..e5d23c9258c 100644 --- a/pkgs/development/tools/rust/cargo-flash/default.nix +++ b/pkgs/development/tools/rust/cargo-flash/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libusb1 ]; meta = with lib; { - description = "A cargo extension for working with microcontrollers."; + description = "A cargo extension for working with microcontrollers"; homepage = "http://probe.rs/"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ fooker ]; diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix index d30c3ad6292..1e79a720a52 100644 --- a/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/pkgs/development/tools/rust/cargo-geiger/default.nix @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "Detects usage of unsafe Rust in a Rust crate and its dependencies."; + description = "Detects usage of unsafe Rust in a Rust crate and its dependencies"; homepage = "https://github.com/rust-secure-code/cargo-geiger"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ evanjs ]; diff --git a/pkgs/development/tools/setupcfg2nix/default.nix b/pkgs/development/tools/setupcfg2nix/default.nix index 9762862cf61..4cc1ec320cc 100644 --- a/pkgs/development/tools/setupcfg2nix/default.nix +++ b/pkgs/development/tools/setupcfg2nix/default.nix @@ -10,7 +10,7 @@ buildSetupcfg rec { }; application = true; meta = { - description = "Generate nix expressions from setup.cfg for a python package."; + description = "Generate nix expressions from setup.cfg for a python package"; homepage = "https://github.com/target/setupcfg2nix"; license = lib.licenses.mit; platforms = lib.platforms.all; diff --git a/pkgs/development/tools/systemfd/default.nix b/pkgs/development/tools/systemfd/default.nix index a0037050b65..c25f0491c67 100644 --- a/pkgs/development/tools/systemfd/default.nix +++ b/pkgs/development/tools/systemfd/default.nix @@ -8,7 +8,7 @@ crateOverrides = defaultCrateOverrides // { systemfd = attrs: { meta = { - description = "A convenient helper for passing sockets into another process."; + description = "A convenient helper for passing sockets into another process"; homepage = "https://github.com/mitsuhiko/systemfd"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.adisbladis ]; diff --git a/pkgs/development/tools/toxiproxy/default.nix b/pkgs/development/tools/toxiproxy/default.nix index 3587454b84b..448c14ffaf1 100644 --- a/pkgs/development/tools/toxiproxy/default.nix +++ b/pkgs/development/tools/toxiproxy/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { ''; meta = { - description = "Proxy for for simulating network conditions."; + description = "Proxy for for simulating network conditions"; maintainers = with lib.maintainers; [ avnik ]; license = lib.licenses.mit; }; diff --git a/pkgs/development/tools/tracy/default.nix b/pkgs/development/tools/tracy/default.nix index d0d2cbd79e2..5839a7771d0 100644 --- a/pkgs/development/tools/tracy/default.nix +++ b/pkgs/development/tools/tracy/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A real time, nanosecond resolution, remote telemetry frame profiler for games and other applications."; + description = "A real time, nanosecond resolution, remote telemetry frame profiler for games and other applications"; homepage = "https://github.com/wolfpld/tracy"; platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd3; diff --git a/pkgs/development/tools/tychus/default.nix b/pkgs/development/tools/tychus/default.nix index 5eb6dd09789..edd428480a0 100644 --- a/pkgs/development/tools/tychus/default.nix +++ b/pkgs/development/tools/tychus/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { buildFlags = [ "--tags" "release" ]; meta = { - description = "Command line utility to live-reload your application."; + description = "Command line utility to live-reload your application"; homepage = "https://github.com/devlocker/tychus"; license = stdenv.lib.licenses.mit; }; diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix index 7821c34bb17..5c3b2abe4a4 100644 --- a/pkgs/development/tools/vogl/default.nix +++ b/pkgs/development/tools/vogl/default.nix @@ -47,7 +47,7 @@ mkDerivation { ]; meta = with lib; { - description = "OpenGL capture / playback debugger."; + description = "OpenGL capture / playback debugger"; homepage = "https://github.com/ValveSoftware/vogl"; license = licenses.mit; maintainers = [ maintainers.deepfire ]; diff --git a/pkgs/development/tools/xqilla/default.nix b/pkgs/development/tools/xqilla/default.nix index 44a7254a3d7..7d8029ee1f1 100644 --- a/pkgs/development/tools/xqilla/default.nix +++ b/pkgs/development/tools/xqilla/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-xerces=${xercesc}" ]; meta = with stdenv.lib; { - description = "XQilla is an XQuery and XPath 2 library and command line utility written in C++, implemented on top of the Xerces-C library."; + description = "XQilla is an XQuery and XPath 2 library and command line utility written in C++, implemented on top of the Xerces-C library"; license = licenses.asl20 ; maintainers = with maintainers; [ obadz ]; platforms = platforms.all; diff --git a/pkgs/games/fltrator/default.nix b/pkgs/games/fltrator/default.nix index 7cf16e0783e..e01a3f9fb9c 100644 --- a/pkgs/games/fltrator/default.nix +++ b/pkgs/games/fltrator/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A simple retro style arcade side-scroller game."; + description = "A simple retro style arcade side-scroller game"; longDescription = '' FLTrator is a simple retro style arcade side-scroller game in which you steer a spaceship through a landscape with hostile rockets and other obstacles. It has ten different levels and a level editor to create new levels or modify the existing.''; # from https://libregamewiki.org/FLTrator homepage = "http://fltrator.sourceforge.net/"; diff --git a/pkgs/games/frotz/default.nix b/pkgs/games/frotz/default.nix index 800da177a3d..6ff163105da 100644 --- a/pkgs/games/frotz/default.nix +++ b/pkgs/games/frotz/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://davidgriffith.gitlab.io/frotz/"; changelog = "https://gitlab.com/DavidGriffith/frotz/-/raw/${version}/NEWS"; - description = "A z-machine interpreter for Infocom games and other interactive fiction."; + description = "A z-machine interpreter for Infocom games and other interactive fiction"; platforms = platforms.unix; maintainers = with maintainers; [ nicknovitski ddelabru ]; license = licenses.gpl2; diff --git a/pkgs/games/gtetrinet/default.nix b/pkgs/games/gtetrinet/default.nix index 824e7afd734..f3cc9ab0006 100644 --- a/pkgs/games/gtetrinet/default.nix +++ b/pkgs/games/gtetrinet/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - description = "Client for Tetrinet, a multiplayer online Tetris game."; + description = "Client for Tetrinet, a multiplayer online Tetris game"; longDescription = '' GTetrinet is a client program for Tetrinet, a multiplayer tetris game that is played over the internet. diff --git a/pkgs/games/opendungeons/default.nix b/pkgs/games/opendungeons/default.nix index 467c782211f..64b6c07f4a2 100644 --- a/pkgs/games/opendungeons/default.nix +++ b/pkgs/games/opendungeons/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lpthread"; meta = with stdenv.lib; { - description = "An open source, real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius."; + description = "An open source, real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius"; homepage = "https://opendungeons.github.io"; license = [ licenses.gpl3Plus licenses.zlib licenses.mit licenses.cc-by-sa-30 licenses.cc0 licenses.ofl licenses.cc-by-30 ]; platforms = platforms.linux; diff --git a/pkgs/games/pacvim/default.nix b/pkgs/games/pacvim/default.nix index d7805ad66fb..4692c360378 100644 --- a/pkgs/games/pacvim/default.nix +++ b/pkgs/games/pacvim/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://github.com/jmoon018/PacVim"; - description = "PacVim is a game that teaches you vim commands."; + description = "PacVim is a game that teaches you vim commands"; maintainers = with maintainers; [ infinisil ]; license = licenses.lgpl3; platforms = platforms.unix; diff --git a/pkgs/games/redeclipse/default.nix b/pkgs/games/redeclipse/default.nix index fc6f50ef97e..d99d7ccb1d9 100644 --- a/pkgs/games/redeclipse/default.nix +++ b/pkgs/games/redeclipse/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A first person arena shooter, featuring parkour, impulse boosts, and more."; + description = "A first person arena shooter, featuring parkour, impulse boosts, and more"; longDescription = '' Red Eclipse is a fun-filled new take on the first person arena shooter, featuring parkour, impulse boosts, and more. The development is geared diff --git a/pkgs/games/t4kcommon/default.nix b/pkgs/games/t4kcommon/default.nix index f2e226cb570..997ce72db33 100644 --- a/pkgs/games/t4kcommon/default.nix +++ b/pkgs/games/t4kcommon/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf libpng librsvg libxml2 ]; meta = with stdenv.lib; { - description = "A library of code shared between tuxmath and tuxtype."; + description = "A library of code shared between tuxmath and tuxtype"; homepage = "https://github.com/tux4kids/t4kcommon"; license = licenses.gpl3Plus; maintainers = [ maintainers.aanderse ]; diff --git a/pkgs/games/xbill/default.nix b/pkgs/games/xbill/default.nix index 8a6d4cf14cd..f021d9ac7a7 100644 --- a/pkgs/games/xbill/default.nix +++ b/pkgs/games/xbill/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv; { - description = "Protect a computer network from getting infected."; + description = "Protect a computer network from getting infected"; homepage = "http://www.xbill.org/"; license = lib.licenses.gpl1; maintainers = with lib.maintainers; [ aw ]; diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix index b04ef89d215..ce11f4a0551 100644 --- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = "Canon InkJet printer drivers for the MG7500, MG6700, MG6600, MG5600, MG2900, MB2000, MB2300, iB4000, MB5000, MB5300, iP110, E450, MX490, E480, MG7700, MG6900, MG6800, MG5700, MG3600, and G3000 series."; + description = "Canon InkJet printer drivers for the MG7500, MG6700, MG6600, MG5600, MG2900, MB2000, MB2300, iB4000, MB5000, MB5300, iP110, E450, MX490, E480, MG7700, MG6900, MG6800, MG5700, MG3600, and G3000 series"; homepage = "http://support-th.canon-asia.com/contents/TH/EN/0100712901.html"; license = licenses.unfree; platforms = platforms.linux; diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix index 9b328c20b71..f6504b598cb 100644 --- a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix @@ -141,7 +141,7 @@ in stdenv.mkDerivation { dontPatchELF = true; meta = with lib; { - description = "Canon InkJet printer drivers for the MG2400 MG2500 MG3500 MG5500 MG6400 MG6500 MG7100 and P200 series."; + description = "Canon InkJet printer drivers for the MG2400 MG2500 MG3500 MG5500 MG6400 MG6500 MG7100 and P200 series"; homepage = "https://www.canon-europe.com/support/consumer_products/products/fax__multifunctionals/inkjet/pixma_mg_series/pixma_mg5550.aspx?type=drivers&driverdetailid=tcm:13-1094072"; license = licenses.unfree; platforms = platforms.linux; diff --git a/pkgs/misc/documentation-highlighter/default.nix b/pkgs/misc/documentation-highlighter/default.nix index 72f1da6b0de..16b47d01f24 100644 --- a/pkgs/misc/documentation-highlighter/default.nix +++ b/pkgs/misc/documentation-highlighter/default.nix @@ -1,7 +1,7 @@ { stdenv, runCommand }: runCommand "documentation-highlighter" { meta = { - description = "Highlight.js sources for the Nix Ecosystem's documentation."; + description = "Highlight.js sources for the Nix Ecosystem's documentation"; homepage = "https://highlightjs.org"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index 6016cc779f1..eb88476432b 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -1,20 +1,27 @@ -{stdenv, fetchurl, fetchpatch, makeWrapper, symlinkJoin, -pkgconfig, libtool, -gtk2, -libxml2, -libxslt, -libusb-compat-0_1, -sane-backends, -rpm, cpio, -getopt, -patchelf, autoPatchelfHook, gcc +{ stdenv +, fetchurl +, fetchpatch +, makeWrapper +, symlinkJoin +, pkgconfig +, libtool +, gtk2 +, libxml2 +, libxslt +, libusb-compat-0_1 +, sane-backends +, rpm +, cpio +, getopt +, patchelf +, autoPatchelfHook +, gcc }: - let common_meta = { - homepage = "http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"; - license = with stdenv.lib.licenses; epson; - platforms = with stdenv.lib.platforms; linux; - }; + homepage = "http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"; + license = with stdenv.lib.licenses; epson; + platforms = with stdenv.lib.platforms; linux; +}; in ############################ # @@ -23,7 +30,6 @@ in ############################ # adding a plugin for another printer shouldn't be too difficult, but you need the firmware to test... - let plugins = { v330 = stdenv.mkDerivation rec { name = "iscan-v330-bundle"; @@ -33,7 +39,7 @@ let plugins = { # To find new versions, visit # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for # some printer like for instance "WF-7210" to get to the most recent - # version. + # version. # NOTE: Don't forget to update the webarchive link too! urls = [ "https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-${version}.x64.rpm.tar.gz" @@ -49,17 +55,17 @@ let plugins = { mkdir $out{,/share,/lib} cp -r ./usr/share/{iscan-data,esci}/ $out/share/ cp -r ./usr/lib64/esci $out/lib - ''; + ''; passthru = { registrationCommand = '' $registry --add interpreter usb 0x04b8 0x0142 "$plugin/lib/esci/libesci-interpreter-perfection-v330 $plugin/share/esci/esfwad.bin" - ''; + ''; hw = "Perfection V330 Photo"; - }; - meta = common_meta // { description = "Plugin to support "+passthru.hw+" scanner in sane."; }; + }; + meta = common_meta // { description = "Plugin to support " + passthru.hw + " scanner in sane"; }; }; - x770 = stdenv.mkDerivation rec { + x770 = stdenv.mkDerivation rec { pname = "iscan-gt-x770-bundle"; version = "2.30.4"; @@ -79,20 +85,20 @@ let plugins = { cp -r usr/lib64 $out/lib mv $out/share/iscan $out/share/esci mv $out/lib/iscan $out/lib/esci - ''; + ''; passthru = { registrationCommand = '' $registry --add interpreter usb 0x04b8 0x0130 "$plugin/lib/esci/libesint7C $plugin/share/esci/esfw7C.bin" - ''; + ''; hw = "Perfection V500 Photo"; - }; - meta = common_meta // { description = "iscan esci x770 plugin for "+passthru.hw; }; }; + meta = common_meta // { description = "iscan esci x770 plugin for " + passthru.hw; }; + }; f720 = stdenv.mkDerivation rec { pname = "iscan-gt-f720-bundle"; version = "2.30.4"; - nativeBuildInputs= [ autoPatchelfHook ]; + nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ gcc.cc.lib ]; src = fetchurl { urls = [ @@ -107,16 +113,16 @@ let plugins = { mkdir $out cp -r usr/share $out cp -r usr/lib64 $out/lib - ''; + ''; passthru = { registrationCommand = '' $registry --add interpreter usb 0x04b8 0x0131 "$plugin/lib/esci/libesci-interpreter-gt-f720 $plugin/share/esci/esfw8b.bin" - ''; + ''; hw = "GT-F720, GT-S620, Perfection V30, Perfection V300 Photo"; - }; + }; - meta = common_meta // { description = "iscan esci f720 plugin for "+passthru.hw; }; + meta = common_meta // { description = "iscan esci f720 plugin for " + passthru.hw; }; }; s80 = stdenv.mkDerivation rec { pname = "iscan-gt-s80-bundle"; @@ -139,7 +145,7 @@ let plugins = { cp -r usr/share $out cp -r usr/lib64 $out/lib mkdir $out/share/esci - ''; + ''; passthru = { registrationCommand = '' @@ -147,11 +153,11 @@ let plugins = { $registry --add interpreter usb 0x04b8 0x0137 "$plugin/lib/esci/libesci-interpreter-gt-s50.so" $registry --add interpreter usb 0x04b8 0x0143 "$plugin/lib/esci/libesci-interpreter-gt-s50.so" $registry --add interpreter usb 0x04b8 0x0144 "$plugin/lib/esci/libesci-interpreter-gt-s80.so" - ''; + ''; hw = "ES-D200, ED-D350, ES-D400, GT-S50, GT-S55, GT-S80, GT-S85"; - }; + }; - meta = common_meta // { description = "iscan esci s80 plugin for "+passthru.hw; }; + meta = common_meta // { description = "iscan esci s80 plugin for " + passthru.hw; }; }; s650 = stdenv.mkDerivation rec { name = "iscan-gt-s650-bundle"; @@ -175,16 +181,16 @@ let plugins = { cp -r usr/lib64 $out/lib mv $out/share/iscan $out/share/esci mv $out/lib/iscan $out/lib/esci - ''; + ''; passthru = { registrationCommand = '' $registry --add interpreter usb 0x04b8 0x013c "$plugin/lib/esci/libiscan-plugin-gt-s650 $plugin/share/esci/esfw010c.bin" $registry --add interpreter usb 0x04b8 0x013d "$plugin/lib/esci/libiscan-plugin-gt-s650 $plugin/share/esci/esfw010c.bin" - ''; + ''; hw = "GT-S650, Perfection V19, Perfection V39"; }; - meta = common_meta // { description = "iscan GT-S650 for "+passthru.hw; }; + meta = common_meta // { description = "iscan GT-S650 for " + passthru.hw; }; }; network = stdenv.mkDerivation rec { pname = "iscan-nt-bundle"; @@ -209,7 +215,7 @@ let plugins = { cp -r usr/share $out cp -r usr/lib64 $out/lib mkdir $out/share/esci - ''; + ''; passthru = { registrationCommand = ""; hw = "network"; @@ -219,9 +225,6 @@ let plugins = { }; }; in - - - let fwdir = symlinkJoin { name = "esci-firmware-dir"; paths = stdenv.lib.mapAttrsToList (name: value: value + /share/esci) plugins; @@ -278,14 +281,14 @@ stdenv.mkDerivation rec { }) ./firmware_location.patch ./sscanf.patch - ]; + ]; patchFlags = [ "-p0" ]; - configureFlags = [ "--enable-dependency-reduction" "--disable-frontend"]; + configureFlags = [ "--enable-dependency-reduction" "--disable-frontend" ]; postConfigure = '' echo '#define NIX_ESCI_PREFIX "'${fwdir}'"' >> config.h - ''; + ''; postInstall = '' mkdir -p $out/etc/sane.d @@ -294,18 +297,20 @@ stdenv.mkDerivation rec { ln -s ${iscan-data}/share/iscan-data $out/share/iscan-data mkdir -p $out/lib/iscan ln -s ${plugins.network}/lib/iscan/network $out/lib/iscan/network - ''; + ''; postFixup = '' # iscan-registry is a shell script requiring getopt wrapProgram $out/bin/iscan-registry --prefix PATH : ${getopt}/bin registry=$out/bin/iscan-registry; - '' + - stdenv.lib.concatStrings (stdenv.lib.mapAttrsToList (name: value: '' - plugin=${value}; - ${value.passthru.registrationCommand} - '') plugins); + '' + + stdenv.lib.concatStrings (stdenv.lib.mapAttrsToList + (name: value: '' + plugin=${value}; + ${value.passthru.registrationCommand} + '') + plugins); meta = common_meta // { - description = "sane-epkowa backend for some epson scanners."; + description = "sane-epkowa backend for some epson scanners"; longDescription = '' Includes gui-less iscan (aka. Image Scan! for Linux). Supported hardware: at least : diff --git a/pkgs/misc/emulators/np2kai/default.nix b/pkgs/misc/emulators/np2kai/default.nix index 245bad1d535..0ed47af8f5b 100644 --- a/pkgs/misc/emulators/np2kai/default.nix +++ b/pkgs/misc/emulators/np2kai/default.nix @@ -187,7 +187,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A PC-9801 series emulator."; + description = "A PC-9801 series emulator"; homepage = "https://github.com/AZO234/NP2kai"; license = licenses.mit; maintainers = with maintainers; [ OPNA2608 ]; diff --git a/pkgs/misc/hdt/default.nix b/pkgs/misc/hdt/default.nix index 8a4c7c3e6f5..a8cf5c5d4d3 100644 --- a/pkgs/misc/hdt/default.nix +++ b/pkgs/misc/hdt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://www.rdfhdt.org/"; - description = "Header Dictionary Triples (HDT) is a compression format for RDF data that can also be queried for Triple Patterns."; + description = "Header Dictionary Triples (HDT) is a compression format for RDF data that can also be queried for Triple Patterns"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = [ maintainers.koslambrou ]; diff --git a/pkgs/misc/riscv-pk/default.nix b/pkgs/misc/riscv-pk/default.nix index 3e1f63e5e30..6ef50a33a5b 100644 --- a/pkgs/misc/riscv-pk/default.nix +++ b/pkgs/misc/riscv-pk/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation { ''; meta = { - description = "RISC-V Proxy Kernel and Bootloader."; + description = "RISC-V Proxy Kernel and Bootloader"; homepage = "https://github.com/riscv/riscv-pk"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.riscv; diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix index 36f89819570..735a2cd3b76 100644 --- a/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Betterlockscreen is a simple minimal lock screen which allows you to cache images with different filters and lockscreen with blazing speed."; + description = "Betterlockscreen is a simple minimal lock screen which allows you to cache images with different filters and lockscreen with blazing speed"; homepage = "https://github.com/pavanjadhaw/betterlockscreen"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/pkgs/misc/screensavers/i3lock-pixeled/default.nix index 5ffe5f72265..39497917755 100644 --- a/pkgs/misc/screensavers/i3lock-pixeled/default.nix +++ b/pkgs/misc/screensavers/i3lock-pixeled/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Simple i3lock helper which pixels a screenshot by scaling it down and up to get a pixeled version of the screen when the lock is active."; + description = "Simple i3lock helper which pixels a screenshot by scaling it down and up to get a pixeled version of the screen when the lock is active"; homepage = "https://gitlab.com/Ma27/i3lock-pixeled"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix index cefcdbc75a3..d46f772e495 100644 --- a/pkgs/misc/screensavers/xautolock/default.nix +++ b/pkgs/misc/screensavers/xautolock/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install.man" ]; meta = with stdenv.lib; { - description = "Launch a given program when your X session has been idle for a given time."; + description = "Launch a given program when your X session has been idle for a given time"; homepage = "http://www.ibiblio.org/pub/linux/X11/screensavers"; maintainers = with maintainers; [ peti ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/darwin/osxsnarf/default.nix b/pkgs/os-specific/darwin/osxsnarf/default.nix index d9a0de6c7f1..e31271ed2b9 100644 --- a/pkgs/os-specific/darwin/osxsnarf/default.nix +++ b/pkgs/os-specific/darwin/osxsnarf/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=${placeholder "out"}" ]; meta = with lib; { - description = "A Plan 9-inspired way to share your OS X clipboard."; + description = "A Plan 9-inspired way to share your OS X clipboard"; homepage = "https://github.com/eraserhd/osxsnarf"; license = licenses.unlicense; platforms = platforms.darwin; diff --git a/pkgs/os-specific/linux/cpuset/default.nix b/pkgs/os-specific/linux/cpuset/default.nix index 0a9b38f2888..57cffe5f9e0 100644 --- a/pkgs/os-specific/linux/cpuset/default.nix +++ b/pkgs/os-specific/linux/cpuset/default.nix @@ -19,7 +19,7 @@ python2Packages.buildPythonApplication rec { }; meta = with stdenv.lib; { - description = "Cpuset is a Python application that forms a wrapper around the standard Linux filesystem calls to make using the cpusets facilities in the Linux kernel easier."; + description = "Cpuset is a Python application that forms a wrapper around the standard Linux filesystem calls to make using the cpusets facilities in the Linux kernel easier"; homepage = "https://github.com/wykurz/cpuset"; license = licenses.gpl2; maintainers = with maintainers; [ wykurz ]; diff --git a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix index 6da1df98b25..f19af3d10fc 100644 --- a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { ''; meta = { - description = "Tools for managing firmware updates for system76 devices."; + description = "Tools for managing firmware updates for system76 devices"; homepage = "https://github.com/pop-os/system76-firmware"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.shlevy ]; diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index bba3549daf6..e33a40e6a85 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://github.com/intel/compute-runtime"; - description = "Intel Graphics Compute Runtime for OpenCL. Replaces Beignet for Gen8 (Broadwell) and beyond."; + description = "Intel Graphics Compute Runtime for OpenCL. Replaces Beignet for Gen8 (Broadwell) and beyond"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ gloaming ]; diff --git a/pkgs/os-specific/linux/libevdevc/default.nix b/pkgs/os-specific/linux/libevdevc/default.nix index e3dfbd3d6c2..372f110f347 100644 --- a/pkgs/os-specific/linux/libevdevc/default.nix +++ b/pkgs/os-specific/linux/libevdevc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" "LIBDIR=/lib" ]; meta = with stdenv.lib; { - description = "ChromiumOS libevdev. Renamed to avoid conflicts with the standard libevdev found in Linux distros."; + description = "ChromiumOS libevdev. Renamed to avoid conflicts with the standard libevdev found in Linux distros"; license = licenses.bsd3; platforms = platforms.linux; homepage = "https://chromium.googlesource.com/chromiumos/platform/libevdev/"; diff --git a/pkgs/os-specific/linux/libgestures/default.nix b/pkgs/os-specific/linux/libgestures/default.nix index 4c51525727a..46d25df31b9 100644 --- a/pkgs/os-specific/linux/libgestures/default.nix +++ b/pkgs/os-specific/linux/libgestures/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" "LIBDIR=/lib" ]; meta = with stdenv.lib; { - description = "ChromiumOS libgestures modified to compile for Linux."; + description = "ChromiumOS libgestures modified to compile for Linux"; license = licenses.bsd3; platforms = platforms.linux; homepage = "https://chromium.googlesource.com/chromiumos/platform/gestures"; diff --git a/pkgs/os-specific/linux/lksctp-tools/default.nix b/pkgs/os-specific/linux/lksctp-tools/default.nix index bef74cd33ba..6ddf4db562b 100644 --- a/pkgs/os-specific/linux/lksctp-tools/default.nix +++ b/pkgs/os-specific/linux/lksctp-tools/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = "Linux Kernel Stream Control Transmission Protocol Tools."; + description = "Linux Kernel Stream Control Transmission Protocol Tools"; homepage = "http://lksctp.sourceforge.net/"; license = with licenses; [ gpl2 lgpl21 ]; # library is lgpl21 platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix index ad751b9cfe0..0ece2f83600 100644 --- a/pkgs/os-specific/linux/usbguard/default.nix +++ b/pkgs/os-specific/linux/usbguard/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "The USBGuard software framework helps to protect your computer against BadUSB."; + description = "The USBGuard software framework helps to protect your computer against BadUSB"; homepage = "https://usbguard.github.io/"; license = licenses.gpl2; maintainers = [ maintainers.tnias ]; diff --git a/pkgs/os-specific/linux/xf86-input-cmt/default.nix b/pkgs/os-specific/linux/xf86-input-cmt/default.nix index 9f9b278d6f7..93fd7dd5b0e 100644 --- a/pkgs/os-specific/linux/xf86-input-cmt/default.nix +++ b/pkgs/os-specific/linux/xf86-input-cmt/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "Chromebook touchpad driver."; + description = "Chromebook touchpad driver"; license = licenses.bsd3; platforms = platforms.linux; homepage = "https://www.github.com/hugegreenbug/xf86-input-cmt"; diff --git a/pkgs/os-specific/solo5/default.nix b/pkgs/os-specific/solo5/default.nix index 689bc2f3857..283cceb1240 100644 --- a/pkgs/os-specific/solo5/default.nix +++ b/pkgs/os-specific/solo5/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation { null; meta = with lib; { - description = "Sandboxed execution environment."; + description = "Sandboxed execution environment"; homepage = "https://github.com/solo5/solo5"; license = licenses.isc; maintainers = [ maintainers.ehmry ]; diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix index 91da7e179b4..c62fc072ecb 100644 --- a/pkgs/servers/code-server/default.nix +++ b/pkgs/servers/code-server/default.nix @@ -174,7 +174,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = "Run VS Code on a remote server."; + description = "Run VS Code on a remote server"; longDescription = '' code-server is VS Code running on a remote server, accessible through the browser. diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix index c36ca2f8f50..6be80c491fd 100644 --- a/pkgs/servers/dante/default.nix +++ b/pkgs/servers/dante/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { dontAddDisableDepTrack = stdenv.isDarwin; meta = with stdenv.lib; { - description = "A circuit-level SOCKS client/server that can be used to provide convenient and secure network connectivity."; + description = "A circuit-level SOCKS client/server that can be used to provide convenient and secure network connectivity"; homepage = "https://www.inet.no/dante/"; maintainers = [ maintainers.arobyn ]; license = licenses.bsdOriginal; diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index f3cae597ef9..cc6363e75d1 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A web server based on Nginx and has many advanced features, originated by Taobao."; + description = "A web server based on Nginx and has many advanced features, originated by Taobao"; homepage = "https://tengine.taobao.org"; license = licenses.bsd2; platforms = platforms.all; diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 27f45fe6e47..cbe17cdb806 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -84,7 +84,7 @@ in stdenv.mkDerivation rec { passthru.tests.unit-php = nixosTests.unit-php; meta = { - description = "Dynamic web and application server, designed to run applications in multiple languages."; + description = "Dynamic web and application server, designed to run applications in multiple languages"; homepage = "https://unit.nginx.org/"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 67975efb4a1..b8c9626a7c8 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "API Support for your favorite torrent trackers."; + description = "API Support for your favorite torrent trackers"; homepage = "https://github.com/Jackett/Jackett/"; license = licenses.gpl2; maintainers = with maintainers; [ edwtjo nyanloutre purcell ]; diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index 8f1c08bebd8..8edac875a3a 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -77,7 +77,7 @@ _EOF ''; meta = { - description = "Official monitoring plugins for Nagios/Icinga/Sensu and others."; + description = "Official monitoring plugins for Nagios/Icinga/Sensu and others"; homepage = "https://www.monitoring-plugins.org"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix index 8464d4f1b2f..e7a6fa6e400 100644 --- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix +++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix @@ -55,7 +55,7 @@ in { pname = "check_mssql_health"; version = "2.6.4.15"; sha256 = "12z0b3c2p18viy7s93r6bbl8fvgsqh80136d07118qhxshp1pwxg"; - description = "Check plugin for Microsoft SQL Server."; + description = "Check plugin for Microsoft SQL Server"; buildInputs = [ perlPackages.DBDsybase ]; }; @@ -63,7 +63,7 @@ in { pname = "check_nwc_health"; version = "7.10.0.6"; sha256 = "092rhaqnk3403z0y60x38vgh65gcia3wrd6gp8mr7wszja38kxv2"; - description = "Check plugin for network equipment."; + description = "Check plugin for network equipment"; buildInputs = [ perlPackages.NetSNMP ]; }; @@ -71,7 +71,7 @@ in { pname = "check_ups_health"; version = "2.8.3.3"; sha256 = "0qc2aglppwr9ms4p53kh9nr48625sqrbn46xs0k9rx5sv8hil9hm"; - description = "Check plugin for UPSs."; + description = "Check plugin for UPSs"; buildInputs = [ perlPackages.NetSNMP ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix index 47a91d7e3a8..f1a7d0c38e3 100644 --- a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix @@ -19,7 +19,7 @@ buildGoModule rec { meta = with stdenv.lib; { homepage = "https://github.com/mdlayher/keylight_exporter"; - description = "Prometheus exporter for Elgato Key Light devices."; + description = "Prometheus exporter for Elgato Key Light devices"; license = licenses.mit; maintainers = with maintainers; [ mdlayher ]; }; diff --git a/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix b/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix index 4c49c94f286..34b927e0f7b 100644 --- a/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix @@ -19,7 +19,7 @@ buildGoModule rec { meta = with stdenv.lib; { homepage = "https://github.com/mdlayher/modemmanager_exporter"; - description = "Prometheus exporter for ModemManager and its devices."; + description = "Prometheus exporter for ModemManager and its devices"; license = licenses.mit; maintainers = with maintainers; [ mdlayher ]; }; diff --git a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix index d628cf32c57..b3eb3a5cd84 100644 --- a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix @@ -20,7 +20,7 @@ buildGoPackage rec { passthru.tests = { inherit (nixosTests.prometheus-exporters) nextcloud; }; meta = with lib; { - description = "Prometheus exporter for Nextcloud servers."; + description = "Prometheus exporter for Nextcloud servers"; homepage = "https://github.com/xperimental/nextcloud-exporter"; license = licenses.mit; maintainers = with maintainers; [ willibutz ]; diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index 8f927f32e2d..0f303f669af 100644 --- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { passthru.tests = { inherit (nixosTests.prometheus-exporters) wireguard; }; meta = with lib; { - description = "A Prometheus exporter for WireGuard, written in Rust."; + description = "A Prometheus exporter for WireGuard, written in Rust"; homepage = "https://github.com/MindFlavor/prometheus_wireguard_exporter"; license = licenses.mit; maintainers = with maintainers; [ ma27 globin ]; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index b0e9ef356a6..a12b9e50adb 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -33,7 +33,7 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests) telegraf; }; meta = with lib; { - description = "The plugin-driven server agent for collecting & reporting metrics."; + description = "The plugin-driven server agent for collecting & reporting metrics"; license = licenses.mit; homepage = "https://www.influxdata.com/time-series-platform/telegraf/"; maintainers = with maintainers; [ mic92 roblabla foxit64 ]; diff --git a/pkgs/servers/openbgpd/default.nix b/pkgs/servers/openbgpd/default.nix index 2e0c787d0b2..d753cb47a68 100644 --- a/pkgs/servers/openbgpd/default.nix +++ b/pkgs/servers/openbgpd/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "OpenBGPD is a FREE implementation of the Border Gateway Protocol, Version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol."; + description = "OpenBGPD is a FREE implementation of the Border Gateway Protocol, Version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol"; license = licenses.isc; homepage = "http://www.openbgpd.org/"; maintainers = with maintainers; [ kloenk ]; diff --git a/pkgs/servers/pinnwand/default.nix b/pkgs/servers/pinnwand/default.nix index a2f417d88fa..16fa6a7196a 100644 --- a/pkgs/servers/pinnwand/default.nix +++ b/pkgs/servers/pinnwand/default.nix @@ -48,7 +48,7 @@ in with python.pkgs; buildPythonApplication rec { meta = with lib; { homepage = "https://supakeen.com/project/pinnwand/"; license = licenses.mit; - description = "A Python pastebin that tries to keep it simple."; + description = "A Python pastebin that tries to keep it simple"; maintainers = with maintainers; [ hexa ]; }; } diff --git a/pkgs/servers/pinnwand/steck.nix b/pkgs/servers/pinnwand/steck.nix index 09b20efc36e..90f7d6b49f5 100644 --- a/pkgs/servers/pinnwand/steck.nix +++ b/pkgs/servers/pinnwand/steck.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/supakeen/steck"; license = licenses.mit; - description = "Client for pinnwand pastebin."; + description = "Client for pinnwand pastebin"; maintainers = with maintainers; [ hexa ]; }; } diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index 9c08f392042..06541b89500 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -59,7 +59,7 @@ ''; meta = with lib; { - description = "The music player for music lovers."; + description = "The music player for music lovers"; homepage = "https://roonlabs.com"; license = licenses.unfree; maintainers = with maintainers; [ lovesegfault steell ]; diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 9e4eadf72da..99d7a0df349 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { doCheck = false; meta = with lib; { - description = "Relational database with version control and CLI a-la Git."; + description = "Relational database with version control and CLI a-la Git"; homepage = "https://github.com/liquidata-inc/dolt"; license = licenses.asl20; maintainers = with maintainers; [ danbst ]; diff --git a/pkgs/servers/tang/default.nix b/pkgs/servers/tang/default.nix index 5aa261bd8a4..caeb969f23b 100644 --- a/pkgs/servers/tang/default.nix +++ b/pkgs/servers/tang/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; meta = { - description = "Server for binding data to network presence."; + description = "Server for binding data to network presence"; homepage = "https://github.com/latchset/tang"; maintainers = with lib.maintainers; [ fpletz ]; license = lib.licenses.gpl3Plus; diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index ff2f993ecc1..1fbf94beb18 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A Python based monitoring and tracking tool for Plex Media Server."; + description = "A Python based monitoring and tracking tool for Plex Media Server"; homepage = "https://tautulli.com/"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/servers/web-apps/jirafeau/default.nix b/pkgs/servers/web-apps/jirafeau/default.nix index 3dc9fb17190..e0b119da6d8 100644 --- a/pkgs/servers/web-apps/jirafeau/default.nix +++ b/pkgs/servers/web-apps/jirafeau/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Jirafeau is a web site permitting to upload a file in a simple way and give an unique link to it."; + description = "Jirafeau is a web site permitting to upload a file in a simple way and give an unique link to it"; license = licenses.agpl3; homepage = "https://gitlab.com/mojo42/Jirafeau"; platforms = platforms.all; diff --git a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix index 8fea1f99256..f9838857061 100644 --- a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix +++ b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://github.com/mattrude/pgpkeyserver-lite"; - description = "A lightweight static front-end for a sks keyserver."; + description = "A lightweight static front-end for a sks keyserver"; license = licenses.gpl3; maintainers = with maintainers; [ calbrecht globin ]; }; diff --git a/pkgs/shells/zsh/antigen/default.nix b/pkgs/shells/zsh/antigen/default.nix index b4812428adf..5603e5edf59 100644 --- a/pkgs/shells/zsh/antigen/default.nix +++ b/pkgs/shells/zsh/antigen/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "The plugin manager for zsh."; + description = "The plugin manager for zsh"; homepage = "http://antigen.sharats.me"; license = stdenv.lib.licenses.mit; }; diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix index 9f7a7f18704..dffecf617b1 100644 --- a/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/pkgs/shells/zsh/zsh-prezto/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { cp ./* $out/ -R ''; meta = with stdenv.lib; { - description = "Prezto is the configuration framework for Zsh; it enriches the command line interface environment with sane defaults, aliases, functions, auto completion, and prompt themes."; + description = "Prezto is the configuration framework for Zsh; it enriches the command line interface environment with sane defaults, aliases, functions, auto completion, and prompt themes"; homepage = "https://github.com/sorin-ionescu/prezto"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/tools/admin/daemontools/default.nix b/pkgs/tools/admin/daemontools/default.nix index 660563d9757..2bfdb9b69de 100644 --- a/pkgs/tools/admin/daemontools/default.nix +++ b/pkgs/tools/admin/daemontools/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.publicDomain; homepage = "https://cr.yp.to/daemontools.html"; - description = "A collection of tools for managing UNIX services."; + description = "A collection of tools for managing UNIX services"; maintainers = with stdenv.lib.maintainers; [ kevincox ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/admin/lexicon/default.nix b/pkgs/tools/admin/lexicon/default.nix index 4f02615b4a2..4e87a68866c 100644 --- a/pkgs/tools/admin/lexicon/default.nix +++ b/pkgs/tools/admin/lexicon/default.nix @@ -75,7 +75,7 @@ buildPythonApplication rec { ''; meta = with lib; { - description = "Manipulate DNS records on various DNS providers in a standardized way."; + description = "Manipulate DNS records on various DNS providers in a standardized way"; homepage = "https://github.com/AnalogJ/lexicon"; maintainers = with maintainers; [ flyfloh ]; license = licenses.mit; diff --git a/pkgs/tools/audio/picotts/default.nix b/pkgs/tools/audio/picotts/default.nix index 023bf457774..5b7ab80d860 100644 --- a/pkgs/tools/audio/picotts/default.nix +++ b/pkgs/tools/audio/picotts/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { sourceRoot = "source/pico"; preConfigure = "./autogen.sh"; meta = { - description = "Text to speech voice sinthesizer from SVox."; + description = "Text to speech voice sinthesizer from SVox"; homepage = "https://github.com/naggety/picotts"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.canndrew ]; diff --git a/pkgs/tools/compression/pbzx/default.nix b/pkgs/tools/compression/pbzx/default.nix index 13e5882788d..2804ed7a0b5 100644 --- a/pkgs/tools/compression/pbzx/default.nix +++ b/pkgs/tools/compression/pbzx/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp pbzx $out/bin ''; meta = with lib; { - description = "Stream parser of Apple's pbzx compression format."; + description = "Stream parser of Apple's pbzx compression format"; platforms = platforms.unix; license = licenses.gpl3; maintainers = [ maintainers.matthewbauer ]; diff --git a/pkgs/tools/filesystems/convoy/default.nix b/pkgs/tools/filesystems/convoy/default.nix index f12187be810..3372ec83530 100644 --- a/pkgs/tools/filesystems/convoy/default.nix +++ b/pkgs/tools/filesystems/convoy/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/rancher/convoy"; - description = "A Docker volume plugin, managing persistent container volumes."; + description = "A Docker volume plugin, managing persistent container volumes"; license = licenses.asl20; maintainers = with maintainers; [ offline ]; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/keyfuzz/default.nix b/pkgs/tools/inputmethods/keyfuzz/default.nix index 489a24c3a58..0b2883f70a4 100644 --- a/pkgs/tools/inputmethods/keyfuzz/default.nix +++ b/pkgs/tools/inputmethods/keyfuzz/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "0.2"; meta = with stdenv.lib; { - description = "Manipulate the scancode/keycode translation tables of keyboard drivers."; + description = "Manipulate the scancode/keycode translation tables of keyboard drivers"; homepage = "http://0pointer.de/lennart/projects/keyfuzz/"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/tools/misc/adafruit-ampy/default.nix b/pkgs/tools/misc/adafruit-ampy/default.nix index be47d42dc89..31ef3e2487b 100644 --- a/pkgs/tools/misc/adafruit-ampy/default.nix +++ b/pkgs/tools/misc/adafruit-ampy/default.nix @@ -20,7 +20,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { homepage = "https://github.com/pycampers/ampy"; license = licenses.mit; - description = "Utility to interact with a MicroPython board over a serial connection."; + description = "Utility to interact with a MicroPython board over a serial connection"; maintainers = with maintainers; [ etu ]; }; } diff --git a/pkgs/tools/misc/asciinema-scenario/default.nix b/pkgs/tools/misc/asciinema-scenario/default.nix index 29538f94017..cff96a4ec86 100644 --- a/pkgs/tools/misc/asciinema-scenario/default.nix +++ b/pkgs/tools/misc/asciinema-scenario/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "109ij5h31bhn44l0wywgpnnlfjgyairxr5l19s6bz47sbka0xyxk"; meta = with stdenv.lib; { - description = "Create asciinema videos from a text file."; + description = "Create asciinema videos from a text file"; homepage = "https://github.com/garbas/asciinema-scenario/"; maintainers = with maintainers; [ garbas ]; license = with licenses; [ mit ]; diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 9afdd93ad0a..5ed477c93a2 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "Terminal graphics for the 21st century."; + description = "Terminal graphics for the 21st century"; homepage = "https://hpjansson.org/chafa/"; license = licenses.lgpl3Plus; platforms = platforms.all; diff --git a/pkgs/tools/misc/dijo/default.nix b/pkgs/tools/misc/dijo/default.nix index da504ad3ba3..2a3fa242699 100644 --- a/pkgs/tools/misc/dijo/default.nix +++ b/pkgs/tools/misc/dijo/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage { cargoSha256 = "0pm048xf8hkva8q8fjmhrdnk7h2im28ix7xy784xwkkdnilm4j7f"; meta = with lib; { - description = "Scriptable, curses-based, digital habit tracker."; + description = "Scriptable, curses-based, digital habit tracker"; homepage = "https://github.com/NerdyPepper/dijo"; license = licenses.mit; maintainers = with maintainers; [ infinisil ]; diff --git a/pkgs/tools/misc/dmg2img/default.nix b/pkgs/tools/misc/dmg2img/default.nix index 267983dd432..b132079a28e 100644 --- a/pkgs/tools/misc/dmg2img/default.nix +++ b/pkgs/tools/misc/dmg2img/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; - description = "An Apple's compressed dmg to standard (hfsplus) image disk file convert tool."; + description = "An Apple's compressed dmg to standard (hfsplus) image disk file convert tool"; license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/tools/misc/go.rice/default.nix b/pkgs/tools/misc/go.rice/default.nix index 340b2d41c66..33e6975bb02 100644 --- a/pkgs/tools/misc/go.rice/default.nix +++ b/pkgs/tools/misc/go.rice/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { meta = with stdenv.lib; { homepage = "https://github.com/GeertJohan/go.rice"; - description = "A Go package that makes working with resources such as html, js, css, images, templates very easy."; + description = "A Go package that makes working with resources such as html, js, css, images, templates very easy"; license = licenses.bsd2; maintainers = with maintainers; [ blaggacao ]; }; diff --git a/pkgs/tools/misc/gotify-cli/default.nix b/pkgs/tools/misc/gotify-cli/default.nix index cd60f0e98fa..36a7055f875 100644 --- a/pkgs/tools/misc/gotify-cli/default.nix +++ b/pkgs/tools/misc/gotify-cli/default.nix @@ -26,7 +26,7 @@ buildGoModule rec { meta = with lib; { license = licenses.mit; homepage = "https://github.com/gotify/cli"; - description = "A command line interface for pushing messages to gotify/server."; + description = "A command line interface for pushing messages to gotify/server"; maintainers = with maintainers; [ ma27 ]; }; } diff --git a/pkgs/tools/misc/hacksaw/default.nix b/pkgs/tools/misc/hacksaw/default.nix index bf0daa38ab3..a0e884e82d9 100644 --- a/pkgs/tools/misc/hacksaw/default.nix +++ b/pkgs/tools/misc/hacksaw/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "01draql3x71h7xl2xcc69dv7vpi3smnajhrvaihs5vij81pyfrzk"; meta = with lib; { - description = "Lightweight selection tool for usage in screenshot scripts etc."; + description = "Lightweight selection tool for usage in screenshot scripts etc"; homepage = "https://github.com/neXromancers/hacksaw"; license = with licenses; [ mpl20 ]; maintainers = with maintainers; [ TethysSvensson ]; diff --git a/pkgs/tools/misc/ical2org/default.nix b/pkgs/tools/misc/ical2org/default.nix index ffdb4e93f58..bcba352d6d3 100644 --- a/pkgs/tools/misc/ical2org/default.nix +++ b/pkgs/tools/misc/ical2org/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - description = "Convert an iCal file to org agenda format, optionally deduplicating entries."; + description = "Convert an iCal file to org agenda format, optionally deduplicating entries"; homepage = "https://github.com/rjhorniii/ical2org"; license = licenses.gpl3; maintainers = with maintainers; [ swflint ]; diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix index eb9805b22d8..ac40eb762d5 100644 --- a/pkgs/tools/misc/kargo/default.nix +++ b/pkgs/tools/misc/kargo/default.nix @@ -30,7 +30,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { homepage = "https://github.com/kubespray/kargo-cli"; - description = "A tool helps to deploy a kubernetes cluster with Ansible."; + description = "A tool helps to deploy a kubernetes cluster with Ansible"; platforms = platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ ]; diff --git a/pkgs/tools/misc/lice/default.nix b/pkgs/tools/misc/lice/default.nix index f4653f81f3a..2d96819e877 100644 --- a/pkgs/tools/misc/lice/default.nix +++ b/pkgs/tools/misc/lice/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonPackage rec { }; meta = with stdenv.lib; { - description = "Print license based on selection and user options."; + description = "Print license based on selection and user options"; homepage = "https://github.com/licenses/lice"; license = licenses.bsd3; maintainers = with maintainers; [ swflint ]; diff --git a/pkgs/tools/misc/logtop/default.nix b/pkgs/tools/misc/logtop/default.nix index 76c287fe391..a7b2f6282fd 100644 --- a/pkgs/tools/misc/logtop/default.nix +++ b/pkgs/tools/misc/logtop/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - description = "Displays a real-time count of strings received from stdin."; + description = "Displays a real-time count of strings received from stdin"; longDescription = '' logtop displays a real-time count of strings received from stdin. It can be useful in some cases, like getting the IP flooding your diff --git a/pkgs/tools/misc/lokalise2-cli/default.nix b/pkgs/tools/misc/lokalise2-cli/default.nix index 3705d7df6f0..19dafb4cef1 100644 --- a/pkgs/tools/misc/lokalise2-cli/default.nix +++ b/pkgs/tools/misc/lokalise2-cli/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { ''; meta = with stdenv.lib; { - description = "Translation platform for developers. Upload language files, translate, integrate via API."; + description = "Translation platform for developers. Upload language files, translate, integrate via API"; homepage = "https://lokalise.com"; license = licenses.bsd3; maintainers = with maintainers; [ timstott ]; diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix index 883e353b0b0..9bfc7e259d5 100644 --- a/pkgs/tools/misc/noti/default.nix +++ b/pkgs/tools/misc/noti/default.nix @@ -26,7 +26,7 @@ buildGoPackage rec { ''; meta = with lib; { - description = "Monitor a process and trigger a notification."; + description = "Monitor a process and trigger a notification"; longDescription = '' Monitor a process and trigger a notification. diff --git a/pkgs/tools/misc/nyancat/default.nix b/pkgs/tools/misc/nyancat/default.nix index a7b06614785..d4092c237df 100644 --- a/pkgs/tools/misc/nyancat/default.nix +++ b/pkgs/tools/misc/nyancat/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Nyancat in your terminal, rendered through ANSI escape sequences."; + description = "Nyancat in your terminal, rendered through ANSI escape sequences"; homepage = "https://nyancat.dakko.us"; license = licenses.ncsa; maintainers = with maintainers; [ midchildan ]; diff --git a/pkgs/tools/misc/pandoc-plantuml-filter/default.nix b/pkgs/tools/misc/pandoc-plantuml-filter/default.nix index 61a0f14d597..cdf0ab862df 100644 --- a/pkgs/tools/misc/pandoc-plantuml-filter/default.nix +++ b/pkgs/tools/misc/pandoc-plantuml-filter/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/timofurrer/pandoc-plantuml-filter"; - description = "Pandoc filter which converts PlantUML code blocks to PlantUML images."; + description = "Pandoc filter which converts PlantUML code blocks to PlantUML images"; license = licenses.mit; maintainers = with maintainers; [ cmcdragonkai ]; }; diff --git a/pkgs/tools/misc/shunit2/default.nix b/pkgs/tools/misc/shunit2/default.nix index 186235be442..e08a5b576d3 100644 --- a/pkgs/tools/misc/shunit2/default.nix +++ b/pkgs/tools/misc/shunit2/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://github.com/kward/shunit2"; - description = "A xUnit based unit test framework for Bourne based shell scripts."; + description = "A xUnit based unit test framework for Bourne based shell scripts"; maintainers = with maintainers; [ cdepillabout utdemir ]; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/tools/misc/silicon/default.nix b/pkgs/tools/misc/silicon/default.nix index 99de1c3d175..7c3d6a4f70a 100644 --- a/pkgs/tools/misc/silicon/default.nix +++ b/pkgs/tools/misc/silicon/default.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; meta = with lib; { - description = "Create beautiful image of your source code."; + description = "Create beautiful image of your source code"; homepage = "https://github.com/Aloxaf/silicon"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ evanjs ]; diff --git a/pkgs/tools/misc/statserial/default.nix b/pkgs/tools/misc/statserial/default.nix index 66ae899b9c5..448323f4346 100644 --- a/pkgs/tools/misc/statserial/default.nix +++ b/pkgs/tools/misc/statserial/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://sites.google.com/site/tranter/software"; - description = "Display serial port modem status lines."; + description = "Display serial port modem status lines"; license = licenses.gpl2; longDescription = diff --git a/pkgs/tools/misc/td/default.nix b/pkgs/tools/misc/td/default.nix index f4b120d1bc1..bca5bd601d4 100644 --- a/pkgs/tools/misc/td/default.nix +++ b/pkgs/tools/misc/td/default.nix @@ -8,7 +8,7 @@ bundlerApp { passthru.updateScript = bundlerUpdateScript "td"; meta = with lib; { - description = "CLI to manage data on Treasure Data, the Hadoop-based cloud data warehousing."; + description = "CLI to manage data on Treasure Data, the Hadoop-based cloud data warehousing"; homepage = "https://github.com/treasure-data/td"; license = licenses.asl20; maintainers = with maintainers; [ groodt nicknovitski ]; diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix index b2d31a62911..d923a3f4491 100644 --- a/pkgs/tools/misc/thefuck/default.nix +++ b/pkgs/tools/misc/thefuck/default.nix @@ -30,7 +30,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { homepage = "https://github.com/nvbn/thefuck"; - description = "Magnificent app which corrects your previous console command."; + description = "Magnificent app which corrects your previous console command"; license = licenses.mit; maintainers = with maintainers; [ ma27 ]; }; diff --git a/pkgs/tools/misc/wootility/default.nix b/pkgs/tools/misc/wootility/default.nix index 91203e5f7be..cc192951ca8 100644 --- a/pkgs/tools/misc/wootility/default.nix +++ b/pkgs/tools/misc/wootility/default.nix @@ -35,7 +35,7 @@ appimageTools.wrapType2 rec { meta = with lib; { homepage = "https://wooting.io/wootility"; - description = "Wootility is customization and management software for Wooting keyboards."; + description = "Wootility is customization and management software for Wooting keyboards"; platforms = [ "x86_64-linux" ]; license = "unknown"; maintainers = with maintainers; [ davidtwco ]; diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix index 01454b48254..5b5fb66be30 100644 --- a/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with lib; { inherit version; - description = "Cross-platform application for configuring any YubiKey over all USB interfaces."; + description = "Cross-platform application for configuring any YubiKey over all USB interfaces"; homepage = "https://developers.yubico.com/yubikey-manager-qt/"; license = licenses.bsd2; maintainers = [ maintainers.cbley ]; diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index a6b0a93324f..505d26bb582 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -47,7 +47,7 @@ python3Packages.buildPythonPackage rec { meta = with lib; { homepage = "https://developers.yubico.com/yubikey-manager"; - description = "Command line tool for configuring any YubiKey over all USB transports."; + description = "Command line tool for configuring any YubiKey over all USB transports"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/tools/networking/dnstracer/default.nix b/pkgs/tools/networking/dnstracer/default.nix index 7109a294543..b0369ec80bd 100644 --- a/pkgs/tools/networking/dnstracer/default.nix +++ b/pkgs/tools/networking/dnstracer/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lresolv"; meta = with stdenv.lib; { - description = "Dnstracer determines where a given Domain Name Server (DNS) gets its information from, and follows the chain of DNS servers back to the servers which know the data."; + description = "Dnstracer determines where a given Domain Name Server (DNS) gets its information from, and follows the chain of DNS servers back to the servers which know the data"; homepage = "http://www.mavetju.org/unix/general.php"; license = licenses.bsd2; maintainers = with maintainers; [ andir ]; diff --git a/pkgs/tools/networking/goreplay/default.nix b/pkgs/tools/networking/goreplay/default.nix index 3daa6a983b2..86548bf9959 100644 --- a/pkgs/tools/networking/goreplay/default.nix +++ b/pkgs/tools/networking/goreplay/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { meta = { homepage = "https://github.com/buger/goreplay"; license = stdenv.lib.licenses.lgpl3Only; - description = "GoReplay is an open-source tool for capturing and replaying live HTTP traffic."; + description = "GoReplay is an open-source tool for capturing and replaying live HTTP traffic"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; }; diff --git a/pkgs/tools/networking/mcrcon/default.nix b/pkgs/tools/networking/mcrcon/default.nix index 4f943f2cec6..7a5e8b8c5ac 100644 --- a/pkgs/tools/networking/mcrcon/default.nix +++ b/pkgs/tools/networking/mcrcon/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://bukkit.org/threads/admin-rcon-mcrcon-remote-connection-client-for-minecraft-servers.70910/"; - description = "Minecraft console client with Bukkit coloring support."; + description = "Minecraft console client with Bukkit coloring support"; longDescription = '' Mcrcon is a powerful Minecraft RCON terminal client with Bukkit coloring support. It is well suited for remote administration and to be used as part of automated server maintenance scripts. diff --git a/pkgs/tools/networking/ocserv/default.nix b/pkgs/tools/networking/ocserv/default.nix index dea0d10a277..daaa483149a 100644 --- a/pkgs/tools/networking/ocserv/default.nix +++ b/pkgs/tools/networking/ocserv/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://gitlab.com/openconnect/ocserv"; license = licenses.gpl2; - description = "This program is openconnect VPN server (ocserv), a server for the openconnect VPN client."; + description = "This program is openconnect VPN server (ocserv), a server for the openconnect VPN client"; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/networking/persepolis/default.nix b/pkgs/tools/networking/persepolis/default.nix index ecceed21660..32fb053f811 100644 --- a/pkgs/tools/networking/persepolis/default.nix +++ b/pkgs/tools/networking/persepolis/default.nix @@ -62,7 +62,7 @@ buildPythonApplication rec { ]; meta = with stdenv.lib; { - description = "Persepolis Download Manager is a GUI for aria2."; + description = "Persepolis Download Manager is a GUI for aria2"; homepage = "https://persepolisdm.github.io/"; license = licenses.gpl3; maintainers = [ maintainers.linarcx ]; diff --git a/pkgs/tools/networking/quickserve/default.nix b/pkgs/tools/networking/quickserve/default.nix index 8f4876b6ee2..53d649d791f 100644 --- a/pkgs/tools/networking/quickserve/default.nix +++ b/pkgs/tools/networking/quickserve/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - description = "A simple HTTP server for quickly sharing files."; + description = "A simple HTTP server for quickly sharing files"; homepage = "https://xyne.archlinux.ca/projects/quickserve/"; license = licenses.gpl2; maintainers = with maintainers; [ lassulus ]; diff --git a/pkgs/tools/networking/radsecproxy/default.nix b/pkgs/tools/networking/radsecproxy/default.nix index e2a0c900c52..283131b5671 100644 --- a/pkgs/tools/networking/radsecproxy/default.nix +++ b/pkgs/tools/networking/radsecproxy/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://software.nordu.net/radsecproxy/"; - description = "A generic RADIUS proxy that supports both UDP and TLS (RadSec) RADIUS transports."; + description = "A generic RADIUS proxy that supports both UDP and TLS (RadSec) RADIUS transports"; license = licenses.bsd3; maintainers = with maintainers; [ sargon ]; platforms = with platforms; linux; diff --git a/pkgs/tools/networking/tcptraceroute/default.nix b/pkgs/tools/networking/tcptraceroute/default.nix index 6901166e38f..e1e711ef16a 100644 --- a/pkgs/tools/networking/tcptraceroute/default.nix +++ b/pkgs/tools/networking/tcptraceroute/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpcap libnet ]; meta = { - description = "A traceroute implementation using TCP packets."; + description = "A traceroute implementation using TCP packets"; homepage = "https://github.com/mct/tcptraceroute"; license = stdenv.lib.licenses.gpl2; maintainers = [ ]; diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index 081819458f0..4ca5529bdc6 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X github.com/tendermint/tendermint/version.GitCommit=${src.rev}" ]; meta = with stdenv.lib; { - description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short."; + description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short"; homepage = "https://tendermint.com/"; license = licenses.asl20; maintainers = with maintainers; [ alexfmpe ]; diff --git a/pkgs/tools/nix/nix-script/default.nix b/pkgs/tools/nix/nix-script/default.nix index da8ba3bce8e..d604463bb05 100644 --- a/pkgs/tools/nix/nix-script/default.nix +++ b/pkgs/tools/nix/nix-script/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - description = "A shebang for running inside nix-shell."; + description = "A shebang for running inside nix-shell"; homepage = "https://github.com/bennofs/nix-script"; license = licenses.bsd3; maintainers = with maintainers; [ bennofs rnhmjoj ]; diff --git a/pkgs/tools/package-management/elm-github-install/default.nix b/pkgs/tools/package-management/elm-github-install/default.nix index 8da05981daf..f86cdc55ecc 100644 --- a/pkgs/tools/package-management/elm-github-install/default.nix +++ b/pkgs/tools/package-management/elm-github-install/default.nix @@ -12,7 +12,7 @@ bundlerEnv rec { passthru.updateScript = bundlerUpdateScript "elm-github-install"; meta = with lib; { - description = "Install Elm packages from git repositories."; + description = "Install Elm packages from git repositories"; homepage = "https://github.com/gdotdesign/elm-github-install"; license = licenses.unfree; maintainers = with maintainers; [ roberth nicknovitski ]; diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix index 5ae4f5731ba..1a75fa43d4e 100644 --- a/pkgs/tools/package-management/morph/default.nix +++ b/pkgs/tools/package-management/morph/default.nix @@ -35,7 +35,7 @@ buildGoPackage rec { outputs = [ "out" "lib" ]; meta = with lib; { - description = "Morph is a NixOS host manager written in Golang."; + description = "Morph is a NixOS host manager written in Golang"; license = licenses.mit; homepage = "https://github.com/dbcdk/morph"; maintainers = with maintainers; [adamt johanot]; diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix index d559ca8921c..63e2ae12a6e 100644 --- a/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/pkgs/tools/package-management/mynewt-newt/default.nix @@ -28,7 +28,7 @@ buildGoModule rec { meta = with stdenv.lib; { homepage = "https://mynewt.apache.org/"; - description = "Build and package management tool for embedded development."; + description = "Build and package management tool for embedded development"; longDescription = '' Apache Newt is a smart build and package management tool, designed for C and C++ applications in embedded contexts. Newt diff --git a/pkgs/tools/security/acsccid/default.nix b/pkgs/tools/security/acsccid/default.nix index 5b79b3db705..3e61b124fef 100644 --- a/pkgs/tools/security/acsccid/default.nix +++ b/pkgs/tools/security/acsccid/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "acsccid is a PC/SC driver for Linux/Mac OS X and it supports ACS CCID smart card readers."; + description = "acsccid is a PC/SC driver for Linux/Mac OS X and it supports ACS CCID smart card readers"; longDescription = '' acsccid is a PC/SC driver for Linux/Mac OS X and it supports ACS CCID smart card readers. This library provides a PC/SC IFD handler implementation and diff --git a/pkgs/tools/security/ecdsatool/default.nix b/pkgs/tools/security/ecdsatool/default.nix index 524f38982cc..b1a86fe7e64 100644 --- a/pkgs/tools/security/ecdsatool/default.nix +++ b/pkgs/tools/security/ecdsatool/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { buildInputs = with pkgs; [libuecc]; meta = with stdenv.lib; { - description = "Create and manipulate ECC NISTP256 keypairs."; + description = "Create and manipulate ECC NISTP256 keypairs"; homepage = "https://github.com/kaniini/ecdsatool/"; license = with licenses; [free]; platforms = platforms.unix; diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/tools/security/fpm2/default.nix index 3d082523f6f..aff4e1ee1ec 100644 --- a/pkgs/tools/security/fpm2/default.nix +++ b/pkgs/tools/security/fpm2/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnupg gtk2 libxml2 intltool ]; meta = { - description = "FPM2 is GTK2 port from Figaro's Password Manager originally developed by John Conneely, with some new enhancements."; + description = "FPM2 is GTK2 port from Figaro's Password Manager originally developed by John Conneely, with some new enhancements"; homepage = "https://als.regnet.cz/fpm2/"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/security/genpass/default.nix b/pkgs/tools/security/genpass/default.nix index 39a84112d63..4310d3a8919 100644 --- a/pkgs/tools/security/genpass/default.nix +++ b/pkgs/tools/security/genpass/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ]; meta = with stdenv.lib; { - description = "A simple yet robust commandline random password generator."; + description = "A simple yet robust commandline random password generator"; homepage = "https://github.com/cyplo/genpass"; license = licenses.agpl3; maintainers = with maintainers; [ cyplo ]; diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 15ad1c70a8d..80a9c40ebc2 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -54,7 +54,7 @@ buildGoModule rec { ''; meta = with stdenv.lib; { - description = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go."; + description = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go"; homepage = "https://www.gopass.pw/"; license = licenses.mit; maintainers = with maintainers; [ andir rvolosatovs ]; diff --git a/pkgs/tools/security/hashdeep/default.nix b/pkgs/tools/security/hashdeep/default.nix index 8c8ab5b01a5..4ad656462b1 100644 --- a/pkgs/tools/security/hashdeep/default.nix +++ b/pkgs/tools/security/hashdeep/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - description = "A set of cross-platform tools to compute hashes."; + description = "A set of cross-platform tools to compute hashes"; homepage = "https://github.com/jessek/hashdeep"; license = licenses.gpl2; platforms = with platforms; linux ++ freebsd ++ openbsd; diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix index 7c5a2d5a4c1..9a8722ac263 100644 --- a/pkgs/tools/security/hologram/default.nix +++ b/pkgs/tools/security/hologram/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/AdRoll/hologram/"; - description = "Easy, painless AWS credentials on developer laptops."; + description = "Easy, painless AWS credentials on developer laptops"; maintainers = with maintainers; [ nand0p ]; license = licenses.asl20; }; diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index ee1cfa9d2a4..bd1ee471b7a 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -33,7 +33,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://www.keybase.io/"; - description = "The Keybase official command-line utility and service."; + description = "The Keybase official command-line utility and service"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ avaq carlsverre np rvolosatovs filalex77 ]; license = licenses.bsd3; diff --git a/pkgs/tools/security/minica/default.nix b/pkgs/tools/security/minica/default.nix index 20ae3878a71..49f1e2beb4d 100644 --- a/pkgs/tools/security/minica/default.nix +++ b/pkgs/tools/security/minica/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { ''; meta = with lib; { - description = "A simple tool for generating self signed certificates."; + description = "A simple tool for generating self signed certificates"; longDescription = '' Minica is a simple CA intended for use in situations where the CA operator also operates each host where a certificate will be used. It diff --git a/pkgs/tools/security/zzuf/default.nix b/pkgs/tools/security/zzuf/default.nix index 5dab990e22f..428f1ec1d09 100644 --- a/pkgs/tools/security/zzuf/default.nix +++ b/pkgs/tools/security/zzuf/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { preConfigure = "./bootstrap"; meta = with stdenv.lib; { - description = "Transparent application input fuzzer."; + description = "Transparent application input fuzzer"; homepage = "http://caca.zoy.org/wiki/zzuf"; license = licenses.wtfpl; platforms = platforms.linux; diff --git a/pkgs/tools/system/incron/default.nix b/pkgs/tools/system/incron/default.nix index 4b5709e6227..d407982bb67 100644 --- a/pkgs/tools/system/incron/default.nix +++ b/pkgs/tools/system/incron/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A cron-like daemon which handles filesystem events."; + description = "A cron-like daemon which handles filesystem events"; homepage = "https://github.com/ar-/incron"; license = licenses.gpl2; maintainers = [ maintainers.aanderse ]; diff --git a/pkgs/tools/system/jump/default.nix b/pkgs/tools/system/jump/default.nix index 9966ace14f4..d8e838dd360 100644 --- a/pkgs/tools/system/jump/default.nix +++ b/pkgs/tools/system/jump/default.nix @@ -28,7 +28,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "Jump helps you navigate faster by learning your habits."; + description = "Jump helps you navigate faster by learning your habits"; longDescription = '' Jump integrates with the shell and learns about your navigational habits by keeping track of the directories you visit. It diff --git a/pkgs/tools/system/pcstat/default.nix b/pkgs/tools/system/pcstat/default.nix index 5febbcb6ef6..436fa5cae6f 100644 --- a/pkgs/tools/system/pcstat/default.nix +++ b/pkgs/tools/system/pcstat/default.nix @@ -16,7 +16,7 @@ buildGoPackage { goDeps = ./deps.nix; meta = with stdenv.lib; { - description = "Page Cache stat: get page cache stats for files on Linux."; + description = "Page Cache stat: get page cache stats for files on Linux"; homepage = "https://github.com/tobert/pcstat"; license = licenses.asl20; maintainers = with maintainers; [ aminechikhaoui ]; diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix index 28f2c54729b..bf082abadbc 100644 --- a/pkgs/tools/text/miller/default.nix +++ b/pkgs/tools/text/miller/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook flex libtool ]; meta = with stdenv.lib; { - description = "Miller is like awk, sed, cut, join, and sort for name-indexed data such as CSV, TSV, and tabular JSON."; + description = "Miller is like awk, sed, cut, join, and sort for name-indexed data such as CSV, TSV, and tabular JSON"; homepage = "http://johnkerl.org/miller/"; license = licenses.bsd2; maintainers = with maintainers; [ mstarzyk ]; diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/tools/text/platinum-searcher/default.nix index b53c5646e70..e621d13f013 100644 --- a/pkgs/tools/text/platinum-searcher/default.nix +++ b/pkgs/tools/text/platinum-searcher/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/monochromegane/the_platinum_searcher"; - description = "A code search tool similar to ack and the_silver_searcher(ag)."; + description = "A code search tool similar to ack and the_silver_searcher(ag)"; license = licenses.mit; }; } diff --git a/pkgs/tools/typesetting/docbookrx/default.nix b/pkgs/tools/typesetting/docbookrx/default.nix index 6bfb0188a3a..a41276ea432 100644 --- a/pkgs/tools/typesetting/docbookrx/default.nix +++ b/pkgs/tools/typesetting/docbookrx/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation { ''; meta = with lib; { - description = "(An early version of) a DocBook to AsciiDoc converter written in Ruby."; + description = "(An early version of) a DocBook to AsciiDoc converter written in Ruby"; homepage = "https://asciidoctor.org/"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/tools/typesetting/kramdown-asciidoc/default.nix b/pkgs/tools/typesetting/kramdown-asciidoc/default.nix index 3b54eb637d2..655cd5a61e1 100644 --- a/pkgs/tools/typesetting/kramdown-asciidoc/default.nix +++ b/pkgs/tools/typesetting/kramdown-asciidoc/default.nix @@ -26,7 +26,7 @@ let # }; meta = with lib; { - description = "A kramdown extension for converting Markdown documents to AsciiDoc."; + description = "A kramdown extension for converting Markdown documents to AsciiDoc"; homepage = "https://asciidoctor.org/"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/tools/virtualization/cloudmonkey/default.nix b/pkgs/tools/virtualization/cloudmonkey/default.nix index 2565d9346b0..8b9cd18cd0a 100644 --- a/pkgs/tools/virtualization/cloudmonkey/default.nix +++ b/pkgs/tools/virtualization/cloudmonkey/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { }; meta = with lib; { - description = "CLI for Apache CloudStack."; + description = "CLI for Apache CloudStack"; homepage = "https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+cloudmonkey+CLI"; license = [ licenses.asl20 ]; maintainers = [ maintainers.womfoo ]; From 85f9e7f722660e18e1cade10b00c9ada8d8ffc04 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Sat, 17 Oct 2020 23:22:39 +0800 Subject: [PATCH 403/546] ledger-live-desktop: Add RaghavSood as maintainer --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 773c9080cff..3bd379ce27c 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -30,7 +30,7 @@ in appimageTools.wrapType2 rec { description = "Wallet app for Ledger Nano S and Ledger Blue"; homepage = "https://www.ledger.com/live"; license = licenses.mit; - maintainers = with maintainers; [ thedavidmeister nyanloutre ]; + maintainers = with maintainers; [ thedavidmeister nyanloutre RaghavSood ]; platforms = [ "x86_64-linux" ]; }; } From 5cc71ccd9cadf4d1a243722ef8698b95139c89ad Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Thu, 1 Oct 2020 15:57:24 +0300 Subject: [PATCH 404/546] vimPlugins.vim-clap: specify meta.platforms --- pkgs/misc/vim-plugins/overrides.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index a7fdc8b5a13..c036af3ac43 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -603,6 +603,8 @@ self: super: { in '' ln -s ${maple-bin}/bin/maple $target/bin/maple ''; + + meta.platforms = stdenv.lib.platforms.all; }); completion-tabnine = super.completion-tabnine.overrideAttrs(old: { From 0e8198502f7d0d753925e9271a7aa53553e9f236 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Sat, 17 Oct 2020 23:35:58 +0800 Subject: [PATCH 405/546] stripe-cli: init at 1.5.3 --- pkgs/tools/admin/stripe-cli/default.nix | 26 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/admin/stripe-cli/default.nix diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix new file mode 100644 index 00000000000..3ceb0e8509c --- /dev/null +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "stripe-cli"; + version = "1.5.3"; + + src = fetchFromGitHub { + owner = "stripe"; + repo = pname; + rev = "v${version}"; + sha256 = "0anrn7dkxgbzilh45gyqrp2930bkg3g3diarb50qp0rlim302sgy"; + }; + + vendorSha256 = "05cyn9cgmijj6dl075slwm5qc6fj6m5sm414wqm50xz2fjs0400r"; + + subPackages = [ + "cmd/stripe" + ]; + + meta = with stdenv.lib; { + homepage = "https://stripe.com/docs/stripe-cli"; + description = "A command-line tool for Stripe"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ RaghavSood ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a15e49b650..066a5cf6be2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2414,6 +2414,8 @@ in string-machine = callPackage ../applications/audio/string-machine { }; + stripe-cli = callPackage ../tools/admin/stripe-cli { }; + bash-supergenpass = callPackage ../tools/security/bash-supergenpass { }; swappy = callPackage ../applications/misc/swappy { gtk = gtk3; }; From c6218f21723cf677251cb470af4298d4a20e0a78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20H=C3=BCrlimann?= Date: Tue, 13 Oct 2020 23:12:09 +0200 Subject: [PATCH 406/546] trigger: apply review suggestions --- pkgs/games/trigger/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix index e5a299052dd..74a56f1fd40 100644 --- a/pkgs/games/trigger/default.nix +++ b/pkgs/games/trigger/default.nix @@ -2,15 +2,26 @@ , zlib, libGLU, libGL, glew, tinyxml-2 }: stdenv.mkDerivation rec { - name = "trigger-rally-0.6.6.1"; + pname = "trigger-rally"; + version = "0.6.6.1"; src = fetchurl { - url = "mirror://sourceforge/trigger-rally/${name}.tar.gz"; + url = "mirror://sourceforge/trigger-rally/${pname}-${version}.tar.gz"; sha256 = "016bc2hczqscfmngacim870hjcsmwl8r3aq8x03vpf22s49nw23z"; }; - buildInputs = - [ SDL2 freealut SDL2_image openal physfs zlib libGLU libGL glew tinyxml-2 ]; + buildInputs = [ + SDL2 + freealut + SDL2_image + openal + physfs + zlib + libGLU + libGL + glew + tinyxml-2 + ]; preConfigure = '' sed s,/usr/local,$out, -i bin/*defs From 3ed43eaadee7c7ca2c1f6bb6529313f4391b66ac Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 17 Oct 2020 13:08:55 +0700 Subject: [PATCH 407/546] knightos: add platforms --- pkgs/development/tools/knightos/kcc/default.nix | 1 + pkgs/development/tools/knightos/kimg/default.nix | 1 + pkgs/development/tools/knightos/kpack/default.nix | 1 + pkgs/development/tools/knightos/patchrom/default.nix | 1 + 4 files changed, 4 insertions(+) diff --git a/pkgs/development/tools/knightos/kcc/default.nix b/pkgs/development/tools/knightos/kcc/default.nix index 49851dd0c07..2ec7d7f2020 100644 --- a/pkgs/development/tools/knightos/kcc/default.nix +++ b/pkgs/development/tools/knightos/kcc/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { description = "KnightOS C compiler"; license = licenses.gpl2Plus; maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/knightos/kimg/default.nix b/pkgs/development/tools/knightos/kimg/default.nix index b6f490e1d9d..bd4320637dc 100644 --- a/pkgs/development/tools/knightos/kimg/default.nix +++ b/pkgs/development/tools/knightos/kimg/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "Converts image formats supported by ImageMagick to the KnightOS image format"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/knightos/kpack/default.nix b/pkgs/development/tools/knightos/kpack/default.nix index 96af43e6160..c1ecb963d24 100644 --- a/pkgs/development/tools/knightos/kpack/default.nix +++ b/pkgs/development/tools/knightos/kpack/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { description = "A tool to create or extract KnightOS packages"; license = licenses.lgpl2Only; maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/knightos/patchrom/default.nix b/pkgs/development/tools/knightos/patchrom/default.nix index ed34053d835..9feab36ec82 100644 --- a/pkgs/development/tools/knightos/patchrom/default.nix +++ b/pkgs/development/tools/knightos/patchrom/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { description = "Patches jumptables into TI calculator ROM files and generates an include file"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; }; } From 4879f4310468462ed6f73d8529f450ca94861afe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 01:42:04 +0000 Subject: [PATCH 408/546] python37Packages.uamqp: 1.2.10 -> 1.2.12 --- pkgs/development/python-modules/uamqp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index 1e7132525a2..47a0d6cc269 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.2.10"; + version = "1.2.12"; src = fetchPypi { inherit pname version; - sha256 = "398dd818e9a6c14f00c434e7ad3fcbe1d0344f2f4c23bca8c5026280ae032f4f"; + sha256 = "c6657f1d8aae566b89d02c6282827dddcec2a90f75dc0d2d91a47e00c8999d99"; }; buildInputs = [ From 41ef4f88a1e5237524a3f86c5b747a07884a9868 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Oct 2020 03:20:58 +0200 Subject: [PATCH 409/546] python3Packages.snowflake-connector-python: 2.3.2 -> 2.3.3 Fixes the build by relaxing the boto version pin. --- .../snowflake-connector-python/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index bdedfc0ed4b..f33d2639db5 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.3.2"; + version = "2.3.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0as7m736wgx684wssnvhvixjkqidnhxn9i98rcdgagr67s3akfdy"; + sha256 = "18w6ibpibqj3v136jjfklbax1l4y80v8mfk19apxlaprf6wvwpwy"; }; propagatedBuildInputs = [ @@ -57,13 +57,14 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ + --replace "'boto3>=1.4.4,<1.15'," "'boto3~=1.15'," \ --replace "'cryptography>=2.5.0,<3.0.0'," "'cryptography'," \ --replace "'idna<2.10'," "'idna'," \ --replace "'requests<2.24.0'," "'requests'," ''; - # tests are not working - # XXX: fix the tests + # tests require encrypted secrets, see + # https://github.com/snowflakedb/snowflake-connector-python/tree/master/.github/workflows/parameters doCheck = false; pythonImportsCheck = [ "snowflake" "snowflake.connector" ]; From f20c3dc420f0caa667b463db68359431ca19ce2a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 02:05:22 +0000 Subject: [PATCH 410/546] python37Packages.identify: 1.5.5 -> 1.5.6 --- pkgs/development/python-modules/identify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index b9134ef16e3..3385e5bfc9e 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.5.5"; + version = "1.5.6"; src = fetchPypi { inherit pname version; - sha256 = "7c22c384a2c9b32c5cc891d13f923f6b2653aa83e2d75d8f79be240d6c86c4f4"; + sha256 = "969d844b7a85d32a5f9ac4e163df6e846d73c87c8b75847494ee8f4bd2186421"; }; # Tests not included in PyPI tarball From 4f98107888907a124b7aae4965795ad4a88e6399 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 01:49:53 +0000 Subject: [PATCH 411/546] python37Packages.bugsnag: 3.7.1 -> 4.0.1 --- pkgs/development/python-modules/bugsnag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index adae7ff1c38..dde9c8c4c1e 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "bugsnag"; - version = "3.7.1"; + version = "4.0.1"; src = fetchPypi { inherit pname version; - sha256 = "32966bfe625ec6fc0dbc9d86d79a18f31b22b2fdec3ca070eeb3495304f7e18d"; + sha256 = "01c2186f6c2a6f801b66d8fc73b8986bd2d4931a6ab40b720e5fd0b66757facc"; }; propagatedBuildInputs = [ six webob ]; From 6a6ee498e1ac480021ee931c5baa18ef4c40539e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 17 Oct 2020 08:49:03 -0700 Subject: [PATCH 412/546] python2Packages.bugsnag: disable python2 ``` Processing ./bugsnag-4.0.1-py2-none-any.whl ERROR: Package 'bugsnag' requires a different Python: 2.7.18 not in '>=3.5.*, <4' ``` --- pkgs/development/python-modules/bugsnag/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index dde9c8c4c1e..a2c41599b36 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, pythonOlder , six , webob }: @@ -8,6 +9,7 @@ buildPythonPackage rec { pname = "bugsnag"; version = "4.0.1"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; From 0e29b48a0530dbbf2276a1ebc30bb06c56450f41 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 17 Oct 2020 21:00:05 +0800 Subject: [PATCH 413/546] nodePackages.coc-diagnostic: init at 0.9.0 Also add as Vim plugin Also update node packages from generate.sh --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 545 ++++++++---------- pkgs/misc/vim-plugins/overrides.nix | 1 + 3 files changed, 232 insertions(+), 315 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 6e98f2f1e52..6243a735dff 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -20,6 +20,7 @@ , "clean-css-cli" , "clubhouse-cli" , "coc-css" +, "coc-diagnostic" , "coc-emmet" , "coc-eslint" , "coc-git" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 3fbd984eb1c..7736cbf9471 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -328,13 +328,13 @@ let sha512 = "725AQupWJZ8ba0jbKceeFblZTY90McUBWMwHhkFQ9q1zKPJ95GUktljFcgcsIVwRnTnRKlcYzfiNImg5G9m6ZQ=="; }; }; - "@babel/core-7.12.1" = { + "@babel/core-7.12.3" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.12.1"; + version = "7.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.12.1.tgz"; - sha512 = "6bGmltqzIJrinwRRdczQsMhruSi9Sqty9Te+/5hudn4Izx/JYRhW1QELpR+CIL0gC/c9A7WroH6FmkDGxmWx3w=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.12.3.tgz"; + sha512 = "0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g=="; }; }; "@babel/core-7.9.0" = { @@ -589,13 +589,13 @@ let sha512 = "YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A=="; }; }; - "@babel/helper-wrap-function-7.10.4" = { + "@babel/helper-wrap-function-7.12.3" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.10.4"; + version = "7.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz"; - sha512 = "6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz"; + sha512 = "Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow=="; }; }; "@babel/helpers-7.12.1" = { @@ -616,13 +616,13 @@ let sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; }; }; - "@babel/parser-7.12.2" = { + "@babel/parser-7.12.3" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.12.2"; + version = "7.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.2.tgz"; - sha512 = "LMN+SqTiZEonUw4hQA0A3zG8DnN0E1F4K107LbDDUnC+0chML1rvWgsHloC9weB4RmZweE0uhFq0eGX7Nr/PBQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz"; + sha512 = "kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw=="; }; }; "@babel/plugin-external-helpers-7.8.3" = { @@ -2056,22 +2056,22 @@ let sha512 = "t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ=="; }; }; - "@fluentui/react-7.147.0" = { + "@fluentui/react-7.147.1" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.147.0"; + version = "7.147.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.147.0.tgz"; - sha512 = "i7rUpUytr/futFBiSXtpg2bPRX60AYcudRx/KpQ3dKkboR+OVdSzETMtS4ljUt4DzU/DuBo981CzJKWPj9khig=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.147.1.tgz"; + sha512 = "Zk3MygGDVEHrgKi1M12ETozWRxQ0Go8O9RP/mXqWQUHcXK++KfAO6xJZTpMKQ9o18Sb/ZQwjIrYPpYc6JwuyfA=="; }; }; - "@fluentui/react-focus-7.16.12" = { + "@fluentui/react-focus-7.16.13" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "7.16.12"; + version = "7.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.12.tgz"; - sha512 = "i8UYrysWU6T3mVqYdGyjpNpZ9OXNKu8+hyRHie29d3r1HKmt01Sy7wBbOlGqqkozuVAC5XcqPbXhgrQabc1ZtA=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.13.tgz"; + sha512 = "MWyI64GSEZigYe75aCy8VGGIr/tWwk+H8oqPxamoVOHef4kCqYm/70mhrDpBP1oAhJVmdY/Lia6dtkIz3J9wgw=="; }; }; "@fluentui/react-window-provider-0.3.3" = { @@ -2083,13 +2083,13 @@ let sha512 = "MVPf2hqOQ17LAZsuvGcr3oOHksAskUm+fCYdXFhbVoAgsCDVTIuH6i8XgHFd6YjBtzjZmI4+k/3NTQfDqBX8EQ=="; }; }; - "@fluentui/theme-1.5.0" = { + "@fluentui/theme-1.5.1" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.5.0.tgz"; - sha512 = "44/1JAnFxuXt8ZfVa3VXdDOvzcdXYA0DbGrRLDMFa8ZiQMhcN6/Y5mUwBRPEuE3sLkGHL39hQ0Vw3EVeH7TYlg=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.5.1.tgz"; + sha512 = "w5986/CN3hWuH44WmlQNxtndBx0khnb1xjISb/4bktRpehYxIlDBmQYRUOUYXr6zwdK7JXJaJPGjOJzSh2DCDg=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -3307,13 +3307,13 @@ let sha512 = "RibeMnDPvlL8bFYW5C8cs4mbI3AHfQef73tnJCQ/SgrXZHehmHnsyWUiE7qDQCAo+B1RfTapvSyFF69iPj326A=="; }; }; - "@microsoft/load-themed-styles-1.10.113" = { + "@microsoft/load-themed-styles-1.10.114" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.113"; + version = "1.10.114"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.113.tgz"; - sha512 = "33AgF552U+tpwavHsMEY6E196p4kBopTRLndctbO0jxbAC0qU43qYPt7kMqVSBPSZjEA1dGveHNKUhoIFfZqwQ=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.114.tgz"; + sha512 = "baefCOffrEAN86rNBY5uVFt1hEH3DMhMVqeKwmbf1L0u51r0KhvMCdQVS9YRi4VHbiufiea2g7vlFf51RDatkQ=="; }; }; "@mrmlnc/readdir-enhanced-2.2.1" = { @@ -6070,22 +6070,22 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@uifabric/foundation-7.9.13" = { + "@uifabric/foundation-7.9.14" = { name = "_at_uifabric_slash_foundation"; packageName = "@uifabric/foundation"; - version = "7.9.13"; + version = "7.9.14"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.13.tgz"; - sha512 = "XVIniUkMAomET81VI1QCMHbtIzD/w2DTv3IspwTKpuvD1rswtRF07yMinyCLcd2of2crYAC1V5vWsz90QqAKjg=="; + url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.14.tgz"; + sha512 = "AWsSt28+mid44YPofHB8N1nm4C0QmLJ9WXFps5GyjaBHES6/4bfJ7rKzYioa5bN0TxElyK8rRHzwqKNQhWDBYA=="; }; }; - "@uifabric/icons-7.5.11" = { + "@uifabric/icons-7.5.12" = { name = "_at_uifabric_slash_icons"; packageName = "@uifabric/icons"; - version = "7.5.11"; + version = "7.5.12"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.11.tgz"; - sha512 = "htUsBpAsE2AoC1I/ijBVnpHZXAmFl12o4I0WILOONNK6ruhHERu/eg/0eCBv6T0hvcoa13vuTLiuj8RBrDFh2g=="; + url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.12.tgz"; + sha512 = "VIqj4oMwi4HJPqH3+3RblLoYjPfYzjVyZ8Kk57dmA7tj+vbM38Zn9vObe+Xg/EVEfohD3kD0fyEqPmnEqY17Pg=="; }; }; "@uifabric/merge-styles-7.19.1" = { @@ -6115,13 +6115,13 @@ let sha512 = "9E+YKtnH2kyMKnK9XZZsqyM8OCxEJIIfxtaThTlQpYOzrWAGJxQADFbZ7+Usi0U2xHnWNPFROjq+B9ocEzhqMA=="; }; }; - "@uifabric/styling-7.16.12" = { + "@uifabric/styling-7.16.13" = { name = "_at_uifabric_slash_styling"; packageName = "@uifabric/styling"; - version = "7.16.12"; + version = "7.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.12.tgz"; - sha512 = "0TH6nz4ozJte7mp/rDlKI9IjDf5riFe6aKuDg3DDLshyCihBmn6VRF2geVhD7basxk/py/COKJROHZkP4T9ioQ=="; + url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.13.tgz"; + sha512 = "jj5FH7XuQXz8HgRhCXNApeUAynDBv2nfmTpzHawE55x7YR+oliQfsJSY8Ow4YbLAazIR5BuW1n9eKuGxxmIw1w=="; }; }; "@uifabric/utilities-7.32.4" = { @@ -6142,6 +6142,15 @@ let sha512 = "CAqefTFAfnUPwYqsWHXpOxHaq1Zo5UQ3m9Zm2p09LggGe57rqHoBn3c++xcoomzXKynAUuiBMDUCQvKMnXjUpA=="; }; }; + "@ungap/promise-all-settled-1.1.2" = { + name = "_at_ungap_slash_promise-all-settled"; + packageName = "@ungap/promise-all-settled"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz"; + sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="; + }; + }; "@vue/cli-shared-utils-4.5.7" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; @@ -6961,13 +6970,13 @@ let sha512 = "TU5nlYgta8YrBMNpc9FwQzRbiXsj49gsALsXadbGHt9CROPzX5fB0rWDR5mtdpOOKa5XqRFpbj1QroPAoPzVjQ=="; }; }; - "abstract-logging-2.0.0" = { + "abstract-logging-2.0.1" = { name = "abstract-logging"; packageName = "abstract-logging"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/abstract-logging/-/abstract-logging-2.0.0.tgz"; - sha512 = "/oA9z7JszpIioo6J6dB79LVUgJ3eD3cxkAmdCkvWWS+Y9tPtALs1rLqOekLUXUbYqM2fB9TTK0ibAyZJJOP/CA=="; + url = "https://registry.npmjs.org/abstract-logging/-/abstract-logging-2.0.1.tgz"; + sha512 = "2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA=="; }; }; "abstract-random-access-1.1.2" = { @@ -8860,15 +8869,6 @@ let sha512 = "mi+MYNJYLTx2eNYy+Yh6raoQacCsNeeMUaspFPh9Y141lFSsWxxB8V9mM2ye+eqiRs917J6/pJ4M9ZPzenWckA=="; }; }; - "array.prototype.map-1.0.2" = { - name = "array.prototype.map"; - packageName = "array.prototype.map"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.map/-/array.prototype.map-1.0.2.tgz"; - sha512 = "Az3OYxgsa1g7xDYp86l0nnN4bcmuEITGe1rbdEBVkrqkzMgDcbdQ2R7r41pNzti+4NMces3H8gMmuioZUilLgw=="; - }; - }; "arraybuffer.slice-0.0.6" = { name = "arraybuffer.slice"; packageName = "arraybuffer.slice"; @@ -12082,6 +12082,15 @@ let sha512 = "8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w=="; }; }; + "camelcase-6.1.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-6.1.0.tgz"; + sha512 = "WCMml9ivU60+8rEJgELlFp1gxFcEGxwYleE3bziHEDeqsqAWGHdimB7beBFGjLzVNgPGyDsfgXLQEYMpmIFnVQ=="; + }; + }; "camelcase-keys-2.1.0" = { name = "camelcase-keys"; packageName = "camelcase-keys"; @@ -16547,6 +16556,15 @@ let sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; }; }; + "debug-4.2.0" = { + name = "debug"; + packageName = "debug"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz"; + sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg=="; + }; + }; "debug-4.3.0" = { name = "debug"; packageName = "debug"; @@ -17573,13 +17591,13 @@ let sha512 = "IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="; }; }; - "diff2html-3.1.13" = { + "diff2html-3.1.14" = { name = "diff2html"; packageName = "diff2html"; - version = "3.1.13"; + version = "3.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.1.13.tgz"; - sha512 = "Gs4NbtynANYqkPbbGqZN6zwWJq6JofAb5it76xnEUTpFjWJndaCCjFVUoD7yFjEPB36MtwTtT/ptWcKyD9Vw9g=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.1.14.tgz"; + sha512 = "Qot+l+v+aqGcuvJe1C8ZPev17deSyg+DOwICF3m8Ka/C3af1K2Wh2WENYulxv9CQyVhy2VarluR5fMfN5BEHIg=="; }; }; "diff3-0.0.3" = { @@ -18987,6 +19005,15 @@ let sha512 = "MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ=="; }; }; + "entities-2.1.0" = { + name = "entities"; + packageName = "entities"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz"; + sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="; + }; + }; "env-ci-3.2.2" = { name = "env-ci"; packageName = "env-ci"; @@ -19158,15 +19185,6 @@ let sha512 = "I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA=="; }; }; - "es-array-method-boxes-properly-1.0.0" = { - name = "es-array-method-boxes-properly"; - packageName = "es-array-method-boxes-properly"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz"; - sha512 = "wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="; - }; - }; "es-get-iterator-1.1.0" = { name = "es-get-iterator"; packageName = "es-get-iterator"; @@ -25000,13 +25018,13 @@ let sha1 = "3a03edc2214bca3b66424a3e7959349509cb0351"; }; }; - "htmlnano-0.2.6" = { + "htmlnano-0.2.7" = { name = "htmlnano"; packageName = "htmlnano"; - version = "0.2.6"; + version = "0.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/htmlnano/-/htmlnano-0.2.6.tgz"; - sha512 = "HUY/99maFsWX2LRoGJpZ/8QRLCkyY0UU1El3wgLLFAHQlD3mCxCJJNcWJk5SBqaU49MLhIWVDW6cGBeuemvaPQ=="; + url = "https://registry.npmjs.org/htmlnano/-/htmlnano-0.2.7.tgz"; + sha512 = "ozbK3npguK3MTn77WCKngBtCDhc94fmEptPQsn+dO+uIWoEghIMKsjzCMnDJuu403M01ePg9GA5MpXhRBQ3PVg=="; }; }; "htmlparser2-3.10.1" = { @@ -28025,24 +28043,6 @@ let sha512 = "RKYVTCjAnRthyJes037NX/IiqeidgN1xc3j1RjFfECFp28A1GVwK9nA+i0rJPaHqSZwygLzRnFlzUuHFoWWy+Q=="; }; }; - "iterate-iterator-1.0.1" = { - name = "iterate-iterator"; - packageName = "iterate-iterator"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/iterate-iterator/-/iterate-iterator-1.0.1.tgz"; - sha512 = "3Q6tudGN05kbkDQDI4CqjaBf4qf85w6W6GnuZDtUVYwKgtC1q8yxYX7CZed7N+tLzQqS6roujWvszf13T+n9aw=="; - }; - }; - "iterate-value-1.0.2" = { - name = "iterate-value"; - packageName = "iterate-value"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/iterate-value/-/iterate-value-1.0.2.tgz"; - sha512 = "A6fMAio4D2ot2r/TYzr4yUWrmwNdsN5xL7+HUiyACE4DXm+q8HtPcnFTp+NnW3k4N05tZ7FVYFFb2CR13NxyHQ=="; - }; - }; "iterators-0.1.0" = { name = "iterators"; packageName = "iterators"; @@ -34083,13 +34083,13 @@ let sha512 = "O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ=="; }; }; - "mocha-8.1.3" = { + "mocha-8.2.0" = { name = "mocha"; packageName = "mocha"; - version = "8.1.3"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.1.3.tgz"; - sha512 = "ZbaYib4hT4PpF4bdSO2DohooKXIn4lDeiYqB+vTmCdr6l2woW0b6H3pf5x4sM5nwQMru9RvjjHYWVGltR50ZBw=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.2.0.tgz"; + sha512 = "lEWEMq2LMfNJMKeuEwb5UELi+OgFDollXaytR5ggQcHpzG3NP/R7rvixAvF+9/lLsTWhWG+4yD2M70GsM06nxw=="; }; }; "mock-require-3.0.3" = { @@ -34839,6 +34839,15 @@ let sha512 = "s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA=="; }; }; + "nanoid-3.1.12" = { + name = "nanoid"; + packageName = "nanoid"; + version = "3.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz"; + sha512 = "1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A=="; + }; + }; "nanolru-1.0.0" = { name = "nanolru"; packageName = "nanolru"; @@ -35615,13 +35624,13 @@ let sha512 = "WH0WKGi+a4i4DUt2mHnvocex/xPLp9pYt5R6M2JdFB7pJ7Z34hveZ4nDTGTiLXCkitA9T8HFZjhinBCiVHYcWw=="; }; }; - "node-gyp-7.1.1" = { + "node-gyp-7.1.2" = { name = "node-gyp"; packageName = "node-gyp"; - version = "7.1.1"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.1.tgz"; - sha512 = "+7TqukzQVlne5EcLrw0Cdm8S26OC4H2mTb5wji4HlsocgB6a9aYHgqlKLKxRMlH/PWNyVQjyRjFhiet7+QZefA=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz"; + sha512 = "CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ=="; }; }; "node-gyp-build-3.7.0" = { @@ -36038,15 +36047,6 @@ let sha512 = "Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ=="; }; }; - "normalize-html-whitespace-1.0.0" = { - name = "normalize-html-whitespace"; - packageName = "normalize-html-whitespace"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-html-whitespace/-/normalize-html-whitespace-1.0.0.tgz"; - sha512 = "9ui7CGtOOlehQu0t/OhhlmDyc71mKVlv+4vF+me4iZLPrNtRL2xoquEdfZxasC/bdQi/Hr3iTrpyRKIG+ocabA=="; - }; - }; "normalize-package-data-2.5.0" = { name = "normalize-package-data"; packageName = "normalize-package-data"; @@ -36939,13 +36939,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.147.0" = { + "office-ui-fabric-react-7.147.1" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.147.0"; + version = "7.147.1"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.147.0.tgz"; - sha512 = "hCdHsBLAcq+Uj2SQ+P35gp/O7TRvf/Q0LQ46uklAPS+71WrsMIu/0jzj/e7dSzuLySE2TtiozwFKfD2Byf7bZw=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.147.1.tgz"; + sha512 = "nG3h14lvWoTqcO8wxabIDozw84vV0ZtoUvDe6g8QEKsG1oRHaDe8WhCkCy8XCPnsy7f/5aItlbum7AyZtKdgBQ=="; }; }; "omggif-1.0.10" = { @@ -41161,15 +41161,6 @@ let sha1 = "6739e968e3051da20ce6497fb2b50f6911df3d6d"; }; }; - "promise.allsettled-1.0.2" = { - name = "promise.allsettled"; - packageName = "promise.allsettled"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/promise.allsettled/-/promise.allsettled-1.0.2.tgz"; - sha512 = "UpcYW5S1RaNKT6pd+s9jp9K9rlQge1UXKskec0j6Mmuq7UJCvlS2J2/s/yuPN8ehftf9HXMxWlKiPbGGUzpoRg=="; - }; - }; "promise.prototype.finally-3.1.2" = { name = "promise.prototype.finally"; packageName = "promise.prototype.finally"; @@ -49198,15 +49189,6 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; - "strip-json-comments-3.0.1" = { - name = "strip-json-comments"; - packageName = "strip-json-comments"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz"; - sha512 = "VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw=="; - }; - }; "strip-json-comments-3.1.0" = { name = "strip-json-comments"; packageName = "strip-json-comments"; @@ -49576,15 +49558,6 @@ let sha512 = "qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ=="; }; }; - "supports-color-7.1.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz"; - sha512 = "oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g=="; - }; - }; "supports-color-7.2.0" = { name = "supports-color"; packageName = "supports-color"; @@ -56156,13 +56129,13 @@ let sha512 = "P1WjMrUB3qgJNI9jfmpZ/htmBEjFh//6l/5y8SD9hg1Ef5zTTVVoRjTrTEzPrNBQvmhMxkoTsjOXN10GWU7aCg=="; }; }; - "workerpool-6.0.0" = { + "workerpool-6.0.2" = { name = "workerpool"; packageName = "workerpool"; - version = "6.0.0"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/workerpool/-/workerpool-6.0.0.tgz"; - sha512 = "fU2OcNA/GVAJLLyKUoHkAgIhKb0JoCpSjLC/G2vYKxUjVmQwGbRVeoPJ1a8U4pnVofz4AQV5Y/NEw8oKqxEBtA=="; + url = "https://registry.npmjs.org/workerpool/-/workerpool-6.0.2.tgz"; + sha512 = "DSNyvOpFKrNusaaUwk+ej6cBj1bmhLcBfj80elGk+ZIo5JSkq+unB1dLKEOcNfJDZgjGICfhQ0Q5TbP0PvF4+Q=="; }; }; "wrap-ansi-2.1.0" = { @@ -57255,13 +57228,13 @@ let sha512 = "W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw=="; }; }; - "yargs-unparser-1.6.1" = { + "yargs-unparser-2.0.0" = { name = "yargs-unparser"; packageName = "yargs-unparser"; - version = "1.6.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.1.tgz"; - sha512 = "qZV14lK9MWsGCmcr7u5oXGH0dbGqZAIxTDrWXZDo5zUr6b6iUmelNKO6x6R1dQT24AH3LgRxJpr8meWy2unolA=="; + url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz"; + sha512 = "7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA=="; }; }; "yarn-1.22.10" = { @@ -59149,7 +59122,7 @@ in sources."@apollographql/graphql-playground-html-1.6.26" sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.12.1" - (sources."@babel/core-7.12.1" // { + (sources."@babel/core-7.12.3" // { dependencies = [ sources."@babel/generator-7.12.1" sources."@babel/types-7.12.1" @@ -59228,14 +59201,14 @@ in }) sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-validator-option-7.12.1" - sources."@babel/helper-wrap-function-7.10.4" + sources."@babel/helper-wrap-function-7.12.3" (sources."@babel/helpers-7.12.1" // { dependencies = [ sources."@babel/types-7.12.1" ]; }) sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.2" + sources."@babel/parser-7.12.3" sources."@babel/plugin-proposal-async-generator-functions-7.12.1" sources."@babel/plugin-proposal-class-properties-7.12.1" sources."@babel/plugin-proposal-dynamic-import-7.12.1" @@ -59908,7 +59881,7 @@ in sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - sources."entities-2.0.3" + sources."entities-2.1.0" sources."env-ci-3.2.2" sources."envinfo-7.7.3" sources."error-ex-1.3.2" @@ -61096,7 +61069,7 @@ in sources."@babel/generator-7.12.1" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.2" + sources."@babel/parser-7.12.3" sources."@babel/template-7.10.4" sources."@babel/types-7.12.1" sources."@webassemblyjs/ast-1.9.1" @@ -61178,7 +61151,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - (sources."@babel/core-7.12.1" // { + (sources."@babel/core-7.12.3" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -61200,7 +61173,7 @@ in sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helpers-7.12.1" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.2" + sources."@babel/parser-7.12.3" sources."@babel/template-7.10.4" sources."@babel/traverse-7.12.1" sources."@babel/types-7.12.1" @@ -62401,6 +62374,24 @@ in bypassCache = true; reconstructLock = true; }; + coc-diagnostic = nodeEnv.buildNodePackage { + name = "coc-diagnostic"; + packageName = "coc-diagnostic"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.9.0.tgz"; + sha512 = "p64cBvczMAK7JWAjZYAsvCiXAySybq32wWwKSdJx4hNn+jX8clwUmkbnhYaYfejyvz7fBzFTgMdbmOGOH4/DqA=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "diagnostic-languageserver extension for coc.nvim"; + homepage = "https://github.com/iamcco/coc-diagnostic#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; coc-emmet = nodeEnv.buildNodePackage { name = "coc-emmet"; packageName = "coc-emmet"; @@ -62977,7 +62968,7 @@ in (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.0.2" - sources."entities-2.0.3" + sources."entities-2.1.0" ]; }) sources."domelementtype-1.3.1" @@ -63902,7 +63893,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/core-7.12.1" + sources."@babel/core-7.12.3" sources."@babel/generator-7.12.1" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" @@ -63920,7 +63911,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.2" + sources."@babel/parser-7.12.3" sources."@babel/template-7.10.4" sources."@babel/traverse-7.12.1" sources."@babel/types-7.12.1" @@ -63983,7 +63974,7 @@ in (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.0.2" - sources."entities-2.0.3" + sources."entities-2.1.0" ]; }) sources."domelementtype-1.3.1" @@ -67829,7 +67820,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/core-7.12.1" + sources."@babel/core-7.12.3" sources."@babel/generator-7.12.1" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-react-jsx-7.10.4" @@ -67847,7 +67838,7 @@ in sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helpers-7.12.1" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.2" + sources."@babel/parser-7.12.3" sources."@babel/plugin-proposal-object-rest-spread-7.12.1" sources."@babel/plugin-syntax-jsx-7.12.1" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -68179,10 +68170,10 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.147.0" - sources."@fluentui/react-focus-7.16.12" + sources."@fluentui/react-7.147.1" + sources."@fluentui/react-focus-7.16.13" sources."@fluentui/react-window-provider-0.3.3" - sources."@fluentui/theme-1.5.0" + sources."@fluentui/theme-1.5.1" (sources."@gulp-sourcemaps/identity-map-1.0.2" // { dependencies = [ sources."normalize-path-2.1.1" @@ -68194,7 +68185,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.113" + sources."@microsoft/load-themed-styles-1.10.114" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -68235,12 +68226,12 @@ in sources."@types/sqlite3-3.1.6" sources."@types/tough-cookie-4.0.0" sources."@types/url-join-4.0.0" - sources."@uifabric/foundation-7.9.13" - sources."@uifabric/icons-7.5.11" + sources."@uifabric/foundation-7.9.14" + sources."@uifabric/icons-7.5.12" sources."@uifabric/merge-styles-7.19.1" sources."@uifabric/react-hooks-7.13.6" sources."@uifabric/set-version-7.0.23" - sources."@uifabric/styling-7.16.12" + sources."@uifabric/styling-7.16.13" sources."@uifabric/utilities-7.32.4" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -69157,7 +69148,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.147.0" + sources."office-ui-fabric-react-7.147.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -70085,14 +70076,14 @@ in sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-validator-option-7.12.1" - sources."@babel/helper-wrap-function-7.10.4" + sources."@babel/helper-wrap-function-7.12.3" sources."@babel/helpers-7.12.1" (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.2" + sources."@babel/parser-7.12.3" sources."@babel/plugin-proposal-async-generator-functions-7.12.1" sources."@babel/plugin-proposal-class-properties-7.12.1" sources."@babel/plugin-proposal-dynamic-import-7.12.1" @@ -71000,7 +70991,7 @@ in sources."memory-fs-0.5.0" ]; }) - sources."entities-2.0.3" + sources."entities-2.1.0" sources."env-editor-0.4.1" sources."env-paths-2.2.0" sources."envinfo-7.5.0" @@ -71598,7 +71589,7 @@ in sources."no-case-3.0.3" sources."node-fetch-2.6.1" sources."node-forge-0.7.6" - (sources."node-gyp-7.1.1" // { + (sources."node-gyp-7.1.2" // { dependencies = [ sources."rimraf-3.0.2" sources."semver-7.3.2" @@ -72088,7 +72079,7 @@ in (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.0.2" - sources."entities-2.0.3" + sources."entities-2.1.0" ]; }) sources."domelementtype-1.3.1" @@ -77395,7 +77386,7 @@ in (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.0.2" - sources."entities-2.0.3" + sources."entities-2.1.0" ]; }) sources."domelementtype-1.3.1" @@ -77522,7 +77513,7 @@ in sources."domelementtype-2.0.2" sources."domhandler-3.3.0" sources."domutils-2.4.2" - sources."entities-2.0.3" + sources."entities-2.1.0" ]; }) sources."http-errors-1.8.0" @@ -78140,7 +78131,7 @@ in sha512 = "znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ=="; }; dependencies = [ - sources."@babel/parser-7.12.2" + sources."@babel/parser-7.12.3" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.8.11" @@ -78193,7 +78184,7 @@ in (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.0.2" - sources."entities-2.0.3" + sources."entities-2.1.0" ]; }) sources."domelementtype-1.3.1" @@ -81100,7 +81091,7 @@ in dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.12.1" - sources."@babel/core-7.12.1" + sources."@babel/core-7.12.3" sources."@babel/generator-7.12.1" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" @@ -81125,14 +81116,14 @@ in sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-validator-option-7.12.1" - sources."@babel/helper-wrap-function-7.10.4" + sources."@babel/helper-wrap-function-7.12.3" sources."@babel/helpers-7.12.1" (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.2" + sources."@babel/parser-7.12.3" sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.12.1" sources."@babel/plugin-proposal-class-properties-7.12.1" @@ -82720,10 +82711,10 @@ in "@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage { name = "_at_mermaid-js_slash_mermaid-cli"; packageName = "@mermaid-js/mermaid-cli"; - version = "8.8.1"; + version = "8.8.2-beta.8"; src = fetchurl { - url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.8.1.tgz"; - sha512 = "cESM33+QjLuHUcMk9B2qpsplx4h+97adwI/P0/2SvFwFlhVsFfi82a53vV1638hIBLac+RxGG2aT+Fq8YYHHRQ=="; + url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.8.2-beta.8.tgz"; + sha512 = "X9I7gwvqKVdqVvqi9AVfUWXnHQQYjssWJ2asKfhBDAkQn0vPagKkx6EjzKcRgyIroWGXN6ZpwkQ/gMvTPFlx7g=="; }; dependencies = [ sources."@types/node-14.11.10" @@ -82809,19 +82800,19 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.147.0" - sources."@fluentui/react-focus-7.16.12" + sources."@fluentui/react-7.147.1" + sources."@fluentui/react-focus-7.16.13" sources."@fluentui/react-window-provider-0.3.3" - sources."@fluentui/theme-1.5.0" - sources."@microsoft/load-themed-styles-1.10.113" + sources."@fluentui/theme-1.5.1" + sources."@microsoft/load-themed-styles-1.10.114" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@uifabric/foundation-7.9.13" - sources."@uifabric/icons-7.5.11" + sources."@uifabric/foundation-7.9.14" + sources."@uifabric/icons-7.5.12" sources."@uifabric/merge-styles-7.19.1" sources."@uifabric/react-hooks-7.13.6" sources."@uifabric/set-version-7.0.23" - sources."@uifabric/styling-7.16.12" + sources."@uifabric/styling-7.16.13" sources."@uifabric/utilities-7.32.4" sources."accepts-1.3.7" sources."ajv-6.12.6" @@ -82948,7 +82939,7 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.147.0" + sources."office-ui-fabric-react-7.147.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -83078,18 +83069,18 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "8.1.3"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.1.3.tgz"; - sha512 = "ZbaYib4hT4PpF4bdSO2DohooKXIn4lDeiYqB+vTmCdr6l2woW0b6H3pf5x4sM5nwQMru9RvjjHYWVGltR50ZBw=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.2.0.tgz"; + sha512 = "lEWEMq2LMfNJMKeuEwb5UELi+OgFDollXaytR5ggQcHpzG3NP/R7rvixAvF+9/lLsTWhWG+4yD2M70GsM06nxw=="; }; dependencies = [ + sources."@ungap/promise-all-settled-1.1.2" sources."ansi-colors-4.1.1" sources."ansi-regex-3.0.0" sources."ansi-styles-4.3.0" sources."anymatch-3.1.1" sources."argparse-1.0.10" - sources."array.prototype.map-1.0.2" sources."balanced-match-1.0.0" sources."binary-extensions-2.1.0" sources."brace-expansion-1.1.11" @@ -83097,7 +83088,7 @@ in sources."browser-stdout-1.3.1" sources."camelcase-5.3.1" sources."chalk-4.1.0" - sources."chokidar-3.4.2" + sources."chokidar-3.4.3" (sources."cliui-5.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -83108,67 +83099,39 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."concat-map-0.0.1" - sources."debug-4.1.1" + sources."debug-4.2.0" sources."decamelize-1.2.0" - sources."define-properties-1.1.3" sources."diff-4.0.2" sources."emoji-regex-7.0.3" - (sources."es-abstract-1.17.7" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - sources."object.assign-4.1.1" - ]; - }) - sources."es-array-method-boxes-properly-1.0.0" - sources."es-get-iterator-1.1.0" - sources."es-to-primitive-1.2.1" sources."escape-string-regexp-4.0.0" sources."esprima-4.0.1" sources."fill-range-7.0.1" sources."find-up-5.0.0" - sources."flat-4.1.1" + sources."flat-5.0.2" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" - sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."growl-1.10.5" - sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.1" sources."he-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-arguments-1.0.4" sources."is-binary-path-2.1.0" - sources."is-buffer-2.0.4" - sources."is-callable-1.2.2" - sources."is-date-object-1.0.2" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" - sources."is-map-2.0.1" - sources."is-negative-zero-2.0.0" sources."is-number-7.0.0" - sources."is-plain-obj-1.1.0" - sources."is-regex-1.1.1" - sources."is-set-2.0.1" - sources."is-string-1.0.5" - sources."is-symbol-1.0.3" - sources."isarray-2.0.5" + sources."is-plain-obj-2.1.0" sources."isexe-2.0.0" - sources."iterate-iterator-1.0.1" - sources."iterate-value-1.0.2" sources."js-yaml-3.14.0" sources."locate-path-6.0.0" sources."log-symbols-4.0.0" sources."minimatch-3.0.4" sources."ms-2.1.2" + sources."nanoid-3.1.12" sources."normalize-path-3.0.0" - sources."object-inspect-1.8.0" - sources."object-keys-1.1.1" - sources."object.assign-4.1.0" sources."once-1.4.0" sources."p-limit-3.0.2" sources."p-locate-5.0.0" @@ -83176,26 +83139,23 @@ in sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."picomatch-2.2.2" - sources."promise.allsettled-1.0.2" sources."randombytes-2.1.0" - sources."readdirp-3.4.0" + sources."readdirp-3.5.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."safe-buffer-5.2.1" - sources."serialize-javascript-4.0.0" + sources."serialize-javascript-5.0.1" sources."set-blocking-2.0.0" sources."sprintf-js-1.0.3" sources."string-width-2.1.1" - sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimstart-1.0.1" sources."strip-ansi-4.0.0" - sources."strip-json-comments-3.0.1" - sources."supports-color-7.1.0" + sources."strip-json-comments-3.1.1" + sources."supports-color-7.2.0" sources."to-regex-range-5.0.1" sources."which-2.0.2" sources."which-module-2.0.0" sources."wide-align-1.1.3" - sources."workerpool-6.0.0" + sources."workerpool-6.0.2" (sources."wrap-ansi-5.1.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -83221,18 +83181,10 @@ in ]; }) sources."yargs-parser-13.1.2" - (sources."yargs-unparser-1.6.1" // { + (sources."yargs-unparser-2.0.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - sources."yargs-14.2.3" - sources."yargs-parser-15.0.1" + sources."camelcase-6.1.0" + sources."decamelize-4.0.0" ]; }) ]; @@ -83381,7 +83333,7 @@ in dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.12.1" - (sources."@babel/core-7.12.1" // { + (sources."@babel/core-7.12.3" // { dependencies = [ sources."semver-5.7.1" ]; @@ -83414,10 +83366,10 @@ in sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-validator-option-7.12.1" - sources."@babel/helper-wrap-function-7.10.4" + sources."@babel/helper-wrap-function-7.12.3" sources."@babel/helpers-7.12.1" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.2" + sources."@babel/parser-7.12.3" sources."@babel/plugin-proposal-async-generator-functions-7.12.1" sources."@babel/plugin-proposal-class-properties-7.12.1" sources."@babel/plugin-proposal-dynamic-import-7.12.1" @@ -85224,10 +85176,10 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "7.1.1"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.1.tgz"; - sha512 = "+7TqukzQVlne5EcLrw0Cdm8S26OC4H2mTb5wji4HlsocgB6a9aYHgqlKLKxRMlH/PWNyVQjyRjFhiet7+QZefA=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz"; + sha512 = "CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -86819,7 +86771,7 @@ in sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.2" - sources."node-gyp-7.1.1" + sources."node-gyp-7.1.2" sources."nopt-5.0.0" sources."normalize-url-4.5.0" sources."npm-bundled-1.1.1" @@ -87167,7 +87119,7 @@ in dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.12.1" - (sources."@babel/core-7.12.1" // { + (sources."@babel/core-7.12.3" // { dependencies = [ sources."json5-2.1.3" sources."source-map-0.5.7" @@ -87203,10 +87155,10 @@ in sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-validator-option-7.12.1" - sources."@babel/helper-wrap-function-7.10.4" + sources."@babel/helper-wrap-function-7.12.3" sources."@babel/helpers-7.12.1" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.2" + sources."@babel/parser-7.12.3" sources."@babel/plugin-proposal-async-generator-functions-7.12.1" sources."@babel/plugin-proposal-class-properties-7.12.1" sources."@babel/plugin-proposal-dynamic-import-7.12.1" @@ -87511,7 +87463,7 @@ in (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.0.2" - sources."entities-2.0.3" + sources."entities-2.1.0" ]; }) sources."domain-browser-1.2.0" @@ -87623,7 +87575,7 @@ in sources."html-comment-regex-1.1.2" sources."html-encoding-sniffer-1.0.2" sources."html-tags-1.2.0" - (sources."htmlnano-0.2.6" // { + (sources."htmlnano-0.2.7" // { dependencies = [ sources."posthtml-0.13.4" sources."posthtml-parser-0.5.0" @@ -87775,7 +87727,6 @@ in ]; }) sources."node-releases-1.1.63" - sources."normalize-html-whitespace-1.0.0" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."nth-check-1.0.2" @@ -87938,6 +87889,7 @@ in sources."jsesc-0.5.0" ]; }) + sources."relateurl-0.2.7" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" @@ -90448,7 +90400,7 @@ in sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.2" + sources."@babel/parser-7.12.3" sources."@babel/runtime-7.12.1" sources."@babel/template-7.10.4" sources."@babel/traverse-7.12.1" @@ -90907,6 +90859,7 @@ in ]; }) sources."@typescript-eslint/visitor-keys-3.10.1" + sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" sources."agent-base-4.3.0" @@ -90916,7 +90869,6 @@ in sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" sources."argparse-1.0.10" - sources."array.prototype.map-1.0.2" sources."astral-regex-1.0.0" sources."asynckit-0.4.0" sources."azure-devops-node-api-7.2.0" @@ -90940,7 +90892,7 @@ in ]; }) sources."cheerio-1.0.0-rc.3" - sources."chokidar-3.4.2" + sources."chokidar-3.4.3" (sources."cliui-5.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -90962,7 +90914,6 @@ in sources."deep-freeze-0.0.1" sources."deep-is-0.1.3" sources."deepmerge-4.2.2" - sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" sources."denodeify-1.2.1" sources."diff-4.0.2" @@ -90979,15 +90930,6 @@ in sources."emoji-regex-7.0.3" sources."enquirer-2.3.6" sources."entities-1.1.2" - (sources."es-abstract-1.17.7" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - sources."object.assign-4.1.1" - ]; - }) - sources."es-array-method-boxes-properly-1.0.0" - sources."es-get-iterator-1.1.0" - sources."es-to-primitive-1.2.1" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" @@ -91022,22 +90964,19 @@ in sources."file-entry-cache-5.0.1" sources."fill-range-7.0.1" sources."find-up-5.0.0" - sources."flat-4.1.1" + sources."flat-5.0.2" sources."flat-cache-2.0.1" sources."flatted-2.0.2" sources."form-data-3.0.0" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" - sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-caller-file-2.0.5" sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."globals-12.4.0" sources."growl-1.10.5" - sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.1" sources."he-1.2.0" sources."htmlparser2-3.10.1" (sources."http-proxy-agent-2.1.0" // { @@ -91056,28 +90995,15 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-arguments-1.0.4" sources."is-binary-path-2.1.0" - sources."is-buffer-2.0.4" - sources."is-callable-1.2.2" - sources."is-date-object-1.0.2" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" - sources."is-map-2.0.1" sources."is-module-1.0.0" - sources."is-negative-zero-2.0.0" sources."is-number-7.0.0" - sources."is-plain-obj-1.1.0" + sources."is-plain-obj-2.1.0" sources."is-reference-1.2.1" - sources."is-regex-1.1.1" - sources."is-set-2.0.1" - sources."is-string-1.0.5" - sources."is-symbol-1.0.3" - sources."isarray-2.0.5" sources."isexe-2.0.0" - sources."iterate-iterator-1.0.1" - sources."iterate-value-1.0.2" sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."json-schema-traverse-0.4.1" @@ -91102,24 +91028,21 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - (sources."mocha-8.1.3" // { + (sources."mocha-8.2.0" // { dependencies = [ - sources."debug-4.1.1" + sources."debug-4.2.0" sources."escape-string-regexp-4.0.0" sources."has-flag-4.0.0" - sources."strip-json-comments-3.0.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."ms-2.1.2" sources."mute-stream-0.0.8" + sources."nanoid-3.1.12" sources."natural-compare-1.4.0" sources."node-fetch-2.6.1" sources."normalize-path-3.0.0" sources."nth-check-1.0.2" - sources."object-inspect-1.8.0" - sources."object-keys-1.1.1" - sources."object.assign-4.1.0" sources."once-1.4.0" sources."optionator-0.9.1" sources."os-0.1.1" @@ -91144,13 +91067,12 @@ in sources."picomatch-2.2.2" sources."prelude-ls-1.2.1" sources."progress-2.0.3" - sources."promise.allsettled-1.0.2" sources."pseudomap-1.0.2" sources."punycode-2.1.1" sources."randombytes-2.1.0" sources."read-1.0.7" sources."readable-stream-3.6.0" - sources."readdirp-3.4.0" + sources."readdirp-3.5.0" sources."regexpp-3.1.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" @@ -91160,7 +91082,7 @@ in sources."rollup-2.32.0" sources."safe-buffer-5.2.1" sources."semver-6.3.0" - sources."serialize-javascript-4.0.0" + sources."serialize-javascript-5.0.1" sources."set-blocking-2.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -91174,8 +91096,6 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimstart-1.0.1" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" @@ -91224,7 +91144,7 @@ in ]; }) sources."word-wrap-1.2.3" - sources."workerpool-6.0.0" + sources."workerpool-6.0.2" (sources."wrap-ansi-5.1.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -91245,15 +91165,10 @@ in ]; }) sources."yargs-parser-13.1.2" - (sources."yargs-unparser-1.6.1" // { + (sources."yargs-unparser-2.0.0" // { dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - sources."yargs-14.2.3" - sources."yargs-parser-15.0.1" + sources."camelcase-6.1.0" + sources."decamelize-4.0.0" ]; }) sources."yauzl-2.10.0" @@ -95632,7 +95547,7 @@ in }) sources."domelementtype-1.3.1" sources."domutils-1.7.0" - sources."entities-2.0.3" + sources."entities-2.1.0" sources."es-abstract-1.17.7" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" @@ -97615,7 +97530,7 @@ in sources."@types/node-14.11.10" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" - sources."abstract-logging-2.0.0" + sources."abstract-logging-2.0.1" sources."accepts-1.3.7" sources."after-0.8.2" (sources."agent-base-6.0.1" // { @@ -98640,7 +98555,7 @@ in sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-4.0.2" - sources."diff2html-3.1.13" + sources."diff2html-3.1.14" sources."dnd-page-scroll-0.0.4" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" @@ -102373,7 +102288,7 @@ in dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.12.1" - sources."@babel/core-7.12.1" + sources."@babel/core-7.12.3" sources."@babel/generator-7.12.1" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" @@ -102398,10 +102313,10 @@ in sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-validator-option-7.12.1" - sources."@babel/helper-wrap-function-7.10.4" + sources."@babel/helper-wrap-function-7.12.3" sources."@babel/helpers-7.12.1" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.2" + sources."@babel/parser-7.12.3" sources."@babel/plugin-proposal-async-generator-functions-7.12.1" sources."@babel/plugin-proposal-class-properties-7.12.1" sources."@babel/plugin-proposal-dynamic-import-7.12.1" diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index c036af3ac43..98c52a5a0af 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -620,6 +620,7 @@ self: super: { nodePackageNames = [ "coc-go" "coc-css" + "coc-diagnostic" "coc-emmet" "coc-eslint" "coc-git" From a0a9e4d83d7bbc9b34a2b5f79b6a93f3d07ef171 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 16:04:50 +0000 Subject: [PATCH 414/546] argo: 2.10.1 -> 2.11.5 --- pkgs/applications/networking/cluster/argo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 72c3955f90f..b370381b902 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,16 +19,16 @@ let in buildGoModule rec { pname = "argo"; - version = "2.10.1"; + version = "2.11.5"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "1k023rq4p0hvq5famxm83csp3zsijrki8myk6v83xyfigwxc8sia"; + sha256 = "0p72v6bb2hbw2xndrzr13zkc91i1jcd67x4qgai136hp9mv97bk3"; }; - vendorSha256 = "0fqdxs3r4249qxlc9cac0lpbqf2aifkcah07v0cckb9rxfyiwhjz"; + vendorSha256 = "1ca0ssvbi4vrsn9ljc783hnh9bmf5p8nr1lz5wm8g3gbrrrf1ray"; doCheck = false; From 9320c69ecb65d25a8eecb32b02652c5ff8443e4d Mon Sep 17 00:00:00 2001 From: Matt Huszagh Date: Sat, 17 Oct 2020 09:32:55 -0700 Subject: [PATCH 415/546] kicad: set default footprint, symbol library and package locations Previously, these library locations were set absolutely. This prevented overriding their locations with environment variables. Now, setting the corresponding environment variable will override the setting in the environment wrapper. For instance, I can set KISYSMOD=/some/path/to/footprints and this will be used as my footprint library instead of the default footprint library in the nix store. This feature is particularly useful for having kicad libraries which are writable. --- pkgs/applications/science/electronics/kicad/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 7bf45a8fc54..7290503311d 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -197,13 +197,13 @@ stdenv.mkDerivation rec { "--prefix XDG_DATA_DIRS : ${cups}/share" "--prefix GIO_EXTRA_MODULES : ${gnome3.dconf}/lib/gio/modules" - "--set KISYSMOD ${footprints}/share/kicad/modules" - "--set KICAD_SYMBOL_DIR ${symbols}/share/kicad/library" - "--set KICAD_TEMPLATE_DIR ${templates}/share/kicad/template" + "--set-default KISYSMOD ${footprints}/share/kicad/modules" + "--set-default KICAD_SYMBOL_DIR ${symbols}/share/kicad/library" + "--set-default KICAD_TEMPLATE_DIR ${templates}/share/kicad/template" "--prefix KICAD_TEMPLATE_DIR : ${symbols}/share/kicad/template" "--prefix KICAD_TEMPLATE_DIR : ${footprints}/share/kicad/template" ] - ++ optionals (with3d) [ "--set KISYS3DMOD ${packages3d}/share/kicad/modules/packages3d" ] + ++ optionals (with3d) [ "--set-default KISYS3DMOD ${packages3d}/share/kicad/modules/packages3d" ] ++ optionals (withNgspice) [ "--prefix LD_LIBRARY_PATH : ${libngspice}/lib" ] # infinisil's workaround for #39493 From 3326933ca97377c132c1b6df92a1689127141826 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 02:45:46 +0000 Subject: [PATCH 416/546] python37Packages.phonopy: 2.7.1 -> 2.8.1 --- pkgs/development/python-modules/phonopy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index b476543c06a..1a768b7cf57 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonopy"; - version = "2.7.1"; + version = "2.8.1"; src = fetchPypi { inherit pname version; - sha256 = "482c6ff29c058d091ac885e561e28ba3e516ea9e91c44a951cad11f3ae19856c"; + sha256 = "28864b04adb900597705f1367a100da869af835088bdd13f1693c4382259f128"; }; propagatedBuildInputs = [ numpy pyyaml matplotlib h5py spglib ]; From e5a55070db6ffb2dc6ac3c7555a95f8ed23014f5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 03:01:11 +0000 Subject: [PATCH 417/546] python37Packages.simplefix: 1.0.12 -> 1.0.14 --- pkgs/development/python-modules/simplefix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simplefix/default.nix b/pkgs/development/python-modules/simplefix/default.nix index 06968443426..6e498ebeaea 100644 --- a/pkgs/development/python-modules/simplefix/default.nix +++ b/pkgs/development/python-modules/simplefix/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "simplefix"; - version = "1.0.12"; + version = "1.0.14"; src = fetchFromGitHub { repo = "simplefix"; owner = "da4089"; rev = "v${version}"; - sha256 = "0pnyqxpki1ija0kha7axi6irgiifcz4w77libagkv46b1z11cc4r"; + sha256 = "1qccb63w6swq7brp0zinkkngpazmb25r21adry5cq6nniqs5g5zx"; }; checkPhase = '' From b16569f02f5dee25c3a021fc57c9474e8cc4a63a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 03:25:14 +0000 Subject: [PATCH 418/546] python37Packages.aiokafka: 0.5.2 -> 0.6.0 --- pkgs/development/python-modules/aiokafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiokafka/default.nix b/pkgs/development/python-modules/aiokafka/default.nix index b83da06c481..c6cfe99297b 100644 --- a/pkgs/development/python-modules/aiokafka/default.nix +++ b/pkgs/development/python-modules/aiokafka/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiokafka"; - version = "0.5.2"; + version = "0.6.0"; disabled = isPy27; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "aiokafka"; rev = "v${version}"; - sha256 = "062kqsq75fi5pbpqf2a8nxm43pxpr6bwplg6bp4nv2a68r850pki"; + sha256 = "1l5nkz9blmfrbsj7m76vm8vcfdgvab33anzpq62384scp9yf8dln"; }; nativeBuildInputs = [ From 5d15eec20b8ab6653d20948668416d0a34b1a2e8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 00:51:14 +0000 Subject: [PATCH 419/546] python37Packages.sseclient: 0.0.26 -> 0.0.27 --- pkgs/development/python-modules/sseclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sseclient/default.nix b/pkgs/development/python-modules/sseclient/default.nix index 8ba678ed575..b446aa808b4 100644 --- a/pkgs/development/python-modules/sseclient/default.nix +++ b/pkgs/development/python-modules/sseclient/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "sseclient"; - version = "0.0.26"; + version = "0.0.27"; src = fetchPypi { inherit pname version; - sha256 = "33f45ab71bb6369025d6a1014e15f12774f7ea25b7e80eeb00bd73668d5fefad"; + sha256 = "b2fe534dcb33b1d3faad13d60c5a7c718e28f85987f2a034ecf5ec279918c11c"; }; propagatedBuildInputs = [ requests six ]; From d1d1e39a584b8f39ff7ba552d1907ab249b8076e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 17 Oct 2020 09:48:46 -0700 Subject: [PATCH 420/546] python2Packages.sseclient: disable tests --- pkgs/development/python-modules/sseclient/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sseclient/default.nix b/pkgs/development/python-modules/sseclient/default.nix index b446aa808b4..ebc6435bc79 100644 --- a/pkgs/development/python-modules/sseclient/default.nix +++ b/pkgs/development/python-modules/sseclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, fetchPypi, isPy27 , requests, six , backports_unittest-mock, pytestCheckHook, pytestrunner }: @@ -13,6 +13,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests six ]; + # some tests use python3 strings + doCheck = !isPy27; checkInputs = [ backports_unittest-mock pytestCheckHook pytestrunner ]; # tries to open connection to wikipedia From bf7b73ce65f0bd02481ec1e1cbd1d18ed9046a41 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 04:46:53 +0000 Subject: [PATCH 421/546] python37Packages.yamllint: 1.24.2 -> 1.25.0 --- pkgs/development/python-modules/yamllint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index 892a9840a34..f0407dff173 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.24.2"; + version = "1.25.0"; src = fetchPypi { inherit pname version; - sha256 = "07xn11i0c7x72xjxkkzrq9zxl40vfdr41mfvhlayrk6dpbk8vdj0"; + sha256 = "b1549cbe5b47b6ba67bdeea31720f5c51431a4d0c076c1557952d841f7223519"; }; checkInputs = [ nose ]; From 0437b9c9112bb76dbe4977f63f4cc7407de0dac4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 05:18:24 +0000 Subject: [PATCH 422/546] python37Packages.howdoi: 2.0.5 -> 2.0.7 --- pkgs/development/python-modules/howdoi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix index a4f1ab6b772..5b8cb6cecb9 100644 --- a/pkgs/development/python-modules/howdoi/default.nix +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "howdoi"; - version = "2.0.5"; + version = "2.0.7"; src = fetchPypi { inherit pname version; - sha256 = "8e4d048ae7ca6182d648f62a66d07360cca2504fe46649c32748b6ef2735f7f4"; + sha256 = "09362f7390119dffd83c61a942801ad4d19aee499340ef7e8d5871167391d3d6"; }; postPatch = '' From 6de38f76ddea58e372ab6a40f688e1f6fcc6b607 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 05:03:04 +0000 Subject: [PATCH 423/546] python37Packages.google_cloud_firestore: 1.8.1 -> 1.9.0 --- .../python-modules/google_cloud_firestore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_firestore/default.nix b/pkgs/development/python-modules/google_cloud_firestore/default.nix index efc52657fd9..a5d349456fd 100644 --- a/pkgs/development/python-modules/google_cloud_firestore/default.nix +++ b/pkgs/development/python-modules/google_cloud_firestore/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "1.8.1"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "dfe02fc0a77a4e28144c46d441553352d81498ffd8f49906b57342d06c7f5b54"; + sha256 = "d8a56919a3a32c7271d1253542ec24cb13f384a726fed354fdeb2a2269f25d1c"; }; checkInputs = [ pytest ]; From 32c5b753fae9dd2ce217dcfe53bed34f9be85abd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 03:14:52 +0000 Subject: [PATCH 424/546] python37Packages.msal: 1.4.3 -> 1.5.0 --- pkgs/development/python-modules/msal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index a75560e3b55..eae7eadb7f9 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msal"; - version = "1.4.3"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "51b8e8e0d918d9b4813f006324e7c4e21eb76268dd4c1a06d811a3475ad4ac57"; + sha256 = "cc67d3a14850ba7e533ec5d05a4c23a34dd74a7fa5e0210daebef397b2009b0e"; }; propagatedBuildInputs = [ From a08d761d1ede28df78b758004651a65096a196e3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 17 Oct 2020 09:52:18 -0700 Subject: [PATCH 425/546] python2Packages.msal-extensions: fix dependencies --- pkgs/development/python-modules/msal-extensions/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/msal-extensions/default.nix b/pkgs/development/python-modules/msal-extensions/default.nix index 6f3a8b89245..91f7ecf9667 100644 --- a/pkgs/development/python-modules/msal-extensions/default.nix +++ b/pkgs/development/python-modules/msal-extensions/default.nix @@ -1,9 +1,11 @@ { buildPythonPackage , fetchPypi , lib +, isPy27 # pythonPackages , msal +, pathlib2 , portalocker }: @@ -19,6 +21,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ msal portalocker + ] ++ lib.optionals isPy27 [ + pathlib2 ]; # No tests found From 29bc54311f7c71a2ad3fb524c8031f6f96aeef74 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 05:10:27 +0000 Subject: [PATCH 426/546] python37Packages.sqlobject: 3.8.0 -> 3.8.1 --- pkgs/development/python-modules/sqlobject/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix index 05dab8d0265..ccd4190bbfd 100644 --- a/pkgs/development/python-modules/sqlobject/default.nix +++ b/pkgs/development/python-modules/sqlobject/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "SQLObject"; - version = "3.8.0"; + version = "3.8.1"; src = fetchPypi { inherit pname version; - sha256 = "00fb93313067cdbe52fe436eef1e79038b42c969cf44016b24f9eae0511db2d7"; + sha256 = "620657105ab5720658222d10ad13c52281fe524137b59ab166eee4427ee2f548"; }; checkInputs = [ pytest ]; From a8049ded495d64c8dc96b4a1184f5b1527d1a603 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 04:08:20 +0000 Subject: [PATCH 427/546] python37Packages.treq: 20.4.1 -> 20.9.0 --- pkgs/development/python-modules/treq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 1ec88ff1b77..919ef529407 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "treq"; - version = "20.4.1"; + version = "20.9.0"; src = fetchPypi { inherit pname version; - sha256 = "115wwb3sripl3xvwpygwyrxrapyis0i7w1yq591z3dwl9k9fgzk8"; + sha256 = "83cd2ca75aef4f1fbdbe144c186426d930c3e8b20385df8cec9e12d442986da2"; }; propagatedBuildInputs = [ From 350a1bbdcab90334572e37179dbb901724300a30 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 17:06:59 +0000 Subject: [PATCH 428/546] bandwhich: 0.19.0 -> 0.20.0 --- pkgs/tools/networking/bandwhich/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix index 58bb1e3e390..909f08e7bdd 100644 --- a/pkgs/tools/networking/bandwhich/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bandwhich"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "imsnif"; repo = pname; rev = version; - sha256 = "0963yfbf88hb5fvyckhs1vfvib5skkj9n17qibpv5vsdlynbaa96"; + sha256 = "014blvrv0kk4gzga86mbk7gd5dl1szajfi972da3lrfznck1w24n"; }; - cargoSha256 = "0xp45kb0z7wiq6vnws4q7khbzslywh24sb43ssr39l1rajf7w64r"; + cargoSha256 = "0b5pqsdggdjq9sl54rmh2gaq31va6b2crdv7ihh3198ixwasaf02"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; From 69bf6db33e7b6ccf410a9f2c2d46f51f0c89800c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 17 Oct 2020 19:09:39 +0200 Subject: [PATCH 429/546] inxi: 3.1.07-1 -> 3.1.08-1 --- pkgs/tools/system/inxi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index f19f50e5e32..2ede543cd39 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -22,13 +22,13 @@ let ++ recommendedDisplayInformationPrograms; in stdenv.mkDerivation rec { pname = "inxi"; - version = "3.1.07-1"; + version = "3.1.08-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "0hs4m2vmfc6srscaz72r6zpkn6n7msgzlps376ks38gj1l103xfn"; + sha256 = "15b0fn8kv09k7kzyzix1pr1wmjw5yinzgw01v8pf9p547m4a899a"; }; buildInputs = [ perl makeWrapper ]; From 0c695515e2007cb78c6fde6620885a18be9636f9 Mon Sep 17 00:00:00 2001 From: Matt Huszagh Date: Sun, 20 Oct 2019 18:04:20 -0700 Subject: [PATCH 430/546] pythonPackages.python-openems: init at unstable-2020-02-15 --- .../python-modules/python-openems/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/python-openems/default.nix diff --git a/pkgs/development/python-modules/python-openems/default.nix b/pkgs/development/python-modules/python-openems/default.nix new file mode 100644 index 00000000000..dd669cf5475 --- /dev/null +++ b/pkgs/development/python-modules/python-openems/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cython +, openems +, csxcad +, boost +, python-csxcad +, numpy +, h5py +}: + +buildPythonPackage rec { + pname = "python-openems"; + version = "unstable-2020-02-15"; + + src = fetchFromGitHub { + owner = "thliebig"; + repo = "openEMS"; + rev = "ba793ac84e2f78f254d6d690bb5a4c626326bbfd"; + sha256 = "1dca6b6ccy771irxzsj075zvpa3dlzv4mjb8xyg9d889dqlgyl45"; + }; + + sourceRoot = "source/python"; + + nativeBuildInputs = [ + cython + boost + ]; + + propagatedBuildInputs = [ + openems + csxcad + python-csxcad + numpy + h5py + ]; + + setupPyBuildFlags = "-I${openems}/include -L${openems}/lib -R${openems}/lib"; + pythonImportsCheck = [ "openEMS" ]; + + meta = with lib; { + description = "Python interface to OpenEMS"; + homepage = "http://openems.de/index.php/Main_Page.html"; + license = licenses.gpl3; + maintainers = with maintainers; [ matthuszagh ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 809a54de673..b7346675e64 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4510,6 +4510,8 @@ in { python-csxcad = callPackage ../development/python-modules/python-csxcad { }; + python-openems = callPackage ../development/python-modules/python-openems { }; + pkutils = callPackage ../development/python-modules/pkutils { }; plac = callPackage ../development/python-modules/plac { }; From 50f77f31f4bc16a180f811d236d5fd6466bf61b8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 17:41:33 +0000 Subject: [PATCH 431/546] bazelisk: 1.7.1 -> 1.7.2 --- pkgs/development/tools/bazelisk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index 3d475c1f880..26a0dd86670 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "18akakh9bnpn0sngxar9f0r9hhx7dkd8y6q4j16x2d193gcw53c7"; + sha256 = "0psqhv2cm2xwjyivaza2s6x780q6yjn1nsjdy538zjky22dazqq4"; }; vendorSha256 = "116wy1a7gmi2w8why9hszhcybfvpwp4iq62vshb25cdcma6q4mjh"; From 8496b8426e104b79986713fb0b070f0f62abfaff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 10:52:37 -0700 Subject: [PATCH 432/546] bazel-kazel: 0.1.0 -> 0.1.1 (#100851) --- pkgs/development/tools/bazel-kazel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/bazel-kazel/default.nix b/pkgs/development/tools/bazel-kazel/default.nix index 55f79a993ac..20b17de0c21 100644 --- a/pkgs/development/tools/bazel-kazel/default.nix +++ b/pkgs/development/tools/bazel-kazel/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazel-kazel"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "kubernetes"; repo = "repo-infra"; rev = "v${version}"; - sha256 = "121asn0h2vfgqnjk72wqjcfq0w15k15abjdm39i8hv455kzrc2hs"; + sha256 = "0d59kf0y12sa1bki7gzcb2nzppwj3gxlv133bsnl9gc8vx1d8ldg"; }; vendorSha256 = "1pzkjh4n9ai8yqi98bkdhicjdr2l8j3fckl5n90c2gdcwqyxvgkf"; From f62aa57abbcf0432e1c0466abb5666fd71c78cc0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 00:44:09 +0000 Subject: [PATCH 433/546] python37Packages.diff_cover: 3.0.1 -> 4.0.1 --- pkgs/development/python-modules/diff_cover/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix index 9f96c7644df..ab9d9493fd6 100644 --- a/pkgs/development/python-modules/diff_cover/default.nix +++ b/pkgs/development/python-modules/diff_cover/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "diff_cover"; - version = "3.0.1"; + version = "4.0.1"; preCheck = '' export LC_ALL=en_US.UTF-8; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "13768c8bc755dd8e1184ce79b95bbc8115ea566282f4b06efbeca72a4d00427b"; + sha256 = "61a98ec126552d985c0e3e3c33cc72e79d7577f91f6edba99f635411a173d3b9"; }; propagatedBuildInputs = [ jinja2 jinja2_pluralize pygments six inflect ]; From 9524e93607ae5b8287fb356af31e49c19be8fc9e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 15 Oct 2020 14:33:57 -0700 Subject: [PATCH 434/546] python3Packages.pynacl: 1.3.0 -> 1.4.0 --- pkgs/development/python-modules/pynacl/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index 78fe9672a8b..5ce85acc194 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pynacl"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit version; pname = "PyNaCl"; - sha256 = "0c6100edd16fefd1557da078c7a31e7b7d7a52ce39fdca2bec29d4f7b6e7600c"; + sha256 = "01b56hxrbif3hx8l6rwz5kljrgvlbj7shmmd2rjh0hn7974a5sal"; }; checkInputs = [ pytest hypothesis_4 ]; @@ -24,20 +24,10 @@ buildPythonPackage rec { SODIUM_INSTALL = "system"; - # fixed in next release 1.3.0+ - # https://github.com/pyca/pynacl/pull/480 - postPatch = '' - substituteInPlace tests/test_bindings.py \ - --replace "average_size=128," "" - ''; - checkPhase = '' py.test ''; - # https://github.com/pyca/pynacl/issues/550 - PYTEST_ADDOPTS = "-k 'not test_wrong_types'"; - meta = with stdenv.lib; { maintainers = with maintainers; [ va1entin ]; description = "Python binding to the Networking and Cryptography (NaCl) library"; From 937a2f9cbbc8b7f389ad798d2155a914276a707f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 01:10:02 +0000 Subject: [PATCH 435/546] python37Packages.pyspark: 3.0.0 -> 3.0.1 --- pkgs/development/python-modules/pyspark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index 22b68406082..d71cf2a0f43 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyspark"; - version = "3.0.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "8c6e5cc51d91eb8d43e81d0b7093292b5e144ac81445491d5f887d2cf4fe121f"; + sha256 = "38b485d3634a86c9a2923c39c8f08f003fdd0e0a3d7f07114b2fb4392ce60479"; }; # pypandoc is broken with pandoc2, so we just lose docs. From a60ed8e2db86d7a8f341b39e48ccfd423eaa7b0d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 01:27:31 +0000 Subject: [PATCH 436/546] python37Packages.lightgbm: 2.3.1 -> 3.0.0 --- pkgs/development/python-modules/lightgbm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index 95dac53c97c..27b2e948776 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "lightgbm"; - version = "2.3.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "bd1817be401e74c0d8b049e97ea2f35d2ce155cfa130119ce4195ea207bd6388"; + sha256 = "05f5b358469a679dbf27521d926750ca53ff1e61a6c0293d49af30094ebd9d4a"; }; nativeBuildInputs = [ From 38d70ddd5d67d6c142da671cccc6b9d1ef09d220 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 02:54:17 +0000 Subject: [PATCH 437/546] python37Packages.pysonos: 0.0.32 -> 0.0.35 --- pkgs/development/python-modules/pysonos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix index cf1f74b9b79..c51849d171c 100644 --- a/pkgs/development/python-modules/pysonos/default.nix +++ b/pkgs/development/python-modules/pysonos/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pysonos"; - version = "0.0.32"; + version = "0.0.35"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b739d20807f5fac95f8e02831faaf04023b7a8cb6f371024d89fd16c6bd8a589"; + sha256 = "3a0f8f6eb6ba0623b93a6995c1978cf72c4eedc5fbedac194e6d89e1b6b985e4"; }; propagatedBuildInputs = [ xmltodict requests ifaddr ]; From 0690d7804a3d31879feeb3407de9f5083532a3a4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 17:48:07 +0000 Subject: [PATCH 438/546] python37Packages.bids-validator: 1.5.4 -> 1.5.6 --- pkgs/development/python-modules/bids-validator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index bcf45aff832..f97fffe93f0 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.5.4"; + version = "1.5.6"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "b8292f4efb3617532f93c60acfec242150406bfd9e298d7f01187d67c311aa91"; + sha256 = "ef9476ded8226c86fe1d6e6b9f380666ada7a0f4ae39bd5afd7eabbbc6979ab7"; }; # needs packages which are not available in nixpkgs From a6c9267d964119eb660ce94dc6bfa0067eb29a79 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 17:29:55 +0000 Subject: [PATCH 439/546] python37Packages.azure-mgmt-sql: 0.21.0 -> 0.22.0 --- pkgs/development/python-modules/azure-mgmt-sql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix index e4ee9c90519..dd80641a48a 100644 --- a/pkgs/development/python-modules/azure-mgmt-sql/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-sql/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-sql"; - version = "0.21.0"; + version = "0.22.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7bf7a41d2e42532a00b5f41d3fc0512244451a35f038ac0a25c96ef2c5c04300"; + sha256 = "01c82a1559f49e5f51021b8fbd35e738e08cbede1f39cf00da8085c853575f39"; }; propagatedBuildInputs = [ From ec55608ae25bf1bc3f1772f98f1475c1440276e5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 19:10:59 +0000 Subject: [PATCH 440/546] python37Packages.snowflake-sqlalchemy: 1.2.3 -> 1.2.4 --- .../python-modules/snowflake-sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index 0eb0b6bebec..99c5822f350 100644 --- a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "snowflake-sqlalchemy"; - version = "1.2.3"; + version = "1.2.4"; src = fetchPypi { inherit pname version; - sha256 = "2c598ef37623ef4d035a827f1e84725b3239a47f4366417d089de88f72fc4ac9"; + sha256 = "e79d83d4947a0945488699324802eda4ad4a63c7680ad5b2a42c71f4faa2cd8b"; }; propagatedBuildInputs = [ From e07cf5d4bfe6d8e17733a4ee393aa751f564b4d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Wed, 14 Oct 2020 23:11:44 +0200 Subject: [PATCH 441/546] python3Package.pytest-flask: remove support for python 2.7 As stated in its changelog [1], python 2.7 is no longer supported. [1] https://github.com/pytest-dev/pytest-flask/blob/master/docs/changelog.rst --- pkgs/development/python-modules/pytest-flask/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pytest-flask/default.nix b/pkgs/development/python-modules/pytest-flask/default.nix index 047b06d9792..61c9d37267e 100644 --- a/pkgs/development/python-modules/pytest-flask/default.nix +++ b/pkgs/development/python-modules/pytest-flask/default.nix @@ -1,8 +1,9 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, flask, werkzeug, setuptools_scm }: +{ stdenv, buildPythonPackage, fetchPypi, pytest, flask, werkzeug, setuptools_scm, isPy27 }: buildPythonPackage rec { pname = "pytest-flask"; version = "1.0.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; @@ -11,11 +12,8 @@ buildPythonPackage rec { doCheck = false; - buildInputs = [ - pytest - ]; - propagatedBuildInputs = [ + pytest flask werkzeug ]; From 347cb204cae5258d28ff8789f40110ffae265780 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 10:49:37 +0000 Subject: [PATCH 442/546] python37Packages.google_resumable_media: 1.0.0 -> 1.1.0 --- .../python-modules/google_resumable_media/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_resumable_media/default.nix b/pkgs/development/python-modules/google_resumable_media/default.nix index 5bd95004f93..37bfbfc481b 100644 --- a/pkgs/development/python-modules/google_resumable_media/default.nix +++ b/pkgs/development/python-modules/google_resumable_media/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "FzrMa63hSApSn6KcbCcXVDri3AnULpRh/bhvOVAu/PI="; + sha256 = "dcdab13e95bc534d268f87d5293e482cce5bc86dfce6ca0f2e2e89cbb73ef38c"; }; checkInputs = [ pytest mock ]; From e20652da9be165f350a06d5a44df1451f31eb1bd Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 5 Oct 2020 14:28:46 -0400 Subject: [PATCH 443/546] elastix: 5.0.0 -> 5.0.1; unbreak OS X build --- .../science/biology/elastix/default.nix | 20 +++++++------------ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix index 4d98b12928f..e55a72fb9f8 100644 --- a/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -1,32 +1,26 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, itk, python3 }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, itk, python3, Cocoa }: stdenv.mkDerivation rec { pname = "elastix"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "SuperElastix"; repo = pname; rev = version; - sha256 = "1zrl7rz4lwsx88b2shnl985f3a97lmp4ksbd437h9y0hfjq8l0lj"; + sha256 = "1mx8kkak2d3ibfrxrh8jkmh2zkdlgl9h578wiw3617zcwaa97bxw"; }; patches = [ (fetchpatch { - name = "itk-5.1-compat.patch"; - url = "https://github.com/SuperElastix/elastix/commit/402e9a26f22f805b8f2db00c00e59f75fa1783ad.patch"; - sha256 = "1il6gc1lgy78i0w6gkkppr61nh6g0yjspbfk19hcz20778m5jhz9"; - }) - (fetchpatch { - name = "fix-osx-build.patch"; - url = "https://github.com/SuperElastix/elastix/commit/52e1dc3928046f9fbb85d4b2ecd0d5175fa9695d.patch"; - sha256 = "1hf7kgx1jv497pf0x5wj79sy1wncxcvhrkix9w086lcr8zwxvn9q"; + name = "install-executables.patch"; # https://github.com/SuperElastix/elastix/issues/305 + url = "https://github.com/SuperElastix/elastix/commit/8e26cdc0d66f6030c7be085fdc424d84d4fc7546.patch"; + sha256 = "12y9wbpi9jlarnw6fk4iby97jxvx5g4daq9zqblbcmn51r134bj5"; }) ]; - nativeBuildInputs = [ cmake python3 ]; - buildInputs = [ itk ]; + buildInputs = [ itk ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; doCheck = !stdenv.isDarwin; # usual dynamic linker issues diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a15e49b650..667503f6e80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12342,7 +12342,9 @@ in egl-wayland = callPackage ../development/libraries/egl-wayland {}; - elastix = callPackage ../development/libraries/science/biology/elastix { }; + elastix = callPackage ../development/libraries/science/biology/elastix { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; enchant1 = callPackage ../development/libraries/enchant/1.x.nix { }; From 67f67075c0e7d4958144fa01164ff4eb89a3d83f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 17 Oct 2020 11:51:51 -0700 Subject: [PATCH 444/546] python3Packages.datasette: minimize test time --- .../python-modules/datasette/default.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 5fa42c861ed..3ae21421816 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -73,19 +73,26 @@ buildPythonPackage rec { --replace "PyYAML~=5.3" "PyYAML" ''; - # test_html is very slow - # test_black fails on darwin - dontUseSetuptoolsCheck = true; + # takes 30-180 mins to run entire test suite, not worth the cpu resources, slows down reviews + # with pytest-xdist, it still takes around 10mins with 32 cores + # just run the messages tests, as this should give some indictation of correctness pytestFlagsArray = [ - "--ignore=tests/test_html.py" - "--ignore=tests/test_docs.py" - "--ignore=tests/test_black.py" + "tests/test_messages.py" ]; disabledTests = [ "facet" "_invalid_database" # checks error message when connecting to invalid database ]; - pythonImportsCheck = [ "datasette" ]; + + pythonImportsCheck = [ + "datasette" + "datasette.cli" + "datasette.app" + "datasette.database" + "datasette.renderer" + "datasette.tracer" + "datasette.plugins" + ]; meta = with lib; { description = "An instant JSON API for your SQLite databases"; From 0ed7c480e2bc0c42071df4c129dfc7519cb618d0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Oct 2020 23:51:38 +0200 Subject: [PATCH 445/546] python3Packages.trio: 0.16.0 -> 0.17.0 --- pkgs/development/python-modules/trio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 658dea91049..94da63cd3ec 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "trio"; - version = "0.16.0"; - disabled = pythonOlder "3.5"; + version = "0.17.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "df067dd0560c321af39d412cd81fc3a7d13f55af9150527daab980683e9fcf3c"; + sha256 = "0zcxirpdvvl54pbfkgw7vz984879xwvdygqfpggnam24is2zjp78"; }; checkInputs = [ astor pytestCheckHook pyopenssl trustme jedi pylint yapf ]; From 4dfbf286e332510f3beb24eda3131bff06045ccc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 18:06:41 +0000 Subject: [PATCH 446/546] python37Packages.azure-mgmt-subscription: 0.6.0 -> 0.7.0 --- .../python-modules/azure-mgmt-subscription/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix index 6a429a056f4..ee661627222 100644 --- a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-subscription"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7448a322eceed3d300e181fde0f626c0e37df773f6c7297df2b73d98cb0936cf"; + sha256 = "37f570b8872ae65dce312da116588ab8407a5c8a10d959597e61d19b21799f77"; }; propagatedBuildInputs = [ From 0d0c9769b062d3cf4e2d6ff5cbaa5071804ac48c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Oct 2020 20:22:59 +0200 Subject: [PATCH 447/546] python3Packages.wled: init at 0.4.4 --- .../python-modules/wled/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/wled/default.nix diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix new file mode 100644 index 00000000000..329cdd5b610 --- /dev/null +++ b/pkgs/development/python-modules/wled/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, aiohttp +, backoff +, packaging +, yarl +, aresponses +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "wled"; + version = "0.4.4"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "frenck"; + repo = "python-wled"; + rev = "v${version}"; + sha256 = "1adh23v4c9kia3ddqdq0brksd5rhgh4ff7l5hil8klx4dmkrjfz3"; + }; + + propagatedBuildInputs = [ + aiohttp + backoff + packaging + yarl + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportCheck = [ "wled" ]; + + meta = with lib; { + description = "Asynchronous Python client for WLED"; + homepage = "https://github.com/frenck/python-wled"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b7346675e64..b3d1c5cfe85 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7548,6 +7548,8 @@ in { willow = callPackage ../development/python-modules/willow { }; + wled = callPackage ../development/python-modules/wled { }; + word2vec = callPackage ../development/python-modules/word2vec { }; wordcloud = callPackage ../development/python-modules/wordcloud { }; From 8113151a77620b0885d5c4a581771e01444d90c7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Oct 2020 20:23:33 +0200 Subject: [PATCH 448/546] home-assistant: update component packages Enables support for the WLED component. --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index cbcc650111e..911f6bed75b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -922,7 +922,7 @@ "wink" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pubnubsub-handler python-wink "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy "withings" = ps: with ps; [ aiohttp-cors ]; # missing inputs: withings-api - "wled" = ps: with ps; [ ]; # missing inputs: wled + "wled" = ps: with ps; [ wled ]; "wolflink" = ps: with ps; [ ]; # missing inputs: wolf_smartset "workday" = ps: with ps; [ holidays ]; "worldclock" = ps: with ps; [ ]; From 0806cad95b9e070d0a78683798eb55cb8a83ee66 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 16 Oct 2020 18:35:35 +0000 Subject: [PATCH 449/546] python27Packages.pyside2: 5.15.0 -> 5.15.1 --- pkgs/development/python-modules/pyside2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix index 6d8b828fb95..ed0ab2d533a 100644 --- a/pkgs/development/python-modules/pyside2/default.nix +++ b/pkgs/development/python-modules/pyside2/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "pyside2"; - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-opensource-src-${version}.tar.xz"; - sha256 = "0s3bgddcsf6w297nyxv08xpc2nnr3sli980p24nf4xivvr9yxkgi"; + sha256 = "1yn3f414ql8rrvwxlfpp2sckpmb89zj5iszgy1690mrjh7cc2xgi"; }; patches = [ From 5f236c3875df6f5f4672c85294eb9b3ba33034b2 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 17 Oct 2020 14:58:34 -0400 Subject: [PATCH 450/546] linux: 4.14.201 -> 4.14.202 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index dd0d2c2a627..cdbedb34f8d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.201"; + version = "4.14.202"; # 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 = "0nr3w5m7dz28v7qfhp99ih4c369qrhq751wfikbz8ga3di0dqa72"; + sha256 = "0a739g3s0lc579zp4478xr645qzvhmrm1w19x0rj7p8bbfmigiwm"; }; } // (args.argsOverride or {})) From de5c66b9ef6badae4ba8675479fb189b9dbf3ca5 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 17 Oct 2020 14:59:47 -0400 Subject: [PATCH 451/546] linux: 4.19.151 -> 4.19.152 --- 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 d4e72cb3cbd..4c0d7b06ef4 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.151"; + version = "4.19.152"; # 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 = "0vm3nsi9la3azxrsvndbd6fpz79pch7309f2144xyxszsk339cf7"; + sha256 = "0p857b1gmmc2bv8limrdbfb3zsnchvg275sx5fkyy4185jfam9m5"; }; } // (args.argsOverride or {})) From 982d9662908da7489ee5cf0f8c46dd510f990a22 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 17 Oct 2020 15:00:34 -0400 Subject: [PATCH 452/546] linux: 4.4.239 -> 4.4.240 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 49591f63479..539a783e0af 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.239"; + version = "4.4.240"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03myd9ngmjmnddh4iqqsgcfg9rd11vyvwym38yh4m1p08j1zbg0k"; + sha256 = "131pamgxxmx4ba4gn2qxczv8w3lxrmwlqg0a7pdjzg0sy9lirygk"; }; } // (args.argsOverride or {})) From e0218ca69c953f467f30b861c6627d2a83887923 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 17 Oct 2020 15:02:20 -0400 Subject: [PATCH 453/546] linux: 4.9.239 -> 4.9.240 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 114629bad57..58ae2945427 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.239"; + version = "4.9.240"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0lfbn5amykvwz1svvxayzhsz1dvm4mgzsnq1g0wqffclxm148hr3"; + sha256 = "0vvpvw5wsvjnwch5ci63x08qc7qyzpyxbiaxx4521nl8d7371r06"; }; } // (args.argsOverride or {})) From 0b068924842ab0de6f886be77b29387261c8ec6f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 17 Oct 2020 15:03:16 -0400 Subject: [PATCH 454/546] linux: 5.4.71 -> 5.4.72 --- 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 35025efb657..9203321f1f7 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.71"; + version = "5.4.72"; # 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 = "1ivcimngj5h7lxslkrdljpfw9hfvdhrm8wrp7gp4d3gk7kpljw3k"; + sha256 = "0whi5kr1ziy9y20p42adnmqks41cavsraa36g9dbbrbgsmdn890f"; }; } // (args.argsOverride or {})) From bc4b7ed7e1e51644d9fa9ac68eef27a159513249 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 17 Oct 2020 15:05:01 -0400 Subject: [PATCH 455/546] linux: 5.8.15 -> 5.8.16 --- 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 3e13d9eb9ce..35bc489c3c5 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.15"; + version = "5.8.16"; # 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 = "0hfnq4n902pws8sjxd1lsdxxa0v45g988imp73xnqfqv2d71r0bj"; + sha256 = "1icxa0pgqhji924ryz37mpjjf4zlkrm8bidanjyn2mzbar7migzx"; }; } // (args.argsOverride or {})) From 2a82889f8e59ef0176167b0b2bf9d8925523b987 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 17 Oct 2020 15:07:11 -0400 Subject: [PATCH 456/546] linux: 5.9 -> 5.9.1 --- pkgs/os-specific/linux/kernel/linux-5.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.9.nix b/pkgs/os-specific/linux/kernel/linux-5.9.nix index a7aefa209cc..d96dd841d8a 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.9.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.9"; + version = "5.9.1"; # 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 = "01hsddf4sf9q5l1innyyl34b51y48v5wi34qpr421gsh2bpa8f9j"; + sha256 = "0dn0xz81pphca5dkg6zh8c78p05f63rrr5ihqqsmhc4n73li2jms"; }; } // (args.argsOverride or {})) From 6716902e19c290b20ba0b6b208ea3485770211db Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 17 Oct 2020 15:09:11 -0400 Subject: [PATCH 457/546] linux/hardened/patches/4.14: 4.14.201.a -> 4.14.202.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 036cc44ecea..11defcf9735 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,8 +1,8 @@ { "4.14": { - "name": "linux-hardened-4.14.201.a.patch", - "sha256": "16jkhib0fc8l96a092srqpg850wh0n49pa0yghpviz29rlids6vs", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.201.a/linux-hardened-4.14.201.a.patch" + "name": "linux-hardened-4.14.202.a.patch", + "sha256": "0ns5yq087m7i7ciq2b4skxclnlym0zm5v0vjqvzi9r375fd0gm9s", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.202.a/linux-hardened-4.14.202.a.patch" }, "4.19": { "name": "linux-hardened-4.19.151.a.patch", From 43fe838e0895c1a722216b666f370912b8fe2756 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 17 Oct 2020 15:09:13 -0400 Subject: [PATCH 458/546] linux/hardened/patches/4.19: 4.19.151.a -> 4.19.152.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 11defcf9735..87f7816478a 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -5,9 +5,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.202.a/linux-hardened-4.14.202.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.151.a.patch", - "sha256": "12sh1zvc72p7kkbgpm4cjppv1vlqbywsqfsva76pjx1mw0wsj7sj", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.151.a/linux-hardened-4.19.151.a.patch" + "name": "linux-hardened-4.19.152.a.patch", + "sha256": "0zc36yklzjb3sqd61m12c1988mazkrv242wbk7cn0a2b5sw7a373", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.152.a/linux-hardened-4.19.152.a.patch" }, "5.4": { "name": "linux-hardened-5.4.71.a.patch", From d68fed66973fa1706af36a933c5b5fcfe671eb72 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 17 Oct 2020 15:09:18 -0400 Subject: [PATCH 459/546] linux/hardened/patches/5.4: 5.4.71.a -> 5.4.72.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 87f7816478a..cdb34cddf42 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -10,9 +10,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.152.a/linux-hardened-4.19.152.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.71.a.patch", + "name": "linux-hardened-5.4.72.a.patch", "sha256": "1w4sfkx4qj9vx47z06bkf4biaiz58z2qp536g7dss26zdbx1im26", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.71.a/linux-hardened-5.4.71.a.patch" + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.72.a/linux-hardened-5.4.72.a.patch" }, "5.8": { "name": "linux-hardened-5.8.15.a.patch", From 80a57fd78b6361fddeb5306cf2da1a910eedec41 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 17 Oct 2020 15:09:20 -0400 Subject: [PATCH 460/546] linux/hardened/patches/5.8: 5.8.15.a -> 5.8.16.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index cdb34cddf42..a678dc7309f 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -15,8 +15,8 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.72.a/linux-hardened-5.4.72.a.patch" }, "5.8": { - "name": "linux-hardened-5.8.15.a.patch", + "name": "linux-hardened-5.8.16.a.patch", "sha256": "0b7bfzknz2am9pfypazqzky9bcd6659sakcdx2a7p1i3bj6zxnn1", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.15.a/linux-hardened-5.8.15.a.patch" + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.16.a/linux-hardened-5.8.16.a.patch" } } From 138b419901be03e64dfdf7f718f3701653480255 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 17 Oct 2020 15:09:23 -0400 Subject: [PATCH 461/546] linux/hardened/patches/5.9: init at 5.9.1.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index a678dc7309f..ff410b2ab2c 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -18,5 +18,10 @@ "name": "linux-hardened-5.8.16.a.patch", "sha256": "0b7bfzknz2am9pfypazqzky9bcd6659sakcdx2a7p1i3bj6zxnn1", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.16.a/linux-hardened-5.8.16.a.patch" + }, + "5.9": { + "name": "linux-hardened-5.9.1.a.patch", + "sha256": "07897dgkldm2dxsriapjlg9b118sd32qmd1z8xja01xcgd3r6vp7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.1.a/linux-hardened-5.9.1.a.patch" } } From 57738e9b6fa06f3d42f10fb053a2ba4cca789e89 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 19:37:17 +0000 Subject: [PATCH 462/546] brial: 1.2.8 -> 1.2.10 --- pkgs/development/libraries/science/math/brial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix index 90d7357cc07..2e85732f3f3 100644 --- a/pkgs/development/libraries/science/math/brial/default.nix +++ b/pkgs/development/libraries/science/math/brial/default.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation rec { - version = "1.2.8"; + version = "1.2.10"; pname = "brial"; src = fetchFromGitHub { owner = "BRiAl"; repo = "BRiAl"; rev = version; - sha256 = "0qhgckd4fvbs40jw14mvw89rccv94d3df27kipd27hxd4cx7y80y"; + sha256 = "1qg6ssp87rb8p37kahxmm88fbxqg6r540cky5v7wq7l19n2b1bss"; }; # FIXME package boost-test and enable checks From 942ad9a49ad5c7c3ce86eb05e4e9257cd40e3452 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 17 Oct 2020 12:43:09 -0700 Subject: [PATCH 463/546] feh: fix build on darwin Darwin doesn't support inotify, needed for autoreload --- pkgs/applications/graphics/feh/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 82128f81353..467e593025e 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper , xorg, imlib2, libjpeg, libpng , curl, libexif, jpegexiforient, perlPackages -, enableAutoreload ? true }: +, enableAutoreload ? !stdenv.hostPlatform.isDarwin }: with stdenv.lib; From 70b79e8cf2402d43c825fcd9b443c6e7fc9fbf56 Mon Sep 17 00:00:00 2001 From: Etienne Laurin Date: Sat, 17 Oct 2020 20:24:36 +0000 Subject: [PATCH 464/546] fix(gtest): pkgconfig paths --- pkgs/development/libraries/gtest/default.nix | 1 + .../libraries/gtest/fix-pkgconfig-paths.patch | 69 +++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 pkgs/development/libraries/gtest/fix-pkgconfig-paths.patch diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 62234651aa9..0242360aa08 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { patches = [ ./fix-cmake-config-includedir.patch + ./fix-pkgconfig-paths.patch ]; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/development/libraries/gtest/fix-pkgconfig-paths.patch b/pkgs/development/libraries/gtest/fix-pkgconfig-paths.patch new file mode 100644 index 00000000000..3f393259092 --- /dev/null +++ b/pkgs/development/libraries/gtest/fix-pkgconfig-paths.patch @@ -0,0 +1,69 @@ +From 5126ff48d9ac54828d1947d1423a5ef2a8efee3b Mon Sep 17 00:00:00 2001 +From: David Seifert +Date: Sat, 5 Oct 2019 15:58:45 +0200 +Subject: [PATCH] Revert "Use pcfiledir for prefix in pkgconfig file" + +The change makes implicit assumptions on the layout of the install +tree, which is going to break in many ways. + +The correct solution is to use the `PKG_CONFIG_SYSROOT_DIR` variable +to inject the cross-compiled sysroot into `-I` and `-L` paths. +--- + googlemock/cmake/gmock.pc.in | 5 ++--- + googlemock/cmake/gmock_main.pc.in | 5 ++--- + googletest/cmake/gtest.pc.in | 5 ++--- + googletest/cmake/gtest_main.pc.in | 5 ++--- + 4 files changed, 8 insertions(+), 12 deletions(-) + +diff --git a/googlemock/cmake/gmock.pc.in b/googlemock/cmake/gmock.pc.in +index 08e045474..2ef0fbca1 100644 +--- a/googlemock/cmake/gmock.pc.in ++++ b/googlemock/cmake/gmock.pc.in +@@ -1,6 +1,5 @@ +-prefix=${pcfiledir}/../.. +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: gmock + Description: GoogleMock (without main() function) +diff --git a/googlemock/cmake/gmock_main.pc.in b/googlemock/cmake/gmock_main.pc.in +index b22fe6148..04658fe2e 100644 +--- a/googlemock/cmake/gmock_main.pc.in ++++ b/googlemock/cmake/gmock_main.pc.in +@@ -1,6 +1,5 @@ +-prefix=${pcfiledir}/../.. +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: gmock_main + Description: GoogleMock (with main() function) +diff --git a/googletest/cmake/gtest.pc.in b/googletest/cmake/gtest.pc.in +index 9aae29e26..e7967ad56 100644 +--- a/googletest/cmake/gtest.pc.in ++++ b/googletest/cmake/gtest.pc.in +@@ -1,6 +1,5 @@ +-prefix=${pcfiledir}/../.. +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: gtest + Description: GoogleTest (without main() function) +diff --git a/googletest/cmake/gtest_main.pc.in b/googletest/cmake/gtest_main.pc.in +index 915f2973a..fe25d9c73 100644 +--- a/googletest/cmake/gtest_main.pc.in ++++ b/googletest/cmake/gtest_main.pc.in +@@ -1,6 +1,5 @@ +-prefix=${pcfiledir}/../.. +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: gtest_main + Description: GoogleTest (with main() function) From fe8107ceaeb95358f01071ae9c49a1c676377f11 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 21:00:40 +0000 Subject: [PATCH 465/546] cargo-make: 0.32.4 -> 0.32.7 --- pkgs/development/tools/rust/cargo-make/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index a1e9f7971f4..4d1c851198f 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -4,11 +4,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.32.4"; + version = "0.32.7"; src = fetchCrate { inherit pname version; - sha256 = "04x363wz82f0sr4128f1nk1wxnnszxsmaxjs92mbvmpbvry82ivq"; + sha256 = "0x8alv0jdk7xl63b2m4696w2hwqnbwxfqz6f3gisljll42xp6n2z"; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoSha256 = "1fgcxgm800sr0y6ab7c42l335b6c00cx0f2r5rgayi645a47a1zf"; + cargoSha256 = "1y2izxlc1nz3kqzrnhh9ir8j1gwvpj4cma2iqd65s9cf7xpkr6cx"; # Some tests fail because they need network access. # However, Travis ensures a proper build. From 0aaec7505b26ad6602a87d6cbff177dd2eaeb9c3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 21:09:29 +0000 Subject: [PATCH 466/546] cargo-udeps: 0.1.14 -> 0.1.15 --- pkgs/development/tools/rust/cargo-udeps/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index b7879adcc31..cc3aa00b27d 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.14"; + version = "0.1.15"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "0imvq63i3s9qmm0x8cbaknjap2yfmpzva3y0sxmgkcm8ajkvp114"; + sha256 = "0qnmz7sxbwnjdsl17h876szxd04z0q9arbl1ib45b6346x7mq8n4"; }; - cargoSha256 = "196w9rgz4pwqvkiy839kqz765ljqx1k129w4nvxgxv3rcmy4lbzm"; + cargoSha256 = "1jnbf0a3bggjf0wapr9xdj9hwfpgki2csg7rhg5maqavm8m0mirm"; nativeBuildInputs = [ pkgconfig ]; From 7093561865cf6cf7f06cfee7dea57c9bb21586f8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 21:26:41 +0000 Subject: [PATCH 467/546] cava: 0.7.2 -> 0.7.3 --- pkgs/applications/audio/cava/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix index 26cc8cd78da..a92a5325f16 100644 --- a/pkgs/applications/audio/cava/default.nix +++ b/pkgs/applications/audio/cava/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "cava"; - version = "0.7.2"; + version = "0.7.3"; buildInputs = [ alsaLib @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "karlstav"; repo = "cava"; rev = version; - sha256 = "1chc08spjf5i17n8y48aqzdxsj8vvf0r2l62ldw2pqgw60dacvs1"; + sha256 = "04j5hb29hivcbk542sfsx9m57dbnj2s6qpvy9fs488zvgjbgxrai"; }; nativeBuildInputs = [ autoreconfHook ]; From 83bf88fc66ffec65279a5fcba0bc5827c418fdde Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 21:33:44 +0000 Subject: [PATCH 468/546] ccache: 3.7.11 -> 3.7.12 --- pkgs/development/tools/misc/ccache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index e0a6a8065b5..d87de2e648a 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -2,13 +2,13 @@ let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "3.7.11"; + version = "3.7.12"; src = fetchFromGitHub { owner = "ccache"; repo = "ccache"; rev = "v${version}"; - sha256 = "03c6riz4vb0jipplk69c1j8arjjrjn676kglsrzqf8cidrh8j91c"; + sha256 = "1xnv4g4n1jk1i98sa53k8w6q7hbwbw62svs30lssppysbrv8x3gz"; }; nativeBuildInputs = [ asciidoc-full autoreconfHook gperf perl ]; From 227ecf0b10ac8cdd416e0247a4bc8912616c3b70 Mon Sep 17 00:00:00 2001 From: Serg Nesterov Date: Sun, 18 Oct 2020 00:10:45 +0300 Subject: [PATCH 469/546] navi: 2.12.0 -> 2.12.1 --- pkgs/applications/misc/navi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/navi/default.nix b/pkgs/applications/misc/navi/default.nix index 1965a8ad5ec..7553b078ef6 100644 --- a/pkgs/applications/misc/navi/default.nix +++ b/pkgs/applications/misc/navi/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "navi"; - version = "2.12.0"; + version = "2.12.1"; src = fetchFromGitHub { owner = "denisidoro"; repo = "navi"; rev = "v${version}"; - sha256 = "0izmf4flwwn2h1wwpsnghb6rd494lj63hhsky1v9v6l1l641had4"; + sha256 = "1vrj8ad004h6jgmcb56f3f19s4xk6gvcpwysj78bxzgpa1998r3r"; }; - cargoSha256 = "19xv9kbmxbp84lj8ycifsdr7sw9vhwgla7cdmrvlhayiq5r04xd7"; + cargoSha256 = "0yifgcf2pfszzny523ax7pb9a5r3012nynbnhdqg0j1ia1pdymf3"; nativeBuildInputs = [ makeWrapper ]; From 73eea3d98dee65fe8f7f3ea05de52be4621ab226 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Oct 2020 22:45:56 +0200 Subject: [PATCH 470/546] python3Packages.sacn: init at 1.4.6 --- .../python-modules/sacn/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/sacn/default.nix diff --git a/pkgs/development/python-modules/sacn/default.nix b/pkgs/development/python-modules/sacn/default.nix new file mode 100644 index 00000000000..35c7a744329 --- /dev/null +++ b/pkgs/development/python-modules/sacn/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +}: + +buildPythonPackage rec { + pname = "sacn"; + version = "1.4.6"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "015wa9nhqgd0kb60bw19g86ga25s9mpvsbqkahi3kw6df6j0wzss"; + }; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "sacn" ]; + + meta = with lib; { + description = "A simple ANSI E1.31 (aka sACN) module for python"; + homepage = "https://github.com/Hundemeier/sacn"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b3d1c5cfe85..1e556c54887 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6311,6 +6311,8 @@ in { sabyenc = callPackage ../development/python-modules/sabyenc { }; + sacn = callPackage ../development/python-modules/sacn { }; + sacremoses = callPackage ../development/python-modules/sacremoses { }; safe = callPackage ../development/python-modules/safe { }; From 5304f52bc7d76de5862868870b3dda7c3ba134a5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Oct 2020 22:47:05 +0200 Subject: [PATCH 471/546] python3Packages.aubio: init at 0.4.9 --- .../python-modules/aubio/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/aubio/default.nix diff --git a/pkgs/development/python-modules/aubio/default.nix b/pkgs/development/python-modules/aubio/default.nix new file mode 100644 index 00000000000..b580485f659 --- /dev/null +++ b/pkgs/development/python-modules/aubio/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aubio"; + version = "0.4.9"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "0fhxikvlr010nbh02g455d5y8bq6j5yw180cdh4gsd0hb43y3z26"; + }; + + propagatedBuildInputs = [ + numpy + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "aubio" ]; + + meta = with lib; { + description = "a library for audio and music analysis"; + homepage = "https://aubio.org"; + licenses = license.gpl3; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1e556c54887..93874b5ff30 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -452,6 +452,8 @@ in { attrs = callPackage ../development/python-modules/attrs { }; + aubio = callPackage ../development/python-modules/aubio { }; + audio-metadata = callPackage ../development/python-modules/audio-metadata { }; audioread = callPackage ../development/python-modules/audioread { }; From b66df0d36e14c278fad6a9a1ad08e7c1c62a507a Mon Sep 17 00:00:00 2001 From: Etienne Laurin Date: Sat, 17 Oct 2020 21:53:57 +0000 Subject: [PATCH 472/546] use fetchpatch --- pkgs/development/libraries/gtest/default.nix | 8 ++- .../libraries/gtest/fix-pkgconfig-paths.patch | 69 ------------------- 2 files changed, 6 insertions(+), 71 deletions(-) delete mode 100644 pkgs/development/libraries/gtest/fix-pkgconfig-paths.patch diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 0242360aa08..4e8ce95737d 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, ninja, fetchFromGitHub }: +{ stdenv, cmake, ninja, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "gtest"; @@ -15,7 +15,11 @@ stdenv.mkDerivation rec { patches = [ ./fix-cmake-config-includedir.patch - ./fix-pkgconfig-paths.patch + (fetchpatch { + name = "fix-pkgconfig-paths.patch"; + url = "https://github.com/google/googletest/commit/5126ff48d9ac54828d1947d1423a5ef2a8efee3b.patch"; + sha256 = "sha256-TBvECU/9nuvwjsCjWJP2b6DNy+FYnHIFZeuVW7g++JE="; + }) ]; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/development/libraries/gtest/fix-pkgconfig-paths.patch b/pkgs/development/libraries/gtest/fix-pkgconfig-paths.patch deleted file mode 100644 index 3f393259092..00000000000 --- a/pkgs/development/libraries/gtest/fix-pkgconfig-paths.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 5126ff48d9ac54828d1947d1423a5ef2a8efee3b Mon Sep 17 00:00:00 2001 -From: David Seifert -Date: Sat, 5 Oct 2019 15:58:45 +0200 -Subject: [PATCH] Revert "Use pcfiledir for prefix in pkgconfig file" - -The change makes implicit assumptions on the layout of the install -tree, which is going to break in many ways. - -The correct solution is to use the `PKG_CONFIG_SYSROOT_DIR` variable -to inject the cross-compiled sysroot into `-I` and `-L` paths. ---- - googlemock/cmake/gmock.pc.in | 5 ++--- - googlemock/cmake/gmock_main.pc.in | 5 ++--- - googletest/cmake/gtest.pc.in | 5 ++--- - googletest/cmake/gtest_main.pc.in | 5 ++--- - 4 files changed, 8 insertions(+), 12 deletions(-) - -diff --git a/googlemock/cmake/gmock.pc.in b/googlemock/cmake/gmock.pc.in -index 08e045474..2ef0fbca1 100644 ---- a/googlemock/cmake/gmock.pc.in -+++ b/googlemock/cmake/gmock.pc.in -@@ -1,6 +1,5 @@ --prefix=${pcfiledir}/../.. --libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ --includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ - - Name: gmock - Description: GoogleMock (without main() function) -diff --git a/googlemock/cmake/gmock_main.pc.in b/googlemock/cmake/gmock_main.pc.in -index b22fe6148..04658fe2e 100644 ---- a/googlemock/cmake/gmock_main.pc.in -+++ b/googlemock/cmake/gmock_main.pc.in -@@ -1,6 +1,5 @@ --prefix=${pcfiledir}/../.. --libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ --includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ - - Name: gmock_main - Description: GoogleMock (with main() function) -diff --git a/googletest/cmake/gtest.pc.in b/googletest/cmake/gtest.pc.in -index 9aae29e26..e7967ad56 100644 ---- a/googletest/cmake/gtest.pc.in -+++ b/googletest/cmake/gtest.pc.in -@@ -1,6 +1,5 @@ --prefix=${pcfiledir}/../.. --libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ --includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ - - Name: gtest - Description: GoogleTest (without main() function) -diff --git a/googletest/cmake/gtest_main.pc.in b/googletest/cmake/gtest_main.pc.in -index 915f2973a..fe25d9c73 100644 ---- a/googletest/cmake/gtest_main.pc.in -+++ b/googletest/cmake/gtest_main.pc.in -@@ -1,6 +1,5 @@ --prefix=${pcfiledir}/../.. --libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ --includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ - - Name: gtest_main - Description: GoogleTest (with main() function) From 6e0b110d090a183134a468b6b392919393b7f9f0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 22:09:19 +0000 Subject: [PATCH 473/546] checkstyle: 8.36 -> 8.36.2 --- 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 5dba30e7663..7e468f44b1a 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.36"; + version = "8.36.2"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "1f8g330akx3sdc35dgvy6kksr7y3dnnj7029qrpn745bd9fh92hh"; + sha256 = "05yb3020q0r75ggh0nm56yj45ha2ppyhbnjn34wqpadi842pzpfh"; }; nativeBuildInputs = [ makeWrapper ]; From fa80f55860b4670d52c37e56c2b96d4f622bfe47 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 22:16:44 +0000 Subject: [PATCH 474/546] chezmoi: 1.8.5 -> 1.8.7 --- pkgs/tools/misc/chezmoi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index d7b7646afec..448c0859c57 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "1.8.5"; + version = "1.8.7"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "16sv1kbd66rllnnl851y3x54wkl0p7g0qsblprvfr9715svk1835"; + sha256 = "1inmrcp01rxrjylkj9vzgw3q713q6jsqbnqllbzvp8q6kqfliayg"; }; - vendorSha256 = "1i9d672mzmb97s26n0v01m70g4viyl9pdk25haxr6ny4rab2wbi7"; + vendorSha256 = "0m946g6iw42q5ggki2j1lqdshpsxjmdsm1snnyzjzyy8gd88m4cx"; doCheck = false; From 5d1b7e310ecdffe9f599a12e0b4f9808c3525406 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 18 Oct 2020 08:25:36 +1000 Subject: [PATCH 475/546] python3Packages.aubio: fix eval --- pkgs/development/python-modules/aubio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aubio/default.nix b/pkgs/development/python-modules/aubio/default.nix index b580485f659..0429070e32e 100644 --- a/pkgs/development/python-modules/aubio/default.nix +++ b/pkgs/development/python-modules/aubio/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "a library for audio and music analysis"; homepage = "https://aubio.org"; - licenses = license.gpl3; + licenses = licenses.gpl3; maintainers = with maintainers; [ hexa ]; }; } From 72e8737f64e49315412d8e9a06844277ce3788aa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 22:28:35 +0000 Subject: [PATCH 476/546] circleci-cli: 0.1.9454 -> 0.1.10993 --- pkgs/development/tools/misc/circleci-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index b434358e1d2..255403a0c27 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.9454"; + version = "0.1.10993"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "0ld7lb69wmhyrpqjaj1pddx93x529qk2fzyrwlipglwn3mbala5a"; + sha256 = "1pi31zcg4nvrsyb66znf7g51z51qfw56kml6l2vgg4dbpwmzg87h"; }; - vendorSha256 = "1zd95n9k2fags0qh3wvjinxv1ahygr958mmiax2kz117yipaz4rb"; + vendorSha256 = "0fjj8hh0s0jcgz48japbcfpl4ihba2drvvxlyg69j8hrcb9lmi4l"; doCheck = false; From 4a9dba6c444b0eb1933b7495dd373173f0034d55 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 17 Oct 2020 20:23:54 +0100 Subject: [PATCH 477/546] python3Packages.Theano: add pythonImportsCheck this not only gives us a "hint" of test coverage, but also proves the fix from #97597 allows import of theano from within a sandboxed build --- pkgs/development/python-modules/Theano/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix index cc2b681e415..ce32e42e471 100644 --- a/pkgs/development/python-modules/Theano/default.nix +++ b/pkgs/development/python-modules/Theano/default.nix @@ -68,7 +68,9 @@ in buildPythonPackage rec { --replace 'StrParam(default_dnn_base_path)' 'StrParam('\'''${cudnn}'\''')' ''; - preCheck = '' + # needs to be postFixup so it runs before pythonImportsCheck even when + # doCheck = false (meaning preCheck would be disabled) + postFixup = '' mkdir -p check-phase export HOME=$(pwd)/check-phase ''; @@ -81,6 +83,8 @@ in buildPythonPackage rec { checkInputs = [ nose ]; propagatedBuildInputs = [ numpy numpy.blas scipy six libgpuarray_ ]; + pythonImportsCheck = [ "theano" ]; + meta = with stdenv.lib; { homepage = "http://deeplearning.net/software/theano/"; description = "A Python library for large-scale array computation"; From 1616d57218234caa521bdccbcf1b025d5721eaba Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 22:40:17 +0000 Subject: [PATCH 478/546] clash: 1.1.0 -> 1.2.0 --- pkgs/tools/networking/clash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index 4447ab0f048..91271689412 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clash"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "0cbbih035h40hhl7ykmyh9q9nzdqq1p8hmvzd4358cigz1gjc3j2"; + sha256 = "16dgpq67bcy9z5lqwykwh61kwxi164khxqc78i6a3dc9xyivwfya"; }; - vendorSha256 = "0s7mhbjfpfmzqf48d7k0d416m39x6fh5ds4q3xnvhcfx5kmdymq6"; + vendorSha256 = "0gmyq54h9zb4ry2p24nsp8ybqrmaq69zlyp220w16kamx790j07j"; doCheck = false; From 595306b4261e5837aae932eba2fa440bf6ce1bc5 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 18 Oct 2020 08:46:21 +1000 Subject: [PATCH 479/546] python3Packages.aubio: fix eval again --- pkgs/development/python-modules/aubio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aubio/default.nix b/pkgs/development/python-modules/aubio/default.nix index 0429070e32e..4616e1b6ed3 100644 --- a/pkgs/development/python-modules/aubio/default.nix +++ b/pkgs/development/python-modules/aubio/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "a library for audio and music analysis"; homepage = "https://aubio.org"; - licenses = licenses.gpl3; + license = licenses.gpl3; maintainers = with maintainers; [ hexa ]; }; } From e32e589d7d6de49c8f65cc1056ffdc8481463f7b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 22:50:38 +0000 Subject: [PATCH 480/546] clojure-lsp: 20200828T065654 -> 20201009T224414 --- pkgs/development/tools/misc/clojure-lsp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 65f12bfbb09..1641df1562a 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "20200828T065654"; + version = "20201009T224414"; src = fetchurl { url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}"; - sha256 = "1399xjcnnb7vazy1jv3h7lnh1dyn81yk2bwi6ai991a9fsinjnf2"; + sha256 = "1az87b4cq6yyibs4knd0ywd0qfgmfzai4bqry4b7h2ycnfhfxdpa"; }; dontUnpack = true; From 7d17b2d6f31810c3e9f5e990d1509cd7c71ad027 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 18 Oct 2020 00:58:09 +0200 Subject: [PATCH 481/546] doc: Use mesa.drivers instead of legacy alias It was moved in 263f5891b65c841352f5230a1aa7e22ac418a042. --- doc/builders/packages/opengl.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/builders/packages/opengl.xml b/doc/builders/packages/opengl.xml index 5f4433a2884..dfd64b18858 100644 --- a/doc/builders/packages/opengl.xml +++ b/doc/builders/packages/opengl.xml @@ -4,6 +4,6 @@ OpenGL - Packages that use OpenGL have NixOS desktop as their primary target. The current solution for loading the GPU-specific drivers is based on libglvnd and looks for the driver implementation in LD_LIBRARY_PATH. If you are using a non-NixOS GNU/Linux/X11 desktop with free software video drivers, consider launching OpenGL-dependent programs from Nixpkgs with Nixpkgs versions of libglvnd and mesa_drivers in LD_LIBRARY_PATH. For proprietary video drivers you might have luck with also adding the corresponding video driver package. + Packages that use OpenGL have NixOS desktop as their primary target. The current solution for loading the GPU-specific drivers is based on libglvnd and looks for the driver implementation in LD_LIBRARY_PATH. If you are using a non-NixOS GNU/Linux/X11 desktop with free software video drivers, consider launching OpenGL-dependent programs from Nixpkgs with Nixpkgs versions of libglvnd and mesa.drivers in LD_LIBRARY_PATH. For proprietary video drivers you might have luck with also adding the corresponding video driver package. From 75731432016db5528d943625a9b51b09a64f8f29 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 22:58:45 +0000 Subject: [PATCH 482/546] cloudflared: 2020.6.1 -> 2020.10.0 --- pkgs/applications/networking/cloudflared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 96767f63653..47e2cc04b39 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2020.6.1"; + version = "2020.10.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "09jdgpglm4v7pivx8016zzdvj0xkdhaa8xl71p2akc2jn8i8i6gb"; + sha256 = "1ssmyll13pf19fxq34iw4x7ps8p4mcg9nwlx00hp5sahhwx4iz01"; }; vendorSha256 = null; From 08d6831661b3cfb9de7c926ce6afdc0e50df4bac Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 23:09:18 +0000 Subject: [PATCH 483/546] codeql: 2.2.5 -> 2.3.1 --- pkgs/development/tools/analysis/codeql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index e450bbefe24..811c2b2463f 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.2.5"; + version = "2.3.1"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "1x9crby4idkvfy6i5l0r00ixnx3ij68zjh1l5n92hyzlf0snv28d"; + sha256 = "1wbqccvj2a31b3h44rfanjrcv9gm4jl60a66mpxrbfjpmkd5hl35"; }; nativeBuildInputs = [ From 34f7844938f55b6543ad515f6df4209150623b86 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 23:29:17 +0000 Subject: [PATCH 484/546] consul: 1.8.3 -> 1.8.4 --- pkgs/servers/consul/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index b2f9b27e8f8..c153cc39073 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.8.3"; + version = "1.8.4"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "172m8izv0jqvwxl8nwxdy6x7syp7gn70x4zx41h6ajy4h564l16y"; + sha256 = "0rm6qf8jnn6khrx9dy8r4ji1yd89hai52d9zggb5r99k7m9wd291"; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorSha256 = "1q4mvmypza2n2kqnri71y9k2qqmb34x3pa7ifql8gwlp8r0bicy7"; + vendorSha256 = "1g3a9m6aqarq0rqf7qrp9yxcsc3sjnx0vbypakzmrq1ndgdivk16"; doCheck = false; From e072662ed6ee2b3f6ebd8b802e98187db12a59f1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 15:38:38 +0000 Subject: [PATCH 485/546] amass: 3.10.3 -> 3.10.5 --- pkgs/tools/networking/amass/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 61746ebfcc5..6277c158f24 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.10.3"; + version = "3.10.5"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "1vjplwjv0vwwxdpbky7i6dz3phl7yfcbr8fwrbsb47bmj0ldkapc"; + sha256 = "0zxjgg9z45cs116wa643dfh12skz8zydb85vn03ss150hdlgspda"; }; - vendorSha256 = "0c3hyvy8s470zvrv49fx0iil59z0xq10dw4vnr55qgbm2k2pay6w"; + vendorSha256 = "1l7y2h7kpvj6lh3dki5sw0ziyzwihfy0scdk8jqf108ca23g8zv8"; outputs = [ "out" "wordlists" ]; From a4f24201cfed9007eeb07a8b3b675fcda844c7c4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 00:36:01 +0000 Subject: [PATCH 486/546] cpp-utilities: 5.6.0 -> 5.7.0 --- pkgs/development/libraries/cpp-utilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index cbe628aaf4e..b821faebdeb 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.6.0"; + version = "5.7.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "0998pyrxicpalm2w1wmv7qrfhzgr45kl6xh9gv0zxhx2a4xjqq5v"; + sha256 = "04483v9bw6wp831f34fn46zj54v9y7f6qqfmx85fjxhkr3rqk4i0"; }; nativeBuildInputs = [ cmake ]; From 137a90614898016be0d05f60c3637ce9fa87afa9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 01:18:21 +0000 Subject: [PATCH 487/546] croc: 8.5.0 -> 8.5.1 --- pkgs/tools/networking/croc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 97da6497c6b..1211ff14da4 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "8.5.0"; + version = "8.5.1"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "0c8gj4fv5q8zl48lfvw06rxng2scgivb6zls136kxq5f2fb2dyk5"; + sha256 = "1b0bcqgvlalgz82s1dnq7lkmwvznc5vnh27al9j1dqg4hx97md2j"; }; - vendorSha256 = "0cgvbwxscmqjzva0bp5sqb4hnvk2ww50yqw34iya5lk2db9vn3ha"; + vendorSha256 = "15bis2hssk7x2r0m728l1rmbl8nl5p4kzdf5382bcs8p3hscp0gl"; doCheck = false; From 1d3cf88e012480d326700c4a88660f924529531f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 01:54:37 +0000 Subject: [PATCH 488/546] dnsproxy: 0.32.0 -> 0.32.6 --- pkgs/tools/networking/dnsproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 8f279ff688a..68739507d3b 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.32.0"; + version = "0.32.6"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "14iwwg1iqfxjhpw9p3ddq53l901v9l9n2r60q9q6jls8hfqcgsnj"; + sha256 = "0wcn2wr521n2vcmpnwphgycq109251nkfdr0wzn7lk2zl5qx81ax"; }; vendorSha256 = null; From 6e34227809c2ac40bba92079c668a8b85dbcc485 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 02:01:19 +0000 Subject: [PATCH 489/546] do-agent: 3.6.0 -> 3.7.1 --- pkgs/servers/monitoring/do-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/servers/monitoring/do-agent/default.nix index bbfdc97b6dc..d7c7e042981 100644 --- a/pkgs/servers/monitoring/do-agent/default.nix +++ b/pkgs/servers/monitoring/do-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "do-agent"; - version = "3.6.0"; + version = "3.7.1"; src = fetchFromGitHub { owner = "digitalocean"; repo = "do-agent"; rev = "${version}"; - sha256 = "024fs2yln2i4s5aihwlz103w5wvmcwqx7hz9q3fw3dm18k3fjmn2"; + sha256 = "16mmh1kz6zbncfisd9qnb3ssgpkcb4hb7700jlzbdjqxyjmy0qsf"; }; buildFlagsArray = '' From b80cfd766104c6c25627db085649288b946667ae Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 02:09:19 +0000 Subject: [PATCH 490/546] doctl: 1.46.0 -> 1.48.1 --- pkgs/development/tools/doctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 45795b67ea4..ba42f3914b4 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.46.0"; + version = "1.48.1"; vendorSha256 = null; @@ -32,7 +32,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "1f9gw1qjannswx1vy64a5a2cfr8azsci241pk0xhrhk6aqpjzx1n"; + sha256 = "1bykvwv1zhiki7c86hycwck78s8gqw4dzd7smfp4iz609wyk1wqb"; }; meta = with lib; { From a0c0d2557b28d0313e4f79a94433b72704166913 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 02:19:15 +0000 Subject: [PATCH 491/546] dolt: 0.19.0 -> 0.21.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 9e4eadf72da..4a67cc48f9d 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.19.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "1rfwhh62phz75kariqgpkxi4wzll1crzc34x0ybihxllpjf998zx"; + sha256 = "0w9k48jxklhaql8qbbm9ay0md5nia6x3wr0zz3w44pw3gl5kvxyw"; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "1bq8z31yxff0nybzjs7jz7rg61hgqz6l2scbab7062j8whg8wybb"; + vendorSha256 = "16xh4s7zmar0r3kwps5bbl168imyx252lvz9s3snvxzz5kd8wlnm"; doCheck = false; From 7e9df8c8f1d4efd7354baf41888a4f01b7f87ba2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 02:26:25 +0000 Subject: [PATCH 492/546] doppler: 3.10.3 -> 3.15.0 --- pkgs/tools/security/doppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index 847d5d0cafb..8858fb15758 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.10.3"; + version = "3.15.0"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "15wmg67wwwgrs8q45r1z98k9v7mf2bfgsa40gcf8dr18ilnfpbn4"; + sha256 = "06icddb99ahmi5djrslpqsjjd38agvkhnfls5wqahclf0j4dylr6"; }; vendorSha256 = "0wqbwk72k4r30a3vnf0gnx3k97y8xgnr2iavk5bc8f8vkjv0bsv6"; From 2a98bddce54ebea77605da339a11b1205ad11546 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 02:40:14 +0000 Subject: [PATCH 493/546] drawio: 13.7.3 -> 13.7.9 --- pkgs/applications/graphics/drawio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 5a5ce5d8b21..5c76e523c02 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "13.7.3"; + version = "13.7.9"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "14wcj9jbpv1rg0g7djihzzq088aj96mwys4rc9540ajbkbbm9d36"; + sha256 = "1h0baxh9gvshdfqb77x5m8v95lw4lw4djj3gwrna0jjpfhmcs4vq"; }; nativeBuildInputs = [ From 32ac072e3ca5752f5d9b2ae37df432c5ddd7b954 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 03:34:06 +0000 Subject: [PATCH 494/546] embree: 3.12.0 -> 3.12.1 --- pkgs/development/libraries/embree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix index 60d6af94762..650c1d4ce49 100644 --- a/pkgs/development/libraries/embree/default.nix +++ b/pkgs/development/libraries/embree/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "embree"; - version = "3.12.0"; + version = "3.12.1"; src = fetchFromGitHub { owner = "embree"; repo = "embree"; rev = "v${version}"; - sha256 = "1q06fkfww8z8pcnhaqc4d2zi8hn620i9h9dmpnrfy3azalvizhkq"; + sha256 = "0aznd16n7h8g3f6jcahzfp1dq4r7wayqvn03wsaskiq2dvsi4srd"; }; postPatch = '' From 0a39c42f5226dfb2b72b18e51509d0e8d1766c9b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 04:08:43 +0000 Subject: [PATCH 495/546] ergo: 3.3.3 -> 3.3.4 --- pkgs/applications/blockchains/ergo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index a61df3e91bd..685a562f21b 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "3.3.3"; + version = "3.3.4"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "1lsqshpbc5p5qm8kic8a90xmvd2zx2s7jf613j9ng4h3hh75wbff"; + sha256 = "0psq0nxb4c0fsxjzjxb4sy6lh4kj4w8aizd81r92fdv8izbm25sk"; }; nativeBuildInputs = [ makeWrapper ]; From 072e98a7f184c4a52536ac12a6996ce7b634b950 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 18 Oct 2020 04:20:00 +0000 Subject: [PATCH 496/546] python3Packages.pdfminer: 20200726 -> 20201018 https://github.com/pdfminer/pdfminer.six/releases/tag/20201018 --- pkgs/development/python-modules/pdfminer_six/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix index 08f482e6221..9bc8f891570 100644 --- a/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/pkgs/development/python-modules/pdfminer_six/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pdfminer_six"; - version = "20200726"; + version = "20201018"; disabled = !isPy3k; @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "pdfminer"; repo = "pdfminer.six"; rev = version; - sha256 = "1hlaz7ax1czb028x3nhk3l2jy07f26q5hbhmdirljaaga24vd96z"; + sha256 = "1a2fxxnnjqbx344znpvx7cnv1881dk6585ibw01inhfq3w6yj2lr"; }; propagatedBuildInputs = [ chardet cryptography sortedcontainers ]; From b4387e97113fff53f2c648afada835d1930a4c61 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 04:22:37 +0000 Subject: [PATCH 497/546] exoscale-cli: 1.17.0 -> 1.19.0 --- pkgs/tools/admin/exoscale-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 41fc026092d..e131389aa84 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.17.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "01bll978dis8pqvgrbigzgszkx3kjm6acrw44z6j7algw3an352r"; + sha256 = "05j9bwg8ph3xysd3rvykfznzs476w6wi6hj4mfg7jzw5r23ddc7k"; }; goPackagePath = "github.com/exoscale/cli"; From bc0934be31f901090777e7918aeb24198ff5bc0e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 04:40:20 +0000 Subject: [PATCH 498/546] fastmod: 0.4.0 -> 0.4.1 --- pkgs/tools/text/fastmod/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/fastmod/default.nix b/pkgs/tools/text/fastmod/default.nix index d15683894a2..023cc58f4a6 100644 --- a/pkgs/tools/text/fastmod/default.nix +++ b/pkgs/tools/text/fastmod/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "fastmod"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "facebookincubator"; repo = pname; rev = "v${version}"; - sha256 = "0089a17h0wgan3fs6x1la35lzjs1pib7p81wqkh3zcwvx8ffa8z8"; + sha256 = "0nrh6h5imbpl7i0sqqm16x9ggazww5739vng1ay1v6sgbbs0a095"; }; - cargoSha256 = "02nkxjwfiljndmi0pv98chfsw9vmjzgmp5r14mchpayp4943qk9m"; + cargoSha256 = "18bspi59vfnqijxgipmv2h6h5iy7qynpk1ph46yhjsnndjlxxcba"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; From c7bbc9b9f8fc602e983319ff2f47fa3810f4bf4c Mon Sep 17 00:00:00 2001 From: Joshua Campbell Date: Mon, 5 Oct 2020 18:09:12 -0700 Subject: [PATCH 499/546] Update obs-ndi plugin to latest --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/applications/video/obs-studio/obs-ndi.nix | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 009d938554c..d67f0aae12f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4216,6 +4216,12 @@ githubId = 1786438; name = "Jonas Schievink"; }; + jshcmpbll = { + email = "me@joshuadcampbell.com"; + github = "jshcmpbll"; + githubId = 16374374; + name = "Joshua Campbell"; + }; jtcoolen = { email = "jtcoolen@pm.me"; name = "Julien Coolen"; diff --git a/pkgs/applications/video/obs-studio/obs-ndi.nix b/pkgs/applications/video/obs-studio/obs-ndi.nix index f22ddd39ee4..a250a365ac6 100644 --- a/pkgs/applications/video/obs-studio/obs-ndi.nix +++ b/pkgs/applications/video/obs-studio/obs-ndi.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "obs-ndi"; - version = "4.7.1"; + version = "4.9.1"; nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio qtbase ndi ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "Palakis"; repo = "obs-ndi"; rev = version; - sha256 = "040fkbf3f3qgqcrd3072y3zrjb4fwga8zr10jym744xd7bgyylqh"; + sha256 = "1y3xdqp55jayhg4sinwiwpk194zc4f4jf0abz647x2fprsk9jz7s"; }; patches = [ ./fix-search-path.patch ./hardcode-ndi-path.patch ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Network A/V plugin for OBS Studio"; homepage = "https://github.com/Palakis/obs-ndi"; - maintainers = with maintainers; [ peti ]; + maintainers = with maintainers; [ peti jshcmpbll ]; license = licenses.gpl2; platforms = with platforms; linux; }; From e8eb47798f371f0485e270cb18875518d5472a0e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 04:46:10 +0000 Subject: [PATCH 500/546] faudio: 20.09 -> 20.10 --- pkgs/development/libraries/faudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index cc1bb09d390..2898eb937fc 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "20.09"; + version = "20.10"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "097pdpd34aw420c46j6nrl5wdklgqrsznml0q2qxw1m7hrl7gkk6"; + sha256 = "0f5b45zdsy3yv2jsdy5zsd6xcfk1z5w5vlyvnim3d4bn875sp370"; }; nativeBuildInputs = [cmake]; From 9a09285f5a89b73fc79a91d29ce8d02cef829211 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 3 Oct 2020 23:31:43 +0100 Subject: [PATCH 501/546] pythonPackages.fastprogress: init at 1.0.0 --- .../python-modules/fastprogress/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/fastprogress/default.nix diff --git a/pkgs/development/python-modules/fastprogress/default.nix b/pkgs/development/python-modules/fastprogress/default.nix new file mode 100644 index 00000000000..a542b580565 --- /dev/null +++ b/pkgs/development/python-modules/fastprogress/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, numpy +, pytest +, pythonOlder +}: + +buildPythonPackage rec { + pname = "fastprogress"; + version = "1.0.0"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1zhv37q6jkqd1pfhlkd4yzrc3dg83vyksgzf32mjlhd5sb0qmql9"; + }; + + propagatedBuildInputs = [ numpy ]; + + # no real tests + doCheck = false; + pythonImportsCheck = [ "fastprogress" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/fastai/fastprogress"; + description = "Simple and flexible progress bar for Jupyter Notebook and console"; + license = licenses.asl20; + maintainers = with maintainers; [ ris ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 93874b5ff30..28092b35d84 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2004,6 +2004,8 @@ in { fastpbkdf2 = callPackage ../development/python-modules/fastpbkdf2 { }; + fastprogress = callPackage ../development/python-modules/fastprogress { }; + fastrlock = callPackage ../development/python-modules/fastrlock { }; fasttext = callPackage ../development/python-modules/fasttext { }; From 3c3295a02d68fac51a6cca14ab4fe972dc3492be Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 3 Oct 2020 23:50:03 +0100 Subject: [PATCH 502/546] pythonPackages.pymc3: fix build --- pkgs/development/python-modules/pymc3/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix index bda74c5063a..dfbfe90d242 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -14,6 +14,8 @@ , pytest , nose , parameterized +, fastprogress +, typing-extensions }: buildPythonPackage rec { @@ -41,6 +43,8 @@ buildPythonPackage rec { h5py arviz packaging + fastprogress + typing-extensions ]; checkInputs = [ @@ -52,6 +56,7 @@ buildPythonPackage rec { # The test suite is computationally intensive and test failures are not # indicative for package usability hence tests are disabled by default. doCheck = false; + pythonImportsCheck = [ "pymc3" ]; # For some reason tests are run as a part of the *install* phase if enabled. # Theano writes compiled code to ~/.theano hence we set $HOME. From 0a22624386fd1e926c9cc20b24021c83a01c7603 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 06:37:28 +0000 Subject: [PATCH 503/546] findomain: 2.1.3 -> 2.1.4 --- pkgs/tools/networking/findomain/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index 2caf18d9a4b..a98c634f903 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "112w4x79zywy6i5vfr04057p9vschflhdhs7b2mhkcba5gigkrxx"; + sha256 = "0g0kw1b18kk9jhvw88hcxc04ccj8k22fdzky7l2dv3r37vndd91w"; }; - cargoSha256 = "1bfbg5fzwp8drm0vp16503qd5mgjfw7z9p292xgdx0i20s4wfrkk"; + cargoSha256 = "0cmp4w86qnzd2b2w4s3w019857pxysgikkl1g7ldkiylrsm5vlpn"; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optional stdenv.isDarwin Security; From 6b02640fe94133056167b43eedbcfa62cee79ad0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 06:47:41 +0000 Subject: [PATCH 504/546] flannel: 0.12.0 -> 0.13.0 --- pkgs/tools/networking/flannel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index 7ecfb559dcc..86010f4adb9 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { pname = "flannel"; - version = "0.12.0"; + version = "0.13.0"; rev = "v${version}"; goPackagePath = "github.com/coreos/flannel"; @@ -13,7 +13,7 @@ buildGoPackage rec { inherit rev; owner = "coreos"; repo = "flannel"; - sha256 = "04g7rzgyi3xs3sf5p1a9dmd08crdrz6y1b02ziv3444qk40jyswd"; + sha256 = "0mmswnaybwpf18h832haapcs5b63wn5w2hax0smm3inldiggsbw8"; }; meta = { From 8728ae26eac049636320978768d24f0700da5f6b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 07:05:17 +0000 Subject: [PATCH 505/546] flow: 0.133.0 -> 0.136.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index cc3ef8ed0f7..44ecfceb8df 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.133.0"; + version = "0.136.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1r4s4gw50pvp4r4mq2w45s9i7fbkf7zycgp8rrj1dqzmkl9v6kii"; + sha256 = "1gpf9jk4ny5jps93scfcndzg1r93kz3hq8pijpfk4ab8qray83g6"; }; installPhase = '' From 8c4c6a4b71f0800737e0823b93ebc5c8c79e19d1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 07:14:08 +0000 Subject: [PATCH 506/546] fluxctl: 1.20.2 -> 1.21.0 --- pkgs/applications/networking/cluster/fluxctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index 44e21de0a03..fe45b9ccb40 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxctl"; - version = "1.20.2"; + version = "1.21.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "1a44lmrvi5f9jr04rblhcsg3zvqzvdp9wyw4m4h4scsqp5g7dfb7"; + sha256 = "007i6kb80142v19w2dm3667sskcvdp1ilg3q3f9gjgr9c5nrg1m2"; }; - vendorSha256 = "1yzh6iglrzd43yqs1b6qh1i62b6qaz3232lgxyg3gmc81p0i5kr0"; + vendorSha256 = "01v4x2mk5jglnigq0iic52f84vzx56zh46i7v2wlq8ninj8y1k0x"; nativeBuildInputs = [ installShellFiles ]; From 98715062091b2288c8129d309a1d797c8045f03d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 07:27:27 +0000 Subject: [PATCH 507/546] fly: 6.5.1 -> 6.6.0 --- pkgs/development/tools/continuous-integration/fly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index c85f5473de8..1dcb247a4c8 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fly"; - version = "6.5.1"; + version = "6.6.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "0ldw40xn9nb5picly32nq558x0klvkyrr9af0jfngbvm4l5209bc"; + sha256 = "09cfsq8vfjhavhqcydg0l3bi1g12y2p160yi2v0y5vk7ipiqyzrd"; }; vendorSha256 = "1fxbxkg7disndlmb065abnfn7sn79qclkcbizmrq49f064w1ijr4"; From 8136d0c8fda9416535130942586e4ad9f64049f0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 07:38:45 +0000 Subject: [PATCH 508/546] flyctl: 0.0.140 -> 0.0.144 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 8a2cbbe3857..32be24f954a 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.140"; + version = "0.0.144"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "19yap6n3fw8cf9y6bb6yzl24m4f49jv38j7dj4hs09a5qwh85rz4"; + sha256 = "1wg8dgz930hj3q448gg5kxri31q078w5nshvlfkga7vzn8pdg3bk"; }; preBuild = '' @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "0vxfnq9ng7ybkw1xla7m2in2sg6hzvghczqnjrj96n07fln0s9rs"; + vendorSha256 = "0ryb97cwknxwhascz74filvx3wfwd0dhm6x36n4d7z2kiw7fgmh9"; doCheck = false; From d149b27d41032399057b04bdcd882d2f1205e042 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 14 Oct 2020 16:19:25 +0200 Subject: [PATCH 509/546] ocamlformat: refactor --- .../tools/ocaml/ocamlformat/default.nix | 86 ++----------------- .../tools/ocaml/ocamlformat/generic.nix | 68 +++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 76 insertions(+), 80 deletions(-) create mode 100644 pkgs/development/tools/ocaml/ocamlformat/generic.nix diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix index 5b607d3d6c6..1de95187af2 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -1,115 +1,43 @@ -{ lib, fetchurl, fetchzip, ocamlPackages }: +{ lib, fetchurl, fetchzip, callPackage }: -with ocamlPackages; - -let - mkOCamlformat = { - version, - sha256, - buildInputs, - useDune2 ? true, - tarballName ? "ocamlformat-${version}.tbz", - # The 'src' argument can be removed when 0.11.0 is pruned - src ? fetchurl { - url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/${tarballName}"; - inherit sha256; - } - }: - buildDunePackage rec { - pname = "ocamlformat"; - - minimumOCamlVersion = "4.06"; - - inherit src version useDune2 buildInputs; - - meta = { - homepage = "https://github.com/ocaml-ppx/ocamlformat"; - description = "Auto-formatter for OCaml code"; - maintainers = [ lib.maintainers.Zimmi48 lib.maintainers.marsam ]; - license = lib.licenses.mit; - }; - }; - - post_0_11_buildInputs = [ - base - cmdliner - fpath - ocaml-migrate-parsetree - odoc - re - stdio - uuseg - uutf - ]; - - post_0_14_buildInputs = [ - base - cmdliner - fpath - ocaml-migrate-parsetree - odoc - re - stdio - uuseg - uutf - fix - menhir - ]; -in +let mkOCamlformat = callPackage ./generic.nix; in # Older versions should be removed when their usage decrease # This script scraps Github looking for OCamlformat's options and versions usage: # https://gist.github.com/Julow/110dc94308d6078225e0665e3eccd433 rec { - ocamlformat_0_11_0 = mkOCamlformat rec { + ocamlformat_0_11_0 = mkOCamlformat { version = "0.11.0"; - src = fetchzip { - url = "https://github.com/ocaml-ppx/ocamlformat/archive/0.11.0.tar.gz"; - inherit sha256; - }; - sha256 = "0zvjn71jd4d3znnpgh0yphb2w8ggs457b6bl6cg1fmpdgxnds6yx"; - useDune2 = false; - buildInputs = post_0_11_buildInputs; }; ocamlformat_0_12 = mkOCamlformat { version = "0.12"; - sha256 = "1zi8x597dhp2822j6j28s84yyiqppl7kykpwqqclx6ybypvlzdpj"; - useDune2 = false; - buildInputs = post_0_11_buildInputs; }; ocamlformat_0_13_0 = mkOCamlformat rec { version = "0.13.0"; - sha256 = "0ki2flqi3xkhw9mfridivb6laxm7gml8rj9qz42vqmy9yx76jjxq"; tarballName = "ocamlformat-${version}-2.tbz"; - useDune2 = false; - buildInputs = post_0_11_buildInputs; }; ocamlformat_0_14_0 = mkOCamlformat { version = "0.14.0"; - sha256 = "070c0x6z5y0lyls56zm34g8lyc093wkr0jfp50dvrkr9fk1sx2wi"; - buildInputs = post_0_14_buildInputs; }; ocamlformat_0_14_1 = mkOCamlformat { version = "0.14.1"; - sha256 = "03wn46xib63748157xchj7gflkw5000fcjw6n89h9g82q9slazaa"; - buildInputs = post_0_14_buildInputs; }; ocamlformat_0_14_2 = mkOCamlformat { version = "0.14.2"; - sha256 = "16phz1sg9b070p6fm8d42j0piizg05vghdjmw8aj7xm82b1pm7sz"; - buildInputs = post_0_14_buildInputs; + }; + + ocamlformat_0_14_3 = mkOCamlformat { + version = "0.14.3"; }; ocamlformat_0_15_0 = mkOCamlformat { version = "0.15.0"; - sha256 = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6"; - buildInputs = post_0_14_buildInputs; }; ocamlformat = ocamlformat_0_15_0; diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/tools/ocaml/ocamlformat/generic.nix new file mode 100644 index 00000000000..c39ade7c074 --- /dev/null +++ b/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -0,0 +1,68 @@ +{ lib, fetchurl, fetchzip, ocamlPackages +, version +, tarballName ? "ocamlformat-${version}.tbz", +}: + +let src = + if version == "0.11.0" + then fetchzip { + url = "https://github.com/ocaml-ppx/ocamlformat/archive/0.11.0.tar.gz"; + sha256 = "0zvjn71jd4d3znnpgh0yphb2w8ggs457b6bl6cg1fmpdgxnds6yx"; + } else fetchurl { + url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/${tarballName}"; + sha256 = { + "0.12" = "1zi8x597dhp2822j6j28s84yyiqppl7kykpwqqclx6ybypvlzdpj"; + "0.13.0" = "0ki2flqi3xkhw9mfridivb6laxm7gml8rj9qz42vqmy9yx76jjxq"; + "0.14.0" = "070c0x6z5y0lyls56zm34g8lyc093wkr0jfp50dvrkr9fk1sx2wi"; + "0.14.1" = "03wn46xib63748157xchj7gflkw5000fcjw6n89h9g82q9slazaa"; + "0.14.2" = "16phz1sg9b070p6fm8d42j0piizg05vghdjmw8aj7xm82b1pm7sz"; + "0.14.3" = "13pfakdncddm41cp61p0l98scawbvhx1q4zdsglv7ph87l7zwqfl"; + "0.15.0" = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6"; + }."${version}"; + } +; in + +with ocamlPackages; + +buildDunePackage rec { + pname = "ocamlformat"; + inherit src version; + + minimumOCamlVersion = "4.06"; + + useDune2 = lib.versionAtLeast version "0.14"; + + buildInputs = + if lib.versionAtLeast version "0.14" + then [ + base + cmdliner + fpath + ocaml-migrate-parsetree + odoc + re + stdio + uuseg + uutf + fix + menhir + ] else [ + base + cmdliner + fpath + ocaml-migrate-parsetree + odoc + re + stdio + uuseg + uutf + ]; + + meta = { + homepage = "https://github.com/ocaml-ppx/ocamlformat"; + description = "Auto-formatter for OCaml code"; + maintainers = [ lib.maintainers.Zimmi48 lib.maintainers.marsam ]; + license = lib.licenses.mit; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83b1eae27bb..ce17c160bdc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9576,7 +9576,7 @@ in inherit (callPackage ../development/tools/ocaml/ocamlformat { }) ocamlformat # latest version ocamlformat_0_11_0 ocamlformat_0_12 ocamlformat_0_13_0 ocamlformat_0_14_0 - ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_15_0; + ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_14_3 ocamlformat_0_15_0; orc = callPackage ../development/compilers/orc { }; From 0628b0322fb47ccf1d71d883896ccb5ce9a06d4a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 08:10:02 +0000 Subject: [PATCH 510/546] frp: 0.34.0 -> 0.34.1 --- pkgs/tools/networking/frp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index 6bc05139f8b..0e00009751a 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "frp"; - version = "0.34.0"; + version = "0.34.1"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "1f0cr7211wkam1204x6gsflhw7gc995lia3jq4v6n3ijfwy5vyvm"; + sha256 = "1n1b7rr6njblz3rmsdl6xng4swlagg2z3jnik0gnajiq3w8ajwdj"; }; - vendorSha256 = "1ym4qcqgbbj6pa4cgmxmny7krxwjfl8l02hb3r5jh9qj886fwhdr"; + vendorSha256 = "18d9478ndzywwmh0jsxcb4i2rqyn3vzrgwflqrsv7krijalknsc9"; doCheck = false; From 7566c01d5332f06eb8270ee5f9a8db47fea65642 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 08:18:49 +0000 Subject: [PATCH 511/546] fselect: 0.6.10 -> 0.7.1 --- pkgs/tools/misc/fselect/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix index 312c7bbe3e9..bf0496037b5 100644 --- a/pkgs/tools/misc/fselect/default.nix +++ b/pkgs/tools/misc/fselect/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fselect"; - version = "0.6.10"; + version = "0.7.1"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = version; - sha256 = "17dz0qj2981plvzp72yisyrjnyz1sy3pqyvhx76ws2754vjgq4ra"; + sha256 = "1q7y5agsi6wjb1dnyvdhm4qmdhpv30cx5a8m1blks8is9z2bblz0"; }; - cargoSha256 = "19b05gx717xjg4arn4zgrqh7ckzgzx0ygg9gkfzsg7phz7f01626"; + cargoSha256 = "0r2zj0dvf6h4ph3b75z2rdlqwzkdjrjj2iad4dbf9nsr63giwd9n"; nativeBuildInputs = [ installShellFiles ]; From 6392f5e308b8e3e8f36b0ec5736fe1f4a757dd0b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 08:30:03 +0000 Subject: [PATCH 512/546] ft2-clone: 1.31 -> 1.36 --- pkgs/applications/audio/ft2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index bcdc1fe719c..4eae53e0542 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.31"; + version = "1.36"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "02j876d4xmbdmqairrs5190dzdm3k4s5hi3g9wvx62cxnnw7igha"; + sha256 = "0hsgzh7s2qgl8ah8hzmhfl74v5y8wc7f6z8ly9026h5r6pb09id0"; }; nativeBuildInputs = [ cmake ]; From c17f56677e9e3d54bb35b9b4724b34900f8fbeaa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 08:50:48 +0000 Subject: [PATCH 513/546] gauge: 1.1.3 -> 1.1.4 --- pkgs/development/tools/gauge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index 8755466ec8c..457d7b7a4b5 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "gauge"; - version = "1.1.3"; + version = "1.1.4"; goPackagePath = "github.com/getgauge/gauge"; excludedPackages = ''\(build\|man\)''; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "getgauge"; repo = "gauge"; rev = "v${version}"; - sha256 = "11qllg1alv9khkgjarpzlsqg5ygisjprg79n2jqhv1w6izx88cqc"; + sha256 = "07kq6j5scbcicgb8dqkf129q5ppvnlvkfp165ql30jrkfd6ybf6y"; }; meta = with stdenv.lib; { From 37d6d5a32c83a7ae3a55a81c366c377fbb8b229d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 09:03:52 +0000 Subject: [PATCH 514/546] gerbera: 1.6.1 -> 1.6.4 --- pkgs/servers/gerbera/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/gerbera/default.nix b/pkgs/servers/gerbera/default.nix index 93bd7778d08..c3f36a75923 100644 --- a/pkgs/servers/gerbera/default.nix +++ b/pkgs/servers/gerbera/default.nix @@ -21,13 +21,13 @@ let optionOnOff = option: if option then "on" else "off"; in stdenv.mkDerivation rec { pname = "gerbera"; - version = "1.6.1"; + version = "1.6.4"; src = fetchFromGitHub { repo = "gerbera"; owner = "gerbera"; rev = "v${version}"; - sha256 = "sha256:05ca27r9sidbl7xns9hcdan8wgjrpg26n1wq1vp247c9bqhpyql8"; + sha256 = "0vkgbw2ibvfr0zffnmmws7389msyqsiw8anfad6awvkda3z3rxjm"; }; cmakeFlags = [ @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { - homepage = https://docs.gerbera.io/; + homepage = "https://docs.gerbera.io/"; description = "UPnP Media Server for 2020"; longDescription = '' Gerbera is a Mediatomb fork. From 3366d98cae8657f702bb357fc5918d7d2966adec Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 09:11:10 +0000 Subject: [PATCH 515/546] gifski: 1.2.0 -> 1.2.2 --- pkgs/tools/graphics/gifski/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index 4758dece42f..612db49c8a4 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - sha256 = "0yziqgvjjb5bblmm060li7dv1i23gpn0f75jb72z8cdf2wg1qmxb"; + sha256 = "175wlvn6psa3xx9g2i05xykk24wpmkr0m27rm95jyi0kzlqdc466"; }; - cargoSha256 = "1y4q6p6hbmpwdpahmspgngm842qrq1srl7319wslq9ydl09m1x3x"; + cargoSha256 = "01gf8v6q2rpaik6dyxch8n2mpaxp222v32zrw19059hn3smg98l0"; nativeBuildInputs = [ pkgconfig ]; From b1d5d5174f711af3ecd590856faacee05ac7e87e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 09:21:55 +0000 Subject: [PATCH 516/546] gitoxide: 0.4.0 -> 0.4.3 --- pkgs/applications/version-management/gitoxide/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index b6b9c7e5660..0b9d29bd525 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.4.0"; + version = "0.4.3"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - sha256 = "0sx3z9l9n9qq2zj91pgm7znhxjsj59zvwms3aivfglhawwj3iwyj"; + sha256 = "0ap5ih4s99c4ah95mcafqsvy4yhfqab6vg1c6ydzfa4czczgcxff"; }; - cargoSha256 = "0ykkh86p4csi0v3pb2idjk94w9m32a34a5qrvna7ml5yz84m8hva"; + cargoSha256 = "0vj7g2jhvd5d37rcq02hval9axpciwyqyd10z2a0bsvw0r4bh943"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; From 0d68479eb70e878279730f5cb18314d4bae9f49c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 09:42:57 +0000 Subject: [PATCH 517/546] go-jira: 1.0.24 -> 1.0.27 --- pkgs/applications/misc/go-jira/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/go-jira/default.nix b/pkgs/applications/misc/go-jira/default.nix index 8b3ca1e2d8d..001f3d1de4c 100644 --- a/pkgs/applications/misc/go-jira/default.nix +++ b/pkgs/applications/misc/go-jira/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-jira"; - version = "1.0.24"; + version = "1.0.27"; src = fetchFromGitHub { rev = "v${version}"; owner = "go-jira"; repo = "jira"; - sha256 = "1qpimh39hsg75mb32hlvxmd7jj5b0cmhdkqz3dizfcnidllr3grd"; + sha256 = "1sw56aqghfxh88mfchf0nvqld0x7w22jfwx13pd24slxv1iag1nb"; }; - vendorSha256 = "18jwxnkv94lsxfv57ga519knxm077cc8chp5c992ipk58a04nv18"; + vendorSha256 = "0d64gkkzfm6hbgqaibj26fpaqnjs50p1675ycrshdhn6blb5mbxg"; doCheck = false; From a50653ce319035c1877be5127584242ccab0d66a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 10:04:46 +0000 Subject: [PATCH 518/546] go-tools: 2020.1.5 -> 2020.1.6 --- pkgs/development/tools/go-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix index ec4b1ee66b3..c566ea528b3 100644 --- a/pkgs/development/tools/go-tools/default.nix +++ b/pkgs/development/tools/go-tools/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "go-tools"; - version = "2020.1.5"; + version = "2020.1.6"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-tools"; rev = version; - sha256 = "1ry3ywncc9qkmh8ihh67v6k8nmqhq2gvfyrl1ykl4z6s56b7f9za"; + sha256 = "1r83gx7k4fiz3wlshhniz1i39xv492nni1nvfxjfqgnmkavb6r4x"; }; - vendorSha256 = "0nbbngsphklzhcmqafrw1im2l1vnfcma9sb4vskdpdrsadv5ss5r"; + vendorSha256 = "1g04rzirjv90s1i542cqi2abhgh8b74qwhp1hp1cszgb7k8nndmr"; doCheck = false; From b4dcee7c3f8d61bd5b8949ff6b8e80860f9a62d6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 10:28:18 +0000 Subject: [PATCH 519/546] gotestsum: 0.5.3 -> 0.5.4 --- pkgs/development/tools/gotestsum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index 71bccc74ce6..bc0b331c54d 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gotestsum"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; rev = "v${version}"; - sha256 = "1jq529m788yp3b6j4dhxgcw7qm1lyxx1ir2vwr41vp7gh17fmwar"; + sha256 = "1nmx91a5faixj1pzg9wbmxn8z1mphmdcvd6lajqy1ds21fzn2g1i"; }; - vendorSha256 = "1injixhllv41glb3yz276gjrkiwwkfimrhb367d2pvjpzqmhplan"; + vendorSha256 = "02av4z3lxfb6xrv3ij1alf5k8xhxz0dasnf2farbcszz021bzfrq"; doCheck = false; From 9440fec364809e1f53e0c6f097b4956b6200e027 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 10:55:24 +0000 Subject: [PATCH 520/546] grpcui: 1.0.0 -> 1.1.0 --- pkgs/tools/networking/grpcui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/grpcui/default.nix b/pkgs/tools/networking/grpcui/default.nix index be3ed2ea2c6..a9fb7c823f9 100644 --- a/pkgs/tools/networking/grpcui/default.nix +++ b/pkgs/tools/networking/grpcui/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpcui"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "fullstorydev"; repo = pname; rev = "v${version}"; - sha256 = "0b6rc294v8jagk79hcjbaldfi7y7idx8bknsbdi3djym5rspdg6s"; + sha256 = "1l8ldx7nx2pa2ac5znss0j0dhapn3syj02xqys4jz22hr5gvfj6m"; }; - vendorSha256 = "0wih9xvpgqqd82v1pxy5rslrsd6wsl0ys1bi1mf373dnfq5vh5a9"; + vendorSha256 = "15qgpbsl41swifw8w1lx0pbniwv3rf35127ald7h1r157vfa0r8b"; doCheck = false; From 1b8dafbba1e204d51182cfd547a5383f4f78810a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 11:12:51 +0000 Subject: [PATCH 521/546] h3: 3.6.4 -> 3.7.1 --- pkgs/development/misc/h3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/misc/h3/default.nix b/pkgs/development/misc/h3/default.nix index 32f65c0925c..8b8515261a1 100644 --- a/pkgs/development/misc/h3/default.nix +++ b/pkgs/development/misc/h3/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "h3"; - version = "3.6.4"; + version = "3.7.1"; src = fetchFromGitHub { owner = "uber"; repo = "h3"; rev = "v${version}"; - sha256 = "1a4scs5n9srq6sjkz8d60ffzpc6aadkxmk1i3hdj081j0jzsrpf7"; + sha256 = "1ccyzbvbacf0bl9av4yp15zmhiqr3679nnbab11yrhxm9csyal16"; }; nativeBuildInputs = [ cmake ]; From 051fd9bf7787595da34324863c44b5083338b876 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 11:27:23 +0000 Subject: [PATCH 522/546] hcxdumptool: 6.1.2 -> 6.1.3 --- pkgs/tools/security/hcxdumptool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/hcxdumptool/default.nix b/pkgs/tools/security/hcxdumptool/default.nix index 63752b5f123..4ffc4133c14 100644 --- a/pkgs/tools/security/hcxdumptool/default.nix +++ b/pkgs/tools/security/hcxdumptool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hcxdumptool"; - version = "6.1.2"; + version = "6.1.3"; src = fetchFromGitHub { owner = "ZerBea"; repo = "hcxdumptool"; rev = version; - sha256 = "0y73a5p23rg4zx6vkgpq1p3j2dzqcvzwn1ymswfkqm5zihbi17d7"; + sha256 = "1bbf617islljmcw665vqwlplbkpa36w2n4fc4avy7blj773lxp6y"; }; buildInputs = [ openssl ]; From b116c54879127228670ac2ff3a76eb59b59c9273 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 11:52:51 +0000 Subject: [PATCH 523/546] helmfile: 0.130.1 -> 0.131.0 --- pkgs/applications/networking/cluster/helmfile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 785a454fea2..8cd9a230be8 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.130.1"; + version = "0.131.0"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "14k3281sxin4ki78f2v75nyky1jxyhyq5aw06mhdp0w5ql9b02m4"; + sha256 = "1jhmw916acf0i3wji0i1srni90n2rxax95y09h1zszpccw60x4bf"; }; - vendorSha256 = "1k3aamsm97w22pdip2916a5f619rvnif7s8g6815pzsapgnpp4qp"; + vendorSha256 = "1r94yc9b57jvpa2mhnla32nxa01rh9s7zf8qjgcpw63hm20mbbgc"; doCheck = false; From 5bc7030a25c753b080ba77cf860b5e994b2fc49a Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 18 Oct 2020 14:08:28 +0200 Subject: [PATCH 524/546] freecad: add missing python module for addon manager --- pkgs/applications/graphics/freecad/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index f9322add5c0..563b3a5486f 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -32,6 +32,7 @@ in mkDerivation rec { libGLU libXmu qtbase qttools qtwebengine qtxmlpatterns ] ++ (with pythonPackages; [ matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost + GitPython # for addon manager ]); cmakeFlags = [ From 351f24fa03a2ef7cd12800c67b87cc61b5c09f4b Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 18 Oct 2020 14:09:26 +0200 Subject: [PATCH 525/546] freecad: 2020-09-25 -> 2020-10-17 --- pkgs/applications/graphics/freecad/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 563b3a5486f..3a5d36dfac1 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -9,13 +9,13 @@ let pythonPackages = python3Packages; in mkDerivation rec { pname = "freecad-unstable"; - version = "2020-09-25"; + version = "2020-10-17"; src = fetchFromGitHub { owner = "FreeCAD"; repo = "FreeCAD"; - rev = "7616153b3c31ace006169cdc2fdafab484498858"; - sha256 = "1vffvzv3gkndfj2k8ik0afyk9rgngnr4aai5py66qd63qd7kmxch"; + rev = "f3bdaaa55a6c03b297924c40819d23e4603fa55b"; + sha256 = "1q1iy4i9k65v8z7h8a6r4bf5ycn124jp26xwp0xwbar4gnkx2jiq"; }; nativeBuildInputs = [ From 3694212f4d059ad794572a87e4207738ac39ee12 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 13 Oct 2020 14:17:29 +0800 Subject: [PATCH 526/546] puddletag: fix wrapping --- pkgs/applications/audio/puddletag/default.nix | 13 +++++++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 56fcdcc94cd..55cde08fe87 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, chromaprint }: +{ stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook, chromaprint }: python3Packages.buildPythonApplication rec { pname = "puddletag"; @@ -13,6 +13,8 @@ python3Packages.buildPythonApplication rec { sourceRoot = "source/source"; + nativeBuildInputs = [ wrapQtAppsHook ]; + propagatedBuildInputs = [ chromaprint ] ++ (with python3Packages; [ configobj mutagen @@ -20,9 +22,13 @@ python3Packages.buildPythonApplication rec { pyqt5 ]); - doCheck = false; # there are no tests + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; - dontStrip = true; # we are not generating any binaries + doCheck = false; # there are no tests + + dontStrip = true; # we are not generating any binaries meta = with stdenv.lib; { description = "An audio tag editor similar to the Windows program, Mp3tag"; @@ -30,6 +36,5 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; - broken = true; # Needs Qt wrapping }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 850c4243b0d..326f54578f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20730,7 +20730,7 @@ in gradio = callPackage ../applications/audio/gradio { }; - puddletag = callPackage ../applications/audio/puddletag { }; + puddletag = libsForQt5.callPackage ../applications/audio/puddletag { }; w_scan = callPackage ../applications/video/w_scan { }; From a8d6b961d891e563710e909667c766e94f2761ac Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 12:52:08 +0000 Subject: [PATCH 527/546] hugo: 0.75.1 -> 0.76.5 --- pkgs/applications/misc/hugo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 37965fd6e3e..2707a481c73 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.75.1"; + version = "0.76.5"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "1c3l3q2xkibl1lz2mbvhgj94s6d9g5nakhpzj252s3m3cgk4w5wh"; + sha256 = "0p7zz9cif1vihhs21nvh4n3y1p2cwpga59rilpam7yvza4nzx7ay"; }; - vendorSha256 = "0gdd8fqd4mwg69wj8dxmm5wh1pjhdc189l2gy6njgpmwh93xbvdg"; + vendorSha256 = "0kiqy8n2df52gsgsbmr96rph8lpnw06g622123hlwk7kqg0z9ifh"; doCheck = false; From 1665d59ac3300f74f1eaa8d136d6f9cf64d11c93 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 18 Oct 2020 15:12:12 +0200 Subject: [PATCH 528/546] freecadStable: remove It depends on the insecure qtwebkit package. --- pkgs/applications/graphics/freecad/stable.nix | 85 ------------------- pkgs/top-level/all-packages.nix | 5 -- 2 files changed, 90 deletions(-) delete mode 100644 pkgs/applications/graphics/freecad/stable.nix diff --git a/pkgs/applications/graphics/freecad/stable.nix b/pkgs/applications/graphics/freecad/stable.nix deleted file mode 100644 index 657caeca8b3..00000000000 --- a/pkgs/applications/graphics/freecad/stable.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, -xercesc, ode, eigen, qtbase, qttools, qtwebkit, wrapQtAppsHook, -opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig, -gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkgconfig, mpi ? null }: - -assert mpi != null; - -let - pythonPackages = python3Packages; -in mkDerivation rec { - pname = "freecad"; - version = "0.18.4"; - - src = fetchFromGitHub { - owner = "FreeCAD"; - repo = "FreeCAD"; - rev = version; - sha256 = "1phs9a0px5fnzpyx930cz39p5dis0f0yajxzii3c3sazgkzrd55s"; - }; - - nativeBuildInputs = [ - cmake - ninja - pkgconfig - pythonPackages.pyside2-tools - wrapQtAppsHook - ]; - - buildInputs = [ - cmake coin3d xercesc ode eigen opencascade-occt gts - zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile - libGLU libXmu qtbase qttools qtwebkit - ] ++ (with pythonPackages; [ - matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost - ]); - - # Fix missing app icon on Wayland. Has been upstreamed and should be safe to - # remove in versions >= 0.19 - patches = [ - (fetchpatch { - url = "https://github.com/FreeCAD/FreeCAD/commit/c4d2a358ca125d51d059dfd72dcbfba326196dfc.patch"; - sha256 = "0yqc9zrxgi2c2xcidm8wh7a9yznkphqvjqm9742qm5fl20p8gl4h"; - }) - ]; - - cmakeFlags = [ - "-DBUILD_QT5=ON" - "-DSHIBOKEN_INCLUDE_DIR=${pythonPackages.shiboken2}/include" - "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken" - ("-DPYSIDE_INCLUDE_DIR=${pythonPackages.pyside2}/include" - + ";${pythonPackages.pyside2}/include/PySide2/QtCore" - + ";${pythonPackages.pyside2}/include/PySide2/QtWidgets" - + ";${pythonPackages.pyside2}/include/PySide2/QtGui" - ) - "-DPYSIDE_LIBRARY=PySide2::pyside2" - ]; - - # This should work on both x86_64, and i686 linux - preBuild = '' - export NIX_LDFLAGS="-L${gfortran.cc}/lib64 -L${gfortran.cc}/lib $NIX_LDFLAGS"; - ''; - - # Their main() removes PYTHONPATH=, and we rely on it. - preConfigure = '' - sed '/putenv("PYTHONPATH/d' -i src/Main/MainGui.cpp - - qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH") - ''; - - qtWrapperArgs = [ - "--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1" - ]; - - postFixup = '' - mv $out/share/doc $out - ''; - - meta = with stdenv.lib; { - description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; - homepage = "https://www.freecadweb.org/"; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ viric gebner ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 850c4243b0d..fa45539595b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20846,11 +20846,6 @@ in freecad = libsForQt5.callPackage ../applications/graphics/freecad { mpi = openmpi; }; - freecadStable = libsForQt5.callPackage ../applications/graphics/freecad/stable.nix { - mpi = openmpi; - opencascade-occt = opencascade-occt730; - python3Packages = python37Packages; - }; freemind = callPackage ../applications/misc/freemind { jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 From 27bf7cb663f56009e3cae5632034e63efaf41d4a Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 18 Oct 2020 15:13:25 +0200 Subject: [PATCH 529/546] opencascade-occt730: remove --- .../libraries/opencascade-occt/7.3.nix | 29 ------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 30 deletions(-) delete mode 100644 pkgs/development/libraries/opencascade-occt/7.3.nix diff --git a/pkgs/development/libraries/opencascade-occt/7.3.nix b/pkgs/development/libraries/opencascade-occt/7.3.nix deleted file mode 100644 index 5f8302aff3c..00000000000 --- a/pkgs/development/libraries/opencascade-occt/7.3.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, cmake, ninja, tcl, tk, - libGL, libGLU, libXext, libXmu, libXi, darwin }: - -stdenv.mkDerivation rec { - pname = "opencascade-occt"; - version = "7.3.0p3"; - commit = "V${builtins.replaceStrings ["."] ["_"] version}"; - - src = fetchurl { - name = "occt-${commit}.tar.gz"; - url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz"; - sha256 = "0k9c3ypcnjcilq1dhsf6xxbd52gyq4h5rchvp30k3c8ph4ris5pz"; - }; - - nativeBuildInputs = [ cmake ninja ]; - buildInputs = [ tcl tk libGL libGLU libXext libXmu libXi ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; - - meta = with stdenv.lib; { - description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; - homepage = "https://www.opencascade.org/"; - license = licenses.lgpl21; # essentially... - # The special exception defined in the file OCCT_LGPL_EXCEPTION.txt - # are basically about making the license a little less share-alike. - maintainers = with maintainers; [ amiloradovsky ]; - platforms = platforms.all; - }; - -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa45539595b..8d33489e0a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14707,7 +14707,6 @@ in inherit (darwin.apple_sdk.frameworks) OpenCL Cocoa; }; opencascade-occt = callPackage ../development/libraries/opencascade-occt { }; - opencascade-occt730 = callPackage ../development/libraries/opencascade-occt/7.3.nix { }; opencl-headers = callPackage ../development/libraries/opencl-headers { }; From c0b098a6580220d6e0b3ae97de244f345280536c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 14:29:57 +0000 Subject: [PATCH 530/546] intermodal: 0.1.11 -> 0.1.12 --- pkgs/tools/misc/intermodal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/intermodal/default.nix b/pkgs/tools/misc/intermodal/default.nix index fe5d724e696..438758a7949 100644 --- a/pkgs/tools/misc/intermodal/default.nix +++ b/pkgs/tools/misc/intermodal/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "intermodal"; - version = "0.1.11"; + version = "0.1.12"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "1wqf227ljfys16jfbxi6mlkgdczgqrh15ixl9vi6higlxfi2wsj2"; + sha256 = "0mn0wm3bihn7ffqk0p79mb1hik54dbhc9diq1wh9ylpld2iqmz68"; }; - cargoSha256 = "0lx8y1y5mf8ga7iz74dnfyf2b9jx15wishw0khfxknmh96h2y99h"; + cargoSha256 = "0kf5afarfwcl47b40pwnslfvxmxllmb995vc5ls2lpz4cx0jwahn"; # include_hidden test tries to use `chflags` on darwin checkFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ]; From 5a2f63248c4af3868215d51ce01ba59a15aa396e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 14:53:00 +0000 Subject: [PATCH 531/546] jackett: 0.16.1670 -> 0.16.1757 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 67975efb4a1..44266d781f3 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.16.1670"; + version = "0.16.1757"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "1jjvk2y56j6hx4588jsdvj2yk7slacn49z09vhw9vf9nkddx1mgb"; + sha256 = "1scf7sh4cpq0drz6jn60l6163g0dcqvp6ifq5gyj3484zwpxmnsf"; }; nativeBuildInputs = [ makeWrapper ]; From f739404c2bb15d900ab6e46ae2210bc48227098f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 15:14:12 +0000 Subject: [PATCH 532/546] joker: 0.15.6 -> 0.15.7 --- pkgs/development/interpreters/joker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index 7f773882d8f..2eb01b37644 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "joker"; - version = "0.15.6"; + version = "0.15.7"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "1yi9q8ibia6gz6s30i3bjrbmlhj6knrb3d73113dxrs8abi1mkbh"; + sha256 = "01mlizkflajad4759yl60ymibymrvanhc22jaffj50k9b77v97kq"; }; vendorSha256 = "031ban30kx84r54fj9aq96pwkz9nqh4p9yzs4l8i1wqmy52rldvl"; From 33e782aaf7f9bf4a3bf133a6eff75195c63ebbb2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 15:43:20 +0000 Subject: [PATCH 533/546] kbs2: 0.1.5 -> 0.1.6 --- pkgs/tools/security/kbs2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/kbs2/default.nix b/pkgs/tools/security/kbs2/default.nix index b61a39d603b..78935040fe1 100644 --- a/pkgs/tools/security/kbs2/default.nix +++ b/pkgs/tools/security/kbs2/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kbs2"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "woodruffw"; repo = pname; rev = "v${version}"; - sha256 = "1zyggdsnxzdbfyxk5jcx9r4ra049ddb51krc81s6nik27d5nivmf"; + sha256 = "0n83d4zvy74rn38fqq84lm58l24c3r87m2di2sw4cdr1hkjg3nbl"; }; - cargoSha256 = "0yxqn8jhcj4rxp0g77jsdp02g5qbc0axaaz1j4gp1bkcww6a9k7v"; + cargoSha256 = "0kafyljn3b87k5m0wdii0gfa4wj1yfys8jqx79inj82m0w1khprk"; nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ]; From 3065a71a58c0ac57f0262ae346de4bac76499ec4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 16:06:59 +0000 Subject: [PATCH 534/546] kpt: 0.34.0 -> 0.35.0 --- pkgs/applications/networking/cluster/kpt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kpt/default.nix b/pkgs/applications/networking/cluster/kpt/default.nix index a380cc200d9..9b43f143bdc 100644 --- a/pkgs/applications/networking/cluster/kpt/default.nix +++ b/pkgs/applications/networking/cluster/kpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kpt"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = pname; rev = "v${version}"; - sha256 = "1x4g45sq8licjcccvad6w1yb9h2z2cc2xbpp073j1pafnqwmrswq"; + sha256 = "0pk4j809hh4hkr58wx42vyzcn2g7l2lb60f4j1837hkk3rwrxkpm"; }; - vendorSha256 = "1vpljhqbvwv3a7k4c7p3n4ixh32f8hp9cqj8jz03mzqlmf60pyfs"; + vendorSha256 = "0c5ycyjhzz18ny544ddrag39la0fl0d3zrbbv8szb5jx87jx67jj"; subPackages = [ "." ]; From 8fadee041c638264da270137b96100c062a6576e Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Thu, 24 Sep 2020 14:23:24 +0200 Subject: [PATCH 535/546] pythonPackages.accuweather: init at 0.0.11 --- .../python-modules/accuweather/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/accuweather/default.nix diff --git a/pkgs/development/python-modules/accuweather/default.nix b/pkgs/development/python-modules/accuweather/default.nix new file mode 100644 index 00000000000..ed6dcb54377 --- /dev/null +++ b/pkgs/development/python-modules/accuweather/default.nix @@ -0,0 +1,28 @@ +{ aiohttp, buildPythonPackage, fetchFromGitHub, lib, pytest, pytestCheckHook +, pytestcov, pytestrunner, pytest-asyncio, python, pythonOlder }: + +buildPythonPackage rec { + pname = "accuweather"; + version = "0.0.11"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "bieniu"; + repo = pname; + rev = version; + sha256 = "1sgbw9yldf81phwx6pbvqg9sp767whxymyj0ca9pwx1r6ipr080h"; + }; + + nativeBuildInputs = [ pytestrunner ]; + propagatedBuildInputs = [ aiohttp ]; + checkInputs = [ pytestCheckHook pytestcov pytest-asyncio ]; + + meta = with lib; { + description = + "Python wrapper for getting weather data from AccuWeather servers."; + homepage = "https://github.com/bieniu/accuweather"; + license = licenses.asl20; + maintainers = with maintainers; [ jamiemagee ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 28092b35d84..6d2d7bed26f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -150,6 +150,8 @@ in { absl-py = callPackage ../development/python-modules/absl-py { }; + accuweather = callPackage ../development/python-modules/accuweather { }; + accupy = callPackage ../development/python-modules/accupy { }; acebinf = callPackage ../development/python-modules/acebinf { }; From e8b9945cca3fb375375c78acd14d462b7a942f35 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sat, 3 Oct 2020 14:41:52 +0200 Subject: [PATCH 536/546] home-assistant: regenerate component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 911f6bed75b..1f54f54483b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -5,7 +5,7 @@ version = "0.116.4"; components = { "abode" = ps: with ps; [ abodepy ]; - "accuweather" = ps: with ps; [ ]; # missing inputs: accuweather + "accuweather" = ps: with ps; [ accuweather ]; "acer_projector" = ps: with ps; [ pyserial ]; "acmeda" = ps: with ps; [ ]; # missing inputs: aiopulse "actiontec" = ps: with ps; [ ]; From 90da4ed932a0e6608581965bfe3d0fa88fd5a7f2 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 18 Oct 2020 18:58:41 +0200 Subject: [PATCH 537/546] nix-output-monitor: 0.1.0.0 -> 0.1.0.2 --- pkgs/tools/nix/nix-output-monitor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix index b01f1a41429..1c35e0ccd51 100644 --- a/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/pkgs/tools/nix/nix-output-monitor/default.nix @@ -4,12 +4,12 @@ }: mkDerivation { pname = "nix-output-monitor"; - version = "0.1.0.0"; + version = "0.1.0.2"; src = fetchFromGitHub { owner = "maralorn"; repo = "nix-output-monitor"; - sha256 = "1k9fni02y7xb97mkif1k7s0y1xv06hnqbkds35k4gg8mnf5z911i"; - rev = "a0e0b09"; + sha256 = "0r4348cbmnpawbfa20qw3wnywiqp0jkl5svzl27jrm2yk2g51509"; + rev = "5bf7534"; }; isLibrary = true; isExecutable = true; From 855b84d8b013a88804093cb8782c748441b999a6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 17:00:15 +0000 Subject: [PATCH 538/546] lean: 3.19.0 -> 3.21.0 --- pkgs/applications/science/logic/lean/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 32a75cabc13..eae2e384df4 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.19.0"; + version = "3.21.0"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "1dybq6104vc62x620izgblfd8dqc4ynaiw8ml07km78lq38anm6v"; + sha256 = "1c7f2x6hdamjkr50761gcb5mg8hhlc75k1mf18vn1k9zsy1gxlgz"; }; nativeBuildInputs = [ cmake ]; From b8ec336447e3d9e0d9a12af370c0332a38f7d9a6 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 18 Oct 2020 18:25:33 +0200 Subject: [PATCH 539/546] svtplay-dl: 2.6 -> 2.7 --- pkgs/tools/misc/svtplay-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 0c7e0141f93..a3e973be544 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "svtplay-dl"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "1d969ig4w6irx5822crhpab2f53svpiyf1vfx87irapy309dqy2y"; + sha256 = "0gcw7hwbr9jniwvqix37vvd2fiplsz70qab9w45d21i8jrfnhxb5"; }; pythonPaths = [ pycrypto pyyaml requests ]; From 7565d00a7c18f500a9cb5b48484f1b0fab95a43a Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Sat, 18 Jul 2020 11:27:37 +0200 Subject: [PATCH 540/546] mopidy-local: init at 3.1.1 Mopidy-Local is the successor to Mopidy-Local-SQLite and Mopidy-Local-Images, which are already packaged. I had to make gobject-introspection a propagated build input, otherwise Mopidy-Local can't import Mopidy. --- pkgs/applications/audio/mopidy/default.nix | 2 ++ pkgs/applications/audio/mopidy/local.nix | 30 ++++++++++++++++++++++ pkgs/applications/audio/mopidy/mopidy.nix | 21 +++++++++++---- pkgs/top-level/all-packages.nix | 1 + 4 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 pkgs/applications/audio/mopidy/local.nix diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 23322ca5663..984db6c57fb 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -14,6 +14,8 @@ let mopidy-gmusic = callPackage ./gmusic.nix { }; + mopidy-local = callPackage ./local.nix { }; + mopidy-local-images = callPackage ./local-images.nix { }; mopidy-local-sqlite = callPackage ./local-sqlite.nix { }; diff --git a/pkgs/applications/audio/mopidy/local.nix b/pkgs/applications/audio/mopidy/local.nix new file mode 100644 index 00000000000..43554280565 --- /dev/null +++ b/pkgs/applications/audio/mopidy/local.nix @@ -0,0 +1,30 @@ +{ lib +, mopidy +, python3Packages +}: + +python3Packages.buildPythonApplication rec { + pname = "Mopidy-Local"; + version = "3.1.1"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "13m0iz14lyplnpm96gfpisqvv4n89ls30kmkg21z7v238lm0h19j"; + }; + + propagatedBuildInputs = [ + mopidy + python3Packages.uritools + ]; + + checkInputs = [ + python3Packages.pytestCheckHook + ]; + + meta = with lib; { + homepage = "https://github.com/mopidy/mopidy-local"; + description = "Mopidy extension for playing music from your local music archive"; + license = licenses.asl20; + maintainers = with maintainers; [ ruuda ]; + }; +} diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index 28216020b78..eb5672fe135 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -16,13 +16,24 @@ pythonPackages.buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook ]; buildInputs = with gst_all_1; [ - gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad - glib-networking gobject-introspection + glib-networking + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gst-plugins-ugly ]; - propagatedBuildInputs = with pythonPackages; [ - gst-python pygobject3 pykka tornado requests setuptools - ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python; + propagatedBuildInputs = [ + gobject-introspection + ] ++ (with pythonPackages; [ + gst-python + pygobject3 + pykka + requests + setuptools + tornado + ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python + ); # There are no tests doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 326f54578f4..b520c0d913d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22122,6 +22122,7 @@ in mopidy mopidy-gmusic mopidy-iris + mopidy-local mopidy-local-images mopidy-local-sqlite mopidy-moped From 79a823ceae4c1a32216bc1943300838f95193250 Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Sun, 19 Jul 2020 21:02:03 +0200 Subject: [PATCH 541/546] mopidy-local-images: remove This plugin has been merged into the newer "mopidy-local" plugin which I just added. "mopidy-local-images" and "mopidy-local-sqlite" were added originally for Mopidy Iris, but Iris now works with mopidy-local, and does not need the older plugins any more. --- pkgs/applications/audio/mopidy/default.nix | 2 -- pkgs/applications/audio/mopidy/iris.nix | 2 +- .../audio/mopidy/local-images.nix | 32 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 5 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 pkgs/applications/audio/mopidy/local-images.nix diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 984db6c57fb..90b681a99b3 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -16,8 +16,6 @@ let mopidy-local = callPackage ./local.nix { }; - mopidy-local-images = callPackage ./local-images.nix { }; - mopidy-local-sqlite = callPackage ./local-sqlite.nix { }; mopidy-spotify = callPackage ./spotify.nix { }; diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 467ba6fe3f7..48f955fd713 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, mopidy, mopidy-local-images }: +{ stdenv, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; diff --git a/pkgs/applications/audio/mopidy/local-images.nix b/pkgs/applications/audio/mopidy/local-images.nix deleted file mode 100644 index 085fe855e8a..00000000000 --- a/pkgs/applications/audio/mopidy/local-images.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchFromGitHub, pythonPackages, mopidy, gobject-introspection }: - -pythonPackages.buildPythonApplication rec { - pname = "mopidy-local-images"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "mopidy"; - repo = "mopidy-local-images"; - rev = "v${version}"; - sha256 = "0gdqxws0jish50mmi57mlqcs659wrllzv00czl18niz94vzvyc0d"; - }; - - buildInputs = [ gobject-introspection ]; - - checkInputs = [ - pythonPackages.mock - ]; - - propagatedBuildInputs = [ - mopidy - pythonPackages.pykka - pythonPackages.uritools - ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/mopidy/mopidy-local-images"; - description = "Mopidy local library proxy extension for handling embedded album art"; - license = licenses.asl20; - maintainers = [ maintainers.rvolosatovs ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f8e2091d4c1..3b5cccc8747 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -303,6 +303,7 @@ mapAliases ({ mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # added 2020-05-23 mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 mirage = throw "mirage has been femoved from nixpkgs, as it's unmaintained"; # added 2019-12-10 + mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18 mysql-client = hiPrio mariadb.client; memtest86 = memtest86plus; # added 2019-05-08 mesa_noglu = mesa; # added 2019-05-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b520c0d913d..03dbf51a643 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22123,7 +22123,6 @@ in mopidy-gmusic mopidy-iris mopidy-local - mopidy-local-images mopidy-local-sqlite mopidy-moped mopidy-mopify From b82ca4d2e100592b43ec79ee4efeb626d0929cdd Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Sun, 18 Oct 2020 19:22:12 +0200 Subject: [PATCH 542/546] mopidy-local-sqlite: remove This plugin has been merged into the newer "mopidy-local" plugin which I just added. "mopidy-local-images" and "mopidy-local-sqlite" were added originally for Mopidy Iris, but Iris now works with mopidy-local, and does not need the older ones any more. --- pkgs/applications/audio/mopidy/default.nix | 2 -- .../audio/mopidy/local-sqlite.nix | 25 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 4 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 pkgs/applications/audio/mopidy/local-sqlite.nix diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 90b681a99b3..fc532482cba 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -16,8 +16,6 @@ let mopidy-local = callPackage ./local.nix { }; - mopidy-local-sqlite = callPackage ./local-sqlite.nix { }; - mopidy-spotify = callPackage ./spotify.nix { }; mopidy-moped = callPackage ./moped.nix { }; diff --git a/pkgs/applications/audio/mopidy/local-sqlite.nix b/pkgs/applications/audio/mopidy/local-sqlite.nix deleted file mode 100644 index 23e01c02a0f..00000000000 --- a/pkgs/applications/audio/mopidy/local-sqlite.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchFromGitHub, pythonPackages, mopidy }: - -pythonPackages.buildPythonApplication rec { - pname = "mopidy-local-sqlite"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "mopidy"; - repo = "mopidy-local-sqlite"; - rev = "v${version}"; - sha256 = "1fjd9ydbfwd1n9b9zw8zjn4l7c5hpam2n0xs51pjkjn82m3zq9zv"; - }; - - propagatedBuildInputs = [ - mopidy - pythonPackages.uritools - ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/mopidy/mopidy-local-sqlite"; - description = "Mopidy SQLite local library extension"; - license = licenses.asl20; - maintainers = [ maintainers.rvolosatovs ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3b5cccc8747..df248096890 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -304,6 +304,7 @@ mapAliases ({ mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 mirage = throw "mirage has been femoved from nixpkgs, as it's unmaintained"; # added 2019-12-10 mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18 + mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18 mysql-client = hiPrio mariadb.client; memtest86 = memtest86plus; # added 2019-05-08 mesa_noglu = mesa; # added 2019-05-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03dbf51a643..aebf895e385 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22123,7 +22123,6 @@ in mopidy-gmusic mopidy-iris mopidy-local - mopidy-local-sqlite mopidy-moped mopidy-mopify mopidy-mpd From f98219c519d08d10470b031855fb616d95e95d6c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 18 Oct 2020 08:36:37 -0700 Subject: [PATCH 543/546] linuxPackages.nvidia_x11.persistenced: fix build --- pkgs/os-specific/linux/nvidia-x11/persistenced.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index ff2792ac315..d528512a450 100644 --- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -1,6 +1,6 @@ nvidia_x11: sha256: -{ stdenv, fetchFromGitHub, m4 }: +{ stdenv, fetchFromGitHub, m4, pkg-config, libtirpc }: stdenv.mkDerivation rec { pname = "nvidia-persistenced"; @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { inherit sha256; }; - nativeBuildInputs = [ m4 ]; + nativeBuildInputs = [ m4 pkg-config ]; + + buildInputs = [ libtirpc ]; installFlags = [ "PREFIX=$(out)" ]; From 2e67196d79fe0422fa5f4e519c7309e2103f029c Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Wed, 14 Oct 2020 21:41:37 -0400 Subject: [PATCH 544/546] nixos/nvidia: decouple nvidia_x11.persistenced --- nixos/modules/hardware/video/nvidia.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 2acb891f1a9..6c2d747ee85 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -235,7 +235,7 @@ in hardware.opengl.extraPackages32 = optional offloadCfg.enable nvidia_libs32; environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ] - ++ filter (p: p != null) [ nvidia_x11.persistenced ]; + ++ optional nvidiaPersistencedEnabled [ nvidia_x11.persistenced ]; systemd.packages = optional cfg.powerManagement.enable nvidia_x11.out; From ff6efa6f16724fed790bdb0f6b935fb444ad3e7b Mon Sep 17 00:00:00 2001 From: Jon Date: Sun, 18 Oct 2020 11:24:31 -0700 Subject: [PATCH 545/546] Revert "linuxPackages.nvidia_x11.persistenced: fix build" This reverts commit f98219c519d08d10470b031855fb616d95e95d6c. --- pkgs/os-specific/linux/nvidia-x11/persistenced.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index d528512a450..ff2792ac315 100644 --- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -1,6 +1,6 @@ nvidia_x11: sha256: -{ stdenv, fetchFromGitHub, m4, pkg-config, libtirpc }: +{ stdenv, fetchFromGitHub, m4 }: stdenv.mkDerivation rec { pname = "nvidia-persistenced"; @@ -13,9 +13,7 @@ stdenv.mkDerivation rec { inherit sha256; }; - nativeBuildInputs = [ m4 pkg-config ]; - - buildInputs = [ libtirpc ]; + nativeBuildInputs = [ m4 ]; installFlags = [ "PREFIX=$(out)" ]; From 5e67d80a8ba61fe0467b633c1cb63143c66a26a6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 18 Oct 2020 11:42:05 -0700 Subject: [PATCH 546/546] nixos/nvidia: fix optionals usage --- nixos/modules/hardware/video/nvidia.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 6c2d747ee85..d1cf7d05c1b 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -235,7 +235,7 @@ in hardware.opengl.extraPackages32 = optional offloadCfg.enable nvidia_libs32; environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ] - ++ optional nvidiaPersistencedEnabled [ nvidia_x11.persistenced ]; + ++ optionals nvidiaPersistencedEnabled [ nvidia_x11.persistenced ]; systemd.packages = optional cfg.powerManagement.enable nvidia_x11.out;