From 8850a2c906782b6d45e9953d7e96f5ac41094208 Mon Sep 17 00:00:00 2001 From: Thomas Depierre Date: Sat, 20 Jun 2020 15:31:47 +0200 Subject: [PATCH 001/123] apache-kafka: 2.4.0 -> 2.4.1/2.5.0 --- nixos/tests/kafka.nix | 1 + pkgs/servers/apache-kafka/default.nix | 9 +++++++-- pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix index d29c802b47b4..88e30b62baa2 100644 --- a/nixos/tests/kafka.nix +++ b/nixos/tests/kafka.nix @@ -90,4 +90,5 @@ in with pkgs; { kafka_2_2 = makeKafkaTest "kafka_2_2" apacheKafka_2_2; kafka_2_3 = makeKafkaTest "kafka_2_3" apacheKafka_2_3; kafka_2_4 = makeKafkaTest "kafka_2_4" apacheKafka_2_4; + kafka_2_5 = makeKafkaTest "kafka_2_5" apacheKafka_2_5; } diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index a8baefa98ea0..3aeb5bb719f9 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -49,9 +49,14 @@ let sha256 = "0bldfrvd351agm237icnvn36va67crpnzmbh6dlq84ip910xsgas"; }; "2.4" = { - kafkaVersion = "2.4.0"; + kafkaVersion = "2.4.1"; scalaVersion = "2.12"; - sha256 = "1vng5ipkjzqy0wijc706w2m1rjl5d0nsgbxiacci739y1jmjnn5r"; + sha256 = "0ahsprmpjz026mhbr79187wfdrxcg352iipyfqfrx68q878wnxr1"; + }; + "2.5" = { + kafkaVersion = "2.5.0"; + scalaVersion = "2.13"; + sha256 = "0w3g7ii8x63m2blv2a8c491d0diczpliaqm9f7w5yn98hikh0aqi"; }; }; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca857afc5eea..ef7e1d61ffe7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9996,7 +9996,7 @@ in apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; ant = apacheAnt; - apacheKafka = apacheKafka_2_4; + apacheKafka = apacheKafka_2_5; apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; }; apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; }; apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; }; @@ -10007,6 +10007,7 @@ in apacheKafka_2_2 = callPackage ../servers/apache-kafka { majorVersion = "2.2"; }; apacheKafka_2_3 = callPackage ../servers/apache-kafka { majorVersion = "2.3"; }; apacheKafka_2_4 = callPackage ../servers/apache-kafka { majorVersion = "2.4"; }; + apacheKafka_2_5 = callPackage ../servers/apache-kafka { majorVersion = "2.5"; }; kt = callPackage ../tools/misc/kt {}; From c60cafa719ba22772114f4c35df14fb18f66a66f Mon Sep 17 00:00:00 2001 From: Christian Kauhaus Date: Mon, 7 Sep 2020 12:11:37 +0200 Subject: [PATCH 002/123] mccp: add patch for CVE-2019-14274 Fixes #67197 --- pkgs/development/compilers/mcpp/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/mcpp/default.nix b/pkgs/development/compilers/mcpp/default.nix index bf0db4c1f6cd..023bae48b3e9 100644 --- a/pkgs/development/compilers/mcpp/default.nix +++ b/pkgs/development/compilers/mcpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { pname = "mcpp"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-mcpplib" ]; + patches = [ + (fetchpatch { + name = "CVE-2019-14274.patch"; + url = "https://github.com/h8liu/mcpp/commit/ea453aca2742be6ac43ba4ce0da6f938a7e5a5d8.patch"; + sha256 = "0svkdr3w9b45v6scgzvggw9nsh6a3k7g19fqk0w3vlckwmk5ydzr"; + }) + ]; + meta = with stdenv.lib; { homepage = "http://mcpp.sourceforge.net/"; description = "A portable c preprocessor"; From b82f1771daabd228c06a6284060ccd9537cd4ba2 Mon Sep 17 00:00:00 2001 From: GTrunSec Date: Fri, 11 Sep 2020 15:59:31 -0700 Subject: [PATCH 003/123] zeek: Fix zeek script coreutils and hardlinking --- pkgs/applications/networking/ids/zeek/default.nix | 3 ++- pkgs/applications/networking/ids/zeek/script.nix | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index a0e6433a2028..13e41654b766 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -14,9 +14,10 @@ , swig , gettext , fetchpatch +, coreutils }: let - preConfigure = (import ./script.nix); + preConfigure = (import ./script.nix {inherit coreutils;}); in stdenv.mkDerivation rec { pname = "zeek"; diff --git a/pkgs/applications/networking/ids/zeek/script.nix b/pkgs/applications/networking/ids/zeek/script.nix index 10a2d11a1489..4c8bbcf22c03 100644 --- a/pkgs/applications/networking/ids/zeek/script.nix +++ b/pkgs/applications/networking/ids/zeek/script.nix @@ -1,4 +1,10 @@ +{coreutils}: '' + sed -i 's|/bin/mv|${coreutils}/bin/mv|' scripts/base/frameworks/logging/writers/ascii.zeek + sed -i 's|/bin/mv|${coreutils}/bin/mv|' scripts/policy/misc/trim-trace-file.zeek + sed -i 's|/bin/cat|${coreutils}/bin/cat|' scripts/base/frameworks/notice/actions/pp-alarms.zeek + sed -i 's|/bin/cat|${coreutils}/bin/cat|' scripts/base/frameworks/notice/main.zeek + sed -i "1i##! test dpd" $PWD/scripts/base/frameworks/dpd/__load__.zeek sed -i "1i##! test x509" $PWD/scripts/base/files/x509/__load__.zeek sed -i "1i##! test files-extract" $PWD/scripts/base/files/extract/__load__.zeek @@ -32,6 +38,7 @@ sed -i "1i##! test dns" $PWD/scripts/base/protocols/dns/__load__.zeek sed -i "1i##! test ftp" $PWD/scripts/base/protocols/ftp/__load__.zeek sed -i "1i##! test http" $PWD/scripts/base/protocols/http/__load__.zeek + sed -i "1i##! test tunnels" $PWD/scripts/base/protocols/tunnels/__load__.zeek sed -i "1i##! test imap" $PWD/scripts/base/protocols/imap/__load__.zeek sed -i "1i##! test irc" $PWD/scripts/base/protocols/irc/__load__.zeek sed -i "1i##! test krb" $PWD/scripts/base/protocols/krb/__load__.zeek From ddd23d679074bebd107b628a4bb689f996889f5c Mon Sep 17 00:00:00 2001 From: Kai Harries Date: Sun, 13 Sep 2020 18:29:13 +0200 Subject: [PATCH 004/123] signal-desktop: fix test Test was broken because network is not available during sandboxed test run and therefore the expected text was never shown. ZHF: #97479 --- nixos/tests/signal-desktop.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/tests/signal-desktop.nix b/nixos/tests/signal-desktop.nix index e4b830e9e237..65ae49a267d9 100644 --- a/nixos/tests/signal-desktop.nix +++ b/nixos/tests/signal-desktop.nix @@ -31,8 +31,13 @@ import ./make-test-python.nix ({ pkgs, ...} : # start signal desktop machine.execute("su - alice -c signal-desktop &") - # wait for the "Link your phone to Signal Desktop" message - machine.wait_for_text("Link your phone to Signal Desktop") + # Wait for the Signal window to appear. Since usually the tests + # are run sandboxed and therfore with no internet, we can not wait + # for the message "Link your phone ...". Nor should we wait for + # the "Failed to connect to server" message, because when manually + # running this test it will be not sandboxed. + machine.wait_for_text("Signal") + machine.wait_for_text("File Edit View Window Help") machine.screenshot("signal_desktop") ''; }) From d8bc3fa196ce459724f02f78bed3c63d8d064c3f Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sun, 13 Sep 2020 11:57:12 -0400 Subject: [PATCH 005/123] chatterino2: 2.1.7 -> 2.2.2 Co-authored-by: Cole Helbling --- .../instant-messengers/chatterino2/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index 8fd0128ef2ca..617c02de2635 100644 --- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -2,12 +2,12 @@ mkDerivation rec { pname = "chatterino2"; - version = "2.1.7"; + version = "2.2.2"; src = fetchFromGitHub { - owner = "fourtf"; + owner = "Chatterino"; repo = pname; rev = "v${version}"; - sha256 = "0bbdzainfa7hlz5p0jfq4y04i3wix7z3i6w193906bi4gr9wilpg"; + sha256 = "026cs48hmqkv7k4akbm205avj2pn3x1g7q46chwa707k9km325dz"; fetchSubmodules = true; }; nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; @@ -26,8 +26,9 @@ mkDerivation rec { improved/extended version of the Twitch web chat. Chatterino 2 is the second installment of the Twitch chat client series "Chatterino". - ''; - homepage = "https://github.com/fourtf/chatterino2"; + ''; + homepage = "https://github.com/Chatterino/chatterino2"; + changelog = "https://github.com/Chatterino/chatterino2/blob/master/CHANGELOG.md"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ rexim ]; From b3810166c7dc5c75a5961e9c92726361a1ffc316 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 15 Sep 2020 20:45:42 +0200 Subject: [PATCH 006/123] nixos/doc: Soft deprecate types.attrs --- nixos/doc/manual/development/option-types.xml | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index 5a6dae6e9912..9827615349d9 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -21,16 +21,6 @@ - - - types.attrs - - - - A free-form attribute set. - - - types.bool @@ -64,6 +54,24 @@ + + + types.attrs + + + + A free-form attribute set. + + This type will be deprecated in the future because it doesn't recurse + into attribute sets, silently drops earlier attribute definitions, and + doesn't discharge lib.mkDefault, lib.mkIf + and co. For allowing arbitrary attribute sets, prefer + types.attrsOf types.anything instead which doesn't + have these problems. + + + + From 6e7bc2c6c90335e7bb7d7ca8cef77c58f0e37444 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 15 Sep 2020 20:30:48 +0200 Subject: [PATCH 007/123] lib/options: Fix mergeEqualOption for singular functions Previously it would error out for a single function definition --- lib/options.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/options.nix b/lib/options.nix index 38f4f1329f21..0494a597ab80 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -107,6 +107,10 @@ rec { /* "Merge" option definitions by checking that they all have the same value. */ mergeEqualOption = loc: defs: if defs == [] then abort "This case should never happen." + # Return early if we only have one element + # This also makes it work for functions, because the foldl' below would try + # to compare the first element with itself, which is false for functions + else if length defs == 1 then (elemAt defs 0).value else foldl' (val: def: if def.value != val then throw "The option `${showOption loc}' has conflicting definitions, in ${showFiles (getFiles defs)}." From 67551f46fbc20b3b96ff27503b659a8f3fedb421 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 4 Sep 2020 13:18:22 +0200 Subject: [PATCH 008/123] lib/types: Introduce types.anything This new type has unsurprising merge behavior: Only attribute sets are merged together (recursively), and only if they don't conflict. This is in contrast to the existing types: - types.attrs is problematic because later definitions completely override attributes of earlier definitions, and it doesn't support mkIf and co. - types.unspecified is very similar to types.attrs, but it has smart merging behavior that often doesn't make sense, and it doesn't support all types --- lib/types.nix | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/lib/types.nix b/lib/types.nix index 17e7a939fe3d..a5f4d87e3efd 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -101,6 +101,42 @@ rec { # When adding new types don't forget to document them in # nixos/doc/manual/development/option-types.xml! types = rec { + + anything = mkOptionType { + name = "anything"; + description = "anything"; + check = value: true; + merge = loc: defs: + let + getType = value: + if isAttrs value && isCoercibleToString value + then "stringCoercibleSet" + else builtins.typeOf value; + + # Returns the common type of all definitions, throws an error if they + # don't have the same type + commonType = foldl' (type: def: + if getType def.value == type + then type + else throw "The option `${showOption loc}' has conflicting option types in ${showFiles (getFiles defs)}" + ) (getType (head defs).value) defs; + + mergeFunction = { + # Recursively merge attribute sets + set = (attrsOf anything).merge; + # Safe and deterministic behavior for lists is to only accept one definition + # listOf only used to apply mkIf and co. + list = + if length defs > 1 + then throw "The option `${showOption loc}' has conflicting definitions, in ${showFiles (getFiles defs)}." + else (listOf anything).merge; + # This is the type of packages, only accept a single definition + stringCoercibleSet = mergeOneOption; + # Otherwise fall back to only allowing all equal definitions + }.${commonType} or mergeEqualOption; + in mergeFunction loc defs; + }; + unspecified = mkOptionType { name = "unspecified"; }; From 6a7d250007baedeb4de34e8ce490d49160cb63a8 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 4 Sep 2020 15:27:26 +0200 Subject: [PATCH 009/123] lib/tests: Add tests for types.anything --- lib/tests/modules.sh | 29 ++++++++++++ .../types-anything/attrs-coercible.nix | 12 +++++ .../modules/types-anything/equal-atoms.nix | 26 +++++++++++ .../modules/types-anything/functions.nix | 17 +++++++ lib/tests/modules/types-anything/lists.nix | 16 +++++++ lib/tests/modules/types-anything/mk-mods.nix | 44 +++++++++++++++++++ .../modules/types-anything/nested-attrs.nix | 22 ++++++++++ 7 files changed, 166 insertions(+) create mode 100644 lib/tests/modules/types-anything/attrs-coercible.nix create mode 100644 lib/tests/modules/types-anything/equal-atoms.nix create mode 100644 lib/tests/modules/types-anything/functions.nix create mode 100644 lib/tests/modules/types-anything/lists.nix create mode 100644 lib/tests/modules/types-anything/mk-mods.nix create mode 100644 lib/tests/modules/types-anything/nested-attrs.nix diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 943deebe3c09..cfe474d4ded2 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -233,6 +233,35 @@ checkConfigError 'infinite recursion encountered' config.foo ./freeform-attrsOf. checkConfigError 'The option .* is used but not defined' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix checkConfigOutput 24 config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix ./define-value-string.nix +## types.anything +# Check that attribute sets are merged recursively +checkConfigOutput null config.value.foo ./types-anything/nested-attrs.nix +checkConfigOutput null config.value.l1.foo ./types-anything/nested-attrs.nix +checkConfigOutput null config.value.l1.l2.foo ./types-anything/nested-attrs.nix +checkConfigOutput null config.value.l1.l2.l3.foo ./types-anything/nested-attrs.nix +# Attribute sets that are coercible to strings shouldn't be recursed into +checkConfigOutput foo config.value.outPath ./types-anything/attrs-coercible.nix +# Multiple lists aren't concatenated together +checkConfigError 'The option .* has conflicting definitions' config.value ./types-anything/lists.nix +# Check that all equalizable atoms can be used as long as all definitions are equal +checkConfigOutput 0 config.value.int ./types-anything/equal-atoms.nix +checkConfigOutput false config.value.bool ./types-anything/equal-atoms.nix +checkConfigOutput '""' config.value.string ./types-anything/equal-atoms.nix +checkConfigOutput / config.value.path ./types-anything/equal-atoms.nix +checkConfigOutput null config.value.null ./types-anything/equal-atoms.nix +checkConfigOutput 0.1 config.value.float ./types-anything/equal-atoms.nix +# Functions can't be merged together +checkConfigError "The option .* has conflicting definitions" config.value.multiple-lambdas ./types-anything/functions.nix +checkConfigOutput '' config.value.single-lambda ./types-anything/functions.nix +# Check that all mk* modifiers are applied +checkConfigError 'attribute .* not found' config.value.mkiffalse ./types-anything/mk-mods.nix +checkConfigOutput '{ }' config.value.mkiftrue ./types-anything/mk-mods.nix +checkConfigOutput 1 config.value.mkdefault ./types-anything/mk-mods.nix +checkConfigOutput '{ }' config.value.mkmerge ./types-anything/mk-mods.nix +checkConfigOutput true config.value.mkbefore ./types-anything/mk-mods.nix +checkConfigOutput 1 config.value.nested.foo ./types-anything/mk-mods.nix +checkConfigOutput baz config.value.nested.bar.baz ./types-anything/mk-mods.nix + cat < Date: Tue, 15 Sep 2020 20:42:34 +0200 Subject: [PATCH 010/123] nixos/doc: Add docs for types.anything --- nixos/doc/manual/development/option-types.xml | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index 9827615349d9..3d2191e2f3f3 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -54,6 +54,46 @@ + + + types.anything + + + + A type that accepts any value and recursively merges attribute sets together. + This type is recommended when the option type is unknown. + + <literal>types.anything</literal> Example + + Two definitions of this type like + +{ + str = lib.mkDefault "foo"; + pkg.hello = pkgs.hello; + fun.fun = x: x + 1; +} + + +{ + str = lib.mkIf true "bar"; + pkg.gcc = pkgs.gcc; + fun.fun = lib.mkForce (x: x + 2); +} + + will get merged to + +{ + str = "bar"; + pkg.gcc = pkgs.gcc; + pkg.hello = pkgs.hello; + fun.fun = x: x + 2; +} + + + + + + types.attrs From 8f5bfd6af15ef83d3ff17cd278061293cd3a1f58 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Wed, 16 Sep 2020 10:15:46 +0200 Subject: [PATCH 011/123] tensorflow: Fix compilation with numpy 1.19.x Numpy introduced a breaking API change in version 1.19.x, see [1]. There is a simple fix [2] available in the master branch. [1]: https://github.com/tensorflow/tensorflow/issues/40688 [2]: https://github.com/tensorflow/tensorflow/commit/75ea0b31477d6ba9e990e296bbbd8ca4e7eebadf --- pkgs/development/python-modules/tensorflow/1/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/tensorflow/1/default.nix b/pkgs/development/python-modules/tensorflow/1/default.nix index 5f65004b3d68..1aad8677ca28 100644 --- a/pkgs/development/python-modules/tensorflow/1/default.nix +++ b/pkgs/development/python-modules/tensorflow/1/default.nix @@ -132,6 +132,13 @@ let }) ./lift-gast-restriction.patch + (fetchpatch { + # fix compilation with numpy >= 1.19 + name = "add-const-overload.patch"; + url = "https://github.com/tensorflow/tensorflow/commit/75ea0b31477d6ba9e990e296bbbd8ca4e7eebadf.patch"; + sha256 = "1xp1icacig0xm0nmb05sbrf4nw4xbln9fhc308birrv8286zx7wv"; + }) + # cuda 10.2 does not have "-bin2c-path" option anymore # https://github.com/tensorflow/tensorflow/issues/34429 ../cuda-10.2-no-bin2c-path.patch From 81c2d88d7a1ddd5fb98f85009a3640e1bd1b3a74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Jourde?= Date: Wed, 16 Sep 2020 19:08:44 +0200 Subject: [PATCH 012/123] sc-controller: fixing missing icons (librsvg) --- pkgs/misc/drivers/sc-controller/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix index 4de6e54cd5fb..29264b4f61d3 100644 --- a/pkgs/misc/drivers/sc-controller/default.nix +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -34,9 +34,6 @@ buildPythonApplication rec { preFixup = '' gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH") - # gdk-pixbuf setup hook can not choose between propagated librsvg - # and our librsvg with GObject introspection. - GDK_PIXBUF_MODULE_FILE=$(echo ${librsvg}/lib/gdk-pixbuf-2.0/*/loaders.cache) ''; postFixup = '' From 445f5aaee120c2169b751c2a577e52ca613fc8f4 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 17 Sep 2020 13:18:38 +0300 Subject: [PATCH 013/123] openmpt123: 0.5.1 -> 0.5.2 --- pkgs/applications/audio/openmpt123/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index 15d38a1eea77..0646407582ed 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -2,14 +2,14 @@ , usePulseAudio ? config.pulseaudio or false, libpulseaudio }: let - version = "0.5.1"; + version = "0.5.2"; in stdenv.mkDerivation { pname = "openmpt123"; inherit version; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "1vpalfsrkbx4vyrh1qy564lr91jwdxlbjivv5gzf8zcywxasf0xa"; + sha256 = "1cwpc4j90dpxa2siia68rg9qwwm2xk6bhxnslfjj364507jy6s4l"; }; enableParallelBuilding = true; From 34e8ce3de51cdfef4b6907a678c8de2fa34644c8 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 17 Sep 2020 16:12:19 +0300 Subject: [PATCH 014/123] mame: 0.223 -> 0.224 --- pkgs/misc/emulators/mame/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix index ea5e97762265..a9901fa3dccc 100644 --- a/pkgs/misc/emulators/mame/default.nix +++ b/pkgs/misc/emulators/mame/default.nix @@ -7,7 +7,7 @@ with stdenv; let majorVersion = "0"; - minorVersion = "223"; + minorVersion = "224"; desktopItem = makeDesktopItem { name = "MAME"; @@ -26,7 +26,7 @@ in mkDerivation { owner = "mamedev"; repo = "mame"; rev = "mame${majorVersion}${minorVersion}"; - sha256 = "1lh5cmz4f6km2d8fn3m9ns7fc4wzbdp71v0s6vjcynycpyhy3yl1"; + sha256 = "1z012fk7nlvxxixxcavmzc9443xli6i7xzz7fdf755g7v1cys7im"; }; hardeningDisable = [ "fortify" ]; From 0366a7f2b7a0a332861aa3cb8255b535832d9b6a Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 17 Sep 2020 16:38:07 +0300 Subject: [PATCH 015/123] phodav: 2.4 -> 2.5 --- pkgs/tools/networking/phodav/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/phodav/default.nix b/pkgs/tools/networking/phodav/default.nix index c6b479dd2507..4939e75661ec 100644 --- a/pkgs/tools/networking/phodav/default.nix +++ b/pkgs/tools/networking/phodav/default.nix @@ -2,14 +2,14 @@ , pkgconfig, libsoup, meson, ninja }: let - version = "2.4"; + version = "2.5"; in stdenv.mkDerivation rec { pname = "phodav"; inherit version; src = fetchurl { url = "http://ftp.gnome.org/pub/GNOME/sources/phodav/${version}/${pname}-${version}.tar.xz"; - sha256 = "1hxq8c5qfah3w7mxcyy3yhzdgswplll31a69p5mqdl04bsvw5pbx"; + sha256 = "045rdzf8isqmzix12lkz6z073b5qvcqq6ad028advm5gf36skw3i"; }; mesonFlags = [ From 0f6231702fc1ccde0130bcbf297ff415d17b06d8 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 4 Sep 2020 17:19:55 +0200 Subject: [PATCH 016/123] lib/generators.toPretty: Only quote attribute names if necessary --- lib/generators.nix | 2 +- lib/tests/misc.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/generators.nix b/lib/generators.nix index abd237eb7d37..800ef5be4fcd 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -227,7 +227,7 @@ rec { else "{ " + libStr.concatStringsSep " " (libAttr.mapAttrsToList (name: value: - "${toPretty args name} = ${toPretty args value};") v) + "${libStr.escapeNixIdentifier name} = ${toPretty args value};") v) + " }" else if isFunction v then let fna = lib.functionArgs v; diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index b066f577f323..7d7380e8b74b 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -469,7 +469,7 @@ runTests { function = "<λ>"; functionArgs = "<λ:{(arg),foo}>"; list = "[ 3 4 ${function} [ false ] ]"; - attrs = "{ \"foo\" = null; \"foo bar\" = \"baz\"; }"; + attrs = "{ foo = null; \"foo bar\" = \"baz\"; }"; drv = "<δ:test>"; }; }; From 4811f54e94756d8a83ee9fb439e56675033923ae Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 4 Sep 2020 17:23:28 +0200 Subject: [PATCH 017/123] lib/generators.toPretty: Wrap in a go function As a preparation to the following commit --- lib/generators.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/generators.nix b/lib/generators.nix index 800ef5be4fcd..e6b9b6b66c8b 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -204,7 +204,7 @@ rec { will use fn to convert val to a pretty printed representation. (This means fn is type Val -> String.) */ allowPrettyValues ? false - }@args: v: with builtins; + }@args: let go = v: with builtins; let isPath = v: typeOf v == "path"; in if isInt v then toString v else if isFloat v then "~${toString v}" @@ -214,7 +214,7 @@ rec { else if null == v then "null" else if isPath v then toString v else if isList v then "[ " - + libStr.concatMapStringsSep " " (toPretty args) v + + libStr.concatMapStringsSep " " go v + " ]" else if isAttrs v then # apply pretty values if allowed @@ -227,7 +227,7 @@ rec { else "{ " + libStr.concatStringsSep " " (libAttr.mapAttrsToList (name: value: - "${libStr.escapeNixIdentifier name} = ${toPretty args value};") v) + "${libStr.escapeNixIdentifier name} = ${go value};") v) + " }" else if isFunction v then let fna = lib.functionArgs v; @@ -237,6 +237,7 @@ rec { in if fna == {} then "<λ>" else "<λ:{${showFnas}}>" else abort "generators.toPretty: should never happen (v = ${v})"; + in go; # PLIST handling toPlist = {}: v: let From 47f2eb89c16a74881c6e1a3b18290bf3d0f94a60 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 4 Sep 2020 17:46:12 +0200 Subject: [PATCH 018/123] lib/generators.toPretty: Implement multiline printing --- lib/generators.nix | 25 +++++++++++++++---------- lib/tests/misc.nix | 26 +++++++++++++++++++++++++- 2 files changed, 40 insertions(+), 11 deletions(-) diff --git a/lib/generators.nix b/lib/generators.nix index e6b9b6b66c8b..23a74c757f8a 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -203,9 +203,14 @@ rec { /* If this option is true, attrsets like { __pretty = fn; val = …; } will use fn to convert val to a pretty printed representation. (This means fn is type Val -> String.) */ - allowPrettyValues ? false - }@args: let go = v: with builtins; + allowPrettyValues ? false, + /* If this option is true, the output is indented with newlines for attribute sets and lists */ + multiline ? true + }@args: let + go = indent: v: with builtins; let isPath = v: typeOf v == "path"; + introSpace = if multiline then "\n${indent} " else " "; + outroSpace = if multiline then "\n${indent}" else " "; in if isInt v then toString v else if isFloat v then "~${toString v}" else if isString v then ''"${libStr.escape [''"''] v}"'' @@ -213,9 +218,9 @@ rec { else if false == v then "false" else if null == v then "null" else if isPath v then toString v - else if isList v then "[ " - + libStr.concatMapStringsSep " " go v - + " ]" + else if isList v then "[" + introSpace + + libStr.concatMapStringsSep introSpace (go (indent + " ")) v + + outroSpace + "]" else if isAttrs v then # apply pretty values if allowed if attrNames v == [ "__pretty" "val" ] && allowPrettyValues @@ -224,11 +229,11 @@ rec { else if v ? type && v.type == "derivation" then "<δ:${v.name}>" # "<δ:${concatStringsSep "," (builtins.attrNames v)}>" - else "{ " - + libStr.concatStringsSep " " (libAttr.mapAttrsToList + else "{" + introSpace + + libStr.concatStringsSep introSpace (libAttr.mapAttrsToList (name: value: - "${libStr.escapeNixIdentifier name} = ${go value};") v) - + " }" + "${libStr.escapeNixIdentifier name} = ${go (indent + " ") value};") v) + + outroSpace + "}" else if isFunction v then let fna = lib.functionArgs v; showFnas = concatStringsSep "," (libAttr.mapAttrsToList @@ -237,7 +242,7 @@ rec { in if fna == {} then "<λ>" else "<λ:{${showFnas}}>" else abort "generators.toPretty: should never happen (v = ${v})"; - in go; + in go ""; # PLIST handling toPlist = {}: v: let diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 7d7380e8b74b..4fed8ef01c94 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -446,7 +446,7 @@ runTests { }; testToPretty = { - expr = mapAttrs (const (generators.toPretty {})) rec { + expr = mapAttrs (const (generators.toPretty { multiline = false; })) rec { int = 42; float = 0.1337; bool = true; @@ -474,6 +474,30 @@ runTests { }; }; + testToPrettyMultiline = { + expr = mapAttrs (const (generators.toPretty { })) rec { + list = [ 3 4 [ false ] ]; + attrs = { foo = null; bar.foo = "baz"; }; + }; + expected = rec { + list = '' + [ + 3 + 4 + [ + false + ] + ]''; + attrs = '' + { + bar = { + foo = "baz"; + }; + foo = null; + }''; + }; + }; + testToPrettyAllowPrettyValues = { expr = generators.toPretty { allowPrettyValues = true; } { __pretty = v: "«" + v + "»"; val = "foo"; }; From 073e9b2aed0f855ce26bd3a26dab044c0c17c817 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 17 Sep 2020 17:58:04 +0200 Subject: [PATCH 019/123] lib/generators.toPretty: Improved string printing, handling newlines --- lib/generators.nix | 14 +++++++++++++- lib/tests/misc.nix | 27 +++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/lib/generators.nix b/lib/generators.nix index 23a74c757f8a..81bedd13d80a 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -213,7 +213,19 @@ rec { outroSpace = if multiline then "\n${indent}" else " "; in if isInt v then toString v else if isFloat v then "~${toString v}" - else if isString v then ''"${libStr.escape [''"''] v}"'' + else if isString v then + let + # Separate a string into its lines + newlineSplits = filter (v: ! isList v) (builtins.split "\n" v); + # For a '' string terminated by a \n, which happens when the closing '' is on a new line + multilineResult = "''" + introSpace + concatStringsSep introSpace (lib.init newlineSplits) + outroSpace + "''"; + # For a '' string not terminated by a \n, which happens when the closing '' is not on a new line + multilineResult' = "''" + introSpace + concatStringsSep introSpace newlineSplits + "''"; + # For single lines, replace all newlines with their escaped representation + singlelineResult = "\"" + libStr.escape [ "\"" ] (concatStringsSep "\\n" newlineSplits) + "\""; + in if multiline && length newlineSplits > 1 then + if lib.last newlineSplits == "" then multilineResult else multilineResult' + else singlelineResult else if true == v then "true" else if false == v then "false" else if null == v then "null" diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 4fed8ef01c94..813a8e7f815f 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -450,7 +450,9 @@ runTests { int = 42; float = 0.1337; bool = true; + emptystring = ""; string = ''fno"rd''; + newlinestring = "\n"; path = /. + "/foo"; null_ = null; function = x: x; @@ -463,7 +465,9 @@ runTests { int = "42"; float = "~0.133700"; bool = "true"; + emptystring = ''""''; string = ''"fno\"rd"''; + newlinestring = "\"\\n\""; path = "/foo"; null_ = "null"; function = "<λ>"; @@ -478,6 +482,16 @@ runTests { expr = mapAttrs (const (generators.toPretty { })) rec { list = [ 3 4 [ false ] ]; attrs = { foo = null; bar.foo = "baz"; }; + newlinestring = "\n"; + multilinestring = '' + hello + there + test + ''; + multilinestring' = '' + hello + there + test''; }; expected = rec { list = '' @@ -495,6 +509,19 @@ runTests { }; foo = null; }''; + newlinestring = "''\n \n''"; + multilinestring = '' + ''' + hello + there + test + '''''; + multilinestring' = '' + ''' + hello + there + test'''''; + }; }; From d0be9e98109428e67e4b7fab3e49728cc6633073 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 17 Sep 2020 18:08:44 +0200 Subject: [PATCH 020/123] =?UTF-8?q?lib/generators.toPretty:=20Switch=20awa?= =?UTF-8?q?y=20from=20=CE=B4=20and=20=CE=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - These symbols can be confusing for those not familiar with them - There's no harm in making these more obvious - Terminals may not print them correctly either Also changes the function argument printing slightly to be more obvious --- lib/generators.nix | 12 +++++------- lib/tests/misc.nix | 13 ++++++++----- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/lib/generators.nix b/lib/generators.nix index 81bedd13d80a..205092a2681b 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -237,10 +237,8 @@ rec { # apply pretty values if allowed if attrNames v == [ "__pretty" "val" ] && allowPrettyValues then v.__pretty v.val - # TODO: there is probably a better representation? else if v ? type && v.type == "derivation" then - "<δ:${v.name}>" - # "<δ:${concatStringsSep "," (builtins.attrNames v)}>" + "" else "{" + introSpace + libStr.concatStringsSep introSpace (libAttr.mapAttrsToList (name: value: @@ -248,11 +246,11 @@ rec { + outroSpace + "}" else if isFunction v then let fna = lib.functionArgs v; - showFnas = concatStringsSep "," (libAttr.mapAttrsToList - (name: hasDefVal: if hasDefVal then "(${name})" else name) + showFnas = concatStringsSep ", " (libAttr.mapAttrsToList + (name: hasDefVal: if hasDefVal then name + "?" else name) fna); - in if fna == {} then "<λ>" - else "<λ:{${showFnas}}>" + in if fna == {} then "" + else "" else abort "generators.toPretty: should never happen (v = ${v})"; in go ""; diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 813a8e7f815f..2456b52c099c 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -445,7 +445,10 @@ runTests { expected = builtins.toJSON val; }; - testToPretty = { + testToPretty = + let + deriv = derivation { name = "test"; builder = "/bin/sh"; system = builtins.currentSystem; }; + in { expr = mapAttrs (const (generators.toPretty { multiline = false; })) rec { int = 42; float = 0.1337; @@ -459,7 +462,7 @@ runTests { functionArgs = { arg ? 4, foo }: arg; list = [ 3 4 function [ false ] ]; attrs = { foo = null; "foo bar" = "baz"; }; - drv = derivation { name = "test"; system = builtins.currentSystem; }; + drv = deriv; }; expected = rec { int = "42"; @@ -470,11 +473,11 @@ runTests { newlinestring = "\"\\n\""; path = "/foo"; null_ = "null"; - function = "<λ>"; - functionArgs = "<λ:{(arg),foo}>"; + function = ""; + functionArgs = ""; list = "[ 3 4 ${function} [ false ] ]"; attrs = "{ foo = null; \"foo bar\" = \"baz\"; }"; - drv = "<δ:test>"; + drv = ""; }; }; From 05e4d371ef5c3819b969d34eb76ed7e4b3c99027 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 17 Sep 2020 18:14:18 +0200 Subject: [PATCH 021/123] lib/generators.toPretty: Print [] and {} compactly --- lib/generators.nix | 7 +++++-- lib/tests/misc.nix | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/generators.nix b/lib/generators.nix index 205092a2681b..716ae77973f4 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -230,13 +230,16 @@ rec { else if false == v then "false" else if null == v then "null" else if isPath v then toString v - else if isList v then "[" + introSpace + else if isList v then + if v == [] then "[ ]" + else "[" + introSpace + libStr.concatMapStringsSep introSpace (go (indent + " ")) v - + outroSpace + "]" + + outroSpace + "]" else if isAttrs v then # apply pretty values if allowed if attrNames v == [ "__pretty" "val" ] && allowPrettyValues then v.__pretty v.val + else if v == {} then "{ }" else if v ? type && v.type == "derivation" then "" else "{" + introSpace diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 2456b52c099c..f60e6ad17870 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -461,7 +461,9 @@ runTests { function = x: x; functionArgs = { arg ? 4, foo }: arg; list = [ 3 4 function [ false ] ]; + emptylist = []; attrs = { foo = null; "foo bar" = "baz"; }; + emptyattrs = {}; drv = deriv; }; expected = rec { @@ -476,7 +478,9 @@ runTests { function = ""; functionArgs = ""; list = "[ 3 4 ${function} [ false ] ]"; + emptylist = "[ ]"; attrs = "{ foo = null; \"foo bar\" = \"baz\"; }"; + emptyattrs = "{ }"; drv = ""; }; }; From 15c5ba9d28dbdcebd3320864b62fdc7f2b37defd Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 17 Sep 2020 18:18:50 +0200 Subject: [PATCH 022/123] lib/generators.toPretty: functors should print as functions Not attribute sets. So move the function case forward --- lib/generators.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/generators.nix b/lib/generators.nix index 716ae77973f4..501a23599f45 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -235,6 +235,13 @@ rec { else "[" + introSpace + libStr.concatMapStringsSep introSpace (go (indent + " ")) v + outroSpace + "]" + else if isFunction v then + let fna = lib.functionArgs v; + showFnas = concatStringsSep ", " (libAttr.mapAttrsToList + (name: hasDefVal: if hasDefVal then name + "?" else name) + fna); + in if fna == {} then "" + else "" else if isAttrs v then # apply pretty values if allowed if attrNames v == [ "__pretty" "val" ] && allowPrettyValues @@ -247,13 +254,6 @@ rec { (name: value: "${libStr.escapeNixIdentifier name} = ${go (indent + " ") value};") v) + outroSpace + "}" - else if isFunction v then - let fna = lib.functionArgs v; - showFnas = concatStringsSep ", " (libAttr.mapAttrsToList - (name: hasDefVal: if hasDefVal then name + "?" else name) - fna); - in if fna == {} then "" - else "" else abort "generators.toPretty: should never happen (v = ${v})"; in go ""; From cac4080c4413fe1c4cecabb4bec15610d40c4485 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 17 Sep 2020 20:15:06 +0300 Subject: [PATCH 023/123] rambox: 0.7.5 -> 0.7.6 --- .../networking/instant-messengers/rambox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index e6f80de821f4..a067259d1127 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -3,18 +3,18 @@ }: let - version = "0.7.5"; + version = "0.7.6"; in stdenv.mkDerivation rec { pname = "rambox"; inherit version; src = { x86_64-linux = fetchurl { url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-amd64.deb"; - sha256 = "108yd5djnap37yh0nbjyqkp5ci1zmydfzqcsbapin40a4f36zm31"; + sha256 = "1v9l5nfd25mq448457hg0mj5bzylh0krk411kbr73s7lbaaww1jl"; }; i686-linux = fetchurl { url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-i386.deb"; - sha256 = "1pvh048h6m19rmbscsy69ih0jkyhazmq2pcagmf3kk8gmbi7y6p6"; + sha256 = "0zhn5hnpl6fpgshp1vwghq6f1hz3f7gds7rjnhky1352cb6cr89i"; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); From 5427e43b08f49c190de692aba463afaf7889a991 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 18 Sep 2020 13:44:06 -0400 Subject: [PATCH 024/123] dwarf-fortress: update themes.json --- pkgs/games/dwarf-fortress/themes/themes.json | 54 ++++++++++++-------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/pkgs/games/dwarf-fortress/themes/themes.json b/pkgs/games/dwarf-fortress/themes/themes.json index 48f47c4fbb9e..8b0b9127d5b1 100644 --- a/pkgs/games/dwarf-fortress/themes/themes.json +++ b/pkgs/games/dwarf-fortress/themes/themes.json @@ -1,8 +1,8 @@ [ { "name": "afro-graphics", - "version": "47.02", - "sha256": "0np4jc05905q3bjplbrfi09q4rq3pjbf2vmbrmazfagj2mp8m7z5" + "version": "47.04", + "sha256": "1x1ir0qi3g8wgzwm1pnrkrqb6lhnjq87vs30l8kva6y5wr4sz7q0" }, { "name": "autoreiv", @@ -21,57 +21,67 @@ }, { "name": "gemset", - "version": "47.02", - "sha256": "0gz6cfx9kyldh5dxicyw0yl9lq4qw51vvlpzl767ml0bx3w38bwy" + "version": "47.04", + "sha256": "015nkkdnpykhz6a1n8qi3wgap19a4wavz4n2xbvfa4g770lcjd92" }, { "name": "ironhand", - "version": "47.02", - "sha256": "0j612xxz8g91zslw3a6yls3bzzmz0xdi2n0zx9zkmpzcl67f39ry" + "version": "47.04", + "sha256": "0x3hi1isgc2cv7c3qz87rm7ik0kbd748djpnghvjdqpj3a0n1ih2" }, { "name": "jolly-bastion", - "version": "47.02", - "sha256": "1df2hvm72lklmhhphcwsqm1m3dnaqxd8qvpygg5x71cfgkjd41ic" + "version": "47.04", + "sha256": "0799ad90g62nvpdcl6zq3vr2nvfc62lprm4br9n2hbs8wgrra6rq" }, { "name": "mayday", - "version": "47.01", - "sha256": "02fby7y4zzq8qgq2wsdvzp1k6zgfhdkm768zp0zzj9byi6gmnaq6" + "version": "47.04a", + "sha256": "1hpj40762n81grsddg3nc5jxc0bqmy2xamxvsgxzb2bx0b7akz0w" + }, + { + "name": "meph", + "version": "47.04_v5.5.0_V1.1.2", + "sha256": "0q8hfm66rag61qd2hab7lsr4nyg52bn1hvy6bl7z6kv4yj5cra50" }, { "name": "obsidian", - "version": "47.02", - "sha256": "03b26z557099k0l44lizagh17pz1y6apy496ivzv426xy0mzz684" + "version": "47.04a", + "sha256": "0y5kmj362i9y8w1n5d1nx80yq88c0xqps9i02gvnls6r421a4nms" }, { "name": "phoebus", - "version": "47.02a", - "sha256": "16zllnkrxi2365rd5m392xv72a9wvai0l3pz8xwkb8nlws8f58lb" + "version": "47.04a", + "sha256": "1ihbqs5a3b8pydbcynblvgw2bxkgr9hhpmgjlji7a7zvz8m6h6pw" }, { "name": "rally-ho", - "version": "47.02", - "sha256": "0xw2psmfjrgab0267scc7frgl9h1ypc0mbymn8z3x06m5wc3hbdh" + "version": "47.04", + "sha256": "0pmvpfbj07ll674lw7mjgkb4kgjk4mxr82fjq4ppvwrnzx6vi2g0" }, { "name": "spacefox", - "version": "47.02", - "sha256": "180fp2s489m2arc2z11j1qjnpcadjjkyami13yr3zd0v7msg64h8" + "version": "47.04", + "sha256": "0sk3k5bcpfl2xind4vfrgzbcqqbw0mg47pm3d3h44vi6hl3bdaqj" }, { "name": "taffer", - "version": "47.01b", - "sha256": "0b5hnli3gg32r7yvb3x1fqrmpxlk33j1hila2wiihybkkfnvxy5f" + "version": "47.04", + "sha256": "1ly2sc0pb2kybb8grj19zx372whblmd0bj8p64akpi2rrywi13sy" }, { "name": "tergel", "version": "47.01", "sha256": "142sd1i11vvirn68rp4gqzl67ww597df1lc57ycnpnz0n3q39kxy" }, + { + "name": "vettlingr", + "version": "1.4a", + "sha256": "1p4y0dm52rb49dnmcnivddlsd94m4gr1pxn04fpjbrvck22klgpj" + }, { "name": "wanderlust", - "version": "47.02", - "sha256": "0c36nxry189qdyinjk03wwm3j7q9q7b2sabkv7glx8yz2i61j5q9" + "version": "47.04", + "sha256": "1z56m8zplq5d18sbkwg5lwcy8iwfa5hbxixsm3hdxm04qyld1z89" } ] From 5f47df90ba9088cec03bc21805a22799a72d1629 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 19 Sep 2020 12:48:24 +0200 Subject: [PATCH 025/123] =?UTF-8?q?fuzzel:=201.4.1=20=E2=86=92=201.4.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/fuzzel/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix index cef58b353a3e..717d4a3aab3f 100644 --- a/pkgs/applications/misc/fuzzel/default.nix +++ b/pkgs/applications/misc/fuzzel/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "fuzzel"; - version = "1.4.1"; + version = "1.4.2"; src = fetchgit { url = "https://codeberg.org/dnkl/fuzzel"; rev = "${version}"; - sha256 = "18pg46xry7q4i19mpjfz942c6vkqlrj4q18p85zldzv9gdsxnm9c"; + sha256 = "0c0p9spklzmy9f7abz3mvw0vp6zgnk3ns1i6ks95ljjb3kqy9vs2"; }; nativeBuildInputs = [ pkg-config meson ninja scdoc git ]; @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ fionera ]; platforms = with platforms; linux; + changelog = "https://codeberg.org/dnkl/fuzzel/releases/tag/${version}"; }; } From 3ac630bbe977a4e06fc0c484734717e041d53dae Mon Sep 17 00:00:00 2001 From: MetaDark Date: Sat, 19 Sep 2020 09:52:18 -0400 Subject: [PATCH 026/123] linuxPackages.xpadneo: 0.8.2 -> 0.8.3 --- pkgs/os-specific/linux/xpadneo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/xpadneo/default.nix b/pkgs/os-specific/linux/xpadneo/default.nix index 7a1c2d1cec96..5f1018969212 100644 --- a/pkgs/os-specific/linux/xpadneo/default.nix +++ b/pkgs/os-specific/linux/xpadneo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xpadneo"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "atar-axis"; repo = pname; rev = "v${version}"; - sha256 = "0v688j7jx2b68zlwnrr5y63zxzhldygw1lcp8f3irayhcp8ikzzy"; + sha256 = "1g3ml7vq0dzwl9815c3l0i0qz3a7v8c376c6dqbfkbj2f1d43vqs"; }; setSourceRoot = '' From e3796bc8658fe9244541596d8ddaa7430e80e545 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 20 Sep 2020 04:20:00 +0000 Subject: [PATCH 027/123] shadowsocks-rust: 1.8.17 -> 1.8.18 --- pkgs/tools/networking/shadowsocks-rust/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index e9e09e8cdffe..9726cde61e54 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.8.17"; + version = "1.8.18"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - sha256 = "1fl23q4hccwdapknj7yd8294jil15758k1r6ljbms2gijlly9lg3"; + sha256 = "1kxf0qcyg5mhddrzwv0hd1fy901wl0ydmxi6b1k2217xmgiyi2s6"; }; - cargoSha256 = "0jgzh9p6ziq3337461cj4fkbghks3bq8dnrn6ab8dkynjwvd47bx"; + cargoSha256 = "0vmd4sjagyhrc7q7fszwcjh4nhhmhckmx48i1h2xhr68bwncmyif"; SODIUM_USE_PKG_CONFIG = 1; From e5869f999ffb24780c2e53e3cbec22d4c328cbda Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 20 Sep 2020 09:10:00 -0500 Subject: [PATCH 028/123] gitAndTools.git-imerge: 1.1.0 -> 1.2.0 https://github.com/mhagger/git-imerge/releases/tag/v1.2.0 --- .../git-and-tools/default.nix | 2 +- .../git-and-tools/git-imerge/default.nix | 27 +++++++++---------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index d068fb731695..2946f7cd5014 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -112,7 +112,7 @@ let git-ignore = callPackage ./git-ignore { }; - git-imerge = callPackage ./git-imerge { }; + git-imerge = python3Packages.callPackage ./git-imerge { }; git-interactive-rebase-tool = callPackage ./git-interactive-rebase-tool { inherit (darwin.apple_sdk.frameworks) Security; diff --git a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix index 721a7784e9ca..e1caede77d8e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix @@ -1,25 +1,24 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ lib, buildPythonApplication, fetchPypi, installShellFiles }: -stdenv.mkDerivation rec { +buildPythonApplication rec { pname = "git-imerge"; - version = "1.1.0"; + version = "1.2.0"; - src = fetchFromGitHub { - owner = "mhagger"; - repo = "git-imerge"; - rev = "v${version}"; - sha256 = "0vi1w3f0yk4gqhxj2hzqafqq28rihyhyfnp8x7xzib96j2si14a4"; + src = fetchPypi { + inherit pname version; + sha256 = "df5818f40164b916eb089a004a47e5b8febae2b4471a827e3aaa4ebec3831a3f"; }; - buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; + nativeBuildInputs = [ installShellFiles ]; - makeFlags = [ "PREFIX=" "DESTDIR=$(out)" ] ; - - meta = with stdenv.lib; { + postInstall = '' + installShellCompletion --bash completions/git-imerge + ''; + + meta = with lib; { homepage = "https://github.com/mhagger/git-imerge"; description = "Perform a merge between two branches incrementally"; - license = licenses.gpl2; - platforms = platforms.all; + license = licenses.gpl2Plus; maintainers = [ maintainers.spwhitt ]; }; } From 0b3ffb512cfa96e9bb6a4a0b94b66d892184fbb4 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 5 Sep 2020 16:00:33 +0200 Subject: [PATCH 029/123] cawbird: 1.1.0 -> 1.2.1 - regular version bump to 1.2.0, then bugfix release on top - changes: see - https://github.com/IBBoard/cawbird/releases/tag/v1.2.0 - https://github.com/IBBoard/cawbird/releases/tag/v1.2.1 --- pkgs/applications/networking/cawbird/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cawbird/default.nix b/pkgs/applications/networking/cawbird/default.nix index 2ff9e5581b0a..bd927d2b68e3 100644 --- a/pkgs/applications/networking/cawbird/default.nix +++ b/pkgs/applications/networking/cawbird/default.nix @@ -16,18 +16,19 @@ , wrapGAppsHook , gobject-introspection , glib-networking +, librest , python3 }: stdenv.mkDerivation rec { - version = "1.1.0"; + version = "1.2.1"; pname = "cawbird"; src = fetchFromGitHub { owner = "IBBoard"; repo = "cawbird"; rev = "v${version}"; - sha256 = "0zghryx5y47ff8kxa65lvgmy1cnhvhazxml7r1lxixxj3d88wh7p"; + sha256 = "11s8x48syy5wjj23ab4bn5jxhi7l5sx7aw6q2ggk99v042hxh3h2"; }; nativeBuildInputs = [ @@ -50,6 +51,7 @@ stdenv.mkDerivation rec { dconf gspell glib-networking + librest ] ++ (with gst_all_1; [ gstreamer gst-plugins-base From 4d4516a04e6fabbeb59769886bbddc552b846536 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 2 Sep 2020 09:27:21 +0300 Subject: [PATCH 030/123] gnome-network-displays: init at 0.90.4 --- .../gnome-network-displays/default.nix | 82 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 84 insertions(+) create mode 100644 pkgs/applications/networking/gnome-network-displays/default.nix diff --git a/pkgs/applications/networking/gnome-network-displays/default.nix b/pkgs/applications/networking/gnome-network-displays/default.nix new file mode 100644 index 000000000000..80fbb6dd6e74 --- /dev/null +++ b/pkgs/applications/networking/gnome-network-displays/default.nix @@ -0,0 +1,82 @@ +{ stdenv +, fetchurl +, fetchpatch +# native +, meson +, ninja +, pkg-config +, gettext +, desktop-file-utils +, appstream-glib +, wrapGAppsHook +, python3 +# Not native +, gst_all_1 +, gsettings-desktop-schemas +, gtk3 +, glib +, networkmanager +, libpulseaudio +}: + +stdenv.mkDerivation rec { + pname = "gnome-network-displays"; + version = "0.90.4"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "04snnfz5jxxpjkrwa7dchc2h4shszi8mq9g3ihvsvipgzjw3d498"; + }; + + patches = [ + # Undeclared dependency on gio-unix-2.0, see: + # https://github.com/NixOS/nixpkgs/issues/36468 and + # https://gitlab.gnome.org/GNOME/gnome-network-displays/-/merge_requests/147 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-network-displays/-/commit/ef3f3ff565acd8238da46de604a1e750d4f02f07.diff"; + sha256 = "1ljiwgqia6am4lansg70qnwkch9mp1fr6bga98s5fwyiaw6b6f4p"; + }) + # Fixes an upstream bug: https://gitlab.gnome.org/GNOME/gnome-network-displays/-/issues/147 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-network-displays/-/commit/23164b58f4d5dd59de988525906d6e5e82c5a63c.patch"; + sha256 = "0x32dvkzv9m04q41aicscpf4aspghx81a65462kjqnsavi64lga5"; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + desktop-file-utils + appstream-glib + wrapGAppsHook + python3 + ]; + + buildInputs = [ + gtk3 + glib + gsettings-desktop-schemas + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + gst_all_1.gst-rtsp-server + networkmanager + libpulseaudio + ]; + + preConfigure = '' + patchShebangs ./build-aux/meson/postinstall.py + ''; + + meta = with stdenv.lib; { + homepage = "https://gitlab.gnome.org/GNOME/gnome-network-displays"; + description = "Miracast implementation for GNOME"; + maintainers = with maintainers; [ doronbehar ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04e0f41e13ee..f87373e0de9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11013,6 +11013,8 @@ in gnome-latex = callPackage ../applications/editors/gnome-latex/default.nix { }; + gnome-network-displays = callPackage ../applications/networking/gnome-network-displays { }; + gnome-multi-writer = callPackage ../applications/misc/gnome-multi-writer {}; gnome-online-accounts = callPackage ../development/libraries/gnome-online-accounts { }; From 8bb5c62adc79e63fd6f0e67cf2f8f52faf8256c6 Mon Sep 17 00:00:00 2001 From: dawidsowa Date: Sun, 20 Sep 2020 22:42:36 +0200 Subject: [PATCH 031/123] gallery-dl: 1.14.5 -> 1.15.0 --- pkgs/applications/misc/gallery-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index ef634fcf72bc..db82aea2a508 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "gallery_dl"; - version = "1.14.5"; + version = "1.15.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "03xkrmwk4bvkqai9ghdm5arw9i4zhnfbabdn99lr1cv5prq7m4p3"; + sha256 = "1g9hmb5637x8bhm2wzarqnxzj0i93fcdm1myvld2d97a2d32hy6m"; }; doCheck = false; From d8b5fb33b547c6f3d20d332e82e53b29fb000fa8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 20 Sep 2020 19:14:28 -0400 Subject: [PATCH 032/123] oh-my-zsh: 2020-09-14 -> 2020-09-20 --- 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 97deab47cfbb..cc4c7903360f 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-09-14"; + version = "2020-09-20"; pname = "oh-my-zsh"; - rev = "2bc1da7f377e78cdfa74190ffe5baf6c814d0fce"; + rev = "93c837fec8e9fe61509b9dff9e909e84f7ebe32d"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "1xr5nmd3q8yapc0yzx7cv9qh8gvgvn2rf2z3fhwxrap3z77jp5fv"; + sha256 = "1ww50c1xf64z1m0sy30xaf2adr87cqr5yyv9jrqr227j97vrwj04"; }; installPhase = '' From 6543cbf571af6be8eeface44a8b0e78c13d2037a Mon Sep 17 00:00:00 2001 From: Maxim Krivchikov Date: Fri, 11 Sep 2020 09:07:14 +0300 Subject: [PATCH 033/123] python3Packages.parse: 1.16.0 -> 1.18.0 --- pkgs/development/python-modules/parse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix index 4fb029bad509..7b160237d5eb 100644 --- a/pkgs/development/python-modules/parse/default.nix +++ b/pkgs/development/python-modules/parse/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "parse"; - version = "1.16.0"; + version = "1.18.0"; src = fetchPypi { inherit pname version; - sha256 = "cd89e57aed38dcf3e0ff8253f53121a3b23e6181758993323658bffc048a5c19"; + sha256 = "91666032d6723dc5905248417ef0dc9e4c51df9526aaeef271eacad6491f06a4"; }; checkPhase = '' From f690cacb06c8980b16cd10d1ffd93dcc3d409464 Mon Sep 17 00:00:00 2001 From: Maxim Krivchikov Date: Fri, 11 Sep 2020 09:11:09 +0300 Subject: [PATCH 034/123] python3Packages.python-docx: run behave tests Previously the problematic "behave" dependency was not even used at checkPhase. --- pkgs/development/python-modules/python-docx/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/python-docx/default.nix b/pkgs/development/python-modules/python-docx/default.nix index 15ccd45760dd..025a13958cd0 100644 --- a/pkgs/development/python-modules/python-docx/default.nix +++ b/pkgs/development/python-modules/python-docx/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { checkPhase = '' py.test tests + behave --format progress --stop --tags=-wip ''; meta = { From 0f34c4eb33d407ce6cd2e7b1b31938a04b3db9d5 Mon Sep 17 00:00:00 2001 From: Maxim Krivchikov Date: Sun, 20 Sep 2020 22:44:15 +0300 Subject: [PATCH 035/123] python3Packages.behave: skip test failing on darwin Timing-based test is flaky on Darwin: https://github.com/NixOS/nixpkgs/pull/97737#issuecomment-691489824 --- pkgs/development/python-modules/behave/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index ea7af2dfeaa6..26cd6441ba5a 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , buildPythonApplication, python -, mock, pathpy, pyhamcrest, pytest, pytest-html +, pytestCheckHook, mock, pathpy, pyhamcrest, pytest-html , glibcLocales , colorama, cucumber-tag-expressions, parse, parse-type, six }: @@ -16,7 +16,7 @@ buildPythonApplication rec { sha256 = "1ssgixmqlg8sxsyalr83a1970njc2wg3zl8idsmxnsljwacv7qwv"; }; - checkInputs = [ mock pathpy pyhamcrest pytest pytest-html ]; + checkInputs = [ pytestCheckHook mock pathpy pyhamcrest pytest-html ]; buildInputs = [ glibcLocales ]; propagatedBuildInputs = [ colorama cucumber-tag-expressions parse parse-type six ]; @@ -24,14 +24,14 @@ buildPythonApplication rec { patchShebangs bin ''; - doCheck = true; + # timing-based test flaky on Darwin + # https://github.com/NixOS/nixpkgs/pull/97737#issuecomment-691489824 + disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_step_decorator_async_run_until_complete" ]; - checkPhase = '' + postCheck = '' export LANG="en_US.UTF-8" export LC_ALL="en_US.UTF-8" - pytest tests - ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' features/ ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' tools/test-features/ ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' issue.features/ From 781b870c9167cc01c8783471f059b92238b751cb Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 19 Sep 2020 19:21:33 +0100 Subject: [PATCH 036/123] xmlbird: fix build with python 3.8 also force use of gccStdenv to fix darwin build --- pkgs/tools/misc/birdfont/xmlbird.nix | 6 +++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/birdfont/xmlbird.nix b/pkgs/tools/misc/birdfont/xmlbird.nix index e5ad56376cac..eddcba1c9c89 100644 --- a/pkgs/tools/misc/birdfont/xmlbird.nix +++ b/pkgs/tools/misc/birdfont/xmlbird.nix @@ -13,7 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; - postPatch = "patchShebangs ."; + postPatch = '' + substituteInPlace configure \ + --replace 'platform.dist()[0]' '"nix"' + patchShebangs . + ''; buildPhase = "./build.py"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4e846397b5b..f2a608f4dff9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2566,7 +2566,7 @@ in biblatex-check = callPackage ../tools/typesetting/biblatex-check { }; birdfont = callPackage ../tools/misc/birdfont { }; - xmlbird = callPackage ../tools/misc/birdfont/xmlbird.nix { }; + xmlbird = callPackage ../tools/misc/birdfont/xmlbird.nix { stdenv = gccStdenv; }; blastem = callPackage ../misc/emulators/blastem { inherit (python27Packages) pillow; From 0b67d9e87aea54ea13b4f5031a5b58676834ff4a Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 19 Sep 2020 22:48:51 +0100 Subject: [PATCH 037/123] birdfont: fix build on non-nixos/debian systems to do this we need to prevent platform.version() from using uname to discover this is a debian kernel and try dpkg nonsense --- pkgs/tools/misc/birdfont/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix index bdf68d708a5d..7cec0cab996e 100644 --- a/pkgs/tools/misc/birdfont/default.nix +++ b/pkgs/tools/misc/birdfont/default.nix @@ -14,7 +14,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3 pkgconfig vala_0_44 gobject-introspection wrapGAppsHook ]; buildInputs = [ xmlbird libgee cairo gdk-pixbuf glib gtk3 webkitgtk libnotify sqlite gsettings-desktop-schemas ]; - postPatch = "patchShebangs ."; + postPatch = '' + substituteInPlace install.py \ + --replace 'platform.version()' '"Nix"' + + patchShebangs . + ''; buildPhase = "./build.py"; From 069757550ed82784f70b8d15fb709c0d08286e70 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 21 Sep 2020 09:31:16 +1000 Subject: [PATCH 038/123] doc/python: remove trailing whitespace --- doc/languages-frameworks/python.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index f189ce31448a..e2d9172919ef 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -567,7 +567,7 @@ test run would be: checkPhase = "pytest"; ``` -However, many repositories' test suites do not translate well to nix's build +However, many repositories' test suites do not translate well to nix's build sandbox, and will generally need many tests to be disabled. To filter tests using pytest, one can do the following: From 74c2ed9e35243b18d70b4a4e91094971e2b59541 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 21 Sep 2020 09:33:19 +1000 Subject: [PATCH 039/123] nixos/tools/nixos-install: remove trailing whitespace --- nixos/modules/installer/tools/tools.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 1da3a5b27eb1..e1e1b47aafcb 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -22,10 +22,10 @@ let src = ./nixos-install.sh; inherit (pkgs) runtimeShell; nix = config.nix.package.out; - path = makeBinPath [ - pkgs.nixUnstable + path = makeBinPath [ + pkgs.nixUnstable pkgs.jq - nixos-enter + nixos-enter ]; }; From a4edf4ca208c4d2596fcd9701ff1d03a6020685d Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Sun, 20 Sep 2020 17:58:04 -0700 Subject: [PATCH 040/123] perlPackages.HamAPRSFAP: init at 1.21 --- 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 f1c9da714bad..64fc2011ff10 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8809,6 +8809,21 @@ let }; }; + HamAPRSFAP = buildPerlPackage { + pname = "Ham-APRS-FAP"; + version = "1.21"; + src = fetchurl { + url = "mirror://cpan/authors/id/H/HE/HESSU/Ham-APRS-FAP-1.21.tar.gz"; + sha256 = "e01b455d46f44710dbcf21b6fa843f09358ce60eee1c4141bc74e0a204d3a020"; + }; + propagatedBuildInputs = [ DateCalc ]; + meta = with stdenv.lib; { + description = "Finnish APRS Parser (Fabulous APRS Parser)"; + maintainers = with maintainers; [ andrew-d ]; + license = with licenses; [ artistic1 gpl1Plus ]; + }; + }; + HashDiff = buildPerlPackage { pname = "Hash-Diff"; version = "0.010"; From bf71f459d208c3ef46ac6c186113c929b3aab77e Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sun, 20 Sep 2020 17:58:08 -0700 Subject: [PATCH 041/123] liboping: fix build on Darwin --- pkgs/development/libraries/liboping/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liboping/default.nix b/pkgs/development/libraries/liboping/default.nix index 1b2d83b84d0a..956538b76240 100644 --- a/pkgs/development/libraries/liboping/default.nix +++ b/pkgs/development/libraries/liboping/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses ? null, perl ? null }: +{ stdenv, fetchurl, ncurses ? null, perl ? null, lib }: stdenv.mkDerivation rec { name = "liboping-1.10.0"; @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1n2wkmvw6n80ybdwkjq8ka43z2x8mvxq49byv61b52iyz69slf7b"; }; - NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; + NIX_CFLAGS_COMPILE = lib.optionalString + stdenv.cc.isGNU "-Wno-error=format-truncation"; buildInputs = [ ncurses perl ]; From 31e54cdde34073b3b83e9fca4434cb0cedcb2829 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Thu, 13 Aug 2020 05:30:03 +0000 Subject: [PATCH 042/123] firefox: enable pipewire+webrtc for wayland users --- .../networking/browsers/firefox/common.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 78ee21349088..5ca52a3953f1 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -21,7 +21,7 @@ , pulseaudioSupport ? stdenv.isLinux, libpulseaudio , ffmpegSupport ? true , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook -, waylandSupport ? true, libxkbcommon +, waylandSupport ? true, libxkbcommon, pipewire , gssSupport ? true, kerberos ## privacy-related options @@ -94,6 +94,11 @@ stdenv.mkDerivation ({ patches = [ ./env_var_for_system_dir.patch + (fetchpatch { + # https://src.fedoraproject.org/rpms/firefox/blob/master/f/firefox-pipewire-0-3.patch + url = "https://src.fedoraproject.org/rpms/firefox/raw/e99b683a352cf5b2c9ff198756859bae408b5d9d/f/firefox-pipewire-0-3.patch"; + sha256 = "0qc62di5823r7ly2lxkclzj9rhg2z7ms81igz44nv0fzv3dszdab"; + }) ] ++ patches; @@ -123,7 +128,7 @@ stdenv.mkDerivation ({ ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optional gtk3Support gtk3 ++ lib.optional gssSupport kerberos - ++ lib.optional waylandSupport libxkbcommon + ++ lib.optionals waylandSupport [ libxkbcommon pipewire ] ++ lib.optionals stdenv.isDarwin [ CoreMedia ExceptionHandling Kerberos AVFoundation MediaToolbox CoreLocation Foundation libobjc AddressBook cups ]; @@ -135,6 +140,11 @@ stdenv.mkDerivation ({ postPatch = '' rm -rf obj-x86_64-pc-linux-gnu + + # needed for enabling webrtc+pipewire + substituteInPlace \ + media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build \ + --replace /usr/include ${pipewire.dev}/include '' + lib.optionalString (lib.versionAtLeast ffversion "80") '' substituteInPlace dom/system/IOUtils.h \ --replace '#include "nspr/prio.h"' '#include "prio.h"' From efa99abf28a65eb247bf0848d579d1e251da7f04 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Mon, 21 Sep 2020 12:07:38 +1000 Subject: [PATCH 043/123] singularity: 3.6.2 -> 3.6.3 --- pkgs/applications/virtualization/singularity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 0c1569145e6a..2f2d66f3b2f5 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -18,11 +18,11 @@ with lib; buildGoPackage rec { pname = "singularity"; - version = "3.6.2"; + version = "3.6.3"; src = fetchurl { url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "16sd08bfa2b1qgpnd3q6k7glw0w1wyrqyf47fz2220yafrryrmyz"; + sha256 = "1zd29s8lggv4x5xracgzywayg1skl9qc2bqh1zdxh1wrg9sqbadi"; }; goPackagePath = "github.com/sylabs/singularity"; From 85ce3805647d12397969d87504493158d726ad1f Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Mon, 21 Sep 2020 00:06:27 -0400 Subject: [PATCH 044/123] terraform-compliance: fix build * Disables lock of pythonPackages.ipython to allow building with what's in nixpkgs --- .../networking/cluster/terraform-compliance/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-compliance/default.nix b/pkgs/applications/networking/cluster/terraform-compliance/default.nix index e906f035fda2..6205b3bf5fe5 100644 --- a/pkgs/applications/networking/cluster/terraform-compliance/default.nix +++ b/pkgs/applications/networking/cluster/terraform-compliance/default.nix @@ -27,6 +27,11 @@ buildPythonApplication rec { sha256 = "161mszmxqp3wypnda48ama2mmq8yjilkxahwc1mxjwzy1n19sn7v"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "IPython==7.16.1" "IPython" + ''; + checkInputs = [ pytestCheckHook ]; disabledTests = [ From c743f4e16c36b284e70897a3ac2368348a8798e4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 21 Sep 2020 04:20:00 +0000 Subject: [PATCH 045/123] mruby: 2.1.1 -> 2.1.2 --- .../compilers/mruby/bison-36-compat.patch | 59 ------------------- pkgs/development/compilers/mruby/default.nix | 8 +-- 2 files changed, 3 insertions(+), 64 deletions(-) delete mode 100644 pkgs/development/compilers/mruby/bison-36-compat.patch diff --git a/pkgs/development/compilers/mruby/bison-36-compat.patch b/pkgs/development/compilers/mruby/bison-36-compat.patch deleted file mode 100644 index 674a88fe4c23..000000000000 --- a/pkgs/development/compilers/mruby/bison-36-compat.patch +++ /dev/null @@ -1,59 +0,0 @@ -From acab088fd6af0b2ef2df1396aeb93bfc2e020fa5 Mon Sep 17 00:00:00 2001 -From: "Yukihiro \"Matz\" Matsumoto" -Date: Mon, 27 Apr 2020 18:52:43 +0900 -Subject: [PATCH 1/2] Updating `parse.y for recent `bison` (retry). - ---- - mrbgems/mruby-compiler/core/parse.y | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y -index 6a1faf4e..2a4f740e 100644 ---- a/mrbgems/mruby-compiler/core/parse.y -+++ b/mrbgems/mruby-compiler/core/parse.y -@@ -1323,7 +1323,7 @@ heredoc_end(parser_state *p) - - %} - --%pure-parser -+%define api.pure - %parse-param {parser_state *p} - %lex-param {parser_state *p} - --- -2.27.0 - -From 3cc682d943b29e84928a847a23f411ddbace74b7 Mon Sep 17 00:00:00 2001 -From: "Yukihiro \"Matz\" Matsumoto" -Date: Fri, 15 May 2020 12:30:13 +0900 -Subject: [PATCH 2/2] Remove `YYERROR_VERBOSE` which no longer supported since - `bison 3.6`. - -Instead we added `%define parse.error verbose`. ---- - mrbgems/mruby-compiler/core/parse.y | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y -index 2a4f740e..eee6a5e5 100644 ---- a/mrbgems/mruby-compiler/core/parse.y -+++ b/mrbgems/mruby-compiler/core/parse.y -@@ -9,7 +9,6 @@ - #ifdef PARSER_DEBUG - # define YYDEBUG 1 - #endif --#define YYERROR_VERBOSE 1 - #define YYSTACK_USE_ALLOCA 1 - - #include -@@ -1323,6 +1322,7 @@ heredoc_end(parser_state *p) - - %} - -+%define parse.error verbose - %define api.pure - %parse-param {parser_state *p} - %lex-param {parser_state *p} --- -2.27.0 - diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix index 2589c47c3bec..eee4f2c64eb7 100644 --- a/pkgs/development/compilers/mruby/default.nix +++ b/pkgs/development/compilers/mruby/default.nix @@ -2,26 +2,24 @@ stdenv.mkDerivation rec { pname = "mruby"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "mruby"; repo = "mruby"; rev = version; - sha256 = "gEEb0Vn/G+dNgeY6r0VP8bMSPrEOf5s+0GoOcnIPtEU="; + sha256 = "0fhfv8pi7i8jn2vgk2n2rjnbnfa12nhj514v8i4k353n7q4pmkh3"; }; nativeBuildInputs = [ ruby bison rake ]; - patches = [ ./bison-36-compat.patch ]; - # Necessary so it uses `gcc` instead of `ld` for linking. # https://github.com/mruby/mruby/blob/35be8b252495d92ca811d76996f03c470ee33380/tasks/toolchains/gcc.rake#L25 preBuild = if stdenv.isLinux then "unset LD" else null; installPhase = '' mkdir $out - cp -R build/host/{bin,lib} $out + cp -R include build/host/{bin,lib} $out ''; doCheck = true; From dbdd5d4116cf55143793ef5b145d67b64d52cadf Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Mon, 21 Sep 2020 01:30:44 -0300 Subject: [PATCH 046/123] maintainer: Add bryanasdev000 Signed-off-by: Bryan A. S --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 13a35c5c806d..490855b5a990 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1224,6 +1224,12 @@ githubId = 3043718; name = "Brett Lyons"; }; + bryanasdev000 = { + email = "bryanasdev000@gmail.com"; + github = "bryanasdev000"; + githubId = 53131727; + name = "Bryan Albuquerque"; + }; btlvr = { email = "btlvr@protonmail.com"; github = "btlvr"; From 8465b4849bf46f63e171fc9919cdb69e62d097db Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Mon, 21 Sep 2020 01:58:36 -0300 Subject: [PATCH 047/123] popeye: init at 0.8.10 Signed-off-by: Bryan A. S --- .../networking/cluster/popeye/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/networking/cluster/popeye/default.nix diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix new file mode 100644 index 000000000000..ff180bdc9b2f --- /dev/null +++ b/pkgs/applications/networking/cluster/popeye/default.nix @@ -0,0 +1,34 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "popeye"; + version = "0.8.10"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "derailed"; + repo = "popeye"; + sha256 = "1cx39xipvvhb12nhvg7kfssnqafajni662b070ynlw8p870bj0sn"; + }; + + buildFlagsArray = '' + -ldflags= + -s -w + -X github.com/derailed/popeye/cmd.version=${version} + -X github.com/derailed/popeye/cmd.commit=b7a876eafd4f7ec5683808d8d6880c41c805056a + -X github.com/derailed/popeye/cmd.date=2020-08-25T23:02:30Z + ''; + + vendorSha256 = "0b2bawc9wnqwgvrv614rq5y4ns9di65zqcbb199y2ijpsaw5d9a7"; + + doCheck = false; + + meta = with stdenv.lib; { + description = "A Kubernetes cluster resource sanitizer"; + homepage = "https://github.com/derailed/popeye"; + changelog = "https://github.com/derailed/popeye/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = [ maintainers.bryanasdev000 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2a608f4dff9..1ace0ff5e2e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21629,6 +21629,8 @@ in k9s = callPackage ../applications/networking/cluster/k9s { }; + popeye = callPackage ../applications/networking/cluster/popeye { }; + fluxctl = callPackage ../applications/networking/cluster/fluxctl { }; linkerd = callPackage ../applications/networking/cluster/linkerd { }; From 142f6d8515b699e08052482a69fc4c9a0f4fd041 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Mon, 21 Sep 2020 02:12:06 -0300 Subject: [PATCH 048/123] velero: init at 1.5.1 Signed-off-by: Bryan A. S --- .../networking/cluster/velero/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/cluster/velero/default.nix diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix new file mode 100644 index 000000000000..0d5835a8cde1 --- /dev/null +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -0,0 +1,45 @@ +{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "velero"; + version = "1.5.1"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "vmware-tanzu"; + repo = "velero"; + sha256 = "1rmymwmglcia5j0c692g34hlffba1yqs2s0iyjpafma2zabrcnai"; + }; + + buildFlagsArray = '' + -ldflags= + -s -w + -X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version} + -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=87d86a45a6ca66c6c942c7c7f08352e26809426c + -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean + ''; + + vendorSha256 = "1izl7z689jf3i3wax7rfpk0jjly7nsi7vzasy1j9v5cwjy2d5z4v"; + + excludedPackages = [ "issue-template-gen" ]; + + doCheck = false; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + $out/bin/velero completion bash > helm.bash + $out/bin/velero completion zsh > helm.zsh + installShellCompletion helm.{bash,zsh} + ''; + + meta = with stdenv.lib; { + description = + "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; + homepage = "https://velero.io/"; + changelog = + "https://github.com/vmware-tanzu/velero/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = [ maintainers.mbode maintainers.bryanasdev000 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2a608f4dff9..3f5a88c6bbb6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26937,7 +26937,7 @@ in helmsman = callPackage ../applications/networking/cluster/helmsman { }; - heptio-ark = callPackage ../applications/networking/cluster/heptio-ark { }; + velero = callPackage ../applications/networking/cluster/velero { }; hplip = callPackage ../misc/drivers/hplip { }; From 617d5b7fca82ee8757decff563e195f149ee8875 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Mon, 21 Sep 2020 02:13:58 -0300 Subject: [PATCH 049/123] velero: remove old heptio-ark package Signed-off-by: Bryan A. S --- .../networking/cluster/heptio-ark/default.nix | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/heptio-ark/default.nix diff --git a/pkgs/applications/networking/cluster/heptio-ark/default.nix b/pkgs/applications/networking/cluster/heptio-ark/default.nix deleted file mode 100644 index aa86dcbeb241..000000000000 --- a/pkgs/applications/networking/cluster/heptio-ark/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "heptio-ark"; - version = "0.10.0"; - - goPackagePath = "github.com/heptio/ark"; - - src = fetchFromGitHub { - rev = "v${version}"; - owner = "heptio"; - repo = "ark"; - sha256 = "18h9hvp95va0hyl268gnzciwy1dqmc57bpifbj885870rdfp0ffv"; - }; - - excludedPackages = [ "issue-template-gen" ]; - - meta = with stdenv.lib; { - description = "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; - homepage = "https://heptio.github.io/ark/"; - license = licenses.asl20; - maintainers = [maintainers.mbode]; - platforms = platforms.unix; - }; -} From a4afd525cb9ab90b71977142489ac154a701b7d0 Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Sun, 20 Sep 2020 17:38:46 -0400 Subject: [PATCH 050/123] prometheus: Unbreak IPv6 listenAddress The format of the listenAddress option was recently changed to separate the address and the port parts. There is now a legacy check that tells users to update to the new format. This legacy check produces a false positive on IPv6 addresses, since they contain colons. Fix the regex to make it not match colons within IPv6 addresses. --- nixos/modules/services/monitoring/prometheus/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index d7e06484b692..bfd4951ef48a 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -629,7 +629,9 @@ in { config = mkIf cfg.enable { assertions = [ ( let - legacy = builtins.match "(.*):(.*)" cfg.listenAddress; + # Match something with dots (an IPv4 address) or something ending in + # a square bracket (an IPv6 addresses) followed by a port number. + legacy = builtins.match "(.*\\..*|.*]):([[:digit:]]+)" cfg.listenAddress; in { assertion = legacy == null; message = '' From 4e155d6be99492803dadb443f9a43458214cb00d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 21 Sep 2020 08:01:37 +0200 Subject: [PATCH 051/123] =?UTF-8?q?fontmatrix:=200.6.0=20=E2=86=92=200.6.0?= =?UTF-8?q?-qt5=20(#97800)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is an unofficial port of Fontmatrix 0.6.0 to Qt5 Co-authored-by: symphorien --- .../graphics/fontmatrix/default.nix | 24 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix index 99ca119b3bcd..3c67b11844d0 100644 --- a/pkgs/applications/graphics/fontmatrix/default.nix +++ b/pkgs/applications/graphics/fontmatrix/default.nix @@ -1,26 +1,32 @@ -{ stdenv, fetchFromGitHub, cmake, qt4 }: +{ lib, mkDerivation, fetchpatch, fetchFromGitHub, cmake, qttools, qtwebkit }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "fontmatrix"; - version = "0.6.0"; + version = "0.6.0-qt5"; src = fetchFromGitHub { - owner = "fontmatrix"; + owner = "fcoiffie"; repo = "fontmatrix"; - rev = "v${version}"; - sha256 = "0aqndj1jhm6hjpwmj1qm92z2ljh7w78a5ff5ag47qywqha1ngn05"; + rev = "1ff8382d8c85c18d9962918f461341ff4fe21993"; + sha256 = "0yx1gbsjj9ddq1kiqplif1w5x5saw250zbmhmd4phqmaqzr60w0h"; }; - buildInputs = [ qt4 ]; + # Add missing QAction include + patches = [ (fetchpatch { + url = "https://github.com/fcoiffie/fontmatrix/commit/dc6de8c414ae21516b72daead79c8db88309b102.patch"; + sha256 = "092860fdyf5gq67jqfxnlgwzjgpizi6j0njjv3m62aiznrhig7c8"; + })]; + + buildInputs = [ qttools qtwebkit ]; nativeBuildInputs = [ cmake ]; hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac"; homepage = "https://github.com/fontmatrix/fontmatrix"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2a608f4dff9..cd2f01f6345a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3752,7 +3752,7 @@ in fontforge-fonttools = callPackage ../tools/misc/fontforge/fontforge-fonttools.nix {}; - fontmatrix = callPackage ../applications/graphics/fontmatrix {}; + fontmatrix = libsForQt514.callPackage ../applications/graphics/fontmatrix {}; foremost = callPackage ../tools/system/foremost { }; From c06b0edde22ce82caa8a996df7d4505d71770287 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 15 Sep 2020 07:26:11 +0200 Subject: [PATCH 052/123] =?UTF-8?q?ocamlPackages.apron:=200.9.12=20?= =?UTF-8?q?=E2=86=92=200.9.13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/apron/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/pkgs/development/ocaml-modules/apron/default.nix index 7dc87194d6a5..0da1ab74e199 100644 --- a/pkgs/development/ocaml-modules/apron/default.nix +++ b/pkgs/development/ocaml-modules/apron/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-apron-${version}"; - version = "0.9.12"; + version = "0.9.13"; src = fetchFromGitHub { owner = "antoinemine"; repo = "apron"; rev = "v${version}"; - sha256 = "0bciv4wz52p57q0aggmvixvqrsd1slflfyrm1z6fy5c44f4fmjjn"; + sha256 = "14ymjahqdxj26da8wik9d5dzlxn81b3z1iggdl7rn2nn06jy7lvy"; }; buildInputs = [ perl gmp mpfr ppl ocaml findlib camlidl ]; From 0996ac6b0ea3fb8530cfe59c24a1af4baeb553b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Mon, 21 Sep 2020 07:59:52 +0200 Subject: [PATCH 053/123] nvtop: Make independent of Nvidia driver version For packages relying on Nvidia drivers we don't want to hard-code the location of a particular driver version in the RPATH. Otherwise the software might fail with errors such as: > Impossible to initialize nvidia nvml : Driver/library version mismatch To fix this the usual pattern in nixpkgs is to add `/run/opengl-driver/lib` to the RPATH of these binaries. This is the global location where Nvidia libraries are available on NixOS and so this makes sure that the nvtop binary can be run with all versions of the driver. At build time however these libraries are not available at that particular location. For precisely this use case, Nvidia ships stub versions of the driver libraries with the cudatoolkit. So we just need to point CMake to that directory. Fixes: #98328 --- pkgs/tools/system/nvtop/default.nix | 16 ++++++++++------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix index cd9ec7c7082d..59636fb5dc80 100644 --- a/pkgs/tools/system/nvtop/default.nix +++ b/pkgs/tools/system/nvtop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, nvidia_x11, cudatoolkit, ncurses }: +{ stdenv, fetchFromGitHub, cmake, cudatoolkit, ncurses, addOpenGLRunpath }: stdenv.mkDerivation rec { pname = "nvtop"; @@ -6,22 +6,26 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Syllo"; - repo = "nvtop"; + repo = "nvtop"; rev = version; sha256 = "1b6yz54xddip1r0k8cbqg41dpyhds18fj29bj3yf40xvysklb0f4"; }; cmakeFlags = [ "-DNVML_INCLUDE_DIRS=${cudatoolkit}/include" - "-DNVML_LIBRARIES=${nvidia_x11}/lib/libnvidia-ml.so" + "-DNVML_LIBRARIES=${cudatoolkit}/targets/x86_64-linux/lib/stubs/libnvidia-ml.so" "-DCMAKE_BUILD_TYPE=Release" ]; - nativeBuildInputs = [ cmake ]; - buildInputs = [ ncurses nvidia_x11 cudatoolkit ]; + nativeBuildInputs = [ cmake addOpenGLRunpath ]; + buildInputs = [ ncurses cudatoolkit ]; + + postFixup = '' + addOpenGLRunpath $out/bin/nvtop + ''; meta = with stdenv.lib; { - description = "A (h)top like like task monitor for NVIDIA GPUs"; + description = "A (h)top like task monitor for NVIDIA GPUs"; homepage = "https://github.com/Syllo/nvtop"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2a608f4dff9..b4b437ab9122 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14607,9 +14607,7 @@ in nvidia-optical-flow-sdk = callPackage ../development/libraries/nvidia-optical-flow-sdk { }; - nvtop = callPackage ../tools/system/nvtop { - nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; }; - }; + nvtop = callPackage ../tools/system/nvtop { }; ocl-icd = callPackage ../development/libraries/ocl-icd { }; From 9ff87334e687e8754e324573b0df6e485480fa4e Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Fri, 18 Sep 2020 11:28:31 +0200 Subject: [PATCH 054/123] maintainers: add charvp --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 13a35c5c806d..785f823ce73c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1439,6 +1439,12 @@ githubId = 89596; name = "Florian Friesdorf"; }; + charvp = { + email = "nixpkgs@cvpetegem.be"; + github = "charvp"; + githubId = 42220376; + name = "Charlotte Van Petegem"; + }; chattered = { email = "me@philscotted.com"; name = "Phil Scott"; From 090cc5d6ea548221cd7ec61b10003a446cd9bca3 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Fri, 18 Sep 2020 11:28:53 +0200 Subject: [PATCH 055/123] bluej: init at 4.2.2 --- pkgs/applications/editors/bluej/default.nix | 36 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/editors/bluej/default.nix diff --git a/pkgs/applications/editors/bluej/default.nix b/pkgs/applications/editors/bluej/default.nix new file mode 100644 index 000000000000..25caf4b7ac7f --- /dev/null +++ b/pkgs/applications/editors/bluej/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, makeWrapper, jdk }: + +stdenv.mkDerivation rec { + pname = "bluej"; + version = "4.2.2"; + src = fetchurl { + # We use the deb here. First instinct might be to go for the "generic" JAR + # download, but that is actually a graphical installer that is much harder + # to unpack than the deb. + url = "https://www.bluej.org/download/files/BlueJ-linux-${builtins.replaceStrings ["."] [""] version}.deb"; + sha256 = "5c2241f2208e98fcf9aad7c7a282bcf16e6fd543faa5fdb0b99b34d1023113c3"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + unpackPhase = '' + ar xf $src + tar xf data.tar.xz + ''; + + installPhase = '' + mkdir -p $out + cp -r usr/* $out + + makeWrapper ${jdk}/bin/java $out/bin/bluej \ + --add-flags "-Djavafx.embed.singleThread=true -Dawt.useSystemAAFontSettings=on -Xmx512M -cp \"$out/share/bluej/bluej.jar\" bluej.Boot" + ''; + + meta = with stdenv.lib; { + description = "A simple integrated development environment for Java"; + homepage = "https://www.bluej.org/"; + license = licenses.gpl2ClasspathPlus; + maintainers = [ maintainers.charvp ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2a608f4dff9..ef3fe3ae7380 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19838,6 +19838,10 @@ in gtk = gtk3; }; + bluej = callPackage ../applications/editors/bluej/default.nix { + jdk = jetbrains.jdk; + }; + bluejeans-gui = callPackage ../applications/networking/instant-messengers/bluejeans { }; blugon = callPackage ../applications/misc/blugon { }; From 5d365404ac202557db1800d58c7ded91c8797522 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Fri, 7 Aug 2020 14:05:13 -0700 Subject: [PATCH 056/123] beets: add extrafiles plugin --- pkgs/tools/audio/beets/default.nix | 7 ++++- pkgs/tools/audio/beets/extrafiles-plugin.nix | 30 ++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/audio/beets/extrafiles-plugin.nix diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 776eca999989..56551891a4a5 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -31,6 +31,7 @@ , enableAlternatives ? false , enableCheck ? false, liboggz ? null , enableCopyArtifacts ? false +, enableExtraFiles ? false , bashInteractive, bash-completion }: @@ -100,6 +101,7 @@ let externalTestArgs.beets = (beets.override { enableAlternatives = false; enableCopyArtifacts = false; + enableExtraFiles = false; }).overrideAttrs (stdenv.lib.const { doInstallCheck = false; }); @@ -110,6 +112,7 @@ let alternatives = callPackage ./alternatives-plugin.nix pluginArgs; check = callPackage ./check-plugin.nix pluginArgs; copyartifacts = callPackage ./copyartifacts-plugin.nix pluginArgs; + extrafiles = callPackage ./extrafiles-plugin.nix pluginArgs; }; in pythonPackages.buildPythonApplication rec { @@ -156,7 +159,9 @@ in pythonPackages.buildPythonApplication rec { ++ optional enableThumbnails pythonPackages.pyxdg ++ optional enableWeb pythonPackages.flask ++ optional enableAlternatives plugins.alternatives - ++ optional enableCopyArtifacts plugins.copyartifacts; + ++ optional enableCopyArtifacts plugins.copyartifacts + ++ optional enableExtraFiles plugins.extrafiles + ; buildInputs = [ imagemagick diff --git a/pkgs/tools/audio/beets/extrafiles-plugin.nix b/pkgs/tools/audio/beets/extrafiles-plugin.nix new file mode 100644 index 000000000000..7d0e446ce605 --- /dev/null +++ b/pkgs/tools/audio/beets/extrafiles-plugin.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, beets, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + pname = "beets-extrafiles"; + version = "0.0.7"; + + src = fetchFromGitHub { + repo = "beets-extrafiles"; + owner = "Holzhaus"; + rev = "v${version}"; + sha256 = "0ah7mgax9zrhvvd5scf2z0v0bhd6xmmv5sdb6av840ixpl6vlvm6"; + }; + + postPatch = '' + sed -i -e '/install_requires/,/\]/{/beets/d}' setup.py + sed -i -e '/namespace_packages/d' setup.py + ''; + + nativeBuildInputs = [ beets ]; + + preCheck = '' + HOME=$TEMPDIR + ''; + + meta = { + homepage = "https://github.com/Holzhaus/beets-extrafiles"; + description = "A plugin for beets that copies additional files and directories during the import process"; + license = stdenv.lib.licenses.mit; + }; +} From 0bbeca2ff952e6a171534793ddd0fa97c8f9546a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Thu, 17 Sep 2020 18:14:47 +0200 Subject: [PATCH 057/123] ocamlPackages.zarith: 1.9 -> 1.10 --- pkgs/development/ocaml-modules/zarith/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index 1123cc0d2b4e..f9996eb6af62 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -6,9 +6,9 @@ let source = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "1.9"; - url = "https://github.com/ocaml/Zarith/archive/release-1.9.tar.gz"; - sha256 = "1xrqcaj5gp52xp4ybpnblw8ciwlgrr0zi7rg7hnk8x83isjkpmwx"; + version = "1.10"; + url = "https://github.com/ocaml/Zarith/archive/release-1.10.tar.gz"; + sha256 = "1qxrl0v2mk9wghc1iix3n0vfz2jbg6k5wpn1z7p02m2sqskb0zhb"; } else { version = "1.3"; url = "http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz"; From cc2982b79b02d64594280c2856567062f24ad694 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 21 Sep 2020 09:36:53 +0200 Subject: [PATCH 058/123] untrunc: update to latest git version --- pkgs/tools/video/untrunc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/video/untrunc/default.nix b/pkgs/tools/video/untrunc/default.nix index 728b4ff01188..1918f4e59745 100644 --- a/pkgs/tools/video/untrunc/default.nix +++ b/pkgs/tools/video/untrunc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "untrunc"; - version = "2018.01.13"; + version = "2020.02.09"; src = fetchFromGitHub { owner = "ponchio"; repo = "untrunc"; - rev = "3a2e6d0718faf06589f7b9d95c8f966348e537f7"; - sha256 = "03ka4lr69k7mikfpcpd95smzdj62v851ididnjyps5a0j06f8087"; + rev = "4eed44283168c727ace839ff7590092fda2e0848"; + sha256 = "0nfj67drc6bxqlkf8a1iazqhi0w38a7rjrb2bpa74gwq6xzygvbr"; }; buildInputs = [ gcc libav_12 ]; From f5a61c2604cdb76a1d83c598ed71da4705ff435f Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Mon, 21 Sep 2020 01:12:45 -0700 Subject: [PATCH 059/123] lizardfs: fix build Build failure was due to upstream issue, now fixed in the v3.13 RC. https://github.com/lizardfs/lizardfs/issues/655 https://github.com/lizardfs/lizardfs/pull/677 --- pkgs/tools/filesystems/lizardfs/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix index 3ae898d4ba8a..e2cb603ca3d5 100644 --- a/pkgs/tools/filesystems/lizardfs/default.nix +++ b/pkgs/tools/filesystems/lizardfs/default.nix @@ -47,6 +47,12 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/debian/lizardfs/raw/bfcd5bcf/debian/patches/spdlog.patch"; sha256 = "0j44rb816i6kfh3y2qdha59c4ja6wmcnlrlq29il4ybxn42914md"; }) + # Fix https://github.com/lizardfs/lizardfs/issues/655 + # (Remove upon update to 3.13) + (fetchpatch { + url = "https://github.com/lizardfs/lizardfs/commit/5d20c95179be09241b039050bceda3c46980c004.patch"; + sha256 = "185bfcz2rjr4cnxld2yc2nxwzz0rk4x1fl1sd25g8gr5advllmdv"; + }) ]; meta = with stdenv.lib; { From 846acc4c8c5d3994f9a2179506867989b0fae48e Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 21 Sep 2020 12:55:11 +0200 Subject: [PATCH 060/123] slack: 4.8.0 -> 4.9.1 for darwin 4.9.0 is the latest --- .../networking/instant-messengers/slack/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 777aabf021b7..2edccd8c019e 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -40,8 +40,8 @@ let pname = "slack"; version = { - x86_64-darwin = "4.8.0"; - x86_64-linux = "4.8.0"; + x86_64-darwin = "4.9.0"; + x86_64-linux = "4.9.1"; }.${system} or throwSystem; src = let @@ -49,11 +49,11 @@ let in { x86_64-darwin = fetchurl { url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg"; - sha256 = "0k22w3c3brbc7ivmc5npqy8h7zxfgnbs7bqwii03psymm6sw53j2"; + sha256 = "007fflncvvclj4agb6g5hc5k9j5hhz1rpvlcfd8w31rn1vad4abk"; }; x86_64-linux = fetchurl { url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "0q8qpz5nwhps7y5gq1bl8hjw7vsk789srrv39hzc7jrl8f1bxzk0"; + sha256 = "1n8br5vlcnf13b8m6727hy4bkmd6wayss96ck4ba9zsjiyj7v74i"; }; }.${system} or throwSystem; From f000c741a33725599661e66c2bfe0adca74ea1a0 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 17 Aug 2020 21:56:07 +0200 Subject: [PATCH 061/123] pythonPackages.b2sdk: init at 1.1.4 --- .../python-modules/b2sdk/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/b2sdk/default.nix diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix new file mode 100644 index 000000000000..7dfce0d75c52 --- /dev/null +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm, isPy27, pytestCheckHook +, requests, arrow, logfury, tqdm }: + +buildPythonPackage rec { + pname = "b2sdk"; + version = "1.1.4"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "0g527qdda105r5g9yjh4lxzlmz34m2bdz8dydqqy09igdsmiyi9j"; + }; + + pythonImportsCheck = [ "b2sdk" ]; + + nativebuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ requests arrow logfury tqdm ]; + + # requires unpackaged dependencies like liccheck + doCheck = false; + + meta = with stdenv.lib; { + description = "Client library and utilities for access to B2 Cloud Storage (backblaze)."; + homepage = "https://github.com/Backblaze/b2-sdk-python"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 03b751ae2881..3012a8f88cf3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -713,6 +713,8 @@ in { azure-synapse-spark = callPackage ../development/python-modules/azure-synapse-spark { }; + b2sdk = callPackage ../development/python-modules/b2sdk { }; + Babel = callPackage ../development/python-modules/Babel { }; babelfish = callPackage ../development/python-modules/babelfish { }; From 3c03a98235d88cc498e174564a73effc43687fa4 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 17 Aug 2020 21:56:47 +0200 Subject: [PATCH 062/123] duplicity: use new b2sdk python package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The backblaze library moved into the b2sdk package. If it’s not used, duplicity fails loading the b2:// backend. > BackendException: B2 backend requires B2 Python SDK (pip install b2sdk) --- pkgs/tools/backup/duplicity/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 6d6da3c98749..c12cc1198c9c 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -46,9 +46,8 @@ pythonPackages.buildPythonApplication rec { librsync ]; - propagatedBuildInputs = [ - backblaze-b2 - ] ++ (with pythonPackages; [ + propagatedBuildInputs = with pythonPackages; [ + b2sdk boto cffi cryptography @@ -65,7 +64,7 @@ pythonPackages.buildPythonApplication rec { future ] ++ stdenv.lib.optionals (!isPy3k) [ enum - ]); + ]; checkInputs = [ gnupg # Add 'gpg' to PATH. From 7bd19e7a258912e1bdd243556e9b7536e4c1d25d Mon Sep 17 00:00:00 2001 From: oxalica Date: Mon, 21 Sep 2020 20:03:33 +0800 Subject: [PATCH 063/123] nix-prefetch: fix compatibility with nixUnstable again --- .../package-management/nix-prefetch/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix-prefetch/default.nix b/pkgs/tools/package-management/nix-prefetch/default.nix index edc8e8bf1a19..f1f575a81b94 100644 --- a/pkgs/tools/package-management/nix-prefetch/default.nix +++ b/pkgs/tools/package-management/nix-prefetch/default.nix @@ -21,10 +21,16 @@ in stdenv.mkDerivation rec { }; patches = [ - # Fix compatibility with nixUnstable: https://github.com/msteen/nix-prefetch/pull/8 + # Fix compatibility with nixUnstable + # https://github.com/msteen/nix-prefetch/pull/9 (fetchpatch { - url = "https://github.com/msteen/nix-prefetch/commit/817a7695d98663386fa27a6c04d1617e0a83e1ab.patch"; - sha256 = "1zfgvafg30frwrh56k2wj4g76cljyjylm47ll60ms0yfx55spa7x"; + url = "https://github.com/msteen/nix-prefetch/commit/2722cda48ab3f4795105578599b29fc99518eff4.patch"; + sha256 = "037m388sbl72kyqnk86mw7lhjhj9gzfglw3ri398ncfmmkq8b7r4"; + }) + # https://github.com/msteen/nix-prefetch/pull/12 + (fetchpatch { + url = "https://github.com/msteen/nix-prefetch/commit/de96564e9f28df82bccd0584953094e7dbe87e20.patch"; + sha256 = "0mxai6w8cfs7k8wfbsrpg5hwkyb0fj143nm0v142am0ky8ahn0d9"; }) ]; From 731fd9efe3114bc97a9e2a113a486721b77e07e9 Mon Sep 17 00:00:00 2001 From: meutraa Date: Sun, 20 Sep 2020 13:15:17 +0100 Subject: [PATCH 064/123] androidStudioPackages.{dev,canary}: 4.2.0.10 -> 4.2.0.11 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 964a1cd7ae1f..f35e695d1b67 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -19,9 +19,9 @@ let sha256Hash = "sha256-qbxmR9g8DSKzcP09bJuc+am79BSXWG39UQxFEb1bZ88="; }; latestVersion = { # canary & dev - version = "4.2.0.10"; # "Android Studio 4.2 Canary 10" - build = "202.6811877"; - sha256Hash = "sha256-ZKfETCECIOq+q/5N+I13ceb5dqGMGTXMGrqSeTL9KCc="; + version = "4.2.0.11"; # "Android Studio 4.2 Canary 11" + build = "202.6825553"; + sha256Hash = "sha256-la3J0mgUxJA50l1PLr9FPMKI5QYkoBRriVyu3aVq7io="; }; in { # Attributes are named by their corresponding release channels From 5f19b74d135449aebb43c8fe4ca2847b7ea37ef8 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 21 Sep 2020 20:47:12 +0800 Subject: [PATCH 065/123] f3: clean-ups and compile on darwin (#98365) * f3: clean-ups and compile on darwin * fixed from feedback --- pkgs/tools/filesystems/f3/default.nix | 53 ++++++++++++++++++--------- 1 file changed, 36 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix index 3559579fe80f..e8d60f835bf0 100644 --- a/pkgs/tools/filesystems/f3/default.nix +++ b/pkgs/tools/filesystems/f3/default.nix @@ -1,13 +1,11 @@ -{ stdenv, fetchFromGitHub -, parted, udev +{ stdenv, lib, fetchFromGitHub +, parted, systemd ? null }: stdenv.mkDerivation rec { pname = "f3"; version = "7.2"; - enableParallelBuilding = true; - src = fetchFromGitHub { owner = "AltraMayor"; repo = pname; @@ -15,24 +13,45 @@ stdenv.mkDerivation rec { sha256 = "1iwdg0r4wkgc8rynmw1qcqz62l0ldgc8lrazq33msxnk5a818jgy"; }; - buildInputs = [ parted udev ]; + postPatch = '' + sed -i 's/-oroot -groot//' Makefile - patchPhase = "sed -i 's/-oroot -groot//' Makefile"; + for f in f3write.h2w log-f3wr; do + substituteInPlace $f \ + --replace '$(dirname $0)' $out/bin + done + ''; - buildFlags = [ "all" # f3read, f3write - "extra" # f3brew, f3fix, f3probe - ]; + buildInputs = [ + parted + ] + ++ lib.optional stdenv.isLinux systemd; - installFlags = [ "PREFIX=$(out)" - "install" - "install-extra" - ]; + enableParallelBuilding = true; - meta = { + buildFlags = [ + "all" # f3read, f3write + ] + ++ lib.optional stdenv.isLinux "extra"; # f3brew, f3fix, f3probe + + installFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + installTargets = [ + "install" + ] + ++ lib.optional stdenv.isLinux "install-extra"; + + postInstall = '' + install -Dm555 -t $out/bin f3write.h2w log-f3wr + install -Dm444 -t $out/share/doc/${pname} LICENSE README.rst + ''; + + meta = with lib; { description = "Fight Flash Fraud"; homepage = "http://oss.digirati.com.br/f3/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ makefu ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ makefu ]; }; } From d4eed01376d33dc06571c256e96fcca9c3907c44 Mon Sep 17 00:00:00 2001 From: Max Wittig Date: Mon, 21 Sep 2020 15:19:51 +0200 Subject: [PATCH 066/123] gitlab-runner: 13.3.1 -> 13.4.0 (#98377) --- .../continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index ae746f9c54c6..af591a540d4a 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "13.3.1"; + version = "13.4.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "0bm6vgdy0lhy1cw6rjsifihxrin33h8c5xwca0mgwd4f7ad64dgs"; + sha256 = "0rdnrnkm9pcdzi3ddmk0ia9r6lv548by08q1nrb7683jywr7bin3"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "1pjpqmi45c0d41cwrb8vb4lkcqarq430mni37h1bsijgqiap8rqk"; + sha256 = "1nd32vqp096h36p89c0v21yijn3dzz4ix5bwsbl20mc8m802wvg7"; }; in buildGoPackage rec { @@ -30,7 +30,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "15v5m420vv3vxmmga65j0agaa7b9mn1iywkq2ggpnrnznk5m613f"; + sha256 = "124gplxs3a6kyc7b7mwsf0l02i9qi0ifjn3r2m7vq5wvk31qa97b"; }; patches = [ ./fix-shell-path.patch ]; From ac49c2f72a5d403046cdbebe3972a09c57ab3b4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Mon, 21 Sep 2020 15:21:57 +0200 Subject: [PATCH 067/123] freeoffice: 976 -> 978 Fixes #98385. --- pkgs/applications/office/softmaker/freeoffice.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/softmaker/freeoffice.nix b/pkgs/applications/office/softmaker/freeoffice.nix index 634a696a73e2..2e12e6d3d43d 100644 --- a/pkgs/applications/office/softmaker/freeoffice.nix +++ b/pkgs/applications/office/softmaker/freeoffice.nix @@ -5,9 +5,9 @@ # overridable. This is useful when the upstream archive was replaced # and nixpkgs is not in sync yet. , officeVersion ? { - version = "976"; + version = "978"; edition = "2018"; - sha256 = "13yh4lyqakbdqf4r8vw8imy5gwpfva697iqfd85qmp3wimqvzskl"; + sha256 = "1c5div1kbyyj48f89wkhc1i1759n70bsbp3w4a42cr0jmllyl60v"; } , ... } @ args: From 114202e369150a0d202103bcb6c92b21058d3db8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 21 Sep 2020 11:51:25 +0200 Subject: [PATCH 068/123] thunderbird-78: fix #97994: broken UI in 78.2.2 --- .../networking/mailreaders/thunderbird/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index e6b279fd35c1..4f122cde02dc 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -6,6 +6,7 @@ , curl , dbus , dbus-glib +, fetchpatch , fetchurl , file , fontconfig @@ -146,6 +147,13 @@ stdenv.mkDerivation rec { patches = [ ./no-buildconfig.patch + (fetchpatch { # included in 78.3.0 + name = "empty-UI.patch"; + url = "https://hg.mozilla.org/releases/comm-esr78/raw-rev/f085dbd311bc"; + # paths: {a,b}/foo -> {a,b}/comm/foo + stripLen = 1; extraPrefix = "comm/"; + sha256 = "0x9pw62w93kyd99q9wi2d8llcfzbrqib7fp5kcrjidvhnkxpr6j7"; + }) ]; postPatch = '' From d33267c6399d69709804c137b95773e710b50ed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 21 Sep 2020 11:53:20 +0200 Subject: [PATCH 069/123] thunderbird.meta.maintainers: add myself I've been keeping an eye on it anyway, and the current meta.maintainers don't seem to be active around thunderbird. --- pkgs/applications/networking/mailreaders/thunderbird/68.nix | 1 + pkgs/applications/networking/mailreaders/thunderbird/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/pkgs/applications/networking/mailreaders/thunderbird/68.nix index fef707b72932..707b35dd4995 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/68.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/68.nix @@ -333,6 +333,7 @@ stdenv.mkDerivation rec { eelco lovesegfault pierron + vcunat ]; platforms = platforms.linux; license = licenses.mpl20; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 4f122cde02dc..06bfd92f5fb2 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -335,6 +335,7 @@ stdenv.mkDerivation rec { eelco lovesegfault pierron + vcunat ]; platforms = platforms.linux; license = licenses.mpl20; From 517c9755969a6bdedfc91982f90057c74c622d5d Mon Sep 17 00:00:00 2001 From: leenaars Date: Mon, 21 Sep 2020 17:39:04 +0200 Subject: [PATCH 070/123] Sylk: 3.8.0 -> 3.8.4 (#98392) --- 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 0796e1173115..1ab7a0da5dc6 100644 --- a/pkgs/applications/networking/Sylk/default.nix +++ b/pkgs/applications/networking/Sylk/default.nix @@ -2,7 +2,7 @@ let pname = "Sylk"; - version = "2.8.2"; + version = "2.8.4"; 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:0figpfm5cgbryq6v26k9gj42zgbk335bsa3bzyxpvz2slq8rzb2y"; + hash = "sha256-2s4ezyszNZD9YBj69f62aqtJWwFeida6G/fOA1exu2M="; }; profile = '' From 8be7347e2b7c3f0dd54413b613d782bfcb3741b6 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Sun, 20 Sep 2020 18:36:59 -0700 Subject: [PATCH 071/123] pythonPackages.mohawk: init at 1.1.0 --- .../python-modules/mohawk/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/mohawk/default.nix diff --git a/pkgs/development/python-modules/mohawk/default.nix b/pkgs/development/python-modules/mohawk/default.nix new file mode 100644 index 000000000000..e260bb7b54a3 --- /dev/null +++ b/pkgs/development/python-modules/mohawk/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, python, mock, nose, pytest, six }: + +with lib; +buildPythonPackage rec { + pname = "mohawk"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "08wppsv65yd0gdxy5zwq37yp6jmxakfz4a2yx5wwq2d222my786j"; + }; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ mock nose pytest ]; + + checkPhase = '' + pytest mohawk/tests.py + ''; + + meta = { + description = "Python library for Hawk HTTP authorization."; + homepage = "https://github.com/kumar303/mohawk"; + license = licenses.mpl20; + maintainers = [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3012a8f88cf3..e2849b0731ac 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3708,6 +3708,8 @@ in { modestmaps = callPackage ../development/python-modules/modestmaps { }; + mohawk = callPackage ../development/python-modules/mohawk { }; + moinmoin = callPackage ../development/python-modules/moinmoin { }; # Needed here because moinmoin is loaded as a Python library. From a2228f4c18bdb95c8697b8c43ef99107e2c7af41 Mon Sep 17 00:00:00 2001 From: r-burns <52847440+r-burns@users.noreply.github.com> Date: Mon, 21 Sep 2020 08:58:29 -0700 Subject: [PATCH 072/123] libversion: fix tests on Darwin (#98361) --- pkgs/development/libraries/libversion/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libversion/default.nix b/pkgs/development/libraries/libversion/default.nix index cee04fa79e43..a26aa9b56941 100644 --- a/pkgs/development/libraries/libversion/default.nix +++ b/pkgs/development/libraries/libversion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ stdenv, fetchFromGitHub, cmake, lib }: stdenv.mkDerivation rec { pname = "libversion"; @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + cmakeFlags = lib.optional stdenv.isDarwin [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" # needed for tests + ]; + preCheck = '' export LD_LIBRARY_PATH=/build/source/build/libversion/''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH ''; From 3b6800c76a53426de8fe7c4ca09eaa56844d4cde Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Sun, 20 Sep 2020 23:11:25 -0400 Subject: [PATCH 073/123] python3Packages.spyder: fix build * Remove version locks that don't match what's in nixpkgs --- pkgs/development/python-modules/spyder/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index acaa2e888f8d..43bddb4e4719 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -42,7 +42,10 @@ buildPythonPackage rec { # remove dependency on pyqtwebengine # this is still part of the pyqt 5.11 version we have in nixpkgs sed -i /pyqtwebengine/d setup.py - substituteInPlace setup.py --replace "pyqt5<5.13" "pyqt5" + substituteInPlace setup.py \ + --replace "pyqt5<5.13" "pyqt5" \ + --replace "parso==0.7.0" "parso" \ + --replace "jedi==0.17.1" "jedi" ''; postInstall = '' From 9dc654234a6b6ed4a2c137426dbdd61084f245ee Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Sun, 20 Sep 2020 23:22:21 -0400 Subject: [PATCH 074/123] pythonPackages.spyder-kernels: 1.9.3 -> 1.9.4 * Meta: add changelog & download page, update homepage --- .../development/python-modules/spyder-kernels/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 7652d2cf4c9e..868ce80558a6 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "1.9.3"; + version = "1.9.4"; src = fetchPypi { inherit pname version; - sha256 = "877109d0691376f8ffb380ec1daf9b867958231065660277dbc5ccf0b4bf87d0"; + sha256 = "ca9d997c475b714b54d2fd67aa140837ec3630e91cbbc2e0cd190f1b0bd9fe9d"; }; propagatedBuildInputs = [ @@ -23,7 +23,9 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Jupyter kernels for Spyder's console"; - homepage = "https://github.com/spyder-ide/spyder-kernels"; + homepage = "https://docs.spyder-ide.org/current/ipythonconsole.html"; + downloadPage = "https://github.com/spyder-ide/spyder-kernels/releases"; + changelog = "https://github.com/spyder-ide/spyder-kernels/blob/master/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ gebner ]; }; From 6e4908a52d6f852f837679b9f637233ad6b2f51b Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Sun, 20 Sep 2020 23:24:29 -0400 Subject: [PATCH 075/123] spyder: 4.1.4 -> 4.1.5 Changelog: https://github.com/spyder-ide/spyder/blob/master/CHANGELOG.md#version-415-2020-09-01 * Meta: update homepage, add downloadPage & changelog --- pkgs/development/python-modules/spyder/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index 43bddb4e4719..2b0276afc9d8 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "spyder"; - version = "4.1.4"; + version = "4.1.5"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "6946b2128afaf1b64e878a74d33f9abd60c91f75949b3d05f305b3c3f5fec1e2"; + sha256 = "d467f020b694193873a237ce6744ae36bd5a59f4d2b7ffbeb15dda68b03f5aa1"; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; @@ -72,7 +72,9 @@ buildPythonPackage rec { environment for the Python language with advanced editing, interactive testing, debugging and introspection features. ''; - homepage = "https://github.com/spyder-ide/spyder/"; + homepage = "https://www.spyder-ide.org/"; + downloadPage = "https://github.com/spyder-ide/spyder/releases"; + changelog = "https://github.com/spyder-ide/spyder/blob/master/CHANGELOG.md"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ gebner ]; From 8403806a3953ac75ad1141e578e55293114a0617 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 24 Aug 2020 23:40:19 -0400 Subject: [PATCH 076/123] python3Packages.rising: init at 0.2.0post0 --- .../python-modules/rising/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/rising/default.nix diff --git a/pkgs/development/python-modules/rising/default.nix b/pkgs/development/python-modules/rising/default.nix new file mode 100644 index 000000000000..eb9afc8353c7 --- /dev/null +++ b/pkgs/development/python-modules/rising/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchFromGitHub +, pytestCheckHook +, pytestcov +, dill +, numpy +, pytorch +, threadpoolctl +, tqdm +}: + +buildPythonPackage rec { + pname = "rising"; + version = "0.2.0post0"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "PhoenixDL"; + repo = pname; + rev = "v${version}"; + sha256 = "0fb9894ppcp18wc2dhhjizj8ja53gbv9wpql4mixxxdz8z2bn33c"; + }; + + propagatedBuildInputs = [ numpy pytorch threadpoolctl tqdm ]; + checkInputs = [ dill pytestcov pytestCheckHook ]; + + disabledTests = [ "test_affine" ]; # deprecated division operator '/' + + meta = { + description = "High-performance data loading and augmentation library in PyTorch"; + homepage = "https://rising.rtfd.io"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e2849b0731ac..5a2650a9e843 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6115,6 +6115,8 @@ in { ripser = callPackage ../development/python-modules/ripser { }; + rising = callPackage ../development/python-modules/rising { }; + rivet = disabledIf (!isPy3k) (toPythonModule (pkgs.rivet.override { python3 = python; })); rjsmin = callPackage ../development/python-modules/rjsmin { }; From 4f03644c56ddd8c57bec062d3de79ec13887a0be Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Sun, 20 Sep 2020 17:37:59 -0400 Subject: [PATCH 077/123] spotify: support --force-device-scale-factor Add a Spotify wrapper with a `deviceScaleFactor` argument to set the `--force-device-scale-factor` flag for high-DPI displays. If unset, nothing is added. This allows e.g. spotify.override { deviceScaleFactor = 1.66; } Uses a separate wrapper derivation as suggested by @Ma27. Uses `wrapProgram` instead of `makeWrapper` as suggested by @Ma27. --- pkgs/applications/audio/spotify/default.nix | 2 +- pkgs/applications/audio/spotify/wrapper.nix | 31 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++- 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/audio/spotify/wrapper.nix diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 245d96dee018..13edd8ea3830 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -64,7 +64,7 @@ let in stdenv.mkDerivation { - pname = "spotify"; + pname = "spotify-unwrapped"; inherit version; # fetch from snapcraft instead of the debian repository most repos fetch from. diff --git a/pkgs/applications/audio/spotify/wrapper.nix b/pkgs/applications/audio/spotify/wrapper.nix new file mode 100644 index 000000000000..418ef3cbc03e --- /dev/null +++ b/pkgs/applications/audio/spotify/wrapper.nix @@ -0,0 +1,31 @@ +{ symlinkJoin +, lib +, spotify-unwrapped +, makeWrapper + + # High-DPI support: Spotify's --force-device-scale-factor argument; not added + # if `null`, otherwise, should be a number. +, deviceScaleFactor ? null +}: + +symlinkJoin { + name = "spotify-${spotify-unwrapped.version}"; + + paths = [ spotify-unwrapped.out ]; + + nativeBuildInputs = [ makeWrapper ]; + preferLocalBuild = true; + passthru.unwrapped = spotify-unwrapped; + postBuild = '' + wrapProgram $out/bin/spotify \ + ${lib.optionalString (deviceScaleFactor != null) '' + --add-flags ${lib.escapeShellArg "--force-device-scale-factor=${ + builtins.toString deviceScaleFactor + }"} + ''} + ''; + + meta = spotify-unwrapped.meta // { + priority = (spotify-unwrapped.meta.priority or 0) - 1; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f636f0fd894e..e08da2d177dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23326,7 +23326,7 @@ in spek = callPackage ../applications/audio/spek { }; - spotify = callPackage ../applications/audio/spotify { + spotify-unwrapped = callPackage ../applications/audio/spotify { libgcrypt = libgcrypt_1_5; libpng = libpng12; curl = curl.override { @@ -23334,6 +23334,8 @@ in }; }; + spotify = callPackage ../applications/audio/spotify/wrapper.nix { }; + libspotify = callPackage ../development/libraries/libspotify (config.libspotify or {}); sourcetrail = callPackage ../development/tools/sourcetrail { }; From 0e0dc5544cebe4435031ffaaf00f02bfd9b3aed8 Mon Sep 17 00:00:00 2001 From: oxalica Date: Fri, 18 Sep 2020 02:33:12 +0800 Subject: [PATCH 078/123] rust-analyzer: 2020-08-24 -> 2020-09-21 --- .../node-packages/node-packages.nix | 503 +++++++++--------- .../tools/rust/rust-analyzer/default.nix | 6 +- .../tools/rust/rust-analyzer/generic.nix | 26 +- .../rust-analyzer/no-loop-in-const-fn.patch | 223 ++++++++ .../rust/rust-analyzer/no-option-zip.patch | 63 +++ .../rust-analyzer/build-deps/package.json | 28 +- 6 files changed, 569 insertions(+), 280 deletions(-) create mode 100644 pkgs/development/tools/rust/rust-analyzer/no-loop-in-const-fn.patch create mode 100644 pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 201deab6607f..8e0e5ca40bab 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -1723,94 +1723,94 @@ let sha512 = "oJZb4PScX25ZGObpw9n7/bJBE7R0oF6hJ4ABe+WvMqSCI3kxaReMTgJJNIrxpmbXscxWM8U1ndLefP5IjPcU7Q=="; }; }; - "@graphql-tools/delegate-6.2.2" = { + "@graphql-tools/delegate-6.2.3" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-6.2.2.tgz"; - sha512 = "8VycfZYQ+m4HgajewQT6v6BzAEFxc6mh6rO+uqewnvh143nvv3ud4nXEAfOddUm0PrE6iD3Ng2BZtPSWF5mt+w=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-6.2.3.tgz"; + sha512 = "j4P7RaI5J9AvGcfBDITO6bZDeSvjMgDby2smn3L2dmXpPfMYh00KRRSZjzdMwSkLxi+0octh9buUAeCdvVMkKQ=="; }; }; - "@graphql-tools/graphql-file-loader-6.2.2" = { + "@graphql-tools/graphql-file-loader-6.2.3" = { name = "_at_graphql-tools_slash_graphql-file-loader"; packageName = "@graphql-tools/graphql-file-loader"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.2.tgz"; - sha512 = "dKuOk4vH2WWzVGydL13FjdR3WEmJHMoud3MXF9uyvLcjuDm9L0r+PdSI1PSPiCYs7Ii2bJ8zgmdz32jCBHZszA=="; + url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.3.tgz"; + sha512 = "9K+foDqfcJXf2jNNOWWZnV+PdxJkKmzAY58qlbFEFfUeRC6ZmOA9B3vTkcFadVdSwIsaWHhaxqHrNAD+OfkAyQ=="; }; }; - "@graphql-tools/import-6.2.2" = { + "@graphql-tools/import-6.2.3" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.2.tgz"; - sha512 = "fxQx+960CBzG6+MGGRaWv9tQ71ir2NZQeVC2dfieQLv5/LXH0fqKe9ltYCfJFskscAmzWeuS19Sibhdn0JMecw=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.3.tgz"; + sha512 = "2ftXR84aPy2ueAEEGw/yFvYGPbvJYs2m18FEODhAq5z4P285ZlCMluxTUR9yNjumzgQP5Eer4fl64ztsdJvCyg=="; }; }; - "@graphql-tools/json-file-loader-6.2.2" = { + "@graphql-tools/json-file-loader-6.2.3" = { name = "_at_graphql-tools_slash_json-file-loader"; packageName = "@graphql-tools/json-file-loader"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.2.2.tgz"; - sha512 = "m/gKQGJS+4bUy/8v0uup3su9RcCLdWvmhYW9+J8WDSzDE2QEdYQMeyDFYV14x0r92IhRpftLd//JvoE3cTV5Kg=="; + url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.2.3.tgz"; + sha512 = "7v445KZLVB3owbibu2HsFmVSsdDOn0NzYSqIXaaIZ7saqoVtG8etSt699kLw5gJM3j0Kjm7XDz9tK60Apes/xg=="; }; }; - "@graphql-tools/load-6.2.2" = { + "@graphql-tools/load-6.2.3" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.2.2.tgz"; - sha512 = "p5fvGSvtrIjL3rmQbdESnYH5zxqdKeQOIwoPnfvx6uDqqm3HaRBzS+k5V/PkhGsFRR5VFrqA8kPAbE87BYpkqw=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.2.3.tgz"; + sha512 = "3wmzrwf7tVY8rDRT2jxfQKlKgSB6P8OordFoOxpk1qNP2vmkUN9tWKxaI1ANkdm+et1D3ovUHeSoW6jKscnUAA=="; }; }; - "@graphql-tools/merge-6.2.2" = { + "@graphql-tools/merge-6.2.3" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.2.tgz"; - sha512 = "2YyErSvq4hn5mjE6qJ/0Q8r3WU9JB3+obv2xyvb+oW+E/T1iYRJGxSFldi6lqO5IADZz8QASLJeSpRBw40gpBg=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.3.tgz"; + sha512 = "qSSxdM2AKjnAHuChcnxIfzsGej78B56EE6ZD3tXMtKJOMQMhk4T4yXnKRHEw8fw7ZtNk/KqCmb6LJHy8Ws8frg=="; }; }; - "@graphql-tools/schema-6.2.2" = { + "@graphql-tools/schema-6.2.3" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.2.2.tgz"; - sha512 = "KITlyr//1oKyxIOlGvNZDl4c6bLj2Gc+3eJXyUKWfSmgsmAZPudpQNa/8VbiVujpm7UaX0cyM3FdeCaxWFeBgg=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.2.3.tgz"; + sha512 = "CV5vDfQhXidssLK5hjT55FfwRAvBoGW53lVBl0rbXrbsSX7H9iVHdUf4UaDIlMc6WcnnzOrRiue/khHz3rzDEg=="; }; }; - "@graphql-tools/url-loader-6.2.2" = { + "@graphql-tools/url-loader-6.2.3" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.2.2.tgz"; - sha512 = "vNDjhf7SJr9RnIDPBBEyTfKBb3aWRA3uy3jDkqQ/AFyh4hXRkg8xnECH7c6glRnWiZJeObMTxowZSUnDA68IyA=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.2.3.tgz"; + sha512 = "cV/VR/lT1bHxwhrZlyG+sevl4zU0zZQHS7+TelTfAdKGrSswEozK98pPjkFP57+6ghitH6XoHUE91hFxtaODsA=="; }; }; - "@graphql-tools/utils-6.2.2" = { + "@graphql-tools/utils-6.2.3" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.2.2.tgz"; - sha512 = "a0SSYF76dnKHs8te4Igfnrrq1VOO4sFG8yx3ehO7464eGUfUUYo2QmNRjhxny2HRMvqzX40xuQikyg6LBXDNLQ=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.2.3.tgz"; + sha512 = "eOhZy4y23r6AddokBqvFpQybtHvhTyZCc3VFWn8eIqF92vre90UKHbCX6Cf6VBo6i7l0ZwChPPbUzEiHOk+HJQ=="; }; }; - "@graphql-tools/wrap-6.2.2" = { + "@graphql-tools/wrap-6.2.3" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-6.2.2.tgz"; - sha512 = "FjCE+NvMwcCiAlt9EAw9uDi2zblE4Z5CEkY+z4NRO1AmCB5THoWJKG+csPh8tGuU80mAJI51Wy9FQGyUo/EU0g=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-6.2.3.tgz"; + sha512 = "bxMXobcuKy8r7jKefQx5VH3FSyXVHKfDWfJ65Kq4oAC2+d7DUlpr3HZ6BWoMhfgUf6s6PPM26Us00TGsUQlAGg=="; }; }; "@gulp-sourcemaps/identity-map-1.0.2" = { @@ -2596,13 +2596,13 @@ let sha512 = "RibeMnDPvlL8bFYW5C8cs4mbI3AHfQef73tnJCQ/SgrXZHehmHnsyWUiE7qDQCAo+B1RfTapvSyFF69iPj326A=="; }; }; - "@microsoft/load-themed-styles-1.10.93" = { + "@microsoft/load-themed-styles-1.10.97" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.93"; + version = "1.10.97"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.93.tgz"; - sha512 = "iziiQyDJmyP8QE33hYjuVsj18RvtzRMdON1QLDkJSrs9xisXWgEjK8U12UsEkBYpYXzxPxqq5+X+fK8Vs6g8vQ=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.97.tgz"; + sha512 = "FX8a2rXhYzXJWSoSjbxSyOvOo2SOHUjLG7JRWTf6rwiQDM/8fSTC/7TLkE2BAMg9n4vG+AxrgfN561VPnHQxrw=="; }; }; "@mrmlnc/readdir-enhanced-2.2.1" = { @@ -3145,13 +3145,13 @@ let sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ=="; }; }; - "@prettier/plugin-pug-1.5.1" = { + "@prettier/plugin-pug-1.6.1" = { name = "_at_prettier_slash_plugin-pug"; packageName = "@prettier/plugin-pug"; - version = "1.5.1"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@prettier/plugin-pug/-/plugin-pug-1.5.1.tgz"; - sha512 = "LUuXiILPURVCF8u4gnE6SWQZ/+1kVnRatXK6SmQyk+ed8F4uDyNCGuIu3/W7jYQB+k7kD6eQZqINuPWvbPTzYQ=="; + url = "https://registry.npmjs.org/@prettier/plugin-pug/-/plugin-pug-1.6.1.tgz"; + sha512 = "FqFByfSa72q2bxNocGlziXM/wAkhhIG5ecFU6+MddikqWTI+KIoeXRz6QHTtTWjcXqu6svlUNjNLhXMEMh25Hw=="; }; }; "@primer/octicons-10.1.0" = { @@ -3271,13 +3271,13 @@ let sha512 = "9JXf2k8xqvMYfqmhgtB6eCgMN9fbxwF1XDF3mGKJc6pkAmt0jnsqurxQ0tC1akQKNSXCm7c3unQxa3zuxtZ7mQ=="; }; }; - "@rollup/plugin-commonjs-15.0.0" = { + "@rollup/plugin-commonjs-15.1.0" = { name = "_at_rollup_slash_plugin-commonjs"; packageName = "@rollup/plugin-commonjs"; - version = "15.0.0"; + version = "15.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-15.0.0.tgz"; - sha512 = "8uAdikHqVyrT32w1zB9VhW6uGwGjhKgnDNP4pQJsjdnyF4FgCj6/bmv24c7v2CuKhq32CcyCwRzMPEElaKkn0w=="; + url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-15.1.0.tgz"; + sha512 = "xCQqz4z/o0h2syQ7d9LskIMvBSH4PX5PjYdpSSvgS+pQik3WahkQVNWg3D8XJeYjZoVWnIUQYDghuEMRGrmQYQ=="; }; }; "@rollup/plugin-json-4.1.0" = { @@ -3442,13 +3442,13 @@ let sha512 = "3guXwRmHOujBy6Lmf7THtnfJQcLRYzpTRpL1rCxLko7OtIWcOth3TvW2JtWNu6qubauA+5kpLB2rdCaPefZYbQ=="; }; }; - "@serverless/platform-client-china-1.0.37" = { + "@serverless/platform-client-china-1.1.0" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "1.0.37"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.37.tgz"; - sha512 = "eN2UBK51Z9RkRY5Im0j2wCl3XuHBKiuY3kpQIxtGs52yuQx8PA0I/HBsYwyRgoTpvATK3MM/SsyeKpvNs90+uw=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.1.0.tgz"; + sha512 = "QVk55zO5wcax3tPFp6IiZwf7yI0wZ64kNuR0eGM31g37AMt2+rBM6plE41zNKADRDBSqOtmnwEbsPiWlxZ/S9A=="; }; }; "@serverless/platform-sdk-2.3.2" = { @@ -10678,13 +10678,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001131" = { + "caniuse-lite-1.0.30001133" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001131"; + version = "1.0.30001133"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001131.tgz"; - sha512 = "4QYi6Mal4MMfQMSqGIRPGbKIbZygeN83QsWq1ixpUwvtfgAZot5BrCKzGygvZaV+CnELdTwD0S4cqUNozq7/Cw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001133.tgz"; + sha512 = "s3XAUFaC/ntDb1O3lcw9K8MPeOW7KO3z9+GzAoBxfz1B0VdacXPMKgFUtG4KIsgmnbexmi013s9miVu4h+qMHw=="; }; }; "canvas-2.6.1" = { @@ -13730,13 +13730,13 @@ let sha512 = "MSHgpjQqgbT/94D4CyADeNoYh52zMkCX4pcJvPP5WqPsLFMKjr2TCMg381ox5qI0ii2dPwaLx/00477knXqXVw=="; }; }; - "cross-fetch-3.0.5" = { + "cross-fetch-3.0.6" = { name = "cross-fetch"; packageName = "cross-fetch"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.5.tgz"; - sha512 = "FFLcLtraisj5eteosnX1gf01qYDCOc4fDy0+euOt8Kn9YBY2NtXL/pCoYPavw24NIQkQqm5ZOLsGD5Zzj0gyew=="; + url = "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.6.tgz"; + sha512 = "KBPUbqgFjzWlVcURG+Svp9TlhA5uliYtiNx/0r8nv0pdypeQCRJ9IaSIc3q/x3q8t3F75cHuwxVql1HFGHCNJQ=="; }; }; "cross-spawn-4.0.2" = { @@ -14873,13 +14873,13 @@ let sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; }; }; - "debug-4.2.0" = { + "debug-4.3.0" = { name = "debug"; packageName = "debug"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz"; - sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.0.tgz"; + sha512 = "jjO6JD2rKfiZQnBoRzhRTbXjHLGLfH+UtGkWLc/UXAh/rzZMyjbgn0NcfFpqT8nd1kTtFnDiJcrIFkq4UKeJVg=="; }; }; "debug-fabulous-1.1.0" = { @@ -21553,13 +21553,13 @@ let sha512 = "yUhpEDLeuGiGJjRSzEq3kvt4zJtAcjKmhIiwNp/eUs75tRlXfWcHo5tcBaMQtnjHWC7nQYT5HkY/l0QOQTkVww=="; }; }; - "got-11.6.2" = { + "got-11.7.0" = { name = "got"; packageName = "got"; - version = "11.6.2"; + version = "11.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-11.6.2.tgz"; - sha512 = "/21qgUePCeus29Jk7MEti8cgQUNXFSWfIevNIk4H7u1wmXNDrGPKPY6YsPY+o9CIT/a2DjCjRz0x1nM9FtS2/A=="; + url = "https://registry.npmjs.org/got/-/got-11.7.0.tgz"; + sha512 = "7en2XwH2MEqOsrK0xaKhbWibBoZqy+f1RSUoIeF1BLcnf+pyQdDsljWMfmOh+QKJwuvDIiKx38GtPh5wFdGGjg=="; }; }; "got-6.7.1" = { @@ -23750,22 +23750,22 @@ let sha512 = "zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw=="; }; }; - "ink-3.0.5" = { + "ink-3.0.6" = { name = "ink"; packageName = "ink"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/ink/-/ink-3.0.5.tgz"; - sha512 = "Zc/Yoi3P0cY0DC9ryb3HTwmi4Qgke9332ebOhDRaK9Cw6D+ABAOQPeHG8IdmI1GOkMKRMZwTP/1jRs/b1D1n9Q=="; + url = "https://registry.npmjs.org/ink/-/ink-3.0.6.tgz"; + sha512 = "MOaRUKlDdyzBr6IhiBpBA5+9tv+OlVvQrEErQlN2dfofJ0Q52Xc3gZ5YtgGj0UVD24Ex79WL2QZGJh0emz+jDQ=="; }; }; - "ink-text-input-4.0.0" = { + "ink-text-input-4.0.1" = { name = "ink-text-input"; packageName = "ink-text-input"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-4.0.0.tgz"; - sha512 = "mzftl3MRUYEi4/lQQzjUGgmPtPIQgGbeedp6G9cDIGTQPMOiaklrCX8zWi9aY5n0OKoJpjmi3TR6eRBNNhCP8Q=="; + url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-4.0.1.tgz"; + sha512 = "wiqkrB2tgnCnv51r2LpNLVfgrd/V+UXF3ccry+/Q7on9CBt8LVavX6NDYRMdXljuM+CcFV/sVro0bCr5oxB05w=="; }; }; "inline-source-map-0.6.2" = { @@ -31302,13 +31302,13 @@ let sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"; }; }; - "mobx-4.15.6" = { + "mobx-4.15.7" = { name = "mobx"; packageName = "mobx"; - version = "4.15.6"; + version = "4.15.7"; src = fetchurl { - url = "https://registry.npmjs.org/mobx/-/mobx-4.15.6.tgz"; - sha512 = "eZVEHZLi/Fe+V4qurBBQoFHCqaGrfMuYK1Vy4t5MHYfy90f52ptAKsemHsJcYl+R5/sA3oeT3rMLiVsbB7bllA=="; + url = "https://registry.npmjs.org/mobx/-/mobx-4.15.7.tgz"; + sha512 = "X4uQvuf2zYKHVO5kRT5Utmr+J9fDnRgxWWnSqJ4oiccPTQU38YG+/O3nPmOhUy4jeHexl7XJJpWDBgEnEfp+8w=="; }; }; "mobx-react-5.4.4" = { @@ -32256,13 +32256,13 @@ let sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; }; }; - "nearley-2.19.6" = { + "nearley-2.19.7" = { name = "nearley"; packageName = "nearley"; - version = "2.19.6"; + version = "2.19.7"; src = fetchurl { - url = "https://registry.npmjs.org/nearley/-/nearley-2.19.6.tgz"; - sha512 = "OV3Lx+o5iIGWVY38zs+7aiSnBqaHTFAOQiz83VHJje/wOOaSgzE3H0S/xfISxJhFSoPcX611OEDV9sCT8F283g=="; + url = "https://registry.npmjs.org/nearley/-/nearley-2.19.7.tgz"; + sha512 = "Y+KNwhBPcSJKeyQCFjn8B/MIe+DDlhaaDgjVldhy5xtFewIbiQgcbZV8k2gCVwkI1ZsKCnjIYZbR+0Fim5QYgg=="; }; }; "neat-csv-2.1.0" = { @@ -36786,13 +36786,13 @@ let sha512 = "40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw=="; }; }; - "polished-3.6.6" = { + "polished-3.6.7" = { name = "polished"; packageName = "polished"; - version = "3.6.6"; + version = "3.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/polished/-/polished-3.6.6.tgz"; - sha512 = "yiB2ims2DZPem0kCD6V0wnhcVGFEhNh0Iw0axNpKU+oSAgFt6yx6HxIT23Qg0WWvgS379cS35zT4AOyZZRzpQQ=="; + url = "https://registry.npmjs.org/polished/-/polished-3.6.7.tgz"; + sha512 = "b4OViUOihwV0icb9PHmWbR+vPqaSzSAEbgLskvb7ANPATVXGiYv/TQFHQo65S53WU9i5EQ1I03YDOJW7K0bmYg=="; }; }; "portfinder-1.0.28" = { @@ -41278,13 +41278,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.27.1" = { + "rollup-2.28.1" = { name = "rollup"; packageName = "rollup"; - version = "2.27.1"; + version = "2.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.27.1.tgz"; - sha512 = "GiWHQvnmMgBktSpY/1+nrGpwPsTw4b9P28og2uedfeq4JZ16rzAmnQ5Pm/E0/BEmDNia1ZbY7+qu3nBgNa19Hg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.28.1.tgz"; + sha512 = "DOtVoqOZt3+FjPJWLU8hDIvBjUylc9s6IZvy76XklxzcLvAQLtVAG/bbhsMhcWnYxC0TKKcf1QQ/tg29zeID0Q=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -50576,13 +50576,13 @@ let sha512 = "JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A=="; }; }; - "vscode-jsonrpc-5.1.0-next.1" = { + "vscode-jsonrpc-6.0.0-next.5" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; - version = "5.1.0-next.1"; + version = "6.0.0-next.5"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.1.0-next.1.tgz"; - sha512 = "mwLDojZkbmpizSJSmp690oa9FB9jig18SIDGZeBCvFc2/LYSRvMm/WwWtMBJuJ1MfFh7rZXfQige4Uje5Z9NzA=="; + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.5.tgz"; + sha512 = "IAgsltQPwg/pXOPsdXgbUTCaO9VSKZwirZN5SGtkdYQ/R3VjeC4v00WTVvoNayWMZpoC3O9u0ogqmsKzKhVasQ=="; }; }; "vscode-languageclient-4.0.1" = { @@ -50594,13 +50594,13 @@ let sha512 = "0fuBZj9pMkeJ8OMyIvSGeRaRVhUaJt+yeFxi7a3sz/AbrngQdcxOovMXPgKuieoBSBKS05gXPS88BsWpJZfBkA=="; }; }; - "vscode-languageclient-7.0.0-next.1" = { + "vscode-languageclient-7.0.0-next.9" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; - version = "7.0.0-next.1"; + version = "7.0.0-next.9"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.1.tgz"; - sha512 = "JrjCUhLpQZxQ5VpWpilOHDMhVsn0fdN5jBh1uFNhSr5c2loJvRdr9Km2EuSQOFfOQsBKx0+xvY8PbsypNEcJ6w=="; + url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.9.tgz"; + sha512 = "lFO+rN/i72CM2va6iKXq1lD7pJg8J93KEXf0w0boWVqU+DJhWzLrV3pXl8Xk1nCv//qOAyhlc/nx2KZCTeRF/A=="; }; }; "vscode-languageserver-3.5.1" = { @@ -50675,13 +50675,13 @@ let sha512 = "zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw=="; }; }; - "vscode-languageserver-protocol-3.16.0-next.2" = { + "vscode-languageserver-protocol-3.16.0-next.7" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.16.0-next.2"; + version = "3.16.0-next.7"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.2.tgz"; - sha512 = "atmkGT/W6tF0cx4SaWFYtFs2UeSeC28RPiap9myv2YZTaTCFvTBEPNWrU5QRKfkyM0tbgtGo6T3UCQ8tkDpjzA=="; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.7.tgz"; + sha512 = "tOjrg+K3RddJ547zpC9/LAgTbzadkPuHlqJFFWIcKjVhiJOh73XyY+Ngcu9wukGaTsuSGjJ0W8rlmwanixa0FQ=="; }; }; "vscode-languageserver-protocol-3.5.1" = { @@ -50738,15 +50738,6 @@ let sha512 = "+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="; }; }; - "vscode-languageserver-types-3.16.0-next.1" = { - name = "vscode-languageserver-types"; - packageName = "vscode-languageserver-types"; - version = "3.16.0-next.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.1.tgz"; - sha512 = "tZFUSbyjUcrh+qQf13ALX4QDdOfDX0cVaBFgy7ktJ0VwS7AW/yRKgGPSxVqqP9OCMNPdqP57O5q47w2pEwfaUg=="; - }; - }; "vscode-languageserver-types-3.16.0-next.2" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -50756,6 +50747,15 @@ let sha512 = "QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q=="; }; }; + "vscode-languageserver-types-3.16.0-next.3" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.16.0-next.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.3.tgz"; + sha512 = "s/z5ZqSe7VpoXJ6JQcvwRiPPA3nG0nAcJ/HH03zoU6QaFfnkcgPK+HshC3WKPPnC2G08xA0iRB6h7kmyBB5Adg=="; + }; + }; "vscode-languageserver-types-3.5.0" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -52647,13 +52647,13 @@ let sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4"; }; }; - "yargs-parser-20.0.0" = { + "yargs-parser-20.2.0" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "20.0.0"; + version = "20.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.0.0.tgz"; - sha512 = "8eblPHTL7ZWRkyjIZJjnGf+TijiKJSwA24svzLRVvtgoi/RZiKa9fFQTrlx0OKLnyHSdt/enrdadji6WFfESVA=="; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.0.tgz"; + sha512 = "2agPoRFPoIcFzOIp6656gcvsg2ohtscpw2OINr/q46+Sq41xz2OYLqx5HRHabmFU1OARIPAYH5uteICE7mn/5A=="; }; }; "yargs-parser-4.2.1" = { @@ -53687,7 +53687,7 @@ in sources."cssstyle-1.4.0" sources."dashdash-1.14.1" sources."data-urls-1.1.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."deep-is-0.1.3" sources."delayed-stream-1.0.0" sources."domexception-1.0.1" @@ -55132,7 +55132,7 @@ in sources."callsites-2.0.0" sources."camel-case-4.1.1" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001131" + sources."caniuse-lite-1.0.30001133" sources."capital-case-1.0.3" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" @@ -55274,7 +55274,7 @@ in sources."csv-parser-1.12.1" sources."dashdash-1.14.1" sources."date-fns-1.30.1" - (sources."debug-4.2.0" // { + (sources."debug-4.3.0" // { dependencies = [ sources."ms-2.1.2" ]; @@ -56659,7 +56659,7 @@ in sources."commander-2.20.3" sources."concat-map-0.0.1" sources."convert-source-map-1.7.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ejs-2.5.7" sources."ensure-posix-path-1.1.1" sources."escape-string-regexp-1.0.5" @@ -57331,7 +57331,7 @@ in sources."caseless-0.12.0" (sources."castv2-0.1.10" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" ]; }) sources."castv2-client-1.2.0" @@ -57760,10 +57760,10 @@ in coc-eslint = nodeEnv.buildNodePackage { name = "coc-eslint"; packageName = "coc-eslint"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.3.0.tgz"; - sha512 = "V3yyEXLi+XAFPSvA1WiA+qkBytEqLvEsqfwquyZfXkpOAcG4b2PtA+MLou6OFSpJeYpe4d2Xr3sY8ThBCoxx3g=="; + url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.3.1.tgz"; + sha512 = "yiWUByuOtIHs1GnXspO59F5K0QtGYxMmpt8ZC2VvvB3DZZhEbhmBNrcoU66JaJP9y8tCZWTRh1eyobCRBL0pTA=="; }; buildInputs = globalBuildInputs; meta = { @@ -57777,10 +57777,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-2.0.0.tgz"; - sha512 = "uGqh7FKFXc26zjuzErw7vtnR8xHxmEf9jJNOekKyYncRg5Wzc7g5kYt2aFo+lA9zk3qC62DJ6LAaDJkfREQDmA=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-2.0.1.tgz"; + sha512 = "kPNmgaCx6hKshq/Vv5uugrPkQcDa7pVp+hosGADBP8qzHxudbumDA5va2vSzqjhUxAYEGTL92F0mBapg29pJhg=="; }; buildInputs = globalBuildInputs; meta = { @@ -57856,10 +57856,10 @@ in coc-imselect = nodeEnv.buildNodePackage { name = "coc-imselect"; packageName = "coc-imselect"; - version = "0.0.12"; + version = "0.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/coc-imselect/-/coc-imselect-0.0.12.tgz"; - sha512 = "X8TBe8UTwNd01HrWBXy93jQ1PShGtTa4bm2aH2bQwx9EH9FW7ufRlw7euPKkR2kzilshwb3UbJnLET2vFdZjJw=="; + url = "https://registry.npmjs.org/coc-imselect/-/coc-imselect-0.0.13.tgz"; + sha512 = "5hL7FmrLILl6PwZDUndOfHqfMjAl31pvB6YifmnZJO/ht4J3lFLCWxkiyXt5PRQbrHKLGnPT7sySTKxF8X303g=="; }; buildInputs = globalBuildInputs; meta = { @@ -57980,7 +57980,7 @@ in }) sources."date-format-3.0.0" sources."debounce-1.2.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."deep-extend-0.6.0" sources."define-properties-1.1.3" sources."duplexer2-0.1.4" @@ -58221,7 +58221,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001131" + sources."caniuse-lite-1.0.30001133" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -58288,7 +58288,7 @@ in }) sources."crypto-random-string-1.0.0" sources."currently-unhandled-0.4.1" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" sources."decamelize-keys-1.1.0" sources."decode-uri-component-0.2.0" @@ -59308,7 +59308,7 @@ in sources."callsites-2.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."caniuse-lite-1.0.30001131" + sources."caniuse-lite-1.0.30001133" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -59348,7 +59348,7 @@ in sources."copy-descriptor-0.1.1" sources."cosmiconfig-5.2.1" sources."currently-unhandled-0.4.1" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -59934,10 +59934,10 @@ in coc-vetur = nodeEnv.buildNodePackage { name = "coc-vetur"; packageName = "coc-vetur"; - version = "1.1.13"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.1.13.tgz"; - sha512 = "RVjVqe3CiT+XCSupp8UrUeEGFPLfSrHl4yTxhizqV5SdovxWQ3UOTrDgLvH6HyKiMNphKRhTyknpHyDE6LtdZQ=="; + url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.2.0.tgz"; + sha512 = "JtuTM6DHU21h6j1fEeAaOtfFveLOzeqVXh9mjd53fVHws9T89wW8yV0ZsU5gz4u4g0tw7nN779sJqOEAXnmR8w=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -59946,7 +59946,7 @@ in sources."@emmetio/extract-abbreviation-0.2.0" (sources."@eslint/eslintrc-0.1.3" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ignore-4.0.6" sources."strip-json-comments-3.1.1" ]; @@ -59959,7 +59959,7 @@ in }) sources."@nodelib/fs.stat-1.1.3" sources."@nodelib/fs.walk-1.2.4" - sources."@prettier/plugin-pug-1.5.1" + sources."@prettier/plugin-pug-1.6.1" sources."@sindresorhus/is-0.14.0" sources."@sorg/log-2.2.0" sources."@starptech/expression-parser-0.10.0" @@ -59997,7 +59997,7 @@ in sources."@typescript-eslint/types-3.10.1" (sources."@typescript-eslint/typescript-estree-3.10.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."semver-7.3.2" ]; }) @@ -60221,7 +60221,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."cross-spawn-7.0.3" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."has-flag-4.0.0" sources."ignore-4.0.6" sources."path-key-3.1.1" @@ -60603,7 +60603,7 @@ in sources."semver-5.7.1" ]; }) - sources."debug-4.2.0" + sources."debug-4.3.0" sources."eslint-6.8.0" sources."eslint-utils-1.4.3" sources."espree-6.2.1" @@ -60941,7 +60941,7 @@ in sources."vscode-web-custom-data-0.3.1" (sources."vue-eslint-parser-7.1.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."espree-6.2.1" ]; }) @@ -62565,7 +62565,7 @@ in sources."dat-secret-storage-4.0.1" sources."dat-storage-1.1.1" sources."dat-swarm-defaults-1.0.2" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decode-uri-component-0.2.0" sources."decompress-response-4.2.1" sources."deep-equal-0.2.2" @@ -63415,7 +63415,7 @@ in sources."convert-to-spaces-1.0.2" sources."cross-spawn-6.0.5" sources."debounce-fn-4.0.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -63445,7 +63445,7 @@ in sources."get-stream-4.1.0" sources."glob-7.1.6" sources."globals-11.12.0" - sources."got-11.6.2" + sources."got-11.7.0" sources."hard-rejection-2.1.0" sources."has-flag-3.0.0" sources."hosted-git-info-2.8.8" @@ -63455,7 +63455,7 @@ in sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."ink-3.0.5" // { + (sources."ink-3.0.6" // { dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-4.1.0" @@ -63465,7 +63465,7 @@ in sources."supports-color-7.2.0" ]; }) - (sources."ink-text-input-4.0.0" // { + (sources."ink-text-input-4.0.1" // { dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-4.1.0" @@ -63693,7 +63693,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.93" + sources."@microsoft/load-themed-styles-1.10.97" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -64460,7 +64460,7 @@ in sources."lodash.some-4.6.0" (sources."log4js-6.3.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -64996,7 +64996,7 @@ in (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."fs-extra-8.1.0" sources."jsonfile-4.0.0" sources."ms-2.1.2" @@ -65270,7 +65270,7 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."deep-is-0.1.3" sources."doctrine-3.0.0" sources."emoji-regex-7.0.3" @@ -65414,7 +65414,7 @@ in sources."concat-map-0.0.1" sources."core_d-2.0.0" sources."cross-spawn-7.0.3" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."deep-is-0.1.3" sources."doctrine-3.0.0" sources."emoji-regex-7.0.3" @@ -66335,7 +66335,7 @@ in }; dependencies = [ sources."async-2.6.3" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."lodash-4.17.20" sources."lodash.groupby-4.6.0" sources."microee-0.0.6" @@ -66367,7 +66367,7 @@ in sources."chloride-2.3.0" sources."chloride-test-1.2.4" sources."commander-2.20.3" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."deep-extend-0.6.0" sources."diff-3.5.0" sources."discontinuous-range-1.0.0" @@ -66412,7 +66412,7 @@ in sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" sources."muxrpc-6.5.0" - sources."nearley-2.19.6" + sources."nearley-2.19.7" sources."node-gyp-build-4.2.3" sources."node-polyglot-1.0.0" sources."non-private-ip-1.4.4" @@ -66560,10 +66560,10 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "3.2.10"; + version = "3.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.2.10.tgz"; - sha512 = "IVwhdySPQyHTfImCGllphBqHZtDWGnphjZG4EhkKtJY98b69sbaRU8PRO+XEC0rutbb5Gf0oCHvM3QswtAVCeQ=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.2.12.tgz"; + sha512 = "ZL27e8s3lkkrKrGCCQDlwIGnLOihrrehDI1jriWaU+UaVME1IYCtOiYbLp59iITK2s8Ak7e0LSSCyO08bRLAvQ=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -66859,32 +66859,33 @@ in sources."@exodus/schemasafe-1.0.0-rc.2" sources."@graphql-cli/common-4.0.0" sources."@graphql-cli/init-4.0.0" - sources."@graphql-tools/delegate-6.2.2" - (sources."@graphql-tools/graphql-file-loader-6.2.2" // { + sources."@graphql-tools/delegate-6.2.3" + (sources."@graphql-tools/graphql-file-loader-6.2.3" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - (sources."@graphql-tools/import-6.2.2" // { + (sources."@graphql-tools/import-6.2.3" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - (sources."@graphql-tools/json-file-loader-6.2.2" // { + (sources."@graphql-tools/json-file-loader-6.2.3" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - sources."@graphql-tools/load-6.2.2" - sources."@graphql-tools/merge-6.2.2" - sources."@graphql-tools/schema-6.2.2" - (sources."@graphql-tools/url-loader-6.2.2" // { + sources."@graphql-tools/load-6.2.3" + sources."@graphql-tools/merge-6.2.3" + sources."@graphql-tools/schema-6.2.3" + (sources."@graphql-tools/url-loader-6.2.3" // { dependencies = [ - sources."cross-fetch-3.0.5" + sources."cross-fetch-3.0.6" + sources."node-fetch-2.6.1" ]; }) - sources."@graphql-tools/utils-6.2.2" - sources."@graphql-tools/wrap-6.2.2" + sources."@graphql-tools/utils-6.2.3" + sources."@graphql-tools/wrap-6.2.3" sources."@kwsites/exec-p-0.4.0" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" @@ -66977,7 +66978,7 @@ in sources."d-1.0.1" sources."dashdash-1.14.1" sources."dataloader-2.0.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" sources."decompress-response-3.3.0" sources."deep-equal-2.0.3" @@ -69027,7 +69028,7 @@ in sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" sources."data-uri-to-buffer-1.2.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."deep-is-0.1.3" sources."degenerator-1.0.4" sources."delayed-stream-1.0.0" @@ -69779,10 +69780,10 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "1.0.168"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-1.0.168.tgz"; - sha512 = "h4ng5Qc2C1RST9cLlVpu+79TpANA9vIEESCv56rzEy0zyhKGtlMeD0IiiY7ZJalmHCousNfYzdTPhM2pg1Q0ug=="; + url = "https://registry.npmjs.org/joplin/-/joplin-1.1.7.tgz"; + sha512 = "Eb227112WOzZ4+gMNx4dtGPonyN0c834hdogAfN9yJ30DatlgAi8+kWJI+IuCOznvemu0456+mwHmOhw7jLEPg=="; }; dependencies = [ sources."@cronvel/get-pixels-3.4.0" @@ -70688,10 +70689,10 @@ in jsdoc = nodeEnv.buildNodePackage { name = "jsdoc"; packageName = "jsdoc"; - version = "3.6.5"; + version = "3.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.5.tgz"; - sha512 = "SbY+i9ONuxSK35cgVHaI8O9senTE4CDYAmGSDJ5l3+sfe62Ff4gy96osy6OW84t4K4A8iGnMrlRrsSItSNp3RQ=="; + url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.6.tgz"; + sha512 = "znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ=="; }; dependencies = [ sources."@babel/parser-7.11.5" @@ -71289,7 +71290,7 @@ in sources."lodash-4.17.20" (sources."log4js-6.3.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -71356,7 +71357,7 @@ in (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -73993,7 +73994,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.30001131" + sources."caniuse-lite-1.0.30001133" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -74095,7 +74096,7 @@ in sources."dash-ast-1.0.0" sources."dashdash-1.14.1" sources."death-1.1.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" sources."define-properties-1.1.3" @@ -75334,7 +75335,7 @@ in sources."@fluentui/react-icons-0.3.4" sources."@fluentui/react-window-provider-0.3.3" sources."@fluentui/theme-0.3.2" - sources."@microsoft/load-themed-styles-1.10.93" + sources."@microsoft/load-themed-styles-1.10.97" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@uifabric/foundation-7.9.5" @@ -75889,10 +75890,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "2.63.2"; + version = "2.63.3"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.63.2.tgz"; - sha512 = "H9c4UIuhOG5jl7ZlwuB/D4ac35BbYgiwXi77jTwx2QLy5Gy/UfId6ocFAdV5KYwSY5Yx2aS5txt4uYXm5qAb6w=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.63.3.tgz"; + sha512 = "XHokxG0dgSYbewUj9ifRI/EiM8PYAwWaA31+WFCbGHi0kKHrVwFLx1FsQH3Yo35dQk7MM0dnHjT8xTir0slgZw=="; }; dependencies = [ sources."@analytics/cookie-utils-0.2.3" @@ -76188,7 +76189,7 @@ in sources."@octokit/rest-16.43.2" sources."@octokit/types-5.5.0" sources."@rollup/plugin-babel-5.2.1" - (sources."@rollup/plugin-commonjs-15.0.0" // { + (sources."@rollup/plugin-commonjs-15.1.0" // { dependencies = [ sources."estree-walker-2.0.1" ]; @@ -76332,7 +76333,7 @@ in sources."cachedir-2.3.0" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001131" + sources."caniuse-lite-1.0.30001133" sources."cardinal-2.1.1" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -76464,7 +76465,7 @@ in sources."crypto-random-string-2.0.0" sources."cyclist-1.0.1" sources."date-time-2.1.0" - (sources."debug-4.2.0" // { + (sources."debug-4.3.0" // { dependencies = [ sources."ms-2.1.2" ]; @@ -77252,7 +77253,7 @@ in sources."ret-0.1.15" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.27.1" + sources."rollup-2.28.1" sources."run-async-2.4.1" sources."run-parallel-1.1.9" sources."rxjs-6.6.3" @@ -78140,7 +78141,7 @@ in sources."accepts-1.3.7" (sources."agent-base-6.0.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -78346,7 +78347,7 @@ in sources."http-signature-1.2.0" (sources."https-proxy-agent-5.0.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -79069,7 +79070,7 @@ in sources."core-util-is-1.0.2" sources."crypto-random-string-2.0.0" sources."dashdash-1.14.1" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."debuglog-1.0.1" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" @@ -79796,7 +79797,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001131" + sources."caniuse-lite-1.0.30001133" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -79879,7 +79880,7 @@ in sources."dashdash-1.14.1" sources."data-urls-1.1.0" sources."deasync-0.1.20" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decode-uri-component-0.2.0" sources."deep-is-0.1.3" (sources."defaults-1.0.3" // { @@ -81823,10 +81824,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.6.1"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.6.1.tgz"; - sha512 = "pHEgIV5hIqwaMqDlDNj5yuNuSjN5CKAZvBgdL5CC2mo2itdpqoYy/NkLId0bnnRgrsmyA57Nz4Q78JFnx0Jcdw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.7.0.tgz"; + sha512 = "5+ZKJUKhh6indenG8egpELjgAEQKO6fx5LHlepDr3zymkX6EupySjPh/E/20ue920bUbMdvC0Hi2S71S45IJ7A=="; }; buildInputs = globalBuildInputs; meta = { @@ -82375,10 +82376,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.72"; + version = "1.1.73"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.72.tgz"; - sha512 = "nRYCxhlGwG/NRl6eCZX3oxUaZGy7VRVuL/b46ZsDh69ZzkZ/CSMsxW19Jb4vZgGb8M2eLcFpan45m7UtiHBMWA=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.73.tgz"; + sha512 = "IWW7ZCp/Mk0WOVX9o1/L/Usq+vQODEDOaxlLSCDCClBAdjQsxCCo4FYZPMs4Ec3GKRwEmXHwzW8ZIit3J/cHKw=="; }; buildInputs = globalBuildInputs; meta = { @@ -82660,7 +82661,7 @@ in sources."crypto-browserify-3.12.0" sources."css-color-keywords-1.0.0" sources."css-to-react-native-3.0.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" sources."decko-1.2.0" sources."delegate-3.2.0" @@ -82765,7 +82766,7 @@ in sources."minimalistic-crypto-utils-1.0.1" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - sources."mobx-4.15.6" + sources."mobx-4.15.7" sources."mobx-react-5.4.4" sources."ms-2.1.2" sources."neo-async-2.6.2" @@ -82801,7 +82802,7 @@ in sources."pbkdf2-3.1.1" sources."perfect-scrollbar-1.5.0" sources."picomatch-2.2.2" - sources."polished-3.6.6" + sources."polished-3.6.7" sources."postcss-value-parser-4.1.0" sources."prismjs-1.21.0" sources."process-0.11.10" @@ -82974,10 +82975,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.27.1"; + version = "2.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.27.1.tgz"; - sha512 = "GiWHQvnmMgBktSpY/1+nrGpwPsTw4b9P28og2uedfeq4JZ16rzAmnQ5Pm/E0/BEmDNia1ZbY7+qu3nBgNa19Hg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.28.1.tgz"; + sha512 = "DOtVoqOZt3+FjPJWLU8hDIvBjUylc9s6IZvy76XklxzcLvAQLtVAG/bbhsMhcWnYxC0TKKcf1QQ/tg29zeID0Q=="; }; dependencies = [ sources."fsevents-2.1.3" @@ -83084,7 +83085,7 @@ in sources."cross-spawn-7.0.3" sources."css-select-1.2.0" sources."css-what-2.1.3" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" sources."deep-freeze-0.0.1" sources."deep-is-0.1.3" @@ -83277,7 +83278,7 @@ in sources."resolve-1.17.0" sources."resolve-from-4.0.0" sources."rimraf-2.6.3" - sources."rollup-2.27.1" + sources."rollup-2.28.1" sources."safe-buffer-5.2.1" sources."semver-6.3.0" sources."serialize-javascript-4.0.0" @@ -83328,10 +83329,10 @@ in sources."semver-5.7.1" ]; }) - sources."vscode-jsonrpc-5.1.0-next.1" - sources."vscode-languageclient-7.0.0-next.1" - sources."vscode-languageserver-protocol-3.16.0-next.2" - sources."vscode-languageserver-types-3.16.0-next.1" + sources."vscode-jsonrpc-6.0.0-next.5" + sources."vscode-languageclient-7.0.0-next.9" + sources."vscode-languageserver-protocol-3.16.0-next.7" + sources."vscode-languageserver-types-3.16.0-next.3" sources."vscode-test-1.4.0" sources."which-2.0.2" sources."which-module-2.0.0" @@ -83419,7 +83420,7 @@ in sources."crc-0.2.0" sources."crypto-0.0.3" sources."dashdash-1.14.1" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" sources."events.node-0.4.9" @@ -83653,7 +83654,7 @@ in sources."2-thenable-1.0.0" (sources."@kwsites/file-exists-1.1.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -83703,7 +83704,7 @@ in ]; }) sources."@serverless/platform-client-1.1.10" - (sources."@serverless/platform-client-china-1.0.37" // { + (sources."@serverless/platform-client-china-1.1.0" // { dependencies = [ sources."archiver-4.0.2" sources."async-3.2.0" @@ -83713,7 +83714,7 @@ in (sources."@serverless/platform-sdk-2.3.2" // { dependencies = [ sources."chalk-2.4.2" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."https-proxy-agent-4.0.0" sources."is-docker-1.1.0" sources."ms-2.1.2" @@ -84079,7 +84080,7 @@ in (sources."https-proxy-agent-5.0.0" // { dependencies = [ sources."agent-base-6.0.1" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -84294,7 +84295,7 @@ in sources."signal-exit-3.0.3" (sources."simple-git-2.20.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -84344,7 +84345,7 @@ in sources."supports-color-5.5.0" (sources."tabtab-3.0.2" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" sources."untildify-3.0.3" ]; @@ -84412,7 +84413,7 @@ in sources."xtend-4.0.2" sources."yaml-ast-parser-0.0.43" sources."yamljs-0.3.0" - sources."yargs-parser-20.0.0" + sources."yargs-parser-20.2.0" sources."yauzl-2.10.0" sources."yeast-0.1.2" sources."zip-stream-3.0.1" @@ -85181,7 +85182,7 @@ in }) sources."crypto-random-string-2.0.0" sources."data-uri-to-buffer-1.2.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" (sources."decompress-response-6.0.0" // { dependencies = [ @@ -86018,7 +86019,7 @@ in sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."cross-spawn-6.0.5" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decode-uri-component-0.2.0" sources."deep-equal-1.1.1" sources."deep-extend-0.6.0" @@ -86295,7 +86296,7 @@ in }) sources."napi-macros-2.0.0" sources."ncp-2.0.0" - sources."nearley-2.19.6" + sources."nearley-2.19.7" sources."nice-try-1.0.5" sources."node-gyp-build-4.2.3" sources."non-private-ip-1.4.4" @@ -88336,7 +88337,7 @@ in sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" sources."delayed-stream-1.0.0" sources."discord.js-11.6.4" @@ -88526,7 +88527,7 @@ in sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" sources."crypt-0.0.2" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."deep-equal-1.1.1" sources."deep-is-0.1.3" sources."define-properties-1.1.3" @@ -88857,7 +88858,7 @@ in sources."core-util-is-1.0.2" sources."crypto-random-string-2.0.0" sources."cuss-1.21.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -89607,7 +89608,7 @@ in sources."after-0.8.2" (sources."agent-base-6.0.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -89771,7 +89772,7 @@ in sources."http_ece-1.1.0" (sources."https-proxy-agent-5.0.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -91742,14 +91743,14 @@ in (sources."eslint-5.16.0" // { dependencies = [ sources."cross-spawn-6.0.5" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ignore-4.0.6" ]; }) (sources."eslint-plugin-vue-6.2.2" // { dependencies = [ sources."acorn-7.4.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."eslint-scope-5.1.1" sources."espree-6.2.1" sources."vue-eslint-parser-7.1.0" @@ -92434,7 +92435,7 @@ in sources."vscode-uri-1.0.8" (sources."vue-eslint-parser-6.0.5" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" ]; }) sources."vue-onsenui-helper-json-1.0.2" @@ -92751,7 +92752,7 @@ in (sources."eslint-7.5.0" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" sources."strip-ansi-6.0.0" ]; @@ -94419,7 +94420,7 @@ in sources."semver-5.7.1" ]; }) - (sources."debug-4.2.0" // { + (sources."debug-4.3.0" // { dependencies = [ sources."ms-2.1.2" ]; @@ -95038,20 +95039,20 @@ in sources."bitfield-3.0.0" (sources."bittorrent-dht-10.0.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) sources."bittorrent-peerid-1.3.3" (sources."bittorrent-protocol-3.1.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) (sources."bittorrent-tracker-9.15.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" sources."ms-2.1.2" @@ -95071,7 +95072,7 @@ in sources."bufferutil-4.0.1" (sources."castv2-0.1.10" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -95216,7 +95217,7 @@ in sources."record-cache-1.1.0" (sources."render-media-3.4.3" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -95232,14 +95233,14 @@ in sources."simple-get-2.8.1" (sources."simple-peer-9.7.2" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) sources."simple-sha1-3.0.1" (sources."simple-websocket-8.1.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -95260,7 +95261,7 @@ in sources."to-arraybuffer-1.0.1" (sources."torrent-discovery-9.3.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -95274,7 +95275,7 @@ in sources."url-join-4.0.1" (sources."ut_metadata-3.5.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -95285,7 +95286,7 @@ in sources."vlc-command-1.2.0" (sources."webtorrent-0.108.6" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decompress-response-4.2.1" sources."mimic-response-2.1.0" sources."ms-2.1.2" @@ -96329,7 +96330,7 @@ in }) (sources."yeoman-generator-4.12.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."diff-4.0.2" sources."dir-glob-2.2.2" sources."ejs-3.1.5" diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index c9c87991a8ac..5d66f6e21007 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-08-24"; + rev = "2020-09-21"; version = "unstable-${rev}"; - sha256 = "11q5shrq55krgpj7rjfqw84131j5g55zyrwww3cxcbr8ndi3xdnf"; - cargoSha256 = "15kjcgxmigm0lwbp8p0kdxax86ldjqq9q8ysj6khfhqd0173184n"; + sha256 = "1wjm69r1c6s8a4rd91csg7c48bp8jamxsrm5m6rg3bk2gqp8yzz8"; + cargoSha256 = "089w2i6lvpjxkxghkb2mij9sxfxlcc1zv4iq4qmzq8gnc6ddz12d"; }; 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 7092f5291dd9..3bd6d1ccee14 100644 --- a/pkgs/development/tools/rust/rust-analyzer/generic.nix +++ b/pkgs/development/tools/rust/rust-analyzer/generic.nix @@ -1,9 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin -, useJemalloc ? false +{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin, cmake +, useMimalloc ? false , doCheck ? true # Version specific args -, rev, version, sha256, cargoSha256 }: +, rev, version, sha256, cargoSha256 +}: rustPlatform.buildRustPackage { pname = "rust-analyzer-unwrapped"; @@ -15,11 +16,17 @@ rustPlatform.buildRustPackage { inherit rev sha256; }; + 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 + ]; + buildAndTestSubdir = "crates/rust-analyzer"; - cargoBuildFlags = lib.optional useJemalloc "--features=jemalloc"; + cargoBuildFlags = lib.optional useMimalloc "--features=mimalloc"; - nativeBuildInputs = lib.optionals doCheck [ rustPlatform.rustcSrc ]; + nativeBuildInputs = lib.optional useMimalloc cmake; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; @@ -27,16 +34,11 @@ rustPlatform.buildRustPackage { RUST_ANALYZER_REV = rev; inherit doCheck; - # Skip tests running `rustup` for `cargo fmt`. - preCheck = '' - fakeRustup=$(mktemp -d) - ln -s $(command -v true) $fakeRustup/rustup - export PATH=$PATH''${PATH:+:}$fakeRustup + preCheck = lib.optionalString doCheck '' export RUST_SRC_PATH=${rustPlatform.rustcSrc} ''; - # Temporary disabled until #93119 is fixed. - doInstallCheck = false; + doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck versionOutput="$($out/bin/rust-analyzer --version)" diff --git a/pkgs/development/tools/rust/rust-analyzer/no-loop-in-const-fn.patch b/pkgs/development/tools/rust/rust-analyzer/no-loop-in-const-fn.patch new file mode 100644 index 000000000000..e750b3c4e122 --- /dev/null +++ b/pkgs/development/tools/rust/rust-analyzer/no-loop-in-const-fn.patch @@ -0,0 +1,223 @@ +This patch revert 4b989009e3839cfc6f021d1552a46561cee6cde2 (CONST LOOPS ARE HERE). + +diff --git a/crates/parser/src/grammar/expressions.rs b/crates/parser/src/grammar/expressions.rs +index 5f885edfd..e72929f8c 100644 +--- a/crates/parser/src/grammar/expressions.rs ++++ b/crates/parser/src/grammar/expressions.rs +@@ -316,7 +316,7 @@ fn expr_bp(p: &mut Parser, mut r: Restrictions, bp: u8) -> (Option Option<(CompletedMarker, BlockLike)> { + let m; +diff --git a/crates/parser/src/grammar/expressions/atom.rs b/crates/parser/src/grammar/expressions/atom.rs +index 66a92a4e1..ba6dd2fbc 100644 +--- a/crates/parser/src/grammar/expressions/atom.rs ++++ b/crates/parser/src/grammar/expressions/atom.rs +@@ -15,7 +15,7 @@ use super::*; + // let _ = b"e"; + // let _ = br"f"; + // } +-pub(crate) const LITERAL_FIRST: TokenSet = TokenSet::new(&[ ++pub(crate) const LITERAL_FIRST: TokenSet = token_set![ + TRUE_KW, + FALSE_KW, + INT_NUMBER, +@@ -25,8 +25,8 @@ pub(crate) const LITERAL_FIRST: TokenSet = TokenSet::new(&[ + STRING, + RAW_STRING, + BYTE_STRING, +- RAW_BYTE_STRING, +-]); ++ RAW_BYTE_STRING ++]; + + pub(crate) fn literal(p: &mut Parser) -> Option { + if !p.at_ts(LITERAL_FIRST) { +@@ -39,7 +39,7 @@ pub(crate) fn literal(p: &mut Parser) -> Option { + + // E.g. for after the break in `if break {}`, this should not match + pub(super) const ATOM_EXPR_FIRST: TokenSet = +- LITERAL_FIRST.union(paths::PATH_FIRST).union(TokenSet::new(&[ ++ LITERAL_FIRST.union(paths::PATH_FIRST).union(token_set![ + T!['('], + T!['{'], + T!['['], +@@ -59,9 +59,9 @@ pub(super) const ATOM_EXPR_FIRST: TokenSet = + T![loop], + T![for], + LIFETIME, +- ])); ++ ]); + +-const EXPR_RECOVERY_SET: TokenSet = TokenSet::new(&[LET_KW, R_DOLLAR]); ++const EXPR_RECOVERY_SET: TokenSet = token_set![LET_KW, R_DOLLAR]; + + pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMarker, BlockLike)> { + if let Some(m) = literal(p) { +diff --git a/crates/parser/src/grammar/items.rs b/crates/parser/src/grammar/items.rs +index 22810e6fb..8fd8f3b80 100644 +--- a/crates/parser/src/grammar/items.rs ++++ b/crates/parser/src/grammar/items.rs +@@ -26,7 +26,7 @@ pub(super) fn mod_contents(p: &mut Parser, stop_on_r_curly: bool) { + } + } + +-pub(super) const ITEM_RECOVERY_SET: TokenSet = TokenSet::new(&[ ++pub(super) const ITEM_RECOVERY_SET: TokenSet = token_set![ + FN_KW, + STRUCT_KW, + ENUM_KW, +@@ -41,7 +41,7 @@ pub(super) const ITEM_RECOVERY_SET: TokenSet = TokenSet::new(&[ + USE_KW, + MACRO_KW, + T![;], +-]); ++]; + + pub(super) fn item_or_macro(p: &mut Parser, stop_on_r_curly: bool) { + let m = p.start(); +diff --git a/crates/parser/src/grammar/paths.rs b/crates/parser/src/grammar/paths.rs +index 5d297e2d6..52562afa4 100644 +--- a/crates/parser/src/grammar/paths.rs ++++ b/crates/parser/src/grammar/paths.rs +@@ -3,7 +3,7 @@ + use super::*; + + pub(super) const PATH_FIRST: TokenSet = +- TokenSet::new(&[IDENT, T![self], T![super], T![crate], T![:], T![<]]); ++ token_set![IDENT, T![self], T![super], T![crate], T![:], T![<]]; + + pub(super) fn is_path_start(p: &Parser) -> bool { + is_use_path_start(p) || p.at(T![<]) +diff --git a/crates/parser/src/grammar/patterns.rs b/crates/parser/src/grammar/patterns.rs +index 796f206e1..07b1d6dd5 100644 +--- a/crates/parser/src/grammar/patterns.rs ++++ b/crates/parser/src/grammar/patterns.rs +@@ -2,18 +2,9 @@ + + use super::*; + +-pub(super) const PATTERN_FIRST: TokenSet = +- expressions::LITERAL_FIRST.union(paths::PATH_FIRST).union(TokenSet::new(&[ +- T![box], +- T![ref], +- T![mut], +- T!['('], +- T!['['], +- T![&], +- T![_], +- T![-], +- T![.], +- ])); ++pub(super) const PATTERN_FIRST: TokenSet = expressions::LITERAL_FIRST ++ .union(paths::PATH_FIRST) ++ .union(token_set![T![box], T![ref], T![mut], T!['('], T!['['], T![&], T![_], T![-], T![.]]); + + pub(crate) fn pattern(p: &mut Parser) { + pattern_r(p, PAT_RECOVERY_SET); +@@ -83,7 +74,7 @@ fn pattern_single_r(p: &mut Parser, recovery_set: TokenSet) { + } + + const PAT_RECOVERY_SET: TokenSet = +- TokenSet::new(&[LET_KW, IF_KW, WHILE_KW, LOOP_KW, MATCH_KW, R_PAREN, COMMA]); ++ token_set![LET_KW, IF_KW, WHILE_KW, LOOP_KW, MATCH_KW, R_PAREN, COMMA]; + + fn atom_pat(p: &mut Parser, recovery_set: TokenSet) -> Option { + let m = match p.nth(0) { +diff --git a/crates/parser/src/grammar/types.rs b/crates/parser/src/grammar/types.rs +index 1ea130ac5..9d00eb9b9 100644 +--- a/crates/parser/src/grammar/types.rs ++++ b/crates/parser/src/grammar/types.rs +@@ -2,7 +2,7 @@ + + use super::*; + +-pub(super) const TYPE_FIRST: TokenSet = paths::PATH_FIRST.union(TokenSet::new(&[ ++pub(super) const TYPE_FIRST: TokenSet = paths::PATH_FIRST.union(token_set![ + T!['('], + T!['['], + T![<], +@@ -16,16 +16,16 @@ pub(super) const TYPE_FIRST: TokenSet = paths::PATH_FIRST.union(TokenSet::new(&[ + T![for], + T![impl], + T![dyn], +-])); ++]); + +-const TYPE_RECOVERY_SET: TokenSet = TokenSet::new(&[ ++const TYPE_RECOVERY_SET: TokenSet = token_set![ + T![')'], + T![,], + L_DOLLAR, + // test_err struct_field_recover + // struct S { f pub g: () } + T![pub], +-]); ++]; + + pub(crate) fn type_(p: &mut Parser) { + type_with_bounds_cond(p, true); +diff --git a/crates/parser/src/token_set.rs b/crates/parser/src/token_set.rs +index a68f0144e..994017acf 100644 +--- a/crates/parser/src/token_set.rs ++++ b/crates/parser/src/token_set.rs +@@ -9,21 +9,15 @@ pub(crate) struct TokenSet(u128); + impl TokenSet { + pub(crate) const EMPTY: TokenSet = TokenSet(0); + +- pub(crate) const fn new(kinds: &[SyntaxKind]) -> TokenSet { +- let mut res = 0u128; +- let mut i = 0; +- while i < kinds.len() { +- res |= mask(kinds[i]); +- i += 1 +- } +- TokenSet(res) ++ pub(crate) const fn singleton(kind: SyntaxKind) -> TokenSet { ++ TokenSet(mask(kind)) + } + + pub(crate) const fn union(self, other: TokenSet) -> TokenSet { + TokenSet(self.0 | other.0) + } + +- pub(crate) const fn contains(&self, kind: SyntaxKind) -> bool { ++ pub(crate) fn contains(&self, kind: SyntaxKind) -> bool { + self.0 & mask(kind) != 0 + } + } +@@ -32,10 +26,16 @@ const fn mask(kind: SyntaxKind) -> u128 { + 1u128 << (kind as usize) + } + ++#[macro_export] ++macro_rules! token_set { ++ ($($t:expr),*) => { TokenSet::EMPTY$(.union(TokenSet::singleton($t)))* }; ++ ($($t:expr),* ,) => { token_set!($($t),*) }; ++} ++ + #[test] + fn token_set_works_for_tokens() { + use crate::SyntaxKind::*; +- let ts = TokenSet::new(&[EOF, SHEBANG]); ++ let ts = token_set![EOF, SHEBANG]; + assert!(ts.contains(EOF)); + assert!(ts.contains(SHEBANG)); + assert!(!ts.contains(PLUS)); +diff --git a/xtask/src/install.rs b/xtask/src/install.rs +index d829790d7..b25a6e301 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 = 46; ++const REQUIRED_RUST_VERSION: u32 = 43; + + pub struct InstallCmd { + pub client: Option, diff --git a/pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch b/pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch new file mode 100644 index 000000000000..06c8a1a595ea --- /dev/null +++ b/pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch @@ -0,0 +1,63 @@ +diff --git a/crates/assists/src/handlers/merge_imports.rs b/crates/assists/src/handlers/merge_imports.rs +index 0bd679260..e0b76e079 100644 +--- a/crates/assists/src/handlers/merge_imports.rs ++++ b/crates/assists/src/handlers/merge_imports.rs +@@ -32,7 +32,7 @@ pub(crate) fn merge_imports(acc: &mut Assists, ctx: &AssistContext) -> Option<() + if let Some(use_item) = tree.syntax().parent().and_then(ast::Use::cast) { + let (merged, to_delete) = + next_prev().filter_map(|dir| neighbor(&use_item, dir)).find_map(|use_item2| { +- try_merge_imports(&use_item, &use_item2, MergeBehaviour::Full).zip(Some(use_item2)) ++ Some((try_merge_imports(&use_item, &use_item2, MergeBehaviour::Full)?, use_item2)) + })?; + + rewriter.replace_ast(&use_item, &merged); +@@ -44,7 +44,7 @@ pub(crate) fn merge_imports(acc: &mut Assists, ctx: &AssistContext) -> Option<() + } else { + let (merged, to_delete) = + next_prev().filter_map(|dir| neighbor(&tree, dir)).find_map(|use_tree| { +- try_merge_trees(&tree, &use_tree, MergeBehaviour::Full).zip(Some(use_tree)) ++ Some((try_merge_trees(&tree, &use_tree, MergeBehaviour::Full)?, use_tree)) + })?; + + rewriter.replace_ast(&tree, &merged); +diff --git a/crates/assists/src/utils/insert_use.rs b/crates/assists/src/utils/insert_use.rs +index 6d110aaaf..1f1838729 100644 +--- a/crates/assists/src/utils/insert_use.rs ++++ b/crates/assists/src/utils/insert_use.rs +@@ -223,7 +223,7 @@ fn common_prefix(lhs: &ast::Path, rhs: &ast::Path) -> Option<(ast::Path, ast::Pa + } + res = Some((lhs_curr.clone(), rhs_curr.clone())); + +- match lhs_curr.parent_path().zip(rhs_curr.parent_path()) { ++ match zip(lhs_curr.parent_path(), rhs_curr.parent_path()) { + Some((lhs, rhs)) => { + lhs_curr = lhs; + rhs_curr = rhs; +@@ -309,8 +309,8 @@ fn find_insert_position( + let path_node_iter = scope + .as_syntax_node() + .children() +- .filter_map(|node| ast::Use::cast(node.clone()).zip(Some(node))) +- .flat_map(|(use_, node)| use_.use_tree().and_then(|tree| tree.path()).zip(Some(node))); ++ .filter_map(|node| zip(ast::Use::cast(node.clone()), Some(node))) ++ .flat_map(|(use_, node)| zip(use_.use_tree().and_then(|tree| tree.path()), Some(node))); + // Iterator that discards anything thats not in the required grouping + // This implementation allows the user to rearrange their import groups as this only takes the first group that fits + let group_iter = path_node_iter +@@ -328,7 +328,7 @@ fn find_insert_position( + segments + .clone() + .zip(check_segments) +- .flat_map(|(seg, seg2)| seg.name_ref().zip(seg2.name_ref())) ++ .flat_map(|(seg, seg2)| zip(seg.name_ref(), seg2.name_ref())) + .all(|(l, r)| l.text() <= r.text()) + }); + match post_insert { +@@ -743,3 +743,7 @@ use foo::bar::baz::Qux;", + check(path, ra_fixture_before, ra_fixture_after, None) + } + } ++ ++fn zip(x: Option, y: Option) -> Option<(T, U)> { ++ Some((x?, y?)) ++} diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json index ac2da521c22f..4af15f4619ea 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json +++ b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json @@ -2,25 +2,25 @@ "name": "rust-analyzer", "version": "0.4.0-dev", "dependencies": { - "node-fetch": "^2.6.0", - "vscode-languageclient": "7.0.0-next.1", - "@rollup/plugin-commonjs": "^13.0.0", - "@rollup/plugin-node-resolve": "^8.1.0", - "@types/glob": "^7.1.2", + "node-fetch": "^2.6.1", + "vscode-languageclient": "7.0.0-next.9", + "@rollup/plugin-commonjs": "^13.0.2", + "@rollup/plugin-node-resolve": "^8.4.0", + "@types/glob": "^7.1.3", "@types/mocha": "^7.0.2", "@types/node": "~12.7.0", "@types/node-fetch": "^2.5.7", - "@types/vscode": "^1.44.1", - "@typescript-eslint/eslint-plugin": "^3.4.0", - "@typescript-eslint/parser": "^3.4.0", - "eslint": "^7.3.1", + "@types/vscode": "^1.47.1", + "@typescript-eslint/eslint-plugin": "^3.10.1", + "@typescript-eslint/parser": "^3.10.1", + "eslint": "^7.8.0", "glob": "^7.1.6", - "mocha": "^8.0.1", - "rollup": "^2.18.1", - "tslib": "^2.0.0", - "typescript": "^3.9.5", + "mocha": "^8.1.3", + "rollup": "^2.26.9", + "tslib": "^2.0.1", + "typescript": "^3.9.7", "typescript-formatter": "^7.2.2", - "vsce": "^1.75.0", + "vsce": "^1.79.5", "vscode-test": "^1.4.0" } } From 21a6f3aa65a27f00f8260d9b211853b69f0ed094 Mon Sep 17 00:00:00 2001 From: oxalica Date: Mon, 21 Sep 2020 21:29:34 +0800 Subject: [PATCH 079/123] rust-analyzer: fix build --- .../rust/rust-analyzer/no-option-zip.patch | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch b/pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch index 06c8a1a595ea..b2cf679cee95 100644 --- a/pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch +++ b/pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch @@ -1,5 +1,5 @@ diff --git a/crates/assists/src/handlers/merge_imports.rs b/crates/assists/src/handlers/merge_imports.rs -index 0bd679260..e0b76e079 100644 +index fe33cee53..2184a4154 100644 --- a/crates/assists/src/handlers/merge_imports.rs +++ b/crates/assists/src/handlers/merge_imports.rs @@ -32,7 +32,7 @@ pub(crate) fn merge_imports(acc: &mut Assists, ctx: &AssistContext) -> Option<() @@ -21,10 +21,10 @@ index 0bd679260..e0b76e079 100644 rewriter.replace_ast(&tree, &merged); diff --git a/crates/assists/src/utils/insert_use.rs b/crates/assists/src/utils/insert_use.rs -index 6d110aaaf..1f1838729 100644 +index 09f4a2224..2c3a0ca0b 100644 --- a/crates/assists/src/utils/insert_use.rs +++ b/crates/assists/src/utils/insert_use.rs -@@ -223,7 +223,7 @@ fn common_prefix(lhs: &ast::Path, rhs: &ast::Path) -> Option<(ast::Path, ast::Pa +@@ -280,7 +280,7 @@ fn common_prefix(lhs: &ast::Path, rhs: &ast::Path) -> Option<(ast::Path, ast::Pa } res = Some((lhs_curr.clone(), rhs_curr.clone())); @@ -33,7 +33,16 @@ index 6d110aaaf..1f1838729 100644 Some((lhs, rhs)) => { lhs_curr = lhs; rhs_curr = rhs; -@@ -309,8 +309,8 @@ fn find_insert_position( +@@ -324,7 +324,7 @@ fn path_cmp(a: &ast::Path, b: &ast::Path) -> Ordering { + // cmp_by would be useful for us here but that is currently unstable + // cmp doesnt work due the lifetimes on text's return type + a.zip(b) +- .flat_map(|(seg, seg2)| seg.name_ref().zip(seg2.name_ref())) ++ .flat_map(|(seg, seg2)| zip(seg.name_ref(), seg2.name_ref())) + .find_map(|(a, b)| match a.text().cmp(b.text()) { + ord @ Ordering::Greater | ord @ Ordering::Less => Some(ord), + Ordering::Equal => None, +@@ -404,8 +404,8 @@ fn find_insert_position( let path_node_iter = scope .as_syntax_node() .children() @@ -44,7 +53,7 @@ index 6d110aaaf..1f1838729 100644 // Iterator that discards anything thats not in the required grouping // This implementation allows the user to rearrange their import groups as this only takes the first group that fits let group_iter = path_node_iter -@@ -328,7 +328,7 @@ fn find_insert_position( +@@ -423,7 +423,7 @@ fn find_insert_position( segments .clone() .zip(check_segments) @@ -53,8 +62,8 @@ index 6d110aaaf..1f1838729 100644 .all(|(l, r)| l.text() <= r.text()) }); match post_insert { -@@ -743,3 +743,7 @@ use foo::bar::baz::Qux;", - check(path, ra_fixture_before, ra_fixture_after, None) +@@ -931,3 +931,7 @@ use foo::bar::baz::Qux;", + assert_eq!(result.map(|u| u.to_string()), None); } } + From d45ea33a858ba0aa240a69a744f26c01c7749b3c Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Sun, 20 Sep 2020 16:29:33 -0400 Subject: [PATCH 080/123] pythonPackages.pecan: 1.3.3 -> 1.4.0 * Update Homepage * Add Changelog * Convert to pytestCheckHook * Remove buildInputs, corrected to propagatedBuildInputs or checkInputs as appropriate. This caused downstream failures because some required packages were not in the runtime closure (PYTHONPATH). --- .../python-modules/pecan/default.nix | 45 ++++++++++++++----- 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix index 9f3c009f8c12..332f5153a981 100644 --- a/pkgs/development/python-modules/pecan/default.nix +++ b/pkgs/development/python-modules/pecan/default.nix @@ -1,38 +1,59 @@ { stdenv , fetchPypi , buildPythonPackage +, isPy27 # Python deps -, singledispatch , logutils -, webtest , Mako +, singledispatch +, six +, webtest +# Test Inputs +, pytestCheckHook , genshi -, Kajiki -, sqlalchemy , gunicorn , jinja2 -, virtualenv +, Kajiki , mock +, sqlalchemy +, uwsgi +, virtualenv }: buildPythonPackage rec { pname = "pecan"; - version = "1.3.3"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "b5461add4e3f35a7ee377b3d7f72ff13e93f40f3823b3208ab978b29bde936ff"; + sha256 = "4b2acd6802a04b59e306d0a6ccf37701d24376f4dc044bbbafba3afdf9d3389a"; }; - propagatedBuildInputs = [ singledispatch logutils ]; - buildInputs = [ - webtest Mako genshi Kajiki sqlalchemy gunicorn jinja2 virtualenv + propagatedBuildInputs = [ + logutils + Mako + singledispatch + six + webtest ]; - checkInputs = [ mock ]; + checkInputs = [ + pytestCheckHook + genshi + gunicorn + jinja2 + mock + sqlalchemy + virtualenv + ] ++ stdenv.lib.optionals isPy27 [ Kajiki ]; + + pytestFlagsArray = [ + "--pyargs pecan " + ]; meta = with stdenv.lib; { description = "Pecan"; - homepage = "https://github.com/pecan/pecan"; + homepage = "http://www.pecanpy.org/"; + changelog = "https://pecan.readthedocs.io/en/latest/changes.html"; }; } From 143289ad5ba74c60e576534d0c760493f4497608 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Sun, 20 Sep 2020 19:56:45 -0400 Subject: [PATCH 081/123] pythonPackages.WSME: fix build * Remove unneeded patch * Run tests properly (misspelled before) * Update homepage & add changelog * Sort dependencies --- .../python-modules/WSME/default.nix | 67 ++++++++++++------- 1 file changed, 41 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/WSME/default.nix b/pkgs/development/python-modules/WSME/default.nix index f587d186bfd4..c1c6395ab25b 100644 --- a/pkgs/development/python-modules/WSME/default.nix +++ b/pkgs/development/python-modules/WSME/default.nix @@ -1,7 +1,23 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, pbr, six, simplegeneric, netaddr, pytz, webob -, cornice, nose, webtest, pecan, transaction, cherrypy, sphinx -, flask, flask-restful, suds-jurko, glibcLocales }: +{ lib +, buildPythonPackage +, fetchPypi +, pbr +, six +, simplegeneric +, netaddr +, pytz +, webob +# Test inputs +, cherrypy +, flask +, flask-restful +, glibcLocales +, nose +, pecan +, sphinx +, transaction +, webtest +}: buildPythonPackage rec { pname = "WSME"; @@ -12,38 +28,37 @@ buildPythonPackage rec { sha256 = "965b9ce48161e5c50d84aedcf50dca698f05bf07e9d489201bccaec3141cd304"; }; - postPatch = '' - # remove turbogears tests as we don't have it packaged - rm tests/test_tg* - # WSME seems incompatible with recent SQLAlchemy version - rm wsmeext/tests/test_sqlalchemy* - # https://bugs.launchpad.net/wsme/+bug/1510823 - ${if isPy3k then "rm tests/test_cornice.py" else ""} - ''; - - checkPhae = '' - nosetests --exclude test_buildhtml \ - --exlcude test_custom_clientside_error \ - --exclude test_custom_non_http_clientside_error - ''; - - # UnicodeEncodeError, ImportError, ... - doCheck = !isPy3k; - nativeBuildInputs = [ pbr ]; propagatedBuildInputs = [ - six simplegeneric netaddr pytz webob + netaddr + pytz + simplegeneric + six + webob ]; checkInputs = [ - cornice nose webtest pecan transaction cherrypy sphinx - flask flask-restful suds-jurko glibcLocales + nose + cherrypy + flask + flask-restful + glibcLocales + pecan + sphinx + transaction + webtest ]; + # from tox.ini, tests don't work with pytest + checkPhase = '' + nosetests wsme/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose + ''; + meta = with lib; { description = "Simplify the writing of REST APIs, and extend them with additional protocols"; - homepage = "http://git.openstack.org/cgit/openstack/wsme"; + homepage = "https://pythonhosted.org/WSME/"; + changelog = "https://pythonhosted.org/WSME/changes.html"; license = licenses.mit; }; } From e883c6578c5550fd577c53eaa7d27f7c464377cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Mon, 21 Sep 2020 19:56:29 +0200 Subject: [PATCH 082/123] softmaker-office: remove /bin/ls intercept This does not seem to be necessary anymore and fixes segmentation faults on 20.03. --- .../applications/office/softmaker/generic.nix | 28 ++++--------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix index c7803fa3d1d2..c1e25ecb00ec 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, libredirect +, coreutils , pname, version, edition, suiteName, src, archive @@ -52,22 +52,7 @@ in stdenv.mkDerivation { runHook postUnpack ''; - 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 '' + installPhase = '' runHook preInstall mkdir -p $out/share @@ -76,12 +61,9 @@ 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 \ - ${lsIntercept} - makeWrapper $out/share/${pname}${edition}/presentations $out/bin/${pname}-presentations \ - ${lsIntercept} - makeWrapper $out/share/${pname}${edition}/textmaker $out/bin/${pname}-textmaker \ - ${lsIntercept} + 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 for size in 16 32 48 64 96 128 256 512 1024; do mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps From 860bc40a2276f8129ea122c2a3544a9b465de74b Mon Sep 17 00:00:00 2001 From: Guillaume Desforges Date: Sat, 8 Aug 2020 11:36:03 +0200 Subject: [PATCH 083/123] sundials: add KLU support --- .../libraries/sundials/default.nix | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index 24980e9b709b..11a1c922b9ba 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -5,7 +5,9 @@ , blas , lapack , gfortran -, lapackSupport ? true }: +, suitesparse +, lapackSupport ? true +, kluSupport ? true }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -13,7 +15,20 @@ stdenv.mkDerivation rec { pname = "sundials"; version = "5.3.0"; - buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran blas lapack ]; + buildInputs = [ + python + ] ++ stdenv.lib.optionals (lapackSupport) [ + gfortran + blas + lapack + ] + # KLU support is based on Suitesparse. + # It is tested upstream according to the section 1.1.4 of + # [INSTALL_GUIDE.pdf](https://raw.githubusercontent.com/LLNL/sundials/master/INSTALL_GUIDE.pdf) + ++ stdenv.lib.optionals (kluSupport) [ + suitesparse + ]; + nativeBuildInputs = [ cmake ]; src = fetchurl { @@ -35,6 +50,10 @@ stdenv.mkDerivation rec { "-DSUNDIALS_INDEX_TYPE=int32_t" "-DLAPACK_ENABLE=ON" "-DLAPACK_LIBRARIES=${lapack}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" + ] ++ stdenv.lib.optionals (kluSupport) [ + "-DKLU_ENABLE=ON" + "-DKLU_INCLUDE_DIR=${suitesparse.dev}/include" + "-DKLU_LIBRARY_DIR=${suitesparse}/lib" ]; doCheck = true; From 4e888fb70dd9c11de2ba3c5a5b52fdf42dd8d915 Mon Sep 17 00:00:00 2001 From: Guillaume Desforges Date: Mon, 10 Aug 2020 12:15:37 +0200 Subject: [PATCH 084/123] python2Packages.scikits-odes: disable Ever since we added KLU support to sundials (#94930), it stopped building while the Python 3 versions didn't break. Python 2 is EOL. --- pkgs/development/python-modules/scikits-odes/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/scikits-odes/default.nix b/pkgs/development/python-modules/scikits-odes/default.nix index 7927da30c892..5590630e1321 100644 --- a/pkgs/development/python-modules/scikits-odes/default.nix +++ b/pkgs/development/python-modules/scikits-odes/default.nix @@ -6,6 +6,7 @@ , cython , enum34 , gfortran +, isPy27 , isPy3k , numpy , pytest @@ -18,6 +19,8 @@ buildPythonPackage rec { pname = "scikits.odes"; version = "2.6.1"; + disabled = isPy27; + src = fetchPypi { inherit pname version; sha256 = "0kbf2n16h9s35x6pavlx6sff0pqr68i0x0609z92a4vadni32n6b"; From 85c07678d43a58e139a06274807accc8d93e83c9 Mon Sep 17 00:00:00 2001 From: Ente Date: Fri, 11 Sep 2020 00:40:37 +0200 Subject: [PATCH 085/123] isso: build from master * The published 0.12.2 version is broken therefore switch to build from master. Related Issue: https://github.com/posativ/isso/issues/617 * cleanup build inputs * use python3 --- pkgs/servers/isso/default.nix | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix index bb9302479e98..d2387a1fa629 100644 --- a/pkgs/servers/isso/default.nix +++ b/pkgs/servers/isso/default.nix @@ -1,26 +1,32 @@ -{ stdenv, python2, fetchFromGitHub }: +{ stdenv, python3Packages, fetchFromGitHub }: + +with python3Packages; buildPythonApplication rec { -with python2.pkgs; buildPythonApplication rec { pname = "isso"; - version = "0.12.2"; + # Can not use 0.12.2 because of: + # https://github.com/posativ/isso/issues/617 + version = "unstable-2020-09-14"; # no tests on PyPI src = fetchFromGitHub { owner = "posativ"; repo = pname; - rev = version; - sha256 = "18v8lzwgl5hcbnawy50lfp3wnlc0rjhrnw9ja9260awkx7jra9ba"; + rev = "f4d2705d4f1b51f444d0629355a6fcbcec8d57b5"; + sha256 = "02jgfzq3svd54zj09jj7lm2r7ypqqjynzxa9dgnnm0pqvq728wzr"; }; propagatedBuildInputs = [ - bleach - cffi - configparser - html5lib - ipaddr + itsdangerous jinja2 misaka + html5lib werkzeug + bleach + flask-caching + ]; + + buildInputs = [ + cffi ]; checkInputs = [ nose ]; From cd1b769369766a520c46c0f34c7790324424c47e Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 21 Sep 2020 12:26:38 -0300 Subject: [PATCH 086/123] pythonPackages.xlib: 0.25 -> 0.28 --- pkgs/development/python-modules/xlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix index 4c98497c8b17..3d82b599dc06 100644 --- a/pkgs/development/python-modules/xlib/default.nix +++ b/pkgs/development/python-modules/xlib/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "xlib"; - version = "0.25"; + version = "0.28"; src = fetchFromGitHub { owner = "python-xlib"; repo = "python-xlib"; rev = version; - sha256 = "1nncx7v9chmgh56afg6dklz3479s5zg3kq91mzh4mj512y0skyki"; + sha256 = "13551vi65034pjf2g7zkw5dyjqcjfyk32a640g5jr055ssf0bjkc"; }; checkPhase = '' From b0edb341fbae473331bc647fe328d678845329fc Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 22 Aug 2020 16:52:46 -0400 Subject: [PATCH 087/123] buildbot: 2.8.2 -> 2.8.4 --- pkgs/development/python-modules/buildbot/default.nix | 4 ++-- pkgs/development/python-modules/buildbot/pkg.nix | 2 +- pkgs/development/python-modules/buildbot/plugins.nix | 10 +++++----- pkgs/development/python-modules/buildbot/worker.nix | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 9a49be777b00..595f97bcb8fa 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -25,11 +25,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "2.8.2"; + version = "2.8.4"; src = fetchPypi { inherit pname version; - sha256 = "0rdrz2zkd6xaf9kb5l41xmbfzq618sz498w23irshih4c802pdv5"; + sha256 = "0i2sbxhsqyk2yr234il0zsyp1rf2v1l5hmzvw0yrgds6jpr19cqv"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index 4bb8613afeab..ff61f9881099 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1yz3k6dg15q4911x8kjy396dccfgrs50mjz278l09p6zmm71llax"; + sha256 = "1p9qnrqx72y4jrhawgbpwisgily7zg4rh39hpky4x56d5afvjgqc"; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index 4c5aa374562a..9a39cc90b69b 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "19qwr0h6qavznx8rfjq6zjccyd2y7x4nc8asldvay3b44xfsr385"; + sha256 = "1hi44jbnafp7iqncad01hwr087aqmdszvc2if0d9gw6bm159zf4s"; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1wfhwmb1d32k8isk7k8525pmkfih8hlvy53zsj19l3gvjm0da9gw"; + sha256 = "1vkh4kdlnm9z5r62b4vxx6qxc90g65gm1m4qxfc6xjk1265i1w6h"; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0g62v0maz3b9bmjvvjcin6ayg0f5k0n8m93zk75lagyr69g5vaka"; + sha256 = "0v94p1m9fb6m6ik5xyi7bs4jrsgvnyf3sl7f4w1qmb24xc47k2gj"; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0dlq8pchgccc66gfdlssydacisia5fbwc8b4gd8f9gcbish8jmf7"; + sha256 = "13bg289al6dmyrin3l6ih3sk7hm660m69kls3kpagg6j6nmpa5wz"; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "193nni55py6yzw730yyp5va2n4313sjf6a7jmi0xs9bivvvzg5w9"; + sha256 = "11cr7m7m8ah8qqjcqj7qvjjak62cx1sq41cazd4i3r07dyhc3ypn"; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 05938e43ad69..f0eaa7e81ae8 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -7,7 +7,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "0p1w6ailp6xpa6ckl5prj413ilxx5s3lga5mzqxj9nn00vni8ik2"; + sha256 = "1v1bcc2m4pz90rsh5pjb9m9agkvhqdk1viyf64gi1h85h191vkib"; }; propagatedBuildInputs = [ twisted future ]; From e2283652588f41d66540cd963e8445ef8ff79be2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 19 Sep 2020 16:26:21 +0200 Subject: [PATCH 088/123] pythonPackages.yq: repackage as library, convert to application, fix tests --- .../{tools => python-modules}/yq/default.nix | 27 +++++++++++++------ pkgs/top-level/all-packages.nix | 5 +--- pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 22 insertions(+), 12 deletions(-) rename pkgs/development/{tools => python-modules}/yq/default.nix (66%) diff --git a/pkgs/development/tools/yq/default.nix b/pkgs/development/python-modules/yq/default.nix similarity index 66% rename from pkgs/development/tools/yq/default.nix rename to pkgs/development/python-modules/yq/default.nix index cfca8a32f93f..3640023b10f4 100644 --- a/pkgs/development/tools/yq/default.nix +++ b/pkgs/development/python-modules/yq/default.nix @@ -1,6 +1,7 @@ { lib -, buildPythonApplication +, buildPythonPackage , fetchPypi +, pkgs , argcomplete , pyyaml , xmltodict @@ -12,11 +13,24 @@ , toml }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "yq"; version = "2.10.1"; - propagatedBuildInputs = [ pyyaml xmltodict jq argcomplete ]; + src = fetchPypi { + inherit pname version; + sha256 = "1h6nnkp53mm4spwy8nyxwvh9j6p4lxvf20j4bgjskhnhaw3jl9gn"; + }; + + postPatch = '' + substituteInPlace test/test.py --replace "expect_exit_codes={0} if sys.stdin.isatty() else {2}" "expect_exit_codes={0}" + ''; + + propagatedBuildInputs = [ + pyyaml + xmltodict + argcomplete + ]; doCheck = true; @@ -24,16 +38,13 @@ buildPythonApplication rec { pytest coverage flake8 - jq + pkgs.jq toml ]; checkPhase = "pytest ./test/test.py"; - src = fetchPypi { - inherit pname version; - sha256 = "1h6nnkp53mm4spwy8nyxwvh9j6p4lxvf20j4bgjskhnhaw3jl9gn"; - }; + pythonImportsCheck = [ "yq" ]; meta = with lib; { description = "Command-line YAML processor - jq wrapper for YAML documents."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f636f0fd894e..5f7b750c9a1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11798,10 +11798,7 @@ in yodl = callPackage ../development/tools/misc/yodl { }; - yq = callPackage ../development/tools/yq { - inherit (python3Packages) - buildPythonApplication fetchPypi argcomplete pyyaml xmltodict pytest coverage flake8 toml; - }; + yq = python3.pkgs.toPythonApplication python3.pkgs.yq; yq-go = callPackage ../development/tools/yq-go { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c2c471d97721..86e2faa238ec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7614,6 +7614,8 @@ in { yowsup = callPackage ../development/python-modules/yowsup { }; + yq = callPackage ../development/python-modules/yq { }; + yt = callPackage ../development/python-modules/yt { }; yubico-client = callPackage ../development/python-modules/yubico-client { }; From 1a44ef9066f1bfea2d94c769cd31ba14ba0f938b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 19 Sep 2020 16:29:40 +0200 Subject: [PATCH 089/123] pythonPackages.yq: 2.10.1 -> 2.11.0 --- pkgs/development/python-modules/yq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yq/default.nix b/pkgs/development/python-modules/yq/default.nix index 3640023b10f4..ee768eaab756 100644 --- a/pkgs/development/python-modules/yq/default.nix +++ b/pkgs/development/python-modules/yq/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "yq"; - version = "2.10.1"; + version = "2.11.0"; src = fetchPypi { inherit pname version; - sha256 = "1h6nnkp53mm4spwy8nyxwvh9j6p4lxvf20j4bgjskhnhaw3jl9gn"; + sha256 = "1gp9q5w1bjbw7wmba5hm8ippwvkind0p02n07fqa9jlqglhxhm46"; }; postPatch = '' From 40a58cc65bec0ed5b784178239e55f7c7ac969f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 21 Sep 2020 20:08:22 +0200 Subject: [PATCH 090/123] python3.pkgs.yq: make stdin a tty for tests --- pkgs/development/python-modules/yq/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/yq/default.nix b/pkgs/development/python-modules/yq/default.nix index ee768eaab756..f795a8fdfad6 100644 --- a/pkgs/development/python-modules/yq/default.nix +++ b/pkgs/development/python-modules/yq/default.nix @@ -10,6 +10,7 @@ , flake8 , jq , pytest +, unixtools , toml }: @@ -22,10 +23,6 @@ buildPythonPackage rec { sha256 = "1gp9q5w1bjbw7wmba5hm8ippwvkind0p02n07fqa9jlqglhxhm46"; }; - postPatch = '' - substituteInPlace test/test.py --replace "expect_exit_codes={0} if sys.stdin.isatty() else {2}" "expect_exit_codes={0}" - ''; - propagatedBuildInputs = [ pyyaml xmltodict @@ -35,6 +32,7 @@ buildPythonPackage rec { doCheck = true; checkInputs = [ + unixtools.script pytest coverage flake8 @@ -42,7 +40,8 @@ buildPythonPackage rec { toml ]; - checkPhase = "pytest ./test/test.py"; + # tests fails if stdin is not a tty + checkPhase = "echo | script -c 'pytest ./test/test.py'"; pythonImportsCheck = [ "yq" ]; From 4990bd11957a09f488c851ccd1f22e4da2c425c5 Mon Sep 17 00:00:00 2001 From: Erin Shepherd Date: Mon, 21 Sep 2020 20:43:11 +0200 Subject: [PATCH 091/123] Dino: Enable on macOS/Darwin * Remove direct dependencies on some X11 libs. We still inherit them through Gtk+ but it's a start * Rename plugin files from .dylib to .so so Dino's plugin loader finds them The experience is still somewhat janky (no app icon, macOS thinks the app is called ".dino-wrapped", and the Cocoa menu bar is nonresponsive), but beyond this things mostly work fine --- .../instant-messengers/dino/default.nix | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 9c286d008320..70661fd94265 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext , gobject-introspection, gnome3, glib, gdk-pixbuf, gtk3, glib-networking , xorg, libXdmcp, libxkbcommon @@ -60,23 +60,39 @@ stdenv.mkDerivation rec { libgcrypt libsoup pcre - xorg.libxcb - xorg.libpthreadstubs - libXdmcp - libxkbcommon epoxy at-spi2-core dbus icu libsignal-protocol-c librsvg + ] ++ lib.optionals (!stdenv.isDarwin) [ + xorg.libxcb + xorg.libpthreadstubs + libXdmcp + libxkbcommon ]; + # Dino looks for plugins with a .so filename extension, even on macOS where + # .dylib is appropriate, and despite the fact that it builds said plugins with + # that as their filename extension + # + # Therefore, on macOS rename all of the plugins to use correct names that Dino + # will load + # + # See https://github.com/dino/dino/wiki/macOS + postFixup = lib.optionalString (stdenv.isDarwin) '' + cd "$out/lib/dino/plugins/" + for f in *.dylib; do + mv "$f" "$(basename "$f" .dylib).so" + done + ''; + meta = with stdenv.lib; { description = "Modern Jabber/XMPP Client using GTK/Vala"; homepage = "https://github.com/dino/dino"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = [ platforms.linux platforms.darwin ]; maintainers = with maintainers; [ mic92 qyliss ]; }; } From f4cc8c18b92b23e19a3e76c208ecfb40798dc512 Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Mon, 21 Sep 2020 18:43:21 +0000 Subject: [PATCH 092/123] clightning: 0.9.0-1 -> 0.9.1 --- pkgs/applications/blockchains/clightning.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning.nix index 43de23b68fca..2467d3099220 100644 --- a/pkgs/applications/blockchains/clightning.nix +++ b/pkgs/applications/blockchains/clightning.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "clightning"; - version = "0.9.0-1"; + version = "0.9.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "01cwcrqysqsrf96bbbj0grm8j5m46a3acgwy0kzxdx05jdzld9sc"; + sha256 = "4923e2fa001cfc2403d1bed368710499d5def322e6384b8eea2bd39d3351a417"; }; enableParallelBuilding = true; From 243f56fbc70136262f943f4f3d7a7c08e1c7a9c0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 21 Sep 2020 20:26:31 +0200 Subject: [PATCH 093/123] python3.pkgs.bokeh: 2.1.1 -> 2.2.1 --- pkgs/development/python-modules/bokeh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 850070b1c008..55a01c65f1c2 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -33,11 +33,11 @@ buildPythonPackage rec { pname = "bokeh"; - version = "2.1.1"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "2dfabf228f55676b88acc464f416e2b13ee06470a8ad1dd3e609bb789425fbad"; + sha256 = "qC6e69eh4uu3+PwerYAv79EKhNrvjsS/yYYSEyOUhVU="; }; patches = [ From 4e1f8e4e3193cdde8f95c974502f0a31b9b3b74f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 21 Sep 2020 21:55:29 +0200 Subject: [PATCH 094/123] python3Packages.xarray: 0.16.0 -> 0.16.1 --- pkgs/development/python-modules/xarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 344615c90146..d905a11e3418 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.16.0"; + version = "0.16.1"; src = fetchPypi { inherit pname version; - sha256 = "1js3xr3fl9bwid8hl3w2pnigqzjd2rvkncald5x1x5fg7wjy8pb6"; + sha256 = "5e1af056ff834bf62ca57da917159328fab21b1f8c25284f92083016bb2d92a5"; }; checkInputs = [ pytest ]; From 5a71d9619ad9499c51be052cb9aaafba3d5a31b9 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 18 Sep 2020 00:42:54 -0500 Subject: [PATCH 095/123] firecracker: 0.21.1 -> 0.22.0 Signed-off-by: Austin Seipp --- .../virtualization/firecracker/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index 79d1b606bcba..9513457d86d3 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv }: let - version = "0.21.1"; + version = "0.22.0"; suffix = { x86_64-linux = "x86_64"; @@ -15,13 +15,13 @@ let }; firecracker-bin = fetchbin "firecracker" { - x86_64-linux = "0g4fja3bz1fsyz8vj99199yblkn46ygf33ldwd1ssw8f957vbwnb"; - aarch64-linux = "1qyppcxnh7f42fs4px5rvkk6lza57h2sq9naskvqn5zy4vsvq89s"; + x86_64-linux = "1jl7cmw53fbykcji8a0bkdy82mgpfr8km3ab6iwsrswvahh4srx7"; + aarch64-linux = "15vi6441gr4jy0698ifashgv1ic7iz0kbm7c28m2jd8z08p6bnlz"; }; jailer-bin = fetchbin "jailer" { - x86_64-linux = "0x89pfmqci9d3i9fi9b9zm94yr2v7pq7kp3drlb952jkdfj0njyk"; - aarch64-linux = "03fx9sk88jm23wqm8fraqd1ccfhbqvc310mkfv1f5p2ykhq2ahrk"; + x86_64-linux = "0wir7fi1iqvw02908axfaqzp9q5qyg4yk5jicp8s493iz3vhm9h7"; + aarch64-linux = "1l3yc9j27vxfyn89xmxi1ir635v7l8ikwpw9a30dhh50wa3rm4jy"; }; in From 647be9d0ddd034a968191d005e49f0fe0b74a220 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 21 Sep 2020 13:27:40 +1000 Subject: [PATCH 096/123] age: 1.0.0-beta4 -> 1.0.0-beta5 https://github.com/FiloSottile/age/releases/tag/v1.0.0-beta5 --- pkgs/tools/security/age/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix index 8a6d008551e8..4eb88211d6d0 100644 --- a/pkgs/tools/security/age/default.nix +++ b/pkgs/tools/security/age/default.nix @@ -2,21 +2,14 @@ buildGoModule rec { pname = "age"; - version = "1.0.0-beta4"; + version = "1.0.0-beta5"; vendorSha256 = "0km7a2826j3fk2nrkmgc990chrkcfz006wfw14yilsa4p2hmfl7m"; - doCheck = false; - - subPackages = [ - "cmd/age" - "cmd/age-keygen" - ]; - src = fetchFromGitHub { owner = "FiloSottile"; repo = "age"; rev = "v${version}"; - sha256 = "0pp6zn4rdypyxn1md9ppisiwiapkfkbh08rzfl3qwn0998wx6gnb"; + sha256 = "1hdbxd359z8zvnz7h8c4pa16nc7r8db36lx3gpks38lpi0r8hzqk"; }; meta = with lib; { From b06070c2bb4bdb59b3439eb65b020b2e92b7916f Mon Sep 17 00:00:00 2001 From: Zach Coyle Date: Mon, 21 Sep 2020 18:13:52 -0400 Subject: [PATCH 097/123] weather: enable on darwin --- pkgs/applications/misc/weather/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix index f44b5f1f56a3..fdfed065321f 100644 --- a/pkgs/applications/misc/weather/default.nix +++ b/pkgs/applications/misc/weather/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { description = "Quick access to current weather conditions and forecasts"; license = licenses.isc; maintainers = [ maintainers.matthiasbeyer ]; - platforms = platforms.linux; # my only platform + platforms = platforms.linux ++ platforms.darwin; }; } From 433503323e6189f36e33d9d6e919aed9d9ca30d8 Mon Sep 17 00:00:00 2001 From: Erin Date: Tue, 22 Sep 2020 01:42:35 +0200 Subject: [PATCH 098/123] Update pkgs/applications/networking/instant-messengers/dino/default.nix Co-authored-by: Vincent Laporte --- .../applications/networking/instant-messengers/dino/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 70661fd94265..795f71a3cd01 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { description = "Modern Jabber/XMPP Client using GTK/Vala"; homepage = "https://github.com/dino/dino"; license = licenses.gpl3; - platforms = [ platforms.linux platforms.darwin ]; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ mic92 qyliss ]; }; } From b950a85b414459990f32a238aa3dc6e61685f2f9 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 21 Sep 2020 21:24:07 -0300 Subject: [PATCH 099/123] luakit: 2.1 -> 2.2 Also, adding myself to maintainers list. --- .../networking/browsers/luakit/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix index bf10043e942e..3c391c9ffda2 100644 --- a/pkgs/applications/networking/browsers/luakit/default.nix +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "luakit"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "luakit"; repo = "luakit"; rev = version; - sha256 = "05mm76g72fs48410pbij4mw0s3nqji3r7f3mnr2fvhv02xqj05aa"; + sha256 = "sha256-rpHW5VyntmmtekdNcZMIw8Xdv4cfiqJaaHj4ZFFGjYc="; }; nativeBuildInputs = [ @@ -54,9 +54,17 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Fast, small, webkit based browser framework extensible in Lua"; + description = "Fast, small, webkit-based browser framework extensible in Lua"; + longDescription = '' + Luakit is a highly configurable browser framework based on the WebKit web + content engine and the GTK+ toolkit. It is very fast, extensible with Lua, + and licensed under the GNU GPLv3 license. It is primarily targeted at + power users, developers and anyone who wants to have fine-grained control + over their web browser’s behaviour and interface. + ''; homepage = "https://luakit.github.io/"; - license = licenses.gpl3; - platforms = platforms.linux; # Only tested linux + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.AndersonTorres ]; }; } From b531e659541b38fd02cbc17d1b0b9bb3bbe15f33 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 22 Sep 2020 12:26:12 +1000 Subject: [PATCH 100/123] fd: remove unnecessary reference to $src --- pkgs/tools/misc/fd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 89a05815f518..31b47a31ca8f 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; preFixup = '' - installManPage "$src/doc/fd.1" + installManPage doc/fd.1 installShellCompletion $releaseDir/build/fd-find-*/out/fd.{bash,fish} installShellCompletion --zsh $releaseDir/build/fd-find-*/out/_fd From 1d8fae0b4d45ea4152ac8d626e590238bbe26649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 21 Sep 2020 23:29:09 -0300 Subject: [PATCH 101/123] mpv: install mpv_identify.sh It is file identification script. It is used in mc default actions for video files. --- pkgs/applications/video/mpv/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 697a468f8908..4b7d78303b2f 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -209,6 +209,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/share/mpv ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf + cp TOOLS/mpv_identify.sh $out/bin cp TOOLS/umpv $out/bin '' + optionalString stdenv.isDarwin '' mkdir -p $out/Applications From 1399f780bb9d9db02ec80cfb5185da374c4ea753 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 22 Sep 2020 12:26:12 +1000 Subject: [PATCH 102/123] ripgrep: remove unnecessary reference to $src --- pkgs/tools/text/ripgrep/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 9a72e023d6d7..7bd8a74f4587 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { installManPage $releaseDir/build/ripgrep-*/out/rg.1 installShellCompletion $releaseDir/build/ripgrep-*/out/rg.{bash,fish} - installShellCompletion --zsh "$src/complete/_rg" + installShellCompletion --zsh complete/_rg ''; meta = with stdenv.lib; { From c4cb4c226ecbe1f724b22f3f2322ef787f7bbfcc Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Tue, 22 Sep 2020 07:30:35 +0200 Subject: [PATCH 103/123] Declare several versions of OCamlformat (#88799) OCamlformat is still a bit unstable and it's common to work on several projects that each use a different version. Define every versions at once and share code * ocamlformat: add dependency on base OCamlformat always required Base. This will be important in the future as Base may make breaking changes. --- .../tools/ocaml/ocamlformat/default.nix | 113 +++++++++++++++--- pkgs/top-level/all-packages.nix | 5 +- 2 files changed, 101 insertions(+), 17 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix index 069f0471595d..5b607d3d6c64 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -1,19 +1,49 @@ -{ lib, fetchurl, ocamlPackages }: +{ lib, fetchurl, fetchzip, ocamlPackages }: -with ocamlPackages; buildDunePackage rec { - pname = "ocamlformat"; - version = "0.15.0"; +with ocamlPackages; - minimumOCamlVersion = "4.06"; +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"; - useDune2 = true; + minimumOCamlVersion = "4.06"; - src = fetchurl { - url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/ocamlformat-${version}.tbz"; - sha256 = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6"; - }; + inherit src version useDune2 buildInputs; - 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 @@ -25,11 +55,62 @@ with ocamlPackages; buildDunePackage rec { fix menhir ]; +in - 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; +# 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 { + 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_15_0 = mkOCamlformat { + version = "0.15.0"; + sha256 = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6"; + buildInputs = post_0_14_buildInputs; + }; + + ocamlformat = ocamlformat_0_15_0; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b889c44f29c..8b4b3ee5237b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9549,7 +9549,10 @@ in ocaml-crunch = ocamlPackages.crunch.bin; - ocamlformat = callPackage ../development/tools/ocaml/ocamlformat { }; + 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; orc = callPackage ../development/compilers/orc { }; From 479976340ae1963e2cedfe7c33fa81b8808d17f7 Mon Sep 17 00:00:00 2001 From: Milan Date: Tue, 22 Sep 2020 07:57:28 +0200 Subject: [PATCH 104/123] duf: init at 0.1.0 (#98396) --- pkgs/tools/misc/duf/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/misc/duf/default.nix diff --git a/pkgs/tools/misc/duf/default.nix b/pkgs/tools/misc/duf/default.nix new file mode 100644 index 000000000000..70316399e974 --- /dev/null +++ b/pkgs/tools/misc/duf/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "duf"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "muesli"; + repo = "duf"; + rev = "v${version}"; + sha256 = "1akziaa5wjszflyylvnw284pz1aqngl40civzfabjz94pvyjkp76"; + }; + + vendorSha256 = "1aj7rxlylgvxdnnfnfzh20v2jvs8falvjjishxd8rdk1jgfpipl8"; + + meta = with lib; { + homepage = "https://github.com/muesli/duf/"; + description = "Disk Usage/Free Utility"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ petabyteboy ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b4b3ee5237b..744970b2b229 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1858,6 +1858,8 @@ in dua = callPackage ../tools/misc/dua { }; + duf = callPackage ../tools/misc/duf { }; + inherit (ocamlPackages) dune dune_2 dune-release; duperemove = callPackage ../tools/filesystems/duperemove { }; From 534ad6855a5ba397e88eb4e621480de6e5eb0b79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Tue, 22 Sep 2020 08:03:29 +0200 Subject: [PATCH 105/123] viu: 1.0 -> 1.1 --- pkgs/tools/graphics/viu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/viu/default.nix b/pkgs/tools/graphics/viu/default.nix index 2b332bd32564..a434b38453eb 100644 --- a/pkgs/tools/graphics/viu/default.nix +++ b/pkgs/tools/graphics/viu/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "viu"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "atanunq"; repo = "viu"; rev = "v${version}"; - sha256 = "1ivhm6js0ylnxwp84jmm2vmnl4iy1cwr3m9imx7lmcl0i3c8b9if"; + sha256 = "1algvndpl63g3yzp3hhbgm7839njpbmw954nsiwf0j591spz4lph"; }; # tests are failing, reported at upstream: https://github.com/atanunq/viu/issues/40 doCheck = false; - cargoSha256 = "15zdnr95a363w4rddv1fbz796m01430gzly5p953m23g2mbxdmp0"; + cargoSha256 = "1jccaln72aqa9975nbs95gimndqx5kgfkjmh40z6chx1hvn4m2ga"; meta = with lib; { description = "A command-line application to view images from the terminal written in Rust"; From a762bbf7b4abe046dedad82894f7bfa7a106e3fc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Sep 2020 02:38:44 +0200 Subject: [PATCH 106/123] pythonPackages.http-parser: init at 0.9.0 --- .../python-modules/http-parser/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/http-parser/default.nix diff --git a/pkgs/development/python-modules/http-parser/default.nix b/pkgs/development/python-modules/http-parser/default.nix new file mode 100644 index 000000000000..d98785576f48 --- /dev/null +++ b/pkgs/development/python-modules/http-parser/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest +}: + +buildPythonPackage rec { + pname = "http-parser"; + version = "0.9.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "benoitc"; + repo = pname; + rev = version; + sha256 = "05byv1079qi7ypvzm13yf5nc23ink6gr6c5wrhq7fwld4syscy2q"; + }; + + checkInputs = [ pytest ]; + + checkPhase = "pytest testing/"; + + pythonImportsCheck = [ "http_parser" ]; + + meta = with lib; { + description = "HTTP request/response parser for python in C"; + homepage = "https://github.com/benoitc/http-parser"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3eb4f97401c4..9906f9a0c5be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2718,6 +2718,8 @@ in { httplib2 = callPackage ../development/python-modules/httplib2 { }; + http-parser = callPackage ../development/python-modules/http-parser { }; + httpretty = if isPy3k then callPackage ../development/python-modules/httpretty { } else From b3ca5036a4ba0813fa26ab5cf1df3e72a16af32a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Sep 2020 02:39:57 +0200 Subject: [PATCH 107/123] pythonPackages.mocket: 3.8.9 -> 3.9.0 --- pkgs/development/python-modules/mocket/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index a7de28afcc33..234fdbebc00b 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -1,5 +1,6 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27 , decorator +, http-parser , importlib-metadata , python , python_magic @@ -8,11 +9,11 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.8.9"; + version = "3.9.0"; src = fetchPypi { inherit pname version; - sha256 = "12gfqp7y7w6bgky3daxdggdzp08cg9ss64hbf5f49kywvsmcs01i"; + sha256 = "1n1h9xbi1my0vgjsh7mfkd51qfa6imjzxnwqccsvshqa8grcv1wm"; }; patchPhase = '' @@ -24,6 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ decorator + http-parser python_magic urllib3 six From 9fde97d85fa37d4f55a644032e84b2dae3d2d1d3 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 9 Jun 2020 15:17:22 -0400 Subject: [PATCH 108/123] python3Packages.pyxnat: init at 1.3 --- .../python-modules/pyxnat/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/pyxnat/default.nix diff --git a/pkgs/development/python-modules/pyxnat/default.nix b/pkgs/development/python-modules/pyxnat/default.nix new file mode 100644 index 000000000000..2c2557537228 --- /dev/null +++ b/pkgs/development/python-modules/pyxnat/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, nose +, lxml +, requests +}: + +buildPythonPackage rec { + pname = "pyxnat"; + version = "1.3"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "113d13cs5ab7wy4vmyqyh8isjhlgfvan7y2g8n25vcpn3j4j00h0"; + }; + + propagatedBuildInputs = [ lxml requests ]; + + checkInputs = [ nose ]; + checkPhase = "nosetests pyxnat/tests"; + doCheck = false; # requires a docker container running an XNAT server + + pythonImportsCheck = [ "pyxnat" ]; + + meta = with lib; { + homepage = "https://pyxnat.github.io/pyxnat"; + description = "Python API to XNAT"; + license = licenses.bsd3; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9906f9a0c5be..c34048abb59e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5916,6 +5916,8 @@ in { pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml { }); + pyxnat = callPackage ../development/python-modules/pyxnat { }; + pyyaml = callPackage ../development/python-modules/pyyaml { }; pyzmq = callPackage ../development/python-modules/pyzmq { }; From 03ea51a8a3efd681cd885ac699a1b05f08d8cfc5 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 21 Sep 2020 23:39:26 -0400 Subject: [PATCH 109/123] python3Packages.dipy: 1.1.1 -> 1.2.0 --- pkgs/development/python-modules/dipy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dipy/default.nix b/pkgs/development/python-modules/dipy/default.nix index 939f0912fe1f..a1360ada2257 100644 --- a/pkgs/development/python-modules/dipy/default.nix +++ b/pkgs/development/python-modules/dipy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dipy"; - version = "1.1.1"; + version = "1.2.0"; disabled = isPy27; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "dipy"; repo = pname; rev = version; - sha256 = "08abx0f4li6ya62ilc59miw4mk6wndizahyylxhgcrpacb6ydw28"; + sha256 = "0x49lph400ndlvk419nd2g9ss4jg75xr7xh88ggv5d2ama19v7py"; }; nativeBuildInputs = [ cython packaging ]; From a4c2512d7b77c574c5e4840ff79cf084a02d4aba Mon Sep 17 00:00:00 2001 From: Jared Tobin Date: Mon, 21 Sep 2020 10:58:59 -0230 Subject: [PATCH 110/123] vimPlugins.hoon-vim: init at 2020-02-19 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 90dd6c94d373..93fd20190e8f 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1533,6 +1533,18 @@ let meta.homepage = "https://github.com/mpickering/hlint-refactor-vim/"; }; + hoon-vim = buildVimPluginFrom2Nix { + pname = "hoon-vim"; + version = "2019-02-19"; + src = fetchFromGitHub { + owner = "urbit"; + repo = "hoon.vim"; + rev = "116f29971a2fbec8e484daeba8afd9d60f85800f"; + sha256 = "029rm8njpsa0lhhh504975lmw7yr2bkvxi2gag1l9279r629vp2r"; + }; + meta.homepage = "https://github.com/urbit/hoon.vim/"; + }; + i3config-vim = buildVimPluginFrom2Nix { pname = "i3config-vim"; version = "2020-03-28"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index f97280adf7b0..c5e53ba3f737 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -544,6 +544,7 @@ uarun/vim-protobuf udalov/kotlin-vim ujihisa/neco-look unblevable/quick-scope +urbit/hoon.vim Valodim/deoplete-notmuch vhda/verilog_systemverilog.vim vim-airline/vim-airline From 943fa12e6a7aaaec9af8bab5afa897d6086c4199 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 13 Sep 2020 07:55:14 +0200 Subject: [PATCH 111/123] hop: fix build The configure process tries to escape the sandbox by writing into /tmp --- pkgs/development/compilers/hop/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/compilers/hop/default.nix b/pkgs/development/compilers/hop/default.nix index f63f4169bc36..49687cfb2d81 100644 --- a/pkgs/development/compilers/hop/default.nix +++ b/pkgs/development/compilers/hop/default.nix @@ -7,6 +7,10 @@ stdenv.mkDerivation rec { sha256 = "1bvp7pc71bln5yvfj87s8750c6l53wjl6f8m12v62q9926adhwys"; }; + postPatch = '' + substituteInPlace configure --replace "(os-tmp)" '(getenv "TMPDIR")' + ''; + buildInputs = [ bigloo ]; preConfigure = '' From 06098c76b9b044acf6e57402f84078a5a627e0f3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 12 Sep 2020 21:31:21 +0200 Subject: [PATCH 112/123] =?UTF-8?q?bigloo:=204.1a-2=20=E2=86=92=204.3h;=20?= =?UTF-8?q?hop:=202.5.1=20=E2=86=92=203.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/bigloo/default.nix | 20 +++++++++++++++---- pkgs/development/compilers/hop/default.nix | 16 ++++++++------- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix index 32116048a438..a3bac2b1722c 100644 --- a/pkgs/development/compilers/bigloo/default.nix +++ b/pkgs/development/compilers/bigloo/default.nix @@ -1,17 +1,29 @@ -{ fetchurl, stdenv, gmp }: +{ fetchurl, stdenv, autoconf, automake, libtool, gmp +, darwin +}: stdenv.mkDerivation rec { pname = "bigloo"; - version = "4.1a-2"; + version = "4.3h"; src = fetchurl { - url = "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo${version}.tar.gz"; - sha256 = "09yrz8r0jpj7bda39fdxzrrdyhi851nlfajsyf0b6jxanz6ygcjx"; + url = "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo-${version}.tar.gz"; + sha256 = "0fw08096sf8ma2cncipnidnysxii0h0pc7kcqkjhkhdchknp8vig"; }; + nativeBuildInputs = [ autoconf automake libtool ]; + + buildInputs = stdenv.lib.optional stdenv.isDarwin + darwin.apple_sdk.frameworks.ApplicationServices + ; + propagatedBuildInputs = [ gmp ]; preConfigure = + # For libuv on darwin + stdenv.lib.optionalString stdenv.isDarwin '' + export LIBTOOLIZE=libtoolize + '' + # Help libgc's configure. '' export CXXCPP="$CXX -E" ''; diff --git a/pkgs/development/compilers/hop/default.nix b/pkgs/development/compilers/hop/default.nix index 49687cfb2d81..fd3ef137ae60 100644 --- a/pkgs/development/compilers/hop/default.nix +++ b/pkgs/development/compilers/hop/default.nix @@ -1,10 +1,16 @@ { stdenv, fetchurl, bigloo }: +# Compute the “release” version of bigloo (before the first dash, if any) +let bigloo-release = + let inherit (stdenv.lib) head splitString; in + head (splitString "-" (builtins.parseDrvName bigloo.name).version) +; in + stdenv.mkDerivation rec { - name = "hop-2.5.1"; + name = "hop-3.3.0"; src = fetchurl { url = "ftp://ftp-sop.inria.fr/indes/fp/Hop/${name}.tar.gz"; - sha256 = "1bvp7pc71bln5yvfj87s8750c6l53wjl6f8m12v62q9926adhwys"; + sha256 = "14gf9ihmw95zdnxsqhn5jymfivpfq5cg9v0y7yjd5i7c787dncp5"; }; postPatch = '' @@ -13,13 +19,9 @@ stdenv.mkDerivation rec { buildInputs = [ bigloo ]; - preConfigure = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -lbigloogc-4.1a"; - ''; - configureFlags = [ "--bigloo=${bigloo}/bin/bigloo" - "--bigloolibdir=${bigloo}/lib/bigloo/4.1a/" + "--bigloolibdir=${bigloo}/lib/bigloo/${bigloo-release}/" ]; meta = with stdenv.lib; { From f29f67bdb3992530bd4b0631c578e4ee31eae635 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 22 Sep 2020 03:24:36 -0300 Subject: [PATCH 113/123] Removing myself from maintainers list of blockchains --- pkgs/applications/blockchains/bitcoin.nix | 2 +- pkgs/applications/blockchains/dashpay.nix | 2 +- pkgs/applications/blockchains/dogecoin.nix | 2 +- pkgs/applications/blockchains/litecoin.nix | 2 +- pkgs/applications/blockchains/namecoin.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix index 65feac9565b2..09dc59a051ad 100644 --- a/pkgs/applications/blockchains/bitcoin.nix +++ b/pkgs/applications/blockchains/bitcoin.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { homepage = "https://bitcoin.org/"; downloadPage = "https://bitcoincore.org/bin/bitcoin-core-${version}/"; changelog = "https://bitcoincore.org/en/releases/${version}/"; - maintainers = with maintainers; [ roconnor AndersonTorres ]; + maintainers = with maintainers; [ roconnor ]; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/applications/blockchains/dashpay.nix b/pkgs/applications/blockchains/dashpay.nix index b88aa3af19e3..7bdf93b2dacc 100644 --- a/pkgs/applications/blockchains/dashpay.nix +++ b/pkgs/applications/blockchains/dashpay.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { private as you make transactions without waits, similar to cash. ''; homepage = "https://www.dash.org"; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; license = licenses.mit; }; diff --git a/pkgs/applications/blockchains/dogecoin.nix b/pkgs/applications/blockchains/dogecoin.nix index b1ebebdd213a..27a1f6132f05 100644 --- a/pkgs/applications/blockchains/dogecoin.nix +++ b/pkgs/applications/blockchains/dogecoin.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.dogecoin.com/"; license = licenses.mit; - maintainers = with maintainers; [ edwtjo offline AndersonTorres ]; + maintainers = with maintainers; [ edwtjo offline ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/blockchains/litecoin.nix b/pkgs/applications/blockchains/litecoin.nix index 22cfa3dbb91e..fa352652dbf9 100644 --- a/pkgs/applications/blockchains/litecoin.nix +++ b/pkgs/applications/blockchains/litecoin.nix @@ -50,6 +50,6 @@ mkDerivation rec { platforms = platforms.unix; license = licenses.mit; broken = stdenv.isDarwin; - maintainers = with maintainers; [ offline AndersonTorres ]; + maintainers = with maintainers; [ offline ]; }; } diff --git a/pkgs/applications/blockchains/namecoin.nix b/pkgs/applications/blockchains/namecoin.nix index 548213a52fdf..936eaa2505e1 100644 --- a/pkgs/applications/blockchains/namecoin.nix +++ b/pkgs/applications/blockchains/namecoin.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency"; homepage = "https://namecoin.org"; license = licenses.mit; - maintainers = with maintainers; [ doublec AndersonTorres infinisil ]; + maintainers = with maintainers; [ doublec infinisil ]; platforms = platforms.linux; }; } From ec92ffc53014a0255f56353e260f8a8975d4e00d Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 13 Sep 2020 20:05:26 -0400 Subject: [PATCH 114/123] orocos-kdl: init at 1.4.0 --- .../libraries/orocos-kdl/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/orocos-kdl/default.nix diff --git a/pkgs/development/libraries/orocos-kdl/default.nix b/pkgs/development/libraries/orocos-kdl/default.nix new file mode 100644 index 000000000000..094ee544649d --- /dev/null +++ b/pkgs/development/libraries/orocos-kdl/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, cmake, eigen }: + +stdenv.mkDerivation rec { + pname = "orocos-kdl"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "orocos"; + repo = "orocos_kinematics_dynamics"; + rev = "v${version}"; + sha256 = "0qj56j231h0rnjbglakammxn2lwmhy5f2qa37v1f6pcn81dn13vv"; + }; + + sourceRoot = "source/orocos_kdl"; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ eigen ]; + + meta = with lib; { + description = "Kinematics and Dynamics Library"; + homepage = "https://www.orocos.org/kdl.html"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ lopsided98 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 744970b2b229..f69cc670dc48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9558,6 +9558,8 @@ in orc = callPackage ../development/compilers/orc { }; + orocos-kdl = callPackage ../development/libraries/orocos-kdl { }; + metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { }; ber_metaocaml = callPackage ../development/compilers/ocaml/ber-metaocaml.nix { }; From 83162ab3b97d0e13b08e28938133381a7515c1e3 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 13 Sep 2020 20:06:33 -0400 Subject: [PATCH 115/123] pythonPackages.pykdl: init at 1.4.0 --- .../python-modules/pykdl/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/pykdl/default.nix diff --git a/pkgs/development/python-modules/pykdl/default.nix b/pkgs/development/python-modules/pykdl/default.nix new file mode 100644 index 000000000000..5fc38cd5dd4d --- /dev/null +++ b/pkgs/development/python-modules/pykdl/default.nix @@ -0,0 +1,20 @@ +{ lib, stdenv, toPythonModule, cmake, orocos-kdl, python, sip }: + +toPythonModule (stdenv.mkDerivation { + pname = "pykdl"; + inherit (orocos-kdl) version src; + + sourceRoot = "source/python_orocos_kdl"; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ orocos-kdl ]; + propagatedBuildInputs = [ python sip ]; + + meta = with lib; { + description = "Kinematics and Dynamics Library (Python bindings)"; + homepage = "https://www.orocos.org/kdl.html"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ lopsided98 ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c34048abb59e..7e64e854a4a8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5013,6 +5013,8 @@ in { pyjwt = callPackage ../development/python-modules/pyjwt { }; + pykdl = callPackage ../development/python-modules/pykdl { }; + pykdtree = callPackage ../development/python-modules/pykdtree { inherit (pkgs.llvmPackages) openmp; }; pykeepass = callPackage ../development/python-modules/pykeepass { }; From 23370afcedc46f63ea0dc7328bcb1f40d78887bf Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 22 Sep 2020 11:22:41 +0200 Subject: [PATCH 116/123] curlie: 1.3.1 -> 1.5.4 --- pkgs/tools/networking/curlie/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/curlie/default.nix b/pkgs/tools/networking/curlie/default.nix index b2c4d46a8ce9..f8147cb16115 100644 --- a/pkgs/tools/networking/curlie/default.nix +++ b/pkgs/tools/networking/curlie/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "curlie"; - version = "1.3.1"; + version = "1.5.4"; src= fetchFromGitHub { owner = "rs"; repo = pname; rev = "v${version}"; - sha256 = "09v8alrbw6qva3q3bcqxnyjm7svagfxqvhdff7cqf5pbmkxnhln9"; + sha256 = "0z92gz39m0gk8j7l2nwa5vrfr3mq160vr1b15sy13jwi1zspc7hx"; }; - vendorSha256 = "1mxgf004czf65a2mv99gfp27g98xhllmfcz4ynfv66nfkbfz6a8n"; + vendorSha256 = "1qnl15b9cs6xi8z368a9n34v3wr2adwp376cjzhyllni7sf6v1mm"; doCheck = false; From bd4805b659f5691010a1845e4f5c123ff4eb184a Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 21 Sep 2020 13:43:44 +0100 Subject: [PATCH 117/123] pythonPackages.django: 2.2.15 -> 2.2.16 See https://docs.djangoproject.com/en/dev/releases/2.2.16/ --- pkgs/development/python-modules/django/2_2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/2_2.nix b/pkgs/development/python-modules/django/2_2.nix index 99f71b9d8621..3a88f0703d06 100644 --- a/pkgs/development/python-modules/django/2_2.nix +++ b/pkgs/development/python-modules/django/2_2.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.2.15"; + version = "2.2.16"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "3e2f5d172215862abf2bac3138d8a04229d34dbd2d0dab42c6bf33876cc22323"; + sha256 = "1535g2r322cl4x52fb0dmzlbg23539j2wx6027j54p22xvjlbkv2"; }; patches = stdenv.lib.optional withGdal From 11c36334bfebed78ee32b8de333938c57a703f15 Mon Sep 17 00:00:00 2001 From: oxalica Date: Sun, 21 Jun 2020 20:41:38 +0800 Subject: [PATCH 118/123] vscode-extensions.vadimcn.vscode-lldb: init at 1.5.3 --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 1184 +++++++++++++++-- pkgs/misc/vscode-extensions/default.nix | 6 +- .../vscode-lldb/build-deps/package.json | 24 + .../cmake-build-extension-only.patch | 45 + .../vscode-extensions/vscode-lldb/default.nix | 106 ++ .../vscode-lldb/reset-cargo-config.patch | 11 + 7 files changed, 1260 insertions(+), 117 deletions(-) create mode 100644 pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json create mode 100644 pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch create mode 100644 pkgs/misc/vscode-extensions/vscode-lldb/default.nix create mode 100644 pkgs/misc/vscode-extensions/vscode-lldb/reset-cargo-config.patch diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 6a4affb915f8..ba8488bda2ad 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -205,6 +205,7 @@ , "vscode-css-languageserver-bin" , "vscode-html-languageserver-bin" , "vscode-json-languageserver-bin" +, { "vscode-lldb-build-deps": "../../misc/vscode-extensions/vscode-lldb/build-deps" } , "vue-cli" , "vue-language-server" , "web-ext" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 8e0e5ca40bab..8d56372af252 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -1228,13 +1228,13 @@ let sha512 = "wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A=="; }; }; - "@babel/polyfill-7.10.4" = { + "@babel/polyfill-7.11.5" = { name = "_at_babel_slash_polyfill"; packageName = "@babel/polyfill"; - version = "7.10.4"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.10.4.tgz"; - sha512 = "8BYcnVqQ5kMD2HXoHInBH7H1b/uP3KdnwCYXOqFnXqguOyuu443WXusbIUbWEfY3Z0Txk0M1uG/8YuAMhNl6zg=="; + url = "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.11.5.tgz"; + sha512 = "FunXnE0Sgpd61pKSj2OSOs1D44rKTD3pGOfGilZ6LGrrIH0QEtJlTjqOqdF8Bs98JmjfGhni2BBkTfv9KcKJ9g=="; }; }; "@babel/preset-env-7.11.5" = { @@ -1291,15 +1291,6 @@ let sha512 = "CAml0ioKX+kOAvBQDHa/+t1fgOt3qkTIz0TrRtRAT6XY0m5qYZXR85k6/sLCNPMGhYDlCFHCYuU0ybTJbvlC6w=="; }; }; - "@babel/runtime-7.10.5" = { - name = "_at_babel_slash_runtime"; - packageName = "@babel/runtime"; - version = "7.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.5.tgz"; - sha512 = "otddXKhdNn7d0ptoFRHtMLa8LqDxLYwTjB4nYgM1yy5N6gU/MUf8zqyyLltCH3yAVitBzmwK4us+DD0l/MauAg=="; - }; - }; "@babel/runtime-7.11.2" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; @@ -1660,13 +1651,13 @@ let sha512 = "t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ=="; }; }; - "@fluentui/react-7.138.0" = { + "@fluentui/react-7.139.0" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.138.0"; + version = "7.139.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.138.0.tgz"; - sha512 = "fekFIGSMqzSUbiqwm1GvYZ+BvmBPHwP0sUcoNct92WCTrfcwnHhX7q770RbcRGGG7K9OuasbGafP3auFHSz7FQ=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.139.0.tgz"; + sha512 = "Y3u80PnrK/ZnTlezo+Syfvy8UXkHEpwCHNW8hjezfOkhPVVI8fpmrPeHy2dDnqah5HDbuC6KUU9owWg/UojSCw=="; }; }; "@fluentui/react-focus-7.16.5" = { @@ -4405,6 +4396,15 @@ let sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"; }; }; + "@types/json5-0.0.30" = { + name = "_at_types_slash_json5"; + packageName = "@types/json5"; + version = "0.0.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/json5/-/json5-0.0.30.tgz"; + sha512 = "sqm9g7mHlPY/43fcSNrCYfOeX9zkTTK+euO5E6+CVijSMm5tTjkVdwdqRkY3ljjIAf8679vps5jKUoJBCLsMDA=="; + }; + }; "@types/keygrip-1.0.2" = { name = "_at_types_slash_keygrip"; packageName = "@types/keygrip"; @@ -4612,6 +4612,15 @@ let sha512 = "7iPCCv/SOqeGvz3CcBBnhG+3vBMntO3SMVcyUHmrJq6Lzdbi4dtSxk3JkIUm+JDGnT26mtxlNQHmTKlvDnjFwg=="; }; }; + "@types/node-8.10.64" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "8.10.64"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-8.10.64.tgz"; + sha512 = "/EwBIb+imu8Qi/A3NF9sJ9iuKo7yV+pryqjmeRqaU0C4wBAOhas5mdvoYeJ5PCKrh6thRSJHdoasFqh3BQGILA=="; + }; + }; "@types/node-fetch-2.5.7" = { name = "_at_types_slash_node-fetch"; packageName = "@types/node-fetch"; @@ -4963,6 +4972,15 @@ let sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="; }; }; + "@types/yauzl-2.9.1" = { + name = "_at_types_slash_yauzl"; + packageName = "@types/yauzl"; + version = "2.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.1.tgz"; + sha512 = "A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA=="; + }; + }; "@types/yoga-layout-1.9.2" = { name = "_at_types_slash_yoga-layout"; packageName = "@types/yoga-layout"; @@ -5953,13 +5971,13 @@ let sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1"; }; }; - "addons-linter-2.1.0" = { + "addons-linter-2.5.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "2.1.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-2.1.0.tgz"; - sha512 = "ISCPobK6VdQ+5btMf1abkuD/9V+6RjnpJAVmEzjxDitk7HY03mLXVhA8SoD0XgngrI6cFlM2/i4OxfY4dHokpw=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-2.5.0.tgz"; + sha512 = "d3GGf27ibN9ioxmjEiAFkGQRdyw5W+Gb2/9G55AZ6YygtBjtJDotTnSsE6Tz+mEFY4QKo/OaVs1XKjcZEl2fJA=="; }; }; "addr-to-ip-port-1.5.1" = { @@ -6340,6 +6358,15 @@ let sha512 = "SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA=="; }; }; + "ansi-colors-3.2.3" = { + name = "ansi-colors"; + packageName = "ansi-colors"; + version = "3.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz"; + sha512 = "LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw=="; + }; + }; "ansi-colors-3.2.4" = { name = "ansi-colors"; packageName = "ansi-colors"; @@ -11200,6 +11227,15 @@ let sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA=="; }; }; + "chokidar-3.3.0" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz"; + sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; + }; + }; "chokidar-3.4.2" = { name = "chokidar"; packageName = "chokidar"; @@ -15143,13 +15179,13 @@ let sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; }; }; - "deepcopy-2.0.0" = { + "deepcopy-2.1.0" = { name = "deepcopy"; packageName = "deepcopy"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/deepcopy/-/deepcopy-2.0.0.tgz"; - sha512 = "d5ZK7pJw7F3k6M5vqDjGiiUS9xliIyWkdzBjnPhnSeRGjkYOGZMCFkdKVwV/WiHOe0NwzB8q+iDo7afvSf0arA=="; + url = "https://registry.npmjs.org/deepcopy/-/deepcopy-2.1.0.tgz"; + sha512 = "8cZeTb1ZKC3bdSCP6XOM1IsTczIO73fdqtwa2B0N15eAz7gmyhQo+mc5gnFuulsgN3vIQYmTgbmQVKalH1dKvQ=="; }; }; "deepmerge-2.1.0" = { @@ -15953,13 +15989,13 @@ let sha512 = "EAyaxl8hy4Ph07kzlzGTfpbZMNAAAHXSZtNEMwdlnSd1noHzvA6HsgKt4fEMSvaEXQYLSphe5rPMxN4WOj0hcQ=="; }; }; - "dispensary-0.52.0" = { + "dispensary-0.55.0" = { name = "dispensary"; packageName = "dispensary"; - version = "0.52.0"; + version = "0.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/dispensary/-/dispensary-0.52.0.tgz"; - sha512 = "A13TTo/2yaK/Z3So4OdzodBTbyTMpqVOH15cbmUuKvl+T1cOLn0VGQjibrG9cELa9mkLfhjFodqYQWkOGkG9Ig=="; + url = "https://registry.npmjs.org/dispensary/-/dispensary-0.55.0.tgz"; + sha512 = "5+6E0kQNVWIZCGwTw34B48bJQyUuvwJD6hsI/b7ScKbjfrzUIgod/ROsTX6t9d3O031A9O5RPVHIqkX4ZzcAfw=="; }; }; "diveSync-0.3.0" = { @@ -17655,15 +17691,6 @@ let sha512 = "K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig=="; }; }; - "eslint-7.5.0" = { - name = "eslint"; - packageName = "eslint"; - version = "7.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.5.0.tgz"; - sha512 = "vlUP10xse9sWt9SGRtcr1LAC67BENcQMFeV+w5EvLEoFe3xJ8cF1Skd0msziRx/VMC+72B4DxreCE+OR12OA6Q=="; - }; - }; "eslint-7.9.0" = { name = "eslint"; packageName = "eslint"; @@ -17754,6 +17781,15 @@ let sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="; }; }; + "eslint-visitor-keys-2.0.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz"; + sha512 = "QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ=="; + }; + }; "esm-3.2.25" = { name = "esm"; packageName = "esm"; @@ -17808,15 +17844,6 @@ let sha512 = "ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw=="; }; }; - "espree-7.2.0" = { - name = "espree"; - packageName = "espree"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-7.2.0.tgz"; - sha512 = "H+cQ3+3JYRMEIOl87e7QdHX70ocly5iW4+dttuR8iYSPr/hXKFb+7dBsZ7+u1adC4VrnPlTkv0+OwuPnDop19g=="; - }; - }; "espree-7.3.0" = { name = "espree"; packageName = "espree"; @@ -21120,6 +21147,15 @@ let sha512 = "MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ=="; }; }; + "glob-7.1.3" = { + name = "glob"; + packageName = "glob"; + version = "7.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz"; + sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="; + }; + }; "glob-7.1.5" = { name = "glob"; packageName = "glob"; @@ -26054,6 +26090,15 @@ let sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; }; }; + "js-yaml-3.13.1" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; + sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; + }; + }; "js-yaml-3.14.0" = { name = "js-yaml"; packageName = "js-yaml"; @@ -30249,13 +30294,13 @@ let sha1 = "c04891883c28c83602e1d06b05a11037e359b4c8"; }; }; - "mdn-browser-compat-data-1.0.31" = { + "mdn-browser-compat-data-1.0.35" = { name = "mdn-browser-compat-data"; packageName = "mdn-browser-compat-data"; - version = "1.0.31"; + version = "1.0.35"; src = fetchurl { - url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.31.tgz"; - sha512 = "GVQQYWgoH3jbBaIy8M4hrg34qaNpPedtZvwAjUmkpHq4FXKKCea8Ji5rlS32YJSU9dt7TPvuWWX7Cce5mZyFPA=="; + url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.35.tgz"; + sha512 = "7SMAEZgBaElDNcqFhmInBnSo+c+MOzprt7hrGNcEo9hMhDiPQ7L4dwEt6gunudjI0jXenPJaW0S8U4ckeP2uhw=="; }; }; "mdn-data-2.0.4" = { @@ -31329,6 +31374,15 @@ let sha1 = "161be5bdeb496771eb9b35745050b622b5aefc58"; }; }; + "mocha-7.2.0" = { + name = "mocha"; + packageName = "mocha"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz"; + sha512 = "O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ=="; + }; + }; "mocha-8.1.3" = { name = "mocha"; packageName = "mocha"; @@ -32690,6 +32744,15 @@ let sha256 = "224950cc405150c37dbd3c4aa65dc0cfb799b1a57f674e9bb76f993268106406"; }; }; + "node-environment-flags-1.0.6" = { + name = "node-environment-flags"; + packageName = "node-environment-flags"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz"; + sha512 = "5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw=="; + }; + }; "node-fetch-1.6.3" = { name = "node-fetch"; packageName = "node-fetch"; @@ -32906,13 +32969,13 @@ let sha512 = "SVfQ/wMw+DesunOm5cKqr6yDcvUTDl/yc97ybGHMrteNEY6oekXpNpS3lZwgLlwz0FLgHoiW28ZpmBHUDg37cw=="; }; }; - "node-notifier-7.0.2" = { + "node-notifier-8.0.0" = { name = "node-notifier"; packageName = "node-notifier"; - version = "7.0.2"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-notifier/-/node-notifier-7.0.2.tgz"; - sha512 = "ux+n4hPVETuTL8+daJXTOC6uKLgMsl1RYfFv7DKRzyvzBapqco0rZZ9g72ZN8VS6V+gvNYHYa/ofcCY8fkJWsA=="; + url = "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.0.tgz"; + sha512 = "46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA=="; }; }; "node-persist-2.1.0" = { @@ -34059,13 +34122,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.138.0" = { + "office-ui-fabric-react-7.139.0" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.138.0"; + version = "7.139.0"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.138.0.tgz"; - sha512 = "HW4ugd+x7Jg96yBWxmUNMfkTS0U8RMwf5mGsHBAvW9s5l1ektjTjKnb5beHxNrddXKqcjz9ZThdTk/Gxds0jig=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.139.0.tgz"; + sha512 = "kqt3LUKUJfPie/32bmWxMcn3VdZoH5yiicdOj8B/huu1WPDDmhM+UlsUX2AmLeAEmqkH8XZxlgpmym96dhstaA=="; }; }; "omggif-1.0.10" = { @@ -36516,13 +36579,13 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pino-6.4.0" = { + "pino-6.6.1" = { name = "pino"; packageName = "pino"; - version = "6.4.0"; + version = "6.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-6.4.0.tgz"; - sha512 = "TRDp5fJKRBtVlxd4CTox3rJL+TzwQztB/VNmT5n87zFgKVU7ztnmZkcX1zypPP+3ZZcveOTYKJy74UXdVBaXFQ=="; + url = "https://registry.npmjs.org/pino/-/pino-6.6.1.tgz"; + sha512 = "DOgm7rn6ctBkBYemHXSLj7+j3o3U1q1FWBXbHcprur8mA93QcJSycEkEqhqKiFB9Mx/3Qld2FGr6+9yfQza0kA=="; }; }; "pino-std-serializers-2.5.0" = { @@ -37345,6 +37408,15 @@ let sha512 = "36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg=="; }; }; + "postcss-selector-parser-6.0.3" = { + name = "postcss-selector-parser"; + packageName = "postcss-selector-parser"; + version = "6.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.3.tgz"; + sha512 = "0ClFaY4X1ra21LRqbW6y3rUbWcxnSVkDFG57R7Nxus9J9myPFlv+jYDMohzpkBx0RrjjiqjtycpchQ+PLGmZ9w=="; + }; + }; "postcss-svgo-4.0.2" = { name = "postcss-svgo"; packageName = "postcss-svgo"; @@ -39856,6 +39928,15 @@ let sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; }; }; + "readdirp-3.2.0" = { + name = "readdirp"; + packageName = "readdirp"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz"; + sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; + }; + }; "readdirp-3.4.0" = { name = "readdirp"; packageName = "readdirp"; @@ -42691,13 +42772,13 @@ let sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; }; }; - "sign-addon-2.0.6" = { + "sign-addon-3.1.0" = { name = "sign-addon"; packageName = "sign-addon"; - version = "2.0.6"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/sign-addon/-/sign-addon-2.0.6.tgz"; - sha512 = "/8SQPNCrrZKMthdDf1IfI4XMbq8k9YsiiMyVeQL8xhhQSsZho6ZvEUBFSA70N0eznLZyab3k1d2CNOchYRYA6Q=="; + url = "https://registry.npmjs.org/sign-addon/-/sign-addon-3.1.0.tgz"; + sha512 = "zZ7nKc5/3QWM3skYBosGDvYQf2jkKhW2u8BELrZoN1wgCSOnwsV9T47Vx9uaNbA3CyZ+V9XSA0tDVHoV1QfVPw=="; }; }; "signal-exit-3.0.3" = { @@ -45076,6 +45157,15 @@ let sha1 = "5ea211cd92d228e184294990a6cc97b366a77cb0"; }; }; + "string-argv-0.3.1" = { + name = "string-argv"; + packageName = "string-argv"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz"; + sha512 = "a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg=="; + }; + }; "string-env-interpolation-1.0.1" = { name = "string-env-interpolation"; packageName = "string-env-interpolation"; @@ -45877,6 +45967,15 @@ let sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; + "supports-color-6.0.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz"; + sha512 = "on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg=="; + }; + }; "supports-color-6.1.0" = { name = "supports-color"; packageName = "supports-color"; @@ -47705,6 +47804,15 @@ let sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA=="; }; }; + "ts-loader-6.2.2" = { + name = "ts-loader"; + packageName = "ts-loader"; + version = "6.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-loader/-/ts-loader-6.2.2.tgz"; + sha512 = "HDo5kXZCBml3EUPcc7RlZOV/JGlLHwppTLEHb3SHnr5V7NXD4klMEkrhJe5wgRbaWsSXi+Y1SIBN/K9B6zWGWQ=="; + }; + }; "ts-loader-8.0.1" = { name = "ts-loader"; packageName = "ts-loader"; @@ -49199,15 +49307,6 @@ let sha512 = "grrmrB6Zb8DUiyDIaeRTBCkgISYUgETNe7NglEbVsrLWXeESnlCSP50WfRSj/GmzMPl6Uchj24S/p80nP/ZQrQ=="; }; }; - "update-notifier-4.1.0" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.0.tgz"; - sha512 = "w3doE1qtI0/ZmgeoDoARmI5fjDoT93IfKgEGqm26dGUOh8oNpaSTsGNdYRN/SjOuo10jcJGwkEL3mroKzktkew=="; - }; - }; "update-notifier-4.1.1" = { name = "update-notifier"; packageName = "update-notifier"; @@ -50504,6 +50603,24 @@ let sha512 = "/0HCaxiSL0Rmm3sJ+iyZekljKEYKo1UHSzX4UFOo5VDLgRhKomJf7g1p8glcbCHXB/70IcH8IhKnwlTznf8RPQ=="; }; }; + "vscode-debugadapter-testsupport-1.41.0" = { + name = "vscode-debugadapter-testsupport"; + packageName = "vscode-debugadapter-testsupport"; + version = "1.41.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.41.0.tgz"; + sha512 = "3aEDm+B6trSxUJWETbNBM5qbEAUbzPpLZ9YT9ez+C1ITG4uaioc8GIQtkVk1kpxP++WPWo0LVjYY8CbVRCRapg=="; + }; + }; + "vscode-debugprotocol-1.41.0" = { + name = "vscode-debugprotocol"; + packageName = "vscode-debugprotocol"; + version = "1.41.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.41.0.tgz"; + sha512 = "Sxp7kDDuhpEZiDaIfhM0jLF3RtMqvc6CpoESANE77t351uezsd/oDoqALLcOnmmsDzTgQ3W0sCvM4gErnjDFpA=="; + }; + }; "vscode-emmet-helper-1.2.17" = { name = "vscode-emmet-helper"; packageName = "vscode-emmet-helper"; @@ -51125,13 +51242,13 @@ let sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; }; }; - "webidl-conversions-5.0.0" = { + "webidl-conversions-6.1.0" = { name = "webidl-conversions"; packageName = "webidl-conversions"; - version = "5.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz"; - sha512 = "VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="; + url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz"; + sha512 = "qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="; }; }; "webpack-4.44.0" = { @@ -51332,13 +51449,13 @@ let sha512 = "WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg=="; }; }; - "whatwg-url-8.1.0" = { + "whatwg-url-8.2.2" = { name = "whatwg-url"; packageName = "whatwg-url"; - version = "8.1.0"; + version = "8.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.1.0.tgz"; - sha512 = "vEIkwNi9Hqt4TV9RdnaBPNt+E2Sgmo3gePebCRgZ1R7g6d23+53zCTnuB0amKI4AXq6VM8jj2DUAa0S1vjJxkw=="; + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.2.2.tgz"; + sha512 = "PcVnO6NiewhkmzV0qn7A+UZ9Xx4maNTI+O+TShmfE4pqjoCMwUMjkvoNhNHPTvgR7QH9Xt3R13iHuWy2sToFxQ=="; }; }; "whatwg-url-compat-0.6.5" = { @@ -52692,6 +52809,15 @@ let sha1 = "9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"; }; }; + "yargs-unparser-1.6.0" = { + name = "yargs-unparser"; + packageName = "yargs-unparser"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz"; + sha512 = "W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw=="; + }; + }; "yargs-unparser-1.6.1" = { name = "yargs-unparser"; packageName = "yargs-unparser"; @@ -55947,7 +56073,7 @@ in sources."postcss-modules-local-by-default-3.0.3" sources."postcss-modules-scope-2.2.0" sources."postcss-modules-values-3.0.0" - sources."postcss-selector-parser-6.0.2" + sources."postcss-selector-parser-6.0.3" sources."postcss-value-parser-4.1.0" sources."prepend-http-1.0.4" sources."prismjs-1.21.0" @@ -63677,7 +63803,7 @@ in sources."@fluentui/date-time-utilities-7.8.1" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.138.0" + sources."@fluentui/react-7.139.0" sources."@fluentui/react-focus-7.16.5" sources."@fluentui/react-icons-0.3.4" sources."@fluentui/react-window-provider-0.3.3" @@ -64655,7 +64781,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.138.0" + sources."office-ui-fabric-react-7.139.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -69780,10 +69906,10 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "1.1.7"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-1.1.7.tgz"; - sha512 = "Eb227112WOzZ4+gMNx4dtGPonyN0c834hdogAfN9yJ30DatlgAi8+kWJI+IuCOznvemu0456+mwHmOhw7jLEPg=="; + url = "https://registry.npmjs.org/joplin/-/joplin-1.1.8.tgz"; + sha512 = "oBMVeCZP/gQ66imuK65rQIXDl5NrpyMPoPGqzcBxsIyTKHV3w5nAYvB+TQUO1fHNw61EsaRhGVMCrO139kkdQw=="; }; dependencies = [ sources."@cronvel/get-pixels-3.4.0" @@ -75330,7 +75456,7 @@ in sources."@fluentui/date-time-utilities-7.8.1" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.138.0" + sources."@fluentui/react-7.139.0" sources."@fluentui/react-focus-7.16.5" sources."@fluentui/react-icons-0.3.4" sources."@fluentui/react-window-provider-0.3.3" @@ -75470,7 +75596,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.138.0" + sources."office-ui-fabric-react-7.139.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -80293,7 +80419,7 @@ in sources."postcss-ordered-values-4.1.2" sources."postcss-reduce-initial-4.0.3" sources."postcss-reduce-transforms-4.0.2" - sources."postcss-selector-parser-6.0.2" + sources."postcss-selector-parser-6.0.3" sources."postcss-svgo-4.0.2" sources."postcss-unique-selectors-4.0.1" sources."postcss-value-parser-3.3.1" @@ -80483,6 +80609,7 @@ in (sources."uncss-0.17.3" // { dependencies = [ sources."is-absolute-url-3.0.3" + sources."postcss-selector-parser-6.0.2" ]; }) sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -85055,10 +85182,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.398.1"; + version = "1.399.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.398.1.tgz"; - sha512 = "jH24ztdJY8DQlqkd1z8n/JutdOqHtTPccCynM2hfOedW20yAp9c108LFjXvqBEk/EH3YyNmWzyLkkHOySeDkwQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.399.0.tgz"; + sha512 = "o1okhJvmRpETbMHCyJvXaVOLIVtlbledhztTZKsnMRs0wgim/GyNNWTboqM5a0aR23OpQzW8qlV3BQRsAvEisw=="; }; dependencies = [ sources."@sindresorhus/is-2.1.1" @@ -91241,6 +91368,816 @@ in bypassCache = true; reconstructLock = true; }; + "vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps" = nodeEnv.buildNodePackage { + name = "vscode-lldb"; + packageName = "vscode-lldb"; + version = "1.5.3"; + src = ../../misc/vscode-extensions/vscode-lldb/build-deps; + dependencies = [ + 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/yauzl-2.9.1" + sources."@webassemblyjs/ast-1.9.0" + sources."@webassemblyjs/floating-point-hex-parser-1.9.0" + sources."@webassemblyjs/helper-api-error-1.9.0" + sources."@webassemblyjs/helper-buffer-1.9.0" + sources."@webassemblyjs/helper-code-frame-1.9.0" + sources."@webassemblyjs/helper-fsm-1.9.0" + sources."@webassemblyjs/helper-module-context-1.9.0" + sources."@webassemblyjs/helper-wasm-bytecode-1.9.0" + sources."@webassemblyjs/helper-wasm-section-1.9.0" + sources."@webassemblyjs/ieee754-1.9.0" + sources."@webassemblyjs/leb128-1.9.0" + sources."@webassemblyjs/utf8-1.9.0" + sources."@webassemblyjs/wasm-edit-1.9.0" + sources."@webassemblyjs/wasm-gen-1.9.0" + sources."@webassemblyjs/wasm-opt-1.9.0" + sources."@webassemblyjs/wasm-parser-1.9.0" + sources."@webassemblyjs/wast-parser-1.9.0" + sources."@webassemblyjs/wast-printer-1.9.0" + sources."@xtuc/ieee754-1.2.0" + sources."@xtuc/long-4.2.2" + sources."acorn-6.4.1" + sources."ajv-6.12.5" + sources."ajv-errors-1.0.1" + sources."ajv-keywords-3.5.2" + sources."ansi-colors-3.2.3" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."anymatch-3.1.1" + sources."aproba-1.2.0" + sources."argparse-1.0.10" + 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."azure-devops-node-api-7.2.0" + 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."boolbase-1.0.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."brorand-1.1.0" + sources."browser-stdout-1.3.1" + 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."string_decoder-1.3.0" + ]; + }) + sources."browserify-zlib-0.2.0" + (sources."buffer-4.9.2" // { + dependencies = [ + sources."isarray-1.0.0" + ]; + }) + sources."buffer-crc32-0.2.13" + sources."buffer-from-1.1.1" + sources."buffer-xor-1.0.3" + sources."builtin-status-codes-3.0.0" + (sources."cacache-12.0.4" // { + dependencies = [ + sources."glob-7.1.6" + ]; + }) + sources."cache-base-1.0.1" + sources."camelcase-5.3.1" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."supports-color-5.5.0" + ]; + }) + sources."cheerio-1.0.0-rc.3" + sources."chokidar-3.3.0" + sources."chownr-1.1.4" + 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-buffer-1.1.6" + (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."cliui-5.0.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."collection-visit-1.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + 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" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + 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."cross-spawn-6.0.5" + sources."crypto-browserify-3.12.0" + sources."css-select-1.2.0" + sources."css-what-2.1.3" + sources."cyclist-1.0.1" + sources."debug-3.2.6" + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" + sources."denodeify-1.2.1" + sources."des.js-1.0.1" + sources."detect-file-1.0.0" + sources."diff-3.5.0" + (sources."diffie-hellman-5.0.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."dom-serializer-0.1.1" + sources."domain-browser-1.2.0" + 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."string_decoder-1.1.1" + ]; + }) + (sources."elliptic-6.5.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."emoji-regex-7.0.3" + sources."emojis-list-3.0.0" + sources."end-of-stream-1.4.4" + sources."enhanced-resolve-4.3.0" + sources."entities-1.1.2" + sources."errno-0.1.7" + sources."es-abstract-1.17.6" + sources."es-to-primitive-1.2.1" + sources."escape-string-regexp-1.0.5" + sources."eslint-scope-4.0.3" + sources."esprima-4.0.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) + sources."estraverse-4.3.0" + sources."events-3.2.0" + sources."evp_bytestokey-1.0.3" + (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" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-buffer-1.1.6" + (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."ms-2.0.0" + ]; + }) + sources."expand-tilde-2.0.2" + (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."fd-slicer-1.1.0" + sources."figgy-pudding-3.5.2" + sources."file-uri-to-path-1.0.0" + sources."fill-range-7.0.1" + sources."find-cache-dir-2.1.0" + sources."find-up-3.0.0" + (sources."findup-sync-3.0.0" // { + dependencies = [ + sources."braces-2.3.2" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."is-buffer-1.1.6" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."to-regex-range-2.1.1" + ]; + }) + sources."flat-4.1.0" + (sources."flush-write-stream-1.1.1" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + sources."for-in-1.0.2" + sources."fragment-cache-0.2.1" + (sources."from2-2.3.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + sources."fs-write-stream-atomic-1.0.10" + sources."fs.realpath-1.0.0" + sources."fsevents-2.1.3" + sources."function-bind-1.1.1" + sources."get-caller-file-2.0.5" + sources."get-value-2.0.6" + sources."glob-7.1.3" + sources."glob-parent-5.1.1" + (sources."global-modules-2.0.0" // { + dependencies = [ + sources."global-prefix-3.0.0" + ]; + }) + sources."global-prefix-1.0.2" + sources."graceful-fs-4.2.4" + sources."growl-1.10.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 = [ + sources."is-buffer-1.1.6" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.1" + sources."string_decoder-1.3.0" + ]; + }) + sources."hash.js-1.1.7" + sources."he-1.2.0" + sources."hmac-drbg-1.0.1" + sources."homedir-polyfill-1.0.3" + (sources."htmlparser2-3.10.1" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.1" + sources."string_decoder-1.3.0" + ]; + }) + sources."https-browserify-1.0.0" + sources."ieee754-1.1.13" + sources."iferr-0.1.5" + sources."import-local-2.0.0" + sources."imurmurhash-0.1.4" + sources."infer-owner-1.0.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.5" + sources."interpret-1.4.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-binary-path-2.1.0" + sources."is-buffer-2.0.4" + sources."is-callable-1.2.1" + 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-glob-4.0.1" + sources."is-number-7.0.0" + sources."is-plain-object-2.0.4" + sources."is-regex-1.1.1" + sources."is-symbol-1.0.3" + sources."is-windows-1.0.2" + sources."is-wsl-1.1.0" + sources."isarray-0.0.1" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."js-yaml-3.13.1" + sources."json-parse-better-errors-1.0.2" + sources."json-schema-traverse-0.4.1" + sources."json5-2.1.3" + sources."kind-of-6.0.3" + sources."leven-3.1.0" + sources."linkify-it-2.2.0" + sources."loader-runner-2.4.0" + (sources."loader-utils-1.4.0" // { + dependencies = [ + sources."json5-1.0.1" + ]; + }) + sources."locate-path-3.0.0" + sources."lodash-4.17.20" + sources."log-symbols-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."markdown-it-10.0.0" // { + dependencies = [ + sources."entities-2.0.3" + ]; + }) + sources."md5.js-1.3.5" + sources."mdurl-1.0.1" + (sources."memory-fs-0.5.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + sources."memory-streams-0.1.3" + sources."micromatch-4.0.2" + (sources."miller-rabin-4.0.1" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."mime-1.6.0" + sources."minimalistic-assert-1.0.1" + sources."minimalistic-crypto-utils-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."mississippi-3.0.0" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."mkdirp-0.5.5" + sources."mocha-7.2.0" + sources."move-concurrently-1.0.1" + sources."ms-2.1.1" + sources."mute-stream-0.0.8" + sources."nan-2.14.1" + sources."nanomatch-1.2.13" + sources."neo-async-2.6.2" + sources."nice-try-1.0.5" + sources."node-environment-flags-1.0.6" + (sources."node-libs-browser-2.2.1" // { + dependencies = [ + sources."isarray-1.0.0" + sources."punycode-1.4.1" + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."string_decoder-1.1.1" + ]; + }) + sources."safe-buffer-5.2.1" + sources."string_decoder-1.3.0" + ]; + }) + sources."normalize-path-3.0.0" + sources."nth-check-1.0.2" + 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-buffer-1.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-inspect-1.8.0" + sources."object-keys-1.1.1" + sources."object-visit-1.0.1" + sources."object.assign-4.1.0" + sources."object.getownpropertydescriptors-2.1.0" + sources."object.pick-1.3.0" + sources."once-1.4.0" + sources."os-0.1.1" + sources."os-browserify-0.3.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."pako-1.0.11" + (sources."parallel-transform-1.2.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + sources."parse-asn1-5.1.6" + sources."parse-passwd-1.0.0" + sources."parse-semver-1.1.1" + sources."parse5-3.0.3" + 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-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."pbkdf2-3.1.1" + sources."pend-1.2.0" + 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."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."read-1.0.7" + sources."readable-stream-1.0.34" + sources."readdirp-3.2.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."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."resolve-cwd-2.0.0" + (sources."resolve-dir-1.0.1" // { + dependencies = [ + sources."global-modules-1.0.0" + ]; + }) + sources."resolve-from-3.0.0" + 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-blocking-2.0.0" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."setimmediate-1.0.5" + sources."sha.js-2.4.11" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + (sources."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" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-buffer-1.1.6" + (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."ms-2.0.0" + sources."source-map-0.5.7" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."is-buffer-1.1.6" + sources."kind-of-3.2.2" + ]; + }) + sources."source-list-map-2.0.1" + sources."source-map-0.6.1" + sources."source-map-resolve-0.5.3" + sources."source-map-support-0.5.19" + sources."source-map-url-0.4.0" + sources."split-string-3.1.0" + sources."sprintf-js-1.0.3" + sources."ssri-6.0.1" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-buffer-1.1.6" + (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."stream-browserify-2.0.2" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + sources."stream-each-1.2.3" + (sources."stream-http-2.8.3" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + sources."stream-shift-1.0.1" + sources."string-argv-0.3.1" + sources."string-width-2.1.1" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimstart-1.0.1" + sources."string_decoder-0.10.31" + sources."strip-ansi-4.0.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-6.0.0" + sources."tapable-1.1.3" + sources."terser-4.8.0" + sources."terser-webpack-plugin-1.4.5" + (sources."through2-2.0.5" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + sources."timers-browserify-2.0.11" + sources."tmp-0.0.29" + sources."to-arraybuffer-1.0.1" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."is-buffer-1.1.6" + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-5.0.1" + (sources."ts-loader-6.2.2" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."tslib-1.13.0" + sources."tty-browserify-0.0.0" + sources."tunnel-0.0.4" + sources."typed-rest-client-1.2.0" + sources."typedarray-0.0.6" + sources."typescript-3.9.7" + sources."uc.micro-1.0.6" + sources."underscore-1.8.3" + sources."union-value-1.0.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."isarray-1.0.0" + ]; + }) + 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."url-join-1.1.0" + sources."use-3.1.1" + (sources."util-0.11.1" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."util-deprecate-1.0.2" + sources."v8-compile-cache-2.1.1" + sources."vm-browserify-1.1.2" + sources."vsce-1.79.5" + sources."vscode-debugadapter-testsupport-1.41.0" + sources."vscode-debugprotocol-1.41.0" + (sources."watchpack-1.7.4" // { + dependencies = [ + sources."chokidar-3.4.2" + sources."readdirp-3.4.0" + ]; + }) + (sources."watchpack-chokidar2-2.0.0" // { + dependencies = [ + sources."anymatch-2.0.0" + sources."binary-extensions-1.13.1" + sources."braces-2.3.2" + sources."chokidar-2.1.8" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."fsevents-1.2.13" + sources."glob-parent-3.1.0" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-glob-3.1.0" + sources."is-number-3.0.0" + sources."isarray-1.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."normalize-path-2.1.1" + sources."readable-stream-2.3.7" + sources."readdirp-2.2.1" + sources."string_decoder-1.1.1" + sources."to-regex-range-2.1.1" + ]; + }) + (sources."webpack-4.44.2" // { + dependencies = [ + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."is-buffer-1.1.6" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."isarray-1.0.0" + sources."memory-fs-0.4.1" + sources."micromatch-3.1.10" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + sources."to-regex-range-2.1.1" + ]; + }) + (sources."webpack-cli-3.3.12" // { + dependencies = [ + sources."supports-color-6.1.0" + ]; + }) + sources."webpack-sources-1.4.3" + sources."which-1.3.1" + sources."which-module-2.0.0" + sources."wide-align-1.1.3" + sources."worker-farm-1.7.0" + (sources."wrap-ansi-5.1.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."wrappy-1.0.2" + sources."xtend-4.0.2" + sources."y18n-4.0.0" + sources."yallist-3.1.1" + (sources."yargs-13.3.2" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."yargs-parser-13.1.2" + sources."yargs-unparser-1.6.0" + sources."yauzl-2.10.0" + sources."yazl-2.5.1" + ]; + buildInputs = globalBuildInputs; + meta = { + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; vue-cli = nodeEnv.buildNodePackage { name = "vue-cli"; packageName = "vue-cli"; @@ -92482,10 +93419,10 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-5.0.0.tgz"; - sha512 = "K5rzVijxNbOjxv+au1Sj7J82s1/CCyBQ9bhJE9TWdOD3OLELhC3bWJHyNJ1u2sT+kf8guaJjFvPnd6WG67PHtw=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-5.1.0.tgz"; + sha512 = "Eupjwvif/9P4uGdZIddJziLLLD/RuzW8r8HEANGCW8e3dlPV4GJu5z815k9DLVshG0v+q/stUPR968Q2p7hhMQ=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -92500,10 +93437,16 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/polyfill-7.10.4" - sources."@babel/runtime-7.10.5" + sources."@babel/polyfill-7.11.5" + sources."@babel/runtime-7.11.2" sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" + (sources."@eslint/eslintrc-0.1.3" // { + dependencies = [ + sources."debug-4.3.0" + sources."ms-2.1.2" + ]; + }) sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" @@ -92515,9 +93458,9 @@ in sources."adbkit-2.11.1" sources."adbkit-logcat-1.1.0" sources."adbkit-monkey-1.0.1" - sources."addons-linter-2.1.0" + sources."addons-linter-2.5.0" sources."adm-zip-0.4.16" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."ajv-merge-patch-4.1.0" sources."ansi-align-3.0.0" sources."ansi-colors-4.1.1" @@ -92715,14 +93658,14 @@ in sources."deep-equal-1.1.1" sources."deep-extend-0.6.0" sources."deep-is-0.1.3" - sources."deepcopy-2.0.0" + sources."deepcopy-2.1.0" sources."deepmerge-4.2.2" sources."defaults-1.0.3" sources."defer-to-connect-1.1.3" sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" - (sources."dispensary-0.52.0" // { + (sources."dispensary-0.55.0" // { dependencies = [ sources."async-3.2.0" ]; @@ -92749,19 +93692,28 @@ in sources."es6-promisify-6.1.1" sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.5.0" // { + (sources."eslint-7.9.0" // { dependencies = [ sources."ansi-regex-5.0.0" sources."debug-4.3.0" + sources."eslint-visitor-keys-1.3.0" sources."ms-2.1.2" sources."strip-ansi-6.0.0" ]; }) sources."eslint-plugin-no-unsanitized-3.1.2" sources."eslint-scope-5.1.1" - sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.3.0" - sources."espree-7.2.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 = [ @@ -92998,7 +93950,7 @@ in sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."marky-1.2.1" - sources."mdn-browser-compat-data-1.0.31" + sources."mdn-browser-compat-data-1.0.35" sources."mem-5.1.1" sources."merge-stream-2.0.0" (sources."micromatch-3.1.10" // { @@ -93052,7 +94004,7 @@ in sources."neo-async-2.6.2" sources."next-tick-1.1.0" sources."node-forge-0.7.6" - (sources."node-notifier-7.0.2" // { + (sources."node-notifier-8.0.0" // { dependencies = [ sources."uuid-8.3.0" ]; @@ -93115,7 +94067,7 @@ in sources."pend-1.2.0" sources."performance-now-2.1.0" sources."picomatch-2.2.2" - sources."pino-6.4.0" + sources."pino-6.6.1" sources."pino-std-serializers-2.5.0" sources."posix-character-classes-0.1.1" (sources."postcss-7.0.32" // { @@ -93199,7 +94151,7 @@ in sources."shebang-regex-3.0.0" sources."shell-quote-1.6.1" sources."shellwords-0.1.1" - (sources."sign-addon-2.0.6" // { + (sources."sign-addon-3.1.0" // { dependencies = [ sources."core-js-3.6.5" ]; @@ -93343,7 +94295,7 @@ in ]; }) sources."upath-1.2.0" - (sources."update-notifier-4.1.0" // { + (sources."update-notifier-4.1.1" // { dependencies = [ sources."chalk-3.0.0" ]; @@ -93384,8 +94336,8 @@ in ]; }) sources."wcwidth-1.0.1" - sources."webidl-conversions-5.0.0" - sources."whatwg-url-8.1.0" + sources."webidl-conversions-6.1.0" + sources."whatwg-url-8.2.2" sources."when-3.7.7" sources."which-2.0.2" sources."which-module-2.0.0" diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 04eabef9ec3c..a0229f595d4e 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, vscode-utils, llvmPackages_8 }: +{ stdenv, callPackage, vscode-utils, llvmPackages_8, llvmPackages_latest }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; @@ -178,6 +178,10 @@ in }; }; + vadimcn.vscode-lldb = callPackage ./vscode-lldb { + lldb = llvmPackages_latest.lldb; + }; + vscodevim.vim = buildVscodeMarketplaceExtension { mktplcRef = { name = "vim"; diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json b/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json new file mode 100644 index 000000000000..6e73ee446d86 --- /dev/null +++ b/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json @@ -0,0 +1,24 @@ +{ + "name": "vscode-lldb", + "version": "1.5.3", + "dependencies": { + "@types/json5": "^0.0.30", + "@types/mocha": "^7.0.1", + "@types/node": "^8.10.50", + "@types/vscode": "^1.31.0", + "@types/yauzl": "^2.9.0", + "json5": "^2.1.0", + "memory-streams": "^0.1.3", + "mocha": "^7.0.1", + "source-map-support": "^0.5.12", + "string-argv": "^0.3.1", + "ts-loader": "^6.2.1", + "typescript": "^3.7.0", + "vsce": "^1.73.0", + "vscode-debugadapter-testsupport": "^1.35.0", + "vscode-debugprotocol": "^1.35.0", + "webpack": "^4.39.1", + "webpack-cli": "^3.3.7", + "yauzl": "^2.10.0" + } +} diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch b/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch new file mode 100644 index 000000000000..db62552b913b --- /dev/null +++ b/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch @@ -0,0 +1,45 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,13 +9,6 @@ include(cmake/CopyFiles.cmake) + set(CMAKE_CXX_STANDARD 11) + set(CMAKE_INSTALL_PREFIX $ENV{HOME}/.vscode/extensions/vscode-lldb CACHE PATH "Install location") + +-set(LLDB_ROOT $ENV{LLDB_ROOT} CACHE PATH "Root of LLDB build directory") +-if (LLDB_ROOT) +- message("Using LLDB from ${LLDB_ROOT}") +-else() +- message(FATAL_ERROR "LLDB_ROOT not set." ) +-endif() +- + # General OS-specific definitions + if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + set(DylibPrefix lib) +@@ -64,8 +57,9 @@ set(UpdateFile ${CMAKE_COMMAND} -E copy_if_different) + + # Adapter + +-add_subdirectory(adapter) +-add_subdirectory(lldb) ++add_custom_target(adapter) ++add_custom_target(lldb) ++add_custom_target(codelldb) + + # Extension package content + +@@ -74,16 +68,6 @@ configure_file(package.json ${CMAKE_CURRENT_BINARY_DIR}/package.json @ONLY) + configure_file(webpack.config.js ${CMAKE_CURRENT_BINARY_DIR}/webpack.config.js @ONLY) + file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) + +-# Run 'npm install' +-execute_process( +- COMMAND ${NPM} install +- WORKING_DIRECTORY ${CMAKE_BINARY_DIR} +- RESULT_VARIABLE Result +-) +-if (NOT ${Result} EQUAL 0) +- message(FATAL_ERROR "npm intall failed: ${Result}") +-endif() +- + # Copy it back, so we can commit the lock file. + file(COPY ${CMAKE_CURRENT_BINARY_DIR}/package-lock.json DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}) + \ No newline at end of file diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix new file mode 100644 index 000000000000..f22c9df36a1b --- /dev/null +++ b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix @@ -0,0 +1,106 @@ +{ lib, stdenv, vscode-utils, fetchFromGitHub, rustPlatform, makeWrapper, jq +, nodePackages, cmake, nodejs, unzip, python3, lldb, breakpointHook +, setDefaultLldbPath ? true +}: +assert lib.versionAtLeast python3.version "3.5"; +let + publisher = "vadimcn"; + name = "vscode-lldb"; + version = "1.5.3"; + + dylibExt = stdenv.hostPlatform.extensions.sharedLibrary; + + src = fetchFromGitHub { + owner = "vadimcn"; + repo = "vscode-lldb"; + rev = "v${version}"; + sha256 = "1139945j3z0fxc3nlyvd81k0ypymqsj051idrbgbibwshpi86y93"; + fetchSubmodules = true; + }; + + adapter = rustPlatform.buildRustPackage { + pname = "${name}-adapter"; + inherit version src; + + cargoSha256 = "0jl4msf2jcjxddwqkx8fr0c35wg4vwvg5c19mihri1v34i09zc5r"; + + # It will pollute the build environment of `buildRustPackage`. + cargoPatches = [ ./reset-cargo-config.patch ]; + + nativeBuildInputs = [ makeWrapper ]; + + buildAndTestSubdir = "adapter"; + + # Hack: Need a nightly compiler. + RUSTC_BOOTSTRAP = 1; + + # `adapter` expects a special hierarchy to resolve everything well. + postInstall = '' + mkdir -p $out/adapter + mv -t $out/adapter \ + $out/bin/* \ + $out/lib/* \ + ./adapter/*.py \ + ./formatters/*.py + rmdir $out/{bin,lib} + ''; + + postFixup = '' + wrapProgram $out/adapter/codelldb \ + --prefix PATH : "${python3}/bin" \ + --prefix LD_LIBRARY_PATH : "${python3}/lib" + ''; + }; + + build-deps = nodePackages."vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps"; + + vsix = stdenv.mkDerivation { + name = "${name}-${version}-vsix"; + inherit src; + + # Only build the extension. We handle `adapter` and `lldb` with nix. + patches = [ ./cmake-build-extension-only.patch ]; + + nativeBuildInputs = [ cmake nodejs unzip breakpointHook ]; + + postConfigure = '' + cp -r ${build-deps}/lib/node_modules/vscode-lldb/{node_modules,package-lock.json} . + ''; + + makeFlags = [ "vsix_bootstrap" ]; + + installPhase = '' + unzip ./codelldb-bootstrap.vsix 'extension/*' -d ./vsix-extracted + mv vsix-extracted/extension $out + + ln -s ${adapter}/adapter $out + # Mark that adapter and lldb are installed. + touch $out/platform.ok + ''; + + dontStrip = true; + dontPatchELF = true; + }; + +in vscode-utils.buildVscodeExtension { + inherit name; + src = vsix; + + nativeBuildInputs = lib.optional setDefaultLldbPath jq; + postUnpack = lib.optionalString setDefaultLldbPath '' + jq '.contributes.configuration.properties."lldb.library".default = $s' \ + --arg s "${lldb}/lib/liblldb.so" \ + $sourceRoot/package.json >$sourceRoot/package.json.new + mv $sourceRoot/package.json.new $sourceRoot/package.json + ''; + + vscodeExtUniqueId = "${publisher}.${name}"; + + meta = with lib; { + description = "A native debugger extension for VSCode based on LLDB"; + homepage = "https://github.com/vadimcn/vscode-lldb"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ oxalica ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/reset-cargo-config.patch b/pkgs/misc/vscode-extensions/vscode-lldb/reset-cargo-config.patch new file mode 100644 index 000000000000..300f8cd96ef9 --- /dev/null +++ b/pkgs/misc/vscode-extensions/vscode-lldb/reset-cargo-config.patch @@ -0,0 +1,11 @@ +--- a/.cargo/config ++++ b/.cargo/config +@@ -1,8 +0,0 @@ +-[build] +-target-dir = "build/target" +- +-[target.armv7-unknown-linux-gnueabihf] +-linker = "arm-linux-gnueabihf-gcc" +- +-[target.aarch64-unknown-linux-gnu] +-linker = "aarch64-linux-gnu-gcc" From bc2e4628b2f7742821f6967aa0afaab51a560362 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 21 Sep 2020 13:50:45 +0200 Subject: [PATCH 119/123] maestral-gui: Fix Qt by using libsForQt5 This is needed after c88f3adb179 to make sure the libs are consistent. --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f69cc670dc48..c111685ca01b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10868,8 +10868,8 @@ in if stdenv.targetPlatform.isi686 then gcc6.cc else if stdenv.targetPlatform == stdenv.hostPlatform && targetPackages.stdenv.cc.isGNU - # Can only do this is in the native case, otherwise we might get infinite - # recursion if `targetPackages.stdenv.cc.cc` itself uses `gccForLibs`. + # Can only do this is in the native case, otherwise we might get infinite + # recursion if `targetPackages.stdenv.cc.cc` itself uses `gccForLibs`. then targetPackages.stdenv.cc.cc else gcc.cc; @@ -23242,7 +23242,7 @@ in maestral = with python3Packages; toPythonApplication maestral; - maestral-gui = libsForQt514.callPackage ../applications/networking/maestral-qt { }; + maestral-gui = libsForQt5.callPackage ../applications/networking/maestral-qt { }; insync = callPackage ../applications/networking/insync { }; From 8463f5c9fde625df0bfff7ad5b3aa1df9fe39d9b Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 16 Sep 2020 18:58:40 +0200 Subject: [PATCH 120/123] pythonPackages.dropbox: 10.3.1 -> 10.4.1 --- 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 51ddaa0de23a..754fe962b5a1 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.3.1"; + version = "10.4.1"; src = fetchPypi { inherit pname version; - sha256 = "6de5f6f36aad32d4382f3d0ad88ee85a22d81d638c960667b8e1ada05db2f98c"; + sha256 = "sha256-INA50DD3wfVPItGCgywZCe5bViatUkaaGdJ0vwcEHgY="; }; # Set DROPBOX_TOKEN environment variable to a valid token. From 08ab7f917deebaeab9117beb8beae4c8be870738 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 16 Sep 2020 18:57:37 +0200 Subject: [PATCH 121/123] pythonPackages.dbus-next: init at 0.1.4 --- .../python-modules/dbus-next/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/dbus-next/default.nix diff --git a/pkgs/development/python-modules/dbus-next/default.nix b/pkgs/development/python-modules/dbus-next/default.nix new file mode 100644 index 000000000000..163a7adcb10d --- /dev/null +++ b/pkgs/development/python-modules/dbus-next/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, python +, dbus, dbus-python, pytest, pytestcov, pytest-asyncio, pytest-timeout +}: + +buildPythonPackage rec { + pname = "dbus-next"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "altdesktop"; + repo = "python-dbus-next"; + rev = "v${version}"; + sha256 = "sha256-C/aFDHmt6Qws6ek+++wM5GRN6TEvMGMiFktKIXRdGL0="; + }; + + checkInputs = [ + dbus + dbus-python + pytest + pytestcov + pytest-asyncio + pytest-timeout + ]; + + # test_peer_interface hits a timeout + checkPhase = '' + dbus-run-session --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + ${python.interpreter} -m pytest -sv --cov=dbus_next \ + -k "not test_peer_interface" + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/altdesktop/python-dbus-next"; + description = "A zero-dependency DBus library for Python with asyncio support"; + license = licenses.mit; + maintainers = with maintainers; [ sfrijters ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e64e854a4a8..d52b0f6bb8b6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1462,6 +1462,8 @@ in { dbfread = callPackage ../development/python-modules/dbfread { }; + dbus-next = callPackage ../development/python-modules/dbus-next { }; + dbus-python = callPackage ../development/python-modules/dbus { inherit (pkgs) dbus pkgconfig; }; dcmstack = callPackage ../development/python-modules/dcmstack { }; From b3e1fd55e4f921c826d397984c7e981a4ab49a3d Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 16 Sep 2020 18:41:49 +0200 Subject: [PATCH 122/123] pythonPackages.maestral: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/maestral/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index c7a4fc3f423a..99b7f304a9ef 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -3,27 +3,28 @@ , fetchFromGitHub , pythonOlder , python -, blinker, bugsnag, click, dropbox, fasteners, keyring, keyrings-alt, pathspec, Pyro5, requests, u-msgpack-python, watchdog +, blinker, bugsnag, click, dbus-next, dropbox, fasteners, keyring, keyrings-alt, pathspec, Pyro5, requests, sqlalchemy, u-msgpack-python, watchdog , sdnotify , systemd }: buildPythonPackage rec { pname = "maestral"; - version = "1.1.0"; + version = "1.2.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral"; rev = "v${version}"; - sha256 = "0d1pxbg69ll07w4bbpzs7zz1yn82qyrym95b0mqmhrrg2ysxjngg"; + sha256 = "sha256-/xm6sGios5N68X94GqFFzH1jNSMK1OnvQiEykU9IAZU="; }; propagatedBuildInputs = [ blinker bugsnag click + dbus-next dropbox fasteners keyring @@ -31,6 +32,7 @@ buildPythonPackage rec { pathspec Pyro5 requests + sqlalchemy u-msgpack-python watchdog ] ++ stdenv.lib.optionals stdenv.isLinux [ From 6dad7ddb8cfc7b897dce9a4c7ba6a0cbdda06401 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 16 Sep 2020 18:41:58 +0200 Subject: [PATCH 123/123] maestral-qt: 1.1.0 -> 1.2.0 --- pkgs/applications/networking/maestral-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index ea6303a3c34d..d6a7705b19eb 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "maestral-qt"; - version = "1.1.0"; + version = "1.2.0"; disabled = python3.pkgs.pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; rev = "v${version}"; - sha256 = "0clzzwwbrynfbvawhaaa4mp2qi8smng31mmz0is166z6g67bwdl6"; + sha256 = "sha256-bEVxtp2MqEsjQvcVXmrWcwys3AMg+lPcdYn4IlYhyqw="; }; propagatedBuildInputs = with python3.pkgs; [